summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/tkz/tkz-fct
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-02-07 03:01:03 +0000
committerNorbert Preining <norbert@preining.info>2020-02-07 03:01:03 +0000
commit9c4a09ca6a4130e71ba545412319aaee3c618460 (patch)
tree52b4c3ee8dc02613fc8ce4faffe5292e10e5d10a /macros/latex/contrib/tkz/tkz-fct
parente684f0597e24a1d09af301d82b340b2df7cf2080 (diff)
CTAN sync 202002070301
Diffstat (limited to 'macros/latex/contrib/tkz/tkz-fct')
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/README80
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/TKZdoc-fct.pdfbin0 -> 742770 bytes
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-VDW.tex15
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-area.tex16
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-asymptote.tex7
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-bac.tex4
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-compilation.tex70
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-example.tex9
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fonctions.tex8
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fppgf.tex2
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-installation.tex169
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-label.tex1
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-main.tex224
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-param.tex3
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-point.tex4
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-polar.tex5
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-symbol.tex1
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-tangent.tex7
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-why.tex15
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/fct.ist6
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/readme.tex16
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/tkz-fct-screen.pdfbin778582 -> 0 bytes
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/Makefile7
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/info_fct_tex.txt18
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/preamble-standalone.ltx6
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-01-0-0.tex16
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-03-3-0.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-03-4-0.tex13
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-2-0.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-2-0.tex)12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-3-0.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-3-0.tex)12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-4-0.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-4-0.tex)12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-5-0.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-5-0.tex)14
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-6-0.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-6-0.tex)12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-7-0.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-7-0.tex)12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-8-0.tex15
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-1-0.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-1-0.tex)12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-2-0.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-2-0.tex)12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-3-0.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-3-0.tex)12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-4-0.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-4-0.tex)12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-5-0.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-5-0.tex)12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-6-0.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-6-0.tex)12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-06-1-0.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-6-1-0.tex)12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-10-2.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-10-2.tex)12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-2-0.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-2-0.tex)14
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-3-0.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-3-0.tex)14
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-4-0.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-4-0.tex)12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-5-0.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-5-0.tex)12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-6-0.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-6-0.tex)14
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-7-0.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-7-0.tex)14
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-8-0.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-8-0.tex)12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-9-1.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-9-1.tex)12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-10-0.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-10-0.tex)16
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-11-0.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-11-0.tex)12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-2-0.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-2-0.tex)12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-3-0.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-3-0.tex)14
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-4-0.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-4-0.tex)12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-7-0.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-7-0.tex)14
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-8-0.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-8-0.tex)12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-9-0.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-9-0.tex)12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-09-1-0.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-9-1-0.tex)12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-09-2-0.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-9-2-0.tex)12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-09-3-0.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-9-3-0.tex)12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-09-4-0.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-9-4-0.tex)12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-1-0-0.tex21
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-2-0.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-3-0.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-4-0.tex14
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-5-0.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-6-0.tex14
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-7-0.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-8-0.tex14
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-1-0.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-2-0.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-3-0.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-4-0.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-5-0.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-6-0.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-7-0.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-1-0.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-2-0.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-3-0.tex24
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-4-0.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-5-0.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-6-0.tex18
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-13-0-0.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-1-0.tex38
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-2-0.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-3-0.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-4-0.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-5-0.tex19
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-6-1.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-1.tex14
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-2.tex32
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-3.tex32
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-4.tex32
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-8-1.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-8-2.tex14
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-15-0-1.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-15-0-3.tex)14
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-15-0-2.tex (renamed from macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-15-0-4.tex)12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-16-1-0.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-16-2-0.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-3-3-0.tex16
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-3-4-0.tex17
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-8-0.tex19
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-6-0.tex18
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/examples/tkzfctpreamble.ltx18
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/latex/tkz-fct.sty583
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/readme-tkz-fct-fr.txt97
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/readme-tkz-fct.txt85
109 files changed, 910 insertions, 1706 deletions
diff --git a/macros/latex/contrib/tkz/tkz-fct/README b/macros/latex/contrib/tkz/tkz-fct/README
index 9067153f4d..2b964f04d0 100644
--- a/macros/latex/contrib/tkz/tkz-fct/README
+++ b/macros/latex/contrib/tkz/tkz-fct/README
@@ -1,93 +1,77 @@
-%%%%%%%%%%%%%%%%%%%%%% english readme %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-readme-tkz-fct.txt 06/01/2011 version 1.16 c
+%%%%%%%%%%%%%%%%%%%%%% english readme %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+readme-tkz-fct.txt 2020/02/06 version 1.2 c
-tkz-fct.sty uses tkz-base to draw graph of functions with a Cartesian
+tkz-fct.sty uses tkz-base version > 3 to draw graph of functions with a Cartesian
(rectangular) coordinate system.
Licence
--------
+--------------------------
This program can be redistributed and/or modified under the terms
of the LaTeX Project Public License Distributed from CTAN
archives in directory macros/latex/base/lppl.txt.
Features
---------
- -- needs etex, fp.sty, tkz-base and gnuplot;
+--------------------------
+ -- needs tkz-base, fp.sty and gnuplot;
-- automatically loads the package TikZ;
- -- compiles with utf8, pdflatex;
- -- compiles using the chain dvi->dvips->ps2pdf;
- -- not yet ready for use with TeX and ConText (I need more time and ideas);
- -- good news! ready to lualatex but I still need to test.
+ -- compiles with utf8, pdflatex, lualatex.
+
Installation
-------------
+-------------------------
You can experiment with the tkz-fct 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 :
+You can also place all of the distribution files in the directory :
/texmf/tex/latex/tkz.
How to use it
--------------
+--------------------------
To use the package tkz-fct, place the following line in the preamble of your
LaTeX document.
\usepackage{tkz-fct}
+\usepackage[your-language]{babel}
+\usepackage[autolanguage]{numprint}
-If you use the xcolor package, load that package before tkz-euclide to avoid
+If you use the xcolor package, load that package before tkz-fct to avoid
package conflicts.
\usepackage[usenames,dvipsnames]{xcolor}
-\usepackage{amsmath,tkz-fct}
+\usepackage{tkz-fct}
+
+In order to format the numbers correctly, you place the following two lines
+
+\usepackage[your-language]{babel}
+\usepackage[autolanguage]{numprint}
Documentation
--------------
- Documentation for tkz-fct and tkz-base is available on my sites:
+--------------------------
+
+Documentation for tkz-fct and tkz-base is available on my site :
- http://altermundus.fr (en français) or http://altermundus.fr (in english)
+ http://altermundus.fr (en français)
Examples
---------
- All examples given in documentation will be stored on my sites as standalone files, ready for compilation.
-
-Compatibility
--------------
-
-The new package tkz-euclide is *not* compatible with older packages tkz-base, tkz-2d, and tkz-arith.
+---------------------
+All examples given in documentation will be stored on my site as standalone files, ready for compilation.
+
History
+--------------------------
+
+-- 1.2 Add compatibility with tkz-base > 3.01
+ add couverture.tex and tkz-doc.cfg
-- 1.16 c correction of bugs
now default domain is xmin:xmax and not -5:5.
-- 1.13 first version
-How to get all the examples :
-
-1) You need to modify the file TKZdoc-fct-main.tex . Replace
- \usepackage{tkzexample} by
-
-\usepackage[saved]{tkzexample}
-\def\tkzFileSavedPrefix{tkzFct}
-
-2) Compile the sources
- $ pdflatex TKZdoc-fct-main.tex
- You get in your folder all the examples with the prefix tkzFct.
-
-3) Put all these files in a new folder with the ruby script "addcontent.rb"
- Run the script
- $ ruby addcontent.rb
- You get a folder with all the complete examples. The files begin with
- \input{tkzfctpreamble.ltx}
-
-4) Now you can compile the files. A fine solution is to use a makefile. You
- can put the two files tkzfctpreamble.ltx and Makefile inside the last folder
- and now you run
-$make
-
+---------------------------------------
Alain Matthes
5 rue de Valence
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/TKZdoc-fct.pdf b/macros/latex/contrib/tkz/tkz-fct/doc/TKZdoc-fct.pdf
new file mode 100644
index 0000000000..6ea875eb16
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/TKZdoc-fct.pdf
Binary files differ
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-VDW.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-VDW.tex
index 189e2d0427..0f5a4a45ff 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-VDW.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-VDW.tex
@@ -1,4 +1,4 @@
-%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex
+
\subsection{Courbes de \tkzname{Van der Waals}}
\bigskip
@@ -36,11 +36,9 @@ définie sur l'intervalle $I=\big]b~;~+\infty\big]$
\newpage
-\subsubsection{ Première courbe avec \emph{b}=1}
+\subsubsection{ Première courbe avec $ b=1$}
Quelques courbes pour $r\leq\ v \leq\ 6$
-
-
\medskip
\begin{center}
\begin{tkzexample}[]
@@ -59,7 +57,7 @@ définie sur l'intervalle $I=\big]b~;~+\infty\big]$
\newpage
-\subsubsection{ Deuxième courbe \emph{b}=1/3 }
+\subsubsection{ Deuxième courbe $b=1/3$ }
\medskip
@@ -80,7 +78,7 @@ définie sur l'intervalle $I=\big]b~;~+\infty\big]$
\newpage
-\subsubsection{ Troisième courbe \emph{b}=32/27 }
+\subsubsection{ Troisième courbe $ b=32/27$ }
\medskip
@@ -99,9 +97,6 @@ définie sur l'intervalle $I=\big]b~;~+\infty\big]$
\end{tkzexample}
\end{center}
-
-
-
\newpage
\subsection{Valeurs critiques}
\subsubsection{Courbes de \tkzname{Van der Walls} }
@@ -144,7 +139,7 @@ définie sur l'intervalle $I=\big]b~;~+\infty\big]$
\tkzFct[color=blue,domain = 0.35:3]{-3/(x*x) +27/(4*(3*x-1))}
\tkzFct[color=orange,domain = 0.35:3]{-3/(x*x) +8/(3*x-1)}
\tkzFct[color=green,domain = 0.35:3]{-3/(x*x) +7/(3*x-1)}
- \tkzText[draw,fill = white,text=Maroon](2,-2)%
+ \tkzText[draw,fill = white,text=brown](2,-2)%
{$f(x)=-\dfrac{3}{x^2}+\dfrac{8\alpha}{3x-1}$ \hspace{.5cm}%
avec $\alpha \in%
\left\{\dfrac{1}{2}~;~\dfrac{27}{32}~;~\dfrac{7}{8}~;~1\right\}$}
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-area.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-area.tex
index c87045bbec..d5dd91cb0d 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-area.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-area.tex
@@ -1,4 +1,4 @@
-%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex
+
\section{Macros pour définir des surfaces }
Il s'agit par exemple de représenter la partie du plan comprise entre la courbe représentative d'une fonction, l'axe des abscisses et les droites
@@ -94,28 +94,28 @@ Cette macro permet de mettre en évidence une surface délimitée par les courbe
\toprule
options & défaut & explication \\
\midrule
-\TOline{between} {a and b}{référence des deux courbes}
+\TOline{between} {no default}{référence des deux courbes, obligatoire !}
\TOline{domain= min:max}{domain=-5:5}{Les options sont celles de \TIKZ.}
\TOline{opacity} {0.5}{transparence}
\bottomrule
\end{tabular}
-\emph{L'option \tkzname{pattern} de \TIKZ\ peut être utile ! }
+{L'option \tkzname{pattern} de \TIKZ\ peut être utile ! }
\end{NewMacroBox}
%<--------------------------------------------------------------------------->
\subsection{Surface comprise entre deux courbes en couleur}
Par défaut, la surface définie est comprise entre les deux premières courbes.
-\begin{tkzexample}[vbox]
+
\begin{tikzpicture}[scale=1.5]
\tkzInit[xmax=5,ymax=5]
\tkzGrid \tkzAxeXY
\tkzFct[domain = 0:5]{x}
\tkzFct[domain = 1:5]{log(x)}
- \tkzDrawAreafg[color = orange!50,domain = 1:5]
+ \tkzDrawAreafg[between=a and b,color = orange!50,domain = 1:5]
\end{tikzpicture}
-\end{tkzexample}
+
%<--------------------------------------------------------------------------->
\newpage
@@ -183,8 +183,8 @@ Ici aussi, attention à l'ordre des références dans l'option \tkzname{between}
\tkzAxeXY
\tkzFct[domain = -.5:4]{ 4*x-x**2+4/(x**2+1)**2}
\tkzFct[domain = -.5:4]{x-1+4/(x**2+1)**2}
- \tkzDrawAreafg[color=green,domain = 1:4]
- \tkzDrawAreafg[pattern=north west lines,domain = -.5:1]
+ \tkzDrawAreafg[between=a and b,color=green,domain = 1:4]
+ \tkzDrawAreafg[between=a and b,pattern=north west lines,domain = -.5:1]
\tkzRep
\tkzText(2.5,4.5){$C_f$}
\tkzText(2.5,1){$C_g$}
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-asymptote.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-asymptote.tex
index e4715c712f..1f3666c6e5 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-asymptote.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-asymptote.tex
@@ -1,4 +1,3 @@
-%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex
%<–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––>
\section{Droites particulières}
%<–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––>
@@ -25,7 +24,7 @@ options & défaut & définition \\
\bottomrule
\end{tabular}
-\emph{voir les options les lignes dans \TIKZ}
+{voir les options les lignes dans \TIKZ}
\end{NewMacroBox}
@@ -73,7 +72,7 @@ arguments & exemple & définition \\
\begin{tkzexample}[]
\begin{tikzpicture}
\tkzInit[xmin=-7,xmax=7,ymin=-1,ymax=1]
- \tkzAxeY[gradsize=\scriptstyle]
+ \tkzAxeY[font=\small]
\tkzAxeX[trig=2]
\foreach\v in {-2,-1,1,2}
{\tkzVLine[color=red]{\v*\FPpi}}
@@ -148,7 +147,7 @@ arguments & exemple & définition \\
\tkzHLine[line width=1pt,color=red]{1}
\tkzVLine[line width=1pt,color=blue]{2}
\tkzDefPoint(1,1){A}
- \tkzDrawPoint[fill=white,color=Maroon,size=10](A)
+ \tkzDrawPoint[fill=white,color=brown,size=6](A)
\tkzDefPointByFct[draw,with=b]({1+exp(1)})
\tkzLabelPoint[above right](tkzPointResult){$(1+\text{e}~;~2)$}
\tkzText[draw,color = black,fill = brown!20](6,6)%
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-bac.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-bac.tex
index 4a2fe0a813..8f9a2de207 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-bac.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-bac.tex
@@ -1,8 +1,6 @@
-%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex
\section{Exemples avec les packages \tkzname{alterqcm} et \tkzname{tkz-tab}}
-
-\shorthandoff{:}
+%\shorthandoff{:}
\begin{alterqcm}[lq=110mm]
\AQmessage{ La figure 1. donne la représentation graphique d'une fonction $f$ définie sur $\mathbf{R}^+$ et la figure 2 celle d'une primitive de $f$ sur $\mathbf{R}^+$.
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-compilation.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-compilation.tex
index 1cb39a3a79..1bfa45df41 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-compilation.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-compilation.tex
@@ -1,4 +1,3 @@
-%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex
\section{Utilisation de Gnuplot}
%–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––>
\subsection{Mécanisme d'interaction entre \TIKZ\ et \tkzname{Gnuplot}}
@@ -6,8 +5,7 @@
\TEX\ est un système logiciel de composition de documents ( text processing programm ). Il permet bien sûr de calculer, mais avec des moyens limités. \TIKZ\ est ainsi limité par \TEX\ pour effectuer des calculs. Pour rappel ±16383.99999 pt est l'intervalle dans lequel \TEX\ stocke ses valeurs. Sachant que 1 cm est égal à 28.45274 pt, on s'aperçoit que \TEX\ ne peut traiter que des dimensions inférieures à 5,75 mètres environ.
Bien sûr, cela paraît suffisant, mais malheureusement, pendant un enchaînement de calculs, il est assez facile de dépasser ces limites.
-\bigskip
- \tkzActivOff
+\bigskip
\newcommand{\drawpage}[4]{%
\begin{scope}[xshift=#1, yshift=#2,font=\footnotesize]
\filldraw[fill=white!75!#4,draw=#4, very thin]%
@@ -20,62 +18,59 @@ Bien sûr, cela paraît suffisant, mais malheureusement, pendant un enchaînemen
\begin{center}
\begin{tikzpicture}[>=triangle 45,scale=.75]
-\drawpage{0cm}{0cm}{\texttt\blue\begin{minipage}{2cm}
+\drawpage{0cm}{0cm}{\texttt\tkzblue\begin{minipage}{2cm}
sample.tex
with
\tkzcname{draw plot[id=fct] function{---.};}
\end{minipage}}{blue}
-\drawpage{12cm}{0cm}{\texttt \red sample.fct.gnuplot}{red}
-\drawpage{12cm}{-14cm}{\texttt\red sample.fct.table}{red}
-\drawpage{0cm}{-14cm}{\texttt\blue\begin{minipage}{2cm}
-sample.pdf
+\drawpage{12cm}{0cm}{\texttt \tkzred sample.fct.gnuplot}{red}
+\drawpage{12cm}{-14cm}{\texttt\tkzred sample.fct.table}{red}
+\drawpage{0cm}{-14cm}{\texttt\tkzblue\begin{minipage}{2cm}
+sample.pdf
-\bigskip
-\shorthandoff{:}
+\bigskip
\begin{tikzpicture}[domain=-1.5:.8]
- \draw plot[id=f1,samples=200] function{x*x};
+ \draw plot[id=f1,samples=200] function{x*x};
\end{tikzpicture}
-\end{minipage}}{blue}
+\end{minipage}}{blue}
-\path (8.05,2.9) node(A)
+\path (8.05,2.9) node(A)
[diamond,%
draw,color = black,
fill = red!60,%
text = black,%
minimum size = 3 cm,%
- font = \normalsize]
- {{\texttt \tikzname-\TEX}};
- \path (14.1,-4.08) node(B)
+ font = \normalsize]
+ {{\texttt \tikzname-\TEX}};
+ \path (14.1,-4.08) node(B)
[diamond,%
draw,color=black,fill=green!60,%
text = black,%
minimum size = 3 cm,%
- font = \normalsize]
+ font = \normalsize]
{{\texttt gnuplot}};
- \path (8.05,-11.1) node(C)
+ \path (8.05,-11.1) node(C)
[diamond,%
draw,color = black,
fill = red!60,%
text = black,%
minimum size = 3 cm,%
- font = \normalsize]
- {{\texttt \tikzname-\TEX}};
+ font = \normalsize]
+ {{\texttt \tikzname-\TEX}};
\draw[->] (4.2,2.9) -- (A.west);
\draw[->] (A.east) -- (12,2.9);
- \draw[->] (14.1,0) -- (B.north);
+ \draw[->] (14.1,0) -- (B.north);
\draw[->] (B.south) -- (14.1,-8.18);
\draw[->] (12 ,-11.1)--(C.east);
- \draw[->] (C.west)--(4.2,-11.1);
+ \draw[->] (C.west)--(4.2,-11.1);
\draw[->,magenta] (4.2,2.9) to [ out =-80,in=260] node[below,pos=.5]{étape 1} (12,2.9);
- \draw[->,magenta] (14.1,0) to [ out =200,in=160] node[left,pos=.5]{étape 2} (14.1,-8.18);
- \draw[->,magenta] (12 ,-11.1) to [ out =110,in=70] node[above,pos=.5]{étape 3} (4.2,-11.1);
+ \draw[->,magenta] (14.1,0) to [ out =200,in=160] node[left,pos=.5]{étape 2} (14.1,-8.18);
+ \draw[->,magenta] (12 ,-11.1) to [ out =110,in=70] node[above,pos=.5]{étape 3} (4.2,-11.1);
\end{tikzpicture}
\end{center}
-\newpage
-
Pour tracer des courbes en 2D en contournant ces problèmes, un moyen simple offert par \TIKZ, est d'utiliser \tkzname{gnuplot}.
\tkzname{tkz-fct.sty} s'appuie sur le programme \tkzname{gnuplot} et le package \tkzname{fp.sty}. Le premier est utilisé pour obtenir une liste de points, et le second pour évaluer ponctuellement des valeurs.
@@ -97,7 +92,6 @@ On part du fichier \tkzname{sample.tex} suivant :
\end{tikzpicture}
\end{document}
\end{tkzltxexample}
- \tkzActivOn
La compilation de ce fichier créé avec \TIKZ, produit un fichier nommé \tkzname{sample.f1.gnuplot}. Le nom du fichier est obtenu à partir de \tkzcname{jobname} et de l'option \tkzname{id}. Ainsi un même fichier peut créer plusieurs fichiers distincts. C'est un fichier texte ordinaire, affecté de l'extension \tkzname{gnuplot}. Il contient un préambule indiquant à \tkzname{gnuplot} qu'il doit créer une table contenant les coordonnées d'un certain nombre de points obtenu par la fonction définie par $x\longrightarrow x^2$. Ce nombre de points est défini par l'option \tkzname{samples}. Cette étape ne présente aucune difficulté particulière. Le fichier obtenu peut être traité manuellement avec \tkzname{gnuplot}. Le résultat est le fichier suivant :
@@ -125,7 +119,7 @@ Si \tkzname{gnuplot} trouve \tkzname{sample.f1.gnuplot} alors il produit un fich
\end{tkzltxexample}
-La version 2.1 de \TIKZ\ a adopté \tkzname{set table} et il n'y a plus d'incompatibilité entre \TIKZ\ et les versions récentes de \tkzname{gnuplot} (v>4.2).
+La version 2.1 de \TIKZ\ a adopté \tkzname{set table} et il n'y a plus d'incompatibilité entre \TIKZ\ et les versions récentes de \tkzname{gnuplot} (v>4.2). J'espère qu'il en va de même pour les versions de \TIKZ\ > 3.
\item \textcolor{red}{\textbf{Étape 3}}
@@ -165,11 +159,11 @@ La version 2.1 de \TIKZ\ a adopté \tkzname{set table} et il n'y a plus d'inco
Gnuplot est proposé avec la plupart des distributions Linux, et existe pour OS X ainsi que pour Windows.
\begin{enumerate}
- \item \tkzname{Ubuntu}\NameSys{Linux Ubuntu} ou un autre système Linux: on l'installe en suivant la procédure classique d'installation d'un nouveau paquetage.
- \item \tkzname{Windows}\NameSys{Windows XP} Les utilisateurs de Windows doivent se méfier, après avoir téléchargé la bonne version et installé \tkzname{gnuplot} alors il faudra renommé wgnuplot en gnuplot. Ensuite il faudra modifier le \tkzname{path}. Si le chemin du programme est \shorthandoff{:}\tkzname{C:\textbackslash gnuplot} alors il faudra ajouter \tkzname{{C:}\textbackslash gnuplot\textbackslash bin\textbackslash}\shorthandon{:} aux variables environnement (Aller à "Poste de Travail" puis faire "propriétés", dans l'onglet "Avancé", cliquer sur "Variables d'environnement". ).
+ \item \NameSys{Linux Ubuntu} ou un autre système Linux: on l'installe en suivant la procédure classique d'installation d'un nouveau paquetage.
+ \item \NameSys{Windows XP} Les utilisateurs de Windows doivent se méfier, après avoir téléchargé la bonne version et installé \tkzname{gnuplot} alors il faudra renommé wgnuplot en gnuplot. Ensuite il faudra modifier le \tkzname{path}. Si le chemin du programme est \tkzname{C:\textbackslash gnuplot} alors il faudra ajouter \tkzname{{C:}\textbackslash gnuplot\textbackslash bin\textbackslash} aux variables environnement (Aller à "Poste de Travail" puis faire "propriétés", dans l'onglet "Avancé", cliquer sur "Variables d'environnement". ).
Ensuite pour compiler sous latex, il faudra ajouter au script de compilation l'option \tkzname{--enable-write18 }.
- \item \tkzname{OS X}\NameSys{OS X} C'est le système en version Snow Leopard qui pose le plus de problème, car il faut compiler les sources.
- Si vous n'utilisez \tkzname{gnuplot} qu'en collaboration avec \TIKZ\ alors il vous suffit de compiler les sources ainsi :
+ \item \NameSys{OS X} L'installation n'est jamais simple sauf
+ si vous n'utilisez \tkzname{gnuplot} qu'en collaboration avec \TIKZ\ alors il vous suffit de compiler les sources ainsi :
\begin{enumerate}
@@ -178,7 +172,7 @@ Ensuite pour compiler sous latex, il faudra ajouter au script de compilation l'o
Cela doit donner
\begin{tkzltxexample}[]
-$ cd /Users/ego/Desktop/gnuplot-4.4.2
+$ cd /Users/you/Desktop/gnuplot-4.4.2
\end{tkzltxexample}
\item ensuite taper la ligne suivante et valider
@@ -201,8 +195,7 @@ Enregister le code suivant dans un fichier avec le nom test.tex, puis compiler a
\begin{tkzltxexample}[]
-\documentclass{scrartcl}
-\usepackage[usenames,dvipsnames]{xcolor}
+\documentclass{standalone}
\usepackage{tkz-fct}
\begin{document}
\begin{tikzpicture}
@@ -213,9 +206,9 @@ Enregister le code suivant dans un fichier avec le nom test.tex, puis compiler a
\end{document}
\end{tkzltxexample}
-\begin{tkzexample}[latex=8cm]
+\begin{tkzexample}[latex=9cm]
\begin{tikzpicture}
- \tkzInit[xmin=-5,xmax=5,ymax=2]
+ \tkzInit[xmin=-3,xmax=3,ymax=2]
\tkzGrid
\tkzAxeXY
\end{tikzpicture}
@@ -226,8 +219,7 @@ Enregister le code suivant dans un fichier avec le nom test.tex, puis compiler a
Il suffit d'ajouter une ligne pour tracer la représentation graphique d'une fonction.
\begin{tkzltxexample}[]
-\documentclass{scrartcl}
-\usepackage[usenames,dvipsnames]{xcolor}
+\documentclass{standalone}
\usepackage{tkz-fct}
\begin{document}
\begin{tikzpicture}[scale=1.25]
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-example.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-example.tex
index 19e85867ad..ccdf5bcc5c 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-example.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-example.tex
@@ -1,4 +1,4 @@
-%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex
+
\section{Quelques exemples}
\subsection{Variante intermédiaire : \TIKZ\ + \tkzname{tkz-fct}}
@@ -102,8 +102,11 @@ Les codes de \TIKZ\ et de \tkzname{tkz-fct} peuvent se compléter. Ainsi les axe
\begin{tkzexample}[vbox]
\begin{tikzpicture}[scale=.8]
\tkzInit[xmin=5,xmax=40,ymin=0,ymax=350,xstep=2.5,ystep=25]
- \tkzAxeX[label=$q$]
- \tkzAxeY[label=$C(q)$] \tkzGrid
+ \tkzDrawX[label=$q$]
+ \tkzLabelX
+ \tkzDrawY[label=$C(q)$]
+ \tkzLabelY
+ \tkzGrid
\tkzFct[domain=5:40]{0.1*\x**2+2*\x+60}
\foreach \vv in {5,10,...,40}{%
\tkzDefPointByFct(\vv)
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fonctions.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fonctions.tex
index b711ddf021..0f48a56e8c 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fonctions.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fonctions.tex
@@ -1,4 +1,4 @@
-%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex
+
\section{Les différentes macros}
\tkzname{Gnuplot} détermine les points nécessaires pour tracer la courbe. Le nombre de points est fixé par l'option \tkzname{samples}; dans les premiers exemples la valeur du nombre de points est celle donnée par défaut. Ensuite Tikz va utiliser cette table pour tracer la courbe. C'est donc \tkzname{Tikz} qui trace la courbe.
@@ -7,7 +7,7 @@
Cette première macro est la plus importante car elle permet de tracer la représentation graphique d'une fonction continue .\hypertarget{tfct}{}
\begin{NewMacroBox}{tkzFct}{\oarg{local options}\var{gnuplot expression}}
-\emph{La fonction est donnée en utilisant la syntaxe de gnuplot. x est la variable sauf si \tkzname{xstep} est différent de 1, dans ce cas la variable est \tkzcname{x}.}
+{La fonction est donnée en utilisant la syntaxe de gnuplot. x est la variable sauf si \tkzname{xstep} est différent de 1, dans ce cas la variable est \tkzcname{x}.}
\medskip
\begin{tabular}{lll}
@@ -18,7 +18,7 @@ Cette première macro est la plus importante car elle permet de tracer la repré
\bottomrule
\end{tabular}
-\emph{L'expression est de la forme 2*x+1 ; 3*log(x) ; x*exp(x) ; x*x*x+x*x+x. }
+{L'expression est de la forme 2*x+1 ; 3*log(x) ; x*exp(x) ; x*x*x+x*x+x. }
Les options sont celles de \TIKZ.
@@ -110,8 +110,6 @@ Attention, ici \tkzname{ystep=6} or \tkzname{gnuplot} donne $80\div=13$. il fau
\begin{tkzexample}[vbox]
\begin{tikzpicture}[scale=0.4]
\tkzInit[xmax=30,ymax=90,ystep=6]
- \tkzAxeX[nograd,noticks,poslabel=right,label=$t$]
- \tkzAxeY[nograd,noticks,poslabel=above,label=$P$]
\tkzFct[line width=1pt,color=red,dashed,domain=0:30]{80.0}
\tkzFct[line width=1pt,color=blue,domain=0:30]{80/(1.0+4.0*exp(-0.21*x))}
\tkzText[above,color=red](20,80){$P=80$}
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fppgf.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fppgf.tex
index fda81f58f3..531287c400 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fppgf.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fppgf.tex
@@ -1,5 +1,3 @@
-%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex
-
\section{Utilisation \tkzname{pgfmath} et de \tkzname{fp.sty} }
%--------------------------------------------------------------------------->
\subsection{\tkzname{pgfmath}}
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-installation.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-installation.tex
index f835fd4776..a33f5b995d 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-installation.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-installation.tex
@@ -1,171 +1,8 @@
-%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex
+\section{Installation de \tkzNamePack{tkz-fct}}
+ \tkzname{tkz-fct} est présent sur le serveur du \tkzname{CTAN} et fait partie de \NameDist{TeXLive} donc il est bientôt possible de l'installer avec \tkzname{tlmgr}. Ce package fait aussi partie de \NameDist{MikTeX} sous \NameSys{Windows}.
-\section{Installation de \tkzname{tkz-fct}}
-Il est possible que lorsque vous lirez ce document, \tkzname{tkz-fct} soit présent sur le serveur du \tkzname{CTAN}\footnote{\tkzname{tkz-fct} ne fait pas encore partie de \tkzname{TeXLive} mais il sera bientôt possible de l'installer avec \emph{tlmgr}}. Si \tkzname{tkz-fct} ne fait pas encore partie de votre distribution, cette section vous montre comment l'installer, elle est aussi nécessaire, si vous avez envie d'installer une version plus récente ou personnalisée de \tkzname{tkz-fct}. \emph{Attention, la présence dans mon dossier texmf, des fichiers de \PGF, s'explique par l'utilisation occasionnelle de la version CVS de \PGF}.
+ Vérifier que \tkzname{TikZ 3..}\index{TikZ@TikZ} est installé car c'est la version minimum pour le bon fonctionnement de \tkzname{tkz-fct}. \tkzNamePack{tkz-base} doit aussi être installé, de même le binaire « gnuplot» doit être installé sur votre ordinateur. \tkzNamePack{fp.sty} est intensément utilisé mais il est présent dans toutes les distributions.
-\subsection{Avec TeXLive sous OS X, Linux et Windows}\NameDist{TeXLive}
-Créer un dossier \tikz[remember picture,baseline=(n1.base)]\node [fill=blue!30,draw] (n1) {tkz}; avec comme chemin : \textcolor{red!60}{ texmf/tex/latex/tkz}. Le nom « tkz » n'est pas une obligation, tout autre nom est possible.
-
-\tikz[baseline=(t.base)]\node [fill=blue!30,draw] (t) {texmf}; est un dossier personnel, voici les chemins de ce dossier sur mes deux ordinateurs:
-
-\medskip
-\begin{itemize}\setlength{\itemsep}{5pt}
-\item sous OS X \colorbox{blue!30}{\textbf{/Users/ego/Library/texmf}};
-\item sous Ubuntu \colorbox{blue!30}{\textbf{/home/ego/texmf}}.
-\end{itemize}
-
-\medskip
-\begin{enumerate}
-\item
-
- Placez le fichier \tikz[remember picture,baseline=(n2.base)]\node [fill=blue!20,draw] (n2) {tkz-fct.sty};
- dans le dossier \tikz[baseline=(p.base)]\node [fill=blue!20,draw] (p) {tkz};.
-
-
-
-\medskip
-\begin{tikzpicture} [remember picture,rotate=90]
-
-\node (texmf) at (4,2) [draw,fill=blue!30 ] {texmf};
-
-\node (tex) at (6,0) [draw ] {tex};
-\node (doc) at (2,0) [draw ] {doc};
-
-\node (texgen) at (7,-2) [draw ] {generic};
-\node (docgen) at (0,-2) [draw ] {generic};
-
-\node (latex) at (4,-2) [draw ] {latex};
-
-\node (genpgf) at (7,-4) [draw] {pgf};
-\node (latpgf) at (5,-4) [draw] {pgf};
-\node (tkz) at (4,-4) [draw,fill=blue!20 ] {tkz};
-
-\node (docpgf) at (0,-4) [draw] {pgf};
-
-\node (fct) at (6,-6) [draw,fill=orange!20] {tkz-fct.sty};
-\node (tkb) at (4,-6) [draw,fill=blue!20] {tkzbase};
-\node (tke) at (2,-6) [draw,fill=blue!20] {tkzeuclide};
-
-\node (tari) at (9,-11) [draw,fill=green!20] {tkz-tools-arith.tex};
-\node (tuti) at (8,-11) [draw,fill=green!20] {tkz-tools-utilities.tex};
-\node (tmisc) at (7,-11) [draw,fill=green!20] {tkz-tools-misc.tex};
-\node (tmath) at (6,-11) [draw,fill=green!20] {tkz-tools-math.tex};
-\node (tbas) at (5,-11) [draw,fill=green!20] {tkz-tools-base.tex};
-\node (base) at (4,-11) [draw,fill=green!20] {tkz-base.sty};
-\node (cfg) at (3,-11) [draw,fill=red!20] {tkz-base.cfg};
-\node (mark) at (2,-11) [draw,fill=red!20] {tkz-obj-marks.tex};
-\node (pts) at (1,-11) [draw,fill=red!20] {tkz-obj-points.tex};
-\node (seg) at (0,-11) [draw,fill=red!20] {tkz-obj-segments.tex};
-
-
-
-\draw[-open triangle 90](texmf.north east) --(tex.south west) ;
-\draw[-open triangle 90](texmf.south east) -- (doc.north west) ;
-
-\draw[-open triangle 90](tex.north east) --(texgen.south west) ;
-\draw[-open triangle 90](tex.south east) -- (latex.north west) ;
-\draw[-open triangle 90](texgen.east) -- (genpgf.west) ;
-
-\draw[-open triangle 90](doc.south east) -- (docgen.north west) ;
-\draw[-open triangle 90](docgen.east) -- (docpgf.west) ;
-
-\draw[-open triangle 90](latex.north east) -- (latpgf.south west) ;
-\draw[-open triangle 90](latex.east) -- (tkz.west) ;
-
-\draw[-open triangle 90,blue!40](tkz.east) to[out=-90,in=90](fct.west) ;
-\draw[-open triangle 90,blue!40](tkz.east) to[out=-90,in=90](tkb.west) ;
-\draw[-open triangle 90,blue!40](tkz.east) to[out=-90,in=90](tke.west) ;
-
-\draw[-open triangle 90,blue!40](tkb.east) to[out=-90,in=90](tari.west) ;
-\draw[-open triangle 90,blue!40](tkb.east) to[out=-90,in=90](tuti.west) ;
-\draw[-open triangle 90,blue!40](tkb.east) to[out=-90,in=90](tmisc.west) ;
-\draw[-open triangle 90,blue!40](tkb.east) to[out=-90,in=90](tmath.west) ;
-\draw[-open triangle 90,blue!40](tkb.east) to[out=-90,in=90](tbas.west) ;
-\draw[-open triangle 90,blue!40](tkb.east) to[out=-90,in=90](base.west) ;
-\draw[-open triangle 90,blue!40](tkb.east) to[out=-90,in=90](cfg.west) ;
-\draw[-open triangle 90,blue!40](tkb.east) to[out=-90,in=90](mark.west) ;
-\draw[-open triangle 90,blue!40](tkb.east) to[out=-90,in=90](pts.west) ;
-\draw[-open triangle 90,blue!40](tkb.east) to[out=-90,in=90](seg.west) ;
-
-\end{tikzpicture}
-
-\begin{tikzpicture}[remember picture,overlay]
- \path[->,thin,red!50,>=latex] (n1) edge [bend left] (tkz);
- \path[->,thin,red!50,>=latex] (n2) edge [bend left] (fct);
-\end{tikzpicture}
-
-\vfill
-\newpage
-\item Ouvrir un terminal, puis faire \tkzname{sudo texhash} si nécessaire.
-\item Vérifier que \tkzname{Ti\emph{k}Z 2.10}\index{TikZ@Ti\emph{k}Z} est installé car c'est la version minimum pour le bon fonctionnement de \tkzname{tkz-fct}. \tkzname{tkz-base} doit aussi être installé, de même le binaire « gnuplot» doit être installé sur votre ordinateur. \tkzname{fp.sty} est intensément utilisé mais il est présent dans toutes les distributions.
-\end{enumerate}
-
-
-\subsection{Avec MikTeX sous Windows XP}\NameDist{MikTeX}\NameSys{Windows XP}
-
-Je ne connais pas grand-chose à ce système mais un utilisateur de mes packages \textbf{Wolfgang Buechel} a eu la gentillesse de me faire parvenir ce qui suit~:
-
-Pour ajouter \tkzname{tkz-fct.sty} à MiKTeX\footnote{Essai réalisé avec la version \tkzname{2.7}}:
-
-\begin{itemize}\setlength{\itemsep}{10pt}
- \item ajouter un dossier \tkzname{tkz} dans le dossier
- \textcolor{red}{\texttt{[MiKTeX-dir]/tex/latex}}
- \item copier \tkzname{tkz-fct.sty} et tous les packages nécessaires à son fonctionnement dans le dossier \tkzname{tkz},
- \item mettre à jour MiKTeX, pour cela dans shell DOS lancer la commande \textbf{\textcolor{red}{|mktexlsr -u|}}
-
- ou bien encore, choisir \textcolor{red}{|Start/Programs/Miktex/Settings/General|}
-
- puis appuyer sur le bouton \textbf{\textcolor{red}{|Refresh FNDB|}}.
-\end{itemize}
-
-\subsection{Résumé de l'installation}
-
-Pour résumer, \tkzname{Ti\emph{k}Z 2.10} est nécessaire, ensuite soit \tkzname{tkz-fct} est dans votre distribution et le seul problème est l'installation de \tkzname{gnuplot}; soit il n'est pas dans votre distribution et dans ce cas, il suffit de créer un dossier qui le contiendra ainsi que \tkzname{tkz-base} et les fichiers qui l'accompagnent.
-
-Au moment où j'écris ces lignes les fichiers nécessaires pour utiliser \tkzname{tkz-fct} sont~:
-
-\vspace*{8pt}
-\begin{itemize}
-
- \item \tkzname{tkz-fct.sty} un fichier
-
-\vspace*{20pt}
- \item \tkzname{tkz-base} dossier nécessaire qui comprend~:
-
- \vspace*{8pt}
- \begin{itemize}
- \item \tkzname{tkz-base.sty} fichier principal
- \item \tkzname{tkz-base.cfg} fichier de configuration
- \item \tkzname{tkz-tools-base.tex}
- \item \tkzname{tkz-tools-arith.tex}
- \item \tkzname{tkz-tools-misc.tex}
- \item \tkzname{tkz-tools-utilities.tex}
- \item \tkzname{tkz-obj-points.tex}
- \item \tkzname{tkz-obj-segments.tex}
- \item \tkzname{tkz-obj-marks.tex}
- \end{itemize}
-
-\vspace*{20pt}
- \item \tkzname{tkz-euclide} dossier qui comprend~:
-
- \vspace*{8pt}
- \begin{itemize}
- \item \tkzname{tkz-euclide.sty} fichier principal
- \item \tkzname{tkz-tools-intersections.tex}
- \item \tkzname{tkz-tools-math.tex}
- \item \tkzname{tkz-tools-transformations.tex}
- \item \tkzname{tkz-lib-symbols.tex} ajoute des formes nouvelles
- \item \tkzname{tkz-obj-lines.tex}
- \item \tkzname{tkz-obj-addpoints.tex} compléments sur les points
- \item \tkzname{tkz-obj-circles.tex}
- \item \tkzname{tkz-obj-arcs.tex}
- \item \tkzname{tkz-obj-angles.tex}
- \item \tkzname{tkz-obj-polygons.tex}
- \item \tkzname{tkz-obj-sectors.tex}
- \item \tkzname{tkz-obj-protractor.tex}
-\end{itemize}
-
-\end{itemize}
\endinput
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-label.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-label.tex
index fc0925ffd4..52a46a3555 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-label.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-label.tex
@@ -1,4 +1,3 @@
-%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex
\section{Labels}
Ce qui est souhaitable, c'est de pouvoir nommer les courbes. Prenons comme exemple, la fonction $f$ définie par :
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-main.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-main.tex
index 7e6f2870a8..1293a8885d 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-main.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-main.tex
@@ -1,17 +1,8 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% tkz-fct.sty encodage : utf8 %
-% %
-% %
-% Créé par Alain Matthes le 30/09/2010 %
-% Copyright (c) 2009 __Collège Sévigné__ All rights reserved. %
-% documentation version : 1.0 %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Fichier .tex de présentation du package tkz-fonction.sty
-
+% !TEX TS-program = lualatex
% encoding : utf8
-% documentation of tkz-fct.sty
-% Copyright (C) 2010 Alain Matthes
+% doc de tkz-euclide.sty
+% Created by Alain Matthes on 2020-01-02.
+% Copyright (C) 2020 Alain Matthes
%
% This file may be distributed and/or modified
%
@@ -20,126 +11,120 @@
% 2. under the GNU Public License.
%
% See the file doc/generic/pgf/licenses/LICENSE for more details.%
-% See http://www.latex-project.org/lppl.txt for details.
-
-% ``TKZdoc-fct-main '' is the french documentation of tkz-fct
-
-\documentclass[DIV=12,fontsize=10,headinclude=false,index=totoc,footinclude=false,headings=small]{tkz-doc}
-\usepackage{svn-multi}
-\usepackage{tkz-tab,tkz-fct,alterqcm}
-\usepackage{tkz-euclide}
-\usetkzobj{all}
-\tkzSetUpColors[background=fondpaille,text=Maroon]
-\def\tkzTabDefaultWritingColor{Maroon}
-\def\tkzTabDefaultBackgroundColor{fondpaille}
-\usepackage{rotating,fancyvrb}
-\usepackage[frenchb]{babel}
-\usepackage[autolanguage]{numprint}
-\usepackage[pdftex,
- unicode,
- pdfpagelabels,
- colorlinks = true,
- urlcolor = blue,
- filecolor = pdffilecolor,
- linkcolor = blue,
- breaklinks = false,
- hyperfootnotes = false,
- bookmarks = true,
- bookmarksopen = true,
- linktocpage = true,
- pdfsubject = {2d function},
- pdfauthor = {Alain Matthes},
- pdftitle = {tkz-fct},
- pdfkeywords = {fct},
- pdfcreator = {LaTeX}]{hyperref}
-\usepackage{url}
-\def\UrlFont{\small\ttfamily}
-\usepackage{microtype}
-
-\DisableLigatures{encoding = T1,
- family = tt*}
-\usepackage[parfill]{parskip}
-
-\gdef\nameofpack{tkz-fct}
-\gdef\versionofpack{1.16 c}
-\gdef\dateofpack{2011/06/01}
-\gdef\nameofdoc{doc-tkz-fct}
-\gdef\versionofdoc{1.16}
-\gdef\dateofdoc{2011/06/01}
-\gdef\authorofpack{Alain Matthes}
-\gdef\adressofauthor{}
-\gdef\namecollection{AlterMundus}
-\gdef\urlauthor{http://altermundus.fr}
-\gdef\urlauthorcom{http://altermundus.com}
-\title{The package : tkz-fct.sty}
-\author{Alain Matthes}
-
-\usepackage{shortvrb,ipa}
-\makeatletter
-\renewcommand*\l@subsubsection{\bprot@dottedtocline{3}{3.8em}{4em}}
-\makeatother
-\AtBeginDocument{\MakeShortVerb{\|}}
-
-\pdfcompresslevel=9
-
-\pdfinfo{%
-/Title (doc_tkzFct.pdf)
-/Creator (TeX)
-/Producer (pdfeTeX)
-/Author (Alain Matthes)
-/CreationDate (\dateofpack)
-/Subject (Documentation du package \nameofpack)
-/Keywords (tikz, pgf, pdfeTeX, graphiques, fonctions, points, maths, pdflatex, droites)%
+% See http://www.latex-project.org/lppl.txt for details.
+
+% TKZdoc-euclide-main is the french doc of tkz-euclide
+\documentclass[DIV = 14,
+ fontsize = 10,
+ headinclude = false,
+ index = totoc,
+ footinclude = false,
+ twoside,
+ headings = small
+ ]{tkz-doc}
+\usepackage{etoc}
+\gdef\tkznameofpack{tkz-fct}
+\gdef\tkzversionofpack{1.2c}
+\gdef\tkzdateofpack{2020/02/03}
+\gdef\tkznameofdoc{doc-tkz-fc}
+\gdef\tkzversionofdoc{1.2c}
+\gdef\tkzdateofdoc{2020/02/03}
+\gdef\tkzauthorofpack{Alain Matthes}
+\gdef\tkzadressofauthor{}
+\gdef\tkznamecollection{AlterMundus}
+\gdef\tkzurlauthor{}
+\gdef\tkzengine{lualatex}
+\gdef\tkzurlauthorcom{http://altermundus.fr}
+% -- Packages ---------------------------------------------------
+\usepackage[dvipsnames,svgnames]{xcolor}
+\usepackage{calc}
+\usepackage{tkz-euclide,tkz-fct,alterqcm,tkz-tab}
+\usetikzlibrary{babel}
+\usetikzlibrary[shapes.geometric]
+\usepackage[colorlinks]{hyperref}
+\hypersetup{
+ linkcolor=BrickRed,
+ citecolor=Green,
+ filecolor=Mulberry,
+ urlcolor=NavyBlue,
+ menucolor=BrickRed,
+ runcolor=Mulberry,
+ linkbordercolor=BrickRed,
+ citebordercolor=Green,
+ filebordercolor=Mulberry,
+ urlbordercolor=NavyBlue,
+ menubordercolor=BrickRed,
+ runbordercolor=Mulberry,
+ pdfsubject={2d function},
+ pdfauthor={\tkzauthorofpack},
+ pdftitle={\tkznameofpack},
+ pdfcreator={\tkzengine}
}
-
-
-\newcommand*{\E}{\ensuremath{\mathrm{e}}}
-\usepackage{tkzexample}
+\usepackage{tkzexample}
+\usepackage{mathtools}
+\usepackage{unicode-math}
+\usepackage{fourier-otf}
+\setmainfont[Ligatures=TeX]{TeX Gyre Pagella}
+\setmathfont{TeX Gyre Pagella Math}
+\usepackage{datetime,multicol}
+\usepackage[french]{babel}
+\usepackage[autolanguage]{numprint}
+\usepackage{microtype}
+\usepackage{rotating,ipa}
+\usepackage{array,multirow,multido,booktabs}
+\usepackage{shortvrb,fancyvrb}
+\renewcommand{\labelitemi}{\lefthand}
+\AtBeginDocument{\MakeShortVerb{\|}} % link to shortvrb
+\pdfcompresslevel=9
+\setlength\parindent{0pt}
+\RequirePackage{makeidx}
+%\def\tkzFileSavedPrefix{tkzFct}
+\makeindex
+% \def\tkzref{\arabic{section}-\arabic{subsection}-\arabic{subsubsection}}
+% \renewenvironment{tkzexample}[1][]{%
+% \tkz@killienc \VerbatimOut{tkzfct-\tkzref.tex}%
+% }{%
+% \endVerbatimOut
+% }
% \usepackage[saved]{tkzexample}
-% \def\tkzFileSavedPrefix{tkzFct}
+%<--------------------------------------------------------------------------->
\begin{document}
-
-%<--------------------- Première page présentation ------------------------–>
-\title{\nameofpack}
+
+\parindent=0pt
+\author{\tkzauthorofpack}
+\title{\tkznameofpack}
\date{\today}
\clearpage
\thispagestyle{empty}
-\maketitle
+\maketitle
\clearpage
-\pagecolor{fondpaille}
-\color{Maroon}
+\tkzSetUpColors[background=white,text=darkgray]
-\nameoffile{\nameofpack}
+\let\rmfamily\ttfamily
+\nameoffile{\tkznameofpack}
-\defoffile{\textbf{tkz-fct.sty} est un package pour créer à l'aide de \TIKZ, des représentations graphiques de fonctions en 2D le plus simplement possible. Il est dépendant de \TIKZ\ et fera partie d'une série de modules ayant comme point commun, la création de dessins utiles dans l'enseignement des mathématiques. Ce package existait déjà, et était disponible sur mon site internet. La version « officielle » a pour premier numéro de version 1.13 c (c pour \tkzname{CTAN}); de plus, la syntaxe a évolué et certaines macros ont commencé une mutation qui permettra de rendre l'ensemble de mes packages plus homogène. Ce package nécessite la version 2.1 de \TIKZ.}
+ \defoffile{\tkzname{\tkznameofpack} est un package pour créer à l'aide de \TIKZ\ , des représentations graphiques de fonctions en 2D le plus simplement possible. Il est dépendant de \TIKZ\ et fera partie d'une série de modules ayant comme point commun, la création de dessins utiles dans l'enseignement des mathématiques. Ce package nécessite la version 3.x de \TIKZ et une version 3 de tkz-base.}
\presentation
-\vspace*{24pt}
-\noindent\lefthand\ Je souhaite remercier \tkzimp{Till Tantau} pour avoir créé le merveilleux outil \tkzname{\TIKZ}, ainsi que \tkzimp{Michel Bovani} pour \tkzname{fourier}, dont l'association avec \tkzname{utopia} est excellente.
+\vspace*{24pt}
+\noindent\lefthand\ Je souhaite remercier \tkzimp{Till Tantau} pour avoir créé le merveilleux outil \TIKZ\ .
+
-
\vspace*{12pt}
-\noindent\lefthand\ Je souhaite remercier aussi \tkzimp{David Arnold} qui a corrigé un grand nombre d'erreurs et qui a testé de nombreux exemples, \tkzimp{Wolfgang Büchel} qui a corrigé également des erreurs et a construit de superbes scripts pour obtenir les fichiers d'exemples, \tkzimp{John Kitzmiller} et ses exemples, et enfin \tkzimp{Gaétan Marris} pour ses remarques.
+\noindent\lefthand\ Je souhaite remercier aussi \tkzimp{David Arnold} qui a corrigé un grand nombre d'erreurs et qui a testé de nombreux exemples, \tkzimp{Wolfgang Büchel} qui a corrigé également des erreurs et a construit de superbes scripts pour obtenir les fichiers d'exemples, \tkzimp{John Kitzmiller} et ses exemples, et enfin \tkzimp{Gaétan Marris} pour ses remarques .
\vspace*{12pt}
-\noindent\lefthand\ Vous trouverez de nombreux exemples sur mes sites~:
-\href{http://altermundus.com/pages/download.html}{altermundus.com} ou
-\href{http://altermundus.fr/pages/download.html}{altermundus.fr}
+\noindent\lefthand\ Vous trouverez de nombreux exemples sur mon site~:
+\href{http://altermundus.fr/}{altermundus.fr}
-\vfill
+\vfill
Vous pouvez envoyer vos remarques, et les rapports sur des erreurs que vous aurez constatées à l'adresse suivante~: \href{mailto:al.ma@mac.com}{\textcolor{blue}{Alain Matthes}}.
-
-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 CTAN archives.
-\vspace{1cm}
-\begin{center}
- \begin{tikzpicture}[decoration=snake,color=Peach,line width=1pt]
- \draw[decorate] (0,0)--(\textwidth-1cm,0);
- \end{tikzpicture}
-\end{center}
\clearpage
\tableofcontents
@@ -147,9 +132,9 @@ Project Public License Distributed from CTAN archives.
\clearpage
\newpage
-\setlength{\parskip}{1ex plus 0.5ex minus 0.2ex}
-%<---------------------------- the files ------------------------------------>
-
+ \setlength{\parskip}{1ex plus 0.5ex minus 0.2ex}
+% %<---------------------------- the files ------------------------------------>
+%
\include{TKZdoc-fct-why}
\include{TKZdoc-fct-installation}
\include{TKZdoc-fct-compilation}
@@ -158,7 +143,7 @@ Project Public License Distributed from CTAN archives.
\include{TKZdoc-fct-label}
\include{TKZdoc-fct-tangent}
\include{TKZdoc-fct-area}
-\include{TKZdoc-fct-riemann}
+\include{TKZdoc-fct-riemann}
\include{TKZdoc-fct-asymptote}
\include{TKZdoc-fct-param}
\include{TKZdoc-fct-polar}
@@ -170,8 +155,9 @@ Project Public License Distributed from CTAN archives.
\include{TKZdoc-fct-fppgf}
\include{TKZdoc-fct-faq}
\include{TKZdoc-fct-liste}
-%<--------------------------------------------------------------------------->
-
+% %<--------------------------------------------------------------------------->
\clearpage\newpage
-\printindex
+\begin{multicols}{2}
+\small\printindex
+\end{multicols}
\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-param.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-param.tex
index a99cf86365..102ff07534 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-param.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-param.tex
@@ -1,8 +1,7 @@
-%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex
\section{Courbes avec équations paramétrées}
\hypertarget{tfpa}{}
\begin{NewMacroBox}{tkzFctPar}{\oarg{local options}\marg{$x(t)$}\marg{$y(t)$}}
- \emph{$x(t)$ et $y(t)$ sont des expressions utilisant la syntaxe de \tkzname{gnuplot}. La variable est $t$.}
+ {$x(t)$ et $y(t)$ sont des expressions utilisant la syntaxe de \tkzname{gnuplot}. La variable est $t$.}
\medskip
\begin{tabular}{lll}
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-point.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-point.tex
index cd9ca26441..9368e72ebd 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-point.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-point.tex
@@ -3,7 +3,7 @@
\section{Placer un point sur une courbe} \hypertarget{tptfct}{}
\begin{NewMacroBox}{tkzDefPointByFct}{\parg{$decimal number$}}
-\emph{Cette macro permet de calculer l'image par la fonction définie précédemment, d'un nombre décimal.}
+{Cette macro permet de calculer l'image par la fonction définie précédemment, d'un nombre décimal.}
\medskip
\begin{tabular}{lll}
@@ -23,7 +23,7 @@
\bottomrule
\end{tabular}
-\emph{C'est donc la dernière fonction définie qui est utilisée. Si une autre fonction, est utilisée alors il faut utiliser l'ancienne macro \tkzcname{tkzFctPt}. Le point est défini sous un nom générique \tkzname{tkzPointResult} mais non tracé. Afin de le tracer il faut utiliser la macro \tkzcname{tkzDrawPoint}.}
+{C'est donc la dernière fonction définie qui est utilisée. Si une autre fonction, est utilisée alors il faut utiliser l'ancienne macro \tkzcname{tkzFctPt}. Le point est défini sous un nom générique \tkzname{tkzPointResult} mais non tracé. Afin de le tracer il faut utiliser la macro \tkzcname{tkzDrawPoint}.}
\end{NewMacroBox}
\subsection{Exemple avec \tkzcname{tkzGetPoint}}
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-polar.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-polar.tex
index 9b23cc5728..907df34ad0 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-polar.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-polar.tex
@@ -1,9 +1,8 @@
-%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex
\section{Courbes en coordonnées polaires}
\hypertarget{tfpo}{}
\begin{NewMacroBox}{tkzFctPolar}{\oarg{local options}\marg{$f(t)$}}
- \emph{$f(t)$ est une expression utilisant la syntaxe de \tkzname{gnuplot}. }
+ {$f(t)$ est une expression utilisant la syntaxe de \tkzname{gnuplot}. }
\medskip
\begin{tabular}{lll}
@@ -30,7 +29,7 @@ options & défaut & définition \\
\end{tabular}
\medskip
-\emph{ \tkzname{gnuplot} définit $\pi$ avec \tkzname{pi} et \tkzname{fp.sty} avec \tkzcname{FPpi}. Les valeurs qui déterminent le domaine sont évaluées par \tkzname{fp.sty}. Il est possible d'utiliser soit \tkzname{pi}, soit \tkzcname{FPpi}.}
+{ \tkzname{gnuplot} définit $\pi$ avec \tkzname{pi} et \tkzname{fp.sty} avec \tkzcname{FPpi}. Les valeurs qui déterminent le domaine sont évaluées par \tkzname{fp.sty}. Il est possible d'utiliser soit \tkzname{pi}, soit \tkzcname{FPpi}.}
\end{NewMacroBox}
\subsection{Équation polaire exemple 1}
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-symbol.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-symbol.tex
index 718914699c..8f8bdca471 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-symbol.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-symbol.tex
@@ -1,4 +1,3 @@
-%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex
\section{Symboles}
Certains ajoutent aux courbes des symboles afin de donner des indications supplémentaires au lecteur. Voici quelques exemples possibles~:
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-tangent.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-tangent.tex
index c2a9c698dd..c1e57ecd2a 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-tangent.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-tangent.tex
@@ -1,4 +1,3 @@
-%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex
\section{Macros pour tracer des tangentes }
Si une seule fonction est utilisée, elle est stockée avec comme nom
@@ -11,7 +10,7 @@ Dans les autres cas si AT est la longueur de la demi-tangente et si $p$ est la p
\subsection{Représentation d'une tangente \tkzcname{tkzDrawTangentLine}}
\hypertarget{tdtl}{}
\begin{NewMacroBox}{tkzDrawTangentLine}{\oarg{local options}\parg{a}}
-\emph{On l'emploie soit juste après l'utilisation de \tkzcname{tkzFct}, sinon il faut donner la référence de la fonction à l'aide de l'option \tkzname{with}.}
+{On l'emploie soit juste après l'utilisation de \tkzcname{tkzFct}, sinon il faut donner la référence de la fonction à l'aide de l'option \tkzname{with}.}
\medskip
\begin{tabular}{lll}
@@ -44,7 +43,7 @@ options & défaut & définition \\
\tkzAxeXY
\tkzFct[color=red,samples=100,domain = 0:800]%
{(1./90000)*\x*\x*\x-(1./100)*\x*\x+(113./36)*\x}
- \tkzDrawTangentLine[draw,color=blue,kr=300,kl=450,coord](450)
+ \tkzDrawTangentLine[draw,color=blue,kr=300,kl=450](450)
\tkzText[draw,color = black,fill = brown!50,opacity = 0.8](300,1200)%
{$f(x)=\dfrac{1}{90000}x^3 -\dfrac{1}{{100}}x^2 +\dfrac{113}{36}x$}
\end{tikzpicture}
@@ -160,7 +159,7 @@ Ici, on ne veut que les demi-tangentes comprises entre 0 et 1, pour cela il suff
\tkzGrid(0,0)(1,1)
\tkzAxeXY
\tkzFct[color = red,thick, domain =0:1]{(exp(\x)-1)/(exp(1)-1)}
- \tkzSetUpPoint[size=12]
+ \tkzSetUpPoint[size=6]
\tkzDrawTangentLine[draw, kl = 0, kr = 0.4](0)
\tkzDrawTangentLine[draw, kl = 0.4,kr = 0 ](1)
\tkzText[draw,color = red,fill = orange!20](0.5,0.6)%
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-why.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-why.tex
index 131d1b8b89..6e30744de2 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-why.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-why.tex
@@ -1,4 +1,3 @@
-%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex
\section{Fonctionnement}
\TIKZ\ apporte différentes possibilités pour obtenir les représentations graphiques des fonctions. J'ai privilégié l'utilisation de \tkzname{gnuplot}, car je trouve \tkzname{pgfmath} trop lent et les résultats trop imprécis.
@@ -28,19 +27,15 @@ Les valeurs de $f(x)$ sont comprises entre 0 et $\numprint{1000000}$. En choisis
Les valeurs du domaine seront comprises entre $0$ et $10$, mais l'expression donnée à \tkzname{gnuplot}, comportera des \tkzcname{x} équivalents à $x \times 10$, enfin, la valeur finale sera divisée par \tkzname{ystep=100000}. Les valeurs de $f(x)$ resteront ainsi comprises entre $0$ et $10$.
\begin{tkzexample}[latex=10cm,small]
-\begin{tikzpicture}[scale=.5]
- \tkzInit[xmax=100,xstep=10,
- ymax=1000000,
+\begin{tikzpicture}
+ \tkzInit[xmax=80,xstep=10,
+ ymax=800000,
ystep=100000]
- \tkzAxeX[right]
- \tkzAxeY[above]
+ \tkzAxeXY
\tkzGrid
\tkzFct[color=red,
- domain=0:100]{\x**3}
+ domain=0:80]{\x**3}
\end{tikzpicture}
\end{tkzexample}
-
-
-
\endinput
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/fct.ist b/macros/latex/contrib/tkz/tkz-fct/doc/latex/fct.ist
deleted file mode 100644
index 935392d700..0000000000
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/fct.ist
+++ /dev/null
@@ -1,6 +0,0 @@
-heading_prefix "{\\bfseries\\hfil "
-heading_suffix "\\hfil}\\nopagebreak\n"
-headings_flag 1
-delim_0 "\\dotfill"
-delim_1 "\\dotfill"
-delim_2 "\\dotfill"
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/readme.tex b/macros/latex/contrib/tkz/tkz-fct/doc/readme.tex
deleted file mode 100644
index 4b387a6021..0000000000
--- a/macros/latex/contrib/tkz/tkz-fct/doc/readme.tex
+++ /dev/null
@@ -1,16 +0,0 @@
-How to compile the sources
-
-All these files are in utf8.
-
-You only need to run
-
-$ pdflatex TKZdoc-fct-main.tex
-
-If you want the same index of my documentation
-$ cd path-to-the-sources
-$ pdflatex TKZdoc-fct-main.tex
-$ makeindex -s fct.ist TKZdoc-fct-main.idx
-$ pdflatex TKZdoc-fct-main.tex
-
-
-The end \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/tkz-fct-screen.pdf b/macros/latex/contrib/tkz/tkz-fct/doc/tkz-fct-screen.pdf
deleted file mode 100644
index 822de996e7..0000000000
--- a/macros/latex/contrib/tkz/tkz-fct/doc/tkz-fct-screen.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/Makefile b/macros/latex/contrib/tkz/tkz-fct/examples/Makefile
deleted file mode 100644
index e6d2c02491..0000000000
--- a/macros/latex/contrib/tkz/tkz-fct/examples/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-all: doc
-
-doc:
- for datei in $$(ls *tex | cut -d \. -f 1) ; do make $$datei.pdf ; done
-
-%.pdf: %.tex
- pdflatex --shell-escape $*.tex \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/info_fct_tex.txt b/macros/latex/contrib/tkz/tkz-fct/examples/info_fct_tex.txt
deleted file mode 100644
index 2d9faf5e37..0000000000
--- a/macros/latex/contrib/tkz/tkz-fct/examples/info_fct_tex.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-2011/01/25
-
-This archive contains all the examples of the documentation about tkz-fct.
-
-You need to compile a file with pdflatex or pfdtex to have in the same directory the file tkzpreamble.ltx. This file in in the archive.
-
-You can also find a Makefile in the archive. The way to use the Makefile is :
-
-$ cd <path of the archive>
-$ make
-
-Best regards
-
-Alain Matthes
-
-
-
- \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/preamble-standalone.ltx b/macros/latex/contrib/tkz/tkz-fct/examples/latex/preamble-standalone.ltx
new file mode 100644
index 0000000000..a281c5fee7
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/preamble-standalone.ltx
@@ -0,0 +1,6 @@
+\documentclass{standalone}
+\usepackage{tkz-euclide,tkz-fct,tkz-tab,alterqcm}
+
+
+
+
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-01-0-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-01-0-0.tex
new file mode 100644
index 0000000000..8885200411
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-01-0-0.tex
@@ -0,0 +1,16 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 1 (Section 1 : Fonctionnement)
+
+\begin{tikzpicture}
+ \tkzInit[xmax=80,xstep=10,
+ ymax=800000,
+ ystep=100000]
+ \tkzAxeXY
+ \tkzGrid
+ \tkzFct[color=red,
+ domain=0:80]{\x**3}
+\end{tikzpicture}
+
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-03-3-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-03-3-0.tex
new file mode 100644
index 0000000000..77080faf3b
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-03-3-0.tex
@@ -0,0 +1,12 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 2 (Section 3.3 : Test de l'installation de tkz-base)
+
+ \begin{tikzpicture}
+ \tkzInit[xmin=-3,xmax=3,ymax=2]
+ \tkzGrid
+ \tkzAxeXY
+ \end{tikzpicture}
+
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-03-4-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-03-4-0.tex
new file mode 100644
index 0000000000..29df04f010
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-03-4-0.tex
@@ -0,0 +1,13 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 3 (Section 3.4 : Test de l'installation de tkz-fct)
+
+\begin{tikzpicture}[scale=1.25]
+ \tkzInit[xmin=-5,xmax=5,ymax=2]
+ \tkzGrid
+ \tkzAxeXY
+ \tkzFct[color=red]{2*x**2/(x**2+1)}
+\end{tikzpicture}
+
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-2-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-2-0.tex
index 4abbf769d1..f7743863d3 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-2-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-2-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 4 (Section 4.2 : option : \tkzname{samples})
+
\begin{tikzpicture}[scale=1]
\tkzInit[xmax=5,ymax=2]
\tkzGrid[sub]
@@ -14,4 +10,4 @@
\tkzFct[samples=400,domain=.5:5]{1/x}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-3-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-3-0.tex
index 286fb61a4e..d922a48ce1 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-3-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-3-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 5 (Section 4.3 : options : \tkzname{xstep, ystep})
+
\begin{tikzpicture}
\tkzInit[xmax= 110,xstep=10,
ymax=6,ystep=1]
@@ -16,4 +12,4 @@
\tkzFct[domain = 0.1:100 ]{50/\x}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-4-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-4-0.tex
index 3b084dc581..1b5e701e64 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-4-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-4-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 6 (Section 4.4 : Modification de \tkzname{xstep} et \tkzname{ystep})
+
\begin{tikzpicture}[scale=1.5]
\tkzInit[xmax=700,xstep=100,ymax=1200,ystep=400]
\tkzGrid(0,0)(700,1200) \tkzAxeXY
@@ -14,4 +10,4 @@
{(1./90000)*\x*\x*\x-(1./100)*\x*\x+(113./36)*\x}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-5-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-5-0.tex
index 97586988b9..415d051f1a 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-5-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-5-0.tex
@@ -1,19 +1,13 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 7 (Section 4.5 : \tkzname{ystep} et les fonctions constantes)
+
\begin{tikzpicture}[scale=0.4]
\tkzInit[xmax=30,ymax=90,ystep=6]
- \tkzAxeX[nograd,noticks,poslabel=right,label=$t$]
- \tkzAxeY[nograd,noticks,poslabel=above,label=$P$]
\tkzFct[line width=1pt,color=red,dashed,domain=0:30]{80.0}
\tkzFct[line width=1pt,color=blue,domain=0:30]{80/(1.0+4.0*exp(-0.21*x))}
\tkzText[above,color=red](20,80){$P=80$}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-6-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-6-0.tex
index 40aff17570..09d5950464 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-6-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-6-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 8 (Section 4.6 : Les fonctions affines ou linéaires)
+
\begin{tikzpicture}[]
\tkzInit[ymax=20,ystep=5]
\tkzAxeXY
@@ -16,4 +12,4 @@
\tkzFct[color=purple,domain=0:10,samples=2]{7.}%7.0/5 =1.2
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-7-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-7-0.tex
index 5c559cc799..7189000a8a 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-7-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-7-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 9 (Section 4.7 : Sous-grille)
+
\begin{tikzpicture}
\tkzInit[xmin=4,xmax=18,xstep=2,
ymin=20,ymax=90,ystep=10]
@@ -20,4 +16,4 @@
color=brown](6,60)(12,90)
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-8-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-8-0.tex
new file mode 100644
index 0000000000..19fff86960
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-8-0.tex
@@ -0,0 +1,15 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 10 (Section 4.8 : Utilisation des macros de \tkzname{tkz-base})
+
+ \begin{tikzpicture}[scale=2]
+ \tkzInit[xmin=-3,xmax=3, ymin=-1,ymax=3]
+ \tkzGrid[sub,subxstep=.5,subystep=.5]
+ \tkzAxeXY
+ \tkzFct[domain = -3:2]{(2-x)*exp(x)}
+ \tkzText(-2,1.25){$\mathcal{C}_{f}$}
+ \tkzDefPoint(2,0){A} \tkzDrawPoint(A) \tkzLabelPoints(A)
+ \end{tikzpicture}
+
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-1-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-1-0.tex
index ca159081f8..4eba5d8089 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-1-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-1-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 11 (Section 5.1 : Exemple avec \tkzcname{tkzGetPoint})
+
\begin{tikzpicture}[scale=1.25]
\tkzInit[xmin=-2,xmax=2,xstep=1,
ymin=-8,ymax=24,ystep=8]
@@ -16,4 +12,4 @@
\tkzLabelPoint[above right](A){$A_0$}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-2-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-2-0.tex
index 979a701756..09402c8363 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-2-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-2-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 12 (Section 5.2 : Exemple avec \tkzcname{tkzGetPoint} et \tkzname{tkzPointResult})
+
\begin{tikzpicture}[scale=1.25]
\tkzInit[xmin=-2,xmax=2,xstep=1,
ymin=-8,ymax=24,ystep=8]
@@ -18,4 +14,4 @@
% ou bien \tkzDefPointByFct[draw](.5)
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-3-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-3-0.tex
index 8dd2cf9127..3164cac52f 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-3-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-3-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 13 (Section 5.3 : Options \tkzname{draw} et \tkzname{ref})
+
\begin{tikzpicture}[scale=1.25]
\tkzInit[xmin=-2,xmax=2,xstep=1,
ymin=-8,ymax=24,ystep=8]
@@ -17,4 +13,4 @@
\tkzLabelPoint[above right](A){$a$}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-4-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-4-0.tex
index fec5273be5..45c7c08d12 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-4-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-4-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 14 (Section 5.4 : Placer des points sans courbe)
+
\begin{tikzpicture}[xscale=3,yscale=2]
\tkzInit[xmin=-2,xmax=2,xstep=1,
ymin=-8,ymax=24,ystep=8]
@@ -17,4 +13,4 @@
\tkzDefPointByFct[draw](\va)}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-5-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-5-0.tex
index bbaafc8664..949853f109 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-5-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-5-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 15 (Section 5.5 : Placer des points sans se soucier des coordonnées)
+
\begin{tikzpicture}[scale=1.6]
\tkzInit[xmin = 0, xmax = 800,
ymin = 0, ymax = 2000,
@@ -20,4 +16,4 @@
\tkzDefPointByFct[draw](\va)}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-6-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-6-0.tex
index 4943b0a970..1ea3cb6626 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-6-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-6-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 16 (Section 5.6 : Placer des points avec deux fonctions)
+
\begin{tikzpicture}[scale=4]
\tkzInit[xmax=3,ymax=2]
\tkzAxeX
@@ -27,4 +23,4 @@
(2,0.3){$g(x)=\frac{1}{8}(3x-1)$}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-6-1-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-06-1-0.tex
index 1d7a94d24b..808c64d81f 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-6-1-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-06-1-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 17 (Section 6.1 : Ajouter un label)
+
\begin{tikzpicture}
\tkzInit[xmin=0,xmax=10,
ymin=0,ymax=1.2,ystep=0.2]
@@ -19,4 +15,4 @@
\tkzText[above right,text=red](tkzPointResult){${\mathcal{C}}_f$}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-10-2.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-10-2.tex
index 35e273a97b..e1f56e1a0c 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-10-2.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-10-2.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 26 (Section 7.10.2 : utilisation de la valeur numérique)
+
\begin{tikzpicture}[scale=1]
\tkzInit[xmax=1,xstep=0.1,ymin=0.0,ymax=1,ystep=0.1]
\tkzGrid \tkzAxeXY
@@ -14,4 +10,4 @@
\tkzDrawTangentLine[draw,color = red, kr = 0.2,kl = 0.2]({1/exp(1)})
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-2-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-2-0.tex
index 71c35c2cbf..ab227375b7 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-2-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-2-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 18 (Section 7.2 : Tangente avec \tkzname{xstep} et \tkzname{ystep} différents de 1)
+
\begin{tikzpicture}[xscale=1.5]
\tikzset{tan style/.style={-}}
\tkzInit[xmin=0,xmax=800,xstep=100,
@@ -19,6 +15,6 @@
\tkzText[draw, color = black,%
fill = brown!50, opacity = 0.8](300,1200)%
{$f(x)=\dfrac{1}{90000}x^3 -\dfrac{1}{{100}}x^2 +\dfrac{113}{36}x$}
- \end{tikzpicture}
+\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-3-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-3-0.tex
index ba9f7c0ca1..9a57b5ce99 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-3-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-3-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 19 (Section 7.3 : Les options \tkzname{kl}, \tkzname{kr} et l'option \tkzname{draw})
+
\begin{tikzpicture}[scale=1.5]
\tkzInit[xmin=-3,xmax=4,ymin=-4,ymax=2]
\tkzGrid \tkzDrawXY \tkzClip
@@ -16,6 +12,6 @@
\tkzDrawTangentLine[draw](1)
\tkzDrawTangentLine[kr=0,draw](3)
\tkzRep
- \end{tikzpicture}
+\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-4-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-4-0.tex
index c663f04631..ae9576110a 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-4-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-4-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 20 (Section 7.4 : Tangente et l'option \tkzname{with})
+
\begin{tikzpicture}[scale=4]
\tkzInit[xmax=3,ymax=2]
\tkzAxeXY
@@ -25,4 +21,4 @@
{$g(x)=\frac{1}{8}(3x-1)$}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-5-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-5-0.tex
index ff16ab4745..0d04fcbee6 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-5-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-5-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 21 (Section 7.5 : Quelques tangentes )
+
\begin{tikzpicture}[scale=2]
\tkzInit[xmin=-5,xmax=2,ymin=-1, ymax=3]
\tkzDrawX
@@ -19,4 +15,4 @@
\tkzDrawTangentLine[color=blue,kr=0](1)
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-6-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-6-0.tex
index 0a1fe9b959..de41164650 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-6-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-6-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 22 (Section 7.6 : Demi-tangentes )
+
\begin{tikzpicture}[scale=2.75]
\tkzInit[xmin=-2,xmax=3,ymax=3]
\tkzGrid[color=orange](-2,0)(3,3)
@@ -15,6 +11,6 @@
\tkzFct[color = red ,domain = -1:2]{(((x+1)*x)*x)**0.5}
\tkzDrawTangentLine(0)
\tkzText[draw,color = red,fill = orange!20](2,1){$f(x)=\sqrt{x^3+x^2}$}
- \end{tikzpicture}
+\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-7-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-7-0.tex
index 50c06cfed4..0da5e6441f 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-7-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-7-0.tex
@@ -1,22 +1,18 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 23 (Section 7.7 : Demi-tangentes Courbe de Lorentz )
+
\begin{tikzpicture}[scale=1.25]
\tkzInit[xmax=1,ymax=1,xstep=0.1,ystep=0.1]
\tkzGrid(0,0)(1,1)
\tkzAxeXY
\tkzFct[color = red,thick, domain =0:1]{(exp(\x)-1)/(exp(1)-1)}
- \tkzSetUpPoint[size=12]
+ \tkzSetUpPoint[size=6]
\tkzDrawTangentLine[draw, kl = 0, kr = 0.4](0)
\tkzDrawTangentLine[draw, kl = 0.4,kr = 0 ](1)
\tkzText[draw,color = red,fill = orange!20](0.5,0.6)%
{$f(x)=\dfrac{\text{e}^x-1}{\text{e}-1}$}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-8-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-8-0.tex
index a43c8eda8e..f68cf844d9 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-8-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-8-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 24 (Section 7.8 : Série de tangentes)
+
\begin{tikzpicture}[scale=2]
\tikzstyle{tan style}=[-]
\tkzInit[xmin=-5,xmax=2,ymin=-1,ymax=3]
@@ -19,4 +15,4 @@
\tkzDrawTangentLine[color=blue,line width=.4pt, kr=0,kl=0.5](\x)}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-9-1.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-9-1.tex
index 94e4f09b22..0604828df7 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-9-1.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-9-1.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 25 (Section 7.9.1 : Utilisation de \tkzcname{tkzFctLast})
+
\begin{tikzpicture}[scale=2]
\tikzstyle{tan style}=[-]
\tkzInit[xmin=-5,xmax=2,ymin=-1,ymax=3]
@@ -19,4 +15,4 @@
\tkzDrawTangentLine[color=blue,line width=.4pt,kr=0,kl=.75](\v)}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-10-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-10-0.tex
index bf66978aaf..6d40969c60 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-10-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-10-0.tex
@@ -1,23 +1,19 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 33 (Section 8.10 : Mélange de style)
+
\begin{tikzpicture}[scale=2.5]
\tkzInit[xmin=-1,xmax=4,ymin=0,ymax=5]
\tkzGrid
\tkzAxeXY
\tkzFct[domain = -.5:4]{ 4*x-x**2+4/(x**2+1)**2}
\tkzFct[domain = -.5:4]{x-1+4/(x**2+1)**2}
- \tkzDrawAreafg[color=green,domain = 1:4]
- \tkzDrawAreafg[pattern=north west lines,domain = -.5:1]
+ \tkzDrawAreafg[between=a and b,color=green,domain = 1:4]
+ \tkzDrawAreafg[between=a and b,pattern=north west lines,domain = -.5:1]
\tkzRep
\tkzText(2.5,4.5){$C_f$}
\tkzText(2.5,1){$C_g$}
\end{tikzpicture}%
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-11-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-11-0.tex
index ec51f0d78f..634c70b460 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-11-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-11-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 34 (Section 8.11 : Courbes de niveaux)
+
\begin{tikzpicture}[scale=.75]
\tkzInit[xmax=20,ymax=12]
\tkzGrid[color=orange,sub](0,0)(20,12)
@@ -25,4 +21,4 @@
\tkzDrawAreafg[between= g and e,color=gray!20,domain =12:20]
\end{tikzpicture}%
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-2-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-2-0.tex
index 21df45d74f..a71373a61c 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-2-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-2-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 27 (Section 8.2 : Naissance de la fonction logarithme népérien)
+
\begin{tikzpicture}[scale=2]
\tkzInit[xmin=0,xmax=3,xstep=1,
ymin=-2,ymax=2,ystep=1]
@@ -28,4 +24,4 @@
\tkzDrawPoints(A,B)
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-3-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-3-0.tex
index c62f6cc38b..75e39e9064 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-3-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-3-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 28 (Section 8.3 : Surface simple)
+
\begin{tikzpicture}[scale=1.75]
\tkzInit[xmin=0,xmax=800,xstep=100,
ymin=0,ymax=2000,ystep=400]
@@ -17,6 +13,6 @@
\tkzDrawPoint(a)
\tkzDrawArea[color=orange!50, domain =0:450]
\tkzDrawArea[color=orange!80, domain =450:800]
- \end{tikzpicture}
+\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-4-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-4-0.tex
index 9ce07d15c7..07050e22a2 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-4-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-4-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 29 (Section 8.4 : Surface et hachures)
+
\begin{tikzpicture}[scale=2]
\tkzInit[xmin=-3,xmax=4,ymin=-2,ymax=4]
\tkzGrid(-3,-2)(4,4)
@@ -21,4 +17,4 @@
\tkzRep
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-7-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-7-0.tex
index b5ee2373b6..1fa37f71c5 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-7-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-7-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 30 (Section 8.7 : Surface comprise entre deux courbes avec des hachures)
+
\begin{tikzpicture}[scale=.8]
\tkzInit[xmax=5,ymax=5]
\tkzGrid
@@ -14,6 +10,6 @@
\tkzFct[domain = 0:5]{x}
\tkzFct[domain = 1:5]{log(x)}
\tkzDrawAreafg[between= a and b,pattern=north west lines,domain = 1:5]
- \end{tikzpicture}
+\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-8-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-8-0.tex
index f56e6d1ed6..9073b668a2 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-8-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-8-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 31 (Section 8.8 : Surface comprise entre deux courbes avec l'option \tkzname{between})
+
\begin{tikzpicture}[scale=1.25]
\tkzInit[ymin=-1,xmax=5,ymax=3]
\tkzGrid
@@ -18,4 +14,4 @@
domain = 1:4]
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-9-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-9-0.tex
index 8fb2018a77..29e26a498c 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-9-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-9-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 32 (Section 8.9 : Surface comprise entre deux courbes : courbes de Lorentz)
+
\begin{tikzpicture}[scale=1.25]
\tkzInit[xmax=1,ymax=1,xstep=0.1,ystep=0.1]
\tkzGrid
@@ -18,4 +14,4 @@
\tkzDrawAreafg[between = c and a,color=gray!60,domain = 0:1]
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-9-1-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-09-1-0.tex
index 008448e5b4..25867a79c9 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-9-1-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-09-1-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 35 (Section 9.1 : Somme de Riemann)
+
\begin{tikzpicture}[scale=3.5]
\tkzInit[xmax=3,ymax=1.75]
\tkzAxeXY
@@ -16,4 +12,4 @@
line width=1pt,interval=1./2:exp(1),number=10]
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-9-2-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-09-2-0.tex
index 9517111d66..64faec82ce 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-9-2-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-09-2-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 36 (Section 9.2 : Somme de Riemann Inf)
+
\begin{tikzpicture}[scale=1.75]
\tkzInit[xmin=-3,xmax=6,ymin=-2,ymax=14,ystep=2]
\tkzDrawX \tkzDrawY
@@ -14,4 +10,4 @@
\tkzDrawRiemannSumInf[fill=green!40,opacity=.5,interval=-1:5,number=10]
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-9-3-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-09-3-0.tex
index 70b221adc5..2f08a96821 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-9-3-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-09-3-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 37 (Section 9.3 : Somme de Riemann Inf et Sup)
+
\begin{tikzpicture}[scale=1.75]
\tkzInit[xmin=-3,xmax=6,ymin=-2,ymax=14,ystep=2]
\tkzDrawX \tkzDrawY
@@ -15,4 +11,4 @@
\tkzDrawRiemannSumInf[fill=green!40,opacity=.5,interval=-1:5,number=10]
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-9-4-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-09-4-0.tex
index 14cb4f711a..9e80435a8d 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-9-4-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-09-4-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 38 (Section 9.4 : Somme de Riemann Mid)
+
\begin{tikzpicture}[scale=1.75]
\tkzInit[xmin=-3,xmax=6,ymin=-2,ymax=14,ystep=2]
\tkzDrawX \tkzDrawY
@@ -14,4 +10,4 @@
\tkzDrawRiemannSumMid[fill=blue!40,opacity=.5,interval=-1:5,number=10]
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-1-0-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-1-0-0.tex
deleted file mode 100644
index 02a0e3f7e7..0000000000
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-1-0-0.tex
+++ /dev/null
@@ -1,21 +0,0 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
-\begin{document}
-
-\begin{tikzpicture}[scale=.5]
- \tkzInit[xmax=100,xstep=10,
- ymax=1000000,
- ystep=100000]
- \tkzAxeX[right]
- \tkzAxeY[above]
- \tkzGrid
- \tkzFct[color=red,
- domain=0:100]{\x**3}
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-2-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-2-0.tex
index df6a3d865d..4bc5eb21b2 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-2-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-2-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 39 (Section 10.2 : Ligne verticale )
+
\begin{tikzpicture}[scale=2]
\tkzInit[xmax=3,ymax=2]
\tkzAxeXY
@@ -18,4 +14,4 @@
line width = 1pt]{1./3}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-3-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-3-0.tex
index 760e14af9c..14df7d6296 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-3-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-3-0.tex
@@ -1,16 +1,12 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 40 (Section 10.3 : Lignes verticales)
+
\begin{tikzpicture}
\tkzInit[xmax=5,ymax=5]
\tkzAxeXY
\tkzVLines[color = green]{1,2,...,4}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-4-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-4-0.tex
index 406658aab0..749b6e4837 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-4-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-4-0.tex
@@ -1,18 +1,14 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 41 (Section 10.4 : Ligne verticale et valeur calculée par \tkzname{fp} )
+
\begin{tikzpicture}
\tkzInit[xmin=-7,xmax=7,ymin=-1,ymax=1]
- \tkzAxeY[gradsize=\scriptstyle]
+ \tkzAxeY[font=\small]
\tkzAxeX[trig=2]
\foreach\v in {-2,-1,1,2}
{\tkzVLine[color=red]{\v*\FPpi}}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-5-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-5-0.tex
index 4be8cec8f4..16b5e32eb8 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-5-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-5-0.tex
@@ -1,16 +1,12 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 42 (Section 10.5 : Une ligne horizontale)
+
\begin{tikzpicture}
\tkzInit[xmax=80,xstep=20,ymax=2]
\tkzAxeXY
\tkzHLine[color=red]{exp(1)-1}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-6-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-6-0.tex
index 19f17b80ca..9430b809cb 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-6-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-6-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 43 (Section 10.6 : Asymptote horizontale)
+
\begin{tikzpicture}[scale=2.5]
\tkzInit[xmax=5,ymin=0.5,ymax=1.5,ystep=0.5]
\tkzGrid
@@ -15,6 +11,6 @@
\tkzHLine[color=red,style=solid,line width=1.2pt]{1}
\tkzDrawTangentLine[draw,color=blue](1)
\tkzText[draw,fill = brown!20](2,0.75){$f(x)=x \text{e}^{-x}+1$}
- \end{tikzpicture}
+\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-7-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-7-0.tex
index a3b328ec31..0d2cd771c0 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-7-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-7-0.tex
@@ -1,16 +1,12 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 44 (Section 10.7 : Lignes horizontales)
+
\begin{tikzpicture}
\tkzInit
\tkzAxeXY
\tkzHLines[color = green]{1,2,...,10}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-8-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-8-0.tex
index b0bae30e5f..9b8894f47a 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-8-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-8-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 45 (Section 10.8 : Asymptote horizontale et verticale)
+
\begin{tikzpicture}[scale=1.25]
\tkzInit
\tkzGrid
@@ -16,11 +12,11 @@
\tkzHLine[line width=1pt,color=red]{1}
\tkzVLine[line width=1pt,color=blue]{2}
\tkzDefPoint(1,1){A}
- \tkzDrawPoint[fill=white,color=Maroon,size=10](A)
+ \tkzDrawPoint[fill=white,color=brown,size=6](A)
\tkzDefPointByFct[draw,with=b]({1+exp(1)})
\tkzLabelPoint[above right](tkzPointResult){$(1+\text{e}~;~2)$}
\tkzText[draw,color = black,fill = brown!20](6,6)%
{$f(x)=\dfrac{1}{\ln^2 (x-1)}+1$}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-1-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-1-0.tex
index e96d94592b..9b7d6f35f4 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-1-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-1-0.tex
@@ -1,16 +1,12 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 46 (Section 11.1 : Courbe paramétrée exemple 1)
+
\begin{tikzpicture}
\tkzInit[ymax=2.25,ystep=.5] \tkzGrid
\tkzAxeXY
\tkzFctPar[samples=400,domain=0:2*pi]{(t-sin(t))}{(1-cos(t))}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-2-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-2-0.tex
index d5a2a7c9e3..65bb2c0219 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-2-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-2-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 47 (Section 11.2 : Courbe paramétrée exemple 2)
+
\begin{tikzpicture}[scale=1.25]
\tkzInit[xmin=-50,xmax=50,xstep=10,
ymin=-50,ymax=50,ystep=10]
@@ -15,4 +11,4 @@
\tkzFctPar[smooth,samples=200,domain=0:50]{t*sin(t)}{t*cos(t)}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-3-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-3-0.tex
index a7c50423c9..7484370f2b 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-3-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-3-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 48 (Section 11.3 : Courbe paramétrée exemple 3)
+
\begin{tikzpicture}[scale=1.5]
\tkzInit[xmin=-2,xmax=10,xstep=2,ymin=-10,ymax=4,ystep=2]
\tkzGrid[sub]
@@ -15,4 +11,4 @@
\tkzFctPar[samples=400,domain=-pi:pi]{exp(t)*sin(t)}{exp(t)*cos(t)}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-4-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-4-0.tex
index 76cc471190..6c89c5b7f0 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-4-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-4-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 49 (Section 11.4 : Courbe paramétrée exemple 4)
+
\begin{tikzpicture}[scale=1.25]
\tkzInit[xmin=-1,xmax=1,xstep=.2,
ymin=-1,ymax=1,ystep=.2]
@@ -18,4 +14,4 @@
domain=0:2*pi]{(cos(t))**3}{(sin(t))**3}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-5-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-5-0.tex
index d65a219cd8..b45d54ba54 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-5-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-5-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 50 (Section 11.5 : Courbe paramétrée exemple 5)
+
\begin{tikzpicture}[scale=4]
\tkzInit[xmin=-1,xmax=1,ymin=-2,ymax=1]
\tkzClip
@@ -15,4 +11,4 @@
{(sin(t))**3}{cos(t)-(cos(t))**4}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-6-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-6-0.tex
index 761dc75065..4fa7ec308c 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-6-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-6-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 51 (Section 11.6 : Courbe paramétrée exemple 6)
+
\begin{tikzpicture}[scale=1.5]
\tkzInit[xmin=-.4,xmax=.4,xstep=.1,ymin=0,ymax=.7,ystep=.1]
\tkzClip
@@ -15,4 +11,4 @@
{sin(t)*cos(t)*log(abs(t))}{sqrt(abs(t))*cos(t)}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-7-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-7-0.tex
index 4f30e5b968..45ba1e77f5 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-7-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-7-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 52 (Section 11.7 : Courbe paramétrée exemple 7)
+
\begin{tikzpicture}[scale=1.75]
\tkzInit[xmin=-20,xmax=20,xstep=5,ymin=-25,ymax=15,ystep=5]
\tkzClip
@@ -15,4 +11,4 @@
{16*(sin(t))**3}{13*cos(t)-5*cos(2*t)-2*cos(3*t)-cos(4*t)}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-1-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-1-0.tex
index d4fbfc1990..844ef3ad7a 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-1-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-1-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 53 (Section 12.1 : Équation polaire exemple 1)
+
\begin{tikzpicture}[scale=0.75]
\tkzInit [xmin=-0.5,xmax=0.5,
ymin=-0.5,ymax=0.5,
@@ -15,4 +11,4 @@
\tkzFctPolar[domain=-2*pi:2*pi]{cos(t)*sin(t)}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-2-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-2-0.tex
index 972c5d54c9..a61de63123 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-2-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-2-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 54 (Section 12.2 : Équation polaire exemple 2)
+
\begin{tikzpicture}[scale=1.25]
\tkzInit [xmin=-1,xmax=1,
ymin=-1,ymax=1,
@@ -15,4 +11,4 @@
\tkzFctPolar[domain=0:2*pi]{cos(2*t)}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-3-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-3-0.tex
index 68ea16a048..10b89682fa 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-3-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-3-0.tex
@@ -1,19 +1,15 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 55 (Section 12.3 : Équation polaire Heart)
+
\begin{tikzpicture}[scale=3]
- \tkzInit[xmin=-5,xmax=5,ymin=-5,ymax=5]
- \tkzFctPolar[domain = -pi:pi,
- samples = 800,
- ball color = red,
- shading = ball]%
- {2-2*sin(t)+sin(t)*sqrt(abs(cos(t)))/(sin(t)+1.4)}
+ \tkzInit[xmin=-5,xmax=5,ymin=-5,ymax=5]
+ \tkzFctPolar[domain = -pi:pi,
+ samples = 800,
+ ball color = red,
+ shading = ball]%
+ {2-2*sin(t)+sin(t)*sqrt(abs(cos(t)))/(sin(t)+1.4)}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-4-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-4-0.tex
index 04699a9269..901097453b 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-4-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-4-0.tex
@@ -1,15 +1,11 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 56 (Section 12.4 : Équation polaire exemple 4)
+
\begin{tikzpicture}[scale=4]
\tkzInit [xmin=-5,xmax=5,ymin=-5,ymax=5,xstep=1,ystep=1]
\tkzFctPolar[domain=0:2*pi,samples=400]{ 1-sin(t) }
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-5-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-5-0.tex
index f912e69c1a..f410535b9b 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-5-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-5-0.tex
@@ -1,16 +1,12 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 57 (Section 12.5 : Équation polaire Cannabis ou Marijuana Curve)
+
\begin{tikzpicture}[scale=2.5]
\tkzInit [xmin=-5,xmax=5,ymin=-5,ymax=5,xstep=1,ystep=1]
\tkzFctPolar[domain=0:2*pi,samples=1000]%
{ (1+.9*cos(8*t))*(1+.1*cos(24*t))*(1+.1*cos(200*t))*(1+sin(t)) }
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-6-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-6-0.tex
index d9504dcfc6..a311f6ae26 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-6-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-6-0.tex
@@ -1,15 +1,11 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 58 (Section 12.6 : Scarabaeus Curve)
+
\begin{tikzpicture}[scale=2.5]
- \tkzInit [xmin=-5,xmax=5,ymin=-5,ymax=5,xstep=1,ystep=1]
- \tkzFctPolar[domain=0:2*pi,samples=400]{1.6*cos(2*t)-3*cos(t) }
- \end{tikzpicture}
+ \tkzInit [xmin=-5,xmax=5,ymin=-5,ymax=5,xstep=1,ystep=1]
+ \tkzFctPolar[domain=0:2*pi,samples=400]{1.6*cos(2*t)-3*cos(t) }
+ \end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-13-0-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-13-0-0.tex
index 2f6a66113c..071a69d456 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-13-0-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-13-0-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 59 (Section 13 : Symboles)
+
\begin{tikzpicture}
\tkzInit[xmin=-1,xmax=6,ymin=0,ymax=10,xstep=1,ystep=1]
\tkzGrid[color=gray]
@@ -16,4 +12,4 @@
\tkzFct[{]-},color=green!50!black,domain =3:6,samples=2]{2*\x-4}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-1-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-1-0.tex
index 67d567bb53..29c14fb7e2 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-1-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-1-0.tex
@@ -1,24 +1,20 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
- \begin{tikzpicture}[scale=3]
- \tkzInit[xmin=0,xmax=4,ymin=-1.5,ymax=1.5]
- \tkzAxeY[label=$f(x)$]
- \tkzDefPoint(1,0){x} \tkzDrawPoint[color=blue,size=0.6pt](x)
- \shade[top color=gray!80,bottom color=gray!20] (1,0)%
- plot[id=ln,domain=1:2.718] function{log(x)} |-(1,0);
- \draw[color=blue] plot[id=ln,domain=0.2:4,samples=200]function{log(x)};
- \tkzAxeX
- \tkzText[draw,color= black,fill=brown!50](2,-1)%
- {$\mathcal{A} = \int_1^{\text{e}}\ln(x)\text{d}x =%
- \big[x\ln(x)\big]_{1}^{\text{e}} = \text{e}$}
- \tkzText[draw,color= black,fill=brown!50](2,0.3){$\mathcal{A}$}
- \end{tikzpicture}
+% Ex. No. 60 (Section 14.1 : Variante intermédiaire : \TIKZ\ + \tkzname{tkz-fct})
+
+ \begin{tikzpicture}[scale=3]
+ \tkzInit[xmin=0,xmax=4,ymin=-1.5,ymax=1.5]
+ \tkzAxeY[label=$f(x)$]
+ \tkzDefPoint(1,0){x} \tkzDrawPoint[color=blue,size=0.6pt](x)
+ \shade[top color=gray!80,bottom color=gray!20] (1,0)%
+ plot[id=ln,domain=1:2.718] function{log(x)} |-(1,0);
+ \draw[color=blue] plot[id=ln,domain=0.2:4,samples=200]function{log(x)};
+ \tkzAxeX
+ \tkzText[draw,color= black,fill=brown!50](2,-1)%
+ {$\mathcal{A} = \int_1^{\text{e}}\ln(x)\text{d}x =%
+ \big[x\ln(x)\big]_{1}^{\text{e}} = \text{e}$}
+ \tkzText[draw,color= black,fill=brown!50](2,0.3){$\mathcal{A}$}
+ \end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-2-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-2-0.tex
index b28c809626..af23e82210 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-2-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-2-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 61 (Section 14.2 : Courbes de \tkzname{Lorentz})
+
\begin{tikzpicture}[scale=1]
\tkzInit[xmax=1,ymax=1,xstep=0.1,ystep=0.1]
\tkzGrid(0,0)(1,1)
@@ -25,4 +21,4 @@
\tkzDrawAreafg[between=c and a,color=red!60,domain = 0:1]
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-3-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-3-0.tex
index 43cf4044df..c077890e2f 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-3-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-3-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 62 (Section 14.3 : Courbe exponentielle)
+
\begin{tikzpicture}[scale=1.25]
\tkzInit[xmin=-6,xmax=4,ymin=-5,ymax=6]
\tkzGrid
@@ -20,4 +16,4 @@
\tkzText(-2,-3){($\mathcal{T}$)}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-4-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-4-0.tex
index 290560596a..46da6372b2 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-4-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-4-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 63 (Section 14.4 : Axe logarithmique)
+
\begin{tikzpicture}[scale=0.8]
\tkzInit[xmax=14,ymax=12]
\draw[thin,->] (0,0) -- (14,0) node[below left] {};
@@ -27,4 +23,4 @@
\tkzLabelPoint(b){$M_{11}$}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-5-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-5-0.tex
index e72e2c5253..e943de9a7d 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-5-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-5-0.tex
@@ -1,16 +1,15 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 64 (Section 14.5 : Un peu de tout)
+
\begin{tikzpicture}[scale=.8]
\tkzInit[xmin=5,xmax=40,ymin=0,ymax=350,xstep=2.5,ystep=25]
- \tkzAxeX[label=$q$]
- \tkzAxeY[label=$C(q)$] \tkzGrid
+ \tkzDrawX[label=$q$]
+ \tkzLabelX
+ \tkzDrawY[label=$C(q)$]
+ \tkzLabelY
+ \tkzGrid
\tkzFct[domain=5:40]{0.1*\x**2+2*\x+60}
\foreach \vv in {5,10,...,40}{%
\tkzDefPointByFct(\vv)
@@ -23,4 +22,4 @@
\tkzDrawSetOfPoints[mark = x,mark size=3pt]
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-6-1.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-6-1.tex
index 416c701d18..73f217354f 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-6-1.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-6-1.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 65 (Section 14.6.1 : Le code)
+
\begin{tikzpicture}
\tkzInit[xmin=-1,xmax=1,ymin=-1.8,ymax=1.2,xstep=0.1,ystep=0.2]
\tkzGrid
@@ -38,4 +34,4 @@
\foreach \v in {-1,-0.8,---.,1}{\tkzDefPointByFct[draw](\v)}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-1.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-1.tex
index 5e37982ce5..48f7a80220 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-1.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-1.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 66 (Section 14.7.1 : Tableau de variations)
+
\begin{tikzpicture}
\tkzTab%
{ $v$ /1,%
@@ -21,6 +17,6 @@
{-/ $0$ /,%
+/$\dfrac{8}{27b}$ /,%
-/ $0$ /}%
- \end{tikzpicture}
+\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-2.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-2.tex
index d844d5799a..d543f04cc6 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-2.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-2.tex
@@ -1,21 +1,17 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
- \begin{tikzpicture}[xscale=2,yscale=2.5]
- \tkzInit[xmin=0,xmax=6,ymax=0.5,ystep=0.1]
- \tkzDrawX[label=$v$]
- \tkzDrawY[label=$g(v)$]
- \tkzGrid(0,0)(6,0.5)
- \tkzFct[color = red,domain =1:6]{(2*(x-1)*(x-1))/(x*x*x)}
- \tkzDrawTangentLine[color=blue,draw](3)
- \tkzDefPointByFct(1)
- \tkzText[draw, fill = brown!30](4,0.1){$g(v)=2\dfrac{(v-1)^2}{v^3}$}
- \end{tikzpicture}
+% Ex. No. 67 (Section 14.7.2 : Première courbe avec $ b=1$)
+
+ \begin{tikzpicture}[xscale=2,yscale=2.5]
+ \tkzInit[xmin=0,xmax=6,ymax=0.5,ystep=0.1]
+ \tkzDrawX[label=$v$]
+ \tkzDrawY[label=$g(v)$]
+ \tkzGrid(0,0)(6,0.5)
+ \tkzFct[color = red,domain =1:6]{(2*(x-1)*(x-1))/(x*x*x)}
+ \tkzDrawTangentLine[color=blue,draw](3)
+ \tkzDefPointByFct(1)
+ \tkzText[draw, fill = brown!30](4,0.1){$g(v)=2\dfrac{(v-1)^2}{v^3}$}
+ \end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-3.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-3.tex
index 52d3f27ede..c46720bfce 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-3.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-3.tex
@@ -1,21 +1,17 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
- \begin{tikzpicture}[scale=1.2]
- \tkzInit[xmin=0,xmax=2,xstep=0.2,ymax=1,ystep=0.1]
- \tkzAxeXY
- \tkzGrid(0,0)(2,1)
- \tkzFct[color = red,domain =1/3:2]{(2*(\x-1./3)*(\x-1./3))/(\x*\x*\x)}
- \tkzDrawTangentLine[draw,color=blue,kr=.5,kl=.5](1)
- \tkzDefPointByFct(1)
- \tkzText[draw,fill = brown!30](1.2,0.3)%
- {$g(v)=2\dfrac{\left(v-\dfrac{1}{3}\right)^2}{v^3}$}
- \end{tikzpicture}
+% Ex. No. 68 (Section 14.7.3 : Deuxième courbe $b=1/3$ )
+
+ \begin{tikzpicture}[scale=1.2]
+ \tkzInit[xmin=0,xmax=2,xstep=0.2,ymax=1,ystep=0.1]
+ \tkzAxeXY
+ \tkzGrid(0,0)(2,1)
+ \tkzFct[color = red,domain =1/3:2]{(2*(\x-1./3)*(\x-1./3))/(\x*\x*\x)}
+ \tkzDrawTangentLine[draw,color=blue,kr=.5,kl=.5](1)
+ \tkzDefPointByFct(1)
+ \tkzText[draw,fill = brown!30](1.2,0.3)%
+ {$g(v)=2\dfrac{\left(v-\dfrac{1}{3}\right)^2}{v^3}$}
+ \end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-4.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-4.tex
index 5c5497a3c3..da73665eeb 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-4.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-4.tex
@@ -1,21 +1,17 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
- \begin{tikzpicture}[scale=1.2]
- \tkzInit[xmin=0,xmax=10,ymax=.35,ystep=0.05];
- \tkzAxeXY
- \tkzGrid(0,0)(10,.35)
- \tkzFct[color = red,
- domain =1.185:10]{(2*(\x-32./27)*(\x-32./27))/(\x*\x*\x)}
- \tkzDrawTangentLine[draw,color=blue,kr=2,kl=2](3.555)
- \tkzText[draw,fill = brown!30](5,0.3)%
- {$g(v)=2\dfrac{\left(v-\dfrac{32}{27}\right)^2}{v^3}$}
- \end{tikzpicture}
+% Ex. No. 69 (Section 14.7.4 : Troisième courbe $ b=32/27$ )
+
+ \begin{tikzpicture}[scale=1.2]
+ \tkzInit[xmin=0,xmax=10,ymax=.35,ystep=0.05];
+ \tkzAxeXY
+ \tkzGrid(0,0)(10,.35)
+ \tkzFct[color = red,
+ domain =1.185:10]{(2*(\x-32./27)*(\x-32./27))/(\x*\x*\x)}
+ \tkzDrawTangentLine[draw,color=blue,kr=2,kl=2](3.555)
+ \tkzText[draw,fill = brown!30](5,0.3)%
+ {$g(v)=2\dfrac{\left(v-\dfrac{32}{27}\right)^2}{v^3}$}
+ \end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-8-1.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-8-1.tex
index a459ea7628..a5c1afc3e3 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-8-1.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-8-1.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 70 (Section 14.8.1 : Courbes de \tkzname{Van der Walls} )
+
\begin{tikzpicture}[scale=4]
\tkzInit[xmax=3,ymax=2];
\tkzAxeXY
@@ -26,4 +22,4 @@
\tkzText[draw,fill = white,text=green](2,0.4){$g(x) = \dfrac{3x-1}{8}$}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-8-2.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-8-2.tex
index 35d406fef9..4012a55b00 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-8-2.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-8-2.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 71 (Section 14.8.2 : Courbes de \tkzname{Van der Walls} (suite))
+
\begin{tikzpicture}[xscale=4,yscale=1.5]
\tkzInit[xmin=0,xmax=3,ymax=3,ymin=-4]
\tkzGrid(0,-4)(3,3)
@@ -17,10 +13,10 @@
\tkzFct[color=blue,domain = 0.35:3]{-3/(x*x) +27/(4*(3*x-1))}
\tkzFct[color=orange,domain = 0.35:3]{-3/(x*x) +8/(3*x-1)}
\tkzFct[color=green,domain = 0.35:3]{-3/(x*x) +7/(3*x-1)}
- \tkzText[draw,fill = white,text=Maroon](2,-2)%
+ \tkzText[draw,fill = white,text=brown](2,-2)%
{$f(x)=-\dfrac{3}{x^2}+\dfrac{8\alpha}{3x-1}$ \hspace{.5cm}%
avec $\alpha \in%
\left\{\dfrac{1}{2}~;~\dfrac{27}{32}~;~\dfrac{7}{8}~;~1\right\}$}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-15-0-3.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-15-0-1.tex
index 3ab7a8c04a..10ba742294 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-15-0-3.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-15-0-1.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 72 (Section 15.0.1 : Première représentation)
+
\begin{tikzpicture}[xscale=2.25,yscale=1]
\tkzInit[xmin=-2,xmax=3,ymin=-1,ymax=6]
\tkzDrawX
@@ -19,6 +15,6 @@
\tkzDrawPoint(pt2)
\tkzPointShowCoord[xlabel=$2$,ylabel=$\text{e}+2$](pt2)
\tkzRep
- \end{tikzpicture}
+\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-15-0-4.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-15-0-2.tex
index 6d7fb2fad7..5fc013f510 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-15-0-4.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-15-0-2.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 73 (Section 15.0.2 : Seconde représentation)
+
\begin{tikzpicture}[xscale=2.25,yscale=1]
\tkzInit[xmin=-2,xmax=3,ymin=-1,ymax=6]
\tkzDrawX
@@ -21,4 +17,4 @@
\tkzRep
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-16-1-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-16-1-0.tex
index f38e0fe263..d56bdd5f44 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-16-1-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-16-1-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 74 (Section 16.1 : \tkzname{pgfmath})
+
\begin{tikzpicture}
\def\Asmall{0.7 } \def\Abig{3 } \def\B{20}%Herbert Voss
\path[fill=blue!40!black,domain=-pi:pi,samples=500,smooth,variable=\t]%
@@ -19,4 +15,4 @@
{0.5*\Abig*sin(\t r)+0.5*\Asmall*sin(\B*\t r)});
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-16-2-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-16-2-0.tex
index 5964b6ad52..d3f8c51548 100644
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-16-2-0.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-16-2-0.tex
@@ -1,12 +1,8 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
+\input{preamble-standalone.ltx}
\begin{document}
+% Ex. No. 75 (Section 16.2 : \tkzname{fp.sty})
+
\begin{tikzpicture}
\tkzInit[xmin=-0.2,xmax=0.2,xstep=.1,
ymin=-12,ymax=6,ystep=2]
@@ -16,4 +12,4 @@
{-5+x*(0.5+4*x*(x*(-2+x*1)))}
\end{tikzpicture}
-\end{document}
+\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-3-3-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-3-3-0.tex
deleted file mode 100644
index a5e1873af9..0000000000
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-3-3-0.tex
+++ /dev/null
@@ -1,16 +0,0 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
-\begin{document}
-
- \begin{tikzpicture}
- \tkzInit[xmin=-5,xmax=5,ymax=2]
- \tkzGrid
- \tkzAxeXY
- \end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-3-4-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-3-4-0.tex
deleted file mode 100644
index 93270e1c29..0000000000
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-3-4-0.tex
+++ /dev/null
@@ -1,17 +0,0 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
-\begin{document}
-
-\begin{tikzpicture}[scale=1.25]
- \tkzInit[xmin=-5,xmax=5,ymax=2]
- \tkzGrid
- \tkzAxeXY
- \tkzFct[color=red]{2*x**2/(x**2+1)}
- \end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-8-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-8-0.tex
deleted file mode 100644
index d8d928beb2..0000000000
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-8-0.tex
+++ /dev/null
@@ -1,19 +0,0 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
-\begin{document}
-
- \begin{tikzpicture}[scale=2]
- \tkzInit[xmin=-3,xmax=3, ymin=-1,ymax=3]
- \tkzGrid[sub,subxstep=.5,subystep=.5]
- \tkzAxeXY
- \tkzFct[domain = -3:2]{(2-x)*exp(x)}
- \tkzText(-2,1.25){$\mathcal{C}_{f}$}
- \tkzDefPoint(2,0){A} \tkzDrawPoint(A) \tkzLabelPoints(A)
- \end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-6-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-6-0.tex
deleted file mode 100644
index 5b258b1fdd..0000000000
--- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-6-0.tex
+++ /dev/null
@@ -1,18 +0,0 @@
-%
-% tkz-euclide (14/01/2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Author Alain Matthes
-\input{tkzfctpreamble.ltx}
-
-\begin{document}
-
- \begin{tikzpicture}[scale=1.5]
- \tkzInit[xmax=5,ymax=5]
- \tkzGrid \tkzAxeXY
- \tkzFct[domain = 0:5]{x}
- \tkzFct[domain = 1:5]{log(x)}
- \tkzDrawAreafg[color = orange!50,domain = 1:5]
- \end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/tkzfctpreamble.ltx b/macros/latex/contrib/tkz/tkz-fct/examples/tkzfctpreamble.ltx
deleted file mode 100644
index b2465e4499..0000000000
--- a/macros/latex/contrib/tkz/tkz-fct/examples/tkzfctpreamble.ltx
+++ /dev/null
@@ -1,18 +0,0 @@
-%
-% tkzfctpreamble (juin 2011)
-%
-% Coding (utf8) Creator (TeX) Producer (pdfeTeX)
-% Copyright (C) 2010 Alain Matthes
-%
-\documentclass{scrartcl}
-\usepackage[usenames,dvipsnames,svgnames]{xcolor}
-\usepackage{amsmath,tkz-tab,tkz-euclide,tkz-fct}
-\usetkzobj{all}
-
-\definecolor{bistre}{rgb}{.75,.50,.30}
-\definecolor{Maroon}{rgb}{0.5,0.0,0.0}
-\definecolor{fondpaille}{cmyk}{0,0,0.1,0}
-\pagecolor{fondpaille}
-\color{Maroon}
-\tkzSetUpColors[background=fondpaille,text=Maroon]
-
diff --git a/macros/latex/contrib/tkz/tkz-fct/latex/tkz-fct.sty b/macros/latex/contrib/tkz/tkz-fct/latex/tkz-fct.sty
index 86aa260a02..881066229b 100644
--- a/macros/latex/contrib/tkz/tkz-fct/latex/tkz-fct.sty
+++ b/macros/latex/contrib/tkz/tkz-fct/latex/tkz-fct.sty
@@ -1,27 +1,17 @@
-% Copyright 2011 by Alain Matthes
+% Copyright 2020 by Alain Matthes
%
% This file may be distributed and/or modified
%
% 1. under the LaTeX Project Public License and/or
% 2. under the GNU Public License.
-%
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- % %
- % tkz-fct.sty encodage : utf8 %
- % %
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- % %
- % Créé par Alain Matthes le 16-01-2011 %
- % %
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Objet : fonctions numériques en 2D with gnuplot
-
% constants from tkz-base
% \tkz@init@xstep
% \tkz@init@ystep
+\typeout{2020/02/06 1.2 beta function tkz-fct}
%<--------------------------------------------------------------------------->
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tkz-fct}[2011/06/01 1.16 c function ]
+\ProvidesPackage{tkz-fct}[2020/02/06 1.2 beta function ]
\newcount\tkz@tkzf@fct
\edef\tkzTWOPTCode{\the\catcode`\:}
\tkz@tkzf@fct=0 %
@@ -29,7 +19,7 @@
%<--------------------------------------------------------------------------->
% Initialisation
%<--------------------------------------------------------------------------->
-\RequirePackage{tkz-base}
+\RequirePackage{tkz-base,fp}
% % Code from Christian Tellechea 2009 % modified by AM
% modified \FP@pow from fp.sty
\def\FP@pow#1#2#3{%
@@ -82,26 +72,28 @@
\newif\iftkz@draw
\newif\iftkz@fp
\def\tkz@dmin{-5}\def\tkz@dmax{5}
-\pgfkeys{%
-/tkzfct/.cd,
-domain/.code args={#1:#2} {\FPeval\tkz@min{(#1)}
- \FPeval\tkz@max{(#2)}},
-samples/.code = {\edef\tkz@fct@samples{#1}},
-id/.code = {\edef\tkz@fct@id{#1}},
-fp/.is if = tkz@fp,
-fp/.default = false,
-/tkzfct/.unknown/.code = {\let\searchname=\pgfkeyscurrentname
- \pgfkeysalso{\searchname/.try=#1,
- /tikz/\searchname/.retry=#1}}}
+\global\let\tkz@tmp@xa\tkz@init@xmin% modif 2016
+\global\let\tkz@tmp@xb\tkz@init@xmax% modif 2016
+\global\let\tkz@tmp@ya\tkz@init@ymin% modif 2016
+\global\let\tkz@tmp@yb\tkz@init@ymax% modif 2016
+\catcode`\:=12
+\pgfkeys{/@tkzfct/.cd,
+ domain/.code args = {#1:#2} {\FPeval\tkz@min{(#1)}
+ \FPeval\tkz@max{(#2)}},
+ domain = \tkz@tmp@xa:\tkz@tmp@xb,
+ samples/.store in = \tkz@fct@samples,
+ id/.store in = \tkz@fct@id,
+ fp/.is if = tkz@fp,
+ fp/.default = false,
+ samples = 200,
+ fp = true,
+ id = tkzfct,
+ /@tkzfct/.search also = {/tikz},
+}%
\def\tkzFct{\pgfutil@ifnextchar[{\tkzActivOff\tkz@fct}{\tkz@fct[]}}
\def\tkz@fct[#1]#2{%
-\pgfkeys{/tkzfct/.cd,
-domain = \@xa:\@xb,
-samples = 200,
-fp = true,
-id = tkzfct}
-\pgfqkeys{/tkzfct}{#1}%
+\pgfqkeys{/@tkzfct}{#1}%
\iftkz@init@NO%
\FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}%
\FPdiv{\tkz@y@delta}{\tkz@init@yorigine}{\tkz@init@ystep}%
@@ -116,12 +108,14 @@ id = tkzfct}
\def\x{(x*\tkz@init@xstep)}%
\expandafter\edef\csname tkzFctgnu\@alph\tkz@tkzf@fct \endcsname{#2}%
\expandafter\edef\csname tkzFctgnuLast\endcsname{#2}
-\begin{scope}[samples = \tkz@fct@samples,#1]
- \clip (\tkz@xa,\tkz@ya) rectangle (\tkz@xb,\tkz@yb);
- \draw[xshift = -\tkz@x@delta cm,yshift = -\tkz@y@delta cm,/tkzfct/.cd]%
- plot[id=\tkz@fct@id,domain= \tkz@ba:\tkz@bb]%
- function{(#2)/\tkz@init@ystep};%
-\end{scope}
+% %%%%%%%
+\begin{scope}
+ \clip (\tkz@xa,\tkz@ya) rectangle (\tkz@xb,\tkz@yb);
+ \draw[#1, xshift = -\tkz@x@delta cm,yshift = -\tkz@y@delta cm]%
+ plot[ samples = \tkz@fct@samples,id=\tkz@fct@id,
+ domain= \tkz@ba:\tkz@bb] function{(#2)/\tkz@init@ystep};%
+\end{scope}
+% %%%%%%%
\let\tkz@tmp@xstep\tkz@init@xstep
\def\tkz@init@xstep{1}
\iftkz@fp%
@@ -140,27 +134,25 @@ id = tkzfct}
%<--------------------------------------------------------------------------->
% point d'une courbe (new method)
%<--------------------------------------------------------------------------->
-\pgfkeys{%
-/tkzfctpt/.cd,
-draw/.is if = tkz@draw,
-draw/.default = true,
-with/.code = \global\def\tkz@fct@used{#1},
-ref/.code = \global\def\tkz@fct@ref{#1}}
+\pgfkeys{/tkzfctpt/.cd,
+ draw/.is if = tkz@draw,
+ draw/.default = true,
+ with/.store in = \tkz@fct@used,
+ ref/.store in = \tkz@fct@ref,
+ draw = false,
+ with = {},
+ ref = {}
+ }
\def\tkzDefPointByFct{\pgfutil@ifnextchar[{\tkz@fctpoint}{\tkz@fctpoint[]}}
\def\tkz@fctpoint[#1](#2){%
-\pgfkeys{/tkzfctpt/.cd,
- draw = false,
- with = {},
- ref = {}}
\pgfqkeys{/tkzfctpt}{#1}
-
- \FPeval\x{(#2)}%
+ \FPeval\x{(#2)}%
\ifx\tkzutil@empty\tkz@fct@used
\FPeval\tkz@fx{\tkzFctLast}
\else
\edef\tkz@fct{\csname tkzFct\tkz@fct@used\endcsname}
- \FPeval\tkz@fx{\tkz@fct}
+ \FPeval\tkz@fx{\tkz@fct}
\fi
\tkzDefPoint(\x,\tkz@fx){tkzPointResult}%
\iftkz@draw
@@ -174,28 +166,24 @@ ref/.code = \global\def\tkz@fct@ref{#1}}
%<--------------------------------------------------------------------------->
% tangente \tkzDrawTangentLine
%<--------------------------------------------------------------------------->
-\pgfkeys{%
-/tkztan/.cd,
-draw/.is if = tkz@draw,
-draw/.default = true,
-with/.code = \global\def\tkz@fct@used{#1},
-kr/.code = {\edef\tkz@tan@kr{#1}},
-kl/.code = {\edef\tkz@tan@kl{#1}},
-/tkztan/.unknown/.code = {\let\searchname=\pgfkeyscurrentname
- \pgfkeysalso{\searchname/.try=#1,
- /tikz/\searchname/.retry=#1}}
+\pgfkeys{/@tkztan/.cd,
+ with/.store in = \tkz@fct@used,
+ kr/.store in = \tkz@tan@kr,
+ kl/.store in = \tkz@tan@kl,
+ draw/.is if = tkz@draw,
+ draw/.default = true,
+ draw = false,
+ with = {},
+ kr = 1,
+ kl = 1,
+ /@tkztan/.search also = {/tikz},
}%
%<--------------------------------------------------------------------------->
\def\tkzDrawTangentLine{\pgfutil@ifnextchar[{\tkz@DrawTangentLine}{%
\tkz@DrawTangentLine[]}}
\def\tkz@DrawTangentLine[#1](#2){%
\begingroup
-\pgfkeys{/tkztan/.cd,
- draw = false,
- with = {},
- kr = 1,
- kl = 1}
-\pgfqkeys{/tkztan}{#1}
+\pgfqkeys{/@tkztan}{#1}
\FPeval\x{(#2)}%
\ifx\tkzutil@empty\tkz@fct@used
\FPeval\tkz@img{\tkzFctLast}
@@ -219,7 +207,7 @@ kl/.code = {\edef\tkz@tan@kl{#1}},
\FPadd{\tkz@deltay}{\tkz@old@img}{-\tkz@img}%
\FPmul{\tkz@slope}{\tkz@deltay}{1000000}%
\protected@edef\tkz@temp{%
-\noexpand\draw[/tkztan/tan style,/tkztan/.cd,#1]}\tkz@temp%
+\noexpand\draw[/tkztan/tan style,/@tkztan/.cd,#1]}\tkz@temp%
(tkzPointResult)--++(\tkz@krx,-\tkz@kry*\tkz@slope);
\fi
% demi tgt --> gauche
@@ -230,7 +218,7 @@ kl/.code = {\edef\tkz@tan@kl{#1}},
\FPadd{\tkz@deltay}{\tkz@old@img}{-\tkz@img}
\FPmul{\tkz@slope}{\tkz@deltay}{-1000000}
\protected@edef\tkz@temp{%
-\noexpand\draw[/tkztan/tan style,/tkztan/.cd,#1]}\tkz@temp%
+\noexpand\draw[/tkztan/tan style,/@tkztan/.cd,#1]}\tkz@temp%
(tkzPointResult)--++(-\tkz@klx,\tkz@kly*\tkz@slope);
\fi
\iftkz@draw
@@ -239,29 +227,26 @@ kl/.code = {\edef\tkz@tan@kl{#1}},
\endgroup
}
%<--------------------------------------------------------------------------->
-% tkzArea
+% tkzArea
%<--------------------------------------------------------------------------->
\pgfkeys{%
/tkzarea/.cd,
-domain/.code args={#1:#2} {\FPeval\tkz@min{(#1)}
- \FPeval\tkz@max{(#2)}},
-opacity/.code = {\edef\tkz@fct@opacity{#1}},
-id/.code = {\edef\tkz@fct@id{#1}},
-color/.code = {\edef\tkz@fct@color{#1}},
-samples/.code = {\edef\tkz@fct@samples{#1}},
-/tkzarea/.unknown/.code = {\let\searchname=\pgfkeyscurrentname
- \pgfkeysalso{\searchname/.try=#1,
- /tikz/\searchname/.retry=#1}}}
+ domain/.code args={#1:#2} {\FPeval\tkz@min{(#1)}
+ \FPeval\tkz@max{(#2)}},
+ opacity/.store in = \tkz@fct@opacity,
+ id/.store in = \tkz@fct@id,
+ color/.store in = \tkz@fct@color,
+ samples/.store in = \tkz@fct@samples,
+ domain = -5:5,
+ color = \tkz@otherlinecolor,
+ samples = 200,
+ id = tkzfonct,
+ opacity = .5,
+ /tkzarea/.search also = {/tikz}
+ }
\def\tkzArea{\pgfutil@ifnextchar[{\catcode`\:=12 \tkz@aire}{\tkz@aire[]}}
\def\tkz@aire[#1]{%
-\begingroup
-\pgfkeys{%
-/tkzarea/.cd,
-domain = -5:5,
-color = \tkz@otherlinecolor,
-samples = 200,
-id = tkzfonct,
-opacity = .5}
+\begingroup
\pgfqkeys{/tkzarea}{#1}
\iftkz@init@NO
\FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}%
@@ -287,39 +272,37 @@ opacity = .5}
\endgroup
}
\let\tkzDrawArea\tkzArea
+
%<--------------------------------------------------------------------------->
% tkzAreafg
%<--------------------------------------------------------------------------->
-\pgfkeys{/tkzareafg/.cd,
-domain/.code args={#1:#2} {\FPeval\tkz@min{(#1)}
- \FPeval\tkz@max{(#2)}},
-between/.code args={#1 and #2}{\def\tkz@below{#1}
- \def\tkz@above{#2}},
-opacity/.code = {\edef\tkz@fct@opacity{#1}},
-id/.code = {\edef\tkz@fct@id{#1}},
-color/.code = {\edef\tkz@fct@color{#1}},
-samples/.code = {\edef\tkz@fct@samples{#1}},
-/tkzareafg/.unknown/.code = {\let\searchname=\pgfkeyscurrentname
- \pgfkeysalso{\searchname/.try=#1,
- /tikz/\searchname/.retry=#1}}}
-\def\tkzAreafg{\pgfutil@ifnextchar[{\tkz@airefg}{\tkz@airefg[]}}
+\pgfkeys{/@tkzareafg/.cd,
+ domain/.code args ={#1:#2} {\FPeval\tkz@min{(#1)}
+ \FPeval\tkz@max{(#2)}},
+ between/.code args ={#1 and #2}{\def\tkz@below{#1}
+ \def\tkz@above{#2}},
+ opacity/.store in = \tkz@fct@opacity,
+ id/.store in = \tkz@fct@id,
+ color/.store in = \tkz@fct@color,
+ samples/.store in = \tkz@fct@samples,
+ domain = -5:5,
+ between = a and b,
+ color = lightgray,
+ samples = 200,
+ id = tkzfonct,
+ opacity = .5,
+ /@tkzareafg/.search also = {/tikz}
+ }
+\def\tkzAreafg{\pgfutil@ifnextchar[{\tkz@airefg}{\tkz@airefg[]}}
\def\tkz@airefg[#1]{%
\begingroup
-\pgfkeys{/tkzareafg/.cd,
-domain = -5:5,
-between = a and b,
-color = lightgray,
-samples = 200,
-id = tkzfonct,
-opacity = .5
-}
-\pgfqkeys{/tkzareafg}{#1}
+\pgfqkeys{/@tkzareafg}{#1}
\def\tkz@fctsup{\csname tkzFctgnu\tkz@below\endcsname}
\def\tkz@fctinf{\csname tkzFctgnu\tkz@above\endcsname}
\iftkz@init@NO%
\FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}%
\FPdiv{\tkz@y@delta}{\tkz@init@yorigine}{\tkz@init@xstep}%
-\else
+\else
\FPset{\tkz@x@delta}{0}
\FPset{\tkz@y@delta}{0}%
\fi%
@@ -329,34 +312,33 @@ opacity = .5
\FPdiv\tkz@bb{\tkz@max}{\tkz@init@xstep}
\begin{scope}[domain = \tkz@ba:\tkz@bb,
samples = \tkz@fct@samples,
- id = \tkz@fct@id]
+ id = \tkz@fct@id]
\clip (\tkz@ba,\tkz@ya)--plot function{(\tkz@fctsup)/\tkz@init@ystep}%
--(\tkz@bb,\tkz@ya);%
\clip (\tkz@ba,\tkz@yb)--plot function{(\tkz@fctinf)/\tkz@init@ystep}%
--(\tkz@bb,\tkz@yb);
\fill [color = \tkz@fct@color,
fill opacity = \tkz@fct@opacity,
- /tkzareafg/.cd,
+ /@tkzareafg/.cd,
#1]%
(\tkz@ba,\tkz@ya) rectangle (\tkz@bb,\tkz@yb);
\end{scope}
\endgroup
-}
-\let\tkzDrawAreafg\tkzAreafg
-\def\tkz@pamin{-5}\def\tkz@pamax{5}
+}
+\let\tkzDrawAreafg\tkzAreafg
+\def\tkz@pamin{-5}\def\tkz@pamax{5}
%<--------------------------------------------------------------------------->
-% tkzFctPar
+% tkzFctPar
%<--------------------------------------------------------------------------->
-\def\tkzFctPar{\pgfutil@ifnextchar[{\catcode`\:=12 \tkz@fctp}{\tkz@fctp[]}}
+\def\tkzFctPar{\pgfutil@ifnextchar[{\catcode`\:=12 \tkz@fctp}{\tkz@fctp[]}}
\def\tkz@fctp[#1]#2#3{%
\begingroup
-\pgfkeys{%
-/tkzfct/.cd,
-domain = \tkz@pamin:\tkz@pamax,
-samples = 200,
-fp = true,
-id = tkzfct}
-\pgfqkeys{/tkzfct}{#1}
+\pgfkeys{/@tkzfct/.cd,
+ domain = \tkz@pamin:\tkz@pamax,
+ samples = 200,
+ fp = true,
+ id = tkzfct}
+\pgfqkeys{/@tkzfct}{#1}
\iftkz@init@NO%
\FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}%
\FPdiv{\tkz@y@delta}{\tkz@init@yorigine}{\tkz@init@ystep}%
@@ -369,29 +351,29 @@ id = tkzfct}
\clip (\tkz@xa,\tkz@ya) rectangle (\tkz@xb,\tkz@yb);
\draw [xshift = -\tkz@x@delta cm,%
yshift = -\tkz@y@delta cm,
- /tkzfct/.cd, #1]%
+ /@tkzfct/.cd, #1]%
plot [parametric,domain = \tkz@min:\tkz@max,%
id = tkzparfct]%
function {(#2)/\tkz@init@xstep,(#3)/\tkz@init@ystep};
\tkzActivOn
\end{scope}
\endgroup
-}
+}
%<--------------------------------------------------------------------------->
-% tkzFctPolar
+% tkzFctPolar
%<--------------------------------------------------------------------------->
-\def\tkz@pomin{0}\def\tkz@pomax{2*pi}
+\def\tkz@pomin{0}\def\tkz@pomax{2*pi}
\def\tkzFctPolar{\pgfutil@ifnextchar[{%
- \catcode`\:=12 \tkz@FctPolar}{\tkz@FctPolar[]}}
+ \catcode`\:=12 \tkz@FctPolar}{\tkz@FctPolar[]}}
\def\tkz@FctPolar[#1]#2{%
\begingroup
-\pgfkeys{%
-/tkzfct/.cd,
-domain = \tkz@pomin:\tkz@pomax,
-fp = true,
-samples = 200,
-id = tkzfctpolar}
-\pgfqkeys{/tkzfct}{#1}
+\pgfkeys{/@tkzfct/.cd,
+ domain = \tkz@pomin:\tkz@pomax,
+ fp = true,
+ samples = 200,
+ id = tkzfctpolar
+ }
+\pgfqkeys{/@tkzfct}{#1}
\iftkz@init@NO%
\FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}%
\FPdiv{\tkz@y@delta}{\tkz@init@yorigine}{\tkz@init@ystep}%
@@ -399,40 +381,40 @@ id = tkzfctpolar}
\FPset{\tkz@x@delta}{0}
\FPset{\tkz@y@delta}{0}%
\fi%
-
+
\begin{scope}
\tkzActivOff
\draw [xshift = -\tkz@x@delta cm,%
yshift = -\tkz@y@delta cm,
- /tkzfct/.cd, #1]%
+ /@tkzfct/.cd, #1]%
plot [raw gnuplot,id = tkzpolarfct]%
function { set polar;set samples \tkz@fct@samples ; set trange [\tkz@min:\tkz@max]; plot (#2)/\tkz@init@xstep};
\tkzActivOn
\end{scope}
\endgroup
-}
+}
%<--------------------------------------------------------------------------->
-% tkzDrawRiemannSum
+% tkzDrawRiemannSum
%<--------------------------------------------------------------------------->
-\pgfkeys{/tkzriemann/.cd,
-interval/.code args={#1:#2} {\FPeval\tkz@min{(#1)}
- \FPeval\tkz@max{(#2)}},
-number/.code = {\edef\tkz@fct@nb{#1}},
-opacity/.code = {\edef\tkz@fct@opacity{#1}},
-color/.code = {\edef\tkz@fct@color{#1}},
-/tkzriemann/.unknown/.code = {\let\searchname=\pgfkeyscurrentname
- \pgfkeysalso{\searchname/.try=#1,
- /tikz/\searchname/.retry=#1}}} \def\tkzDrawRiemannSum{\pgfutil@ifnextchar[{%
- \catcode`\:=12 \tkz@DrawRiemannSum}{\tkz@DrawRiemannSum[]}}
+\pgfkeys{/@tkzriemann/.cd,
+ interval/.code args={#1:#2} {\FPeval\tkz@min{(#1)}
+ \FPeval\tkz@max{(#2)}},
+ number/.store in = \tkz@fct@nb,
+ opacity/.store in = \tkz@fct@opacity,
+ color/.store in = \tkz@fct@color,
+ /@tkzriemann/.search also = {/tikz},
+}
+\def\tkzDrawRiemannSum{\pgfutil@ifnextchar[{%
+ \catcode`\:=12 \tkz@DrawRiemannSum}{\tkz@DrawRiemannSum[]}}
\def\tkz@DrawRiemannSum[#1]{%
\begingroup
-\pgfkeys{%
-/tkzriemann/.cd,
-interval = 1:2,
-number = 10,
-opacity = 0.5,
-line width = 1pt}
-\pgfqkeys{/tkzriemann}{#1}
+\pgfkeys{/@tkzriemann/.cd,
+ interval = 1:2,
+ number = 10,
+ opacity = 0.5,
+ line width = 1pt
+}
+\pgfqkeys{/@tkzriemann}{#1}
\iftkz@init@NO%
\FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}%
\FPdiv{\tkz@y@delta}{\tkz@init@yorigine}{\tkz@init@ystep}%
@@ -442,39 +424,42 @@ line width = 1pt}
\fi%
\FPadd\tkz@intwd{\tkz@max}{-\tkz@min}
\FPdiv\tkz@delta{\tkz@intwd}{\tkz@fct@nb}
-\FPadd\tkz@fct@nb{\tkz@fct@nb}{-1}
+\FPadd\tkz@fct@nb{\tkz@fct@nb}{-1}
\begin{scope}
\foreach \i in {0,1,...,\tkz@fct@nb}{%
\FPeval\x{(\tkz@min+i*\tkz@delta)}
\FPeval\tkz@fx{\tkzFcta}
\FPadd\tkz@next{\x}{\tkz@delta}
- \draw[color=\tkz@fct@color,opacity=\tkz@fct@opacity,/tkzriemann/.cd,#1] (\x ,0 ) rectangle (\tkz@next , \tkz@fx/\tkz@init@ystep );
- }
- \end{scope}
+ \draw[ color=\tkz@fct@color,
+ opacity=\tkz@fct@opacity,
+ /@tkzriemann/.cd,#1] (\x ,0 ) rectangle (\tkz@next,
+ \tkz@fx/\tkz@init@ystep );
+}
+ \end{scope}
\endgroup
-}
+}
%<--------------------------------------------------------------------------->
-% tkzDrawRiemannSumInf
+% tkzDrawRiemannSumInf
%<--------------------------------------------------------------------------->
-\pgfkeys{/tkzriemann/.cd,
-interval/.code args={#1:#2} {\FPeval\tkz@min{(#1)}
- \FPeval\tkz@max{(#2)}},
-number/.code = {\edef\tkz@fct@nb{#1}},
-opacity/.code = {\edef\tkz@fct@opacity{#1}},
-color/.code = {\edef\tkz@fct@color{#1}},
-/tkzriemann/.unknown/.code = {\let\searchname=\pgfkeyscurrentname
- \pgfkeysalso{\searchname/.try=#1,
- /tikz/\searchname/.retry=#1}}} \def\tkzDrawRiemannSumInf{\pgfutil@ifnextchar[{%
- \catcode`\:=12 \tkz@DrawRiemannSumInf}{\tkz@DrawRiemannSumInf[]}}
+\pgfkeys{/@tkzriemann/.cd,
+ interval/.code args={#1:#2} {\FPeval\tkz@min{(#1)}
+ \FPeval\tkz@max{(#2)}},
+ number/.store in = \tkz@fct@nb,
+ opacity/.store in = \tkz@fct@opacity,
+ color/.store in = \tkz@fct@color,
+ /@tkzriemann/.search also = {/tikz},
+ }
+\def\tkzDrawRiemannSumInf{\pgfutil@ifnextchar[{%
+ \catcode`\:=12 \tkz@DrawRiemannSumInf}{\tkz@DrawRiemannSumInf[]}}
\def\tkz@DrawRiemannSumInf[#1]{%
\begingroup
-\pgfkeys{%
-/tkzriemann/.cd,
-interval = 1:2,
-number = 10,
-opacity = 0.5,
-line width = 1pt}
-\pgfqkeys{/tkzriemann}{#1}
+\pgfkeys{/@tkzriemann/.cd,
+ interval = 1:2,
+ number = 10,
+ opacity = 0.5,
+ line width = 1pt
+ }
+\pgfqkeys{/@tkzriemann}{#1}
\iftkz@init@NO%
\FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}%
\FPdiv{\tkz@y@delta}{\tkz@init@yorigine}{\tkz@init@ystep}%
@@ -484,42 +469,42 @@ line width = 1pt}
\fi%
\FPadd\tkz@intwd{\tkz@max}{-\tkz@min}
\FPdiv\tkz@delta{\tkz@intwd}{\tkz@fct@nb}
-\FPadd\tkz@fct@nb{\tkz@fct@nb}{-1}
-
+\FPadd\tkz@fct@nb{\tkz@fct@nb}{-1}
+
\begin{scope}
\foreach \i in {0,1,...,\tkz@fct@nb}{%
\FPeval\x{(\tkz@min+i*\tkz@delta)}
\FPeval\tkz@fx{\tkzFcta}
\let\tkz@firstimg\tkz@fx
- \let\tkz@firstx\x
- \FPadd\tkz@next{\x}{\tkz@delta}
- \let\tkzFctTmp\tkzFcta
- \FPset\x{\tkz@next}
- \FPeval\tkz@fxnext{\tkzFcta}
-\ifdim \tkz@fx pt < \tkz@fxnext pt\relax
- \draw[opacity=\tkz@fct@opacity,/tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@firstimg/\tkz@init@ystep );
-\else
-\draw[opacity=\tkz@fct@opacity,/tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@fxnext/\tkz@init@ystep );
- \fi
- }
- \end{scope}
+ \let\tkz@firstx\x
+ \FPadd\tkz@next{\x}{\tkz@delta}
+ \let\tkzFctTmp\tkzFcta
+ \FPset\x{\tkz@next}
+ \FPeval\tkz@fxnext{\tkzFcta}
+ \ifdim \tkz@fx pt < \tkz@fxnext pt\relax
+ \draw[opacity=\tkz@fct@opacity,/@tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@firstimg/\tkz@init@ystep );
+\else
+\draw[opacity=\tkz@fct@opacity,/@tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@fxnext/\tkz@init@ystep );
+ \fi
+ }
+ \end{scope}
\endgroup
-}
+}
%<--------------------------------------------------------------------------->
-% tkzDrawRiemannSumSup
+% tkzDrawRiemannSumSup
%<--------------------------------------------------------------------------->
\def\tkzDrawRiemannSumSup{\pgfutil@ifnextchar[{%
- \catcode`\:=12 \tkz@DrawRiemannSumSup}{\tkz@DrawRiemannSumSup[]}}
+ \catcode`\:=12 \tkz@DrawRiemannSumSup}{\tkz@DrawRiemannSumSup[]}}
\def\tkz@DrawRiemannSumSup[#1]{%
\begingroup
-\pgfkeys{%
-/tkzriemann/.cd,
-interval = 1:2,
-number = 10,
-opacity = 0.5,
-line width = 1pt}
-\pgfqkeys{/tkzriemann}{#1}
+\pgfkeys{/@tkzriemann/.cd,
+ interval = 1:2,
+ number = 10,
+ opacity = 0.5,
+ line width = 1pt
+ }
+\pgfqkeys{/@tkzriemann}{#1}
\iftkz@init@NO%
\FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}%
\FPdiv{\tkz@y@delta}{\tkz@init@yorigine}{\tkz@init@ystep}%
@@ -529,42 +514,42 @@ line width = 1pt}
\fi%
\FPadd\tkz@intwd{\tkz@max}{-\tkz@min}
\FPdiv\tkz@delta{\tkz@intwd}{\tkz@fct@nb}
-\FPadd\tkz@fct@nb{\tkz@fct@nb}{-1}
-
+\FPadd\tkz@fct@nb{\tkz@fct@nb}{-1}
+
\begin{scope}
\foreach \i in {0,1,...,\tkz@fct@nb}{%
\FPeval\x{(\tkz@min+i*\tkz@delta)}
\FPeval\tkz@fx{\tkzFcta}
\let\tkz@firstimg\tkz@fx
- \let\tkz@firstx\x
+ \let\tkz@firstx\x
\FPadd\tkz@next{\x}{\tkz@delta}
\let\tkzFctTmp\tkzFcta
\FPset\x{\tkz@next}
\FPeval\tkz@fxnext{\tkzFcta}
\ifdim \tkz@fx pt > \tkz@fxnext pt\relax
- \draw[opacity=\tkz@fct@opacity,/tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@firstimg/\tkz@init@ystep );
-\else
-\draw[opacity=\tkz@fct@opacity,/tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@fxnext/\tkz@init@ystep );
- \fi
- }
- \end{scope}
+ \draw[opacity=\tkz@fct@opacity,/@tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@firstimg/\tkz@init@ystep );
+\else
+\draw[opacity=\tkz@fct@opacity,/@tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@fxnext/\tkz@init@ystep );
+ \fi
+ }
+ \end{scope}
\endgroup
}
%<--------------------------------------------------------------------------->
-% tkzDrawRiemannSumMid
+% tkzDrawRiemannSumMid
%<--------------------------------------------------------------------------->
\def\tkzDrawRiemannSumMid{\pgfutil@ifnextchar[{%
- \catcode`\:=12 \tkz@DrawRiemannSumMid}{\tkz@DrawRiemannSumMid[]}}
+ \catcode`\:=12 \tkz@DrawRiemannSumMid}{\tkz@DrawRiemannSumMid[]}}
\def\tkz@DrawRiemannSumMid[#1]{%
\begingroup
-\pgfkeys{%
-/tkzriemann/.cd,
-interval = 1:2,
-number = 10,
-opacity = 0.5,
-line width = 1pt}
-\pgfqkeys{/tkzriemann}{#1}
+\pgfkeys{/@tkzriemann/.cd,
+ interval = 1:2,
+ number = 10,
+ opacity = 0.5,
+ line width = 1pt
+ }
+\pgfqkeys{/@tkzriemann}{#1}
\iftkz@init@NO%
\FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}%
\FPdiv{\tkz@y@delta}{\tkz@init@yorigine}{\tkz@init@ystep}%
@@ -574,46 +559,43 @@ line width = 1pt}
\fi%
\FPadd\tkz@intwd{\tkz@max}{-\tkz@min}
\FPdiv\tkz@delta{\tkz@intwd}{\tkz@fct@nb}
-\FPadd\tkz@fct@nb{\tkz@fct@nb}{-1}
-
+\FPadd\tkz@fct@nb{\tkz@fct@nb}{-1}
+
\begin{scope}
\foreach \i in {0,1,...,\tkz@fct@nb}{%
\FPeval\x{(\tkz@min+i*\tkz@delta)}
\FPeval\tkz@fx{\tkzFcta}
\let\tkz@firstimg\tkz@fx
- \let\tkz@firstx\x
+ \let\tkz@firstx\x
\FPadd\tkz@next{\x}{\tkz@delta}
\FPset\x{\tkz@next}
\FPeval\tkz@fxnext{\tkzFcta}
\FPeval\tkz@midimg{(\tkz@firstimg+\tkz@fxnext)/2}
- \draw[opacity=\tkz@fct@opacity,/tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@midimg/\tkz@init@ystep );
- }
- \end{scope}
+ \draw[opacity=\tkz@fct@opacity,/@tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@midimg/\tkz@init@ystep );
+ }
+ \end{scope}
\endgroup
-}
-
+}
+
%<--------------------------------------------------------------------------–>
% tkzXH F rien T et [ ou ]
%<--------------------------------------------------------------------------–>
\def\tkz@ComT{v} % need
-\pgfkeys{
- tkzxh/.cd,
- posgrad/.code = {\def\tkz@tkzXh@posgrad{#1}},
- left/.code = {\def\tkz@tkzXh@left{#1}},
- right/.code = {\def\tkz@tkzXh@right{#1}},
- color/.code = {\def\tkz@tkzXh@color{#1}},
- }
-\def\tkzXH{\pgfutil@ifnextchar[{\tkz@xh}{\tkz@xh[]}}
+\pgfkeys{/@tkzxh/.cd,
+ posgrad/.store in = \tkz@tkzXh@posgrad,
+ left/.store in = \tkz@tkzXh@left,
+ right/.store in = \tkz@tkzXh@right,
+ color/.store in = \tkz@tkzXh@color,
+ posgrad = {below=6 pt},
+ color = \tkz@mainlinecolor,
+ left = {},
+ right = {},
+ }
+\def\tkzXH{\pgfutil@ifnextchar[{\tkz@xh}{\tkz@xh[]}}
\def\tkz@xh[#1]#2{%
-\pgfkeys{/tkzxh/.cd,
- posgrad = {below=6 pt},
- color = \tkz@mainlinecolor,
- left = {},
- right = {}
-}
- \pgfqkeys{/tkzxh}{#1}
+ \pgfqkeys{/@tkzxh}{#1}
\begingroup
\foreach \xA/\RA/\sA/\xB/\RB/\sB in {#2}{%
\tkzDefPoint(\xA,0){deb}\tkzDefPoint(\xB,0){fin}
@@ -627,7 +609,7 @@ line width = 1pt}
\noexpand\node[\tkz@tkzXh@posgrad]}\tkz@temp at (deb){%
\tkz@showgrad{\xA}$\numprint{\tkz@result}$};\fi
-\ifx\RB\tkz@ComT
+\ifx\RB\tkz@ComT
\protected@edef\tkz@temp{\noexpand\node[\tkz@tkzXh@posgrad]}\tkz@temp%
at (fin){%
\tkz@showgrad{\xB}$\numprint{\tkz@result}$};\fi
@@ -640,64 +622,65 @@ line width = 1pt}
}%
\endgroup
}%
-%<--------------------------------------------------------------------------->
-% tangente obsolete
-%<--------------------------------------------------------------------------->
-\def\tkzTan{\pgfutil@ifnextchar[{\tkz@Tan}{\tkz@Tan[]}}
-
-\def\tkz@Tan[#1]#2(#3)#{
-\pgfkeys{/tkztan/.cd,
-draw = false,
-with={},
-kr = 1,
-kl = 1}
-\pgfqkeys{/tkztan}{#1}
- \global\edef\tkz@opttan{#1}
- \FPeval\x{(#3)}%
- \FPeval\tkz@img{#2}
- \let\tkz@yy #2%
- \let\tkz@xx\x%
- \let\tkz@old@img\tkz@img
- \tkz@@Tan
-}
-\def\tkz@@Tan#1{%
-\FPdiv{\tkz@old@x}{\x}{1}
-\let\tkz@nexpty\tkz@img
-\tkz@ptStar[](\tkz@old@x,\tkz@nexpty){#1}
-\FPdiv{\tkz@krx}{\tkz@tan@kr}{\tkz@tmp@xstep}
-\FPdiv{\tkz@kry}{\tkz@tan@kr}{\tkz@init@ystep}
-\FPdiv{\tkz@klx}{\tkz@tan@kl}{\tkz@tmp@xstep}
-\FPdiv{\tkz@kly}{\tkz@tan@kl}{\tkz@init@ystep}
- % demi tgt--> droite
-\FPifzero{\tkz@tan@kr}%
-\else
-\FPadd{\x}{\tkz@xx}{0.000001}%
-\FPeval\tkz@img{\tkz@yy}%
-\FPadd{\tkz@deltay}{\tkz@old@img}{-\tkz@img}%
-\FPmul{\tkz@slope}{\tkz@deltay}{1000000}%
-\protected@edef\tkz@temp{
- \noexpand\draw[tan style,/tkztan/.cd,\tkz@opttan,-]}\tkz@temp%
- (#1)--++(\tkz@krx,-\tkz@kry*\tkz@slope);
-\fi
-% demi tgt --> gauche
-\FPifzero{\tkz@tan@kl}%
- \else
-\FPadd{\x}{\tkz@xx}{-0.000001}
-\FPeval\tkz@img{\tkz@yy}%
-\FPadd{\tkz@deltay}{\tkz@old@img}{-\tkz@img}
-\FPmul{\tkz@slope}{\tkz@deltay}{-1000000}
- \protected@edef\tkz@temp{
- \noexpand
-\draw[tan style,/tkztan/.cd,\tkz@opttan,-]}\tkz@temp%
- (#1)--++(-\tkz@klx,\tkz@kly*\tkz@slope);
- \fi
-}
+% %<--------------------------------------------------------------------------->
+% % tangente obsolete
+% %<--------------------------------------------------------------------------->
+% \def\tkzTan{\pgfutil@ifnextchar[{\tkz@Tan}{\tkz@Tan[]}}
+%
+% \def\tkz@Tan[#1]#2(#3)#{
+% \pgfkeys{/@tkztan/.cd,
+% draw = false,
+% with = {},
+% kr = 1,
+% kl = 1
+% }
+% \pgfqkeys{/@tkztan}{#1}
+% \global\edef\tkz@opttan{#1}
+% \FPeval\x{(#3)}%
+% \FPeval\tkz@img{#2}
+% \let\tkz@yy #2%
+% \let\tkz@xx\x%
+% \let\tkz@old@img\tkz@img
+% \tkz@@Tan
+% }
+% \def\tkz@@Tan#1{%
+% \FPdiv{\tkz@old@x}{\x}{1}
+% \let\tkz@nexpty\tkz@img
+% \tkz@ptStar[](\tkz@old@x,\tkz@nexpty){#1}
+% \FPdiv{\tkz@krx}{\tkz@tan@kr}{\tkz@tmp@xstep}
+% \FPdiv{\tkz@kry}{\tkz@tan@kr}{\tkz@init@ystep}
+% \FPdiv{\tkz@klx}{\tkz@tan@kl}{\tkz@tmp@xstep}
+% \FPdiv{\tkz@kly}{\tkz@tan@kl}{\tkz@init@ystep}
+% % demi tgt--> droite
+% \FPifzero{\tkz@tan@kr}%
+% \else
+% \FPadd{\x}{\tkz@xx}{0.000001}%
+% \FPeval\tkz@img{\tkz@yy}%
+% \FPadd{\tkz@deltay}{\tkz@old@img}{-\tkz@img}%
+% \FPmul{\tkz@slope}{\tkz@deltay}{1000000}%
+% \protected@edef\tkz@temp{
+% \noexpand\draw[tan style,/@tkztan/.cd,\tkz@opttan,-]}\tkz@temp%
+% (#1)--++(\tkz@krx,-\tkz@kry*\tkz@slope);
+% \fi
+% % demi tgt --> gauche
+% \FPifzero{\tkz@tan@kl}%
+% \else
+% \FPadd{\x}{\tkz@xx}{-0.000001}
+% \FPeval\tkz@img{\tkz@yy}%
+% \FPadd{\tkz@deltay}{\tkz@old@img}{-\tkz@img}
+% \FPmul{\tkz@slope}{\tkz@deltay}{-1000000}
+% \protected@edef\tkz@temp{
+% \noexpand
+% \draw[tan style,/@tkztan/.cd,\tkz@opttan,-]}\tkz@temp%
+% (#1)--++(-\tkz@klx,\tkz@kly*\tkz@slope);
+% \fi
+% }
%<--------------------------------------------------------------------------->
% point d'une courbe obsolete
%<--------------------------------------------------------------------------->
-\def\tkzFctPt{\pgfutil@ifnextchar[{\tkz@fctpt}{\tkz@fctpt[]}}
+\def\tkzFctPt{\pgfutil@ifnextchar[{\tkz@fctpt}{\tkz@fctpt[]}}
\def\tkz@fctpt[#1]#2(#3)#{%
- \global\edef\tkz@optptfct{#1}
+ \global\edef\tkz@optptfct{#1}
\FPeval\x{(#3)}%
\FPeval\tkz@y{#2}
\tkz@defpoint
@@ -707,7 +690,7 @@ kl = 1}
\protected@edef\tkz@temp{
\noexpand \tkzDrawPoint[\tkz@optptfct](#1)}\tkz@temp
\let\tkz@init@xstep\tkz@tmp@xstep
-}
+}
%<-------------------------- the end --------------------------------------->
\endinput
diff --git a/macros/latex/contrib/tkz/tkz-fct/readme-tkz-fct-fr.txt b/macros/latex/contrib/tkz/tkz-fct/readme-tkz-fct-fr.txt
deleted file mode 100644
index 21248704ac..0000000000
--- a/macros/latex/contrib/tkz/tkz-fct/readme-tkz-fct-fr.txt
+++ /dev/null
@@ -1,97 +0,0 @@
-% encodage utf8
------------------------ french lisez-moi ! -----------------------------------
-readme-tkz-fct.txt 01/06/2011 version 1.16
-
-Objet
------
-
-tkz-fct.sty utilise tkz-base pour tracer des représentations de fonctions en 2D dans des repères orthogonaux.
-
-Licence
--------
-LaTeX Project Public License
-
-
-Contraintes
-----------
- -- ce package nécessite etex.sty, fp.sty, le dossier tkzbase et gnuplot;
- -- bien sûr, PGF/TikZ doit être installé en version 2.1 ;
- -- ce package fonctionne avec utf8 et pdflatex;
- -- la chaîne dvi->dvips->ps2pdf est aussi possible;
- -- il ne fonctionne pas encore avec TeX et ConTeXt.
- -- les premiers tests que lualatex peut être utilisé
-
-Installation
-------------
-Si vous voulez installer ce package à la main pour tester une version beta, il
- suffit de placer le package tkz-fct dans un dossier tkz (par exemple) ici :
- /texmf/tex/latex/tkz, à côté du dossier tkzbase.
-Il est possible aussi de le mettre dans le dossier avec vos propres fichiers.
-
-Le plus simple est de récupérer l'archive tkz.zip qui contient l'ensemble de
- mes packages liés à tkz-base.
-
-
-Fonctionnement
--------------
-Son fonctionnement s'obtient en plaçant la ligne suivante dans le préambule :
-\usepackage{tkz-fct}
-
-Ce package charge tkz-base et TikZ. Si vous avez besoin de xcolor.sty, il
- est nécessaire de le charger avant tkz-base, afin d'éviter des conflits
- entre packages.
-
-\usepackage[usenames,dvipsnames]{xcolor}
-\usepackage{amsmath,tkz-fct}
-
-Documentation
--------------
- tkz-fct-screen.pdf est actuellement en français mais de nombreux exemples
- sont donnés.
-Une documentation destinée à l'impression sera bientôt prête. Vous trouverez
- ces fichiers sur mes sites :
- http://altermundus.fr ou http://altermundus.com
-
-
-Exemples
---------
- Tous les exemples donnés dans la documentation, sont stockés sur mes sites
- sous forme de fichiers individuels, prêts pour être compilés.
-
-Historique des versions
-
--- 1.16 c correction de bugs
- maintenant le domaine par défaut est xmin:xmax
-
-
-Comment obtenir tous les exemples de la documentation
------------------------------------------------------
-
-1) Il faut modifier l fichier TKZdoc-fct-main.tex . Remplacez
- \usepackage{tkzexample} par
-
-\usepackage[saved]{tkzexample}
-\def\tkzFileSavedPrefix{tkzFct}
-Les exemples sont enregistrés dans des fichiers ayant comme préfixe tkzFct.
-
-2) Ensuite il faut compiler les sources
- $ pdflatex TKZdoc-fct-main.tex
-
-3) Placez tous les fichiers dans un dossier avec le script ruby
- "addcontent.rb"
- Lancez le script
- $ ruby addcontent.rb
- Vous devez obtenir un dossier "new" avec tous les exemples complétés avec en
- particulier la ligne \input{tkzfctpreamble.ltx}
-
-4) Vous pouvez compiler tous les exemples en une seule fois. Placez les deux
-fichiers tkzfctpreamble.ltx and Makefile dans le dernier dossier et lancez
-$ make
-
-
-
- Alain Matthes
- 5 rue de Valence
- Paris 75005
-
- al (dot) ma (at) mac (dot) com \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-fct/readme-tkz-fct.txt b/macros/latex/contrib/tkz/tkz-fct/readme-tkz-fct.txt
deleted file mode 100644
index 887fafcfca..0000000000
--- a/macros/latex/contrib/tkz/tkz-fct/readme-tkz-fct.txt
+++ /dev/null
@@ -1,85 +0,0 @@
-%%%%%%%%%%%%%%%%%%%%%% english readme %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-readme-tkz-fct.txt 01/06/2011 version 1.16
-
-tkz-fct.sty uses tkz-base to draw graph of functions with a Cartesian (rectangular) coordinate system. You need pgf/tikz 2.1 to use this package. You need to install Gnuplot 4.3 or higher.
-
-Licence
--------
-
-This program can be redistributed and/or modified under the terms
-of the LaTeX Project Public License Distributed from CTAN
-archives in directory macros/latex/base/lppl.txt.
-
-Features
---------
- -- needs etex, fp.sty, tkz-base and gnuplot;
- -- automatically loads the package TikZ;
- -- compiles with utf8, pdflatex;
- -- compiles using the chain dvi->dvips->ps2pdf;
- -- not yet ready for use with TeX and ConText (I need more time and ideas);
-
-Installation
-------------
-
-You can experiment with the tkz-fct 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-fct, place the following line in the preamble of your LaTeX document.
-
-\usepackage{tkz-fct}
-
-If you use the xcolor package, load that package before tkz-fct to avoid package conflicts.
-
-\usepackage[usenames,dvipsnames]{xcolor}
-\usepackage{amsmath,tkz-fct}
-
-Documentation
--------------
- Documentation for tkz-fct and tkz-base is available on my sites:
-
- http://altermundus.fr (en français) or http://altermundus.fr (in english)
-
-
-Examples
---------
- All examples given in documentation will be stored on my sites as standalone files, ready for compilation.
-
-History
-
--- 1.16 c correction of bugs
- now default domain is xmin:xmax and not -5:5.
--- 1.13 first version
-
-How to get all the examples :
-
-1) You need to modify the file TKZdoc-fct-main.tex . Replace
- \usepackage{tkzexample} by
-
-\usepackage[saved]{tkzexample}
-\def\tkzFileSavedPrefix{tkzFct}
-
-2) Compile the sources
- $ pdflatex TKZdoc-fct-main.tex
- You get in your folder all the examples with the prefix tkzFct.
-
-3) Put all these files in a new folder with the ruby script "addcontent.rb"
- Run the script
- $ ruby addcontent.rb
- You get a folder with all the complete examples. The files begin with
- \input{tkzfctpreamble.ltx}
-
-4) Now you can compile the files. A fine solution is to use a makefile . You can put the two files tkzfctpreamble.ltx and Makefile inside the last folder and now you run
-$make
-
-
-
- Alain Matthes
- 5 rue de Valence
- Paris 75005
-
- al (dot) ma (at) mac (dot) com \ No newline at end of file