texlive[61495] Master/texmf-dist: tkz-base (4jan22)
commits+karl at tug.org
commits+karl at tug.org
Tue Jan 4 23:30:54 CET 2022
Revision: 61495
http://tug.org/svn/texlive?view=revision&revision=61495
Author: karl
Date: 2022-01-04 23:30:53 +0100 (Tue, 04 Jan 2022)
Log Message:
-----------
tkz-base (4jan22)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/tkz-base/README.md
trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-BB.tex
trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-axes.tex
trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-compilation.tex
trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-divers.tex
trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-grid.tex
trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-initialisation.tex
trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-installation.tex
trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-main.tex
trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-marks.tex
trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-news.tex
trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-point.tex
trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-base.cfg
trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-base.sty
trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-lib-marks.tex
trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-axes.tex
trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-grids.tex
trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-marks.tex
trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-points.tex
trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-rep.tex
trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-BB.tex
trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-arith.tex
trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-base.tex
trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-misc.tex
trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-modules.tex
trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-print.tex
trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-text.tex
trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-utilities.tex
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-example.tex
trunk/Master/texmf-dist/doc/latex/tkz-base/tkz-base.pdf
trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-lib-shape.tex
trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-axesmin.tex
trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-colors.tex
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base.pdf
trunk/Master/texmf-dist/doc/latex/tkz-base/examples/
Modified: trunk/Master/texmf-dist/doc/latex/tkz-base/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/tkz-base/README.md 2022-01-04 22:29:24 UTC (rev 61494)
+++ trunk/Master/texmf-dist/doc/latex/tkz-base/README.md 2022-01-04 22:30:53 UTC (rev 61495)
@@ -1,91 +1,74 @@
-# tkz-base
+# tkz-base — for Cartesian coordinate system
-Release 3.06c 2020/04/06
+Release 4.00 b 2022/01/04
## Description
-
-The package `tkz-base` provides some tools like a Cartesian (rectangular)
-coordinate system to other packages like `tkz-euclide` or `tkz-fct`.
+The package `tkz-base` provides some tools like a Cartesian (rectangular) coordinate system to other packages like `tkz-euclide` or `tkz-fct`.
With this package, you can draw coordinate axis, grids, draw points, the
-principle is to specify the position of any point in two-dimensional space by
-an unique couple of coordinates.
+principle is to specify the position of any point in two-dimensional space by an unique couple of coordinates.
## Licence
-The scontents package may be modified and distributed under the terms and
-conditions of the [LaTeX Project Public
-License](https://www.latex-project.org/lppl/), version 1.3c or greater.
+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.
-## Features
+## Requirements
-- needs xfp.sty, numprint;
-- requires and automatically loads PGF/TikZ > 3.0;
-- compiles with utf8, pdflatex, lualatex;
-
+- [xfp](https://ctan.org/pkg/xfp)
+- [numprint](https://www.ctan.org/pkg/numprint)
+
## Installation
-The package `tkz-base` is present in `TeXLive` and `MiKTeX`, use the
-package manager to install.
+The package `tkz-base` is present in TeXLive and MiKTeX, use the package
+manager to install.
-You can experiment with the `tkz-base` package by placing all of the
+You can experiment with the `tkz-base package by placing all of the
distribution files in the directory containing your current tex file.
-For manual instalation all files must be moved into the different directories in your
-installation `TDS` tree or in your `TEXMFHOME`:
-
-```
- doc/TKZdoc-base.pdf -> TDS:doc/latex/tkz-doc/TKZdoc-base.pdf
- doc/examples/*.* -> TDS:doc/latex/tkz-doc/examples/*.*
- doc/sourcedoc/*.* -> TDS:doc/latex/tkz-doc/sourcedoc/*.*
- code/*.* -> TDS:tex/latex/tkz-doc/*.*
-```
-
+You can also placing all of the distribution files in the directory :
+/texmf/tex/latex/tkz.
+
## How to use it
+- compiles with utf8, pdflatex, lualatex;
+- To use the package tkz-base, place the following lines in the preamble of
+ your LaTeX document.
-To use the package `tkz-base`, place the following lines in the preamble of
-your LaTeX document.
+\usepackage{tkz-base} (loads TikZ and some tikzlibraries).
-```
-\usepackage{tkz-base}
-```
+To avoid package conflicts, you need to load xcolor before TikZ or tkz-base or tkz-euclide
-The line `\usepackage{tkz-base}` loads TikZ.
-The line `\usetkzobj{all}` loads all objects used by `tkz-euclide`.
-With `\usepackage{tkz-euclide}` you don't need to use `\usetkzobj`
-
-To avoid package conflicts, you need to load `xcolor` before `TikZ` or `tkz-base` or
-`tkz-euclide`.
-
## Documentation
-Documentations for `tkz-base` and `tkz-euclide` are available on CTAN and your
-distribution.
-
-
+Documentations for `tkz-base` are available on CTAN and your distribution.
+
+
## Examples
-All examples given in documentation will be stored on CTAN as standalone
-files, ready for compilation. You can use the main.tex file to load and
-compile an example.
+All examples given in documentation will be stored on my site : [http://altermundus.fr](http://altermundus.fr) as standalone
+files, ready for compilation.
-Other examples, en français, can be found on my site [http://altermundus.fr](http://altermundus.fr).
+Other examples, in French, are on my site.
## Compatibility
-The new version of `tkz-base` is *not* fully compatible with the version 1.16 but
-the differences are minor
+The new version of `tkz-base` is *not* fully compatible with the version 3 but the differences are minor
## History
+- 4.00b now `tkz-euclide` is independent of `tkz-base`. Some geometry specific macros have been removed.
- 3.06c correction of the documentation ( thanks to Laurent Van Deik)
-- 3.05c correction of bugs, some macros have migrated to `tkz-euclide`
+- 3.05c correction of bugs, some macros have migrated to tkz-euclide
- 3.02c correction of bugs, new code
- 3.01c correction of bugs, new code
- 1.16 correction of bugs
-- 1.13 first version
+- 1.13 first version
## Author
-Alain Matthes, 5 rue de Valence, Paris 75005, al (dot) ma (at) mac (dot) com
-
+Alain Matthes, 5 rue de Valence, Paris 75005, al (dot) ma (at) mac (dot) com
\ No newline at end of file
Modified: trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-BB.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-BB.tex 2022-01-04 22:29:24 UTC (rev 61494)
+++ trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-BB.tex 2022-01-04 22:30:53 UTC (rev 61495)
@@ -1,10 +1,100 @@
-\section{Bounding box management}
+\section{Controlling Bounding Box}
+From the \tkzimp{PgfManual} :"When you add the clip option, the current path is used for clipping subsequent drawings. Clipping never enlarges the clipping area. Thus, when you clip against a certain path and then clip again against another path, you clip against the intersection of both.
+The only way to enlarge the clipping path is to end the {pgfscope} in which the clipping was done. At the end of a {pgfscope} the clipping path that was in force at the beginning of the scope is reinstalled."
+
+
+First of all, you don't have to deal with \TIKZ\ the size of the bounding box. Early versions of \tkzNamePack{tkz-euclide} did not control the size of the bounding box, now with \tkzNamePack{\tkznameofpack} 4 the size of the bounding box is limited.
+
The initial bounding box after using the macro \tkzcname{tkzInit} is defined by the rectangle based on the points $(0,0)$ and $(10,10)$. The \tkzcname{tkzInit} macro allows this initial bounding box to be modified using the arguments (\tkzname{xmin}, \tkzname{xmax}, \tkzname{ymin}, and \tkzname{ymax}). Of course any external trace modifies the bounding box. \TIKZ\ maintains that bounding box. It is possible to influence this behavior either directly with commands or options in \TIKZ\ such as a command like \tkzcname{useasboundingbox} or the option \tkzname{use as bounding box}. A possible consequence is to reserve a box for a figure but the figure may overflow the box and spread over the main text.
The following command \tkzcname{pgfresetboundingbox} clears a bounding box and establishes a new one.
-%Enfin Il est parfois utile de contenir une figure dans une b
-%current bounding box or current path bounding box remember picture et overlay
+\subsection{Utility of \tkzcname{tkzInit}}
+ However, it is sometimes necessary to control the size of what will be displayed.
+ To do this, you need to have prepared the bounding box you are going to work in, this is the role of the macro \tkzNameMacro{tkzInit}. For some drawings, it is interesting to fix the extreme values (xmin,xmax,ymin and ymax) and to "clip" the definition rectangle in order to control the size of the figure as well as possible.
+The two macros that are useful for controlling the bounding box:
+\begin{itemize}
+ \item \tkzcname{tkzInit}
+ \item \tkzcname{tkzClip}
+\end{itemize}
+\vspace{20pt}
+
+To this, I added macros directly linked to the bounding box. You can now view it, backup it, restore it (see the section Bounding Box).
+
+\subsection{\tkzcname{tkzInit}}
+
+\begin{NewMacroBox}{tkzInit}{\oarg{local options}}\hypertarget{init}{}%
+\begin{tabular}{lll}%
+options & default & definition \\
+\midrule
+\TOline{xmin} {0} {minimum value of the abscissae in cm}
+\TOline{xmax} {10} {maximum value of the abscissae in cm}
+\TOline{xstep}{1} {difference between two graduations in $x$}
+\TOline{ymin} {0} {minimum y-axis value in cm }
+\TOline{ymax} {10} {maximum y-axis value in cm}
+\TOline{ystep}{1} {difference between two graduations in $y$}
+\bottomrule
+\end{tabular}
+
+\medskip
+
+The role of \tkzcname{tkzInit} is to define a \textcolor{red}{orthogonal} coordinates system and a rectangular part of the plane in which you will place your drawings using Cartesian coordinates.
+This macro allows you to define your working environment as with a calculator. With \tkzname{\tkznameofpack} 4 \tkzcname{xstep} and \tkzcname{ystep} are always 1. Logically it is no longer useful to use \tkzcname{tkzInit}, except for an action like "Clipping Out".
+\end{NewMacroBox}
+
+
+\subsection{\tkzcname{tkzClip}}
+
+\subsection{tkzClip}
+\begin{NewMacroBox}{tkzClip}{\oarg{local options}}
+The role of this macro is to make invisible what is outside the rectangle defined by (xmin~;~ymin) and (xmax~;~ymax).
+
+\medskip
+\begin{tabular}{lll}
+\hline
+options & default & definition \\
+\midrule
+\TOline{space} {1} {added value on the right, left, bottom and top of the background}
+\bottomrule
+\end{tabular}
+
+\medskip
+
+The role of the \tkzname{space} option is to enlarge the visible part of the drawing. This part becomes the rectangle defined by (xmin-space~;~ymin-space) and (xmax+space~;~ymax+space). \tkzname{space} can be negative! The unit is cm and should not be specified.
+\end{NewMacroBox}
+
+The role of this macro is to "clip" the initial rectangle so that only the paths contained in this rectangle are drawn.
+
+\begin{tkzexample}[latex=8cm,small]
+\begin{tikzpicture}
+ \tkzInit[xmax=4, ymax=3]
+ \tkzDefPoints{-1/-1/A,5/2/B}
+ \tkzDrawX \tkzDrawY
+ \tkzGrid
+ \tkzClip
+ \tkzDrawSegment(A,B)
+\end{tikzpicture}
+\end{tkzexample}
+
+It is possible to add a bit of space
+\begin{tkzltxexample}[]
+ \tkzClip[space=1]
+\end{tkzltxexample}
+
+\subsection{\tkzcname{tkzClip} and the option \tkzname{space}}
+This option allows you to add some space around the "clipped" rectangle.
+\begin{tkzexample}[latex=8cm,small]
+\begin{tikzpicture}
+ \tkzInit[xmax=4, ymax=3]
+ \tkzDefPoints{-1/-1/A,5/2/B}
+ \tkzDrawX \tkzDrawY
+ \tkzGrid
+ \tkzClip[space=1]
+ \tkzDrawSegment(A,B)
+\end{tikzpicture}
+\end{tkzexample}
+The dimensions of the "clipped" rectangle are \tkzname{xmin-1}, \tkzname{ymin-1}, \tkzname{xmax+1} and \tkzname{ymax+1}.
+
%<--------------------------------------------------------------------------->
% tkzShowBB
%<--------------------------------------------------------------------------->
@@ -14,7 +104,6 @@
This macro displays the bounding box. A rectangular frame surrounds the bounding box. This macro accepts \TIKZ\ options.
\end{NewMacroBox}
-
\subsubsection{Example with \tkzcname{tkzShowBB}}
\begin{tkzexample}[latex=8cm,small]
\begin{tikzpicture}[scale=.5]
@@ -23,10 +112,10 @@
\tkzDefPoint(3,0){A}
\begin{scope}
\tkzClipBB
- \tkzDrawCircle[R](A,5 cm)
- \tkzShowBB
+ \tkzDrawCircle[R](A,5)
+ \tkzShowBB[line width = 4pt,fill=teal!10,opacity=.4]
\end{scope}
-\tkzDrawCircle[R,red](A,4 cm)
+\tkzDrawCircle[R,red](A,4)
\end{tikzpicture}
\end{tkzexample}
%<--------------------------------------------------------------------------->
@@ -35,7 +124,7 @@
\subsection{tkzClipBB}
\begin{NewMacroBox}{tkzClipBB}{}%
The idea is to limit future constructions to the current bounding box.
-\end{NewMacroBox}
+\end{NewMacroBox}
\subsubsection{Example with \tkzcname{tkzClipBB} and the bisectors}
@@ -46,7 +135,7 @@
\tkzDefPoint(1,4){J}
\tkzDefLine[bisector](I,O,J) \tkzGetPoint{i}
\tkzDefLine[bisector out](I,O,J) \tkzGetPoint{j}
- \tkzDrawPoints(O,I,J,i,j)
+ \tkzDrawPoints(O,I,J,i,j)
\tkzClipBB
\tkzDrawLines[add = 1 and 2,color=red](O,I O,J)
\tkzDrawLines[add = 1 and 2,color=blue](O,i O,j)
@@ -54,186 +143,4 @@
\end{tikzpicture}
\end{tkzexample}
-
-%<--------------------------------------------------------------------------->
-% tkzSetBB
-%<--------------------------------------------------------------------------->
-\subsection{tkzSetBB}
-\begin{NewMacroBox}{tkzSetBB}{\parg{$x_A~;~y_A$} \parg{$x_B~;~y_B$} or {\parg{$A$} \parg{$B$}}}%
-This macro defines the rectangle with coordinates $(x_A~;~y_A$) and $(x_B~;~y_B)$ as the new bounding box.
-\end{NewMacroBox}
-
-\subsubsection{Example with \tkzcname{tkzShowBB}}
-\begin{tkzexample}[latex=8cm,small]
-above\\
-left
-\begin{tikzpicture}
- \tkzDefPoint(0,0){A}
- \tkzDefPoint(3,3){B}
- \tkzDefPoint(1,1){C}
- \tkzSetBB(A)(2,2)
- \tkzDrawSegment(A,B)
- \tkzDrawPoints(A,C)
- \tkzShowBB
-\end{tikzpicture}right
-\end{tkzexample}
-%<--------------------------------------------------------------------------->
-% tkzSaveBB
-%<--------------------------------------------------------------------------->
-\subsection{tkzSaveBB}{}
-\begin{NewMacroBox}{tkzSaveBB}{}%
-This macro saves the bounding box, i.e. it stores the coordinates of two points that define a rectangle.
-\end{NewMacroBox}
-
-\begin{tkzexample}[latex=7cm,small]
-A figure above the text.
-\begin{tikzpicture}
- \begin{scope}
- \tkzSetBB(0,0)(6,2) \tkzShowBB[fill=blue!20]
- \tkzSaveBB
- \end{scope}
- \tkzDefPoint(3,3){A}\tkzShowBB
- \tkzDrawCircle[R,fill=yellow,opacity=.2](A,2cm)
- \tkzRestoreBB
-\end{tikzpicture}
-\end{tkzexample}
-
-
-
-
-%<--------------------------------------------------------------------------->
-% tkzRestoreBB
-%<--------------------------------------------------------------------------->
-\subsection{tkzRestoreBB}
-\begin{NewMacroBox}{tkzRestoreBB}{}
-This macro retrieves the bounding box backup. As you can see, the figure overflows the box. The bounding box has been reduced.
-\end{NewMacroBox}
-\subsubsection{Example of the use of \tkzcname{tkzRestoreBB}}
-\begin{tkzexample}[latex=8cm,small]
- \vspace{ 2cm}
-Start\\
-\begin{tikzpicture}
- \tkzDefPoint(-2,-2){A}
- \tkzDefPoint(2,1){B}
- \tkzDefPoint(0,0){O}
- \tkzSaveBB
- \tkzShowBB[red,line width=1pt]
- \tkzRestoreBB
- \tkzDrawCircle(O,B)
- \tkzClipBB
- \tkzFillCircle[gray!20](O,B)
-\end{tikzpicture}
-End
-\end{tkzexample}
-
-
-%<--------------------------------------------------------------------------->
-% tkzClip
-%<--------------------------------------------------------------------------->
-\subsection{tkzClip}
-\begin{NewMacroBox}{tkzClip}{\oarg{local options}}
-The role of this macro is to make invisible what is outside the rectangle defined by (xmin~;~ymin) and (xmax~;~ymax).
-
-\medskip
-\begin{tabular}{lll}
-\hline
-options & default & definition \\
-\midrule
-\TOline{space} {1} {added value on the right, left, bottom and top of the background}
-\bottomrule
-\end{tabular}
-
-\medskip
-
-The role of the \tkzname{space} option is to enlarge the visible part of the drawing. This part becomes the rectangle defined by (xmin-space~;~ymin-space) and (xmax+space~;~ymax+space). \tkzname{space} can be negative! The unit is cm and should not be specified.
-\end{NewMacroBox}
-
-\subsubsection{First example with \tkzcname{tkzClip}} \hypertarget{clip}{}
-
-\begin{tkzexample}[latex=8cm,small]
-\begin{tikzpicture}
- \tkzInit[xmax=3, ymax=3]
- \tkzGrid
- \tkzAxeXY
- \draw[red] (-1,-1)--(5,5);
-\end{tikzpicture}
-\end{tkzexample}
-
-\subsubsection{Second example with \tkzcname{tkzClip}}
-\begin{tkzexample}[latex=8cm,small]
-\begin{tikzpicture}
- \tkzInit[xmax=3, ymax=3]
- \tkzGrid
- \tkzAxeXY
- \tkzClip
- \draw[red] (-1,-1)--(5,5);
-\end{tikzpicture}
-\end{tkzexample}
-%<--------------------------------------------------------------------------->
-It is possible to add a bit of space \tkzcname{tkzClip[space]}.
-
-\subsubsection{\tkzcname{tkzClip} and l'option \tkzname{space}}
-The dimensions to define the clipped rectangle are \tkzname{xmin-1}, \tkzname{ymin-1}, \tkzname{xmax+1} and \tkzname{ymax+1}.
-
-\begin{tkzexample}[latex=8cm,small]
-\begin{tikzpicture}
- \tkzInit[xmax=3, ymax=3]
- \tkzGrid \tkzAxeXY
- \tkzClip[space=-0.5]
- \draw[red] (-0.5,-0.5)--(3.5,3.5);
-\end{tikzpicture}
-\end{tkzexample}
-
-\subsection{Reverse clip: tkzreverseclip}
-The next example uses
-
-\begin{tkzltxexample}[]
- \def\tkzClipOutPolygon(#1,#2){\clip[tkzreserveclip] (#1)
- \foreach \pt in {#2}{--(\pt)}--cycle;
- }
- \tikzset{tkzreverseclip/.style={insert path={%
- (\tkz at xa,\tkz at ya) rectangle (\tkz at xb,\tkz at yb)}}}
- \end{tkzltxexample}
-
-\subsubsection{Example with \tkzcname{tkzClipOutPolygon}}
-\begin{tkzexample}[latex=7cm,small]
-\begin{tikzpicture}[scale=.5]
- \tkzInit[xmin=-5,xmax=5,ymin=-5,ymax=5]
- \pgfinterruptboundingbox
- \tkzDefPoints{-.5/0/P1,.5/0/P2}
- \foreach \i [count=\j from 3] in {2,...,7}{%
- \tkzDefShiftPoint[P\i]({45*(\i-1)}:1 cm){P\j}
- }
- \endpgfinterruptboundingbox
- \tkzClipOutPolygon(P1,P2,P3,P4,P5,P6,P7,P8)
- \tkzCalcLength[cm](P1,P5)\tkzGetLength{r}
- \begin{scope}[blend group=screen]
- \foreach \i in {1,...,8}{%
- \pgfmathparse{100-5*\i}
- \tkzFillCircle[R,color=blue!%
- \pgfmathresult](P\i,\r)
- }
- \end{scope}
-\end{tikzpicture}
-\end{tkzexample}
-
-
-\subsection{Options from \TIKZ: trim left or right}
-See the \tkzimp{pgfmanual}
-
-\subsection{\TIKZ\ Controls \tkzcname{pgfinterruptboundingbox} and \tkzcname{endpgfinterruptboundingbox}}
-This command temporarily interrupts the calculation of the box and configures a new box.
-
-\begin{tkzexample}[latex=8cm,small]
-\begin{tikzpicture}
-\tkzDefPoint(0,5){A}\tkzDefPoint(5,4){B}
-\tkzDefPoint(0,0){C}\tkzDefPoint(5,1){D}
-\pgfinterruptboundingbox
- \tkzInterLL(A,B)(C,D)\tkzGetPoint{I}
-\endpgfinterruptboundingbox
-\tkzClipBB
- \tkzDrawCircle(I,B)
-\tkzDrawSegments(A,B C,D A,C)
-\end{tikzpicture}
-\end{tkzexample}
\endinput
\ No newline at end of file
Modified: trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-axes.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-axes.tex 2022-01-04 22:29:24 UTC (rev 61494)
+++ trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-axes.tex 2022-01-04 22:30:53 UTC (rev 61495)
@@ -5,7 +5,7 @@
%<--------------------------------------------------------------------->
% tkzDrawX
%<--------------------------------------------------------------------->
-\subsection{\tkzcname{tkzDrawX}} \hypertarget{dx}{}
+\subsection{\tkzcname{tkzDrawX}}
\begin{NewMacroBox}{tkzDrawX}{\oarg{local options}}%
This macro allows you to draw the abscissa axis with default ticks.
The options are those of \TIKZ\ plus the following ones:
@@ -82,7 +82,7 @@
\end{tikzpicture}
\end{tkzexample}
- \subsubsection{Trigonometric axis with the option \tkzname{trig=$n$}}\hypertarget{newm}{}
+ \subsubsection{Trigonometric axis with the option \tkzname{trig=n}}
If $number=0$ then the axis is graduated from cm to cm, otherwise the axis is graduated using multiples of $\frac{\pi}{number}$.
\begin{tkzexample}[latex=6cm,small]
@@ -103,7 +103,7 @@
%<--------------------------------------------------------------------->
% tkzLabelX
%<--------------------------------------------------------------------->
-\subsection{\tkzcname{tkzLabelX}}\hypertarget{lx}{}
+\subsection{\tkzcname{tkzLabelX}}
\begin{NewMacroBox}{tkzLabelX}{\oarg{local options}}%
This macro allows you to place graduations. The option \tkzname{orig} can be used again, but its behavior is reversed. By default, the original value is placed.
The options are those of \TIKZ, plus the following ones:
@@ -279,7 +279,7 @@
%<--------------------------------------------------------------------->
% tkzAxeX
%<--------------------------------------------------------------------->
-\subsection{\tkzcname{tkzAxeX}}\hypertarget{ax}{}
+\subsection{\tkzcname{tkzAxeX}}
\begin{NewMacroBox}{tkzAxeX}{\oarg{local options}}%
This macro allows you to draw the abscissa axis with default ticks as well as the graduations. It combines the two macros \tkzcname{tkzDrawX} and \tkzcname{tkzLabelX}. It should only be used in simple cases.
@@ -333,7 +333,7 @@
%<--------------------------------------------------------------------->
% tkzDrawY
%<--------------------------------------------------------------------->
-\subsection{\tkzcname{tkzDrawY}} \hypertarget{dy}{}
+\subsection{\tkzcname{tkzDrawY}}
\begin{NewMacroBox}{tkzDrawY}{\oarg{local options}}%
This macro allows you to draw the ordinate axis with default ticks.
The options are those of \TIKZ\ plus the following ones:
@@ -355,7 +355,7 @@
\end{tabular}
\end{NewMacroBox}
-\subsection{\tkzcname{tkzLabelY}} \hypertarget{ly}{}
+\subsection{\tkzcname{tkzLabelY}}
\begin{NewMacroBox}{tkzLabelY}{\oarg{local options}}%
This macro allows you to draw the abscissa axis with default ticks.
The options are those of \TIKZ\ plus the following ones:
@@ -378,7 +378,7 @@
%<--------------------------------------------------------------------->
% tkzAxeY
%<--------------------------------------------------------------------->
-\subsection{\tkzcname{tkzAxeY}}\hypertarget{ay}{}
+\subsection{\tkzcname{tkzAxeY}}
\begin{NewMacroBox}{tkzAxeY}{\oarg{local options}}%
This macro combines the two macros:
\tkzcname{tkzDrawY} \tkzcname{tkzLabelY}
@@ -387,7 +387,7 @@
%<--------------------------------------------------------------------->
% tkzAxeXY
%<--------------------------------------------------------------------->
-\subsection{\tkzcname{tkzAxeXY}} \hypertarget{axy}{}
+\subsection{\tkzcname{tkzAxeXY}}
\begin{NewMacroBox}{tkzAxeXY}{\oarg{local options}}%
This macro combines the four macros:
\tkzcname{tkzDrawX}\tkzcname{tkzDrawY} \tkzcname{tkzLabelX}\tkzcname{tkzLabelY}
@@ -423,7 +423,7 @@
%<--------------------------------------------------------------------->
% tkzDrawXY
%<--------------------------------------------------------------------->
-\subsection{\tkzcname{tkzDrawXY}} \hypertarget{dxy}{}
+\subsection{\tkzcname{tkzDrawXY}}
\begin{NewMacroBox}{tkzDrawXY}{\oarg{local options}}%
This macro combines the two macros: \tkzcname{tkzDrawX}\tkzcname{tkzDrawY}.
It is necessary to use common options as in the example below.
@@ -447,7 +447,7 @@
%<--------------------------------------------------------------------->
% tkzLabelXY
%<--------------------------------------------------------------------->
-\subsection{\tkzcname{tkzLabelXY}} \hypertarget{lxy}{}
+\subsection{\tkzcname{tkzLabelXY}}
\begin{NewMacroBox}{tkzLabelXY}{\oarg{local options}}%
This macro combines the two macros:
@@ -468,7 +468,7 @@
%<--------------------------------------------------------------------->
% tkzSetUpAxis
%<--------------------------------------------------------------------->
-\subsection{Changing values by axis default} \hypertarget{axis}{}
+\subsection{Changing values by axis default}
\begin{NewMacroBox}{tkzSetUpAxis}{\oarg{local options}}%
\begin{tabular}{lll}%
Modified: trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-compilation.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-compilation.tex 2022-01-04 22:29:24 UTC (rev 61494)
+++ trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-compilation.tex 2022-01-04 22:30:53 UTC (rev 61495)
@@ -30,17 +30,13 @@
\begin{enumerate}
\item The compilation of this document and examples is obtained with \tkzimp{lua\LATEX}.
-\item In principle, \tkzNamePack{tkz-base} is not loaded by the user, it will be loaded by another package like \tkzNamePack{tkz-euclide} or \tkzNamePack{tkz-fct}. \tkzNamePack{tkz-base} loads \tkzNamePack{numprint} with the option \tkzNamePack{autolanguage}, \tkzNamePack{xfp} and of course {\TIKZ}.
+\item \tkzNamePack{tkz-base} loads \tkzNamePack{numprint} with the option \tkzNamePack{autolanguage}, \tkzNamePack{xfp} and of course {\TIKZ}.
\item \TIKZ\ seems that version 3 of pgf has fixed those problems. In case of difficulty, it is recommended to load the \NameLib{babel} library with \tkzcname{usetikzlabry\{babel\}}. Another possibility is to compile with Lua\LATEX.
\end{enumerate}
-
\subsection {\tkzNamePack{xfp} and \tkzNamePack{numprint}}
-
\tkzNamePack{xfp} now replaces \tkzNamePack{fp} in this package. One of the advantages for the user is a simplified syntax. It allows to manage calculations on large or very small numbers with precision. This slows down the compilation a bit, so it is better not to overuse it. \tkzNamePack{xfp} is used above all, to obtain correct graduations.
-
\tkzNamePack{numprint} was present when I started to write this series of packages, since \tkzNamePack{siunitx} has grown and I can understand that some people prefer it. In a future version, I plan to leave the choice of the package for displaying numbers.
-
\endinput
Modified: trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-divers.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-divers.tex 2022-01-04 22:29:24 UTC (rev 61494)
+++ trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-divers.tex 2022-01-04 22:30:53 UTC (rev 61495)
@@ -1,6 +1,6 @@
\section{Lines parallel to the axes}
-\subsection{ Draw a horizontal line with \tkzcname{tkzHLine}} \hypertarget{thl}{}
+\subsection{ Draw a horizontal line with \tkzcname{tkzHLine}}
\tkzHandBomb The syntax is that of \tkzname{xfp}!
\begin{NewMacroBox}{tkzHLine}{\oarg{local options}\marg{decimal number}}%
\begin{tabular}{lll}%
@@ -72,7 +72,7 @@
\end{tkzexample}
-\subsection{ Draw a vertical line with \tkzcname{tkzVLine}} \hypertarget{tvl}{}
+\subsection{ Draw a vertical line with \tkzcname{tkzVLine}}
\tkzHandBomb The syntax is that of \tkzname{xfp}!
\begin{NewMacroBox}{tkzVLine}{\oarg{local options}\marg{decimal number}}%
\begin{tabular}{lll}%
@@ -146,7 +146,7 @@
\section{Ticks on the axes}
%<–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––>
-\subsection{ Drawing one tick on the abscissa axis \tkzcname{tkzHTick}} \hypertarget{tht}{}
+\subsection{ Drawing one tick on the abscissa axis \tkzcname{tkzHTick}}
\begin{NewMacroBox}{tkzHTick}{\oarg{local options}\marg{decimal number}}%
\begin{tabular}{lll}%
arguments & example & definition \\
@@ -180,7 +180,7 @@
\end{tikzpicture}
\end{tkzexample}
-\subsection{ Drawing ticks on the abscissa axis \tkzcname{tkzHTicks}} \hypertarget{thts}{}
+\subsection{ Drawing ticks on the abscissa axis \tkzcname{tkzHTicks}}
\begin{NewMacroBox}{tkzHTicks}{\oarg{local options}\marg{list of numbers}}%
\begin{tabular}{lll}
arguments & example & definition \\
@@ -192,7 +192,7 @@
See options for \TIKZ.
\end{NewMacroBox}
-\subsection{ Drawing one tick on the ordinate axis \tkzcname{tkzVTick}} \hypertarget{tvt}{}
+\subsection{ Drawing one tick on the ordinate axis \tkzcname{tkzVTick}}
\begin{NewMacroBox}{tkzVTick}{\oarg{local options}\marg{decimal number}}%
\begin{tabular}{lll}%
arguments & example & definition \\
@@ -204,7 +204,7 @@
See options for \TIKZ.
\end{NewMacroBox}
-\subsection{ Drawing ticks on the ordinate axis \tkzcname{tkzVTicks}} \hypertarget{tvts}{}
+\subsection{ Drawing ticks on the ordinate axis \tkzcname{tkzVTicks}}
\begin{NewMacroBox}{tkzVTicks}{\oarg{local options}\marg{decimal number}}%
\begin{tabular}{lll}
arguments & example & definition \\
Added: trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-example.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-example.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-example.tex 2022-01-04 22:30:53 UTC (rev 61495)
@@ -0,0 +1,26 @@
+\section{Here are a few examples}
+
+Here is a very simple example that shows you that once the reference is defined, it is easy to work with the tools of my module. It is however possible to use the Tikz tools, but in this case you have to go back to the original coordinate system.
+
+\subsection{Recipe by month}
+
+\begin{tkzexample}[vbox,small]
+\begin{tikzpicture}
+ \tkzInit[xmax=12,ymin=1000,ymax=11000,ystep=1000]
+ \tkzClip[space=2]
+ \tkzAxeX[label=month,below=10pt]
+ \tkzAxeY[label=Recipe]
+ \tkzDefPoint(1,2000){A}
+ \tkzDefPoint(2,3000){B}
+ \tkzDefPoint(4,2500){C}
+ \tkzDefPoint(5,4200){D}
+ \tkzDrawSegments[color=brown!50](A,B B,C C,D)
+ \tkzDrawMarks[mark=ball](A,B,C,D)
+ \tkzText[draw,color = red,fill = red!10,text width=3cm](5,6000)%
+ {\begin{center}\color{blue}%
+ Recipe by month\end{center}%
+ }
+\end{tikzpicture}
+\end{tkzexample}
+
+\endinput
Property changes on: trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-example.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-grid.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-grid.tex 2022-01-04 22:29:24 UTC (rev 61494)
+++ trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-grid.tex 2022-01-04 22:30:53 UTC (rev 61495)
@@ -21,7 +21,9 @@
\end{tabular}
\medskip
-Default values can be changed in the configuration file or by macros. The color of the second grid is the same as the main grid, but less intense (by default |gray!50|). Same behavior for the line thickness (by default |0.75 of line width|). See the examples to change this behavior.
+Default values can be changed in the configuration file or by macros. The color of the second grid is the same as the main grid, but less intense (by default |gray!50|).
+
+Same behavior for the line thickness (by default |0.75 of line width|). See the examples to change this behavior.
\end{NewMacroBox}
\subsubsection{\tkzcname{tkzGrid} and the option \tkzname{sub}}
@@ -149,7 +151,7 @@
\subsubsection{Use of a repetition grid}
\begin{tkzexample}[latex=8cm,small]
\begin{tikzpicture}[scale=.5]
- \tikzset{xaxe style/.style ={-}}
+ % \tikzset{xaxe style/.style ={-}}
\tkzInit[xmax=15,ymax=15]
\tkzClip
\tkzGrid[sub,color=orange]
Modified: trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-initialisation.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-initialisation.tex 2022-01-04 22:29:24 UTC (rev 61494)
+++ trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-initialisation.tex 2022-01-04 22:30:53 UTC (rev 61495)
@@ -48,7 +48,7 @@
With \tkzname{tkz-base}, it will be possible to work with any coordinates, but it will be necessary to use the macros of the package.
-\tkzNamePack{tkz-base} simplifies the use of different value ranges. This package is used by several of my packages such as \tkzname{tkz-tukey}, a package for drawing graphical representations in elementary statistics, \tkzNamePack{tkz-fct} which allows to draw graphical representations of functions using \tkzname{gnuplot}, as well as with \tkzname{tkz-euclide} for Euclidean geometry.
+\tkzNamePack{tkz-base} simplifies the use of different value ranges. This package is used by \tkzNamePack{tkz-fct} which allows to draw graphical representations of functions using \tkzname{gnuplot}.
First of all, you should know that it is not necessary to deal with \TIKZ\ with the size of the support (bounding box); however it is sometimes necessary, either to draw a grid, or to draw axes, or to work with a different unit than the centimeter, or finally to control the size of what will be displayed.
To do this, you must have prepared the frame in which you are going to work, this is the role of \tkzNamePack{tkz-base} and its main macro \tkzNameMacro{tkzInit}. For example, if you want to work on a 10 cm square, but such that the unit is the dm then you will have to use.
Modified: trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-installation.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-installation.tex 2022-01-04 22:29:24 UTC (rev 61494)
+++ trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-installation.tex 2022-01-04 22:30:53 UTC (rev 61495)
@@ -1,41 +1,12 @@
\section{Installation}
-\NamePack{tkz-base} is now on the server of the \tkzname{CTAN}\footnote{\NamePack{tkz-base} is part of \NameDist{TeXLive} and \tkzname{tlmgr} allows to install it, it is also part of \NameDist{MikTeX} under \NameSys{Windows}.}. If you want to test a beta version, just put the following files in a texmf folder that your system will be able to find.
+\tkzname{\tkznameofpack} is now on the server of the \tkzname{CTAN}\footnote{\tkzname{\tkznameofpack} is part of \NameDist{TeXLive} and \tkzname{tlmgr} allows you to install them. This package is also part of \NameDist{MiKTeX} under \NameSys{Windows}.}. If you want to test a beta version, just put the following files in a texmf folder that your system can find.
+You will have to check several points:
-\subsection{Files present}
-%–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––>
-Before testing the installation, you can verify that the \tkzname{tkzbase} folder contains the following files:
-
-\begin{itemize}
-\item \tkzname{tkz-base.cfg}
-\item \tkzname{tkz-base.sty}
-\item \tkzname{tkz-lib-marks.tex}
-\item \tkzname{tkz-obj-axes.tex}
-\item \tkzname{tkz-obj-grids.tex}
-\item \tkzname{tkz-obj-marks.tex}
-\item \tkzname{tkz-obj-points.tex}
-\item \tkzname{tkz-obj-rep.tex}
-\item \tkzname{tkz-tools-arith.tex}
-\item \tkzname{tkz-tools-base.tex}
-\item \tkzname{tkz-tools-BB.tex}
-\item \tkzname{tkz-tools-math.tex}
-\item \tkzname{tkz-tools-misc.tex}
-\item \tkzname{tkz-tools-modules.tex}
-\item \tkzname{tkz-tools-print.tex}
-\item \tkzname{tkz-tools-text.tex}
-\item \tkzname{tkz-tools-utilities.tex}
+\begin{itemize}\setlength{\itemsep}{5pt}
+\item The \tkzname{\tkznameofpack} folder must be located on a path recognized by \tkzname{latex}.
+\item The \tkzname{\tkznameofpack} uses \tkzNamePack{xfp}.
+\item This documentation and all examples were obtained with \tkzname{lualatex} but \tkzname{pdflatex} or \tkzname{xelatex} should be suitable.
\end{itemize}
-The one with the main macros is \tkzname{tkz-tools-base.tex},
-it's called \tkzname{tkz-base} which handles all the files.
-The various tools are in files beginning with \tkzname{tkz-tools}, the mathematical objects created are in files whose name has for prefix \tkzname{tkz-obj}. Finally \tkzname{tkz-base.cfg} whose presence is not mandatory allows to modify many default values.
-
-Moreover, \TIKZ\ is loaded with the following libraries:
-
-\begin{tkzltxexample}[]
-\usetikzlibrary{angles, arrows, arrows.meta, babel, calc, decorations, decorations.markings,decoration.shapes, decorations.text, decorations.pathmorphing,
-decorations.pathreplacing, intersections, patterns, plotmarks, positioning, quotes,
-shapes.misc, through}
-\end{tkzltxexample}
-
\endinput
Modified: trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-main.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-main.tex 2022-01-04 22:29:24 UTC (rev 61494)
+++ trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-main.tex 2022-01-04 22:30:53 UTC (rev 61495)
@@ -1,7 +1,7 @@
%!TEX TS-program = lualatex
-% encoding: utf8
-% documentation of tkz-base.sty
-% Copyright 2020 Alain Matthes
+% encoding: utf8
+% documentation of tkz-base.sty
+% 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.
@@ -9,44 +9,23 @@
% 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.
-% This work consists of the files:
-% TKZdoc-base-axes.tex
-% TKZdoc-base-BB.tex
-% TKZdoc-base-compilation.tex
-% TKZdoc-base-divers.tex
-% TKZdoc-base-example.tex
-% TKZdoc-base-faq.tex
-% TKZdoc-base-grid.tex
-% TKZdoc-base-initialisation.tex
-% TKZdoc-base-installation.tex
-% TKZdoc-base-main.tex
-% TKZdoc-base-marks.tex
-% TKZdoc-base-news.tex
-% TKZdoc-base-obj.tex
-% TKZdoc-base-point.tex
-% TKZdoc-base-rep.tex
-% TKZdoc-base-style.tex
-% TKZdoc-base-texte.tex
-% TKZdoc-base-tools.tex
+
\documentclass[DIV = 14,
fontsize = 10,
- headinclude = false,
index = totoc,
- footinclude = false,
twoside,
headings = small,
- cadre]{tkz-doc}
-\usepackage{etoc}
+ cadre
+ ]{tkz-doc}
+%\usepackage{etoc}
\gdef\tkznameofpack{tkz-base}
-\gdef\tkzversionofpack{3.06c}
-\gdef\tkzdateofpack{2020/03/20}
+\gdef\tkzversionofpack{4.00 b}
+\gdef\tkzdateofpack{2022/01/04}
\gdef\tkznameofdoc{doc-tkz-base}
-\gdef\tkzversionofdoc{3.06c}
-\gdef\tkzdateofdoc{2020/03/20}
+\gdef\tkzversionofdoc{4.00 b}
+\gdef\tkzdateofdoc{2022/01/04}
\gdef\tkzauthorofpack{Alain Matthes}
\gdef\tkzadressofauthor{}
\gdef\tkznamecollection{AlterMundus}
@@ -53,9 +32,10 @@
\gdef\tkzurlauthor{}
\gdef\tkzengine{lualatex}
\gdef\tkzurlauthorcom{http://altermundus.fr}
-% -- Packages ---------------------------------------------------
+% -- Packages ---------------------------------------------------
\usepackage{calc}
-\usepackage{tkz-euclide}
+\usepackage{tkz-base}
+\usepackage{tkz-euclide}
\usepackage[colorlinks]{hyperref}
\hypersetup{
linkcolor=Gray,
@@ -93,22 +73,22 @@
\usepackage{unicode-math}
\usepackage{fourier-otf}
\makeatletter
-\newfontfamily\zorna{ORNA4___.TTF}%\if at tkzcadre \usepackage{zorna} \fi
+\if at tkzcadre \usepackage{zorna} \fi
\makeatother
\usepackage{datetime,multicol,lscape}
\usepackage[english]{babel}
\usepackage[autolanguage]{numprint}
\usepackage[normalem]{ulem}
-\usepackage{microtype}
+%\usepackage{microtype}
\usepackage{array,multirow,multido,booktabs}
-\usepackage{shortvrb,fancyvrb}
+\usepackage{shortvrb,fancyvrb}
\renewcommand{\labelitemi}{--}
\AtBeginDocument{\MakeShortVerb{\|}} % link to shortvrb
-\pdfcompresslevel=9
+\pdfcompresslevel=9
\setlength\parindent{0pt}
-\RequirePackage{imakeidx}
+\RequirePackage{makeidx}
%\@twocolumnfalse
-\makeindex
+\makeindex
% \def\tkzref{\arabic{section}-\arabic{subsection}-\arabic{subsubsection}}
% \renewenvironment{tkzexample}[1][]{%
% \tkz at killienc \VerbatimOut{tkzbase-\tkzref.tex}%
@@ -115,11 +95,11 @@
% }{%
% \endVerbatimOut
% }
-%<--------------------------------------------------------------------------->
+%<--------------------------------------------------------------------------->
\begin{document}
\parindent=0pt
-\author{\tkzauthorofpack}
+\author{\tkzauthorofpack}
\title{\tkznameofpack}
\date{\today}
\clearpage
@@ -132,9 +112,9 @@
\setlength\unitlength{1mm}
\put(70,120){%
\begin{tikzpicture}
- \node at (30pt,30pt){\fontsize{60}{60}\selectfont \zorna{c}};
+ \node at (30pt,30pt){\fontsize{60}{60}\selectfont \zorna{c}};
\node at (270pt,30pt){\fontsize{60}{60}\selectfont \zorna{d}};
- \node at (30pt,210pt){\fontsize{60}{60}\selectfont \zorna{a}};
+ \node at (30pt,210pt){\fontsize{60}{60}\selectfont \zorna{a}};
\node at (270pt,210pt){\fontsize{60}{60}\selectfont \zorna{b}};
\draw[line width=2pt,double,color=MidnightBlue,
fill=myblue!10,opacity=.5] (0,0) rectangle (300pt,240pt);
@@ -142,38 +122,36 @@
\begin{center}
\color{MidnightBlue}
\fontsize{24}{48}
- \selectfont tkz-euclide\\
- tool for \\
- Euclidean Geometry
+ \selectfont tkz-base
\end{center}};
-\end{tikzpicture}}
-}
+\end{tikzpicture}}
+}
\else
\fi
\makeatother
\clearpage
-\tkzSetUpColors[background=white,text=darkgray]
+\tkzSetUpColors[background=white,text=darkgray]
\let\rmfamily\ttfamily
-\nameoffile{\tkznameofpack}
-\defoffile{\tkzname{\tkznameofpack} is a package based on \TIKZ\ to make graphics as simple as possible. It is the basis on which a series of packages will be built, having as a common point, the creation of drawings useful in the teaching of mathematics. The main function of Basic is to provide an orthogonal coordinate system, and to let the user choose the graphical units. This package requires version 3 or higher of \TIKZ.}
+\nameoffile{\tkznameofpack}
+\defoffile{\tkzname{\tkznameofpack} is a package based on \TIKZ\ to make graphics as simple as possible. It is the basis on which a series of packages will be built, having as a common point, the creation of drawings useful in the teaching of mathematics. The main function of \tkzname{\tkznameofpack} is to provide an orthogonal coordinate system, and to let the user choose the graphical units. This package requires version 3 or higher of \TIKZ.}
\presentation
-\vspace*{1cm}
+\vspace*{1cm}
\noindent\space I'd like to thank \textbf{Till~Tantau} for creating the wonderful tool \href{http://sourceforge.net/projects/pgf/}{\TIKZ}.
-\vspace*{12pt}
+\vspace*{12pt}
\noindent\space I thank \textbf{Yves~Combe} for sharing his work on the protractor and the compass constructions. I would also like to thank, \tkzimp{David~Arnold} who corrected a lot of errors and tested many examples, \tkzimp{Wolfgang~Büchel} who also corrected errors and built great scripts to get the example files, \tkzimp{John~Kitzmiller} and \tkzimp{Dimitri~Kapetas} for their examples, \tkzimp{Gaétan~Marris} for his remarks and corrections, and finally \tkzimp{Laurent Van Deik} for all his corrections, remarks and questions.
\vspace*{12pt}
-\noindent\space You will find many examples on my site:
+\noindent\space You will find many examples on my site:
\href{http://altermundus.fr}{altermundus.fr}.
\vfill
You can send your remarks, and reports on errors you find, to the following address: \href{mailto:al.ma at mac.com}{\textcolor{pdfurlcolor}{\tkzauthorofpack}}.
-
-This file can be redistributed and/or modified under the terms of the \LATEX\
+
+This file can be redistributed and/or modified under the terms of the \LATEX\
Project Public License Distributed from \href{http://www.ctan.org/}{CTAN}\ archives.
@@ -180,10 +158,10 @@
\clearpage
\tableofcontents
-\clearpage
+\clearpage
\newpage
-\setlength{\parskip}{1ex plus 0.5ex minus 0.2ex}
+\setlength{\parskip}{1ex plus 0.5ex minus 0.2ex}
%<------------- includes -----------------------------------------------
\include{TKZdoc-base-news}
\include{TKZdoc-base-installation}
@@ -201,7 +179,7 @@
\include{TKZdoc-base-texte}
\include{TKZdoc-base-faq}
%<------------------------------------------------------------------------
-\clearpage\newpage
+\clearpage\newpage
\makeatletter
\begin{multicols}{2}
Modified: trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-marks.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-marks.tex 2022-01-04 22:29:24 UTC (rev 61494)
+++ trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-marks.tex 2022-01-04 22:30:53 UTC (rev 61495)
@@ -159,7 +159,7 @@
\end{NewMacroBox}
\subsubsection{Mark and plot; use of \tkzcname{tkzDrawMarks}}
-\begin{tkzexample}[latex=7cm,small]
+\begin{tkzexample}[latex=8cm,small]
\begin{tikzpicture}
\tkzInit[xmax=6,ymin=1000,
ymax=5000,ystep=1000]
Modified: trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-news.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-news.tex 2022-01-04 22:29:24 UTC (rev 61494)
+++ trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-news.tex 2022-01-04 22:30:53 UTC (rev 61495)
@@ -1,18 +1,20 @@
\section{News and presentation}
-This package is the foundation of the \tkzNamePack{tkz-euclide} and \tkzNamePack{tkz-fct} in particular. It provides a Cartesian system that will be defined by the macro \tkzcname{tkzInit}. The package has been modified and object transfers between \tkzimp{tkz-base} and \tkzimp{tkz-euclide} have been performed.
-In the future, the definition macros will be isolated.
+This package was the foundation of the \tkzNamePack{tkz-euclide} and \tkzNamePack{tkz-fct} in particular. Now \tkzNamePack{tkz-euclide} is independent of \tkzname{\tkznameofpack}. \tkzimp{tkz-euclide} should be used only for Euclidean geometry. The package has been modified and object transfers between
+\tkzimp{tkz-base} and \tkzimp{tkz-euclide} have been performed.
+\tkzimp{tkz-base} provides a Cartesian system that will be defined by the macro \tkzcname{tkzInit}. The big difference now between \tkzname{tkznameofpack} and \tkzNamePack{tkz-euclide} is the role of the units. The unit in \tkzNamePack{tkz-euclide} is the cm and is fixed. Ce n'est pas le cas \tkzimp{tkz-base}
+
The main novelty is the recent replacement of the \tkzNamePack{fp} package by \tkzNamePack{xfp}. The appearance of this one is a step towards version 3 of \LATEX.
The next step will be the creation of a new package.
-Here are some of the changes. The |tkz-euclide| package brings more new features.
+Here are some of the changes. The \tkzimp{tkz-euclide} package brings more new features. \tkzimp{tkz-euclide} is used for some examples in this documentation.
+
\vspace{2cm}
\begin{itemize}\setlength{\itemsep}{10pt}
\item Code Improvement;
\item Bug correction;
\item The bounding box is now controlled in each macro (hopefully) to avoid the use of \tkzcname{tkzInit} followed by \tkzcname{tkzClip};
-\item Addition of macros for the "bounding box": \tkzcname{tkzSaveBB} \tkzcname{tkzClipBB};
\item Logically most macros accept \TIKZ\ options. So I removed the "duplicate" options;
\item Removing the option "label options";
\item Random points are now in \tkzimp{tkz-euclide} and the macro \tkzcname{tkzGetRandPointOn} is replaced by \tkzcname{tkzDefRandPointOn}. For homogeneity reasons, the points must be retrieved with \tkzcname{tkzGetPoint};
Modified: trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-point.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-point.tex 2022-01-04 22:29:24 UTC (rev 61494)
+++ trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-point.tex 2022-01-04 22:30:53 UTC (rev 61495)
@@ -230,7 +230,7 @@
\end{tkzexample}
%<--------------------------------------------------------------------------->
-\subsection{Drawing a point \tkzcname{tkzDrawPoint}} \hypertarget{tdrp}{}
+\subsection{Drawing a point \tkzcname{tkzDrawPoint}}
\begin{NewMacroBox}{tkzDrawPoint}{\oarg{local options}\parg{point}}%
\begin{tabular}{lll}%
arguments & default & definition \\
@@ -344,7 +344,7 @@
\tkzDefPoint(30:5){C}
\end{scope}
\tkzCalcLength[cm](A,B)\tkzGetLength{rAB}
- \tkzDrawCircle[R](A,\rAB cm)
+ \tkzDrawCircle[R](A,\rAB)
\tkzDrawSegment(A,B)
\tkzDrawPoints(A,B,C)
\tkzLabelPoints(B,C)
@@ -451,7 +451,7 @@
\begin{tkzexample}[latex=5cm,small]
\begin{tikzpicture}[scale=1.25]
\tkzDefPoint(2,1){O}
- \tkzDefRandPointOn[circle=center O radius 1.5cm]
+ \tkzDefRandPointOn[circle=center O radius 1.5]
\tkzGetPoint{A}
\tkzDrawCircle(O,A)
\tkzDefPointBy[rotation=center O angle 100](A)
@@ -472,7 +472,7 @@
\begin{tkzexample}[latex=5cm,small]
\begin{tikzpicture}[scale=1.25]
\tkzDefPoint(2,1){O}
- \tkzDefRandPointOn[circle=center O radius 1.5cm]
+ \tkzDefRandPointOn[circle=center O radius 1.5]
\tkzGetPoint{A}
\tkzDrawCircle(O,A)
\tkzDefPointBy[rotation=center O angle 100](A)
Deleted: trunk/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base.pdf
===================================================================
(Binary files differ)
Added: trunk/Master/texmf-dist/doc/latex/tkz-base/tkz-base.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/latex/tkz-base/tkz-base.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/latex/tkz-base/tkz-base.pdf 2022-01-04 22:29:24 UTC (rev 61494)
+++ trunk/Master/texmf-dist/doc/latex/tkz-base/tkz-base.pdf 2022-01-04 22:30:53 UTC (rev 61495)
Property changes on: trunk/Master/texmf-dist/doc/latex/tkz-base/tkz-base.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-base.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-base.cfg 2022-01-04 22:29:24 UTC (rev 61494)
+++ trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-base.cfg 2022-01-04 22:30:53 UTC (rev 61495)
@@ -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,11 +16,11 @@
% 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 at backgroundcolor{white}
\def\tkz at textcolor{black}
%<---------------------------------------------------------
@@ -46,7 +46,7 @@
\def\tkz at euc@pointshape{circle}
\def\tkz at euc@pointcolor{\tkz at mainlinecolor}
\def\tkz at euc@labelcolor{\tkz at mainlinecolor}
-\def\tkz at euc@pointsize{3 pt}
+\def\tkz at euc@pointsize{3}
\def\tkz at euc@pointpos{below right}
\def\tkz at euc@segmentcolor{\tkz at mainlinecolor}
\def\tkz at euc@circlecolor{\tkz at mainlinecolor}
@@ -90,7 +90,11 @@
%<------------------------- compass -----------------------------------–>
\def\tkz at euc@compasscolor{\tkz at otherlinecolor}
\def\tkz at euc@compasswidth{0.4pt}
-\def\tkz at euc@compassstyle{solid}
+\def\tkz at euc@compassstyle{solid}
+%<------------------------- arc -----------------------------------–>
+\def\tkz at arc@lw{0.4pt}
+\def\tkz at arc@color{\tkz at mainlinecolor}
+\def\tkz at arc@style{solid}
%<---------------------------- mark -----------------------------------–>
\def\tkz at mk@color{\tkz at mainlinecolor}
\def\tkz at mk@mark{*}
@@ -98,6 +102,8 @@
\def\tkz at mk@fill{\tkz at 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 at euc@labelcolor,
font = \normalsize}
}
-
+\tikzset{label angle style/.style={ \tkz at euc@labelcolor,
+ font = \normalsize}
+ }
\tikzset{line style/.style = {line width = \tkz at euc@linewidth,
color = \tkz at euc@linecolor,
style = \tkz at euc@linestyle,
- add = {\tkz at euc@lineleft} and {\tkz at euc@lineright}%
+ add = {\tkz at euc@lineleft} and {\tkz at euc@lineright}%
}
}
\tikzset{label seg style/.style = {color = \tkz at mainlinecolor,
@@ -148,6 +156,7 @@
}
}
}
+\tikzset{arc style/.style={gray,thin}}
%<---------------------- show coord -----------------------------------–>
\tikzset{arrow coord style/.style = {dashed,
\tkz at 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 at xa,\tkz at ya) rectangle (\tkz at xb,\tkz at 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
Modified: trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-base.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-base.sty 2022-01-04 22:29:24 UTC (rev 61494)
+++ trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-base.sty 2022-01-04 22:30:53 UTC (rev 61495)
@@ -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 at 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,
+ quotes,
+ shapes.misc,
positioning,
- quotes,
shadows,
- shapes.misc,
+ 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 at radi
+
%--------------------- tkz registres
\newdimen\tkz at ax
\newdimen\tkz at ay
@@ -79,7 +52,7 @@
\newdimen\tkz at cy
\newdimen\tkz at dx
\newdimen\tkz at dy
-% 2017
+% 2017 ???? inutile !
\newdimen\tkz at tax
\newdimen\tkz at tay
\newdimen\tkz at tbx
@@ -96,8 +69,6 @@
\newif\iftkz at coord@noxdraw
\newif\iftkz at coord@noydraw
\newif\iftkz at vec@normed
-%--------------------- lines
-\newif\iftkz at line@normed
%--------------------- tkz axis
\newif\iftkz at X@noticks
\newif\iftkz at Y@noticks
@@ -118,8 +89,6 @@
\newif\iftkz at node\tkz at nodefalse
\newif\iftkz at legend@line%--------------------- legend
\newif\iftkz at TestSubString
-\newif\ifnormtkzcode at execute% german ? right angle
-\newif\iftkz at sawp@sc%---------------------- semi circle
\newif\ifpgf at unknown % math arith
\newif\ifpgf at isaprime
\newcount\tkz at 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
Modified: trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-lib-marks.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-lib-marks.tex 2022-01-04 22:29:24 UTC (rev 61494)
+++ trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-lib-marks.tex 2022-01-04 22:30:53 UTC (rev 61495)
@@ -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
Added: trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-lib-shape.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-lib-shape.tex (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-lib-shape.tex 2022-01-04 22:30:53 UTC (rev 61495)
@@ -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 at xa=\pgf at x \pgf at ya=\pgf at y
+ \northeast \pgf at xb=\pgf at x \pgf at yb=\pgf at y
+ \pgfpathmoveto{\pgfqpoint{0 pt}{\pgf at ya}}
+ \pgfpathlineto{\pgfqpoint{0 pt}{\pgf at yb}}
+ \pgfpathmoveto{\pgfqpoint{\pgf at xa}{0 pt}}
+ \pgfpathlineto{\pgfqpoint{\pgf at xb}{0 pt}}
+ }
+}
+\makeatother
+\endinput
\ No newline at end of file
Property changes on: trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-lib-shape.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-axes.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-axes.tex 2022-01-04 22:29:24 UTC (rev 61494)
+++ trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-axes.tex 2022-01-04 22:30:53 UTC (rev 61495)
@@ -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 at getinteger#1.\@nil}
\def\tkz at 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 @@
down space = \tkz at init@downspace,
noticks/.is if = tkz at Y@noticks,
noticks/.default = true,
- noticks = false,
+ noticks = true,
tickwd/.store in = \tkz at Y@tickwd,
ticklt/.store in = \tkz at Y@ticklt,
tickrt/.store in = \tkz at Y@tickrt,
@@ -448,8 +446,8 @@
\pgfkeys{/tkzAxeXY/.cd,
swap/.is if = tkz at 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}}
}
Added: trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-axesmin.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-axesmin.tex (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-axesmin.tex 2022-01-04 22:30:53 UTC (rev 61495)
@@ -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 at getinteger#1.\@nil}
+\def\tkz at 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 at sua@lw{#1},
+ color/.code = \xdef\tkz at sua@color{#1},
+ tickwd/.code = \xdef\tkz at sua@tickwd{#1},
+ ticka/.code = \xdef\tkz at sua@ticka{#1},
+ tickb/.code = \xdef\tkz at sua@tickb{#1},
+ line width = \tkz at init@lw,
+ color = \tkz at init@color,
+ tickwd = \tkz at init@tickwd,
+ ticka = \tkz at init@ticka,
+ tickb = \tkz at init@tickb
+}
+
+\def\tkzSetUpAxis{\pgfutil at ifnextchar[{\tkz at SetUpAxis}{\tkz at SetUpAxis[]}}
+\def\tkz at SetUpAxis[#1]{%
+\begingroup
+\pgfqkeys{/tkzaxis}{#1}
+\global\let\tkz at init@lw\tkz at sua@lw
+\global\let\tkz at init@gradsize\tkz at sua@gradsize
+\global\let\tkz at init@color\tkz at sua@color
+\global\let\tkz at init@tickwd\tkz at sua@tickwd
+\global\let\tkz at init@ticka\tkz at sua@ticka
+\global\let\tkz at init@tickb\tkz at 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 at X@color,
+ label/.store in = \tkz at X@label,
+ right space/.store in = \tkz at axe@rxspace,
+ left space/.store in = \tkz at axe@lxspace,
+ step/.code = {\edef\tkz at posnext{\fpeval{#1}}},
+ color = \tkz at init@color,
+ label = \tkz at init@xlabel,
+ step = \tkz at init@xstep,
+ right space = \tkz at init@rightspace, %???
+ left space = \tkz at init@leftspace,
+ noticks/.is if = tkz at X@noticks,
+ noticks/.default = true,
+ noticks = true,
+ tickwd/.store in = \tkz at X@tickwd,
+ tickup/.store in = \tkz at X@tickup,
+ tickdn/.store in = \tkz at X@tickdn,
+ tickwd = \tkz at init@tickwd,
+ tickup = \tkz at init@ticka,
+ tickdn = \tkz at init@tickb,
+ /tkzdrawX/.search also={/tikz},
+ }
+
+\def\tkzDrawX{\pgfutil at ifnextchar[{\tkz at DrawX}{\tkz at DrawX[]}}
+\def\tkz at DrawX[#1]{
+\begingroup%
+\pgfqkeys{/tkzdrawX}{#1}
+\edef\tkz at posmax{\fpeval{trunc(\tkz at xb,\tkz at init@xdec)}}
+\edef\tkz at posmin{\fpeval{trunc(\tkz at xa,\tkz at init@xdec)}}
+\edef\tkz at xbsup{\fpeval{\tkz at xb+\tkz at axe@rxspace}}
+\edef\tkz at xainf{\fpeval{\tkz at xa-\tkz at axe@lxspace}}
+\path (\tkz at xainf,0)--(\tkz at xbsup,0) node(tkz at xline){};
+\draw[xaxe style,
+ color = \tkz at X@color,
+ /tkzdrawX/.cd, #1] (\tkz at xainf,0)--(\tkz at xbsup,0)
+ node[ xlabel style,
+ /tkzdrawX/.cd,
+ #1]{\tkz at X@label};
+ \iftkz at X@noticks
+ \else
+ \edef\tkz at posmax{\fpeval{trunc(\tkz at posmax,\tkz at init@xdec)}}
+ \edef\tkz at posnext{\fpeval{\tkz at posnext/\tkz at init@xstep+\tkz at posmin}}
+ \foreach \pos in {\tkz at posmin,...,\tkz at posmax}{%
+ \edef\tkz at pos{\fpeval{\pos*1}}% ???
+ \draw[ color = \tkz at X@color, line width = \tkz at X@tickwd,
+ shift = {(\tkz at pos,0)}]%
+ (0pt,\tkz at X@tickup)--(0pt,-\tkz at X@tickdn);
+ }
+ \fi
+\endgroup
+}
+%<--------------------------------------------------------------------------–>
+% tkzDrawY todo améliorer les unités
+%<--------------------------------------------------------------------------–>
+\pgfkeys{%
+ /tkzdrawY/.cd,
+ color/.store in = \tkz at Y@color,
+ label/.store in = \tkz at Y@label,
+ up space/.store in = \tkz at axe@uyspace,
+ down space/.store in = \tkz at axe@dyspace,
+ step/.code = {\edef\tkz at posnext{\fpeval{#1}}},
+ color = \tkz at init@color,
+ label = \tkz at init@ylabel,
+ step = \tkz at init@ystep,
+ up space = \tkz at init@upspace,
+ down space = \tkz at init@downspace,
+ noticks/.is if = tkz at Y@noticks,
+ noticks/.default = true,
+ noticks = true,
+ tickwd/.store in = \tkz at Y@tickwd,
+ ticklt/.store in = \tkz at Y@ticklt,
+ tickrt/.store in = \tkz at Y@tickrt,
+ tickwd = \tkz at init@tickwd,
+ ticklt = \tkz at init@tickb,
+ tickrt = \tkz at init@ticka,
+ /tkzdrawY/.search also={/tikz},
+ }
+
+\def\tkzDrawY{\pgfutil at ifnextchar[{\tkz at DrawY}{\tkz at DrawY[]}}
+\def\tkz at DrawY[#1]{%
+\begingroup
+\pgfkeys{/tkzdrawY/.cd,step = \tkz at init@ystep}
+\pgfqkeys{/tkzdrawY}{#1}
+\edef\tkz at posmax{\fpeval{trunc(\tkz at yb,\tkz at init@ydec)}}
+\edef\tkz at posmin{\fpeval{trunc(\tkz at ya,\tkz at init@ydec)}}
+\edef\tkz at ybsup{\fpeval{\tkz at yb+\tkz at axe@uyspace}}
+\edef\tkz at yainf{\fpeval{\tkz at ya-\tkz at axe@dyspace}}
+\path (0,\tkz at yainf)--(0,\tkz at ybsup) node(tkz at yline){};
+\draw[color = \tkz at Y@color,
+ yaxe style,/tkzdrawY/.cd,#1] (0,\tkz at yainf)--(0,\tkz at ybsup)
+ node[ylabel style,/tkzdrawY/.cd,#1]{\tkz at Y@label};
+ \iftkz at Y@noticks
+ \else
+ \edef\tkz at posmax{\fpeval{trunc(\tkz at posmax,\tkz at init@ydec)}}
+ \edef\tkz at posnext{\fpeval{\tkz at posnext/\tkz at init@ystep+\tkz at posmin}}
+ \foreach \tkz at pos in {\tkz at posmin,\tkz at posnext,...,\tkz at posmax}{%
+ \draw[color = \tkz at Y@color,
+ line width = \tkz at Y@tickwd,
+ shift = {(0,\tkz at pos)}]%
+ (\tkz at Y@tickrt,0pt)--(-\tkz at Y@ticklt,0pt);}
+
+ \fi
+\endgroup}
+\makeatother
+\endinput
\ No newline at end of file
Property changes on: trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-axesmin.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-grids.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-grids.tex 2022-01-04 22:29:24 UTC (rev 61494)
+++ trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-grids.tex 2022-01-04 22:30:53 UTC (rev 61495)
@@ -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 at sug@lw,
- color/.store in = \tkz at sug@color,
- line width = \tkz at grid@lw,
- color = \tkz at grid@color
+ line width/.store in = \tkz at sug@lw,
+ color/.store in = \tkz at sug@color,
+ line width = \tkz at grid@lw,
+ color = \tkz at grid@color
}
\def\tkzSetUpGrid{\pgfutil at ifnextchar[{\tkz at SetUpGrid}{\tkz at SetUpGrid[]}}
@@ -39,22 +36,22 @@
% tkzGrid
%<--------------------------------------------------------------------------–>
\pgfkeys{/tkzGrid/.cd,
- color/.code = {\def\tkz at gd@color{#1}%
- \edef\tkz at gd@subcolor{%
- \tkz at gd@color!\tkzCoeffSubColor}},
- subxstep/.store in = {\tkz at gd@subxstep},
- subystep/.store in = {\tkz at gd@subystep},
- ratio/.store in = {\tkz at gd@ratio},
- line width/.code = {\edef\tkz at gd@lw{#1}
- \edef\tkz at gd@sublw{\tkz at gd@ratio\tkz at gd@lw}},
- sub/.is if = tkz at gd@sub,
- sub/.default = true ,
- sub = false,
- color = \tkz at grid@color,
- ratio = 0.75,
- subxstep = \tkz at grid@xstep,
- subystep = \tkz at grid@ystep,
- line width = \tkz at grid@lw,
+ color/.code = {\def\tkz at gd@color{#1}%
+ \edef\tkz at gd@subcolor{%
+ \tkz at gd@color!\tkzCoeffSubColor}},
+ subxstep/.store in = {\tkz at gd@subxstep},
+ subystep/.store in = {\tkz at gd@subystep},
+ ratio/.store in = {\tkz at gd@ratio},
+ line width/.code = {\edef\tkz at gd@lw{#1}
+ \edef\tkz at gd@sublw{\tkz at gd@ratio\tkz at gd@lw}},
+ sub/.is if = tkz at gd@sub,
+ sub/.default = true ,
+ sub = false,
+ color = \tkz at grid@color,
+ ratio = 0.75,
+ subxstep = \tkz at grid@xstep,
+ subystep = \tkz at grid@ystep,
+ line width = \tkz at grid@lw,
/tkzGrid/.search also= {/tikz},
}
%<--------------------------------------------------------------------------–>
@@ -64,10 +61,10 @@
\def\tkz@@Grid[#1](#2,#3)(#4,#5){%
\pgfqkeys{/tkzGrid}{#1}
\begingroup
- \edef\tkz at gxa{\fpeval{(#2-\tkz at init@xorigine)/\tkz at init@xstep}}
- \edef\tkz at gxb{\fpeval{(#4-\tkz at init@xorigine)/\tkz at init@xstep}}
- \edef\tkz at gya{\fpeval{(#3-\tkz at init@yorigine)/\tkz at init@ystep}}
- \edef\tkz at gyb{\fpeval{(#5-\tkz at init@yorigine)/\tkz at init@ystep}}
+ \edef\tkz at gxa{\fpeval{(#2-\tkz at init@xorigine)/\tkz at init@xstep}}
+ \edef\tkz at gxb{\fpeval{(#4-\tkz at init@xorigine)/\tkz at init@xstep}}
+ \edef\tkz at gya{\fpeval{(#3-\tkz at init@yorigine)/\tkz at init@ystep}}
+ \edef\tkz at gyb{\fpeval{(#5-\tkz at init@yorigine)/\tkz at init@ystep}}
\iftkz at gd@sub%
\edef\@subxstep{\fpeval{\tkz at gd@subxstep/\tkz at init@xstep}}%
\edef\@subystep{\fpeval{\tkz at gd@subystep/\tkz at init@ystep}}%
@@ -82,6 +79,5 @@
(\tkz at gxa,\tkz at gya) grid (\tkz at gxb,\tkz at gyb);%
\endgroup
}%
- %<--------------------------------------------------------------------------–>
\makeatother
\endinput
\ No newline at end of file
Modified: trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-marks.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-marks.tex 2022-01-04 22:29:24 UTC (rev 61494)
+++ trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-marks.tex 2022-01-04 22:30:53 UTC (rev 61495)
@@ -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
Modified: trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-points.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-points.tex 2022-01-04 22:29:24 UTC (rev 61494)
+++ trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-points.tex 2022-01-04 22:30:53 UTC (rev 61495)
@@ -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}
-%<--------------------------------------------------------------------------–>
+\def\fileversion{4.00}
+\def\filedate{2022/01/04}
+\typeout{2022/01/04 4.00 tkz-obj-eu-points.tex}
+\makeatletter
+%<--------------------------------------------------------------------------->
% init def point
-%<--------------------------------------------------------------------------–>
-\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 at xa=\pgf at x \pgf at ya=\pgf at y
- \northeast \pgf at xb=\pgf at x \pgf at yb=\pgf at y
- \pgfpathmoveto{\pgfqpoint{0 pt}{\pgf at ya}}
- \pgfpathlineto{\pgfqpoint{0 pt}{\pgf at yb}}
- \pgfpathmoveto{\pgfqpoint{\pgf at xa}{0 pt}}
- \pgfpathlineto{\pgfqpoint{\pgf at xb}{0 pt}}
- }
-}
-%<--------------------------------------------------------------------------–>
+%<--------------------------------------------------------------------------->
% tkzDefPoint
-%<--------------------------------------------------------------------------–>
-
-%<--------------------------------------------------------------------------–>
+%<--------------------------------------------------------------------------->
% macros complémentaires pour def point
-%<--------------------------------------------------------------------------–>
+%<--------------------------------------------------------------------------->
\def\tkz at parsecoordinate#1{%
\tkz at getseparator#1,\@nil
\iftkz at polar
@@ -85,17 +48,17 @@
\xdef\tkz at absc{\tkz at x}
\xdef\tkz at ord{\tkz at y}
}
-%<--------------------------------------------------------------------------–>
+%<--------------------------------------------------------------------------->
% options pour point definition
-%<--------------------------------------------------------------------------–>
+%<--------------------------------------------------------------------------->
\pgfkeys{/tkzPt/.cd,
polar/.is if = tkz at pt@polar,
polar/.default = true,
polar = false
}
-%<--------------------------------------------------------------------------–>
+%<--------------------------------------------------------------------------->
% tkz at ptStar
-%<--------------------------------------------------------------------------–>
+%<--------------------------------------------------------------------------->
\def\tkz at ptStar[#1](#2,#3)#{%
\pgfkeys{/tkzPt/.cd, polar = false}
\pgfqkeys{/tkzPt}{#1}
@@ -110,10 +73,10 @@
\edef\tkzpt at ya{\fpeval{(\tkz at y-\tkz at init@yorigine)/\tkz at init@ystep}}
\tkz at 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 at ifnextchar[{\tkz at DefPoint}{\tkz at DefPoint[]}}
\def\tkz at DefPoint[#1](#2)#{%
@@ -126,9 +89,9 @@
\tkz at DefPointEnd[#1]
}%
\def\tkz at DefPointEnd[#1]#2{\coordinate[#1] (#2) at (tkz at coord@temp);}
-%<--------------------------------------------------------------------------–>
+%<--------------------------------------------------------------------------->
% tkzDefPoints
-%<--------------------------------------------------------------------------–>
+%<--------------------------------------------------------------------------->
\def\tkzDefPoints{\pgfutil at ifnextchar[{\tkz at DefPoints}{\tkz at DefPoints[]}}
\def\tkz at DefPoints[#1]#2{%
\begingroup
@@ -145,14 +108,16 @@
\endgroup}%
}
\def\tkz at absorb@bad at arg#1){\endgroup}
-%<--------------------------------------------------------------------------–>
-\def\tkz at node#1{\path[coordinate](\tkzpt at xa,\tkzpt at ya) coordinate(#1);}
+%<--------------------------------------------------------------------------->
+\def\tkz at node#1{ \pgfinterruptboundingbox
+\path[coordinate](\tkzpt at xa,\tkzpt at ya) coordinate(#1);
+ \endpgfinterruptboundingbox}
% \def\tkz at drawnode#1{\path[coordinate](\tkzpt at xa,\tkzpt at ya) coordinate(#1);
% \tkz at DrawPt{#1}
% }
-%<--------------------------------------------------------------------------–>
+%<--------------------------------------------------------------------------->
% tkzSetUpPoint définit la forme d'un point
-%<--------------------------------------------------------------------------–>
+%<--------------------------------------------------------------------------->
\pgfkeys{/tkzsetuppt/.cd,
size/.store in = \tkz at pt@size,
color/.store in = \tkz at pt@color,
@@ -173,13 +138,11 @@
inner sep = 0pt,
shape = \tkz at pt@shape,
minimum size = \tkz at pt@size,
- fill = \tkz at pt@fill
- }
- }
- }% end setup
-%<--------------------------------------------------------------------------–>
+ fill = \tkz at pt@fill}}
+}% end setup
+%<--------------------------------------------------------------------------->
% Draw Point
-%<--------------------------------------------------------------------------–>
+%<--------------------------------------------------------------------------->
\pgfkeys{/tkzdrawpt/.cd,
size/.code = {\tikzset{point style/.append style={minimum size = #1}}},
size = \tkz at euc@pointsize,
@@ -193,9 +156,9 @@
\node[point style,/tkzdrawpt/.cd,#1] at (#2) {};%2016
\endgroup
}
-%<--------------------------------------------------------------------------–>
+%<--------------------------------------------------------------------------->
\def\tkzDrawPoints{\pgfutil at ifnextchar[{\tkz at drawpts}{\tkz at drawpts[]}}
-%<--------------------------------------------------------------------------–>
+%<--------------------------------------------------------------------------->
\def\tkz at drawpts[#1](#2){%
\begingroup
\pgfqkeys{/tkzdrawpt}{#1}
@@ -202,9 +165,9 @@
\foreach \point in {#2}{\node[point style,/tkzdrawpt/.cd,#1] at (\point) {};} %2016
\endgroup
}
-%<--------------------------------------------------------------------------–>
+%<--------------------------------------------------------------------------->
%
-%<--------------------------------------------------------------------------–>
+%<--------------------------------------------------------------------------->
\def\tkzRenamePoint(#1)#2{\coordinate (#2) at (#1);}
\def\tkz at RenamePointEnd[#1]#2{\coordinate[#1] (#2) at (\tkz at ax,\tkz at 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 at ax\pgf at x %
@@ -228,15 +191,13 @@
\coordinate (#3) at (#2);
\end{scope}
}
-%<-------------------------------------------------------------------------–>
+%<-------------------------------------------------------------------------->
% tkzLabelPoint Affichage des LABELS pour un point
-%<-------------------------------------------------------------------------–>
-\tikzset{label style/.style={\tkz at euc@pointpos,\tkz at euc@labelcolor,
- font=\normalsize}}
+%<-------------------------------------------------------------------------->
\def\tkzLabelPoint{\pgfutil at ifnextchar[{\tkz at LabelPoint}{\tkz at LabelPoint[]}}
\def\tkz at LabelPoint[#1](#2)#3{%
\node[label style,#1] at (#2) {#3};}%
-%<--------------------------------------------------------------------------–>
+%<--------------------------------------------------------------------------->
\def\tkzLabelPoints{\pgfutil at ifnextchar[{\tkz at LabelPoints}{\tkz at LabelPoints[]}}%
\def\tkz at LabelPoints[#1](#2){%
@@ -243,8 +204,38 @@
\foreach \point in {#2}{
\node[label style,#1] at (\point) {$\point$};}
}%
-%<--------------------------------------------------------------------------–>
-%<--------------------------------------------------------------------------–>
+%<--------------------------------------------------------------------------->
+\pgfkeys{/tkzsetuppt/.cd,
+ size/.store in = \tkz at pt@size,
+ color/.store in = \tkz at pt@color,
+ fill/.store in = \tkz at pt@fill,
+ shape/.store in = \tkz at pt@shape,
+ size = \tkz at euc@pointsize,
+ color = \tkz at euc@pointcolor,
+ fill = \tkz at euc@pointcolor,
+ shape = \tkz at euc@pointshape,
+ /tkzsetuppt/.search also = {/tikz},
+ }
+\def\tkzSetUpPoint{\pgfutil at ifnextchar[{\tkz at SetUpPoint}{%
+ \tkz at SetUpPoint[]}}
+\def\tkz at SetUpPoint[#1]{%
+\pgfqkeys{/tkzsetuppt}{#1}
+% redefine point style with new values
+\tikzset{point style/.style={draw = \tkz at pt@color,
+ inner sep = 0pt,
+ shape = \tkz at pt@shape,
+ minimum size = \tkz at pt@size,
+ fill = \tkz at pt@fill}}
+}% end setup
+%<--------------------------------------------------------------------------->
+%
+%<--------------------------------------------------------------------------->
+\def\tkzSetUpLabel{\pgfutil at ifnextchar[{\tkz at SetUpLabel}{%
+ \tkz at SetUpLabel[]}}
+\def\tkz at SetUpLabel[#1]{%
+\tikzset{label style/.style={#1}}
+}% end setup
+%<--------------------------------------------------------------------------->
\pgfkeys{/tkzautolab/.cd,
center/.store in = \tkz at center,
@@ -260,9 +251,9 @@
\path (\tkz at center) -- ($ (\point) + \tkz at dist*($(\point)-(\tkz at center)$) $) node[/tkzautolab/.cd,#1]{$\point$};}
\endgroup
}%
-%<--------------------------------------------------------------------------–>
+%<--------------------------------------------------------------------------->
% PointShowCoord
-%<--------------------------------------------------------------------------–>
+%<--------------------------------------------------------------------------->
\pgfkeys{/tkzprcoord/.cd,
xlabel/.store in = \tkz at xlabel,
ylabel/.store in = \tkz at 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 at x}{\pgfpointanchor{#1}{center}}
Modified: trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-rep.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-rep.tex 2022-01-04 22:29:24 UTC (rev 61494)
+++ trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-rep.tex 2022-01-04 22:30:53 UTC (rev 61495)
@@ -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
Modified: trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-BB.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-BB.tex 2022-01-04 22:29:24 UTC (rev 61494)
+++ trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-BB.tex 2022-01-04 22:30:53 UTC (rev 61495)
@@ -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}
+
+\def\fileversion{4.00}
+\def\filedate{2022/01/04}
+\typeout{2022/01/04 4.00 tkz-obj-BB.tex}
\makeatletter
%<--------------------------------------------------------------------------–>
-\pgfkeys{/tkzClip/.cd,
-space/.store in = {\tkz at CLI@space},
-space = {}}
-
-\def\tkzClip{\pgfutil at ifnextchar[{\tkz at Clip}{\tkz at Clip[]}}
-\def\tkz at Clip[#1]{%
-
-\pgfqkeys{/tkzClip}{#1}
-\ifx\tkzutil at empty\tkz at CLI@space
- \clip (\tkz at xa,\tkz at ya) rectangle (\tkz at xb,\tkz at yb);
- \else
- \edef\tkz at xxa{\fpeval{\tkz at xa-\tkz at CLI@space}}
- \edef\tkz at yya{\fpeval{\tkz at ya-\tkz at CLI@space}}
- \edef\tkz at xxb{\fpeval{\tkz at xb+\tkz at CLI@space}} % correction bug 2020
- \edef\tkz at yyb{\fpeval{\tkz at yb+\tkz at CLI@space}}
- \clip (\tkz at xxa,\tkz at yya) rectangle (\tkz at xxb,\tkz at yyb);
-\fi
-}
-%<--------------------------------------------------------------------------–>
-\def\tkzSetBB(#1)(#2){%
- \pgfresetboundingbox
- \path coordinate (tkz at SW) at (#1)
- coordinate (tkz at NE) at (#2);
- \path[use as bounding box](#1) rectangle (#2);
- }
-%<--------------------------------------------------------------------------–>
-\def\tkzSaveBB{%
-\path coordinate (tkz at SW) at (current bounding box.north east)
- coordinate (tkz at NE) at (current bounding box.south west);
-}
-%<--------------------------------------------------------------------------–>
-\def\tkzRestoreBB{%
- \pgfresetboundingbox
- \path[use as bounding box] (tkz at SW) rectangle (tkz at NE) ;
-}
-%<--------------------------------------------------------------------------–>
\def\tkzShowBB{\pgfutil at ifnextchar[{\tkz at ShowBB}{\tkz at ShowBB[]}}
\def\tkz at 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 at xa,\tkz at ya) rectangle (\tkz at xb,\tkz at yb)}}}
-%todo add options
-%<--------------------------------------------------------------------------–>
\makeatother
\endinput
\ No newline at end of file
Modified: trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-arith.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-arith.tex 2022-01-04 22:29:24 UTC (rev 61494)
+++ trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-arith.tex 2022-01-04 22:30:53 UTC (rev 61495)
@@ -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 at ifundefined{pgfmath at function@isprime}{%
\pgfmathdeclarefunction{isprime}{1}{%
- \begingroup%
+ \begingroup%
\pgf at unknowntrue
\c at pgfmath@counta#1\relax%
\ifcase#1\relax
Modified: trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-base.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-base.tex 2022-01-04 22:29:24 UTC (rev 61494)
+++ trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-base.tex 2022-01-04 22:30:53 UTC (rev 61495)
@@ -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 at tmp@xa\tkz at init@xmin% modif 2016
@@ -30,23 +28,23 @@
ymin/.store in = \tkz at init@ymin,
ymax/.store in = \tkz at init@ymax,
ystep/.store in = \tkz at init@ystep,
- NO/.is if = tkz at init@NO,
- NO/.default = true,
- xmin = 0,
- xmax = 10,
- xstep = 1,
- ymin = 0,
- ymax = 10,
- ystep = 1,
- NO = false
+ NO/.is if = tkz at init@NO,
+ NO/.default = true,
+ xmin = 0,
+ xmax = 10,
+ xstep = 1,
+ ymin = 0,
+ ymax = 10,
+ ystep = 1,
+ NO = false
}
\def\tkzInit{\pgfutil at ifnextchar[{\tkz at Init}{\tkz at Init[]}}
\def\tkz at Init[#1]{%
- \pgfqkeys{/tkzInit}{#1}
+ \pgfqkeys{/tkzInit}{#1}
\ifx\tkzfctloaded\undefined
\else
- \tkz at tkzf@fct=0 % only if tkz-fct loaded
+ \tkz at tkzf@fct=0 % only if tkz-fct loaded
\fi
\xdef\tkz at init@xorigine{0}
\xdef\tkz at init@yorigine{0}
@@ -54,23 +52,23 @@
\edef\@xsgmax{\fpeval{sign(\tkz at init@xmax)}}
\edef\@ysgmin{\fpeval{sign(\tkz at init@ymin)}}
\edef\@ysgmax{\fpeval{sign(\tkz at init@ymax)}}
- \let\tkz at tmp@xa\tkz at init@xmin %modif 2016
- \let\tkz at tmp@xb\tkz at init@xmax %modif 2016
- \let\tkz at tmp@ya\tkz at init@ymin %modif 2016
- \let\tkz at tmp@yb\tkz at init@ymax %modif 2016
- \tkz at init@NOfalse
+ \let\tkz at tmp@xa\tkz at init@xmin %modif 2016
+ \let\tkz at tmp@xb\tkz at init@xmax %modif 2016
+ \let\tkz at tmp@ya\tkz at init@ymin %modif 2016
+ \let\tkz at tmp@yb\tkz at init@ymax %modif 2016
+ \tkz at init@NOfalse
\ifx\@xsgmin\@xsgmax \tkz at init@NOtrue \fi
\ifx\@ysgmin\@ysgmax \tkz at init@NOtrue \fi
\iftkz at init@NO%
\ifx\@xsgmin\@xsgmax
\edef\tkz at init@xmax{\fpeval{\tkz at init@xmax-\tkz at init@xmin}}
- \edef\tkz at init@xorigine{\tkz at init@xmin}
- \edef\tkz at init@xmin{0}
+ \edef\tkz at init@xorigine{\tkz at init@xmin}
+ \edef\tkz at init@xmin{0}
\fi
\ifx\@ysgmin\@ysgmax
\edef\tkz at init@ymax{\fpeval{\tkz at init@ymax-\tkz at init@ymin}}
- \edef\tkz at init@yorigine{\tkz at init@ymin}
- \edef\tkz at init@ymin{0}
+ \edef\tkz at init@yorigine{\tkz at init@ymin}
+ \edef\tkz at init@ymin{0}
\fi
\fi
\edef\tkz at xa{\fpeval{\tkz at init@xmin/\tkz at init@xstep}}
Added: trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-colors.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-colors.tex (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-colors.tex 2022-01-04 22:30:53 UTC (rev 61495)
@@ -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 at background,
+ text/.estore in = \setupcolor at text,
+ @initial/.style = {background=white,text=black},
+ @apply/.code = {\pagecolor{\setupcolor at background}%
+ \color{\setupcolor at text}%
+ },
+}
+\def\tkzSetUpColors{\pgfutil at ifnextchar[{\tkz at SetUpColors}{\tkz at SetUpColors[]}}
+\def\tkz at SetUpColors[#1]{\setupcolorkeys{@initial,#1, at apply}}
+
+%<------ Initialisation of all colors ----------------->
+\pgfkeys{/tkzsupallcol/.cd,
+ background/.store in = \tkz at suac@bkc,
+ text/.store in = \tkz at suac@txt,
+ background = \tkz at backgroundcolor,% see tkz-base.cfg
+ text = \tkz at textcolor% idem
+ }
+\def\tkzSetUpAllColors{\pgfutil at ifnextchar[{\tkz at SetUpAllColors}{%
+ \tkz at SetUpAllColors[]}}
+\def\tkz at SetUpAllColors[#1]{%
+ \pgfqkeys{/tkzsupallcol}{#1} % now we redine the based colors
+ \def\tkz at fillcolor{\tkz at suac@bkc}
+ \def\tkz at mainlinecolor{\tkz at suac@txt}
+ \def\tkz at textcolor{\tkz at suac@txt}
+ \def\tkz at otherlinecolor{\tkz at suac@txt!50}
+ \def\tkz at sua@color{\tkz at suac@txt}
+ \tkzSetUpAxis[color=\tkz at suac@txt]
+ \tkzSetUpGrid[color=\tkz at suac@txt]
+ \pagecolor{\tkz at suac@bkc}
+ \color{\tkz at suac@txt}
+}
+\makeatother
+\endinput
\ No newline at end of file
Property changes on: trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-colors.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-misc.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-misc.tex 2022-01-04 22:29:24 UTC (rev 61494)
+++ trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-misc.tex 2022-01-04 22:30:53 UTC (rev 61495)
@@ -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
Modified: trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-modules.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-modules.tex 2022-01-04 22:29:24 UTC (rev 61494)
+++ trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-modules.tex 2022-01-04 22:30:53 UTC (rev 61495)
@@ -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 at obj@all{angles,arcs,compass,defcircles,deflines,defpoints,defpointsby,defpointsrnd,defpointswith,polygons,protractor,sectors,show,triangles}%
Modified: trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-print.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-print.tex 2022-01-04 22:29:24 UTC (rev 61494)
+++ trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-print.tex 2022-01-04 22:30:53 UTC (rev 61495)
@@ -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{%
Modified: trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-text.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-text.tex 2022-01-04 22:29:24 UTC (rev 61494)
+++ trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-text.tex 2022-01-04 22:30:53 UTC (rev 61495)
@@ -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
Modified: trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-utilities.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-utilities.tex 2022-01-04 22:29:24 UTC (rev 61494)
+++ trunk/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-utilities.tex 2022-01-04 22:30:53 UTC (rev 61495)
@@ -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,15 +7,32 @@
% 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 at CLI@space},
+space = {}}
+
+\def\tkzClip{\pgfutil at ifnextchar[{\tkz at Clip}{\tkz at Clip[]}}
+\def\tkz at Clip[#1]{%
+
+\pgfqkeys{/tkzClip}{#1}
+\ifx\tkzutil at empty\tkz at CLI@space
+ \clip (\tkz at xa,\tkz at ya) rectangle (\tkz at xb,\tkz at yb);
+ \else
+ \edef\tkz at xxa{\fpeval{\tkz at xa-\tkz at CLI@space}}
+ \edef\tkz at yya{\fpeval{\tkz at ya-\tkz at CLI@space}}
+ \edef\tkz at xxb{\fpeval{\tkz at xb+\tkz at CLI@space}} % correction bug 2020
+ \edef\tkz at yyb{\fpeval{\tkz at yb+\tkz at CLI@space}}
+ \clip (\tkz at xxa,\tkz at yya) rectangle (\tkz at xxb,\tkz at yyb);
+\fi
+}
+
% for testing results
\def\extractxy#1{%
\pgfextractx{\pgf at x}{\pgfpointanchor{#1}{center}}
@@ -22,7 +39,6 @@
\pgfextracty{\pgf at y}{\pgfpointanchor{#1}{center}}
\typeout{#1 \the\pgf at x,\the\pgf at y}
}
-
%<-------------- some tools ------------------------------------------------->
\def\tkzutil at empty{}
\def\tkzutil at 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 at background,
- text/.estore in = \setupcolor at text,
- @initial/.style = {background=white,text=black},
- @apply/.code = {\pagecolor{\setupcolor at background}%
- \color{\setupcolor at text}%
- },
-}
-\def\tkzSetUpColors{\pgfutil at ifnextchar[{\tkz at SetUpColors}{\tkz at SetUpColors[]}}
-\def\tkz at SetUpColors[#1]{\setupcolorkeys{@initial,#1, at apply}}
-
-%<------ Initialisation of all colors ----------------->
-\pgfkeys{/tkzsupallcol/.cd,
- background/.store in = \tkz at suac@bkc,
- text/.store in = \tkz at suac@txt,
- background = \tkz at backgroundcolor,% see tkz-base.cfg
- text = \tkz at textcolor% idem
- }
-\def\tkzSetUpAllColors{\pgfutil at ifnextchar[{\tkz at SetUpAllColors}{%
- \tkz at SetUpAllColors[]}}
-\def\tkz at SetUpAllColors[#1]{%
- \pgfqkeys{/tkzsupallcol}{#1} % now we redine the based colors
- \def\tkz at fillcolor{\tkz at suac@bkc}
- \def\tkz at mainlinecolor{\tkz at suac@txt}
- \def\tkz at textcolor{\tkz at suac@txt}
- \def\tkz at otherlinecolor{\tkz at suac@txt!50}
- \def\tkz at sua@color{\tkz at suac@txt}
- \tkzSetUpAxis[color=\tkz at suac@txt]
- \tkzSetUpGrid[color=\tkz at suac@txt]
- \pagecolor{\tkz at suac@bkc}
- \color{\tkz at suac@txt}
-}
%<--------------------------------------------------------------------------–>
% Pour savoir le nombre de décimales d'un nombre
% le nombre dans #1 et le résultat dans \c at pgfmath@countb
@@ -125,6 +103,9 @@
\expandafter\C at untToken
\fi
}
+%<---------------------------------------------------------–>
+\def\tkz at recuplast(#1,#2){\def\tkz at last{#1}}
+\def\tkz at stop{\tkz at stop}
% end code from JCC
%<---------------------------------------------------------–>
% Tools
More information about the tex-live-commits
mailing list.