diff options
| author | Karl Berry <karl@freefriends.org> | 2020-04-11 22:42:09 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2020-04-11 22:42:09 +0000 |
| commit | 225c9a6864c8945d937da8f9c458f6bc5eacb6bb (patch) | |
| tree | 8c43f43e3b35f2e434b658bb138fc819e822e1e5 | |
| parent | b5027823bc9f2e1d2bdc165ac21a2eb735db0bad (diff) | |
tkz-base (6apr20)
git-svn-id: svn://tug.org/texlive/trunk@54668 c570f23f-e606-0410-a88d-b1316a301751
38 files changed, 309 insertions, 702 deletions
diff --git a/Master/texmf-dist/doc/latex/tkz-base/README b/Master/texmf-dist/doc/latex/tkz-base/README deleted file mode 100644 index abed7856069..00000000000 --- a/Master/texmf-dist/doc/latex/tkz-base/README +++ /dev/null @@ -1,83 +0,0 @@ -% encodage utf8 - -readme-tkz-base.txt V3.05 c 2020/03/08 - -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. - -Licence -------- - -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 --------- - - -- needs xfp.sty, numprint; - -- requires and automatically loads PGF/TikZ > 3.0; - -- compiles with utf8, pdflatex, lualatex; - -Installation ------------- - -You can experiment with the tkz-base package by placing all of the -distribution files in the directory containing your current tex file. - -You can also placing all of the distribution files in the directory : -/texmf/tex/latex/tkz. - -How to use it -------------- - -To use the package tkz-base, place the following lines in the preamble of - your LaTeX document. - -\usepackage{tkz-base} - -\usepackage{tkz-base} loads TikZ. -\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. - - -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. - -Other examples can be found on my site http://altermundus.fr (en français) - -Compatibility -------------- - -The new package tkz-base 3.02c is *not* fully compatible with the version 1.16 but the differences are minor - -History -------- --- 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 - - Alain Matthes - 5 rue de Valence - Paris 75005 - - al (dot) ma (at) mac (dot) com
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/tkz-base/README.md b/Master/texmf-dist/doc/latex/tkz-base/README.md new file mode 100644 index 00000000000..1357d483ce2 --- /dev/null +++ b/Master/texmf-dist/doc/latex/tkz-base/README.md @@ -0,0 +1,91 @@ +# tkz-base + +Release 3.06c 2020/04/06 + +## Description + +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. + +## 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. + +## Features + +- needs xfp.sty, numprint; +- requires and automatically loads PGF/TikZ > 3.0; +- compiles with utf8, pdflatex, lualatex; + +## Installation + +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 +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/*.* +``` + +## How to use it + + +To use the package `tkz-base`, place the following lines in the preamble of +your LaTeX document. + +``` +\usepackage{tkz-base} +``` + +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. + + +## 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. + +Other examples, en français, can be found on my site [http://altermundus.fr](http://altermundus.fr). + +## Compatibility + +The new version of `tkz-base` is *not* fully compatible with the version 1.16 but +the differences are minor + +## History + +- 3.06c correction of the documentation ( thanks to Laurent Van Deik) +- 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 + +## Author + +Alain Matthes, 5 rue de Valence, Paris 75005, al (dot) ma (at) mac (dot) com + diff --git a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-BB.tex b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-BB.tex index 6af88de5986..15a00e38c8d 100644 --- a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-BB.tex +++ b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-BB.tex @@ -59,7 +59,7 @@ The idea is to limit future constructions to the current bounding box. % tkzSetBB %<---------------------------------------------------------------------------> \subsection{tkzSetBB} -\begin{NewMacroBox}{tkzSetBB}{\parg{$x_A~;~y_A$} \parg{$x_B~;~y_B$} ou bien {\parg{$A$} \parg{$B$}}}% +\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} @@ -132,7 +132,7 @@ End %<---------------------------------------------------------------------------> \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)$. +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} @@ -145,7 +145,7 @@ options & default & definition \\ \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. +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}{} @@ -172,7 +172,7 @@ The role of the \tkzname{space} option is to enlarge the visible part of the dra %<---------------------------------------------------------------------------> It is possible to add a bit of space \tkzcname{tkzClip[space]}. -\subsubsection{\tkzcname{tkzClip} et l'option \tkzname{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] @@ -221,7 +221,7 @@ The next example uses \subsection{Options from \TIKZ: trim left or right} See the \tkzimp{pgfmanual} -\subsection{TikZ Controls \tkzcname{pgfinterruptboundingbox} and \tkzcname{endpgfinterruptboundingbox}} +\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] diff --git a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-axes.tex b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-axes.tex index 0090b80e76f..57ff5132d79 100644 --- a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-axes.tex +++ b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-axes.tex @@ -1,6 +1,6 @@ \section{Macros for the axes} - \tkzHandBomb\ Careful, these macros have been modified. It's now easier to use the styles of \TIKZ. \tkzcname{tkzDrawX} allows to draw an axis, \tkzcname{tkzLabelX} places graduations and finally in simple cases \tkzcname{tkzAxeX} traces and graduations. The options of \TIKZ are accessible. + \tkzHandBomb\ Careful, these macros have been modified. It's now easier to use the styles of \TIKZ. \tkzcname{tkzDrawX} allows to draw an axis, \tkzcname{tkzLabelX} places graduations and finally in simple cases \tkzcname{tkzAxeX} traces and graduations. The options of \TIKZ\ are accessible. Fractions can be used for graduations. %<---------------------------------------------------------------------> % tkzDrawX @@ -17,10 +17,10 @@ options & default & definition \\ \midrule \TOline{color} {black} {Axis and ticks} \TOline{noticks} {false} {no ticks on axis} -\TOline{right space}{0,5 cm} {axis extended right} +\TOline{right space}{0.5 cm} {axis extended right} \TOline{left space} {0 cm} {extension of the axis to the left} \TOline{label} {$x$} {label name} -\TOline{trig} {0} {if <>0 pi/trig is the unit} +\TOline{trig} {0} {if <>0 graduations are multiples of $pi$/trig" "trig is an integer"} \TOline{tickwd} {0.8pt} {tick thickness} \TOline{tickup} {1pt} {tick over axis} \TOline{tickdn} {1pt} {tick depth over axis} @@ -82,8 +82,8 @@ It adds a little space after the last tick. \end{tikzpicture} \end{tkzexample} - \subsubsection{Trigonometric axis with the option \tkzname{trig=1}}\hypertarget{newm}{} -If number=0 then the axis is graduated from cm to cm, otherwise the axis is graduated using multiples of $\frac{\pi}{number}$. + \subsubsection{Trigonometric axis with the option \tkzname{trig=$n$}}\hypertarget{newm}{} +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] \begin{tikzpicture} @@ -113,8 +113,8 @@ The options are those of \TIKZ, plus the following ones: \toprule options & default & definition \\ \midrule -\TOline{frac} {0}{if <>0 graduations = num/frac "frac is an integer"} -\TOline{trig} {0}{if <>0 pi/trig "trig is an integer"} +\TOline{frac} {0}{if <>0 graduations are multiples num/frac "frac is an integer"} +\TOline{trig} {0}{if <>0 graduations are multiples $pi$/trig "trig is an integer"} \TOline{font} {\BS textstyle} {scale size.} \TOline{color} {black} {graduation color} \TOline{step} {1} {interval between graduations} @@ -219,7 +219,7 @@ Two possibilities. It is possible to define the default style used for the math \end{tkzexample} \subsubsection{Colour of the graduations} -The key here is to use the color, text, and text options correctly. \tkzname{fill} +The key here is to use the color, text, and text options correctly. \begin{tkzexample}[latex=7cm,small] \begin{tikzpicture} \tkzInit[xmin = -2,xmax = 3, @@ -289,8 +289,8 @@ This macro allows you to draw the abscissa axis with default ticks as well as th options & default & definition \\ \midrule \TOline{label} {$x$}{label name} -\TOline{trig} {0}{graduation fraction de $\pi$} -\TOline{frac} {0}{fractional, denominator graduation « frac »} +\TOline{trig} {0}{if <>0, graduations are multiples of $pi$/trig} +\TOline{frac} {0}{if <>0, graduations are multiples of 1/frac} \TOline{swap} {false}{allows you to run \tkzcname{tkzLabelX} before \tkzcname{tkzDrawX}} \bottomrule \end{tabular} @@ -345,10 +345,10 @@ options & default & definition \\ \midrule \TOline{color} {black} {color of axis and ticks} \TOline{noticks} {false} {no ticks on the axis} -\TOline{up space} {0,5 cm} {top axis extension} +\TOline{up space} {0.5 cm} {top axis extension} \TOline{down space} {0 cm}{axis extension down} \TOline{label} {$x$}{label name} -\TOline{trig} {0}{if <>0 pi/trig is the unit} +\TOline{trig} {0}{if <>0, graduations are multiples of $pi$/trig "trig is an integer" } \TOline{tickwd} {0.8pt}{tick's thickness} \TOline{ticklt} {1pt}{height of the tick above the axis} \TOline{tickrt} {1pt}{above-axis tick depth} @@ -366,13 +366,13 @@ The options are those of \TIKZ\ plus the following ones: options & default & definition \\ \midrule \TOline{color} {black} {graduation color} -\TOline{frac} {0}{if <>0 graduations are denominator fractions=frac} +\TOline{frac} {0}{if <>0, graduations are multiples of $1$/frac "frac is an integer"} \TOline{font} {\BS textstyle} {graduation size.} \TOline{step} {1} {interval between graduations} \bottomrule \end{tabular} -{\tkzname{frac} and \tkzname{trig} are integers that can be changed to fractional or trigonometric writing. } +{\tkzname{frac} is a integer that can be changed to fractional or trigonometric writing.} \end{NewMacroBox} %<---------------------------------------------------------------------> @@ -382,7 +382,7 @@ options & default & definition \\ \begin{NewMacroBox}{tkzAxeY}{\oarg{local options}}% This macro combines the two macros: \tkzcname{tkzDrawY} \tkzcname{tkzLabelY} -Voir \tkzcname{tkzAxeX} for options +See \tkzcname{tkzAxeX} for options. \end{NewMacroBox} %<---------------------------------------------------------------------> % tkzAxeXY @@ -426,7 +426,7 @@ It is necessary to use common options as in the example below, but this means th \subsection{\tkzcname{tkzDrawXY}} \hypertarget{dxy}{} \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 +It is necessary to use common options as in the example below. \end{NewMacroBox} \subsubsection{Common colour and empty labels} @@ -491,7 +491,7 @@ options & default & definition \\ \end{tikzpicture} \end{tkzexample} -You have to run \tkzcname{tkzSetUpAxis } again to retrieve the default values. +You have to run \tkzcname{tkzSetUpAxis} again to retrieve the default values. \medskip \begin{tkzltxexample}[small] diff --git a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-compilation.tex b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-compilation.tex index 66a055a3b0a..b4fa6996609 100644 --- a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-compilation.tex +++ b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-compilation.tex @@ -29,7 +29,7 @@ The code below allows you to test your installation of \tkzname{tkz-base}. Pleas \emph{Notes on this test} \begin{enumerate} -\item The compilation of this document and examples is obtained with \tkzimp{luaLatex-dev}. +\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 \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} diff --git a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-divers.tex b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-divers.tex index 578b4bd68ef..7d2922647bd 100644 --- a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-divers.tex +++ b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-divers.tex @@ -6,7 +6,7 @@ \begin{tabular}{lll}% arguments & example & definition \\ \midrule -\TAline{decimal number}{\tkzcname{tkzHLine\{1\}}}{Draw the right $y=1$} +\TAline{decimal number}{\tkzcname{tkzHLine\{1\}}}{Draw the straight line $y=1$} \bottomrule \end{tabular} @@ -20,7 +20,7 @@ options & default & definition \\ \bottomrule \end{tabular} -{see options the lines in \TIKZ} +{see the lines options in \TIKZ} \end{NewMacroBox} \subsubsection{Horizontal line } @@ -43,20 +43,20 @@ options & default & definition \\ \tkzInit[xmin=-3,xmax=3,ymin=-2,ymax=1.5] \foreach\v in {-1,1} {\tkzHLine[color=red]{\v*pi/2}} - \tkzDrawY - \tkzAxeX[trig=2] + \tkzDrawX + \tkzAxeY[trig=2] \tkzLabelY \end{tikzpicture} \end{tkzexample} \subsection{Horizontal lines with \tkzcname{tkzHLines} } \hypertarget{thls}{} -\tkzHandBomb The syntax is that of \tkzname{xfp} ! +\tkzHandBomb The syntax is that of \tkzname{xfp}! \begin{NewMacroBox}{tkzHLines}{\oarg{local options}\marg{list of values}}% \begin{tabular}{lll}% arguments & example & definition \\ \midrule -\TAline{list of values}{\tkzcname{tkzHLines\{1,4\}}}{draws the lines $x=1$ and $x=4$} +\TAline{list of values}{\tkzcname{tkzHLines\{1,4\}}}{draws the lines $y=1$ and $y=4$} \end{tabular} \end{NewMacroBox} @@ -73,7 +73,7 @@ arguments & example & definition \\ \subsection{ Draw a vertical line with \tkzcname{tkzVLine}} \hypertarget{tvl}{} -\tkzHandBomb The syntax is that of \tkzname{xfp} ! +\tkzHandBomb The syntax is that of \tkzname{xfp}! \begin{NewMacroBox}{tkzVLine}{\oarg{local options}\marg{decimal number}}% \begin{tabular}{lll}% arguments & example & definition \\ @@ -125,7 +125,7 @@ See options the lines in \TIKZ. \subsection{Vertical lines with \tkzcname{tkzVLines} } \hypertarget{tvls}{} -\tkzHandBomb The syntax is that of \tkzname{xfp} ! +\tkzHandBomb The syntax is that of \tkzname{xfp}! \begin{NewMacroBox}{tkzVLines}{\oarg{local options}\marg{list of values}}% \begin{tabular}{lll}% arguments & example & definition \\ @@ -180,7 +180,7 @@ See options for \TIKZ. \end{tikzpicture} \end{tkzexample} -\subsection{ Drawing ticks on the ordinate axis \tkzcname{tkzHTicks}} \hypertarget{thts}{} +\subsection{ Drawing ticks on the abscissa axis \tkzcname{tkzHTicks}} \hypertarget{thts}{} \begin{NewMacroBox}{tkzHTicks}{\oarg{local options}\marg{list of numbers}}% \begin{tabular}{lll} arguments & example & definition \\ @@ -192,19 +192,19 @@ arguments & example & definition \\ See options for \TIKZ. \end{NewMacroBox} -\subsection{ Drawing one tick on the abscissa axis \tkzcname{tkzVTick}} \hypertarget{tvt}{} +\subsection{ Drawing one tick on the ordinate axis \tkzcname{tkzVTick}} \hypertarget{tvt}{} \begin{NewMacroBox}{tkzVTick}{\oarg{local options}\marg{decimal number}}% \begin{tabular}{lll}% arguments & example & definition \\ \midrule -\TAline{decimal number}{\tkzcname{tkzVTick\{1\}}}{the abscissa of the tick is 1} +\TAline{decimal number}{\tkzcname{tkzVTick\{1\}}}{the ordinate of the tick is 1} \bottomrule \end{tabular} See options for \TIKZ. \end{NewMacroBox} -\subsection{ Drawing ticks on the abscissa axis \tkzcname{tkzVTicks}} \hypertarget{tvts}{} +\subsection{ Drawing ticks on the ordinate axis \tkzcname{tkzVTicks}} \hypertarget{tvts}{} \begin{NewMacroBox}{tkzVTicks}{\oarg{local options}\marg{decimal number}}% \begin{tabular}{lll} arguments & example & definition \\ diff --git a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-faq.tex b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-faq.tex index 44f60ff4f48..0674b6ec310 100644 --- a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-faq.tex +++ b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-faq.tex @@ -1,18 +1,18 @@ \section{FAQ} \subsection{General Questions} - \begin{itemize}\setlength{\itemsep}{10pt} - \item \tkzimp{Why \tkzNamePack{tkz-base} ?} As a Mathematics teacher, I needed tools that would allow me to write my lessons and exercises quickly. \TIKZ\ was perfect for that, but I was wasting too much time on details. I wanted to create a syntax that was both close to that of \LATEX and math so I could memorize better. So I created a module for each branch of mathematics I taught. \tkzNamePack{tkz-base} is the common part of all these modules. \tkzNamePack{tkz-euclide} and \tkzNamePack{tkz-berge} are the ones I invested the most in. +\begin{itemize}\setlength{\itemsep}{10pt} +\item \tkzimp{Why \tkzNamePack{tkz-base} ?} As a Mathematics teacher, I needed tools that would allow me to write my lessons and exercises quickly. \TIKZ\ was perfect for that, but I was wasting too much time on details. I wanted to create a syntax that was both close to that of \LATEX and math so I could memorize better. So I created a module for each branch of mathematics I taught. \tkzNamePack{tkz-base} is the common part of all these modules. \tkzNamePack{tkz-euclide} and \tkzNamePack{tkz-berge} are the ones I invested the most in. - \item \tkzimp{Relationship with \TIKZ?} \TIKZ\ is a great package for describing drawings. My packages are based on it. That said, it is in no way comparable. My packages are only useful for people who want to create mathematical figures. - \end{itemize} +\item \tkzimp{Relationship with \TIKZ?} \TIKZ\ is a great package for describing drawings. My packages are based on it. That said, it is in no way comparable. My packages are only useful for people who want to create mathematical figures. +\end{itemize} \subsection{Most common errors} \begin{itemize}\setlength{\itemsep}{10pt} \item \tkzimp{Error unknown option: "label options"}. This option is no longer available. You can now directly use the options in \TIKZ. - \item \tkzimp{Error avec \tkzcname{tkzDrawPoint} ou \tkzcname{tkzDefPoint} }\tkzcname{tkzDrawPoint(A,B)} when you need \tkzcname{tkzDrawPoints}. This is true with all macros that allow you to define multiple objects. The singular form allows you to use custom options. On the other hand, it is possible to use the plural form for a single object. + \item \tkzimp{Error with \tkzcname{tkzDrawPoint} or \tkzcname{tkzDefPoint} }\tkzcname{tkzDrawPoint(A,B)} when you need \tkzcname{tkzDrawPoints}. This is true with all macros that allow you to define multiple objects. The singular form allows you to use custom options. On the other hand, it is possible to use the plural form for a single object. \item \tkzimp{Propagation of a style} It is possible to restrict the propagation of a style by placing a piece of code in a group or in a \tkzimp{scope} environment or between parentheses. diff --git a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-grid.tex b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-grid.tex index 80c8af8b0b1..7440e24474b 100644 --- a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-grid.tex +++ b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-grid.tex @@ -1,7 +1,7 @@ \section{Use of \tkzcname{tkzGrid}} \hypertarget{grid}{} \begin{NewMacroBox}{tkzGrid}{\oarg{local options}\parg{$x_A~;~y_A$} \parg{$x_B~;~y_B$}}% - A few changes for this macro. First of all, to simplify currently the color of the thinnest grid is determined automatically from the main grid, same process for the thickness. This behavior can be modified using styles. +A few changes for this macro. First of all, to simplify currently the color of the thinnest grid is determined automatically from the main grid, same process for the thickness. This behavior can be modified using styles. \begin{tabular}{lll}% options & default & definition \\ @@ -21,7 +21,7 @@ options & default & definition \\ \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. Same behavior for the line thickness. 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}} @@ -37,11 +37,11 @@ It is preferable to run \tkzcname{tkzGrid} first, \end{tkzexample} \subsubsection{Option \tkzname{sub}} -The option \tkzname{sub} allows to display a finer secondary grid. Some parameters are mofiable. +The option \tkzname{sub} allows to display a finer secondary grid. Some parameters are modifiable. \begin{tkzexample}[latex=6cm,small] -\def\tkzCoeffSubColor{20} -\def\tkzCoeffSubLw{0.2} +\def\tkzCoeffSubColor{20}% instead of 50 +\def\tkzCoeffSubLw{0.2}% instead of 0.75 \begin{tikzpicture} \tkzInit[xmax=4, ymax=2] % we can change the step for the second grid diff --git a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-initialisation.tex b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-initialisation.tex index b95c3e3fc6a..69734817956 100644 --- a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-initialisation.tex +++ b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-initialisation.tex @@ -11,7 +11,7 @@ The following code gives an error \end{tkzltxexample} {\color{red} Latex Error: ... Dimension too large.} -Indeed, the default unit is a centimeter or \TEX\ cannot store a dimension greater than 575 cm, which leads to an error. \TEX\ however, can store integers up to $2^{31}-1$, so it is possible to work on integers first and then define the dimensions. +Indeed, the default unit is a centimeter but \TEX\ cannot store a dimension greater than 575 cm, which leads to an error. \TEX\ however, can store integers up to $2^{31}-1$, so it is possible to work on integers first and then define the dimensions. \begin{tkzltxexample}[right margin=7cm] \begin{tikzpicture}[x=0.01 cm] @@ -22,7 +22,7 @@ Indeed, the default unit is a centimeter or \TEX\ cannot store a dimension great {\color{red} Latex Error: ... Dimension too large.} The previous code still makes an error. Indeed, 600 cm is a dimension - and does not take into account the change of unit. Correct is: + and does not take into account the change of unit. The correct version is: \begin{tkzltxexample}[right margin=7cm] \begin{tikzpicture}[x=0.01 cm] @@ -30,7 +30,7 @@ The previous code still makes an error. Indeed, 600 cm is a dimension \end{tikzpicture} \end{tkzltxexample} -This time, the stored dimension is 6 cm which is acceptable. It is possible with \TEX\ to handle large whole numbers,but, on the other hand, the dimensions cannot exceed \numprint{16384} pt or approximately 5.75 m. +This time, the stored dimension is 6 cm which is acceptable. It is possible with \TEX\ to handle large whole numbers, but, on the other hand, the dimensions cannot exceed \numprint{16384} pt or approximately 5.75 m. With \TEX, it's also possible to work with the \tkzname{xfp} package. This allows him to work at longer intervals, but at the cost of a certain slowness. This is the method I have preferred for some sensitive calculations that require good precision, such as calculations to measure angles or segment length, but it is necessary once a number has been found to assign it to a dimension. We always find the same constraints. @@ -72,12 +72,12 @@ All this makes little sense for Euclidean geometry, and in this case it is recom I tried to generalize the following syntax: \begin{itemize} - \item The syntax is close to that of \LATEX, there's no need for "; " + \item The syntax is close to that of \LATEX, there's no need for ";" with \tkzname{tkz-base}. \item all the macros have names beginning with \tkzname{tkz}; \item braces are used to pass a parameter that will be the reference of an object created by the macro; \item parentheses are used to refer to an object that has already been created or to a coordinate pair; \item square brackets are necessary to pass optional arguments or options, some choices are sometimes mandatory. The use of the comma even in a Math mode requires to be protected in a TeX group; - \item blanks (space) are prohibited between [...] and (...), [...] and \{...\}, as well as between (...) and \{…\}, but it is possible to put spaces between past optional arguments [...]. + \item blanks (space) are prohibited between [...] and (...), [...] and \{...\}, as well as between (...) and \{…\}, but it is possible to put spaces between passed in optional arguments [...]. \end{itemize} \section{Initialization \tkzcname{tkzInit}} diff --git a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-installation.tex b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-installation.tex index 260c0de199b..9a773413ffe 100644 --- a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-installation.tex +++ b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-installation.tex @@ -1,6 +1,6 @@ \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. +\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. \subsection{Files present} %–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––> @@ -33,9 +33,9 @@ The various tools are in files beginning with \tkzname{tkz-tools}, the mathemati Moreover, \TIKZ\ is loaded with the following libraries: \begin{tkzltxexample}[] -\usetikzlibrary{angles, arrows, arrows.meta ,babel, calc, decorations, decorations.markings, +\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,shapes.misc, through} +shapes.misc, through} \end{tkzltxexample} \endinput diff --git a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-main.tex b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-main.tex index 591eda88913..5de59c95e39 100644 --- a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-main.tex +++ b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-main.tex @@ -1,6 +1,6 @@ %!TEX TS-program = lualatex -% encoding: utf8 -% documentation of tkz-base.sty +% encoding: utf8 +% documentation of tkz-base.sty % Copyright 2020 Alain Matthes % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -11,7 +11,7 @@ % 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: % TKZdoc-base-axes.tex @@ -38,23 +38,24 @@ index = totoc, footinclude = false, twoside, - headings = small]{tkz-doc} + headings = small, + cadre]{tkz-doc} \usepackage{etoc} \gdef\tkznameofpack{tkz-base} -\gdef\tkzversionofpack{3.05c} -\gdef\tkzdateofpack{2020/03/03} +\gdef\tkzversionofpack{3.06c} +\gdef\tkzdateofpack{2020/03/20} \gdef\tkznameofdoc{doc-tkz-base} -\gdef\tkzversionofdoc{3.05c} -\gdef\tkzdateofdoc{2020/03/03} +\gdef\tkzversionofdoc{3.06c} +\gdef\tkzdateofdoc{2020/03/20} \gdef\tkzauthorofpack{Alain Matthes} \gdef\tkzadressofauthor{} \gdef\tkznamecollection{AlterMundus} \gdef\tkzurlauthor{} \gdef\tkzengine{lualatex} \gdef\tkzurlauthorcom{http://altermundus.fr} -% -- Packages --------------------------------------------------- +% -- Packages --------------------------------------------------- \usepackage{calc} -\usepackage{tkz-euclide} +\usepackage{tkz-euclide} \usepackage[colorlinks]{hyperref} \hypersetup{ linkcolor=Gray, @@ -90,45 +91,50 @@ Numbers={Lowercase,Monospaced}, ] \usepackage{unicode-math} -\usepackage{fourier-otf,zorna} +\usepackage{fourier-otf} +\makeatletter +\newfontfamily\zorna{ORNA4___.TTF}%\if@tkzcadre \usepackage{zorna} \fi +\makeatother \usepackage{datetime,multicol,lscape} \usepackage[english]{babel} \usepackage[autolanguage]{numprint} -\usepackage{ulem} +\usepackage[normalem]{ulem} \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{makeidx} +\RequirePackage{imakeidx} %\@twocolumnfalse -\makeindex +\makeindex % \def\tkzref{\arabic{section}-\arabic{subsection}-\arabic{subsubsection}} % \renewenvironment{tkzexample}[1][]{% % \tkz@killienc \VerbatimOut{tkzbase-\tkzref.tex}% % }{% % \endVerbatimOut % } -%<---------------------------------------------------------------------------> +%<---------------------------------------------------------------------------> \begin{document} \parindent=0pt -\author{\tkzauthorofpack} +\author{\tkzauthorofpack} \title{\tkznameofpack} \date{\today} \clearpage \thispagestyle{empty} \maketitle \null +\makeatletter +\if@tkzcadre \AddToShipoutPicture*{% \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); @@ -136,44 +142,48 @@ \begin{center} \color{MidnightBlue} \fontsize{24}{48} - \selectfont tkz-base\\ + \selectfont tkz-euclide\\ + tool for \\ + Euclidean Geometry \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} +\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.} \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} -\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, and finally \tkzimp{Gaétan~Marris} for his remarks and corrections. +\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@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. \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} @@ -191,7 +201,7 @@ Project Public License Distributed from \href{http://www.ctan.org/}{CTAN}\ arch \include{TKZdoc-base-texte} \include{TKZdoc-base-faq} %<------------------------------------------------------------------------ -\clearpage\newpage +\clearpage\newpage \makeatletter \begin{multicols}{2} diff --git a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-marks.tex b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-marks.tex index 32ccd34e17b..b54b04c69b9 100644 --- a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-marks.tex +++ b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-marks.tex @@ -4,13 +4,13 @@ I distinguished between the points used in Euclidean geometry and the "marks or To position the symbol, we use the macro \tkzcname{tkzDefPoint} to correctly define a point, then the macro \tkzcname{tkzDrawMark} to draw the symbol. -It is common to have to draw a scatter plot , so I created a macro that allows you to define several points quickly. +It is common to have to draw a scatter plot, so I created a macro that allows you to define several points quickly. A "mark" symbol can be scaled, which is sometimes useful, but, on the other hand, if you change the abscissa and ordinates differently then the "marks" are distorted. Reminder: it was already possible to create a cloud of points with the macro \tkzcname{tkzDefPoints}, but this requires to give a reference (a name) to each point, which is sometimes tedious. The macro \tkzcname{tkzSetOfPoints} allows to define points \tkzname{tkzPt1}, \tkzname{tkzPt2}, etc. -This is frequently referred to as the "scatter plot ". The difference from the macro \tkzcname{tkzDefPoints} is that the reference to the points is given by a prefix (default tkzPt) and the point number. +This is frequently referred to as the "scatter plot". The difference from the macro \tkzcname{tkzDefPoints} is that the reference to the points is given by a prefix (default |tkzPt|) and the point number. The points are not drawn. @@ -55,8 +55,7 @@ options & default & definition \\ \subsubsection{Link the points of a scatter plot with \tkzcname{tkzJoinSetOfPoints}} \begin{tkzexample}[latex=7cm,small] \begin{tikzpicture}[scale=1] -\tkzInit[xmax=5, - ymin=1000,ymax=6000,ystep=1000] +\tkzInit[xmax=5,ymin=1000,ymax=6000,ystep=1000] \tkzDrawX[label=$m$,below=13pt] \tkzDrawY[label=$R(m)$] \tkzLabelX[font=\scriptsize] @@ -64,11 +63,9 @@ options & default & definition \\ \tkzDefSetOfPoints{% 1/2000,2/3000,4/2500,5/4200} \tkzJoinSetOfPoints[% - thick, - color=brown] + thick, color=brown] \tkzDrawSetOfPoints[% - mark=ball - ,mark size=3pt] + mark=ball, mark size=3pt] \end{tikzpicture} \end{tkzexample} @@ -96,7 +93,7 @@ options & default & definition \\ \begin{tabular}{lll}% options & default & example \\ \midrule -\TOline{liste}{no default}{\tkzcname{tkzSetUpMark[mark=heart]}} +\TOline{mark}{no default}{\tkzcname{tkzSetUpMark[mark=heart]}} \end{tabular} \end{NewMacroBox} @@ -124,12 +121,12 @@ options & default & example \\ mark options={color=blue,fill=blue!40}] \tkzText[draw,color = red, fill = orange!20](3,5800)% - {Recette en fonction du mois} + {Revenue by month} \end{tikzpicture} \end{tkzexample} \subsection{\tkzcname{tkzDrawMark}} -\begin{NewMacroBox}{tkzDrawMark}{\oarg{local options}\parg(point)}% +\begin{NewMacroBox}{tkzDrawMark}{\oarg{local options}\parg{point}}% Place a symbol. More efficient than the next to place a single symbol. \medskip @@ -150,7 +147,7 @@ options & default & definition \\ \end{tkzexample} \subsection{\tkzcname{tkzDrawMarks}} -\begin{NewMacroBox}{tkzDrawMarks}{\oarg{local options}\parg(list of points)}% +\begin{NewMacroBox}{tkzDrawMarks}{\oarg{local options}\parg{list of points}}% Allows you to place a series of marks. \medskip diff --git a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-news.tex b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-news.tex index c882351812c..361d8198bf9 100644 --- a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-news.tex +++ b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-news.tex @@ -9,18 +9,18 @@ The main novelty is the recent replacement of the \tkzNamePack{fp} package by \t Here are some of the changes. The |tkz-euclide| package brings more new features. \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}. -\item The options \tkzimp{end} and \tkzimp{start} which allowed to give a label to a line are removed. You must now use the macro \tkzcname{tkzLabelLine}. +\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}; +\item The options \tkzimp{end} and \tkzimp{start} which allowed to give a label to a line are removed. You must now use the macro \tkzcname{tkzLabelLine}; -\item Introduction of the libraries \NameLib{quotes} and \NameLib{angles} it allows to give a label to a point.even if I am not in favour of this practice. +\item Introduction of the libraries \NameLib{quotes} and \NameLib{angles} they allows to give a label to a point.even if I am not in favour of this practice; -\item Appearance of the macro \tkzcname{usetkztool} which allows to load new "tools". +\item Appearance of the macro \tkzcname{usetkztool}, which allows to load new "tools". \end{itemize} \endinput
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-obj.tex b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-obj.tex index a20b705e397..a20b705e397 100644 --- a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-obj.tex +++ b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-obj.tex diff --git a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-point.tex b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-point.tex index 03a6721bd21..b0fa58e01f1 100644 --- a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-point.tex +++ b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-point.tex @@ -6,7 +6,7 @@ The new macro is \tkzNameMacro{tkzDefPoint}, it allows to use \TIKZ-specific opt \subsection{Defining a point in Cartesian coordinates: \tkzcname{tkzDefPoint}} \hypertarget{tdp}{} -\begin{NewMacroBox}{tkzDefPoint}{\oarg{local options}\parg{x,y}\var{name} ou \parg{a:r}\var{name}}% +\begin{NewMacroBox}{tkzDefPoint}{\oarg{local options}\parg{x,y}\var{name} or \parg{a:r}\var{name}}% \begin{tabular}{lll}% arguments & default & definition \\ \midrule @@ -45,7 +45,7 @@ options & default & definition \\ \end{tkzexample} \subsection{Placing a label with the library \tkzname{quotes}} -I prefer not to mix operations and use \tkzcname{tkzLabelPoint} to place labels. See section The Syntax Quotes. +I prefer not to mix operations and use \tkzcname{tkzLabelPoint} to place labels. See the section "The Quotes Syntax" in the \TIKZ\ manual. \begin{tkzexample}[latex=7cm,small] \begin{tikzpicture}[trim left=-1cm] @@ -62,7 +62,7 @@ I prefer not to mix operations and use \tkzcname{tkzLabelPoint} to place labels. \subsubsection{Rotation with \tkzname{shift} and \tkzname{scope}} -Preferable to rotate is to use an environment \tkzNameEnv{scope}. +Preferable to rotate is to use a \tkzNameEnv{scope} environment. \begin{tkzexample}[latex=7cm,small] \begin{tikzpicture}[scale=.75,rotate=90] @@ -97,8 +97,8 @@ Here we must follow the syntax of \tkzNamePack{xfp}. It is always possible to go \end{tikzpicture} \end{tkzexample} -\subsubsection{Scope et \tkzcname{tkzDefPoint} } -First, we can use the \tkzNameEnv{scope} de \TIKZ\ +\subsubsection{Scope and \tkzcname{tkzDefPoint}} +First, we can use the \tkzNameEnv{scope} of \TIKZ. In the following example, we have a way to define an isosceles triangle. \begin{tkzexample}[latex=7cm,small] @@ -120,7 +120,7 @@ In the following example, we have a way to define an isosceles triangle. \subsection{Definition of points in Cartesian coordinates: \tkzcname{tkzDefPoints}} \hypertarget{tdps}{} \begin{NewMacroBox}{tkzDefPoints}{\oarg{local options}\var{$x_1/y_1/n_1,x_2/y_2/n_2$, ...}}% -$x_1$ et $y_1$ are the coordinates of a referenced point $n_1$ +$x_1$ and $y_1$ are the coordinates of a referenced point $n_1$ \begin{tabular}{lll}% \toprule @@ -173,7 +173,7 @@ This macro allows you to place one point relative to another. This is equivalent \end{tkzexample} \subsection{Point relative to another: \tkzcname{tkzDefShiftPointCoord}} -\begin{NewMacroBox}{tkzDefShiftPointCoord}{\oarg{a,b}\parg{x,y}\var{name} ou \parg{a:r}\var{name}}% +\begin{NewMacroBox}{tkzDefShiftPointCoord}{\oarg{a,b}\parg{x,y}\var{name} or \parg{a:r}\var{name}}% {This involves performing a $(a,b)$ vector translation at the defined point relative to the origin.} \medskip @@ -247,7 +247,7 @@ arguments & default & definition \\ \toprule options & default & definition \\ \midrule -\TOline{shape} {circle}{Possible \tkzname{cross} ou \tkzname{cross out}} +\TOline{shape} {circle}{Possible \tkzname{cross} or \tkzname{cross out}} \TOline{size} {2 pt} {disk size} \TOline{color} {black}{the default color can be changed} \bottomrule @@ -266,7 +266,7 @@ options & default & definition \\ \end{tkzexample} \subsubsection{Changing the style} -The default definition in the file \tkzname{tkz-base.cfg} +The default definition is in the file \tkzname{tkz-base.cfg} \begin{tkzltxexample}[small] \tikzset{point style/.style={draw = \tkz@euc@pointcolor, @@ -369,7 +369,7 @@ options & default & definition\\ \end{tabular} \medskip -Optionally, we can use any style of Tikz, especially placement with above, right, dots... +Optionally, we can use any style of \TIKZ, especially placement with above, right, dots... \end{NewMacroBox} \subsubsection{Example with \tkzcname{tkzLabelPoint}} @@ -407,7 +407,7 @@ It is possible to place several labels quickly when the point references are ide \begin{tabular}{lll} arguments & example & result \\ \midrule -\TAline{list of points}{\tkzcname{tkzLabelPoint(A,B,C)}}{Display of $A$, $B$ and $C$} +\TAline{list of points}{\tkzcname{tkzLabelPoints(A,B,C)}}{Display of $A$, $B$ and $C$} \bottomrule \end{tabular} @@ -429,17 +429,25 @@ This macro reduces the number of lines of code, but it is not obvious that all p % tkzAutoLabelPoints %<---------------------------------------------------------------------------> \subsection{Automatic position of labels \tkzcname{tkzAutoLabelPoints}} -The label of a point is placed in a direction defined by a center and a point \tkzname{center}. The distance to the point is determined by a percentage of the distance between the center and the point. This percentage is given by \tkzname{dist}. +The label of a point is placed in a direction defined by a \tkzname{center} and a point . The distance to the point is determined by a percentage of the distance between the center and the point. This percentage is given by \tkzname{dist}. \begin{NewMacroBox}{tkzLabelPoints}{\oarg{local options}\parg{$A_1,A_2,...$}}% \begin{tabular}{lll} arguments & example & result \\ \midrule \TAline{list of points}{\tkzcname{tkzLabelPoint(A,B,C)}}{Display of $A$, $B$ and $C$} \end{tabular} + +\medskip +\begin{tabular}{lll} +options & default & definition \\ +\midrule +\TOline{center}{no default}{you need to deisgn a center} +\TOline{dist}{0.15}{percentage change in the distance between the center and the points} +\end{tabular} \end{NewMacroBox} -\subsubsection{Example with \tkzcname{tkzAutoLabelPoints}} -Here the points are positioned relative to the center of gravity of $A,B,C \text{et} O$. +\subsubsection{Example 1 with \tkzcname{tkzAutoLabelPoints}} +Here the points are positioned relative to the center of gravity of $A,B,C \ \text{et}\ O$. \begin{tkzexample}[latex=5cm,small] \begin{tikzpicture}[scale=1.25] \tkzDefPoint(2,1){O} @@ -459,7 +467,7 @@ Here the points are positioned relative to the center of gravity of $A,B,C \text \end{tikzpicture} \end{tkzexample} -\subsubsection{Example with \tkzcname{tkzAutoLabelPoints}} +\subsubsection{Example 2 with \tkzcname{tkzAutoLabelPoints}} This time the reference is $O$ and the distance is by default $0.15$. \begin{tkzexample}[latex=5cm,small] \begin{tikzpicture}[scale=1.25] @@ -486,8 +494,8 @@ options & default & definition \\ \midrule \TOline{shape}{circle}{possible: circle, cross, cross out} \TOline{size}{current }{the size of the point is size * line width } -\TOline{color}{current}{example \tkzcname{tkzLabelPoint(A,B,C)}} -\TOline{fill}{current!50}{example \tkzcname{tkzLabelPoint(A,B,C)}} +\TOline{color}{current}{} +\TOline{fill}{current!50}{} \end{tabular} \end{NewMacroBox} @@ -505,7 +513,7 @@ This is a macro for choosing a \hypertarget{setupoint}{style} for points. \end{tikzpicture} \end{tkzexample} -\subsubsection{Example with \tkzcname{tkzSetUpPoint}} +\subsubsection{Second example with \tkzcname{tkzSetUpPoint}} \begin{tkzexample}[latex=7cm,small] \begin{tikzpicture} \tkzInit[ymin=-0.5,ymax=3,xmin=-0.5,xmax=7] @@ -558,8 +566,11 @@ argument & example & explanation \\ option & default & explication \\ \midrule \TOline{xlabel}{empty}{label abscissa} -\TOline{xstyle}{empty}{style for the abscissa label node} -\TOline{noxdraw}{false}{boolean so as not to draw an arrow to $(x'x)$} +\TOline{xstyle}{empty}{style for the abscissa label node example |text=red|} +\TOline{noxdraw}{false}{boolean for not draw an arrow to the X-axis $(x'x)$} +\TOline{ylabel}{empty}{idem} +\TOline{ystyle}{empty}{idem} +\TOline{noydraw}{false}{idem} \end{tabular} \end{NewMacroBox} @@ -585,8 +596,6 @@ Here are some of the main styles: \end{tkzltxexample} \subsubsection{Example with \tkzcname{tkzPointShowCoord}} -Without the options, you only get the arrows. - \begin{tkzexample}[latex=7cm,small] \begin{tikzpicture}[scale=1.5] @@ -603,8 +612,6 @@ Without the options, you only get the arrows. \end{tkzexample} \subsubsection{Example with \tkzcname{tkzPointShowCoord} and \tkzname{xstep}} -Without the options, you only get the arrows. - \begin{tkzexample}[latex=7cm,small] \begin{tikzpicture}[xscale=3,yscale=2] @@ -621,7 +628,7 @@ Without the options, you only get the arrows. \subsection{\tkzcname{tkzDefSetOfPoints}} % (fold) It was already possible to create a scatter plot with the macro \tkzcname{tkzDefPoints}, but this requires making a reference (a name) to each point, which is sometimes tedious. The macro \tkzcname{tkzSetOfPoints} allows to define points \tkzname{tkzPt1}, \tkzname{tkzPt2}, etc. -This is frequently referred to as \hypertarget{label_tkzDefSetOfPoints}{« scatter plot"}. The difference from the macro \tkzcname{tkzDefPoints} is that the reference to the points is given by a prefix (default tkzPt) and the point number. +This is frequently referred to as \hypertarget{label_tkzDefSetOfPoints}{ "scatter plot"}. The difference from the macro \tkzcname{tkzDefPoints} is that the reference to the points is given by a prefix (default \tkzname{tkzPt}) and the point number. The points are not drawn. \begin{NewMacroBox}{tkzDefSetOfPoints}{\oarg{local options}\var{$x_1/y_1,x_2/y_2,\ldots,x_n/y_n$}}% diff --git a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-rep.tex b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-rep.tex index 329cf82b49e..ccbf3e57586 100644 --- a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-rep.tex +++ b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-rep.tex @@ -1,5 +1,5 @@ \section{Using an orthogonal coordinate system} -\subsection{Repère avec \tkzcname{tkzRep}} +\subsection{Coordinate system with \tkzcname{tkzRep}} \hypertarget{rep}{} \begin{NewMacroBox}{tkzRep}{\oarg{local options}}% \begin{tabular}{lll}% diff --git a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-style.tex b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-style.tex index 71fa54c4aac..3a0900de0cb 100644 --- a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-style.tex +++ b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-style.tex @@ -66,12 +66,4 @@ The transformation will be valid for the entire document. Note that \tkzname{xmi \end{tikzpicture} \end{tkzexample} - -\subsection{Configuration Macros} - - \begin{itemize} - \item {\color{blue}{\textbackslash}\hyperlink{setupoint}{tkzSetUpPoint}} - \item {\color{blue}{\textbackslash}\hyperlink{axis}{tkzSetUpAxis}} -\end{itemize} - \endinput
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-texte.tex b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-texte.tex index eb53581ab96..50792842f9a 100644 --- a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-texte.tex +++ b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base-texte.tex @@ -6,7 +6,7 @@ Of course you can use \TIKZ, but the macro I propose to allow you to place the t The options are always those of \TIKZ, in particular the following ones: \begin{NewMacroBox}{tkzText}{\oarg{local options}\parg{dot}\var{text}}% The point can either be given by its coordinates or by its name. -\hypertarget{text}{} + \begin{tabular}{lll}% \toprule options & default & definition\\ @@ -29,7 +29,7 @@ options & default & definition\\ line width = 1pt,% color = red,% fill = orange!20](3,4000)% - {Recette en fonction du mois} + {Revenue by month} \end{tikzpicture} \end{tkzexample} @@ -49,7 +49,7 @@ options & default & definition\\ \end{tikzpicture} \end{tkzexample} -\subsubsection{Text with a period} +\subsubsection{Text with a point} It is possible to give the reference of a point instead of its coordinates. \begin{tkzexample}[latex=8cm] @@ -93,16 +93,16 @@ The arguments differ according to the boolean \tkzname{line}. \toprule options & default & definition\\ \midrule -\TOline{line}{false}{Boolean :line or symbol} +\TOline{line}{false}{Boolean: line or symbol} \end{tabular} -Avec |line=true| +With |line=true| \begin{tabular}{lll} \toprule arguments & default & example\\ \midrule -\TAline{style/line width/color/texte}{no default}{dashed/1pt/red/Recipe} +\TAline{style/line width/color/text}{no default}{dashed/1pt/red/Product Recipe B} \end{tabular} \medskip @@ -112,7 +112,7 @@ With |line=false| \toprule arguments & default & example\\ \midrule -\TAline{mark/mark size/color/texte}{no default}{heart/1ex/red!30/Product Recipe A} +\TAline{mark/mark size/color/text}{no default}{heart/1ex/red!30/Product Recipe A} \end{tabular} \end{NewMacroBox} diff --git a/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base.pdf b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base.pdf Binary files differindex 31180a04aaa..dfaf3b8d397 100644 --- a/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base.pdf +++ b/Master/texmf-dist/doc/latex/tkz-base/TKZdoc-base.pdf diff --git a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-example.tex b/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-example.tex deleted file mode 100644 index a9faf42a9c0..00000000000 --- a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-example.tex +++ /dev/null @@ -1,26 +0,0 @@ -\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 diff --git a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-tools.tex b/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-tools.tex deleted file mode 100644 index 3ddc5fb111c..00000000000 --- a/Master/texmf-dist/doc/latex/tkz-base/latex/TKZdoc-base-tools.tex +++ /dev/null @@ -1,374 +0,0 @@ -\section{Miscellaneous tools} - -\subsection{Duplicate a segment} - -This involves constructing a segment on a given half-line of the same length as a given segment. - -\begin{NewMacroBox}{tkzDuplicateSegment}{\parg{pt1,pt2}\parg{pt3,pt4}\marg{pt5}}% -This involves creating a segment on a given half-line of the same length as a given segment . It is in fact the definition of a point. - -\medskip -\begin{tabular}{lll}% -\toprule -arguments & example & explanation \\ -\midrule -\TAline{(pt1,pt2)(pt3,pt4)\{pt5\}} {\tkzcname{tkzDuplicateLen}(A,B)(E,F)\{C\}}{AC=EF et $C \in [AB)$} \\ -\bottomrule -\end{tabular} - -\medskip -The macro \tkzcname{tkzDuplicateLength} is identical to this one. -\end{NewMacroBox} - -\begin{tkzexample}[latex=6cm,small] - \begin{tikzpicture} - \tkzDefPoint(0,0){A} - \tkzDefPoint(2,-3){B} - \tkzDefPoint(2,5){C} - \tkzDrawSegments[red](A,B A,C) - \tkzDuplicateSegment(A,B)(A,C) \tkzGetPoint{D} - \tkzDrawSegment[green](A,D) - \tkzDrawPoints[color=red](A,B,C,D) - \tkzLabelPoints[above right=3pt](A,B,C,D) - \end{tikzpicture} -\end{tkzexample} - -\subsubsection{Gold proportion with \tkzcname{tkzDuplicateSegment}} - \begin{tkzexample}[latex=7cm,small] -\begin{tikzpicture}[rotate=-90,scale=.75] - \tkzInit[xmax=10,ymax=10] - \tkzClip[space=1] - \tkzDefPoint(0,0){A} - \tkzDefPoint(10,0){B} - \tkzDefMidPoint(A,B) \tkzGetPoint{I} - \tkzDefPointWith[orthogonal,K=-.75](B,A) - \tkzGetPoint{C} - \tkzInterLC(B,C)(B,I) \tkzGetSecondPoint{D} - \tkzDuplicateSegment(B,D)(D,A) \tkzGetPoint{E} - \tkzInterLC(A,B)(A,E) \tkzGetPoints{N}{M} - \tkzDrawArc[delta=10](D,E)(B) - \tkzDrawArc[delta=10](A,M)(E) - \tkzDrawLines(A,B B,C A,D) - \tkzDrawArc[delta=10](B,D)(I) - \tkzDrawPoints(A,B,D,C,M,I,N) - \tkzLabelPoints(A,B,D,C,M,I,N) -\end{tikzpicture} - \end{tkzexample} -% <--------------------------------------------------------------------> - % About Angles -% <--------------------------------------------------------------------> -\subsection{Determining a slope} -It is a question of determining whether it exists, the slope of a straight line defined by two points. No verification of the existence is made. - -\begin{NewMacroBox}{tkzFindSlope}{\parg{pt1,pt2}\marg{name of macro}}% -The result is stored in a macro. - -\medskip -\begin{tabular}{lll} -\toprule -arguments & example & explication \\ -\midrule -\TAline{(pt1,pt2){pt3}} {\tkzcname{tkzFindSlope}(A,B)\{slope\}}{\tkzcname{slope} will give the result of $\frac{y_B-y_A}{x_B-x_A}$} \\ -\bottomrule -\end{tabular} - -\medskip -\tkzHandBomb\ Careful not to have $x_B=x_A$ -\end{NewMacroBox} - - -\begin{tkzexample}[latex=7cm,small] -\begin{tikzpicture}[scale=1.5] - \tkzInit[xmax=4,ymax=5]\tkzGrid[sub] - \tkzDefPoint(1,2){A} \tkzDefPoint(3,4){B} - \tkzDefPoint(3,2){C} \tkzDefPoint(3,1){D} - \tkzDrawSegments(A,B A,C A,D) - \tkzDrawPoints[color=red](A,B,C,D) - \tkzLabelPoints(A,B,C,D) - \tkzFindSlope(A,B){SAB} \tkzFindSlope(A,C){SAC} - \tkzFindSlope(A,D){SAD} - \pgfkeys{/pgf/number format/.cd,fixed,precision=2} - \tkzText[fill=Gold!50,draw=brown](1,4)% - {La pente de (AB) est: $\pgfmathprintnumber{\SAB}$} - \tkzText[fill=Gold!50,draw=brown](1,3.5)% - {La pente de (AC) est: $\pgfmathprintnumber{\SAC}$} - \tkzText[fill=Gold!50,draw=brown](1,3)% - {La pente de (AD) est: $\pgfmathprintnumber{\SAD}$} -\end{tikzpicture} -\end{tkzexample} - -\subsection{Angle formed by a straight line with the horizontal axis} -Much more interesting than the last one. The result is between -180 degrees and +180 degrees. - -\begin{NewMacroBox}{tkzFindSlopeAngle}{\parg{pt1,pt2}}% -The result is stored in a macro \tkzcname{tkzAngleResult}. - -\medskip -\begin{tabular}{lll} -\toprule -arguments & example & explication \\ -\midrule -\TAline{(pt1,pt2)} {\tkzcname{tkzFindSlopeAngle}(A,B)}{\tkzcname{tkzGetAngle} can retrieve the result} -\bottomrule -\end{tabular} - -\medskip -{If recovery is not necessary, it is possible to use \tkzcname{tkzAngleResult}} -\end{NewMacroBox} - - -\subsubsection{Example of use of \tkzcname{tkzFindSlopeAngle}} -Here is another version of the construction of a mediator - -\begin{tkzexample}[latex=6cm,small] -\begin{tikzpicture} - \tkzInit - \tkzDefPoint(0,0){A} \tkzDefPoint(3,2){B} - \tkzDefLine[mediator](A,B) \tkzGetPoints{I}{J} - \tkzCalcLength[cm](A,B) \tkzGetLength{dAB} - \tkzFindSlopeAngle(A,B) \tkzGetAngle{tkzangle} - \begin{scope}[rotate=\tkzangle] - \tikzset{arc/.style={color=gray,delta=10}} - \tkzDrawArc[R,arc](B,3/4*\dAB)(120,240) - \tkzDrawArc[R,arc](A,3/4*\dAB)(-45,60) - \tkzDrawLine(I,J) \tkzDrawSegment(A,B) - \end{scope} - \tkzDrawPoints(A,B,I,J) \tkzLabelPoints(A,B) - \tkzLabelPoints[right](I,J) -\end{tikzpicture} -\end{tkzexample} - -\subsection{from an angle} -In the previous example, I used the macro \tkzcname{tkzGetAngle} to retrieve an angle. - -\begin{NewMacroBox}{tkzGetAngle}{\marg{name of macro}}% -This macro retrieves \tkzcname{tkzAngleResult} and stores the result in a new macro. - -\medskip - -\begin{tabular}{lll}% -\toprule -arguments & example & explication \\ -\midrule -\TAline{name of macro} {\tkzcname{tkzGetAngle}\{ang\}}{\tkzcname{ang} contains the value of the angle. } -\end{tabular} -\end{NewMacroBox} - -\subsection{Example of the use of \tkzcname{tkzGetAngle}} - - The point here is that $(AB)$ is the bisector of $\widehat{CAD}$, such that the $AD$ slope is zero. We recover the slope of $(AB)$ and then rotate twice. - -\begin{tkzexample}[vbox,small] -\begin{tikzpicture} - \tkzInit - \tkzDefPoint(1,5){A} \tkzDefPoint(5,2){B} - \tkzDrawSegment(A,B) - \tkzFindSlopeAngle(A,B)\tkzGetAngle{tkzang} - \tkzDefPointBy[rotation= center A angle \tkzang ](B) - \tkzGetPoint{C} - \tkzDefPointBy[rotation= center A angle -\tkzang ](B) - \tkzGetPoint{D} - \tkzCompass[length=1,dashed,color=red](A,C) - \tkzCompass[delta=10,brown](B,C) - \tkzDrawPoints(A,B,C,D) - \tkzLabelPoints(B,C,D) - \tkzLabelPoints[above left](A) - \tkzDrawSegments[style=dashed,color=orange!30](A,C A,D) -\end{tikzpicture} -\end{tkzexample} - -\subsection{Angle formed by three points} -\begin{NewMacroBox}{tkzFindAngle}{\parg{pt1,pt2,pt3}}% -The result is stored in a macro \tkzcname{tkzAngleResult}. - -\medskip -\begin{tabular}{lll} -\toprule -arguments & example & explication \\ -\midrule -\TAline{(pt1,pt2,pt3)} {\tkzcname{tkzFindAngle}(A,B,C)}{\tkzcname{tkzAngleResult} gives the angle ($\overrightarrow{BA},\overrightarrow{BC}$)} -\bottomrule -\end{tabular} - -\medskip -The result is between -180 degrees and +180 degrees. pt2 is the vertex and \tkzcname{tkzGetAngle} can retrieve the angle. -\end{NewMacroBox} - -\subsection{Example of use of \tkzcname{tkzFindAngle} } -\begin{tkzexample}[vbox,small] -\begin{tikzpicture} - \tkzInit[xmin=-1,ymin=-1,xmax=7,ymax=7] - \tkzClip - \tkzDefPoint (0,0){O} \tkzDefPoint (6,0){A} - \tkzDefPoint (5,5){B} \tkzDefPoint (3,4){M} - \tkzFindAngle (A,O,M) \tkzGetAngle{an} - \tkzDefPointBy[rotation=center O angle \an](A) - \tkzGetPoint{C} - \tkzDrawSector[fill = blue!50,opacity=.5](O,A)(C) - \tkzFindAngle(M,B,A) \tkzGetAngle{am} - \tkzDefPointBy[rotation = center O angle \am](A) - \tkzGetPoint{D} - \tkzDrawSector[fill = red!50,opacity = .5](O,A)(D) - \tkzDrawPoints(O,A,B,M,C,D) - \tkzLabelPoints(O,A,B,M,C,D) - \edef\an{\fpeval{round(\an,2)}}\edef\am{\fpeval{round(\am,2)}} - \tkzDrawSegments(M,B B,A) - \tkzText(4,2){$\widehat{AOC}=\widehat{AOM}=\an^{\circ}$} - \tkzText(1,4){$\widehat{AOD}=\widehat{MBA}=\am^{\circ}$} -\end{tikzpicture} -\end{tkzexample} - -\subsection{\tkzcname{tkzCalcLength}} -There's an option in \TIKZ\ name in \tkzname{veclen}. This option - is used to calculate AB if A and B are two points. - -The only problem for me is that the version of \TIKZ\ is not accurate enough in some cases. My version uses the \tkzNamePack{xfp} package and is slower, but more accurate. - \hypertarget{tpsc}{} -\begin{NewMacroBox}{tkzCalcLength}{\oarg{local options}\parg{pt1,pt2}\marg{name of macro}}% -\begin{tabular}{lll}% -arguments & example & explication \\ -\midrule -\TAline{(pt1,pt2)\{name of macro\}} {\tkzcname{tkzCalcLength}(A,B)\{dAB\}}{\tkzcname{dAB} donne $AB$ en pt} -\bottomrule -\end{tabular} - -\medskip -Une seule option - -\begin{tabular}{lll}% - options & default & example \\ -\midrule -\TOline{cm} {false}{\tkzcname{tkzCalcLength}[cm](A,B)\{dAB\} \tkzcname{dAB} gives AB en cm} -\end{tabular} - -The result is stored in a macro. -\end{NewMacroBox} - -\subsubsection{Compass square construction} - -\begin{tkzexample}[latex=7cm,small] -\begin{tikzpicture}[scale=1] - \tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B} - \tkzDrawLine[add= .6 and .2](A,B) - \tkzCalcLength[cm](A,B)\tkzGetLength{dAB} - \tkzDefLine[perpendicular=through A](A,B) - \tkzDrawLine(A,tkzPointResult) \tkzGetPoint{D} - \tkzShowLine[orthogonal=through A,gap=2](A,B) - \tkzMarkRightAngle(B,A,D) - \tkzVecKOrth[-1](B,A)\tkzGetPoint{C} - \tkzCompasss(A,D D,C) - \tkzDrawArc[R](B,\dAB)(80,110) - \tkzDrawPoints(A,B,C,D) - \tkzDrawSegments[color=gray,style=dashed](B,C C,D) - \tkzLabelPoints(A,B,C,D) -\end{tikzpicture} -\end{tkzexample} - -\subsection{Transformation from pt to cm or cm to pt} -Not sure if this is necessary and it is only a division by 28.45274 and a multiplication by the same number. The macros are: - -\begin{NewMacroBox}{tkzpttocm}{\parg{nombre}\marg{name of macro}}% -The result is stored in a macro. - -\medskip -\begin{tabular}{lll}% -\toprule -arguments & example & explication \\ -\midrule -\TAline{(nombre){name of macro}} {\tkzcname{tkzpttocm}(120)\{len\}}{\tkzcname{len} donne un nombre de tkzname{cm}} -\bottomrule -\end{tabular} - -\medskip -You'll have to use \tkzcname{len} along with \tkzname{cm}. -\end{NewMacroBox} - -\subsection{Change of unit} -\begin{NewMacroBox}{tkzcmtopt}{\parg{nombre}\marg{name of macro}}% -The result is stored in a macro. - -\medskip -\begin{tabular}{lll} -\toprule -arguments & example & explication \\ -\midrule -\TAline{(nombre)\{name of macro\}}{\tkzcname{tkzcmtopt}(5)\{len\}}{\tkzcname{len} longueur en \tkzname{pts}} -\bottomrule -\end{tabular} - -\medskip -\noindent{The result can be used with \tkzcname{len}\tkzname{pt}} -\end{NewMacroBox} - -\subsubsection{Example} -The macro \tkzcname{tkzDefCircle[radius](A,B)} defines the radius that we retrieve with \tkzcname{tkzGetLength}, but this result is in \tkzname{pt}. - -\begin{tkzexample}[latex=6cm,small] -\begin{tikzpicture}[scale=.5] - \tkzDefPoint(0,0){A} - \tkzDefPoint(3,-4){B} - \tkzDefCircle[through](A,B) - \tkzGetLength{rABpt} - \tkzpttocm(\rABpt){rABcm} - \tkzDrawCircle(A,B) - \tkzDrawPoints(A,B) - \tkzLabelPoints(A,B) - \tkzDrawSegment[dashed](A,B) - \tkzLabelSegment(A,B){$\pgfmathprintnumber{\rABcm}$} -\end{tikzpicture} -\end{tkzexample} - -%<--------------------------------------------------------------------------–> -% 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 -%<--------------------------------------------------------------------------–> -\begin{NewMacroBox}{tkzGetPointCoord}{\parg{$A$}\marg{name of macro}}% -Stores in two macros the coordinates of a point - -\medskip -\begin{tabular}{lll} -\toprule -arguments & example & explanation \\ -\midrule -\TAline{(point)\{name of macro\}} {\tkzcname{tkzGetPointCoord}(A)\{A\}}{\tkzcname{Ax} and \tkzcname{Ay} give the coordinates of $A$} -\end{tabular} - -\medskip -If the name of the macro is \tkzname{p}, then \tkzcname{px} and \tkzcname{py} give the coordinates of the chosen point with the cm as. -\end{NewMacroBox} - -\subsubsection{Coordinate transfer with \tkzcname{tkzGetPointCoord}} -\begin{tkzexample}[width=8cm,small] -\begin{tikzpicture} - \tkzInit[xmax=5,ymax=3] - \tkzGrid[sub,orange] - \tkzAxeXY - \tkzDefPoint(1,0){A} - \tkzDefPoint(4,2){B} - \tkzGetPointCoord(A){a} - \tkzGetPointCoord(B){b} - \tkzDefPoint(\ax,\ay){C} - \tkzDefPoint(\bx,\by){D} - \tkzDrawPoints[color=red](C,D) -\end{tikzpicture} -\end{tkzexample} - -\subsubsection{Sum of vectors with \tkzcname{tkzGetPointCoord}} -\begin{tkzexample}[width=6cm,small] -\begin{tikzpicture}[>=latex] - \tkzDefPoint(1,4){a} - \tkzDefPoint(3,2){b} - \tkzDefPoint(1,1){c} - \tkzDrawSegment[->,red](a,b) - \tkzGetPointCoord(c){c} - \draw[color=blue,->](a) -- ([shift=(b)]\cx,\cy) ; - \draw[color=purple,->](b) -- ([shift=(b)]\cx,\cy) ; - \tkzDrawSegment[->,blue](a,c) - \tkzDrawSegment[->,purple](b,c) -\end{tikzpicture} -\end{tkzexample} - -\endinput
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/tkz-base/latex/tiger.pdf b/Master/texmf-dist/doc/latex/tkz-base/tiger.pdf Binary files differindex d69cc73ffcf..d69cc73ffcf 100644 --- a/Master/texmf-dist/doc/latex/tkz-base/latex/tiger.pdf +++ b/Master/texmf-dist/doc/latex/tkz-base/tiger.pdf diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-base.cfg b/Master/texmf-dist/tex/latex/tkz-base/tkz-base.cfg index 2acb32861ee..fbab54e1371 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-base.cfg +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-base.cfg @@ -17,9 +17,9 @@ % variable. %utf8 encoding -\def\fileversion{3.05c} -\def\filedate{2020/03/03} -\typeout{2020/03/03 3.05c tkz-base.cfg} +\def\fileversion{3.06c} +\def\filedate{2020/03/18} +\typeout{2020/03/18 3.06c tkz-base.cfg} %<------ colors ---------------------------------------–> \def\tkz@backgroundcolor{white} \def\tkz@textcolor{black} diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-base.sty b/Master/texmf-dist/tex/latex/tkz-base/tkz-base.sty index 56d93baed9d..d3acfceed92 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-base.sty +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-base.sty @@ -33,9 +33,9 @@ %<--------------------------------------------------------------------------–> % Objet : Outils pour la création de graphiques géométriques %<--------------------------------------------------------------------------–> -\typeout{2020/03/03 3.05c tkz-base.sty} +\typeout{2020/03/18 3.06c tkz-base.sty} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tkz-base}[2020/03/03 3.05c tkz-base] +\ProvidesPackage{tkz-base}[2020/03/18 3.06c tkz-base] \ifx\e@alloc\@undefined \RequirePackage{etex} \fi @@ -141,5 +141,4 @@ \input{tkz-lib-marks} \usetkztool{base,utilities,math,text,BB,arith,print,misc} \usetkzobj{axes,grids,marks,points,rep} -\endinput - +\endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-lib-marks.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-lib-marks.tex index 5ae1de142ec..4d90cd1e786 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-lib-marks.tex +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-lib-marks.tex @@ -12,9 +12,9 @@ % % The Current Maintainer of this work is Alain Matthes. -\def\fileversion{3.05c} -\def\filedate{2020/03/03} -\typeout{2020/03/03 3.05c tkz-lib-symbols.tex} +\def\fileversion{3.06c} +\def\filedate{2020/03/18} +\typeout{2020/03/18 3.06c tkz-lib-symbols.tex} \makeatletter %<--------------------------------------------------------------------------–> % Création des symboles diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-axes.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-axes.tex index ddc800a8013..0382917149c 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-axes.tex +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-axes.tex @@ -13,9 +13,9 @@ % The Current Maintainer of this work is Alain Matthes. % utf8 encoding -\def\fileversion{3.05c} -\def\filedate{2020/03/03} -\typeout{2020/03/03 3.05c tkz-obj-axes.tex} +\def\fileversion{3.06c} +\def\filedate{2020/03/18} +\typeout{2020/03/18 3.06c tkz-obj-axes.tex} \newif\ifinteger \makeatletter \def\removedot#1.{#1} diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-grids.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-grids.tex index eb23c857c09..9330d547233 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-grids.tex +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-grids.tex @@ -13,9 +13,9 @@ % The Current Maintainer of this work is Alain Matthes. % utf8 encoding -\def\fileversion{3.05c} -\def\filedate{2020/03/03} -\typeout{2020/03/03 3.05c tkz-obj-grids.tex} +\def\fileversion{3.06c} +\def\filedate{2020/03/18} +\typeout{2020/03/18 3.06c tkz-obj-grids.tex} \makeatletter %<--------------------------------------------------------------------------–> % Setup Grid diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-marks.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-marks.tex index 78a0785cae6..be03c2be341 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-marks.tex +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-marks.tex @@ -14,9 +14,9 @@ % utf8 encoding -\def\fileversion{3.05c} -\def\filedate{2020/03/03} -\typeout{2020/03/03 3.05c tkz-obj-marks.tex} +\def\fileversion{3.07c} +\def\filedate{2020/03/18} +\typeout{2020/03/18 3.07c tkz-obj-marks.tex} \makeatletter %<-------------------------------------------------------------------------–> % Setup Marks @@ -26,10 +26,10 @@ %<--------------------------------------------------------------------------–> \pgfkeys{/tkzSoPt/.cd, prefix/.store in = \tkz@pref, - prefix = tkzPt, - /tkzSoPt/.unknown/.code = {\let\searchname=\pgfkeyscurrentname - \pgfkeysalso{\searchname/.try=#1, - /tikz/\searchname/.retry=#1}} + prefix = tkzPt, + /tkzSoPt/.unknown/.code = {\let\searchname=\pgfkeyscurrentname + \pgfkeysalso{\searchname/.try=#1, + /tikz/\searchname/.retry=#1}} } \def\tkzDefSetOfPoints{\pgfutil@ifnextchar[{\tkz@SetOfPoints}{% \tkz@SetOfPoints[]}} @@ -49,8 +49,8 @@ %<-------------------------------------------------------------------------–> \pgfkeys{/tkzjoinmk/.cd, prefix/.store in = \tkz@pref, - prefix=tkzPt, - /tkzjoinmk/.search also={/tikz} + prefix = tkzPt, + /tkzjoinmk/.search also = {/tikz} } \def\tkzJoinSetOfPoints{\pgfutil@ifnextchar[{\tkz@JoinSetOfPoints}{% \tkz@JoinSetOfPoints[]}} @@ -70,8 +70,8 @@ %<-------------------------------------------------------------------------–> \pgfkeys{/tkzdrawmk/.cd, prefix/.store in = \tkz@pref, - prefix=tkzPt, - /tkzdrawmk/.search also = {/tikz} + prefix = tkzPt, + /tkzdrawmk/.search also = {/tikz} } \def\tkzDrawSetOfPoints{\pgfutil@ifnextchar[{\tkz@DrawSetOfPoints}{ \tkz@DrawSetOfPoints[]}} @@ -117,10 +117,7 @@ inner sep = 0pt, mark = \tkz@sum@mk@mark, mark size = \tkz@sum@mk@size, - mark options = {color = \tkz@sum@mk@color, - fill = \tkz@sum@mk@fill}}} + mark options = {color = \tkz@sum@mk@color, fill = \tkz@sum@mk@fill}}} }% \makeatother -%<--------------------------------------- ------------------–> -\endinput -
\ No newline at end of file +\endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-points.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-points.tex index 8d3ea5b550e..97cd3ccd1b8 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-points.tex +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-points.tex @@ -13,9 +13,9 @@ % The Current Maintainer of this work is Alain Matthes. -\def\fileversion{3.05c} -\def\filedate{2020/03/03} -\typeout{2020/03/03 3.05c tkz-obj-points.tex} +\def\fileversion{3.06c} +\def\filedate{2020/03/18} +\typeout{2020/03/18 3.06c tkz-obj-points.tex} %<--------------------------------------------------------------------------–> % init def point %<--------------------------------------------------------------------------–> @@ -329,4 +329,4 @@ } \let\tkzGetPointxy\tkzGetPointCoord \makeatother -\endinput +\endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-rep.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-rep.tex index ff1ee65f06b..0698c963fd1 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-rep.tex +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-rep.tex @@ -12,9 +12,9 @@ % % The Current Maintainer of this work is Alain Matthes. % utf8 encoding -\def\fileversion{3.05c} -\def\filedate{2020/03/03} -\typeout{2020/03/03 3.05c tkz-obj-rep.tex} +\def\fileversion{3.06c} +\def\filedate{2020/03/18} +\typeout{2020/03/18 3.06c tkz-obj-rep.tex} \makeatletter %<--------------------------------------------------------------------------–> % repère diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-BB.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-BB.tex index a6829b6835f..6fd5422bbba 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-BB.tex +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-BB.tex @@ -12,9 +12,9 @@ % % The Current Maintainer of this work is Alain Matthes. % utf8 encoding -\def\fileversion{3.05c} -\def\filedate{2020/03/03} -\typeout{2020/03/03 3.05c tkz-obj-BB.tex} +\def\fileversion{3.06c} +\def\filedate{2020/03/18} +\typeout{2020/03/18 3.06c tkz-obj-BB.tex} \makeatletter %<--------------------------------------------------------------------------–> \pgfkeys{/tkzClip/.cd, diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-arith.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-arith.tex index c25572c7097..c8990a76a22 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-arith.tex +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-arith.tex @@ -12,9 +12,9 @@ % % The Current Maintainer of this work is Alain Matthes. % utf8 encoding -\def\fileversion{3.05c} -\def\filedate{2020/03/03} -\typeout{2020/03/03 3.05c tkz-tools-arith.tex} +\def\fileversion{3.06c} +\def\filedate{2020/03/18} +\typeout{2020/03/18 3.06c tkz-tools-arith.tex} % 1.161 test if "isfactor" is already defined % now with pgf 3.0 gcd isprime isodd iseven are defined %<--------------------------------------------------------------------------–> @@ -210,6 +210,4 @@ %<---------------------------------------------------------------------------> %\catcode`\@=\tkzAtCode\relax \makeatother -\endinput - - +\endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-base.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-base.tex index 825c881e35a..9f66cdac0a3 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-base.tex +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-base.tex @@ -12,9 +12,9 @@ % % The Current Maintainer of this work is Alain Matthes. % utf8 encoding -\def\fileversion{3.05c} -\def\filedate{2020/03/03} -\typeout{2020/03/03 3.05c tkz-tools-base.tex} +\def\fileversion{3.06c} +\def\filedate{2020/03/18} +\typeout{2020/03/18 3.06c tkz-tools-base.tex} \makeatletter %<--------------------------------------------------------------------------–> \global\let\tkz@tmp@xa\tkz@init@xmin% modif 2016 diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-misc.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-misc.tex index c5bd7f2f91c..31e8981e63a 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-misc.tex +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-misc.tex @@ -12,9 +12,9 @@ % % The Current Maintainer of this work is Alain Matthes. % utf8 encoding -\def\fileversion{3.05c} -\def\filedate{2020/03/03} -\typeout{2020/03/03 3.05c tkz-tools-misc.tex} +\def\fileversion{3.06c} +\def\filedate{2020/03/18} +\typeout{2020/03/18 3.06c tkz-tools-misc.tex} \makeatletter %<--------------------------------------------------------------------------–> % hline pb avec line diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-modules.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-modules.tex index 8197dc7a4e2..151a8ce0419 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-modules.tex +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-modules.tex @@ -12,9 +12,9 @@ % % The Current Maintainer of this work is Alain Matthes. % utf8 encoding -\def\fileversion{3.05c} -\def\filedate{2020/03/03} -\typeout{2020/03/03 3.05c tkz-tools-utilities.tex} +\def\fileversion{3.06c} +\def\filedate{2020/03/18} +\typeout{2020/03/18 3.06c tkz-tools-utilities.tex} \makeatletter %<------------- % chargement des modules ----------------------------------> \def\tkz@obj@all{angles,arcs,compass,defcircles,deflines,defpoints,defpointsby,defpointsrnd,defpointswith,polygons,protractor,sectors,show,triangles}% diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-print.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-print.tex index d61b81e39af..be4d362cae8 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-print.tex +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-print.tex @@ -12,9 +12,9 @@ % % The Current Maintainer of this work is Alain Matthes. % utf8 encoding -\def\fileversion{3.05c} -\def\filedate{2020/03/03} -\typeout{2020/03/03 3.05c tkz-tools-print.tex} +\def\fileversion{3.06c} +\def\filedate{2020/03/18} +\typeout{2020/03/18 3.06c tkz-tools-print.tex} \makeatletter %<------------- tkzPrintFrac ----------------------------------> \def\tkzPrintFrac#1#2{% @@ -85,4 +85,4 @@ }% \makeatother -\endinput +\endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-text.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-text.tex index d8d4d804b39..8fb49d5fbb4 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-text.tex +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-text.tex @@ -12,9 +12,9 @@ % % The Current Maintainer of this work is Alain Matthes. % utf8 encoding -\def\fileversion{3.05c} -\def\filedate{2020/03/03} -\typeout{2020/03/03 3.05c tkz-tools-text.tex} +\def\fileversion{3.06c} +\def\filedate{2020/03/18} +\typeout{2020/03/18 3.06c tkz-tools-text.tex} \makeatletter %<--------------------------------------------------------------------------–> % tkzText @@ -86,6 +86,5 @@ };% \endgroup } - \makeatother \endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-utilities.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-utilities.tex index 5c02aad0d5f..e3ed8cb5a72 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-utilities.tex +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-utilities.tex @@ -12,9 +12,9 @@ % % The Current Maintainer of this work is Alain Matthes. % utf8 encoding -\def\fileversion{3.05c} -\def\filedate{2020/03/03} -\typeout{2020/03/03 3.05c tkz-tools-utilities.tex} +\def\fileversion{3.06c} +\def\filedate{2020/03/18} +\typeout{2020/03/18 3.06c tkz-tools-utilities.tex} \makeatletter % for testing results \def\extractxy#1{% |