summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/tkz
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-03-09 03:01:39 +0000
committerNorbert Preining <norbert@preining.info>2020-03-09 03:01:39 +0000
commit0561778af6f8fde0a3a1c334e2aab9a4f1142d6e (patch)
treec19fe45e4101aed56e7fb3602174c6a5e335d7d1 /macros/latex/contrib/tkz
parenta8880a5ee484845d9a526c5ca8d21d31214af22b (diff)
CTAN sync 202003090301
Diffstat (limited to 'macros/latex/contrib/tkz')
-rw-r--r--macros/latex/contrib/tkz/tkz-base/README15
-rw-r--r--macros/latex/contrib/tkz/tkz-base/doc/TKZdoc-base.pdfbin414751 -> 376977 bytes
-rw-r--r--macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-BB.tex77
-rw-r--r--macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-axes.tex268
-rw-r--r--macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-compilation.tex96
-rw-r--r--macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-divers.tex169
-rw-r--r--macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-example.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-faq.tex23
-rw-r--r--macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-grid.tex67
-rw-r--r--macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-initialisation.tex120
-rw-r--r--macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-installation.tex14
-rw-r--r--macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-main.tex123
-rw-r--r--macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-marks.tex88
-rw-r--r--macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-news.tex35
-rw-r--r--macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-obj.tex108
-rw-r--r--macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-point.tex367
-rw-r--r--macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-rep.tex46
-rw-r--r--macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-style.tex28
-rw-r--r--macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-texte.tex96
-rw-r--r--macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-tools.tex197
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/preamble-standalone.ltx4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tiger.pdfbin34359 -> 0 bytes
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-3.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-4.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-10-1.tex13
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-10-1.tex16
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-2-0.tex16
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-9-2.tex20
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-09-2-0.tex14
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.1.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-1-1.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.2.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-2-1.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.3.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-3-1.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.4.0.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-4-0.tex)7
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.5.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-5-1.tex)7
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.6.1.tex13
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.6.2.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-6-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.6.3.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-6-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.7.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-7-0.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.9.0.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-9-0.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-10-1.tex20
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-10-3.tex18
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-3-1.tex22
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-12-2-0.tex18
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-12.1.2.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-13-1-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-13.1.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-1-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-13.1.2.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-1-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-13.2.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-2-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-13.3.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-3-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-13.3.2.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-3-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-13.4.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-4-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14.1.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-15-1-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-15.1.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-1-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-15.2.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-2-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-15.2.2.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-2-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-15.3.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-3-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-15.4.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-4-0.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-15.5.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-5-1.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16.1.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-1-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16.1.2.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-1-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16.1.3.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-1-3.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16.1.4.tex18
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16.2.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-2-1.tex)10
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-1-4.tex18
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-3.1.0.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-4.1.0.tex10
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-4.2.0.tex11
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-5.1.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-1-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-5.1.2.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-1-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-5.2.0.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-2-0.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-5.2.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-2-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-5.2.2.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-2-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-5.2.3.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-2-3.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.1.0.tex17
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.1.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.1.2.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-2.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.1.3.tex11
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.1.4.tex11
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.1.5.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-5.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.1.6.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-6.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.10.1.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.10.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-10.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.11.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-11.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.2.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.3.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-3.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.4.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-4.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.5.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-5.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.6.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-6.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.7.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-7.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.8.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-8.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.9.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-9.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.3.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-3-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.3.2.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-3-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.3.3.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-3-3.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.7.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-7-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.7.2.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-7-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.7.3.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-7-3.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.8.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-8-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.8.2.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-8-2.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.9.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-9-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.10.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-10.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.11.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-11.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.2.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-2.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.3.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-3.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.4.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-4.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.5.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-5.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.6.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-6.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.7.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-7.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.8.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-8.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.9.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-9.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.1.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.10.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-9-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.10.2.tex20
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.11.1.tex16
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.11.2.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-10-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.11.3.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-10-3.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.12.2.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-11-2.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.12.3.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-11-3.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.13.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-12-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.2.0.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.2.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-3.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.2.2.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-4.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.2.3.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-5.tex)8
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.3.1.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.4.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-3-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.5.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-4-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.5.2.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-4-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.6.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-5-1.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.6.2.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-5-2.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.6.3.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-5-3.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.7.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-6-1.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.7.2.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-6-2.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.8.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-7-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.8.2.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-7-2.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.9.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-8-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-base/examples/tkzBase-9.2.0.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-base.cfg23
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-base.sty47
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-lib-marks.tex23
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-axes.tex23
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-grids.tex23
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-marks.tex29
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-points.tex35
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-rep.tex23
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-BB.tex23
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-arith.tex23
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-base.tex22
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-misc.tex23
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-modules.tex23
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-print.tex23
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-text.tex23
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-utilities.tex23
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/README16
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/doc/TKZdoc-euclide.pdfbin716749 -> 780553 bytes
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-FAQ.tex15
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-angles.tex323
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-arcs.tex98
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-base.tex8
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-circles.tex321
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-compass.tex47
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-config.tex88
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-exemples.tex143
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-installation.tex19
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-intersec.tex81
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-lines.tex466
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-main.tex144
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-news.tex35
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-obj.tex29
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-pointby.tex171
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-points.tex603
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-pointsSpc.tex413
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-pointwith.tex73
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-polygons.tex184
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-presentation.tex236
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-rapporteur.tex29
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-rnd.tex27
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-sectors.tex107
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-show.tex105
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-tools.tex205
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-triangles.tex255
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/preamble-standalone.ltx4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-1.tex15
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-5.tex18
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-08-2-0.tex24
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-2-1.tex20
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-5-1.tex25
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-1.0.0.tex16
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-1.3.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-3-1.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-1.3.2.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-3-2.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-1.3.3.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-3-3.tex)13
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-1.4.0.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-4-0.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-1.5.0.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-1.6.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-6-1.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.10.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-10.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.11.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-11.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.2.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.3.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-3.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.4.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-4.tex)9
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.5.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-5.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.6.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-6.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.7.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-7.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.8.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-8.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.9.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-9.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.2.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-2-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11.2.0.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-2-0.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11.3.0.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-3-0.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11.4.0.tex15
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11.4.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-4-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11.5.0.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-5-0.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11.5.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-5-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11.6.0.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-6-0.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-4-0.tex15
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.1.1.tex18
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.1.2.tex14
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.1.3.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-2.tex)8
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.1.4.tex18
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.1.5.tex18
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.2.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-2-1.tex)8
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.2.2.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-2-2.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.2.3.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-2-3.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.2.4.tex18
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.2.5.tex27
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-1.tex19
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-3.tex18
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-4.tex19
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-5.tex25
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-6.tex27
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13.1.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13.1.2.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13.1.3.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-3.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13.1.4.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-4.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13.1.5.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-5.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13.1.6.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-6.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13.2.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-2-1.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.1.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-1-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.1.2.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-1-2.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.1.3.tex21
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.2.0.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-2-0.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.2.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-2-1.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.3.1.tex15
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.3.2.tex16
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.4.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-4-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.5.0.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-5-0.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.5.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-5-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.5.2.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-5-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.5.3.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-5-3.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-1-3.tex28
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-3-1.tex18
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-3-2.tex20
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.1.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-1-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.1.2.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-1-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.1.3.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-1-3.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.2.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-2-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.2.2.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.2.3.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.2.4.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.2.5.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-2-2.tex16
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.2.tex21
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.3.tex21
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.4.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-4.tex)12
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.5.tex33
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.6.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-6.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.7.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-7.tex)12
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.8.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-8.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-2.tex22
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-3.tex21
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-5.tex33
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.1.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-1-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.1.2.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-1-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.1.3.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-1-3.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.10.1.tex17
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.10.2.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.3.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-3-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.3.2.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-3-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.3.3.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-3-3.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.4.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-4-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.5.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-5-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.6.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-6-1.tex)7
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.7.1.tex12
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.7.2.tex13
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.8.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-7-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.8.2.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-7-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.9.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-8-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-1.tex)10
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.10.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-10.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.2.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-2.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.3.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-3.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.4.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-4.tex)24
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.5.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-5.tex)8
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.6.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-6.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.7.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-7.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.8.tex21
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.9.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-9.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-8.tex21
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.1.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-1-1.tex)8
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.2.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-2-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.2.2.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-2-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.2.3.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-2-3.tex)14
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.2.4.tex15
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.3.1.tex22
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.4.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-4-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.5.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-5-1.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.6.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-6-1.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-2-4.tex15
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.1.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-1-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.2.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.2.2.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.2.3.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-3.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.2.4.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-4.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.2.6.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-6.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.2.7.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-7.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.2.8.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-8.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.2.9.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-9.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.3.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.3.2.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.3.3.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-3.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.3.4.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-4.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.3.5.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-6.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-5.tex20
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.1.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-1-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.1.2.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-1-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.1.3.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-1-3.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.2.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-2-1.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.2.2.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-2-2.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.3.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-3-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.4.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-4-1.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.4.2.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-4-2.tex)5
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.4.3.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-4-3.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.4.4.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-4-4.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22.2.0.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-5-0.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22.3.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-7-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22.4.0.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-7-0.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22.4.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-7-2.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22.5.0.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-2-0.tex)10
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22.6.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-8-1.tex)18
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22.6.2.tex28
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23.1.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-1.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23.1.2.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23.1.3.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-3.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23.1.4.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-4.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23.1.5.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-5.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23.2.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-2-1.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23.2.2.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-2-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23.3.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-3-1.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.1.0.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-1-0.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.2.0.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-2-0.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.3.0.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-3-0.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.4.0.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-4-0.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.5.0.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-5-0.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.6.0.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-6-0.tex)11
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.7.0.tex24
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.8.0.tex20
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25.1.0.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-1-0.tex)9
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25.1.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-1-1.tex)17
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25.2.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-8-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25.4.1.tex19
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25.5.1.tex (renamed from macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-10-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25.5.2.tex18
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26.1.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25-1-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26.1.2.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25-1-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26.2.0.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25-2-0.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26.3.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25-3-0.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-27.1.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-1-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-27.1.2.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-1-2.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-27.1.3.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-1-3.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-27.1.4.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-1-4.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-27.2.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-2-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-27.2.2.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-2-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-28.1.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-27-1-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-2.tex24
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29.1.0.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-28-1-0.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29.2.0.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-28-2-0.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.1.2.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-1-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.1.3.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-1-3.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.1.4.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-1-4.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.1.5.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-1-5.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.10.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-11.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.11.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-12.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.12.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-13.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.2.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-3.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.3.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-4.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.4.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-5.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.5.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-6.tex)19
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.6.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-7.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.7.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-8.tex)17
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.8.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-9.tex)16
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.9.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-10.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31.1.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-1-1.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31.1.2.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-1-2.tex)18
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31.1.3.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-1-3.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31.2.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-2-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31.2.2.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-2-2.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31.3.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-3-1.tex)10
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31.3.2.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-3-2.tex)8
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31.4.0.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-4-0.tex)10
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-32.2.0.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31-2-0.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-32.3.0.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31-3-0.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-32.4.0.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31-4-0.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.0.0.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-0-0.tex)8
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.1.1.tex15
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.1.2.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.1.3.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-3.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.1.4.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-4.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.1.5.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-5.tex)8
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.2.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-2-1.tex)7
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.2.2.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-2-2.tex)9
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.2.3.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-2-3.tex)10
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.4.0.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-4-0.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.5.0.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-5-0.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-5.1.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-05-1-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-5.2.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-05-2-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-5.2.2.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-05-2-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-5.3.0.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-05-3-0.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-1.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.2.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.3.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-3.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.4.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-4.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.5.tex23
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.6.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-6.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.7.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-7.tex)8
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.8.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-8.tex)9
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.9.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-9.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-7.0.2.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-07-0-2.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-7.0.3.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-07-0-3.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-7.0.4.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-07-0-4.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-8.1.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-08-1-1.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-8.2.0.tex23
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.0.tex16
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-1-1.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.2.tex20
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.3.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-3-1.tex)14
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.4.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-4-1.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.5.tex22
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.6.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-6-1.tex)6
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.7.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-7-1.tex)10
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.8.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-7-2.tex)4
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.3.1.tex (renamed from macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10-1-0.tex)8
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/latex/tkz-euclide.sty72
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-angles.tex32
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-arcs.tex148
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-circles.tex23
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-compass.tex53
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-circles.tex23
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-lines.tex50
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-polygons.tex24
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-triangles.tex66
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-lines.tex116
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-by.tex70
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-rnd.tex23
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-with.tex76
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points.tex37
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-polygons.tex47
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-protractor.tex29
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-sectors.tex23
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-show.tex25
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-triangles.tex103
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-angles.tex23
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-intersections.tex23
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-math.tex (renamed from macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-math.tex)23
464 files changed, 5800 insertions, 4972 deletions
diff --git a/macros/latex/contrib/tkz/tkz-base/README b/macros/latex/contrib/tkz/tkz-base/README
index 636e7df906..abed785606 100644
--- a/macros/latex/contrib/tkz/tkz-base/README
+++ b/macros/latex/contrib/tkz/tkz-base/README
@@ -1,6 +1,6 @@
% encodage utf8
-readme-tkz-base.txt V3.02 c 2020/02/06
+readme-tkz-base.txt V3.05 c 2020/03/08
The package tkz-base provides some tools like a Cartesian (rectangular) coordinate system to other packages like tkz-euclide or tkz-fct.
With this package, you can draw coordinate axis, grids, draw points, the
@@ -9,9 +9,14 @@ principle is to specify the position of any point in two-dimensional space by a
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.
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3
+ of this license or (at your option) any later version.
+ The latest version of this license is in
+ http://www.latex-project.org/lppl.txt
+ and version 1.3 or later is part of all distributions of LaTeX
+ version 2005/12/01 or later.
+
Features
@@ -65,7 +70,7 @@ The new package tkz-base 3.02c is *not* fully compatible with the version 1.16 b
History
-------
-
+-- 3.05c correction of bugs, some macros have migrated to tkz-euclide
-- 3.02c correction of bugs, new code
-- 3.01c correction of bugs, new code
-- 1.16 correction of bugs
diff --git a/macros/latex/contrib/tkz/tkz-base/doc/TKZdoc-base.pdf b/macros/latex/contrib/tkz/tkz-base/doc/TKZdoc-base.pdf
index eb42a519f9..31180a04aa 100644
--- a/macros/latex/contrib/tkz/tkz-base/doc/TKZdoc-base.pdf
+++ b/macros/latex/contrib/tkz/tkz-base/doc/TKZdoc-base.pdf
Binary files differ
diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-BB.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-BB.tex
index 74950a060f..6af88de598 100644
--- a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-BB.tex
+++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-BB.tex
@@ -1,22 +1,21 @@
-\section{Gestion de la bounding box}
-La bounding box initiale après usage de la macro \tkzcname{tkzInit} est définie par le rectangle basé sur les points $(0,0)$ et $(10,10)$. La macro \tkzcname{tkzInit} permet de modifier cette bounding box initiale en utilisant les arguments (\tkzname{xmin}, \tkzname{xmax}, \tkzname{ymin}, et \tkzname{ymax}). Bien sûr tout tracé extérieur modifie la bounding box. \TIKZ tient à jour cette bounding box. Il est possible d'influer sur ce comportement soit directement avec des commandes ou des options de \TIKZ comme une commande comme \tkzcname{useasboundingbox} ou l'option \tkzname{use as bounding box}. Une conséquence possible est de réserver une boite pour une figure mais la figure peut déborder de la boite et se repandre au-dessus du texte principal.
-La commande suivante \tkzcname{pgfresetboundingbox} permet d'effacer une bounding box et d'en établir une nouvelle.
+\section{Bounding box management}
+The initial bounding box after using the macro \tkzcname{tkzInit} is defined by the rectangle based on the points $(0,0)$ and $(10,10)$. The \tkzcname{tkzInit} macro allows this initial bounding box to be modified using the arguments (\tkzname{xmin}, \tkzname{xmax}, \tkzname{ymin}, and \tkzname{ymax}). Of course any external trace modifies the bounding box. \TIKZ\ maintains that bounding box. It is possible to influence this behavior either directly with commands or options in \TIKZ\ such as a command like \tkzcname{useasboundingbox} or the option \tkzname{use as bounding box}. A possible consequence is to reserve a box for a figure but the figure may overflow the box and spread over the main text.
+The following command \tkzcname{pgfresetboundingbox} clears a bounding box and establishes a new one.
%Enfin Il est parfois utile de contenir une figure dans une b
-
%current bounding box or current path bounding box remember picture et overlay
%<--------------------------------------------------------------------------->
% tkzShowBB
%<--------------------------------------------------------------------------->
\subsection{tkzShowBB}
-La macro la plus simple.
-\begin{NewMacroBox}{tkzShowBB}{\oarg{local options}}
-Cette macro permet de visualiser la bounding box. Un cadre rectangulaire entoure celle-ci. Cette macro accepte les options de \TIKZ.
+The simplest macro.
+\begin{NewMacroBox}{tkzShowBB}{\oarg{local options}}%
+This macro displays the bounding box. A rectangular frame surrounds the bounding box. This macro accepts \TIKZ\ options.
\end{NewMacroBox}
-\subsubsection{Exemple 2 avec \tkzcname{tkzShowBB}}
+\subsubsection{Example with \tkzcname{tkzShowBB}}
\begin{tkzexample}[latex=8cm,small]
\begin{tikzpicture}[scale=.5]
\tkzInit[ymax=5,xmax=8]
@@ -35,10 +34,10 @@ Cette macro permet de visualiser la bounding box. Un cadre rectangulaire entoure
%<--------------------------------------------------------------------------->
\subsection{tkzClipBB}
\begin{NewMacroBox}{tkzClipBB}{}%
-Il s'agit de limiter les futures constructions à la bounding box actuelle.
+The idea is to limit future constructions to the current bounding box.
\end{NewMacroBox}
-\subsubsection{Exemple avec \tkzcname{tkzClipBB} et les bissectrices}
+\subsubsection{Example with \tkzcname{tkzClipBB} and the bisectors}
\begin{tkzexample}[latex=6cm,small]
\begin{tikzpicture}
@@ -60,11 +59,11 @@ Il s'agit de limiter les futures constructions à la bounding box actuelle.
% tkzSetBB
%<--------------------------------------------------------------------------->
\subsection{tkzSetBB}
-\begin{NewMacroBox}{tkzSetBB}{\parg{$x_A~;~y_A$} \parg{$x_B~;~y_B$} ou bien {\parg{$A$} \parg{$B$}}}
-{Cette macro permet de définir le rectangle ayant pour coordonnées $(x_A~;~y_A$) et $(x_B~;~y_B)$ comme la nouvelle bounding box.}
+\begin{NewMacroBox}{tkzSetBB}{\parg{$x_A~;~y_A$} \parg{$x_B~;~y_B$} ou bien {\parg{$A$} \parg{$B$}}}%
+This macro defines the rectangle with coordinates $(x_A~;~y_A$) and $(x_B~;~y_B)$ as the new bounding box.
\end{NewMacroBox}
-\subsubsection{Exemple avec \tkzcname{tkzShowBB}}
+\subsubsection{Example with \tkzcname{tkzShowBB}}
\begin{tkzexample}[latex=8cm,small]
above\\
left
@@ -82,12 +81,12 @@ left
% tkzSaveBB
%<--------------------------------------------------------------------------->
\subsection{tkzSaveBB}{}
-\begin{NewMacroBox}{tkzSaveBB}{}
-Cette macro permet de sauvegarder la bounding box, autrement dit elle enregistre les coordonnées de deux points qui définissent un rectangle.
+\begin{NewMacroBox}{tkzSaveBB}{}%
+This macro saves the bounding box, i.e. it stores the coordinates of two points that define a rectangle.
\end{NewMacroBox}
\begin{tkzexample}[latex=7cm,small]
-Une figure au-dessus du texte\\
+A figure above the text.
\begin{tikzpicture}
\begin{scope}
\tkzSetBB(0,0)(6,2) \tkzShowBB[fill=blue!20]
@@ -107,9 +106,9 @@ Une figure au-dessus du texte\\
%<--------------------------------------------------------------------------->
\subsection{tkzRestoreBB}
\begin{NewMacroBox}{tkzRestoreBB}{}
-Cette macro récupère la sauvegarde de la bounding box. Comme vous le constater, la figure déborde de la boîte. La bounding box a été réduite.
+This macro retrieves the bounding box backup. As you can see, the figure overflows the box. The bounding box has been reduced.
\end{NewMacroBox}
-\subsubsection{Exemple d'utilisation de \tkzcname{tkzRestoreBB}}
+\subsubsection{Example of the use of \tkzcname{tkzRestoreBB}}
\begin{tkzexample}[latex=8cm,small]
\vspace{ 2cm}
Start\\
@@ -133,23 +132,23 @@ End
%<--------------------------------------------------------------------------->
\subsection{tkzClip}
\begin{NewMacroBox}{tkzClip}{\oarg{local options}}
-Le rôle de cette macro est de rendre invisible ce qui est hors du rectangle défini par $(xmin~;~ymin)$ et $(xmax~;~ymax)$.
+The role of this macro is to make invisible what is outside the rectangle defined by $(xmin~;~ymin)$ and $(xmax~;~ymax)$.
\medskip
\begin{tabular}{lll}
\hline
-options & défaut & définition \\
+options & default & definition \\
\midrule
-\TOline{space} {1} {valeur ajoutée à droite, à gauche, en bas et en haut du background}
+\TOline{space} {1} {added value on the right, left, bottom and top of the background}
\bottomrule
\end{tabular}
\medskip
-{Le rôle de l'option \tkzname{space} est d'agrandir la partie visible du dessin. Cette partie devient le rectangle définit par $(xmin-space~;~ymin-space)$ et $(xmax+space~;~ymax+space)$. \tkzname{space} peut être négatif! L'unité est le cm et ne doit pas être indiquée. }
+The role of the \tkzname{space} option is to enlarge the visible part of the drawing. This part becomes the rectangle defined by $(xmin-space~;~ymin-space)$ and $(xmax+space~;~ymax+space)$. \tkzname{space} can be negative! The unit is cm and should not be specified.
\end{NewMacroBox}
-\subsubsection{Premier exemple avec \tkzcname{tkzClip}} \hypertarget{clip}{}
+\subsubsection{First example with \tkzcname{tkzClip}} \hypertarget{clip}{}
\begin{tkzexample}[latex=8cm,small]
\begin{tikzpicture}
@@ -160,6 +159,7 @@ options & défaut & définition \\
\end{tikzpicture}
\end{tkzexample}
+\subsubsection{Second example with \tkzcname{tkzClip}}
\begin{tkzexample}[latex=8cm,small]
\begin{tikzpicture}
\tkzInit[xmax=3, ymax=3]
@@ -170,17 +170,10 @@ options & défaut & définition \\
\end{tikzpicture}
\end{tkzexample}
%<--------------------------------------------------------------------------->
-Il est possible d'ajouter un peu d'espace \tkzcname{tkzClip[space]}
+It is possible to add a bit of space \tkzcname{tkzClip[space]}.
\subsubsection{\tkzcname{tkzClip} et l'option \tkzname{space}}
-Les dimensions pour définir le rectangle clippé sont \tkzname{xmin-1}, \tkzname{ymin-1}, \tkzname{xmax+1} et \tkzname{ymax+1}.
-\begin{tkzexample}[latex=8cm,small]
-\begin{tikzpicture}
- \tkzInit[xmax=3, ymax=3]
- \tkzGrid \tkzAxeXY
- \draw[red] (-0.5,-0.5)--(3.5,3.5);
-\end{tikzpicture}
-\end{tkzexample}
+The dimensions to define the clipped rectangle are \tkzname{xmin-1}, \tkzname{ymin-1}, \tkzname{xmax+1} and \tkzname{ymax+1}.
\begin{tkzexample}[latex=8cm,small]
\begin{tikzpicture}
@@ -191,8 +184,18 @@ Les dimensions pour définir le rectangle clippé sont \tkzname{xmin-1}, \tkznam
\end{tikzpicture}
\end{tkzexample}
-\subsection{style tkzreverseclip}
+\subsection{Reverse clip: tkzreverseclip}
+The next example uses
+
+\begin{tkzltxexample}[]
+ \def\tkzClipOutPolygon(#1,#2){\clip[tkzreserveclip] (#1)
+ \foreach \pt in {#2}{--(\pt)}--cycle;
+ }
+ \tikzset{tkzreverseclip/.style={insert path={%
+ (\tkz@xa,\tkz@ya) rectangle (\tkz@xb,\tkz@yb)}}}
+ \end{tkzltxexample}
+\subsubsection{Example with \tkzcname{tkzClipOutPolygon}}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=.5]
\tkzInit[xmin=-5,xmax=5,ymin=-5,ymax=5]
@@ -215,11 +218,11 @@ Les dimensions pour définir le rectangle clippé sont \tkzname{xmin-1}, \tkznam
\end{tkzexample}
-\subsection{option tikz : trim left or right}
-voir le \tkzimp{pgfmanual}
+\subsection{Options from \TIKZ: trim left or right}
+See the \tkzimp{pgfmanual}
-\subsection{Commandes de TikZ \tkzcname{pgfinterruptboundingbox} et \tkzcname{endpgfinterruptboundingbox}}
-Cette commande interrompt temporairement le calcul de la boîte et configure une nouvelle boîte
+\subsection{TikZ Controls \tkzcname{pgfinterruptboundingbox} and \tkzcname{endpgfinterruptboundingbox}}
+This command temporarily interrupts the calculation of the box and configures a new box.
\begin{tkzexample}[latex=8cm,small]
\begin{tikzpicture}
diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-axes.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-axes.tex
index 0b9f62af9a..0090b80e76 100644
--- a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-axes.tex
+++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-axes.tex
@@ -1,29 +1,29 @@
-\section{Macros pour les axes}
+\section{Macros for the axes}
- \tkzHandBomb\ Attention ces macros ont été modifiées. Il est désormais plus faciles d'utiliser les stiles de \TIKZ\ . \tkzcname{tkzDrawX} permet de tracer un axe, \tkzcname{tkzLabelX} place des graduations et enfin dans les cas simples \tkzcname{tkzAxeX} trace et gradue. Les options de \TIKZ sont accessibles.
-Pour les graduations, il est possible d'utiliser des fractions.
+ \tkzHandBomb\ Careful, these macros have been modified. It's now easier to use the styles of \TIKZ. \tkzcname{tkzDrawX} allows to draw an axis, \tkzcname{tkzLabelX} places graduations and finally in simple cases \tkzcname{tkzAxeX} traces and graduations. The options of \TIKZ are accessible.
+Fractions can be used for graduations.
%<--------------------------------------------------------------------->
% tkzDrawX
%<--------------------------------------------------------------------->
\subsection{\tkzcname{tkzDrawX}} \hypertarget{dx}{}
-\begin{NewMacroBox}{tkzDrawX}{\oarg{local options}}
-Cette macro permet de tracer l'axe des abscisses avec des ticks par défaut.
-Les options sont celles de \TIKZ\ plus les suivantes~:
+\begin{NewMacroBox}{tkzDrawX}{\oarg{local options}}%
+This macro allows you to draw the abscissa axis with default ticks.
+The options are those of \TIKZ\ plus the following ones:
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
-options & défaut & définition \\
+options & default & definition \\
\midrule
-\TOline{color} {black} {couleur de l'axe et des ticks}
-\TOline{noticks} {false} {pas de ticks sur l'axe}
-\TOline{right space}{0,5 cm} {prolongement de l'axe à droite}
-\TOline{left space} {0 cm} {prolongement de l'axe à gauche}
-\TOline{label} {$x$} {nom attribué au label}
-\TOline{trig} {0} {si <>0 pi/trig est l'unité}
-\TOline{tickwd} {0.8pt} {épaisseur du tick}
-\TOline{tickup} {1pt} {hauteur du tick au dessus de l'axe}
-\TOline{tickdn} {1pt} {profondeur du tick en dessus de l'axe}
+\TOline{color} {black} {Axis and ticks}
+\TOline{noticks} {false} {no ticks on axis}
+\TOline{right space}{0,5 cm} {axis extended right}
+\TOline{left space} {0 cm} {extension of the axis to the left}
+\TOline{label} {$x$} {label name}
+\TOline{trig} {0} {if <>0 pi/trig is the unit}
+\TOline{tickwd} {0.8pt} {tick thickness}
+\TOline{tickup} {1pt} {tick over axis}
+\TOline{tickdn} {1pt} {tick depth over axis}
\bottomrule
\end{tabular}
@@ -40,10 +40,10 @@ options & défaut & définition \\
\end{tikzpicture}
\medskip
-{Cette macro permet de tracer l'axe des abscisses. Le plus important est de tester l'ensemble des options. Ci-dessus, vous avez les valeurs qui définissent un tick. Sinon les options de \TIKZ\ s'appliquent et en particulier \tkzname{text}, \tkzname{color}, \tkzname{fill} et \tkzname{font}. }
+This macro is used to draw the abscissa axis. The most important thing is to test all the options. Above, you have the values that define a tick. Otherwise the options of \TIKZ\ apply and in particular \tkzname{text}, \tkzname{color}, \tkzname{fill} and \tkzname{font}.
\end{NewMacroBox}
-\subsubsection{Sans tick,ni label}
+\subsubsection{No tick, no label}
\begin{tkzexample}[latex=8cm,small]
\begin{tikzpicture}
\tkzInit[xmax=5]
@@ -51,41 +51,39 @@ options & défaut & définition \\
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Placement du label}
+\subsubsection{Label placement}
\begin{tkzexample}[latex=8cm,small]
\begin{tikzpicture}
\tkzInit[xmax=5]
- \tkzDrawX[label = quantité,
+ \tkzDrawX[label = quantity,
above left = 8pt]
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Couleur du label et de l'axe}
-La couleur du label est obtenue avec l'option \tkzname{text}, celle de l'axe avec l'option \tkzname{color}.
+\subsubsection{Label and Axis Colour}
+The color of the label is obtained with the option \tkzname{text}, that of the axis with the option \tkzname{color}.
-L'option \tkzname{ right=12pt} décale le label $x$ de 12 pt.
+The option \tkzname{right=12pt} shifts the label $x$ by 12 pt.
-\begin{tkzexample}[latex=8cm,small]
+\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}
\tkzInit[xmax=5]
- \tkzDrawX[text=blue,color=red,
- right=12pt]
+ \tkzDrawX[text=blue,color=red,right=12pt]
\end{tikzpicture}
\end{tkzexample}
\subsubsection{Option \tkzname{right space}}
-Cela ajoute un peu d'espace après le dernier tick.
-\begin{tkzexample}[latex=7cm,small]
+It adds a little space after the last tick.
+\begin{tkzexample}[latex=6cm,small]
\begin{tikzpicture}
\tkzInit[xmax=0.4,xstep=0.1]
-\tkzDrawX[text=blue,color=red,
- right=12pt,right space=1]
+\tkzDrawX[text=blue,color=red,right=12pt,right space=1]
\end{tikzpicture}
\end{tkzexample}
- \subsubsection{Axe trigonométrique avec l'option \tkzname{trig=1}}\hypertarget{newm}{}
-Si number=0 alors l'axe est gradué de cm en cm, sinon l'axe est gradué à l'aide des multiples de $\frac{\pi}{number}$
+ \subsubsection{Trigonometric axis with the option \tkzname{trig=1}}\hypertarget{newm}{}
+If number=0 then the axis is graduated from cm to cm, otherwise the axis is graduated using multiples of $\frac{\pi}{number}$.
\begin{tkzexample}[latex=6cm,small]
\begin{tikzpicture}
@@ -94,7 +92,7 @@ Si number=0 alors l'axe est gradué de cm en cm, sinon l'axe est gradué à l'ai
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Axe trigonométrique avec l'option \tkzname{trig=2} }
+\subsubsection{Trigonometric axis with the option \tkzname{trig=2} }
\begin{tkzexample}[latex=6cm,small]
\begin{tikzpicture}
@@ -102,35 +100,33 @@ Si number=0 alors l'axe est gradué de cm en cm, sinon l'axe est gradué à l'ai
\tkzDrawX[trig=2]
\end{tikzpicture}
\end{tkzexample}
-
-\newpage
%<--------------------------------------------------------------------->
% tkzLabelX
%<--------------------------------------------------------------------->
\subsection{\tkzcname{tkzLabelX}}\hypertarget{lx}{}
-\begin{NewMacroBox}{tkzLabelX}{\oarg{local options}}
-Cette macro permet de placer des graduations. L'option \tkzname{orig} peut de nouveau être utilisée, mais son comportement est inversée. Par défaut, la valeur à l'origine est placée.
-Les options sont celles de \TIKZ, plus les suivantes~:
+\begin{NewMacroBox}{tkzLabelX}{\oarg{local options}}%
+This macro allows you to place graduations. The option \tkzname{orig} can be used again, but its behavior is reversed. By default, the original value is placed.
+The options are those of \TIKZ, plus the following ones:
\medskip
\begin{tabular}{lll}
\toprule
-options & défaut & définition \\
+options & default & definition \\
\midrule
-\TOline{frac} {0}{si <>0 graduations = num/frac "frac est un entier"}
-\TOline{trig} {0}{si <>0 pi/trig "trig est un entier"}
-\TOline{font} {\BS textstyle} { taille de la graduation.}
-\TOline{color} {black} {couleur des graduations}
-\TOline{step} {1} {intervalle entre deux graduations}
-\TOline{np off} {false} {désactivation de numprint}
-\TOline{orig} {true} {affiche la graduation de l'origine}
+\TOline{frac} {0}{if <>0 graduations = num/frac "frac is an integer"}
+\TOline{trig} {0}{if <>0 pi/trig "trig is an integer"}
+\TOline{font} {\BS textstyle} {scale size.}
+\TOline{color} {black} {graduation color}
+\TOline{step} {1} {interval between graduations}
+\TOline{np off} {false} {numprint deactivation}
+\TOline{orig} {true} {displays the origin graduation }
\bottomrule
\end{tabular}
-{\tkzname{frac} et \tkzname{trig} sont des nombres entiers permettant de passer à une écriture fractionnaire ou trigonométrique.}
+{\tkzname{frac} and \tkzname{trig} are integers that can be changed to fractional or trigonometric writing. }
\end{NewMacroBox}
-\subsubsection{Position des graduations}
+\subsubsection{Position of the graduations}
\begin{tkzexample}[latex=6cm,small]
\begin{tikzpicture}
\tkzInit[xmax=.5,xstep=0.1]
@@ -140,7 +136,7 @@ options & défaut & définition \\
\end{tkzexample}
-\subsubsection{Position des graduations avec \tkzname{xlabel style}}
+\subsubsection{Position of the graduations with \tkzname{xlabel style}}
\begin{tkzexample}[latex=5cm,small]
\begin{tikzpicture}
\tkzInit[xmin=1000,xmax=4000,xstep=1000]
@@ -150,8 +146,8 @@ options & défaut & définition \\
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Dates avec \tkzname{np off}}
-Pour les dates, il faut désactiver numprint.
+\subsubsection{Dates with \tkzname{np off}}
+For dates, you have to deactivate numprint.
\begin{tkzexample}[latex=5cm,small]
\begin{tikzpicture}
\tkzInit[xmin=2000,xmax=2004]
@@ -179,8 +175,8 @@ Pour les dates, il faut désactiver numprint.
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Taille des graduations}
-Deux possibilités. Il est possible de définir le style employé par défaut pour le mode math :
+\subsubsection{Graduations size}
+Two possibilities. It is possible to define the default style used for the math mode:
\begin{tkzltxexample}[small]
\let\tkzmathstyle\textstyle
@@ -222,8 +218,8 @@ Deux possibilités. Il est possible de définir le style employé par défaut po
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Couleur des graduations}
-Il s'agit ici de bien utiliser les options \tkzname{color}, \tkzname{text} et \tkzname{fill}
+\subsubsection{Colour of the graduations}
+The key here is to use the color, text, and text options correctly. \tkzname{fill}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}
\tkzInit[xmin = -2,xmax = 3,
@@ -235,10 +231,10 @@ Il s'agit ici de bien utiliser les options \tkzname{color}, \tkzname{text} et \t
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Tracés des axes avant la graduation}
-Dans certains cas, il est préférable de placer \tkzcname{tkzDrawXY} après \tkzcname{tkzLabelX} et \tkzcname{tkzLabelY}.
+\subsubsection{Axis drawings before the graduation}
+In some cases, it is preferable to place \tkzcname{tkzDrawXY} after \tkzcname{tkzLabelX} and \tkzcname{tkzLabelY}.
-Cela permet d'éviter des problèmes d'affichage.
+This prevents display problems.
\begin{tkzexample}[latex=7cm,small]
@@ -249,7 +245,7 @@ Cela permet d'éviter des problèmes d'affichage.
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Graduations (exceptées à l'origine) avant les tracés }
+\subsubsection{Graduations (except originally) prior to tracings }
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}
@@ -261,7 +257,7 @@ Cela permet d'éviter des problèmes d'affichage.
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Graduations uniquement positives avant les tracés }
+\subsubsection{Only positive graduations before drawings }
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}
@@ -271,7 +267,7 @@ Cela permet d'éviter des problèmes d'affichage.
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Pas de graduations à l'origine }
+\subsubsection{No graduations at the origin }
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}
@@ -284,25 +280,25 @@ Cela permet d'éviter des problèmes d'affichage.
% tkzAxeX
%<--------------------------------------------------------------------->
\subsection{\tkzcname{tkzAxeX}}\hypertarget{ax}{}
-\begin{NewMacroBox}{tkzAxeX}{\oarg{local options}}
-Cette macro permet de tracer l'axe des abscisses avec des ticks par défaut ainsi que les graduations. Elle combine les deux macros \tkzcname{tkzDrawX} et \tkzcname{tkzLabelX}. Elle doit être utilisée que dans les cas simples.
+\begin{NewMacroBox}{tkzAxeX}{\oarg{local options}}%
+This macro allows you to draw the abscissa axis with default ticks as well as the graduations. It combines the two macros \tkzcname{tkzDrawX} and \tkzcname{tkzLabelX}. It should only be used in simple cases.
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
-options & défaut & définition \\
+options & default & definition \\
\midrule
-\TOline{label} {$x$}{nom attribué au label}
+\TOline{label} {$x$}{label name}
\TOline{trig} {0}{graduation fraction de $\pi$}
-\TOline{frac} {0}{graduation fractionnaire, de dénominateur « frac »}
-\TOline{swap} {false}{permet de lancer \tkzcname{tkzLabelX} avant \tkzcname{tkzDrawX}}
+\TOline{frac} {0}{fractional, denominator graduation « frac »}
+\TOline{swap} {false}{allows you to run \tkzcname{tkzLabelX} before \tkzcname{tkzDrawX}}
\bottomrule
\end{tabular}
-{\tkzname{text} définit la couleur des graduations.}
+The option \tkzname{text} defines the color of the graduations.
\end{NewMacroBox}
-\subsubsection{exemple avec \tkzcname{tkzAxeX}}
+\subsubsection{Example with \tkzcname{tkzAxeX}}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}
\tkzInit[xmax=0.5,xstep=0.1,ymax=1]
@@ -311,7 +307,7 @@ options & défaut & définition \\
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Usage de \tkzname{pi} et \tkzcname{tkzAxeX}}
+\subsubsection{Use of \tkzname{pi} and \tkzcname{tkzAxeX}}
\begin{tkzexample}[latex=5cm,small]
\begin{tikzpicture}
\tkzInit[xmax=4,ymax=3.5]
@@ -323,8 +319,8 @@ options & défaut & définition \\
\end{tkzexample}
-\subsubsection{Option \tkzname{frac} et \tkzname{trig}}
-Dans cet exemple, on positionne le label $t$ ainsi que les graduations. \tkzcname{below=10pt} sert à placer les graduations en-dessous.
+\subsubsection{Option \tkzname{frac} and \tkzname{trig}}
+In this example, we position the $t$ label as well as the graduations. \tkzcname{below=10pt} is used to place the graduations underneath.
\begin{tkzexample}[latex=5cm,small]
\begin{tikzpicture}
\tkzInit[xmax=9,xstep=3,ymax=3.5]
@@ -338,68 +334,68 @@ Dans cet exemple, on positionne le label $t$ ainsi que les graduations. \tkzcna
% tkzDrawY
%<--------------------------------------------------------------------->
\subsection{\tkzcname{tkzDrawY}} \hypertarget{dy}{}
-\begin{NewMacroBox}{tkzDrawY}{\oarg{local options}}
-Cette macro permet de tracer l'axe des ordonnées avec des ticks par défaut.
-Les options sont celles de \TIKZ\ plus les suivantes~:
+\begin{NewMacroBox}{tkzDrawY}{\oarg{local options}}%
+This macro allows you to draw the ordinate axis with default ticks.
+The options are those of \TIKZ\ plus the following ones:
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
-options & défaut & définition \\
+options & default & definition \\
\midrule
-\TOline{color} {black} {couleur de l'axe et des ticks}
-\TOline{noticks} {false} {pas de ticks sur l'axe}
-\TOline{up space} {0,5 cm} {prolongement de l'axe en haut}
-\TOline{down space} {0 cm}{prolongement de l'axe en bas}
-\TOline{label} {$x$}{nom attribué au label}
-\TOline{trig} {0}{si <>0 pi/trig est l'unité}
-\TOline{tickwd} {0.8pt}{épaisseur du tick}
-\TOline{ticklt} {1pt}{hauteur du tick au dessus de l'axe}
-\TOline{tickrt} {1pt}{profondeur du tick en dessus de l'axe}
+\TOline{color} {black} {color of axis and ticks}
+\TOline{noticks} {false} {no ticks on the axis}
+\TOline{up space} {0,5 cm} {top axis extension}
+\TOline{down space} {0 cm}{axis extension down}
+\TOline{label} {$x$}{label name}
+\TOline{trig} {0}{if <>0 pi/trig is the unit}
+\TOline{tickwd} {0.8pt}{tick's thickness}
+\TOline{ticklt} {1pt}{height of the tick above the axis}
+\TOline{tickrt} {1pt}{above-axis tick depth}
\end{tabular}
\end{NewMacroBox}
\subsection{\tkzcname{tkzLabelY}} \hypertarget{ly}{}
-\begin{NewMacroBox}{tkzLabelY}{\oarg{local options}}
-Cette macro permet de tracer l'axe des abscisses avec des ticks par défaut.
-Les options sont celles de \TIKZ\ plus les suivantes~:
+\begin{NewMacroBox}{tkzLabelY}{\oarg{local options}}%
+This macro allows you to draw the abscissa axis with default ticks.
+The options are those of \TIKZ\ plus the following ones:
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
-options & défaut & définition \\
+options & default & definition \\
\midrule
-\TOline{color} {black} {couleur des graduations}
-\TOline{frac} {0}{si <>0 les graduations sont des fractions dénominateur=frac}
-\TOline{font} {\BS textstyle} { taille de la graduation.}
-\TOline{step} {1} {intervalle entre deux graduations}
+\TOline{color} {black} {graduation color}
+\TOline{frac} {0}{if <>0 graduations are denominator fractions=frac}
+\TOline{font} {\BS textstyle} {graduation size.}
+\TOline{step} {1} {interval between graduations}
\bottomrule
\end{tabular}
-{\tkzname{frac} et \tkzname{trig} sont des nombres entiers permettant de passer à une écriture fractionnaire ou trigonométrique.}
+{\tkzname{frac} and \tkzname{trig} are integers that can be changed to fractional or trigonometric writing. }
\end{NewMacroBox}
%<--------------------------------------------------------------------->
% tkzAxeY
%<--------------------------------------------------------------------->
\subsection{\tkzcname{tkzAxeY}}\hypertarget{ay}{}
-\begin{NewMacroBox}{tkzAxeY}{\oarg{local options}}
-Cette macro combine les deux macros :
+\begin{NewMacroBox}{tkzAxeY}{\oarg{local options}}%
+This macro combines the two macros:
\tkzcname{tkzDrawY} \tkzcname{tkzLabelY}
-Voir \tkzcname{tkzAxeX} pour les options
+Voir \tkzcname{tkzAxeX} for options
\end{NewMacroBox}
%<--------------------------------------------------------------------->
% tkzAxeXY
%<--------------------------------------------------------------------->
\subsection{\tkzcname{tkzAxeXY}} \hypertarget{axy}{}
-\begin{NewMacroBox}{tkzAxeXY}{\oarg{local options}}
-Cette macro combine les quatre macros :
+\begin{NewMacroBox}{tkzAxeXY}{\oarg{local options}}%
+This macro combines the four macros:
\tkzcname{tkzDrawX}\tkzcname{tkzDrawY} \tkzcname{tkzLabelX}\tkzcname{tkzLabelY}
-{Il est nécessaire d'utiliser des options communes comme dans l'exemple ci-dessous, mais cela signifie que les mêmes options sont appliquées aux deux macros. Ainsi il n'est pas possible de modifier \tkzname{label}}
+It is necessary to use common options as in the example below, but this means that the same options are applied to both macros. Thus it is not possible to change \tkzname{label}.
\end{NewMacroBox}
-\subsubsection{Couleur des axes, des graduations}
+\subsubsection{Colour of axes, graduations}
\begin{tkzexample}[latex=6cm]
\begin{tikzpicture}
@@ -408,7 +404,7 @@ Cette macro combine les quatre macros :
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Option \tkzname{\{label=\{\}\}}}
+\subsubsection{Option \tkzname{label=\{\}}}
\begin{tkzexample}[latex=6cm,small]
\begin{tikzpicture}
@@ -428,14 +424,12 @@ Cette macro combine les quatre macros :
% tkzDrawXY
%<--------------------------------------------------------------------->
\subsection{\tkzcname{tkzDrawXY}} \hypertarget{dxy}{}
-\begin{NewMacroBox}{tkzDrawXY}{\oarg{local options}}
-Cette macro combine les deux macros :
-\tkzcname{tkzDrawX}\tkzcname{tkzDrawY}
-
-{Il est nécessaire d'utiliser des options communes comme dans l'exemple ci-dessous}
+\begin{NewMacroBox}{tkzDrawXY}{\oarg{local options}}%
+This macro combines the two macros: \tkzcname{tkzDrawX}\tkzcname{tkzDrawY}.
+It is necessary to use common options as in the example below
\end{NewMacroBox}
-\subsubsection{Couleur commune et labels vides}
+\subsubsection{Common colour and empty labels}
\begin{tkzexample}[latex=6cm,small]
\begin{tikzpicture}
\tkzInit[xmin=-1,xmax=4,ymin=-1,ymax=1]
@@ -443,10 +437,10 @@ Cette macro combine les deux macros :
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Deux axes trigonométriques}
+\subsubsection{Two trigonometric axes}
\begin{tkzexample}[latex=6cm,small]
\begin{tikzpicture}
- \tkzInit[xmin=-1,xmax=4,ymin=-1,ymax=2]
+ \tkzInit[xmin=-1,xmax=4,ymin=-1,ymax=1]
\tkzDrawXY[label={},color=red,trig=4]
\end{tikzpicture}
\end{tkzexample}
@@ -454,12 +448,12 @@ Cette macro combine les deux macros :
% tkzLabelXY
%<--------------------------------------------------------------------->
\subsection{\tkzcname{tkzLabelXY}} \hypertarget{lxy}{}
-\begin{NewMacroBox}{tkzLabelXY}{\oarg{local options}}
-Cette macro combine les deux macros :
+\begin{NewMacroBox}{tkzLabelXY}{\oarg{local options}}%
+This macro combines the two macros:
\tkzcname{tkzLabelX}\tkzcname{tkzLabelY}
-{Il est nécessaire d'utiliser des options communes comme dans l'exemple ci-dessous}
+It is necessary to use common options as in the example below.
\end{NewMacroBox}
\subsubsection{}
@@ -474,36 +468,30 @@ Cette macro combine les deux macros :
%<--------------------------------------------------------------------->
% tkzSetUpAxis
%<--------------------------------------------------------------------->
-\subsection{Modifier les valeurs par des défauts des axes} \hypertarget{axis}{}
-
-\begin{NewMacroBox}{tkzSetUpAxis}{\oarg{local options}}
+\subsection{Changing values by axis default} \hypertarget{axis}{}
-\medskip
-\begin{tabular}{lll}
-\toprule
-options & défaut & définition \\
+\begin{NewMacroBox}{tkzSetUpAxis}{\oarg{local options}}%
+\begin{tabular}{lll}%
+options & default & definition \\
\midrule
-\TOline{line width}{|0.4pt|}{line width définit la largeur du trait}
-\TOline{tickwd}{|0.8pt|}{épaisseur du tick }
-\TOline{ticka}{|1pt|}{partie droite ou au dessus du tick }
-\TOline{tickb}{|1pt|}{partie gauche ou en dessous du tick }
-\TOline{font}{|\tkzcname{textstyle}|}{taille de la graduation.}
-\bottomrule
+\TOline{line width}{|0.4pt|}{line width defines the width of the line}
+\TOline{tickwd}{|0.8pt|}{tick thickness }
+\TOline{ticka}{|1pt|}{right side or above the tick }
+\TOline{tickb}{|1pt|}{left side or below the tick }
+\TOline{font}{|\tkzcname{textstyle}|}{graduation size.}
\end{tabular}
\end{NewMacroBox}
-\subsubsection{Modification des axes par défaut}
-
-\begin{tkzexample}[latex=6cm,small]
- \begin{tikzpicture}[scale=1]
- \tkzInit[ymax=2,xmax=4]
- \tkzSetUpAxis[line width=1pt,tickwd=1pt,
- ticka=3pt, tickb=0pt]
- \tkzAxeXY
- \end{tikzpicture}
+\subsubsection{Changing the default axes}
+\begin{tkzexample}[latex=5cm,small]
+\begin{tikzpicture}[scale=1]
+ \tkzInit[ymax=2,xmax=4]
+ \tkzSetUpAxis[line width=1pt,tickwd=1pt,ticka=3pt, tickb=0pt]
+ \tkzAxeXY
+\end{tikzpicture}
\end{tkzexample}
-Il faut lancer de nouveau \tkzcname{tkzSetUpAxis } pour récupérer les valeurs par défaut.
+You have to run \tkzcname{tkzSetUpAxis } again to retrieve the default values.
\medskip
\begin{tkzltxexample}[small]
diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-compilation.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-compilation.tex
index 746340983a..66a055a3b0 100644
--- a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-compilation.tex
+++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-compilation.tex
@@ -1,7 +1,7 @@
-\section{Compilation des exemples}
+\section{Compilation of examples}
%–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––>
-\subsection{Test de l'installation}
-Le code ci-dessous permet de tester votre installation de \tkzname{tkz-base}. Je vous signale que \NamePack{xfp}, tout comme \NamePack{numprint} doit être présent ainsi que la version 3.01 (ou plus) de \tkzNamePack{pgf}. Tous les exemples ainsi que cette documentation ont été compilés à l'aide de Lua\LATEX\
+\subsection{Installation test}
+The code below allows you to test your installation of \tkzname{tkz-base}. Please note that \NamePack{xfp} as well as \NamePack{numprint} must be present as well as version 3.01 (or higher) of \tkzNamePack{pgf}. All examples and this documentation have been compiled using Lua\LATEX.
\medskip
\begin{minipage}{0.45\textwidth}
@@ -26,97 +26,21 @@ Le code ci-dessous permet de tester votre installation de \tkzname{tkz-base}. J
\end{tikzpicture}
\end{minipage}
-\emph{Remarques sur ce test}
+\emph{Notes on this test}
\begin{enumerate}
-\item La compilation de ce document et des exemples est obtnue avec \tkzimp{luaLatex-dev}.
-\item En principe, \tkzNamePack{tkz-base} n'est pas chargé par l'utilisateur, il sera chargé par un autre package comme \tkzNamePack{tkz-euclide} ou \tkzNamePack{tkz-fct}. \tkzNamePack{tkz-base} charge \tkzNamePack{numprint} avec l'option \tkzNamePack{autolanguage}, \tkzNamePack{xfp} et bien sûr {\TIKZ}.
-
-\item
-\TIKZ\ était parfois allergique aux caractères actifs, il semblerait que la version 3. de pgf est réglé ces problèmes. En cas de difficulté, il est recommandé de charger la librairie \NameLib{babel} avec \tkzcname{usetikzlabry\{babel\}}. Une autre possibilité est de compiler avec \tkzname{lualatex}.
+\item The compilation of this document and examples is obtained with \tkzimp{luaLatex-dev}.
+\item In principle, \tkzNamePack{tkz-base} is not loaded by the user, it will be loaded by another package like \tkzNamePack{tkz-euclide} or \tkzNamePack{tkz-fct}. \tkzNamePack{tkz-base} loads \tkzNamePack{numprint} with the option \tkzNamePack{autolanguage}, \tkzNamePack{xfp} and of course {\TIKZ}.
+\item \TIKZ\ seems that version 3 of pgf has fixed those problems. In case of difficulty, it is recommended to load the \NameLib{babel} library with \tkzcname{usetikzlabry\{babel\}}. Another possibility is to compile with Lua\LATEX.
\end{enumerate}
-\subsection{Pourquoi \tkzNamePack{xfp} et \tkzNamePack{numprint}}
-
-\tkzNamePack{xfp} remplace désormais \tkzNamePack{fp} dans ce package. Un des avantages pour l'utilisateur est une syntace simplifiée. Il permet de gérer des calculs sur des grands nombres ou des très petits avec précision. Cela ralentit un peu la compilation, aussi il est préférable de ne pas en abuser. \tkzNamePack{xfp} est avant tout utilisé, pour obtenir des graduations correctes.
+\subsection {\tkzNamePack{xfp} and \tkzNamePack{numprint}}
-\tkzNamePack{numprint} était présent quand j'ai commencé à écrire cette série de packages, depuis \tkzNamePack{siunitx} s'est développé et je peux comprendre que certains le préfèrent. Dans une prochaine version, j'ai prévu de laisser le choix du package pour l'affichage des nombres.
+\tkzNamePack{xfp} now replaces \tkzNamePack{fp} in this package. One of the advantages for the user is a simplified syntax. It allows to manage calculations on large or very small numbers with precision. This slows down the compilation a bit, so it is better not to overuse it. \tkzNamePack{xfp} is used above all, to obtain correct graduations.
-% \newpage
-% \section{Les macros}
-%
-% Le package vous fournit les macros essentielles suivantes, qui sont données avec leurs principales options et valeurs par défaut~:
-%
-% \bigskip
-% \begin{enumerate}
-% \item Macros générales
-% \medskip
-% \begin{itemize}\setlength{\itemsep}{6pt}
-%
-% \item \tkzhname{\hyperlink{obj}{usetkzobj}}\var{all} ou \var{circles,lines,polygons,etc.}
-% \item \tkzhname{\hyperlink{init}{tkzInit}}[xmin=0,xmax=10,xstep=1,ymin=0,ymax=10,ystep=1]
-% \item \tkzhname{\hyperlink{grid}{tkzGrid}}[sub,color=darkgray,line width=.4pt]
-% \item \tkzhname{\hyperlink{clip}{tkzClip}}[space=1]
-% \item \tkzhname{\hyperlink{rep}{tkzRep}}[xlabel=$\vec{\imath}$,ylabel=$\vec{\jmath}$]
-% \item \tkzhname{\hyperlink{text}{tkzText}}[color=black,text=black,fill=white]\parg{point}\var{un texte}
-% \item \tkzhname{\hyperlink{legend}{tkzLegend}}[options]\var{mark/couleur/size/texte}
-% \end{itemize}
-% \item Macros sur les axes
-% \medskip
-% \begin{itemize}\setlength{\itemsep}{4pt}
-% \item \tkzhname{\hyperlink{ax}{tkzAxeX}}[label=$x$,color=black,trig,frac]
-% \item \tkzhname{\hyperlink{dx}{tkzDrawX}}[noticks,label=$x$]
-% \item \tkzhname{\hyperlink{lx}{tkzLabelX}}[trig,frac,np off]
-% \item \tkzhname{\hyperlink{ay}{tkzAxeY}}[label=$y$,color=black]
-% \item \tkzhname{\hyperlink{dy}{tkzDrawY}}[noticks,label=$y$]
-% \item \tkzhname{\hyperlink{ly}{tkzLabelY}}[trig,frac,np off]
-% \item \tkzhname{\hyperlink{axy}{tkzAxeXY}}[label=\{\},color=black,frac]
-% \item \tkzhname{\hyperlink{dxy}{tkzDrawXY}}[label=\{\},color=black,frac]
-% \item \tkzhname{\hyperlink{lxy}{tkzLabelXY}}[trig,frac,np off]
-% \end{itemize}
-%
-% \item Macros sur les points
-%
-% \medskip
-% \begin{itemize}\setlength{\itemsep}{4pt}
-% \item \tkzhname{\hyperlink{tdp}{tkzDefPoint}}\parg{$x,y$}\marg{name} ou bien \parg{$a:r$}\marg{name}
-% \item \tkzhname{\hyperlink{tdps}{tkzDefPoints}}\marg{$x_1$/$y_1$/name,$x_2$/$y_2$/name}
-% \item \tkzhname{\hyperlink{tdsp}{tkzDefShiftPoint}}[point]\parg{$x,y$ ou $a:r$ }\marg{name}
-% \item \tkzhname{\hyperlink{tdrp}{tkzDrawPoint}}[options]\parg{name}
-% \item \tkzhname{\hyperlink{tdrps}{tkzDrawPoints}}[options]\parg{n1,n2,...}
-% \item \tkzhname{\hyperlink{tlp}{tkzLabelPoint}}[options]\parg{name}\var{label}
-% \item \tkzhname{\hyperlink{tlps}{tkzLabelPoints}}\parg{n1,n2,...}
-% \item \tkzhname{\hyperlink{tlps}{tkzLabelPoints}}\parg{n1,n2,...} \item \tkzhname{\hyperlink{tpsc}{tkzPointShowCoord}}[options]\parg{point} \end{itemize}
-%
-% \item Macros sur les segments
-%
-% \medskip
-% \begin{itemize}\setlength{\itemsep}{4pt}
-% \item \tkzhname{\hyperlink{tds}{tkzDrawSegment}}[options]\parg{name,name}
-% \item \tkzhname{\hyperlink{tdss}{tkzDrawSegments}}[options]\parg{$pt_1,pt_2$ $pt_3,pt_4$}
-% \item \tkzhname{\hyperlink{tdpos}{tkzDrawPolySeg}}[options]\parg{$pt_1,pt_2,pt_3,...$ ,...}
-% \item \tkzhname{\hyperlink{tls}{tkzLabelSegment}}[options]\parg{name,name}\marg{label}
-% \item \tkzhname{\hyperlink{tlss}{tkzLabelSegments}}[options]\parg{n1,n2 n3,n4 ...}
-% \item \tkzhname{\hyperlink{tms}{tkzMarkSegment}}[mark=none,pos=.5,size=4pt]\parg{name,name}
-% \item \tkzhname{\hyperlink{tmss}{tkzMarkSegments}}[options]\parg{n1,n2 n3,n4 ...}
-% \end{itemize}
-%
-% \item Autres macros
-%
-% \medskip
-% \begin{itemize}\setlength{\itemsep}{4pt}
-% \item \tkzhname{\hyperlink{thl}{tkzHLine}}[options]\marg{$v$}
-% \item \tkzhname{\hyperlink{thls}{tkzHLines}}[options]\marg{$v_1,v_2,...$}
-% \item \tkzhname{\hyperlink{tvl}{tkzVLine}}[options]\marg{$v$}
-% \item \tkzhname{\hyperlink{tvls}{tkzVLines}}[options]\marg{$v_1,v_2,...$}
-% \item \tkzhname{\hyperlink{tht}{tkzHTick}}[options]\marg{$v$}
-% \item \tkzhname{\hyperlink{thts}{tkzHTicks}}[options]\marg{$v_1,v_2,...$}
-% \item \tkzhname{\hyperlink{tvt}{tkzVTick}}[options]\marg{$v$}
-% \item \tkzhname{\hyperlink{tvts}{tkzVTicks}}[options]\marg{$v_1,v_2,...$} \end{itemize}
-%
-% \end{enumerate}
+\tkzNamePack{numprint} was present when I started to write this series of packages, since \tkzNamePack{siunitx} has grown and I can understand that some people prefer it. In a future version, I plan to leave the choice of the package for displaying numbers.
\endinput
diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-divers.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-divers.tex
index f6de017439..578b4bd68e 100644
--- a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-divers.tex
+++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-divers.tex
@@ -1,32 +1,29 @@
-\section{Droites parallèles aux axes}
+\section{Lines parallel to the axes}
-\subsection{ Tracer une ligne horizontale avec \tkzcname{tkzHLine}} \hypertarget{thl}{}
-\begin{NewMacroBox}{tkzHLine}{\oarg{local options}\marg{decimal number}}
-\tkzHandBomb La syntaxe est celle de \tkzname{xfp}!
-
-\begin{tabular}{lll}
- \toprule
-arguments & exemple & définition \\
+\subsection{ Draw a horizontal line with \tkzcname{tkzHLine}} \hypertarget{thl}{}
+\tkzHandBomb The syntax is that of \tkzname{xfp}!
+\begin{NewMacroBox}{tkzHLine}{\oarg{local options}\marg{decimal number}}%
+\begin{tabular}{lll}%
+arguments & example & definition \\
\midrule
-\TAline{decimal number}{\tkzcname{tkzHLine\{1\}}}{Trace la droite $y=1$}
+\TAline{decimal number}{\tkzcname{tkzHLine\{1\}}}{Draw the right $y=1$}
\bottomrule
\end{tabular}
\medskip
-\begin{tabular}{lll}
-\toprule
-options & défaut & définition \\
+\begin{tabular}{lll}%
+options & default & definition \\
\midrule
-\TOline{color }{|black| }{ couleur du trait}
-\TOline{line width}{|0.6pt| }{ épaisseur du point}
-\TOline{style }{|solid|}{ style du trait }
+\TOline{color }{|black| }{ line colour}
+\TOline{line width}{|0.6pt| }{ point thickness}
+\TOline{style }{|solid|}{ line style }
\bottomrule
\end{tabular}
-{voir les options les lignes dans \TIKZ}
+{see options the lines in \TIKZ}
\end{NewMacroBox}
-\subsubsection{Ligne horizontale }
+\subsubsection{Horizontal line }
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=2]
@@ -40,7 +37,7 @@ options & défaut & définition \\
-\subsubsection{Ligne horizontale et valeur calculée par \tkzname{xfp} }
+\subsubsection{Horizontal line and value calculated by \tkzname{xfp} }
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}
\tkzInit[xmin=-3,xmax=3,ymin=-2,ymax=1.5]
@@ -52,21 +49,18 @@ options & défaut & définition \\
\end{tikzpicture}
\end{tkzexample}
-\subsection{Lignes horizontales avec \tkzcname{tkzHLines} }
-\hypertarget{thls}{}
-\begin{NewMacroBox}{tkzHLines}{\oarg{local options}\marg{list of values}}
-\tkzHandBomb La syntaxe est celle de \tkzname{xfp} !
-
-\begin{tabular}{lll}
- \toprule
-arguments & exemple & définition \\
+\subsection{Horizontal lines with \tkzcname{tkzHLines} }
+\hypertarget{thls}{}
+\tkzHandBomb The syntax is that of \tkzname{xfp} !
+\begin{NewMacroBox}{tkzHLines}{\oarg{local options}\marg{list of values}}%
+\begin{tabular}{lll}%
+arguments & example & definition \\
\midrule
-\TAline{list of values}{\tkzcname{tkzHLines\{1,4\}}}{Trace les droites $x=1$ et $x=4$}
-\bottomrule
+\TAline{list of values}{\tkzcname{tkzHLines\{1,4\}}}{draws the lines $x=1$ and $x=4$}
\end{tabular}
\end{NewMacroBox}
-\subsubsection{Lignes horizontales}
+\subsubsection{Horizontal lines}
\begin{tkzexample}[latex=7cm,small]
@@ -78,33 +72,33 @@ arguments & exemple & définition \\
\end{tkzexample}
-\subsection{ Tracer une ligne verticale avec \tkzcname{tkzVLine}} \hypertarget{tvl}{}
-\begin{NewMacroBox}{tkzVLine}{\oarg{local options}\marg{decimal number}}
-\tkzHandBomb La syntaxe est celle de \tkzname{xfp} !
-\begin{tabular}{lll}
- \toprule
-arguments & exemple & définition \\
+\subsection{ Draw a vertical line with \tkzcname{tkzVLine}} \hypertarget{tvl}{}
+\tkzHandBomb The syntax is that of \tkzname{xfp} !
+\begin{NewMacroBox}{tkzVLine}{\oarg{local options}\marg{decimal number}}%
+\begin{tabular}{lll}%
+arguments & example & definition \\
+
\midrule
-\TAline{decimal number}{\tkzcname{tkzVLine\{1\}}}{Trace la droite $x=1$}
+\TAline{decimal number}{\tkzcname{tkzVLine\{1\}}}{Draw the line $x=1$}
\bottomrule
\end{tabular}
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
-options & défaut & définition \\
+options & default & definition \\
\midrule
-\TOline{color }{|black| }{ couleur du trait}
-\TOline{line width}{|0.6pt| }{ épaisseur du point}
-\TOline{style }{|solid|}{ style du trait }
+\TOline{color }{|black| }{line colour}
+\TOline{line width}{|0.6pt| }{point thickness}
+\TOline{style }{|solid|}{line style }
\bottomrule
\end{tabular}
-{voir les options les lignes dans \TIKZ}
+See options the lines in \TIKZ.
\end{NewMacroBox}
-\subsubsection{Ligne verticale }
+\subsubsection{Vertical line }
\begin{tkzexample}[latex=8cm,small]
\begin{tikzpicture}[scale=2]
@@ -116,7 +110,7 @@ options & défaut & définition \\
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Ligne verticale et valeur calculée par \tkzname{xfp} }
+\subsubsection{Vertical line and value calculated by \tkzname{xfp} }
\begin{tkzexample}[latex=8cm,small]
\begin{tikzpicture}
\tkzInit[xmax=7,ymin=-1,ymax=1]
@@ -129,21 +123,18 @@ options & défaut & définition \\
\end{tkzexample}
-\subsection{Lignes verticales avec \tkzcname{tkzVLines} }
+\subsection{Vertical lines with \tkzcname{tkzVLines} }
\hypertarget{tvls}{}
-\begin{NewMacroBox}{tkzVLines}{\oarg{local options}\marg{list of values}}
-\tkzHandBomb La syntaxe est celle de \tkzname{xfp} !
-
-\begin{tabular}{lll}
- \toprule
-arguments & exemple & définition \\
+\tkzHandBomb The syntax is that of \tkzname{xfp} !
+\begin{NewMacroBox}{tkzVLines}{\oarg{local options}\marg{list of values}}%
+\begin{tabular}{lll}%
+arguments & example & definition \\
\midrule
-\TAline{list of values}{\tkzcname{tkzVLines\{1,4\}}}{Trace les droites $x=1$ et $x=4$}
-\bottomrule
+\TAline{list of values}{\tkzcname{tkzVLines\{1,4\}}}{Trace the lines $x=$1 and $x=4$}
\end{tabular}
\end{NewMacroBox}
-\subsubsection{Lignes verticales}
+\subsubsection{Vertical lines}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}
@@ -153,36 +144,31 @@ arguments & exemple & définition \\
\end{tikzpicture}
\end{tkzexample}
-\newpage
-\section{Ticks sur les axes}
+\section{Ticks on the axes}
%<–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––>
-\subsection{ Tracer des ticks sur l'axe des abscisses \tkzcname{tkzHTick}} \hypertarget{tht}{}
-\begin{NewMacroBox}{tkzHTick}{\oarg{local options}\marg{decimal number}}
-
-
-\begin{tabular}{lll}
- \toprule
-arguments & exemple & définition \\
+\subsection{ Drawing one tick on the abscissa axis \tkzcname{tkzHTick}} \hypertarget{tht}{}
+\begin{NewMacroBox}{tkzHTick}{\oarg{local options}\marg{decimal number}}%
+\begin{tabular}{lll}%
+arguments & example & definition \\
\midrule
-\TAline{decimal number}{\tkzcname{tkzHTick\{1\}}}{l'abscisse du tick est 1}
+\TAline{decimal number}{\tkzcname{tkzHTick\{1\}}}{the abscissa of the tick is 1}
\bottomrule
\end{tabular}
\medskip
-\begin{tabular}{lll}
-\toprule
-options & défaut & définition \\
+\begin{tabular}{lll}%
+options & default & definition \\
\midrule
-\TOline{mark }{* }{ disque plein}
-\TOline{mark size}{3 pt }{taille du symbole}
-\TOline{mark options}{ vide}{permet d'utiliser color par exemple}
+\TOline{mark }{* }{full disk}
+\TOline{mark size}{3 pt }{symbol size}
+\TOline{mark options}{empty}{allows you to use color for example}
\bottomrule
\end{tabular}
-{voir les options de \TIKZ}
+See options for \TIKZ.
\end{NewMacroBox}
-\subsubsection{exemple}
+\subsubsection{Example}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}
@@ -194,47 +180,40 @@ options & défaut & définition \\
\end{tikzpicture}
\end{tkzexample}
-\subsection{ Tracer des ticks sur l'axe des ordonnées \tkzcname{tkzHTicks}} \hypertarget{thts}{}
-\begin{NewMacroBox}{tkzHTicks}{\oarg{local options}\marg{list of numbers}}
-
+\subsection{ Drawing ticks on the ordinate axis \tkzcname{tkzHTicks}} \hypertarget{thts}{}
+\begin{NewMacroBox}{tkzHTicks}{\oarg{local options}\marg{list of numbers}}%
\begin{tabular}{lll}
- \toprule
-arguments & exemple & définition \\
+arguments & example & definition \\
\midrule
-\TAline{decimal number}{\tkzcname{tkzHTicks\{1\}}}{l'abscisse du tick est 1}
+\TAline{decimal number}{\tkzcname{tkzHTicks\{1\}}}{the abscissa of the tick is 1}
\bottomrule
\end{tabular}
-{voir les options de \TIKZ.}
+See options for \TIKZ.
\end{NewMacroBox}
-\subsection{ Tracer des ticks sur l'axe des abscisses \tkzcname{tkzVTick}} \hypertarget{tvt}{}
-\begin{NewMacroBox}{tkzVTick}{\oarg{local options}\marg{decimal number}}
-
-\begin{tabular}{lll}
- \toprule
-arguments & exemple & définition \\
+\subsection{ Drawing one tick on the abscissa axis \tkzcname{tkzVTick}} \hypertarget{tvt}{}
+\begin{NewMacroBox}{tkzVTick}{\oarg{local options}\marg{decimal number}}%
+\begin{tabular}{lll}%
+arguments & example & definition \\
\midrule
-\TAline{decimal number}{\tkzcname{tkzVTick\{1\}}}{l'abscisse du tick est 1}
+\TAline{decimal number}{\tkzcname{tkzVTick\{1\}}}{the abscissa of the tick is 1}
\bottomrule
\end{tabular}
-{voir les options de \TIKZ.}
-
+See options for \TIKZ.
\end{NewMacroBox}
-\subsection{ Tracer des ticks sur l'axe des abscisses \tkzcname{tkzVTicks}} \hypertarget{tvts}{}
-\begin{NewMacroBox}{tkzVTicks}{\oarg{local options}\marg{decimal number}}
-
+\subsection{ Drawing ticks on the abscissa axis \tkzcname{tkzVTicks}} \hypertarget{tvts}{}
+\begin{NewMacroBox}{tkzVTicks}{\oarg{local options}\marg{decimal number}}%
\begin{tabular}{lll}
- \toprule
-arguments & exemple & définition \\
+arguments & example & definition \\
\midrule
-\TAline{decimal number}{\tkzcname{tkzVTicks\{1,3\}}}{les ordonnées des ticks sont 1 et 3}
+\TAline{decimal number}{\tkzcname{tkzVTicks\{1,3\}}}{the ordinates of the ticks are 1 and 3}
\bottomrule
\end{tabular}
-{voir les options de \TIKZ.}
+See options for \TIKZ.
\end{NewMacroBox}
\endinput \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-example.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-example.tex
index 2285181433..a9faf42a9c 100644
--- a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-example.tex
+++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-example.tex
@@ -1,15 +1,15 @@
-\section{Quelques exemples}
+\section{Here are a few examples}
-Voici un exemple très simple qui vous montre qu'une fois le repère défini, il est facile de travailler avec les outils de mon module. Il est cependant possible d'utiliser les outils de Tikz, mais dans ce cas il faut revenir au système de coordonnées d'origine.
+Here is a very simple example that shows you that once the reference is defined, it is easy to work with the tools of my module. It is however possible to use the Tikz tools, but in this case you have to go back to the original coordinate system.
-\subsection{Recette en fonction du mois}
+\subsection{Recipe by month}
\begin{tkzexample}[vbox,small]
\begin{tikzpicture}
\tkzInit[xmax=12,ymin=1000,ymax=11000,ystep=1000]
\tkzClip[space=2]
- \tkzAxeX[label=mois,below=10pt]
- \tkzAxeY[label=Recette]
+ \tkzAxeX[label=month,below=10pt]
+ \tkzAxeY[label=Recipe]
\tkzDefPoint(1,2000){A}
\tkzDefPoint(2,3000){B}
\tkzDefPoint(4,2500){C}
@@ -18,7 +18,7 @@ Voici un exemple très simple qui vous montre qu'une fois le repère défini, il
\tkzDrawMarks[mark=ball](A,B,C,D)
\tkzText[draw,color = red,fill = red!10,text width=3cm](5,6000)%
{\begin{center}\color{blue}%
- Recette en fonction du mois\end{center}%
+ Recipe by month\end{center}%
}
\end{tikzpicture}
\end{tkzexample}
diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-faq.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-faq.tex
index ed02903a96..44f60ff4f4 100644
--- a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-faq.tex
+++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-faq.tex
@@ -1,28 +1,27 @@
\section{FAQ}
-\subsection{Questions générales}
+\subsection{General Questions}
\begin{itemize}\setlength{\itemsep}{10pt}
- \item \tkzimp{Pourquoi \tkzNamePack{tkz-base} ?} J'avais besoin en tant que professeur de Mathématiques d'outils permettant d'écrire mes cours et mes exercices rapidement. \TIKZ\ était parfait pour cela, mais je perdai trop de temps sur des détails. J'ai voulu créer une syntaxe à la fois proche de celle de \LATEX\ et des mathématiques afin de mieux mémoriser. J'ai créé ainsi un module pour chaque branche des mathématiques que j'enseignais. \tkzNamePack{tkz-base} est la partie commune de tous ces modules. \tkzNamePack{tkz-euclide} et \tkzNamePack{tkz-berge} sont ceux pour lesquels je me suis le plus investi.
+ \item \tkzimp{Why \tkzNamePack{tkz-base} ?} As a Mathematics teacher, I needed tools that would allow me to write my lessons and exercises quickly. \TIKZ\ was perfect for that, but I was wasting too much time on details. I wanted to create a syntax that was both close to that of \LATEX and math so I could memorize better. So I created a module for each branch of mathematics I taught. \tkzNamePack{tkz-base} is the common part of all these modules. \tkzNamePack{tkz-euclide} and \tkzNamePack{tkz-berge} are the ones I invested the most in.
- \item \tkzimp{Relation avec Ti\emph{k}Z ?} \TIKZ\ est un superbe package permettant de décrire des dessins. Mes packages sont basés sur lui. Cela dit, cela n'est aucunement comparable. Mes packages ne sont utiles que pour des personnes voulant créer des figures de mathématiques.
+ \item \tkzimp{Relationship with \TIKZ?} \TIKZ\ is a great package for describing drawings. My packages are based on it. That said, it is in no way comparable. My packages are only useful for people who want to create mathematical figures.
\end{itemize}
-\subsection{Erreurs les plus fréquentes}
+\subsection{Most common errors}
\begin{itemize}\setlength{\itemsep}{10pt}
-\item \tkzimp{Error unknown option : label options} Cette option n'existe plus . Vous pouvez maintenant directement utiliser les options de \TIKZ.
+\item \tkzimp{Error unknown option: "label options"}. This option is no longer available. You can now directly use the options in \TIKZ.
- \item \tkzimp{Error avec \tkzcname{tkzDrawPoint} ou \tkzcname{tkzDefPoint} }\tkzcname{tkzDrawPoint(A,B)} alors qu'il faut \tkzcname{tkzDrawPoints}. C'est vrai avec toutes les macros qui permettent de définir plusieurs objets. La forme singulière permmet d'utiliser des options personnalisées. En revanche il est possible d'utiliser la forme pluriel pour un unique objet.
+ \item \tkzimp{Error avec \tkzcname{tkzDrawPoint} ou \tkzcname{tkzDefPoint} }\tkzcname{tkzDrawPoint(A,B)} when you need \tkzcname{tkzDrawPoints}. This is true with all macros that allow you to define multiple objects. The singular form allows you to use custom options. On the other hand, it is possible to use the plural form for a single object.
- \item \tkzimp{propagation d'un style} Il est possible de restreindre la propagation d'un style en plaçant un morceau de code dans un groupe ou dans un environnement \tkzimp{scope} ou bien entre des parenthèses.
+ \item \tkzimp{Propagation of a style} It is possible to restrict the propagation of a style by placing a piece of code in a group or in a \tkzimp{scope} environment or between parentheses.
- \item \tkzimp{L'emploi de la virgule} même dans un mode Mathématique \$2,5\$ nécessite d'être protégé dans un groupe TeX par exemple \{\$2,5\$\}.
+ \item \tkzimp{The use of the comma} even in a Mathematical mode \$2.5\$ needs to be protected in a TeX group, for example \{\$2,5\$\}.
- \item
-\item \tkzcname{tkzDrawSegments\{B,B' C,C'\}} est une erreur. Seules, les macros qui définissent un objet utilisent des accolades.
- \item Si une erreur survient dans un calcul lors d'un passage de paramètres, alors il est préférable de faire ces calculs avant d'appeler la macro.
- \item Ne pas mélanger la syntaxe de \tkzNamePack{pgfmath} et celle de \tkzNamePack{xfp}.
+\item \tkzcname{tkzDrawSegments\{B,B' C,C'\}} is a mistake. Only macros that define an object use braces.
+ \item If an error occurs in a calculation when passing parameters, then it is better to make these calculations before calling the macro.
+ \item Do not mix the syntax of \tkzNamePack{pgfmath} and \tkzNamePack{xfp}.
\end{itemize}
\endinput \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-grid.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-grid.tex
index 6dadd23134..80c8af8b0b 100644
--- a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-grid.tex
+++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-grid.tex
@@ -1,34 +1,33 @@
-\section{Utilisation de \tkzcname{tkzGrid}} \hypertarget{grid}{}
+\section{Use of \tkzcname{tkzGrid}} \hypertarget{grid}{}
-\begin{NewMacroBox}{tkzGrid}{\oarg{local options}\parg{$x_A~;~y_A$} \parg{$x_B~;~y_B$}}
- Quelques changements pour cette macro. Tout d'abord, pour simplifier actuellement la couleur de la grille la plus fine est déterminée automatiquement à partir de la grille principale, même processus pour l'épaisseur. Ce comportement pourra être modifié à l'aide de styles.
+\begin{NewMacroBox}{tkzGrid}{\oarg{local options}\parg{$x_A~;~y_A$} \parg{$x_B~;~y_B$}}%
+ A few changes for this macro. First of all, to simplify currently the color of the thinnest grid is determined automatically from the main grid, same process for the thickness. This behavior can be modified using styles.
-\begin{tabular}{lll}
-options & défaut & définition \\
+\begin{tabular}{lll}%
+options & default & definition \\
\midrule
-\TAline{\parg{$x_A~;~y_A$} \parg{$x_B~;~y_B$}}{(xmin,ymin)(xmax,ymax)} {trace une grille}
+\TAline{\parg{$x_A~;~y_A$} \parg{$x_B~;~y_B$}}{(xmin,ymin)(xmax,ymax)} {grid pattern}
\end{tabular}
-
-
-\begin{tabular}{lll}
-options & défaut & définition \\
+
+\begin{tabular}{lll}%
+options & default & definition \\
\midrule
-\TOline{sub}{true} {demande une sous grille }
-\TOline{color}{darkgray}{couleur de la grille principale}
-\TOline{subxstep}{0.2} {le pas des sous-graduations pour l'axe des abscisses}
-\TOline{subystep}{0.2}{le pas des sous-graduations pour l'axe des ordonnées }
-\TOline{line width}{0.4pt} {épaisseur des traits de la grille principale}
+\TOline{sub}{true} {asks for a sub-grid }
+\TOline{color}{darkgray}{main grid color}
+\TOline{subxstep}{0.2} {the step of the subgraduations for the abscissa axis}
+\TOline{subystep}{0.2}{the step of the subgraduations for the ordinate axis }
+\TOline{line width}{0.4pt} {main grid line thickness}
\bottomrule
\end{tabular}
\medskip
-{Les valeurs par défaut peuvent être changées dans le fichier de configuration ou encore par des macros. La couleur de la seconde grille est celle de la grille principale, mais moins intense. Même comportement pour l'épaisseur du trait. Voir les exemples pour modifier ce comportement.}
+Default values can be changed in the configuration file or by macros. The color of the second grid is the same as the main grid, but less intense. Same behavior for the line thickness. See the examples to change this behavior.
\end{NewMacroBox}
-\subsubsection{\tkzcname{tkzGrid} et l'option \tkzname{sub}}
-L'option \tkzname{sub} permet d'afficher une grille secondaire plus fine.
-Il est préférable de lancer \tkzcname{tkzGrid} en premier,
- pour éviter que la grille se superpose à d'autres éléments .
+\subsubsection{\tkzcname{tkzGrid} and the option \tkzname{sub}}
+The option \tkzname{sub} allows you to display a finer secondary grid.
+It is preferable to run \tkzcname{tkzGrid} first,
+ to prevent the grid from being overlapped with other elements.
\begin{tkzexample}[latex=8cm,small]
\begin{tikzpicture}
\tkzInit[xmax=4, ymax=2]
@@ -38,22 +37,21 @@ Il est préférable de lancer \tkzcname{tkzGrid} en premier,
\end{tkzexample}
\subsubsection{Option \tkzname{sub}}
-L'option \tkzname{sub} permet d'afficher un grille secondaire plus fine. Certains paramètres sont mofiables.
+The option \tkzname{sub} allows to display a finer secondary grid. Some parameters are mofiable.
-
\begin{tkzexample}[latex=6cm,small]
\def\tkzCoeffSubColor{20}
\def\tkzCoeffSubLw{0.2}
\begin{tikzpicture}
\tkzInit[xmax=4, ymax=2]
- % on peut modifier le pas pour la seconde grille
+ % we can change the step for the second grid
\tkzGrid[sub,color=orange,
subxstep=.5,subystep=.5]
\tkzAxeXY
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Presque par défaut}
+\subsubsection{Almost Default}
\begin{tkzexample}[width=7cm,small]
\begin{tikzpicture}
\tkzInit[xmax=5,ymax=2]
@@ -62,7 +60,7 @@ L'option \tkzname{sub} permet d'afficher un grille secondaire plus fine. Certain
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Sous grille en plus, option \tkzname{sub}}
+\subsubsection{Under the grid, too, option \tkzname{sub}}
\begin{tkzexample}[width=7cm,small]
\begin{tikzpicture}
\tkzInit[xmax=5,ymax=2]
@@ -72,7 +70,7 @@ L'option \tkzname{sub} permet d'afficher un grille secondaire plus fine. Certain
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Changement de maille}
+\subsubsection{Grid change}
\begin{tkzexample}[width=7cm,small]
\begin{tikzpicture}
\tkzInit[xmax=5,ymax=2]
@@ -84,8 +82,7 @@ L'option \tkzname{sub} permet d'afficher un grille secondaire plus fine. Certain
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Option \tkzname{xstep}, \tkzname{xstep}, \tkzname{subxstep} et \tkzname{subystep}}
-
+\subsubsection{Option \tkzname{xstep}, \tkzname{xstep}, \tkzname{subxstep} and \tkzname{subystep}}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}
\tkzInit[xmax=.5,xstep=.1,
@@ -98,8 +95,7 @@ L'option \tkzname{sub} permet d'afficher un grille secondaire plus fine. Certain
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Avec des intervalles importants}
-
+\subsubsection{With large intervals}
\begin{tkzexample}[width=7cm,small]
\begin{tikzpicture}
\tkzInit[xmax=100,xstep=20,
@@ -111,9 +107,8 @@ L'option \tkzname{sub} permet d'afficher un grille secondaire plus fine. Certain
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{\tkzcname{tkzGrid} et les arguments}
-
-La grille peut avoir une taille quelconque.
+\subsubsection{\tkzcname{tkzGrid} and the arguments}
+The grid can be any size.
\begin{tkzexample}[width=8cm,small]
\begin{tikzpicture}
\tkzInit[xmax=100,xstep=20,
@@ -126,7 +121,7 @@ La grille peut avoir une taille quelconque.
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Usage de \tkzname{pi} avec \tkzcname{tkzGrid}}
+\subsubsection{Use of \tkzname{pi} with \tkzcname{tkzGrid}}
\begin{tkzexample}[width=8cm,small]
\begin{tikzpicture}[scale=.75]
\tkzInit[xmax=6.5,ymax=6.5]
@@ -139,7 +134,7 @@ La grille peut avoir une taille quelconque.
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Options \tkzname{frac} et \tkzname{trig} avec \tkzcname{tkzGrid}}
+\subsubsection{Options \tkzname{frac} and \tkzname{trig} with \tkzcname{tkzGrid}}
\begin{tkzexample}[width=8cm,small]
\begin{tikzpicture}
\tkzInit[xmax=9,xstep=3,ymax=4]
@@ -151,7 +146,7 @@ La grille peut avoir une taille quelconque.
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Utilisation d'une grille de répérage}
+\subsubsection{Use of a repetition grid}
\begin{tkzexample}[latex=8cm,small]
\begin{tikzpicture}[scale=.5]
\tikzset{xaxe style/.style ={-}}
diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-initialisation.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-initialisation.tex
index b39ac0178e..b95c3e3fc6 100644
--- a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-initialisation.tex
+++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-initialisation.tex
@@ -1,8 +1,8 @@
-\section{Présentation de \tkzname{tkz-base}}
+\section{Presentation of \tkzname{tkz-base}}
-\subsection{Exemple qui pose un problème }
+\subsection{Example that poses a problem }
-Le code suivant donne une erreur
+The following code gives an error
\begin{tkzltxexample}[right margin=7cm]
\begin{tikzpicture}
@@ -11,7 +11,7 @@ Le code suivant donne une erreur
\end{tkzltxexample}
{\color{red} Latex Error: ... Dimension too large.}
-En effet, l'unité par défaut est le cm or \TEX\ ne peut pas stocker une dimension supérieure à 575 cm, c'est ce qui entraîne une erreur. \TEX\ cependant, peut stocker des entiers allant jusqu'à $2^{31}-1$, aussi il est possible de travailler en premier sur des entiers puis de définir les dimensions.
+Indeed, the default unit is a centimeter or \TEX\ cannot store a dimension greater than 575 cm, which leads to an error. \TEX\ however, can store integers up to $2^{31}-1$, so it is possible to work on integers first and then define the dimensions.
\begin{tkzltxexample}[right margin=7cm]
\begin{tikzpicture}[x=0.01 cm]
@@ -21,8 +21,8 @@ En effet, l'unité par défaut est le cm or \TEX\ ne peut pas stocker une dimens
{\color{red} Latex Error: ... Dimension too large.}
-Le code précédent donne encore une erreur. En effet, 600 cm est une dimension
- et ne tient pas compte du changement d'unité. Correct est :
+The previous code still makes an error. Indeed, 600 cm is a dimension
+ and does not take into account the change of unit. Correct is:
\begin{tkzltxexample}[right margin=7cm]
\begin{tikzpicture}[x=0.01 cm]
@@ -30,12 +30,12 @@ Le code précédent donne encore une erreur. En effet, 600 cm est une dimension
\end{tikzpicture}
\end{tkzltxexample}
-Cette fois, la dimension stockée est 6 cm ce qui est acceptable. Il est possible avec \TEX\ de manipuler de grands nombres entiers, mais en revanche les dimensions ne peuvent excéder \numprint{16384} pt soit 5,75 m environ.
+This time, the stored dimension is 6 cm which is acceptable. It is possible with \TEX\ to handle large whole numbers,but, on the other hand, the dimensions cannot exceed \numprint{16384} pt or approximately 5.75 m.
-Avec \TEX, il est aussi possible de travailler avec le package \tkzname{xfp} , qui lui permet de travailler sur des intervalles plus importants, mais au prix d'une certaine lenteur. C'est la méthode que j'ai privilégiée pour certains calculs sensibles qui requièrent une bonne précision comme des calculs de mesure d'angles ou de longueur de segment, mais il est nécessaire une fois un nombre trouvé de l'attribuer à une dimension. On retrouve toujours les mêmes contraintes.
+With \TEX, it's also possible to work with the \tkzname{xfp} package. This allows him to work at longer intervals, but at the cost of a certain slowness. This is the method I have preferred for some sensitive calculations that require good precision, such as calculations to measure angles or segment length, but it is necessary once a number has been found to assign it to a dimension. We always find the same constraints.
-\subsection{Le rôle de \tkzname{tkz-base}}
-Le code suivant donne une erreur non parce que \numprint{6000000} est un trop grand nombre, mais parce que \numprint{0.000001} cm est une trop petite dimension.
+\subsection{The role of \tkzname{\tkznameofpack}}
+The following code gives an error not because \numprint{6000000} is too large, but because \numprint{0.000001} cm is too small.
{\color{red} Latex Error:}
@@ -46,70 +46,64 @@ Le code suivant donne une erreur non parce que \numprint{6000000} est un trop gr
\end{tikzpicture}
\end{tkzltxexample}
-Avec \tkzname{tkz-base}, il sera possible de travailler avec des coordonnées quelconques, mais il faudra pour cela utiliser les macros du package.
+With \tkzname{tkz-base}, it will be possible to work with any coordinates, but it will be necessary to use the macros of the package.
-\tkzNamePack{tkz-base} permet de simplifier l'utilisation d'intervalles de valeurs divers. Ce package est utilisé par plusieurs de mes packages comme \tkzname{tkz-tukey}, un package pour dessiner les représentations graphi-ques en statistiques élémentaires, \tkzNamePack{tkz-fct} qui permet de dessiner les représentations graphiques des fonctions à l'aide du logiciel \tkzname{gnuplot}, ainsi qu'avec \tkzname{tkz-euclide} pour la géométrie euclidienne.
+\tkzNamePack{tkz-base} simplifies the use of different value ranges. This package is used by several of my packages such as \tkzname{tkz-tukey}, a package for drawing graphical representations in elementary statistics, \tkzNamePack{tkz-fct} which allows to draw graphical representations of functions using \tkzname{gnuplot}, as well as with \tkzname{tkz-euclide} for Euclidean geometry.
-Premièrement, il faut savoir qu'il n'est pas nécessaire de s'occuper avec \TIKZ\ de la taille du support (bounding box), cependant il est parfois nécessaire, soit de tracer une grille, soit de tracer des axes, soit de travailler avec une unité différente que le centimètre, soit finalement de contrôler la taille de ce qui sera affiché.
- Pour cela, il faut avoir préparé le repère dans lequel vous allez travailler, c'est le rôle de \tkzNamePack{tkz-base} et de sa macro principale \tkzNameMacro{tkzInit}. Par exemple, si l'on veut travailler sur un carré de 10 cm de côté, mais tel que l'unité soit le dm alors il faudra utiliser.
+First of all, you should know that it is not necessary to deal with \TIKZ\ with the size of the support (bounding box); however it is sometimes necessary, either to draw a grid, or to draw axes, or to work with a different unit than the centimeter, or finally to control the size of what will be displayed.
+ To do this, you must have prepared the frame in which you are going to work, this is the role of \tkzNamePack{tkz-base} and its main macro \tkzNameMacro{tkzInit}. For example, if you want to work on a 10 cm square, but such that the unit is the dm then you will have to use.
\begin{tkzltxexample}[right margin=7cm]
\tkzInit[xmax=1,ymax=1,xstep=0.1,ystep=0.1]
\end{tkzltxexample}
-\tkzname{xstep=0.1} signifie que 1cm représente la graduation $0.1$ ainsi la graduation $1$ se trouve à $10$ cm de l'origine.
+\tkzname{xstep=0.1} means that 1cm represents the $0.1$ graduation so the $1$ graduation is at $10$ cm from the origin.
-En revanche pour des valeurs de $x$ comprises entre \numprint{0} et \numprint{10000} et des valeurs de $y$ comprises entre \numprint{0} et \numprint{100000}, il faudra écrire
+On the other hand, for values of $x$ between \numprint{0} and \numprint{10000} and values of $y$ between \numprint{0} and \numprint{100000}, it will be necessary to write
\begin{tkzltxexample}[right margin=6cm]
\tkzInit[xmax=10000,ymax=100000,xstep=1000,ystep=10000]
\end{tkzltxexample}
-Le résultat est toujours un carré de 10 cm de côté.
+The result is always a 10 cm square.
-Tout cela a peu de sens pour faire de la géométrie euclidienne, et dans ce cas, il est recommandé de laisser l'unité graphique égale à 1 cm. Je n'ai d'ailleurs pas testé si toutes les macros destinées à la géométrie euclidienne acceptaient d'autres valeurs que \tkzname{xstep=1} et \tkzname{ystep=1}. En revanche pour certains dessins, il est intéressant de fixer les valeurs extrêmes et de « clipper » le rectangle de définition afin de contrôler au mieux la taille de la figure.
+All this makes little sense for Euclidean geometry, and in this case it is recommended to leave the graphic unit equal to 1 cm. I have not tested whether all macros for Euclidean geometry accept other values than \tkzname{xstep=1} and \tkzname{ystep=1}. On the other hand, for some drawings, it is interesting to fix the extreme values and to "clip" the definition rectangle in order to control the size of the figure as well as possible.
-\subsection{Syntaxe de \tkzname{tkz-base}}
+\subsection{Syntax of \tkzname{tkz-base}}
-J'ai essayé de généraliser la syntaxe suivante :
+I tried to generalize the following syntax:
\begin{itemize}
- \item la syntaxe est proche de celle de \LATEX, pas besoin « ; »;
- \item toutes les macros ont un nom commençant par \tkzname{tkz};
- \item les accolades sont utilisées pour passer un paramètre qui sera la référence d'un objet créé par la macro;
- \item les parenthèses sont utilisées pour faire référence à un objet déjà créé ou bien pour un couple de coordonnées;
- \item les crochets sont nécessaires pour faire passer des arguments optionnels ou bien encore des options, certains choix sont parfois obligatoires. L'emploi de la virgule même dans un mode Math nécessite d'être protégé dans un groupe TeX;
- \item les blancs (espace) sont interdits entre [...] et (...), [...] et \{...\}, ainsi qu'entre (...) et \{...\} mais il est possible de mettre des espaces entre les arguments optionnels passés [...].
-
+ \item The syntax is close to that of \LATEX, there's no need for "; "
+ \item all the macros have names beginning with \tkzname{tkz};
+ \item braces are used to pass a parameter that will be the reference of an object created by the macro;
+ \item parentheses are used to refer to an object that has already been created or to a coordinate pair;
+ \item square brackets are necessary to pass optional arguments or options, some choices are sometimes mandatory. The use of the comma even in a Math mode requires to be protected in a TeX group;
+ \item blanks (space) are prohibited between [...] and (...), [...] and \{...\}, as well as between (...) and \{…\}, but it is possible to put spaces between past optional arguments [...].
\end{itemize}
-
-\newpage
-\section{Initialisation \tkzcname{tkzInit}}
-\subsection{La macro principale \tkzcname{tkzInit}}
-\begin{NewMacroBox}{tkzInit}{\oarg{local options}}\hypertarget{init}{}
-
-\medskip
-\begin{tabular}{lll}
-\toprule
-options & défaut & définition \\
+\section{Initialization \tkzcname{tkzInit}}
+\subsection{The main macro \tkzcname{tkzInit}}
+\begin{NewMacroBox}{tkzInit}{\oarg{local options}}\hypertarget{init}{}%
+\begin{tabular}{lll}%
+options & default & definition \\
\midrule
-\TOline{xmin} {0} {valeur minimum des abscisses en cm}
-\TOline{xmax} {10} {valeur maximum des abscisses en cm}
-\TOline{xstep}{1} {différence entre deux graduations en $x$}
-\TOline{ymin} {0} {valeur minimum des ordonnées en cm }
-\TOline{ymax} {10} {valeur maximum des ordonnées en cm}
-\TOline{ystep}{1} {différence entre deux graduations en $y$}
+\TOline{xmin} {0} {minimum value of the abscissae in cm}
+\TOline{xmax} {10} {maximum value of the abscissae in cm}
+\TOline{xstep}{1} {difference between two graduations in $x$}
+\TOline{ymin} {0} {minimum y-axis value in cm }
+\TOline{ymax} {10} {maximum y-axis value in cm}
+\TOline{ystep}{1} {difference between two graduations in $y$}
\bottomrule
\end{tabular}
\medskip
-{Le rôle de \tkzname{tkzInit} est de définir un repère \textcolor{red}{orthogonal} et une partie rectangulaire du plan dans laquelle vous allez placer vos dessins à l'aide de coordonnées cartésiennes. Le repère n'est pas obligatoirement normé.
-Cette macro permet de définir votre environnement de travail comme avec une calculatrice.}
+The role of \tkzname{tkzInit} is to define a \textcolor{red}{orthogonal} coordinates system and a rectangular part of the plane in which you will place your drawings using Cartesian coordinates. The coordinates system does not have to be normalized.
+This macro allows you to define your working environment as with a calculator.
\end{NewMacroBox}
-\subsubsection{Modification de la taille du dessin avec \tkzcname{tkzInit}}
-Cette macro prépare le terrain et définit plusieurs constantes. Il est tout à fait possible de faire une figure plus grande que le rectangle prédéfini.
-De plus, comme vous pouvez le constater, il est possible d'utiliser les commandes de \TIKZ\ au milieu de celles de \tkzname{tkz} mais {\color{red} attention aux unités ! il faut réserver cette possibilité que pour des cas exceptionnels}.
+\subsubsection{Changing the drawing size with \tkzcname{tkzInit}}
+This macro sets the stage and defines several constants. It is quite possible to make a figure larger than the predefined rectangle.
+Moreover, as you can see, it is possible to use the commands of \TIKZ\ in the middle of those of \tkzname{tkz} but {\color{red} attention to the units! This possibility must be reserved for exceptional cases only.}
\begin{tkzexample}[latex=10cm,small]
\begin{tikzpicture}
@@ -121,9 +115,9 @@ De plus, comme vous pouvez le constater, il est possible d'utiliser les commande
\end{tkzexample}
%<–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––>
-\subsubsection{Rôle de \tkzname{xstep} , \tkzname{ystep}}
+\subsubsection{Role of \tkzname{xstep} , \tkzname{ystep}}
-\tkzHandBomb\ Attention, une graduation est représentée par 1 cm, sauf si vous redimensionnez la figure avec l'option \tkzname{scale}. Dans l'exemple ci-dessous \tkzname{xstep} = 2 correspond à 1 cm, donc entre 0 et 10, il nous faudra 5 cm. De même \tkzname{ystep}=400, il y a donc 2 cm entre 0 et 800. Il n'est pas possible d'utiliser les options de \TIKZ, \tkzname{x=...} et \tkzname{y=...}.
+\tkzHandBomb\ Warning, a graduation is represented by 1 cm, unless you resize the figure with the \tkzname{scale} option. In the example below \tkzname{xstep} = 2 corresponds to 1 cm, so between 0 and 10, we will need 5 cm. Similarly \tkzname{ystep}=400, so between 0 and 800 there are 2 cm. It is not possible to use the options of \TIKZ, \tkzname{x=...} and \tkzname{y=...}.
\medskip
\begin{tkzexample}[latex=7cm,small]
@@ -135,7 +129,7 @@ De plus, comme vous pouvez le constater, il est possible d'utiliser les commande
\end{tikzpicture}
\end{tkzexample}
-\subsection{Autre exemple avec \tkzname{xstep} et \tkzname{ystep}}
+\subsection{Another example with \tkzname{xstep} and \tkzname{ystep}}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}
\tkzInit[xmax=5,xstep=1,ymax=2,ystep=.5]
@@ -144,12 +138,8 @@ De plus, comme vous pouvez le constater, il est possible d'utiliser les commande
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Origine personnalisée.}
-
-\medskip
-Il est important de remarquer que l'on peut placer un point sans rien calculer.
-
-
+\subsubsection{Customized origin.}
+It is important to note that you can place a point without calculating anything.
\begin{tkzexample}[latex=10cm,small]
\begin{tikzpicture}
\tkzInit[xmin=20,
@@ -164,15 +154,15 @@ Il est important de remarquer que l'on peut placer un point sans rien calculer.
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Utilisation des décimaux }
+\subsubsection{Use of decimals }
\medskip
-Il est préférable d'écrire les différents arguments relatifs à un axe avec le même nombre de décimales.
-\tkzname{numprint} est utilisé pour afficher les graduations correctement.
+It is preferable to write the different arguments relating to an axis with the same number of decimals.
+\tkzname{numprint} is used to display the graduations correctly.
- Dans l'exemple suivant, \tkzname{numprint} utilise les conventions françaises pour l'écriture des nombres car j'ai utilisé :
+In the following example, \tkzname{numprint} uses the English conventions for writing numbers because I used:
-\tkzcname{usepackage[french]\{babel\} }
+\tkzcname{usepackage[english]\{babel\} }
\medskip
@@ -187,10 +177,7 @@ Il est préférable d'écrire les différents arguments relatifs à un axe avec
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Valeurs négatives}
-
-\medskip
-
+\subsubsection{Negative values}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}
\tkzInit[xmin = -40,
@@ -203,5 +190,4 @@ Il est préférable d'écrire les différents arguments relatifs à un axe avec
\end{tikzpicture}
\end{tkzexample}
-
\endinput
diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-installation.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-installation.tex
index 49c9246b47..260c0de199 100644
--- a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-installation.tex
+++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-installation.tex
@@ -1,10 +1,10 @@
\section{Installation}
-\NamePack{tkz-base} est désormais sur le serveur du \tkzname{CTAN}\footnote{\NamePack{tkz-base} fait partie de \NameDist{TeXLive} et \tkzname{tlmgr} permet de l'installer, il fait aussi partie de \NameDist{MikTeX} sous \NameSys{Windows}}. Si vous voulez tester une version beta, il vous suffit de placer les fichiers suivants dans un dossier texmf que votre système pourra trouver.
+\NamePack{tkz-base} is now on the server of the \tkzname{CTAN}\footnote{\NamePack{tkz-base} is part of \NameDist{TeXLive} and \tkzname{tlmgr} allows to install it, it is also part of \NameDist{MikTeX} under \NameSys{Windows}}. If you want to test a beta version, just put the following files in a texmf folder that your system will be able to find.
-\subsection{Fichiers présents}
+\subsection{Files present}
%–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––>
-Avant de tester l'installation, vous pouvez vérifier que le dossier \tkzname{tkzbase} contient les fichiers suivants~:
+Before testing the installation, you can verify that the \tkzname{tkzbase} folder contains the following files:
\begin{itemize}
\item \tkzname{tkz-base.cfg}
@@ -26,11 +26,11 @@ Avant de tester l'installation, vous pouvez vérifier que le dossier \tkzname{tk
\item \tkzname{tkz-tools-utilities.tex}
\end{itemize}
-Celui qui contient les principales macros est \tkzname{tkz-tools-base.tex}
-, il est appelé par \tkzname{tkz-base} qui gère l'ensemble des fichiers.
-Les différents outils sont dans les fichiers commençant par \tkzname{tkz-tools}, les objets mathématiques créés le sont dans des fichiers dont le nom a pour préfixe \tkzname{tkz-obj}. Enfin \tkzname{tkz-base.cfg} dont la présence n'est pas obligatoire permet de modifier beaucoup de valeurs par défaut.
+The one with the main macros is \tkzname{tkz-tools-base.tex},
+it's called \tkzname{tkz-base} which handles all the files.
+The various tools are in files beginning with \tkzname{tkz-tools}, the mathematical objects created are in files whose name has for prefix \tkzname{tkz-obj}. Finally \tkzname{tkz-base.cfg} whose presence is not mandatory allows to modify many default values.
-De plus, \TIKZ\ est chargé avec les librairies suivantes~:
+Moreover, \TIKZ\ is loaded with the following libraries:
\begin{tkzltxexample}[]
\usetikzlibrary{angles, arrows, arrows.meta ,babel, calc, decorations, decorations.markings,
diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-main.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-main.tex
index 2b745068a5..591eda8891 100644
--- a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-main.tex
+++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-main.tex
@@ -1,34 +1,51 @@
%!TEX TS-program = lualatex
-% encoding : utf8
+% encoding: utf8
% documentation of tkz-base.sty
-% Copyright (C) 2020 Alain Matthes
-%
-% This file may be distributed and/or modified
-%
-% 1. under the LaTeX Project Public License , either version 1.3
-% of this license or (at your option) any later version and/or
-% 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-base-main is the french documentation of tkz-base
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+% This work consists of the files:
+% TKZdoc-base-axes.tex
+% TKZdoc-base-BB.tex
+% TKZdoc-base-compilation.tex
+% TKZdoc-base-divers.tex
+% TKZdoc-base-example.tex
+% TKZdoc-base-faq.tex
+% TKZdoc-base-grid.tex
+% TKZdoc-base-initialisation.tex
+% TKZdoc-base-installation.tex
+% TKZdoc-base-main.tex
+% TKZdoc-base-marks.tex
+% TKZdoc-base-news.tex
+% TKZdoc-base-obj.tex
+% TKZdoc-base-point.tex
+% TKZdoc-base-rep.tex
+% TKZdoc-base-style.tex
+% TKZdoc-base-texte.tex
+% TKZdoc-base-tools.tex
\documentclass[DIV = 14,
fontsize = 10,
headinclude = false,
index = totoc,
footinclude = false,
twoside,
- headings = small
- ]{tkz-doc}
+ headings = small]{tkz-doc}
\usepackage{etoc}
\gdef\tkznameofpack{tkz-base}
-\gdef\tkzversionofpack{3.02c}
-\gdef\tkzdateofpack{2020/02/06}
+\gdef\tkzversionofpack{3.05c}
+\gdef\tkzdateofpack{2020/03/03}
\gdef\tkznameofdoc{doc-tkz-base}
-\gdef\tkzversionofdoc{3.02c}
-\gdef\tkzdateofdoc{2020/02/06}
+\gdef\tkzversionofdoc{3.05c}
+\gdef\tkzdateofdoc{2020/03/03}
\gdef\tkzauthorofpack{Alain Matthes}
\gdef\tkzadressofauthor{}
\gdef\tkznamecollection{AlterMundus}
@@ -36,44 +53,52 @@
\gdef\tkzengine{lualatex}
\gdef\tkzurlauthorcom{http://altermundus.fr}
% -- Packages ---------------------------------------------------
-\usepackage[dvipsnames,svgnames]{xcolor}
\usepackage{calc}
\usepackage{tkz-euclide}
\usepackage[colorlinks]{hyperref}
\hypersetup{
- linkcolor=BrickRed,
+ linkcolor=Gray,
citecolor=Green,
filecolor=Mulberry,
urlcolor=NavyBlue,
- menucolor=BrickRed,
+ menucolor=Gray,
runcolor=Mulberry,
- linkbordercolor=BrickRed,
+ linkbordercolor=Gray,
citebordercolor=Green,
filebordercolor=Mulberry,
urlbordercolor=NavyBlue,
- menubordercolor=BrickRed,
+ menubordercolor=Gray,
runbordercolor=Mulberry,
pdfsubject={Cartesian System},
pdfauthor={\tkzauthorofpack},
pdftitle={\tkznameofpack},
- pdfkeywords={tikz, pgf, pdf, pdflatex, graphique, euclide,lualatex,
+ pdfkeywords={tikz, pgf, pdf, pdflatex, graphic, euclide,lualatex,
geometry, points, maths, line, circle, angle ,polygon},
pdfcreator={\tkzengine}
}
\usepackage{tkzexample}
-\usepackage{mathtools}
+%\usepackage{mathtools}
+\usepackage{fontspec}
+\setmainfont{texgyrepagella}%
+ [
+ Extension = .otf ,
+ UprightFont = *-regular,
+ ItalicFont = *-italic,
+ BoldFont = *-bold,
+ BoldItalicFont = *-bolditalic,
+ Ligatures=TeX,
+ Numbers={Lowercase,Monospaced},
+ ]
\usepackage{unicode-math}
-\usepackage{fourier-otf}
-\setmainfont[Ligatures=TeX]{TeX Gyre Pagella}
-\setmathfont{TeX Gyre Pagella Math}
+\usepackage{fourier-otf,zorna}
\usepackage{datetime,multicol,lscape}
-\usepackage[french]{babel}
+\usepackage[english]{babel}
\usepackage[autolanguage]{numprint}
\usepackage{ulem}
\usepackage{microtype}
\usepackage{array,multirow,multido,booktabs}
\usepackage{shortvrb,fancyvrb}
-\renewcommand{\labelitemi}{\lefthand}
+\renewcommand{\labelitemi}{--}
\AtBeginDocument{\MakeShortVerb{\|}} % link to shortvrb
\pdfcompresslevel=9
\setlength\parindent{0pt}
@@ -96,30 +121,49 @@
\clearpage
\thispagestyle{empty}
\maketitle
+\null
+\AddToShipoutPicture*{%
+\setlength\unitlength{1mm}
+\put(70,120){%
+\begin{tikzpicture}
+ \node at (30pt,30pt){\fontsize{60}{60}\selectfont \zorna{c}};
+ \node at (270pt,30pt){\fontsize{60}{60}\selectfont \zorna{d}};
+ \node at (30pt,210pt){\fontsize{60}{60}\selectfont \zorna{a}};
+ \node at (270pt,210pt){\fontsize{60}{60}\selectfont \zorna{b}};
+ \draw[line width=2pt,double,color=MidnightBlue,
+ fill=myblue!10,opacity=.5] (0,0) rectangle (300pt,240pt);
+ \node[text width=240pt] at (150 pt,120 pt){%
+ \begin{center}
+ \color{MidnightBlue}
+ \fontsize{24}{48}
+ \selectfont tkz-base\\
+ \end{center}};
+\end{tikzpicture}}
+}
-\clearpage% next première page présentation
+\clearpage
\tkzSetUpColors[background=white,text=darkgray]
\let\rmfamily\ttfamily
\nameoffile{\tkznameofpack}
-\defoffile{\tkzname{\tkznameofpack} est un package basé sur \TIKZ\space permettant d'obtenir des graphiques le plus simplement possible. Il est la base sur laquelle sera construite une série de packages ayant comme point commun, la création de dessins utiles dans l'enseignement des mathématiques. Le rôle de \tkzname{\tkznameofpack} est essentiellement de fournir une macro permettant de définir un repère orthogonal, et de laisser le choix à l'utilisateur des unités graphiques. Ce package nécessite la version égale ou supérieure à 3 de \TIKZ.}
+\defoffile{\tkzname{\tkznameofpack} is a package based on \TIKZ\ to make graphics as simple as possible. It is the basis on which a series of packages will be built, having as a common point, the creation of drawings useful in the teaching of mathematics. The main function of Basic is to provide an orthogonal coordinate system, and to let the user choose the graphical units. This package requires version 3 or higher of \TIKZ.}
\presentation
\vspace*{1cm}
-\noindent\space Je souhaite remercier \textbf{Till~Tantau} pour avoir créé le merveilleux outil \href{http://sourceforge.net/projects/pgf/}{Ti\emph{k}Z}.
+\noindent\space I'd like to thank \textbf{Till~Tantau} for creating the wonderful tool \href{http://sourceforge.net/projects/pgf/}{\TIKZ}.
\vspace*{12pt}
-\noindent\space Je remercie \textbf{Yve~Combe} pour avoir partagé son travail sur le rapporteur et les constructions à l'aide du compas. Je souhaite remercier également, \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 \tkzimp{Dimitri~Kapetas} pour leurs exemples, et enfin \tkzimp{Gaétan~Marris} pour ses remarques et corrections.
+\noindent\space I thank \textbf{Yves~Combe} for sharing his work on the protractor and the compass constructions. I would also like to thank, \tkzimp{David~Arnold} who corrected a lot of errors and tested many examples, \tkzimp{Wolfgang~Büchel} who also corrected errors and built great scripts to get the example files, \tkzimp{John~Kitzmiller} and \tkzimp{Dimitri~Kapetas} for their examples, and finally \tkzimp{Gaétan~Marris} for his remarks and corrections.
\vspace*{12pt}
-\noindent\space Vous trouverez de nombreux exemples sur mon site~:
-\href{http://altermundus.fr}{altermundus.fr}
+\noindent\space You will find many examples on my site:
+\href{http://altermundus.fr}{altermundus.fr}.
\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{pdfurlcolor}{\tkzauthorofpack}}.
+You can send your remarks, and reports on errors you find, to the following address: \href{mailto:al.ma@mac.com}{\textcolor{pdfurlcolor}{\tkzauthorofpack}}.
-This file can be redistributed and/or modified under the terms of the LATEX
+This file can be redistributed and/or modified under the terms of the \LATEX\
Project Public License Distributed from \href{http://www.ctan.org/}{CTAN}\ archives.
@@ -140,7 +184,6 @@ Project Public License Distributed from \href{http://www.ctan.org/}{CTAN}\ arch
\include{TKZdoc-base-point}
\include{TKZdoc-base-style}
\include{TKZdoc-base-BB}
-\include{TKZdoc-base-tools}
\include{TKZdoc-base-obj}
\include{TKZdoc-base-rep}
\include{TKZdoc-base-divers}
diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-marks.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-marks.tex
index 97f9fabb12..32ccd34e17 100644
--- a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-marks.tex
+++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-marks.tex
@@ -1,35 +1,33 @@
-\section{Marks, marques ou symboles}
+\section{Marks or symbols}
-J'ai distingué les points utilisés en géométrie euclidienne et les « marks » ou symboles que l'on peut rencontrés en statistiques.
+I distinguished between the points used in Euclidean geometry and the "marks or symbols" that can be found in statistics.
-Pour positionner le symbole, on utilise la macro \tkzcname{tkzDefPoint} pour définir correctement un point, puis la macro \tkzcname{tkzDrawMark} pour tracer le symbole.
+To position the symbol, we use the macro \tkzcname{tkzDefPoint} to correctly define a point, then the macro \tkzcname{tkzDrawMark} to draw the symbol.
-Il est fréquent d'avoir à tracer un nuage de points, j'ai donc créé une macro qui permet de définir plusieurs points rapidement.
+It is common to have to draw a scatter plot , so I created a macro that allows you to define several points quickly.
-Un symbole "mark" peut être mise à l'échelle , ce qui est parfois utile, mais en revanche si on modifie différemment les abscisses et les ordonnées alors les "marks" sont déformées.
+A "mark" symbol can be scaled, which is sometimes useful, but, on the other hand, if you change the abscissa and ordinates differently then the "marks" are distorted.
-Rappel: il était déjà possible de créer un nuage de points avec la macro \tkzcname{tkzDefPoints}, mais cela impose de donner une référence (un nom) à chaque point, ce qui est parfois fastidieux. La macro \tkzcname{tkzSetOfPoints} permet de définir des points \tkzname{tkzPt1}, \tkzname{tkzPt2},etc.
-La macro \tkzcname{tkzDefSetOfPoints} a été défini
+Reminder: it was already possible to create a cloud of points with the macro \tkzcname{tkzDefPoints}, but this requires to give a reference (a name) to each point, which is sometimes tedious. The macro \tkzcname{tkzSetOfPoints} allows to define points \tkzname{tkzPt1}, \tkzname{tkzPt2}, etc.
-
-C'est ce qu'on appelle fréquemment « nuage de points». La différence par rapport à la macro \tkzcname{tkzDefPoints}, c'est que la référence aux points est donnée par un préfixe (par défaut tkzPt) et le numéro du point.
-Les points ne sont pas tracés. Voir
-\hyperlink{label_tkzDefSetOfPoints}{tkzDefSetOfPoints}
+This is frequently referred to as the "scatter plot ". The difference from the macro \tkzcname{tkzDefPoints} is that the reference to the points is given by a prefix (default tkzPt) and the point number.
+
+The points are not drawn.
\subsection{\tkzcname{tkzDrawSetOfPoints}}
-\begin{NewMacroBox}{tkzDrawSetOfPoints}{\oarg{local options}}
-Permet de placer des symboles sur les points définis par \tkzcname{tkzDefSetOfPoints}.
+\begin{NewMacroBox}{tkzDrawSetOfPoints}{\oarg{local options}}%
+Allows you to place symbols on the points defined by \tkzcname{tkzDefSetOfPoints}.
\medskip
-\begin{tabular}{lll}
-options & défaut & définition \\
+\begin{tabular}{lll}%
+options & default & definition \\
\midrule
-\TOline{prefix} {tkzPt} {préfixe des noms des points}
+\TOline{prefix} {tkzPt} {point name prefix}
\end{tabular}
\end{NewMacroBox}
- \subsubsection{Tracé d'un nuage avec \tkzcname{tkzDrawSetOfPoints}}
+\subsubsection{Drawing of a scatter plot with \tkzcname{tkzDrawSetOfPoints}}
\begin{tkzexample}[latex=6cm,small]
\begin{tikzpicture}[scale=0.75]
\tkzInit[xmax=6,ymin=1000,ymax=5000,ystep=1000]
@@ -42,21 +40,19 @@ options & défaut & définition \\
\end{tikzpicture}
\end{tkzexample}
-\newpage
\subsection{\tkzcname{tkzJoinSetOfPoints}}
-
-\begin{NewMacroBox}{tkzJoinSetOfPoints}{\oarg{local options}}
-Permet de joindre les symboles par des segments de droite. Il est possible d'utiliser bien sûr toutes les options de \TIKZ.
+\begin{NewMacroBox}{tkzJoinSetOfPoints}{\oarg{local options}}%
+Allows the symbols to be joined by line segments. Of course, it is possible to use all the options of \TIKZ.
\medskip
-\begin{tabular}{lll}
-options & défaut & définition \\
+\begin{tabular}{lll}%
+options & default & definition \\
\midrule
-\TOline{prefix} {tkzPt} {préfixe des noms des points}
+\TOline{prefix} {tkzPt} {point name prefix}
\end{tabular}
\end{NewMacroBox}
-\subsubsection{Lier les points d'un nuage avec \tkzcname{tkzJoinSetOfPoints}}
+\subsubsection{Link the points of a scatter plot with \tkzcname{tkzJoinSetOfPoints}}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=1]
\tkzInit[xmax=5,
@@ -76,8 +72,7 @@ options & défaut & définition \\
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Utilisation des points d'un nuage}
-
+\subsubsection{Using the points of a scatter plot}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=.5]
\tkzInit[xmax=5,ymin=1000,
@@ -97,17 +92,15 @@ options & défaut & définition \\
% \subsection{Mark option \tkzname{mark} et \tkzname{size}}
\subsection{\tkzcname{tkzSetUpMark}}
-
-\begin{NewMacroBox}{tkzSetUpMark}{\oarg{local options}}
-\begin{tabular}{lll}
-options & défaut & définition \\
+\begin{NewMacroBox}{tkzSetUpMark}{\oarg{local options}}%
+\begin{tabular}{lll}%
+options & default & example \\
\midrule
-\TOline{liste}{no default}{exemple \tkzcname{tkzSetUpMark[mark=heart]}}
+\TOline{liste}{no default}{\tkzcname{tkzSetUpMark[mark=heart]}}
\end{tabular}
-
\end{NewMacroBox}
-\subsubsection{Deux nuages}
+\subsubsection{Two scatter plots}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}
\tkzInit[xmax=5.5,ymin=1000,%
@@ -136,19 +129,18 @@ options & défaut & définition \\
\end{tkzexample}
\subsection{\tkzcname{tkzDrawMark}}
-
-\begin{NewMacroBox}{tkzDrawMark}{\oarg{local options}\parg(point)}
-Place un symbole. Plus efficace que la suivante pour placer un seul symbole.
+\begin{NewMacroBox}{tkzDrawMark}{\oarg{local options}\parg(point)}%
+Place a symbol. More efficient than the next to place a single symbol.
\medskip
-\begin{tabular}{lll}
-options & défaut & définition \\
+\begin{tabular}{lll}%
+options & default & definition \\
\midrule
-\TOline{prefix} {tkzPt} {préfixe des noms des points}
+\TOline{prefix} {tkzPt} {point name prefix}
\end{tabular}
\end{NewMacroBox}
-
+\subsubsection{Ball; use of \tkzcname{tkzDrawMarks}}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}
\tkzInit[xmax=3,ymax=1]
@@ -157,21 +149,19 @@ options & défaut & définition \\
\end{tikzpicture}
\end{tkzexample}
-
\subsection{\tkzcname{tkzDrawMarks}}
-
-\begin{NewMacroBox}{tkzDrawMarks}{\oarg{local options}\parg(list of points)}
-Permet de placer une série de marques.
+\begin{NewMacroBox}{tkzDrawMarks}{\oarg{local options}\parg(list of points)}%
+Allows you to place a series of marks.
\medskip
-\begin{tabular}{lll}
-options & défaut & définition \\
+\begin{tabular}{lll}%
+options & default & definition \\
\midrule
-\TOline{prefix} {tkzPt} {préfixe des noms des points}
+\TOline{prefix} {tkzPt} {point name prefix}
\end{tabular}
\end{NewMacroBox}
-\subsubsection{Mark et nuage; utilisation de \tkzcname{tkzDrawMarks}}
+\subsubsection{Mark and plot; use of \tkzcname{tkzDrawMarks}}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}
\tkzInit[xmax=6,ymin=1000,
diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-news.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-news.tex
index 4ef552e71c..c882351812 100644
--- a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-news.tex
+++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-news.tex
@@ -1,29 +1,26 @@
-\section{Nouveautés et présentation}
+\section{News and presentation}
-Ce package est le socle en particulier de \tkzNamePack{tkz-euclide} et de \tkzNamePack{tkz-fct}. Il fournit un repère cartésien qui sera défini avec la macro \tkzcname{tkzInit}. Le package a été modifié et des transferts d' objets entre \tkzimp{tkz-base} et \tkzimp{tkz-euclide} ont été effectués.
-Dans le futur, les macros de définition seront isolées.
+This package is the foundation of the \tkzNamePack{tkz-euclide} and \tkzNamePack{tkz-fct} in particular. It provides a Cartesian system that will be defined by the macro \tkzcname{tkzInit}. The package has been modified and object transfers between \tkzimp{tkz-base} and \tkzimp{tkz-euclide} have been performed.
+In the future, the definition macros will be isolated.
-La nouveauté principale est le remplacement récent du package \tkzNamePack{fp} par \tkzNamePack{xfp}. L'apparition de celui-ci est un pas vers la version 3 de \LATEX.
- Le prochain pas sera la création d'un nouveau paquet
+The main novelty is the recent replacement of the \tkzNamePack{fp} package by \tkzNamePack{xfp}. The appearance of this one is a step towards version 3 of \LATEX.
+ The next step will be the creation of a new package.
-Voici quelques unes des modifications. Le package |tkz-euclide| apporte davantage de nouveautés.
+Here are some of the changes. The |tkz-euclide| package brings more new features.
\vspace{2cm}
\begin{itemize}\setlength{\itemsep}{10pt}
-\item Amélioration du code
-\item Avec \tkzimp{tkz-euclide} charge tous les objets, donc plus besoin de placer \tkzcname{usetkzobj{all}}.
-\item Correction de bugs
-\item La "bounding box" est désormais contrôlée dans chaque macro (enfin je l'espère) cela permet d'éviter l'utilisation de \tkzcname{tkzInit} suivi de \tkzcname{tkzClip}
-\item Ajout de macros concernant la "bounding box" : \tkzcname{tkzSaveBB} \tkzcname{tkzClipBB} etc.
-\item Logiquement la plupart des macros acceptent les options de TikZ. J'ai donc retiré les options "doublons".
-\item Suppression de l'option "label options"
-\item Les points aléatoires sont désormais dans \tkzimp{tkz-euclide} et la macro \tkzcname{tkzGetRandPointOn} est remplacée par \tkzcname{tkzDefRandPointOn}. Pour des raisons d'homogénéité, il faut récupérer les points avec \tkzcname{tkzGetPoint}.
-\item Les options \tkzimp{end} et \tkzimp{start} qui permettaient de donner un label à une droite sont supprimées. Il faut désormais utiliser la macro \tkzcname{tkzLabelLine}
+\item Code Improvement.
+\item Bug correction.
+\item The bounding box is now controlled in each macro (hopefully) to avoid the use of \tkzcname{tkzInit} followed by \tkzcname{tkzClip}.
+\item Addition of macros for the "bounding box": \tkzcname{tkzSaveBB} \tkzcname{tkzClipBB}.
+\item Logically most macros accept TikZ options. So I removed the "duplicate" options.
+\item Removing the option "label options".
+\item Random points are now in \tkzimp{tkz-euclide} and the macro \tkzcname{tkzGetRandPointOn} is replaced by \tkzcname{tkzDefRandPointOn}. For homogeneity reasons, the points must be retrieved with \tkzcname{tkzGetPoint}.
+\item The options \tkzimp{end} and \tkzimp{start} which allowed to give a label to a line are removed. You must now use the macro \tkzcname{tkzLabelLine}.
-\item Introduction des librairies \NameLib{quotes} et \NameLib{angles} cela permet de donner un label à un point.même si je ne suis pas favorable à cette pratique.
+\item Introduction of the libraries \NameLib{quotes} and \NameLib{angles} it allows to give a label to a point.even if I am not in favour of this practice.
-\item La notion de vecteur disparait pour tracer un vecteur il suffit de passer "->" en option de \tkzcname{tkzDrawSegment}.
-
-\item Apparition de la macro \tkzcname{usetkztool} qui permet de charger de nouveaux "outils".
+\item Appearance of the macro \tkzcname{usetkztool} which allows to load new "tools".
\end{itemize}
\endinput \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-obj.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-obj.tex
index ea697451c6..a20b705e39 100644
--- a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-obj.tex
+++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-obj.tex
@@ -1,109 +1,7 @@
-\section{Utilisation des objets complémentaires ou des outils}
+\section{Use Additional Objects or Tools}
-\subsection{Objets complémentaires}
-Ces objets complémentaires peuvent être des points particuliers, des droites, des cercles, des arcs, etc.
-
-Il est possible d'utiliser certains de ces objets, sans charger complètement \tkzname{tkz-euclide}, mais en utilisant la macro \tkzcname{usetkzobj}.
-
-\tkzname{tkz-base} charge les objets les plus utilisés, marqués «~présent~» dans la liste ci-dessous. Cette liste a évolué et le peut encore..
-
-\begin{NewMacroBox}{usetkzobj}{\var{liste d'objets}} \hypertarget{obj}{}
-
-\begin{tabular}{lll}
-options & & définition \\
-\midrule
-\TAline{axes} {présent} {tracer des axes }
-\TAline{circles} {présent} {tracer, nommer des circles, }
-\TAline{grids} {présent} {tracer des grilles }
-\TAline{lines} {présent} {tracer, nommer des droites }
-\TAline{marks} {présent} {tracer des marques}
-\TAline{points} {présent} {définir, nommer, tracer des points }
-\TAline{rep} {présent} {définir, tracer un repère}
-\TAline{segments} {présent} {étiqueter, tracer des segments}
-
-\TAline{defcircles} {absent} {définir des cercles}
-\TAline{deflines} {absent} {définir des droites}
-\TAline{defpointsby} {absent} {définir des points obtenus par une transformation}
-\TAline{defpointsrnd} {absent} {définir des points aléatoires}
-\TAline{defpointswith}{absent} {définir des points obtenus vectoriellement}
-
-\TAline{angles} {absent} {définir, nommer, tracer des angles}
-\TAline{arcs} {absent} {définir, tracer des arcs}
-\TAline{compass} {absent} {afficher des traces de compas}
-\TAline{polygons} {absent} {définir, nommer, tracer des polygones}
-\TAline{protractor}{absent} {tracer un rapporteur}
-\TAline{sectors} {absent} {définir, nommer, tracer des secteurs}
-\TAline{show} {absent} {afficher les traces de compas d'une construction}
-\TAline{triangles} {absent} {définir, nommer, tracer des triangles}
-\end{tabular}
-\end{NewMacroBox}
-
-\subsection{\tkzcname{usetkzobj\{defcircles\}}}
-
-\begin{tkzexample}[latex=8 cm,small]
-\begin{tikzpicture}[scale=0.75]
- \tkzDefPoint(0,0){A}
- \tkzDefPoint(4,0){B}
- \tkzDefPoint(3,3){C}
- \tkzDefCircle[in](A,B,C)
- \tkzGetPoint{I}\tkzGetLength{rI}
- \tkzDrawCircle[R](I,\rI)
- \tkzDrawPolygon(A,B,C)
- \tkzDrawPoints(A,B,C,I)
- \tkzLabelPoints(A,B,C,I)
-\end{tikzpicture}
-\end{tkzexample}
-
-\subsection{Outils complémentaires}
-\tkzHandBomb\ Attention, il faut utiliser \tkzname{tkz-euclide} pour avoir la possibilité d'utiliser des outils comme les transformations ou encore les intersections.
-
-\begin{NewMacroBox}{usetkztool}{\var{liste d'objets}} \hypertarget{obj}{}
-
-\begin{tabular}{lll}
-options & & définition \\
-\midrule
-\TAline{BB} {présent} {outils permettant de trvailler sur la Bounding Box (BB)}
-\TAline{arith} {présent} {outils sur les nombres entiers "macros dans TikZ >=3"}
-\TAline{base} {présent} {macro \tkzcname{tkzInit} base essentielle}
-\TAline{math} {présent} {outils mathématiques de base}
-\TAline{print} {présent} {définir, nommer, tracer des points particuliers}
-\TAline{text} {présent} {outils permettant de travailler sur des textes}
-\TAline{utilities} {présent} {utilitaires}
-\TAline{intersections} {absent} {intersection de droites, de cercles, de droite et de cercle}
-\end{tabular}
- \end{NewMacroBox}
-
- \subsection{Exemple}
- \begin{minipage}{0.45\textwidth}
- \begin{tkzltxexample}[small]
- \documentclass[border=.25cm]{standalone}
- \usepackage{tkz-base}
- \usetkztool{intersections}
-
- \begin{document}
- \begin{tikzpicture}
- \tkzDefPoints{0/0/A,2/2/B,1/2/C}
- \tkzDrawCircles(A,B C,B)
- \tkzDrawPoints(A,B,C)
- \tkzLabelPoints(A,B,C)
- \tkzInterCC(A,B)(C,B)
- \tkzGetPoints{D}{E}
- \tkzDrawPoints[red](D,E)
- \end{tikzpicture}
- \end{document}
- \end{tkzltxexample}
-\end{minipage}
- \begin{minipage}{0.45\textwidth}
- \begin{tikzpicture}
- \tkzDefPoints{0/0/A,2/2/B,1/2/C}
- \tkzDrawCircles(A,B C,B)
- \tkzDrawPoints(A,B,C)
- \tkzLabelPoints(A,B,C)
- \tkzInterCC(A,B)(C,B)
- \tkzGetPoints{D}{E}
- \tkzDrawPoints[red](D,E)
- \end{tikzpicture}
-\end{minipage}
+These complementary objects can be particular points, straight lines, circles, arcs, etc.
+Now \tkzname{\tkznameofpack} has been minimized. If you want to use particular objects you must use \tkzname{tkz-euclide}.
\endinput \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-point.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-point.tex
index 13d1dfdba8..03a6721bd2 100644
--- a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-point.tex
+++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-point.tex
@@ -1,40 +1,38 @@
-\section{Les points}
+\section{The points}
-J'ai fait une distinction entre le point utilisé en géométrie euclidienne et le point pour représenter un élément d'un nuage statistique. Dans le premier cas, j'utilise comme objet un \tkzname{node}, ce qui se traduit par le fait que la représentation du point ne peut être modifiée par un \tkzname{scale}; dans le second cas, j'utilise comme objet un \tkzname{plot mark}. Ce dernier peut être mis à l'échelle et posséder des formes plus variées que le node.
+I made a distinction between the point used in Euclidean geometry and the point used to represent an element of a statistical cloud. In the first case, I use as object a \tkzname{node}, which means that the representation of the point cannot be modified by a \tkzname{scale}; in the second case, I use as object a \tkzname{plot mark}. The latter can be scaled and have more varied forms than the node.
-La nouvelle macro est \tkzNameMacro{tkzDefPoint}, celle-ci permet d'utiliser des options propres à \TIKZ\ comme shift et les valeurs sont traitées avec tkz-base. De plus, si des calculs sont nécessaires alors c'est le package \tkzNamePack{xfp} qui s'en charge. On peut utiliser les coordonnées cartésiennes ou polaires.
+The new macro is \tkzNameMacro{tkzDefPoint}, it allows to use \TIKZ-specific options as a shift and the values are processed with tkz-base. Moreover, if calculations are needed then the \tkzNamePack{xfp} package takes care of them. You can use Cartesian or polar coordinates.
-\subsection{Définition d'un point en coordonnées cartésiennes : \tkzcname{tkzDefPoint}} \hypertarget{tdp}{}
+\subsection{Defining a point in Cartesian coordinates: \tkzcname{tkzDefPoint}} \hypertarget{tdp}{}
-\begin{NewMacroBox}{tkzDefPoint}{\oarg{local options}\parg{x,y}\var{name} ou \parg{a:r}\var{name}}
-
-\begin{tabular}{lll}
-\toprule
-arguments & défaut & définition \\
+\begin{NewMacroBox}{tkzDefPoint}{\oarg{local options}\parg{x,y}\var{name} ou \parg{a:r}\var{name}}%
+\begin{tabular}{lll}%
+arguments & default & definition \\
\midrule
-\TAline{x,y}{no default}{x et y sont deux dimensions, par défaut en cm.}
-\TAline{a:r}{no default}{a est un angle en degré, r une dimension}
+\TAline{x,y}{no default}{$x$ and $y$ are two dimensions, by default in cm.}
+\TAline{a:r}{no default}{$a$ is an angle in degrees, $r$ is a dimension}
\bottomrule
\end{tabular}
\medskip
-\noindent{Les arguments obligatoires de cette macro sont deux dimensions exprimées avec des décimaux, dans le premier cas ce sont deux mesures de longueur, dans le second ce sont une mesure de longueur et la mesure d'un angle en degré}
+\noindent{The mandatory arguments of this macro are two dimensions expressed with decimals, in the first case they are two measures of length, in the second case they are a measure of length and the measure of an angle in degrees}.
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
-options & défaut & définition \\
+options & default & definition \\
\midrule
-\TOline{shift} {(0,0)} {espacement entre deux valeurs}
+\TOline{shift} {(0,0)} {value spacing}
\bottomrule
\end{tabular}
\medskip
-\noindent{Toutes les options de \TIKZ\ que l'on peut appliquer à \tkzname{coordinate}, sont applicables (enfin je l'espère!) comme par exemple l'option \tkzname{label} définit avec la librairie \tkzname{quotes}.}
+\noindent{All the options of \TIKZ\ that we can apply to \tkzname{coordinate}, are applicable (well I hope!) as for example the option \tkzname{label} defined with the library \tkzname{quotes}.}
\end{NewMacroBox}
-\subsubsection{Utilisation de \tkzname{shift}}
-\tkzname{shift} permet de placer les points par rapport à un autre.
+\subsubsection{Use of \tkzname{shift}}
+\tkzname{shift} allows the points to be placed in relation to each other.
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[trim left=-1cm]
@@ -46,8 +44,8 @@ options & défaut & définition \\
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Placer un label avec la librairie \tkzname{quotes} }
-Je préfère ne pas mélanger les opérations et utiliser \tkzcname{tkzLabelPoint} pour placer les labels. voir la section 17.10.4 The Quotes Syntax.
+\subsection{Placing a label with the library \tkzname{quotes}}
+I prefer not to mix operations and use \tkzcname{tkzLabelPoint} to place labels. See section The Syntax Quotes.
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[trim left=-1cm]
@@ -63,8 +61,8 @@ Je préfère ne pas mélanger les opérations et utiliser \tkzcname{tkzLabelPoin
\end{tkzexample}
-\subsubsection{Rotation avec \tkzname{shift} et \tkzname{scope} }
-Préférable pour effectuer une rotation, est d'utiliser un environnement \tkzNameEnv{scope}.
+\subsubsection{Rotation with \tkzname{shift} and \tkzname{scope}}
+Preferable to rotate is to use an environment \tkzNameEnv{scope}.
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=.75,rotate=90]
@@ -79,8 +77,8 @@ Préférable pour effectuer une rotation, est d'utiliser un environnement \tkzN
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Formules et coordonnées}
-Il faut ici respecter la syntaxe de \tkzNamePack{xfp}. Il est toujours possible de passer par \tkzNamePack{pgfmath} mais dans ce cas, il faut calculer les coordonnées avant d'utiliser la macro \tkzcname{tkzDefPoint}.
+\subsubsection{Forms and coordinates}
+Here we must follow the syntax of \tkzNamePack{xfp}. It is always possible to go through \tkzNamePack{pgfmath} but in this case, the coordinates must be calculated before using the macro \tkzcname{tkzDefPoint}.
\begin{tkzexample}[latex=6cm,small]
\begin{tikzpicture}[scale=.75]
@@ -100,8 +98,8 @@ Il faut ici respecter la syntaxe de \tkzNamePack{xfp}. Il est toujours possible
\end{tkzexample}
\subsubsection{Scope et \tkzcname{tkzDefPoint} }
-On peut tout d'abord utiliser l'environnement \tkzNameEnv{scope} de \TIKZ\
-Dans l'exemple suivant, nous avons un moyen de définir un triangle isocèle.
+First, we can use the \tkzNameEnv{scope} de \TIKZ\
+In the following example, we have a way to define an isosceles triangle.
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=1]
@@ -119,52 +117,47 @@ Dans l'exemple suivant, nous avons un moyen de définir un triangle isocèle.
\end{tikzpicture}
\end{tkzexample}
%<--------------------------------------------------------------------------->
-\subsection{Définition de points en coordonnées cartésiennes : \tkzcname{tkzDefPoints}} \hypertarget{tdps}{}
+\subsection{Definition of points in Cartesian coordinates: \tkzcname{tkzDefPoints}} \hypertarget{tdps}{}
-\begin{NewMacroBox}{tkzDefPoints}{\oarg{local options}\var{$x_1/y_1/n_1,x_2/y_2/n_2$, ...}}
-$x_1$ et $y_1$ sont les coordonnées d'un point référencé $n_1$
+\begin{NewMacroBox}{tkzDefPoints}{\oarg{local options}\var{$x_1/y_1/n_1,x_2/y_2/n_2$, ...}}%
+$x_1$ et $y_1$ are the coordinates of a referenced point $n_1$
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
-arguments & exemple & \\
+arguments & example & \\
\midrule
\TAline{$x_i/y_i/n_i$}{\tkzcname{tkzDefPoints\{0/0/O,2/2/A\}}}{}
\end{tabular}
\end{NewMacroBox}
+\subsubsection{Definition of points}
\begin{tkzexample}[latex=6cm,small]
\begin{tikzpicture}[scale=1]
- \tkzDefPoints{% x y name
- 0 /0 /A,
- 2 /0 /B,
- 2 /2 /C,
- 0 /2 /D}
+ \tkzDefPoints{0/0/A,2/0/B,2/2/C,0/2/D}
\tkzDrawSegments(D,A A,B B,C C,D)
- % or with tkz-euclide
- % \tkzDrawPolygon(A,...,D)
+ %with tkz-euclide \tkzDrawPolygon(A,...,D)
\tkzDrawPoints(A,B,C,D)
\end{tikzpicture}
\end{tkzexample}
-\newpage
%<--------------------------------------------------------------------------->
-\subsection{Point relativement à un autre : \tkzcname{tkzDefShiftPoint}}
+\subsection{Point relative to another: \tkzcname{tkzDefShiftPoint}}
\hypertarget{tdsp}{}
-\begin{NewMacroBox}{tkzDefShiftPoint}{\oarg{Point}\parg{x,y}\var{name} ou \parg{a:r}\var{name}}
-\begin{tabular}{lll}
-arguments & défaut & définition \\
+\begin{NewMacroBox}{tkzDefShiftPoint}{\oarg{Point}\parg{x,y}\var{name} ou \parg{a:r}\var{name}}%
+\begin{tabular}{lll}%
+arguments & default & definition \\
\midrule
-\TAline{(x,y)}{no default}{x et y sont deux dimensions, par défaut en cm.}
-\TAline{(a:r)}{no default}{a est un angle en degré, r une dimension}
+\TAline{(x,y)}{no default}{$x$ and $y$ are two dimensions, by default in cm.}
+\TAline{(a:r)}{no default}{$a$ is an angle in degrees, $r$ is a dimension}
\TAline{point} {no default} {\tkzcname{tkzDefShiftPoint}[A](0:4)\{B\}}
\bottomrule
\end{tabular}
-\emph{Pas d'option. Le nom du point est obligatoire.}
+No options. The name of the point is mandatory.
\end{NewMacroBox}
-\subsubsection{Exemple avec \tkzcname{tkzDefShiftPoint}}
-Cette macro permet de placer un point relativement à un autre. Cela revient à une translation. Voici comment construire un triangle isocèle de sommet principal A et d'angle au sommet de $30$ degrés.
+\subsubsection{Example with \tkzcname{tkzDefShiftPoint}}
+This macro allows you to place one point relative to another. This is equivalent to a translation. Here is how to construct an isosceles triangle with main vertex $A$ and angle at vertex of $30^\circ$.
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[rotate=-30]
@@ -179,36 +172,34 @@ Cette macro permet de placer un point relativement à un autre. Cela revient à
\end{tikzpicture}
\end{tkzexample}
-\subsection{Point relativement à un autre : \tkzcname{tkzDefShiftPointCoord}}
-
-\begin{NewMacroBox}{tkzDefShiftPointCoord}{\oarg{a,b}\parg{x,y}\var{name} ou \parg{a:r}\var{name}}
-{Il s'agit d'effectuer une translation de vecteur $(a,b)$ au point défini par rapport à l'oigine.}
+\subsection{Point relative to another: \tkzcname{tkzDefShiftPointCoord}}
+\begin{NewMacroBox}{tkzDefShiftPointCoord}{\oarg{a,b}\parg{x,y}\var{name} ou \parg{a:r}\var{name}}%
+{This involves performing a $(a,b)$ vector translation at the defined point relative to the origin.}
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
-arguments & défaut & définition \\
+arguments & default & definition \\
\midrule
-\TAline{(x,y)}{no default}{x et y sont deux dimensions, par défaut en cm.}
-\TAline{(a:r)}{no default}{a est un angle en degré, r une dimension}
+\TAline{(x,y)}{no default}{$x$ and $y$ are two dimensions, by default in cm.}
+\TAline{(a:r)}{no default}{$a$ is an angle in degrees, $r$ is a dimension}
\bottomrule
\end{tabular}
\medskip
-\begin{tabular}{lll}
-\toprule
-options & défaut & exemple \\
+\begin{tabular}{lll}%
+options & default & example \\
\midrule
\TOline{a,b} {no default} {\tkzcname{tkzDefShiftPointCoord}[2,3](0:4)\{B\}}
\bottomrule
\end{tabular}
-L'option est obligatoire
+The option is mandatory
\end{NewMacroBox}
-\subsubsection{Triangle équilatéral avec \tkzcname{tkzDefShiftPointCoord}}
-Voyons comment obtenir un triangle équilatéral (il y a beaucoup plus simple)
+\subsubsection{Equilateral triangle with \tkzcname{tkzDefShiftPointCoord}}
+Let's see how to get an equilateral triangle (there is much simpler)
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=1]
@@ -223,8 +214,8 @@ Voyons comment obtenir un triangle équilatéral (il y a beaucoup plus simple)
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Triangle isocèle avec \tkzcname{tkzDefShiftPointCoord}}
-Voyons comment obtenir un triangle isocèle dont l'angle principal est de 30 degrés. La rotation est possible. $AB=AC=5$ et $\widehat{BAC}$
+\subsubsection{Isosceles triangle with \tkzcname{tkzDefShiftPointCoord}}
+Let's see how to obtain an isosceles triangle with a principal angle of 30 degrees. Rotation is possible. $AB=AC=5$ and $\widehat{BAC}$
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[rotate=15]
@@ -238,38 +229,35 @@ Voyons comment obtenir un triangle isocèle dont l'angle principal est de 30 deg
\end{tikzpicture}
\end{tkzexample}
-
%<--------------------------------------------------------------------------->
-\subsection{Tracer des points \tkzcname{tkzDrawPoint}} \hypertarget{tdrp}{}
-
-\begin{NewMacroBox}{tkzDrawPoint}{\oarg{local options}\parg{point}}
-\begin{tabular}{lll}
-arguments & défaut & définition \\
+\subsection{Drawing a point \tkzcname{tkzDrawPoint}} \hypertarget{tdrp}{}
+\begin{NewMacroBox}{tkzDrawPoint}{\oarg{local options}\parg{point}}%
+\begin{tabular}{lll}%
+arguments & default & definition \\
\midrule
-\TAline{point} {no default} {un nom ou une référence est demandé}
+\TAline{point} {no default} {a name or reference is requested}
\bottomrule
\end{tabular}
\medskip
-\noindent{L'argument est obligatoire, mais il n'est pas nécessaire (bien que recommandé) d'utiliser une référence; un couple de coordonnées place entre accolades est acceptée. Le disque prend la couleur du cercle, mais 50\% plus claire. Il est possible de tout modifier. Le point est un node et donc il est invariant si le dessin est modifié par une mise à l'échelle.}
+\noindent{The argument is mandatory, but it is not necessary (although recommended) to use a reference; a pair of coordinates placed between braces is accepted. The disk takes the color of the circle, but 50\% lighter. It is possible to modify everything. The point is a node and is therefore invariant if the drawing is modified by scaling..}
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
-options & défaut & définition \\
+options & default & definition \\
\midrule
\TOline{shape} {circle}{Possible \tkzname{cross} ou \tkzname{cross out}}
-\TOline{size} {2 pt} {taille du disque}
-\TOline{color} {black}{la couleur par défaut peut être changée}
+\TOline{size} {2 pt} {disk size}
+\TOline{color} {black}{the default color can be changed}
\bottomrule
\end{tabular}
\medskip
-\noindent{On peut créer d'autres formes comme \tkzname{cross}}
+\noindent{We can create other forms such as \tkzname{cross}}
\end{NewMacroBox}
-\subsubsection{Style des points par défaut}
-
+\subsubsection{Default stitch style}
\begin{tkzexample}[latex=5cm,small]
\begin{tikzpicture}
\tkzDefPoint(1,3){A}
@@ -277,8 +265,8 @@ options & défaut & définition \\
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Modification du style}
-La définition par défaut dans le fichier \tkzname{tkz-base.cfg}
+\subsubsection{Changing the style}
+The default definition in the file \tkzname{tkz-base.cfg}
\begin{tkzltxexample}[small]
\tikzset{point style/.style={draw = \tkz@euc@pointcolor,
@@ -305,8 +293,8 @@ La définition par défaut dans le fichier \tkzname{tkz-base.cfg}
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Exemple de tracés de points}
-Il faut remarquer que \tkzname{scale} ne touche pas à la forme des points. Ce qui est normal. La plupart du temps, on se contente d'une seule forme de points que l'on pourra définir dès le début, soit avec une macro, soit en modifiant un fichier de configuration.
+\subsubsection{Example of point plots}
+Note that \tkzname{scale} does not affect the shape of the dots. Which is normal. Most of the time, we are satisfied with a single point shape that we can define from the beginning, either with a macro or by modifying a configuration file.
\begin{tkzexample}[latex=5cm,small]
\begin{tikzpicture}[scale=.5]
@@ -320,25 +308,23 @@ Il faut remarquer que \tkzname{scale} ne touche pas à la forme des points. Ce q
\end{tikzpicture}
\end{tkzexample}
-Il est possible de tracer plusieurs points en une seule fois, mais cette macro est un peu plus lente que la précédente. De plus on doit se contenter des mêmes options pour tous les points.
+It is possible to draw several points at once, but this macro is a little slower than the previous one. Moreover, we have to make do with the same options for all the points.
-\newpage
-\subsection{Tracer des points \tkzcname{tkzDrawPoints}}
+\subsection{Drawing points \tkzcname{tkzDrawPoints}}
\hypertarget{tdrps}{}
-\begin{NewMacroBox}{tkzDrawPoints}{\oarg{local options}\parg{liste}}
-\begin{tabular}{lll}
-arguments & défaut & définition \\
+\begin{NewMacroBox}{tkzDrawPoints}{\oarg{local options}\parg{liste}}%
+\begin{tabular}{lll}%
+arguments & default & definition \\
\midrule
-\TAline{liste de points}{no default}{exemple \tkzcname{tkzDrawPoints(A,B,C)}}
+\TAline{points list}{no default}{example \tkzcname{tkzDrawPoints(A,B,C)}}
\bottomrule
\end{tabular}
\medskip
-\emph{Attention au « s » final, un oubli entraîne des erreurs en cascade si vous tentez de tracer des points multiples. Les options sont les mêmes que pour la macro précédente. }
+Warning at the final "s", an oversight leads to cascading errors if you attempt to plot multiple points. The options are the same as for the previous macro.
\end{NewMacroBox}
-\subsubsection{Exemple avec \tkzcname{tkzDefPoint} et \tkzcname{tkzDrawPoints} }
-
+\subsubsection{Example with \tkzcname{tkzDefPoint} and \tkzcname{tkzDrawPoints} }
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=.5]
\tkzDefPoint(1,3){A}
@@ -348,8 +334,7 @@ arguments & défaut & définition \\
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Exemple plus complexe }
-
+\subsubsection{More complex example }
\begin{tkzexample}[latex=7cm]
\begin{tikzpicture}[scale=.5]
\tkzDefPoint(2,3){A} \tkzDefPoint(5,-1){B}
@@ -367,29 +352,27 @@ arguments & défaut & définition \\
\end{tikzpicture}
\end{tkzexample}
-\newpage
%<--------------------------------------------------------------------------->
-\subsection{Ajouter un label à un point \tkzcname{tkzLabelPoint}}
+\subsection{Add a label to a point \tkzcname{tkzLabelPoint}}
\hypertarget{tlp}{}
-\emph{Il est possible d'ajouter plusieurs labels à un même point en utilisant plusieurs fois cette macro.}
+It is possible to add several labels at the same point by using this macro several times.
-\begin{NewMacroBox}{tkzLabelPoint}{\oarg{local options}\parg{point}\var{label}}
-\begin{tabular}{lll}
-arguments & exemple & \\
+\begin{NewMacroBox}{tkzLabelPoint}{\oarg{local options}\parg{point}\var{label}}%
+\begin{tabular}{lll}%
+arguments & example & \\
\midrule
\TAline{point}{\tkzcname{tkzLabelPoint(A)\{\$A\_1\$\}}}{}
-options & défaut & définition\\
+options & default & definition\\
\midrule
-\TOline{TikZ options}{}{couleur,position etc.}
+\TOline{TikZ options}{}{colour, position etc.}
\bottomrule
\end{tabular}
\medskip
-{En option, on peut utiliser tous les styles de \TIKZ\ , en particulier le placement avec \tkzname{above}, \tkzname{right}, \dots}
+Optionally, we can use any style of Tikz, especially placement with above, right, dots...
\end{NewMacroBox}
-\subsubsection{Exemple avec \tkzcname{tkzLabelPoint}}
-
+\subsubsection{Example with \tkzcname{tkzLabelPoint}}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}
\tkzDefPoint(0,0){A}
@@ -403,8 +386,8 @@ options & défaut & définition\\
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{label et référence}
- La référence d'un point est l'objet qui permet d'utiliser le point, le label est le nom du point qui sera affiché.
+\subsubsection{Label and reference}
+ The reference of a point is the object that allows to use the point, the label is the name of the point that will be displayed.
\begin{tkzexample}[latex=8cm,small]
\begin{tikzpicture}
@@ -416,23 +399,23 @@ options & défaut & définition\\
\end{tikzpicture}
\end{tkzexample}
%<--------------------------------------------------------------------------->
-\subsection{Ajouter des labels aux points \tkzcname{tkzLabelPoints}}
-Il est possible de placer plusieurs labels rapidement quand les références des points sont identiques aux labels et quand les labels sont placés de la même manière par rapport aux points. Par défaut, c'est \tkzname{below right} qui a été choisi.
+\subsection{Add labels to points \tkzcname{tkzLabelPoints}}
+It is possible to place several labels quickly when the point references are identical to the labels and when the labels are placed in the same way in relation to the points. By default, \tkzname{below right} is chosen.
\hypertarget{tlps}{}
-\begin{NewMacroBox}{tkzLabelPoints}{\oarg{local options}\parg{$A_1,A_2,...$}}
+\begin{NewMacroBox}{tkzLabelPoints}{\oarg{local options}\parg{$A_1,A_2,...$}}%
\begin{tabular}{lll}
-arguments & exemple & résultat \\
+arguments & example & result \\
\midrule
-\TAline{list of points}{\tkzcname{tkzLabelPoint(A,B,C)}}{Affichage de A, B et C}
+\TAline{list of points}{\tkzcname{tkzLabelPoint(A,B,C)}}{Display of $A$, $B$ and $C$}
\bottomrule
\end{tabular}
\medskip
- \emph{Cette macro diminue le nombre de lignes de codes, mais il n'est pas évident que tous les points aient besoin du même positionnement des labels.}
+This macro reduces the number of lines of code, but it is not obvious that all points need the same label positioning.
\end{NewMacroBox}
-\subsubsection{Exemple avec \tkzcname{tkzLabelPoints}}
+\subsubsection{Example with \tkzcname{tkzLabelPoints}}
\begin{tkzexample}[latex = 7cm,small]
\begin{tikzpicture}
\tkzDefPoint(2,3){A}
@@ -445,19 +428,18 @@ arguments & exemple & résultat \\
%<--------------------------------------------------------------------------->
% tkzAutoLabelPoints
%<--------------------------------------------------------------------------->
-\subsection{Position automatique des labels \tkzcname{tkzAutoLabelPoints}}
-Le label d'un point est placé suivant une direction définie par un centre et un point \tkzname{center}. La distance au point est déterminé par un pourcentage de la distance entre le centre et le point. Ce pourcentage est donné par \tkzname{dist}.
-\begin{NewMacroBox}{tkzLabelPoints}{\oarg{local options}\parg{$A_1,A_2,...$}}
+\subsection{Automatic position of labels \tkzcname{tkzAutoLabelPoints}}
+The label of a point is placed in a direction defined by a center and a point \tkzname{center}. The distance to the point is determined by a percentage of the distance between the center and the point. This percentage is given by \tkzname{dist}.
+\begin{NewMacroBox}{tkzLabelPoints}{\oarg{local options}\parg{$A_1,A_2,...$}}%
\begin{tabular}{lll}
-arguments & exemple & résultat \\
+arguments & example & result \\
\midrule
-\TAline{list of points}{\tkzcname{tkzLabelPoint(A,B,C)}}{Affichage de A, B et C}
-\bottomrule
+\TAline{list of points}{\tkzcname{tkzLabelPoint(A,B,C)}}{Display of $A$, $B$ and $C$}
\end{tabular}
\end{NewMacroBox}
-\subsubsection{Exemple avec \tkzcname{tkzAutoLabelPoints}}
-Ici les points sont positionnés par rapport au centre de gravité de $A,B,C \text{et} O$
+\subsubsection{Example with \tkzcname{tkzAutoLabelPoints}}
+Here the points are positioned relative to the center of gravity of $A,B,C \text{et} O$.
\begin{tkzexample}[latex=5cm,small]
\begin{tikzpicture}[scale=1.25]
\tkzDefPoint(2,1){O}
@@ -477,55 +459,53 @@ Ici les points sont positionnés par rapport au centre de gravité de $A,B,C \te
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Exemple avec \tkzcname{tkzAutoLabelPoints}}
-Cette fois la référence est $O$ et la distance est par défaut de $0.15$
+\subsubsection{Example with \tkzcname{tkzAutoLabelPoints}}
+This time the reference is $O$ and the distance is by default $0.15$.
\begin{tkzexample}[latex=5cm,small]
\begin{tikzpicture}[scale=1.25]
- \tkzDefPoint(2,1){O}
- \tkzDefRandPointOn[circle=center O radius 1.5cm]
- \tkzGetPoint{A}
- \tkzDrawCircle(O,A)
- \tkzDefPointBy[rotation=center O angle 100](A)
- \tkzGetPoint{C}
- \tkzDefPointBy[rotation=center O angle 78](A)
- \tkzGetPoint{B}
- \tkzDrawPoints(O,A,B,C)
- \tkzDrawSegments(C,B B,A A,O O,C)
- \tkzAutoLabelPoints[center=O,red](A,B,C)
+ \tkzDefPoint(2,1){O}
+ \tkzDefRandPointOn[circle=center O radius 1.5cm]
+ \tkzGetPoint{A}
+ \tkzDrawCircle(O,A)
+ \tkzDefPointBy[rotation=center O angle 100](A)
+ \tkzGetPoint{C}
+ \tkzDefPointBy[rotation=center O angle 78](A)
+ \tkzGetPoint{B}
+ \tkzDrawPoints(O,A,B,C)
+ \tkzDrawSegments(C,B B,A A,O O,C)
+ \tkzAutoLabelPoints[center=O,red](A,B,C)
\end{tikzpicture}
\end{tkzexample}
%<--------------------------------------------------------------------------->
-\subsection{Style des points avec \tkzcname{tkzSetUpPoint}}
- Il est important de comprendre que la taille d'un point dépend de la taille d'une ligne.
-\begin{NewMacroBox}{tkzSetUpPoint}{\oarg{local options}}
+\subsection{Point style with \tkzcname{tkzSetUpPoint}}
+ It is important to understand that the size of a dot depends on the size of a line.
+\begin{NewMacroBox}{tkzSetUpPoint}{\oarg{local options}}%
\begin{tabular}{lll}
-options & défaut & définition \\
+options & default & definition \\
\midrule
-\TOline{shape}{circle}{possible : circle, cross, cross out}
-\TOline{size}{current }{ la taille du point est size * line width }
-\TOline{color}{current}{exemple \tkzcname{tkzLabelPoint(A,B,C)}}
-\TOline{fill}{current!50}{exemple \tkzcname{tkzLabelPoint(A,B,C)}} \bottomrule
+\TOline{shape}{circle}{possible: circle, cross, cross out}
+\TOline{size}{current }{the size of the point is size * line width }
+\TOline{color}{current}{example \tkzcname{tkzLabelPoint(A,B,C)}}
+\TOline{fill}{current!50}{example \tkzcname{tkzLabelPoint(A,B,C)}}
\end{tabular}
-
\end{NewMacroBox}
-Il s'agit d'une macro permettant de choisir un \hypertarget{setupoint}{style} pour les points. La macro \tkzcname{tkzDrawSegments} est décrite \hyperlink{segs}{ici}.
-
-\subsubsection{Exemple simple avec \tkzcname{tkzSetUpPoint}}
+This is a macro for choosing a \hypertarget{setupoint}{style} for points.
+\subsubsection{Simple example with \tkzcname{tkzSetUpPoint}}
\begin{tkzexample}[latex=6cm,small]
- \begin{tikzpicture}
- \tkzSetUpPoint[shape = cross out,
- color=blue]
- \tkzInit[xmax=100,xstep=20,ymax=.5]
- \tkzDefPoint(20,1){A}
- \tkzDefPoint(80,0){B}
- \tkzDrawLine(A,B)
- \tkzDrawPoints(A,B)
+\begin{tikzpicture}
+ \tkzSetUpPoint[shape = cross out,
+ color=blue]
+ \tkzInit[xmax=100,xstep=20,ymax=.5]
+ \tkzDefPoint(20,1){A}
+ \tkzDefPoint(80,0){B}
+ \tkzDrawLine(A,B)
+ \tkzDrawPoints(A,B)
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Exemple avec \tkzcname{tkzSetUpPoint}}
+\subsubsection{Example with \tkzcname{tkzSetUpPoint}}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}
\tkzInit[ymin=-0.5,ymax=3,xmin=-0.5,xmax=7]
@@ -540,8 +520,8 @@ Il s'agit d'une macro permettant de choisir un \hypertarget{setupoint}{style} po
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Utilisation de\tkzcname{tkzSetUpPoint} dans un groupe}
-Seuls les points du groupe sont affectés par les modifications.
+\subsubsection{Using \tkzcname{tkzSetUpPoint} in a group}
+Only the points in the group are affected by the changes.
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}
@@ -562,32 +542,29 @@ Seuls les points du groupe sont affectés par les modifications.
\end{tikzpicture}
\end{tkzexample}
%<--------------------------------------------------------------------------->
-\subsection{Montrer les coordonnées des points \tkzcname{tkzPointShowCoord}}
-Cette macro permet d'afficher les coordonnées d'un point et de tracer des flèches pour préciser l'abscisse et l'ordonnée. Le point est donné par sa référence (son nom). Il est possible de donner un couple de coordonnées.
-
- \begin{NewMacroBox}{tkzPointShowCoord}{\oarg{local options}\parg{point}}
+\subsection{Show point coordinates}
+This macro allows you to display the coordinates of a point and to draw arrows to specify the abscissa and ordinate. The point is given by its reference (its name). It is possible to give a couple of coordinates.
\hypertarget{tpsc}{}
-\begin{tabular}{lll}
-\toprule
-argument & exemple & explication \\
+\begin{NewMacroBox}{tkzPointShowCoord}{\oarg{local options}\parg{point}}%
+\begin{tabular}{lll}%
+argument & example & explanation \\
\midrule
-\TAline{\parg{ref}}{\tkzcname{tkzPointShowCoord}(A)}{ Montre les coordonnées du point A}
+\TAline{\parg{ref}}{\tkzcname{tkzPointShowCoord}(A)}{shows the coordinates of point $A$}
\bottomrule
- \end{tabular}
+\end{tabular}
- \medskip
-\begin{tabular}{lll}
-%\toprule
-option & défaut & explication \\
+\medskip
+\begin{tabular}{lll}%
+option & default & explication \\
\midrule
-\TOline{xlabel}{empty}{label pour l'abscisse}
-\TOline{xstyle}{empty}{style pour le node du label de l'abscisse}
-\TOline{noxdraw}{false}{booléen pour ne pas tracer de flèche vers $(x'x)$}
+\TOline{xlabel}{empty}{label abscissa}
+\TOline{xstyle}{empty}{style for the abscissa label node}
+\TOline{noxdraw}{false}{boolean so as not to draw an arrow to $(x'x)$}
\end{tabular}
- \end{NewMacroBox}
-
-\subsubsection{styles par défaut}
+\end{NewMacroBox}
+\subsubsection{Default styles}
+Here are some of the main styles:
\begin{tkzltxexample}[small]
\tikzset{arrow coord style/.style={dashed,
\tkz@euc@linecolor,
@@ -607,8 +584,8 @@ option & défaut & explication \\
left=3pt}}
\end{tkzltxexample}
-\subsubsection{Exemple avec \tkzcname{tkzPointShowCoord}}
-Sans les options, on n'obtient que les flèches.
+\subsubsection{Example with \tkzcname{tkzPointShowCoord}}
+Without the options, you only get the arrows.
\begin{tkzexample}[latex=7cm,small]
@@ -625,8 +602,8 @@ Sans les options, on n'obtient que les flèches.
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Exemple avec \tkzcname{tkzPointShowCoord} et \tkzname{xstep}}
-Sans les options, on n'obtient que les flèches.
+\subsubsection{Example with \tkzcname{tkzPointShowCoord} and \tkzname{xstep}}
+Without the options, you only get the arrows.
\begin{tkzexample}[latex=7cm,small]
@@ -642,32 +619,28 @@ Sans les options, on n'obtient que les flèches.
\subsection{\tkzcname{tkzDefSetOfPoints}} % (fold)
-\noindent\space : Il était déjà possible de créer un nuage de points avec la macro \tkzcname{tkzDefPoints}, mais cela impose de donner une référence (un nom) à chaque point, ce qui est parfois fastidieux. La macro \tkzcname{tkzSetOfPoints} permet de définir des points \tkzname{tkzPt1}, \tkzname{tkzPt2},etc.
-
-C'est ce qu'on appelle fréquemment \hypertarget{label_tkzDefSetOfPoints}{« nuage de points»}. La différence par rapport à la macro \tkzcname{tkzDefPoints}, c'est que la référence aux points est donnée par un préfixe (par défaut tkzPt) et le numéro du point.
-Les points ne sont pas tracés.
-
-\begin{NewMacroBox}{tkzDefSetOfPoints}{\oarg{local options}\var{$x_1/y_1,x_2/y_2,\ldots,x_n/y_n$}}
+It was already possible to create a scatter plot with the macro \tkzcname{tkzDefPoints}, but this requires making a reference (a name) to each point, which is sometimes tedious. The macro \tkzcname{tkzSetOfPoints} allows to define points \tkzname{tkzPt1}, \tkzname{tkzPt2}, etc.
-\begin{tabular}{lll}
+This is frequently referred to as \hypertarget{label_tkzDefSetOfPoints}{« scatter plot"}. The difference from the macro \tkzcname{tkzDefPoints} is that the reference to the points is given by a prefix (default tkzPt) and the point number.
+The points are not drawn.
-arguments & défaut & définition \\
+\begin{NewMacroBox}{tkzDefSetOfPoints}{\oarg{local options}\var{$x_1/y_1,x_2/y_2,\ldots,x_n/y_n$}}%
+\begin{tabular}{lll}%
+arguments & default & definition \\
\midrule
-\TAline{$x_n/y_n$}{no default}{Liste de couples $x_n/y_n$ séparés par des virgules}
+\TAline{$x_n/y_n$}{no default}{List of couples $x_n/y_n$ separated by commas}
\bottomrule
\end{tabular}
\medskip
-\begin{tabular}{lll}
-
-options & défaut & définition \\
+\begin{tabular}{lll}%
+options & default & definition \\
\midrule
-\TOline{prefix} {tkzPt} {préfixe pour les noms des points}
+\TOline{prefix} {tkzPt} {prefix for point names}
\end{tabular}
\end{NewMacroBox}
-\subsubsection{Création d'un nuage avec \tkzcname{tkzDefSetOfPoints}}
-
+\subsubsection{Creating a scatter plot with \tkzcname{tkzDefSetOfPoints}}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}
\tkzInit[ymax=4,xmax=5]
diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-rep.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-rep.tex
index 10e5ba6934..329cf82b49 100644
--- a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-rep.tex
+++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-rep.tex
@@ -1,43 +1,35 @@
-\section{Utilisation d'un repère}
-
+\section{Using an orthogonal coordinate system}
\subsection{Repère avec \tkzcname{tkzRep}}
-
\hypertarget{rep}{}
-
-\begin{NewMacroBox}{tkzRep}{\oarg{local options}}
-\begin{tabular}{lll}
-options & défaut & définition \\
+\begin{NewMacroBox}{tkzRep}{\oarg{local options}}%
+\begin{tabular}{lll}%
+options & default & definition \\
\midrule
-\TOline{line width}{|0.8pt|}{line width définit la largeur du trait }
-\TOline{xlabel}{|$\vec{\imath}$|}{étiquette pour l'axe des abscisses}
-\TOline{ylabel}{|$\vec{\jmath}$|}{étiquette pour l'axe des ordonnées}
-\TOline{posxlabel }{|below=2pt|} {Position de l'étiquette}
-\TOline{posylabel }{|left=2pt|} {Position de l'étiquette }
-\TOline{xnorm}{|1|} {norme du vecteur en x}
-\TOline{ynorm}{|1|}{norme du vecteur en y}
-\TOline{color}{|black|}{couleur des traits}
-\TOline{colorlabel}{|black|}{couleur des étiquettes }
+\TOline{line width}{|0.8pt|}{line width defines the width of the line }
+\TOline{xlabel}{|$\vec{\imath}$|}{label for the abscissa axis}
+\TOline{ylabel}{|$\vec{\jmath}$|}{label for the ordinate axis}
+\TOline{posxlabel }{|below=2pt|} {Label position}
+\TOline{posylabel }{|left=2pt|} {Label position }
+\TOline{xnorm}{|1|} {norm of the x-vector}
+\TOline{ynorm}{|1|}{vector norm in y}
+\TOline{color}{|black|}{line colour}
+\TOline{colorlabel}{|black|}{label color }
\end{tabular}
\end{NewMacroBox}
-\subsubsection{Quelques styles modifiables }
+\subsubsection{Some modifiable styles }
\begin{tkzltxexample}[small]
\tikzset{xlabel style/.style = {below = 3 pt,
inner sep = 1pt,
- outer sep = 0pt}
- }
+ outer sep = 0pt}}
\tikzset{ylabel style/.style = {left = 3 pt,
inner sep = 1pt,
outer sep = 0pt}}
- \tikzset{xaxe style/.style = {> = latex, ->}
- }
- \tikzset{yaxe style/.style = {> = latex, ->}
- }
+ \tikzset{xaxe style/.style = {> = latex, ->}}
+ \tikzset{yaxe style/.style = {> = latex, ->}}
\end{tkzltxexample}
-\subsubsection{Exemple d'utilisation }
-
-
+\subsubsection{Example of use }
\begin{tkzexample}[small]
\begin{tikzpicture}
\tikzset{xaxe style/.style={-}}
@@ -53,6 +45,6 @@ options & défaut & définition \\
\vspace{12pt}
-sPour ceux qui utilisent \tkzname{frenchb} avec \tkzname{babel}, en cas de problème avec la version 3 de pgf, il suffit de charger la librairie \tkzname{babel}. \TIKZ\ a été en effet parfois allergique aux caractères actifs.
+For those who use \tkzname{french} with \tkzname{babel}, in case of problems with version 3 of pgf, just load the \tkzname{babel} library. \TIKZ\ was indeed sometimes allergic to the active characters.
\endinput \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-style.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-style.tex
index 080a568db7..71fa54c4aa 100644
--- a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-style.tex
+++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-style.tex
@@ -1,12 +1,12 @@
-\section{Utilisation des styles}
+\section{Style Use}
-\subsection{Modification de \tkzname{tkz-base.cfg}}
-\tkzname{tkz-base.sty} possède un fichier de configuration par défaut. Son existence n'est pas obligatoire, mais s'il existe, vous pouvez le modifier pour obtenir des styles par défaut différents. Je ne donne qu'une description rapide de ce fichier, car il risque d'évoluer prochainement.
+\subsection{Modification of \tkzname{\tkznameofpack}}
+\tkzname{tkz-base.sty} has a default configuration file. Its existence is not mandatory, but if it exists, you can modify it to get different default styles. I only give a quick description of this file, as it may evolve soon.
-Dans \tkzname{tkz-base.cfg}, on peut régler les axes, le repère ( si on l'utilise), la grille, etc. ainsi que les styles qui sont liés à ces objets.
- Il est possible de modifier les styles des points et des segments.
+In \tkzname{tkz-base.cfg}, you can set the axes, the reference (if used), the grid, etc. as well as the styles which are linked to these objects.
+ It is possible to modify the styles of the points and segments.
-Il est aussi possible de définir les dimensions d'un dessin par défaut en modifiant \tkzname{xmin}, \tkzname{xmax}, \tkzname{ymin} et \tkzname{ymax}.
+It is also possible to define the dimensions of a drawing by default by modifying \tkzname{xmin}, \tkzname{xmax}, \tkzname{ymin} and \tkzname{ymax}.
\begin{tkzltxexample}[small]
@@ -16,9 +16,9 @@ Il est aussi possible de définir les dimensions d'un dessin par défaut en modi
\def\tkz@yb{10}
\end{tkzltxexample}
-Ces lignes permettent de définir les valeurs de \tkzname{xmin}, \tkzname{xmax}, etc.
+These lines are used to define the values of \tkzname{xmin}, \tkzname{xmax}, etc.
-Vous pouvez les modifier, par exemple~:
+You can change them, for example:
\begin{tkzltxexample}[small]
\def\tkz@xa{-5}
@@ -27,7 +27,7 @@ Vous pouvez les modifier, par exemple~:
\def\tkz@yb{5}
\end{tkzltxexample}
-Voici une liste des styles utilisés que vous trouverez dans \tkzname{tkz-base.cfg}
+Here's a list of used styles you'll find in \tkzname{tkz-base.cfg}
\begin{itemize}
\item xlabel style
@@ -45,16 +45,16 @@ Voici une liste des styles utilisés que vous trouverez dans \tkzname{tkz-base.
\item ycoord style
\end{itemize}
-\subsection{Utilisation \tkzcname{tikzset}}
-Il est préférable d'utiliser désormais \tkzcname{tikzset} plutôt que \tkzcname{tikzstyle}\ et il est possible de s'inspirer de \tkzname{tkz-base.cfg}.
+\subsection{Use \tkzcname{tikzset}}
+It's better to use \tkzcname{tikzset} now rather than \tkzcname{tikzstyle}\ and it's possible to use \tkzname{tkz-base.cfg}.
-Si vous voulez modifier l'aspect des axes du repère, par exemple placer des flèches à chaque extrémité ou bien les supprimer. Ceci peut se faire dans \tkzname{tkz-base.cfg} ou bien dans votre code.
+If you want to change the appearance of the axes of the orthogonal coordinate system, for example place arrows at each end or remove them. This can be done in \tkzname{tkz-base.cfg} or in your code.
\begin{tkzltxexample}[small]
\tikzset{xaxe style/.style ={>=latex,<->}}
\end{tkzltxexample}
-La transformation sera valable pour tout le document. Il faut noter que \tkzname{xmin} a été modifié, en effet la flèche et le trait correspondant à la graduation se confondent.
+The transformation will be valid for the entire document. Note that \tkzname{xmin} has been modified, in fact the arrow and the line corresponding to the graduation merge.
\begin{tkzexample}[latex=7cm,small]
\tikzset{xaxe style/.style = {<->}}
@@ -67,7 +67,7 @@ La transformation sera valable pour tout le document. Il faut noter que \tkzname
\end{tkzexample}
-\subsection{Macros de configuration}
+\subsection{Configuration Macros}
\begin{itemize}
\item {\color{blue}{\textbackslash}\hyperlink{setupoint}{tkzSetUpPoint}}
diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-texte.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-texte.tex
index 8b7fb13c48..eb53581ab9 100644
--- a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-texte.tex
+++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-texte.tex
@@ -1,25 +1,24 @@
-\section{Textes et Légendes}
+\section{Texts and Legends}
-\subsection{Placer un titre}
-On peut bien sûr utiliser \TIKZ, mais la macro que je propose permet de placer le texte en utilisant les unités choisies pour le dessin.
+\subsection{Placing a title}
+Of course you can use \TIKZ, but the macro I propose to allow you to place the text using the units chosen for the drawing.
-\emph{les options sont toujours celles de \TIKZ, en particulier les suivantes~:}
-\begin{NewMacroBox}{tkzText}{\oarg{local options}\parg{point}\var{text}}
-Le point peut soit être donné par ses coordonnées, soit par son nom.
+The options are always those of \TIKZ, in particular the following ones:
+\begin{NewMacroBox}{tkzText}{\oarg{local options}\parg{dot}\var{text}}%
+The point can either be given by its coordinates or by its name.
\hypertarget{text}{}
-
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
-options & défaut & définition\\
+options & default & definition\\
\midrule
-\TOline{color }{|black|}{couleur courante}
-\TOline{text }{|black|}{couleur du texte}
-\TOline{fill }{|white|}{couleur du fond}
-\TOline{opacity }{|1| }{opacité}
+\TOline{color }{|black|}{current colour}
+\TOline{text }{|black|}{text colour}
+\TOline{fill }{|white|}{background colour}
+\TOline{opacity }{|1| }{opacity}
\end{tabular}
\end{NewMacroBox}
-\subsubsection{Un titre}
+\subsubsection{A title}
\begin{tkzexample}[latex=8cm]
\begin{tikzpicture}
@@ -50,8 +49,8 @@ options & défaut & définition\\
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Texte avec un point}
-Il est possible de donner la référence d'un point à la place de ses coordonnées.
+\subsubsection{Text with a period}
+It is possible to give the reference of a point instead of its coordinates.
\begin{tkzexample}[latex=8cm]
\begin{tikzpicture}
@@ -63,70 +62,63 @@ Il est possible de donner la référence d'un point à la place de ses coordonn
line width = 1pt,
color = black,
fill = purple!20](A)
- {Mon texte}
+ {My text}
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Format du texte}
- L'option \tkzname{text width} est intéressante, voir le pgfmanual pour plus d'informations.
+\subsubsection{Text format}
+ The option \tkzname{text width} is interesting, see the pgfmanual for more information.
\begin{tkzexample}[latex=8cm,small]
\begin{tikzpicture}
- \tkzInit[ymax=5,xmax=6]
- \tkzAxeXY
- \tkzText[draw,opacity=.6,
- inner sep=.6 cm,
- line width = 1pt,
- color = black,
- fill = purple!20,
- text width=3cm](3,3)
- {Mon texte\\ Référence}
+ \tkzInit[ymax=5,xmax=6]
+ \tkzAxeXY
+ \tkzText[draw,opacity=.6,
+ inner sep=.6 cm,
+ line width = 1pt,
+ color = black,
+ fill = purple!20,
+ text width=3cm](3,3)
+ {My text\\\ Reference}
\end{tikzpicture}
\end{tkzexample}
-\subsection{Placer des légendes}
-Il y a deux façons d'utiliser cette macro. Soit on place des légendes pour des courbes. Alors, il faut représenter des lignes avec leur style propre, soit il s'agit de différencier des symboles (mark).
-
-\begin{NewMacroBox}{tkzLegend}{\oarg{local options}\var{mark/couleur/size/text}}\hypertarget{legend}{}
-Les arguments diffèrent en fonction du booléen \tkzname{line}.
+\subsection{Placing legends}
+There are two ways to use this macro. Either you can place legends for curves. Then you can represent lines with their own style, or you can differentiate symbols (mark).
+\hypertarget{legend}{}
+\begin{NewMacroBox}{tkzLegend}{\oarg{local options}\var{mark/color/size/text}}%
+The arguments differ according to the boolean \tkzname{line}.
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
-options & défaut & définition\\
+options & default & definition\\
\midrule
-\TOline{line}{false}{booléen :ligne ou symbole}
+\TOline{line}{false}{Boolean :line or symbol}
\end{tabular}
Avec |line=true|
\begin{tabular}{lll}
\toprule
-arguments & défaut & exemple\\
+arguments & default & example\\
\midrule
-\TAline{style/line width/couleur/texte}{pas de défaut}{dashed/1pt/red/Recette}
+\TAline{style/line width/color/texte}{no default}{dashed/1pt/red/Recipe}
\end{tabular}
\medskip
-Avec |line=false|
+With |line=false|
\begin{tabular}{lll}
\toprule
-arguments & défaut & exemple\\
+arguments & default & example\\
\midrule
-\TAline{mark/mark size/couleur/texte}{pas de défaut}{heart/1ex/red!30/Recette produit A}
+\TAline{mark/mark size/color/texte}{no default}{heart/1ex/red!30/Product Recipe A}
\end{tabular}
-
-\medskip
-{On peut modifier la longueur de la ligne dans \tkzname{tkz-base.cfg}}
-\begin{tkzltxexample}[]
- \def\tkz@legend@line@len{.5cm}
-\end{tkzltxexample}
\end{NewMacroBox}
-\subsubsection{Légendes avec des symboles}
-
+\subsubsection{Legends with symbols}
\begin{tkzexample}[vbox]
- \begin{tikzpicture}
+\begin{tikzpicture}
\tkzInit[xmax=12,ymin=1000,ymax=11000,ystep=2000]
\tkzGrid[color=orange!30]
\tkzDrawX[below right,label=Mois]
@@ -144,8 +136,8 @@ arguments & défaut & exemple\\
\tkzDrawSetOfPoints[prefix=P,mark=square*,mark size=4pt,
mark options={color=blue,fill=blue!40}]
\tkzLegend[draw,rounded corners,fill=orange!20,text=brown,
- line width=2pt](5,10000){heart/1ex/red!30/Recette produit A,%
- square*/0.75ex/blue!40/Recette produit B}
+ line width=2pt](5,10000){heart/1ex/red!30/Product Recipe A,%
+ square*/0.75ex/blue!40/Product Recipe B}
\end{tikzpicture}
\end{tkzexample}
diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-tools.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-tools.tex
index 6a92b89bf2..3ddc5fb111 100644
--- a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-tools.tex
+++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-tools.tex
@@ -1,24 +1,23 @@
-\section{Outils divers}
+\section{Miscellaneous tools}
-\subsection{Dupliquer un segment}
+\subsection{Duplicate a segment}
-Il s'agit de construire un segment sur une demi-droite donnée de même longueur qu'un segment donné.
+This involves constructing a segment on a given half-line of the same length as a given segment.
-\begin{NewMacroBox}{tkzDuplicateSegment}{\parg{pt1,pt2}\parg{pt3,pt4}\marg{pt5}}
-Il s'agit de créer un segment sur une demi-droite donnée de même longueur qu'un segment donné . Il s'agit en fait de la définition d'un point.
+\begin{NewMacroBox}{tkzDuplicateSegment}{\parg{pt1,pt2}\parg{pt3,pt4}\marg{pt5}}%
+This involves creating a segment on a given half-line of the same length as a given segment . It is in fact the definition of a point.
\medskip
-
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
-arguments & exemple & explication \\
+arguments & example & explanation \\
\midrule
\TAline{(pt1,pt2)(pt3,pt4)\{pt5\}} {\tkzcname{tkzDuplicateLen}(A,B)(E,F)\{C\}}{AC=EF et $C \in [AB)$} \\
\bottomrule
\end{tabular}
\medskip
-La macro \tkzcname{tkzDuplicateLength} est identique à celle-ci.
+The macro \tkzcname{tkzDuplicateLength} is identical to this one.
\end{NewMacroBox}
\begin{tkzexample}[latex=6cm,small]
@@ -34,8 +33,7 @@ La macro \tkzcname{tkzDuplicateLength} est identique à celle-ci.
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Proportion d'or avec \tkzcname{tkzDuplicateSegment}}
-
+\subsubsection{Gold proportion with \tkzcname{tkzDuplicateSegment}}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[rotate=-90,scale=.75]
\tkzInit[xmax=10,ymax=10]
@@ -59,24 +57,23 @@ La macro \tkzcname{tkzDuplicateLength} est identique à celle-ci.
% <-------------------------------------------------------------------->
% About Angles
% <-------------------------------------------------------------------->
- \subsection{Déterminer une pente}
-Il s'agit de déterminer si elle existe, la pente d'une droite définie par deux points. Aucune vérification de l'existence n'est faite.
+\subsection{Determining a slope}
+It is a question of determining whether it exists, the slope of a straight line defined by two points. No verification of the existence is made.
-\begin{NewMacroBox}{tkzFindSlope}{\parg{pt1,pt2}\marg{name of macro}}
-Le résultat est stocké dans une macro.
+\begin{NewMacroBox}{tkzFindSlope}{\parg{pt1,pt2}\marg{name of macro}}%
+The result is stored in a macro.
\medskip
-
\begin{tabular}{lll}
\toprule
-arguments & exemple & explication \\
+arguments & example & explication \\
\midrule
-\TAline{(pt1,pt2){pt3}} {\tkzcname{tkzFindSlope}(A,B)\{slope\}}{\tkzcname{slope} donnera le résultat de $\frac{y_B-y_A}{x_B-x_A}$} \\
+\TAline{(pt1,pt2){pt3}} {\tkzcname{tkzFindSlope}(A,B)\{slope\}}{\tkzcname{slope} will give the result of $\frac{y_B-y_A}{x_B-x_A}$} \\
\bottomrule
\end{tabular}
\medskip
-\tkzHandBomb\ Attention à ne pas avoir $x_B=x_A$
+\tkzHandBomb\ Careful not to have $x_B=x_A$
\end{NewMacroBox}
@@ -92,37 +89,36 @@ arguments & exemple & explication \\
\tkzFindSlope(A,D){SAD}
\pgfkeys{/pgf/number format/.cd,fixed,precision=2}
\tkzText[fill=Gold!50,draw=brown](1,4)%
- {La pente de (AB) est : $\pgfmathprintnumber{\SAB}$}
+ {La pente de (AB) est: $\pgfmathprintnumber{\SAB}$}
\tkzText[fill=Gold!50,draw=brown](1,3.5)%
- {La pente de (AC) est : $\pgfmathprintnumber{\SAC}$}
+ {La pente de (AC) est: $\pgfmathprintnumber{\SAC}$}
\tkzText[fill=Gold!50,draw=brown](1,3)%
- {La pente de (AD) est : $\pgfmathprintnumber{\SAD}$}
+ {La pente de (AD) est: $\pgfmathprintnumber{\SAD}$}
\end{tikzpicture}
\end{tkzexample}
-\subsection{Angle formé par une droite avec l'axe horizontal}
-Beaucoup plus intéressante que la précédente. Le résultat est compris entre -180 degrés et +180 degrés.
+\subsection{Angle formed by a straight line with the horizontal axis}
+Much more interesting than the last one. The result is between -180 degrees and +180 degrees.
-\begin{NewMacroBox}{tkzFindSlopeAngle}{\parg{pt1,pt2}}
-Le résultat est stocké dans une macro \tkzcname{tkzAngleResult}.
+\begin{NewMacroBox}{tkzFindSlopeAngle}{\parg{pt1,pt2}}%
+The result is stored in a macro \tkzcname{tkzAngleResult}.
\medskip
-
\begin{tabular}{lll}
\toprule
-arguments & exemple & explication \\
+arguments & example & explication \\
\midrule
-\TAline{(pt1,pt2)} {\tkzcname{tkzFindSlopeAngle}(A,B)}{\tkzcname{tkzGetAngle} peut récupèrer le résultat}
+\TAline{(pt1,pt2)} {\tkzcname{tkzFindSlopeAngle}(A,B)}{\tkzcname{tkzGetAngle} can retrieve the result}
\bottomrule
\end{tabular}
\medskip
-{Si la récupération n'est pas nécessaire, il est possible d'utiliser \tkzcname{tkzAngleResult}}
+{If recovery is not necessary, it is possible to use \tkzcname{tkzAngleResult}}
\end{NewMacroBox}
-\subsubsection{Exemple d'utilisation de \tkzcname{tkzFindSlopeAngle}}
-Voici une autre version de la construction d'une médiatrice
+\subsubsection{Example of use of \tkzcname{tkzFindSlopeAngle}}
+Here is another version of the construction of a mediator
\begin{tkzexample}[latex=6cm,small]
\begin{tikzpicture}
@@ -142,26 +138,25 @@ Voici une autre version de la construction d'une médiatrice
\end{tikzpicture}
\end{tkzexample}
-\subsection{Récupérer un angle}
-Dans l'exemple précédent, j'ai utilisé la macro \tkzcname{tkzGetAngle} qui permet de récupérer un angle.
+\subsection{from an angle}
+In the previous example, I used the macro \tkzcname{tkzGetAngle} to retrieve an angle.
-\begin{NewMacroBox}{tkzGetAngle}{\marg{name of macro}}
-Cette macro récupère \tkzcname{tkzAngleResult} et stocke le résultat dans une nouvelle macro.
+\begin{NewMacroBox}{tkzGetAngle}{\marg{name of macro}}%
+This macro retrieves \tkzcname{tkzAngleResult} and stores the result in a new macro.
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
-arguments & exemple & explication \\
+arguments & example & explication \\
\midrule
-\TAline{name of macro} {\tkzcname{tkzGetAngle}\{ang\}}{\tkzcname{ang} contient la valeur de l'angle.}
+\TAline{name of macro} {\tkzcname{tkzGetAngle}\{ang\}}{\tkzcname{ang} contains the value of the angle. }
\end{tabular}
\end{NewMacroBox}
-\subsection{Exemple d'utilisation de \tkzcname{tkzGetAngle}}
-
- Il s'agit ici que $(AB)$ soit la bissectrice de $\widehat{CAD}$, tel que la pente $AD$ soit nulle. On récupère la pente de $(AB)$ puis on effectue deux rotations.
+\subsection{Example of the use of \tkzcname{tkzGetAngle}}
+ The point here is that $(AB)$ is the bisector of $\widehat{CAD}$, such that the $AD$ slope is zero. We recover the slope of $(AB)$ and then rotate twice.
\begin{tkzexample}[vbox,small]
\begin{tikzpicture}
@@ -182,28 +177,24 @@ arguments & exemple & explication \\
\end{tikzpicture}
\end{tkzexample}
-\subsection{Angle formé par trois points}
-
-
-\begin{NewMacroBox}{tkzFindAngle}{\parg{pt1,pt2,pt3}}
-Le résultat est stocké dans une macro \tkzcname{tkzAngleResult}.
+\subsection{Angle formed by three points}
+\begin{NewMacroBox}{tkzFindAngle}{\parg{pt1,pt2,pt3}}%
+The result is stored in a macro \tkzcname{tkzAngleResult}.
\medskip
-
\begin{tabular}{lll}
\toprule
-arguments & exemple & explication \\
+arguments & example & explication \\
\midrule
-\TAline{(pt1,pt2,pt3)} {\tkzcname{tkzFindAngle}(A,B,C)}{\tkzcname{tkzAngleResult} donne l'angle ($\overrightarrow{BA},\overrightarrow{BC}$)}
+\TAline{(pt1,pt2,pt3)} {\tkzcname{tkzFindAngle}(A,B,C)}{\tkzcname{tkzAngleResult} gives the angle ($\overrightarrow{BA},\overrightarrow{BC}$)}
\bottomrule
\end{tabular}
\medskip
-Le résultat est compris entre -180 degrés et +180 degrés. pt2 est le sommet et \tkzcname{tkzGetAngle} peut récupérer l'angle.
+The result is between -180 degrees and +180 degrees. pt2 is the vertex and \tkzcname{tkzGetAngle} can retrieve the angle.
\end{NewMacroBox}
-\subsection{Exemple d'utilisation de \tkzcname{tkzFindAngle} }
-
+\subsection{Example of use of \tkzcname{tkzFindAngle} }
\begin{tkzexample}[vbox,small]
\begin{tikzpicture}
\tkzInit[xmin=-1,ymin=-1,xmax=7,ymax=7]
@@ -227,38 +218,33 @@ Le résultat est compris entre -180 degrés et +180 degrés. pt2 est le sommet e
\end{tikzpicture}
\end{tkzexample}
-\subsection{Longueur d'un segment \tkzcname{tkzCalcLength}}
-Il existe dans \TIKZ\ une option \tkzname{veclen}. Cette option
- permet de calculer AB si A et B sont deux points.
+\subsection{\tkzcname{tkzCalcLength}}
+There's an option in \TIKZ\ name in \tkzname{veclen}. This option
+ is used to calculate AB if A and B are two points.
-Le seul problème pour moi est que la version de \TIKZ\ n'est pas assez précise dans certains cas particuliers. Ma version utilise le package \tkzNamePack{xfp} et est plus lente, mais plus précise
-
-\begin{NewMacroBox}{tkzCalcLength}{\oarg{local options}\parg{pt1,pt2}\marg{name of macro}}
-Le résultat est stocké dans une macro.
-
-\medskip
-\begin{tabular}{lll}
-\toprule
-arguments & exemple & explication \\
+The only problem for me is that the version of \TIKZ\ is not accurate enough in some cases. My version uses the \tkzNamePack{xfp} package and is slower, but more accurate.
+ \hypertarget{tpsc}{}
+\begin{NewMacroBox}{tkzCalcLength}{\oarg{local options}\parg{pt1,pt2}\marg{name of macro}}%
+\begin{tabular}{lll}%
+arguments & example & explication \\
\midrule
\TAline{(pt1,pt2)\{name of macro\}} {\tkzcname{tkzCalcLength}(A,B)\{dAB\}}{\tkzcname{dAB} donne $AB$ en pt}
\bottomrule
\end{tabular}
\medskip
-
Une seule option
-\begin{tabular}{lll}
-
-\toprule
- options & défaut & exemple \\
+\begin{tabular}{lll}%
+ options & default & example \\
\midrule
-\TOline{cm} {false}{\tkzcname{tkzCalcLength}[cm](A,B)\{dAB\} \tkzcname{dAB} donne AB en cm}
+\TOline{cm} {false}{\tkzcname{tkzCalcLength}[cm](A,B)\{dAB\} \tkzcname{dAB} gives AB en cm}
\end{tabular}
+
+The result is stored in a macro.
\end{NewMacroBox}
-\subsubsection{Construction d'un carré au compas}
+\subsubsection{Compass square construction}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=1]
@@ -278,60 +264,57 @@ Une seule option
\end{tikzpicture}
\end{tkzexample}
-\subsection{Transformation de pt en cm ou de cm en pt}
-Pas sûr que cela soit nécessaire et il ne s'agit que d'une division par 28,45274 et d'un multiplication par ce même nombre. Les macros sont :
+\subsection{Transformation from pt to cm or cm to pt}
+Not sure if this is necessary and it is only a division by 28.45274 and a multiplication by the same number. The macros are:
-\begin{NewMacroBox}{tkzpttocm}{\parg{nombre}\marg{name of macro}}
-Le résultat est stocké dans une macro.
+\begin{NewMacroBox}{tkzpttocm}{\parg{nombre}\marg{name of macro}}%
+The result is stored in a macro.
\medskip
-
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
-arguments & exemple & explication \\
+arguments & example & explication \\
\midrule
\TAline{(nombre){name of macro}} {\tkzcname{tkzpttocm}(120)\{len\}}{\tkzcname{len} donne un nombre de tkzname{cm}}
\bottomrule
\end{tabular}
\medskip
-Il faudra utiliser \tkzcname{len} accompagné de \tkzname{cm}
+You'll have to use \tkzcname{len} along with \tkzname{cm}.
\end{NewMacroBox}
-\subsection{changement d'unité}
-\begin{NewMacroBox}{tkzcmtopt}{\parg{nombre}\marg{name of macro}}
-Le résultat est stocké dans une macro.
+\subsection{Change of unit}
+\begin{NewMacroBox}{tkzcmtopt}{\parg{nombre}\marg{name of macro}}%
+The result is stored in a macro.
\medskip
-
\begin{tabular}{lll}
\toprule
-arguments & exemple & explication \\
+arguments & example & explication \\
\midrule
\TAline{(nombre)\{name of macro\}}{\tkzcname{tkzcmtopt}(5)\{len\}}{\tkzcname{len} longueur en \tkzname{pts}}
\bottomrule
\end{tabular}
\medskip
-\noindent{Le résultat s'utilise avec \tkzcname{len}\tkzname{pt}}
+\noindent{The result can be used with \tkzcname{len}\tkzname{pt}}
\end{NewMacroBox}
-\subsubsection{Exemple}
-La macro \tkzcname{tkzDefCircle[radius](A,B)} définit le rayon que l'on récupère avec \tkzcname{tkzGetLength}, mais ce résultat est en \tkzname{pt}.
+\subsubsection{Example}
+The macro \tkzcname{tkzDefCircle[radius](A,B)} defines the radius that we retrieve with \tkzcname{tkzGetLength}, but this result is in \tkzname{pt}.
\begin{tkzexample}[latex=6cm,small]
\begin{tikzpicture}[scale=.5]
- \tkzDefPoint(0,0){A}
- \tkzDefPoint(3,-4){B}
- \tkzDefCircle[through](A,B)
- \tkzGetLength{rABpt}
- \tkzpttocm(\rABpt){rABcm}
- \tkzDrawCircle(A,B)
- \tkzDrawPoints(A,B)
- \tkzLabelPoints(A,B)
- \tkzDrawSegment[dashed](A,B)
- \tkzLabelSegment(A,B){%
- $\pgfmathprintnumber{\rABcm}$}
+ \tkzDefPoint(0,0){A}
+ \tkzDefPoint(3,-4){B}
+ \tkzDefCircle[through](A,B)
+ \tkzGetLength{rABpt}
+ \tkzpttocm(\rABpt){rABcm}
+ \tkzDrawCircle(A,B)
+ \tkzDrawPoints(A,B)
+ \tkzLabelPoints(A,B)
+ \tkzDrawSegment[dashed](A,B)
+ \tkzLabelSegment(A,B){$\pgfmathprintnumber{\rABcm}$}
\end{tikzpicture}
\end{tkzexample}
@@ -342,24 +325,22 @@ La macro \tkzcname{tkzDefCircle[radius](A,B)} définit le rayon que l'on réc
% en cm
% tkzGetPointCoord avec [#1] cm ou bien pt ?? todo
%<--------------------------------------------------------------------------–>
-\begin{NewMacroBox}{tkzGetPointCoord}{\parg{$A$}\marg{name of macro}}
-Stocke dans deux macros les coordonnées d'un point
+\begin{NewMacroBox}{tkzGetPointCoord}{\parg{$A$}\marg{name of macro}}%
+Stores in two macros the coordinates of a point
\medskip
\begin{tabular}{lll}
\toprule
-arguments & exemple & explication \\
+arguments & example & explanation \\
\midrule
-\TAline{(point)\{name of macro\}} {\tkzcname{tkzGetPointCoord}(A)\{A\}}{\tkzcname{Ax} et \tkzcname{Ay} donnent les coordonnées de $A$}
-
+\TAline{(point)\{name of macro\}} {\tkzcname{tkzGetPointCoord}(A)\{A\}}{\tkzcname{Ax} and \tkzcname{Ay} give the coordinates of $A$}
\end{tabular}
\medskip
-Si le nom de la macro est \tkzname{p}, alors \tkzcname{px} et \tkzcname{py} donnent les coordonnées du point choisi avec le cm comme.
+If the name of the macro is \tkzname{p}, then \tkzcname{px} and \tkzcname{py} give the coordinates of the chosen point with the cm as.
\end{NewMacroBox}
-\subsubsection{Transfert de coordonnées avec \tkzcname{tkzGetPointCoord}}
-
+\subsubsection{Coordinate transfer with \tkzcname{tkzGetPointCoord}}
\begin{tkzexample}[width=8cm,small]
\begin{tikzpicture}
\tkzInit[xmax=5,ymax=3]
@@ -375,7 +356,7 @@ Si le nom de la macro est \tkzname{p}, alors \tkzcname{px} et \tkzcname{py} donn
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Somme de vecteurs avec \tkzcname{tkzGetPointCoord}}
+\subsubsection{Sum of vectors with \tkzcname{tkzGetPointCoord}}
\begin{tkzexample}[width=6cm,small]
\begin{tikzpicture}[>=latex]
\tkzDefPoint(1,4){a}
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/preamble-standalone.ltx b/macros/latex/contrib/tkz/tkz-base/examples/preamble-standalone.ltx
index 11b016acaa..fb3587d4f6 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/preamble-standalone.ltx
+++ b/macros/latex/contrib/tkz/tkz-base/examples/preamble-standalone.ltx
@@ -1,6 +1,2 @@
\documentclass{standalone}
\usepackage{tkz-euclide,tkz-fct}
-
-
-
-
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tiger.pdf b/macros/latex/contrib/tkz/tkz-base/examples/tiger.pdf
deleted file mode 100644
index d69cc73ffc..0000000000
--- a/macros/latex/contrib/tkz/tkz-base/examples/tiger.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-3.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-3.tex
deleted file mode 100644
index 36443b5bcc..0000000000
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-3.tex
+++ /dev/null
@@ -1,12 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 9 (Section 6.1.3 : Couleur du label et de l'axe)
-
-\begin{tikzpicture}
- \tkzInit[xmax=5]
- \tkzDrawX[text=blue,color=red,
- right=12pt]
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-4.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-4.tex
deleted file mode 100644
index 87db2e3eb0..0000000000
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-4.tex
+++ /dev/null
@@ -1,12 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 10 (Section 6.1.4 : Option \tkzname{right space})
-
-\begin{tikzpicture}
-\tkzInit[xmax=0.4,xstep=0.1]
-\tkzDrawX[text=blue,color=red,
- right=12pt,right space=1]
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-10-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-10-1.tex
deleted file mode 100644
index 28f9be281e..0000000000
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-10-1.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 36 (Section 6.10.1 : Modification des axes par défaut)
-
- \begin{tikzpicture}[scale=1]
- \tkzInit[ymax=2,xmax=4]
- \tkzSetUpAxis[line width=1pt,tickwd=1pt,
- ticka=3pt, tickb=0pt]
- \tkzAxeXY
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-10-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-10-1.tex
deleted file mode 100644
index 75ce5e5f9b..0000000000
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-10-1.tex
+++ /dev/null
@@ -1,16 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 67 (Section 8.10.1 : Exemple simple avec \tkzcname{tkzSetUpPoint})
-
- \begin{tikzpicture}
- \tkzSetUpPoint[shape = cross out,
- color=blue]
- \tkzInit[xmax=100,xstep=20,ymax=.5]
- \tkzDefPoint(20,1){A}
- \tkzDefPoint(80,0){B}
- \tkzDrawLine(A,B)
- \tkzDrawPoints(A,B)
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-2-0.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-2-0.tex
deleted file mode 100644
index e8054b2516..0000000000
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-2-0.tex
+++ /dev/null
@@ -1,16 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 53 (Section 8.2 : Définition de points en coordonnées cartésiennes : \tkzcname{tkzDefPoints}} \hypertarget{tdps}{)
-
-\begin{tikzpicture}[scale=1]
- \tkzDefPoints{% x y name
- 0 /0 /A,
- 2 /0 /B,
- 2 /2 /C,
- 0 /2 /D}
- \tkzDrawSegments(D,A A,B B,C C,D)
- \tkzDrawPoints(A,B,C,D)
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-9-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-9-2.tex
deleted file mode 100644
index 37b826266e..0000000000
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-9-2.tex
+++ /dev/null
@@ -1,20 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 66 (Section 8.9.2 : Exemple avec \tkzcname{tkzAutoLabelPoints})
-
-\begin{tikzpicture}[scale=1.25]
- \tkzDefPoint(2,1){O}
- \tkzDefRandPointOn[circle=center O radius 1.5cm]
- \tkzGetPoint{A}
- \tkzDrawCircle(O,A)
- \tkzDefPointBy[rotation=center O angle 100](A)
- \tkzGetPoint{C}
- \tkzDefPointBy[rotation=center O angle 78](A)
- \tkzGetPoint{B}
- \tkzDrawPoints(O,A,B,C)
- \tkzDrawSegments(C,B B,A A,O O,C)
- \tkzAutoLabelPoints[center=O,red](A,B,C)
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-09-2-0.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-09-2-0.tex
deleted file mode 100644
index 8c8c53c77b..0000000000
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-09-2-0.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 73 (Section 9.2 : Utilisation \tkzcname{tikzset})
-
-\tikzset{xaxe style/.style = {<->}}
-\tikzset{xlabel style/.style={below=6pt}}
-\begin{tikzpicture}
- \tkzInit[xmin=-0.5,xmax=5]
- \tkzDrawX
- \tkzLabelX
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-1-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.1.1.tex
index a1ca8c9cec..6023292527 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-1-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.1.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 74 (Section 10.1.1 : Exemple 2 avec \tkzcname{tkzShowBB})
+% Ex. No. 81 (Section 10.1.1 : Example with \tkzcname{tkzShowBB})
\begin{tikzpicture}[scale=.5]
\tkzInit[ymax=5,xmax=8]
@@ -11,8 +11,8 @@
\tkzClipBB
\tkzDrawCircle[R](A,5 cm)
\tkzShowBB
-\end{scope}
+ \end{scope}
\tkzDrawCircle[R,red](A,4 cm)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-2-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.2.1.tex
index 56aef71172..7096d7d49a 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-2-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.2.1.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 75 (Section 10.2.1 : Exemple avec \tkzcname{tkzClipBB} et les bissectrices)
+% Ex. No. 82 (Section 10.2.1 : Example with \tkzcname{tkzClipBB} and the bisectors)
- \begin{tikzpicture}
+\begin{tikzpicture}
\tkzInit[xmin=-3,xmax=6, ymin=-1,ymax=6]
\tkzDefPoint(0,0){O}\tkzDefPoint(3,1){I}
\tkzDefPoint(1,4){J}
@@ -16,4 +16,4 @@
\tkzShowBB
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-3-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.3.1.tex
index 93e52676c4..3e17f8f988 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-3-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.3.1.tex
@@ -1,10 +1,8 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 76 (Section 10.3.1 : Exemple avec \tkzcname{tkzShowBB})
+% Ex. No. 83 (Section 10.3.1 : Example with \tkzcname{tkzShowBB})
-above\\
-left
\begin{tikzpicture}
\tkzDefPoint(0,0){A}
\tkzDefPoint(3,3){B}
@@ -15,4 +13,4 @@ left
\tkzShowBB
\end{tikzpicture}right
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-4-0.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.4.0.tex
index 41b4729807..8bcbcd13c1 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-4-0.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.4.0.tex
@@ -1,17 +1,16 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 77 (Section 10.4 : tkzSaveBB}{)
+% Ex. No. 84 (Section 10.4 : tkzSaveBB}{)
-Une figure au-dessus du texte\\
\begin{tikzpicture}
\begin{scope}
\tkzSetBB(0,0)(6,2) \tkzShowBB[fill=blue!20]
\tkzSaveBB
-\end{scope}
+ \end{scope}
\tkzDefPoint(3,3){A}\tkzShowBB
\tkzDrawCircle[R,fill=yellow,opacity=.2](A,2cm)
\tkzRestoreBB
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-5-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.5.1.tex
index 6e5090700a..0c0288fae8 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-5-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.5.1.tex
@@ -1,10 +1,8 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 78 (Section 10.5.1 : Exemple d'utilisation de \tkzcname{tkzRestoreBB})
+% Ex. No. 85 (Section 10.5.1 : Example of the use of \tkzcname{tkzRestoreBB})
- \vspace{ 2cm}
-Start\\
\begin{tikzpicture}
\tkzDefPoint(-2,-2){A}
\tkzDefPoint(2,1){B}
@@ -16,6 +14,5 @@ Start\\
\tkzClipBB
\tkzFillCircle[gray!20](O,B)
\end{tikzpicture}
-End
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.6.1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.6.1.tex
new file mode 100644
index 0000000000..8338c2b00f
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.6.1.tex
@@ -0,0 +1,13 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 86 (Section 10.6.1 : First example with \tkzcname{tkzClip}} \hypertarget{clip}{)
+
+\begin{tikzpicture}
+ \tkzInit[xmax=3, ymax=3]
+ \tkzGrid
+ \tkzAxeXY
+ \draw[red] (-1,-1)--(5,5);
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-6-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.6.2.tex
index 983695583a..911dfcc2c5 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-6-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.6.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 80 (Section 10.6.1 : Premier exemple avec \tkzcname{tkzClip}} \hypertarget{clip}{)
+% Ex. No. 87 (Section 10.6.2 : Second example with \tkzcname{tkzClip})
\begin{tikzpicture}
\tkzInit[xmax=3, ymax=3]
@@ -11,4 +11,4 @@
\draw[red] (-1,-1)--(5,5);
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-6-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.6.3.tex
index a195d2bace..e9f80c2e2b 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-6-2.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.6.3.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 82 (Section 10.6.2 : \tkzcname{tkzClip} et l'option \tkzname{space})
+% Ex. No. 88 (Section 10.6.3 : \tkzcname{tkzClip} et l'option \tkzname{space})
\begin{tikzpicture}
\tkzInit[xmax=3, ymax=3]
@@ -10,4 +10,4 @@
\draw[red] (-0.5,-0.5)--(3.5,3.5);
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-7-0.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.7.1.tex
index 0105da1029..1c7e430f79 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-7-0.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.7.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 83 (Section 10.7 : style tkzreverseclip)
+% Ex. No. 89 (Section 10.7.1 : Example with \tkzcname{tkzClipOutPolygon})
\begin{tikzpicture}[scale=.5]
\tkzInit[xmin=-5,xmax=5,ymin=-5,ymax=5]
@@ -19,7 +19,7 @@
\tkzFillCircle[R,color=blue!%
\pgfmathresult](P\i,\r)
}
-\end{scope}
+ \end{scope}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-9-0.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.9.0.tex
index 92ecb76b09..95333829b4 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-9-0.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.9.0.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 84 (Section 10.9 : Commandes de TikZ \tkzcname{pgfinterruptboundingbox} et \tkzcname{endpgfinterruptboundingbox})
+% Ex. No. 90 (Section 10.9 : TikZ Controls \tkzcname{pgfinterruptboundingbox} and \tkzcname{endpgfinterruptboundingbox})
\begin{tikzpicture}
\tkzDefPoint(0,5){A}\tkzDefPoint(5,4){B}
@@ -14,4 +14,4 @@
\tkzDrawSegments(A,B C,D A,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-10-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-10-1.tex
deleted file mode 100644
index 0033453009..0000000000
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-10-1.tex
+++ /dev/null
@@ -1,20 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 92 (Section 11.10.1 : Exemple)
-
-\begin{tikzpicture}[scale=.5]
- \tkzDefPoint(0,0){A}
- \tkzDefPoint(3,-4){B}
- \tkzDefCircle[through](A,B)
- \tkzGetLength{rABpt}
- \tkzpttocm(\rABpt){rABcm}
- \tkzDrawCircle(A,B)
- \tkzDrawPoints(A,B)
- \tkzLabelPoints(A,B)
- \tkzDrawSegment[dashed](A,B)
- \tkzLabelSegment(A,B){%
- $\pgfmathprintnumber{\rABcm}$}
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-10-3.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-10-3.tex
deleted file mode 100644
index 6e082f1e94..0000000000
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-10-3.tex
+++ /dev/null
@@ -1,18 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 94 (Section 11.10.3 : Somme de vecteurs avec \tkzcname{tkzGetPointCoord})
-
-\begin{tikzpicture}[>=latex]
- \tkzDefPoint(1,4){a}
- \tkzDefPoint(3,2){b}
- \tkzDefPoint(1,1){c}
- \tkzDrawSegment[->,red](a,b)
- \tkzGetPointCoord(c){c}
- \draw[color=blue,->](a) -- ([shift=(b)]\cx,\cy) ;
- \draw[color=purple,->](b) -- ([shift=(b)]\cx,\cy) ;
- \tkzDrawSegment[->,blue](a,c)
- \tkzDrawSegment[->,purple](b,c)
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-3-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-3-1.tex
deleted file mode 100644
index a6ea1b43c4..0000000000
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-3-1.tex
+++ /dev/null
@@ -1,22 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 88 (Section 11.3.1 : Exemple d'utilisation de \tkzcname{tkzFindSlopeAngle})
-
-\begin{tikzpicture}
- \tkzInit
- \tkzDefPoint(0,0){A} \tkzDefPoint(3,2){B}
- \tkzDefLine[mediator](A,B) \tkzGetPoints{I}{J}
- \tkzCalcLength[cm](A,B) \tkzGetLength{dAB}
- \tkzFindSlopeAngle(A,B) \tkzGetAngle{tkzangle}
- \begin{scope}[rotate=\tkzangle]
- \tikzset{arc/.style={color=gray,delta=10}}
- \tkzDrawArc[R,arc](B,3/4*\dAB)(120,240)
- \tkzDrawArc[R,arc](A,3/4*\dAB)(-45,60)
- \tkzDrawLine(I,J) \tkzDrawSegment(A,B)
-\end{scope}
- \tkzDrawPoints(A,B,I,J) \tkzLabelPoints(A,B)
- \tkzLabelPoints[right](I,J)
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-12-2-0.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-12-2-0.tex
deleted file mode 100644
index 023650f51c..0000000000
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-12-2-0.tex
+++ /dev/null
@@ -1,18 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 95 (Section 12.2 : \tkzcname{usetkzobj\{defcircles\}})
-
-\begin{tikzpicture}[scale=0.75]
- \tkzDefPoint(0,0){A}
- \tkzDefPoint(4,0){B}
- \tkzDefPoint(3,3){C}
- \tkzDefCircle[in](A,B,C)
- \tkzGetPoint{I}\tkzGetLength{rI}
- \tkzDrawCircle[R](I,\rI)
- \tkzDrawPolygon(A,B,C)
- \tkzDrawPoints(A,B,C,I)
- \tkzLabelPoints(A,B,C,I)
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-13-1-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-12.1.2.tex
index c66dfa6197..f2a50ea34e 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-13-1-2.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-12.1.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 96 (Section 13.1.2 : Exemple d'utilisation )
+% Ex. No. 91 (Section 12.1.2 : Example of use )
\begin{tikzpicture}
\tikzset{xaxe style/.style={-}}
@@ -13,4 +13,4 @@
\tkzRep[color=red,ynorm=2]
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-1-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-13.1.1.tex
index 49a248f1e9..45ca2bdda2 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-1-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-13.1.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 97 (Section 14.1.1 : Ligne horizontale )
+% Ex. No. 92 (Section 13.1.1 : Horizontal line )
\begin{tikzpicture}[scale=2]
\tkzInit[xmax=3,ymax=1.5]
@@ -11,4 +11,4 @@
line width = 2pt]{1}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-1-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-13.1.2.tex
index c84051b4d3..94ccca28ce 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-1-2.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-13.1.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 98 (Section 14.1.2 : Ligne horizontale et valeur calculée par \tkzname{xfp} )
+% Ex. No. 93 (Section 13.1.2 : Horizontal line and value calculated by \tkzname{xfp} )
\begin{tikzpicture}
\tkzInit[xmin=-3,xmax=3,ymin=-2,ymax=1.5]
@@ -12,4 +12,4 @@
\tkzLabelY
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-2-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-13.2.1.tex
index 4c4655c5b0..be3fa56c3c 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-2-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-13.2.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 99 (Section 14.2.1 : Lignes horizontales)
+% Ex. No. 94 (Section 13.2.1 : Horizontal lines)
\begin{tikzpicture}
\tkzInit[xmax=5,ymax=4]
@@ -9,4 +9,4 @@
\tkzHLines[color = magenta]{1,...,3}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-3-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-13.3.1.tex
index a7df1b4e1a..df20f63775 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-3-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-13.3.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 100 (Section 14.3.1 : Ligne verticale )
+% Ex. No. 95 (Section 13.3.1 : Vertical line )
\begin{tikzpicture}[scale=2]
\tkzInit[xmax=3,ymax=1]
@@ -11,4 +11,4 @@
line width = 2pt]{1/3}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-3-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-13.3.2.tex
index daef50e813..86aae74f57 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-3-2.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-13.3.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 101 (Section 14.3.2 : Ligne verticale et valeur calculée par \tkzname{xfp} )
+% Ex. No. 96 (Section 13.3.2 : Vertical line and value calculated by \tkzname{xfp} )
\begin{tikzpicture}
\tkzInit[xmax=7,ymin=-1,ymax=1]
@@ -12,4 +12,4 @@
\tkzLabelY
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-4-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-13.4.1.tex
index a99c3ef605..5e1044b353 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-4-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-13.4.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 102 (Section 14.4.1 : Lignes verticales)
+% Ex. No. 97 (Section 13.4.1 : Vertical lines)
\begin{tikzpicture}
\tkzInit[xmax=5,ymax=2]
@@ -9,4 +9,4 @@
\tkzVLines[color = green]{1,2,...,4}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-15-1-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14.1.1.tex
index ef2396cd2f..f007a0f054 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-15-1-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14.1.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 103 (Section 15.1.1 : exemple)
+% Ex. No. 98 (Section 14.1.1 : Example)
\begin{tikzpicture}
\tkzInit[xmax=6]
@@ -11,4 +11,4 @@
mark options={color=purple}]{2*exp(1)}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-1-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-15.1.1.tex
index 7ab9ca2616..fcb697749c 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-1-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-15.1.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 104 (Section 16.1.1 : Tracé d'un nuage avec \tkzcname{tkzDrawSetOfPoints})
+% Ex. No. 99 (Section 15.1.1 : Drawing of a scatter plot with \tkzcname{tkzDrawSetOfPoints})
\begin{tikzpicture}[scale=0.75]
\tkzInit[xmax=6,ymin=1000,ymax=5000,ystep=1000]
@@ -13,4 +13,4 @@
\tkzDrawSetOfPoints[mark=ball,mark size=3pt]
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-2-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-15.2.1.tex
index 6bf283b235..ee7889246b 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-2-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-15.2.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 105 (Section 16.2.1 : Lier les points d'un nuage avec \tkzcname{tkzJoinSetOfPoints})
+% Ex. No. 100 (Section 15.2.1 : Link the points of a scatter plot with \tkzcname{tkzJoinSetOfPoints})
\begin{tikzpicture}[scale=1]
\tkzInit[xmax=5,
@@ -20,4 +20,4 @@
,mark size=3pt]
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-2-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-15.2.2.tex
index c85bc8df02..cd6f35cdb5 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-2-2.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-15.2.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 106 (Section 16.2.2 : Utilisation des points d'un nuage)
+% Ex. No. 101 (Section 15.2.2 : Using the points of a scatter plot)
\begin{tikzpicture}[scale=.5]
\tkzInit[xmax=5,ymin=1000,
@@ -18,4 +18,4 @@
line width=2pt](P1,P2,P3,P4,P5)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-3-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-15.3.1.tex
index e1cb88d884..ef5a5afd8f 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-3-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-15.3.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 107 (Section 16.3.1 : Deux nuages)
+% Ex. No. 102 (Section 15.3.1 : Two scatter plots)
\begin{tikzpicture}
\tkzInit[xmax=5.5,ymin=1000,%
@@ -28,4 +28,4 @@
{Recette en fonction du mois}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-4-0.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-15.4.1.tex
index 17a612f8a3..9b7b417d45 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-4-0.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-15.4.1.tex
@@ -1,12 +1,12 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 108 (Section 16.4 : \tkzcname{tkzDrawMark})
+% Ex. No. 103 (Section 15.4.1 : Ball; use of \tkzcname{tkzDrawMarks})
- \begin{tikzpicture}
+\begin{tikzpicture}
\tkzInit[xmax=3,ymax=1]
\tkzAxeXY
\tkzDrawMark[mark=ball](1,.5)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-5-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-15.5.1.tex
index 3e402c9286..6b385195a3 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-5-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-15.5.1.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 109 (Section 16.5.1 : Mark et nuage; utilisation de \tkzcname{tkzDrawMarks})
+% Ex. No. 104 (Section 15.5.1 : Mark and plot; use of \tkzcname{tkzDrawMarks})
- \begin{tikzpicture}
+\begin{tikzpicture}
\tkzInit[xmax=6,ymin=1000,
ymax=5000,ystep=1000]
\tkzAxeXY
@@ -17,4 +17,4 @@
\tkzDrawMarks[mark=ball](P1,P2,P3,P4)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-1-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16.1.1.tex
index ef3219c2df..0e9800230a 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-1-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16.1.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 110 (Section 17.1.1 : Un titre)
+% Ex. No. 105 (Section 16.1.1 : A title)
\begin{tikzpicture}
\tkzInit[xmax = 6, ymin = 1000,%
@@ -14,4 +14,4 @@
{Recette en fonction du mois}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-1-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16.1.2.tex
index b30125a31b..af01603728 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-1-2.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16.1.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 111 (Section 17.1.2 : Draft)
+% Ex. No. 106 (Section 16.1.2 : Draft)
\begin{tikzpicture}
\tkzInit[xmax = 6, ymin = 1000,%
@@ -15,4 +15,4 @@
{\Huge DRAFT}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-1-3.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16.1.3.tex
index 284cf4a651..218edf8c6c 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-1-3.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16.1.3.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 112 (Section 17.1.3 : Texte avec un point)
+% Ex. No. 107 (Section 16.1.3 : Text with a period)
\begin{tikzpicture}
\tkzInit[ymax=5,xmax=6]
@@ -12,7 +12,7 @@
line width = 1pt,
color = black,
fill = purple!20](A)
- {Mon texte}
+ {My text}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16.1.4.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16.1.4.tex
new file mode 100644
index 0000000000..3dd1a8b774
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16.1.4.tex
@@ -0,0 +1,18 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 108 (Section 16.1.4 : Text format)
+
+\begin{tikzpicture}
+ \tkzInit[ymax=5,xmax=6]
+ \tkzAxeXY
+ \tkzText[draw,opacity=.6,
+ inner sep=.6 cm,
+ line width = 1pt,
+ color = black,
+ fill = purple!20,
+ text width=3cm](3,3)
+ {My text\\\ Reference}
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-2-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16.2.1.tex
index b44df9de0f..ebb9c33b21 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-2-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16.2.1.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 114 (Section 17.2.1 : Légendes avec des symboles)
+% Ex. No. 109 (Section 16.2.1 : Legends with symbols)
- \begin{tikzpicture}
+\begin{tikzpicture}
\tkzInit[xmax=12,ymin=1000,ymax=11000,ystep=2000]
\tkzGrid[color=orange!30]
\tkzDrawX[below right,label=Mois]
@@ -21,8 +21,8 @@
\tkzDrawSetOfPoints[prefix=P,mark=square*,mark size=4pt,
mark options={color=blue,fill=blue!40}]
\tkzLegend[draw,rounded corners,fill=orange!20,text=brown,
- line width=2pt](5,10000){heart/1ex/red!30/Recette produit A,%
- square*/0.75ex/blue!40/Recette produit B}
+ line width=2pt](5,10000){heart/1ex/red!30/Product Recipe A,%
+ square*/0.75ex/blue!40/Product Recipe B}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-1-4.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-1-4.tex
deleted file mode 100644
index ed7485f538..0000000000
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-1-4.tex
+++ /dev/null
@@ -1,18 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 113 (Section 17.1.4 : Format du texte)
-
-\begin{tikzpicture}
- \tkzInit[ymax=5,xmax=6]
- \tkzAxeXY
- \tkzText[draw,opacity=.6,
- inner sep=.6 cm,
- line width = 1pt,
- color = black,
- fill = purple!20,
- text width=3cm](3,3)
- {Mon texte\\ Référence}
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-3.1.0.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-3.1.0.tex
new file mode 100644
index 0000000000..970ba14baa
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-3.1.0.tex
@@ -0,0 +1,12 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 2 (Section 3.1 : Installation test)
+
+\begin{tikzpicture}
+ \tkzInit[xmax=4,ymax=4]
+ \tkzGrid
+ \tkzAxeXY
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-4.1.0.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-4.1.0.tex
new file mode 100644
index 0000000000..8bc4bea581
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-4.1.0.tex
@@ -0,0 +1,10 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 5 (Section 4.1 : Example that poses a problem )
+
+\begin{tikzpicture}[x=0.01 cm]
+ \draw (0,0)--(600,0);
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-4.2.0.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-4.2.0.tex
new file mode 100644
index 0000000000..f3e6d2b710
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-4.2.0.tex
@@ -0,0 +1,11 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 6 (Section 4.2 : The role of \tkzname{\tkznameofpack})
+
+\begin{tikzpicture}[x=0.000001 cm]
+ \coordinate (x) at (6000000,0);
+ \draw (0,0)--(x);
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-1-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-5.1.1.tex
index 8c7886f4bd..d081a3f16b 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-1-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-5.1.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 1 (Section 5.1.1 : Modification de la taille du dessin avec \tkzcname{tkzInit})
+% Ex. No. 7 (Section 5.1.1 : Changing the drawing size with \tkzcname{tkzInit})
\begin{tikzpicture}
\tkzInit[xmax=8,ymax=6]
@@ -10,4 +10,4 @@
\draw[blue](-1,0)--(6,7);
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-1-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-5.1.2.tex
index 954aa48816..7cff1c3528 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-1-2.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-5.1.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 2 (Section 5.1.2 : Rôle de \tkzname{xstep} , \tkzname{ystep})
+% Ex. No. 8 (Section 5.1.2 : Role of \tkzname{xstep} , \tkzname{ystep})
\begin{tikzpicture}
\tkzInit[xmax=10,xstep=2,ymax=800,ystep=400]
@@ -10,4 +10,4 @@
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-2-0.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-5.2.0.tex
index 212196601f..6f295c7387 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-2-0.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-5.2.0.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 3 (Section 5.2 : Autre exemple avec \tkzname{xstep} et \tkzname{ystep})
+% Ex. No. 9 (Section 5.2 : Another example with \tkzname{xstep} and \tkzname{ystep})
\begin{tikzpicture}
\tkzInit[xmax=5,xstep=1,ymax=2,ystep=.5]
@@ -9,4 +9,4 @@
\tkzAxeXY
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-2-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-5.2.1.tex
index 867807404a..31f8f77fc3 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-2-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-5.2.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 4 (Section 5.2.1 : Origine personnalisée.)
+% Ex. No. 10 (Section 5.2.1 : Customized origin.)
\begin{tikzpicture}
\tkzInit[xmin=20,
@@ -15,4 +15,4 @@
\tkzDrawPoint(A)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-2-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-5.2.2.tex
index 1d288602f4..e28f644331 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-2-2.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-5.2.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 5 (Section 5.2.2 : Utilisation des décimaux )
+% Ex. No. 11 (Section 5.2.2 : Use of decimals )
\begin{tikzpicture}
\tkzInit[xmin=0.00, xmax=0.05,
@@ -12,4 +12,4 @@
\tkzDrawPoint(I)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-2-3.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-5.2.3.tex
index 29d77080c2..3aaba65fba 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-2-3.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-5.2.3.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 6 (Section 5.2.3 : Valeurs négatives)
+% Ex. No. 12 (Section 5.2.3 : Negative values)
\begin{tikzpicture}
\tkzInit[xmin = -40,
@@ -13,4 +13,4 @@
\tkzAxeXY
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.1.0.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.1.0.tex
new file mode 100644
index 0000000000..063873cdbe
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.1.0.tex
@@ -0,0 +1,17 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 13 (Section 6.1 : \tkzcname{tkzDrawX}} \hypertarget{dx}{)
+
+\begin{tikzpicture}[>=latex,scale=2]
+ \draw[line width=2 pt](0,0)--(4,0);
+ \draw[fill] (2cm-6pt,-14pt) rectangle (2cm+6pt,+14pt);
+ \draw[<->](2cm-6.5pt,18pt) -- (2cm+6.5pt,+18pt);
+ \node[above] at (2cm,20pt) {tickwd};
+ \draw[<->](2cm+10pt,1pt) -- (2cm+10pt,+14pt);
+ \node[right] at (2cm+10pt,8pt) {tickup};
+ \draw[<->](2cm+10pt,-1pt) -- (2cm+10pt,-14pt);
+ \node[right] at (2cm+10pt,-8pt) {tickdn};
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.1.1.tex
index 8077c1b259..1c08d022ed 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.1.1.tex
@@ -1,11 +1,11 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 7 (Section 6.1.1 : Sans tick,ni label)
+% Ex. No. 14 (Section 6.1.1 : No tick, no label)
\begin{tikzpicture}
\tkzInit[xmax=5]
\tkzDrawX[label={},noticks]
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.1.2.tex
index 1b0d99beed..caaa0740d7 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-2.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.1.2.tex
@@ -1,12 +1,12 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 8 (Section 6.1.2 : Placement du label)
+% Ex. No. 15 (Section 6.1.2 : Label placement)
\begin{tikzpicture}
\tkzInit[xmax=5]
- \tkzDrawX[label = quantité,
+ \tkzDrawX[label = quantity,
above left = 8pt]
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.1.3.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.1.3.tex
new file mode 100644
index 0000000000..73e081bc16
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.1.3.tex
@@ -0,0 +1,11 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 16 (Section 6.1.3 : Label and Axis Colour)
+
+\begin{tikzpicture}
+ \tkzInit[xmax=5]
+ \tkzDrawX[text=blue,color=red,right=12pt]
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.1.4.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.1.4.tex
new file mode 100644
index 0000000000..9e5d06a4d6
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.1.4.tex
@@ -0,0 +1,11 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 17 (Section 6.1.4 : Option \tkzname{right space})
+
+\begin{tikzpicture}
+\tkzInit[xmax=0.4,xstep=0.1]
+\tkzDrawX[text=blue,color=red,right=12pt,right space=1]
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-5.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.1.5.tex
index 8d7a45cf48..da59559630 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-5.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.1.5.tex
@@ -1,11 +1,11 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 11 (Section 6.1.5 : Axe trigonométrique avec l'option \tkzname{trig=1}}\hypertarget{newm}{)
+% Ex. No. 18 (Section 6.1.5 : Trigonometric axis with the option \tkzname{trig=1}}\hypertarget{newm}{)
\begin{tikzpicture}
\tkzInit[xmin=0,xmax=4,ymin=-1,ymax=1]
\tkzDrawX[trig=1]
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-6.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.1.6.tex
index f9db52caa3..eb3e5e4702 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-6.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.1.6.tex
@@ -1,11 +1,11 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 12 (Section 6.1.6 : Axe trigonométrique avec l'option \tkzname{trig=2} )
+% Ex. No. 19 (Section 6.1.6 : Trigonometric axis with the option \tkzname{trig=2} )
\begin{tikzpicture}
\tkzInit[xmin=0,xmax=4,ymin=-1,ymax=1]
\tkzDrawX[trig=2]
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.10.1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.10.1.tex
new file mode 100644
index 0000000000..7e58a72042
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.10.1.tex
@@ -0,0 +1,12 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 43 (Section 6.10.1 : Changing the default axes)
+
+\begin{tikzpicture}[scale=1]
+ \tkzInit[ymax=2,xmax=4]
+ \tkzSetUpAxis[line width=1pt,tickwd=1pt,ticka=3pt, tickb=0pt]
+ \tkzAxeXY
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.1.tex
index 36af00a240..1058d470a7 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 13 (Section 6.2.1 : Position des graduations)
+% Ex. No. 20 (Section 6.2.1 : Position of the graduations)
\begin{tikzpicture}
\tkzInit[xmax=.5,xstep=0.1]
@@ -9,4 +9,4 @@
\tkzLabelX[text=blue,below = 3pt]
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-10.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.10.tex
index 50db8e8130..827c87c4f8 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-10.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.10.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 25 (Section 6.2.10 : Graduations uniquement positives avant les tracés )
+% Ex. No. 32 (Section 6.2.10 : Only positive graduations before drawings )
\begin{tikzpicture}
\tkzInit[xmin=2,ymin=2,xmax=4,ymax=4]
@@ -9,4 +9,4 @@
\tkzDrawXY
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-11.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.11.tex
index 76ae96380e..b24ace923e 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-11.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.11.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 26 (Section 6.2.11 : Pas de graduations à l'origine )
+% Ex. No. 33 (Section 6.2.11 : No graduations at the origin )
\begin{tikzpicture}
\tkzInit[xmin=2,ymin=2,xmax=4,ymax=4]
@@ -9,4 +9,4 @@
\tkzDrawXY
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.2.tex
index 4e5617cd4d..62044924c0 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-2.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 14 (Section 6.2.2 : Position des graduations avec \tkzname{xlabel style})
+% Ex. No. 21 (Section 6.2.2 : Position of the graduations with \tkzname{xlabel style})
\begin{tikzpicture}
\tkzInit[xmin=1000,xmax=4000,xstep=1000]
@@ -10,4 +10,4 @@
\tkzLabelX[below right=3 pt,inner sep = 1pt]
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-3.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.3.tex
index a6539ed2be..18c8ee2031 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-3.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.3.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 15 (Section 6.2.3 : Dates avec \tkzname{np off})
+% Ex. No. 22 (Section 6.2.3 : Dates with \tkzname{np off})
\begin{tikzpicture}
\tkzInit[xmin=2000,xmax=2004]
@@ -10,4 +10,4 @@
\tkzLabelX[np off,below right=3 pt,inner sep =1pt]
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-4.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.4.tex
index 348c6035d9..ed1e4ce69a 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-4.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.4.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 16 (Section 6.2.4 : \tkzname{frac})
+% Ex. No. 23 (Section 6.2.4 : \tkzname{frac})
\begin{tikzpicture}
\tkzInit[xmax=1.75,xstep=0.33333]
@@ -9,4 +9,4 @@
\tkzLabelX[frac=3,text=blue,below = 6pt]
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-5.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.5.tex
index 928aa50064..f566cb7158 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-5.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.5.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 17 (Section 6.2.5 : \tkzname{trig})
+% Ex. No. 24 (Section 6.2.5 : \tkzname{trig})
\begin{tikzpicture}
\tkzInit[xmin=0,xmax=5,ymin=-1,ymax=1]
@@ -9,4 +9,4 @@
\tkzLabelX[trig=2,text=blue,below = 8pt]
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-6.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.6.tex
index fd03f94ea8..ea7b67133b 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-6.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.6.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 21 (Section 6.2.6 : Taille des graduations)
+% Ex. No. 28 (Section 6.2.6 : Graduations size)
\begin{tikzpicture}
\tkzInit[xmin=0,xmax=5,ymin=-1,ymax=1]
@@ -10,4 +10,4 @@
below = 8pt,node font=\scriptsize]
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-7.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.7.tex
index 5f5ceaf5e7..9abf0c8edb 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-7.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.7.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 22 (Section 6.2.7 : Couleur des graduations)
+% Ex. No. 29 (Section 6.2.7 : Colour of the graduations)
\begin{tikzpicture}
\tkzInit[xmin = -2,xmax = 3,
@@ -12,4 +12,4 @@
\tkzLabelX[text=blue]
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-8.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.8.tex
index 6f570d9ebb..dad9b9dede 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-8.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.8.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 23 (Section 6.2.8 : Tracés des axes avant la graduation)
+% Ex. No. 30 (Section 6.2.8 : Axis drawings before the graduation)
\begin{tikzpicture}
\tkzInit[xmin = -1,xmax = 4,
@@ -9,4 +9,4 @@
\tkzDrawXY \tkzLabelX \tkzLabelY
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-9.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.9.tex
index 75a1504371..330556ce29 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-9.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.9.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 24 (Section 6.2.9 : Graduations (exceptées à l'origine) avant les tracés )
+% Ex. No. 31 (Section 6.2.9 : Graduations (except originally) prior to tracings )
\begin{tikzpicture}
\tkzInit[xmin = -1,xmax = 4,
@@ -11,4 +11,4 @@
\tkzDrawXY
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-3-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.3.1.tex
index a1bd770560..141057b12c 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-3-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.3.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 27 (Section 6.3.1 : exemple avec \tkzcname{tkzAxeX})
+% Ex. No. 34 (Section 6.3.1 : Example with \tkzcname{tkzAxeX})
\begin{tikzpicture}
\tkzInit[xmax=0.5,xstep=0.1,ymax=1]
@@ -9,4 +9,4 @@
\tkzAxeX[text=blue]
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-3-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.3.2.tex
index c55a9404e0..d12382c3f0 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-3-2.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.3.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 28 (Section 6.3.2 : Usage de \tkzname{pi} et \tkzcname{tkzAxeX})
+% Ex. No. 35 (Section 6.3.2 : Use of \tkzname{pi} and \tkzcname{tkzAxeX})
\begin{tikzpicture}
\tkzInit[xmax=4,ymax=3.5]
@@ -11,4 +11,4 @@
\tkzAxeY[trig=2]
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-3-3.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.3.3.tex
index 4fe8998bd2..1e8788f169 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-3-3.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.3.3.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 29 (Section 6.3.3 : Option \tkzname{frac} et \tkzname{trig})
+% Ex. No. 36 (Section 6.3.3 : Option \tkzname{frac} and \tkzname{trig})
\begin{tikzpicture}
\tkzInit[xmax=9,xstep=3,ymax=3.5]
@@ -10,4 +10,4 @@
\tkzAxeY[trig=2]
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-7-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.7.1.tex
index 5c095c9410..8a36f37ea2 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-7-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.7.1.tex
@@ -1,11 +1,11 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 30 (Section 6.7.1 : Couleur des axes, des graduations)
+% Ex. No. 37 (Section 6.7.1 : Colour of axes, graduations)
\begin{tikzpicture}
\tkzInit[xmin=-1,xmax=4,ymin=-1,ymax=3]
\tkzAxeXY[label={},text=blue]
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-7-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.7.2.tex
index 694bca684b..540bb7a361 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-7-2.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.7.2.tex
@@ -1,11 +1,11 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 31 (Section 6.7.2 : Option \tkzname{\{label=\{\}\}})
+% Ex. No. 38 (Section 6.7.2 : Option \tkzname{label=\{\}})
\begin{tikzpicture}
\tkzInit[xmin=-1,xmax=4,ymin=-1,ymax=2]
\tkzAxeXY[label={},text=blue,trig=2]
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-7-3.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.7.3.tex
index 6e42c271f2..d3206c7098 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-7-3.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.7.3.tex
@@ -1,11 +1,11 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 32 (Section 6.7.3 : Option \tkzname{swap})
+% Ex. No. 39 (Section 6.7.3 : Option \tkzname{swap})
\begin{tikzpicture}
\tkzInit[xmin=-2,xmax=2,ymin=-2,ymax=2]
\tkzAxeXY[label={},swap]
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-8-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.8.1.tex
index f4ac76b2a1..817fe2f73d 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-8-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.8.1.tex
@@ -1,11 +1,11 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 33 (Section 6.8.1 : Couleur commune et labels vides)
+% Ex. No. 40 (Section 6.8.1 : Common colour and empty labels)
\begin{tikzpicture}
\tkzInit[xmin=-1,xmax=4,ymin=-1,ymax=1]
\tkzDrawXY[label={},color=red]
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-8-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.8.2.tex
index 2b073b0a11..a400f26e56 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-8-2.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.8.2.tex
@@ -1,11 +1,11 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 34 (Section 6.8.2 : Deux axes trigonométriques)
+% Ex. No. 41 (Section 6.8.2 : Two trigonometric axes)
\begin{tikzpicture}
- \tkzInit[xmin=-1,xmax=4,ymin=-1,ymax=2]
+ \tkzInit[xmin=-1,xmax=4,ymin=-1,ymax=1]
\tkzDrawXY[label={},color=red,trig=4]
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-9-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.9.1.tex
index ccf072a536..fbe1715ac3 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-9-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.9.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 35 (Section 6.9.1 : )
+% Ex. No. 42 (Section 6.9.1 : )
\begin{tikzpicture}
\tkzInit[xmin=-1,xmax=4,ymin=-1,ymax=1]
@@ -9,4 +9,4 @@
\tkzLabelXY[text=blue]
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.1.tex
index 5841706ebd..48d6af4edb 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 37 (Section 7.0.1 : \tkzcname{tkzGrid} et l'option \tkzname{sub})
+% Ex. No. 44 (Section 7.0.1 : \tkzcname{tkzGrid} and the option \tkzname{sub})
\begin{tikzpicture}
\tkzInit[xmax=4, ymax=2]
@@ -9,4 +9,4 @@
\tkzAxeXY
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-10.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.10.tex
index 78a09aedc5..71c48e503d 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-10.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.10.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 46 (Section 7.0.10 : Options \tkzname{frac} et \tkzname{trig} avec \tkzcname{tkzGrid})
+% Ex. No. 53 (Section 7.0.10 : Options \tkzname{frac} and \tkzname{trig} with \tkzcname{tkzGrid})
\begin{tikzpicture}
\tkzInit[xmax=9,xstep=3,ymax=4]
@@ -12,4 +12,4 @@
\tkzLabelY[trig=2,font=\scriptsize]
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-11.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.11.tex
index af0c00b4c6..2c4a516f23 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-11.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.11.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 47 (Section 7.0.11 : Utilisation d'une grille de répérage)
+% Ex. No. 54 (Section 7.0.11 : Use of a repetition grid)
\begin{tikzpicture}[scale=.5]
\tikzset{xaxe style/.style ={-}}
@@ -14,4 +14,4 @@
\includegraphics[scale=.5]{tiger}};
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.2.tex
index ef654d6576..a8799fd7b9 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-2.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.2.tex
@@ -1,10 +1,8 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 38 (Section 7.0.2 : Option \tkzname{sub})
+% Ex. No. 45 (Section 7.0.2 : Option \tkzname{sub})
-\def\tkzCoeffSubColor{20}
-\def\tkzCoeffSubLw{0.2}
\begin{tikzpicture}
\tkzInit[xmax=4, ymax=2]
\tkzGrid[sub,color=orange,
@@ -12,4 +10,4 @@
\tkzAxeXY
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-3.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.3.tex
index 55a1ac33f7..94bbba05f8 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-3.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.3.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 39 (Section 7.0.3 : Presque par défaut)
+% Ex. No. 46 (Section 7.0.3 : Almost Default)
\begin{tikzpicture}
\tkzInit[xmax=5,ymax=2]
@@ -9,4 +9,4 @@
\tkzAxeXY
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-4.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.4.tex
index b21740a6ec..b881b4336b 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-4.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.4.tex
@@ -1,13 +1,13 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 40 (Section 7.0.4 : Sous grille en plus, option \tkzname{sub})
+% Ex. No. 47 (Section 7.0.4 : Under the grid, too, option \tkzname{sub})
- \begin{tikzpicture}
+\begin{tikzpicture}
\tkzInit[xmax=5,ymax=2]
\tkzGrid[sub,color=orange]
\tkzGrid[color=orange]
\tkzAxeXY
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-5.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.5.tex
index fe8278d87a..c5e861f58e 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-5.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.5.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 41 (Section 7.0.5 : Changement de maille)
+% Ex. No. 48 (Section 7.0.5 : Grid change)
\begin{tikzpicture}
\tkzInit[xmax=5,ymax=2]
@@ -12,4 +12,4 @@
\tkzAxeXY
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-6.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.6.tex
index f3934d4e7e..590d222821 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-6.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.6.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 42 (Section 7.0.6 : Option \tkzname{xstep}, \tkzname{xstep}, \tkzname{subxstep} et \tkzname{subystep})
+% Ex. No. 49 (Section 7.0.6 : Option \tkzname{xstep}, \tkzname{xstep}, \tkzname{subxstep} and \tkzname{subystep})
\begin{tikzpicture}
\tkzInit[xmax=.5,xstep=.1,
@@ -13,4 +13,4 @@
\tkzAxeXY
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-7.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.7.tex
index bd901dbdea..6e550f4bc2 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-7.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.7.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 43 (Section 7.0.7 : Avec des intervalles importants)
+% Ex. No. 50 (Section 7.0.7 : With large intervals)
\begin{tikzpicture}
\tkzInit[xmax=100,xstep=20,
@@ -12,4 +12,4 @@
\tkzAxeXY
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-8.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.8.tex
index 369e0346de..d41d94a904 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-8.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.8.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 44 (Section 7.0.8 : \tkzcname{tkzGrid} et les arguments)
+% Ex. No. 51 (Section 7.0.8 : \tkzcname{tkzGrid} and the arguments)
\begin{tikzpicture}
\tkzInit[xmax=100,xstep=20,
@@ -13,4 +13,4 @@
\tkzAxeXY
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-9.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.9.tex
index 88e1b387cd..1584da5a14 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-9.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.9.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 45 (Section 7.0.9 : Usage de \tkzname{pi} avec \tkzcname{tkzGrid})
+% Ex. No. 52 (Section 7.0.9 : Use of \tkzname{pi} with \tkzcname{tkzGrid})
\begin{tikzpicture}[scale=.75]
\tkzInit[xmax=6.5,ymax=6.5]
@@ -13,4 +13,4 @@
\tkzDrawXY
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.1.1.tex
index 538d1c8a5e..bd7c3ec966 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.1.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 48 (Section 8.1.1 : Utilisation de \tkzname{shift})
+% Ex. No. 55 (Section 8.1.1 : Use of \tkzname{shift})
\begin{tikzpicture}[trim left=-1cm]
\tkzDefPoint(2,3){A}
@@ -11,4 +11,4 @@
\tkzDrawPoints[color=red](A,B,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-9-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.10.1.tex
index 7e774c8f0c..50b72e5ba0 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-9-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.10.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 65 (Section 8.9.1 : Exemple avec \tkzcname{tkzAutoLabelPoints})
+% Ex. No. 72 (Section 8.10.1 : Example with \tkzcname{tkzAutoLabelPoints})
\begin{tikzpicture}[scale=1.25]
\tkzDefPoint(2,1){O}
@@ -20,4 +20,4 @@
dist=.3,red](O,A,B,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.10.2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.10.2.tex
new file mode 100644
index 0000000000..f20ff7b2ce
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.10.2.tex
@@ -0,0 +1,20 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 73 (Section 8.10.2 : Example with \tkzcname{tkzAutoLabelPoints})
+
+\begin{tikzpicture}[scale=1.25]
+ \tkzDefPoint(2,1){O}
+ \tkzDefRandPointOn[circle=center O radius 1.5cm]
+ \tkzGetPoint{A}
+ \tkzDrawCircle(O,A)
+ \tkzDefPointBy[rotation=center O angle 100](A)
+ \tkzGetPoint{C}
+ \tkzDefPointBy[rotation=center O angle 78](A)
+ \tkzGetPoint{B}
+ \tkzDrawPoints(O,A,B,C)
+ \tkzDrawSegments(C,B B,A A,O O,C)
+ \tkzAutoLabelPoints[center=O,red](A,B,C)
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.11.1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.11.1.tex
new file mode 100644
index 0000000000..edce61975b
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.11.1.tex
@@ -0,0 +1,16 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 74 (Section 8.11.1 : Simple example with \tkzcname{tkzSetUpPoint})
+
+\begin{tikzpicture}
+ \tkzSetUpPoint[shape = cross out,
+ color=blue]
+ \tkzInit[xmax=100,xstep=20,ymax=.5]
+ \tkzDefPoint(20,1){A}
+ \tkzDefPoint(80,0){B}
+ \tkzDrawLine(A,B)
+ \tkzDrawPoints(A,B)
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-10-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.11.2.tex
index af30936f71..5ce9db1926 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-10-2.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.11.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 68 (Section 8.10.2 : Exemple avec \tkzcname{tkzSetUpPoint})
+% Ex. No. 75 (Section 8.11.2 : Example with \tkzcname{tkzSetUpPoint})
\begin{tikzpicture}
\tkzInit[ymin=-0.5,ymax=3,xmin=-0.5,xmax=7]
@@ -15,4 +15,4 @@
\tkzLabelPoints(A,B,C,D)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-10-3.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.11.3.tex
index 1966b2321d..c72d5db012 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-10-3.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.11.3.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 69 (Section 8.10.3 : Utilisation de\tkzcname{tkzSetUpPoint} dans un groupe)
+% Ex. No. 76 (Section 8.11.3 : Using \tkzcname{tkzSetUpPoint} in a group)
\begin{tikzpicture}
\tkzInit[ymin=-0.5,ymax=3,xmin=-0.5,xmax=7]
@@ -20,4 +20,4 @@
\tkzLabelPoints(A,B,C,D)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-11-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.12.2.tex
index 6d3cbba045..7c01960032 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-11-2.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.12.2.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 70 (Section 8.11.2 : Exemple avec \tkzcname{tkzPointShowCoord})
+% Ex. No. 77 (Section 8.12.2 : Example with \tkzcname{tkzPointShowCoord})
- \begin{tikzpicture}[scale=1.5]
+\begin{tikzpicture}[scale=1.5]
\tkzInit[xmax=3,ymax=2]
\tkzAxeXY
\tkzDefPoint(2,1){a}
@@ -15,4 +15,4 @@
\tkzLabelPoint({1,2}){$A_2$}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-11-3.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.12.3.tex
index 08eb2e72a5..e45c6166c0 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-11-3.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.12.3.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 71 (Section 8.11.3 : Exemple avec \tkzcname{tkzPointShowCoord} et \tkzname{xstep})
+% Ex. No. 78 (Section 8.12.3 : Example with \tkzcname{tkzPointShowCoord} and \tkzname{xstep})
- \begin{tikzpicture}[xscale=3,yscale=2]
+\begin{tikzpicture}[xscale=3,yscale=2]
\tkzInit[xmax=15,ymax=15,
xstep=10,ystep=10]
\tkzAxeXY
@@ -12,4 +12,4 @@
\tkzLabelPoint(a){$A_1$}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-12-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.13.1.tex
index 0e93a17423..4776c77e1b 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-12-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.13.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 72 (Section 8.12.1 : Création d'un nuage avec \tkzcname{tkzDefSetOfPoints})
+% Ex. No. 79 (Section 8.13.1 : Creating a scatter plot with \tkzcname{tkzDefSetOfPoints})
\begin{tikzpicture}
\tkzInit[ymax=4,xmax=5]
@@ -12,4 +12,4 @@
\tkzLabelPoints(P1,P2,P3)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.2.0.tex
index 2623303a1d..9317c040a1 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-2.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.2.0.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 49 (Section 8.1.2 : Placer un label avec la librairie \tkzname{quotes} )
+% Ex. No. 56 (Section 8.2 : Placing a label with the library \tkzname{quotes})
\begin{tikzpicture}[trim left=-1cm]
\tkzDefPoint["-60:$A_n$" ](2,3){A}
@@ -14,4 +14,4 @@
\tkzDrawPoints[color=red](A,B,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-3.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.2.1.tex
index 203c63bca8..46ac455fc6 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-3.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.2.1.tex
@@ -1,17 +1,17 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 50 (Section 8.1.3 : Rotation avec \tkzname{shift} et \tkzname{scope} )
+% Ex. No. 57 (Section 8.2.1 : Rotation with \tkzname{shift} and \tkzname{scope})
\begin{tikzpicture}[scale=.75,rotate=90]
\tkzDefPoint[label=right:$A_n$](2,3){A}
\begin{scope}[shift={(A)}]
\tkzDefPoint[label= right:$B_n$](31:3){B}
\tkzDefPoint[label= right:$C_n$](158:3){C}
-\end{scope}
+ \end{scope}
\tkzDrawSegments[color=red,%
line width=1pt](A,B A,C)
\tkzDrawPoints[color=red](A,B,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-4.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.2.2.tex
index 4a913277f9..051cfbadd0 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-4.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.2.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 51 (Section 8.1.4 : Formules et coordonnées)
+% Ex. No. 58 (Section 8.2.2 : Forms and coordinates)
\begin{tikzpicture}[scale=.75]
\tkzInit[xmax=6,ymax=6]
@@ -18,4 +18,4 @@
\tkzLabelPoints(A,O,B,B',A')
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-5.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.2.3.tex
index 71b40b54a8..d71a7362fd 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-5.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.2.3.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 52 (Section 8.1.5 : Scope et \tkzcname{tkzDefPoint} )
+% Ex. No. 59 (Section 8.2.3 : Scope et \tkzcname{tkzDefPoint} )
\begin{tikzpicture}[scale=1]
\begin{scope}[rotate=30]
@@ -9,12 +9,12 @@
\begin{scope}[shift=(A)]
\tkzDefPoint(90:5){B}
\tkzDefPoint(30:5){C}
-\end{scope}
-\end{scope}
+ \end{scope}
+ \end{scope}
\tkzDrawSegments[color=blue](A,B B,C C,A)
\tkzDrawPoints(A,B,C)
\tkzLabelPoints[above](B,C)
\tkzLabelPoints[below](A)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.3.1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.3.1.tex
new file mode 100644
index 0000000000..0161c615e5
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.3.1.tex
@@ -0,0 +1,12 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 60 (Section 8.3.1 : Definition of points)
+
+\begin{tikzpicture}[scale=1]
+ \tkzDefPoints{0/0/A,2/0/B,2/2/C,0/2/D}
+ \tkzDrawSegments(D,A A,B B,C C,D)
+ \tkzDrawPoints(A,B,C,D)
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-3-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.4.1.tex
index d257e0aef3..50d5adc753 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-3-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.4.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 54 (Section 8.3.1 : Exemple avec \tkzcname{tkzDefShiftPoint})
+% Ex. No. 61 (Section 8.4.1 : Example with \tkzcname{tkzDefShiftPoint})
\begin{tikzpicture}[rotate=-30]
\tkzDefPoint(2,3){A}
@@ -14,4 +14,4 @@
\tkzLabelPoints(B)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-4-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.5.1.tex
index 55a1505122..091530f8f8 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-4-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.5.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 55 (Section 8.4.1 : Triangle équilatéral avec \tkzcname{tkzDefShiftPointCoord})
+% Ex. No. 62 (Section 8.5.1 : Equilateral triangle with \tkzcname{tkzDefShiftPointCoord})
\begin{tikzpicture}[scale=1]
\tkzDefPoint(2,3){A}
@@ -13,4 +13,4 @@
\tkzLabelPoint[left](A){$A$}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-4-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.5.2.tex
index 7dfed953ea..293179f463 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-4-2.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.5.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 56 (Section 8.4.2 : Triangle isocèle avec \tkzcname{tkzDefShiftPointCoord})
+% Ex. No. 63 (Section 8.5.2 : Isosceles triangle with \tkzcname{tkzDefShiftPointCoord})
\begin{tikzpicture}[rotate=15]
\tkzDefPoint(2,3){A}
@@ -13,4 +13,4 @@
\tkzLabelPoint[left](A){$A$}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-5-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.6.1.tex
index 732ae0063c..32a5712c93 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-5-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.6.1.tex
@@ -1,11 +1,11 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 57 (Section 8.5.1 : Style des points par défaut)
+% Ex. No. 64 (Section 8.6.1 : Default stitch style)
- \begin{tikzpicture}
+\begin{tikzpicture}
\tkzDefPoint(1,3){A}
\tkzDrawPoint(A)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-5-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.6.2.tex
index ad47b2b3d0..6701537aa5 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-5-2.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.6.2.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 58 (Section 8.5.2 : Modification du style)
+% Ex. No. 65 (Section 8.6.2 : Changing the style)
- \begin{tikzpicture}
+\begin{tikzpicture}
\tikzset{point style/.style={%
draw = blue,
inner sep = 0pt,
@@ -18,4 +18,4 @@
\tkzDrawPoint(O)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-5-3.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.6.3.tex
index 8317c88a26..5f83f89b26 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-5-3.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.6.3.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 59 (Section 8.5.3 : Exemple de tracés de points)
+% Ex. No. 66 (Section 8.6.3 : Example of point plots)
- \begin{tikzpicture}[scale=.5]
+\begin{tikzpicture}[scale=.5]
\tkzDefPoint(1,3){A}
\tkzDefPoint(4,1){B}
\tkzDefPoint(0,0){O}
@@ -13,4 +13,4 @@
\tkzDrawPoint[size=12,color=blue,fill=yellow]({2,2})
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-6-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.7.1.tex
index 73acc0f134..c2527d9f70 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-6-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.7.1.tex
@@ -1,13 +1,13 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 60 (Section 8.6.1 : Exemple avec \tkzcname{tkzDefPoint} et \tkzcname{tkzDrawPoints} )
+% Ex. No. 67 (Section 8.7.1 : Example with \tkzcname{tkzDefPoint} and \tkzcname{tkzDrawPoints} )
- \begin{tikzpicture}[scale=.5]
+\begin{tikzpicture}[scale=.5]
\tkzDefPoint(1,3){A}
\tkzDefPoint(4,1){B}
\tkzDefPoint(0,0){O}
\tkzDrawPoints[size=8,color=red](A,B,O)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-6-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.7.2.tex
index 4d85b00658..85b156e704 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-6-2.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.7.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 61 (Section 8.6.2 : Exemple plus complexe )
+% Ex. No. 68 (Section 8.7.2 : More complex example )
\begin{tikzpicture}[scale=.5]
\tkzDefPoint(2,3){A} \tkzDefPoint(5,-1){B}
@@ -9,7 +9,7 @@
shift={(2,3)}](-30:5.5){E}
\begin{scope}[shift=(A)]
\tkzDefPoint(30:5){C}
-\end{scope}
+ \end{scope}
\tkzCalcLength[cm](A,B)\tkzGetLength{rAB}
\tkzDrawCircle[R](A,\rAB cm)
\tkzDrawSegment(A,B)
@@ -18,4 +18,4 @@
\tkzLabelPoints[above](A)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-7-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.8.1.tex
index 9bc9a1ae50..3237a2ed1c 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-7-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.8.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 62 (Section 8.7.1 : Exemple avec \tkzcname{tkzLabelPoint})
+% Ex. No. 69 (Section 8.8.1 : Example with \tkzcname{tkzLabelPoint})
\begin{tikzpicture}
\tkzDefPoint(0,0){A}
@@ -14,4 +14,4 @@
\tkzLabelPoint[above,purple](C){$C$}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-7-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.8.2.tex
index 431c86c364..49542c5da9 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-7-2.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.8.2.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 63 (Section 8.7.2 : label et référence)
+% Ex. No. 70 (Section 8.8.2 : Label and reference)
- \begin{tikzpicture}
+\begin{tikzpicture}
\tkzInit[xmax=1,xstep=0.15,ymax=.5]
\tkzAxeX \tkzDrawY[noticks]
\tkzDefPoint(0.22,0.25){A}
@@ -11,4 +11,4 @@
\tkzLabelPoint[above](A){$A_1$}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-8-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.9.1.tex
index 66a43be645..a5ebb9da22 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-8-1.tex
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.9.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 64 (Section 8.8.1 : Exemple avec \tkzcname{tkzLabelPoints})
+% Ex. No. 71 (Section 8.9.1 : Example with \tkzcname{tkzLabelPoints})
\begin{tikzpicture}
\tkzDefPoint(2,3){A}
@@ -11,4 +11,4 @@
\tkzLabelPoints(A,B,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-9.2.0.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-9.2.0.tex
new file mode 100644
index 0000000000..591fcf5875
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-9.2.0.tex
@@ -0,0 +1,12 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 80 (Section 9.2 : Use \tkzcname{tikzset})
+
+\begin{tikzpicture}
+ \tkzInit[xmin=-0.5,xmax=5]
+ \tkzDrawX
+ \tkzLabelX
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-base.cfg b/macros/latex/contrib/tkz/tkz-base/latex/tkz-base.cfg
index b3a5fd9547..2acb32861e 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-base.cfg
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-base.cfg
@@ -1,18 +1,25 @@
% tkz-base.cfg
-% Copyright 2020 by Alain Matthes
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
-% This file may be distributed and/or modified
-%
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
% If you modify this original file, YOUR CHANGES WILL BE LOST when it is
% updated. Instead, put your changes in the entire copy of tkz-base.cfg
% and save the file in a directory part of your TEXINPUTS environment
% variable.
-\def\fileversion{3.02c}
-\def\filedate{2020/02/04}
-\typeout{2020/02/04 3.02c tkz-base.cfg}
+%utf8 encoding
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-base.cfg}
%<------ colors ---------------------------------------–>
\def\tkz@backgroundcolor{white}
\def\tkz@textcolor{black}
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-base.sty b/macros/latex/contrib/tkz/tkz-base/latex/tkz-base.sty
index e52f3076ee..56d93baed9 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-base.sty
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-base.sty
@@ -1,19 +1,41 @@
-% tkz-base.sty % this file
-% Copyright 2020\"\" by Alain Matthes
+% tkz-base.sty %
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
-% This file may be distributed and/or modified
-%
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-% This work consists of the main source file interfaces.dtx
-% and the derived files
-% tkz-base.sty % this file
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+% This work consists of the files:
+% tkz-base.sty
+% tkz-base.cfg
+% tkz-lib-marks.tex
+% tkz-obj-axes.tex
+% tkz-obj-grids.tex
+% tkz-obj-marks.tex
+% tkz-obj-points.tex
+% tkz-obj-rep.tex
+% tkz-tools-arith.tex
+% tkz-tools-base.tex
+% tkz-tools-BB.tex
+% tkz-tools-misc.tex
+% tkz-tools-modules.tex
+% tkz-tools-print.tex
+% tkz-tools-text.tex
+% tkz-tools-utilities.tex
+
+% utf8 encoding
%<--------------------------------------------------------------------------–>
% Objet : Outils pour la création de graphiques géométriques
%<--------------------------------------------------------------------------–>
-\typeout{2020/01/24 3.02c tkz-base.sty}
+\typeout{2020/03/03 3.05c tkz-base.sty}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tkz-base}[2020/01/24 3.02c tkz-base]
+\ProvidesPackage{tkz-base}[2020/03/03 3.05c tkz-base]
\ifx\e@alloc\@undefined
\RequirePackage{etex}
\fi
@@ -37,9 +59,8 @@
quotes,
shadows,
shapes.misc,
- snakes,
through
- }
+ }% remove snake library
% Pour les les labels sur les axes
\@ifpackageloaded{numprint}{}
{\RequirePackage[autolanguage]{numprint}} %
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-lib-marks.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-lib-marks.tex
index 0c62abe0cf..5ae1de142e 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-lib-marks.tex
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-lib-marks.tex
@@ -1,13 +1,20 @@
% tkz-lib-marks.tex
-% Copyright 2020 by Alain Matthes
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
-% This file may be distributed and/or modified
-%
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-lib-symbols.tex}
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-lib-symbols.tex}
\makeatletter
%<--------------------------------------------------------------------------–>
% Création des symboles
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-axes.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-axes.tex
index ebfd985c1f..ddc800a801 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-axes.tex
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-axes.tex
@@ -1,12 +1,21 @@
% tkz-obj-axes.tex
-% 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.
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+
% utf8 encoding
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-obj-axes.tex}
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-obj-axes.tex}
\newif\ifinteger
\makeatletter
\def\removedot#1.{#1}
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-grids.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-grids.tex
index 46892db8e2..eb23c857c0 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-grids.tex
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-grids.tex
@@ -1,12 +1,21 @@
% tkz-obj-grids.tex
-% 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.
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+
% utf8 encoding
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-obj-grids.tex}
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-obj-grids.tex}
\makeatletter
%<--------------------------------------------------------------------------–>
% Setup Grid
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-marks.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-marks.tex
index 44d97388c0..78a0785cae 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-marks.tex
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-marks.tex
@@ -1,13 +1,22 @@
%tkz-obj-marks.tex
-% Copyright 2020 by Alain Matthes
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
-% This file may be distributed and/or modified
-%
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-obj-marks.tex}
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+
+
+% utf8 encoding
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-obj-marks.tex}
\makeatletter
%<-------------------------------------------------------------------------–>
% Setup Marks
@@ -99,8 +108,8 @@
fill = \tkz@mk@color!50,
size = \tkz@mk@size
}
-\def\tkzSetUpMark{\pgfutil@ifnextchar[{\tkzActivOff\tkz@SetUpMark}{%
- \tkzActivOff\tkz@SetUpMark[]}}
+\def\tkzSetUpMark{\pgfutil@ifnextchar[{\tkz@SetUpMark}{%
+ \tkz@SetUpMark[]}}
\def\tkz@SetUpMark[#1]{%
\pgfqkeys{/setupmk}{#1}
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-points.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-points.tex
index 5676d60a6b..8d3ea5b550 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-points.tex
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-points.tex
@@ -1,13 +1,21 @@
-% tkz-obj-points.tex
-% Copyright 2020 by Alain Matthes
+ % tkz-obj-points.tex
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
-% This file may be distributed and/or modified
-%
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-obj-points.tex}
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+
+
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-obj-points.tex}
%<--------------------------------------------------------------------------–>
% init def point
%<--------------------------------------------------------------------------–>
@@ -106,8 +114,7 @@
% la macro defpoint les coordonnées cartésiennes ou polaires sont traitées
% afin de pouvoir être adaptées avec les unités choisies
%<--------------------------------------------------------------------------–>
-\def\tkzDefPoint{\pgfutil@ifnextchar[{\tkzActivOff\tkz@DefPoint}{%
- \tkzActivOff\tkz@DefPoint[]}}
+\def\tkzDefPoint{\pgfutil@ifnextchar[{\tkz@DefPoint}{\tkz@DefPoint[]}}
\def\tkz@DefPoint[#1](#2)#{%
\tkz@parsecoordinate{#2}
@@ -231,8 +238,7 @@
\node[label style,#1] at (#2) {#3};}%
%<--------------------------------------------------------------------------–>
-\def\tkzLabelPoints{\pgfutil@ifnextchar[{\tkz@LabelPoints}{%
- \tkz@LabelPoints[]}}%
+\def\tkzLabelPoints{\pgfutil@ifnextchar[{\tkz@LabelPoints}{\tkz@LabelPoints[]}}%
\def\tkz@LabelPoints[#1](#2){%
\foreach \point in {#2}{
\node[label style,#1] at (\point) {$\point$};}
@@ -246,8 +252,7 @@
dist = 0.15,
/tkzautolab/.search also = {/tikz},
}
-\def\tkzAutoLabelPoints{\pgfutil@ifnextchar[{\tkz@AutoLabelPoints}{%
- \tkz@AutoLabelPoints[]}}%
+\def\tkzAutoLabelPoints{\pgfutil@ifnextchar[{\tkz@AutoLabelPoints}{\tkz@AutoLabelPoints[]}}%
\def\tkz@AutoLabelPoints[#1](#2){%
\begingroup
\pgfqkeys{/tkzautolab}{#1}
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-rep.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-rep.tex
index 2406dc791f..ff1ee65f06 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-rep.tex
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-rep.tex
@@ -1,13 +1,20 @@
% tkz-obj-rep.tex
-% Copyright 2020 by Alain Matthes
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
-% This file may be distributed and/or modified
-%
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-obj-rep.tex}
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+% utf8 encoding
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-obj-rep.tex}
\makeatletter
%<--------------------------------------------------------------------------–>
% repère
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-BB.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-BB.tex
index f9e58d75f0..a6829b6835 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-BB.tex
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-BB.tex
@@ -1,11 +1,20 @@
% tkz-tools-BB.tex
-% Copyright 2020 by Alain Matthes
-% This file may be distributed and/or modified
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-obj-BB.tex}
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+% utf8 encoding
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-obj-BB.tex}
\makeatletter
%<--------------------------------------------------------------------------–>
\pgfkeys{/tkzClip/.cd,
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-arith.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-arith.tex
index 4232b3a635..c25572c709 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-arith.tex
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-arith.tex
@@ -1,11 +1,20 @@
% tkz-tools-arith.tex
-% Copyright 2020 by Alain Matthes
-% This file may be distributed and/or modified
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-tools-arith.tex}
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+% utf8 encoding
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-tools-arith.tex}
% 1.161 test if "isfactor" is already defined
% now with pgf 3.0 gcd isprime isodd iseven are defined
%<--------------------------------------------------------------------------–>
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-base.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-base.tex
index fbd631d2ee..825c881e35 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-base.tex
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-base.tex
@@ -1,12 +1,20 @@
% tkz-tools-base.tex
-% 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.
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
% utf8 encoding
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-tools-base.tex}
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-tools-base.tex}
\makeatletter
%<--------------------------------------------------------------------------–>
\global\let\tkz@tmp@xa\tkz@init@xmin% modif 2016
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-misc.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-misc.tex
index 2bd39efc4b..c5bd7f2f91 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-misc.tex
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-misc.tex
@@ -1,11 +1,20 @@
% tkz-tools-misc.tex
-% Copyright 2020 by Alain Matthes
-% This file may be distributed and/or modified
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-tools-misc.tex}
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+% utf8 encoding
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-tools-misc.tex}
\makeatletter
%<--------------------------------------------------------------------------–>
% hline pb avec line
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-modules.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-modules.tex
index 81525e824a..8197dc7a4e 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-modules.tex
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-modules.tex
@@ -1,11 +1,20 @@
% tkz-tools-modules
-% Copyright 2020 by Alain Matthes
-% This file may be distributed and/or modified
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-tools-utilities.tex}
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+% utf8 encoding
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-tools-utilities.tex}
\makeatletter
%<------------- % chargement des modules ---------------------------------->
\def\tkz@obj@all{angles,arcs,compass,defcircles,deflines,defpoints,defpointsby,defpointsrnd,defpointswith,polygons,protractor,sectors,show,triangles}%
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-print.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-print.tex
index 20e53a8b48..d61b81e39a 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-print.tex
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-print.tex
@@ -1,11 +1,20 @@
% tkz-tool-print.tex
-% Copyright 2020 by Alain Matthes
-% This file may be distributed and/or modified
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-tools-print.tex}
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+% utf8 encoding
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-tools-print.tex}
\makeatletter
%<------------- tkzPrintFrac ---------------------------------->
\def\tkzPrintFrac#1#2{%
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-text.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-text.tex
index b9397961cd..d8d4d804b3 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-text.tex
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-text.tex
@@ -1,11 +1,20 @@
% tkz-tools-text.tex
-% Copyright 2020 by Alain Matthes
-% This file may be distributed and/or modified
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-tools-text.tex}
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+% utf8 encoding
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-tools-text.tex}
\makeatletter
%<--------------------------------------------------------------------------–>
% tkzText
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-utilities.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-utilities.tex
index 70739d9a4b..5c02aad0d5 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-utilities.tex
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-utilities.tex
@@ -1,11 +1,20 @@
% tkz-tools-utilities
-% Copyright 2020 by Alain Matthes
-% This file may be distributed and/or modified
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-tools-utilities.tex}
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+% utf8 encoding
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-tools-utilities.tex}
\makeatletter
% for testing results
\def\extractxy#1{%
diff --git a/macros/latex/contrib/tkz/tkz-euclide/README b/macros/latex/contrib/tkz/tkz-euclide/README
index 8728f0a6de..4496217dbc 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/README
+++ b/macros/latex/contrib/tkz/tkz-euclide/README
@@ -1,6 +1,8 @@
% encodage utf8
+
-------------------- english readme ----------------------------------------
-readme-tkz-euclide.txt V3.02 c 2020/02/06
+
+readme-tkz-euclide.txt V3.05 c 2020/03/08
tkz-euclide is a package (latex) which allows you to draw
  two-dimensional geometric figures, in other words to create figures of Euclidean geometry. It uses a Cartesian coordinate system orthogonal provided by the tkz-base package as well as tools to define the unique coordinates of points and to manipulate them. The idea is to allow you to follow step by step a construction that would be done by hand as naturally as possible.
@@ -9,9 +11,13 @@ tkz-euclide is a package (latex) which allows you to draw
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.
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3
+ of this license or (at your option) any later version.
+ The latest version of this license is in
+ http://www.latex-project.org/lppl.txt
+ and version 1.3 or later is part of all distributions of LaTeX
+ version 2005/12/01 or later.
Features
@@ -66,7 +72,7 @@ The new package tkz-euclide 3.02c is *not* fully compatible with the version 1.1
History
-------
-
+-- 3.05 correction of bugs, amelioration of the documentation.
-- 3.02 replacement french documentation by english documentation, correction of bugs.
-- 3.01 replacement fp for xfp, addition of some macros, correction of bugs
-- 1.16 correction of bugs
diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/TKZdoc-euclide.pdf b/macros/latex/contrib/tkz/tkz-euclide/doc/TKZdoc-euclide.pdf
index aabaae0c69..2bc4e0d9b4 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/doc/TKZdoc-euclide.pdf
+++ b/macros/latex/contrib/tkz/tkz-euclide/doc/TKZdoc-euclide.pdf
Binary files differ
diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-FAQ.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-FAQ.tex
index 0725aa2c3a..c445fcc638 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-FAQ.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-FAQ.tex
@@ -3,11 +3,10 @@
\subsection{Most common errors}
For the moment, I'm basing myself on my own, because having changed syntax several times, I've made a number of mistakes. This section is going to be expanded.
- \begin{itemize}\setlength{\itemsep}{10pt}
-
- \item \tkzcname{tkzDrawPoint(A,B)} when it is necessary \tkzcname{tkzDrawPoints}
+\begin{itemize}\setlength{\itemsep}{10pt}
+\item \tkzcname{tkzDrawPoint(A,B)} when you need \tkzcname{tkzDrawPoints}.
-\item \tkzcname{tkzGetPoint(A)} When defining an object, use braces and not brackets, so write~: \tkzcname{tkzGetPoint\{A\}}
+\item \tkzcname{tkzGetPoint(A)} When defining an object, use braces and not brackets, so write: \tkzcname{tkzGetPoint\{A\}}.
\item \tkzcname{tkzGetPoint\{A\}} in place of \tkzcname{tkzGetFirstPoint\{A\}}. When a macro gives two points as results, either we retrieve these points using \tkzcname{tkzGetPoints\{A\}\{B\}}, or we retrieve only one of the two points, using \tkzcname{tkzGetFirstPoint\{A\}} or
\tkzcname{tkzGetSecondPoint\{A\}}. These two points can be used with the reference \tkzname{tkzFirstPointResult} or
@@ -19,17 +18,15 @@
\item \tkzcname{tkzDrawSegments[color = gray,style=dashed]\{B,B' C,C'\}} is a mistake. Only macros that define an object use braces.
-\item The angles are given in degrees, more rarely in radians.
-
+\item The angles are given in degrees, more rarely in radians.
\item If an error occurs in a calculation when passing parameters, then it is better to make these calculations before calling the macro.
\item Do not mix the syntax of \tkzNamePack{pgfmath} and \tkzNamePack{xfp}. I've often chosen \tkzNamePack{xfp} but if you prefer pgfmath then do your calculations before passing parameters.
-\item Use of \tkzcname{tkzClip} : In order to get accurate results, I avoided using normalized vectors. The advantage of normalization is to control the dimension of the manipulated objects, the disadvantage is that with TeX, this implies inaccuracies. These inaccuracies are often small, in the order of a thousandth, but they lead to disasters if the drawing is enlarged. Not normalizing implies that some points are far away from the working area and \tkzcname{tkzClip} allows you to reduce the size of the drawing.
-
+\item Use of \tkzcname{tkzClip}: In order to get accurate results, I avoided using normalized vectors. The advantage of normalization is to control the dimension of the manipulated objects, the disadvantage is that with TeX, this implies inaccuracies. These inaccuracies are often small, in the order of a thousandth, but they lead to disasters if the drawing is enlarged. Not normalizing implies that some points are far away from the working area and \tkzcname{tkzClip} allows you to reduce the size of the drawing.
\item An error occurs if you use the macro \tkzcname{tkzDrawAngle}
with too small an angle. The error is produced by the \NameLib{decoration} library when you want to place a mark on an arc. Even if the mark is absent, the error is still present. It is possible to get around this difficulty with the option \tkzname{mkpos=.2} for example, which will place the mark before the arc. Another possibility is to use the macro \tkzcname{tkzFillAngle}.
- \end{itemize}
+\end{itemize}
\endinput \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-angles.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-angles.tex
index f4516e05d3..d67ea4cc8d 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-angles.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-angles.tex
@@ -1,27 +1,27 @@
-\section{Les angles}
+\section{The angles}
-\subsection{Colorier un angle : fill}
+\subsection{Colour an angle: fill}
-L'opération la plus simple
-\begin{NewMacroBox}{tkzFillAngle}{\oarg{local options}\parg{A,O,B}}
-O est le sommet de l'angle. OA et OB sont les côtés. Attention l'angle est déterminé avec l'ordre des points.
+The simplest operation
+\begin{NewMacroBox}{tkzFillAngle}{\oarg{local options}\parg{A,O,B}}%
+$O$ is the vertex of the angle. $OA$ and $OB$ are the sides. Attention the angle is determined by the order of the points.
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
options & default & definition \\
\midrule
-\TOline{size}{1 cm}{cette option détermine le rayon du secteur angulaire colorié}
+\TOline{size}{1 cm}{this option determines the radius of the coloured angular sector.}
\bottomrule
\end{tabular}
\medskip
-Il faut ajouter bien sûr tous les styles de \TIKZ\ comme par exemple l'usage de fill \index{fill} ou encore shade \index{shade}
+Of course, you have to add all the styles of \TIKZ, like the use of fill and shade...
\end{NewMacroBox}
-\subsubsection{Exemple avec \tkzname{size}}
+\subsubsection{Example with \tkzname{size}}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}
\tkzInit
@@ -33,7 +33,7 @@ Il faut ajouter bien sûr tous les styles de \TIKZ\ comme par exemple l'usage d
\end{tkzexample}
-\subsubsection{Changement de l'ordre des points}
+\subsubsection{Changing the order of items}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}
\tkzInit
@@ -56,8 +56,8 @@ Il faut ajouter bien sûr tous les styles de \TIKZ\ comme par exemple l'usage d
\end{tikzpicture}
\end{tkzexample}
-\begin{NewMacroBox}{tkzFillAngles}{\oarg{local options}\parg{A,O,B}\parg{A',O',B'}etc.}
-Avec des options communes, il existe une macro pour de mutiples angles
+\begin{NewMacroBox}{tkzFillAngles}{\oarg{local options}\parg{A,O,B}\parg{A',O',B'}etc.}%
+With common options, there is a macro for multiple angles.
\end{NewMacroBox}
\subsubsection{Multiples angles}
@@ -87,13 +87,12 @@ Avec des options communes, il existe une macro pour de mutiples angles
\end{tikzpicture}
\end{tkzexample}
- \newpage
-\subsection{Marquer un angle mark}
-Opération plus délicate car les options sont nombreuses. Les symboles utilisés pour le marquage outre ceux de TikZ sont définis dans le fichier |tkz-lib-marks.tex| et désignés par les caractères suivants:\begin{tkzltxexample}[]
+\subsection{Mark an angle mark}
+More delicate operation because there are many options. The symbols used for marking in addition to those of \TIKZ\ are defined in the file |tkz-lib-marks.tex| and designated by the following characters:\begin{tkzltxexample}[]
|, ||,|||, z, s, x, o, oo
\end{tkzltxexample}
-Leurs définitions est la suivante
+Their definitions are as follows
\begin{tkzltxexample}[]
\pgfdeclareplotmark{||}
@@ -205,7 +204,6 @@ Leurs définitions est la suivante
}
\end{tkzltxexample}
-\newpage
% \tkzMarkAngle(B, A, C)
@@ -230,25 +228,25 @@ Leurs définitions est la suivante
% mark : none , |, ||,|||, z, s, x, o, oo mais tous les
% % symboles de tikz sont permis
-\begin{NewMacroBox}{tkzMarkAngle}{\oarg{local options}\parg{A,O,B}}
-O est le sommet. Attention les arguments varient en fonction des options. Plusieurs marquages sont possibles. Vous pouvez simplement tracer un arc ou bian ajouter une marque sur cet arc. Le style de l'arc est choisi avec l'option \tkzname{arc}, le rayon de l'arc est donné par \tkzname{mksize}, l'arc peut bien sûr être colorié.
+\begin{NewMacroBox}{tkzMarkAngle}{\oarg{local options}\parg{A,O,B}}%
+$O$ is the vertex. Attention the arguments vary according to the options. Several markings are possible. You can simply draw an arc or add a mark on this arc. The style of the arc is chosen with the option \tkzname{arc}, the radius of the arc is given by \tkzname{mksize}, the arc can, of course, be colored.
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
options & default & definition \\
\midrule
-\TOline{arc}{l}{choix parmi l, ll et lll simple, double ou triple.}
-\TOline{size}{1 cm}{rayon de l'arc.}
-\TOline{mark}{none}{choix parmi s.}
-\TOline{mksize}{4pt}{taille du symbol (mark).}
-\TOline{mkcolor}{black}{couleur du symbole (mark).}
-\TOline{mkpos}{0.5}{position du symbole sur l'arc.}
+\TOline{arc}{l}{choice of l, ll and lll (single, double or triple).}
+\TOline{size}{1 cm}{arc radius.}
+\TOline{mark}{none}{choice of mark.}
+\TOline{mksize}{4pt}{symbol size (mark).}
+\TOline{mkcolor}{black}{symbol color (mark).}
+\TOline{mkpos}{0.5}{position of the symbol on the arc.}
\end{tabular}
\end{NewMacroBox}
-\subsubsection{Exemple avec \tkzname{mark = x}}
+\subsubsection{Example with \tkzname{mark = x}}
\begin{tkzexample}[latex=6cm,small]
\begin{tikzpicture}[scale=.75]
\tkzDefPoints{0/0/O,5/0/A,3/4/B}
@@ -259,7 +257,7 @@ options & default & definition \\
\end{tikzpicture}
\end{tkzexample}
\DeleteShortVerb{\|}
-\subsubsection{Exemple avec \tkzname{mark =||}}
+\subsubsection{Example with \tkzname{mark =||}}
\MakeShortVerb{\|}
\begin{tkzexample}[latex=6cm,small]
\begin{tikzpicture}[scale=.75]
@@ -271,29 +269,29 @@ options & default & definition \\
\end{tikzpicture}
\end{tkzexample}
-\begin{NewMacroBox}{tkzMarkAngles}{\oarg{local options}\parg{A,O,B}\parg{A',O',B'}etc.}
-Avec des options communes, il existe une macro pour de mutiples angles
+\begin{NewMacroBox}{tkzMarkAngles}{\oarg{local options}\parg{A,O,B}\parg{A',O',B'}etc.}%
+With common options, there is a macro for multiple angles.
\end{NewMacroBox}
-\subsection{Label dans un angle}
+\subsection{Label at an angle}
-\begin{NewMacroBox}{tkzLabelAngle}{\oarg{local options}\parg{A,O,B}}
-Une seule option \tkzname{dist} qui n'est pas indispensable car l'option \tkzname{pos} de \TIKZ\ fonctionne très bien.
+\begin{NewMacroBox}{tkzLabelAngle}{\oarg{local options}\parg{A,O,B}}%
+There is only one option, dist (with or without unit), which can be replaced by the TikZ's pos option (without unit for the latter). By default, the value is in centimeters.
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
options & default & definition \\
\midrule
-\TOline{pos}{1}{ ou dist, permet de contrôler la distance du sommet au label.}
+\TOline{pos}{1}{ or dist, controls the distance from the top to the label.}
\bottomrule
\end{tabular}
\medskip
-Il est possible de déplacer le label avec toutes les options de TikZ : rotate, shift, below, etc.
+It is possible to move the label with all TikZ options : rotate, shift, below, etc.
\end{NewMacroBox}
-\subsubsection{Exemple avec \tkzname{pos}}
+\subsubsection{Example with \tkzname{pos}}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=.75]
\tkzDefPoints{0/0/O,5/0/A,3/4/B}
@@ -330,42 +328,43 @@ Il est possible de déplacer le label avec toutes les options de TikZ : rotate,
\end{tikzpicture}
\end{tkzexample}
-\begin{NewMacroBox}{tkzLabelAngles}{\oarg{local options}\parg{A,O,B}\parg{A',O',B'}etc.}
-Avec des options communes, il existe une macro pour de mutiples angles
- \end{NewMacroBox}
+\begin{NewMacroBox}{tkzLabelAngles}{\oarg{local options}\parg{A,O,B}\parg{A',O',B'}etc.}%
+With common options, there is a macro for multiple angles.
+\end{NewMacroBox}
-\subsection{Marquer un angle droit}
+\subsection{Marking a right angle}
+
+\begin{NewMacroBox}{tkzMarkRightAngle}{\oarg{local options}\parg{A,O,B}}%
+The \tkzname{german} option allows you to change the style of the drawing. The option \tkzname{size} allows to change the size of the drawing.
-\begin{NewMacroBox}{tkzMarkRightAngle}{\oarg{local options}\parg{A,O,B}}
-L'option \tkzname{german} permet de changer le style du dessin. L'option \tkzname{size} permet de modifier la taille du dessin.
-\begin{tabular}{lll}
+\medskip
+\begin{tabular}{lll}%
\toprule
-options & default & definition \\
+options & default & definition \\
\midrule
-\TOline{german}{normal}{ german arc avec point intérieur.}
-\TOline{size}{0.2}{ taille d'un coté.}
+\TOline{german}{normal}{ german arc with inner point.}
+\TOline{size}{0.2}{ side size.}
\end{tabular}
\end{NewMacroBox}
-\subsubsection{Exemple de marquage d'un angle droit}
+\subsubsection{Example of marking a right angle}
\begin{tkzexample}[latex=6cm,small]
\begin{tikzpicture}
\tkzDefPoints{0/0/A,3/1/B,0.9/-1.2/P}
\tkzDefPointBy[projection = onto B--A](P) \tkzGetPoint{H}
\tkzDrawLines[add=.5 and .5](P,H)
\tkzMarkRightAngle[fill=blue!20,size=.5,draw](A,H,P)
- \tkzDrawPoints[](A,B,P,H)
\tkzDrawLines[add=.5 and .5](A,B)
- \tkzMarkRightAngle[fill=red!20,size=.8](B,H,P)
+ \tkzMarkRightAngle[fill=red!20,size=.8](B,H,P)
+ \tkzDrawPoints[](A,B,P,H)
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Exemple de marquage d'un angle droit, german style}
+\subsubsection{Example of marking a right angle, german style}
\begin{tkzexample}[latex=6cm,small]
\begin{tikzpicture}
\tkzDefPoints{0/0/A,3/1/B,0.9/-1.2/P}
\tkzDefPointBy[projection = onto B--A](P) \tkzGetPoint{H}
- \pgfresetboundingbox
\tkzDrawLines[add=.5 and .5](P,H)
\tkzMarkRightAngle[german,size=.5,draw](A,H,P)
\tkzDrawPoints[](A,B,P,H)
@@ -374,7 +373,7 @@ options & default & definition \\
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Mélange de styles}
+\subsubsection{Mix of styles}
\begin{tkzexample}[latex=6cm,small]
\begin{tikzpicture}[scale=.75]
\tkzDefPoint(0,0){A}
@@ -392,7 +391,7 @@ options & default & definition \\
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Exemple complet}
+\subsubsection{Full example}
\begin{tkzexample}[latex=6cm,small]
\begin{tikzpicture}[rotate=-90]
@@ -422,21 +421,72 @@ options & default & definition \\
\end{tkzexample}
\subsection{\tkzcname{tkzMarkRightAngles}}
-\begin{NewMacroBox}{tkzMarkRightAngles}{\oarg{local options}\parg{A,O,B}\parg{A',O',B'}etc.}
-Avec des options communes, il existe une macro pour de mutiples angles
- \end{NewMacroBox}
-
-\subsection{\tkzcname{tkzGetAngle}}
-\begin{NewMacroBox}{tkzGetAngle}{\parg{macro}}
-Attribue la valeur d'un angle à une macro.
- \end{NewMacroBox}
-
-\subsection{\tkzcname{tkzFindAngle}}
-\begin{NewMacroBox}{tkzFindAngle}{\parg{A,O,B}}
-Détermine la valeur de l'angle en degrés.
- \end{NewMacroBox}
+\begin{NewMacroBox}{tkzMarkRightAngles}{\oarg{local options}\parg{A,O,B}\parg{A',O',B'}etc.}%
+With common options, there is a macro for multiple angles.
+\end{NewMacroBox}
+
+\section{Angles tools}
+
+\subsection{Recovering an angle \tkzcname{tkzGetAngle}}
+\begin{NewMacroBox}{tkzGetAngle}{\parg{name of macro}}%
+Assigns the value in degree of an angle to a macro. This macro retrieves \tkzcname{tkzAngleResult} and stores the result in a new macro.
+
+\medskip
+
+\begin{tabular}{lll}%
+\toprule
+arguments & example & explication \\
+\midrule
+\TAline{name of macro} {\tkzcname{tkzGetAngle}\{ang\}}{\tkzcname{ang} contains the value of the angle.}
+\end{tabular}
+\end{NewMacroBox}
+
+\subsection{Example of the use of \tkzcname{tkzGetAngle}}
+
+ The point here is that $(AB)$ is the bisector of $\widehat{CAD}$, such that the $AD$ slope is zero. We recover the slope of $(AB)$ and then rotate twice.
+
+
+\begin{tkzexample}[vbox,small]
+\begin{tikzpicture}
+ \tkzInit
+ \tkzDefPoint(1,5){A} \tkzDefPoint(5,2){B}
+ \tkzDrawSegment(A,B)
+ \tkzFindSlopeAngle(A,B)\tkzGetAngle{tkzang}
+ \tkzDefPointBy[rotation= center A angle \tkzang ](B)
+ \tkzGetPoint{C}
+ \tkzDefPointBy[rotation= center A angle -\tkzang ](B)
+ \tkzGetPoint{D}
+ \tkzCompass[length=1,dashed,color=red](A,C)
+ \tkzCompass[delta=10,brown](B,C)
+ \tkzDrawPoints(A,B,C,D)
+ \tkzLabelPoints(B,C,D)
+ \tkzLabelPoints[above left](A)
+ \tkzDrawSegments[style=dashed,color=orange!30](A,C A,D)
+\end{tikzpicture}
+\end{tkzexample}
+
+
+
+\subsection{Angle formed by three points}
+
+\begin{NewMacroBox}{tkzFindAngle}{\parg{pt1,pt2,pt3}}%
+The result is stored in a macro \tkzcname{tkzAngleResult}.
+
+\medskip
+
+\begin{tabular}{lll}%
+\toprule
+arguments & example & explication \\
+\midrule
+\TAline{(pt1,pt2,pt3)} {\tkzcname{tkzFindAngle}(A,B,C)}{\tkzcname{tkzAngleResult} gives the angle ($\overrightarrow{BA},\overrightarrow{BC}$)}
+\bottomrule
+\end{tabular}
+
+\medskip
+The result is between -180 degrees and +180 degrees. pt2 is the vertex and \tkzcname{tkzGetAngle} can retrieve the angle.
+\end{NewMacroBox}
-\subsubsection{Vérication de la mesure d'un angle}
+\subsubsection{Verification of angle measurement}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=.75]
@@ -456,7 +506,32 @@ Détermine la valeur de l'angle en degrés.
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Détermination des trois angles d'un triangle}
+\subsection{Example of the use of \tkzcname{tkzFindAngle} }
+
+\begin{tkzexample}[vbox,small]
+\begin{tikzpicture}
+ \tkzInit[xmin=-1,ymin=-1,xmax=7,ymax=7]
+ \tkzClip
+ \tkzDefPoint (0,0){O} \tkzDefPoint (6,0){A}
+ \tkzDefPoint (5,5){B} \tkzDefPoint (3,4){M}
+ \tkzFindAngle (A,O,M) \tkzGetAngle{an}
+ \tkzDefPointBy[rotation=center O angle \an](A)
+ \tkzGetPoint{C}
+ \tkzDrawSector[fill = blue!50,opacity=.5](O,A)(C)
+ \tkzFindAngle(M,B,A) \tkzGetAngle{am}
+ \tkzDefPointBy[rotation = center O angle \am](A)
+ \tkzGetPoint{D}
+ \tkzDrawSector[fill = red!50,opacity = .5](O,A)(D)
+ \tkzDrawPoints(O,A,B,M,C,D)
+ \tkzLabelPoints(O,A,B,M,C,D)
+ \edef\an{\fpeval{round(\an,2)}}\edef\am{\fpeval{round(\am,2)}}
+ \tkzDrawSegments(M,B B,A)
+ \tkzText(4,2){$\widehat{AOC}=\widehat{AOM}=\an^{\circ}$}
+ \tkzText(1,4){$\widehat{AOD}=\widehat{MBA}=\am^{\circ}$}
+\end{tikzpicture}
+\end{tkzexample}
+
+\subsubsection{Determination of the three angles of a triangle}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=1.25,rotate=30]
@@ -484,32 +559,114 @@ Détermine la valeur de l'angle en degrés.
\end{tikzpicture}
\end{tkzexample}
-\subsection{\tkzcname{tkzFindSlopeAngle}}
-\begin{NewMacroBox}{tkzFindSlopeAngle}{\parg{A,B}}
-Détermine la pente de la droite (AB).
- \end{NewMacroBox}
+ \subsection{Determining a slope}
+It is a question of determining whether it exists, the slope of a straight line defined by two points. No verification of the existence is made.
+
+\begin{NewMacroBox}{tkzFindSlope}{\parg{pt1,pt2}\marg{name of macro}}%
+The result is stored in a macro.
+
+\medskip
+
+\begin{tabular}{lll}%
+\toprule
+arguments & example & explication \\
+\midrule
+\TAline{(pt1,pt2){pt3}} {\tkzcname{tkzFindSlope}(A,B)\{slope\}}{\tkzcname{slope} will give the result of $\frac{y_B-y_A}{x_B-x_A}$} \\
+\bottomrule
+\end{tabular}
+
+\medskip
+\tkzHandBomb\ Careful not to have $x_B=x_A$.
+\end{NewMacroBox}
+
+
+\begin{tkzexample}[latex=7cm,small]
+\begin{tikzpicture}[scale=1.5]
+ \tkzInit[xmax=4,ymax=5]\tkzGrid[sub]
+ \tkzDefPoint(1,2){A} \tkzDefPoint(3,4){B}
+ \tkzDefPoint(3,2){C} \tkzDefPoint(3,1){D}
+ \tkzDrawSegments(A,B A,C A,D)
+ \tkzDrawPoints[color=red](A,B,C,D)
+ \tkzLabelPoints(A,B,C,D)
+ \tkzFindSlope(A,B){SAB} \tkzFindSlope(A,C){SAC}
+ \tkzFindSlope(A,D){SAD}
+ \pgfkeys{/pgf/number format/.cd,fixed,precision=2}
+ \tkzText[fill=Gold!50,draw=brown](1,4)%
+ {The slope of (AB) is : $\pgfmathprintnumber{\SAB}$}
+ \tkzText[fill=Gold!50,draw=brown](1,3.5)%
+ {The slope of (AC) is : $\pgfmathprintnumber{\SAC}$}
+ \tkzText[fill=Gold!50,draw=brown](1,3)%
+ {The slope of (AD) is : $\pgfmathprintnumber{\SAD}$}
+\end{tikzpicture}
+\end{tkzexample}
+
+\subsection{Angle formed by a straight line with the horizontal axis \tkzcname{tkzFindSlopeAngle}}
+Much more interesting than the last one. The result is between -180 degrees and +180 degrees.
+
+\begin{NewMacroBox}{tkzFindSlopeAngle}{\parg{A,B}}%
+Determines the slope of the straight line (AB). The result is stored in a macro \tkzcname{tkzAngleResult}.
+
+\medskip
+\begin{tabular}{lll}%
+\toprule
+arguments & example & explication \\
+\midrule
+\TAline{(pt1,pt2)} {\tkzcname{tkzFindSlopeAngle}(A,B)}{}
+\bottomrule
+\end{tabular}
+
+\medskip
+\tkzcname{tkzGetAngle} can retrieve the result. If retrieval is not necessary, you can use \tkzcname{tkzAngleResult}.
+\end{NewMacroBox}
- \subsubsection{Pliage}
+ \subsubsection{Folding}
\begin{tkzexample}[latex=6cm,small]
\begin{tikzpicture}
\tkzDefPoint(1,5){A}
- \tkzDefPoint(5,2){B} \tkzDrawSegment(A,B)
- \tkzFindSlopeAngle(A,B)\tkzGetAngle{tkzang}
+ \tkzDefPoint(5,2){B}
+ \tkzDrawSegment(A,B)
+ \tkzFindSlopeAngle(A,B)
+ \tkzGetAngle{tkzang}
\tkzDefPointBy[rotation= center A angle \tkzang ](B)
\tkzGetPoint{C}
\tkzDefPointBy[rotation= center A angle -\tkzang ](B)
\tkzGetPoint{D}
- \tkzCompass[length=1](A,C)
- \tkzCompass[delta=10](B,C) \tkzDrawPoints(A,B,C,D)
- \tkzLabelPoints(B,C,D) \tkzLabelPoints[above left](A)
+ \tkzCompass[orange,length=1](A,C)
+ \tkzCompass[orange,delta=10](B,C)
+ \tkzDrawPoints(A,B,C,D)
+ \tkzLabelPoints(B,C,D)
+ \tkzLabelPoints[above left](A)
\tkzDrawSegments[style=dashed,color=orange](A,C A,D)
\end{tikzpicture}
\end{tkzexample}
+\subsubsection{Example of the use of \tkzcname{tkzFindSlopeAngle}}
+Here is another version of the construction of a mediator
+
+\begin{tkzexample}[latex=6cm,small]
+\begin{tikzpicture}
+ \tkzInit
+ \tkzDefPoint(0,0){A}
+ \tkzDefPoint(3,2){B}
+ \tkzDefLine[mediator](A,B)
+ \tkzGetPoints{I}{J}
+ \tkzCalcLength[cm](A,B)
+ \tkzGetLength{dAB}
+ \tkzFindSlopeAngle(A,B)
+ \tkzGetAngle{tkzangle}
+ \begin{scope}[rotate=\tkzangle]
+ \tikzset{arc/.style={color=gray,delta=10}}
+ \tkzDrawArc[orange,R,arc](B,3/4*\dAB)(120,240)
+ \tkzDrawArc[orange,R,arc](A,3/4*\dAB)(-45,60)
+ \tkzDrawLine(I,J)
+ \tkzDrawSegment(A,B)
+ \end{scope}
+ \tkzDrawPoints(A,B,I,J)
+ \tkzLabelPoints(A,B)
+ \tkzLabelPoints[right](I,J)
+\end{tikzpicture}
+\end{tkzexample}
\endinput
-% \tkzGetAngle
-% \tkzNormalizeAngle
-% \tkzFindSlopeAngle
-% \tkzFindAngle
+
diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-arcs.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-arcs.tex
index 91d130cabd..9c802352a1 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-arcs.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-arcs.tex
@@ -1,44 +1,44 @@
-\section{Les arcs}
+\section{The arcs}
+\begin{NewMacroBox}{tkzDrawArc}{\oarg{local options}\parg{O,\dots}\parg{\dots}}%
-\begin{NewMacroBox}{tkzDrawArc}{\oarg{local options}\parg{O,\dots}\parg{\dots} }
-
-Cette macro trace un arc de centre O. Suivant les options, les arguments diffèrent. Il s'agit de déterminer un point de départ et un point d'arrivée. Soit le point de départ est donné, c'est ce qu'il y a de plus simple, soit on donne le rayon de l'arc. Dans ce dernier cas, il est nécessaire d'avoir deux angles. On peut soit donner directement les angles, soit donner des nodes qui associés au centre permettront de les déterminer.
+This macro traces the arc of center $O$. Depending on the options, the arguments differ. It is a question of determining a starting point and an end point. Either the starting point is given, which is the simplest, or the radius of the arc is given. In the latter case, it is necessary to have two angles. Either the angles can be given directly, or nodes associated with the center can be given to determine them. The angles are in degrees.
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
options & default & definition \\
\midrule
-\TOline{towards}{towards}{O est le centre et l'arc par de A vers (OB)}
-\TOline{rotate} {towards}{l'arc part de A et l'angle détermine sa longueur }
-\TOline{R}{towards}{On donne le rayon et deux angles}
-\TOline{R with nodes}{towards}{On donne le rayon et deux points}
-\TOline{delta}{0}{angle ajouté de chaque côté }
+\TOline{towards}{towards}{$O$ is the center and the arc from $A$ to $(OB)$}
+\TOline{rotate} {towards}{the arc starts from $A$ and the angle determines its length}
+\TOline{R}{towards}{We give the radius and two angles}
+\TOline{R with nodes}{towards}{We give the radius and two points}
+\TOline{angles}{towards}{We give the radius and two points}
+\TOline{delta}{0}{angle added on each side }
\bottomrule
\end{tabular}
\medskip
-Il faut ajouter bien sûr tous les styles de \TIKZ pour les tracés
+Of course, you have to add all the styles of \TIKZ\ for the tracings...
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
-options & arguments & exemple \\
+options & arguments & example \\
\midrule
\TOline{towards}{\parg{pt,pt}\parg{pt}}{\tkzcname{tkzDrawArc[delta=10](O,A)(B)}}
\TOline{rotate} {\parg{pt,pt}\parg{an}}{\tkzcname{tkzDrawArc[rotate,color=red](O,A)(90)}}
-\TOline{R}{\parg{pt,$r$}\parg{an,an}}{\tkzcname{tkzDrawArc[R,color=blue](O,2 cm)(30,90)}}
+\TOline{R}{\parg{pt,$r$}\parg{an,an}}{\tkzcname{tkzDrawArc[R](O,2 cm)(30,90)}}
\TOline{R with nodes}{\parg{pt,$r$}\parg{pt,pt}}{\tkzcname{tkzDrawArc[R with nodes](O,2 cm)(A,B)}}
-\bottomrule
+\TOline{angles}{\parg{pt,pt}\parg{an,an}}{\tkzcname{tkzDrawArc[angles](O,A)(0,90)}}
\end{tabular}
\end{NewMacroBox}
-Quelques exemples :
+Here are a few examples:
-\subsection{\tkzcname{tkzDrawArc} et \tkzname{towards}}
-Il est inutile de mettre \tkzname{towards}. Dans ce premier exemple l'arc part de A et va sur B. L'arc qui va de B vers A est différent. On obtient le saillant en allant dans le sens direct du cercle trigonométrique.
+\subsection{Option \tkzname{towards}}
+It's useless to put \tkzname{towards}. In this first example the arc starts from $A$ and goes to $B$. The arc going from $B$ to $A$ is different. The salient is obtained by going in the direct direction of the trigonometric circle.
\begin{tkzexample}[latex=6cm,small]
\begin{tikzpicture}
\tkzDefPoint(0,0){O}
@@ -54,8 +54,8 @@ Il est inutile de mettre \tkzname{towards}. Dans ce premier exemple l'arc part d
\end{tkzexample}
-\subsection{\tkzcname{tkzDrawArc} et \tkzname{towards}}
-Dans celui-ci, l'arc part de A mais s'arrête sur la droite (OB).
+\subsection{Option \tkzname{towards}}
+In this one, the arc starts from A but stops on the right (OB).
\begin{tkzexample}[latex=6cm,small]
\begin{tikzpicture}[scale=1.5]
@@ -71,7 +71,7 @@ Dans celui-ci, l'arc part de A mais s'arrête sur la droite (OB).
\end{tikzpicture}
\end{tkzexample}
-\subsection{\tkzcname{tkzDrawArc} et \tkzname{rotate}}
+\subsection{Option \tkzname{rotate}}
\begin{tkzexample}[latex=5cm,small]
\begin{tikzpicture}
\tkzDefPoint(0,0){O}
@@ -85,7 +85,7 @@ Dans celui-ci, l'arc part de A mais s'arrête sur la droite (OB).
\end{tkzexample}
-\subsection{\tkzcname{tkzDrawArc} et \tkzname{R}}
+\subsection{Option \tkzname{R}}
\begin{tkzexample}[latex=5cm,small]
\begin{tikzpicture}
\tkzDefPoints{0/0/O}
@@ -97,7 +97,7 @@ Dans celui-ci, l'arc part de A mais s'arrête sur la droite (OB).
\end{tikzpicture}
\end{tkzexample}
-\subsection{\tkzcname{tkzDrawArc} et \tkzname{R with nodes}}
+\subsection{Option \tkzname{R with nodes}}
\begin{tkzexample}[latex=5cm,small]
\begin{tikzpicture}
\tkzDefPoint(0,0){O}
@@ -108,12 +108,11 @@ Dans celui-ci, l'arc part de A mais s'arrête sur la droite (OB).
\end{tikzpicture}
\end{tkzexample}
-\subsection{\tkzcname{tkzDrawArc} et \tkzname{delta}}
-Cette option permet un peu comme \tkzcname{tkzCompass} de placer un arc et de déborder de chaque côté. delta est une mesure en degré.
+\subsection{Option \tkzname{delta}}
+This option allows a bit like \tkzcname{tkzCompass} to place an arc and overflow on either side. delta is a measure in degrees.
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}
- \tkzInit
\tkzDefPoint(0,0){A}
\tkzDefPoint(5,0){B}
\tkzDefPointBy[rotation= center A angle 60](B)
@@ -124,15 +123,56 @@ Cette option permet un peu comme \tkzcname{tkzCompass} de placer un arc et de d
\tkzDrawSegments(A,B A,D)
\tkzDrawLine(B,D)
\tkzSetUpCompass[color=orange]
- \tkzDrawArc[delta=10](A,B)(C)
- \tkzDrawArc[delta=10](B,C)(A)
- \tkzDrawArc[delta=10](C,D)(D)
+ \tkzDrawArc[orange,delta=10](A,B)(C)
+ \tkzDrawArc[orange,delta=10](B,C)(A)
+ \tkzDrawArc[orange,delta=10](C,D)(D)
\tkzDrawPoints(A,B,C,D)
\tkzLabelPoints(A,B,C,D)
\tkzMarkRightAngle(D,B,A)
\end{tikzpicture}
\end{tkzexample}
+\subsection{Option \tkzname{angles}: example 1}
+
+\begin{tkzexample}[latex=7cm,small]
+\begin{tikzpicture}[scale=.75]
+ \tkzDefPoint(0,0){A}
+ \tkzDefPoint(5,0){B}
+ \tkzDefPoint(2.5,0){O}
+ \tkzDefPointBy[rotation=center O angle 60](B)
+ \tkzGetPoint{D}
+ \tkzDefPointBy[symmetry=center D](O)
+ \tkzGetPoint{E}
+ \tkzSetUpLine[color=Maroon]
+ \tkzDrawArc[angles](O,B)(0,180)
+ \tkzDrawArc[angles,](B,O)(100,180)
+ \tkzCompass[delta=20](D,E)
+ \tkzDrawLines(A,B O,E B,E)
+ \tkzDrawPoints(A,B,O,D,E)
+ \tkzLabelPoints(A,B,O,D,E)
+ \tkzMarkRightAngle(O,B,E)
+\end{tikzpicture}
+\end{tkzexample}
+
+\subsection{Option \tkzname{angles}: example 2}
+
+
+\begin{tkzexample}[latex=7cm,small]
+ \begin{tikzpicture}
+ \tkzDefPoint(0,0){O}
+ \tkzDefPoint(5,0){I}
+ \tkzDefPoint(0,5){J}
+ \tkzInterCC(O,I)(I,O)\tkzGetPoints{B}{C}
+ \tkzInterCC(O,I)(J,O)\tkzGetPoints{D}{A}
+ \tkzInterCC(I,O)(J,O)\tkzGetPoints{L}{K}
+ \tkzDrawArc[angles](O,I)(0,90)
+ \tkzDrawArc[angles,color=gray,style=dashed](I,O)(90,180)
+ \tkzDrawArc[angles,color=gray,style=dashed](J,O)(-90,0)
+ \tkzDrawPoints(A,B,K)
+ \foreach \point in {I,A,B,J,K}{\tkzDrawSegment(O,\point)}
+ \end{tikzpicture}
+\end{tkzexample}
+
\endinput
diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-base.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-base.tex
index 4f10a56293..6e250bb49a 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-base.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-base.tex
@@ -14,9 +14,9 @@ The two macros in \tkzNamePack{tkz-base} that are useful for \tkzNamePack{tkz-eu
\end{itemize}
\vspace{20pt}
-To this, I added macros directly linked to the bounding box. You can now view it, backup it, restore it (see the documentation of \tkzNamePack{tkz-base} section BB)
+To this, I added macros directly linked to the bounding box. You can now view it, backup it, restore it (see the documentation of \tkzNamePack{tkz-base} section Bounding Box).
-\subsection{\tkzcname{tkzInit} et \tkzcname{tkzShowBB}}
+\subsection{\tkzcname{tkzInit} and \tkzcname{tkzShowBB}}
The rectangle around the figure shows you the bounding box.
\begin{tkzexample}[latex=8cm,small]
\begin{tikzpicture}
@@ -44,7 +44,7 @@ It is possible to add a bit of space
\tkzClip[space=1]
\end{tkzltxexample}
-\subsection{\tkzcname{tkzClip} et l'option \tkzname{space}}
+\subsection{\tkzcname{tkzClip} and the option \tkzname{space}}
This option allows you to add some space around the "clipped" rectangle.
\begin{tkzexample}[latex=8cm,small]
\begin{tikzpicture}
@@ -55,7 +55,7 @@ This option allows you to add some space around the "clipped" rectangle.
\draw[red] (-1,-1)--(5,2);
\end{tikzpicture}
\end{tkzexample}
-the dimensions of the "clipped" rectangle are \tkzname{xmin-1}, \tkzname{ymin-1}, \tkzname{xmax+1} et \tkzname{ymax+1}.
+The dimensions of the "clipped" rectangle are \tkzname{xmin-1}, \tkzname{ymin-1}, \tkzname{xmax+1} and \tkzname{ymax+1}.
\endinput \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-circles.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-circles.tex
index 66bbea6c76..7b58f6dffd 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-circles.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-circles.tex
@@ -3,39 +3,38 @@
Among the following macros, one will allow you to draw a circle, which is not a real feat. To do this, you will need to know the center of the circle and either the radius of the circle or a point on the circumference. It seemed to me that the most frequent use was to draw a circle with a given centre passing through a given point. This will be the default method, otherwise you will have to use the \tkzname{R} option. There are a large number of special circles, for example the circle circumscribed by a triangle.
\begin{itemize}
- \item I have created a first macro \tkzcname{tkzDefCircle} which allows, according to a particular circle, to retrieve its center and the measurement of the radius in cm. This recovery is done with the macros \tkzcname{tkzGetPoint} and \tkzcname{tkzGetLength},
+ \item I have created a first macro \tkzcname{tkzDefCircle} which allows, according to a particular circle, to retrieve its center and the measurement of the radius in cm. This recovery is done with the macros \tkzcname{tkzGetPoint} and \tkzcname{tkzGetLength};
- \item then a macro \tkzcname{tkzDrawCircle}
+ \item then a macro \tkzcname{tkzDrawCircle};
- \item then a macro that allows you to color in a disc, but without drawing the circle \tkzcname{tkzFillCircle}
+ \item then a macro that allows you to color in a disc, but without drawing the circle \tkzcname{tkzFillCircle};
- \item sometimes, it is necessary for a drawing to be contained in a disk this is the role assigned to \tkzcname{tkzClipCircle},
+ \item sometimes, it is necessary for a drawing to be contained in a disk, this is the role assigned to \tkzcname{tkzClipCircle};
- \item It finally remains to be able to give a label to designate a circle and if several possibilities are offered, we will see here \tkzcname{tkzLabelCircle}.
-\end{itemize}
-
+ \item it finally remains to be able to give a label to designate a circle and if several possibilities are offered, we will see here \tkzcname{tkzLabelCircle}.
+\end{itemize}
-\subsection{Characteristics of a circle : \tkzcname{tkzDefCircle}}
+\subsection{Characteristics of a circle: \tkzcname{tkzDefCircle}}
This macro allows you to retrieve the characteristics (center and radius) of certain circles.
-\begin{NewMacroBox}{tkzDefCircle}{\oarg{local options}\parg{A,B} ou \parg{A,B,C}}
+\begin{NewMacroBox}{tkzDefCircle}{\oarg{local options}\parg{A,B} or \parg{A,B,C}}%
\tkzHandBomb\ Attention the arguments are lists of two or three points. This macro is either used in partnership with \tkzcname{tkzGetPoint} and/or \tkzcname{tkzGetLength} to obtain the center and the radius of the circle, or by using \tkzname{tkzPointResult} and \tkzname{tkzLengthResult} if it is not necessary to keep the results.
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
-arguments & exemple & explication \\
+arguments & example & explication \\
\midrule
\TAline{\parg{pt1,pt2} or \parg{pt1,pt2,pt3}}{\parg{A,B}} {$[AB]$ is radius $A$ is the center}
\bottomrule
\end{tabular}
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
-options & derror & definition \\
+options & default & definition \\
\midrule
\TOline{through} {through}{circle characterized by two points defining a radius}
\TOline{diameter} {through}{circle characterized by two points defining a diameter}
@@ -54,7 +53,7 @@ options & derror & definition \\
{In the following examples, I draw the circles with a macro not yet presented, but this is not necessary. In some cases you may only need the center or the radius.}
\end{NewMacroBox}
- \subsubsection{Example with a random point and the option \tkzimp{through}}
+ \subsubsection{Example with a random point and option \tkzname{through}}
\begin{tkzexample}[latex=7 cm,small]
\begin{tikzpicture}[scale=1]
@@ -72,13 +71,13 @@ options & derror & definition \\
\tkzLabelCircle[draw,fill=orange,
text width=3cm,text centered,
font=\scriptsize](A,C)(-90)%
- {La mesure du rayon est :
- \rACpt pt soit \rACcm cm}
+ {The radius measurement is:
+ \rACpt pt i.e. \rACcm cm}
\end{tikzpicture}
\end{tkzexample}
- \subsubsection{Example with the option \tkzimp{diameter}}
- It is simpler here to search directly for the middle of AB
+ \subsubsection{Example with option \tkzname{diameter}}
+ It is simpler here to search directly for the middle of $[AB]$.
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=1]
\tkzDefPoint(0,0){A}
@@ -93,7 +92,7 @@ options & derror & definition \\
\end{tkzexample}
\subsubsection{Circles inscribed and circumscribed for a given triangle}
- You can also obtain the center of the inscribed circle and its projection on one side of the triangle with \tkzcname{tkzGetFirstPoint{I}} et \tkzcname{tkzGetSecondPoint{Ib}}.
+ You can also obtain the center of the inscribed circle and its projection on one side of the triangle with \tkzcname{tkzGetFirstPoint{I}} and \tkzcname{tkzGetSecondPoint{Ib}}.
\begin{tkzexample}[latex=7cm,small]
@@ -114,21 +113,21 @@ options & derror & definition \\
\end{tikzpicture}
\end{tkzexample}
- \subsubsection{Example with the option \tkzimp{ex}}
-We want to define an excircle of a triangle relativement au point C
+ \subsubsection{Example with option \tkzname{ex}}
+We want to define an excircle of a triangle relatively to point $C$
\begin{tkzexample}[latex=8cm,small]
\begin{tikzpicture}[scale=.75]
\tkzDefPoints{ 0/0/A,4/0/B,0.8/4/C}
\tkzDefCircle[ex](B,C,A)
- \tkzGetPoint{Jc} \tkzGetLength{rc}
- \tkzDefPointBy[projection=onto A--C ](Jc)
- \tkzGetPoint{Xc}
- \tkzDefPointBy[projection=onto A--B ](Jc)
- \tkzGetPoint{Yc}
+ \tkzGetPoint{J_c} \tkzGetLength{rc}
+ \tkzDefPointBy[projection=onto A--C ](J_c)
+ \tkzGetPoint{X_c}
+ \tkzDefPointBy[projection=onto A--B ](J_c)
+ \tkzGetPoint{Y_c}
\tkzGetPoint{I}
\tkzDrawPolygon[color=blue](A,B,C)
- \tkzDrawCircle[R,color=lightgray](Jc,\rc pt)
+ \tkzDrawCircle[R,color=lightgray](J_c,\rc pt)
% possible \tkzDrawCircle[ex](A,B,C)
\tkzDrawCircle[in,color=red](A,B,C) \tkzGetPoint{I}
\tkzDefPointBy[projection=onto A--C ](I)
@@ -136,16 +135,16 @@ We want to define an excircle of a triangle relativement au point C
\tkzDefPointBy[projection=onto A--B ](I)
\tkzGetPoint{D}
\tkzDrawLines[add=0 and 2.2,dashed](C,A C,B)
- \tkzDrawSegments[dashed](Jc,Xc I,D I,F Jc,Yc)
- \tkzMarkRightAngles(A,F,I B,D,I Jc,Xc,A Jc,Yc,B)
- \tkzDrawPoints(B,C,A,I,D,F,Xc,Jc,Yc)
- \tkzLabelPoints(B,A,Jc,I,D,Xc,Yc)
+ \tkzDrawSegments[dashed](J_c,X_c I,D I,F J_c,Y_c)
+ \tkzMarkRightAngles(A,F,I B,D,I J_c,X_c,A J_c,Y_c,B)
+ \tkzDrawPoints(B,C,A,I,D,F,X_c,J_c,Y_c)
+ \tkzLabelPoints(B,A,J_c,I,D,X_c,Y_c)
\tkzLabelPoints[above left](C)
\tkzLabelPoints[left](F)
\end{tikzpicture}
\end{tkzexample}
- \subsubsection{Euler's circle for a given triangle}
+ \subsubsection{Euler's circle for a given triangle with option \tkzname{euler}}
We verify that this circle passes through the middle of each side.
\begin{tkzexample}[latex=8cm,small]
@@ -154,8 +153,8 @@ We verify that this circle passes through the middle of each side.
\tkzDefPoint(0,0){B} \tkzDefPoint(7,0){C}
\tkzDefCircle[euler](A,B,C)
\tkzGetPoint{E} \tkzGetLength{rEuler}
- \tkzDefSpcTriangle[medial](A,B,C){Ma,Mb,Mc}
- \tkzDrawPoints(A,B,C,E,Ma,Mb,Mc)
+ \tkzDefSpcTriangle[medial](A,B,C){M_a,M_b,M_c}
+ \tkzDrawPoints(A,B,C,E,M_a,M_b,M_c)
\tkzDrawCircle[R,blue](E,\rEuler pt)
\tkzDrawPolygon(A,B,C)
\tkzLabelPoints[below](B,C)
@@ -163,7 +162,7 @@ We verify that this circle passes through the middle of each side.
\end{tikzpicture}
\end{tkzexample}
- \subsubsection{Coloured Apollonius circles for a given segment}
+ \subsubsection{Apollonius circles for a given segment option \tkzname{apollonius}}
\begin{tkzexample}[latex=9cm,small]
\begin{tikzpicture}[scale=0.75]
@@ -184,7 +183,7 @@ We verify that this circle passes through the middle of each side.
\end{tikzpicture}
\end{tkzexample}
- \subsubsection{Circles exinscribed to a given triangle}
+ \subsubsection{Circles exinscribed to a given triangle option \tkzname{ex}}
You can also get the center and the projection of it on one side of the triangle.
with \tkzcname{tkzGetFirstPoint\{Jb\}} and \tkzcname{tkzGetSecondPoint\{Tb\}}.
@@ -214,28 +213,28 @@ We verify that this circle passes through the middle of each side.
\end{tikzpicture}
\end{tkzexample}
- \subsubsection{Spieker circle}
-The incircle of the medial triangle $M_AM_BM_C$ is the Spieker circle
+ \subsubsection{Spieker circle with option \tkzname{spieker}}
+The incircle of the medial triangle $M_aM_bM_c$ is the Spieker circle:
\begin{tkzexample}[latex=8cm, small]
\begin{tikzpicture}[scale=1]
\tkzDefPoints{ 0/0/A,4/0/B,0.8/4/C}
- \tkzDefSpcTriangle[medial](A,B,C){Ma,Mb,Mc}
+ \tkzDefSpcTriangle[medial](A,B,C){M_a,M_b,M_c}
\tkzDefTriangleCenter[spieker](A,B,C)
- \tkzGetPoint{Sp}
+ \tkzGetPoint{S_p}
\tkzDrawPolygon[blue](A,B,C)
- \tkzDrawPolygon[red](Ma,Mb,Mc)
+ \tkzDrawPolygon[red](M_a,M_b,M_c)
\tkzDrawPoints[blue](B,C,A)
- \tkzDrawPoints[red](Ma,Mb,Mc,Sp)
- \tkzDrawCircle[in,red](Ma,Mb,Mc)
- \tkzAutoLabelPoints[center=Sp,dist=.3](Ma,Mb,Mc)
- \tkzLabelPoints[blue,right](Sp)
- \tkzAutoLabelPoints[center=Sp](A,B,C)
+ \tkzDrawPoints[red](M_a,M_b,M_c,S_p)
+ \tkzDrawCircle[in,red](M_a,M_b,M_c)
+ \tkzAutoLabelPoints[center=S_p,dist=.3](M_a,M_b,M_c)
+ \tkzLabelPoints[blue,right](S_p)
+ \tkzAutoLabelPoints[center=S_p](A,B,C)
\end{tikzpicture}
\end{tkzexample}
- \subsubsection{Orthogonal circle passing through two given points}
+ \subsubsection{Orthogonal circle passing through two given points, option \tkzname{orthogonal through}}
\begin{tkzexample}[latex=8cm,small]
\begin{tikzpicture}[scale=1]
@@ -272,121 +271,35 @@ The incircle of the medial triangle $M_AM_BM_C$ is the Spieker circle
\end{tikzpicture}
\end{tkzexample}
-
%<---------------------------------------------------------------------------->
-% Tangente
-%<---------------------------------------------------------------------------->
-\subsection{Tangent to a circle}
-Two constructions are proposed. The first one is the construction of a tangent to a circle at a given point of this circle and the second one is the construction of a tangent to a circle passing through a given point outside a disc.
-
-\begin{NewMacroBox}{tkzDefTangent}{\oarg{local options}\parg{pt1,pt2} ou \parg{pt1,dim}}
-The parameter in brackets is the center of the circle or the center of the circle and a point on the circle or the center and the radius.
-
-\medskip
-\begin{tabular}{lll}
-\toprule
-arguments & exemple & explication \\
-\midrule
-\TAline{\parg{pt1,pt2 or \parg{pt1,dim}} }{\parg{A,B} or \parg{A,2cm}} {$[AB]$ is radius $A$ is the center}
-\bottomrule
-\end{tabular}
-
-\medskip
-\begin{tabular}{lll}
-\toprule
-options & default & definition \\
-\midrule
-\TOline{at=pt}{at}{tangent to a point on the circle}
-\TOline{from=pt} {at}{tangent to a circle passing through a point}
-\TOline{from with R=pt} {at}{idem, but the circle is defined by center = radius}
-\bottomrule
-\end{tabular}
-
-The tangent is not drawn. A second point of the tangent is given by \tkzname{tkzPointResult}.
-\end{NewMacroBox}
-
- \subsubsection{Example of a tangent passing through a point on the circle }
-\begin{tkzexample}[latex=7cm,small]
-\begin{tikzpicture}[scale=.5]
- \tkzDefPoint(0,0){O}
- \tkzDefPoint(6,6){E}
- \tkzDefRandPointOn[circle=center O radius 4cm]
- \tkzGetPoint{A}
- \tkzDrawSegment(O,A)
- \tkzDrawCircle(O,A)
- \tkzDefTangent[at=A](O)
- \tkzGetPoint{h}
- \tkzDrawLine[add = 4 and 3](A,h)
- \tkzMarkRightAngle[fill=red!30](O,A,h)
-\end{tikzpicture}
-\end{tkzexample}
-
- \subsubsection{Example of tangents passing through an external point }
-
-\begin{tkzexample}[latex=6cm,small]
-\begin{tikzpicture}[scale=0.75]
- \tkzDefPoint(3,3){c}
- \tkzDefPoint(6,3){a0}
- \tkzRadius=1 cm
- \tkzDrawCircle[R](c,\tkzRadius)
- \foreach \an in {0,10,...,350}{
- \tkzDefPointBy[rotation=center c angle \an](a0)
- \tkzGetPoint{a}
- \tkzDefTangent[from with R = a](c,\tkzRadius)
- \tkzGetPoints{e}{f}
- \tkzDrawLines[color=magenta](a,f a,e)
- \tkzDrawSegments(c,e c,f)
- }%
-\end{tikzpicture}
-\end{tkzexample}
-
- \subsubsection{Example of Andrew Mertz }
-
-\begin{tkzexample}[latex=6cm,small]
- \begin{tikzpicture}[scale=.5]
- \tkzDefPoint(100:8){A}\tkzDefPoint(50:8){B}
- \tkzDefPoint(0,0){C} \tkzDefPoint(0,4){R}
- \tkzDrawCircle(C,R)
- \tkzDefTangent[from = A](C,R) \tkzGetPoints{D}{E}
- \tkzDefTangent[from = B](C,R) \tkzGetPoints{F}{G}
- \tkzDrawSector[fill=blue!80!black,opacity=0.5](A,D)(E)
- \tkzFillSector[color=red!80!black,opacity=0.5](B,F)(G)
- \tkzInterCC(A,D)(B,F) \tkzGetSecondPoint{I}
- \tkzDrawPoint[color=black](I)
- \end{tikzpicture}
-\end{tkzexample}
-\url{http://www.texample.net/tikz/examples/}
-
-\section{Draw, Label The Circles}
-
-Among the following macros, one will allow you to draw a circle, which is not a real feat. To do this, you will need to know the center of the circle and either the radius of the circle or a point on the circumference. It seemed to me that the most frequent use was to draw a circle with a given centre passing through a given point. This will be the default method, otherwise you will have to use the \tkzname{R} option.
+\section{Draw, Label the Circles}
\begin{itemize}
\item I created a first macro \tkzcname{tkzDrawCircle},
\item then a macro that allows you to color a disc, but without drawing the circle. \tkzcname{tkzFillCircle},
- \item sometimes, it is necessary for a drawing to be contained in a disc is the role assigned to \tkzcname{tkzClipCircle},
+ \item sometimes, it is necessary for a drawing to be contained in a disc,this is the role assigned to \tkzcname{tkzClipCircle},
\item It finally remains to be able to give a label to designate a circle and if several possibilities are offered, we will see here \tkzcname{tkzLabelCircle}.
\end{itemize}
\subsection{Draw a circle}
-\begin{NewMacroBox}{tkzDrawCircle}{\oarg{local options}\parg{A,B}}
-\tkzHandBomb\ Attention the arguments are lists of two points. The circles that can be drawn are the same as in the previous macro. An additional option \tkzname{R} to give directly a measure.
+\begin{NewMacroBox}{tkzDrawCircle}{\oarg{local options}\parg{A,B}}%
+\tkzHandBomb\ Attention you need only two points to define a radius or a diameter. An additional option \tkzname{R} is available to give a measure directly.
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
-arguments & exemple & explication \\
+arguments & example & explication \\
\midrule
-\TAline{\parg{pt1,pt2 pt3,pt4 ...}}{\parg{A,B C,D}} {List of two points}
+\TAline{\parg{pt1,pt2}}{\parg{A,B}} {two points to define a radius or a diameter}
\bottomrule
\end{tabular}
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
options & default & definition \\
\midrule
@@ -397,7 +310,7 @@ options & default & definition \\
\end{tabular}
\medskip
-Of course, you have to add all the styles of \TIKZ for the tracings...
+Of course, you have to add all the styles of \TIKZ\ for the tracings...
\end{NewMacroBox}
\subsubsection{Circles and styles, draw a circle and color the disc}
@@ -407,33 +320,33 @@ Of course, you have to add all the styles of \TIKZ for the tracings...
\begin{tikzpicture}
\tkzDefPoint(0,0){O}
\tkzDefPoint(3,0){A}
- % cercle de centre O et passant par A
- \tkzDrawCircle[color=blue,style=dashed](O,A)
- % cercle de diamètre $[OA]$
+ % circle with centre O and passing through A
+ \tkzDrawCircle[color=blue](O,A)
+ % diameter circle $[OA]$
\tkzDrawCircle[diameter,color=red,%
line width=2pt,fill=red!40,%
opacity=.5](O,A)
- % cercle de centre O et de rayon = exp(1) cm
- \edef\rayon{\fpeval{exp(1)}}
+ % circle with centre O and radius = exp(1) cm
+ \edef\rayon{\fpeval{0.25*exp(1)}}
\tkzDrawCircle[R,color=orange](O,\rayon cm)
\end{tikzpicture}
\end{tkzexample}
\subsection{Drawing circles}
-\begin{NewMacroBox}{tkzDrawCircles}{\oarg{local options}\parg{A,B C,D}}
-\tkzHandBomb\ Attention, the arguments are lists of two points. The circles that can be drawn are the same as in the previous macro. An additional option \tkzname{R} to give directly a measure.
+\begin{NewMacroBox}{tkzDrawCircles}{\oarg{local options}\parg{A,B C,D}}%
+\tkzHandBomb\ Attention, the arguments are lists of two points. The circles that can be drawn are the same as in the previous macro. An additional option \tkzname{R} is available to give a measure directly.
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
-arguments & exemple & explication \\
+arguments & example & explication \\
\midrule
\TAline{\parg{pt1,pt2 pt3,pt4 ...}}{\parg{A,B C,D}} {List of two points}
\bottomrule
\end{tabular}
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
options & default & definition \\
\midrule
@@ -444,7 +357,7 @@ options & default & definition \\
\end{tabular}
\medskip
-Of course, you have to add all the styles of \TIKZ for the tracings...
+Of course, you have to add all the styles of \TIKZ\ for the tracings...
\end{NewMacroBox}
\subsubsection{Circles defined by a triangle.}
@@ -479,56 +392,80 @@ Of course, you have to add all the styles of \TIKZ for the tracings...
\tkzDefPoints{0/0/A,4/0/B,1/2.5/C}
\tkzDrawPolygon(A,B,C)
\tkzDefCircle[ex](B,C,A)
-\tkzGetPoint{Jc} \tkzGetSecondPoint{Tc}
+\tkzGetPoint{J_c} \tkzGetSecondPoint{T_c}
\tkzGetLength{rJc}
-\tkzDrawCircle[R](Jc,{\rJc pt})
+\tkzDrawCircle[R](J_c,{\rJc pt})
\tkzDrawLines[add=0 and 1](C,A C,B)
-\tkzDrawSegment(Jc,Tc)
-\tkzMarkRightAngle(Jc,Tc,B)
-\tkzDrawPoints(A,B,C,Jc,Tc)
+\tkzDrawSegment(J_c,T_c)
+\tkzMarkRightAngle(J_c,T_c,B)
+\tkzDrawPoints(A,B,C,J_c,T_c)
\end{tikzpicture}
\end{tkzexample}
- \subsubsection{Cardioid}
- Based on an idea by O. Reboux made with pst-eucl (Pstricks module) by D. Rodriguez.
+\subsubsection{Cardioid}
+Based on an idea by O. Reboux made with pst-eucl (Pstricks module) by D. Rodriguez.
- Its name comes from the Greek kardia (heart), in reference to its shape, and was given to it by Johan Castillon. Wikipedia
+ Its name comes from the Greek \textit{kardia (heart)}, in reference to its shape, and was given to it by Johan Castillon (Wikipedia).
- \begin{tkzexample}[latex=7cm,small]
- \begin{tikzpicture}[scale=.5]
- \tkzDefPoint(0,0){O}
- \tkzDefPoint(2,0){A}
- \foreach \ang in {5,10,...,360}{%
- \tkzDefPoint(\ang:2){M}
- \tkzDrawCircle(M,A)
- }
- \end{tikzpicture}
- \end{tkzexample}
+\begin{tkzexample}[latex=7cm,small]
+\begin{tikzpicture}[scale=.5]
+ \tkzDefPoint(0,0){O}
+ \tkzDefPoint(2,0){A}
+ \foreach \ang in {5,10,...,360}{%
+ \tkzDefPoint(\ang:2){M}
+ \tkzDrawCircle(M,A)
+ }
+\end{tikzpicture}
+\end{tkzexample}
\subsection{Draw a semicircle}
-\begin{NewMacroBox}{tkzDrawSemiCircle}{\oarg{local options}\parg{A,B} ou \parg{A,B,C}}
-\tkzHandBomb\ Attention the arguments are lists of two or three points. This macro is either used in partnership with \tkzcname{tkzGetPoint} and/or \tkzcname{tkzGetLength} to obtain the center and the radius of the circle, or by using \\ \tkzname{tkzPointResult} and \tkzname{tkzLengthResult} if it is not necessary to keep the results.
-
+\begin{NewMacroBox}{tkzDrawSemiCircle}{\oarg{local options}\parg{A,B}}%
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
+\toprule
+arguments & example & explication \\
+\midrule
+\TAline{\parg{pt1,pt2}}{\parg{O,A} or\parg{A,B}} {radius or diameter}
+\bottomrule
+\end{tabular}
+
+\medskip
+\begin{tabular}{lll}%
\toprule
options & default & definition \\
\midrule
\TOline{through} {through}{circle characterized by two points defining a radius}
\TOline{diameter} {through}{circle characterized by two points defining a diameter}
- \bottomrule
\end{tabular}
+\end{NewMacroBox}
+\subsubsection{Use of \tkzcname{tkzDrawSemiCircle}}
+
+\begin{tkzexample}[latex=6cm,small]
+ \begin{tikzpicture}
+ \tkzDefPoint(0,0){A} \tkzDefPoint(6,0){B}
+ \tkzDefSquare(A,B) \tkzGetPoints{C}{D}
+ \tkzDrawPolygon(B,C,D,A)
+ \tkzDefPoint(3,6){F}
+ \tkzDefTriangle[equilateral](C,D) \tkzGetPoint{I}
+ \tkzDefPointBy[projection=onto B--C](I) \tkzGetPoint{J}
+ \tkzInterLL(D,B)(I,J) \tkzGetPoint{K}
+ \tkzDefPointBy[symmetry=center K](B) \tkzGetPoint{M}
+ \tkzDrawCircle(M,I)
+ \tkzCalcLength(M,I) \tkzGetLength{dMI}
+ \tkzFillPolygon[color = red!50](A,B,C,D)
+ \tkzFillCircle[R,color = yellow](M,\dMI pt)
+ \tkzDrawSemiCircle[fill = blue!50!black](F,D)%
+ \end{tikzpicture}
+\end{tkzexample}
-\end{NewMacroBox}
-
\subsection{Colouring a disc}
This was possible with the previous macro, but disk tracing was mandatory, this is no longer the case.
-\begin{NewMacroBox}{tkzFillCircle}{\oarg{local options}\parg{A,B}}
-\begin{tabular}{lll}
+\begin{NewMacroBox}{tkzFillCircle}{\oarg{local options}\parg{A,B}}%
+\begin{tabular}{lll}%
options & default & definition \\
\midrule
\TOline{radius} {radius}{two points define a radius}
@@ -537,7 +474,7 @@ options & default & definition \\
\end{tabular}
\medskip
-You don't need to put \tkzname{radius} because that's the default option. Of course, you have to add all the styles of \TIKZ for the plots.
+You don't need to put \tkzname{radius} because that's the default option. Of course, you have to add all the styles of \TIKZ\ for the plots.
\end{NewMacroBox}
\subsubsection{Example from a sangaku}
@@ -564,25 +501,19 @@ You don't need to put \tkzname{radius} because that's the default option. Of cou
\end{tikzpicture}
\end{tkzexample}
-
-
-\newpage
\subsection{Clipping a disc}
-\begin{NewMacroBox}{tkzClipCircle}{\oarg{local options}\parg{A,B} or \parg{A,r}}
-
-
-\medskip
-\begin{tabular}{lll}
+\begin{NewMacroBox}{tkzClipCircle}{\oarg{local options}\parg{A,B} or \parg{A,r}}%
+\begin{tabular}{lll}%
\toprule
-arguments & exemple & explication \\
+arguments & example & explication \\
\midrule
\TAline{\parg{A,B} or \parg{A,r}}{\parg{A,B} or \parg{A,2cm}} {AB radius or diameter }
\bottomrule
\end{tabular}
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
options & default & definition \\
\midrule
\TOline{radius} {radius}{circle characterized by two points defining a radius}
@@ -614,10 +545,8 @@ It is not necessary to put \tkzname{radius} because that is the default option.
\subsection{Giving a label to a circle}
-\begin{NewMacroBox}{tkzLabelCircle}{\oarg{local options}\parg{A,B}\parg{angle}\marg{label}}
-\begin{tabular}{lll}
-\toprule
-
+\begin{NewMacroBox}{tkzLabelCircle}{\oarg{local options}\parg{A,B}\parg{angle}\marg{label}}%
+\begin{tabular}{lll}%
options & default & definition \\
\midrule
\TOline{radius} {radius}{circle characterized by two points defining a radius}
@@ -644,7 +573,7 @@ You don't need to put \tkzname{radius} because that's the default option. We can
\tkzFillCircle[color=blue!20,opacity=.4](O,M)
\tkzLabelCircle[R,draw,fill=orange,%
text width=2cm,text centered](O,3 cm)(-60)%
- {Le cercle\\ $\mathcal{C}$}
+ {The circle\\ $\mathcal{C}$}
\tkzDrawPoints(M,P)\tkzLabelPoints[right](M,P)
\end{tikzpicture}
\end{tkzexample}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-compass.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-compass.tex
index 0521c58722..a66e7809a1 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-compass.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-compass.tex
@@ -1,17 +1,18 @@
-\section{Utilisation du compas}
+\section{Using the compass}
-\subsection{Macro principale \tkzcname{tkzCompass}}
-\begin{NewMacroBox}{tkzCompass}{\oarg{local options}\parg{A,B}}
-Cette macro permet de laisser une trace de compas autrement dit un arc en un point désigné. Il faut indiquer le centre. Plusieurs options spécifiques vont modifier l'aspect de l'arc ainsi que les options de TikZ comme le style, la couleur, l'épaisseur du trait etc.
+\subsection{Main macro \tkzcname{tkzCompass}}
+\begin{NewMacroBox}{tkzCompass}{\oarg{local options}\parg{A,B}}%
+This macro allows you to leave a compass trace, i.e. an arc at a designated point. The center must be indicated. Several specific options will modify the appearance of the arc as well as TikZ options such as style, color, line thickness etc.
+
+You can define the length of the arc with the option |length| or the option |delta|.
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
options & default & definition \\
\midrule
-\TOline{delta} {0}{Modifie l'angle de l'arc en l'augmentant symétriquement}
-\TOline{length}{1}{Modifie la longueur}
-\bottomrule
+\TOline{delta} {0 (deg)}{Modifies the angle of the arc by increasing it symmetrically (in degrees)}
+\TOline{length}{1 (cm)}{Changes the length (in cm)}
\end{tabular}
\end{NewMacroBox}
@@ -44,15 +45,17 @@ options & default & definition \\
\end{tikzpicture}
\end{tkzexample}
-\subsection{Multiples constructions \tkzcname{tkzCompasss}}
-\begin{NewMacroBox}{tkzCompasss}{\oarg{local options}\parg{pt1,pt2 pt3,pt4,...}}
-\tkzHandBomb\ Attention les arguments sont des listes de deux points. Cela permet d'économiser quelques lignes de codes.
-\begin{tabular}{lll}
+\subsection{Multiple constructions \tkzcname{tkzCompasss}}
+\begin{NewMacroBox}{tkzCompasss}{\oarg{local options}\parg{pt1,pt2 pt3,pt4,\dots}}%
+\tkzHandBomb\ Attention the arguments are lists of two points. This saves a few lines of code.
+
+\medskip
+\begin{tabular}{lll}%
\toprule
options & default & definition \\
\midrule
-\TOline{delta} {0}{Modifie l'angle de l'arc en l'augmentant symétriquement}
-\TOline{length}{1}{Modifie la longueur}
+\TOline{delta} {0}{Modifies the angle of the arc by increasing it symmetrically}
+\TOline{length}{1}{Changes the length}
\end{tabular}
\end{NewMacroBox}
@@ -75,21 +78,19 @@ options & default & definition \\
\end{tkzexample}
-\subsection{Macro de configuration \tkzcname{tkzSetUpCompass}}
+\subsection{Configuration macro \tkzcname{tkzSetUpCompass}}
-\begin{NewMacroBox}{tkzSetUpCompass}{\oarg{local options}}
-\begin{tabular}{lll}
+\begin{NewMacroBox}{tkzSetUpCompass}{\oarg{local options}}%
+\begin{tabular}{lll}%
options & default & definition \\
\midrule
-\TOline{line width} {0.4pt}{épaisseur du trait}
-\TOline{color} {black!50}{couleur du trait}
-\TOline{style} {solid}{style du trait solid, dashed,dotted,...}
+\TOline{line width} {0.4pt}{line thickness}
+\TOline{color} {black!50}{line colour}
+\TOline{style} {solid}{solid line style, dashed,dotted,...}
\end{tabular}
\end{NewMacroBox}
-\begin{tkzltxexample}[]
- \tkzSetUpCompass[color=blue,line width=.3 pt]
-\end{tkzltxexample}
+\subsubsection{Use of \tkzcname{tkzSetUpCompass}}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=.75,
diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-config.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-config.tex
index 7c5c13b33c..c4bdaa1a22 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-config.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-config.tex
@@ -1,23 +1,23 @@
\section{Customization}
-\subsection{\tkzcname{tkzSetUpLine}} \label{tkzsetupline}
-It is a macro that allows you to define the style of all the lines.
+\subsection{Use of \tkzcname{tkzSetUpLine}} \label{tkzsetupline}
It is a macro that allows you to define the style of all the lines.
-\begin{NewMacroBox}{tkzSetUpLine}{\oarg{local options}}
-\begin{tabular}{lll}
+\begin{NewMacroBox}{tkzSetUpLine}{\oarg{local options}}%
+\begin{tabular}{lll}%
options & default & definition \\
\midrule
-\TOline{color}{black}{colour of the construction arcs}
-\TOline{line width}{0.4pt}{thickness of the construction arcs}
-\TOline{style}{solid}{style des arcs de cercle de construction}
-\TOline{add}{.2 and .2}{changing the length of a segment}
+\TOline{color}{black}{colour of the construction lines}
+\TOline{line width}{0.4pt}{thickness of the construction lines}
+\TOline{style}{solid}{style of construction lines}
+\TOline{add}{.2 and .2}{changing the length of a line segment}
\end{tabular}
\end{NewMacroBox}
-\subsubsection{Example 1 change line width}
+\subsubsection{Example 1: change line width}
\begin{tkzexample}[latex=8cm,small]
\begin{tikzpicture}
+ \tkzSetUpLine[color=blue,line width=1pt]
\begin{scope}[rotate=-90]
\tkzDefPoint(10,6){C}
\tkzDefPoint( 0,6){A}
@@ -29,7 +29,6 @@ options & default & definition \\
\tkzMarkRightAngle[size=.4,fill=red!20](B,H,C)
\tkzDrawSegment[color=red](C,H)
\end{scope}
- \tkzSetUpLine[color=blue,line width=1pt]
\tkzLabelSegment[below](C,B){$a$}
\tkzLabelSegment[right](A,C){$b$}
\tkzLabelSegment[left](A,B){$c$}
@@ -44,7 +43,7 @@ options & default & definition \\
-\subsubsection{Example 2 change style of line}
+\subsubsection{Example 2: change style of line}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=.6]
@@ -52,17 +51,17 @@ options & default & definition \\
\tkzDefPoint(1,1){C} \tkzDefPoint(5,1){D}
\tkzDefPoint(1,2){E} \tkzDefPoint(6,2){F}
\tkzDefPoint(0,4){A'}\tkzDefPoint(3,4){B'}
- \tkzDrawSegments(A,B C,D E,F)
- \tkzDrawLine(A',B')
+ \tkzCalcLength[cm](C,D) \tkzGetLength{rCD}
+ \tkzCalcLength[cm](E,F) \tkzGetLength{rEF}
+ \tkzInterCC[R](A',\rCD cm)(B',\rEF cm)
+ \tkzGetPoints{I}{J}
\tkzSetUpLine[style=dashed,color=gray]
+ \tkzDrawLine(A',B')
\tkzCompass(A',B')
- \tkzCalcLength[cm](C,D) \tkzGetLength{rCD}
+ \tkzDrawSegments(A,B C,D E,F)
\tkzDrawCircle[R](A',\rCD cm)
- \tkzCalcLength[cm](E,F) \tkzGetLength{rEF}
\tkzDrawCircle[R](B',\rEF cm)
- \tkzInterCC[R](A',\rCD cm)(B',\rEF cm)
- \tkzGetPoints{I}{J}
- \tkzSetUpLine[color=red] \tkzDrawLine(A',B')
+ \tkzSetUpLine[color=red]
\tkzDrawSegments(A',I B',I)
\tkzDrawPoints(A,B,C,D,E,F,A',B',I,J)
\tkzLabelPoints(A,B,C,D,E,F,A',B',I,J)
@@ -70,7 +69,7 @@ options & default & definition \\
\end{tkzexample}
-\subsubsection{Example 3 extend lines}
+\subsubsection{Example 3: extend lines}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}
\tkzSetUpLine[add=.5 and .5]
@@ -80,21 +79,19 @@ options & default & definition \\
\end{tkzexample}
-\subsection{\tkzcname{tkzSetUpPoint}}
+\subsection{Points style}
+\begin{NewMacroBox}{tkzSetUpPoint}{\oarg{local options}}%
+\begin{tabular}{lll}%
+options & default & definition \\
+\midrule
+\TOline{color}{black}{point color}
+\TOline{size}{3pt}{point size}
+\TOline{fill}{black!50}{inside point color}
+\TOline{shape}{circle}{point shape circle or cross}
+\end{tabular}
+\end{NewMacroBox}
-
- \begin{NewMacroBox}{tkzSetUpCompass}{\oarg{local options}}
- \begin{tabular}{lll}
- options & default & definition \\
- \midrule
- \TOline{color}{black}{ point color}
- \TOline{size}{3pt}{point size}
- \TOline{fill}{black!50}{Inside point color}
- \TOline{shape}{circle}{point shape circle or cross}
- \end{tabular}
- \end{NewMacroBox}
-
-\subsubsection{use of\tkzcname{tkzSetUpPoint}}
+\subsubsection{Use of \tkzcname{tkzSetUpPoint}}
\begin{tkzexample}[latex=8cm,small]
\begin{tikzpicture}
\tkzSetUpPoint[shape = cross out,color=blue]
@@ -106,7 +103,7 @@ options & default & definition \\
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{use of\tkzcname{tkzSetUpPoint} inside a group}
+\subsubsection{Use of \tkzcname{tkzSetUpPoint} inside a group}
\begin{tkzexample}[latex=8cm,small]
\begin{tikzpicture}
\tkzInit[ymin=-0.5,ymax=3,xmin=-0.5,xmax=7]
@@ -128,10 +125,10 @@ options & default & definition \\
-\subsection{\tkzcname{tkzSetUpCompass}}
+\subsection{Use of \tkzcname{tkzSetUpCompass}}
-\begin{NewMacroBox}{tkzSetUpCompass}{\oarg{local options}}
-\begin{tabular}{lll}
+\begin{NewMacroBox}{tkzSetUpCompass}{\oarg{local options}}%
+\begin{tabular}{lll}%
options & default & definition \\
\midrule
\TOline{color}{black}{color of construction arcs}
@@ -140,9 +137,7 @@ options & default & definition \\
\end{tabular}
\end{NewMacroBox}
-\subsubsection{use of\tkzcname{tkzSetUpCompass} with bisector}
-
-
+\subsubsection{Use of \tkzcname{tkzSetUpCompass} with bisector}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=0.75]
\tkzDefPoints{0/1/A, 8/3/B, 3/6/C}
@@ -154,14 +149,13 @@ options & default & definition \\
\tkzShowLine[bisector,size=2,gap=3](A,C,B)
\tkzShowLine[bisector,size=2,gap=3](B,A,C)
\tkzShowLine[bisector,size=1,gap=2](C,B,A)
- \tkzDrawLines[add=0 and 0 ](B,b C,c)
- \tkzDrawLine[add=0 and -.4 ](A,a)
+ \tkzDrawLines[add=0 and 0 ](B,b)
+ \tkzDrawLines[add=0 and -.4 ](A,a C,c)
\tkzLabelPoints(A,B) \tkzLabelPoints[above](C)
\end{tikzpicture}
\end{tkzexample}
\subsubsection{Another example of of\tkzcname{tkzSetUpCompass}}
-
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=1,rotate=90]
\tkzDefPoints{0/1/A, 8/3/B, 3/6/C}
@@ -180,18 +174,16 @@ options & default & definition \\
\tkzDrawLines[add=0 and 0,color=red](B,b)
\tkzShowLine[bisector,size=2,gap=3](B,A,C)
\tkzShowLine[bisector,size=1,gap=3](C,B,A)
- \tkzLabelPoints(A,B,C)
+ \tkzLabelPoints(A,B)\tkzLabelPoints[left](C)
\end{tikzpicture}
\end{tkzexample}
\subsection{Own style}
You can set the normal style with |tkzSetUpPoint| and your own style
-\begin{tkzexample}[vbox,small]
+\begin{tkzexample}[latex=2cm,small]
\tkzSetUpPoint[color=blue!50!white, fill=gray!20!red!50!white]
-\tikzset{/tikz/mystyle/.style={
- color=blue!20!black,
- fill=blue!20}}
+\tikzset{/tikz/mystyle/.style={color=blue!20!black,fill=blue!20}}
\begin{tikzpicture}
\tkzDefPoint(0,0){O}
\tkzDefPoint(0,1){A}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-exemples.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-exemples.tex
index 4a380e355f..fb591ba5e0 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-exemples.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-exemples.tex
@@ -1,33 +1,39 @@
-\section{Des exemples}
-\subsection{Quelques exemples intéressants}
+\section{Some examples}
+\subsection{Some interesting examples}
-\subsubsection{Triangles isocèles semblables}
+\subsubsection{Similar isosceles triangles}
-Ce qui suit provient de l'excellent site \textbf{Descartes et les Mathématiques}. Je n'ai pas modifié le texte et je ne suis l'auteur que de la programmation des figures.
+The following is from the excellent site \textbf{Descartes et les Mathématiques}. I did not modify the text and I am only the author of the programming of the figures.
\url{http://debart.pagesperso-orange.fr/seconde/triangle.html}
-Bibliographie : Géométrie au Bac - Tangente, hors série no 8 - Exercice 11, page 11
+Bibliography:
-Élisabeth Busser et Gilles Cohen : 200 nouveaux problèmes du Monde - POLE 2007
+\begin{itemize}
-Affaire de logique n° 364 - Le Monde 17 février 2004
+\item Géométrie au Bac - Tangente, special issue no. 8 - Exercise 11, page 11
-Deux énoncés ont été proposés, l'un par la revue \emph{Tangente}, et l'autre par le journal \emph{Le Monde}.
+\item Elisabeth Busser and Gilles Cohen: 200 nouveaux problèmes du "Monde" - POLE 2007 (200 new problems of "Le Monde")
+
+
+\item Affaire de logique n° 364 - Le Monde February 17, 2004
+\end{itemize}
+
+
+Two statements were proposed, one by the magazine \textit{Tangente} and the other by \textit{Le Monde}.
\vspace*{2cm}
-\emph{Rédaction de la revue Tangente} : \textcolor{orange}{On construit deux triangles isocèles semblables AXB et BYC de sommets principaux X et Y, tels que A, B et C soient alignés et que ces triangles soient « indirect ». Soit $\alpha$ l'angle au sommet $\widehat{AXB}$ = $\widehat{BYC}$. On construit ensuite un troisième triangle isocèle XZY semblable aux deux premiers, de sommet principal Z et « indirect ».\\
-On demande de démontrer que le point Z appartient à la droite (AC).}
+\emph{Editor of the magazine "Tangente"}: \textcolor{orange}{Two similar isosceles triangles $AXB$ and $BYC$ are constructed with main vertices $X$ and $Y$, such that $A$, $B$ and $C$ are aligned and that these triangles are "indirect". Let $\alpha$ be the angle at vertex $\widehat{AXB}$ = $\widehat{BYC}$. We then construct a third isosceles triangle $XZY$ similar to the first two, with main vertex $Z$ and "indirect".
+We ask to demonstrate that point $Z$ belongs to the straight line $(AC)$.}
\vspace*{2cm}
-\emph{Rédaction du Monde} : \textcolor{orange}{On construit deux triangles isocèles semblables AXB et BYC de sommets principaux X et Y, tels que A, B et C soient alignés et que ces triangles soient « indirect ». Soit $\alpha$ l'angle au sommet $\widehat{AXB}$ = $\widehat{BYC}$. Le point Z du segment [AC] est équidistant des deux sommets X et Y.\\
-Sous quel angle voit-il ces deux sommets ?}
+\emph{Editor of "Le Monde"}: \textcolor{orange}{We construct two similar isosceles triangles $AXB$ and $BYC$ with principal vertices $X$ and $Y$, such that $A$, $B$ and $C$ are aligned and that these triangles are "indirect". Let $\alpha$ be the angle at vertex $\widehat{AXB}$ = $\widehat{BYC}$. The point Z of the line segment $[AC]$ is equidistant from the two vertices $X$ and $Y$.\\
+At what angle does he see these two vertices?}
-\vspace*{2cm} Les constructions et leurs codes associés sont sur les deux pages suivantes, mais vous pouvez chercher avant de regarder. La programmation respecte (il me semble ...), mon raisonnement dans les deux cas.
-\newpage
+\vspace*{2cm} The constructions and their associated codes are on the next two pages, but you can search before looking. The programming respects (it seems to me ...) my reasoning in both cases.
- \subsubsection{version revue "Tangente"}
+ \subsubsection{Revised version of "Tangente"}
\begin{tkzexample}[]
\begin{tikzpicture}[scale=.8,rotate=60]
\tkzDefPoint(6,0){X} \tkzDefPoint(3,3){Y}
@@ -47,8 +53,8 @@ Sous quel angle voit-il ces deux sommets ?}
\tkzLabelPoints(A,B,C,Z) \tkzLabelPoints[above right](X,Y,O)
\end{tikzpicture}
\end{tkzexample}
-\newpage
-\subsubsection{version "Le Monde"}
+
+\subsubsection{"Le Monde" version}
\begin{tkzexample}[]
\begin{tikzpicture}[scale=1.25]
@@ -74,13 +80,13 @@ Sous quel angle voit-il ces deux sommets ?}
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Hauteurs d'un triangle}
+\subsubsection{Triangle altitudes}
-Ce qui suit provient encore de l'excellent site \textbf{Descartes et les Mathématiques}.
+The following is again from the excellent site \textbf{Descartes et les Mathématiques} (Descartes and the Mathematics).
\url{http://debart.pagesperso-orange.fr/geoplan/geometrie_triangle.html}
-Les trois hauteurs d'un triangle sont concourantes au même point H.
+The three altitudes of a triangle intersect at the same H-point.
\begin{tkzexample}[latex=7cm]
\begin{tikzpicture}[scale=.8]
@@ -109,7 +115,7 @@ Les trois hauteurs d'un triangle sont concourantes au même point H.
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Hauteurs - autre construction}
+\subsubsection{Altitudes - other construction}
\begin{tkzexample}[latex=7cm]
\begin{tikzpicture}[scale=.75]
@@ -140,10 +146,9 @@ Les trois hauteurs d'un triangle sont concourantes au même point H.
\end{tikzpicture}
\end{tkzexample}
-\newpage
\subsection{Different authors}
-\subsubsection{ Square root of the integers }
+\subsubsection{ Square root of the integers}
How to get $1$, $\sqrt{2}$, $\sqrt{3}$ with a rule and a compass.
\begin{tkzexample}[latex=7cm,small]
@@ -159,38 +164,12 @@ How to get $1$, $\sqrt{2}$, $\sqrt{3}$ with a rule and a compass.
\end{tkzexample}
-\subsubsection{Circle and tangent}
-We have a point A $(8,2)$, a circle with center A and radius=3cm and a line
- $\delta$ $y=4$. The line intercepts the circle at B. We want to draw the tangent at the circle in B.
-
-
-\begin{tkzexample}[]
-\begin{tikzpicture}
- \edef\alphaR{\fpeval{asin(2/3)}}
- \edef\xB{8-3*cos(\alphaR)}
- \tkzDrawX[noticks,label=$(d)$]
- \tkzDefPoint["$A$" above right](8,2){A}
- \tkzDefPoint[color=red,"$O$" above right](0,0){O}
- \tkzDefPoint["$B$" above left](\xB,4){B}
- \tkzDefLine[orthogonal=through B](A,B) \tkzGetPoint{b}
- \tkzDefPoint(1,0){i}
- \tkzInterLL(B,b)(O,i) \tkzGetPoint{B'}
- \tkzDrawSegment[line width=1pt](A,B)
- \tkzHLine[color=red,style=dashed]{4}
- \tkzText[above](12,4){$\delta$}
- \tkzDrawCircle[R,color=blue,line width=.8pt](A,3 cm)
- \tkzDrawPoint(B')
- \tkzDrawLine(B,B')
- \end{tikzpicture}
-\end{tkzexample}
-
-
\subsubsection{About right triangle}
-We have a segment $[AB]$ and we want to determine a point $C$ such as $AC=8 cm$ and $ABC$ is a right triangle in $B$.
+We have a segment $[AB]$ and we want to determine a point $C$ such that $AC=8$~cm and $ABC$ is a right triangle in $B$.
\begin{tkzexample}[latex=7cm]
-\begin{tikzpicture}
+\begin{tikzpicture}[scale=.5]
\tkzDefPoint["$A$" left](2,1){A}
\tkzDefPoint(6,4){B}
\tkzDrawSegment(A,B)
@@ -211,7 +190,7 @@ We have a segment $[AB]$ and we want to determine a point $C$ such as $AC=8 cm$
\subsubsection{Archimedes}
This is an ancient problem proved by the great Greek mathematician Archimedes .
-The figure below shows a semicircle, with diameter $AB$. A tangent line is drawn and touches the semicircle at $B$. An other tangent line at a point, $C$, on the semicircle is drawn. We project the point $C$ on the segment$[AB]$ on a point $D$ . The two tangent lines intersect at the point $T$.
+The figure below shows a semicircle, with diameter $AB$. A tangent line is drawn and touches the semicircle at $B$. An other tangent line at a point, $C$, on the semicircle is drawn. We project the point $C$ on the line segment $[AB]$ on a point $D$. The two tangent lines intersect at the point $T$.
Prove that the line $(AT)$ bisects $(CD)$
@@ -235,7 +214,7 @@ Prove that the line $(AT)$ bisects $(CD)$
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Exemple : Dimitris Kapeta}
+\subsubsection{Example: Dimitris Kapeta}
You need in this example to use \tkzname{mkpos=.2} with \tkzcname{tkzMarkAngle} because the measure of $ \widehat{CAM}$ is too small.
Another possiblity is to use \tkzcname{tkzFillAngle}.
@@ -266,9 +245,9 @@ Another possiblity is to use \tkzcname{tkzFillAngle}.
\end{tkzexample}
-\subsubsection{Example : John Kitzmiller }
+\subsubsection{Example 1: John Kitzmiller }
-Prove $\bigtriangleup LKJ$ is equilateral
+Prove that $\bigtriangleup LKJ$ is equilateral.
\begin{tkzexample}[vbox,small]
@@ -285,23 +264,26 @@ Prove $\bigtriangleup LKJ$ is equilateral
\tkzInterLL(B,B')(A,A') \tkzGetPoint{L}
\tkzLabelPoint[above](C){C}
\tkzDrawPolygon(A,B,C) \tkzDrawSegments(A,J B,L C,K)
- \tkzMarkAngles[fill= orange,size=1cm,opacity=.3](J,A,C K,C,B L,B,A)
- \tkzLabelPoint[right](J){J}
- \tkzLabelPoint[below](K){K}
- \tkzLabelPoint[above left](L){L}
- \tkzMarkAngles[fill=orange, opacity=.3,thick,size=1,](A,C,J C,B,K B,A,L)
- \tkzMarkAngles[fill=green, size=1, opacity=.5](A,C,J C,B,K B,A,L)
+ \tkzMarkAngles[size=1 cm](J,A,C K,C,B L,B,A)
+ \tkzMarkAngles[thick,size=1 cm](A,C,J C,B,K B,A,L)
+ \tkzMarkAngles[opacity=.5](A,C,J C,B,K B,A,L)
+ \tkzFillAngles[fill= orange,size=1 cm,opacity=.3](J,A,C K,C,B L,B,A)
+ \tkzFillAngles[fill=orange, opacity=.3,thick,size=1,](A,C,J C,B,K B,A,L)
+ \tkzFillAngles[fill=green, size=1, opacity=.5](A,C,J C,B,K B,A,L)
\tkzFillPolygon[color=yellow, opacity=.2](J,A,C)
\tkzFillPolygon[color=yellow, opacity=.2](K,B,C)
\tkzFillPolygon[color=yellow, opacity=.2](L,A,B)
\tkzDrawSegments[line width=3pt,color=cyan,opacity=0.4](A,J C,K B,L)
\tkzDrawSegments[line width=3pt,color=red,opacity=0.4](A,L B,K C,J)
\tkzMarkSegments[mark=o](J,K K,L L,J)
+ \tkzLabelPoint[right](J){J}
+ \tkzLabelPoint[below](K){K}
+ \tkzLabelPoint[above left](L){L}
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Exemple : John Kitzmiller }
-Prove $\dfrac{AC}{CE}=\dfrac{BD}{DF} \qquad$
+\subsubsection{Example 2: John Kitzmiller }
+Prove that $\dfrac{AC}{CE}=\dfrac{BD}{DF}$.
Another interesting example from John, you can see how to use some extra options like \tkzname{decoration} and \tkzname{postaction} from \TIKZ\ with \tkzname{tkz-euclide}.
@@ -327,8 +309,8 @@ Another interesting example from John, you can see how to use some extra options
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Exemple : John Kitzmiller }
-Prove $\dfrac{BC}{CD}=\dfrac{AB}{AD} \qquad$ (Angle Bisector)
+\subsubsection{Example 3: John Kitzmiller }
+Prove that $\dfrac{BC}{CD}=\dfrac{AB}{AD} \qquad$ (Angle Bisector).
\begin{tkzexample}[vbox,small]
\begin{tikzpicture}[scale=2]
@@ -347,10 +329,13 @@ Prove $\dfrac{BC}{CD}=\dfrac{AB}{AD} \qquad$ (Angle Bisector)
\tkzDrawSegments[color=magenta, line width=3pt, opacity=0.4](B,C P,A)
\tkzDrawSegments[color=teal, line width=3pt, opacity=0.4](C,D A,D)
\tkzDrawSegments[color=magenta, line width=3pt, opacity=0.4](A,B)
- \tkzMarkAngles[size=0.7](B,A,C C,A,D)
- \tkzMarkAngles[size=0.7, fill=green, opacity=0.5](B,A,C A,B,P)
- \tkzMarkAngles[size=0.7, fill=yellow, opacity=0.3](B,P,A C,A,D)
- \tkzMarkAngles[size=0.7, fill=green, opacity=0.6](B,A,C A,B,P B,P,A C,A,D)
+ \tkzMarkAngles[size=3mm](B,A,C C,A,D)
+ \tkzMarkAngles[size=3mm](B,A,C A,B,P)
+ \tkzMarkAngles[size=3mm](B,P,A C,A,D)
+ \tkzMarkAngles[size=3mm](B,A,C A,B,P B,P,A C,A,D)
+ \tkzFillAngles[fill=green, opacity=0.5](B,A,C A,B,P)
+ \tkzFillAngles[fill=yellow, opacity=0.3](B,P,A C,A,D)
+ \tkzFillAngles[fill=green, opacity=0.6](B,A,C A,B,P B,P,A C,A,D)
\tkzLabelAngle[pos=1](B,A,C){1} \tkzLabelAngle[pos=1](C,A,D){2}
\tkzLabelAngle[pos=1](A,B,P){3} \tkzLabelAngle[pos=1](B,P,A){4}
\tkzMarkSegments[mark=|](A,B A,P)
@@ -358,8 +343,8 @@ Prove $\dfrac{BC}{CD}=\dfrac{AB}{AD} \qquad$ (Angle Bisector)
\end{tkzexample}
-\subsubsection{Exemple : author John Kitzmiller }
-Prove $\overline{AG}\cong\overline{EF} \qquad$ (Detour)
+\subsubsection{Example 4: author John Kitzmiller }
+Prove that $\overline{AG}\cong\overline{EF} \qquad$ (Detour).
\begin{tkzexample}[vbox,small]
\begin{tikzpicture}[scale=2]
@@ -370,10 +355,14 @@ Prove $\overline{AG}\cong\overline{EF} \qquad$ (Detour)
\tkzFillPolygon[yellow, opacity=0.4](D,F,C)
\tkzFillPolygon[blue, opacity=0.3](A,B,G)
\tkzFillPolygon[blue, opacity=0.3](E,D,F)
- \tkzMarkAngles[size=0.6,fill=green](B,G,A D,F,E)
- \tkzMarkAngles[size=0.6,fill=orange](B,C,G D,C,F)
- \tkzMarkAngles[size=0.6,fill=yellow](G,B,C F,D,C)
- \tkzMarkAngles[size=0.6,fill=red](A,B,G E,D,F)
+ \tkzMarkAngles[size=0.5 cm](B,G,A D,F,E)
+ \tkzMarkAngles[size=0.5 cm](B,C,G D,C,F)
+ \tkzMarkAngles[size=0.5 cm](G,B,C F,D,C)
+ \tkzMarkAngles[size=0.5 cm](A,B,G E,D,F)
+ \tkzFillAngles[size=0.5 cm,fill=green](B,G,A D,F,E)
+ \tkzFillAngles[size=0.5 cm,fill=orange](B,C,G D,C,F)
+ \tkzFillAngles[size=0.5 cm,fill=yellow](G,B,C F,D,C)
+ \tkzFillAngles[size=0.5 cm,fill=red](A,B,G E,D,F)
\tkzMarkSegments[mark=|](B,C D,C) \tkzMarkSegments[mark=s||](G,C F,C)
\tkzMarkSegments[mark=o](A,G E,F) \tkzMarkSegments[mark=s](B,G D,F)
\tkzDrawSegment[color=red](A,E)
@@ -383,7 +372,7 @@ Prove $\overline{AG}\cong\overline{EF} \qquad$ (Detour)
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Example from Indonesia}
+\subsubsection{Example 1: from Indonesia}
\begin{tkzexample}[vbox,small]
\begin{tikzpicture}[scale=3]
@@ -404,7 +393,7 @@ Prove $\overline{AG}\cong\overline{EF} \qquad$ (Detour)
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Another example from Indonesia}
+\subsubsection{Example 2: from Indonesia}
\begin{tkzexample}[vbox,small]
\begin{tikzpicture}[pol/.style={fill=brown!40,opacity=.5},
seg/.style={tkzdotted,color=gray},
diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-installation.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-installation.tex
index a7ea937443..bcbc555fd7 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-installation.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-installation.tex
@@ -1,17 +1,17 @@
\section{Installation}
-\tkzNamePack{tkz-euclide} and \tkzNamePack{tkz-base} are now on the server of the \tkzname{CTAN}\footnote{\tkzNamePack{tkz-base} and \tkzNamePack{tkz-euclide} are part of \NameDist{TeXLive} and \tkzname{tlmgr} allows you to install them. These packages are also part of \NameDist{MikTeX} under \NameSys{Windows}}. If you want to test a beta version, just put the following files in a texmf folder that your system can find.
-You will have to check several points :
+\tkzNamePack{tkz-euclide} and \tkzNamePack{tkz-base} are now on the server of the \tkzname{CTAN}\footnote{\tkzNamePack{tkz-base} and \tkzNamePack{tkz-euclide} are part of \NameDist{TeXLive} and \tkzname{tlmgr} allows you to install them. These packages are also part of \NameDist{MiKTeX} under \NameSys{Windows}.}. If you want to test a beta version, just put the following files in a texmf folder that your system can find.
+You will have to check several points:
\begin{itemize}\setlength{\itemsep}{5pt}
\item The \tkzNamePack{tkz-base} and \tkzNamePack{tkz-euclide} folders must be located on a path recognized by \tkzname{latex}.
-\item The \tkzNamePack{xfp} {footnote{\tkzNamePack{xfp}} replaces \tkzNamePack{fp}}, \tkzNamePack{numprint} , \tkzNamePack{tikz 3.00} must be installed as they are mandatory, for the proper functioning of \tkzNamePack{tkz-euclide}.
+\item The \tkzNamePack{xfp}\footnote{\tkzNamePack{xfp} replaces \tkzNamePack{fp}.}, \tkzNamePack{numprint} and \tkzNamePack{tikz 3.00} must be installed as they are mandatory, for the proper functioning of \tkzNamePack{tkz-euclide}.
\item This documentation and all examples were obtained with \tkzname{lualatex-dev} but \tkzname{pdflatex} should be suitable.
\end{itemize}
-\subsection{List of folder files \tkzname{tkzbase} et \tkzname{tkzeuclide}}
+\subsection{List of folder files \tkzname{tkzbase} and \tkzname{tkzeuclide}}
-In the folder \tkzname{base} :
+In the folder \tkzname{base}:
\begin{itemize}
\item \tkzname{tkz-base.cfg}
@@ -25,7 +25,6 @@ In the folder \tkzname{base} :
\item \tkzname{tkz-tools-arith.tex}
\item \tkzname{tkz-tools-base.tex}
\item \tkzname{tkz-tools-BB.tex}
-\item \tkzname{tkz-tools-math.tex}
\item \tkzname{tkz-tools-misc.tex}
\item \tkzname{tkz-tools-modules.tex}
\item \tkzname{tkz-tools-print.tex}
@@ -33,7 +32,7 @@ In the folder \tkzname{base} :
\item \tkzname{tkz-tools-utilities.tex}
\end{itemize}
-In the \tkzname{euclide} :
+In the folder \tkzname{euclide}:
\begin{itemize}
\item \tkzname{tkz-euclide.sty}
@@ -44,6 +43,7 @@ In the \tkzname{euclide} :
\item \tkzname{tkz-obj-eu-draw-circles.tex}
\item \tkzname{tkz-obj-eu-draw-lines.tex}
\item \tkzname{tkz-obj-eu-draw-polygons.tex}
+\item \tkzname{tkz-obj-eu-draw-triangles.tex}
\item \tkzname{tkz-obj-eu-lines.tex}
\item \tkzname{tkz-obj-eu-points-by.tex}
\item \tkzname{tkz-obj-eu-points-rnd.tex}
@@ -52,6 +52,11 @@ In the \tkzname{euclide} :
\item \tkzname{tkz-obj-eu-polygons.tex}
\item \tkzname{tkz-obj-eu-protractor.tex}
\item \tkzname{tkz-obj-eu-sectors.tex}
+\item \tkzname{tkz-obj-eu-show.tex}
+\item \tkzname{tkz-obj-eu-triangles.tex}
+\item \tkzname{tkz-tools-angles.tex}
+\item \tkzname{tkz-tools-intersections.tex}
+\item \tkzname{tkz-tools-math.tex}
\end{itemize}
\tkzHandBomb\ Now \tkzname{tkz-euclide} loads all the files.
\endinput
diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-intersec.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-intersec.tex
index 70492509f7..3f7619188d 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-intersec.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-intersec.tex
@@ -4,14 +4,11 @@ It is possible to determine the coordinates of the points of intersection betwee
The associated commands have no optional arguments and the user must determine the existence of the intersection points himself.
-\subsection{Intersection de deux droites}
-
- \begin{NewMacroBox}{tkzInterLL}{\parg{$A,B$}\parg{$C,D$}}
+\subsection{Intersection of two straight lines}
+\begin{NewMacroBox}{tkzInterLL}{\parg{$A,B$}\parg{$C,D$}}%
Defines the intersection point \tkzname{tkzPointResult} of the two lines $(AB)$ and $(CD)$. The known points are given in pairs (two per line) in brackets, and the resulting point can be retrieved with the macro \tkzcname{tkzDefPoint}.
-
\end{NewMacroBox}
-\medskip
\subsubsection{Example of intersection between two straight lines}
\begin{tkzexample}[latex=7cm,small]
@@ -28,37 +25,36 @@ Defines the intersection point \tkzname{tkzPointResult} of the two lines $(AB)$
\end{tikzpicture}
\end{tkzexample}
-\subsection{Intersection of a straight line and a circle} % (fold)
-\label{sub:intersection_d_une_droite_et_d_un_cercle}
+\subsection{Intersection of a straight line and a circle}
As before, the line is defined by a couple of points. The circle
is also defined by a couple:
\begin{itemize}
\item $(O,C)$ which is a pair of points, the first is the centre and the second is any point on the circle.
-\item $(O,r)$ The $r$ measure is the shelf measure. It is expressed soint en \emph{cm}, that is to say in \emph{pt}.
+\item $(O,r)$ The $r$ measure is the radius measure. The unit can be the \emph{cm} or \emph{pt}.
\end{itemize}
-\begin{NewMacroBox}{tkzInterLC}{\oarg{options}\parg{$A,B$}\parg{$O,C$} or \parg{$O,r$} or \parg{$O,C,D$}}
+\begin{NewMacroBox}{tkzInterLC}{\oarg{options}\parg{$A,B$}\parg{$O,C$} or \parg{$O,r$} or \parg{$O,C,D$}}%
So the arguments are two couples.
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
options & default & definition \\
\midrule
\TOline{N} {N} { (O,C) determines the circle}
-\TOline{R} {N} { (O, 1 cm) ou (O, 120 pt)}
+\TOline{R} {N} { (O, 1 cm) or (O, 120 pt)}
\TOline{with nodes}{N} { (O,C,D) CD is a radius}
\bottomrule
\end{tabular}
\medskip
-The macro defines the intersection points $I$ and $J$ of the line $(AB)$ and the center circle $O$ with radius $r$ if they exist; otherwise, an error will be reported in the .log file.
+The macro defines the intersection points $I$ and $J$ of the line $(AB)$ and the center circle $O$ with radius $r$ if they exist; otherwise, an error will be reported in the |.log| file.
\end{NewMacroBox}
\subsubsection{Simple example of a line-circle intersection}
-In the following example, the drawing of the circle uses two points and the intersection of the straight line and the circle uses two pairs of points
+In the following example, the drawing of the circle uses two points and the intersection of the straight line and the circle uses two pairs of points:
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=.75]
@@ -77,7 +73,7 @@ In the following example, the drawing of the circle uses two points and the inte
\end{tkzexample}
\subsubsection{More complex example of a line-circle intersection}
-\url{http://gogeometry.com/problem/p190_tangent_circle}
+Figure from \url{http://gogeometry.com/problem/p190_tangent_circle}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=.75]
@@ -104,8 +100,6 @@ In the following example, the drawing of the circle uses two points and the inte
\end{tikzpicture}
\end{tkzexample}
-
-\newpage
\subsubsection{Circle defined by a center and a measure, and special cases}
Let's look at some special cases like straight lines tangent to the circle.
@@ -128,7 +122,7 @@ Let's look at some special cases like straight lines tangent to the circle.
\end{tkzexample}
\subsubsection{More complex example}
-\tkzHandBomb\ Be careful with the syntax. First of all, calculations for the points can be done during the passage of the arguments, but the syntax of \tkzname{xfp} must be respected. You can see that I use the term \tkzname{pi} because \NamePack{xfp} works in radians!. Furthermore, when calculations require the use of parentheses, they must be inserted in a group... \TEX \{ \dots \}.
+\tkzHandBomb\ Be careful with the syntax. First of all, calculations for the points can be done during the passage of the arguments, but the syntax of \tkzname{xfp} must be respected. You can see that I use the term \tkzname{pi} because \NamePack{xfp} can work with radians. You can also work with degrees but in this case, you need to use specific commands like |sind| or |cosd|. Furthermore, when calculations require the use of parentheses, they must be inserted in a group... \TEX \{ \dots \}.
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=1.25]
@@ -152,15 +146,15 @@ Let's look at some special cases like straight lines tangent to the circle.
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Calculation of radius dimension}
+\subsubsection{Calculation of radius example 1}
With \tkzname{pgfmath} and \tkzcname{pgfmathsetmacro}
The radius measurement may be the result of a calculation that is not done within the intersection macro, but before.
A length can be calculated in several ways. It is possible of course,
to use the module \tkzname{pgfmath} and the macro \tkzcname{pgfmathsetmacro}. In some cases, the results obtained are not precise enough, so the following calculation $0.0002 \div 0.0001$ gives $1.98$ with pgfmath while xfp will give $2$.
-\subsubsection{Calculation of radius dimension 1}
-With \tkzname{xfp} and \tkzcname{fpeval}
+\subsubsection{Calculation of radius example 2}
+With \tkzname{xfp} and \tkzcname{fpeval}:
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}
@@ -177,10 +171,10 @@ With \tkzname{xfp} and \tkzcname{fpeval}
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Calculation of radius dimension 2}
+\subsubsection{Calculation of radius example 3}
With \TEX\ and \tkzcname{tkzLength}.
- This dimension was created with \tkzcname{newdimen}. 2 cm has been transformed into points. It is of course possible to use \TEX to calculate.
+ This dimension was created with \tkzcname{newdimen}. 2 cm has been transformed into points. It is of course possible to use \TEX\ to calculate.
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}
@@ -231,32 +225,26 @@ A Sangaku look! It is a question of proving that one can inscribe in a half-disc
\end{tikzpicture}
\end{tkzexample}
-\clearpage \newpage
\subsection{Intersection of two circles}
The most frequent case is that of two circles defined by their center and a point, but as before the option \tkzname{R} allows to use the radius measurements.
-\begin{NewMacroBox}{tkzInterCC}{\oarg{options}\parg{$O,A/r$}\parg{$O',A'/r'$}\marg{$I$}\marg{$J$}}
-
-\medskip
-\begin{tabular}{lll}
-\toprule
-options & defect & definition \\
+\begin{NewMacroBox}{tkzInterCC}{\oarg{options}\parg{$O,A$}\parg{$O',A'$} or \parg{$O,r$}\parg{$O',r'$} or \parg{$O,A,B$} \parg{$O',C,D$}}%
+\begin{tabular}{lll}%
+options & default & definition \\
\midrule
-\TOline{N} {N} {OA and O'A' are radii, O and O' are the centres}
-\TOline{R} {N} {$r$ et $r'$ shave dimensions and measure the radii}
-\TOline{with nodes} {N} {$r$ et $r'$ are dimensions and measure the radii}
+\TOline{N} {N} {$OA$ and $O'A'$ are radii, $O$ and $O'$ are the centres}
+\TOline{R} {N} {$r$ and $r'$ are dimensions and measure the radii}
+\TOline{with nodes} {N} { in (A,A,C)(C,B,F) AC and BF give the radii. }
+\bottomrule
\end{tabular}
\medskip
-
This macro defines the intersection point(s) $I$ and $J$ of the two center circles $O$ and $O'$. If the two circles do not have a common point then the macro ends with an error that is not handled. \\
It is also possible to use directly \tkzcname{tkzInterCCN} and \tkzcname{tkzInterCCR}.
\end{NewMacroBox}
-
\subsubsection{Construction of an equilateral triangle}
-
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[trim left=-1cm,scale=.5]
\tkzDefPoint(1,1){A}
@@ -275,7 +263,6 @@ It is also possible to use directly \tkzcname{tkzInterCCN} and \tkzcname{tkzInte
\end{tkzexample}
\subsubsection{Example a mediator}
-
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=.5]
\tkzDefPoint(0,0){A}
@@ -290,7 +277,6 @@ It is also possible to use directly \tkzcname{tkzInterCCN} and \tkzcname{tkzInte
\end{tkzexample}
\subsubsection{An isosceles triangle.}
-
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[rotate=120,scale=.75]
\tkzDefPoint(1,2){A}
@@ -345,26 +331,7 @@ It is also possible to use directly \tkzcname{tkzInterCCN} and \tkzcname{tkzInte
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Angle trisection}
-
-\begin{tkzexample}[latex=7cm,small]
-\begin{tikzpicture}
- \tikzset{arc/.style={color=gray,style=dashed}}
- \tkzDefPoints{0/0/a,0/5/I,5/0/J}
- \tkzDrawArc[angles](O,I)(0,90)
- \tkzDrawArc[angles,/tikz/arc](I,O)(90,180)
- \tkzDrawArc[angles,/tikz/arc](J,O)(-90,0)
- \tkzInterCC(O,I)(I,O)\tkzGetPoints{B}{C}
- \tkzInterCC(O,I)(J,O)\tkzGetPoints{D}{A}
- \tkzInterCC(I,O)(J,O)\tkzGetPoints{L}{K}
- \tkzDrawPoints(A,B,K)
- \foreach \point in {I,A,B,J,K}{%
- \tkzDrawSegment(O,\point)}
-\end{tikzpicture}
-\end{tkzexample}
-
-
-\subsubsection{with the option \tkzimp{with nodes}}
+\subsubsection{With the option \tkzimp{with nodes}}
\begin{tkzexample}[latex=6cm,small]
\begin{tikzpicture}[scale=.5]
\tkzDefPoints{0/0/a,0/5/B,5/0/C}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-lines.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-lines.tex
index 6ae71f7cb5..45e4a3d3fd 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-lines.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-lines.tex
@@ -5,50 +5,65 @@ It is of course essential to draw straight lines, but before this can be done, i
\subsection{Definition of straight lines}
-\begin{NewMacroBox}{tkzDefLine}{\oarg{local options}\parg{pt1,pt2} ou \parg{pt1,pt2,pt3}}
-The argument is a list of two or three points. Depending on the case, the macro defines one or two points necessary to obtain the line sought. Either the macro \tkzcname{tkzGetPoint} or the macro \tkzcname{tkzGetPoints} must be used.
+\begin{NewMacroBox}{tkzDefLine}{\oarg{local options}\parg{pt1,pt2} or \parg{pt1,pt2,pt3}}%
+The argument is a list of two or three points. Depending on the case, the macro defines one or two points necessary to obtain the line sought. Either the macro \tkzcname{tkzGetPoint} or the macro \tkzcname{tkzGetPoints} must be used.
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
-options & default & definition \\
+arguments & example & explication \\
\midrule
-\TOline{mediator}{}{mediator. Two points are defined}
-\TOline{perpendicular=through\ldots}{}{perpendicular to a straight line passing through a point}
-\TOline{orthogonal=through\ldots}{}{see above }
-\TOline{parallel=through\ldots}{}{parallel to a straight line passing through a point}
-\TOline{bisector}{}{bisector of an angle defined by three points}
-\TOline{bisector out}{}{Exterior Angle Bisector}
-\TOline{tangent=at\ldots }{}{tangent to a circle at a given point}
-\TOline{tangent=from\ldots}{}{tangent to a circle(O,A) passing through a given point}
-\TOline{tangent=from with R\ldots}{}{tangent to a circle(O,r) passing through a given point}
-\TOline{K}{1}{Coefficient for the perpendicular line}
- \bottomrule
+\TAline{\parg{pt1,pt2}}{\parg{A,B}} {[mediator](A,B)}
+\TAline{\parg{pt1,pt2,pt3}}{\parg{A,B,C}} {[bisector](B,A,C)}
+\end{tabular}
+
+\medskip
+\begin{tabular}{lll}%
+\toprule
+options & default & definition \\
+\TOline{mediator}{}{two points are defined}
+\TOline{perpendicular=through\dots}{mediator}{perpendicular to a straight line passing through a point}
+\TOline{orthogonal=through\dots}{mediator}{see above }
+\TOline{parallel=through\dots}{mediator}{parallel to a straight line passing through a point}
+\TOline{bisector}{mediator}{bisector of an angle defined by three points}
+\TOline{bisector out}{mediator}{Exterior Angle Bisector}
+\TOline{K}{1}{coefficient for the perpendicular line}
+\TOline{normed}{false}{normalizes the created segment}
\end{tabular}
\end{NewMacroBox}
\subsubsection{Example with \tkzname{mediator}}
\begin{tkzexample}[latex=5 cm,small]
\begin{tikzpicture}[rotate=25]
- \tkzInit
- \tkzDefPoints{-2/0/A,1/2/B}
- \tkzDefLine[mediator](A,B) \tkzGetPoints{C}{D}
- \tkzDefPointWith[linear,K=.75](C,D) \tkzGetPoint{D}
- \tkzDefMidPoint(A,B) \tkzGetPoint{I}
- \tkzFillPolygon[color=orange!30](A,C,B,D)
- \tkzDrawSegments(A,B C,D)
- \tkzMarkRightAngle(B,I,C)
- \tkzDrawSegments(D,B D,A)
- \tkzDrawSegments(C,B C,A)
+ \tkzDefPoints{-2/0/A,1/2/B}
+ \tkzDefLine[mediator](A,B) \tkzGetPoints{C}{D}
+ \tkzDefPointWith[linear,K=.75](C,D) \tkzGetPoint{D}
+ \tkzDefMidPoint(A,B) \tkzGetPoint{I}
+ \tkzFillPolygon[color=orange!30](A,C,B,D)
+ \tkzDrawSegments(A,B C,D)
+ \tkzMarkRightAngle(B,I,C)
+ \tkzDrawSegments(D,B D,A)
+ \tkzDrawSegments(C,B C,A)
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Example avec \tkzname{orthogonal} et \tkzname{parallel}}
+\subsubsection{Example with \tkzname{bisector} and \tkzname{normed}}
+\begin{tkzexample}[latex=7 cm,small]
+\begin{tikzpicture}[rotate=25,scale=.75]
+ \tkzDefPoints{0/0/C, 2/-3/A, 4/0/B}
+ \tkzDefLine[bisector,normed](B,A,C) \tkzGetPoint{a}
+ \tkzDrawLines[add= 0 and .5](A,B A,C)
+ \tkzShowLine[bisector,gap=4,size=2,color=red](B,A,C)
+ \tkzDrawLines[blue!50,dashed,add= 0 and 3](A,a)
+\end{tikzpicture}
+\end{tkzexample}
+
+\subsubsection{Example with \tkzname{orthogonal} and \tkzname{parallel}}
\begin{tkzexample}[latex=5 cm,small]
\begin{tikzpicture}
\tkzDefPoints{-1.5/-0.25/A,1/-0.75/B,-0.7/1/C}
\tkzDrawLine(A,B)
- \tkzLabelLine[pos=1.25,left](A,B){$(d_1)$}
+ \tkzLabelLine[pos=1.25,below left](A,B){$(d_1)$}
\tkzDrawPoints(A,B,C)
\tkzDefLine[orthogonal=through C](B,A) \tkzGetPoint{c}
\tkzDrawLine(C,c)
@@ -57,111 +72,169 @@ options & default & definition \\
\tkzMarkRightAngle(C,I,B)
\tkzDefLine[parallel=through C](A,B) \tkzGetPoint{c'}
\tkzDrawLine(C,c')
- \tkzLabelLine[pos=1.25,left](C,c'){$(d_2)$}
+ \tkzLabelLine[pos=1.25,below left](C,c'){$(d_2)$}
\tkzMarkRightAngle(I,C,c')
\end{tikzpicture}
\end{tkzexample}
-
-\newpage
\subsubsection{An envelope}
Based on a figure from O. Reboux with pst-eucl by D Rodriguez.
\begin{tkzexample}[vbox,small]
-\begin{tikzpicture}[scale=1]
- \tkzInit[xmin=-6,ymin=-6,xmax=6,ymax=6]
- \tkzClip
- \tkzDefPoint(0,0){O}
- \tkzDefPoint(132:4){A}
- \tkzDefPoint(5,0){B}
- \foreach \ang in {5,10,...,360}{%
- \tkzDefPoint(\ang:5){M}
- \tkzDefLine[mediator](A,M)
- \tkzDrawLine[color=magenta,add= 4 and 4](tkzFirstPointResult,tkzSecondPointResult)}
+\begin{tikzpicture}[scale=.75]
+ \tkzInit[xmin=-6,ymin=-4,xmax=6,ymax=6] % necessary
+ \tkzClip
+ \tkzDefPoint(0,0){O}
+ \tkzDefPoint(132:4){A}
+ \tkzDefPoint(5,0){B}
+ \foreach \ang in {5,10,...,360}{%
+ \tkzDefPoint(\ang:5){M}
+ \tkzDefLine[mediator](A,M)
+ \tkzDrawLine[color=magenta,add= 3 and 3](tkzFirstPointResult,tkzSecondPointResult)}
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{A parable}
+\subsubsection{A parabola}
Based on a figure from O. Reboux with pst-eucl by D Rodriguez.
It is not necessary to name the two points that define the mediator.
\begin{tkzexample}[vbox,small]
-\begin{tikzpicture}[scale=1.25]
- \tkzInit[xmin=-6,ymin=-6,xmax=6,ymax=6]
- \tkzClip
- \tkzDefPoint(0,0){O}
- \tkzDefPoint(132:5){A}
- \tkzDefPoint(4,0){B}
- \foreach \ang in {5,10,...,360}{%
- \tkzDefPoint(\ang:4){M}
- \tkzDefLine[mediator](A,M)
- \tkzDrawLine[color=magenta,
- add= 4 and 4](tkzFirstPointResult,tkzSecondPointResult)}
- \end{tikzpicture}
+\begin{tikzpicture}[scale=.75]
+ \tkzInit[xmin=-6,ymin=-4,xmax=6,ymax=6]
+ \tkzClip
+ \tkzDefPoint(0,0){O}
+ \tkzDefPoint(132:5){A}
+ \tkzDefPoint(4,0){B}
+ \foreach \ang in {5,10,...,360}{%
+ \tkzDefPoint(\ang:4){M}
+ \tkzDefLine[mediator](A,M)
+ \tkzDrawLine[color=magenta,add= 3 and 3](tkzFirstPointResult,tkzSecondPointResult)}
+\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Drawing a tangent option \tkzimp{from with R} and \tkzimp{at}}
+%<---------------------------------------------------------------------------->
+\subsection{Specific lines: Tangent to a circle}
+Two constructions are proposed. The first one is the construction of a tangent to a circle at a given point of this circle and the second one is the construction of a tangent to a circle passing through a given point outside a disc.
+
+\begin{NewMacroBox}{tkzDefTangent}{\oarg{local options}\parg{pt1,pt2} or \parg{pt1,dim}}%
+The parameter in brackets is the center of the circle or the center of the circle and a point on the circle or the center and the radius. This macro replaces the old one: \tkzcname{tkzTangent}.
+
+\medskip
+\begin{tabular}{lll}%
+\toprule
+arguments & example & explication \\
+\midrule
+\TAline{\parg{pt1,pt2 or \parg{pt1,dim}} }{\parg{A,B} or \parg{A,2cm}} {$[AB]$ is radius $A$ is the center}
+\bottomrule
+\end{tabular}
+
+\medskip
+\begin{tabular}{lll}%
+options & default & definition \\
+\midrule
+\TOline{at=pt}{at}{tangent to a point on the circle}
+\TOline{from=pt} {at}{tangent to a circle passing through a point}
+\TOline{from with R=pt} {at}{idem, but the circle is defined by center = radius}
+\bottomrule
+\end{tabular}
+The tangent is not drawn. A second point of the tangent is given by \tkzname{tkzPointResult}.
+\end{NewMacroBox}
+
+\subsubsection{Example of a tangent passing through a point on the circle }
\begin{tkzexample}[latex=7cm,small]
- \begin{tikzpicture}[scale=.5]
+\begin{tikzpicture}[scale=.75]
\tkzDefPoint(0,0){O}
- \tkzDefPoint(6,6){E}
- \tkzDefRandPointOn[circle=center O radius 4cm]
+ \tkzDefPoint(6,6){E}
+ \tkzDefRandPointOn[circle=center O radius 3cm]
\tkzGetPoint{A}
- \tkzDefRandPointOn[circle=center O radius 4cm]
- \tkzGetPoint{B}
- \tkzDrawSegments(O,A O,B)
- \tkzDrawCircle(O,A)
- \tkzDefTangent[from with R=E](O,4cm)
- \tkzGetSecondPoint{k}
+ \tkzDrawSegment(O,A)
+ \tkzDrawCircle(O,A)
\tkzDefTangent[at=A](O)
\tkzGetPoint{h}
- \tkzDrawPoints(E)
- \tkzDrawLine[add = .5 and .5](A,h)
- \tkzDrawLine[add = .5 and .5](E,k)
+ \tkzDrawLine[add = 4 and 3](A,h)
\tkzMarkRightAngle[fill=red!30](O,A,h)
- \end{tikzpicture}
+\end{tikzpicture}
\end{tkzexample}
+\subsubsection{Example of tangents passing through an external point }
+\begin{tkzexample}[latex=7cm,small]
+\begin{tikzpicture}[scale=.8]
+ \tkzDefPoint(3,3){c}
+ \tkzDefPoint(6,3){a0}
+ \tkzRadius=1 cm
+ \tkzDrawCircle[R](c,\tkzRadius)
+ \foreach \an in {0,10,...,350}{
+ \tkzDefPointBy[rotation=center c angle \an](a0)
+ \tkzGetPoint{a}
+ \tkzDefTangent[from with R = a](c,\tkzRadius)
+ \tkzGetPoints{e}{f}
+ \tkzDrawLines[color=magenta](a,f a,e)
+ \tkzDrawSegments(c,e c,f)
+ }%
+\end{tikzpicture}
+\end{tkzexample}
+\subsubsection{Example of Andrew Mertz}
+\begin{tkzexample}[latex=6cm,small]
+ \begin{tikzpicture}[scale=.5]
+ \tkzDefPoint(100:8){A}\tkzDefPoint(50:8){B}
+ \tkzDefPoint(0,0){C} \tkzDefPoint(0,4){R}
+ \tkzDrawCircle(C,R)
+ \tkzDefTangent[from = A](C,R) \tkzGetPoints{D}{E}
+ \tkzDefTangent[from = B](C,R) \tkzGetPoints{F}{G}
+ \tkzDrawSector[fill=blue!80!black,opacity=0.5](A,D)(E)
+ \tkzFillSector[color=red!80!black,opacity=0.5](B,F)(G)
+ \tkzInterCC(A,D)(B,F) \tkzGetSecondPoint{I}
+ \tkzDrawPoint[color=black](I)
+ \end{tikzpicture}
+\end{tkzexample}
+\url{http://www.texample.net/tikz/examples/}
-\subsubsection{Drawing a tangent option \tkzimp{from}}
-
+\subsubsection{Drawing a tangent option \tkzimp{from with R} and \tkzimp{at}}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=.5]
- \tkzDefPoint(0,0){B}
- \tkzDefPoint(0,8){A}
- \tkzDefSquare(A,B)
- \tkzGetPoints{C}{D}
- \tkzDrawSquare(A,B)
- \tkzClipPolygon(A,B,C,D)
- \tkzDefPoint(4,8){F}
- \tkzDefPoint(4,0){E}
- \tkzDefPoint(4,4){Q}
- \tkzFillPolygon[color = green](A,B,C,D)
- \tkzDrawCircle[fill = orange](B,A)
- \tkzDrawCircle[fill = purple](E,B)
- \tkzDefTangent[from=B](F,A)
- \tkzInterLL(F,tkzFirstPointResult)(C,D)
- \tkzInterLL(A,tkzPointResult)(F,E)
- \tkzDrawCircle[fill = yellow](tkzPointResult,Q)
- \tkzDefPointBy[projection= onto B--A](tkzPointResult)
- \tkzDrawCircle[fill = blue!50!black](tkzPointResult,A)
+ \tkzDefPoint(0,0){O}
+ \tkzDefRandPointOn[circle=center O radius 4cm]
+ \tkzGetPoint{A}
+ \tkzDefTangent[at=A](O)
+ \tkzGetPoint{h}
+ \tkzDrawSegments(O,A)
+ \tkzDrawCircle(O,A)
+ \tkzDrawLine[add = 1 and 1](A,h)
+ \tkzMarkRightAngle[fill=red!30](O,A,h)
+ \end{tikzpicture}
+\end{tkzexample}
+
+\subsubsection{Drawing a tangent option \tkzimp{from}}
+\begin{tkzexample}[latex=5cm,small]
+\begin{tikzpicture}[scale=.5]
+ \tkzDefPoint(0,0){B}
+ \tkzDefPoint(0,8){A}
+ \tkzDefSquare(A,B)
+ \tkzGetPoints{C}{D}
+ \tkzDrawSquare(A,B)
+ \tkzClipPolygon(A,B,C,D)
+ \tkzDefPoint(4,8){F}
+ \tkzDefPoint(4,0){E}
+ \tkzDefPoint(4,4){Q}
+ \tkzFillPolygon[color = green](A,B,C,D)
+ \tkzDrawCircle[fill = orange](B,A)
+ \tkzDrawCircle[fill = purple](E,B)
+ \tkzDefTangent[from=B](F,A)
+ \tkzInterLL(F,tkzFirstPointResult)(C,D)
+ \tkzInterLL(A,tkzPointResult)(F,E)
+ \tkzDrawCircle[fill = yellow](tkzPointResult,Q)
+ \tkzDefPointBy[projection= onto B--A](tkzPointResult)
+ \tkzDrawCircle[fill = blue!50!black](tkzPointResult,A)
\end{tikzpicture}
\end{tkzexample}
\section{Drawing, naming the lines}
-
-The following macros are simply used to draw, name lines
-
-
+The following macros are simply used to draw, name lines.
\subsection{Draw a straight line}
-
-To draw a normal straight line, just give a couple of points. You can use the \tkzname{add} option to extend the line.( This option is due to \tkzimp{Mark Wibrow} ).
-
-In the special case of lines defined in a triangle, the number of arguments is a list of three points (the vertices of the triangle). The second point is where the line will come from. The first and last points determine the target segment. The old method has therefore been slightly modified. So for \tkzcname{tkzDrawMedian}, instead of |(A,B)(C)| you have to write |(B,C,A)| where C is the point that will be linked to the middle of the segment |[A,B]|.
-
+To draw a normal straight line, just give a couple of points. You can use the \tkzname{add} option to extend the line (This option is due to \tkzimp{Mark Wibrow}, see the code below).
\begin{tkzltxexample}[]
\tikzset{%
@@ -171,27 +244,27 @@ In the special case of lines defined in a triangle, the number of arguments is a
\tikztonodes}}}
\end{tkzltxexample}
- \begin{NewMacroBox}{tkzDrawLine}{\oarg{local options}\parg{pt1,pt2} ou \parg{pt1,pt2,pt3} }
+In the special case of lines defined in a triangle, the number of arguments is a list of three points (the vertices of the triangle). The second point is where the line will come from. The first and last points determine the target segment. The old method has therefore been slightly modified. So for \tkzcname{tkzDrawMedian}, instead of $(A,B)(C)$ you have to write $(B,C,A)$ where $C$ is the point that will be linked to the middle of the segment $[A,B]$.
+
+\begin{NewMacroBox}{tkzDrawLine}{\oarg{local options}\parg{pt1,pt2} or \parg{pt1,pt2,pt3}}%
The arguments are a list of two points or three points.
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
options & default & definition \\
\midrule
-\TOline{median}{none}{ [median](A,B,C) median from B}
-\TOline{altitude}{none}{[altitude](C,A,B) altitude from A}
-\TOline{bisector}{none}{[bisector](B,C,A) bisector from C }
-\TOline{none}{none}{ draw the straight line A,B }
-\TOline{add= nb1 and nb2}{.2 and .2}{Extends the segment}
+\TOline{median}{none}{[median](A,B,C) median from $B$}
+\TOline{altitude}{none}{[altitude](C,A,B) altitude from $A$}
+\TOline{bisector}{none}{[bisector](B,C,A) bisector from $C$}
+\TOline{none}{none}{draw the straight line $(AB)$}
+\TOline{add= nb1 and nb2}{.2 and .2}{extends the segment}
\bottomrule
\end{tabular}
-\medskip
-\tkzname{add} defines the length of the line passing through the points pt1 and pt2. Both numbers are percentages. The styles of \TIKZ\ are accessible for plots
+\tkzname{add} defines the length of the line passing through the points pt1 and pt2. Both numbers are percentages. The styles of \TIKZ\ are accessible for plots.
\end{NewMacroBox}
-\subsubsection{Examples of right-hand plots with \tkzname{add}}
-
+\subsubsection{Examples with \tkzname{add}}
\begin{tkzexample}[latex=5cm,small]
\begin{tikzpicture}
\tkzInit[xmin=-2,xmax=3,ymin=-2.25,ymax=2.25]
@@ -208,9 +281,8 @@ options & default & definition \\
\end{tikzpicture}
\end{tkzexample}
-\newpage
It is possible to draw several lines, but with the same options.
-\begin{NewMacroBox}{tkzDrawLines}{\oarg{local options}\parg{pt1,pt2 pt3,pt4 ...}}
+\begin{NewMacroBox}{tkzDrawLines}{\oarg{local options}\parg{pt1,pt2 pt3,pt4 ...}}%
Arguments are a list of pairs of points separated by spaces. The styles of \TIKZ\ are available for the draws.
\end{NewMacroBox}
@@ -243,7 +315,6 @@ Arguments are a list of pairs of points separated by spaces. The styles of \TI
\end{tkzexample}
\subsubsection{Medians in a triangle}
-
\begin{tkzexample}[latex=7 cm,small]
\begin{tikzpicture}[scale=1.25]
\tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B}
@@ -256,7 +327,6 @@ Arguments are a list of pairs of points separated by spaces. The styles of \TI
\end{tkzexample}
\subsubsection{Altitudes in a triangle}
-
\begin{tkzexample}[latex=7 cm,small]
\begin{tikzpicture}[scale=1.25]
\tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B}
@@ -272,7 +342,7 @@ Arguments are a list of pairs of points separated by spaces. The styles of \TI
You have to give the angles in a straight line.
\begin{tkzexample}[latex=7 cm,small]
-\begin{tikzpicture}[scale=1.5]
+\begin{tikzpicture}[scale=1.25]
\tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B}
\tkzDefPoint(1,3){C} \tkzDrawPolygon(A,B,C)
\tkzSetUpLine[color=purple]
@@ -282,32 +352,23 @@ You have to give the angles in a straight line.
\end{tikzpicture}
\end{tkzexample}
-
-\subsection{Add labels on a straight line \tkzcname{tkzLabelLine}}
-
- \begin{NewMacroBox}{tkzLabelLine}{\oarg{local options}\parg{pt1,pt2}\marg{label}}
-
- \begin{tabular}{lll}
- \toprule
- arguments & default & definition \\
- \midrule
- \TAline{label}{}{example \tkzcname{tkzLabelLine(A,B)\{$\delta$\}}}
- \bottomrule
- \end{tabular}
-
-\medskip
-\begin{tabular}{lll}
-\toprule
-options & default & definition \\
+\subsection{Add labels on a straight line \tkzcname{tkzLabelLine}}%
+\begin{NewMacroBox}{tkzLabelLine}{\oarg{local options}\parg{pt1,pt2}\marg{label}}
+\begin{tabular}{lll}%
+arguments & default & definition \\
\midrule
-\TOline{pos}{.5}{pos est une option de \TIKZ\ mais essentielle dans ce cas}
- \bottomrule
+\TAline{label}{}{\tkzcname{tkzLabelLine(A,B)}\{\$\tkzcname{Delta}\$\}}
+\bottomrule
\end{tabular}
-\medskip
-As an option, and in addition to the \tkzname{pos}, you can use all styles of \TIKZ\ , especially the placement with \tkzname{above}, \tkzname{right}, \dots
+\begin{tabular}{lll}%
+options & default & definition \\
+\midrule
+\TOline{pos}{.5}{\tkzname{pos} is an option for \TIKZ, but essential in this case\dots}
+\end{tabular}
- \end{NewMacroBox}
+As an option, and in addition to the \tkzname{pos}, you can use all styles of \TIKZ, especially the placement with \tkzname{above}, \tkzname{right}, \dots
+\end{NewMacroBox}
\subsubsection{Example with \tkzcname{tkzLabelLine}}
An important option is \tkzname{pos}, it's the one that allows you to place the label along the right. The value of \tkzname{pos} can be greater than 1 or negative.
@@ -319,22 +380,18 @@ An important option is \tkzname{pos}, it's the one that allows you to place the
\tkzGetPoint{c}
\tkzDrawLines(A,B C,c)
\tkzLabelLine[pos=1.25,blue,right](C,c){$(\delta)$}
- \tkzLabelLine[pos=-0.25,red,left](C,c){encore $(\delta)$}
+ \tkzLabelLine[pos=-0.25,red,left](C,c){again $(\delta)$}
\end{tikzpicture}
\end{tkzexample}
\section{Draw, Mark segments}
-
-There is, of course, a macro to simply draw a segment (it would be possible, as for a half line, to create a style with \tkzcname{add}) .
-
+There is, of course, a macro to simply draw a segment (it would be possible, as for a half line, to create a style with \tkzcname{add}).
\subsection{Draw a segment \tkzcname{tkzDrawSegment}}
-
-
- \begin{NewMacroBox}{tkzDrawSegment}{\oarg{local options}\parg{pt1,pt2}}
-The arguments are a list of two points. The styles of \TIKZ are available for the drawings
+\begin{NewMacroBox}{tkzDrawSegment}{\oarg{local options}\parg{pt1,pt2}}%
+The arguments are a list of two points. The styles of \TIKZ\ are available for the drawings.
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
argument & example & definition \\
\midrule
\TAline{(pt1,pt2)}{(A,B)}{draw the segment $[A,B]$}
@@ -342,12 +399,14 @@ argument & example & definition \\
\end{tabular}
\medskip
-\begin{tabular}{lll}
-options & exemple & définition \\
+\begin{tabular}{lll}%
+options & example & definition \\
\midrule
-\TOline{options de TikZ}{}{all TikZ options are valid.}
-\TOline{add}{}{add = kl and kr ; allows the segment to be extended to the left and right}
-\TOline{dim}{}{dim = label,dim,option ; allows you to add dimensions to a figure.}
+\TOline{\TIKZ\ options}{}{all \TIKZ\ options are valid.}
+\TOline{add}{0 and 0}{add = $kl$ and $kr$, \dots}
+\TOline{\dots}{\dots}{allows the segment to be extended to the left and right. }
+\TOline{dim}{no default}{dim = \{label,dim,option\}, \dots}
+\TOline{\dots}{\dots}{allows you to add dimensions to a figure.}
\bottomrule
\end{tabular}
@@ -366,7 +425,7 @@ This is of course equivalent to \tkzcname{draw (A)--(B);}
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Example of extending an option segment \tkzimp{add}}
+\subsubsection{Example of extending an segment with option \tkzname{add}}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}
@@ -380,40 +439,34 @@ This is of course equivalent to \tkzcname{draw (A)--(B);}
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Example of adding dimensions (technical figure) option \tkzimp{dim}}
- \begin{tkzexample}[latex=7cm,small]
- \begin{tikzpicture}[scale=2]
- \pgfkeys{/pgf/number format/.cd,fixed,precision=2}
- % Define the first two points
- \tkzDefPoint(0,0){A}
- \tkzDefPoint(3,0){B}
- \tkzDefPoint(1,1){C}
- % Draw the triangle and the points
- \tkzDrawPolygon(A,B,C)
- \tkzDrawPoints(A,B,C)
- % Label the sides
- \tkzCalcLength[cm](A,B)\tkzGetLength{ABl}
- \tkzCalcLength[cm](B,C)\tkzGetLength{BCl}
- \tkzCalcLength[cm](A,C)\tkzGetLength{ACl}
- % add dim
- \tkzDrawSegment[dim={\pgfmathprintnumber\BCl,
- 6pt,transform shape}](C,B)
- \tkzDrawSegment[dim={\pgfmathprintnumber\ACl,
- 6pt,transform shape}](A,C)
- \tkzDrawSegment[dim={\pgfmathprintnumber\ABl,
- -6pt,transform shape}](A,B)
- \end{tikzpicture}
- \end{tkzexample}
+\subsubsection{Example of adding dimensions with option \tkzname{dim}}
+\begin{tkzexample}[vbox,small]
+\begin{tikzpicture}[scale=4]
+ \pgfkeys{/pgf/number format/.cd,fixed,precision=2}
+ % Define the first two points
+ \tkzDefPoint(0,0){A}
+ \tkzDefPoint(3,0){B}
+ \tkzDefPoint(1,1){C}
+ % Draw the triangle and the points
+ \tkzDrawPolygon(A,B,C)
+ \tkzDrawPoints(A,B,C)
+ % Label the sides
+ \tkzCalcLength[cm](A,B)\tkzGetLength{ABl}
+ \tkzCalcLength[cm](B,C)\tkzGetLength{BCl}
+ \tkzCalcLength[cm](A,C)\tkzGetLength{ACl}
+ % add dim
+ \tkzDrawSegment[dim={\pgfmathprintnumber\BCl,6pt,transform shape}](C,B)
+ \tkzDrawSegment[dim={\pgfmathprintnumber\ACl,6pt,transform shape}](A,C)
+ \tkzDrawSegment[dim={\pgfmathprintnumber\ABl,-6pt,transform shape}](A,B)
+\end{tikzpicture}
+\end{tkzexample}
-\bigskip
-If the options are the same we can plot several segments with the same macro.
-\newpage
\subsection{Drawing segments \tkzcname{tkzDrawSegments}}
- \hypertarget{tdss}{}
+If the options are the same we can plot several segments with the same macro.
- \begin{NewMacroBox}{tkzDrawSegments}{\oarg{local options}\parg{pt1,pt2 pt3,pt4 ...}}
-The arguments are a two-point couple list. The styles of \TIKZ are available for the plots
+\begin{NewMacroBox}{tkzDrawSegments}{\oarg{local options}\parg{pt1,pt2 pt3,pt4 ...}}%
+The arguments are a two-point couple list. The styles of \TIKZ\ are available for the plots.
\end{NewMacroBox}
\begin{tkzexample}[latex=6cm,small]
@@ -439,7 +492,7 @@ The arguments are a two-point couple list. The styles of \TIKZ are available for
mark=at position .5 with {\arrow[thick]{#1}}
}}}
\tkzDefPoint(0,0){A}
- \tkzDefPoint(4,0){B}
+ \tkzDefPoint(4,-4){B}
\tkzDrawSegments[arr=stealth](A,B)
\tkzDrawPoints(A,B)
\end{tikzpicture}
@@ -448,11 +501,11 @@ The arguments are a two-point couple list. The styles of \TIKZ are available for
\subsection{Mark a segment \tkzcname{tkzMarkSegment}}
\hypertarget{tms}{}
- \begin{NewMacroBox}{tkzMarkSegment}{\oarg{local options}\parg{pt1,pt2}}
+ \begin{NewMacroBox}{tkzMarkSegment}{\oarg{local options}\parg{pt1,pt2}}%
The macro allows you to place a mark on a segment.
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
options & default & definition \\
\midrule
@@ -467,34 +520,27 @@ Possible marks are those provided by \TIKZ, but other marks have been created ba
\end{NewMacroBox}
\subsubsection{Several marks }
-\begin{tkzexample}[latex=6cm,small]
+\begin{tkzexample}[latex=5cm,small]
\begin{tikzpicture}
\tkzDefPoint(2,1){A}
\tkzDefPoint(6,4){B}
\tkzDrawSegment(A,B)
- \tkzMarkSegment[color=brown,size=2pt,
- pos=0.4, mark=z](A,B)
- \tkzMarkSegment[color=blue,
- pos=0.2, mark=oo](A,B)
- \tkzMarkSegment[pos=0.8,
- mark=s,color=red](A,B)
+ \tkzMarkSegment[color=brown,size=2pt,pos=0.4, mark=z](A,B)
+ \tkzMarkSegment[color=blue,pos=0.2, mark=oo](A,B)
+ \tkzMarkSegment[pos=0.8,mark=s,color=red](A,B)
\end{tikzpicture}
\end{tkzexample}
\subsubsection{Use of \tkzname{mark}}
-\begin{tkzexample}[latex=6cm,small]
+\begin{tkzexample}[latex=5cm,small]
\begin{tikzpicture}
\tkzDefPoint(2,1){A}
\tkzDefPoint(6,4){B}
\tkzDrawSegment(A,B)
- \tkzMarkSegment[color=gray,
- pos=0.2,mark=s|](A,B)
- \tkzMarkSegment[color=gray,
- pos=0.4,mark=s||](A,B)
- \tkzMarkSegment[color=brown,
- pos=0.6,mark=||](A,B)
- \tkzMarkSegment[color=red,
- pos=0.8,mark=|||](A,B)
+ \tkzMarkSegment[color=gray,pos=0.2,mark=s|](A,B)
+ \tkzMarkSegment[color=gray,pos=0.4,mark=s||](A,B)
+ \tkzMarkSegment[color=brown,pos=0.6,mark=||](A,B)
+ \tkzMarkSegment[color=red,pos=0.8,mark=|||](A,B)
\end{tikzpicture}
\end{tkzexample}
@@ -502,11 +548,11 @@ Possible marks are those provided by \TIKZ, but other marks have been created ba
\subsection{Marking segments \tkzcname{tkzMarkSegments}}
\hypertarget{tmss}{}
-\begin{NewMacroBox}{tkzMarkSegments}{\oarg{local options}\parg{pt1,pt2 pt3,pt4 ...}}
+\begin{NewMacroBox}{tkzMarkSegments}{\oarg{local options}\parg{pt1,pt2 pt3,pt4 ...}}%
Arguments are a list of pairs of points separated by spaces. The styles of \TIKZ\ are available for plots.
\end{NewMacroBox}
-\subsubsection{Marques pour un triangle isocèle}
+\subsubsection{Marks for an isosceles triangle}
\begin{tkzexample}[latex=6cm,small]
\begin{tikzpicture}[scale=1]
\tkzDefPoints{0/0/O,2/2/A,4/0/B,6/2/C}
@@ -518,8 +564,7 @@ Arguments are a list of pairs of points separated by spaces. The styles of \TIKZ
\end{tkzexample}
\subsection{Another marking}
-
-\begin{tkzexample}[latex=7cm,small]
+\begin{tkzexample}[latex=5cm,small]
\begin{tikzpicture}[scale=1]
\tkzDefPoint(0,0){A}\tkzDefPoint(3,2){B}
\tkzDefPoint(4,0){C}\tkzDefPoint(2.5,1){P}
@@ -538,30 +583,29 @@ Arguments are a list of pairs of points separated by spaces. The styles of \TIKZ
\end{tikzpicture}
\end{tkzexample}
-\newpage
\hypertarget{tls}{}
- \begin{NewMacroBox}{tkzLabelSegment}{\oarg{local options}\parg{pt1,pt2}\marg{label}}
-This macro allows you to place a label along a segment or a line. The options are those of \TIKZ\ for example \tkzname{pos}
+\begin{NewMacroBox}{tkzLabelSegment}{\oarg{local options}\parg{pt1,pt2}\marg{label}}
+This macro allows you to place a label along a segment or a line. The options are those of \TIKZ\ for example \tkzname{pos}.
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%%
argument & example & definition \\
\midrule
\TAline{label}{\tkzcname{tkzLabelSegment(A,B)\{$5$\}}}{label text}
-\TAline{(pt1,pt2)}{(A,B)}{label along $[A,B]$}
+\TAline{(pt1,pt2)}{(A,B)}{label along $[AB]$}
\bottomrule
\end{tabular}
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
options & default & definition \\
\midrule
\TOline{pos}{.5}{label's position}
\end{tabular}
\end{NewMacroBox}
- \subsubsection{Labels multiples}
+\subsubsection{Multiple labels}
\begin{tkzexample}[latex=7 cm,small]
\begin{tikzpicture}
\tkzInit
@@ -574,7 +618,6 @@ options & default & definition \\
\end{tkzexample}
\subsubsection{Labels and right-angled triangle}
-
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[rotate=-60]
\tikzset{label seg style/.append style = {%
@@ -605,12 +648,11 @@ options & default & definition \\
\end{tkzexample}
\hypertarget{tlss}{}
- \begin{NewMacroBox}{tkzLabelSegments}{\oarg{local options}\parg{pt1,pt2 pt3,pt4 ...}}
+ \begin{NewMacroBox}{tkzLabelSegments}{\oarg{local options}\parg{pt1,pt2 pt3,pt4 ...}}%
The arguments are a two-point couple list. The styles of \TIKZ\ are available for plotting.
\end{NewMacroBox}
\subsubsection{Labels for an isosceles triangle}
-
\begin{tkzexample}[latex=6cm,small]
\begin{tikzpicture}[scale=1]
\tkzDefPoints{0/0/O,2/2/A,4/0/B,6/2/C}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-main.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-main.tex
index 49e8abe71f..e0946accd5 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-main.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-main.tex
@@ -1,34 +1,59 @@
% !TEX TS-program = lualatex
% encoding : utf8
-% doc de tkz-euclide.sty
-% Created by Alain Matthes on 2020-01-02.
-% Copyright (C) 2020 Alain Matthes
+% Documentation of tkz-euclide
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
-% This file may be distributed and/or modified
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
%
-% 1. under the LaTeX Project Public License , either version 1.3
-% of this license or (at your option) any later version and/or
-% 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.
+% This work consists of the files:
+% TKZdoc-euclide-pointby.tex
+% TKZdoc-euclide-presentation.tex
+% TKZdoc-euclide-exemples.tex
+% TKZdoc-euclide-rapporteur.tex
+% TKZdoc-euclide-compass.tex
+% TKZdoc-euclide-intersec.tex
+% TKZdoc-euclide-tools.tex
+% TKZdoc-euclide-arcs.tex
+% TKZdoc-euclide-circles.tex
+% TKZdoc-euclide-polygons.tex
+% TKZdoc-euclide-triangles.tex
+% TKZdoc-euclide-lines.tex
+% TKZdoc-euclide-pointwith.tex
+% TKZdoc-euclide-pointsSpc.tex
+% TKZdoc-euclide-points.tex
+% TKZdoc-euclide-installation.tex
+% TKZdoc-euclide-angles.tex
+% TKZdoc-euclide-config.tex
+% TKZdoc-euclide-base.tex
+% TKZdoc-euclide-FAQ.tex
+% TKZdoc-euclide-show.tex
+% TKZdoc-euclide-sectors.tex
+% TKZdoc-euclide-rnd.tex
+% TKZdoc-euclide-news.tex
-% 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}
+ headings = small]{tkz-doc}
\usepackage{etoc}
\gdef\tkznameofpack{tkz-euclide}
-\gdef\tkzversionofpack{3.02c}
-\gdef\tkzdateofpack{2020/02/06}
+\gdef\tkzversionofpack{3.05c}
+\gdef\tkzdateofpack{2020/03/03}
\gdef\tkznameofdoc{doc-tkz-euclide}
-\gdef\tkzversionofdoc{3.02c}
-\gdef\tkzdateofdoc{2020/02/06}
+\gdef\tkzversionofdoc{3.05c}
+\gdef\tkzdateofdoc{2020/03/03}
\gdef\tkzauthorofpack{Alain Matthes}
\gdef\tkzadressofauthor{}
\gdef\tkznamecollection{AlterMundus}
@@ -41,17 +66,17 @@
\usepackage{tkz-euclide}
\usepackage[colorlinks]{hyperref}
\hypersetup{
- linkcolor=BrickRed,
+ linkcolor=Gray,
citecolor=Green,
filecolor=Mulberry,
urlcolor=NavyBlue,
- menucolor=BrickRed,
+ menucolor=Gray,
runcolor=Mulberry,
- linkbordercolor=BrickRed,
+ linkbordercolor=Gray,
citebordercolor=Green,
filebordercolor=Mulberry,
urlbordercolor=NavyBlue,
- menubordercolor=BrickRed,
+ menubordercolor=Gray,
runbordercolor=Mulberry,
pdfsubject={Euclidean Geometry},
pdfauthor={\tkzauthorofpack},
@@ -59,24 +84,28 @@
pdfcreator={\tkzengine}
}
\usepackage{tkzexample}
-\usepackage{mathtools}
+\usepackage{fontspec}
+\setmainfont{texgyrepagella}%
+ [Extension = .otf ,
+ UprightFont = *-regular,
+ ItalicFont = *-italic,
+ BoldFont = *-bold,
+ BoldItalicFont = *-bolditalic,
+ Ligatures=TeX,
+ Numbers={Lowercase,Monospaced}]
\usepackage{unicode-math}
-\usepackage{fourier-otf}
-\setmainfont[Ligatures=TeX]{TeX Gyre Pagella}
-\setmathfont{TeX Gyre Pagella Math}
+\usepackage{fourier-otf,zorna}
\usepackage{datetime,multicol,lscape}
\usepackage[english]{babel}
\usepackage[autolanguage]{numprint}
-\usepackage{ulem}
+\usepackage[normalem]{ulem}
\usepackage{microtype}
\usepackage{array,multirow,multido,booktabs}
\usepackage{shortvrb,fancyvrb}
-\renewcommand{\labelitemi}{\lefthand}
-\AtBeginDocument{\MakeShortVerb{\|}} % link to shortvrb
-\pdfcompresslevel=9
+
+\renewcommand{\labelitemi}{--}
\setlength\parindent{0pt}
\RequirePackage{makeidx}
-%\@twocolumnfalse
\makeindex
% \def\tkzref{\arabic{section}-\arabic{subsection}-\arabic{subsubsection}}
% \renewenvironment{tkzexample}[1][]{%
@@ -85,14 +114,37 @@
% \endVerbatimOut
% }
%<--------------------------------------------------------------------------->
+\AtBeginDocument{\MakeShortVerb{\|}} % link to shortvrb
\begin{document}
-\author{\tkzauthorofpack}
+\parindent=0pt
+\author{\tkzauthorofpack}
\title{\tkznameofpack}
\date{\today}
\clearpage
\thispagestyle{empty}
\maketitle
+\null
+\AddToShipoutPicture*{%
+\setlength\unitlength{1mm}
+\put(70,120){%
+\begin{tikzpicture}
+ \node at (30pt,30pt){\fontsize{60}{60}\selectfont \zorna{c}};
+ \node at (270pt,30pt){\fontsize{60}{60}\selectfont \zorna{d}};
+ \node at (30pt,210pt){\fontsize{60}{60}\selectfont \zorna{a}};
+ \node at (270pt,210pt){\fontsize{60}{60}\selectfont \zorna{b}};
+ \draw[line width=2pt,double,color=MidnightBlue,
+ fill=myblue!10,opacity=.5] (0,0) rectangle (300pt,240pt);
+ \node[text width=240pt] at (150 pt,120 pt){%
+ \begin{center}
+ \color{MidnightBlue}
+ \fontsize{24}{48}
+ \selectfont tkz-euclide\\
+ tool for \\
+ Euclidean Geometry
+ \end{center}};
+\end{tikzpicture}}
+}
\clearpage
\tkzSetUpColors[background=white,text=darkgray]
@@ -100,46 +152,44 @@
\let\rmfamily\ttfamily
\nameoffile{\tkznameofpack}
\defoffile{\lefthand\
-The \tkzname{\tkznameofpack} is a set of convenient macros for drawing in a plane ( fundamental two-dimensional object) with a Cartesian coordinate system. It handles the more classic situations in Euclidean Geometry. \tkzname{\tkznameofpack} is built on top of PGF and its associated front-end \TIKZ\ and is a (La)TeX-friendly drawing package. The aim is to provide a high-level user interface to build graphics relatively simply. It uses a Cartesian coordinate system orthogonal provided by the \tkzimp{tkz-base} package as well as tools to define the unique coordinates of points and to manipulate them. The idea is to allow you to follow step by step a construction that would be done by hand as naturally as possible.\\
+The \tkzname{\tkznameofpack} is a set of convenient macros for drawing in a plane (fundamental two-dimensional object) with a Cartesian coordinate system. It handles the most classic situations in Euclidean Geometry. \tkzname{\tkznameofpack} is built on top of PGF and its associated front-end \TIKZ\ and is a (La)TeX-friendly drawing package. The aim is to provide a high-level user interface to build graphics relatively simply. It uses a Cartesian coordinate system orthogonal provided by the \tkzimp{tkz-base} package as well as tools to define the unique coordinates of points and to manipulate them. The idea is to allow you to follow step by step a construction that would be done by hand as naturally as possible.\\
Now the package needs the version 3.0 of \TIKZ. English is not my native language so there might be some errors.
}
-
-
-
\presentation
\vspace*{1cm}
-\lefthand\ Firstly, I would like to thank \textbf{Till Tantau} for the beautiful LATEX package, namely \href{http://sourceforge.net/projects/pgf/}{Ti\emph{k}Z}.
+\lefthand\ Firstly, I would like to thank \textbf{Till Tantau} for the beautiful \LaTeX{} package, namely \href{http://sourceforge.net/projects/pgf/}{\TIKZ}.
\vspace*{12pt}
-\lefthand\ I received much valuable advices, remarks, corrections and examples from \tkzimp{Jean-Côme Charpentier} , \tkzimp{Josselin Noirel}, \tkzimp{Manuel Pégourié-Gonnard}, \tkzimp{Franck Pastor} , \tkzimp{David Arnold}, \tkzimp{Ulrike Fischer},\tkzimp{Stefan Kottwitz} \tkzimp{Christian Tellechea}, \tkzimp{Nicolas Kisselhoff},\tkzimp{David Arnold}, \tkzimp{Wolfgang Büchel}, \tkzimp{John Kitzmiller},\tkzimp{Dimitri Kapetas},\tkzimp{Gaétan Marris},\tkzimp{Mark Wibrow}, \tkzimp{Yve Combe} for his work on protractor, \tkzimp{Dimitri Kapetas}, \tkzimp{Gaétan Marris} and \tkzimp{Paul Gaborit} .
+\lefthand\ I received much valuable advice, remarks, corrections and examples from \tkzimp{Jean-Côme Charpentier}, \tkzimp{Josselin Noirel}, \tkzimp{Manuel Pégourié-Gonnard}, \tkzimp{Franck Pastor}, \tkzimp{David Arnold}, \tkzimp{Ulrike Fischer}, \tkzimp{Stefan Kottwitz}, \tkzimp{Christian Tellechea}, \tkzimp{Nicolas Kisselhoff}, \tkzimp{David Arnold}, \tkzimp{Wolfgang Büchel}, \tkzimp{John Kitzmiller}, \tkzimp{Dimitri Kapetas}, \tkzimp{Gaétan Marris}, \tkzimp{Mark Wibrow}, \tkzimp{Yves Combe} for his work on a protractor, \tkzimp{Paul Gaborit} and \tkzimp{Laurent} for all his corrections, remarks and questions.
\vspace*{12pt}
-\lefthand\ I would also like to thank Eric Weisstein, Creator of MathWorld ~:
-\href{http://mathworld.wolfram.com/about/author.html}{MathWorld}
+\lefthand\ I would also like to thank Eric Weisstein, creator of MathWorld:
+\href{http://mathworld.wolfram.com/about/author.html}{MathWorld}.
\vspace*{12pt}
-\lefthand\ You can find some examples on my site~:
-\href{http://altermundus.fr}{altermundus.fr} \hspace{2cm} under construction !
+\lefthand\ You can find some examples on my site:
+\href{http://altermundus.fr}{altermundus.fr}. \hspace{2cm} under construction!
\vfill
-Please report typos or any other comments to this documentation to ~: \href{mailto:al.ma@mac.com}{\textcolor{blue}{Alain Matthes}}.
+Please report typos or any other comments to this documentation to: \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 \href{http://www.ctan.org/}{CTAN}\ archives.
\clearpage
\tableofcontents
-\clearpage \newpage
+\clearpage
+\newpage
\setlength{\parskip}{1ex plus 0.5ex minus 0.2ex}
-
\include{TKZdoc-euclide-presentation}
\include{TKZdoc-euclide-installation}
\include{TKZdoc-euclide-news}
\include{TKZdoc-euclide-points}
+\include{TKZdoc-euclide-pointsSpc}
\include{TKZdoc-euclide-pointby}
\include{TKZdoc-euclide-pointwith}
\include{TKZdoc-euclide-rnd}
@@ -151,6 +201,7 @@ Project Public License Distributed from \href{http://www.ctan.org/}{CTAN}\ arch
\include{TKZdoc-euclide-angles}
\include{TKZdoc-euclide-sectors}
\include{TKZdoc-euclide-arcs}
+\include{TKZdoc-euclide-tools}
\include{TKZdoc-euclide-compass}
\include{TKZdoc-euclide-show}
\include{TKZdoc-euclide-rapporteur}
@@ -158,8 +209,7 @@ Project Public License Distributed from \href{http://www.ctan.org/}{CTAN}\ arch
\include{TKZdoc-euclide-config}
\include{TKZdoc-euclide-base}
\include{TKZdoc-euclide-FAQ}
+
\clearpage\newpage
-\begin{multicols}{2}
\small\printindex
-\end{multicols}
\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-news.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-news.tex
index b11a4622e0..f6b6d1068d 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-news.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-news.tex
@@ -10,28 +10,31 @@ An important novelty is the recent replacement of the \tkzNamePack{fp} package b
Here are some of the changes.
\vspace{1cm}
\begin{itemize}\setlength{\itemsep}{10pt}
-\item Improved code and bug fixes.
-\item With \tkzimp{tkz-euclide} loads all objects, so there's no need to place. \tkzcname{usetkzobj{all}}.
-\item The bounding box is now controlled in each macro (hopefully) to avoid the use of \tkzcname{tkzInit} followed by \tkzcname{tkzClip}.
-\item Added macros for the bounding box: \tkzcname{tkzSaveBB} \tkzcname{tkzClipBB} and so on.
-\item Logically most macros accept TikZ options. So I removed the "duplicate" options when possible; thus the "label options" option is removed.
-\item Random points are now in \tkzimp{tkz-euclide} and the macro \tkzcname{tkzGetRandPointOn} is replaced by \tkzcname{tkzDefRandPointOn}. For homogeneity reasons, the points must be retrieved with \tkzcname{tkzGetPoint}.
+\item Improved code and bug fixes;
-\item The options \tkzimp{end} and \tkzimp{start} which allowed to give a label to a straight line are removed. You now have to use the macro \tkzcname{tkzLabelLine}
+\item With \tkzimp{tkz-euclide} loads all objects, so there's no need to place \tkzcname{usetkzobj\{all\}};\item The bounding box is now controlled in each macro (hopefully) to avoid the use of \tkzcname{tkzInit} followed by \tkzcname{tkzClip};\item Added macros for the bounding box: \tkzcname{tkzSaveBB} \tkzcname{tkzClipBB} and so on;\item Logically most macros accept \TIKZ\ options. So I removed the "duplicate" options when possible thus the "label options" option is removed;
-\item Introduction of the libraries \NameLib{quotes} and \NameLib{angles} it allows to give a label to a point, even if I am not in favour of this practice.
+\item Random points are now in \tkzname{\tkznameofpack} and the macro \tkzcname{tkzGetRandPointOn} is replaced by \tkzcname{tkzDefRandPointOn}. For homogeneity reasons, the points must be retrieved with \tkzcname{tkzGetPoint};
-\item The notion of vector disappears to draw a vector just pass "->" as an option to \tkzcname{tkzDrawSegment}.
-\item Many macros still exist, but are obsolete and will disappear:
+\item The options \tkzname{end} and \tkzname{start} which allowed to give a label to a straight line are removed. You now have to use the macro \tkzcname{tkzLabelLine};
+
+\item Introduction of the libraries \NameLib{quotes} and \NameLib{angles}; it allows to give a label to a point, even if I am not in favour of this practice;
+
+\item The notion of vector disappears, to draw a vector just pass "->" as an option to \tkzcname{tkzDrawSegment};
+
+\item Many macros still exist, but are obsolete and will disappear:
\begin{itemize}
- \item |\tkzDrawMedians| trace and create midpoints on the sides of a triangle. The creation and drawing separation is not respected so it is preferable to first create the coordinates of these points with |\tkzSpcTriangle[median]| and then to choose the ones you are going to draw with |\tkzDrawSegments| or |\tkzDrawLines|.
- \item |\tkzDrawMedians(A,B)(C)| is now spelled |\tkzDrawMedians(A,C,B)|. This defines the median from $C$.
- \item Another example |\tkzDrawTriangle[equilateral]| was handy but it is better to get the third point with |\tkzDefTriangle[equilateral]| and then draw with |\tkzDrawPolygon|.
+
+\item |\tkzDrawMedians| trace and create midpoints on the sides of a triangle. The creation and drawing separation is not respected so it is preferable to first create the coordinates of these points with |\tkzSpcTriangle[median]| and then to choose the ones you are going to draw with |\tkzDrawSegments| or |\tkzDrawLines|;
+
+\item |\tkzDrawMedians(A,B)(C)| is now spelled |\tkzDrawMedians(A,C,B)|. This defines the median from $C$;
+
+\item Another example |\tkzDrawTriangle[equilateral]| was handy but it is better to get the third point with |\tkzDefTriangle[equilateral]| and then draw with |\tkzDrawPolygon|;
- \item |\tkzDefRandPointOn| replaced by |\tkzGetRandPointOn|
- \item now |\tkzTangent| is |\tkzDefTangent|
- \item You can use |global path name| if you want find intersection but it's very slow like in TikZ.
+\item |\tkzDefRandPointOn| is replaced by |\tkzGetRandPointOn|;\item now |\tkzTangent| is replaced by |\tkzDefTangent|;
+
+\item You can use |global path name| if you want find intersection but it's very slow like in \TIKZ.
\end{itemize}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-obj.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-obj.tex
deleted file mode 100644
index 413087202a..0000000000
--- a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-obj.tex
+++ /dev/null
@@ -1,29 +0,0 @@
-\section{Utilisation des objets complémentaires}
-
-Ces objets complémentaires peuvent être des points, des segments, des droites.
-Il est possible d'utiliser certains de ces objets sans charger complètement \tkzname{tkz-euclide} mais en utilisant la macro \tkzcname{usetkzobj}. Attention, il faut utiliser \tkzname{tkz-euclide} pour avoir la possibilité d'utiliser des outils comme les transformations ou encore les intersections.
-
-Voici la liste actuelle des objets et ceux qui sont chargés par défaut par \tkzname{tkz-base}.
-\begin{NewMacroBox}{usetkzobj}{\marg{liste d'objets}}
-
-\begin{tabular}{lll}
-options & & définition \\
-\midrule
-\TAline{all} {absent} {tous les objets sont chargés}
-\TAline{points}{présent}{définir, nommer, tracer des points }
-\TAline{lines}{absent} {définir, nommer, tracer des droites}
-\TAline{segments} {présent}{définir, nommer, tracer des segments}
-\TAline{vectors} {absent}{définir, nommer, tracer des des vecteurs}
-\TAline{circles} {absent}{définir, nommer, tracer des cercles}
-\TAline{polygons}{absent}{définir, nommer, tracer des quadrilatères}
-\TAline{arcs} {absent}{définir, nommer, tracer des arcs}
-\TAline{sectors}{absent}{définir, nommer, tracer des secteurs}
-\TAline{protractor}{absent}{tracer un rapporteur}
-\TAline{marks}{présent}{définir, nommer, tracer des marques}
-\end{tabular}
- \end{NewMacroBox}
-
-
-\subsubsection{\tkzcname{usetkzobj\{points,segments\}}}
-
-\endinput \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-pointby.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-pointby.tex
index 35046719d0..fdc4f91fb9 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-pointby.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-pointby.tex
@@ -1,26 +1,26 @@
\section{Definition of points by transformation; \tkzcname{tkzDefPointBy} }
These transformations are:
-\begin{enumerate}
- \item the translation;
- \item l'homothety;
+\begin{itemize}
+ \item translation;
+ \item homothety;
\item orthogonal reflection or symmetry;
\item central symmetry;
\item orthogonal projection;
\item rotation (degrees or radians);
- \item inversion with respect to a circle
-\end{enumerate}
+ \item inversion with respect to a circle.
+\end{itemize}
-The choice of transformations is made through the options. There are two macros, one for the transformation of a single point \tkzcname{tkzDefPointBy} and the other for the transformation of a list of points \tkzcname{tkzDefPointsBy}. By default the image of $A$ is $A'$. For example, we'll write~:
+The choice of transformations is made through the options. There are two macros, one for the transformation of a single point \tkzcname{tkzDefPointBy} and the other for the transformation of a list of points \tkzcname{tkzDefPointsBy}. By default the image of $A$ is $A'$. For example, we'll write:
\begin{tkzltxexample}[]
-\tkzDefPointBy[translation= from A to A'](B) the result is in \tkzname{tkzPointResult}}
+\tkzDefPointBy[translation= from A to A'](B)
\end{tkzltxexample}
-
+The result is in \tkzname{tkzPointResult}
\medskip
-\begin{NewMacroBox}{tkzDefPointBy}{\oarg{local options}\parg{pt}}
+\begin{NewMacroBox}{tkzDefPointBy}{\oarg{local options}\parg{pt}}%
The argument is a simple existing point and its image is stored in \tkzname{tkzPointResult}. If you want to keep this point then the macro \tkzcname{tkzGetPoint\{M\}} allows you to assign the name \tkzname{M} to the point.
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
arguments & definition & examples \\
\midrule
@@ -28,7 +28,7 @@ arguments & definition & examples \\
\bottomrule
\end{tabular}
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
options & & examples \\
\midrule
\TOline{translation}{= from \#1 to \#2}{[translation=from A to B](E)}
@@ -37,7 +37,7 @@ options & & examples \\
\TOline{symmetry } {= center \#1}{[symmetry=center A](E)}
\TOline{projection }{= onto \#1--\#2}{[projection=onto A--B](E)}
\TOline{rotation } {= center \#1 angle \#2}{[rotation=center O angle 30](E)}
-\TOline{rotation in rad}{= center \#1 angle \#2}{rotation=center O angle pi/3}
+\TOline{rotation in rad}{= center \#1 angle \#2}{[rotation in rad=center O angle pi/3](E)}
\TOline{inversion}{= center \#1 through \#2}{[inversion =center O through A](E)}
\bottomrule
\end{tabular}
@@ -45,14 +45,26 @@ options & & examples \\
The image is only defined and not drawn.
\end{NewMacroBox}
-\subsection{Orthogonal reflection or symmetry }
+\subsection{Examples of transformations}
+\subsubsection{Example of translation}
-\subsubsection{Example of reflection}
+\subsection{Example of translation}
+\begin{tkzexample}[latex=7cm,small]
+\begin{tikzpicture}[>=latex]
+ \tkzDefPoint(0,0){A} \tkzDefPoint(3,1){B}
+ \tkzDefPoint(3,0){C}
+ \tkzDefPointBy[translation= from B to A](C)
+ \tkzGetPoint{D}
+ \tkzDrawPoints[teal](A,B,C,D)
+ \tkzLabelPoints[color=teal](A,B,C,D)
+ \tkzDrawSegments[orange,->](A,B D,C)
+\end{tikzpicture}
+\end{tkzexample}
+
+\subsubsection{Example of reflection (orthogonal symmetry)}
\begin{tkzexample}[vbox,small]
\begin{tikzpicture}[scale=1]
- \tkzInit[ymin=-4,ymax=6,xmin=-7,xmax=3]
- \tkzClip
\tkzDefPoints{1.5/-1.5/C,-4.5/2/D}
\tkzDefPoint(-4,-2){O}
\tkzDefPoint(-2,-2){A}
@@ -69,56 +81,50 @@ The image is only defined and not drawn.
\end{tikzpicture}
\end{tkzexample}
-
-\subsection{Homothety}
-\subsubsection{Example of homothety and projection}
+
+\subsubsection{Example of \tkzname{homothety} and \tkzname{projection}}
\begin{tkzexample}[vbox,small]
-\begin{tikzpicture}[scale=1.25]
- \tkzInit \tkzClip
- \tkzDefPoint(0,1){A} \tkzDefPoint(6,3){B} \tkzDefPoint(3,6){C}
- \tkzDrawLines[add= 0 and .3](A,B A,C)
+\begin{tikzpicture}[scale=1.2]
+ \tkzDefPoint(0,1){A} \tkzDefPoint(5,3){B} \tkzDefPoint(3,4){C}
\tkzDefLine[bisector](B,A,C) \tkzGetPoint{a}
\tkzDrawLine[add=0 and 0,color=magenta!50 ](A,a)
\tkzDefPointBy[homothety=center A ratio .5](a) \tkzGetPoint{a'}
- \tkzDefPointBy[projection = onto A--B](a') \tkzGetPoint{k}
- \tkzDrawSegment[blue](a',k)
- \tkzDrawPoints(a,a',k,A)
- \tkzDrawCircle(a',k)
+ \tkzDefPointBy[projection = onto A--B](a') \tkzGetPoint{k'}
+ \tkzDefPointBy[projection = onto A--B](a) \tkzGetPoint{k}
+ \tkzDrawLines[add= 0 and .3](A,k A,C)
+ \tkzDrawSegments[blue](a',k' a,k)
+ \tkzDrawPoints(a,a',k,k',A)
+ \tkzDrawCircles(a',k' a,k)
\tkzLabelPoints(a,a',k,A)
\end{tikzpicture}
\end{tkzexample}
-\subsection{The projection }
\subsubsection{Example of projection}
-
\begin{tkzexample}[vbox,small]
\begin{tikzpicture}[scale=1.5]
- \tkzInit[xmin=-3,xmax=5,ymax=4] \tkzClip[space=.5]
\tkzDefPoint(0,0){A}
\tkzDefPoint(0,4){B}
- \tkzDrawTriangle[pythagore](B,A) \tkzGetPoint{C}
+ \tkzDefTriangle[pythagore](B,A) \tkzGetPoint{C}
\tkzDefLine[bisector](B,C,A) \tkzGetPoint{c}
\tkzInterLL(C,c)(A,B) \tkzGetPoint{D}
- \tkzDrawSegment(C,D)
- \tkzDrawCircle(D,A)
\tkzDefPointBy[projection=onto B--C](D) \tkzGetPoint{G}
\tkzInterLC(C,D)(D,A) \tkzGetPoints{E}{F}
+ \tkzDrawPolygon[teal](A,B,C)
+ \tkzDrawSegment(C,D)
+ \tkzDrawCircle(D,A)
+ \tkzDrawSegment[orange](D,G)
+ \tkzMarkRightAngle[fill=orange!20](D,G,B)
\tkzDrawPoints(A,C,F) \tkzLabelPoints(A,C,F)
\tkzDrawPoints(B,D,E,G)
\tkzLabelPoints[above right](B,D,E,G)
\end{tikzpicture}
\end{tkzexample}
-
-
-\newpage
-\subsection{Symmetry }
\subsubsection{Example of symmetry}
-
\begin{tkzexample}[vbox,small]
-\begin{tikzpicture}[scale=1.5]
+\begin{tikzpicture}[scale=1]
\tkzDefPoint(0,0){O}
\tkzDefPoint(2,-1){A}
\tkzDefPoint(2,2){B}
@@ -134,84 +140,65 @@ The image is only defined and not drawn.
\end{tikzpicture}
\end{tkzexample}
-
-\newpage
-\subsection{Rotation }
\subsubsection{Example of rotation}
-
-
-\begin{tkzexample}[latex=8cm,small]
- \begin{tikzpicture}[scale=1]
- \tkzInit
+\begin{tkzexample}[latex=7cm,small]
+\begin{tikzpicture}[scale=0.5]
\tkzDefPoint(0,0){A}
\tkzDefPoint(5,0){B}
\tkzDrawSegment(A,B)
- \tkzDefPointBy[rotation=%
- center A angle 60](B)
+ \tkzDefPointBy[rotation=center A angle 60](B)
\tkzGetPoint{C}
- \tkzDefPointBy[symmetry=%
- center C](A)
+ \tkzDefPointBy[symmetry=center C](A)
\tkzGetPoint{D}
\tkzDrawSegment(A,tkzPointResult)
\tkzDrawLine(B,D)
- \tkzDrawArc[delta=10](A,B)(C)
- \tkzDrawArc[delta=10](B,C)(A)
- \tkzDrawArc[delta=10](C,D)(D)
+ \tkzDrawArc[orange,delta=10](A,B)(C)
+ \tkzDrawArc[orange,delta=10](B,C)(A)
+ \tkzDrawArc[orange,delta=10](C,D)(D)
\tkzMarkRightAngle(D,B,A)
\end{tikzpicture}
\end{tkzexample}
-
-\subsection{Rotation in radian }
\subsubsection{Example of rotation in radian}
-
-\begin{tkzexample}[latex=8cm,small]
+\begin{tkzexample}[latex=6cm,small]
\begin{tikzpicture}
\tkzDefPoint["$A$" left](1,5){A}
\tkzDefPoint["$B$" right](5,2){B}
\tkzDefPointBy[rotation in rad= center A angle pi/3](B)
- \tkzGetPoint{C}
-
+ \tkzGetPoint{C}
\tkzDrawSegment(A,B)
\tkzDrawPoints(A,B,C)
\tkzCompass[color=red](A,C)
- \tkzCompass[color=red](B,C)
-
+ \tkzCompass[color=red](B,C)
\tkzLabelPoints(C)
\end{tikzpicture}
\end{tkzexample}
-
-\newpage
-\subsection{Inversion with respect to a circle }
\subsubsection{Inversion of points}
-
-
\begin{tkzexample}[latex=8cm,small]
\begin{tikzpicture}[scale=1.5]
\tkzDefPoint(0,0){O}
\tkzDefPoint(1,0){A}
- \tkzDrawCircle(O,A)
\tkzDefPoint(-1.5,-1.5){z1}
\tkzDefPoint(0.35,0){z2}
- \tkzDrawPoints[color=black,
- fill=red,size=4](O,z1,z2)
\tkzDefPointBy[inversion =%
center O through A](z1)
\tkzGetPoint{Z1}
\tkzDefPointBy[inversion =%
center O through A](z2)
- \tkzGetPoint{Z2}
+ \tkzGetPoint{Z2}
+ \tkzDrawCircle(O,A)
\tkzDrawPoints[color=black,
fill=red,size=4](Z1,Z2)
\tkzDrawSegments(z1,Z1 z2,Z2)
+ \tkzDrawPoints[color=black,
+ fill=red,size=4](O,z1,z2)
\tkzLabelPoints(O,A,z1,z2,Z1,Z2)
\end{tikzpicture}
\end{tkzexample}
\subsubsection{Point Inversion: Orthogonal Circles}
-
\begin{tkzexample}[latex=8cm,small]
\begin{tikzpicture}[scale=1.5]
\tkzDefPoint(0,0){O}
@@ -230,24 +217,29 @@ The image is only defined and not drawn.
\end{tikzpicture}
\end{tkzexample}
-\newpage
-\section{Transformation of multiple points; \tkzcname{tkzDefPointsBy} }
-
+\subsection{Transformation of multiple points; \tkzcname{tkzDefPointsBy} }
Variant of the previous macro for defining multiple images.
You must give the names of the images as arguments, or indicate that the names of the images are formed from the names of the antecedents, leaving the argument empty.
\begin{tkzltxexample}[]
-\tkzDefPointsBy[translation= from A to A'](B,C){} the images are B' and C'.
-\tkzDefPointsBy[translation= from A to A'](B,C){D,E} the images are D and E
-\tkzDefPointsBy[translation= from A to A'](B) the image is B'.
+\tkzDefPointsBy[translation= from A to A'](B,C){}
\end{tkzltxexample}
+The images are $B'$ and $C'$.
-\begin{NewMacroBox}{tkzDefPointsBy}{\oarg{local options}\parg{list of points}\marg{list of points}}
-\begin{tabular}{lll}
-\toprule
-arguments & exemples & \\
+\begin{tkzltxexample}[]
+\tkzDefPointsBy[translation= from A to A'](B,C){D,E}
+\end{tkzltxexample}
+The images are $D$ and $E$.
+
+\begin{tkzltxexample}[]
+\tkzDefPointsBy[translation= from A to A'](B)
+\end{tkzltxexample}
+The image is $B'$.
+\begin{NewMacroBox}{tkzDefPointsBy}{\oarg{local options}\parg{list of points}\marg{list of points}}%
+\begin{tabular}{lll}%
+arguments & examples & \\
\midrule
-\TAline{\parg{liste de pts}\marg{list of pts}}{(A,B)\{E,F\}}{E is the image of A and F is the image of B.} \\
+\TAline{\parg{list of points}\marg{list of pts}}{(A,B)\{E,F\}}{$E$ is the image of $A$ and $F$ is the image of $B$.} \\
\bottomrule
\end{tabular}
@@ -255,9 +247,9 @@ arguments & exemples & \\
If the list of images is empty then the name of the image is the name of the antecedent to which " ' " is added.
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
-options & & exemples \\
+options & & examples \\
\midrule
\TOline{translation = from \#1 to \#2}{}{[translation=from A to B](E)\{\}}
\TOline{homothety = center \#1 ratio \#2}{}{[homothety=center A ratio .5](E)\{F\}}
@@ -265,7 +257,7 @@ options & & exemples \\
\TOline{symmetry = center \#1}{}{[symmetry=center A](E)\{F\}}
\TOline{projection = onto \#1--\#2}{}{[projection=onto A--B](E)\{F\}}
\TOline{rotation = center \#1 angle \#2}{}{[rotation=center angle 30](E)\{F\}}
-\TOline{rotation in rad = center \#1 angle \#2}{}{par exemple angle pi/3}
+\TOline{rotation in rad = center \#1 angle \#2}{}{for instance angle pi/3}
\bottomrule
\end{tabular}
@@ -273,11 +265,10 @@ options & & exemples \\
The points are only defined and not drawn.
\end{NewMacroBox}
-\subsection{Example de translation}
-
+\subsubsection{Example of translation}
\begin{tkzexample}[latex=7cm,small]
-\begin{tikzpicture}
- \tkzDefPoint(0,0){A} \tkzDefPoint(4,2){A'}
+\begin{tikzpicture}[>=latex]
+ \tkzDefPoint(0,0){A} \tkzDefPoint(3,1){A'}
\tkzDefPoint(3,0){B} \tkzDefPoint(1,2){C}
\tkzDefPointsBy[translation= from A to A'](B,C){}
\tkzDrawPolygon[color=blue](A,B,C)
diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-points.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-points.tex
index 9cea12304c..cce1c9066f 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-points.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-points.tex
@@ -2,25 +2,24 @@
Points can be specified in any of the following ways:
\begin{itemize}
-\item Cartesian coordinates
-\item Polar coordinates
-\item Named points
-\item Relative points
+\item Cartesian coordinates;
+\item Polar coordinates;
+\item Named points;
+\item Relative points.
\end{itemize}
Even if it's possible, I think it's a bad idea to work directly with coordinates. Preferable is to use named points.
A point is defined if it has a name linked to a unique pair of decimal numbers.
- Let $(x,y)$ or $(a:d)$ i.e. ( $x$ abscissa, $y$ ordinate) or ($a$ angle : $d$ distance ).
- This is possible because the plan has been provided with an orthonormed Cartesian coordinate system. The working axes are supposed to be (ortho)normed with unity equal to $1cm $ or something equivalent like $0.39370~in$.
- Now by default if you use a grid or axes, the rectangle used is defined by the coordinate points~: $(0,0)$ et $(10,10)$. It's the macro \tkzcname{tkzInit} of the package \tkzNamePack{tkz-base} that creates this rectangle. Look at the following two codes and the result of their compilation:
+ Let $(x,y)$ or $(a:d)$ i.e. ($x$ abscissa, $y$ ordinate) or ($a$ angle: $d$ distance).
+ This is possible because the plan has been provided with an orthonormed Cartesian coordinate system. The working axes are supposed to be (ortho)normed with unity equal to $1$~cm or something equivalent like $0.39370$~in.
+ Now by default if you use a grid or axes, the rectangle used is defined by the coordinate points: $(0,0)$ and $(10,10)$. It's the macro \tkzcname{tkzInit} of the package \tkzNamePack{tkz-base} that creates this rectangle. Look at the following two codes and the result of their compilation:
\begin{tkzexample}[latex=10cm,small]
\begin{tikzpicture}
- \tkzGrid
- \tkzDefPoint(0,0){O}
- \tkzDrawPoint[red](O)
- \tkzShowBB[line width=2pt,
- orange]
+\tkzGrid
+\tkzDefPoint(0,0){O}
+\tkzDrawPoint[red](O)
+\tkzShowBB[line width=2pt,teal]
\end{tikzpicture}
\end{tkzexample}
@@ -31,7 +30,7 @@ A point is defined if it has a name linked to a unique pair of decimal numbers.
\tkzDefPoint(5,5){A}
\tkzDrawSegment[blue](O,A)
\tkzDrawPoints[red](O,A)
- \tkzShowBB[line width=2pt,orange]
+ \tkzShowBB[line width=2pt,teal]
\end{tikzpicture}
\end{tkzexample}
@@ -40,13 +39,8 @@ A point is defined if it has a name linked to a unique pair of decimal numbers.
$y$-direction.
A point in polar coordinates requires an angle $\alpha$, in degrees,
- and distance from the origin, $d$. Unlike Cartesian coordinates, the
- distance does not have a default dimensional unit, so one must be
- supplied. The \tikz{} syntax for a point specified in polar
- coordinates is $(\alpha:r\:dim)$, where {\em dim} is a dimensional
- unit such as \texttt{cm}, \texttt{pt}, \texttt{in}, or any other
- \TeX-based unit. Other than syntax and the required dimensional unit,
- this follows usual mathematical usage.
+ and a distance $d$ from the origin with a dimensional
+ unit by default it's the \texttt{cm}.
\begin{minipage}[b]{0.5\textwidth}
@@ -59,7 +53,8 @@ A point is defined if it has a name linked to a unique pair of decimal numbers.
\tkzDefPoint(3,4){A}
\tkzDrawPoints(O,A)
\tkzLabelPoint(A){$A_1 (x_1,y_1)$}
- \tkzShowPointCoord[xlabel=$x_1$,ylabel=$y_1$](A)
+ \tkzShowPointCoord[xlabel=$x_1$,
+ ylabel=$y_1$](A)
\tkzLabelPoints(O,I)
\tkzLabelPoints[left](J)
\tkzDrawPoints[shape=cross](I,J)
@@ -74,14 +69,14 @@ A point is defined if it has a name linked to a unique pair of decimal numbers.
\tkzDefPoints{0/0/O,1/0/I,0/1/J}
\tkzDefPoint(40:4){P}
\tkzDrawXY[noticks,>=triangle 45]
- \tkzDrawSegment[dim={$r$,
+ \tkzDrawSegment[dim={$d$,
16pt,above=6pt}](O,P)
\tkzDrawPoints(O,P)
\tkzMarkAngle[mark=none,->](I,O,P)
\tkzFillAngle[fill=blue!20,
opacity=.5](I,O,P)
\tkzLabelAngle[pos=1.25](I,O,P){$\alpha$}
- \tkzLabelPoint(P){$P (\alpha : r )$}
+ \tkzLabelPoint(P){$P (\alpha : d )$}
\tkzDrawPoints[shape=cross](I,J)
\tkzLabelPoints(O,I)
\tkzLabelPoints[left](J)
@@ -89,51 +84,47 @@ A point is defined if it has a name linked to a unique pair of decimal numbers.
\end{tkzexample}
\end{minipage}%
-The \tkzNameMacro{tkzDefPoint} macro is used to define a point by assigning coordinates to it. This macro is based on \tkzNameMacro{coordinate}, a macro of \TIKZ\ . It can use \TIKZ-specific options such as \IoptName{TikZ}{shift}. If calculations are required then the \tkzNamePack{xfp} package is chosen. We can use Cartesian or polar coordinates.
+The \tkzNameMacro{tkzDefPoint} macro is used to define a point by assigning coordinates to it. This macro is based on \tkzNameMacro{coordinate}, a macro of \TIKZ. It can use \TIKZ-specific options such as \tkzname{shift}. If calculations are required then the \tkzNamePack{xfp} package is chosen. We can use Cartesian or polar coordinates.
\subsection{Defining a named point \tkzcname{tkzDefPoint}}
-\begin{NewMacroBox}{tkzDefPoint}{\oarg{local options}\parg{x,y}\marg{name} ou \parg{a:r}\marg{name}}
-
-\begin{tabular}{lll}
-\toprule
-arguments & défaut & définition \\
+\begin{NewMacroBox}{tkzDefPoint}{\oarg{local options}\parg{$x,y$}\marg{name} or \parg{$\alpha$:$d$}\marg{name}}%
+\begin{tabular}{lll}%
+arguments & default & definition \\
\midrule
-\TAline{(x,y)}{no default}{x et y sont deux dimensions, par défaut en cm.}
-\TAline{(a:d)}{no default}{a est un angle en degré, d une dimension}
-\TAline{\{name\}}{no default}{Nom attribué au point : $A$, $T_a$ ,$P1$ etc ...}
+\TAline{($x,y$)}{no default}{$x$ and $y$ are two dimensions, by default in cm.}
+\TAline{($\alpha$:$d$)}{no default}{$\alpha$ is an angle in degrees, $d$ is a dimension}
+\TAline{\{name\}}{no default}{Name assigned to the point: $A$, $T_a$ ,$P1$ etc ...}
\bottomrule
\end{tabular}
\medskip
-{Les arguments obligatoires de cette macro sont deux dimensions exprimées avec des décimaux, dans le premier cas ce sont deux mesures de longueur, dans le second ce sont une mesure de longueur et la mesure d'un angle en degré}
+The obligatory arguments of this macro are two dimensions expressed with decimals, in the first case they are two measures of length, in the second case they are a measure of length and the measure of an angle in degrees.
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
options & default & definition \\
\midrule
-\TOline{label} {no default} {permet de placer un label à une distance prédéfinie}
-\TOline{shift} {no default} {Ajoute (x,y) ou (a:d) à toutes les coordonnées}
- \bottomrule
+\TOline{label} {no default} {allows you to place a label at a predefined distance}
+\TOline{shift} {no default} {adds $(x,y)$ or $(\alpha:d)$ to all coordinates}
\end{tabular}
-
\end{NewMacroBox}
- \subsubsection{Cartesian coordinates }
+\subsubsection{Cartesian coordinates }
- \begin{tkzexample}[latex=7cm,small]
- \begin{tikzpicture}
- \tkzInit[xmax=5,ymax=5]
- \tkzDefPoint(0,0){A}
- \tkzDefPoint(4,0){B}
- \tkzDefPoint(0,3){C}
- \tkzDrawPolygon(A,B,C)
- \tkzDrawPoints(A,B,C)
- \end{tikzpicture}
- \end{tkzexample}
-
- \subsubsection{Calculations with \tkzNamePack{xfp}}
+\begin{tkzexample}[latex=7cm,small]
+ \begin{tikzpicture}
+ \tkzInit[xmax=5,ymax=5]
+ \tkzDefPoint(0,0){A}
+ \tkzDefPoint(4,0){B}
+ \tkzDefPoint(0,3){C}
+ \tkzDrawPolygon(A,B,C)
+ \tkzDrawPoints(A,B,C)
+ \end{tikzpicture}
+\end{tkzexample}
+
+\subsubsection{Calculations with \tkzNamePack{xfp}}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=1]
@@ -159,7 +150,7 @@ options & default & definition \\
\end{tkzexample}
\subsubsection{Calculations and coordinates}
-You must follow the syntax of \tkzNamePack{fxp} here. It is always possible to go through \tkzNamePack{pgfmath} but in this case, the coordinates must be calculated before using the macro \tkzcname{tkzDefPoint}.
+You must follow the syntax of \tkzNamePack{xfp} here. It is always possible to go through \tkzNamePack{pgfmath} but in this case, the coordinates must be calculated before using the macro \tkzcname{tkzDefPoint}.
\begin{tkzexample}[latex=6cm,small]
\begin{tikzpicture}[scale=.5]
@@ -171,8 +162,7 @@ You must follow the syntax of \tkzNamePack{fxp} here. It is always possible to g
\subsubsection{Relative points}
-
-First, we can use the \tkzNameEnv{scope} environment from \TIKZ\ ..
+First, we can use the \tkzNameEnv{scope} environment from \TIKZ.
In the following example, we have a way to define an equilateral triangle.
\begin{tkzexample}[latex=7cm,small]
@@ -193,26 +183,24 @@ In the following example, we have a way to define an equilateral triangle.
\end{tkzexample}
%<--------------------------------------------------------------------------->
-\subsection{Point relative to another : \tkzcname{tkzDefShiftPoint}}
-\begin{NewMacroBox}{tkzDefShiftPoint}{\oarg{Point}\parg{x,y}\marg{name} ou \parg{a:d}\marg{name}}
-\begin{tabular}{lll}
+\subsection{Point relative to another: \tkzcname{tkzDefShiftPoint}}
+\begin{NewMacroBox}{tkzDefShiftPoint}{\oarg{Point}\parg{$x,y$}\marg{name} or \parg{$\alpha$:$d$}\marg{name}}%
+\begin{tabular}{lll}%
arguments & default & definition \\
\midrule
-\TAline{(x,y)}{no default}{x and y are two dimensions, by default in cm.}
-\TAline{(a:d)}{no default}{a is an angle in degrees, d is a dimension}
+\TAline{($x,y$)}{no default}{$x$ and $y$ are two dimensions, by default in cm.}
+\TAline{($\alpha$:$d$)}{no default}{$\alpha$ is an angle in degrees, $d$ is a dimension}
\midrule
options & default & definition \\
\midrule
\TOline{[pt]} {no default} {\tkzcname{tkzDefShiftPoint}[A](0:4)\{B\}}
-\bottomrule
\end{tabular}
-
\end{NewMacroBox}
\subsubsection{Isosceles triangle with \tkzcname{tkzDefShiftPoint}}
-This macro allows you to place one point relative to another. This is equivalent to a translation. Here is how to construct an isosceles triangle with main vertex A and angle at vertex of $30^{\circ} $.
+This macro allows you to place one point relative to another. This is equivalent to a translation. Here is how to construct an isosceles triangle with main vertex $A$ and angle at vertex of $30^{\circ} $.
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[rotate=-30]
@@ -220,29 +208,26 @@ This macro allows you to place one point relative to another. This is equivalent
\tkzDefShiftPoint[A](0:4){B}
\tkzDefShiftPoint[A](30:4){C}
\tkzDrawSegments(A,B B,C C,A)
- \tkzMarkSegments[mark=|,
- color=red](A,B A,C)
+ \tkzMarkSegments[mark=|,color=red](A,B A,C)
\tkzDrawPoints(A,B,C)
\tkzLabelPoints(B,C)
\tkzLabelPoints[above left](A)
\end{tikzpicture}
\end{tkzexample}
-
-
\subsubsection{Equilateral triangle}
Let's see how to get an equilateral triangle (there is much simpler)
-
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=1]
\tkzDefPoint(2,3){A}
- \tkzDefShiftPoint[A](30:4){B}
- \tkzDefShiftPoint[A](-30:4){C}
+ \tkzDefShiftPoint[A](30:3){B}
+ \tkzDefShiftPoint[A](-30:3){C}
\tkzDrawPolygon(A,B,C)
\tkzDrawPoints(A,B,C)
\tkzLabelPoints(B,C)
\tkzLabelPoints[above left](A)
+ \tkzMarkSegments[mark=|,color=red](A,B A,C B,C)
\end{tikzpicture}
\end{tkzexample}
@@ -251,22 +236,21 @@ There's a simpler way
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}
\tkzDefPoint(0,0){A}
- \tkzDefPoint(60:3){B}
- \tkzDefShiftPointCoord[B](30:4){C}
- \tkzDefShiftPointCoord[A](30:4){D}
+ \tkzDefPoint(30:3){B}
+ \tkzDefShiftPointCoord[B](10:2){C}
+ \tkzDefShiftPointCoord[A](10:2){D}
\tkzDrawPolygon(A,...,D)
\tkzDrawPoints(A,...,D)
\end{tikzpicture}
\end{tkzexample}
%<--------------------------------------------------------------------------->
+\subsection{Definition of multiple points: \tkzcname{tkzDefPoints}}
-\subsection{Definition of multiple points : \tkzcname{tkzDefPoints}}
-
-\begin{NewMacroBox}{tkzDefPoints}{\oarg{local options}\marg{$x_1/y_1/n_1,x_2/y_2/n_2$, ...}}
-$x_i$ et $y_i$ are the coordinates of a referenced point $n_i$
+\begin{NewMacroBox}{tkzDefPoints}{\oarg{local options}\marg{$x_1/y_1/n_1,x_2/y_2/n_2$, ...}}%
+$x_i$ and $y_i$ are the coordinates of a referenced point $n_i$
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
arguments & default & example \\
\midrule
@@ -274,19 +258,14 @@ arguments & default & example \\
\end{tabular}
\medskip
-\begin{tabular}{lll}
-\toprule
+\begin{tabular}{lll}%
options & default & definition \\
\midrule
-\TOline{label} {no default} {allows you to place a label at a predefined distance}
-\TOline{shift} {no default} {Adds (x,y) or (a:d) to all coordinates}
- \bottomrule
+\TOline{shift} {no default} {Adds $(x,y)$ or $(\alpha:d)$ to all coordinates}
\end{tabular}
-
\end{NewMacroBox}
\subsection{Create a triangle}
-
\begin{tkzexample}[latex=6cm,small]
\begin{tikzpicture}[scale=1]
\tkzDefPoints{0/0/A,4/0/B,4/3/C}
@@ -305,19 +284,17 @@ Note here the syntax for drawing the polygon.
\end{tikzpicture}
\end{tkzexample}
-\newpage
\section{Special points}
The introduction of the dots was done in \tkzname{tkz-base}, the most important macro being \tkzcname{tkzDefPoint}. Here are some special points.
-
%<--------------------------------------------------------------------------->
\subsection{Middle of a segment \tkzcname{tkzDefMidPoint}}
It is a question of determining the middle of a segment.
-\begin{NewMacroBox}{tkzDefMidPoint}{\parg{pt1,pt2}}
+\begin{NewMacroBox}{tkzDefMidPoint}{\parg{pt1,pt2}}%
The result is in \tkzname{tkzPointResult}. We can access it with \tkzcname{tkzGetPoint}.
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
arguments & default & definition \\
\midrule
@@ -326,7 +303,7 @@ arguments & default & definition \\
\end{NewMacroBox}
\subsubsection{Use of \tkzcname{tkzDefMidPoint}}
-Review the use of \tkzcname{tkzDefPoint} in \NamePack{tkz-base}.
+Review the use of \tkzcname{tkzDefPoint} in \tkzNamePack{tkz-base}.
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=1]
\tkzDefPoint(2,3){A}
@@ -341,18 +318,18 @@ Review the use of \tkzcname{tkzDefPoint} in \NamePack{tkz-base}.
\subsection{Barycentric coordinates }
$pt_1$, $pt_2$, \dots, $pt_n$ being $n$ points, they define $n$ vectors $\overrightarrow{v_1}$, $\overrightarrow{v_2}$, \dots, $\overrightarrow{v_n}$ with the origin of the referential as the common endpoint. $\alpha_1$, $\alpha_2$,
-\dots $\alpha_n$ is $n$ numbers, the vector obtained by :
+\dots $\alpha_n$ are $n$ numbers, the vector obtained by:
\begin{align*}
\frac{\alpha_1 \overrightarrow{v_1} + \alpha_2 \overrightarrow{v_2} + \cdots + \alpha_n \overrightarrow{v_n}}{\alpha_1
+ \alpha_2 + \cdots + \alpha_n}
\end{align*}
defines a single point.
-\begin{NewMacroBox}{tkzDefBarycentricPoint}{\parg{pt1=$\alpha_1$,pt2=$\alpha_2$,\ldots}}
-\begin{tabular}{lll}
+\begin{NewMacroBox}{tkzDefBarycentricPoint}{\parg{pt1=$\alpha_1$,pt2=$\alpha_2$,\dots}}%
+\begin{tabular}{lll}%
arguments & default & definition \\
\midrule
-\TAline{(pt1=$\alpha_1$,pt2=$\alpha_2$,\ldots)}{no default}{Each point has a assigned weight}
+\TAline{(pt1=$\alpha_1$,pt2=$\alpha_2$,\dots)}{no default}{Each point has a assigned weight}
\bottomrule
\end{tabular}
@@ -362,7 +339,7 @@ You need at least two points.
\subsubsection{Using \tkzcname{tkzDefBarycentricPoint} with two points}
-In the following example, we obtain the barycentre of points A and B with coefficients 1 and 2, in other words:
+In the following example, we obtain the barycentre of points $A$ and $B$ with coefficients $1$ and $2$, in other words:
\[
\overrightarrow{AI}= \frac{2}{3}\overrightarrow{AB}
\]
@@ -380,8 +357,7 @@ In the following example, we obtain the barycentre of points A and B with coeffi
\end{tkzexample}
\subsubsection{Using \tkzcname{tkzDefBarycentricPoint} with three points}
-
-This time M is simply the centre of gravity of the triangle. For reasons of simplification and homogeneity, there is also \tkzcname{tkzCentroid}
+This time $M$ is simply the centre of gravity of the triangle. For reasons of simplification and homogeneity, there is also \tkzcname{tkzCentroid}.
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=.8]
\tkzDefPoint(2,1){A}
@@ -430,441 +406,6 @@ The centres of the two homotheties in which two circles correspond are called ex
\end{tikzpicture}
\end{tkzexample}
-\clearpage \newpage
-\section{Special points relating to a triangle}
-
-\subsection{Triangle center : \tkzcname{tkzDefTriangleCenter}}
-
-This macro allows you to define the center of a triangle.
-
-
-\begin{NewMacroBox}{tkzDefTriangleCenter}{\oarg{local options}\parg{A,B,C}}
-\tkzHandBomb\ Be careful, the arguments are lists of three points. This macro is used in conjunction with \tkzcname{tkzGetPoint} to get the center you are looking for. You can use \tkzname{tkzPointResult} if it is not necessary to keep the results.
-
-\medskip
-\begin{tabular}{lll}
-\toprule
-arguments & default & definition \\
-
-\midrule
-\TAline{(pt1,pt2,pt3)}{no default}{three points}
-\midrule
-options & default & definition \\
-\midrule
-\TOline{ortho} {circum}{Intersection of the altitudes of a triangle}
-\TOline{centroid} {circum}{centre of gravity. Intersection of the medians }
-\TOline{circum}{circum}{circle center circumscribed}
-\TOline{in} {circum}{centre du cercle inscrit dans à un triangle }
-\TOline{ex} {circum}{center of a circle exinscribed to a triangle }
-\TOline{euler}{circum}{centre of Euler's circle }
-\TOline{symmedian} {circum}{Lemoine's point or symmedian centre or Grebe's point }
-\TOline{spieker} {circum}{Spieker Circle Center}
-\TOline{nagel}{circum}{Nagel Centre}
-\TOline{mittenpunkt} {circum}{or else MiddlePoint center}
-\TOline{feuerbach}{circum}{Feuerbach Point}
-
-\end{tabular}
-\end{NewMacroBox}
-
-\subsubsection{\IoptName{tkzDefTriangleCenter}{ortho}}
- The intersection H of the three altitudes of a triangle is called the orthocenter.
-
-
-\begin{tkzexample}[latex=5cm,small]
-\begin{tikzpicture}
- \tkzDefPoint(0,0){A}
- \tkzDefPoint(5,1){B}
- \tkzDefPoint(1,4){C}
- \tkzClipPolygon(A,B,C)
- \tkzDefTriangleCenter[ortho](B,C,A)
- \tkzGetPoint{H}
- \tkzDefSpcTriangle[orthic,name=H](A,B,C){a,b,c}
- \tkzDrawPolygon[color=blue](A,B,C)
- \tkzDrawPoints(A,B,C,H)
- \tkzDrawLines[add=0 and 1](A,Ha B,Hb C,Hc)
- \tkzLabelPoint(H){$H$}
- \tkzAutoLabelPoints[center=H](A,B,C)
- \tkzMarkRightAngles(A,Ha,B B,Hb,C C,Hc,A)
-\end{tikzpicture}
-\end{tkzexample}
-
-\subsubsection{\IoptName{tkzDefTriangleCenter}{centroid}}
-
-\begin{tkzexample}[latex=5cm,small]
-\begin{tikzpicture}[scale=.75]
- \tkzDefPoints{-1/1/A,5/1/B}
- \tkzDefEquilateral(A,B)
- \tkzGetPoint{C}
- \tkzDefTriangleCenter[centroid](A,B,C)
- \tkzGetPoint{G}
- \tkzDrawPolygon[color=brown](A,B,C)
- \tkzDrawPoints(A,B,C,G)
- \tkzDrawLines[add = 0 and 2/3](A,G B,G C,G)
-\end{tikzpicture}
-\end{tkzexample}
-
-\subsubsection{\IoptName{tkzDefTriangleCenter}{circum}}
-
-\begin{tkzexample}[latex=6cm,small]
- \begin{tikzpicture}
- \tkzDefPoints{0/1/A,3/2/B,1/4/C}
- \tkzDefTriangleCenter[circum](A,B,C)
- \tkzGetPoint{G}
- \tkzDrawPolygon[color=brown](A,B,C)
- \tkzDrawCircle(G,A)
- \tkzDrawPoints(A,B,C,G)
- \end{tikzpicture}
-\end{tkzexample}
-
-
-\subsubsection{\IoptName{tkzDefTriangleCenter}{in}}
- In geometry, the incircle or inscribed circle of a triangle is the largest circle contained in the triangle; it touches (is tangent to) the three sides. The center of the incircle is a triangle center called the triangle's incenter.
- The center of the incircle, called the incenter, can be found as the intersection of the three internal angle bisectors. The center of an excircle is the intersection of the internal bisector of one angle (at vertex A, for example) and the external bisectors of the other two. The center of this excircle is called the excenter relative to the vertex A, or the excenter of A.[3] Because the internal bisector of an angle is perpendicular to its external bisector, it follows that the center of the incircle together with the three excircle centers form an orthocentric system.(\url{https://en.wikipedia.org/wiki/Incircle_and_excircles_of_a_triangle})
-
- \medskip
- We get the centre of the inscribed circle of the triangle. The result is of course in \tkzname{tkzPointResult}. We can retrieve it with \tkzcname{tkzGetPoint}.
-
-\begin{tkzexample}[latex=6cm,small]
-\begin{tikzpicture}
- \tkzDefPoints{0/1/A,3/2/B,1/4/C}
- \tkzDefTriangleCenter[in](A,B,C)\tkzGetPoint{I}
- \tkzDefPointBy[projection=onto A--C](I)
- \tkzGetPoint{Ib}
- \tkzDrawPolygon[color=blue](A,B,C)
- \tkzDrawPoints(A,B,C,I)
- \tkzDrawLines[add = 0 and 2/3](A,I B,I C,I)
- \tkzDrawCircle(I,Ib)
-\end{tikzpicture}
-\end{tkzexample}
-
-\subsubsection{\IoptName{tkzDefTriangleCenter}{ex}}
-
-
-An excircle or escribed circle of the triangle is a circle lying outside the triangle, tangent to one of its sides and tangent to the extensions of the other two. Every triangle has three distinct excircles, each tangent to one of the triangle's sides.
-(\url{https://en.wikipedia.org/wiki/Incircle_and_excircles_of_a_triangle})
-
-
- We get the centre of an inscribed circle of the triangle. The result is of course in \tkzname{tkzPointResult}. We can retrieve it with \tkzcname{tkzGetPoint}.
-
-\begin{tkzexample}[latex=8cm,small]
-\begin{tikzpicture}[scale=.5]
- \tkzDefPoints{0/1/A,3/2/B,1/4/C}
- \tkzDefCircle[ex](B,C,A)
- \tkzGetFirstPoint{J_c}
- \tkzGetSecondPoint{Tc}
- \tkzDrawPolygon[color=blue](A,B,C)
- \tkzDrawPoints(A,B,C,J_c)
- \tkzDrawCircle[red](J_c,Tc)
- \tkzDrawLines[add=1.5 and 0](A,C B,C)
- \tkzLabelPoints(J_c)
-\end{tikzpicture}
-\end{tkzexample}
-
-\subsubsection{Utilisation de \IoptName{tkzDefTriangleCenter}{euler} }
-This macro allows to obtain the center of the circle of the nine points or euler's circle or Feuerbach's circle.
-The nine-point circle, also called Euler's circle or the Feuerbach circle, is the circle that passes through the perpendicular feet $H_A$, $H_B$, and $H_C$ dropped from the vertices of any reference triangle ABC on the sides opposite them. Euler showed in 1765 that it also passes through the midpoints $M_A$, $M_B$, $M_C$ of the sides of ABC. By Feuerbach's theorem, the nine-point circle also passes through the midpoints $E_A$, $E_B$, and $E_C$ of the segments that join the vertices and the orthocenter H. These points are commonly referred to as the Euler points. (\url{http://mathworld.wolfram.com/Nine-PointCircle.html})
-
-\begin{tkzexample}[latex=7cm,small]
-\begin{tikzpicture}[scale=1]
- \tkzDefPoints{0/0/A,6/0/B,0.8/4/C}
- \tkzDefSpcTriangle[medial,
- name=M](A,B,C){_A,_B,_C}
- \tkzDefTriangleCenter[euler](A,B,C)
- \tkzGetPoint{N} % I= N nine points
- \tkzDefTriangleCenter[ortho](A,B,C)
- \tkzGetPoint{H}
- \tkzDefMidPoint(A,H) \tkzGetPoint{E_A}
- \tkzDefMidPoint(C,H) \tkzGetPoint{E_C}
- \tkzDefMidPoint(B,H) \tkzGetPoint{E_B}
- \tkzDefSpcTriangle[ortho,name=H](A,B,C){_A,_B,_C}
- \tkzDrawPolygon[color=blue](A,B,C)
- \tkzDrawCircle(N,E_A)
- \tkzDrawSegments[blue](A,H_A B,H_B C,H_C)
- \tkzDrawPoints(A,B,C,N,H)
- \tkzDrawPoints[red](M_A,M_B,M_C)
- \tkzDrawPoints[blue]( H_A,H_B,H_C)
- \tkzDrawPoints[green](E_A,E_B,E_C)
- \tkzAutoLabelPoints[center=N,
- font=\scriptsize](A,B,C,%
- M_A,M_B,M_C,%
- H_A,H_B,H_C,%
- E_A,E_B,E_C)
- \tkzLabelPoints[font=\scriptsize](H,N)
- \tkzMarkSegments[mark=s|,size=3pt,
- color=blue,line width=1pt](B,E_B E_B,H)
-\end{tikzpicture}
-\end{tkzexample}
-
-
-\subsubsection{Using option \IoptName{tkzDefTriangleCenter}{symmedian}}
-
-\begin{tkzexample}[latex=6cm,small]
-\begin{tikzpicture}
- \tkzDefPoint(0,0){A}
- \tkzDefPoint(5,0){B}
- \tkzDefPoint(1,4){C}
- \tkzDefTriangleCenter[symmedian](A,B,C)\tkzGetPoint{K}
- \tkzDefTriangleCenter[median](A,B,C)\tkzGetPoint{G}
- \tkzDefTriangleCenter[in](A,B,C)\tkzGetPoint{I}
- \tkzDefSpcTriangle[centroid,name=M](A,B,C){a,b,c}
- \tkzDefSpcTriangle[incentral,name=I](A,B,C){a,b,c}
- \tkzDrawPolygon[color=blue](A,B,C)
- \tkzDrawPoints(A,B,C,K)
- \tkzDrawLines[add = 0 and 2/3,blue](A,K B,K C,K)
- \tkzDrawSegments[red,dashed](A,Ma B,Mb C,Mc)
- \tkzDrawSegments[orange,dashed](A,Ia B,Ib C,Ic)
- \tkzDrawLine(G,I)
-\end{tikzpicture}
-\end{tkzexample}
-
-\subsubsection{Using option \IoptName{tkzDefTriangleCenter}{nagel}}
-
-Let$ Ta$ be the point at which the $Ja$ excircle meets the side BC of a triangle $ABC$, and define Tband Tc similarly. Then the lines $ATa$, $BTb$, and $CTc$ concur in the Nagel point $Na$.
-\href{http://mathworld.wolfram.com/NagelPoint.html}{Weisstein, Eric W. "Nagel point." From MathWorld--A Wolfram Web Resource. }
-
-
-\begin{tkzexample}[latex=8cm,small]
- \begin{tikzpicture}[scale=.5]
- \tkzDefPoints{0/0/A,6/0/B,4/6/C}
- \tkzDefSpcTriangle[ex](A,B,C){Ja,Jb,Jc}
- \tkzDefSpcTriangle[extouch](A,B,C){Ta,Tb,Tc}
- \tkzDrawPoints(Ja,Jb,Jc,Ta,Tb,Tc)
- \tkzLabelPoints(Ja,Jb,Jc,Ta,Tb,Tc)
- \tkzDrawPolygon[blue](A,B,C)
- \tkzDefTriangleCenter[nagel](A,B,C) \tkzGetPoint{Na}
- \tkzDrawPoints[blue](B,C,A)
- \tkzDrawPoints[red](Na)
- \tkzLabelPoints[blue](B,C,A)
- \tkzLabelPoints[red](Na)
- \tkzDrawLines[add=0 and 1](A,Ta B,Tb C,Tc)
- \tkzShowBB\tkzClipBB
- \tkzDrawLines[add=1 and 1,dashed](A,B B,C C,A)
- \tkzDrawCircles[ex,gray](A,B,C C,A,B B,C,A)
- \tkzDrawSegments[dashed](Ja,Ta Jb,Tb Jc,Tc)
- \tkzMarkRightAngles[fill=gray!20](Ja,Ta,C Jb,Tb,A Jc,Tc,B)
- \end{tikzpicture}
-\end{tkzexample}
-
-
-\subsubsection{Option Triangle "mittenpunkt"}
-\begin{tkzexample}[latex=8cm,small]
-\begin{tikzpicture}[scale=.5]
- \tkzDefPoints{0/0/A,6/0/B,4/6/C}
- \tkzDefSpcTriangle[centroid](A,B,C){Ma,Mb,Mc}
- \tkzDefSpcTriangle[ex](A,B,C){Ja,Jb,Jc}
- \tkzDefSpcTriangle[extouch](A,B,C){Ta,Tb,Tc}
- \tkzDefTriangleCenter[mittenpunkt](A,B,C)
- \tkzGetPoint{Mi}
- \tkzDrawPoints(Ma,Mb,Mc,Ja,Jb,Jc)
- \tkzClipBB
- \tkzDrawPolygon[blue](A,B,C)
- \tkzDrawLines[add=0 and 1](Ja,Ma
- Jb,Mb Jc,Mc)
- \tkzDrawLines[add=1 and 1](A,B A,C B,C)
- \tkzDrawCircles[gray](Ja,Ta Jb,Tb Jc,Tc)
- \tkzDrawPoints[blue](B,C,A)
- \tkzDrawPoints[red](Mi)
- \tkzLabelPoints[red](Mi)
- \tkzLabelPoints[left](Mb)
- \tkzLabelPoints(Ma,Mc,Jb,Jc)
- \tkzLabelPoints[above left](Ja,Jc)
- \tkzShowBB
-\end{tikzpicture}
-\end{tkzexample}
-%<--------------------------------------------------------------------------->
-%<--------------------------------------------------------------------------->
-\clearpage \newpage
-\section{Draw a point}
-\subsubsection{Drawing points \tkzcname{tkzDrawPoint}} \hypertarget{tdrp}{}
-
-\begin{NewMacroBox}{tkzDrawPoint}{\oarg{local options}\parg{name}}
-\begin{tabular}{lll}
-arguments & default & definition \\
-\midrule
-\TAline{name of point} {no default} {Only one point name is accepted}
-\bottomrule
-\end{tabular}
-
-\medskip
-The argument is required. The disc takes the color of the circle, but lighter. It is possible to change everything. The point is a node and therefore it is invariant if the drawing is modified by scaling.
-
-\medskip
-\begin{tabular}{lll}
-\toprule
-options & default & definition \\
-\midrule
-\TOline{shape} {circle}{Possible \tkzname{cross} ou \tkzname{cross out}}
-\TOline{size} {6}{$6 \times$ \tkzcname{pgflinewidth}}
-\TOline{color} {black}{the default color can be changed }
-\bottomrule
-\end{tabular}
-
-\medskip
-{We can create other forms such as \tkzname{cross}}
-\end{NewMacroBox}
-
-\subsubsection{Example of point drawings}
-Note that \tkzname{scale} does not affect the shape of the dots. Which is normal. Most of the time, we are satisfied with a single point shape that we can define from the beginning, either with a macro or by modifying a configuration file.
-
-
-\begin{tkzexample}[latex=5cm,small]
- \begin{tikzpicture}[scale=.5]
- \tkzDefPoint(1,3){A}
- \tkzDefPoint(4,1){B}
- \tkzDefPoint(0,0){O}
- \tkzDrawPoint[color=red](A)
- \tkzDrawPoint[fill=blue!20,draw=blue](B)
- \tkzDrawPoint[color=green](O)
- \end{tikzpicture}
-\end{tkzexample}
-
-It is possible to draw several points at once but this macro is a little slower than the previous one. Moreover, we have to make do with the same options for all the points.
-
-\hypertarget{tdrps}{}
-\begin{NewMacroBox}{tkzDrawPoints}{\oarg{local options}\parg{liste}}
-\begin{tabular}{lll}
-arguments & default & definition \\
-\midrule
-\TAline{points list}{no default}{example \tkzcname{tkzDrawPoints(A,B,C)}}
-\bottomrule
-\end{tabular}
-
-\medskip
-\begin{tabular}{lll}
-\toprule
-options & default & definition \\
-\midrule
-\TOline{shape} {circle}{Possible \tkzname{cross} ou \tkzname{cross out}}
-\TOline{size} {6}{$6 \times$ \tkzcname{pgflinewidth}}
-\TOline{color} {black}{the default color can be changed }
-\bottomrule
-\end{tabular}
-
-\medskip
-\tkzHandBomb\ Beware of the final "s", an oversight leads to cascading errors if you try to draw multiple points. The options are the same as for the previous macro.
-\end{NewMacroBox}
-
-\subsubsection{First example}
-
-\begin{tkzexample}[latex=7cm,small]
-\begin{tikzpicture}
- \tkzDefPoint(1,3){A}
- \tkzDefPoint(4,1){B}
- \tkzDefPoint(0,0){C}
- \tkzDrawPoints[size=6,color=red,
- fill=red!50](A,B,C)
-\end{tikzpicture}
-\end{tkzexample}
-
-\subsubsection{Second example}
-
-\begin{tkzexample}[latex=7cm,small]
-\begin{tikzpicture}[scale=.5]
- \tkzDefPoint(2,3){A} \tkzDefPoint(5,-1){B}
- \tkzDefPoint[label=below:$\mathcal{C}$,
- shift={(2,3)}](-30:5.5){E}
- \begin{scope}[shift=(A)]
- \tkzDefPoint(30:5){C}
- \end{scope}
- \tkzCalcLength[cm](A,B)\tkzGetLength{rAB}
- \tkzDrawCircle[R](A,\rAB cm)
- \tkzDrawSegment(A,B)
- \tkzDrawPoints(A,B,C)
- \tkzLabelPoints(B,C)
- \tkzLabelPoints[above](A)
-\end{tikzpicture}
-\end{tkzexample}
-
-\section{Point on line or circle}
-\subsection{Point on a line}
-
-\begin{NewMacroBox}{tkzDefPointOnLine}{\oarg{local options}\parg{A,B}}
-\begin{tabular}{lll}
-arguments & default & definition \\
-\midrule
-\TAline{pt1,pt2} {no default} {Two points to define a line}
-\bottomrule
-\end{tabular}
-
-\medskip
-\begin{tabular}{lll}
-\toprule
-options & default & definition \\
-\midrule
-\TOline{pos=nb} {}{nb is a decimal }
-\bottomrule
-\end{tabular}
-
-\medskip
-
-\end{NewMacroBox}
-
-\subsubsection{Use of option \tkzname{pos} 1}
-\begin{tkzexample}[latex=9cm,small]
- \begin{tikzpicture}
- \tkzDefPoints{0/0/A,4/0/B}
- \tkzDrawLine[red](A,B)
- \tkzDefPointOnLine[pos=1.2](A,B)
- \tkzGetPoint{P}
- \tkzDefPointOnLine[pos=-0.2](A,B)
- \tkzGetPoint{R}
- \tkzDefPointOnLine[pos=0.5](A,B)
- \tkzGetPoint{S}
- \tkzDrawPoints(A,B,P)
- \tkzLabelPoints(A,B)
- \tkzLabelPoint[above](P){pos=$1.2$}
- \tkzLabelPoint[above](R){pos=$-.2$}
- \tkzLabelPoint[above](S){pos=$.5$}
- \tkzDrawPoints(A,B,P,R,S)
- \tkzLabelPoints(A,B)
- \end{tikzpicture}
-\end{tkzexample}
-
-\subsection{Point on a circle}
-
-\begin{NewMacroBox}{tkzDefPointOnCircle}{\oarg{local options}\parg{A,B}}
-\begin{tabular}{lll}
-arguments & default & definition \\
-\midrule
-\TAline{pt1,pt2} {no default} {Two points to define a line}
-\bottomrule
-\end{tabular}
-
-\medskip
-\begin{tabular}{lll}
-\toprule
-options & default & definition \\
-\midrule
-\TOline{angle} {0}{angle formed with the abscissa axis}
-\TOline{center} {tkzPointResult}{circle center}
-\TOline{radius} {|\tkzLengthResult pt|}{radius circle}
-\bottomrule
-\end{tabular}
-
-
-\end{NewMacroBox}
-
-\begin{tkzexample}[latex=7cm,small]
-\begin{tikzpicture}
- \tkzDefPoints{0/0/A,4/0/B,0.8/3/C}
- \tkzDefPointOnCircle[angle=90,center=B,
- radius=1 cm]
- \tkzGetPoint{I}
- \tkzDrawCircle[R,teal](B,1cm)
- \tkzDrawPoint[teal](I)
- \tkzDefCircle[circum](A,B,C)
- \tkzGetPoint{G} \tkzGetLength{rG}
- \tkzDefPointOnCircle[angle=30,center=G,
- radius=\rG pt]
- \tkzGetPoint{J}
- \tkzDrawPoints(A,B,C)
- \tkzDrawCircle(G,J)
- \tkzDrawPoint(G)
- \tkzDrawPoint[red](J)
-\end{tikzpicture}
-\end{tkzexample}
-
-
\endinput
diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-pointsSpc.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-pointsSpc.tex
new file mode 100644
index 0000000000..f2bdf788ce
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-pointsSpc.tex
@@ -0,0 +1,413 @@
+\section{Special points relating to a triangle}
+
+\subsection{Triangle center: \tkzcname{tkzDefTriangleCenter}}
+
+This macro allows you to define the center of a triangle.
+
+
+\begin{NewMacroBox}{tkzDefTriangleCenter}{\oarg{local options}\parg{A,B,C}}%
+\tkzHandBomb\ Be careful, the arguments are lists of three points. This macro is used in conjunction with \tkzcname{tkzGetPoint} to get the center you are looking for. You can use \tkzname{tkzPointResult} if it is not necessary to keep the results.
+
+\medskip
+\begin{tabular}{lll}%
+\toprule
+arguments & default & definition \\
+
+\midrule
+\TAline{(pt1,pt2,pt3)}{no default}{three points}
+\midrule
+options & default & definition \\
+\midrule
+\TOline{ortho} {circum}{intersection of the altitudes of a triangle}
+\TOline{centroid} {circum}{centre of gravity. Intersection of the medians }
+\TOline{circum}{circum}{circle center circumscribed}
+\TOline{in} {circum}{center of the circle inscribed in a triangle }
+\TOline{ex} {circum}{center of a circle exinscribed to a triangle }
+\TOline{euler}{circum}{center of Euler's circle }
+\TOline{symmedian} {circum}{Lemoine's point or symmedian centre or Grebe's point }
+\TOline{spieker} {circum}{Spieker Circle Center}
+\TOline{nagel}{circum}{Nagel Center}
+\TOline{mittenpunkt} {circum}{also called the middlespoint}
+\TOline{feuerbach}{circum}{Feuerbach Point}
+
+\end{tabular}
+\end{NewMacroBox}
+
+\subsubsection{Option \tkzname{ortho} or \tkzname{orthic}}
+ The intersection $H$ of the three altitudes of a triangle is called the orthocenter.
+
+\begin{tkzexample}[latex=5cm,small]
+\begin{tikzpicture}
+ \tkzDefPoint(0,0){A}
+ \tkzDefPoint(5,1){B}
+ \tkzDefPoint(1,4){C}
+ \tkzClipPolygon(A,B,C)
+ \tkzDefTriangleCenter[ortho](B,C,A)
+ \tkzGetPoint{H}
+ \tkzDefSpcTriangle[orthic,name=H](A,B,C){a,b,c}
+ \tkzDrawPolygon[color=blue](A,B,C)
+ \tkzDrawPoints(A,B,C,H)
+ \tkzDrawLines[add=0 and 1](A,Ha B,Hb C,Hc)
+ \tkzLabelPoint(H){$H$}
+ \tkzAutoLabelPoints[center=H](A,B,C)
+ \tkzMarkRightAngles(A,Ha,B B,Hb,C C,Hc,A)
+\end{tikzpicture}
+\end{tkzexample}
+
+\subsubsection{Option \tkzname{centroid}}
+\begin{tkzexample}[latex=5cm,small]
+\begin{tikzpicture}[scale=.75]
+ \tkzDefPoints{-1/1/A,5/1/B}
+ \tkzDefEquilateral(A,B)
+ \tkzGetPoint{C}
+ \tkzDefTriangleCenter[centroid](A,B,C)
+ \tkzGetPoint{G}
+ \tkzDrawPolygon[color=brown](A,B,C)
+ \tkzDrawPoints(A,B,C,G)
+ \tkzDrawLines[add = 0 and 2/3](A,G B,G C,G)
+\end{tikzpicture}
+\end{tkzexample}
+
+\subsubsection{Option \tkzname{circum}}
+\begin{tkzexample}[latex=6cm,small]
+ \begin{tikzpicture}
+ \tkzDefPoints{0/1/A,3/2/B,1/4/C}
+ \tkzDefTriangleCenter[circum](A,B,C)
+ \tkzGetPoint{G}
+ \tkzDrawPolygon[color=brown](A,B,C)
+ \tkzDrawCircle(G,A)
+ \tkzDrawPoints(A,B,C,G)
+ \end{tikzpicture}
+\end{tkzexample}
+
+\subsubsection{Option \tkzname{in}}
+In geometry, the incircle or inscribed circle of a triangle is the largest circle contained in the triangle; it touches (is tangent to) the three sides. The center of the incircle is a triangle center called the triangle's incenter.
+The center of the incircle, called the incenter, can be found as the intersection of the three internal angle bisectors. The center of an excircle is the intersection of the internal bisector of one angle (at vertex $A$, for example) and the external bisectors of the other two. The center of this excircle is called the excenter relative to the vertex $A$, or the excenter of $A$. Because the internal bisector of an angle is perpendicular to its external bisector, it follows that the center of the incircle together with the three excircle centers form an orthocentric system.(\url{https://en.wikipedia.org/wiki/Incircle_and_excircles_of_a_triangle})
+
+ \medskip
+ We get the centre of the inscribed circle of the triangle. The result is of course in \tkzname{tkzPointResult}. We can retrieve it with \tkzcname{tkzGetPoint}.
+
+\begin{tkzexample}[latex=6cm,small]
+\begin{tikzpicture}
+ \tkzDefPoints{0/1/A,3/2/B,1/4/C}
+ \tkzDefTriangleCenter[in](A,B,C)\tkzGetPoint{I}
+ \tkzDefPointBy[projection=onto A--C](I)
+ \tkzGetPoint{Ib}
+ \tkzDrawPolygon[color=blue](A,B,C)
+ \tkzDrawPoints(A,B,C,I)
+ \tkzDrawLines[add = 0 and 2/3](A,I B,I C,I)
+ \tkzDrawCircle(I,Ib)
+\end{tikzpicture}
+\end{tkzexample}
+
+\subsubsection{Option \tkzname{ex}}
+An excircle or escribed circle of the triangle is a circle lying outside the triangle, tangent to one of its sides and tangent to the extensions of the other two. Every triangle has three distinct excircles, each tangent to one of the triangle's sides.
+(\url{https://en.wikipedia.org/wiki/Incircle_and_excircles_of_a_triangle})
+
+
+ We get the centre of an inscribed circle of the triangle. The result is of course in \tkzname{tkzPointResult}. We can retrieve it with \tkzcname{tkzGetPoint}.
+
+\begin{tkzexample}[latex=8cm,small]
+ \begin{tikzpicture}[scale=.5]
+ \tkzDefPoints{0/1/A,3/2/B,1/4/C}
+ \tkzDefTriangleCenter[ex](B,C,A)
+ \tkzGetPoint{J_c}
+ \tkzDefPointBy[projection=onto A--B](J_c)
+ \tkzGetPoint{Tc}
+ %or
+ % \tkzDefCircle[ex](B,C,A)
+ % \tkzGetFirstPoint{J_c}
+ % \tkzGetSecondPoint{Tc}
+ \tkzDrawPolygon[color=blue](A,B,C)
+ \tkzDrawPoints(A,B,C,J_c)
+ \tkzDrawCircle[red](J_c,Tc)
+ \tkzDrawLines[add=1.5 and 0](A,C B,C)
+ \tkzLabelPoints(J_c)
+ \end{tikzpicture}
+\end{tkzexample}
+
+\subsubsection{Option \tkzname{euler}}
+This macro allows to obtain the center of the circle of the nine points or euler's circle or Feuerbach's circle.
+The nine-point circle, also called Euler's circle or the Feuerbach circle, is the circle that passes through the perpendicular feet $H_A$, $H_B$, and $H_C$ dropped from the vertices of any reference triangle $ABC$ on the sides opposite them. Euler showed in 1765 that it also passes through the midpoints $M_A$, $M_B$, $M_C$ of the sides of $ABC$. By Feuerbach's theorem, the nine-point circle also passes through the midpoints $E_A$, $E_B$, and $E_C$ of the segments that join the vertices and the orthocenter $H$. These points are commonly referred to as the Euler points. (\url{http://mathworld.wolfram.com/Nine-PointCircle.html})
+
+\begin{tkzexample}[latex=7cm,small]
+\begin{tikzpicture}[scale=1]
+ \tkzDefPoints{0/0/A,6/0/B,0.8/4/C}
+ \tkzDefSpcTriangle[medial,
+ name=M](A,B,C){_A,_B,_C}
+ \tkzDefTriangleCenter[euler](A,B,C)
+ \tkzGetPoint{N} % I= N nine points
+ \tkzDefTriangleCenter[ortho](A,B,C)
+ \tkzGetPoint{H}
+ \tkzDefMidPoint(A,H) \tkzGetPoint{E_A}
+ \tkzDefMidPoint(C,H) \tkzGetPoint{E_C}
+ \tkzDefMidPoint(B,H) \tkzGetPoint{E_B}
+ \tkzDefSpcTriangle[ortho,name=H](A,B,C){_A,_B,_C}
+ \tkzDrawPolygon[color=blue](A,B,C)
+ \tkzDrawCircle(N,E_A)
+ \tkzDrawSegments[blue](A,H_A B,H_B C,H_C)
+ \tkzDrawPoints(A,B,C,N,H)
+ \tkzDrawPoints[red](M_A,M_B,M_C)
+ \tkzDrawPoints[blue]( H_A,H_B,H_C)
+ \tkzDrawPoints[green](E_A,E_B,E_C)
+ \tkzAutoLabelPoints[center=N,
+ font=\scriptsize](A,B,C,%
+ M_A,M_B,M_C,%
+ H_A,H_B,H_C,%
+ E_A,E_B,E_C)
+ \tkzLabelPoints[font=\scriptsize](H,N)
+ \tkzMarkSegments[mark=s|,size=3pt,
+ color=blue,line width=1pt](B,E_B E_B,H)
+\end{tikzpicture}
+\end{tkzexample}
+
+
+\subsubsection{Option \tkzname{symmedian}}
+
+\begin{tkzexample}[latex=6cm,small]
+\begin{tikzpicture}
+ \tkzDefPoint(0,0){A}
+ \tkzDefPoint(5,0){B}
+ \tkzDefPoint(1,4){C}
+ \tkzDefTriangleCenter[symmedian](A,B,C)\tkzGetPoint{K}
+ \tkzDefTriangleCenter[median](A,B,C)\tkzGetPoint{G}
+ \tkzDefTriangleCenter[in](A,B,C)\tkzGetPoint{I}
+ \tkzDefSpcTriangle[centroid,name=M](A,B,C){a,b,c}
+ \tkzDefSpcTriangle[incentral,name=I](A,B,C){a,b,c}
+ \tkzDrawPolygon[color=blue](A,B,C)
+ \tkzDrawLines[add = 0 and 2/3,blue](A,K B,K C,K)
+ \tkzDrawSegments[red,dashed](A,Ma B,Mb C,Mc)
+ \tkzDrawSegments[orange,dashed](A,Ia B,Ib C,Ic)
+ \tkzDrawLine[add=2 and 2](G,I)
+ \tkzDrawPoints(A,B,C,K,G,I)
+\end{tikzpicture}
+\end{tkzexample}
+
+
+\subsubsection{Option \tkzname{nagel}}
+Let $Ta$ be the point at which the excircle with center $Ja$ meets the side $BC$ of a triangle $ABC$, and define $Tb$ and $Tc$ similarly. Then the lines $ATa$, $BTb$, and $CTc$ concur in the Nagel point $Na$.
+\href{http://mathworld.wolfram.com/NagelPoint.html}{Weisstein, Eric W. "Nagel point." From MathWorld--A Wolfram Web Resource. }
+
+
+\begin{tkzexample}[latex=8cm,small]
+ \begin{tikzpicture}[scale=.5]
+ \tkzDefPoints{0/0/A,6/0/B,4/6/C}
+ \tkzDefSpcTriangle[ex](A,B,C){Ja,Jb,Jc}
+ \tkzDefSpcTriangle[extouch](A,B,C){Ta,Tb,Tc}
+ \tkzDrawPoints(Ja,Jb,Jc,Ta,Tb,Tc)
+ \tkzLabelPoints(Ja,Jb,Jc,Ta,Tb,Tc)
+ \tkzDrawPolygon[blue](A,B,C)
+ \tkzDefTriangleCenter[nagel](A,B,C) \tkzGetPoint{Na}
+ \tkzDrawPoints[blue](B,C,A)
+ \tkzDrawPoints[red](Na)
+ \tkzLabelPoints[blue](B,C,A)
+ \tkzLabelPoints[red](Na)
+ \tkzDrawLines[add=0 and 1](A,Ta B,Tb C,Tc)
+ \tkzShowBB\tkzClipBB
+ \tkzDrawLines[add=1 and 1,dashed](A,B B,C C,A)
+ \tkzDrawCircles[ex,gray](A,B,C C,A,B B,C,A)
+ \tkzDrawSegments[dashed](Ja,Ta Jb,Tb Jc,Tc)
+ \tkzMarkRightAngles[fill=gray!20](Ja,Ta,C
+ Jb,Tb,A Jc,Tc,B)
+ \end{tikzpicture}
+\end{tkzexample}
+
+
+\subsubsection{Option \tkzname{mittenpunkt}}
+\begin{tkzexample}[latex=8cm,small]
+\begin{tikzpicture}[scale=.5]
+ \tkzDefPoints{0/0/A,6/0/B,4/6/C}
+ \tkzDefSpcTriangle[centroid](A,B,C){Ma,Mb,Mc}
+ \tkzDefSpcTriangle[ex](A,B,C){Ja,Jb,Jc}
+ \tkzDefSpcTriangle[extouch](A,B,C){Ta,Tb,Tc}
+ \tkzDefTriangleCenter[mittenpunkt](A,B,C)
+ \tkzGetPoint{Mi}
+ \tkzDrawPoints(Ma,Mb,Mc,Ja,Jb,Jc)
+ \tkzClipBB
+ \tkzDrawPolygon[blue](A,B,C)
+ \tkzDrawLines[add=0 and 1](Ja,Ma
+ Jb,Mb Jc,Mc)
+ \tkzDrawLines[add=1 and 1](A,B A,C B,C)
+ \tkzDrawCircles[gray](Ja,Ta Jb,Tb Jc,Tc)
+ \tkzDrawPoints[blue](B,C,A)
+ \tkzDrawPoints[red](Mi)
+ \tkzLabelPoints[red](Mi)
+ \tkzLabelPoints[left](Mb)
+ \tkzLabelPoints(Ma,Mc,Jb,Jc)
+ \tkzLabelPoints[above left](Ja,Jc)
+ \tkzShowBB
+\end{tikzpicture}
+\end{tkzexample}
+%<---------------------------------------------------------------------->
+%<---------------------------------------------------------------------->
+\section{Draw a point}
+\subsubsection{Drawing points \tkzcname{tkzDrawPoint}} \hypertarget{tdrp}{}
+
+\begin{NewMacroBox}{tkzDrawPoint}{\oarg{local options}\parg{name}}%
+\begin{tabular}{lll}%
+arguments & default & definition \\
+\midrule
+\TAline{name of point} {no default} {Only one point name is accepted}
+\bottomrule
+\end{tabular}
+
+\medskip
+The argument is required. The disc takes the color of the circle, but lighter. It is possible to change everything. The point is a node and therefore it is invariant if the drawing is modified by scaling.
+
+\medskip
+\begin{tabular}{lll}%
+\toprule
+options & default & definition \\
+\midrule
+\TOline{shape} {circle}{Possible \tkzname{cross} or \tkzname{cross out}}
+\TOline{size} {6}{$6 \times$ \tkzcname{pgflinewidth}}
+\TOline{color} {black}{the default color can be changed }
+\bottomrule
+\end{tabular}
+
+\medskip
+{We can create other forms such as \tkzname{cross}}
+\end{NewMacroBox}
+
+\subsubsection{Example of point drawings}
+Note that \tkzname{scale} does not affect the shape of the dots. Which is normal. Most of the time, we are satisfied with a single point shape that we can define from the beginning, either with a macro or by modifying a configuration file.
+
+
+\begin{tkzexample}[latex=5cm,small]
+ \begin{tikzpicture}[scale=.5]
+ \tkzDefPoint(1,3){A}
+ \tkzDefPoint(4,1){B}
+ \tkzDefPoint(0,0){O}
+ \tkzDrawPoint[color=red](A)
+ \tkzDrawPoint[fill=blue!20,draw=blue](B)
+ \tkzDrawPoint[color=green](O)
+ \end{tikzpicture}
+\end{tkzexample}
+
+It is possible to draw several points at once but this macro is a little slower than the previous one. Moreover, we have to make do with the same options for all the points.
+
+\hypertarget{tdrps}{}
+\begin{NewMacroBox}{tkzDrawPoints}{\oarg{local options}\parg{liste}}%
+\begin{tabular}{lll}%
+arguments & default & definition \\
+\midrule
+\TAline{points list}{no default}{example \tkzcname{tkzDrawPoints(A,B,C)}}
+\bottomrule
+\end{tabular}
+
+\medskip
+\begin{tabular}{lll}%
+options & default & definition \\
+\midrule
+\TOline{shape} {circle}{Possible \tkzname{cross} or \tkzname{cross out}}
+\TOline{size} {6}{$6 \times$ \tkzcname{pgflinewidth}}
+\TOline{color} {black}{the default color can be changed }
+\bottomrule
+\end{tabular}
+
+\medskip
+\tkzHandBomb\ Beware of the final "s", an oversight leads to cascading errors if you try to draw multiple points. The options are the same as for the previous macro.
+\end{NewMacroBox}
+
+\subsubsection{First example}
+
+\begin{tkzexample}[latex=7cm,small]
+\begin{tikzpicture}
+ \tkzDefPoint(1,3){A}
+ \tkzDefPoint(4,1){B}
+ \tkzDefPoint(0,0){C}
+ \tkzDrawPoints[size=6,color=red,
+ fill=red!50](A,B,C)
+\end{tikzpicture}
+\end{tkzexample}
+
+\subsubsection{Second example}
+
+\begin{tkzexample}[latex=7cm,small]
+\begin{tikzpicture}[scale=.5]
+ \tkzDefPoint(2,3){A} \tkzDefPoint(5,-1){B}
+ \tkzDefPoint[label=below:$\mathcal{C}$,
+ shift={(2,3)}](-30:5.5){E}
+ \begin{scope}[shift=(A)]
+ \tkzDefPoint(30:5){C}
+ \end{scope}
+ \tkzCalcLength[cm](A,B)\tkzGetLength{rAB}
+ \tkzDrawCircle[R](A,\rAB cm)
+ \tkzDrawSegment(A,B)
+ \tkzDrawPoints(A,B,C)
+ \tkzLabelPoints(B,C)
+ \tkzLabelPoints[above](A)
+\end{tikzpicture}
+\end{tkzexample}
+
+\section{Point on line or circle}
+\subsection{Point on a line}
+
+\begin{NewMacroBox}{tkzDefPointOnLine}{\oarg{local options}\parg{A,B}}%
+\begin{tabular}{lll}%
+arguments & default & definition \\
+\midrule
+\TAline{pt1,pt2} {no default} {Two points to define a line}
+\bottomrule
+\end{tabular}
+
+\medskip
+\begin{tabular}{lll}%
+options & default & definition \\
+\midrule
+\TOline{pos=nb} {}{nb is a decimal }
+\end{tabular}
+\end{NewMacroBox}
+
+\subsubsection{Use of option \tkzname{pos}}
+\begin{tkzexample}[latex=9cm,small]
+ \begin{tikzpicture}
+ \tkzDefPoints{0/0/A,4/0/B}
+ \tkzDrawLine[red](A,B)
+ \tkzDefPointOnLine[pos=1.2](A,B)
+ \tkzGetPoint{P}
+ \tkzDefPointOnLine[pos=-0.2](A,B)
+ \tkzGetPoint{R}
+ \tkzDefPointOnLine[pos=0.5](A,B)
+ \tkzGetPoint{S}
+ \tkzDrawPoints(A,B,P)
+ \tkzLabelPoints(A,B)
+ \tkzLabelPoint[above](P){pos=$1.2$}
+ \tkzLabelPoint[above](R){pos=$-.2$}
+ \tkzLabelPoint[above](S){pos=$.5$}
+ \tkzDrawPoints(A,B,P,R,S)
+ \tkzLabelPoints(A,B)
+ \end{tikzpicture}
+\end{tkzexample}
+
+\subsection{Point on a circle}
+
+\begin{NewMacroBox}{tkzDefPointOnCircle}{\oarg{local options}}%
+\begin{tabular}{lll}%
+options & default & definition \\
+\midrule
+\TOline{angle} {0}{angle formed with the abscissa axis}
+\TOline{center} {|tkzPointResult|}{circle center required}
+\TOline{radius} {|\BS tkzLengthResult|}{radius circle}
+\end{tabular}
+\end{NewMacroBox}
+
+\begin{tkzexample}[latex=7cm,small]
+\begin{tikzpicture}
+ \tkzDefPoints{0/0/A,4/0/B,0.8/3/C}
+ \tkzDefPointOnCircle[angle=90,center=B,radius=1 cm]
+ \tkzGetPoint{I}
+ \tkzDefCircle[circum](A,B,C)
+ \tkzGetPoint{G} \tkzGetLength{rG}
+ \tkzDefPointOnCircle[angle=30,center=G,radius=\rG pt]
+ \tkzGetPoint{J}
+ \tkzDrawCircle[R,teal](B,1cm)
+ \tkzDrawPoint[teal](I)
+ \tkzDrawPoints(A,B,C)
+ \tkzDrawCircle(G,J)
+ \tkzDrawPoints(G,J)
+ \tkzDrawPoint[red](J)
+ \tkzLabelPoints(G,J)
+\end{tikzpicture}
+\end{tkzexample}
+\endinput \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-pointwith.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-pointwith.tex
index 98c1ef0c6d..8af1881003 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-pointwith.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-pointwith.tex
@@ -2,21 +2,21 @@
\subsection{\tkzcname{tkzDefPointWith}}
There are several possibilities to create points that meet certain vector conditions.
-This can be done with \tkzcname{tkzDefPointWith}. The general principle is as follows, two points are passed as arguments, i.e. a vector. The different options allow to obtain a new point forming with the first point ( with some exceptions) a collinear vector or a vector orthogonal to the first vector. Then the length is either proportional to that of the first one, or proportional to the unit. Since this point is only used temporarily, it does not have to be named immediately. The result is in \tkzcname{tkzPointResult}. The macro \tkzNameMacro{tkzGetPoint} allows you to retrieve the point and name it differently.
+This can be done with \tkzcname{tkzDefPointWith}. The general principle is as follows, two points are passed as arguments, i.e. a vector. The different options allow to obtain a new point forming with the first point (with some exceptions) a collinear vector or a vector orthogonal to the first vector. Then the length is either proportional to that of the first one, or proportional to the unit. Since this point is only used temporarily, it does not have to be named immediately. The result is in \tkzname{tkzPointResult}. The macro \tkzNameMacro{tkzGetPoint} allows you to retrieve the point and name it differently.
There are options to define the distance between the given point and the obtained point.
In the general case this distance is the distance between the 2 points given as arguments if the option is of the "normed" type then the distance between the given point and the obtained point is 1 cm. Then the $K$ option allows to obtain multiples.
-\begin{NewMacroBox}{tkzDefPointWith}{\parg{pt1,pt2}}
+\begin{NewMacroBox}{tkzDefPointWith}{\parg{pt1,pt2}}%
It is in fact the definition of a point meeting vectorial conditions.
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
arguments & definition & explication \\
\midrule
-\TAline{(pt1,pt2)} {point couple}{the result is a point in \tkzcname{tkzPointResult} } \\
+\TAline{(pt1,pt2)} {point couple}{the result is a point in \tkzname{tkzPointResult} } \\
\bottomrule
\end{tabular}
@@ -24,23 +24,21 @@ arguments & definition & explication \\
\medskip
In what follows, it is assumed that the point is recovered by \tkzNameMacro{tkzGetPoint\{C\}}
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
-options & exemple & explication \\
+options & example & explication \\
\midrule
-\TOline{orthogonal}{[orthogonal](A,B)}{$AC=AB$ et $\overrightarrow{AC} \perp \overrightarrow{AB}$}
-\TOline{orthogonal normed}{[orthogonal normed](A,B)}{$AC=1$ et $\overrightarrow{AC} \perp \overrightarrow{AB}$}
+\TOline{orthogonal}{[orthogonal](A,B)}{$AC=AB$ and $\overrightarrow{AC} \perp \overrightarrow{AB}$}
+\TOline{orthogonal normed}{[orthogonal normed](A,B)}{$AC=1$ and $\overrightarrow{AC} \perp \overrightarrow{AB}$}
\TOline{linear}{[linear](A,B)}{$\overrightarrow{AC}=K \times \overrightarrow{AB}$}
-\TOline{linear normed}{[linear normed](A,B)}{$AC=K$ et $\overrightarrow{AC}=k\times \overrightarrow{AB}$ }
+\TOline{linear normed}{[linear normed](A,B)}{$AC=K$ and $\overrightarrow{AC}=k\times \overrightarrow{AB}$ }
\TOline{colinear= at \#1}{[colinear= at C](A,B)}{$\overrightarrow{CD}= \overrightarrow{AB}$ }
\TOline{colinear normed= at \#1}{[colinear normed= at C](A,B)}{$\overrightarrow{CD}= \overrightarrow{AB}$ }
\TOline{K}{[linear](A,B),K=2}{$\overrightarrow{AC}=2\times \overrightarrow{AB}$}
- \bottomrule
\end{tabular}
-
\end{NewMacroBox}
-\subsubsection{\tkzcname{tkzDefPointWith} et \tkzname{colinear at}}
+\subsubsection{Option \tkzname{colinear at}}
$(\overrightarrow{AB}=\overrightarrow{CD})$
\begin{tkzexample}[latex=6cm,small]
\begin{tikzpicture}[scale=1.2,
@@ -56,7 +54,7 @@ options & exemple & explication \\
\end{tkzexample}
-\subsubsection{colinear at}
+\subsubsection{Option \tkzname{colinear at} with $K$}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[vect/.style={->,
@@ -74,8 +72,7 @@ options & exemple & explication \\
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{colinear $K=\frac{\sqrt{2}}{2}$}
-
+\subsubsection{Option \tkzname{colinear at} with $K=\frac{\sqrt{2}}{2}$}
\begin{tkzexample}[latex=6cm,small]
\begin{tikzpicture}[vect/.style={->,
shorten >=3pt,>=latex'}]
@@ -89,17 +86,18 @@ options & exemple & explication \\
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{\tkzcname{tkzDefPointWith} et \tkzname{orthogonal}}
-$K=-1$ afin que $(\overrightarrow{AC},\overrightarrow{AB})$ détermine un angle positif. AB=AC puisque $|K|=1$
+\subsubsection{Option \tkzname{orthogonal}}
+AB=AC since $K=1$.
\begin{tkzexample}[latex=6cm,small]
\begin{tikzpicture}[scale=1.2,
vect/.style={->,shorten >=3pt,>=latex'}]
\tkzDefPoint(2,3){A}
\tkzDefPoint(4,2){B}
- \tkzDefPointWith[orthogonal,K=-1](A,B)
+ \tkzDefPointWith[orthogonal,K=1](A,B)
\tkzGetPoint{C}
\tkzDrawPoints[color=red](A,B,C)
- \tkzLabelPoints[right=3pt](A,B,C)
+ \tkzLabelPoints[right=3pt](B,C)
+ \tkzLabelPoints[below=3pt](A)
\tkzDrawSegments[vect](A,B A,C)
\tkzMarkRightAngle(B,A,C)
\end{tikzpicture}
@@ -107,7 +105,9 @@ $K=-1$ afin que $(\overrightarrow{AC},\overrightarrow{AB})$ détermine un angle
-\subsubsection{ orthogonal simple}
+\subsubsection{Option \tkzname{orthogonal} with $K=-1$}
+OK=OI since $\lvert K \rvert=1$ then OI=OJ=OK.
+
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=.75]
\tkzDefPoint(1,2){O}
@@ -124,7 +124,7 @@ $K=-1$ afin que $(\overrightarrow{AC},\overrightarrow{AB})$ détermine un angle
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{advanced orthogonal}
+\subsubsection{Option \tkzname{orthogonal} more complicated example}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=.75]
\tkzDefPoints{0/0/A,6/0/B}
@@ -147,7 +147,7 @@ $K=-1$ afin que $(\overrightarrow{AC},\overrightarrow{AB})$ détermine un angle
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{segment colinear and orthogonal}
+\subsubsection{Options \tkzname{colinear} and \tkzname{orthogonal}}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=1.2,
vect/.style={->,shorten >=3pt,>=latex'}]
@@ -163,8 +163,8 @@ $K=-1$ afin que $(\overrightarrow{AC},\overrightarrow{AB})$ détermine un angle
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{\tkzcname{tkzDefPointWith} \tkzname{orthogonal normed}, K=1}
-AC=1
+\subsubsection{Option \tkzname{orthogonal normed}, $K=1$}
+$AC=1$.
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=1.2,
@@ -178,8 +178,8 @@ AC=1
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{\tkzcname{tkzDefPointWith} et \tkzname{orthogonal normed} K=2}
-$K=2$ donc AC=2.
+\subsubsection{Option \tkzname{orthogonal normed} and $K=2$}
+$K=2$ therefore $AC=2$.
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=1.2,
@@ -195,8 +195,9 @@ $K=2$ donc AC=2.
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{\tkzcname{tkzDefPointWith} \tkzname{linear} }
- Ici $K=0.5$
+\subsubsection{Option \tkzname{linear}}
+Here $K=0.5$.
+
This amounts to applying a homothety or a multiplication of a vector by a real. Here is the middle of $[AB]$.
\begin{tkzexample}[latex=7cm,small]
@@ -210,8 +211,8 @@ This amounts to applying a homothety or a multiplication of a vector by a real.
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{\tkzcname{tkzDefPointWith} \tkzname{linear normed}}
-In the following example AC=1 and C belongs to $(AB)$.
+\subsubsection{Option \tkzname{linear normed}}
+In the following example $AC=1$ and $C$ belongs to $(AB)$.
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=1.2]
@@ -233,19 +234,19 @@ In the following example AC=1 and C belongs to $(AB)$.
\subsection{\tkzcname{tkzGetVectxy} }
-Retrieving the coordinates of a vector
+Retrieving the coordinates of a vector.
-\begin{NewMacroBox}{tkzGetVectxy}{\parg{$A,B$}\var{text}}
-Allows to obtain the coordinates of a vector
+\begin{NewMacroBox}{tkzGetVectxy}{\parg{$A,B$}\var{text}}%
+Allows to obtain the coordinates of a vector.
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
-arguments & example & explication \\
+arguments & example & explication \\
\midrule
-\TAline{(point)\{name of macro\}} {\tkzcname{tkzGetVectxy}(A,B)\{V\}}{\tkzcname{Vx},\tkzcname{Vy} : coordinates of $\overrightarrow{AB}$}
+\TAline{(point)\{name of macro\}} {\tkzcname{tkzGetVectxy}(A,B)\{V\}}{\tkzcname{Vx},\tkzcname{Vy}: coordinates of $\overrightarrow{AB}$}
\end{tabular}
\end{NewMacroBox}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-polygons.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-polygons.tex
index fe50b39e2c..d63e31fdea 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-polygons.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-polygons.tex
@@ -1,25 +1,21 @@
\section{Definition of polygons}
-
\subsection{Defining the points of a square} \label{def_square}
- We have seen the definitions of some triangles. Let us look at the definitions of some quadrilaterals and regular polygons.
-
- \begin{NewMacroBox}{tkzDefSquare}{\parg{pt1,pt2}}
+We have seen the definitions of some triangles. Let us look at the definitions of some quadrilaterals and regular polygons.
+\begin{NewMacroBox}{tkzDefSquare}{\parg{pt1,pt2}}%
The square is defined in the forward direction. From two points, two more points are obtained such that the four taken in order form a square. The square is defined in the forward direction. The results are in \tkzname{tkzFirstPointResult} and \tkzname{tkzSecondPointResult}.\\
-We can rename them with \tkzcname{tkzGetPoints}
+We can rename them with \tkzcname{tkzGetPoints}.
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
Arguments & example & explication \\
\midrule
-\TAline{\parg{pt1,pt2}}{\tkzcname{tkzDefSquare}\parg{A,B}}{The square is defined in the direct direction}
-\bottomrule
- \end{tabular}
+\TAline{\parg{pt1,pt2}}{\tkzcname{tkzDefSquare}\parg{A,B}}{The square is defined in the direct direction.}
+\end{tabular}
\end{NewMacroBox}
\subsubsection{Using \tkzcname{tkzDefSquare} with two points}
-
Note the inversion of the first two points and the result.
\begin{tkzexample}[latex=4cm,small]
@@ -34,7 +30,7 @@ Note the inversion of the first two points and the result.
\end{tikzpicture}
\end{tkzexample}
- We may only need one point to draw an isosceles right-angled triangle so we use \tkzcname{tkzGetFirstPoint} or \tkzcname{tkzGetSecondPoint}
+ We may only need one point to draw an isosceles right-angled triangle so we use \tkzcname{tkzGetFirstPoint} or \tkzcname{tkzGetSecondPoint}.
\subsubsection{Use of \tkzcname{tkzDefSquare} to obtain an isosceles right-angled triangle}
\begin{tkzexample}[latex=7cm,small]
@@ -74,11 +70,11 @@ Note the inversion of the first two points and the result.
\subsection{Defining the points of a parallelogram}
It is a matter of completing three points in order to obtain a parallelogram.
- \begin{NewMacroBox}{tkzDefParallelogram}{\parg{pt1,pt2,pt3}}
+\begin{NewMacroBox}{tkzDefParallelogram}{\parg{pt1,pt2,pt3}}%
From three points, another point is obtained such that the four taken in order form a parallelogram. The result is in \tkzname{tkzPointResult}. \\
We can rename it with the name \tkzcname{tkzGetPoint}...
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
arguments & default & definition \\
\midrule
@@ -143,26 +139,24 @@ Explanation of the definition of a parallelogram
\subsection{Drawing a square}
-
- \begin{NewMacroBox}{tkzDrawSquare}{\oarg{local options}\parg{pt1,pt2}}
+\begin{NewMacroBox}{tkzDrawSquare}{\oarg{local options}\parg{pt1,pt2}}%
The macro draws a square but not the vertices. It is possible to color the inside. The order of the points is that of the direct direction of the trigonometric circle.
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
arguments & example & explication \\
\midrule
\TAline{\parg{pt1,pt2}}{|\tkzcname{tkzDrawSquare}|\parg{A,B}}{|\tkzcname{tkzGetPoints\{C\}\{D\}}|}
\bottomrule
- \end{tabular}
+\end{tabular}
\medskip
- \begin{tabular}{lll}
- options & example & explication \\
- \midrule
- \TOline{Options TikZ}{|red,line width=1pt|}{}
- \bottomrule
- \end{tabular}
+\begin{tabular}{lll}%
+options & example & explication \\
+\midrule
+\TOline{Options TikZ}{|red,line width=1pt|}{}
+\end{tabular}
\end{NewMacroBox}
\subsubsection{The idea is to inscribe two squares in a semi-circle.}
@@ -188,37 +182,33 @@ arguments & example & explication \\
\end{tkzexample}
\subsection{The golden rectangle}
- \begin{NewMacroBox}{tkzDefGoldRectangle}{\parg{point,point}}
+ \begin{NewMacroBox}{tkzDefGoldRectangle}{\parg{point,point}}%
The macro determines a rectangle whose size ratio is the number $\Phi$. The created points are in \tkzname{tkzFirstPointResult} and \tkzname{tkzSecondPointResult}. They can be obtained with the macro \tkzcname{tkzGetPoints}. The following macro is used to draw the rectangle.
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
arguments & example & explication \\
\midrule
-\TAline{\parg{pt1,pt2}}{\parg{A,B}}{Si C et D sont créés alors $AB/BC=\Phi$}
+\TAline{\parg{pt1,pt2}}{\parg{A,B}}{If C and D are created then $AB/BC=\Phi$.}
\end{tabular}
\end{NewMacroBox}
\begin{NewMacroBox}{tkzDrawGoldRectangle}{\oarg{local options}\parg{point,point}}
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
arguments & example & explication \\
\midrule
\TAline{\parg{pt1,pt2}}{\parg{A,B}}{Draws the golden rectangle based on the segment $[AB]$}
- \end{tabular}
+\end{tabular}
\medskip
- \begin{tabular}{lll}
- options & example & explication \\
- \midrule
- \TOline{Options TikZ}{|red,line width=1pt|}{}
- \bottomrule
- \end{tabular}
-
+\begin{tabular}{lll}%
+options & example & explication \\
+\midrule
+\TOline{Options TikZ}{|red,line width=1pt|}{}
+\end{tabular}
\end{NewMacroBox}
-%
\subsubsection{Golden Rectangles}
-
\begin{tkzexample}[latex=6 cm,small]
\begin{tikzpicture}[scale=.6]
\tkzDefPoint(0,0){A} \tkzDefPoint(8,0){B}
@@ -230,11 +220,10 @@ arguments & example & explication \\
\end{tkzexample}
\subsection{Drawing a polygon}
+ \begin{NewMacroBox}{tkzDrawPolygon}{\oarg{local options}\parg{points list}}%
+Just give a list of points and the macro plots the polygon using the \TIKZ\ options present. You can replace $(A,B,C,D,E)$ by $(A,...,E)$ and $(P_1,P_2,P_3,P_4,P_5)$ by $(P_1,P...,P_5)$
- \begin{NewMacroBox}{tkzDrawPolygon}{\oarg{local options}\parg{liste de points}}
-Just give a list of points and the macro plots the polygon using the \TIKZ\ options present.
-
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
arguments & example & explication \\
\midrule
@@ -242,7 +231,7 @@ arguments & example & explication \\
\end{tabular}
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
options & default & example \\
\midrule
@@ -250,7 +239,7 @@ options & default & example \\
\end{tabular}
\end{NewMacroBox}
-\subsubsection{Draw a polygon 1}
+\subsubsection{\tkzcname{tkzDrawPolygon}}
\begin{tkzexample}[latex=7cm, small]
\begin{tikzpicture} [rotate=18,scale=1.5]
@@ -262,21 +251,62 @@ options & default & example \\
\tkzDrawSegments[style=dashed](A,C B,D)
\end{tikzpicture}\end{tkzexample}
-
+\subsection{Drawing a polygonal chain}
+ \begin{NewMacroBox}{tkzDrawPolySeg}{\oarg{local options}\parg{points list}}%
+Just give a list of points and the macro plots the polygonal chain using the \TIKZ\ options present.
+
+\begin{tabular}{lll}%
+\toprule
+arguments & example & explication \\
+\midrule
+\TAline{\parg{pt1,pt2,pt3,...}}{|\BS tkzDrawPolySeg[gray,dashed](A,B,C)|}{Drawing a triangle}
+ \end{tabular}
+
+\medskip
+\begin{tabular}{lll}%
+\toprule
+options & default & example \\
+\midrule
+\TOline{Options TikZ}{...}{|\BS tkzDrawPolySeg[red,line width=2pt](A,B,C)|}
+ \end{tabular}
+\end{NewMacroBox}
+
+\subsubsection{Polygonal chain}
+
+\begin{tkzexample}[latex=7cm, small]
+\begin{tikzpicture}
+ \tkzDefPoints{0/0/A,6/0/B,3/4/C,2/2/D}
+ \tkzDrawPolySeg(A,...,D)
+ \tkzDrawPoints(A,...,D)
+\end{tikzpicture}
+\end{tkzexample}
+
+\subsubsection{Polygonal chain: index notation}
+
+\begin{tkzexample}[latex=7cm, small]
+\begin{tikzpicture}
+\foreach \pt in {1,2,...,8} {%
+\tkzDefPoint(\pt*20:3){P_\pt}}
+\tkzDrawPolySeg(P_1,P_...,P_8)
+\tkzDrawPoints(P_1,P_...,P_8)
+\end{tikzpicture}
+\end{tkzexample}
+
\subsection{Clip a polygon}
- \begin{NewMacroBox}{tkzClipPolygon}{\oarg{local options}\parg{points list}}
+ \begin{NewMacroBox}{tkzClipPolygon}{\oarg{local options}\parg{points list}}%
This macro makes it possible to contain the different plots in the designated polygon.
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
-options & example & explication \\
+arguments & example & explication \\
\midrule
\TAline{\parg{pt1,pt2}}{\parg{A,B}}{}
%\bottomrule
\end{tabular}
\end{NewMacroBox}
-\subsubsection{Simple Example}
+
+\subsubsection{\tkzcname{tkzClipPolygon}}
\begin{tkzexample}[latex=7 cm,small]
\begin{tikzpicture}[scale=1.25]
\tkzInit[xmin=0,xmax=4,ymin=0,ymax=3]
@@ -290,7 +320,7 @@ options & example & explication \\
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Example Sangaku in a square}
+\subsubsection{Example: use of "Clip" for Sangaku in a square}
\begin{tkzexample}[latex=7cm, small]
\begin{tikzpicture}[scale=.75]
\tkzDefPoint(0,0){A} \tkzDefPoint(8,0){B}
@@ -315,20 +345,20 @@ options & example & explication \\
\end{tkzexample}
\subsection{Color a polygon}
- \begin{NewMacroBox}{tkzFillPolygon}{\oarg{local options}\parg{points list}}
+ \begin{NewMacroBox}{tkzFillPolygon}{\oarg{local options}\parg{points list}}%
You can color by drawing the polygon, but in this case you color the inside of the polygon without drawing it.
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
-options & example & explication \\
+arguments & example & explication \\
\midrule
\TAline{\parg{pt1,pt2,\dots}}{\parg{A,B,\dots}}{}
%\bottomrule
\end{tabular}
\end{NewMacroBox}
-\subsubsection{Color a polygon}
+\subsubsection{\tkzcname{tkzFillPolygon}}
\begin{tkzexample}[latex=7cm, small]
\begin{tikzpicture}[scale=0.7]
\tkzInit[xmin=-3,xmax=6,ymin=-1,ymax=6]
@@ -348,4 +378,52 @@ options & example & explication \\
\tkzLabelAngle[pos = 1.5](A,O,B){$\alpha$}
\end{tikzpicture}
\end{tkzexample}
+
+\subsection{Regular polygon}
+ \begin{NewMacroBox}{tkzDefRegPolygon}{\oarg{local options}\parg{pt1,pt2}}%
+From the number of sides, depending on the options, this macro determines a regular polygon according to its center or one side.
+
+\begin{tabular}{lll}%
+\toprule
+arguments & example & explication \\
+\midrule
+\TAline{\parg{pt1,pt2}}{\parg{O,A}}{with option "center", $O$ is the center of the polygon.}
+\TAline{\parg{pt1,pt2}}{\parg{A,B}}{with option "side", $[AB]$ is a side.}
+ \end{tabular}
+
+\medskip
+\begin{tabular}{lll}%
+\toprule
+options & default & example \\
+\midrule
+\TOline{name}{P}{The vertices are named $P1$,$P2$,\dots}
+\TOline{sides}{5}{number of sides.}
+\TOline{center}{center}{The first point is the center.}
+\TOline{side}{center}{The two points are vertices.}
+\TOline{Options TikZ}{...}{}
+\end{tabular}
+\end{NewMacroBox}
+
+\subsubsection{Option \tkzname{center}}
+\begin{tkzexample}[latex=7cm, small]
+\begin{tikzpicture}
+ \tkzDefPoints{0/0/P0,0/0/Q0,2/0/P1}
+ \tkzDefMidPoint(P0,P1) \tkzGetPoint{Q1}
+ \tkzDefRegPolygon[center,sides=7](P0,P1)
+ \tkzDefMidPoint(P1,P2) \tkzGetPoint{Q1}
+ \tkzDefRegPolygon[center,sides=7,name=Q](P0,Q1)
+ \tkzDrawPolygon(P1,P...,P7)
+ \tkzFillPolygon[gray!20](Q0,Q1,P2,Q2)
+ \foreach \j in {1,...,7} {\tkzDrawSegment[black](P0,Q\j)}
+\end{tikzpicture}
+\end{tkzexample}
+
+\subsubsection{Option \tkzname{side}}
+\begin{tkzexample}[latex=7cm, small]
+\begin{tikzpicture}[scale=1]
+ \tkzDefPoints{-4/0/A, -1/0/B}
+ \tkzDefRegPolygon[side,sides=5,name=P](A,B)
+ \tkzDrawPolygon[thick](P1,P...,P5)
+\end{tikzpicture}
+\end{tkzexample}
\endinput \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-presentation.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-presentation.tex
index d3a282366d..44aa4cd007 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-presentation.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-presentation.tex
@@ -1,26 +1,40 @@
\section{Presentation and Overview}
-\subsection{Why tkz-euclide ?}
-My initial goal was to provide myself and other mathematics teachers with a tool to quickly create Euclidean geometry figures without investing too much effort in learning a new programming language.
-Of course, tkz-euclide is for math teachers who use latex and makes it possible to easily create correct drawings by means of LaTeX.
+\begin{tkzexample}[latex=5cm,small]
+ \begin{tikzpicture}[scale=.25]
+ \tkzDefPoints{00/0/A,12/0/B,6/12*sind(60)/C}
+ \foreach \density in {20,30,...,240}{%
+ \tkzDrawPolygon[fill=teal!\density](A,B,C)
+ \pgfnodealias{X}{A}
+ \tkzDefPointWith[linear,K=.15](A,B) \tkzGetPoint{A}
+ \tkzDefPointWith[linear,K=.15](B,C) \tkzGetPoint{B}
+ \tkzDefPointWith[linear,K=.15](C,X) \tkzGetPoint{C}}
+ \end{tikzpicture}
+\end{tkzexample}
+
+\vspace*{12pt}
+
+\subsection{Why \tkzname{\tkznameofpack}? }
+My initial goal was to provide other mathematics teachers and myself with a tool to quickly create Euclidean geometry figures without investing too much effort in learning a new programming language.
+Of course, \tkzname{\tkznameofpack} is for math teachers who use \LATEX\ and makes it possible to easily create correct drawings by means of \LATEX.
It appeared that the simplest method was to reproduce the one used to obtain construction by hand.
-To describe a construction, you must of course define the objects but also the actions that you perform. It seemed to me that a syntax close to the language of mathematicians and their students would be more easily understandable; moreover, it also seemed to me that this syntax should be close to that of LaTeX.
-The objects of course are points, segments, lines, triangles, polygons and circles. As for actions, I considered five to be sufficient, namely: define, create, draw, mark and label.
+To describe a construction, you must, of course, define the objects but also the actions that you perform. It seemed to me that syntax close to the language of mathematicians and their students would be more easily understandable; moreover, it also seemed to me that this syntax should be close to that of \LaTeX.
+The objects, of course, are points, segments, lines, triangles, polygons and circles. As for actions, I considered five to be sufficient, namely: define, create, draw, mark and label.
The syntax is perhaps too verbose but it is, I believe, easily accessible.
-As a result, the students like teachers were able to easily access this tool
+As a result, the students like teachers were able to easily access this tool.
-\subsection{tkz-euclide vs TikZ}
+\subsection{\tkzname{\tkznameofpack} vs \tkzname{\TIKZ } }
-I love programming with TikZ and without TikZ I would never have had the idea to create tkz-euclide but never forget that behind it there is TikZ and that it is always possible to insert code from TikZ. tkz-euclide doesn't prevent you from using TikZ.
+I love programming with \TIKZ, and without \TIKZ\ I would never have had the idea to create \tkzname{\tkznameofpack} but never forget that behind it there is \TIKZ\ and that it is always possible to insert code from \TIKZ. \tkzname{\tkznameofpack} doesn't prevent you from using \TIKZ.
That said, I don't think mixing syntax is a good thing.
-There is no need to compare TikZ and tkz-euclide. The latter is not addressed to the same audience as Tikz. The first one allows you to do a lot of things, the second one only does geometry drawings. The first one can do everything the second one does, but the second one will more easily do what you want.
+There is no need to compare \TIKZ\ and \tkzname{\tkznameofpack}. The latter is not addressed to the same audience as \TIKZ. The first one allows you to do a lot of things, the second one only does geometry drawings. The first one can do everything the second one does, but the second one will more easily do what you want.
\subsection{How it works}
-\subsubsection{Example Part I gold triangle}
+\subsubsection{Example Part I: gold triangle}
\begin{center}
\begin{tikzpicture}
@@ -50,25 +64,33 @@ There is no need to compare TikZ and tkz-euclide. The latter is not addressed t
Let's analyze the figure
\begin{enumerate}
- \item CBD and DBE are isosceles triangles; BC=BE and BD is a bisector of the angle CBE.From this we deduce that the CBD and DBE angles are equal and have the same measure $\alpha$.
- \[\widehat{BAC} +\widehat{ABC} + \widehat{BCA}=180^\circ \text{in the triangle} BAC\]
- \[3\alpha + \widehat{BCA}=180^\circ \text{in the triangle} CBD\]
+ \item $CBD$ and $DBE$ are isosceles triangles;
+
+ \item $BC=BE$ and $(BD)$ is a bisector of the angle $CBE$;
+
+ \item From this we deduce that the $CBD$ and $DBE$ angles are equal and have the same measure $\alpha$
+ \[\widehat{BAC} +\widehat{ABC} + \widehat{BCA}=180^\circ \ \text{in the triangle}\ BAC \]
+ \[3\alpha + \widehat{BCA}=180^\circ\ \text{in the triangle}\ CBD\]
then
- \[\alpha + 2\widehat{BCA}=180^\circ \] soit
+ \[\alpha + 2\widehat{BCA}=180^\circ \]
+ or
\[\widehat{BCA}=90^\circ -\alpha/2 \]
- finally \[\widehat{CBD}=\alpha=36^\circ \]
- the triangle CBD is a "gold" triangle
+
+ \item Finally \[\widehat{CBD}=\alpha=36^\circ \]
+ the triangle $CBD$ is a "gold" triangle.
\end{enumerate}
-How construct a gold triangle or an angle of $36^\circ$ ?
+\vspace*{24pt}
+How construct a gold triangle or an angle of $36^\circ$?
-\begin{itemize}
- \item We place the fixed points $C$ and $D$.|\tkzDefPoint(0,0){C}| and |\tkzDefPoint(4,0){D}|.
- \item We construct a square $CDef$ and we construct the midpoint $m$ of $Cf$.
- We can do all of this with a compass and a rule.
- \item Then we trace an arc with center m through e. This arc cross the line $Cf$ at $n$
- \item Now the two arcs with center $C$ et $D$ and radius $Cn$ define the point $B$.
-\end{itemize}
+\begin{enumerate}
+ \item We place the fixed points $C$ and $D$. |\tkzDefPoint(0,0){C}| and |\tkzDefPoint(4,0){D}|;
+ \item We construct a square $CDef$ and we construct the midpoint $m$ of $[Cf]$;
+
+ We can do all of this with a compass and a rule;
+ \item Then we trace an arc with center $m$ through $e$. This arc cross the line $(Cf)$ at $n$;
+ \item Now the two arcs with center $C$ and $D$ and radius $Cn$ define the point $B$.
+\end{enumerate}
\begin{minipage}{.4\textwidth}
@@ -144,13 +166,13 @@ After building the golden triangle $BCD$, we build the point $A$ by noticing tha
\tkzDrawPolygon(B,C,D)
\tkzDrawSegments(D,A A,B C,E)
\tkzDrawArc[delta=10](B,C)(E)
- \tkzDrawPoints(A,...,F)
\tkzMarkRightAngle[fill=blue!20](B,F,C)
\tkzFillAngles[fill=blue!10](C,B,D E,A,D)
\tkzMarkAngles(C,B,D E,A,D)
\tkzLabelAngles[pos=1.5](C,B,D E,A,D){$\alpha$}
\tkzLabelPoints[below](A,C,D,E)
\tkzLabelPoints[above right](B,F)
+ \tkzDrawPoints(A,...,F)
\end{tikzpicture}
\end{center}
@@ -186,9 +208,9 @@ After building the golden triangle $BCD$, we build the point $A$ by noticing tha
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Example Part II two others methods gold and euclide triangle}
+\subsubsection{Example Part II: two others methods gold and euclide triangle}
-tkz-euclide knows how to define a "gold" or "euclide" triangle. We can define BCD and BCA comme des triangles d'or
+\tkzname{\tkznameofpack} knows how to define a "gold" or "euclide" triangle. We can define $BCD$ and $BCA$ like gold triangles.
\begin{center}
@@ -196,9 +218,9 @@ tkz-euclide knows how to define a "gold" or "euclide" triangle. We can define BC
\begin{tikzpicture}
\tkzDefPoint(0,0){C}
\tkzDefPoint(4,0){D}
- \tkzDefTriangle[gold](C,D)
+ \tkzDefTriangle[euclide](C,D)
\tkzGetPoint{B}
- \tkzDefTriangle[gold](B,C)
+ \tkzDefTriangle[euclide](B,C)
\tkzGetPoint{A}
\tkzInterLC(B,A)(B,D) \tkzGetSecondPoint{E}
\tkzInterLL(B,D)(C,E) \tkzGetPoint{F}
@@ -218,7 +240,7 @@ tkz-euclide knows how to define a "gold" or "euclide" triangle. We can define BC
\end{tkzexample}
\end{center}
-Voici une dernière méthode qui utilise des rotations
+Here is a final method that uses rotations:
\begin{center}
\begin{tkzexample}[code only,small]
@@ -268,8 +290,8 @@ $IB=a$, $AI=1$
% calculation
\tkzDefPointBy[homothety=center A ratio 10 ](I) \tkzGetPoint{B}
\tkzDefMidPoint(A,B) \tkzGetPoint{M}
- \tkzDefPointWith[orthogonal](I,M) \tkzGetPoint{i}
- \tkzInterLC(I,i)(M,B) \tkzGetSecondPoint{C}
+ \tkzDefPointWith[orthogonal](I,M) \tkzGetPoint{H}
+ \tkzInterLC(I,H)(M,B) \tkzGetSecondPoint{C}
\tkzDrawSegment[style=orange](I,C)
\tkzDrawArc(M,B)(A)
\tkzDrawSegment[dim={$1$,-16pt,}](A,I)
@@ -281,16 +303,16 @@ $IB=a$, $AI=1$
\tkzLabelPoints[above right](I,M)
\tkzLabelPoints[above left](C)
\tkzLabelPoint[right](B){$B(10,0)$}
- \tkzLabelSegment[right=4pt](I,C){$IC=\sqrt{a}$}
+ \tkzLabelSegment[right=4pt](I,C){$\sqrt{a^2}=a \ (a>0)$}
\end{tikzpicture}
-\emph{Commentaires}
+\emph{Comments}
\begin{itemize}
\item The Preamble
- Let us first look at the preamble. If you need it, you have to load \tkzname{xcolor} before \tkzname{tkz-euclide}, that is, before \TIKZ\ . \TIKZ\ may cause problems with the active characters , but...
+ Let us first look at the preamble. If you need it, you have to load \tkzname{xcolor} before \tkzname{tkz-euclide}, that is, before \TIKZ. \TIKZ\ may cause problems with the active characters, but...
provides a library in its latest version that's supposed to solve these problems \NameLib{babel}.
\begin{tkzltxexample}[]
@@ -303,16 +325,15 @@ $IB=a$, $AI=1$
The following code consists of several parts:
- \item Definition of fixed points: the first part includes the definitions of the points necessary for the construction, these are the fixed points. The macros \tkzcname{tkkzInit} and \tkzcname{tkkzClip} in most cases are not necessary.
+ \item Definition of fixed points: the first part includes the definitions of the points necessary for the construction, these are the fixed points. The macros \tkzcname{tkzInit} and \tkzcname{tkzClip} in most cases are not necessary.
\begin{tkzltxexample}[]
- \tkzDefPoint(0,0){O}
+ \tkzDefPoint(0,0){A}
\tkzDefPoint(1,0){I}
- \tkzDefPoint(10,0){B}
\end{tkzltxexample}
\item The second part is dedicated to the creation of new points from the fixed points;
- a $B$ point is placed at $10 cm$ from $A$. The middle of $[AB]$ is defined by $M$ and then the orthogonal line to the $(AB)$ line is searched for at the $I$ point. Then we look for the intersection of this line with the semi-circle of center $M$ passing through $A$.
+ a $B$ point is placed at $10$~cm from $A$. The middle of $[AB]$ is defined by $M$ and then the orthogonal line to the $(AB)$ line is searched for at the $I$ point. Then we look for the intersection of this line with the semi-circle of center $M$ passing through $A$.
\begin{tkzltxexample}[]
\tkzDefPointBy[homothety=center A ratio 10 ](I)
@@ -328,10 +349,10 @@ The following code consists of several parts:
\item The third one includes the different drawings;
\begin{tkzltxexample}[]
- \tkzDrawSegment[style=dashed](I,H)
+ \tkzDrawSegment[style=orange](I,H)
\tkzDrawPoints(O,I,A,B,M)
\tkzDrawArc(M,A)(O)
- \tkzDrawSegment[dim={$1$,-16pt,}](O,I) % voir la documentation pour l'usage de dim
+ \tkzDrawSegment[dim={$1$,-16pt,}](O,I)
\tkzDrawSegment[dim={$a/2$,-10pt,}](I,M)
\tkzDrawSegment[dim={$a/2$,-16pt,}](M,A)
\end{tkzltxexample}
@@ -362,9 +383,8 @@ The following code consists of several parts:
% calculation
\tkzDefPointBy[homothety=center A ratio 10 ](I) \tkzGetPoint{B}
\tkzDefMidPoint(A,B) \tkzGetPoint{M}
- \tkzDefPointWith[orthogonal](I,M) \tkzGetPoint{i}
- \tkzInterLC(I,i)(M,B) \tkzGetSecondPoint{C}
-
+ \tkzDefPointWith[orthogonal](I,M) \tkzGetPoint{H}
+ \tkzInterLC(I,H)(M,B) \tkzGetSecondPoint{C}
\tkzDrawSegment[style=orange](I,C)
\tkzDrawArc(M,B)(A)
\tkzDrawSegment[dim={$1$,-16pt,}](A,I)
@@ -376,30 +396,29 @@ The following code consists of several parts:
\tkzLabelPoints[above right](I,M)
\tkzLabelPoints[above left](C)
\tkzLabelPoint[right](B){$B(10,0)$}
- \tkzLabelSegment[right=4pt](I,C){$IC=\sqrt{a}$}
+ \tkzLabelSegment[right=4pt](I,C){$\sqrt{a^2}=a \ (a>0)$}
\end{tikzpicture}
\end{tkzexample}
\end{itemize}
-\newpage
\subsection{The Elements of tkz code}
-In this paragraph, we start looking at the "rules" and "symbols" used to create a figure with tkz-euclide.
+In this paragraph, we start looking at the "rules" and "symbols" used to create a figure with \tkzname{\tkznameofpack}.
The primitive objects are points. You can refer to a point at any time using the name given when defining it. (it is possible to assign a different name later on).
\medskip
-In general, tkz-euclide macros have a name beginning with tkz. There are four main categories starting with~:
-|\tkzDef...| |\tkzDraw...| |\tkzMark...| et |\tkzLabel...|
+In general, \tkzname{\tkznameofpack} macros have a name beginning with tkz. There are four main categories starting with:
+|\tkzDef...| |\tkzDraw...| |\tkzMark...| and |\tkzLabel...|
-Among the first category, |\tkzDefPoint| allows you to define fixed points. It will be studied in detail later. Here we will see in detail the macro DefTriangle |\tkzDefTriangle|.
+Among the first category, |\tkzDefPoint| allows you to define fixed points. It will be studied in detail later. Here we will see in detail the macro |\tkzDefTriangle|.
This macro makes it possible to associate to a pair of points a third point in order to define a certain triangle |\tkzDefTriangle(A,B)|. The obtained point is referenced |tkzPointResult| and it is possible to choose another reference with |\tkzGetPoint{C}| for example.
Parentheses are used to pass arguments. In |(A,B)| $A$ and $B$ are the points with which a third will be defined.
However, in |{C}| we use braces to retrieve the new point.
-In order to choose a certain type of triangle among the following choices :
- |equilateral|, |halftone|, |pythagoras|, |school|, |golden or sublime|, |euclide|, |gold|, |cheops|...
- and |two angles| you just have to choose between hooks, for example~:
+In order to choose a certain type of triangle among the following choices:
+ |equilateral|, |half|, |pythagoras|, |school|, |golden or sublime|, |euclide|, |gold|, |cheops|...
+ and |two angles| you just have to choose between hooks, for example:
|\tkzDefTriangle[euclide](A,B) \tkzGetPoint{C}|
@@ -434,20 +453,92 @@ In order to choose a certain type of triangle among the following choices :
\end{minipage}
-\subsection{Conventions}
+\subsection{Notations and conventions}
+
+I deliberately chose to use the geometric French and personal conventions to describe the geometric objects represented. The objects defined and represented by \tkzname{\tkznameofpack} are points, lines and circles located in a plane. They are the primary objects of Euclidean geometry from which we will construct figures.
+
+According to \tkzimp{Euclidian} these figures will only illustrate pure ideas produced by our brain.
+Thus a point has no dimension and therefore no real existence. In the same way the line has no width and therefore no existence in the real world. The objects that we are going to consider are only representations of ideal mathematical objects. \tkzname{\tkznameofpack} will follow the steps of the ancient Greeks to obtain geometrical constructions using the ruler and the compass.
+
+Here are the notations that will be used:
+
+
+\begin{itemize}
+\item The points are represented geometrically either by a small disc or by the intersection of two lines (two straight lines, a straight line and a circle or two circles). In this case, the point is represented by a cross.
+
+\begin{tkzexample}[latex=6cm, small]
+ \begin{tikzpicture}
+ \tkzDefPoints{0/0/A,4/2/B}
+ \tkzDrawPoints(A,B)
+ \tkzLabelPoints(A,B)
+ \end{tikzpicture}
+\end{tkzexample}
+
+or else
+
+\begin{tkzexample}[latex=6cm, small]
+ \begin{tikzpicture}
+ \tkzSetUpPoint[shape=cross, color=red]
+ \tkzDefPoints{0/0/A,4/2/B}
+ \tkzDrawPoints(A,B)
+ \tkzLabelPoints(A,B)
+ \end{tikzpicture}
+ \end{tkzexample}
-For this documentation, I used the geometric French and personal conventions for naming the points:
+The existence of a point being established, we can give it a label which will be a capital letter (with some exceptions) of the Latin alphabet such as $A$, $B$ or $C$. For example:
\begin{itemize}
\item $O$ is a center for a circle, a rotation, etc.;
\item $M$ defined a midpoint;
\item $H$ defined the foot of an altitude;
\item $P'$ is the image of $P$ by a transformation ;
-\item $a$ defined an angle (degree), $r$ the length of a radius, $d$ a length (or dimension);
-\item ($x_1$,$y_1$) coordinates of the point $A_1$, ($x_A$,$y_A$) coordinates of the point $A$;
-\item $[AB]$ a line segment, $(AB)$ a line.
\end{itemize}
-\subsection{How to use the tkz-euclide package ?}
+It is important to note that the reference name of a point in the code may be different from the label to designate it in the text. So we can define a point A and give it as label $P$. In particular the style will be different, point A will be labeled $A$.
+
+\begin{tkzexample}[latex=6cm, small]
+ \begin{tikzpicture}
+ \tkzDefPoints{0/0/A}
+ \tkzDrawPoints(A)
+ \tkzLabelPoint(A){$P$}
+ \end{tikzpicture}
+\end{tkzexample}
+
+Exceptions: some points such as the middle of the sides of a triangle share a characteristic, so it is normal that their names also share a common character. We will designate these points by $M_a$, $M_b$ and $M_c$ or $M_A$, $M_B$ and $M_C$.
+
+In the code, these points will be referred to as: M\_A, M\_B and M\_C.
+
+Another exception relates to intermediate construction points which will not be labelled. They will often be designated by a lowercase letter in the code.
+
+\item The line segments are designated by two points representing their ends in square brackets: $[AB]$.
+
+\item The straight lines are in Euclidean geometry defined by two points so $A$ and $B$ define the straight line $(AB)$. We can also designate this stright line using the Greek alphabet and name it $(\delta)$ or $(\Delta)$. It is also possible to designate the straight line with lowercase letters such as $d$ and $d'$.
+
+\item The semi-straight line is designated as follows $[AB)$.
+
+
+\item Relation between the straight lines. Two perpendicular $(AB)$ and $(CD)$ lines will be written $(AB) \perp (CD)$ and if they are parallel we will write $(AB) \parallelslant (CD)$.
+
+\item The lengths of the sides of triangle ABC are $AB$, $AC$ and $BC$. The numbers are also designated by a lowercase letter so we will write: $AB=c$, $AC=b$ and $BC=a$. The letter $a$ is also used to represent an angle, and $r$ is frequently used to represent a radius, $d$ a diameter, $l$ a length, $d$ a distance.
+
+\item Polygons are designated afterwards by their vertices so $ABC$ is a triangle, $EFGH$ a quadrilateral.
+
+\item Angles are generally measured in degrees (ex $60^\circ$) and in an equilateral $ABC$ triangle we will write $\widehat{ABC}=\widehat{B}=60^\circ$.
+
+\item The arcs are designated by their extremities. For example if $A$ and $B$ are two points of the same circle then $\widearc{AB}$.
+
+
+\item Circles are noted either $\mathcal{C}$ if there is no possible confusion or $\mathcal{C}$ $(O~;~A)$ for a circle with center $O$ and passing through the point $A$ or $\mathcal{C}$ $(O~;~1)$ for a circle with center O and radius 1 cm.
+
+\item Name of the particular lines of a triangle: I used the terms bisector, bisector out, mediator (sometimes called perpendicular bisectors), altitude, median and symmedian.
+
+\item ($x_1$,$y_1$) coordinates of the point $A_1$, ($x_A$,$y_A$) coordinates of the point $A$.
+
+\end{itemize}
+
+
+
+
+\subsection{How to use the \tkzname{\tkznameofpack} package ?}
\subsubsection{Let's look at a classic example}
In order to show the right way, we will see how to build an equilateral triangle. Several possibilities are open to us, we are going to follow the steps of Euclid.
@@ -456,14 +547,14 @@ In order to show the right way, we will see how to build an equilateral triangle
\begin{verbatim}
\documentclass{standalone}
\end{verbatim}
-\item Then load the tkz-euclide package:
+\item Then load the \tkzname{\tkznameofpack} package:
\begin{verbatim}
\usepackage{tkz-euclide}
\end{verbatim}
- You don't need to load \TIKZ\ because the tkz-euclide package works on top of TikZ and loads it.
+ You don't need to load \TIKZ\ because the \tkzname{\tkznameofpack} package works on top of TikZ and loads it.
\item {\color{red} \bomb \sout{|\BS usetkzobj{all}| }}
- With the new version 3.02 you don't need this line anymore. All objects are now loaded.
+ With the new version 3.03 you don't need this line anymore. All objects are now loaded.
\item Start the document and open a TikZ picture environment:
\begin{verbatim}
\begin{document}
@@ -476,31 +567,32 @@ In order to show the right way, we will see how to build an equilateral triangle
\tkzDefPoint(5,2){B}
\end{verbatim}
-\item Two points define two circles, let's use these circles :
+\item Two points define two circles, let's use these circles:
circle with center $A$ through $B$ and circle with center $B$ through $A$. These two circles have two points in common.
\begin{verbatim}
\tkzInterCC(A,B)(B,A)
\end{verbatim}
-we can get the points of intersection with
+We can get the points of intersection with
\begin{verbatim}
\tkzGetPoints{C}{D}
\end{verbatim}
\item All the necessary points are obtained, we can move on to the final steps including the plots.
\begin{verbatim}
+\tkzDrawCircles[gray,dashed](A,B B,A)
\tkzDrawPolygon(A,B,C)% The triangle
\end{verbatim}
-\item Draw all points A,B,C and D :
+\item Draw all points $A$, $B$, $C$ and $D$:
\begin{verbatim}
\tkzDrawPoints(A,...,D)
\end{verbatim}
\item The final step, we print labels to the points and use options for positioning:\\
\begin{verbatim}
-\tkzLabelPoints[below left](A)
-\tkzLabelPoints(B,D)
-\tkzLabelPoint (above] (C){$C$}
+\tkzLabelSegments[swap](A,B){$c$}
+\tkzLabelPoints(A,B,D)
+\tkzLabelPoints[above](C)
\end{verbatim}
\item We finally close both environments
\begin{verbatim}
@@ -533,12 +625,12 @@ we can get the points of intersection with
\end{itemize}
-\subsubsection{"Set, Calculate, Draw, Mark, Label"}
-The title could have been : \texttt{Separation of Calculus and Drawings}
+\subsubsection{\tkzname{Set, Calculate, Draw, Mark, Label}}
+The title could have been: \texttt{Separation of Calculus and Drawings}
-When a document is prepared using the LaTeX system, the source code of the document can be divided into two parts: the document body and the preamble.
+When a document is prepared using the \LATEX\ system, the source code of the document can be divided into two parts: the document body and the preamble.
Under this methodology, publications can be structured, styled and typeset with minimal effort.
-I propose a similar methodology for creating figures with tkz-euclide.
+I propose a similar methodology for creating figures with \tkzname{\tkznameofpack}.
The first part defines the fixed points, the second part allows the creation of new points. These are the two main parts. All that is left to do is to draw, mark and label.
diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-rapporteur.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-rapporteur.tex
index a528e9bb57..ebd7f3fd80 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-rapporteur.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-rapporteur.tex
@@ -1,25 +1,20 @@
-\section{Rapporteurs}
+\section{Protractor}
+Based on an idea by Yves Combe, the following macro allows you to draw a protractor.
+The operating principle is even simpler. Just name a half-line (a ray). The protractor will be placed on the origin $O$, the direction of the half-line is given by $A$. The angle is measured in the direct direction of the trigonometric circle.
-
-D'après une idée de Yves Combe., la macro suivante permet de dessiner un rapporteur.
-
-
-\begin{NewMacroBox}{tkzProtractor}{\oarg{local options}\parg{$O,A$}}
-
-\medskip
-\begin{tabular}{lll}
-\toprule
-options & défaut & définition \\
+\begin{NewMacroBox}{tkzProtractor}{\oarg{local options}\parg{$O,A$}}%
+\begin{tabular}{lll}%
+options & default & definition \\
\midrule
-\TOline{lw} {0.4 pt} { épaisseur des lignes}
-\TOline{scale} {1} { ratio : permet d'ajuster la taille du rapporteur} \TOline{return} {false} { sens indirect du cercle trigonométrique}
+\TOline{lw} {0.4 pt} {line thickness}
+\TOline{scale} {1} {ratio: adjusts the size of the protractor}
+\TOline{return} {false} {trigonometric circle indirect}
\end{tabular}
\end{NewMacroBox}
-\subsection{Le rapporteur circulaire}
-
-Mesure dans le sens direct
+\subsection{The circular protractor}
+Measuring in the forward direction
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=.5]
@@ -33,7 +28,7 @@ Mesure dans le sens direct
\end{tikzpicture}
\end{tkzexample}
-\subsection{Le rapporteur circulaire, transparent et retourné}
+\subsection{The circular protractor, transparent and returned}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=.5]
diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-rnd.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-rnd.tex
index 37e0fdb6ba..47a5bd70f0 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-rnd.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-rnd.tex
@@ -4,32 +4,29 @@
%<--------------------------------------------------------------------------->
At the moment there are four possibilities:
\begin{enumerate}
- \item point in a rectangle,
- \item on a segment,
- \item on a straight line,
+ \item point in a rectangle;
+ \item on a segment;
+ \item on a straight line;
\item on a circle.
\end{enumerate}
\subsection{Obtaining random points}
-This is the new version that replaces \tkzcname{tkzGetRandPointOn}
-\begin{NewMacroBox}{tkzDefRandPointOn}{\oarg{local options}}
-{The result is a point with a random position that can be named with the macro \tkzcname{tkzGetPoint}. It is possible to use \tkzname{tkzPointResult} if it is not necessary to retain the results..}
-
+This is the new version that replaces \tkzcname{tkzGetRandPointOn}.
+\begin{NewMacroBox}{tkzDefRandPointOn}{\oarg{local options}}%
+{The result is a point with a random position that can be named with the macro \tkzcname{tkzGetPoint}. It is possible to use \tkzname{tkzPointResult} if it is not necessary to retain the results.}
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
options & default & definition \\
\midrule
\TOline{rectangle=pt1 and pt2} {}{[rectangle=A and B]}
\TOline{segment= pt1--pt2} {}{[segment=A--B]}
\TOline{line=pt1--pt2}{}{[line=A--B]}
-\TOline{circle =center pt1 radius dim}{}{[circle = center A radius 2cm]}
+\TOline{circle =center pt1 radius dim}{}{[circle = center A radius 2 cm]}
\TOline{circle through=center pt1 through pt2}{}{[circle through= center A through B]}
\TOline{disk through=center pt1 through pt2}{}{[disk through=center A through B]}
- \bottomrule
\end{tabular}
-
\end{NewMacroBox}
\subsection{Random point in a rectangle}
@@ -65,10 +62,10 @@ options & default & definition \\
\begin{tikzpicture}
\tkzInit[xmax=5,ymax=5] \tkzGrid
\tkzDefPoints{0/0/A,2/2/B,3/3/C,5/5/D}
- \tkzDefRandPointOn[line = A--B]\tkzGetPoint{a}
- \tkzDefRandPointOn[line = C--D]\tkzGetPoint{d}
- \tkzDrawPoints(A,B,C,D,a,d)
- \tkzLabelPoints(A,B,C,D,a,d)
+ \tkzDefRandPointOn[line = A--B]\tkzGetPoint{E}
+ \tkzDefRandPointOn[line = C--D]\tkzGetPoint{F}
+ \tkzDrawPoints(A,...,F)
+ \tkzLabelPoints(A,...,F)
\end{tikzpicture}
\end{tkzexample}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-sectors.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-sectors.tex
index e615d1c0a0..030af8917f 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-sectors.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-sectors.tex
@@ -1,29 +1,24 @@
-\section{Les secteurs}
-
+\section{Sectors}
\subsection{\tkzcname{tkzDrawSector}}
-\begin{NewMacroBox}{tkzDrawSector}{\oarg{local options}\parg{O,\dots}\parg{\dots}}
-\tkzHandBomb\ Attention les arguments varient en fonction des options.
-
-\medskip
-\begin{tabular}{lll}
-\toprule
-options & default & definition \\
+\tkzHandBomb\ Attention the arguments vary according to the options.
+\begin{NewMacroBox}{tkzDrawSector}{\oarg{local options}\parg{O,\dots}\parg{\dots}}%
+\begin{tabular}{lll}%
+options & default & definition \\
\midrule
-\TOline{towards}{towards}{O est le centre et l'arc par de A vers (OB)}
-\TOline{rotate} {towards}{l'arc part de A et l'angle détermine sa longueur }
-\TOline{R}{towards}{On donne le rayon et deux angles}
-\TOline{R with nodes}{towards}{On donne le rayon et deux points}
+\TOline{towards}{towards}{$O$ is the center and the arc from $A$ to $(OB)$}
+\TOline{rotate} {towards}{the arc starts from $A$ and the angle determines its length }
+\TOline{R}{towards}{We give the radius and two angles}
+\TOline{R with nodes}{towards}{We give the radius and two points}
\bottomrule
\end{tabular}
\medskip
-Il faut ajouter bien sûr tous les styles de \TIKZ\ pour les tracés
+You have to add, of course, all the styles of \TIKZ\ for tracings...
\medskip
-
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
-options & arguments & exemple \\
+options & arguments & example \\
\midrule
\TOline{towards}{\parg{pt,pt}\parg{pt}}{\tkzcname{tkzDrawSector(O,A)(B)}}
\TOline{rotate} {\parg{pt,pt}\parg{an}}{\tkzcname{tkzDrawSector[rotate,color=red](O,A)(90)}}
@@ -33,10 +28,10 @@ options & arguments & exemple \\
\end{tabular}
\end{NewMacroBox}
-Quelques exemples :
+Here are a few examples:
-\subsubsection{\tkzcname{tkzDrawSector} et \tkzname{towards}}
-Il est inutile de mettre \tkzname{towards}. Il est possible d'utiliser \tkzimp{fill} en option.
+\subsubsection{\tkzcname{tkzDrawSector} and \tkzname{towards}}
+There's no need to put \tkzname{towards}. You can use \tkzname{fill} as an option.
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=1]
@@ -53,8 +48,7 @@ Il est inutile de mettre \tkzname{towards}. Il est possible d'utiliser \tkzimp{f
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{\tkzcname{tkzDrawSector} et \tkzname{rotate}}
-
+\subsubsection{\tkzcname{tkzDrawSector} and \tkzname{rotate}}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=2]
\tkzDefPoint(0,0){O}
@@ -66,7 +60,7 @@ Il est inutile de mettre \tkzname{towards}. Il est possible d'utiliser \tkzimp{f
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{\tkzcname{tkzDrawSector} et \tkzname{R}}
+\subsubsection{\tkzcname{tkzDrawSector} and \tkzname{R}}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=1.25]
\tkzDefPoint(0,0){O}
@@ -82,7 +76,7 @@ Il est inutile de mettre \tkzname{towards}. Il est possible d'utiliser \tkzimp{f
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{\tkzcname{tkzDrawSector} et \tkzname{R}}
+\subsubsection{\tkzcname{tkzDrawSector} and \tkzname{R}}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=1.25]
\tkzDefPoint(0,0){O}
@@ -100,7 +94,7 @@ Il est inutile de mettre \tkzname{towards}. Il est possible d'utiliser \tkzimp{f
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{\tkzcname{tkzDrawSector} et \tkzname{R with nodes}}
+\subsubsection{\tkzcname{tkzDrawSector} and \tkzname{R with nodes}}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture} [scale=.5]
\tkzDefPoint(-1,-2){A}
@@ -128,41 +122,36 @@ Il est inutile de mettre \tkzname{towards}. Il est possible d'utiliser \tkzimp{f
\end{tikzpicture}
\end{tkzexample}
-\subsection{\tkzcname{tkzFillSector}}
-\begin{NewMacroBox}{tkzFillSector}{\oarg{local options}\parg{O,\dots}\parg{\dots}}
-\tkzHandBomb\ Attention les arguments varient en fonction des options.
-
-\medskip
-
-\begin{tabular}{lll}
-\toprule
-options & default & definition \\
+\subsection{\tkzcname{tkzFillSector}}
+\tkzHandBomb\ Attention the arguments vary according to the options.
+\begin{NewMacroBox}{tkzFillSector}{\oarg{local options}\parg{O,\dots}\parg{\dots}}%
+\begin{tabular}{lll}%
+options & default & definition \\
\midrule
-\TOline{towards}{towards}{O est le centre et l'arc par de A vers (OB)}
-\TOline{rotate} {towards}{l'arc part de A et l'angle détermine sa longueur }
-\TOline{R}{towards}{On donne le rayon et deux angles}
-\TOline{R with nodes}{towards}{On donne le rayon et deux points}
+\TOline{towards}{towards}{$O$ is the center and the arc from $A$ to $(OB)$}
+\TOline{rotate} {towards}{the arc starts from A and the angle determines its length }
+\TOline{R}{towards}{We give the radius and two angles}
+\TOline{R with nodes}{towards}{We give the radius and two points}
\bottomrule
\end{tabular}
\medskip
-Il faut ajouter bien sûr tous les styles de \TIKZ pour les tracés
+Of course, you have to add all the styles of \TIKZ\ for the tracings...
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
-options & arguments & exemple \\
+options & arguments & example \\
\midrule
\TOline{towards}{\parg{pt,pt}\parg{pt}}{\tkzcname{tkzFillSector(O,A)(B)}}
\TOline{rotate} {\parg{pt,pt}\parg{an}}{\tkzcname{tkzFillSector[rotate,color=red](O,A)(90)}}
\TOline{R}{\parg{pt,$r$}\parg{an,an}}{\tkzcname{tkzFillSector[R,color=blue](O,2 cm)(30,90)}}
\TOline{R with nodes}{\parg{pt,$r$}\parg{pt,pt}}{\tkzcname{tkzFillSector[R with nodes](O,2 cm)(A,B)}}
-\bottomrule
\end{tabular}
\end{NewMacroBox}
-\subsubsection{\tkzcname{tkzFillSector} et \tkzname{towards}}
-Il est inutile de mettre \tkzname{towards} et vous remarquerez que les contours ne sont pas tracés,seule la surface est colorée.
+\subsubsection{\tkzcname{tkzFillSector} and \tkzname{towards}}
+It is useless to put \tkzname{towards} and you will notice that the contours are not drawn, only the surface is colored.
\begin{tkzexample}[latex=5.75cm,small]
\begin{tikzpicture}[scale=.6]
\tkzDefPoint(0,0){O}
@@ -179,7 +168,7 @@ Il est inutile de mettre \tkzname{towards} et vous remarquerez que les contours
\end{tkzexample}
-\subsubsection{\tkzcname{tkzFillSector} et \tkzname{rotate}}
+\subsubsection{\tkzcname{tkzFillSector} and \tkzname{rotate}}
\begin{tkzexample}[latex=5.75cm,small]
\begin{tikzpicture}[scale=1.5]
\tkzDefPoint(0,0){O} \tkzDefPoint(2,2){A}
@@ -188,35 +177,29 @@ Il est inutile de mettre \tkzname{towards} et vous remarquerez que les contours
\end{tikzpicture}
\end{tkzexample}
-\newpage
-\subsection{\tkzcname{tkzClipSector}}
-\begin{NewMacroBox}{tkzClipSector}{\oarg{local options}\parg{O,\dots}\parg{\dots}}
-\tkzHandBomb\ Attention les arguments varient en fonction des options.
-
-\medskip
-
-\begin{tabular}{lll}
-\toprule
-options & default & definition \\
+\subsection{\tkzcname{tkzClipSector}}
+\tkzHandBomb\ Attention the arguments vary according to the options.
+\begin{NewMacroBox}{tkzClipSector}{\oarg{local options}\parg{O,\dots}\parg{\dots}}%
+\begin{tabular}{lll}%
+options & default & definition \\
\midrule
-\TOline{towards}{towards}{O est le centre et le secteur part de A vers (OB)}
-\TOline{rotate} {towards}{le secteur part de A et l'angle détermine son amplitude }
-\TOline{R}{towards}{On donne le rayon et deux angles}
+\TOline{towards}{towards}{$O$ is the centre and the sector starts from $A$ to $(OB)$}
+\TOline{rotate} {towards}{The sector starts from $A$ and the angle determines its amplitude. }
+\TOline{R}{towards}{We give the radius and two angles}
\bottomrule
\end{tabular}
\medskip
-Il faut ajouter bien sûr tous les styles de \TIKZ\ pour les tracés
+You have to add, of course, all the styles of \TIKZ\ for tracings...
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
-options & arguments & exemple \\
+options & arguments & example \\
\midrule
\TOline{towards}{\parg{pt,pt}\parg{pt}}{\tkzcname{tkzClipSector(O,A)(B)}}
\TOline{rotate} {\parg{pt,pt}\parg{angle}}{\tkzcname{tkzClipSector[rotate](O,A)(90)}}
\TOline{R}{\parg{pt,$r$}\parg{angle 1,angle 2}}{\tkzcname{tkzClipSector[R](O,2 cm)(30,90)}}
-\bottomrule
\end{tabular}
\end{NewMacroBox}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-show.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-show.tex
index 0d45ff2230..f52a749430 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-show.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-show.tex
@@ -1,33 +1,32 @@
\section{The Show}
-\subsection{Montrer les constructions de certaines lignes \tkzcname{tkzShowLine}}
+\subsection{Show the constructions of some lines \tkzcname{tkzShowLine}}
- \begin{NewMacroBox}{tkzShowLine}{\oarg{local options}\parg{pt1,pt2} ou \parg{pt1,pt2,pt3}}
-Ces constructions concernent les médiatrices, les droites perpendiculaires ou parallèles passant par un point donné et les bissectrices. Les arguments sont donc des listes de deux ou bien de trois points. Plusieurs options permettent l'ajustement des constructions. L'idée de cette macro revient à \tkzimp{Yves Combe}
+ \begin{NewMacroBox}{tkzShowLine}{\oarg{local options}\parg{pt1,pt2} or \parg{pt1,pt2,pt3}}%
+These constructions concern mediatrices, perpendicular or parallel lines passing through a given point and bisectors. The arguments are therefore lists of two or three points. Several options allow the adjustment of the constructions. The idea of this macro comes from \tkzimp{Yves Combe}.
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
-options & default & definition \\
+options & default & definition \\
\midrule
-\TOline{mediator}{mediator}{affiche les constructions d'une médiatrice}
-\TOline{perpendicular}{mediator}{constructions pour une perpendiculaire}
+\TOline{mediator}{mediator}{displays the constructions of a mediator}
+\TOline{perpendicular}{mediator}{constructions for a perpendicular}
\TOline{orthogonal}{mediator}{idem}
-\TOline{bisector}{mediator}{constructions pour une bissectrice}
-\TOline{K}{1}{cercle inscrit dans à un triangle }
-\TOline{length}{1}{ en cm, longueur d'un arc}
-\TOline{ratio} {.5}{rapport entre les longueurs des arcs}
-\TOline{gap}{2}{placement le point de construction}
-\TOline{size}{1}{rayon d'un arc (voir bissectrice)}
+\TOline{bisector}{mediator}{constructions for a bisector}
+\TOline{K}{1}{circle within a triangle }
+\TOline{length}{1}{in cm, length of a arc}
+\TOline{ratio} {.5}{arc length ratio}
+\TOline{gap}{2}{placing the point of construction}
+\TOline{size}{1}{radius of an arc (see bisector)}
\bottomrule
\end{tabular}
-Il faut ajouter bien sûr tous les styles de \TIKZ\ pour les tracés
+You have to add, of course, all the styles of \TIKZ\ for tracings\dots
\end{NewMacroBox}
-\subsubsection{Exemple de \tkzcname{tkzShowLine} et \tkzname{parallel}}
-
+\subsubsection{Example of \tkzcname{tkzShowLine} and \tkzname{parallel}}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}
\tkzDefPoints{-1.5/-0.25/A,1/-0.75/B,-1.5/2/C}
@@ -38,8 +37,7 @@ Il faut ajouter bien sûr tous les styles de \TIKZ\ pour les tracés
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Exemple de \tkzcname{tkzShowLine} et \tkzname{perpendicular}}
-
+\subsubsection{Example of \tkzcname{tkzShowLine} and \tkzname{perpendicular}}
\begin{tkzexample}[latex=5cm,small]
\begin{tikzpicture}
\tkzDefPoints{0/0/A, 3/2/B, 2/2/C}
@@ -47,13 +45,12 @@ Il faut ajouter bien sûr tous les styles de \TIKZ\ pour les tracés
\tkzShowLine[perpendicular=through C,K=-.5,gap=3](A,B)
\tkzDefPointBy[projection=onto A--B](c)\tkzGetPoint{h}
\tkzMarkRightAngle[fill=lightgray](A,h,C)
-\tkzDrawLines[add=1 and 1](A,B C,c)
+\tkzDrawLines[add=.5 and .5](A,B C,c)
\tkzDrawPoints(A,B,C,h,c)
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Exemple de \tkzcname{tkzShowLine} et \tkzname{bisector}}
-
+\subsubsection{Example of \tkzcname{tkzShowLine} and \tkzname{bisector}}
\begin{tkzexample}[latex=7 cm,small]
\begin{tikzpicture}[scale=1.25]
\tkzDefPoints{0/0/A, 4/2/B, 1/4/C}
@@ -73,7 +70,7 @@ Il faut ajouter bien sûr tous les styles de \TIKZ\ pour les tracés
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Exemple de \tkzcname{tkzShowLine} et \tkzname{mediator}}
+\subsubsection{Example of \tkzcname{tkzShowLine} and \tkzname{mediator}}
\begin{tkzexample}[latex=7 cm,small]
\begin{tikzpicture}
\tkzDefPoint(2,2){A}
@@ -87,30 +84,28 @@ Il faut ajouter bien sûr tous les styles de \TIKZ\ pour les tracés
\end{tikzpicture}
\end{tkzexample}
-\subsection{Constructions de certaines transformations \addbs{tkzShowTransformation}}
-
- \begin{NewMacroBox}{tkzShowTransformation}{\oarg{local options}\parg{pt1,pt2} ou \parg{pt1,pt2,pt3}}
-Ces constructions concernent les symétries orthogonales, les symétries centrales, les projections orthogonales et les translations. Plusieurs options permettent l'ajustement des constructions. L'idée de cette macro revient à \tkzimp{Yves Combe}
+\subsection{Constructions of certain transformations \addbs{tkzShowTransformation}}
+\begin{NewMacroBox}{tkzShowTransformation}{\oarg{local options}\parg{pt1,pt2} or \parg{pt1,pt2,pt3}}%
+These constructions concern orthogonal symmetries, central symmetries, orthogonal projections and translations. Several options allow the adjustment of the constructions. The idea of this macro comes from \tkzimp{Yves Combe}.
-
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
options & default & definition \\
\midrule
-\TOline{reflection= over pt1--pt2}{reflection}{constructions d'une symétrie orthogonale}
-\TOline{symmetry=center pt}{reflection}{constructions d'une symétrie centrale}
-\TOline{projection=onto pt1--pt2}{reflection}{constructions d'une projection}
-\TOline{translation=from pt1 to pt2}{reflection}{constructions d'une translation}
-\TOline{K}{1}{cercle inscrit dans à un triangle }
-\TOline{length}{1}{longueur d'un arc}
-\TOline{ratio} {.5}{rapport entre les longueurs des arcs}
-\TOline{gap}{2}{placement le point de construction}
-\TOline{size}{1}{rayon d'un arc (voir bissectrice)}
+\TOline{reflection= over pt1--pt2}{reflection}{constructions of orthogonal symmetry}
+\TOline{symmetry=center pt}{reflection}{constructions of central symmetry}
+\TOline{projection=onto pt1--pt2}{reflection}{constructions of a projection}
+\TOline{translation=from pt1 to pt2}{reflection}{constructions of a translation}
+\TOline{K}{1}{circle within a triangle }
+\TOline{length}{1}{arc length}
+\TOline{ratio} {.5}{arc length ratio}
+\TOline{gap}{2}{placing the point of construction}
+\TOline{size}{1}{radius of an arc (see bisector)}
\end{tabular}
\end{NewMacroBox}
-\subsubsection{Exemple d'utilisation de \tkzcname{tkzShowTransformation}}
+\subsubsection{Example of the use of \tkzcname{tkzShowTransformation}}
\begin{tkzexample}[latex=6cm,small]
@@ -143,9 +138,9 @@ options & default & definition \\
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Autre exemple d'utilisation de \tkzcname{tkzShowTransformation}}
+\subsubsection{Another example of the use of \tkzcname{tkzShowTransformation}}
-Vous retouverez cette figure, mais sans les traits de construction
+You'll find this figure again, but without the construction features.
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=.6]
\tkzDefPoints{0/0/A,8/0/B,3.5/10/I}
@@ -168,37 +163,35 @@ Vous retouverez cette figure, mais sans les traits de construction
\end{tikzpicture}
\end{tkzexample}
-%<--------------------------------------------------------------------------->
-\section{Différents points}
-%<--------------------------------------------------------------------------->
+%<---------------------------------------------------------------------->
+\section{Different points}
+%<---------------------------------------------------------------------->
\subsection{\tkzcname{tkzDefEquiPoints}}
-Cette macro permet d'obtenir deux points d'une droite équidistants d'un point donné.
+This macro makes it possible to obtain two points on a straight line equidistant from a given point.
-\begin{NewMacroBox}{tkzDefEquiPoints}{\oarg{local options}\parg{pt1,pt2}}
-\begin{tabular}{lll}
-arguments & défaut & définition \\
+\begin{NewMacroBox}{tkzDefEquiPoints}{\oarg{local options}\parg{pt1,pt2}}%
+\begin{tabular}{lll}%
+arguments & default & definition \\
\midrule
-\TAline{(pt1,pt2)}{no default}{liste non ordonnée de deux points}
+\TAline{(pt1,pt2)}{no default}{unordered list of two items}
\bottomrule
\end{tabular}
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule \\
options & default & definition \\
\midrule
-\TOline{dist} {2 cm} {moitié de la distance entre les deux points}
-\TOline{from=pt} {no default} {point de référence}
-\TOline{show} {false} {si true affiche les traces de compas}
-\TOline{/compass/delta} {0} {taille des traces de compas }
+\TOline{dist} {2 cm} {half the distance between the two points}
+\TOline{from=pt} {no default} {reference point}
+\TOline{show} {false} {if true displays compass traces}
+\TOline{/compass/delta} {0} {compass trace size }
\end{tabular}
\end{NewMacroBox}
-
-\subsubsection{Utilisation de \tkzcname{tkzDefEquiPoints} avec des options}
-
+\subsubsection{Using \tkzcname{tkzDefEquiPoints} with options}
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}
\tkzSetUpCompass[color=purple,line width=1pt]
diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-tools.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-tools.tex
new file mode 100644
index 0000000000..819b57dc77
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-tools.tex
@@ -0,0 +1,205 @@
+\section{Miscellaneous tools}
+\subsection{Duplicate a segment}
+This involves constructing a segment on a given half-line of the same length as a given segment.
+
+\begin{NewMacroBox}{tkzDuplicateSegment}{\parg{pt1,pt2}\parg{pt3,pt4}\marg{pt5}}%
+This involves creating a segment on a given half-line of the same length as a given segment . It is in fact the definition of a point.
+\tkzcname{tkzDuplicateSegment} is the new name of \tkzcname{tkzDuplicateLen}.
+\medskip
+\begin{tabular}{lll}%
+\toprule
+arguments & example & explication \\
+
+\midrule
+\TAline{(pt1,pt2)(pt3,pt4)\{pt5\}} {\tkzcname{tkzDuplicateSegment}(A,B)(E,F)\{C\}}{AC=EF and $C \in [AB)$} \\
+\bottomrule
+\end{tabular}
+
+\medskip
+The macro \tkzcname{tkzDuplicateLength} is identical to this one.
+\end{NewMacroBox}
+
+\begin{tkzexample}[latex=6cm,small]
+ \begin{tikzpicture}
+ \tkzDefPoint(0,0){A}
+ \tkzDefPoint(2,-3){B}
+ \tkzDefPoint(2,5){C}
+ \tkzDrawSegments[red](A,B A,C)
+ \tkzDuplicateSegment(A,B)(A,C)
+ \tkzGetPoint{D}
+ \tkzDrawSegment[green](A,D)
+ \tkzDrawPoints[color=red](A,B,C,D)
+ \tkzLabelPoints[above right=3pt](A,B,C,D)
+ \end{tikzpicture}
+\end{tkzexample}
+
+\subsubsection{Proportion of gold with \tkzcname{tkzDuplicateSegment}}
+\begin{tkzexample}[latex=7cm,small]
+\begin{tikzpicture}[rotate=-90,scale=.75]
+ \tkzDefPoint(0,0){A}
+ \tkzDefPoint(10,0){B}
+ \tkzDefMidPoint(A,B)
+ \tkzGetPoint{I}
+ \tkzDefPointWith[orthogonal,K=-.75](B,A)
+ \tkzGetPoint{C}
+ \tkzInterLC(B,C)(B,I) \tkzGetSecondPoint{D}
+ \tkzDuplicateSegment(B,D)(D,A) \tkzGetPoint{E}
+ \tkzInterLC(A,B)(A,E) \tkzGetPoints{N}{M}
+ \tkzDrawArc[orange,delta=10](D,E)(B)
+ \tkzDrawArc[orange,delta=10](A,M)(E)
+ \tkzDrawLines(A,B B,C A,D)
+ \tkzDrawArc[orange,delta=10](B,D)(I)
+ \tkzDrawPoints(A,B,D,C,M,I,N)
+ \tkzLabelPoints(A,B,D,C,M,I,N)
+\end{tikzpicture}
+\end{tkzexample}
+
+\subsection{Segment length \tkzcname{tkzCalcLength}}
+There's an option in \TIKZ\ named \tkzname{veclen}. This option
+ is used to calculate AB if A and B are two points.
+
+The only problem for me is that the version of \TIKZ\ is not accurate enough in some cases. My version uses the \tkzNamePack{xfp} package and is slower, but more accurate.
+
+\begin{NewMacroBox}{tkzCalcLength}{\oarg{local options}\parg{pt1,pt2}\marg{name of macro}}%
+The result is stored in a macro.
+
+\medskip
+\begin{tabular}{lll}%
+\toprule
+arguments & example & explication \\
+\midrule
+\TAline{(pt1,pt2)\{name of macro\}} {\tkzcname{tkzCalcLength}(A,B)\{dAB\}}{\tkzcname{dAB} gives $AB$ in pt}
+\bottomrule
+\end{tabular}
+
+\medskip
+Only one option
+
+\begin{tabular}{lll}%
+
+\toprule
+ options & default & example \\
+\midrule
+\TOline{cm} {false}{\tkzcname{tkzCalcLength}[cm](A,B)\{dAB\} \tkzcname{dAB} gives $AB$ in cm}
+\end{tabular}
+\end{NewMacroBox}
+
+\subsubsection{Compass square construction}
+
+\begin{tkzexample}[latex=7cm,small]
+\begin{tikzpicture}[scale=1]
+ \tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B}
+ \tkzDrawLine[add= .6 and .2](A,B)
+ \tkzCalcLength[cm](A,B)\tkzGetLength{dAB}
+ \tkzDefLine[perpendicular=through A](A,B)
+ \tkzDrawLine(A,tkzPointResult) \tkzGetPoint{D}
+ \tkzShowLine[orthogonal=through A,gap=2](A,B)
+ \tkzMarkRightAngle(B,A,D)
+ \tkzVecKOrth[-1](B,A)\tkzGetPoint{C}
+ \tkzCompasss(A,D D,C)
+ \tkzDrawArc[R](B,\dAB)(80,110)
+ \tkzDrawPoints(A,B,C,D)
+ \tkzDrawSegments[color=gray,style=dashed](B,C C,D)
+ \tkzLabelPoints(A,B,C,D)
+\end{tikzpicture}
+\end{tkzexample}
+
+
+\subsection{Transformation from pt to cm}
+Not sure if this is necessary and it is only a division by 28.45274 and a multiplication by the same number. The macros are:
+
+\begin{NewMacroBox}{tkzpttocm}{\parg{nombre}\marg{name of macro}}%
+\begin{tabular}{lll}%
+arguments & example & explication \\
+\midrule
+\TAline{(number){name of macro}} {\tkzcname{tkzpttocm}(120)\{len\}}{\tkzcname{len} gives a number of \tkzname{cm}}
+\bottomrule
+\end{tabular}
+
+\medskip
+You'll have to use \tkzcname{len} along with \tkzname{cm}. The result is stored in a macro.
+\end{NewMacroBox}
+
+\subsection{Transformation from cm to pt}
+\begin{NewMacroBox}{tkzcmtopt}{\parg{nombre}\marg{name of macro}}%
+\begin{tabular}{lll}%
+arguments & example & explication \\
+\midrule
+\TAline{(nombre)\{name of macro\}}{\tkzcname{tkzcmtopt}(5)\{len\}}{\tkzcname{len} length in \tkzname{pt}}
+\bottomrule
+\end{tabular}
+
+\medskip
+The result is stored in a macro. The result can be used with \tkzcname{len} \tkzname{pt}.
+\end{NewMacroBox}
+
+\subsubsection{Example}
+The macro \tkzcname{tkzDefCircle[radius](A,B)} defines the radius that we retrieve with \tkzcname{tkzGetLength}, but this result is in \tkzname{pt}.
+
+\begin{tkzexample}[latex=6cm,small]
+\begin{tikzpicture}[scale=.5]
+ \tkzDefPoint(0,0){A}
+ \tkzDefPoint(3,-4){B}
+ \tkzDefCircle[through](A,B)
+ \tkzGetLength{rABpt}
+ \tkzpttocm(\rABpt){rABcm}
+ \tkzDrawCircle(A,B)
+ \tkzDrawPoints(A,B)
+ \tkzLabelPoints(A,B)
+ \tkzDrawSegment[dashed](A,B)
+ \tkzLabelSegment(A,B){$\pgfmathprintnumber{\rABcm}$}
+\end{tikzpicture}
+\end{tkzexample}
+
+\subsection{Get point coordinates}
+%<--------------------------------------------------------------------------–>
+% Coordonnées d'un point
+% result in #2x and #2y #1 is the point and we get its coordinates
+% use either $A$ one point \tkzGetPointCoord(A){V} then \Vx = xA and \Vy = yA
+% in cm
+% tkzGetPointCoord with [#1] cm or pt ?? todo
+%<--------------------------------------------------------------------------–>
+\begin{NewMacroBox}{tkzGetPointCoord}{\parg{$A$}\marg{name of macro}}%
+\begin{tabular}{lll}%
+arguments & example & explication \\
+\midrule
+\TAline{(point)\{name of macro\}} {\tkzcname{tkzGetPointCoord}(A)\{A\}}{\tkzcname{Ax} and \tkzcname{Ay} give coordinates for $A$}
+\end{tabular}
+
+\medskip
+Stores in two macros the coordinates of a point. If the name of the macro is \tkzname{p}, then \tkzcname{px} and \tkzcname{py} give the coordinates of the chosen point with the cm as unit.
+\end{NewMacroBox}
+
+\subsubsection{Coordinate transfer with \tkzcname{tkzGetPointCoord}}
+
+\begin{tkzexample}[width=8cm,small]
+\begin{tikzpicture}
+ \tkzInit[xmax=5,ymax=3]
+ \tkzGrid[sub,orange]
+ \tkzAxeXY
+ \tkzDefPoint(1,0){A}
+ \tkzDefPoint(4,2){B}
+ \tkzGetPointCoord(A){a}
+ \tkzGetPointCoord(B){b}
+ \tkzDefPoint(\ax,\ay){C}
+ \tkzDefPoint(\bx,\by){D}
+ \tkzDrawPoints[color=red](C,D)
+\end{tikzpicture}
+\end{tkzexample}
+
+\subsubsection{Sum of vectors with \tkzcname{tkzGetPointCoord}}
+\begin{tkzexample}[width=6cm,small]
+\begin{tikzpicture}[>=latex]
+ \tkzDefPoint(1,4){a}
+ \tkzDefPoint(3,2){b}
+ \tkzDefPoint(1,1){c}
+ \tkzDrawSegment[->,red](a,b)
+ \tkzGetPointCoord(c){c}
+ \draw[color=blue,->](a) -- ([shift=(b)]\cx,\cy) ;
+ \draw[color=purple,->](b) -- ([shift=(b)]\cx,\cy) ;
+ \tkzDrawSegment[->,blue](a,c)
+ \tkzDrawSegment[->,purple](b,c)
+\end{tikzpicture}
+\end{tkzexample}
+
+\endinput \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-triangles.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-triangles.tex
index 13cf231e45..038e93892c 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-triangles.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-triangles.tex
@@ -1,46 +1,46 @@
-\section{Les triangles}
+\section{Triangles}
-\subsection{Définition des triangles \tkzcname{tkzDefTriangle}}
-Les macros suivantes vont permettre de définir ou de construire un triangle à partir \tkzname{au moins} de deux points.
+\subsection{Definition of triangles \tkzcname{tkzDefTriangle}}
+The following macros will allow you to define or construct a triangle from \tkzname{at least} two points.
- Pour le moment, il est possible de définir les triangles suivants :
+ At the moment, it is possible to define the following triangles:
\begin{itemize}
-\item \tkzname{two angles} détermine un triangle connaissant deux angles,
-\item \tkzname{equilateral} détermine un triangle équilatéral,
-\item \tkzname{half} détermine un triangle rectangle tel que le rapport des mesures des deux côtés adjacents à l'angle droit soit égal à $2$,
-\item \tkzname{pythagore} détermine un triangle rectangle dont les mesures des côtés sont proportionnelles à 3, 4 et 5,
-\item \tkzname{school} détermine un triangle rectangle dont les angles sont 30, 60 et 90 degrés,
-\item \tkzname{golden} détermine un triangle rectangle tel que le rapport des mesures des deux côtés adjacents à l'angle droit soit égal $\Phi=1,618034$, J'ai choisi comme dénomination « triangle doré » car il rpovient du rectangle d'or et j'ai conservé la dénomination « triangle d'or » ou encore « triangle d'Euclide » pour le triangle isocèle dont les angles à la base sont de 72 degrés,
+\item \tkzname{two angles} determines a triangle with two angles;
+\item \tkzname{equilateral} determines an equilateral triangle;
+\item \tkzname{half} determines a right-angled triangle such that the ratio of the measurements of the two adjacent sides to the right angle is equal to $2$;
+\item \tkzname{pythagore} determines a right-angled triangle whose side measurements are proportional to 3, 4 and 5;
+\item \tkzname{school} determines a right-angled triangle whose angles are 30, 60 and 90 degrees;
+\item \tkzname{golden} determines a right-angled triangle such that the ratio of the measurements on the two adjacent sides to the right angle is equal to $\Phi=1.618034$, I chose "golden triangle" as the denomination because it comes from the golden rectangle and I kept the denomination "gold triangle" or "Euclid's triangle" for the isosceles triangle whose angles at the base are 72 degrees;
-\item \tkzname{gold} ou \tkzname{euclide} pour le triangle d'or,
+\item \tkzname{euclide} or \tkzname{gold} for the gold triangle;
-\item \tkzname{cheops} détermine un troisième point tel que le triangle soit isocèle dont les mesures des côtés sont proportionnelles à $2$, $\Phi$ et $\Phi$.
+\item \tkzname{cheops} determines a third point such that the triangle is isosceles with side measurements proportional to $2$, $\Phi$ and $\Phi$.
\end{itemize}
-\begin{NewMacroBox}{tkzDefTriangle}{\oarg{local options}\parg{A,B}}
-les points sont ordonnés car le triangle est construit en suivant le sens direct du cercle trigonométrique. Cette macro est soit utilisée en partenariat avec \tkzcname{tkzGetPoint} soit en utilisant \tkzname{tkzPointResult} s'il n'est pas nécessaire de conserver le nom.
-
+\begin{NewMacroBox}{tkzDefTriangle}{\oarg{local options}\parg{A,B}}%
+The points are ordered because the triangle is constructed following the direct direction of the trigonometric circle. This macro is either used in partnership with \tkzcname{tkzGetPoint} or by using \tkzname{tkzPointResult} if it is not necessary to keep the name.
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
options & default & definition \\
\midrule
-\TOline{two angles= \#1 and \#2}{no defaut}{triangle connaissant deux angles}
-\TOline{equilateral} {no defaut}{triangle équilatéral }
-\TOline{pythagore}{no defaut}{proportionnel au triangle de pythagore 3-4-5}
-\TOline{school} {no defaut}{ angles de 30, 60 et 90 degrés }
-\TOline{gold}{no defaut}{ angles de 72, 72 et 36 degrés, $A$ est le sommet }
-\TOline{euclide} {no defaut}{identique au précédent mais $[AB]$ est la base}
-\TOline{golden} {no defaut}{rectangle en B et $AB/AC = \Phi$}
-\TOline{cheops} {no defaut}{AC=BC, AC et BC sont proportionnels à $2$ et $\Phi$.}
+\TOline{two angles= \#1 and \#2}{no defaut}{triangle knowing two angles}
+\TOline{equilateral} {no defaut}{equilateral triangle }
+\TOline{pythagore}{no defaut}{proportional to the pythagorean triangle 3-4-5}
+\TOline{school} {no defaut}{angles of 30, 60 and 90 degrees }
+\TOline{gold}{no defaut}{angles of 72, 72 and 36 degrees, $A$ is the apex}
+\TOline{euclide} {no defaut}{same as above but $[AB]$ is the base}
+\TOline{golden} {no defaut}{B rectangle and $AB/AC = \Phi$}
+\TOline{cheops} {no defaut}{AC=BC, AC and BC are proportional to $2$ and $\Phi$.}
+\bottomrule
\end{tabular}
\medskip
-\tkzcname{tkzGetPoint} permet de stocker le point sinon \tkzname{tkzPointResult} permet une utilisation immédiate.
+\tkzcname{tkzGetPoint} allows you to store the point otherwise \tkzname{tkzPointResult} allows for immediate use.
\end{NewMacroBox}
-\subsubsection{triangle doré (golden)}
+\subsubsection{Option \tkzname{golden}}
\begin{tkzexample}[latex=6 cm,small]
\begin{tikzpicture}[scale=.8]
\tkzInit[xmax=5,ymax=3] \tkzClip[space=.5]
@@ -52,7 +52,7 @@ options & default & definition \\
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{triangle équilatéral}\label{def_equilateral}
+\subsubsection{Option \tkzname{equilateral}}
\begin{tkzexample}[latex=7 cm,small]
\begin{tikzpicture}
\tkzDefPoint(0,0){A}
@@ -68,7 +68,7 @@ options & default & definition \\
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{triangle d'or (euclide)}
+\subsubsection{Option \tkzname{gold} or \tkzname{euclide} }
\begin{tkzexample}[latex=7 cm,small]
\begin{tikzpicture}
\tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B}
@@ -82,33 +82,32 @@ options & default & definition \\
\end{tkzexample}
\newpage
-\subsection{Tracé des triangles}
- \begin{NewMacroBox}{tkzDrawTriangle}{\oarg{local options}\parg{A,B}}
-Macro semblable à la macro précédente mais les côtés sont tracés.
+\subsection{Drawing of triangles}
+ \begin{NewMacroBox}{tkzDrawTriangle}{\oarg{local options}\parg{A,B}}%
+Macro similar to the previous macro but the sides are drawn.
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
options & default & definition \\
\midrule
-\TOline{two angles= \#1 and \#2}{no defaut}{triangle connaissant deux angles}
-\TOline{equilateral} {no defaut}{triangle équilatéral }
-\TOline{pythagore}{no defaut}{proportionnel au triangle de pythagore 3-4-5}
-\TOline{school} {no defaut}{les angles sont 30, 60 et 90 degrés }
-\TOline{gold}{no defaut}{les angles sont 72, 72 et 36 degrés, $A$ est le sommet }
-\TOline{euclide} {no defaut}{identique au précédent mais $[AB]$ est la base}
-\TOline{golden} {no defaut}{rectangle en B et $AB/AC = \Phi$}
-\TOline{cheops} {no defaut}{isocèle en C et $AC/AB = \frac{\Phi}{2}$}
+\TOline{two angles= \#1 and \#2}{equilateral}{triangle knowing two angles}
+\TOline{equilateral} {equilateral}{equilateral triangle }
+\TOline{pythagore}{equilateral}{proportional to the pythagorean triangle 3-4-5}
+\TOline{school} {equilateral}{the angles are 30, 60 and 90 degrees }
+\TOline{gold}{equilateral}{the angles are 72, 72 and 36 degrees, $A$ is the vertex }
+\TOline{euclide} {equilateral}{identical to the previous one but $[AB]$ is the base}
+\TOline{golden} {equilateral}{B rectangle and $AB/AC = \Phi$}
+\TOline{cheops} {equilateral}{isosceles in C and $AC/AB = \frac{\Phi}{2}$}
\bottomrule
\end{tabular}
\medskip
-Dans toutes ses définitions, les dimensions du triangle dépendent des deux points de départ.
+In all its definitions, the dimensions of the triangle depend on the two starting points.
\end{NewMacroBox}
-
-\subsubsection{triangle de Pythagore}
-Ce triangle a des côtés dont les longueurs sont proportionnelles à 3, 4 et 5.
+\subsubsection{Option \tkzname{pythagore}}
+This triangle has sides whose lengths are proportional to 3, 4 and 5.
\begin{tkzexample}[latex=6 cm,small]
\begin{tikzpicture}
@@ -120,53 +119,76 @@ Ce triangle a des côtés dont les longueurs sont proportionnelles à 3, 4 et 5.
\end{tkzexample}
- \subsubsection{triangle 30 60 90 (school)}
- Les angles font 30, 60 et 90 degrés.
+\subsubsection{Option \tkzname{school}}
+The angles are 30, 60 and 90 degrees.
\begin{tkzexample}[latex=6 cm,small]
\begin{tikzpicture}
-\tkzInit[ymin=-2.5,ymax=0,xmin=-5,xmax=0]
-\tkzClip[space=.5]
-\begin{scope}[rotate=-180]
\tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B}
\tkzDrawTriangle[school,fill=red!30](A,B)
- \tkzMarkRightAngles(B,A,tkzPointResult)
-\end{scope}
+ \tkzMarkRightAngles(tkzPointResult,B,A)
\end{tikzpicture}
\end{tkzexample}
+\subsubsection{Option \tkzname{golden}}
+\begin{tkzexample}[latex=6 cm,small]
+\begin{tikzpicture}[scale=1]
+ \tkzDefPoint(0,-10){M}
+ \tkzDefPoint(3,-10){N}
+ \tkzDrawTriangle[golden,color=brown](M,N)
+\end{tikzpicture}
+\end{tkzexample}
-\section{Triangles spécifiques avec \tkzcname{tkzDefSpcTriangle}}
+\subsubsection{Option \tkzname{gold}}
+\begin{tkzexample}[latex=6 cm,small]
+\begin{tikzpicture}[scale=1]
+ \tkzDefPoint(5,-5){I}
+ \tkzDefPoint(8,-5){J}
+ \tkzDrawTriangle[gold,color=blue!50](I,J)
+\end{tikzpicture}
+\end{tkzexample}
-Les centres de certains triangles ont été définis dans la section "points", ici il s'agit de déterminer les trois sommets de triangles spécifiques.
+\subsubsection{Option \tkzname{euclide}}
+\begin{tkzexample}[latex=6 cm,small]
+ \begin{tikzpicture}[scale=1]
+ \tkzDefPoint(10,-5){K}
+ \tkzDefPoint(13,-5){L}
+ \tkzDrawTriangle[euclide,color=blue,fill=blue!10](K,L)
+ \end{tikzpicture}
+\end{tkzexample}
+
+
+\section{Specific triangles with \tkzcname{tkzDefSpcTriangle}}
+
+The centers of some triangles have been defined in the "points" section, here it is a question of determining the three vertices of specific triangles.
\begin{NewMacroBox}{tkzDefSpcTriangle}{\oarg{local options}\parg{A,B,C}}
The order of the points is important!
\medskip
-\begin{tabular}{lll}
+\begin{tabular}{lll}%
\toprule
options & default & definition \\
\midrule
-\TOline{in or incentral}{centroid}{triangle connaissant deux angles}
-\TOline{ex or excentral} {centroid}{triangle équilatéral }
-\TOline{extouch}{centroid}{proportionnel au triangle de pythagore 3-4-5}
-\TOline{intouch or contact} {centroid}{ angles de 30, 60 et 90 degrés }
-\TOline{centroid or medial}{centroid}{ angles de 72, 72 et 36 degrés, $A$ est le sommet }
-\TOline{orthic} {centroid}{identique au précédent mais $[AB]$ est la base}
-\TOline{feuerbach} {centroid}{rectangle en B et $AB/AC = \Phi$}
-\TOline{euler} {centroid}{AC=BC, AC et BC sont proportionnels à $2$ et $\Phi$.}
-\TOline{tangential} {centroid}{AC=BC, AC et BC sont proportionnels à $2$ et $\Phi$.}
-\TOline{name} {no defaut}{AC=BC, AC et BC sont proportionnels à $2$ et $\Phi$.}
+\TOline{in or incentral}{centroid}{two-angled triangle}
+\TOline{ex or excentral} {centroid}{equilateral triangle }
+\TOline{extouch}{centroid}{proportional to the pythagorean triangle 3-4-5}
+\TOline{intouch or contact} {centroid}{ 30, 60 and 90 degree angles }
+\TOline{centroid or medial}{centroid}{ angles of 72, 72 and 36 degrees, $A$ is the vertex }
+\TOline{orthic} {centroid}{same as above but $[AB]$ is the base}
+\TOline{feuerbach} {centroid}{B rectangle and $AB/AC = \Phi$}
+\TOline{euler} {centroid}{AC=BC, AC and BC are proportional to $2$ and $\Phi$.}
+\TOline{tangential} {centroid}{AC=BC, AC and BC are proportional to $2$ and $\Phi$.}
+\TOline{name} {no defaut}{AC=BC, AC and BC are proportional to $2$ and $\Phi$.}
\midrule
\end{tabular}
\medskip
-\tkzcname{tkzGetPoint} permet de stocker le point sinon \tkzname{tkzPointResult} permet une utilisation immédiate.
+\tkzcname{tkzGetPoint} allows you to store the point otherwise \tkzname{tkzPointResult} allows for immediate use.
\end{NewMacroBox}
-\subsubsection{\tkzcname{tkzDefSpcTriangle} option "medial" ou "centroid"}
+\subsubsection{Option \tkzname{medial} or \tkzname{centroid} }
The geometric centroid of the polygon vertices of a triangle is the point $G$ (sometimes also denoted $M$) which is also the intersection of the triangle's three triangle medians. The point is therefore sometimes called the median point. The centroid is always in the interior of the triangle.\\
\href{http://mathworld.wolfram.com/TriangleCentroid.html}{Weisstein, Eric W. "Centroid triangle" From MathWorld--A Wolfram Web Resource.}
@@ -189,8 +211,9 @@ In the following example, we obtain the Euler circle which passes through the pr
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Option : "in" ou "incentral"}
-The Incentral triangle is the triangle whose vertices are determined by
+\subsubsection{Option \tkzname{in} or \tkzname{incentral} }
+
+The incentral triangle is the triangle whose vertices are determined by
the intersections of the reference triangle’s angle bisectors with the
respective opposite sides.\\
\href{http://mathworld.wolfram.com/ContactTriangle.html}{Weisstein, Eric W. "Incentral triangle" From MathWorld--A Wolfram Web Resource.}
@@ -199,66 +222,66 @@ respective opposite sides.\\
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=1]
\tkzDefPoints{ 0/0/A,5/0/B,1/3/C}
- \tkzDefSpcTriangle[in,name=I](A,B,C){a,b,c}
+ \tkzDefSpcTriangle[in,name=I](A,B,C){_a,_b,_c}
\tkzInCenter(A,B,C)\tkzGetPoint{I}
\tkzDrawPolygon[red](A,B,C)
- \tkzDrawPolygon[blue](Ia,Ib,Ic)
- \tkzDrawPoints(A,B,C,I,Ia,Ib,Ic)
+ \tkzDrawPolygon[blue](I_a,I_b,I_c)
+ \tkzDrawPoints(A,B,C,I,I_a,I_b,I_c)
\tkzDrawCircle[in](A,B,C)
- \tkzDrawSegments[dashed](A,Ia B,Ib C,Ic)
- \tkzAutoLabelPoints[center=I,blue,font=\scriptsize]%
-(Ia,Ib,Ic)
- \tkzAutoLabelPoints[center=I,red,font=\scriptsize]%
-(A,B,C)
-(A,B,C,Ia,Ib,Ic)
+ \tkzDrawSegments[dashed](A,I_a B,I_b C,I_c)
+ \tkzAutoLabelPoints[center=I,
+ blue,font=\scriptsize](I_a,I_b,I_c)
+ \tkzAutoLabelPoints[center=I,red,
+ font=\scriptsize](A,B,C,I_a,I_b,I_c)
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Option : "ex" ou "Excentral"}
-The excentral triangle of a triangle $ABC$ is the triangle $JaJbJc$ with vertices corresponding to the excenters of $ABC$.
+\subsubsection{Option \tkzname{ex} or \tkzname{excentral} }
+
+The excentral triangle of a triangle $ABC$ is the triangle $J_aJ_bJ_c$ with vertices corresponding to the excenters of $ABC$.
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=.6]
\tkzDefPoints{0/0/A,6/0/B,0.8/4/C}
- \tkzDefSpcTriangle[excentral,name=J](A,B,C){a,b,c}
- \tkzDefSpcTriangle[extouch,name=T](A,B,C){a,b,c}
+ \tkzDefSpcTriangle[excentral,name=J](A,B,C){_a,_b,_c}
+ \tkzDefSpcTriangle[extouch,name=T](A,B,C){_a,_b,_c}
\tkzDrawPolygon[blue](A,B,C)
- \tkzDrawPolygon[red](Ja,Jb,Jc)
+ \tkzDrawPolygon[red](J_a,J_b,J_c)
\tkzDrawPoints(A,B,C)
- \tkzDrawPoints[red](Ja,Jb,Jc)
+ \tkzDrawPoints[red](J_a,J_b,J_c)
\tkzLabelPoints(A,B,C)
- \tkzLabelPoints[red](Jb,Jc)
- \tkzLabelPoints[red,above](Ja)
+ \tkzLabelPoints[red](J_b,J_c)
+ \tkzLabelPoints[red,above](J_a)
\tkzClipBB \tkzShowBB
- \tkzDrawCircles[gray](Ja,Ta Jb,Tb Jc,Tc)
+ \tkzDrawCircles[gray](J_a,T_a J_b,T_b J_c,T_c)
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Option : "intouch"}
-The contact triangle of a triangle ABC, also called the intouch triangle, is the triangle formed by the points of tangency of the incircle of $ABC$ with $ABC$.\\
+\subsubsection{Option \tkzname{intouch}}
+The contact triangle of a triangle $ABC$, also called the intouch triangle, is the triangle formed by the points of tangency of the incircle of $ABC$ with $ABC$.\\
\href{http://mathworld.wolfram.com/ContactTriangle.html}{Weisstein, Eric W. "Contact triangle" From MathWorld--A Wolfram Web Resource.}
We obtain the intersections of the bisectors with the sides.
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[scale=.75]
\tkzDefPoints{0/0/A,6/0/B,0.8/4/C}
- \tkzDefSpcTriangle[intouch,name=x](A,B,C){a,b,c}
+ \tkzDefSpcTriangle[intouch,name=X](A,B,C){_a,_b,_c}
\tkzInCenter(A,B,C)\tkzGetPoint{I}
\tkzDrawPolygon[red](A,B,C)
- \tkzDrawPolygon[blue](xa,xb,xc)
+ \tkzDrawPolygon[blue](X_a,X_b,X_c)
\tkzDrawPoints[red](A,B,C)
- \tkzDrawPoints[blue](xa,xb,xc)
+ \tkzDrawPoints[blue](X_a,X_b,X_c)
\tkzDrawCircle[in](A,B,C)
\tkzAutoLabelPoints[center=I,blue,font=\scriptsize]%
-(xa,xb,xc)
+(X_a,X_b,X_c)
\tkzAutoLabelPoints[center=I,red,font=\scriptsize]%
(A,B,C)
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Option : "extouch"}
-The extouch triangle $TaTbTc$ is the triangle formed by the points of tangency of a triangle $ABC$ with its excircles $Ja$, $Jb$, and $Jc$. The points $Ta$, $Tb$, and $Tc$ can also be constructed as the points which bisect the perimeter of $A_1A_2A_3$ starting at $A$, $B$, and $C$.\\
+\subsubsection{Option \tkzname{extouch}}
+The extouch triangle $T_aT_bT_c$ is the triangle formed by the points of tangency of a triangle $ABC$ with its excircles $J_a$, $J_b$, and $J_c$. The points $T_a$, $T_b$, and $T_c$ can also be constructed as the points which bisect the perimeter of $A_1A_2A_3$ starting at $A$, $B$, and $C$.\\
\href{http://mathworld.wolfram.com/ExtouchTriangle.html}{Weisstein, Eric W. "Extouch triangle" From MathWorld--A Wolfram Web Resource.}
We obtain the points of contact of the exinscribed circles as well as the triangle formed by the centres of the exinscribed circles.
@@ -267,32 +290,32 @@ We obtain the points of contact of the exinscribed circles as well as the triang
\begin{tikzpicture}[scale=.7]
\tkzDefPoints{0/0/A,6/0/B,0.8/4/C}
\tkzDefSpcTriangle[excentral,
- name=J](A,B,C){a,b,c}
+ name=J](A,B,C){_a,_b,_c}
\tkzDefSpcTriangle[extouch,
- name=T](A,B,C){a,b,c}
+ name=T](A,B,C){_a,_b,_c}
\tkzDefTriangleCenter[nagel](A,B,C)
-\tkzGetPoint{Na}
+\tkzGetPoint{N_a}
\tkzDefTriangleCenter[centroid](A,B,C)
\tkzGetPoint{G}
-\tkzDrawPoints[blue](Ja,Jb,Jc)
+\tkzDrawPoints[blue](J_a,J_b,J_c)
\tkzClipBB \tkzShowBB
-\tkzDrawCircles[gray](Ja,Ta Jb,Tb Jc,Tc)
+\tkzDrawCircles[gray](J_a,T_a J_b,T_b J_c,T_c)
\tkzDrawLines[add=1 and 1](A,B B,C C,A)
-\tkzDrawSegments[gray](A,Ta B,Tb C,Tc)
-\tkzDrawSegments[gray](Ja,Ta Jb,Tb Jc,Tc)
+\tkzDrawSegments[gray](A,T_a B,T_b C,T_c)
+\tkzDrawSegments[gray](J_a,T_a J_b,T_b J_c,T_c)
\tkzDrawPolygon[blue](A,B,C)
-\tkzDrawPolygon[red](Ta,Tb,Tc)
-\tkzDrawPoints(A,B,C,Na)
-\tkzLabelPoints(Na)
+\tkzDrawPolygon[red](T_a,T_b,T_c)
+\tkzDrawPoints(A,B,C,N_a)
+\tkzLabelPoints(N_a)
\tkzAutoLabelPoints[center=Na,blue](A,B,C)
\tkzAutoLabelPoints[center=G,red,
- dist=.4](Ta,Tb,Tc)
-\tkzMarkRightAngles[fill=gray!15](Ja,Ta,B
- Jb,Tb,C Jc,Tc,A)
+ dist=.4](T_a,T_b,T_c)
+\tkzMarkRightAngles[fill=gray!15](J_a,T_a,B
+ J_b,T_b,C J_c,T_c,A)
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Option : "feuerbach"}
+\subsubsection{Option \tkzname{feuerbach}}
The Feuerbach triangle is the triangle formed by the three points of tangency of the nine-point circle with the excircles.\\
\href{http://mathworld.wolfram.com/FeuerbachTriangle.html}{Weisstein, Eric W. "Feuerbach triangle" From MathWorld--A Wolfram Web Resource.}
@@ -322,8 +345,8 @@ The Feuerbach triangle is the triangle formed by the three points of tangency of
\end{tikzpicture}
\end{tkzexample}
-\subsubsection{Option Triangle "tangential"}
-The tangential triangle is the triangle $T_AT_BT_C $formed by the lines tangent to the circumcircle of a given triangle ABC at its vertices. It is therefore antipedal triangle of ABC with respect to the circumcenter O.\\
+\subsubsection{Option \tkzname{tangential}}
+The tangential triangle is the triangle $T_aT_bT_c$ formed by the lines tangent to the circumcircle of a given triangle $ABC$ at its vertices. It is therefore antipedal triangle of $ABC$ with respect to the circumcenter $O$.\\
\href{http://mathworld.wolfram.com/TangentialTriangle.html}{Weisstein, Eric W. "Tangential Triangle." From MathWorld--A Wolfram Web Resource. }
@@ -331,21 +354,21 @@ The tangential triangle is the triangle $T_AT_BT_C $formed by the lines tangent
\begin{tikzpicture}[scale=.5,rotate=80]
\tkzDefPoints{0/0/A,6/0/B,1.8/4/C}
\tkzDefSpcTriangle[tangential,
- name=T](A,B,C){a,b,c}
+ name=T](A,B,C){_a,_b,_c}
\tkzDrawPolygon[red](A,B,C)
- \tkzDrawPolygon[blue](Ta,Tb,Tc)
+ \tkzDrawPolygon[blue](T_a,T_b,T_c)
\tkzDrawPoints[red](A,B,C)
- \tkzDrawPoints[blue](Ta,Tb,Tc)
+ \tkzDrawPoints[blue](T_a,T_b,T_c)
\tkzDefCircle[circum](A,B,C)
\tkzGetPoint{O}
\tkzDrawCircle(O,A)
\tkzLabelPoints[red](A,B,C)
- \tkzLabelPoints[blue](Ta,Tb,Tc)
+ \tkzLabelPoints[blue](T_a,T_b,T_c)
\end{tikzpicture}
\end{tkzexample}
- \subsubsection{Option Triangle "euler"}
-The Euler triangle of a triangle ABC is the triangle $E_AE_BE_C$ whose vertices are the midpoints of the segments joining the orthocenter H with the respective vertices. The vertices of the triangle are known as the Euler points, and lie on the nine-point circle.
+\subsubsection{Option \tkzname{euler}}
+The Euler triangle of a triangle $ABC$ is the triangle $E_AE_BE_C$ whose vertices are the midpoints of the segments joining the orthocenter $H$ with the respective vertices. The vertices of the triangle are known as the Euler points, and lie on the nine-point circle.
\begin{tkzexample}[latex=7cm,small]
\begin{tikzpicture}[rotate=90,scale=1.25]
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/preamble-standalone.ltx b/macros/latex/contrib/tkz/tkz-euclide/examples/preamble-standalone.ltx
index 11b016acaa..fb3587d4f6 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/preamble-standalone.ltx
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/preamble-standalone.ltx
@@ -1,6 +1,2 @@
\documentclass{standalone}
\usepackage{tkz-euclide,tkz-fct}
-
-
-
-
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-1.tex
deleted file mode 100644
index c38c3de860..0000000000
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-1.tex
+++ /dev/null
@@ -1,15 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 12 (Section 4.1.1 : Cartesian coordinates )
-
- \begin{tikzpicture}
- \tkzInit[xmax=5,ymax=5]
- \tkzDefPoint(0,0){A}
- \tkzDefPoint(4,0){B}
- \tkzDefPoint(0,3){C}
- \tkzDrawPolygon(A,B,C)
- \tkzDrawPoints(A,B,C)
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-5.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-5.tex
deleted file mode 100644
index e7a180434b..0000000000
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-5.tex
+++ /dev/null
@@ -1,18 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 30 (Section 6.1.5 : \IoptName{tkzDefTriangleCenter}{ex})
-
-\begin{tikzpicture}[scale=.5]
- \tkzDefPoints{0/1/A,3/2/B,1/4/C}
- \tkzDefCircle[ex](B,C,A)
- \tkzGetFirstPoint{J_c}
- \tkzGetSecondPoint{Tc}
- \tkzDrawPolygon[color=blue](A,B,C)
- \tkzDrawPoints(A,B,C,J_c)
- \tkzDrawCircle[red](J_c,Tc)
- \tkzDrawLines[add=1.5 and 0](A,C B,C)
- \tkzLabelPoints(J_c)
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-08-2-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-08-2-0.tex
deleted file mode 100644
index b59a15d8ea..0000000000
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-08-2-0.tex
+++ /dev/null
@@ -1,24 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 39 (Section 8.2 : Point on a circle)
-
-\begin{tikzpicture}
- \tkzDefPoints{0/0/A,4/0/B,0.8/3/C}
- \tkzDefPointOnCircle[angle=90,center=B,
- radius=1 cm]
- \tkzGetPoint{I}
- \tkzDrawCircle[R,teal](B,1cm)
- \tkzDrawPoint[teal](I)
- \tkzDefCircle[circum](A,B,C)
- \tkzGetPoint{G} \tkzGetLength{rG}
- \tkzDefPointOnCircle[angle=30,center=G,
- radius=\rG pt]
- \tkzGetPoint{J}
- \tkzDrawPoints(A,B,C)
- \tkzDrawCircle(G,J)
- \tkzDrawPoint(G)
- \tkzDrawPoint[red](J)
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-2-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-2-1.tex
deleted file mode 100644
index 05d6c6a05a..0000000000
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-2-1.tex
+++ /dev/null
@@ -1,20 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 41 (Section 9.2.1 : Example of homothety and projection)
-
-\begin{tikzpicture}[scale=1.25]
- \tkzInit \tkzClip
- \tkzDefPoint(0,1){A} \tkzDefPoint(6,3){B} \tkzDefPoint(3,6){C}
- \tkzDrawLines[add= 0 and .3](A,B A,C)
- \tkzDefLine[bisector](B,A,C) \tkzGetPoint{a}
- \tkzDrawLine[add=0 and 0,color=magenta!50 ](A,a)
- \tkzDefPointBy[homothety=center A ratio .5](a) \tkzGetPoint{a'}
- \tkzDefPointBy[projection = onto A--B](a') \tkzGetPoint{k}
- \tkzDrawSegment[blue](a',k)
- \tkzDrawPoints(a,a',k,A)
- \tkzDrawCircle(a',k)
- \tkzLabelPoints(a,a',k,A)
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-5-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-5-1.tex
deleted file mode 100644
index c0f119a85d..0000000000
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-5-1.tex
+++ /dev/null
@@ -1,25 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 44 (Section 9.5.1 : Example of rotation)
-
- \begin{tikzpicture}[scale=1]
- \tkzInit
- \tkzDefPoint(0,0){A}
- \tkzDefPoint(5,0){B}
- \tkzDrawSegment(A,B)
- \tkzDefPointBy[rotation=%
- center A angle 60](B)
- \tkzGetPoint{C}
- \tkzDefPointBy[symmetry=%
- center C](A)
- \tkzGetPoint{D}
- \tkzDrawSegment(A,tkzPointResult)
- \tkzDrawLine(B,D)
- \tkzDrawArc[delta=10](A,B)(C)
- \tkzDrawArc[delta=10](B,C)(A)
- \tkzDrawArc[delta=10](C,D)(D)
- \tkzMarkRightAngle(D,B,A)
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-1.0.0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-1.0.0.tex
new file mode 100644
index 0000000000..d14867b6e6
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-1.0.0.tex
@@ -0,0 +1,16 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 1 (Section 1 : Presentation and Overview)
+
+\begin{tikzpicture}[scale=.25]
+ \tkzDefPoints{00/0/A,12/0/B,6/12*sind(60)/C}
+ \foreach \density in {20,30,...,240}{%
+ \tkzDrawPolygon[fill=teal!\density](A,B,C)
+ \pgfnodealias{X}{A}
+ \tkzDefPointWith[linear,K=.15](A,B) \tkzGetPoint{A}
+ \tkzDefPointWith[linear,K=.15](B,C) \tkzGetPoint{B}
+ \tkzDefPointWith[linear,K=.15](C,X) \tkzGetPoint{C}}
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-3-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-1.3.1.tex
index a64287e178..b1492bf998 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-3-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-1.3.1.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 2 (Section 1.3.1 : Example Part I gold triangle)
+% Ex. No. 6 (Section 1.3.1 : Example Part I: gold triangle)
- \begin{tikzpicture}
+\begin{tikzpicture}
\tkzDefPoint(0,0){C}
\tkzDefPoint(4,0){D}
\tkzDefSquare(C,D)
@@ -31,4 +31,4 @@
\tkzLabelPoints[above right](B,F)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-3-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-1.3.2.tex
index 78e0fd8fd2..50520d3395 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-3-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-1.3.2.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 4 (Section 1.3.2 : Example Part II two others methods gold and euclide triangle)
+% Ex. No. 8 (Section 1.3.2 : Example Part II: two others methods gold and euclide triangle)
- \begin{tikzpicture}
+\begin{tikzpicture}
\tkzDefPoint(0,0){C} % possible
% \tkzDefPoint[label=below:$C$](0,0){C}
% but don't do this
@@ -29,4 +29,4 @@
\tkzLabelPoints[above](B,E)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-3-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-1.3.3.tex
index 193e91a237..5bf623549a 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-3-3.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-1.3.3.tex
@@ -1,18 +1,17 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 5 (Section 1.3.3 : Complete but minimal example)
+% Ex. No. 10 (Section 1.3.3 : Complete but minimal example)
- \begin{tikzpicture}[scale=1,ra/.style={fill=gray!20}]
+\begin{tikzpicture}[scale=1,ra/.style={fill=gray!20}]
% fixed points
\tkzDefPoint(0,0){A}
\tkzDefPoint(1,0){I}
% calculation
\tkzDefPointBy[homothety=center A ratio 10 ](I) \tkzGetPoint{B}
\tkzDefMidPoint(A,B) \tkzGetPoint{M}
- \tkzDefPointWith[orthogonal](I,M) \tkzGetPoint{i}
- \tkzInterLC(I,i)(M,B) \tkzGetSecondPoint{C}
-
+ \tkzDefPointWith[orthogonal](I,M) \tkzGetPoint{H}
+ \tkzInterLC(I,H)(M,B) \tkzGetSecondPoint{C}
\tkzDrawSegment[style=orange](I,C)
\tkzDrawArc(M,B)(A)
\tkzDrawSegment[dim={$1$,-16pt,}](A,I)
@@ -24,7 +23,7 @@
\tkzLabelPoints[above right](I,M)
\tkzLabelPoints[above left](C)
\tkzLabelPoint[right](B){$B(10,0)$}
- \tkzLabelSegment[right=4pt](I,C){$IC=\sqrt{a}$}
+ \tkzLabelSegment[right=4pt](I,C){$\sqrt{a^2}=a \ (a>0)$}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-4-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-1.4.0.tex
index 41afbdc227..22349017df 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-4-0.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-1.4.0.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 6 (Section 1.4 : The Elements of tkz code)
+% Ex. No. 12 (Section 1.4 : The Elements of tkz code)
- \begin{tikzpicture}[scale=.75]
+\begin{tikzpicture}[scale=.75]
\tkzDefPoints{0/0/A,8/0/B}
\foreach \tr in {equilateral,half,pythagore,%
school,golden,euclide, gold,cheops}
@@ -15,4 +15,4 @@
\tkzDrawSegments(A,B)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-1.5.0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-1.5.0.tex
new file mode 100644
index 0000000000..fb55d7b37c
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-1.5.0.tex
@@ -0,0 +1,12 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 15 (Section 1.5 : Notations and conventions)
+
+\begin{tikzpicture}
+ \tkzDefPoints{0/0/A}
+ \tkzDrawPoints(A)
+ \tkzLabelPoint(A){$P$}
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-6-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-1.6.1.tex
index ea6d953b25..4dbf112bf2 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-6-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-1.6.1.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 7 (Section 1.6.1 : Let's look at a classic example)
+% Ex. No. 17 (Section 1.6.1 : Let's look at a classic example)
- \begin{tikzpicture}[scale=.5]
+\begin{tikzpicture}[scale=.5]
% fixed points
\tkzDefPoint(0,0){A}
\tkzDefPoint(5,2){B}
@@ -22,4 +22,4 @@
\tkzLabelPoints[above](C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.1.tex
index c2f47fac43..18afc7ff0b 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 49 (Section 11.1.1 : \tkzcname{tkzDefPointWith} et \tkzname{colinear at})
+% Ex. No. 60 (Section 10.1.1 : Option \tkzname{colinear at})
\begin{tikzpicture}[scale=1.2,
vect/.style={->,shorten >=3pt,>=latex'}]
@@ -14,4 +14,4 @@
\tkzDrawSegments[vect](A,B C,D)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-10.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.10.tex
index 553572a317..d4facfed58 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-10.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.10.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 58 (Section 11.1.10 : \tkzcname{tkzDefPointWith} \tkzname{linear} )
+% Ex. No. 69 (Section 10.1.10 : Option \tkzname{linear})
\begin{tikzpicture}[scale=1.2]
\tkzDefPoint(1,3){A} \tkzDefPoint(4,2){B}
@@ -12,4 +12,4 @@
\tkzLabelPoints[above right=3pt](A,B,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-11.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.11.tex
index 2977b90624..b3aa5fb1e1 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-11.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.11.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 59 (Section 11.1.11 : \tkzcname{tkzDefPointWith} \tkzname{linear normed})
+% Ex. No. 70 (Section 10.1.11 : Option \tkzname{linear normed})
\begin{tikzpicture}[scale=1.2]
\tkzDefPoint(1,3){A} \tkzDefPoint(4,2){B}
@@ -13,4 +13,4 @@
\tkzLabelPoints[above right=3pt](A,B,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.2.tex
index 7ff8f22bef..4ce4d6822c 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 50 (Section 11.1.2 : colinear at)
+% Ex. No. 61 (Section 10.1.2 : Option \tkzname{colinear at} with $K$)
\begin{tikzpicture}[vect/.style={->,
shorten >=3pt,>=latex'}]
@@ -17,4 +17,4 @@
\tkzDrawSegments[vect](A,B C,H)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.3.tex
index 645719cca9..244c6e59a6 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-3.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.3.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 51 (Section 11.1.3 : colinear $K=\frac{\sqrt{2}}{2}$)
+% Ex. No. 62 (Section 10.1.3 : Option \tkzname{colinear at} with $K=\frac{\sqrt{2}}{2}$)
\begin{tikzpicture}[vect/.style={->,
shorten >=3pt,>=latex'}]
@@ -14,4 +14,4 @@
\tkzDrawSegments[vect](A,B C,D)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.4.tex
index a0bc38ede3..c736adac8e 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-4.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.4.tex
@@ -1,18 +1,19 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 52 (Section 11.1.4 : \tkzcname{tkzDefPointWith} et \tkzname{orthogonal})
+% Ex. No. 63 (Section 10.1.4 : Option \tkzname{orthogonal})
\begin{tikzpicture}[scale=1.2,
vect/.style={->,shorten >=3pt,>=latex'}]
\tkzDefPoint(2,3){A}
\tkzDefPoint(4,2){B}
- \tkzDefPointWith[orthogonal,K=-1](A,B)
+ \tkzDefPointWith[orthogonal,K=1](A,B)
\tkzGetPoint{C}
\tkzDrawPoints[color=red](A,B,C)
- \tkzLabelPoints[right=3pt](A,B,C)
+ \tkzLabelPoints[right=3pt](B,C)
+ \tkzLabelPoints[below=3pt](A)
\tkzDrawSegments[vect](A,B A,C)
\tkzMarkRightAngle(B,A,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-5.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.5.tex
index b01a8b5ca0..ad47b93669 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-5.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.5.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 53 (Section 11.1.5 : orthogonal simple)
+% Ex. No. 64 (Section 10.1.5 : Option \tkzname{orthogonal} with $K=-1$)
\begin{tikzpicture}[scale=.75]
\tkzDefPoint(1,2){O}
@@ -17,4 +17,4 @@
\tkzLabelPoints(O,I,J,K)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-6.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.6.tex
index b455e51a52..adb9a6caeb 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-6.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.6.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 54 (Section 11.1.6 : advanced orthogonal)
+% Ex. No. 65 (Section 10.1.6 : Option \tkzname{orthogonal} more complicated example)
\begin{tikzpicture}[scale=.75]
\tkzDefPoints{0/0/A,6/0/B}
@@ -23,4 +23,4 @@
\tkzLabelPoints(A,B,C,F,M,E)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-7.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.7.tex
index 4f824311be..30be510ab9 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-7.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.7.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 55 (Section 11.1.7 : segment colinear and orthogonal)
+% Ex. No. 66 (Section 10.1.7 : Options \tkzname{colinear} and \tkzname{orthogonal})
\begin{tikzpicture}[scale=1.2,
vect/.style={->,shorten >=3pt,>=latex'}]
@@ -16,4 +16,4 @@
\tkzDrawPoints(A,...,D)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-8.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.8.tex
index 5bcb0f65bd..a157dfdc05 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-8.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.8.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 56 (Section 11.1.8 : \tkzcname{tkzDefPointWith} \tkzname{orthogonal normed}, K=1)
+% Ex. No. 67 (Section 10.1.8 : Option \tkzname{orthogonal normed}, $K=1$)
\begin{tikzpicture}[scale=1.2,
vect/.style={->,shorten >=3pt,>=latex'}]
@@ -13,4 +13,4 @@
\tkzMarkRightAngle[fill=gray!20](B,A,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-9.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.9.tex
index 42519ab258..50d5a2d651 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-9.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.9.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 57 (Section 11.1.9 : \tkzcname{tkzDefPointWith} et \tkzname{orthogonal normed} K=2)
+% Ex. No. 68 (Section 10.1.9 : Option \tkzname{orthogonal normed} and $K=2$)
\begin{tikzpicture}[scale=1.2,
vect/.style={->,shorten >=3pt,>=latex'}]
@@ -15,4 +15,4 @@
\tkzLabelPoints[above=3pt](A,B,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-2-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.2.1.tex
index 747d00d946..181ace6c64 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-2-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.2.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 60 (Section 11.2.1 : Coordinate transfer with \tkzcname{tkzGetVectxy})
+% Ex. No. 71 (Section 10.2.1 : Coordinate transfer with \tkzcname{tkzGetVectxy})
\begin{tikzpicture}
\tkzDefPoint(0,0){O}
@@ -15,4 +15,4 @@
\tkzLabelPoints(A,B,O,V)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-2-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11.2.0.tex
index 8301f5ad87..2d256cb366 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-2-0.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11.2.0.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 61 (Section 12.2 : Random point in a rectangle)
+% Ex. No. 72 (Section 11.2 : Random point in a rectangle)
\begin{tikzpicture}
\tkzInit[xmax=5,ymax=5]\tkzGrid
@@ -15,4 +15,4 @@
\tkzLabelPoints(A,B,C,a,d)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-3-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11.3.0.tex
index 08286630a5..7be5ae33fd 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-3-0.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11.3.0.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 62 (Section 12.3 : Random point on a segment)
+% Ex. No. 73 (Section 11.3 : Random point on a segment)
\begin{tikzpicture}
\tkzInit[xmax=5,ymax=5] \tkzGrid
@@ -12,4 +12,4 @@
\tkzLabelPoints(A,B,C,D,a,d)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11.4.0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11.4.0.tex
new file mode 100644
index 0000000000..75d04187db
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11.4.0.tex
@@ -0,0 +1,15 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 74 (Section 11.4 : Random point on a straight line)
+
+\begin{tikzpicture}
+ \tkzInit[xmax=5,ymax=5] \tkzGrid
+ \tkzDefPoints{0/0/A,2/2/B,3/3/C,5/5/D}
+ \tkzDefRandPointOn[line = A--B]\tkzGetPoint{E}
+ \tkzDefRandPointOn[line = C--D]\tkzGetPoint{F}
+ \tkzDrawPoints(A,...,F)
+ \tkzLabelPoints(A,...,F)
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-4-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11.4.1.tex
index 394404b53a..5b3c78e4c5 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-4-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11.4.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 64 (Section 12.4.1 : Example of random points)
+% Ex. No. 75 (Section 11.4.1 : Example of random points)
\begin{tikzpicture}
\tkzDefPoints{0/0/A,2/2/B,-1/-1/C}
@@ -24,4 +24,4 @@
\tkzDrawRectangle(A,B)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-5-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11.5.0.tex
index 42d1f9e15b..572d8a6897 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-5-0.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11.5.0.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 65 (Section 12.5 : Random point on a circle)
+% Ex. No. 76 (Section 11.5 : Random point on a circle)
\begin{tikzpicture}
\tkzInit[xmax=5,ymax=5] \tkzGrid
@@ -15,4 +15,4 @@
\tkzLabelPoints(A,B,a)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-5-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11.5.1.tex
index cfedad22b4..0f71ebdfef 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-5-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11.5.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 66 (Section 12.5.1 : Random example and circle of Apollonius)
+% Ex. No. 77 (Section 11.5.1 : Random example and circle of Apollonius)
\begin{tikzpicture}[scale=1]
\tkzDefPoints{0/0/A,3/0/B}
@@ -27,4 +27,4 @@
{ $MA/MB=\coeffK$\\$NA/NB=\coeffK$}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-6-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11.6.0.tex
index 000691ea21..600c61b9fe 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-6-0.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11.6.0.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 67 (Section 12.6 : Middle of a compass segment)
+% Ex. No. 78 (Section 11.6 : Middle of a compass segment)
\begin{tikzpicture}[scale=.75]
\tkzDefPoint(0,0){A}
@@ -29,4 +29,4 @@
\tkzLabelPoints(A,B,M)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-4-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-4-0.tex
deleted file mode 100644
index d07f36751f..0000000000
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-4-0.tex
+++ /dev/null
@@ -1,15 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 63 (Section 12.4 : Random point on a straight line)
-
-\begin{tikzpicture}
- \tkzInit[xmax=5,ymax=5] \tkzGrid
- \tkzDefPoints{0/0/A,2/2/B,3/3/C,5/5/D}
- \tkzDefRandPointOn[line = A--B]\tkzGetPoint{a}
- \tkzDefRandPointOn[line = C--D]\tkzGetPoint{d}
- \tkzDrawPoints(A,B,C,D,a,d)
- \tkzLabelPoints(A,B,C,D,a,d)
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.1.1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.1.1.tex
new file mode 100644
index 0000000000..826cd564b5
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.1.1.tex
@@ -0,0 +1,18 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 79 (Section 12.1.1 : Example with \tkzname{mediator})
+
+\begin{tikzpicture}[rotate=25]
+ \tkzDefPoints{-2/0/A,1/2/B}
+ \tkzDefLine[mediator](A,B) \tkzGetPoints{C}{D}
+ \tkzDefPointWith[linear,K=.75](C,D) \tkzGetPoint{D}
+ \tkzDefMidPoint(A,B) \tkzGetPoint{I}
+ \tkzFillPolygon[color=orange!30](A,C,B,D)
+ \tkzDrawSegments(A,B C,D)
+ \tkzMarkRightAngle(B,I,C)
+ \tkzDrawSegments(D,B D,A)
+ \tkzDrawSegments(C,B C,A)
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.1.2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.1.2.tex
new file mode 100644
index 0000000000..39f38e0866
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.1.2.tex
@@ -0,0 +1,14 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 80 (Section 12.1.2 : Example with \tkzname{bisector} and \tkzname{normed})
+
+\begin{tikzpicture}[rotate=25,scale=.75]
+ \tkzDefPoints{0/0/C, 2/-3/A, 4/0/B}
+ \tkzDefLine[bisector,normed](B,A,C) \tkzGetPoint{a}
+ \tkzDrawLines[add= 0 and .5](A,B A,C)
+ \tkzShowLine[bisector,gap=4,size=2,color=red](B,A,C)
+ \tkzDrawLines[blue!50,dashed,add= 0 and 3](A,a)
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.1.3.tex
index b15124718c..1c77634e53 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.1.3.tex
@@ -1,12 +1,12 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 69 (Section 13.1.2 : Example avec \tkzname{orthogonal} et \tkzname{parallel})
+% Ex. No. 81 (Section 12.1.3 : Example with \tkzname{orthogonal} and \tkzname{parallel})
\begin{tikzpicture}
\tkzDefPoints{-1.5/-0.25/A,1/-0.75/B,-0.7/1/C}
\tkzDrawLine(A,B)
- \tkzLabelLine[pos=1.25,left](A,B){$(d_1)$}
+ \tkzLabelLine[pos=1.25,below left](A,B){$(d_1)$}
\tkzDrawPoints(A,B,C)
\tkzDefLine[orthogonal=through C](B,A) \tkzGetPoint{c}
\tkzDrawLine(C,c)
@@ -15,8 +15,8 @@
\tkzMarkRightAngle(C,I,B)
\tkzDefLine[parallel=through C](A,B) \tkzGetPoint{c'}
\tkzDrawLine(C,c')
- \tkzLabelLine[pos=1.25,left](C,c'){$(d_2)$}
+ \tkzLabelLine[pos=1.25,below left](C,c'){$(d_2)$}
\tkzMarkRightAngle(I,C,c')
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.1.4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.1.4.tex
new file mode 100644
index 0000000000..de3be4b2be
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.1.4.tex
@@ -0,0 +1,18 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 82 (Section 12.1.4 : An envelope)
+
+\begin{tikzpicture}[scale=.75]
+ \tkzInit[xmin=-6,ymin=-4,xmax=6,ymax=6] % necessary
+ \tkzClip
+ \tkzDefPoint(0,0){O}
+ \tkzDefPoint(132:4){A}
+ \tkzDefPoint(5,0){B}
+ \foreach \ang in {5,10,...,360}{%
+ \tkzDefPoint(\ang:5){M}
+ \tkzDefLine[mediator](A,M)
+ \tkzDrawLine[color=magenta,add= 3 and 3](tkzFirstPointResult,tkzSecondPointResult)}
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.1.5.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.1.5.tex
new file mode 100644
index 0000000000..afa76e3561
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.1.5.tex
@@ -0,0 +1,18 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 83 (Section 12.1.5 : A parabola)
+
+\begin{tikzpicture}[scale=.75]
+ \tkzInit[xmin=-6,ymin=-4,xmax=6,ymax=6]
+ \tkzClip
+ \tkzDefPoint(0,0){O}
+ \tkzDefPoint(132:5){A}
+ \tkzDefPoint(4,0){B}
+ \foreach \ang in {5,10,...,360}{%
+ \tkzDefPoint(\ang:4){M}
+ \tkzDefLine[mediator](A,M)
+ \tkzDrawLine[color=magenta,add= 3 and 3](tkzFirstPointResult,tkzSecondPointResult)}
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-2-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.2.1.tex
index e370a90725..818896e6e1 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-2-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.2.1.tex
@@ -1,12 +1,12 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 128 (Section 19.2.1 : Example of a tangent passing through a point on the circle )
+% Ex. No. 84 (Section 12.2.1 : Example of a tangent passing through a point on the circle )
-\begin{tikzpicture}[scale=.5]
+\begin{tikzpicture}[scale=.75]
\tkzDefPoint(0,0){O}
\tkzDefPoint(6,6){E}
- \tkzDefRandPointOn[circle=center O radius 4cm]
+ \tkzDefRandPointOn[circle=center O radius 3cm]
\tkzGetPoint{A}
\tkzDrawSegment(O,A)
\tkzDrawCircle(O,A)
@@ -16,4 +16,4 @@
\tkzMarkRightAngle[fill=red!30](O,A,h)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-2-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.2.2.tex
index bdaac686b0..27db66fd33 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-2-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.2.2.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 129 (Section 19.2.2 : Example of tangents passing through an external point )
+% Ex. No. 85 (Section 12.2.2 : Example of tangents passing through an external point )
-\begin{tikzpicture}[scale=0.75]
+\begin{tikzpicture}[scale=.8]
\tkzDefPoint(3,3){c}
\tkzDefPoint(6,3){a0}
\tkzRadius=1 cm
@@ -18,4 +18,4 @@
}%
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-2-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.2.3.tex
index 0cb9cec7fb..592f7d2347 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-2-3.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.2.3.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 130 (Section 19.2.3 : Example of Andrew Mertz )
+% Ex. No. 86 (Section 12.2.3 : Example of Andrew Mertz)
- \begin{tikzpicture}[scale=.5]
+\begin{tikzpicture}[scale=.5]
\tkzDefPoint(100:8){A}\tkzDefPoint(50:8){B}
\tkzDefPoint(0,0){C} \tkzDefPoint(0,4){R}
\tkzDrawCircle(C,R)
@@ -15,4 +15,4 @@
\tkzDrawPoint[color=black](I)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.2.4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.2.4.tex
new file mode 100644
index 0000000000..0b7bb6747a
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.2.4.tex
@@ -0,0 +1,18 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 87 (Section 12.2.4 : Drawing a tangent option \tkzimp{from with R} and \tkzimp{at})
+
+\begin{tikzpicture}[scale=.5]
+ \tkzDefPoint(0,0){O}
+ \tkzDefRandPointOn[circle=center O radius 4cm]
+ \tkzGetPoint{A}
+ \tkzDefTangent[at=A](O)
+ \tkzGetPoint{h}
+ \tkzDrawSegments(O,A)
+ \tkzDrawCircle(O,A)
+ \tkzDrawLine[add = 1 and 1](A,h)
+ \tkzMarkRightAngle[fill=red!30](O,A,h)
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.2.5.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.2.5.tex
new file mode 100644
index 0000000000..57c4ce4c91
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.2.5.tex
@@ -0,0 +1,27 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 88 (Section 12.2.5 : Drawing a tangent option \tkzimp{from})
+
+\begin{tikzpicture}[scale=.5]
+ \tkzDefPoint(0,0){B}
+ \tkzDefPoint(0,8){A}
+ \tkzDefSquare(A,B)
+ \tkzGetPoints{C}{D}
+ \tkzDrawSquare(A,B)
+ \tkzClipPolygon(A,B,C,D)
+ \tkzDefPoint(4,8){F}
+ \tkzDefPoint(4,0){E}
+ \tkzDefPoint(4,4){Q}
+ \tkzFillPolygon[color = green](A,B,C,D)
+ \tkzDrawCircle[fill = orange](B,A)
+ \tkzDrawCircle[fill = purple](E,B)
+ \tkzDefTangent[from=B](F,A)
+ \tkzInterLL(F,tkzFirstPointResult)(C,D)
+ \tkzInterLL(A,tkzPointResult)(F,E)
+ \tkzDrawCircle[fill = yellow](tkzPointResult,Q)
+ \tkzDefPointBy[projection= onto B--A](tkzPointResult)
+ \tkzDrawCircle[fill = blue!50!black](tkzPointResult,A)
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-1.tex
deleted file mode 100644
index 08b6b72102..0000000000
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-1.tex
+++ /dev/null
@@ -1,19 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 68 (Section 13.1.1 : Example with \tkzname{mediator})
-
-\begin{tikzpicture}[rotate=25]
- \tkzInit
- \tkzDefPoints{-2/0/A,1/2/B}
- \tkzDefLine[mediator](A,B) \tkzGetPoints{C}{D}
- \tkzDefPointWith[linear,K=.75](C,D) \tkzGetPoint{D}
- \tkzDefMidPoint(A,B) \tkzGetPoint{I}
- \tkzFillPolygon[color=orange!30](A,C,B,D)
- \tkzDrawSegments(A,B C,D)
- \tkzMarkRightAngle(B,I,C)
- \tkzDrawSegments(D,B D,A)
- \tkzDrawSegments(C,B C,A)
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-3.tex
deleted file mode 100644
index 754b8d2c98..0000000000
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-3.tex
+++ /dev/null
@@ -1,18 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 70 (Section 13.1.3 : An envelope)
-
-\begin{tikzpicture}[scale=1]
- \tkzInit[xmin=-6,ymin=-6,xmax=6,ymax=6]
- \tkzClip
- \tkzDefPoint(0,0){O}
- \tkzDefPoint(132:4){A}
- \tkzDefPoint(5,0){B}
- \foreach \ang in {5,10,...,360}{%
- \tkzDefPoint(\ang:5){M}
- \tkzDefLine[mediator](A,M)
- \tkzDrawLine[color=magenta,add= 4 and 4](tkzFirstPointResult,tkzSecondPointResult)}
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-4.tex
deleted file mode 100644
index bf3c722eaf..0000000000
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-4.tex
+++ /dev/null
@@ -1,19 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 71 (Section 13.1.4 : A parable)
-
-\begin{tikzpicture}[scale=1.25]
- \tkzInit[xmin=-6,ymin=-6,xmax=6,ymax=6]
- \tkzClip
- \tkzDefPoint(0,0){O}
- \tkzDefPoint(132:5){A}
- \tkzDefPoint(4,0){B}
- \foreach \ang in {5,10,...,360}{%
- \tkzDefPoint(\ang:4){M}
- \tkzDefLine[mediator](A,M)
- \tkzDrawLine[color=magenta,
- add= 4 and 4](tkzFirstPointResult,tkzSecondPointResult)}
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-5.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-5.tex
deleted file mode 100644
index c08103fbba..0000000000
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-5.tex
+++ /dev/null
@@ -1,25 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 72 (Section 13.1.5 : Drawing a tangent option \tkzimp{from with R} and \tkzimp{at})
-
- \begin{tikzpicture}[scale=.5]
- \tkzDefPoint(0,0){O}
- \tkzDefPoint(6,6){E}
- \tkzDefRandPointOn[circle=center O radius 4cm]
- \tkzGetPoint{A}
- \tkzDefRandPointOn[circle=center O radius 4cm]
- \tkzGetPoint{B}
- \tkzDrawSegments(O,A O,B)
- \tkzDrawCircle(O,A)
- \tkzDefTangent[from with R=E](O,4cm)
- \tkzGetSecondPoint{k}
- \tkzDefTangent[at=A](O)
- \tkzGetPoint{h}
- \tkzDrawPoints(E)
- \tkzDrawLine[add = .5 and .5](A,h)
- \tkzDrawLine[add = .5 and .5](E,k)
- \tkzMarkRightAngle[fill=red!30](O,A,h)
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-6.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-6.tex
deleted file mode 100644
index f9c12b5df1..0000000000
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-6.tex
+++ /dev/null
@@ -1,27 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 73 (Section 13.1.6 : Drawing a tangent option \tkzimp{from})
-
- \begin{tikzpicture}[scale=.5]
- \tkzDefPoint(0,0){B}
- \tkzDefPoint(0,8){A}
- \tkzDefSquare(A,B)
- \tkzGetPoints{C}{D}
- \tkzDrawSquare(A,B)
- \tkzClipPolygon(A,B,C,D)
- \tkzDefPoint(4,8){F}
- \tkzDefPoint(4,0){E}
- \tkzDefPoint(4,4){Q}
- \tkzFillPolygon[color = green](A,B,C,D)
- \tkzDrawCircle[fill = orange](B,A)
- \tkzDrawCircle[fill = purple](E,B)
- \tkzDefTangent[from=B](F,A)
- \tkzInterLL(F,tkzFirstPointResult)(C,D)
- \tkzInterLL(A,tkzPointResult)(F,E)
- \tkzDrawCircle[fill = yellow](tkzPointResult,Q)
- \tkzDefPointBy[projection= onto B--A](tkzPointResult)
- \tkzDrawCircle[fill = blue!50!black](tkzPointResult,A)
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13.1.1.tex
index b4a79c00dc..ccbc1bffe8 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13.1.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 74 (Section 14.1.1 : Examples of right-hand plots with \tkzname{add})
+% Ex. No. 89 (Section 13.1.1 : Examples with \tkzname{add})
\begin{tikzpicture}
\tkzInit[xmin=-2,xmax=3,ymin=-2.25,ymax=2.25]
@@ -17,4 +17,4 @@
\tkzLabelPoints(A,B,C,D,E,F,G,H)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13.1.2.tex
index 38871e6f02..6e437bc6b1 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13.1.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 75 (Section 14.1.2 : Example with \tkzcname{tkzDrawLines})
+% Ex. No. 90 (Section 13.1.2 : Example with \tkzcname{tkzDrawLines})
\begin{tikzpicture}
\tkzDefPoint(0,0){A}
@@ -12,4 +12,4 @@
\tkzLabelPoints(A,B,C,D)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13.1.3.tex
index bc6fa74542..09398cb87f 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-3.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13.1.3.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 76 (Section 14.1.3 : Example with the option \tkzname{add})
+% Ex. No. 91 (Section 13.1.3 : Example with the option \tkzname{add})
\begin{tikzpicture}[scale=.5]
\tkzDefPoint(0,0){O}
@@ -15,4 +15,4 @@
\tkzDrawLines[add = 1 and .5,color=blue](O,i O,j)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13.1.4.tex
index 614db1b70f..01a767172b 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-4.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13.1.4.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 77 (Section 14.1.4 : Medians in a triangle)
+% Ex. No. 92 (Section 13.1.4 : Medians in a triangle)
\begin{tikzpicture}[scale=1.25]
\tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B}
@@ -12,4 +12,4 @@
\tkzDrawLine[median](A,B,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-5.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13.1.5.tex
index 0fa5586acc..8b830cd5ea 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-5.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13.1.5.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 78 (Section 14.1.5 : Altitudes in a triangle)
+% Ex. No. 93 (Section 13.1.5 : Altitudes in a triangle)
\begin{tikzpicture}[scale=1.25]
\tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B}
@@ -12,4 +12,4 @@
\tkzDrawLine[altitude](A,B,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-6.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13.1.6.tex
index dea9390282..90fc2476e7 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-6.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13.1.6.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 79 (Section 14.1.6 : Bisectors in a triangle)
+% Ex. No. 94 (Section 13.1.6 : Bisectors in a triangle)
-\begin{tikzpicture}[scale=1.5]
+\begin{tikzpicture}[scale=1.25]
\tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B}
\tkzDefPoint(1,3){C} \tkzDrawPolygon(A,B,C)
\tkzSetUpLine[color=purple]
@@ -12,4 +12,4 @@
\tkzDrawLine[bisector](A,B,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-2-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13.2.1.tex
index 98cd8c990a..5a94a09b74 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-2-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13.2.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 80 (Section 14.2.1 : Example with \tkzcname{tkzLabelLine})
+% Ex. No. 95 (Section 13.2.1 : Example with \tkzcname{tkzLabelLine})
\begin{tikzpicture}
\tkzDefPoints{0/0/A,3/0/B,1/1/C}
@@ -9,7 +9,7 @@
\tkzGetPoint{c}
\tkzDrawLines(A,B C,c)
\tkzLabelLine[pos=1.25,blue,right](C,c){$(\delta)$}
- \tkzLabelLine[pos=-0.25,red,left](C,c){encore $(\delta)$}
+ \tkzLabelLine[pos=-0.25,red,left](C,c){again $(\delta)$}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.1.1.tex
index d61e0491bd..c66be7b0a6 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-1-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.1.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 81 (Section 15.1.1 : Example with point references)
+% Ex. No. 96 (Section 14.1.1 : Example with point references)
\begin{tikzpicture}[scale=1.5]
\tkzDefPoint(0,0){A}
@@ -11,4 +11,4 @@
\tkzLabelPoints(A,B)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-1-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.1.2.tex
index a51b731c18..a4f91a1f11 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-1-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.1.2.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 82 (Section 15.1.2 : Example of extending an option segment \tkzimp{add})
+% Ex. No. 97 (Section 14.1.2 : Example of extending an segment with option \tkzname{add})
- \begin{tikzpicture}
+\begin{tikzpicture}
\tkzDefPoints{0/0/A,6/0/B,0.8/4/C}
\tkzDefTriangleCenter[euler](A,B,C)
\tkzGetPoint{E}
@@ -13,4 +13,4 @@
\tkzLabelPoints(A,B,C,E)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.1.3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.1.3.tex
new file mode 100644
index 0000000000..50e0c04d63
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.1.3.tex
@@ -0,0 +1,21 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 98 (Section 14.1.3 : Example of adding dimensions with option \tkzname{dim})
+
+\begin{tikzpicture}[scale=4]
+ \pgfkeys{/pgf/number format/.cd,fixed,precision=2}
+ \tkzDefPoint(0,0){A}
+ \tkzDefPoint(3,0){B}
+ \tkzDefPoint(1,1){C}
+ \tkzDrawPolygon(A,B,C)
+ \tkzDrawPoints(A,B,C)
+ \tkzCalcLength[cm](A,B)\tkzGetLength{ABl}
+ \tkzCalcLength[cm](B,C)\tkzGetLength{BCl}
+ \tkzCalcLength[cm](A,C)\tkzGetLength{ACl}
+ \tkzDrawSegment[dim={\pgfmathprintnumber\BCl,6pt,transform shape}](C,B)
+ \tkzDrawSegment[dim={\pgfmathprintnumber\ACl,6pt,transform shape}](A,C)
+ \tkzDrawSegment[dim={\pgfmathprintnumber\ABl,-6pt,transform shape}](A,B)
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-2-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.2.0.tex
index 678362bd28..074b835878 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-2-0.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.2.0.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 84 (Section 15.2 : Drawing segments \tkzcname{tkzDrawSegments})
+% Ex. No. 99 (Section 14.2 : Drawing segments \tkzcname{tkzDrawSegments})
\begin{tikzpicture}
\tkzInit[xmin=-1,xmax=3,ymin=-1,ymax=2]
@@ -15,4 +15,4 @@
\tkzLabelPoints[above](B)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-2-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.2.1.tex
index cff3b62052..dcb8fe001d 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-2-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.2.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 85 (Section 15.2.1 : Place an arrow on segment)
+% Ex. No. 100 (Section 14.2.1 : Place an arrow on segment)
\begin{tikzpicture}
\tikzset{
@@ -10,9 +10,9 @@
mark=at position .5 with {\arrow[thick]{#1}}
}}}
\tkzDefPoint(0,0){A}
- \tkzDefPoint(4,0){B}
+ \tkzDefPoint(4,-4){B}
\tkzDrawSegments[arr=stealth](A,B)
\tkzDrawPoints(A,B)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.3.1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.3.1.tex
new file mode 100644
index 0000000000..a093ff5385
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.3.1.tex
@@ -0,0 +1,15 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 101 (Section 14.3.1 : Several marks )
+
+\begin{tikzpicture}
+ \tkzDefPoint(2,1){A}
+ \tkzDefPoint(6,4){B}
+ \tkzDrawSegment(A,B)
+ \tkzMarkSegment[color=brown,size=2pt,pos=0.4, mark=z](A,B)
+ \tkzMarkSegment[color=blue,pos=0.2, mark=oo](A,B)
+ \tkzMarkSegment[pos=0.8,mark=s,color=red](A,B)
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.3.2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.3.2.tex
new file mode 100644
index 0000000000..820cca00f5
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.3.2.tex
@@ -0,0 +1,16 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 102 (Section 14.3.2 : Use of \tkzname{mark})
+
+\begin{tikzpicture}
+ \tkzDefPoint(2,1){A}
+ \tkzDefPoint(6,4){B}
+ \tkzDrawSegment(A,B)
+ \tkzMarkSegment[color=gray,pos=0.2,mark=s|](A,B)
+ \tkzMarkSegment[color=gray,pos=0.4,mark=s||](A,B)
+ \tkzMarkSegment[color=brown,pos=0.6,mark=||](A,B)
+ \tkzMarkSegment[color=red,pos=0.8,mark=|||](A,B)
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-4-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.4.1.tex
index 1b5701802d..03890e041b 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-4-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.4.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 88 (Section 15.4.1 : Marques pour un triangle isocèle)
+% Ex. No. 103 (Section 14.4.1 : Marks for an isosceles triangle)
\begin{tikzpicture}[scale=1]
\tkzDefPoints{0/0/O,2/2/A,4/0/B,6/2/C}
@@ -11,4 +11,4 @@
\tkzMarkSegments[mark=||,size=6pt](O,A A,B)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-5-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.5.0.tex
index c4bfea9313..eb1d6e2147 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-5-0.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.5.0.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 89 (Section 15.5 : Another marking)
+% Ex. No. 104 (Section 14.5 : Another marking)
- \begin{tikzpicture}[scale=1]
+\begin{tikzpicture}[scale=1]
\tkzDefPoint(0,0){A}\tkzDefPoint(3,2){B}
\tkzDefPoint(4,0){C}\tkzDefPoint(2.5,1){P}
\tkzDrawPolygon(A,B,C)
@@ -20,4 +20,4 @@
\tkzLabelPoints[above right](P',C',B)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-5-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.5.1.tex
index e2987c9905..8b3ca2a7b0 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-5-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.5.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 90 (Section 15.5.1 : Labels multiples)
+% Ex. No. 105 (Section 14.5.1 : Multiple labels)
\begin{tikzpicture}
\tkzInit
@@ -12,4 +12,4 @@
\tkzLabelSegment[below,pos=.2](A,B){$4$}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-5-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.5.2.tex
index 41c37c42a5..4ef89e699e 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-5-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.5.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 91 (Section 15.5.2 : Labels and right-angled triangle)
+% Ex. No. 106 (Section 14.5.2 : Labels and right-angled triangle)
\begin{tikzpicture}[rotate=-60]
\tikzset{label seg style/.append style = {%
@@ -30,4 +30,4 @@
\tkzMarkRightAngles[german](A,C,B B,P,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-5-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.5.3.tex
index d20e641496..4369da6d46 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-5-3.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.5.3.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 92 (Section 15.5.3 : Labels for an isosceles triangle)
+% Ex. No. 107 (Section 14.5.3 : Labels for an isosceles triangle)
\begin{tikzpicture}[scale=1]
\tkzDefPoints{0/0/O,2/2/A,4/0/B,6/2/C}
@@ -11,4 +11,4 @@
\tkzLabelSegments[color=red,above=4pt](O,A A,B){$a$}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-1-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-1-3.tex
deleted file mode 100644
index 64d616fde2..0000000000
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-1-3.tex
+++ /dev/null
@@ -1,28 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 83 (Section 15.1.3 : Example of adding dimensions (technical figure) option \tkzimp{dim})
-
- \begin{tikzpicture}[scale=2]
- \pgfkeys{/pgf/number format/.cd,fixed,precision=2}
- % Define the first two points
- \tkzDefPoint(0,0){A}
- \tkzDefPoint(3,0){B}
- \tkzDefPoint(1,1){C}
- % Draw the triangle and the points
- \tkzDrawPolygon(A,B,C)
- \tkzDrawPoints(A,B,C)
- % Label the sides
- \tkzCalcLength[cm](A,B)\tkzGetLength{ABl}
- \tkzCalcLength[cm](B,C)\tkzGetLength{BCl}
- \tkzCalcLength[cm](A,C)\tkzGetLength{ACl}
- % add dim
- \tkzDrawSegment[dim={\pgfmathprintnumber\BCl,
- 6pt,transform shape}](C,B)
- \tkzDrawSegment[dim={\pgfmathprintnumber\ACl,
- 6pt,transform shape}](A,C)
- \tkzDrawSegment[dim={\pgfmathprintnumber\ABl,
- -6pt,transform shape}](A,B)
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-3-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-3-1.tex
deleted file mode 100644
index 8c6e4ec492..0000000000
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-3-1.tex
+++ /dev/null
@@ -1,18 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 86 (Section 15.3.1 : Several marks )
-
-\begin{tikzpicture}
- \tkzDefPoint(2,1){A}
- \tkzDefPoint(6,4){B}
- \tkzDrawSegment(A,B)
- \tkzMarkSegment[color=brown,size=2pt,
- pos=0.4, mark=z](A,B)
- \tkzMarkSegment[color=blue,
- pos=0.2, mark=oo](A,B)
- \tkzMarkSegment[pos=0.8,
- mark=s,color=red](A,B)
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-3-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-3-2.tex
deleted file mode 100644
index 26cb6fb913..0000000000
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-3-2.tex
+++ /dev/null
@@ -1,20 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 87 (Section 15.3.2 : Use of \tkzname{mark})
-
-\begin{tikzpicture}
- \tkzDefPoint(2,1){A}
- \tkzDefPoint(6,4){B}
- \tkzDrawSegment(A,B)
- \tkzMarkSegment[color=gray,
- pos=0.2,mark=s|](A,B)
- \tkzMarkSegment[color=gray,
- pos=0.4,mark=s||](A,B)
- \tkzMarkSegment[color=brown,
- pos=0.6,mark=||](A,B)
- \tkzMarkSegment[color=red,
- pos=0.8,mark=|||](A,B)
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.1.1.tex
index 4d4374b3f6..13d0c40f51 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-1-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.1.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 93 (Section 16.1.1 : triangle doré (golden))
+% Ex. No. 108 (Section 15.1.1 : Option \tkzname{golden})
\begin{tikzpicture}[scale=.8]
\tkzInit[xmax=5,ymax=3] \tkzClip[space=.5]
@@ -12,4 +12,4 @@
\tkzLabelPoints[above](C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-1-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.1.2.tex
index 47605fcc6f..ef87491f28 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-1-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.1.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 94 (Section 16.1.2 : triangle équilatéral)
+% Ex. No. 109 (Section 15.1.2 : Option \tkzname{equilateral})
\begin{tikzpicture}
\tkzDefPoint(0,0){A}
@@ -16,4 +16,4 @@
\tkzLabelPoints(A,B,C,D)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-1-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.1.3.tex
index 11f13d0f52..c1179987a3 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-1-3.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.1.3.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 95 (Section 16.1.3 : triangle d'or (euclide))
+% Ex. No. 110 (Section 15.1.3 : Option \tkzname{gold} or \tkzname{euclide} )
\begin{tikzpicture}
\tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B}
@@ -13,4 +13,4 @@
\tkzDrawBisector(A,C,B)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-2-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.2.1.tex
index dbb9772f1d..95d14deac7 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-2-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.2.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 96 (Section 16.2.1 : triangle de Pythagore)
+% Ex. No. 111 (Section 15.2.1 : Option \tkzname{pythagore})
\begin{tikzpicture}
\tkzDefPoint(0,0){A}
@@ -10,4 +10,4 @@
\tkzMarkRightAngles(A,B,tkzPointResult)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.2.2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.2.2.tex
new file mode 100644
index 0000000000..d67b7da0d6
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.2.2.tex
@@ -0,0 +1,12 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 112 (Section 15.2.2 : Option \tkzname{school})
+
+\begin{tikzpicture}
+ \tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B}
+ \tkzDrawTriangle[school,fill=red!30](A,B)
+ \tkzMarkRightAngles(tkzPointResult,B,A)
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.2.3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.2.3.tex
new file mode 100644
index 0000000000..915e82b101
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.2.3.tex
@@ -0,0 +1,12 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 113 (Section 15.2.3 : Option \tkzname{golden})
+
+\begin{tikzpicture}[scale=1]
+ \tkzDefPoint(0,-10){M}
+ \tkzDefPoint(3,-10){N}
+ \tkzDrawTriangle[golden,color=brown](M,N)
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.2.4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.2.4.tex
new file mode 100644
index 0000000000..50b34ce1f4
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.2.4.tex
@@ -0,0 +1,12 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 114 (Section 15.2.4 : Option \tkzname{gold})
+
+\begin{tikzpicture}[scale=1]
+ \tkzDefPoint(5,-5){I}
+ \tkzDefPoint(8,-5){J}
+ \tkzDrawTriangle[gold,color=blue!50](I,J)
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.2.5.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.2.5.tex
new file mode 100644
index 0000000000..79ae689b25
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.2.5.tex
@@ -0,0 +1,12 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 115 (Section 15.2.5 : Option \tkzname{euclide})
+
+\begin{tikzpicture}[scale=1]
+ \tkzDefPoint(10,-5){K}
+ \tkzDefPoint(13,-5){L}
+ \tkzDrawTriangle[euclide,color=blue,fill=blue!10](K,L)
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-2-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-2-2.tex
deleted file mode 100644
index 9bbceb668a..0000000000
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-2-2.tex
+++ /dev/null
@@ -1,16 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 97 (Section 16.2.2 : triangle 30 60 90 (school))
-
-\begin{tikzpicture}
-\tkzInit[ymin=-2.5,ymax=0,xmin=-5,xmax=0]
-\tkzClip[space=.5]
-\begin{scope}[rotate=-180]
- \tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B}
- \tkzDrawTriangle[school,fill=red!30](A,B)
- \tkzMarkRightAngles(B,A,tkzPointResult)
-\end{scope}
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.1.tex
index e1a75b5d37..7caa380a62 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 98 (Section 17.0.1 : \tkzcname{tkzDefSpcTriangle} option "medial" ou "centroid")
+% Ex. No. 116 (Section 16.0.1 : Option \tkzname{medial} or \tkzname{centroid} )
\begin{tikzpicture}[rotate=90,scale=.75]
\tkzDefPoints{0/0/A,6/0/B,0.8/4/C}
@@ -18,4 +18,4 @@
\tkzLabelPoints[font=\scriptsize](M)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.2.tex
new file mode 100644
index 0000000000..5ab3d72d27
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.2.tex
@@ -0,0 +1,21 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 117 (Section 16.0.2 : Option \tkzname{in} or \tkzname{incentral} )
+
+\begin{tikzpicture}[scale=1]
+ \tkzDefPoints{ 0/0/A,5/0/B,1/3/C}
+ \tkzDefSpcTriangle[in,name=I](A,B,C){_a,_b,_c}
+ \tkzInCenter(A,B,C)\tkzGetPoint{I}
+ \tkzDrawPolygon[red](A,B,C)
+ \tkzDrawPolygon[blue](I_a,I_b,I_c)
+ \tkzDrawPoints(A,B,C,I,I_a,I_b,I_c)
+ \tkzDrawCircle[in](A,B,C)
+ \tkzDrawSegments[dashed](A,I_a B,I_b C,I_c)
+ \tkzAutoLabelPoints[center=I,
+ blue,font=\scriptsize](I_a,I_b,I_c)
+ \tkzAutoLabelPoints[center=I,red,
+ font=\scriptsize](A,B,C,I_a,I_b,I_c)
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.3.tex
new file mode 100644
index 0000000000..b6e1117422
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.3.tex
@@ -0,0 +1,21 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 118 (Section 16.0.3 : Option \tkzname{ex} or \tkzname{excentral} )
+
+\begin{tikzpicture}[scale=.6]
+ \tkzDefPoints{0/0/A,6/0/B,0.8/4/C}
+ \tkzDefSpcTriangle[excentral,name=J](A,B,C){_a,_b,_c}
+ \tkzDefSpcTriangle[extouch,name=T](A,B,C){_a,_b,_c}
+ \tkzDrawPolygon[blue](A,B,C)
+ \tkzDrawPolygon[red](J_a,J_b,J_c)
+ \tkzDrawPoints(A,B,C)
+ \tkzDrawPoints[red](J_a,J_b,J_c)
+ \tkzLabelPoints(A,B,C)
+ \tkzLabelPoints[red](J_b,J_c)
+ \tkzLabelPoints[red,above](J_a)
+ \tkzClipBB \tkzShowBB
+ \tkzDrawCircles[gray](J_a,T_a J_b,T_b J_c,T_c)
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.4.tex
index 77666ae907..3a6ffedf9a 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-4.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.4.tex
@@ -1,21 +1,21 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 101 (Section 17.0.4 : Option : "intouch")
+% Ex. No. 119 (Section 16.0.4 : Option \tkzname{intouch})
\begin{tikzpicture}[scale=.75]
\tkzDefPoints{0/0/A,6/0/B,0.8/4/C}
- \tkzDefSpcTriangle[intouch,name=x](A,B,C){a,b,c}
+ \tkzDefSpcTriangle[intouch,name=X](A,B,C){_a,_b,_c}
\tkzInCenter(A,B,C)\tkzGetPoint{I}
\tkzDrawPolygon[red](A,B,C)
- \tkzDrawPolygon[blue](xa,xb,xc)
+ \tkzDrawPolygon[blue](X_a,X_b,X_c)
\tkzDrawPoints[red](A,B,C)
- \tkzDrawPoints[blue](xa,xb,xc)
+ \tkzDrawPoints[blue](X_a,X_b,X_c)
\tkzDrawCircle[in](A,B,C)
\tkzAutoLabelPoints[center=I,blue,font=\scriptsize]%
-(xa,xb,xc)
+(X_a,X_b,X_c)
\tkzAutoLabelPoints[center=I,red,font=\scriptsize]%
(A,B,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.5.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.5.tex
new file mode 100644
index 0000000000..64101af4cd
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.5.tex
@@ -0,0 +1,33 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 120 (Section 16.0.5 : Option \tkzname{extouch})
+
+\begin{tikzpicture}[scale=.7]
+\tkzDefPoints{0/0/A,6/0/B,0.8/4/C}
+\tkzDefSpcTriangle[excentral,
+ name=J](A,B,C){_a,_b,_c}
+\tkzDefSpcTriangle[extouch,
+ name=T](A,B,C){_a,_b,_c}
+\tkzDefTriangleCenter[nagel](A,B,C)
+\tkzGetPoint{N_a}
+\tkzDefTriangleCenter[centroid](A,B,C)
+\tkzGetPoint{G}
+\tkzDrawPoints[blue](J_a,J_b,J_c)
+\tkzClipBB \tkzShowBB
+\tkzDrawCircles[gray](J_a,T_a J_b,T_b J_c,T_c)
+\tkzDrawLines[add=1 and 1](A,B B,C C,A)
+\tkzDrawSegments[gray](A,T_a B,T_b C,T_c)
+\tkzDrawSegments[gray](J_a,T_a J_b,T_b J_c,T_c)
+\tkzDrawPolygon[blue](A,B,C)
+\tkzDrawPolygon[red](T_a,T_b,T_c)
+\tkzDrawPoints(A,B,C,N_a)
+\tkzLabelPoints(N_a)
+\tkzAutoLabelPoints[center=Na,blue](A,B,C)
+\tkzAutoLabelPoints[center=G,red,
+ dist=.4](T_a,T_b,T_c)
+\tkzMarkRightAngles[fill=gray!15](J_a,T_a,B
+ J_b,T_b,C J_c,T_c,A)
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-6.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.6.tex
index 82ae803be6..544dfe303c 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-6.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.6.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 103 (Section 17.0.6 : Option : "feuerbach")
+% Ex. No. 121 (Section 16.0.6 : Option \tkzname{feuerbach})
\begin{tikzpicture}[scale=1]
\tkzDefPoint(0,0){A}
@@ -24,4 +24,4 @@
font=\scriptsize](A,B,C,F_a,F_b,F_c,J_a,J_b,J_c)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-7.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.7.tex
index b71f602432..0a75442e52 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-7.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.7.tex
@@ -1,21 +1,21 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 104 (Section 17.0.7 : Option Triangle "tangential")
+% Ex. No. 122 (Section 16.0.7 : Option \tkzname{tangential})
\begin{tikzpicture}[scale=.5,rotate=80]
\tkzDefPoints{0/0/A,6/0/B,1.8/4/C}
\tkzDefSpcTriangle[tangential,
- name=T](A,B,C){a,b,c}
+ name=T](A,B,C){_a,_b,_c}
\tkzDrawPolygon[red](A,B,C)
- \tkzDrawPolygon[blue](Ta,Tb,Tc)
+ \tkzDrawPolygon[blue](T_a,T_b,T_c)
\tkzDrawPoints[red](A,B,C)
- \tkzDrawPoints[blue](Ta,Tb,Tc)
+ \tkzDrawPoints[blue](T_a,T_b,T_c)
\tkzDefCircle[circum](A,B,C)
\tkzGetPoint{O}
\tkzDrawCircle(O,A)
\tkzLabelPoints[red](A,B,C)
- \tkzLabelPoints[blue](Ta,Tb,Tc)
+ \tkzLabelPoints[blue](T_a,T_b,T_c)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-8.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.8.tex
index d5041da322..617b36b119 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-8.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.8.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 105 (Section 17.0.8 : Option Triangle "euler")
+% Ex. No. 123 (Section 16.0.8 : Option \tkzname{euler})
\begin{tikzpicture}[rotate=90,scale=1.25]
\tkzDefPoints{0/0/A,6/0/B,0.8/4/C}
@@ -30,4 +30,4 @@
\tkzDrawPolygon[color=red](M_A,M_B,M_C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-2.tex
deleted file mode 100644
index 7d41f95ce8..0000000000
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-2.tex
+++ /dev/null
@@ -1,22 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 99 (Section 17.0.2 : Option : "in" ou "incentral")
-
-\begin{tikzpicture}[scale=1]
- \tkzDefPoints{ 0/0/A,5/0/B,1/3/C}
- \tkzDefSpcTriangle[in,name=I](A,B,C){a,b,c}
- \tkzInCenter(A,B,C)\tkzGetPoint{I}
- \tkzDrawPolygon[red](A,B,C)
- \tkzDrawPolygon[blue](Ia,Ib,Ic)
- \tkzDrawPoints(A,B,C,I,Ia,Ib,Ic)
- \tkzDrawCircle[in](A,B,C)
- \tkzDrawSegments[dashed](A,Ia B,Ib C,Ic)
- \tkzAutoLabelPoints[center=I,blue,font=\scriptsize]%
-(Ia,Ib,Ic)
- \tkzAutoLabelPoints[center=I,red,font=\scriptsize]%
-(A,B,C)
-(A,B,C,Ia,Ib,Ic)
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-3.tex
deleted file mode 100644
index 1a8293accd..0000000000
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-3.tex
+++ /dev/null
@@ -1,21 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 100 (Section 17.0.3 : Option : "ex" ou "Excentral")
-
-\begin{tikzpicture}[scale=.6]
- \tkzDefPoints{0/0/A,6/0/B,0.8/4/C}
- \tkzDefSpcTriangle[excentral,name=J](A,B,C){a,b,c}
- \tkzDefSpcTriangle[extouch,name=T](A,B,C){a,b,c}
- \tkzDrawPolygon[blue](A,B,C)
- \tkzDrawPolygon[red](Ja,Jb,Jc)
- \tkzDrawPoints(A,B,C)
- \tkzDrawPoints[red](Ja,Jb,Jc)
- \tkzLabelPoints(A,B,C)
- \tkzLabelPoints[red](Jb,Jc)
- \tkzLabelPoints[red,above](Ja)
- \tkzClipBB \tkzShowBB
- \tkzDrawCircles[gray](Ja,Ta Jb,Tb Jc,Tc)
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-5.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-5.tex
deleted file mode 100644
index 208bb86297..0000000000
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-5.tex
+++ /dev/null
@@ -1,33 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 102 (Section 17.0.5 : Option : "extouch")
-
-\begin{tikzpicture}[scale=.7]
-\tkzDefPoints{0/0/A,6/0/B,0.8/4/C}
-\tkzDefSpcTriangle[excentral,
- name=J](A,B,C){a,b,c}
-\tkzDefSpcTriangle[extouch,
- name=T](A,B,C){a,b,c}
-\tkzDefTriangleCenter[nagel](A,B,C)
-\tkzGetPoint{Na}
-\tkzDefTriangleCenter[centroid](A,B,C)
-\tkzGetPoint{G}
-\tkzDrawPoints[blue](Ja,Jb,Jc)
-\tkzClipBB \tkzShowBB
-\tkzDrawCircles[gray](Ja,Ta Jb,Tb Jc,Tc)
-\tkzDrawLines[add=1 and 1](A,B B,C C,A)
-\tkzDrawSegments[gray](A,Ta B,Tb C,Tc)
-\tkzDrawSegments[gray](Ja,Ta Jb,Tb Jc,Tc)
-\tkzDrawPolygon[blue](A,B,C)
-\tkzDrawPolygon[red](Ta,Tb,Tc)
-\tkzDrawPoints(A,B,C,Na)
-\tkzLabelPoints(Na)
-\tkzAutoLabelPoints[center=Na,blue](A,B,C)
-\tkzAutoLabelPoints[center=G,red,
- dist=.4](Ta,Tb,Tc)
-\tkzMarkRightAngles[fill=gray!15](Ja,Ta,B
- Jb,Tb,C Jc,Tc,A)
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.1.1.tex
index faead36ac4..13b0caf97b 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-1-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.1.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 106 (Section 18.1.1 : Using \tkzcname{tkzDefSquare} with two points)
+% Ex. No. 124 (Section 17.1.1 : Using \tkzcname{tkzDefSquare} with two points)
\begin{tikzpicture}[scale=.5]
\tkzDefPoint(0,0){A} \tkzDefPoint(3,0){B}
@@ -13,4 +13,4 @@
tkzSecondPointResult)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-1-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.1.2.tex
index 82a8f36d92..d37a9f3526 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-1-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.1.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 107 (Section 18.1.2 : Use of \tkzcname{tkzDefSquare} to obtain an isosceles right-angled triangle)
+% Ex. No. 125 (Section 17.1.2 : Use of \tkzcname{tkzDefSquare} to obtain an isosceles right-angled triangle)
\begin{tikzpicture}[scale=1]
\tkzDefPoint(0,0){A}
@@ -10,4 +10,4 @@
\tkzDrawPolygon[color=blue,fill=blue!30](A,B,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-1-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.1.3.tex
index 915ff3b88a..a767a6b163 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-1-3.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.1.3.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 108 (Section 18.1.3 : Pythagorean Theorem and \tkzcname{tkzDefSquare} )
+% Ex. No. 126 (Section 17.1.3 : Pythagorean Theorem and \tkzcname{tkzDefSquare} )
\begin{tikzpicture}[scale=.5]
\tkzInit
@@ -24,4 +24,4 @@
\tkzLabelSegment[swap](A,B){$c$}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.10.1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.10.1.tex
new file mode 100644
index 0000000000..90e118091e
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.10.1.tex
@@ -0,0 +1,17 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 138 (Section 17.10.1 : Option \tkzname{center})
+
+\begin{tikzpicture}
+ \tkzDefPoints{0/0/P0,0/0/Q0,2/0/P1}
+ \tkzDefMidPoint(P0,P1) \tkzGetPoint{Q1}
+ \tkzDefRegPolygon[center,sides=7](P0,P1)
+ \tkzDefMidPoint(P1,P2) \tkzGetPoint{Q1}
+ \tkzDefRegPolygon[center,sides=7,name=Q](P0,Q1)
+ \tkzDrawPolygon(P1,P...,P7)
+ \tkzFillPolygon[gray!20](Q0,Q1,P2,Q2)
+ \foreach \j in {1,...,7} {\tkzDrawSegment[black](P0,Q\j)}
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.10.2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.10.2.tex
new file mode 100644
index 0000000000..d5b28de5c8
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.10.2.tex
@@ -0,0 +1,12 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 139 (Section 17.10.2 : Option \tkzname{side})
+
+\begin{tikzpicture}[scale=1]
+ \tkzDefPoints{-4/0/A, -1/0/B}
+ \tkzDefRegPolygon[side,sides=5,name=P](A,B)
+ \tkzDrawPolygon[thick](P1,P...,P5)
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-3-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.3.1.tex
index beb81b3d88..ac26e93d44 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-3-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.3.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 109 (Section 18.3.1 : Example of a parallelogram definition)
+% Ex. No. 127 (Section 17.3.1 : Example of a parallelogram definition)
\begin{tikzpicture}[scale=1]
\tkzDefPoints{0/0/A,3/0/B,4/2/C}
@@ -13,4 +13,4 @@
\tkzDrawPoints(A,...,D)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-3-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.3.2.tex
index 1ccd775cd7..4810df86fe 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-3-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.3.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 110 (Section 18.3.2 : Simple example)
+% Ex. No. 128 (Section 17.3.2 : Simple example)
\begin{tikzpicture}[scale=1]
\tkzDefPoints{0/0/A,3/0/B,4/2/C}
@@ -13,4 +13,4 @@
\tkzDrawPoints(A,...,D)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-3-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.3.3.tex
index bd138f15e9..f1562f4e6b 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-3-3.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.3.3.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 111 (Section 18.3.3 : Construction of the golden rectangle )
+% Ex. No. 129 (Section 17.3.3 : Construction of the golden rectangle )
\begin{tikzpicture}[scale=.5]
\tkzInit[xmax=14,ymax=10]
@@ -21,4 +21,4 @@
(E,F C,F B,E)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-4-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.4.1.tex
index 8941995398..2a743b99cb 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-4-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.4.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 112 (Section 18.4.1 : The idea is to inscribe two squares in a semi-circle.)
+% Ex. No. 130 (Section 17.4.1 : The idea is to inscribe two squares in a semi-circle.)
\begin{tikzpicture}[scale=.75]
\tkzInit[ymax=8,xmax=8]
@@ -21,4 +21,4 @@
\tkzDrawPoints(E,G,H,F,J,K,L)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-5-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.5.1.tex
index be38a5cd00..0116bad5b2 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-5-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.5.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 113 (Section 18.5.1 : Golden Rectangles)
+% Ex. No. 131 (Section 17.5.1 : Golden Rectangles)
\begin{tikzpicture}[scale=.6]
\tkzDefPoint(0,0){A} \tkzDefPoint(8,0){B}
@@ -11,4 +11,4 @@
\tkzDrawPolygon[color=blue,fill=blue!20](B,C,E,F)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-6-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.6.1.tex
index 8be32ed78c..b1cb949fdc 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-6-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.6.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 114 (Section 18.6.1 : Draw a polygon 1)
+% Ex. No. 132 (Section 17.6.1 : \tkzcname{tkzDrawPolygon})
\begin{tikzpicture} [rotate=18,scale=1.5]
\tkzDefPoint(0,0){A}
@@ -10,6 +10,7 @@
\tkzDefPoint(-0.75,2){D}
\tkzDrawPolygon[fill=black!50!blue!20!](A,B,C,D)
\tkzDrawSegments[style=dashed](A,C B,D)
-\end{tikzpicture}
-\end{document}
+\end{tikzpicture}\end{tkzexample}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.7.1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.7.1.tex
new file mode 100644
index 0000000000..489e47e509
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.7.1.tex
@@ -0,0 +1,12 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 133 (Section 17.7.1 : Polygonal chain)
+
+\begin{tikzpicture}
+ \tkzDefPoints{0/0/A,6/0/B,3/4/C,2/2/D}
+ \tkzDrawPolySeg(A,...,D)
+ \tkzDrawPoints(A,...,D)
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.7.2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.7.2.tex
new file mode 100644
index 0000000000..b06fc7e181
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.7.2.tex
@@ -0,0 +1,13 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 134 (Section 17.7.2 : Polygonal chain: index notation)
+
+\begin{tikzpicture}
+\foreach \pt in {1,2,...,8} {%
+\tkzDefPoint(\pt*20:3){P_\pt}}
+\tkzDrawPolySeg(P_1,P_...,P_8)
+\tkzDrawPoints(P_1,P_...,P_8)
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-7-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.8.1.tex
index 3045821ae3..3a4d146696 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-7-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.8.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 115 (Section 18.7.1 : Simple Example)
+% Ex. No. 135 (Section 17.8.1 : \tkzcname{tkzClipPolygon})
\begin{tikzpicture}[scale=1.25]
\tkzInit[xmin=0,xmax=4,ymin=0,ymax=3]
@@ -14,4 +14,4 @@
\tkzDrawLine[color=red](D,E)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-7-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.8.2.tex
index 9b070480a7..e16ea98e90 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-7-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.8.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 116 (Section 18.7.2 : Example Sangaku in a square)
+% Ex. No. 136 (Section 17.8.2 : Example: use of "Clip" for Sangaku in a square)
\begin{tikzpicture}[scale=.75]
\tkzDefPoint(0,0){A} \tkzDefPoint(8,0){B}
@@ -24,4 +24,4 @@
\tkzFillCircle[R,color = blue!50!black](F,4 cm)%
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-8-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.9.1.tex
index d1c480a078..97a1e650f1 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-8-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.9.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 117 (Section 18.8.1 : Color a polygon)
+% Ex. No. 137 (Section 17.9.1 : \tkzcname{tkzFillPolygon})
\begin{tikzpicture}[scale=0.7]
\tkzInit[xmin=-3,xmax=6,ymin=-1,ymax=6]
@@ -21,4 +21,4 @@
\tkzLabelAngle[pos = 1.5](A,O,B){$\alpha$}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.1.tex
index b3166a802f..942deb276d 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.1.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 118 (Section 19.1.1 : Example with a random point and the option \tkzimp{through})
+% Ex. No. 140 (Section 18.1.1 : Example with a random point and option \tkzname{through})
- \begin{tikzpicture}[scale=1]
+\begin{tikzpicture}[scale=1]
\tkzDefPoint(0,4){A}
\tkzDefPoint(2,2){B}
\tkzDefMidPoint(A,B) \tkzGetPoint{I}
@@ -18,8 +18,8 @@
\tkzLabelCircle[draw,fill=orange,
text width=3cm,text centered,
font=\scriptsize](A,C)(-90)%
- {La mesure du rayon est :
- \rACpt pt soit \rACcm cm}
+ {The radius measurement is:
+ \rACpt pt i.e. \rACcm cm}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-10.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.10.tex
index ced687050c..a28c539346 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-10.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.10.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 127 (Section 19.1.10 : Orthogonal circle of given center)
+% Ex. No. 149 (Section 18.1.10 : Orthogonal circle of given center)
\begin{tikzpicture}[scale=.75]
\tkzDefPoints{0/0/O,1/0/A}
@@ -18,4 +18,4 @@
\tkzLabelPoints(O,A,B,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.2.tex
index 9238806027..902c9febe2 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.2.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 119 (Section 19.1.2 : Example with the option \tkzimp{diameter})
+% Ex. No. 141 (Section 18.1.2 : Example with option \tkzname{diameter})
- \begin{tikzpicture}[scale=1]
+\begin{tikzpicture}[scale=1]
\tkzDefPoint(0,0){A}
\tkzDefPoint(2,2){B}
\tkzDefCircle[diameter](A,B)
@@ -14,4 +14,4 @@
\tkzLabelPoints(A,B,O)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.3.tex
index cd1e96675e..ca0f59c3a7 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-3.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.3.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 120 (Section 19.1.3 : Circles inscribed and circumscribed for a given triangle)
+% Ex. No. 142 (Section 18.1.3 : Circles inscribed and circumscribed for a given triangle)
\begin{tikzpicture}[scale=1]
\tkzDefPoint(2,2){A}
@@ -19,4 +19,4 @@
\tkzDrawPolygon(A,B,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.4.tex
index 19eb9c017f..866f0be0cd 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-4.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.4.tex
@@ -1,19 +1,19 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 121 (Section 19.1.4 : Example with the option \tkzimp{ex})
+% Ex. No. 143 (Section 18.1.4 : Example with option \tkzname{ex})
\begin{tikzpicture}[scale=.75]
\tkzDefPoints{ 0/0/A,4/0/B,0.8/4/C}
\tkzDefCircle[ex](B,C,A)
- \tkzGetPoint{Jc} \tkzGetLength{rc}
- \tkzDefPointBy[projection=onto A--C ](Jc)
- \tkzGetPoint{Xc}
- \tkzDefPointBy[projection=onto A--B ](Jc)
- \tkzGetPoint{Yc}
+ \tkzGetPoint{J_c} \tkzGetLength{rc}
+ \tkzDefPointBy[projection=onto A--C ](J_c)
+ \tkzGetPoint{X_c}
+ \tkzDefPointBy[projection=onto A--B ](J_c)
+ \tkzGetPoint{Y_c}
\tkzGetPoint{I}
\tkzDrawPolygon[color=blue](A,B,C)
- \tkzDrawCircle[R,color=lightgray](Jc,\rc pt)
+ \tkzDrawCircle[R,color=lightgray](J_c,\rc pt)
% possible \tkzDrawCircle[ex](A,B,C)
\tkzDrawCircle[in,color=red](A,B,C) \tkzGetPoint{I}
\tkzDefPointBy[projection=onto A--C ](I)
@@ -21,12 +21,12 @@
\tkzDefPointBy[projection=onto A--B ](I)
\tkzGetPoint{D}
\tkzDrawLines[add=0 and 2.2,dashed](C,A C,B)
- \tkzDrawSegments[dashed](Jc,Xc I,D I,F Jc,Yc)
- \tkzMarkRightAngles(A,F,I B,D,I Jc,Xc,A Jc,Yc,B)
- \tkzDrawPoints(B,C,A,I,D,F,Xc,Jc,Yc)
- \tkzLabelPoints(B,A,Jc,I,D,Xc,Yc)
+ \tkzDrawSegments[dashed](J_c,X_c I,D I,F J_c,Y_c)
+ \tkzMarkRightAngles(A,F,I B,D,I J_c,X_c,A J_c,Y_c,B)
+ \tkzDrawPoints(B,C,A,I,D,F,X_c,J_c,Y_c)
+ \tkzLabelPoints(B,A,J_c,I,D,X_c,Y_c)
\tkzLabelPoints[above left](C)
\tkzLabelPoints[left](F)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-5.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.5.tex
index 6ba01e0077..d88b2286dd 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-5.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.5.tex
@@ -1,19 +1,19 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 122 (Section 19.1.5 : Euler's circle for a given triangle)
+% Ex. No. 144 (Section 18.1.5 : Euler's circle for a given triangle with option \tkzname{euler})
\begin{tikzpicture}[scale=.75]
\tkzDefPoint(5,3.5){A}
\tkzDefPoint(0,0){B} \tkzDefPoint(7,0){C}
\tkzDefCircle[euler](A,B,C)
\tkzGetPoint{E} \tkzGetLength{rEuler}
- \tkzDefSpcTriangle[medial](A,B,C){Ma,Mb,Mc}
- \tkzDrawPoints(A,B,C,E,Ma,Mb,Mc)
+ \tkzDefSpcTriangle[medial](A,B,C){M_a,M_b,M_c}
+ \tkzDrawPoints(A,B,C,E,M_a,M_b,M_c)
\tkzDrawCircle[R,blue](E,\rEuler pt)
\tkzDrawPolygon(A,B,C)
\tkzLabelPoints[below](B,C)
\tkzLabelPoints[left](A,E)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-6.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.6.tex
index d157b65d28..52fea9194b 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-6.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.6.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 123 (Section 19.1.6 : Coloured Apollonius circles for a given segment)
+% Ex. No. 145 (Section 18.1.6 : Apollonius circles for a given segment option \tkzname{apollonius})
\begin{tikzpicture}[scale=0.75]
\tkzDefPoint(0,0){A}
@@ -20,4 +20,4 @@
\tkzDrawLine[add=.2 and 1](A,B)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-7.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.7.tex
index fb7dca4286..6569fd7e1f 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-7.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.7.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 124 (Section 19.1.7 : Circles exinscribed to a given triangle)
+% Ex. No. 146 (Section 18.1.7 : Circles exinscribed to a given triangle option \tkzname{ex})
\begin{tikzpicture}[scale=.6]
\tkzDefPoint(0,0){A}
@@ -26,4 +26,4 @@
\tkzLabelPoints(A,B,C,I,J,K)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.8.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.8.tex
new file mode 100644
index 0000000000..f228a2c82b
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.8.tex
@@ -0,0 +1,21 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 147 (Section 18.1.8 : Spieker circle with option \tkzname{spieker})
+
+\begin{tikzpicture}[scale=1]
+ \tkzDefPoints{ 0/0/A,4/0/B,0.8/4/C}
+ \tkzDefSpcTriangle[medial](A,B,C){M_a,M_b,M_c}
+ \tkzDefTriangleCenter[spieker](A,B,C)
+ \tkzGetPoint{S_p}
+ \tkzDrawPolygon[blue](A,B,C)
+ \tkzDrawPolygon[red](M_a,M_b,M_c)
+ \tkzDrawPoints[blue](B,C,A)
+ \tkzDrawPoints[red](M_a,M_b,M_c,S_p)
+ \tkzDrawCircle[in,red](M_a,M_b,M_c)
+ \tkzAutoLabelPoints[center=S_p,dist=.3](M_a,M_b,M_c)
+ \tkzLabelPoints[blue,right](S_p)
+ \tkzAutoLabelPoints[center=S_p](A,B,C)
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-9.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.9.tex
index d5bd2678d4..ae4560dbd4 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-9.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.9.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 126 (Section 19.1.9 : Orthogonal circle passing through two given points)
+% Ex. No. 148 (Section 18.1.9 : Orthogonal circle passing through two given points, option \tkzname{orthogonal through})
\begin{tikzpicture}[scale=1]
\tkzDefPoint(0,0){O}
@@ -17,4 +17,4 @@
\tkzLabelPoints(O,A,z1,z2,c)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-8.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-8.tex
deleted file mode 100644
index 21cc8385d4..0000000000
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-8.tex
+++ /dev/null
@@ -1,21 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 125 (Section 19.1.8 : Spieker circle)
-
-\begin{tikzpicture}[scale=1]
- \tkzDefPoints{ 0/0/A,4/0/B,0.8/4/C}
- \tkzDefSpcTriangle[medial](A,B,C){Ma,Mb,Mc}
- \tkzDefTriangleCenter[spieker](A,B,C)
- \tkzGetPoint{Sp}
- \tkzDrawPolygon[blue](A,B,C)
- \tkzDrawPolygon[red](Ma,Mb,Mc)
- \tkzDrawPoints[blue](B,C,A)
- \tkzDrawPoints[red](Ma,Mb,Mc,Sp)
- \tkzDrawCircle[in,red](Ma,Mb,Mc)
- \tkzAutoLabelPoints[center=Sp,dist=.3](Ma,Mb,Mc)
- \tkzLabelPoints[blue,right](Sp)
- \tkzAutoLabelPoints[center=Sp](A,B,C)
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.1.1.tex
index 8e58ae04d4..2c15cf0d30 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-1-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.1.1.tex
@@ -1,17 +1,17 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 131 (Section 20.1.1 : Circles and styles, draw a circle and color the disc)
+% Ex. No. 150 (Section 19.1.1 : Circles and styles, draw a circle and color the disc)
\begin{tikzpicture}
\tkzDefPoint(0,0){O}
\tkzDefPoint(3,0){A}
- \tkzDrawCircle[color=blue,style=dashed](O,A)
+ \tkzDrawCircle[color=blue](O,A)
\tkzDrawCircle[diameter,color=red,%
line width=2pt,fill=red!40,%
opacity=.5](O,A)
- \edef\rayon{\fpeval{exp(1)}}
+ \edef\rayon{\fpeval{0.25*exp(1)}}
\tkzDrawCircle[R,color=orange](O,\rayon cm)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-2-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.2.1.tex
index a5ceb7175f..118dc56778 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-2-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.2.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 132 (Section 20.2.1 : Circles defined by a triangle.)
+% Ex. No. 151 (Section 19.2.1 : Circles defined by a triangle.)
\begin{tikzpicture}
\tkzDefPoint(0,0){A}
@@ -13,4 +13,4 @@
\tkzLabelPoints(A,B,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-2-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.2.2.tex
index ac9c968404..58e454bedb 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-2-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.2.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 133 (Section 20.2.2 : Concentric circles.)
+% Ex. No. 152 (Section 19.2.2 : Concentric circles.)
\begin{tikzpicture}
\tkzDefPoint(0,0){A}
@@ -10,4 +10,4 @@
\tkzLabelPoints(A)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-2-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.2.3.tex
index cf37487d36..6524868899 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-2-3.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.2.3.tex
@@ -1,19 +1,19 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 134 (Section 20.2.3 : Exinscribed circles.)
+% Ex. No. 153 (Section 19.2.3 : Exinscribed circles.)
\begin{tikzpicture}[scale=1]
\tkzDefPoints{0/0/A,4/0/B,1/2.5/C}
\tkzDrawPolygon(A,B,C)
\tkzDefCircle[ex](B,C,A)
-\tkzGetPoint{Jc} \tkzGetSecondPoint{Tc}
+\tkzGetPoint{J_c} \tkzGetSecondPoint{T_c}
\tkzGetLength{rJc}
-\tkzDrawCircle[R](Jc,{\rJc pt})
+\tkzDrawCircle[R](J_c,{\rJc pt})
\tkzDrawLines[add=0 and 1](C,A C,B)
-\tkzDrawSegment(Jc,Tc)
-\tkzMarkRightAngle(Jc,Tc,B)
-\tkzDrawPoints(A,B,C,Jc,Tc)
+\tkzDrawSegment(J_c,T_c)
+\tkzMarkRightAngle(J_c,T_c,B)
+\tkzDrawPoints(A,B,C,J_c,T_c)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.2.4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.2.4.tex
new file mode 100644
index 0000000000..3f9892ed96
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.2.4.tex
@@ -0,0 +1,15 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 154 (Section 19.2.4 : Cardioid)
+
+\begin{tikzpicture}[scale=.5]
+ \tkzDefPoint(0,0){O}
+ \tkzDefPoint(2,0){A}
+ \foreach \ang in {5,10,...,360}{%
+ \tkzDefPoint(\ang:2){M}
+ \tkzDrawCircle(M,A)
+ }
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.3.1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.3.1.tex
new file mode 100644
index 0000000000..c0c88b0874
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.3.1.tex
@@ -0,0 +1,22 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 155 (Section 19.3.1 : Use of \tkzcname{tkzDrawSemiCircle})
+
+\begin{tikzpicture}
+ \tkzDefPoint(0,0){A} \tkzDefPoint(6,0){B}
+ \tkzDefSquare(A,B) \tkzGetPoints{C}{D}
+ \tkzDrawPolygon(B,C,D,A)
+ \tkzDefPoint(3,6){F}
+ \tkzDefTriangle[equilateral](C,D) \tkzGetPoint{I}
+ \tkzDefPointBy[projection=onto B--C](I) \tkzGetPoint{J}
+ \tkzInterLL(D,B)(I,J) \tkzGetPoint{K}
+ \tkzDefPointBy[symmetry=center K](B) \tkzGetPoint{M}
+ \tkzDrawCircle(M,I)
+ \tkzCalcLength(M,I) \tkzGetLength{dMI}
+ \tkzFillPolygon[color = red!50](A,B,C,D)
+ \tkzFillCircle[R,color = yellow](M,\dMI pt)
+ \tkzDrawSemiCircle[fill = blue!50!black](F,D)%
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-4-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.4.1.tex
index 997b49528c..4f7b6999c5 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-4-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.4.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 136 (Section 20.4.1 : Example from a sangaku)
+% Ex. No. 156 (Section 19.4.1 : Example from a sangaku)
\begin{tikzpicture}
\tkzInit[xmin=0,xmax = 6,ymin=0,ymax=6]
@@ -23,4 +23,4 @@
\tkzFillCircle[color = yellow](K,Q)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-5-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.5.1.tex
index 00000d1304..14a93fc7b7 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-5-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.5.1.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 137 (Section 20.5.1 : Example)
+% Ex. No. 157 (Section 19.5.1 : Example)
- \begin{tikzpicture}
+\begin{tikzpicture}
\tkzInit[xmax=5,ymax=5]
\tkzGrid \tkzClip
\tkzDefPoint(0,0){A}
@@ -18,4 +18,4 @@
\tkzDrawCircle[fill=red!20,opacity=.5](C,O)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-6-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.6.1.tex
index d9b0db98a3..7ff97754d8 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-6-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.6.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 138 (Section 20.6.1 : Example)
+% Ex. No. 158 (Section 19.6.1 : Example)
\begin{tikzpicture}
\tkzDefPoint(0,0){O} \tkzDefPoint(2,0){N}
@@ -16,8 +16,8 @@
\tkzFillCircle[color=blue!20,opacity=.4](O,M)
\tkzLabelCircle[R,draw,fill=orange,%
text width=2cm,text centered](O,3 cm)(-60)%
- {Le cercle\\ $\mathcal{C}$}
+ {The circle\\ $\mathcal{C}$}
\tkzDrawPoints(M,P)\tkzLabelPoints[right](M,P)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-2-4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-2-4.tex
deleted file mode 100644
index e0efc4e8a9..0000000000
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-2-4.tex
+++ /dev/null
@@ -1,15 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 135 (Section 20.2.4 : Cardioid)
-
- \begin{tikzpicture}[scale=.5]
- \tkzDefPoint(0,0){O}
- \tkzDefPoint(2,0){A}
- \foreach \ang in {5,10,...,360}{%
- \tkzDefPoint(\ang:2){M}
- \tkzDrawCircle(M,A)
- }
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.1.1.tex
index f65c476c83..c691e75cb7 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-1-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.1.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 139 (Section 21.1.1 : Example of intersection between two straight lines)
+% Ex. No. 159 (Section 20.1.1 : Example of intersection between two straight lines)
\begin{tikzpicture}[rotate=-45,scale=.75]
\tkzDefPoint(2,1){A}
@@ -15,4 +15,4 @@
\tkzDrawPoint[color=red](I)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.2.1.tex
index 0aa2171586..73da7dcf98 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.2.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 140 (Section 21.2.1 : Simple example of a line-circle intersection)
+% Ex. No. 160 (Section 20.2.1 : Simple example of a line-circle intersection)
\begin{tikzpicture}[scale=.75]
\tkzInit[xmax=5,ymax=4]
@@ -17,4 +17,4 @@
\tkzLabelPoints[above right](O,A,B,C,D,E)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.2.2.tex
index 1b1472086b..d54ae9432b 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.2.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 141 (Section 21.2.2 : More complex example of a line-circle intersection)
+% Ex. No. 161 (Section 20.2.2 : More complex example of a line-circle intersection)
\begin{tikzpicture}[scale=.75]
\tkzDefPoint(0,0){A}
@@ -26,4 +26,4 @@
\tkzLabelPoints(A,B,O,O',E,D)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.2.3.tex
index d5e11a7c13..6743c5fe38 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-3.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.2.3.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 142 (Section 21.2.3 : Circle defined by a center and a measure, and special cases)
+% Ex. No. 162 (Section 20.2.3 : Circle defined by a center and a measure, and special cases)
\begin{tikzpicture}[scale=.5]
\tkzDefPoint(0,8){A} \tkzDefPoint(8,0){B}
@@ -19,4 +19,4 @@
\tkzDrawLine(I2,J2)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.2.4.tex
index 3f1f3c7798..b6227cd8c2 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-4.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.2.4.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 143 (Section 21.2.4 : More complex example)
+% Ex. No. 163 (Section 20.2.4 : More complex example)
\begin{tikzpicture}[scale=1.25]
\tkzDefPoint(0,1){J}
@@ -23,4 +23,4 @@
}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-6.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.2.6.tex
index 50a5e0823e..e8516e5c2e 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-6.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.2.6.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 144 (Section 21.2.6 : Calculation of radius dimension 1)
+% Ex. No. 164 (Section 20.2.6 : Calculation of radius example 2)
- \begin{tikzpicture}
+\begin{tikzpicture}
\tkzDefPoint(2,2){A}
\tkzDefPoint(5,4){B}
\tkzDefPoint(4,4){O}
@@ -16,4 +16,4 @@
\tkzDrawLine(I,J)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-7.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.2.7.tex
index e1c50f98dd..c1c56e0d37 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-7.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.2.7.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 145 (Section 21.2.7 : Calculation of radius dimension 2)
+% Ex. No. 165 (Section 20.2.7 : Calculation of radius example 3)
\begin{tikzpicture}
\tkzDefPoints{2/2/A,5/4/B,4/4/0}
@@ -14,4 +14,4 @@
\tkzDrawLine(I,J)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-8.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.2.8.tex
index 1529306d69..43eda622ef 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-8.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.2.8.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 146 (Section 21.2.8 : Squares in half a disc)
+% Ex. No. 166 (Section 20.2.8 : Squares in half a disc)
\begin{tikzpicture}[scale=.75]
\tkzDefPoints{0/0/A,8/0/B,4/0/I}
@@ -19,4 +19,4 @@
\tkzDrawPoints(E,G,H,F,J,K,L)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-9.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.2.9.tex
index f7efc3d2bb..036c15abbc 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-9.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.2.9.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 147 (Section 21.2.9 : Option "with nodes")
+% Ex. No. 167 (Section 20.2.9 : Option "with nodes")
\begin{tikzpicture}[scale=.75]
\tkzDefPoints{0/0/A,4/0/B,1/1/D,2/0/E}
@@ -15,4 +15,4 @@
\tkzDrawLine(F,G)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.3.1.tex
index 8e9d4b6419..aa438fa1ad 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.3.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 148 (Section 21.3.1 : Construction of an equilateral triangle)
+% Ex. No. 168 (Section 20.3.1 : Construction of an equilateral triangle)
\begin{tikzpicture}[trim left=-1cm,scale=.5]
\tkzDefPoint(1,1){A}
@@ -18,4 +18,4 @@
\tkzLabelPoint[above](C){$C$}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.3.2.tex
index 39232148c8..15b25c6def 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.3.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 149 (Section 21.3.2 : Example a mediator)
+% Ex. No. 169 (Section 20.3.2 : Example a mediator)
\begin{tikzpicture}[scale=.5]
\tkzDefPoint(0,0){A}
@@ -14,4 +14,4 @@
\tkzDrawLine[color=red](M,N)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.3.3.tex
index cf947a87ca..867efb1726 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-3.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.3.3.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 150 (Section 21.3.3 : An isosceles triangle.)
+% Ex. No. 170 (Section 20.3.3 : An isosceles triangle.)
\begin{tikzpicture}[rotate=120,scale=.75]
\tkzDefPoint(1,2){A}
@@ -19,4 +19,4 @@
\tkzLabelPoint[above](C){$C$}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.3.4.tex
index 47f624f418..eb95cc825c 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-4.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.3.4.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 151 (Section 21.3.4 : Segment trisection)
+% Ex. No. 171 (Section 20.3.4 : Segment trisection)
\begin{tikzpicture}[scale=.8]
\tkzDefPoint(0,0){A}
@@ -33,4 +33,4 @@
\tkzMarkSegments[mark=s|](A,I I,J J,B)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-6.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.3.5.tex
index 9d8708cf16..c0aa5b0ec3 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-6.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.3.5.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 153 (Section 21.3.6 : with the option \tkzimp{with nodes})
+% Ex. No. 172 (Section 20.3.5 : With the option \tkzimp{with nodes})
\begin{tikzpicture}[scale=.5]
\tkzDefPoints{0/0/a,0/5/B,5/0/C}
@@ -22,4 +22,4 @@
}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-5.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-5.tex
deleted file mode 100644
index 60258c92f8..0000000000
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-5.tex
+++ /dev/null
@@ -1,20 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 152 (Section 21.3.5 : Angle trisection)
-
-\begin{tikzpicture}
- \tikzset{arc/.style={color=gray,style=dashed}}
- \tkzDefPoints{0/0/a,0/5/I,5/0/J}
- \tkzDrawArc[angles](O,I)(0,90)
- \tkzDrawArc[angles,/tikz/arc](I,O)(90,180)
- \tkzDrawArc[angles,/tikz/arc](J,O)(-90,0)
- \tkzInterCC(O,I)(I,O)\tkzGetPoints{B}{C}
- \tkzInterCC(O,I)(J,O)\tkzGetPoints{D}{A}
- \tkzInterCC(I,O)(J,O)\tkzGetPoints{L}{K}
- \tkzDrawPoints(A,B,K)
- \foreach \point in {I,A,B,J,K}{%
- \tkzDrawSegment(O,\point)}
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.1.1.tex
index 8c37a7e617..9d9b3fd65e 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-1-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.1.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 154 (Section 22.1.1 : Exemple avec \tkzname{size})
+% Ex. No. 173 (Section 21.1.1 : Example with \tkzname{size})
\begin{tikzpicture}
\tkzInit
@@ -11,4 +11,4 @@
\tkzDrawPoints(O,A,B)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-1-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.1.2.tex
index 715832f9b8..83c04f5a55 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-1-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.1.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 156 (Section 22.1.2 : Changement de l'ordre des points)
+% Ex. No. 175 (Section 21.1.2 : Changing the order of items)
\begin{tikzpicture}
\tkzInit
@@ -13,4 +13,4 @@
\tkzDrawPoints(O,A,B)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-1-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.1.3.tex
index ebb3dfbb9f..ffe82354cd 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-1-3.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.1.3.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 157 (Section 22.1.3 : Multiples angles)
+% Ex. No. 176 (Section 21.1.3 : Multiples angles)
\begin{tikzpicture}[scale=0.75]
\tkzDefPoint(0,0){B}
@@ -27,4 +27,4 @@
B,M,C M,C,B D,L,N L,N,D N,D,L)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-2-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.2.1.tex
index 51b68f1e22..c184076450 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-2-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.2.1.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 158 (Section 22.2.1 : Exemple avec \tkzname{mark = x})
+% Ex. No. 177 (Section 21.2.1 : Example with \tkzname{mark = x})
- \begin{tikzpicture}[scale=.75]
+\begin{tikzpicture}[scale=.75]
\tkzDefPoints{0/0/O,5/0/A,3/4/B}
\tkzMarkAngle[size = 4cm,mark = x,
arc=ll,mkcolor = red](A,O,B)
@@ -11,4 +11,4 @@
\tkzDrawPoints(O,A,B)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-2-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.2.2.tex
index a8b52efe9b..1c0b86ecb4 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-2-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.2.2.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 159 (Section 22.2.2 : Exemple avec \tkzname{mark =||})
+% Ex. No. 178 (Section 21.2.2 : Example with \tkzname{mark =||})
- \begin{tikzpicture}[scale=.75]
+\begin{tikzpicture}[scale=.75]
\tkzDefPoints{0/0/O,5/0/A,3/4/B}
\tkzMarkAngle[size = 4cm,mark = ||,
arc=ll,mkcolor = red](A,O,B)
@@ -11,4 +11,4 @@
\tkzDrawPoints(O,A,B)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-3-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.3.1.tex
index 47b1752381..31e94ac28f 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-3-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.3.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 161 (Section 22.3.1 : Exemple avec \tkzname{pos})
+% Ex. No. 180 (Section 21.3.1 : Example with \tkzname{pos})
\begin{tikzpicture}[rotate=30]
\tkzDefPoint(2,1){S}
@@ -25,4 +25,4 @@
\tkzLabelAngles[pos = 2.7](T,S,s s,S,P){$30^{\circ}$}%
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-4-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.4.1.tex
index 6ddd6bb111..487190ae1b 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-4-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.4.1.tex
@@ -1,16 +1,16 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 162 (Section 22.4.1 : Exemple de marquage d'un angle droit)
+% Ex. No. 181 (Section 21.4.1 : Example of marking a right angle)
\begin{tikzpicture}
\tkzDefPoints{0/0/A,3/1/B,0.9/-1.2/P}
\tkzDefPointBy[projection = onto B--A](P) \tkzGetPoint{H}
\tkzDrawLines[add=.5 and .5](P,H)
\tkzMarkRightAngle[fill=blue!20,size=.5,draw](A,H,P)
- \tkzDrawPoints[](A,B,P,H)
\tkzDrawLines[add=.5 and .5](A,B)
\tkzMarkRightAngle[fill=red!20,size=.8](B,H,P)
+ \tkzDrawPoints[](A,B,P,H)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-4-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.4.2.tex
index 5e0dcb4a87..5e4a94e15a 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-4-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.4.2.tex
@@ -1,12 +1,11 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 163 (Section 22.4.2 : Exemple de marquage d'un angle droit, german style)
+% Ex. No. 182 (Section 21.4.2 : Example of marking a right angle, german style)
\begin{tikzpicture}
\tkzDefPoints{0/0/A,3/1/B,0.9/-1.2/P}
\tkzDefPointBy[projection = onto B--A](P) \tkzGetPoint{H}
- \pgfresetboundingbox
\tkzDrawLines[add=.5 and .5](P,H)
\tkzMarkRightAngle[german,size=.5,draw](A,H,P)
\tkzDrawPoints[](A,B,P,H)
@@ -14,4 +13,4 @@
\tkzMarkRightAngle[german,size=.8](P,H,B)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-4-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.4.3.tex
index 95ed0f5cc1..68bb020c33 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-4-3.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.4.3.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 164 (Section 22.4.3 : Mélange de styles)
+% Ex. No. 183 (Section 21.4.3 : Mix of styles)
\begin{tikzpicture}[scale=.75]
\tkzDefPoint(0,0){A}
@@ -18,4 +18,4 @@
\tkzDrawPoints(A,B,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-4-4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.4.4.tex
index fb1c7dd8bd..41980c3fe0 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-4-4.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.4.4.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 165 (Section 22.4.4 : Exemple complet)
+% Ex. No. 184 (Section 21.4.4 : Full example)
\begin{tikzpicture}[rotate=-90]
\tkzDefPoint(0,1){A}
@@ -28,4 +28,4 @@
\tkzMarkRightAngle[german](B,P,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-5-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22.2.0.tex
index 913e1f8f7b..1a72d1ac85 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-5-0.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22.2.0.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 89 (Section 11.5 : Exemple d'utilisation de \tkzcname{tkzGetAngle})
+% Ex. No. 185 (Section 22.2 : Example of the use of \tkzcname{tkzGetAngle})
\begin{tikzpicture}
\tkzInit
@@ -20,4 +20,4 @@
\tkzDrawSegments[style=dashed,color=orange!30](A,C A,D)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-7-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22.3.1.tex
index 95d407fc1c..1e3dfaf92c 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-7-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22.3.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 166 (Section 22.7.1 : Vérication de la mesure d'un angle)
+% Ex. No. 186 (Section 22.3.1 : Verification of angle measurement)
\begin{tikzpicture}[scale=.75]
\tkzDefPoint(-1,1){A}
@@ -19,4 +19,4 @@
\tkzMarkAngle[size=1.5cm](B,A,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-7-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22.4.0.tex
index 808b679507..ad152a3e8c 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-7-0.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22.4.0.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 90 (Section 11.7 : Exemple d'utilisation de \tkzcname{tkzFindAngle} )
+% Ex. No. 187 (Section 22.4 : Example of the use of \tkzcname{tkzFindAngle} )
\begin{tikzpicture}
\tkzInit[xmin=-1,ymin=-1,xmax=7,ymax=7]
@@ -24,4 +24,4 @@
\tkzText(1,4){$\widehat{AOD}=\widehat{MBA}=\am^{\circ}$}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-7-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22.4.1.tex
index 7eb4f82bc5..31a340396f 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-7-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22.4.1.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 167 (Section 22.7.2 : Détermination des trois angles d'un triangle)
+% Ex. No. 188 (Section 22.4.1 : Determination of the three angles of a triangle)
- \begin{tikzpicture}[scale=1.25,rotate=30]
+\begin{tikzpicture}[scale=1.25,rotate=30]
\tkzDefPoints{0.5/1.5/A, 3.5/4/B, 6/2.5/C}
\tkzDrawPolygon(A,B,C)
\tkzDrawPoints(A,B,C)
@@ -27,4 +27,4 @@
\tkzLabelAngle[pos = 1](A,B,C){$\angleABC^{\circ}$}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-2-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22.5.0.tex
index 50621b6fa7..6eeffa8a31 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-2-0.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22.5.0.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 87 (Section 11.2 : Déterminer une pente)
+% Ex. No. 189 (Section 22.5 : Determining a slope)
\begin{tikzpicture}[scale=1.5]
\tkzInit[xmax=4,ymax=5]\tkzGrid[sub]
@@ -14,11 +14,11 @@
\tkzFindSlope(A,D){SAD}
\pgfkeys{/pgf/number format/.cd,fixed,precision=2}
\tkzText[fill=Gold!50,draw=brown](1,4)%
- {La pente de (AB) est : $\pgfmathprintnumber{\SAB}$}
+ {The slope of (AB) is : $\pgfmathprintnumber{\SAB}$}
\tkzText[fill=Gold!50,draw=brown](1,3.5)%
- {La pente de (AC) est : $\pgfmathprintnumber{\SAC}$}
+ {The slope of (AC) is : $\pgfmathprintnumber{\SAC}$}
\tkzText[fill=Gold!50,draw=brown](1,3)%
- {La pente de (AD) est : $\pgfmathprintnumber{\SAD}$}
+ {The slope of (AD) is : $\pgfmathprintnumber{\SAD}$}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-8-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22.6.1.tex
index 6f4efbdff2..a29cfe07ec 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-8-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22.6.1.tex
@@ -1,20 +1,24 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 168 (Section 22.8.1 : Pliage)
+% Ex. No. 190 (Section 22.6.1 : Folding)
\begin{tikzpicture}
\tkzDefPoint(1,5){A}
- \tkzDefPoint(5,2){B} \tkzDrawSegment(A,B)
- \tkzFindSlopeAngle(A,B)\tkzGetAngle{tkzang}
+ \tkzDefPoint(5,2){B}
+ \tkzDrawSegment(A,B)
+ \tkzFindSlopeAngle(A,B)
+ \tkzGetAngle{tkzang}
\tkzDefPointBy[rotation= center A angle \tkzang ](B)
\tkzGetPoint{C}
\tkzDefPointBy[rotation= center A angle -\tkzang ](B)
\tkzGetPoint{D}
- \tkzCompass[length=1](A,C)
- \tkzCompass[delta=10](B,C) \tkzDrawPoints(A,B,C,D)
- \tkzLabelPoints(B,C,D) \tkzLabelPoints[above left](A)
+ \tkzCompass[orange,length=1](A,C)
+ \tkzCompass[orange,delta=10](B,C)
+ \tkzDrawPoints(A,B,C,D)
+ \tkzLabelPoints(B,C,D)
+ \tkzLabelPoints[above left](A)
\tkzDrawSegments[style=dashed,color=orange](A,C A,D)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22.6.2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22.6.2.tex
new file mode 100644
index 0000000000..aff651e888
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22.6.2.tex
@@ -0,0 +1,28 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 191 (Section 22.6.2 : Example of the use of \tkzcname{tkzFindSlopeAngle})
+
+\begin{tikzpicture}
+ \tkzInit
+ \tkzDefPoint(0,0){A}
+ \tkzDefPoint(3,2){B}
+ \tkzDefLine[mediator](A,B)
+ \tkzGetPoints{I}{J}
+ \tkzCalcLength[cm](A,B)
+ \tkzGetLength{dAB}
+ \tkzFindSlopeAngle(A,B)
+ \tkzGetAngle{tkzangle}
+ \begin{scope}[rotate=\tkzangle]
+ \tikzset{arc/.style={color=gray,delta=10}}
+ \tkzDrawArc[orange,R,arc](B,3/4*\dAB)(120,240)
+ \tkzDrawArc[orange,R,arc](A,3/4*\dAB)(-45,60)
+ \tkzDrawLine(I,J)
+ \tkzDrawSegment(A,B)
+ \end{scope}
+ \tkzDrawPoints(A,B,I,J)
+ \tkzLabelPoints(A,B)
+ \tkzLabelPoints[right](I,J)
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23.1.1.tex
index 12af0238a8..0839f78e35 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23.1.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 169 (Section 23.1.1 : \tkzcname{tkzDrawSector} et \tkzname{towards})
+% Ex. No. 192 (Section 23.1.1 : \tkzcname{tkzDrawSector} and \tkzname{towards})
\begin{tikzpicture}[scale=1]
\tkzDefPoint(0,0){O}
@@ -13,7 +13,7 @@
\tkzDefPoint(-30:3){A}
\tkzDefPointBy[rotation = center O angle -60](A)
\tkzDrawSector[fill=blue!50](O,tkzPointResult)(A)
-\end{scope}
+ \end{scope}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23.1.2.tex
index a50a6f5099..4e09ef65fd 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23.1.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 170 (Section 23.1.2 : \tkzcname{tkzDrawSector} et \tkzname{rotate})
+% Ex. No. 193 (Section 23.1.2 : \tkzcname{tkzDrawSector} and \tkzname{rotate})
\begin{tikzpicture}[scale=2]
\tkzDefPoint(0,0){O}
@@ -12,4 +12,4 @@
fill=blue!20](O,A)(-30)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23.1.3.tex
index fe10e558cf..a6d6f744e4 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-3.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23.1.3.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 171 (Section 23.1.3 : \tkzcname{tkzDrawSector} et \tkzname{R})
+% Ex. No. 194 (Section 23.1.3 : \tkzcname{tkzDrawSector} and \tkzname{R})
\begin{tikzpicture}[scale=1.25]
\tkzDefPoint(0,0){O}
@@ -16,4 +16,4 @@
fill=red!90](O,2cm)(270,360)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23.1.4.tex
index cf0a6d0315..5ee3aa7053 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-4.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23.1.4.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 172 (Section 23.1.4 : \tkzcname{tkzDrawSector} et \tkzname{R})
+% Ex. No. 195 (Section 23.1.4 : \tkzcname{tkzDrawSector} and \tkzname{R})
\begin{tikzpicture}[scale=1.25]
\tkzDefPoint(0,0){O}
@@ -18,4 +18,4 @@
\tkzLabelPoints[left](O)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-5.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23.1.5.tex
index a53cce0c9a..06517ed645 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-5.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23.1.5.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 173 (Section 23.1.5 : \tkzcname{tkzDrawSector} et \tkzname{R with nodes})
+% Ex. No. 196 (Section 23.1.5 : \tkzcname{tkzDrawSector} and \tkzname{R with nodes})
\begin{tikzpicture} [scale=.5]
\tkzDefPoint(-1,-2){A}
@@ -28,4 +28,4 @@
\tkzLabelAngle[pos=1.5](A,S,B){$\alpha$}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-2-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23.2.1.tex
index cb566d7e1b..af2e378076 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-2-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23.2.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 174 (Section 23.2.1 : \tkzcname{tkzFillSector} et \tkzname{towards})
+% Ex. No. 197 (Section 23.2.1 : \tkzcname{tkzFillSector} and \tkzname{towards})
\begin{tikzpicture}[scale=.6]
\tkzDefPoint(0,0){O}
@@ -13,7 +13,7 @@
\tkzDefPoint(-30:3){A}
\tkzDefPointBy[rotation = center O angle -60](A)
\tkzFillSector[color=blue!50](O,tkzPointResult)(A)
-\end{scope}
+ \end{scope}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-2-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23.2.2.tex
index df408c5272..55adc0d7b8 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-2-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23.2.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 175 (Section 23.2.2 : \tkzcname{tkzFillSector} et \tkzname{rotate})
+% Ex. No. 198 (Section 23.2.2 : \tkzcname{tkzFillSector} and \tkzname{rotate})
\begin{tikzpicture}[scale=1.5]
\tkzDefPoint(0,0){O} \tkzDefPoint(2,2){A}
@@ -9,4 +9,4 @@
\tkzFillSector[rotate,color=blue!20](O,A)(-30)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-3-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23.3.1.tex
index 91c586f5c6..8053d152a0 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-3-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23.3.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 176 (Section 23.3.1 : \tkzcname{tkzClipSector})
+% Ex. No. 199 (Section 23.3.1 : \tkzcname{tkzClipSector})
\begin{tikzpicture}[scale=1.5]
\tkzDefPoint(0,0){O}
@@ -13,8 +13,8 @@
\begin{scope}
\tkzClipSector(O,B)(A)
\draw[fill=gray!20] (-1,0) rectangle (3,3);
-\end{scope}
+ \end{scope}
\tkzDrawPoints(A,B,O)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-1-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.1.0.tex
index b0b2cf7202..251fdfe91e 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-1-0.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.1.0.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 177 (Section 24.1 : \tkzcname{tkzDrawArc} et \tkzname{towards})
+% Ex. No. 200 (Section 24.1 : Option \tkzname{towards})
\begin{tikzpicture}
\tkzDefPoint(0,0){O}
@@ -15,4 +15,4 @@
\tkzLabelPoints[below](O,A,B)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-2-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.2.0.tex
index 84b29c8aff..143f59aeea 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-2-0.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.2.0.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 178 (Section 24.2 : \tkzcname{tkzDrawArc} et \tkzname{towards})
+% Ex. No. 201 (Section 24.2 : Option \tkzname{towards})
\begin{tikzpicture}[scale=1.5]
\tkzDefPoint(0,0){O}
@@ -15,4 +15,4 @@
\tkzLabelPoints[below](O,A,B)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-3-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.3.0.tex
index 93f76879c3..c1b2b4d8e9 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-3-0.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.3.0.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 179 (Section 24.3 : \tkzcname{tkzDrawArc} et \tkzname{rotate})
+% Ex. No. 202 (Section 24.3 : Option \tkzname{rotate})
\begin{tikzpicture}
\tkzDefPoint(0,0){O}
@@ -13,4 +13,4 @@
\tkzLabelPoints[below](O,A,B)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-4-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.4.0.tex
index 5d6510e912..c55b79cd56 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-4-0.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.4.0.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 180 (Section 24.4 : \tkzcname{tkzDrawArc} et \tkzname{R})
+% Ex. No. 203 (Section 24.4 : Option \tkzname{R})
\begin{tikzpicture}
\tkzDefPoints{0/0/O}
@@ -12,4 +12,4 @@
\tkzLabelPoint[below](O){$O$}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-5-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.5.0.tex
index 23ede67eef..3d7b5106b3 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-5-0.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.5.0.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 181 (Section 24.5 : \tkzcname{tkzDrawArc} et \tkzname{R with nodes})
+% Ex. No. 204 (Section 24.5 : Option \tkzname{R with nodes})
\begin{tikzpicture}
\tkzDefPoint(0,0){O}
@@ -11,4 +11,4 @@
\tkzDrawArc[R with nodes](B,\radius pt)(A,O)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-6-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.6.0.tex
index cc9585049e..d4cd3ba9d0 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-6-0.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.6.0.tex
@@ -1,10 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 182 (Section 24.6 : \tkzcname{tkzDrawArc} et \tkzname{delta})
+% Ex. No. 205 (Section 24.6 : Option \tkzname{delta})
\begin{tikzpicture}
- \tkzInit
\tkzDefPoint(0,0){A}
\tkzDefPoint(5,0){B}
\tkzDefPointBy[rotation= center A angle 60](B)
@@ -15,12 +14,12 @@
\tkzDrawSegments(A,B A,D)
\tkzDrawLine(B,D)
\tkzSetUpCompass[color=orange]
- \tkzDrawArc[delta=10](A,B)(C)
- \tkzDrawArc[delta=10](B,C)(A)
- \tkzDrawArc[delta=10](C,D)(D)
+ \tkzDrawArc[orange,delta=10](A,B)(C)
+ \tkzDrawArc[orange,delta=10](B,C)(A)
+ \tkzDrawArc[orange,delta=10](C,D)(D)
\tkzDrawPoints(A,B,C,D)
\tkzLabelPoints(A,B,C,D)
\tkzMarkRightAngle(D,B,A)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.7.0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.7.0.tex
new file mode 100644
index 0000000000..2342487cac
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.7.0.tex
@@ -0,0 +1,24 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 206 (Section 24.7 : Option \tkzname{angles}: example 1)
+
+\begin{tikzpicture}[scale=.75]
+ \tkzDefPoint(0,0){A}
+ \tkzDefPoint(5,0){B}
+ \tkzDefPoint(2.5,0){O}
+ \tkzDefPointBy[rotation=center O angle 60](B)
+ \tkzGetPoint{D}
+ \tkzDefPointBy[symmetry=center D](O)
+ \tkzGetPoint{E}
+ \tkzSetUpLine[color=Maroon]
+ \tkzDrawArc[angles](O,B)(0,180)
+ \tkzDrawArc[angles,](B,O)(100,180)
+ \tkzCompass[delta=20](D,E)
+ \tkzDrawLines(A,B O,E B,E)
+ \tkzDrawPoints(A,B,O,D,E)
+ \tkzLabelPoints(A,B,O,D,E)
+ \tkzMarkRightAngle(O,B,E)
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.8.0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.8.0.tex
new file mode 100644
index 0000000000..44acdc3c22
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.8.0.tex
@@ -0,0 +1,20 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 207 (Section 24.8 : Option \tkzname{angles}: example 2)
+
+\begin{tikzpicture}
+ \tkzDefPoint(0,0){O}
+ \tkzDefPoint(5,0){I}
+ \tkzDefPoint(0,5){J}
+ \tkzInterCC(O,I)(I,O)\tkzGetPoints{B}{C}
+ \tkzInterCC(O,I)(J,O)\tkzGetPoints{D}{A}
+ \tkzInterCC(I,O)(J,O)\tkzGetPoints{L}{K}
+ \tkzDrawArc[angles](O,I)(0,90)
+ \tkzDrawArc[angles,color=gray,style=dashed](I,O)(90,180)
+ \tkzDrawArc[angles,color=gray,style=dashed](J,O)(-90,0)
+ \tkzDrawPoints(A,B,K)
+ \foreach \point in {I,A,B,J,K}{\tkzDrawSegment(O,\point)}
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-1-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25.1.0.tex
index 6c97a27ac7..e451aef646 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-1-0.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25.1.0.tex
@@ -1,17 +1,18 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 85 (Section 11.1 : Dupliquer un segment)
+% Ex. No. 208 (Section 25.1 : Duplicate a segment)
- \begin{tikzpicture}
+\begin{tikzpicture}
\tkzDefPoint(0,0){A}
\tkzDefPoint(2,-3){B}
\tkzDefPoint(2,5){C}
\tkzDrawSegments[red](A,B A,C)
- \tkzDuplicateSegment(A,B)(A,C) \tkzGetPoint{D}
+ \tkzDuplicateSegment(A,B)(A,C)
+ \tkzGetPoint{D}
\tkzDrawSegment[green](A,D)
\tkzDrawPoints[color=red](A,B,C,D)
\tkzLabelPoints[above right=3pt](A,B,C,D)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25.1.1.tex
index 9e9ef3e234..25f1c12349 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-1-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25.1.1.tex
@@ -1,25 +1,24 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 86 (Section 11.1.1 : Proportion d'or avec \tkzcname{tkzDuplicateSegment})
+% Ex. No. 209 (Section 25.1.1 : Proportion of gold with \tkzcname{tkzDuplicateSegment})
\begin{tikzpicture}[rotate=-90,scale=.75]
- \tkzInit[xmax=10,ymax=10]
- \tkzClip[space=1]
\tkzDefPoint(0,0){A}
\tkzDefPoint(10,0){B}
- \tkzDefMidPoint(A,B) \tkzGetPoint{I}
+ \tkzDefMidPoint(A,B)
+ \tkzGetPoint{I}
\tkzDefPointWith[orthogonal,K=-.75](B,A)
- \tkzGetPoint{C}
+ \tkzGetPoint{C}
\tkzInterLC(B,C)(B,I) \tkzGetSecondPoint{D}
\tkzDuplicateSegment(B,D)(D,A) \tkzGetPoint{E}
\tkzInterLC(A,B)(A,E) \tkzGetPoints{N}{M}
- \tkzDrawArc[delta=10](D,E)(B)
- \tkzDrawArc[delta=10](A,M)(E)
+ \tkzDrawArc[orange,delta=10](D,E)(B)
+ \tkzDrawArc[orange,delta=10](A,M)(E)
\tkzDrawLines(A,B B,C A,D)
- \tkzDrawArc[delta=10](B,D)(I)
+ \tkzDrawArc[orange,delta=10](B,D)(I)
\tkzDrawPoints(A,B,D,C,M,I,N)
\tkzLabelPoints(A,B,D,C,M,I,N)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-8-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25.2.1.tex
index 59d9de8751..95f9d4128d 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-8-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25.2.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 91 (Section 11.8.1 : Construction d'un carré au compas)
+% Ex. No. 210 (Section 25.2.1 : Compass square construction)
\begin{tikzpicture}[scale=1]
\tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B}
@@ -19,4 +19,4 @@
\tkzLabelPoints(A,B,C,D)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25.4.1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25.4.1.tex
new file mode 100644
index 0000000000..6a894f4f6e
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25.4.1.tex
@@ -0,0 +1,19 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 211 (Section 25.4.1 : Example)
+
+\begin{tikzpicture}[scale=.5]
+ \tkzDefPoint(0,0){A}
+ \tkzDefPoint(3,-4){B}
+ \tkzDefCircle[through](A,B)
+ \tkzGetLength{rABpt}
+ \tkzpttocm(\rABpt){rABcm}
+ \tkzDrawCircle(A,B)
+ \tkzDrawPoints(A,B)
+ \tkzLabelPoints(A,B)
+ \tkzDrawSegment[dashed](A,B)
+ \tkzLabelSegment(A,B){$\pgfmathprintnumber{\rABcm}$}
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-10-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25.5.1.tex
index 70b18e5c65..9097cd3263 100644
--- a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-10-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25.5.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 93 (Section 11.10.2 : Transfert de coordonnées avec \tkzcname{tkzGetPointCoord})
+% Ex. No. 212 (Section 25.5.1 : Coordinate transfer with \tkzcname{tkzGetPointCoord})
\begin{tikzpicture}
\tkzInit[xmax=5,ymax=3]
@@ -16,4 +16,4 @@
\tkzDrawPoints[color=red](C,D)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25.5.2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25.5.2.tex
new file mode 100644
index 0000000000..96fdfbdef3
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25.5.2.tex
@@ -0,0 +1,18 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 213 (Section 25.5.2 : Sum of vectors with \tkzcname{tkzGetPointCoord})
+
+\begin{tikzpicture}[>=latex]
+ \tkzDefPoint(1,4){a}
+ \tkzDefPoint(3,2){b}
+ \tkzDefPoint(1,1){c}
+ \tkzDrawSegment[->,red](a,b)
+ \tkzGetPointCoord(c){c}
+ \draw[color=blue,->](a) -- ([shift=(b)]\cx,\cy) ;
+ \draw[color=purple,->](b) -- ([shift=(b)]\cx,\cy) ;
+ \tkzDrawSegment[->,blue](a,c)
+ \tkzDrawSegment[->,purple](b,c)
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26.1.1.tex
index 0f008bc0bc..0403f58fc4 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25-1-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26.1.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 183 (Section 25.1.1 : Option \tkzname{length})
+% Ex. No. 214 (Section 26.1.1 : Option \tkzname{length})
\begin{tikzpicture}
\tkzDefPoint(1,1){A}
@@ -14,4 +14,4 @@
\tkzDrawSegments(A,B A,C B,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25-1-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26.1.2.tex
index 746db992e2..54f3c917c6 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25-1-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26.1.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 184 (Section 25.1.2 : Option \tkzname{delta})
+% Ex. No. 215 (Section 26.1.2 : Option \tkzname{delta})
\begin{tikzpicture}
\tkzDefPoint(0,0){A}
@@ -15,4 +15,4 @@
\tkzMarkAngle(A,C,B)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25-2-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26.2.0.tex
index 1cffbd27c4..1083b097b3 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25-2-0.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26.2.0.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 185 (Section 25.2 : Multiples constructions \tkzcname{tkzCompasss})
+% Ex. No. 216 (Section 26.2 : Multiple constructions \tkzcname{tkzCompasss})
\begin{tikzpicture}[scale=.75]
\tkzDefPoint(2,2){A} \tkzDefPoint(5,-2){B}
@@ -19,4 +19,4 @@
\tkzLabelPoints(A,B,C,i,j,D)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25-3-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26.3.1.tex
index 706b2255ca..c9e0c91aae 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25-3-0.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26.3.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 186 (Section 25.3 : Macro de configuration \tkzcname{tkzSetUpCompass})
+% Ex. No. 217 (Section 26.3.1 : Use of \tkzcname{tkzSetUpCompass})
\begin{tikzpicture}[scale=.75,
showbi/.style={bisector,size=2,gap=3}]
@@ -21,4 +21,4 @@
\tkzShowBB
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-27.1.1.tex
index 690427362c..cd5016ccb3 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-1-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-27.1.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 187 (Section 26.1.1 : Exemple de \tkzcname{tkzShowLine} et \tkzname{parallel})
+% Ex. No. 218 (Section 27.1.1 : Example of \tkzcname{tkzShowLine} and \tkzname{parallel})
\begin{tikzpicture}
\tkzDefPoints{-1.5/-0.25/A,1/-0.75/B,-1.5/2/C}
@@ -11,4 +11,4 @@
\tkzDrawLine(C,c) \tkzDrawPoints(A,B,C,c)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-1-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-27.1.2.tex
index edb0c11dd1..60d65e5c59 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-1-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-27.1.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 188 (Section 26.1.2 : Exemple de \tkzcname{tkzShowLine} et \tkzname{perpendicular})
+% Ex. No. 219 (Section 27.1.2 : Example of \tkzcname{tkzShowLine} and \tkzname{perpendicular})
\begin{tikzpicture}
\tkzDefPoints{0/0/A, 3/2/B, 2/2/C}
@@ -9,8 +9,8 @@
\tkzShowLine[perpendicular=through C,K=-.5,gap=3](A,B)
\tkzDefPointBy[projection=onto A--B](c)\tkzGetPoint{h}
\tkzMarkRightAngle[fill=lightgray](A,h,C)
-\tkzDrawLines[add=1 and 1](A,B C,c)
+\tkzDrawLines[add=.5 and .5](A,B C,c)
\tkzDrawPoints(A,B,C,h,c)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-1-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-27.1.3.tex
index cb5639c088..bf15e64e8f 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-1-3.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-27.1.3.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 189 (Section 26.1.3 : Exemple de \tkzcname{tkzShowLine} et \tkzname{bisector})
+% Ex. No. 220 (Section 27.1.3 : Example of \tkzcname{tkzShowLine} and \tkzname{bisector})
\begin{tikzpicture}[scale=1.25]
\tkzDefPoints{0/0/A, 4/2/B, 1/4/C}
@@ -20,4 +20,4 @@
\tkzDrawLines[add=0 and -0.3,color=red!50](A,a B,b)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-1-4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-27.1.4.tex
index 4a90c17713..96dd4c211a 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-1-4.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-27.1.4.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 190 (Section 26.1.4 : Exemple de \tkzcname{tkzShowLine} et \tkzname{mediator})
+% Ex. No. 221 (Section 27.1.4 : Example of \tkzcname{tkzShowLine} and \tkzname{mediator})
\begin{tikzpicture}
\tkzDefPoint(2,2){A}
@@ -14,4 +14,4 @@
\tkzLabelPoints[below =3pt](A,B)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-2-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-27.2.1.tex
index 7a6f39ed3d..e1160c2c2b 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-2-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-27.2.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 191 (Section 26.2.1 : Exemple d'utilisation de \tkzcname{tkzShowTransformation})
+% Ex. No. 222 (Section 27.2.1 : Example of the use of \tkzcname{tkzShowTransformation})
\begin{tikzpicture}[scale=.6]
\tkzDefPoint(0,0){O} \tkzDefPoint(2,-2){A}
@@ -31,4 +31,4 @@
color=red,size=3,gap=-2](C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-2-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-27.2.2.tex
index 5d233157d1..27dedda2cf 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-2-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-27.2.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 192 (Section 26.2.2 : Autre exemple d'utilisation de \tkzcname{tkzShowTransformation})
+% Ex. No. 223 (Section 27.2.2 : Another example of the use of \tkzcname{tkzShowTransformation})
\begin{tikzpicture}[scale=.6]
\tkzDefPoints{0/0/A,8/0/B,3.5/10/I}
@@ -23,4 +23,4 @@
\tkzLabelPoints[below left](M,A)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-27-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-28.1.1.tex
index 674791cac8..8a7b00c1cd 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-27-1-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-28.1.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 193 (Section 27.1.1 : Utilisation de \tkzcname{tkzDefEquiPoints} avec des options)
+% Ex. No. 224 (Section 28.1.1 : Using \tkzcname{tkzDefEquiPoints} with options)
\begin{tikzpicture}
\tkzSetUpCompass[color=purple,line width=1pt]
@@ -18,4 +18,4 @@
\tkzLabelPoints[color=blue](A,B,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-2.tex
deleted file mode 100644
index 3e4d69b6e5..0000000000
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-2.tex
+++ /dev/null
@@ -1,24 +0,0 @@
-\input{preamble-standalone.ltx}
-\begin{document}
-
-% Ex. No. 201 (Section 29.2.2 : Circle and tangent)
-
-\begin{tikzpicture}
- \edef\alphaR{\fpeval{asin(2/3)}}
- \edef\xB{8-3*cos(\alphaR)}
- \tkzDrawX[noticks,label=$(d)$]
- \tkzDefPoint["$A$" above right](8,2){A}
- \tkzDefPoint[color=red,"$O$" above right](0,0){O}
- \tkzDefPoint["$B$" above left](\xB,4){B}
- \tkzDefLine[orthogonal=through B](A,B) \tkzGetPoint{b}
- \tkzDefPoint(1,0){i}
- \tkzInterLL(B,b)(O,i) \tkzGetPoint{B'}
- \tkzDrawSegment[line width=1pt](A,B)
- \tkzHLine[color=red,style=dashed]{4}
- \tkzText[above](12,4){$\delta$}
- \tkzDrawCircle[R,color=blue,line width=.8pt](A,3 cm)
- \tkzDrawPoint(B')
- \tkzDrawLine(B,B')
-\end{tikzpicture}
-
-\end{document}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-28-1-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29.1.0.tex
index 0a4e8657e4..6e0803cb62 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-28-1-0.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29.1.0.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 194 (Section 28.1 : Le rapporteur circulaire)
+% Ex. No. 225 (Section 29.1 : The circular protractor)
\begin{tikzpicture}[scale=.5]
\tkzDefPoint(2,0){A}\tkzDefPoint(0,0){O}
@@ -13,4 +13,4 @@
\tkzProtractor[scale = 1](A,B)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-28-2-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29.2.0.tex
index ba0005a4fc..d39457cf57 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-28-2-0.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29.2.0.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 195 (Section 28.2 : Le rapporteur circulaire, transparent et retourné)
+% Ex. No. 226 (Section 29.2 : The circular protractor, transparent and returned)
\begin{tikzpicture}[scale=.5]
\tkzDefPoint(2,3){A}
@@ -11,4 +11,4 @@
\tkzProtractor[return](A,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-1-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.1.2.tex
index 57fc3d3ef4..1b7d2216ba 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-1-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.1.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 196 (Section 29.1.2 : version revue "Tangente")
+% Ex. No. 227 (Section 30.1.2 : Revised version of "Tangente")
\begin{tikzpicture}[scale=.8,rotate=60]
\tkzDefPoint(6,0){X} \tkzDefPoint(3,3){Y}
@@ -21,4 +21,4 @@
\tkzLabelPoints(A,B,C,Z) \tkzLabelPoints[above right](X,Y,O)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-1-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.1.3.tex
index 82e98b1c95..9d4e24c0ba 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-1-3.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.1.3.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 197 (Section 29.1.3 : version "Le Monde")
+% Ex. No. 228 (Section 30.1.3 : "Le Monde" version)
\begin{tikzpicture}[scale=1.25]
\tkzDefPoint(0,0){A}
@@ -25,4 +25,4 @@
\tkzLabelPoints[above right](X,Y,M,I)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-1-4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.1.4.tex
index 9b70cff832..e2c28fa15d 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-1-4.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.1.4.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 198 (Section 29.1.4 : Hauteurs d'un triangle)
+% Ex. No. 229 (Section 30.1.4 : Triangle altitudes)
\begin{tikzpicture}[scale=.8]
\tkzDefPoint(0,0){C}
@@ -28,4 +28,4 @@
\tkzLabelPoints(A,B,C,A',B',C',H)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-1-5.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.1.5.tex
index 5a32879967..68bedb7537 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-1-5.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.1.5.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 199 (Section 29.1.5 : Hauteurs - autre construction)
+% Ex. No. 230 (Section 30.1.5 : Altitudes - other construction)
\begin{tikzpicture}[scale=.75]
\tkzDefPoint(0,0){A}
@@ -30,4 +30,4 @@
\tkzDrawPoints[color=brown](O,A,B,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.1.tex
index c673e80b66..e701c79437 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 200 (Section 29.2.1 : Square root of the integers )
+% Ex. No. 231 (Section 30.2.1 : Square root of the integers)
\begin{tikzpicture}[scale=1.5]
\tkzDefPoint(0,0){O}
@@ -13,4 +13,4 @@
\tkzDrawPolySeg[color=blue](a\i,a\j,O)}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-11.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.10.tex
index b5717e72ce..7ae1ec1a7f 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-11.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.10.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 210 (Section 29.2.11 : Another example from Indonesia)
+% Ex. No. 240 (Section 30.2.10 : Example 2: from Indonesia)
- \begin{tikzpicture}[pol/.style={fill=brown!40,opacity=.5},
+\begin{tikzpicture}[pol/.style={fill=brown!40,opacity=.5},
seg/.style={tkzdotted,color=gray},
hidden pt/.style={fill=gray!40},
mra/.style={color=gray!70,tkzdotted,/tkzrightangle/size=.2},
@@ -55,4 +55,4 @@
\tkzLabelPoints[below left](K)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-12.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.11.tex
index 9d59631303..936ce71654 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-12.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.11.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 211 (Section 29.2.12 : Three circles)
+% Ex. No. 241 (Section 30.2.11 : Three circles)
\begin{tikzpicture}[scale=1.5]
\tkzDefPoints{0/0/A,8/0/B,0/4/a,8/4/b,8/8/c}
@@ -36,4 +36,4 @@
\tkzDrawSegments[gray,dashed](C,M A,N B,P M,a M,b A,a a,b b,B A,D Ia,ha)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-13.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.12.tex
index 1a6f14bfb8..8be2c168cd 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-13.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.12.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 212 (Section 29.2.13 : "The" Circle of APOLLONIUS)
+% Ex. No. 242 (Section 30.2.12 : "The" Circle of APOLLONIUS)
- \begin{tikzpicture}[scale=.5]
+\begin{tikzpicture}[scale=.5]
\tkzDefPoints{0/0/A,6/0/B,0.8/4/C}
\tkzDefTriangleCenter[euler](A,B,C) \tkzGetPoint{N}
\tkzDefTriangleCenter[circum](A,B,C) \tkzGetPoint{O}
@@ -47,4 +47,4 @@
\tkzLabelPoints[above](K,O)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.2.tex
index 5e34acb890..f70246491f 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-3.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.2.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 202 (Section 29.2.3 : About right triangle)
+% Ex. No. 232 (Section 30.2.2 : About right triangle)
-\begin{tikzpicture}
+\begin{tikzpicture}[scale=.5]
\tkzDefPoint["$A$" left](2,1){A}
\tkzDefPoint(6,4){B}
\tkzDrawSegment(A,B)
@@ -19,4 +19,4 @@
\tkzDrawLine[color=gray,style=dashed](A,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.3.tex
index 9043a7862f..3d67985882 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-4.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.3.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 203 (Section 29.2.4 : Archimedes)
+% Ex. No. 233 (Section 30.2.3 : Archimedes)
\begin{tikzpicture}[scale=1.25]
\tkzDefPoint(0,0){A}\tkzDefPoint(6,0){D}
@@ -21,4 +21,4 @@
\tkzMarkSegment[pos=.25,mark=s|](C,D) \tkzMarkSegment[pos=.75,mark=s|](C,D)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-5.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.4.tex
index 3c691fd04e..ce6746584f 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-5.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.4.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 204 (Section 29.2.5 : Exemple : Dimitris Kapeta)
+% Ex. No. 234 (Section 30.2.4 : Example: Dimitris Kapeta)
\begin{tikzpicture}[scale=1.25]
\tkzDefPoint(0,0){O}
@@ -25,4 +25,4 @@
\tkzLabelPoint[below left](A'){$A'$}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-6.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.5.tex
index e3e2f35be1..c2ba7d9aa6 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-6.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.5.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 205 (Section 29.2.6 : Example : John Kitzmiller )
+% Ex. No. 235 (Section 30.2.5 : Example 1: John Kitzmiller )
\begin{tikzpicture}[scale=2]
\tkzDefPoint[label=below left:A](0,0){A}
@@ -16,18 +16,21 @@
\tkzInterLL(B,B')(A,A') \tkzGetPoint{L}
\tkzLabelPoint[above](C){C}
\tkzDrawPolygon(A,B,C) \tkzDrawSegments(A,J B,L C,K)
- \tkzMarkAngles[fill= orange,size=1cm,opacity=.3](J,A,C K,C,B L,B,A)
- \tkzLabelPoint[right](J){J}
- \tkzLabelPoint[below](K){K}
- \tkzLabelPoint[above left](L){L}
- \tkzMarkAngles[fill=orange, opacity=.3,thick,size=1,](A,C,J C,B,K B,A,L)
- \tkzMarkAngles[fill=green, size=1, opacity=.5](A,C,J C,B,K B,A,L)
+ \tkzMarkAngles[size=1 cm](J,A,C K,C,B L,B,A)
+ \tkzMarkAngles[thick,size=1 cm](A,C,J C,B,K B,A,L)
+ \tkzMarkAngles[opacity=.5](A,C,J C,B,K B,A,L)
+ \tkzFillAngles[fill= orange,size=1 cm,opacity=.3](J,A,C K,C,B L,B,A)
+ \tkzFillAngles[fill=orange, opacity=.3,thick,size=1,](A,C,J C,B,K B,A,L)
+ \tkzFillAngles[fill=green, size=1, opacity=.5](A,C,J C,B,K B,A,L)
\tkzFillPolygon[color=yellow, opacity=.2](J,A,C)
\tkzFillPolygon[color=yellow, opacity=.2](K,B,C)
\tkzFillPolygon[color=yellow, opacity=.2](L,A,B)
\tkzDrawSegments[line width=3pt,color=cyan,opacity=0.4](A,J C,K B,L)
\tkzDrawSegments[line width=3pt,color=red,opacity=0.4](A,L B,K C,J)
\tkzMarkSegments[mark=o](J,K K,L L,J)
+ \tkzLabelPoint[right](J){J}
+ \tkzLabelPoint[below](K){K}
+ \tkzLabelPoint[above left](L){L}
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-7.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.6.tex
index 16133d1b7d..953da4ee5d 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-7.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.6.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 206 (Section 29.2.7 : Exemple : John Kitzmiller )
+% Ex. No. 236 (Section 30.2.6 : Example 2: John Kitzmiller )
\begin{tikzpicture}[scale=2,decoration={markings,
mark=at position 3cm with {\arrow[scale=2]{>}}}]
@@ -23,4 +23,4 @@
\tkzDrawSegments[color=magenta, line width=3pt, opacity=0.4](D,F)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-8.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.7.tex
index 7314c830de..824a01e5dd 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-8.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.7.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 207 (Section 29.2.8 : Exemple : John Kitzmiller )
+% Ex. No. 237 (Section 30.2.7 : Example 3: John Kitzmiller )
\begin{tikzpicture}[scale=2]
\tkzDefPoints{0/0/B, 5/0/D} \tkzDefPoint(70:3){A}
@@ -13,19 +13,22 @@
\begin{scope}[decoration={markings,
mark=at position .5 with {\arrow[scale=2]{>}}}]
\tkzDrawSegments[postaction={decorate},dashed](C,A P,B)
-\end{scope}
+ \end{scope}
\tkzDrawSegment(A,C) \tkzDrawSegment[style=dashed](A,P)
\tkzLabelPoints[below](B,C,D) \tkzLabelPoints[above](A,P)
\tkzDrawSegments[color=magenta, line width=3pt, opacity=0.4](B,C P,A)
\tkzDrawSegments[color=teal, line width=3pt, opacity=0.4](C,D A,D)
\tkzDrawSegments[color=magenta, line width=3pt, opacity=0.4](A,B)
- \tkzMarkAngles[size=0.7](B,A,C C,A,D)
- \tkzMarkAngles[size=0.7, fill=green, opacity=0.5](B,A,C A,B,P)
- \tkzMarkAngles[size=0.7, fill=yellow, opacity=0.3](B,P,A C,A,D)
- \tkzMarkAngles[size=0.7, fill=green, opacity=0.6](B,A,C A,B,P B,P,A C,A,D)
+ \tkzMarkAngles[size=3mm](B,A,C C,A,D)
+ \tkzMarkAngles[size=3mm](B,A,C A,B,P)
+ \tkzMarkAngles[size=3mm](B,P,A C,A,D)
+ \tkzMarkAngles[size=3mm](B,A,C A,B,P B,P,A C,A,D)
+ \tkzFillAngles[fill=green, opacity=0.5](B,A,C A,B,P)
+ \tkzFillAngles[fill=yellow, opacity=0.3](B,P,A C,A,D)
+ \tkzFillAngles[fill=green, opacity=0.6](B,A,C A,B,P B,P,A C,A,D)
\tkzLabelAngle[pos=1](B,A,C){1} \tkzLabelAngle[pos=1](C,A,D){2}
\tkzLabelAngle[pos=1](A,B,P){3} \tkzLabelAngle[pos=1](B,P,A){4}
\tkzMarkSegments[mark=|](A,B A,P)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-9.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.8.tex
index 350113e117..1717f0cfc6 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-9.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.8.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 208 (Section 29.2.9 : Exemple : author John Kitzmiller )
+% Ex. No. 238 (Section 30.2.8 : Example 4: author John Kitzmiller )
\begin{tikzpicture}[scale=2]
\tkzDefPoint(0,3){A} \tkzDefPoint(6,3){E} \tkzDefPoint(1.35,3){B}
@@ -11,10 +11,14 @@
\tkzFillPolygon[yellow, opacity=0.4](D,F,C)
\tkzFillPolygon[blue, opacity=0.3](A,B,G)
\tkzFillPolygon[blue, opacity=0.3](E,D,F)
- \tkzMarkAngles[size=0.6,fill=green](B,G,A D,F,E)
- \tkzMarkAngles[size=0.6,fill=orange](B,C,G D,C,F)
- \tkzMarkAngles[size=0.6,fill=yellow](G,B,C F,D,C)
- \tkzMarkAngles[size=0.6,fill=red](A,B,G E,D,F)
+ \tkzMarkAngles[size=0.5 cm](B,G,A D,F,E)
+ \tkzMarkAngles[size=0.5 cm](B,C,G D,C,F)
+ \tkzMarkAngles[size=0.5 cm](G,B,C F,D,C)
+ \tkzMarkAngles[size=0.5 cm](A,B,G E,D,F)
+ \tkzFillAngles[size=0.5 cm,fill=green](B,G,A D,F,E)
+ \tkzFillAngles[size=0.5 cm,fill=orange](B,C,G D,C,F)
+ \tkzFillAngles[size=0.5 cm,fill=yellow](G,B,C F,D,C)
+ \tkzFillAngles[size=0.5 cm,fill=red](A,B,G E,D,F)
\tkzMarkSegments[mark=|](B,C D,C) \tkzMarkSegments[mark=s||](G,C F,C)
\tkzMarkSegments[mark=o](A,G E,F) \tkzMarkSegments[mark=s](B,G D,F)
\tkzDrawSegment[color=red](A,E)
@@ -23,4 +27,4 @@
\tkzLabelPoints[below](C,D,E,G) \tkzLabelPoints[above](A,B,F)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-10.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.9.tex
index 86353f826f..70825cb132 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-10.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.9.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 209 (Section 29.2.10 : Example from Indonesia)
+% Ex. No. 239 (Section 30.2.9 : Example 1: from Indonesia)
\begin{tikzpicture}[scale=3]
\tkzDefPoints{0/0/A,2/0/B}
@@ -20,4 +20,4 @@
\tkzMarkRightAngles(D,A,B D,G,F)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31.1.1.tex
index 65261c69a5..58fa13558b 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-1-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31.1.1.tex
@@ -1,9 +1,10 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 213 (Section 30.1.1 : Example 1 change line width)
+% Ex. No. 243 (Section 31.1.1 : Example 1: change line width)
\begin{tikzpicture}
+ \tkzSetUpLine[color=blue,line width=1pt]
\begin{scope}[rotate=-90]
\tkzDefPoint(10,6){C}
\tkzDefPoint( 0,6){A}
@@ -15,7 +16,6 @@
\tkzMarkRightAngle[size=.4,fill=red!20](B,H,C)
\tkzDrawSegment[color=red](C,H)
\end{scope}
- \tkzSetUpLine[color=blue,line width=1pt]
\tkzLabelSegment[below](C,B){$a$}
\tkzLabelSegment[right](A,C){$b$}
\tkzLabelSegment[left](A,B){$c$}
@@ -26,4 +26,4 @@
\tkzLabelPoints[above](A)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-1-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31.1.2.tex
index ce3f561f2e..f7978fd5d9 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-1-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31.1.2.tex
@@ -1,27 +1,27 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 214 (Section 30.1.2 : Example 2 change style of line)
+% Ex. No. 244 (Section 31.1.2 : Example 2: change style of line)
\begin{tikzpicture}[scale=.6]
\tkzDefPoint(1,0){A} \tkzDefPoint(4,0){B}
\tkzDefPoint(1,1){C} \tkzDefPoint(5,1){D}
\tkzDefPoint(1,2){E} \tkzDefPoint(6,2){F}
\tkzDefPoint(0,4){A'}\tkzDefPoint(3,4){B'}
- \tkzDrawSegments(A,B C,D E,F)
- \tkzDrawLine(A',B')
- \tkzSetUpLine[style=dashed,color=gray]
- \tkzCompass(A',B')
\tkzCalcLength[cm](C,D) \tkzGetLength{rCD}
- \tkzDrawCircle[R](A',\rCD cm)
\tkzCalcLength[cm](E,F) \tkzGetLength{rEF}
- \tkzDrawCircle[R](B',\rEF cm)
\tkzInterCC[R](A',\rCD cm)(B',\rEF cm)
\tkzGetPoints{I}{J}
- \tkzSetUpLine[color=red] \tkzDrawLine(A',B')
+ \tkzSetUpLine[style=dashed,color=gray]
+ \tkzDrawLine(A',B')
+ \tkzCompass(A',B')
+ \tkzDrawSegments(A,B C,D E,F)
+ \tkzDrawCircle[R](A',\rCD cm)
+ \tkzDrawCircle[R](B',\rEF cm)
+ \tkzSetUpLine[color=red]
\tkzDrawSegments(A',I B',I)
\tkzDrawPoints(A,B,C,D,E,F,A',B',I,J)
\tkzLabelPoints(A,B,C,D,E,F,A',B',I,J)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-1-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31.1.3.tex
index 0452f420a3..34476f6d05 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-1-3.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31.1.3.tex
@@ -1,12 +1,12 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 215 (Section 30.1.3 : Example 3 extend lines)
+% Ex. No. 245 (Section 31.1.3 : Example 3: extend lines)
- \begin{tikzpicture}
+\begin{tikzpicture}
\tkzSetUpLine[add=.5 and .5]
\tkzDefPoints{0/0/A,4/0/B,1/3/C}
\tkzDrawLines(A,B B,C A,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-2-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31.2.1.tex
index 1472372575..1b599cde55 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-2-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31.2.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 216 (Section 30.2.1 : use of\tkzcname{tkzSetUpPoint})
+% Ex. No. 246 (Section 31.2.1 : Use of \tkzcname{tkzSetUpPoint})
\begin{tikzpicture}
\tkzSetUpPoint[shape = cross out,color=blue]
@@ -12,4 +12,4 @@
\tkzDrawPoints(A,B)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-2-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31.2.2.tex
index 313205c831..73cd6a54c9 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-2-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31.2.2.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 217 (Section 30.2.2 : use of\tkzcname{tkzSetUpPoint} inside a group)
+% Ex. No. 247 (Section 31.2.2 : Use of \tkzcname{tkzSetUpPoint} inside a group)
- \begin{tikzpicture}
+\begin{tikzpicture}
\tkzInit[ymin=-0.5,ymax=3,xmin=-0.5,xmax=7]
\tkzDefPoint(0,0){A}
\tkzDefPoint(02.25,04.25){B}
@@ -20,4 +20,4 @@
\tkzLabelPoints(A,B,C,D)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-3-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31.3.1.tex
index 3b30aef8e2..6c94964942 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-3-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31.3.1.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 218 (Section 30.3.1 : use of\tkzcname{tkzSetUpCompass} with bisector)
+% Ex. No. 248 (Section 31.3.1 : Use of \tkzcname{tkzSetUpCompass} with bisector)
- \begin{tikzpicture}[scale=0.75]
+\begin{tikzpicture}[scale=0.75]
\tkzDefPoints{0/1/A, 8/3/B, 3/6/C}
\tkzDrawPolygon(A,B,C)
\tkzSetUpCompass[color=red,line width=.2 pt]
@@ -13,9 +13,9 @@
\tkzShowLine[bisector,size=2,gap=3](A,C,B)
\tkzShowLine[bisector,size=2,gap=3](B,A,C)
\tkzShowLine[bisector,size=1,gap=2](C,B,A)
- \tkzDrawLines[add=0 and 0 ](B,b C,c)
- \tkzDrawLine[add=0 and -.4 ](A,a)
+ \tkzDrawLines[add=0 and 0 ](B,b)
+ \tkzDrawLines[add=0 and -.4 ](A,a C,c)
\tkzLabelPoints(A,B) \tkzLabelPoints[above](C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-3-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31.3.2.tex
index a09172bba7..d0770c2c93 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-3-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31.3.2.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 219 (Section 30.3.2 : Another example of of\tkzcname{tkzSetUpCompass})
+% Ex. No. 249 (Section 31.3.2 : Another example of of\tkzcname{tkzSetUpCompass})
- \begin{tikzpicture}[scale=1,rotate=90]
+\begin{tikzpicture}[scale=1,rotate=90]
\tkzDefPoints{0/1/A, 8/3/B, 3/6/C}
\tkzDrawPolygon(A,B,C)
\tkzSetUpCompass[color=brown,
@@ -20,7 +20,7 @@
\tkzDrawLines[add=0 and 0,color=red](B,b)
\tkzShowLine[bisector,size=2,gap=3](B,A,C)
\tkzShowLine[bisector,size=1,gap=3](C,B,A)
- \tkzLabelPoints(A,B,C)
+ \tkzLabelPoints(A,B)\tkzLabelPoints[left](C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-4-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31.4.0.tex
index 149bdfe307..f7594210cd 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-4-0.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31.4.0.tex
@@ -1,13 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 220 (Section 30.4 : Own style)
+% Ex. No. 250 (Section 31.4 : Own style)
-\tkzSetUpPoint[color=blue!50!white, fill=gray!20!red!50!white]
-\tikzset{/tikz/mystyle/.style={
- color=blue!20!black,
- fill=blue!20}}
- \begin{tikzpicture}
+\begin{tikzpicture}
\tkzDefPoint(0,0){O}
\tkzDefPoint(0,1){A}
\tkzDrawPoints(O) % general style
@@ -15,4 +11,4 @@
\tkzLabelPoints(O,A)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31-2-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-32.2.0.tex
index b60291f277..99cf75ec36 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31-2-0.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-32.2.0.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 221 (Section 31.2 : \tkzcname{tkzInit} et \tkzcname{tkzShowBB})
+% Ex. No. 251 (Section 32.2 : \tkzcname{tkzInit} and \tkzcname{tkzShowBB})
\begin{tikzpicture}
\tkzInit[xmin=-1,xmax=3,ymin=-1, ymax=3]
@@ -9,4 +9,4 @@
\tkzShowBB[red,line width=2pt]
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31-3-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-32.3.0.tex
index 62f5ee84a1..d64141c801 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31-3-0.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-32.3.0.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 222 (Section 31.3 : \tkzcname{tkzClip})
+% Ex. No. 252 (Section 32.3 : \tkzcname{tkzClip})
\begin{tikzpicture}
\tkzInit[xmax=4, ymax=3]
@@ -11,4 +11,4 @@
\draw[red] (-1,-1)--(5,2);
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31-4-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-32.4.0.tex
index 30ec471939..be93fea5d0 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31-4-0.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-32.4.0.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 223 (Section 31.4 : \tkzcname{tkzClip} et l'option \tkzname{space})
+% Ex. No. 253 (Section 32.4 : \tkzcname{tkzClip} and the option \tkzname{space})
\begin{tikzpicture}
\tkzInit[xmax=4, ymax=3]
@@ -11,4 +11,4 @@
\draw[red] (-1,-1)--(5,2);
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-0-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.0.0.tex
index 94ab543939..c0de49d5e8 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-0-0.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.0.0.tex
@@ -1,24 +1,24 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 11 (Section 4 : Definition of a point)
+% Ex. No. 21 (Section 4 : Definition of a point)
\begin{tikzpicture}[,scale=1]
\tkzInit[xmax=5,ymax=5]
\tkzDefPoints{0/0/O,1/0/I,0/1/J}
\tkzDefPoint(40:4){P}
\tkzDrawXY[noticks,>=triangle 45]
- \tkzDrawSegment[dim={$r$,
+ \tkzDrawSegment[dim={$d$,
16pt,above=6pt}](O,P)
\tkzDrawPoints(O,P)
\tkzMarkAngle[mark=none,->](I,O,P)
\tkzFillAngle[fill=blue!20,
opacity=.5](I,O,P)
\tkzLabelAngle[pos=1.25](I,O,P){$\alpha$}
- \tkzLabelPoint(P){$P (\alpha : r )$}
+ \tkzLabelPoint(P){$P (\alpha : d )$}
\tkzDrawPoints[shape=cross](I,J)
\tkzLabelPoints(O,I)
\tkzLabelPoints[left](J)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.1.1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.1.1.tex
new file mode 100644
index 0000000000..37a2adf9a2
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.1.1.tex
@@ -0,0 +1,15 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 22 (Section 4.1.1 : Cartesian coordinates )
+
+\begin{tikzpicture}
+ \tkzInit[xmax=5,ymax=5]
+ \tkzDefPoint(0,0){A}
+ \tkzDefPoint(4,0){B}
+ \tkzDefPoint(0,3){C}
+ \tkzDrawPolygon(A,B,C)
+ \tkzDrawPoints(A,B,C)
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.1.2.tex
index d17061d346..1d3db1934a 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.1.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 13 (Section 4.1.2 : Calculations with \tkzNamePack{xfp})
+% Ex. No. 23 (Section 4.1.2 : Calculations with \tkzNamePack{xfp})
\begin{tikzpicture}[scale=1]
\tkzInit[xmax=4,ymax=4]
@@ -12,4 +12,4 @@
\tkzDrawPoints[color=blue](O,B,A)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.1.3.tex
index 27a95601b9..e855f43720 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-3.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.1.3.tex
@@ -1,13 +1,13 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 14 (Section 4.1.3 : Polar coordinates )
+% Ex. No. 24 (Section 4.1.3 : Polar coordinates )
- \begin{tikzpicture}
+\begin{tikzpicture}
\foreach \an [count=\i] in {0,60,...,300}
{ \tkzDefPoint(\an:3){A_\i}}
\tkzDrawPolygon(A_1,A_...,A_6)
\tkzDrawPoints(A_1,A_...,A_6)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.1.4.tex
index ff7508f4b5..f6c2211947 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-4.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.1.4.tex
@@ -1,12 +1,12 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 15 (Section 4.1.4 : Calculations and coordinates)
+% Ex. No. 25 (Section 4.1.4 : Calculations and coordinates)
- \begin{tikzpicture}[scale=.5]
+\begin{tikzpicture}[scale=.5]
\foreach \an [count=\i] in {0,2,...,358}
{ \tkzDefPoint(\an:sqrt(sqrt(\an mm))){A_\i}}
\tkzDrawPoints(A_1,A_...,A_180)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-5.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.1.5.tex
index 6d4830eb98..46e19dd738 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-5.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.1.5.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 16 (Section 4.1.5 : Relative points)
+% Ex. No. 26 (Section 4.1.5 : Relative points)
\begin{tikzpicture}[scale=1]
\tkzSetUpLine[color=blue!60]
@@ -10,12 +10,12 @@
\begin{scope}[shift=(A)]
\tkzDefPoint(90:5){B}
\tkzDefPoint(30:5){C}
-\end{scope}
-\end{scope}
+ \end{scope}
+ \end{scope}
\tkzDrawPolygon(A,B,C)
\tkzLabelPoints[above](B,C)
\tkzLabelPoints[below](A)
\tkzDrawPoints(A,B,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-2-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.2.1.tex
index 33389d4696..c0c8f00be3 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-2-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.2.1.tex
@@ -1,18 +1,17 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 17 (Section 4.2.1 : Isosceles triangle with \tkzcname{tkzDefShiftPoint})
+% Ex. No. 27 (Section 4.2.1 : Isosceles triangle with \tkzcname{tkzDefShiftPoint})
\begin{tikzpicture}[rotate=-30]
\tkzDefPoint(2,3){A}
\tkzDefShiftPoint[A](0:4){B}
\tkzDefShiftPoint[A](30:4){C}
\tkzDrawSegments(A,B B,C C,A)
- \tkzMarkSegments[mark=|,
- color=red](A,B A,C)
+ \tkzMarkSegments[mark=|,color=red](A,B A,C)
\tkzDrawPoints(A,B,C)
\tkzLabelPoints(B,C)
\tkzLabelPoints[above left](A)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-2-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.2.2.tex
index 794969f7c0..ba8146983a 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-2-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.2.2.tex
@@ -1,16 +1,17 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 18 (Section 4.2.2 : Equilateral triangle)
+% Ex. No. 28 (Section 4.2.2 : Equilateral triangle)
\begin{tikzpicture}[scale=1]
\tkzDefPoint(2,3){A}
- \tkzDefShiftPoint[A](30:4){B}
- \tkzDefShiftPoint[A](-30:4){C}
+ \tkzDefShiftPoint[A](30:3){B}
+ \tkzDefShiftPoint[A](-30:3){C}
\tkzDrawPolygon(A,B,C)
\tkzDrawPoints(A,B,C)
\tkzLabelPoints(B,C)
\tkzLabelPoints[above left](A)
+ \tkzMarkSegments[mark=|,color=red](A,B A,C B,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-2-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.2.3.tex
index 9b2cf82063..1e08116f73 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-2-3.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.2.3.tex
@@ -1,15 +1,15 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 19 (Section 4.2.3 : Parallelogram)
+% Ex. No. 29 (Section 4.2.3 : Parallelogram)
\begin{tikzpicture}
\tkzDefPoint(0,0){A}
- \tkzDefPoint(60:3){B}
- \tkzDefShiftPointCoord[B](30:4){C}
- \tkzDefShiftPointCoord[A](30:4){D}
+ \tkzDefPoint(30:3){B}
+ \tkzDefShiftPointCoord[B](10:2){C}
+ \tkzDefShiftPointCoord[A](10:2){D}
\tkzDrawPolygon(A,...,D)
\tkzDrawPoints(A,...,D)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-4-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.4.0.tex
index 71598e7cd8..7e4708d5ec 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-4-0.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.4.0.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 20 (Section 4.4 : Create a triangle)
+% Ex. No. 30 (Section 4.4 : Create a triangle)
\begin{tikzpicture}[scale=1]
\tkzDefPoints{0/0/A,4/0/B,4/3/C}
@@ -9,4 +9,4 @@
\tkzDrawPoints(A,B,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-5-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.5.0.tex
index 87885436eb..4e4840dd96 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-5-0.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.5.0.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 21 (Section 4.5 : Create a square)
+% Ex. No. 31 (Section 4.5 : Create a square)
\begin{tikzpicture}[scale=1]
\tkzDefPoints{0/0/A,2/0/B,2/2/C,0/2/D}
@@ -9,4 +9,4 @@
\tkzDrawPoints(A,B,C,D)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-05-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-5.1.1.tex
index e655da2683..f8e64c8c7f 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-05-1-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-5.1.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 22 (Section 5.1.1 : Use of \tkzcname{tkzDefMidPoint})
+% Ex. No. 32 (Section 5.1.1 : Use of \tkzcname{tkzDefMidPoint})
\begin{tikzpicture}[scale=1]
\tkzDefPoint(2,3){A}
@@ -12,4 +12,4 @@
\tkzLabelPoints[right](A,B,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-05-2-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-5.2.1.tex
index 9df81202fd..3769b15dc9 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-05-2-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-5.2.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 23 (Section 5.2.1 : Using \tkzcname{tkzDefBarycentricPoint} with two points)
+% Ex. No. 33 (Section 5.2.1 : Using \tkzcname{tkzDefBarycentricPoint} with two points)
\begin{tikzpicture}
\tkzDefPoint(2,3){A}
@@ -13,4 +13,4 @@
\tkzLabelPoints(A,B,I)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-05-2-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-5.2.2.tex
index 0b04be6dad..4d9a504efa 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-05-2-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-5.2.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 24 (Section 5.2.2 : Using \tkzcname{tkzDefBarycentricPoint} with three points)
+% Ex. No. 34 (Section 5.2.2 : Using \tkzcname{tkzDefBarycentricPoint} with three points)
\begin{tikzpicture}[scale=.8]
\tkzDefPoint(2,1){A}
@@ -21,4 +21,4 @@
\tkzAutoLabelPoints[center=M,above right](A',B',C')
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-05-3-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-5.3.0.tex
index 38fa5d98cf..38faf71e01 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-05-3-0.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-5.3.0.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 25 (Section 5.3 : Internal Similitude Center)
+% Ex. No. 35 (Section 5.3 : Internal Similitude Center)
\begin{tikzpicture}[scale=.75,rotate=-30]
\tkzDefPoint(0,0){O}
@@ -26,4 +26,4 @@
\tkzLabelPoints[font=\scriptsize](O,A,I,J,D,E,F,G,D',E',F',G')
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.1.tex
index dd99b48968..763183c634 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.1.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 26 (Section 6.1.1 : \IoptName{tkzDefTriangleCenter}{ortho})
+% Ex. No. 36 (Section 6.1.1 : Option \tkzname{ortho} or \tkzname{orthic})
\begin{tikzpicture}
\tkzDefPoint(0,0){A}
@@ -19,4 +19,4 @@
\tkzMarkRightAngles(A,Ha,B B,Hb,C C,Hc,A)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.2.tex
index 640a06ed5d..b637a48113 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.2.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 27 (Section 6.1.2 : \IoptName{tkzDefTriangleCenter}{centroid})
+% Ex. No. 37 (Section 6.1.2 : Option \tkzname{centroid})
\begin{tikzpicture}[scale=.75]
\tkzDefPoints{-1/1/A,5/1/B}
@@ -14,4 +14,4 @@
\tkzDrawLines[add = 0 and 2/3](A,G B,G C,G)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.3.tex
index 0277dd685e..684da82e65 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-3.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.3.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 28 (Section 6.1.3 : \IoptName{tkzDefTriangleCenter}{circum})
+% Ex. No. 38 (Section 6.1.3 : Option \tkzname{circum})
- \begin{tikzpicture}
+\begin{tikzpicture}
\tkzDefPoints{0/1/A,3/2/B,1/4/C}
\tkzDefTriangleCenter[circum](A,B,C)
\tkzGetPoint{G}
@@ -12,4 +12,4 @@
\tkzDrawPoints(A,B,C,G)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.4.tex
index 64638de5a7..40a50fbf06 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-4.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.4.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 29 (Section 6.1.4 : \IoptName{tkzDefTriangleCenter}{in})
+% Ex. No. 39 (Section 6.1.4 : Option \tkzname{in})
\begin{tikzpicture}
\tkzDefPoints{0/1/A,3/2/B,1/4/C}
@@ -14,4 +14,4 @@
\tkzDrawCircle(I,Ib)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.5.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.5.tex
new file mode 100644
index 0000000000..92701dca99
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.5.tex
@@ -0,0 +1,23 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 40 (Section 6.1.5 : Option \tkzname{ex})
+
+\begin{tikzpicture}[scale=.5]
+ \tkzDefPoints{0/1/A,3/2/B,1/4/C}
+ \tkzDefTriangleCenter[ex](B,C,A)
+ \tkzGetPoint{J_c}
+ \tkzDefPointBy[projection=onto A--B](J_c)
+ \tkzGetPoint{Tc}
+ %or
+ % \tkzDefCircle[ex](B,C,A)
+ % \tkzGetFirstPoint{J_c}
+ % \tkzGetSecondPoint{Tc}
+ \tkzDrawPolygon[color=blue](A,B,C)
+ \tkzDrawPoints(A,B,C,J_c)
+ \tkzDrawCircle[red](J_c,Tc)
+ \tkzDrawLines[add=1.5 and 0](A,C B,C)
+ \tkzLabelPoints(J_c)
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-6.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.6.tex
index 2e6e8ea628..2caaafffe9 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-6.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.6.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 31 (Section 6.1.6 : Utilisation de \IoptName{tkzDefTriangleCenter}{euler} )
+% Ex. No. 41 (Section 6.1.6 : Option \tkzname{euler})
\begin{tikzpicture}[scale=1]
\tkzDefPoints{0/0/A,6/0/B,0.8/4/C}
@@ -32,4 +32,4 @@
color=blue,line width=1pt](B,E_B E_B,H)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-7.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.7.tex
index 031afaeb83..0df63327ee 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-7.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.7.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 32 (Section 6.1.7 : Using option \IoptName{tkzDefTriangleCenter}{symmedian})
+% Ex. No. 42 (Section 6.1.7 : Option \tkzname{symmedian})
\begin{tikzpicture}
\tkzDefPoint(0,0){A}
@@ -13,11 +13,11 @@
\tkzDefSpcTriangle[centroid,name=M](A,B,C){a,b,c}
\tkzDefSpcTriangle[incentral,name=I](A,B,C){a,b,c}
\tkzDrawPolygon[color=blue](A,B,C)
- \tkzDrawPoints(A,B,C,K)
\tkzDrawLines[add = 0 and 2/3,blue](A,K B,K C,K)
\tkzDrawSegments[red,dashed](A,Ma B,Mb C,Mc)
\tkzDrawSegments[orange,dashed](A,Ia B,Ib C,Ic)
- \tkzDrawLine(G,I)
+ \tkzDrawLine[add=2 and 2](G,I)
+ \tkzDrawPoints(A,B,C,K,G,I)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-8.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.8.tex
index 9ed2e4cdc4..7c5a83fcbf 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-8.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.8.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 33 (Section 6.1.8 : Using option \IoptName{tkzDefTriangleCenter}{nagel})
+% Ex. No. 43 (Section 6.1.8 : Option \tkzname{nagel})
- \begin{tikzpicture}[scale=.5]
+\begin{tikzpicture}[scale=.5]
\tkzDefPoints{0/0/A,6/0/B,4/6/C}
\tkzDefSpcTriangle[ex](A,B,C){Ja,Jb,Jc}
\tkzDefSpcTriangle[extouch](A,B,C){Ta,Tb,Tc}
@@ -20,7 +20,8 @@
\tkzDrawLines[add=1 and 1,dashed](A,B B,C C,A)
\tkzDrawCircles[ex,gray](A,B,C C,A,B B,C,A)
\tkzDrawSegments[dashed](Ja,Ta Jb,Tb Jc,Tc)
- \tkzMarkRightAngles[fill=gray!20](Ja,Ta,C Jb,Tb,A Jc,Tc,B)
+ \tkzMarkRightAngles[fill=gray!20](Ja,Ta,C
+ Jb,Tb,A Jc,Tc,B)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-9.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.9.tex
index 75f79a104d..1b3b13181a 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-9.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.9.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 34 (Section 6.1.9 : Option Triangle "mittenpunkt")
+% Ex. No. 44 (Section 6.1.9 : Option \tkzname{mittenpunkt})
\begin{tikzpicture}[scale=.5]
\tkzDefPoints{0/0/A,6/0/B,4/6/C}
@@ -26,4 +26,4 @@
\tkzShowBB
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-07-0-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-7.0.2.tex
index a384d79ccf..4cdbb37312 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-07-0-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-7.0.2.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 35 (Section 7.0.2 : Example of point drawings)
+% Ex. No. 45 (Section 7.0.2 : Example of point drawings)
- \begin{tikzpicture}[scale=.5]
+\begin{tikzpicture}[scale=.5]
\tkzDefPoint(1,3){A}
\tkzDefPoint(4,1){B}
\tkzDefPoint(0,0){O}
@@ -12,4 +12,4 @@
\tkzDrawPoint[color=green](O)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-07-0-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-7.0.3.tex
index 72c4c2a189..33ea4dcbaf 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-07-0-3.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-7.0.3.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 36 (Section 7.0.3 : First example)
+% Ex. No. 46 (Section 7.0.3 : First example)
\begin{tikzpicture}
\tkzDefPoint(1,3){A}
@@ -11,4 +11,4 @@
fill=red!50](A,B,C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-07-0-4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-7.0.4.tex
index 6f4a965fee..9ee9b5de99 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-07-0-4.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-7.0.4.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 37 (Section 7.0.4 : Second example)
+% Ex. No. 47 (Section 7.0.4 : Second example)
\begin{tikzpicture}[scale=.5]
\tkzDefPoint(2,3){A} \tkzDefPoint(5,-1){B}
@@ -9,7 +9,7 @@
shift={(2,3)}](-30:5.5){E}
\begin{scope}[shift=(A)]
\tkzDefPoint(30:5){C}
-\end{scope}
+ \end{scope}
\tkzCalcLength[cm](A,B)\tkzGetLength{rAB}
\tkzDrawCircle[R](A,\rAB cm)
\tkzDrawSegment(A,B)
@@ -18,4 +18,4 @@
\tkzLabelPoints[above](A)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-08-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-8.1.1.tex
index 60d9222e9c..0a6b2a966f 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-08-1-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-8.1.1.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 38 (Section 8.1.1 : Use of option \tkzname{pos} 1)
+% Ex. No. 48 (Section 8.1.1 : Use of option \tkzname{pos})
- \begin{tikzpicture}
+\begin{tikzpicture}
\tkzDefPoints{0/0/A,4/0/B}
\tkzDrawLine[red](A,B)
\tkzDefPointOnLine[pos=1.2](A,B)
@@ -21,4 +21,4 @@
\tkzLabelPoints(A,B)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-8.2.0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-8.2.0.tex
new file mode 100644
index 0000000000..75acbd5d7c
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-8.2.0.tex
@@ -0,0 +1,23 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 49 (Section 8.2 : Point on a circle)
+
+\begin{tikzpicture}
+ \tkzDefPoints{0/0/A,4/0/B,0.8/3/C}
+ \tkzDefPointOnCircle[angle=90,center=B,radius=1 cm]
+ \tkzGetPoint{I}
+ \tkzDefCircle[circum](A,B,C)
+ \tkzGetPoint{G} \tkzGetLength{rG}
+ \tkzDefPointOnCircle[angle=30,center=G,radius=\rG pt]
+ \tkzGetPoint{J}
+ \tkzDrawCircle[R,teal](B,1cm)
+ \tkzDrawPoint[teal](I)
+ \tkzDrawPoints(A,B,C)
+ \tkzDrawCircle(G,J)
+ \tkzDrawPoints(G,J)
+ \tkzDrawPoint[red](J)
+ \tkzLabelPoints(G,J)
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.0.tex
new file mode 100644
index 0000000000..4b83d72a9a
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.0.tex
@@ -0,0 +1,16 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 50 (Section 9.2 : Example of translation)
+
+\begin{tikzpicture}[>=latex]
+ \tkzDefPoint(0,0){A} \tkzDefPoint(3,1){B}
+ \tkzDefPoint(3,0){C}
+ \tkzDefPointBy[translation= from B to A](C)
+ \tkzGetPoint{D}
+ \tkzDrawPoints[teal](A,B,C,D)
+ \tkzLabelPoints[color=teal](A,B,C,D)
+ \tkzDrawSegments[orange,->](A,B D,C)
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.1.tex
index ed29933234..7d9517c803 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-1-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.1.tex
@@ -1,11 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 40 (Section 9.1.1 : Example of reflection)
+% Ex. No. 51 (Section 9.2.1 : Example of reflection (orthogonal symmetry))
\begin{tikzpicture}[scale=1]
- \tkzInit[ymin=-4,ymax=6,xmin=-7,xmax=3]
- \tkzClip
\tkzDefPoints{1.5/-1.5/C,-4.5/2/D}
\tkzDefPoint(-4,-2){O}
\tkzDefPoint(-2,-2){A}
@@ -21,4 +19,4 @@
\tkzDrawLine[add= .5 and .5](C,D)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.2.tex
new file mode 100644
index 0000000000..4d5341ddd6
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.2.tex
@@ -0,0 +1,20 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 52 (Section 9.2.2 : Example of \tkzname{homothety} and \tkzname{projection})
+
+\begin{tikzpicture}[scale=1.2]
+ \tkzDefPoint(0,1){A} \tkzDefPoint(5,3){B} \tkzDefPoint(3,4){C}
+ \tkzDefLine[bisector](B,A,C) \tkzGetPoint{a}
+ \tkzDrawLine[add=0 and 0,color=magenta!50 ](A,a)
+ \tkzDefPointBy[homothety=center A ratio .5](a) \tkzGetPoint{a'}
+ \tkzDefPointBy[projection = onto A--B](a') \tkzGetPoint{k'}
+ \tkzDefPointBy[projection = onto A--B](a) \tkzGetPoint{k}
+ \tkzDrawLines[add= 0 and .3](A,k A,C)
+ \tkzDrawSegments[blue](a',k' a,k)
+ \tkzDrawPoints(a,a',k,k',A)
+ \tkzDrawCircles(a',k' a,k)
+ \tkzLabelPoints(a,a',k,A)
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-3-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.3.tex
index ced8e2745c..185d9cedad 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-3-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.3.tex
@@ -1,22 +1,24 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 42 (Section 9.3.1 : Example of projection)
+% Ex. No. 53 (Section 9.2.3 : Example of projection)
\begin{tikzpicture}[scale=1.5]
- \tkzInit[xmin=-3,xmax=5,ymax=4] \tkzClip[space=.5]
\tkzDefPoint(0,0){A}
\tkzDefPoint(0,4){B}
- \tkzDrawTriangle[pythagore](B,A) \tkzGetPoint{C}
+ \tkzDefTriangle[pythagore](B,A) \tkzGetPoint{C}
\tkzDefLine[bisector](B,C,A) \tkzGetPoint{c}
\tkzInterLL(C,c)(A,B) \tkzGetPoint{D}
- \tkzDrawSegment(C,D)
- \tkzDrawCircle(D,A)
\tkzDefPointBy[projection=onto B--C](D) \tkzGetPoint{G}
\tkzInterLC(C,D)(D,A) \tkzGetPoints{E}{F}
+ \tkzDrawPolygon[teal](A,B,C)
+ \tkzDrawSegment(C,D)
+ \tkzDrawCircle(D,A)
+ \tkzDrawSegment[orange](D,G)
+ \tkzMarkRightAngle[fill=orange!20](D,G,B)
\tkzDrawPoints(A,C,F) \tkzLabelPoints(A,C,F)
\tkzDrawPoints(B,D,E,G)
\tkzLabelPoints[above right](B,D,E,G)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-4-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.4.tex
index 5c52a48c78..639e23b392 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-4-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.4.tex
@@ -1,9 +1,9 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 43 (Section 9.4.1 : Example of symmetry)
+% Ex. No. 54 (Section 9.2.4 : Example of symmetry)
-\begin{tikzpicture}[scale=1.5]
+\begin{tikzpicture}[scale=1]
\tkzDefPoint(0,0){O}
\tkzDefPoint(2,-1){A}
\tkzDefPoint(2,2){B}
@@ -18,4 +18,4 @@
\tkzLabelPoints(A,B,O,A',B')
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.5.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.5.tex
new file mode 100644
index 0000000000..fbd70534b5
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.5.tex
@@ -0,0 +1,22 @@
+\input{preamble-standalone.ltx}
+\begin{document}
+
+% Ex. No. 55 (Section 9.2.5 : Example of rotation)
+
+\begin{tikzpicture}[scale=0.5]
+ \tkzDefPoint(0,0){A}
+ \tkzDefPoint(5,0){B}
+ \tkzDrawSegment(A,B)
+ \tkzDefPointBy[rotation=center A angle 60](B)
+ \tkzGetPoint{C}
+ \tkzDefPointBy[symmetry=center C](A)
+ \tkzGetPoint{D}
+ \tkzDrawSegment(A,tkzPointResult)
+ \tkzDrawLine(B,D)
+ \tkzDrawArc[orange,delta=10](A,B)(C)
+ \tkzDrawArc[orange,delta=10](B,C)(A)
+ \tkzDrawArc[orange,delta=10](C,D)(D)
+ \tkzMarkRightAngle(D,B,A)
+\end{tikzpicture}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-6-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.6.tex
index 6bab89ec36..924a66ff76 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-6-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.6.tex
@@ -1,20 +1,18 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 45 (Section 9.6.1 : Example of rotation in radian)
+% Ex. No. 56 (Section 9.2.6 : Example of rotation in radian)
\begin{tikzpicture}
\tkzDefPoint["$A$" left](1,5){A}
\tkzDefPoint["$B$" right](5,2){B}
\tkzDefPointBy[rotation in rad= center A angle pi/3](B)
\tkzGetPoint{C}
-
\tkzDrawSegment(A,B)
\tkzDrawPoints(A,B,C)
\tkzCompass[color=red](A,C)
\tkzCompass[color=red](B,C)
-
\tkzLabelPoints(C)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-7-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.7.tex
index bd131e4c5f..7f4955b754 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-7-1.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.7.tex
@@ -1,26 +1,26 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 46 (Section 9.7.1 : Inversion of points)
+% Ex. No. 57 (Section 9.2.7 : Inversion of points)
\begin{tikzpicture}[scale=1.5]
\tkzDefPoint(0,0){O}
\tkzDefPoint(1,0){A}
- \tkzDrawCircle(O,A)
\tkzDefPoint(-1.5,-1.5){z1}
\tkzDefPoint(0.35,0){z2}
- \tkzDrawPoints[color=black,
- fill=red,size=4](O,z1,z2)
\tkzDefPointBy[inversion =%
center O through A](z1)
\tkzGetPoint{Z1}
\tkzDefPointBy[inversion =%
center O through A](z2)
\tkzGetPoint{Z2}
+ \tkzDrawCircle(O,A)
\tkzDrawPoints[color=black,
fill=red,size=4](Z1,Z2)
\tkzDrawSegments(z1,Z1 z2,Z2)
+ \tkzDrawPoints[color=black,
+ fill=red,size=4](O,z1,z2)
\tkzLabelPoints(O,A,z1,z2,Z1,Z2)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-7-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.8.tex
index 4d943a54f1..0606dec824 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-7-2.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.8.tex
@@ -1,7 +1,7 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 47 (Section 9.7.2 : Point Inversion: Orthogonal Circles)
+% Ex. No. 58 (Section 9.2.8 : Point Inversion: Orthogonal Circles)
\begin{tikzpicture}[scale=1.5]
\tkzDefPoint(0,0){O}
@@ -19,4 +19,4 @@
fill=red,size=4](O,z1,z2,Z1,O,A)
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10-1-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.3.1.tex
index 179a48984a..1ad547124c 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10-1-0.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.3.1.tex
@@ -1,10 +1,10 @@
\input{preamble-standalone.ltx}
\begin{document}
-% Ex. No. 48 (Section 10.1 : Example de translation)
+% Ex. No. 59 (Section 9.3.1 : Example of translation)
-\begin{tikzpicture}
- \tkzDefPoint(0,0){A} \tkzDefPoint(4,2){A'}
+\begin{tikzpicture}[>=latex]
+ \tkzDefPoint(0,0){A} \tkzDefPoint(3,1){A'}
\tkzDefPoint(3,0){B} \tkzDefPoint(1,2){C}
\tkzDefPointsBy[translation= from A to A'](B,C){}
\tkzDrawPolygon[color=blue](A,B,C)
@@ -17,4 +17,4 @@
style=dashed](A,A' B,B' C,C')
\end{tikzpicture}
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-euclide.sty b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-euclide.sty
index 5c86e5c0af..74ab4a2987 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-euclide.sty
+++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-euclide.sty
@@ -1,30 +1,78 @@
-% tkz-euclide.sty
-% Copyright 2020 by Alain Matthes
+% tkz-euclide.sty (utf8 encoding)
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
-% This file may be distributed and/or modified
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
%
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
+% This work consists of the files:
+% tkz-euclide.sty
+% tkz-obj-eu-angles.tex
+% tkz-obj-eu-arcs.tex
+% tkz-obj-eu-circles.tex
+% tkz-obj-eu-compass.tex
+% tkz-obj-eu-draw-circles.tex
+% tkz-obj-eu-draw-lines.tex
+% tkz-obj-eu-draw-polygons.tex
+% tkz-obj-eu-lines.tex
+% tkz-obj-eu-points-by.tex
+% tkz-obj-eu-points-rnd.tex
+% tkz-obj-eu-points-with.tex
+% tkz-obj-eu-points.tex
+% tkz-obj-eu-polygons.tex
+% tkz-obj-eu-protractor.tex
+% tkz-obj-eu-sectors.tex
+% tkz-obj-eu-show.tex
+% tkz-obj-eu-triangles.tex
+% tkz-tools-angles.tex
+% tkz-tools-intersections.tex
+% tkz-tools-math.tex
+
%<------------------------------------------------------------–>
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-euclide.sty}
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-euclide.sty}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tkz-euclide}[2020/01/24 3.02c for euclidan geometry ]
+\ProvidesPackage{tkz-euclide}[2020/03/03 3.05c for euclidan geometry ]
\RequirePackage{tkz-base}
\makeatletter
-\@ifpackagelater{tkz-base}{2020/01/24}{%
+\@ifpackagelater{tkz-base}{2020/03/03}{%
% Package is new enough
}{%
\PackageError{tkz-euclide}{Package tkz-base is too old , you need a recent version}%
}
\makeatother
-\DeclareOption*{}%% Ne rien faire quand une option est inconnue
+\DeclareOption*{}
\ProcessOptions
%<----------------------------------------------------------–>
% Initialisation
%<----------------------------------------------------------–>
\input{tkz-tools-intersections}
\input{tkz-tools-angles}
-\usetkzobj{eu-angles,eu-arcs,eu-compass,eu-circles,eu-draw-circles,eu-lines,eu-draw-lines,eu-points,eu-points-by,eu-points-rnd,eu-points-with,eu-draw-polygons,eu-polygons,eu-protractor,eu-sectors,eu-show,eu-triangles}
+\usetkzobj{%
+ eu-angles,%
+ eu-arcs,%
+ eu-compass,%
+ eu-circles,%
+ eu-draw-circles,%
+ eu-draw-lines,%
+ eu-draw-polygons,%
+ eu-draw-triangles,%
+ eu-lines,%
+ eu-points,%
+ eu-points-by,%
+ eu-points-rnd,%
+ eu-points-with,%
+ eu-polygons,%
+ eu-protractor,%
+ eu-sectors,%
+ eu-show,%
+ eu-triangles}
\endinput
diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-angles.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-angles.tex
index bce07ea8a9..2347745e0b 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-angles.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-angles.tex
@@ -1,11 +1,21 @@
% tkz-tool-eu-angles.tex
-% Copyright 2020 by Alain Matthes
-% This file may be distributed and/or modified
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-tool-eu-angles.tex}
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+
+% utf8 encoding
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-tool-eu-angles.tex}
\makeatletter
%<--------------------------------------------------------------------------–>
\newdimen\tkz@arcsize% from julian julian@d-and-j.net
@@ -27,8 +37,7 @@
\endgroup
}
%<--------------------------------------------------------------------------–>
-% Mark an angle
-%<--------------------------------------------------------------------------–>
+% Mark an angle modi 3.03 suppression de \tkz@mksize,
%<--------------------------------------------------------------------------–>
% \tkzMarkAngle(B, A, C)
%
@@ -83,7 +92,7 @@
\tkzNormalizeAngle(\tkz@dirOne,\tkz@dirTwo)
% les marques, aucune si mktype = none
-\def\tkz@mymark{\pgfsetplotmarksize{\tkz@mksize}\pgfuseplotmark{\tkz@markang}}
+\def\tkz@mymark{\pgfuseplotmark{\tkz@markang}}
% draw the arcs
\begin{scope}[decoration= {markings,
mark=at position \tkz@mkpos with {\tkz@mymark}}]
@@ -91,8 +100,7 @@
\tkzDrawArcRAN[#1,fill=none,postaction={decorate}]%
(#3,\tkz@size)(\tkz@FirstAngle,\tkz@SecondAngle)
\else
- \ifx\tkz@arc\tkz@arcdouble
-
+ \ifx\tkz@arc\tkz@arcdouble
\tkzDrawArcRAN[#1,fill=none](#3,\tkz@size-1.5\pgflinewidth)%
(\tkz@FirstAngle,\tkz@SecondAngle)
\tkzPathArcRAN[#1,fill=none,postaction={decorate}]%
diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-arcs.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-arcs.tex
index c8ef72c3e6..e58b01e25a 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-arcs.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-arcs.tex
@@ -1,42 +1,53 @@
% tkz-obj-eu-arcs.tex
-% Copyright 2020 by Alain Matthes
-% This file may be distributed and/or modified
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-obj-eu-arcs.tex}
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+
+
+% utf8 encoding
+\def\fileversion{3.05c}
+\def\filedate{2020/03/23}
+\typeout{2020/03/23 3.05c tkz-obj-eu-arcs.tex}
\makeatletter
%<------------------------------ Arcs -------------------------------------–
% options : delta
% \def\tkz@delta{0}
% \tikzset{arc style/.style={#1}}
% \pgfkeys{/tikz/.cd,delta/.code={\def\tkz@delta{#1}}}
-
+\tikzset{arc style/.style={gray,thin}}
\gdef\tkz@numa{0}
\pgfkeys{/tkzdrawarc/.cd,
- type/.is choice,
- type/towards/.code = \def\tkz@numa{0},
- type/rotate/.code = \def\tkz@numa{1},
- type/angles/.code = \def\tkz@numa{2},
- type/R/.code = \def\tkz@numa{3},
- type/R with nodes/.code = \def\tkz@numa{4},
- towards/.style = {type=towards},
- rotate/.style = {type=rotate},
- R/.style = {type=R},
- angles/.style = {type=angles},
- R with nodes/.style = {type=R with nodes},
- diameter/.code = {},
- arc/.code = {},
- size/.code = {},
- mark/.code = {},
- mkpos/.code = {},
- mksize/.code = {},
- mkcolor/.code = {},
- type/.default = towards,
- delta/.store in = \tkz@delta,
- delta = 0,
- /tkzdrawarc/.search also = {/tikz}
+ type/.is choice,
+ type/towards/.code = \def\tkz@numa{0},
+ type/rotate/.code = \def\tkz@numa{1},
+ type/angles/.code = \def\tkz@numa{2},
+ type/R/.code = \def\tkz@numa{3},
+ type/R with nodes/.code = \def\tkz@numa{4},
+ towards/.style = {type=towards},
+ rotate/.style = {type=rotate},
+ R/.style = {type=R},
+ angles/.style = {type=angles},
+ R with nodes/.style = {type=R with nodes},
+ diameter/.code = {},
+ arc/.code = {},
+ size/.code = {},
+ mark/.code = {},
+ mkpos/.code = {},
+ mksize/.code = {},
+ mkcolor/.code = {},
+ type/.default = towards,
+ delta/.store in = \tkz@delta,
+ delta = 0,
+ /tkzdrawarc/.search also = {/tikz}
}
\def\tkzDrawArc{\pgfutil@ifnextchar[{\tkz@DrawArc}{\tkz@DrawArc[]}}
\def\tkz@DrawArc[#1](#2,#3)(#4){%
@@ -66,7 +77,7 @@
\tkzCalcLength(#2,#3)\tkzGetLength{tkz@radius}
\tkzFindSlopeAngle(#2,#3)\tkzGetAngle{tkz@FirstAngle}
\tkzFindSlopeAngle(#2,#4)\tkzGetAngle{tkz@SecondAngle}
- \tkz@DrawArcRAngles[#1](#2,\tkz@radius pt)(\tkz@FirstAngle,\tkz@SecondAngle)
+ \tkz@DrawArcRAngles[#1](#2,\tkz@radius pt)(\tkz@FirstAngle,\tkz@SecondAngle)
\endgroup
}
%<--------------------------------------------------------------------------–>
@@ -78,15 +89,15 @@
\tkz@DrawArcRotate[]}}
\def\tkz@DrawArcRotate[#1](#2,#3)(#4){%
\begingroup
- \tkzCalcLength(#2,#3) \tkzGetLength{tkz@radius}
- \tkzFindSlopeAngle(#2,#3) \tkzGetAngle{tkz@FirstA}
+ \tkzCalcLength(#2,#3) \tkzGetLength{tkz@radius}
+ \tkzFindSlopeAngle(#2,#3) \tkzGetAngle{tkz@FirstA}
\pgfmathadd{\tkz@FirstA}{#4}
\edef\tkz@SecondA{\pgfmathresult}
\pgfmathgreaterthan{#4}{0}
\ifdim\pgfmathresult pt=1 pt\relax%
- \tkz@DrawArcRAngles[#1](#2,\tkz@radius pt)(\tkz@FirstA,\tkz@SecondA)
+ \tkz@DrawArcRAngles[#1](#2,\tkz@radius pt)(\tkz@FirstA,\tkz@SecondA)
\else
- \tkz@DrawArcRAngles[#1](#2,\tkz@radius pt)(\tkz@SecondA,\tkz@FirstA)
+ \tkz@DrawArcRAngles[#1](#2,\tkz@radius pt)(\tkz@SecondA,\tkz@FirstA)
\fi
\endgroup
}
@@ -103,6 +114,32 @@
\endgroup
}
%<--------------------------------------------------------------------------–>
+% Degree #2 center #4 - #3 radius from #5 (degree) to #6(degree)
+%<--------------------------------------------------------------------------–>
+\def\tkzDrawArcRwithNodes{\pgfutil@ifnextchar[{\tkz@DrawArcRwithNodes}{%
+ \tkz@DrawArcRwithNodes[]}}
+\def\tkz@DrawArcRwithNodes[#1](#2,#3,#4)(#5,#6){%
+\begingroup
+ \tkzCalcLength(#3,#4)
+ \tkzFindSlopeAngle(#2,#5)\tkzGetAngle{tkz@FirstAngle}
+ \tkzFindSlopeAngle(#2,#6)\tkzGetAngle{tkz@SecondAngle}
+ \tkz@DrawArcRAngles[#1](#2,\tkzLengthResult)(\tkz@FirstAngle,\tkz@SecondAngle)
+\endgroup
+}
+%<--------------------------------------------------------------------------–>
+% Nodes R #2 center #3 radius en cm from #4(node) to #5(node)
+% \tkzDrawArcR(O,2 cm)(A,B)
+%<--------------------------------------------------------------------------–>
+\def\tkzDrawArcR{\pgfutil@ifnextchar[{\tkz@DrawArcR}{\tkz@DrawArcR[]}}
+\def\tkz@DrawArcR[#1](#2,#3)(#4,#5){%
+\begingroup
+ \tkzFindSlopeAngle(#2,#4)\tkzGetAngle{tkz@FirstAngle}
+ \tkzFindSlopeAngle(#2,#5)\tkzGetAngle{tkz@SecondAngle}
+ \tkz@DrawArcRAngles[#1](#2,#3)(\tkz@FirstAngle,\tkz@SecondAngle)
+\endgroup
+}
+%<--------------------------------------------------------------------------–>
+%<--------------------------------------------------------------------------–>
% #1 center #2 radius #4 first angle (degree) #5 second angle (degree)
% angles 0 .. 180 or -180 .. 0
%<--------------------------------------------------------------------------–>
@@ -117,51 +154,26 @@
\ifdim\pgfmathresult pt=1 pt\relax%
\pgfmathgreaterthan{\tkz@FirstAngle}{\tkz@SecondAngle}
\ifdim\pgfmathresult pt=1 pt\relax%
- \pgfmathsubtract{\tkz@FirstAngle}{360}
- \edef\tkz@FirstAngle{\pgfmathresult}%
- \fi
+ \pgfmathsubtract{\tkz@FirstAngle}{360}
+ \edef\tkz@FirstAngle{\pgfmathresult}%
+ \fi
\else
\pgfmathgreaterthan{\tkz@FirstAngle}{\tkz@SecondAngle}
\ifdim\pgfmathresult pt=1 pt\relax%
- \pgfmathadd{\tkz@SecondAngle}{360}
- \edef\tkz@SecondAngle{\pgfmathresult}%
- \fi
+ \pgfmathadd{\tkz@SecondAngle}{360}
+ \edef\tkz@SecondAngle{\pgfmathresult}%
+ \fi
\fi
\pgfmathsubtract{\tkz@FirstAngle}{\tkz@delta}
\edef\tkz@FirstAngle{\pgfmathresult}%
\pgfmathadd{\tkz@SecondAngle}{\tkz@delta}
\edef\tkz@SecondAngle{\pgfmathresult}
- \draw[shift = {(#2)},compass style,/tkzdrawarc/.cd,#1]%
+ \draw[shift = {(#2)},arc style,/tkzdrawarc/.cd,#1]%
(\tkz@FirstAngle:#3) arc (\tkz@FirstAngle:\tkz@SecondAngle:#3);
\endgroup
}
%<--------------------------------------------------------------------------–>
-% Degree #2 center #4 - #3 radius from #5 (degree) to #6(degree)
-%<--------------------------------------------------------------------------–>
-\def\tkzDrawArcRwithNodes{\pgfutil@ifnextchar[{\tkz@DrawArcRwithNodes}{%
- \tkz@DrawArcRwithNodes[]}}
-\def\tkz@DrawArcRwithNodes[#1](#2,#3,#4)(#5,#6){%
-\begingroup
- \tkzCalcLength(#3,#4)
- \tkzFindSlopeAngle(#2,#5)\tkzGetAngle{tkz@FirstAngle}
- \tkzFindSlopeAngle(#2,#6)\tkzGetAngle{tkz@SecondAngle}
- \tkz@DrawArcRAngles[#1](#2,\tkzLengthResult)%
- (\tkz@FirstAngle,\tkz@SecondAngle)
-\endgroup
-}
-%<--------------------------------------------------------------------------–>
-% Nodes R #2 center #3 radius en cm from #4(node) to #5(node)
-% \tkzDrawArcR(O,2 cm)(A,B)
-%<--------------------------------------------------------------------------–>
-\def\tkzDrawArcR{\pgfutil@ifnextchar[{\tkz@DrawArcR}{\tkz@DrawArcR[]}}
-\def\tkz@DrawArcR[#1](#2,#3)(#4,#5){%
-\begingroup
- \tkzFindSlopeAngle(#2,#4)\tkzGetAngle{tkz@FirstAngle}
- \tkzFindSlopeAngle(#2,#5)\tkzGetAngle{tkz@SecondAngle}
- \tkz@DrawArcRAngles[#1](#2,#3)(\tkz@FirstAngle,\tkz@SecondAngle)
-\endgroup
-}
-%<--------------------------------------------------------------------------–>
+
\makeatother
\endinput
\ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-circles.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-circles.tex
index 9a3a726658..901cb72348 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-circles.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-circles.tex
@@ -1,12 +1,21 @@
% tkz-obj-eu-circles.tex
-% Copyright 2020 by Alain Matthes
-% This file may be distributed and/or modified
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-obj-eu-circles.tex}
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+
+% utf8 encoding
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-obj-eu-circles.tex}
\makeatletter
%<--------------------------------------------------------------------------–>
% tkzCircle center and one point
diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-compass.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-compass.tex
index dd1c46863a..50cda7b15b 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-compass.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-compass.tex
@@ -1,11 +1,21 @@
% tkz-obj-eu-compass.tex
-% Copyright 2020 by Alain Matthes
-% This file may be distributed and/or modified
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-obj-eu-compass.tex}
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+
+% utf8 encoding
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-obj-eu-compass.tex}
\makeatletter
%<--------------------------------------------------------------------------–>
% Author Alain Matthes
@@ -16,24 +26,22 @@
%<--------------------------------------------------------------------------–>
% Setup Compass
%<--------------------------------------------------------------------------–>
-\pgfkeys{%
- tkzsucompass/.cd,
+\pgfkeys{tkzsucompass/.cd,
line width/.code = {\global\edef\tkz@compass@lw{#1}},
color/.code = {\global\edef\tkz@compass@color{#1}},
style/.code = {\global\edef\tkz@compass@style{#1}},
}
%<--------------------------------------------------------------------------–>
-%<--------------------------------------------------------------------------–>
-\def\tkzSetUpCompass{\pgfutil@ifnextchar[{\tkzActivOff\tkz@SetUpCompass}{%
- \tkzActivOff\tkz@SetUpCompass[]}}
+\def\tkzSetUpCompass{\pgfutil@ifnextchar[{\tkz@SetUpCompass}{% remove tkzActivOff 3.03
+ \tkz@SetUpCompass[]}}
%<--------------------------------------------------------------------------–>
\def\tkz@SetUpCompass[#1]{%
-\pgfkeys{%
- tkzsucompass/.cd,
+\pgfkeys{tkzsucompass/.cd,
line width = \tkz@euc@compasswidth,
color = \tkz@euc@compasscolor,
- style = \tkz@euc@compassstyle
- }
+ style = \tkz@euc@compassstyle,
+ /tkzsucompass/.search also = {/tikz}
+}
\pgfqkeys{/tkzsucompass}{#1}
\tikzset{compass style/.style={color = \tkz@compass@color,
line width = \tkz@compass@lw,
@@ -56,7 +64,7 @@
/tkzcompass/length/.code = {\def\tkz@length{#1}},
/tkzcompass/ratio/.code = {\def\tkz@ratio{#1}},
/tkzcompass/.unknown/.code = {\let\searchname=\pgfkeyscurrentname
- \pgfkeysalso{\searchname/.try=#1,
+ \pgfkeysalso{\searchname/.try=#1,
/tikz/\searchname/.retry=#1}}
}
@@ -70,15 +78,14 @@
ratio = .5
}
\pgfkeys{tkzcompass/.cd,#1}
- \tkzCalcLength(#2,#3)\tkzGetLength{tkz@tempLen}
+\tkzCalcLength(#2,#3)\tkzGetLength{tkz@tempLen}
\ifnum\tkz@delta=0 %
\pgfmathsetmacro{\tkz@delta}{min(deg(\tkz@length cm/ \tkz@tempLen pt),180)/2}
\fi
- \tkzFindSlopeAngle(#2,#3)\tkzGetAngle{tkz@angle}%
- \draw[shift ={(#2)},/tkzcompass/.cd,compass style,#1]%
- (\tkz@angle-\tkz@delta:\tkz@tempLen pt)%
- arc (\tkz@angle-\tkz@delta:\tkz@angle+\tkz@delta:\tkz@tempLen pt);
- %};
+\tkzFindSlopeAngle(#2,#3)\tkzGetAngle{tkz@angle}%
+\draw[shift ={(#2)},/tkzcompass/.cd,compass style,#1]%
+ (\tkz@angle-\tkz@delta:\tkz@tempLen pt)%
+ arc (\tkz@angle-\tkz@delta:\tkz@angle+\tkz@delta:\tkz@tempLen pt);
\endgroup}
%<--------------------------------------------------------------------------–>
\def\tkz@multiCompass#1 #2\@nil{%
diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-circles.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-circles.tex
index f8a0a05558..1b05f579af 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-circles.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-circles.tex
@@ -1,12 +1,21 @@
% tkz-obj-eu-draw-circles.tex
-% Copyright 2020 by Alain Matthes
-% This file may be distributed and/or modified
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-obj-eu-draw-circles.tex}
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+
+% utf8 encoding
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-obj-eu-draw-circles.tex}
\makeatletter
%for compatibility
%<--------------------------------------------------------------------------–>
diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-lines.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-lines.tex
index d837c35a1d..3df6a484c2 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-lines.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-lines.tex
@@ -1,11 +1,21 @@
% tkz-obj-eu-draw-lines.tex
-% Copyright 2020 by Alain Matthes
-% This file may be distributed and/or modified
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-obj-eu-draw-lines.tex}
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+
+% utf8 encoding
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-obj-eu-draw-lines.tex}
\makeatletter
\def\tkz@numdl{0}
\pgfkeys{/tkzdrawl/.cd,
@@ -225,12 +235,12 @@
color/.code = {\xdef\tkz@line@color{#1}},
style/.code = {\xdef\tkz@line@style{#1}},
add/.code args = {#1 and #2} {\xdef\tkz@line@left{#1}%
- \xdef\tkz@line@right{#2}%
- }
+ \xdef\tkz@line@right{#2}},
+ /tkzsuline/.search also={/tikz}%
}
%<--------------------------------------------------------------------------–>
-\def\tkzSetUpLine{\pgfutil@ifnextchar[{\tkzActivOff\tkz@SetUpLine}{%
- \tkzActivOff\tkz@SetUpLine[]}}
+\def\tkzSetUpLine{\pgfutil@ifnextchar[{\tkz@SetUpLine}{% remove tkzActivOff 3.03
+ \tkz@SetUpLine[]}}
\def\tkz@SetUpLine[#1]{%
\pgfkeys{%
tkzsuline/.cd,
@@ -291,10 +301,10 @@
color/.store in = \tkz@mkcolor,
mark/.store in = \tkz@markseg,
size/.store in = \tkz@mksize,
- size = 4pt,
- color = \tkz@mk@color,
- pos = .5,
- mark = |,
+ size = 4pt,
+ color = \tkz@mk@color,
+ pos = .5,
+ mark = |,
/@tkzmarkoptions/.search also={/tikz},
}
\def\tkzMarkSegment{\pgfutil@ifnextchar[{\tkz@MarkSegment}{\tkz@MarkSegment[]}}
@@ -350,8 +360,7 @@
\next#2\@nil
}
%<--------------------------------------------------------------------------–>
-\def\tkzLabelSegments{\pgfutil@ifnextchar[{\tkz@LabelSegments}{%
- \tkz@LabelSegments[]}}
+\def\tkzLabelSegments{\pgfutil@ifnextchar[{\tkz@LabelSegments}{\tkz@LabelSegments[]}}
\def\tkz@LabelSegments[#1](#2)#3{%
\def\tkz@optls{#1}
\def\tkz@labelseg{#3}
@@ -363,14 +372,15 @@
%<--------------------------------------------------------------------------–>
% PolySeg
%<--------------------------------------------------------------------------–>
-\def\tkzDrawPolySeg{\pgfutil@ifnextchar[{\tkz@DrawPolySeg}{%
- \tkz@DrawPolySeg[]}}
+\def\tkzDrawPolySeg{\pgfutil@ifnextchar[{\tkz@DrawPolySeg}{\tkz@DrawPolySeg[]}}
\def\tkz@DrawPolySeg[#1](#2,#3){%
\begingroup
\draw[line style,#1] (#2)
- \foreach \po in {#3}{--(\po)};%
+ \foreach \pt in {#2,#3}{--(\pt)};%
\endgroup
}
+
+
%<--------------------------------------------------------------------------–>
% add dim
% \draw[dim={5cm,7pt,}] (A) -- (B);
diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-polygons.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-polygons.tex
index 6b3764ccc3..a960baa49b 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-polygons.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-polygons.tex
@@ -1,11 +1,21 @@
% tkz-obj-eu-polygons.tex
-% Copyright 2020 by Alain Matthes
-% This file may be distributed and/or modified
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-obj-eu-polygons.tex}
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+
+% utf8 encoding
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-obj-eu-polygons.tex}
\makeatletter
%<--------------------------------------------------------------------------–>
% Polygon
diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-triangles.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-triangles.tex
new file mode 100644
index 0000000000..bc0d6b10f2
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-triangles.tex
@@ -0,0 +1,66 @@
+% tkz-obj-eu-draw-triangles.tex
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+
+% utf8 encoding
+%<--------------------------------------------------------------------------–>
+% Draw Triangles
+%<--------------------------------------------------------------------------–>
+
+\def\tkz@numdtr{0}
+\pgfkeys{/drawtriangle/.cd,
+ equilateral/.code = {\def\tkz@numdtr{0}},
+ half/.code = {\def\tkz@numdtr{1}},
+ pythagore/.code = {\def\tkz@numdtr{2}},
+ school/.code = {\def\tkz@numdtr{3}},
+ golden/.code = {\def\tkz@numdtr{4}},
+ sublime/.code = {\def\tkz@numdtr{4}},
+ euclide/.code = {\def\tkz@numdtr{5}},
+ gold/.code = {\def\tkz@numdtr{6}},
+ cheops/.code = {\def\tkz@numdtr{7}},
+ two angles/.code args = {#1 and #2}{\def\tkz@numdtr{8}%
+ \def\tkz@alpha{#1}%
+ \def\tkz@beta{#2}},
+ equilateral,
+ /drawtriangle/.search also={/tikz}
+}
+
+\def\tkzDrawTriangle{\pgfutil@ifnextchar[{\tkz@DrawTriangle}{%
+ \tkz@DrawTriangle[]}}
+\def\tkz@DrawTriangle[#1](#2,#3){%
+\begingroup
+\pgfkeys{/drawtriangle/.cd,equilateral}
+\pgfqkeys{/drawtriangle}{#1}
+\ifcase\tkz@numdtr%
+ \tkzDefEquilateral(#2,#3)
+\or% 1
+ \tkzDefTwoOne(#2,#3)
+\or% 2
+ \tkzDefPythagore(#2,#3)
+\or% 3
+ \tkzDefSchoolTriangle(#2,#3)
+\or% 4
+ \tkzDefGoldenTriangle(#2,#3)
+\or% 5
+ \tkzDefEuclideTriangle(#2,#3)
+\or% 6
+ \tkzDefGoldTriangle(#2,#3)
+\or% 7
+ \tkzDefCheopsTriangle(#2,#3)
+\or% 8
+ \tkzDefTwoAnglesTriangle(#2,#3)
+\fi
+ \draw[/drawtriangle/.cd,line style,#1] (#2)--(#3)--(tkzPointResult)--cycle;
+\endgroup
+}
+
diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-lines.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-lines.tex
index 5246f68455..de4323a8b0 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-lines.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-lines.tex
@@ -1,11 +1,21 @@
% tkz-obj-eu-lines.tex
-% Copyright 2020 by Alain Matthes
-% This file may be distributed and/or modified
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-obj-eu-lines.tex}
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+
+% utf8 encoding
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-obj-eu-lines.tex}
\makeatletter
%<--------------------------------------------------------------------------–>
% les lignes
@@ -26,7 +36,8 @@
K = 1,
normed/.is if = tkz@line@normed,
normed/.default = true,
- normed = false
+ normed = false,
+ mediator
}
\def\tkzDefLine{\pgfutil@ifnextchar[{\tkz@DefLine}{\tkz@DefLine[]}}
@@ -53,70 +64,86 @@
%<--------------------------------------------------------------------------–>
% tkzLineLL revoir out !!
%<--------------------------------------------------------------------------–>
-\def\tkzDefLineLL(#1,#2){%
+\def\tkzDefLineLL{\pgfutil@ifnextchar[{\tkz@DefLineLL}{%
+ \tkz@DefLineLL[1]}}
+\def\tkz@DefLineLL[#1](#2,#3){%
\begingroup
- \pgfpointdiff{\pgfpointanchor{#1}{center}}{\pgfpointanchor{#2}{center}}%
+ \pgfpointdiff{\pgfpointanchor{#2}{center}}{\pgfpointanchor{#3}{center}}%
\pgf@xa=\pgf@x\relax%%
\pgf@ya=\pgf@y\relax%%
\pgfinterruptboundingbox
- \path[coordinate](\tkz@through)--++(\pgf@xa,\pgf@ya)%
+ \path[coordinate](\tkz@through)--++(\tkz@koeff\pgf@xa,\tkz@koeff\pgf@ya)%
coordinate (tkzPointResult);
\endpgfinterruptboundingbox
- \iftkz@line@normed
- \tkzVecKNorm(\tkz@through,tkzPointResult)
- \fi
+ \iftkz@line@normed
+ \tkzVecKNorm(\tkz@through,tkzPointResult)
+ \fi
\endgroup}%
%<--------------------------------------------------------------------------–>
% tkzOrthLine
%<--------------------------------------------------------------------------–>
\def\tkzDefOrthLine{\pgfutil@ifnextchar[{\tkz@DefOrthLine}{%
\tkz@DefOrthLine[1]}}
-\def\tkz@DefOrthLine[#1](#2,#3)(#4){%
+\def\tkz@DefOrthLine[#1](#2,#3){%
\begingroup
- \tkzVecKOrth(#2,#3)
+ \tkzDefPointWith(#2,#3)
\pgfnodealias{tkz@OLtmp}{tkzPointResult}
- \tkz@VecKCoLinear[#1](#2,tkz@OLtmp,#4)
+ \tkz@VecKCoLinear[\tkz@koeff](#2,tkz@OLtmp,\tkz@through)
\iftkz@line@normed
\pgfinterruptboundingbox
\tkzVecKNorm(\tkz@through,tkzPointResult)
\endpgfinterruptboundingbox
\fi
-\endgroup
-}
+\endgroup}%
%<--------------------------------------------------------------------------–>
% tkzMediatorLine
%<--------------------------------------------------------------------------–>
-\def\tkzDefMediatorLine(#1,#2){% new 2020
+\def\tkzDefMediatorLine{\pgfutil@ifnextchar[{\tkz@DefMediatorLine}{%
+ \tkz@DefMediatorLine[1]}}
+
+\def\tkz@DefMediatorLine[#1](#2,#3){% new 2020
\begingroup
- \tkzDefEquilateral(#1,#2)
+ \tkzDefEquilateral(#2,#3)
\pgfnodealias{tkzFirstPointResult}{tkzPointResult}
- \tkzDefEquilateral(#2,#1)
- \pgfnodealias{tkzSecondPointResult}{tkzPointResult}
- \iftkz@line@normed
- \tkzDefMidPoint(#1,#2)
- \pgfnodealias{tkz@mid}{tkzPointResult}
- \pgfinterruptboundingbox
- \tkzVecKNorm(tkz@mid,tkzFirstPointResult)
- \pgfnodealias{tkzFirstPointResult}{tkzPointResult}
- \tkzVecKNorm(tkz@mid,tkzSecondPointResult)
- \pgfnodealias{tkzSecondPointResult}{tkzPointResult}
- \endpgfinterruptboundingbox
-\fi
-\endgroup
-}
+ \tkzDefEquilateral(#3,#2)
+ \pgfnodealias{tkzSecondPointResult}{tkzPointResult}
+ \ifx\tkz@koeff=1 %
+ \else
+ \tkzDefMidPoint(#2,#3)
+ \pgfnodealias{tkz@mid}{tkzPointResult}
+ \tkz@VecK[\tkz@koeff](tkz@mid,tkzFirstPointResult)
+ \pgfnodealias{tkzFirstPointResult}{tkzPointResult}
+ \tkz@VecK[\tkz@koeff](tkz@mid,tkzSecondPointResult)
+ \pgfnodealias{tkzSecondPointResult}{tkzPointResult}
+ \fi
+ \iftkz@line@normed
+ \tkzDefMidPoint(#2,#3)
+ \pgfnodealias{tkz@mid}{tkzPointResult}
+ \pgfinterruptboundingbox
+ \tkzVecKNorm[\tkz@koeff](tkz@mid,tkzFirstPointResult)
+ \pgfnodealias{tkzFirstPointResult}{tkzPointResult}
+ \tkzVecKNorm[\tkz@koeff](tkz@mid,tkzSecondPointResult)
+ \pgfnodealias{tkzSecondPointResult}{tkzPointResult}
+ \endpgfinterruptboundingbox
+ \fi
+\endgroup}
% autre possibilité
%<--------------------------------------------------------------------------–>
-% BisectorLine % pb avec un angle plat
+% BisectorLine
%<--------------------------------------------------------------------------–>
\def\tkzDefBisectorLine(#1,#2,#3){%
\begingroup
\pgfinterruptboundingbox
- \tkzDuplicateLength(#2,#1)(#2,#3)
+ \tkzDuplicateSegment(#2,#1)(#2,#3)
\pgfnodealias{bi@tmp}{tkzPointResult}
\tkzDefEquilateral(bi@tmp,#1)
+ \ifx\tkz@koeff=1 %
+ \else
+ \tkzVecK[\tkz@koeff](#2,tkzPointResult)
+ \fi
\iftkz@line@normed
- \tkzVecKNorm(#2,tkzPointResult)
+ \tkzVecKNorm[\tkz@koeff](#2,tkzPointResult)
\fi
\endpgfinterruptboundingbox
\endgroup
@@ -132,8 +159,12 @@
\tkzDefMidPoint(#1,out@tmp)
\pgfnodealias{out@pt1}{tkzPointResult}
\tkzURotateAngle(#2,90)(out@pt1)
+ \ifx\tkz@koeff=1 %
+ \else
+ \tkzVecK[\tkz@koeff](#2,tkzPointResult)
+ \fi
\iftkz@line@normed
- \tkzVecKNorm(#2,tkzPointResult)
+ \tkzVecKNorm[\tkz@koeff](#2,tkzPointResult)
\fi
\endpgfinterruptboundingbox
\endgroup
@@ -148,6 +179,13 @@
\tkzDefMidPoint(#1,#3)
\pgfnodealias{sym@pt2}{tkzPointResult}
\tkzUSymOrth(#2,sym@pt1)(sym@pt2)
+ \ifx\tkz@koeff=1 %
+ \else
+ \tkzVecK[\tkz@koeff](#2,tkzPointResult)
+ \fi
+ \iftkz@line@normed
+ \tkzVecKNorm[\tkz@koeff](#2,tkzPointResult)
+ \fi
\endgroup
}
%<-------------------------------------------------------------------------–>
diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-by.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-by.tex
index 2ab31570ac..6e63182107 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-by.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-by.tex
@@ -1,11 +1,20 @@
% tkz-tools-eu-points-by.tex
-% Copyright 2020 by Alain Matthes
-% This file may be distributed and/or modified
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-tools-eu-points-by.tex}
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+% utf8 encoding
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-tools-eu-points-by.tex}
\makeatletter
%<--------------------------------------------------------------------------–>
% Transformations Géométriques
@@ -148,7 +157,9 @@ inversion/.code args={center #1 through #2}{%
{\pgfpointanchor{\PointCS}{center}}%
\tkz@ax=\pgf@x%
\tkz@ay=\pgf@y%
+ \pgfinterruptboundingbox
\path(#1)--++(-\tkz@ax,-\tkz@ay)coordinate (\tkz@pointtsf);
+ \endpgfinterruptboundingbox
}
\endgroup
}
@@ -183,15 +194,16 @@ inversion/.code args={center #1 through #2}{%
%<--------------------------------------------------------------------------–>
\def\tkzUSymOrth(#1,#2)(#3){%
\begingroup
- \pgfpointdiff{\pgfpointanchor{#1}{center}}%
- {\pgfpointanchor{#2}{center}}%
- \tkz@ax =\pgf@y%
- \tkz@ay =\pgf@x%
- \path[coordinate]%
- (#3)--++(-\tkz@ax,\tkz@ay) coordinate (tkz@point);
- \tkzInterLL(#1,#2)(#3,tkz@point)
- \pgfnodealias{tkzPointofSym}{tkzPointResult}
- \tkz@VecK[2](#3,tkzPointofSym)
+ \pgfpointdiff{\pgfpointanchor{#1}{center}}%
+ {\pgfpointanchor{#2}{center}}%
+ \tkz@ax =\pgf@y%
+ \tkz@ay =\pgf@x%
+ \pgfinterruptboundingbox
+ \path[coordinate] (#3)--++(-\tkz@ax,\tkz@ay) coordinate (tkz@point);
+ \endpgfinterruptboundingbox
+ \tkzInterLL(#1,#2)(#3,tkz@point)
+ \pgfnodealias{tkzPointofSym}{tkzPointResult}
+ \tkz@VecK[2](#3,tkzPointofSym)
\endgroup
}
@@ -257,8 +269,10 @@ inversion/.code args={center #1 through #2}{%
\pgf@xa=\pgf@x%
\pgf@ya=\pgf@y%
\pgfmathparse{#2}\edef\tkz@coeff{\pgfmathresult}%
+ \pgfinterruptboundingbox
\path[coordinate](#1)--++(\tkz@coeff\pgf@xa,\tkz@coeff\pgf@ya)%
coordinate(\tkz@pointtsf);
+ \endpgfinterruptboundingbox
}
\endgroup
}
@@ -270,8 +284,10 @@ inversion/.code args={center #1 through #2}{%
\pgf@xa=\pgf@x%
\pgf@ya=\pgf@y%
\pgfmathparse{#2}\edef\tkz@coeff{\pgfmathresult}%
+ \pgfinterruptboundingbox
\path[coordinate](#1)--++(\tkz@coeff\pgf@xa,\tkz@coeff\pgf@ya)%
coordinate(tkzPointResult);
+ \endpgfinterruptboundingbox
\endgroup
}
%<--------------------------------------------------------------------------–>
@@ -298,7 +314,9 @@ inversion/.code args={center #1 through #2}{%
{#2}
\tkz@bx\pgf@x%
\tkz@by\pgf@y%
+ \pgfinterruptboundingbox
\path[coordinate](\tkz@bx,\tkz@by)coordinate(\tkz@pointtsf);%
+ \endpgfinterruptboundingbox
}
\endgroup
}
@@ -316,7 +334,9 @@ inversion/.code args={center #1 through #2}{%
{#2}
\tkz@bx\pgf@x%
\tkz@by\pgf@y%
- \path (\tkz@bx,\tkz@by) coordinate (tkzPointResult);%
+ \pgfinterruptboundingbox
+ \path (\tkz@bx,\tkz@by) coordinate (tkzPointResult);%
+ \endpgfinterruptboundingbox
\endgroup
}
%<--------------------------------------------------------------------------–>
@@ -345,7 +365,9 @@ inversion/.code args={center #1 through #2}{%
{\tkz@Angle}
\tkz@bx\pgf@x%
\tkz@by\pgf@y%
- \path[coordinate](\tkz@bx,\tkz@by)coordinate(\tkz@pointtsf);
+ \pgfinterruptboundingbox
+ \path[coordinate](\tkz@bx,\tkz@by)coordinate(\tkz@pointtsf);
+ \endpgfinterruptboundingbox
}
\endgroup
}
@@ -365,7 +387,9 @@ inversion/.code args={center #1 through #2}{%
{\tkz@Angle}
\tkz@bx\pgf@x%
\tkz@by\pgf@y%
- \path[coordinate](\tkz@bx,\tkz@by)coordinate(tkzPointResult);
+ \pgfinterruptboundingbox
+ \path[coordinate](\tkz@bx,\tkz@by)coordinate(tkzPointResult);
+ \endpgfinterruptboundingbox
\endgroup
}
%<--------------------------------------------------------------------------–>
@@ -381,16 +405,18 @@ inversion/.code args={center #1 through #2}{%
\else
\xdef\tkz@pointtsf{\tkz@FirstPoint}
\fi
- \tkzCalcLength[cm](#1,\PointIP)\tkzGetLength{tkz@lnb}%
- \edef\tkz@lnc{\fpeval{1/\tkz@lnb}}
+ \tkzCalcLength[cm](#1,#2)\tkzGetLength{tkz@lna}
+ \tkzCalcLength[cm](#1,\PointIP)\tkzGetLength{tkz@lnb}
+ \edef\tkz@lnc{\tkz@lna/\tkz@lnb*\tkz@lna}
\tkzVecKNorm[\tkz@lnb](#1,\PointIP)
}
\endgroup
}
\def\tkzUInversePoint(#1,#2)(#3){%
\begingroup
+ \tkzCalcLength[cm](#1,#2)\tkzGetLength{tkz@lna}%
\tkzCalcLength[cm](#1,#3)\tkzGetLength{tkz@lnb}%
- \edef\tkz@lnc{\fpeval{1/\tkz@lnb}}
+ \edef\tkz@lnc{\fpeval{\tkz@lna/\tkz@lnb*\tkz@lna}}
\tkzVecKNorm[\tkz@lnc](#1,#3)
\endgroup
}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-rnd.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-rnd.tex
index d11902126d..30f20fc8b8 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-rnd.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-rnd.tex
@@ -1,13 +1,20 @@
% tkz-obj-eu-points-rnd.tex
-% Copyright 2020 by Alain Matthes
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
-% This file may be distributed and/or modified
-%
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-obj-eu-points-rnd.tex}
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+% utf8 encoding
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-obj-eu-points-rnd.tex}
%<--------------------------------------------------------------------------–>
\makeatletter
%<-------------------------------------------------------------------------–>
diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-with.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-with.tex
index 6e235de7b3..8d239713c7 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-with.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-with.tex
@@ -1,11 +1,20 @@
% tkz-obj-eu-points-with.tex
-% Copyright 2020 by Alain Matthes
-% This file may be distributed and/or modified
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-obj-eu-points-with.tex}
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+% utf8 encoding
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-obj-eu-points-with.tex}
\makeatletter
%<--------------------------------------------------------------------------–>
% Vectors
@@ -72,28 +81,33 @@
linear/.code = {\def\tkz@numv{2}},
orthogonal normed/.code = {\def\tkz@numv{3}},
linear normed/.code = {\def\tkz@numv{4}},
- colinear normed/.code args = {at#1}{\def\tkz@numv{5}\def\tkz@frompoint{#1}},
- K/.code = {\pgfmathparse{#1}\def\tkz@ratio{\pgfmathresult}},
+ colinear normed/.code args = {at #1}{\def\tkz@numv{5}\def\tkz@frompoint{#1}},
+ K/.code = {\edef\tkz@coeff{\fpeval{#1}}},
K = 1,
+ normed/.is if = tkz@line@normed,
+ normed/.default = true,
+ normed = false,
orthogonal
}
-\def\tkzDefPointWith[#1](#2,#3){%
+\def\tkzDefPointWith{\pgfutil@ifnextchar[{\tkz@DefPointWith}{\tkz@DefPointWith[]}}
+
+\def\tkz@DefPointWith[#1](#2,#3){%
\begingroup
\pgfkeys{/@pointwith/.cd,K=1}
\pgfqkeys{/@pointwith}{#1}
\ifcase\tkz@numv%
% first case 0
- \tkz@DefVectorColinearat[\tkz@ratio](#2,#3)
+ \tkz@DefVectorColinearat[\tkz@coeff](#2,#3)
\or% 1
- \tkz@VecKOrth[\tkz@ratio](#2,#3)
+ \tkz@VecKOrth[\tkz@coeff](#2,#3)
\or% 2
- \tkz@VecK[\tkz@ratio](#2,#3)
+ \tkz@VecK[\tkz@coeff](#2,#3)
\or% 3
- \tkz@VecKOrthNorm[\tkz@ratio](#2,#3)
+ \tkz@VecKOrthNorm[\tkz@coeff](#2,#3)
\or% 4
- \tkz@VecKNorm[\tkz@ratio](#2,#3)
+ \tkz@VecKNorm[\tkz@coeff](#2,#3)
\or% 5
- \tkz@VecKColinearNorm[\tkz@ratio](#2,#3)
+ \tkz@VecKColinearNorm[\tkz@coeff](#2,#3)
\fi
\endgroup
}
@@ -102,33 +116,39 @@
%<--------------------------------------------------------------------------–>
% tkz@numv 0
\def\tkz@DefVectorColinearat[#1](#2,#3){%
+\iftkz@line@normed
+ \tkz@VecKColinearNorm[#1](#2,#3)
+\else
\begingroup
\pgfpointdiff{\pgfpointanchor{#2}{center}}{\pgfpointanchor{#3}{center}}%
\pgf@xa=\pgf@x\relax%
\pgf@ya=\pgf@y\relax%
\pgfinterruptboundingbox
- \path (\tkz@frompoint)--++(\tkz@ratio\pgf@xa,\tkz@ratio\pgf@ya) coordinate (tkzPointResult);
+ \path (\tkz@frompoint)--++(\tkz@coeff\pgf@xa,\tkz@coeff\pgf@ya) coordinate (tkzPointResult);
\endpgfinterruptboundingbox
\endgroup
+\fi
}
%<--------------------------------------------------------------------------–>
-% tkzVector K Orth coeff dans #1
-% v(AN) perp v(AB) v(AB) v(AN) sens direct cercle trigo
-% ||v(AN)||=||v(AB)||
+% tkzVector K Orth coeff dans #1
+% v(AN) perp v(AB) (v(AB) , v(AN) ) sens direct cercle trigo
+% ||v(AN)||=||v(AB)||
%<--------------------------------------------------------------------------–>
% tkz@numv 1
\def\tkzVecKOrth{\pgfutil@ifnextchar[{\tkz@VecKOrth}{\tkz@VecKOrth[1]}}
\def\tkz@VecKOrth[#1](#2,#3){%
+\iftkz@line@normed
+ \tkz@VecKOrthNorm[#1](#2,#3)
+\else
\begingroup
\pgfpointdiff{\pgfpointanchor{#2}{center}}{\pgfpointanchor{#3}{center}}%
\pgf@xa=-\pgf@y%
\pgf@ya=\pgf@x%
- \pgfmathparse{#1}
- \let\tkz@coeff\pgfmathresult
\pgfinterruptboundingbox
\path (#2)--++(\tkz@coeff\pgf@xa,\tkz@coeff\pgf@ya) coordinate (tkzPointResult);
\endpgfinterruptboundingbox
\endgroup
+\fi
}%
%<--------------------------------------------------------------------------–>
@@ -138,6 +158,9 @@
% tkz@numv 2
\def\tkzVecK{\pgfutil@ifnextchar[{\tkz@VecK}{\tkz@VecK[1]}}
\def\tkz@VecK[#1](#2,#3){%
+\iftkz@line@normed
+ \tkz@VecKNorm[#1](#2,#3)
+\else
\begingroup
\pgfpointdiff{\pgfpointanchor{#2}{center}}%
{\pgfpointanchor{#3}{center}}%
@@ -147,8 +170,9 @@
\let\tkz@coeff\pgfmathresult
\pgfinterruptboundingbox
\path (#2)--++(\tkz@coeff\pgf@xa,\tkz@coeff\pgf@ya) coordinate (tkzPointResult);
- \endpgfinterruptboundingbox
+ \endpgfinterruptboundingbox
\endgroup
+\fi
}%
%<--------------------------------------------------------------------------–>
% tkzVecKOrthNorm coeff dans #1
@@ -171,7 +195,6 @@
\endpgfinterruptboundingbox
\endgroup
}%
-
%<--------------------------------------------------------------------------–>
% VectorNormalised ou K*VectorNormalised
% A-->#2 B-->#3 N-->#4 v(AB) devient v(AN) tq ||v(AN)||=1 si #1=1
@@ -211,14 +234,12 @@
\endpgfinterruptboundingbox
\endgroup
}%
-
%<--------------------------------------------------------------------------–>
-% VecKCoLinear CN = K x AB #1 pt #2 pt #3 pt #4 nb #5 pt result
+% VecKCoLinear CN = K x AB #1 pt #2 pt #3 pt #4 nb #5 pt result
% il faut modifier cette macro : on supprime #3 pour la colinéarité
% Il suffit d'utiliser Replicate ou Duplicate coeff dans #1
% v(CD)=#1 x v(AB) #1 le coeff; #2-->A #3-->B #4-->C
%<--------------------------------------------------------------------------–>
-
\def\tkz@VecKCoLinear[#1](#2,#3,#4){%
\begingroup
\pgfpointdiff{\pgfpointanchor{#2}{center}}%
@@ -242,7 +263,6 @@
\endpgfinterruptboundingbox
\endgroup
}%
-
%<-------------------------------------------------------------------------–>
\makeatother
\endinput \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points.tex
index 774faae921..b6d8d45318 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points.tex
@@ -1,11 +1,20 @@
% tkz-obj-eu-points.tex
-% Copyright 2020 by Alain Matthes
-% This file may be distributed and/or modified
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-obj-eu-points.tex}
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+% utf8 encoding
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-obj-eu-points.tex}
\makeatletter
%add ExCenter
%<--------------------------------------------------------------------------–>
@@ -151,22 +160,19 @@
%<--------------------------------------------------------------------------–>
\def\tkzOrthoCenter(#1,#2,#3){% H orthocentre
\begingroup
+ \pgfinterruptboundingbox
\tkzUProjection(#1,#2)(#3)
\pgfnodealias{ort@pta}{tkzPointResult}
\tkzUProjection(#1,#3)(#2)
\pgfnodealias{ort@ptb}{tkzPointResult}
\tkzInterLL(#2,ort@ptb)(#3,ort@pta)
+ \endpgfinterruptboundingbox
\endgroup
}
\let\tkzDefOrthoCenter\tkzOrthoCenter
%<--------------------------------------------------------------------------–>
-% GravityCenter
+% GravityCenter modif 3.03
%<--------------------------------------------------------------------------–>
-% \def\tkzCentroid(#1,#2,#3){%
-% \begingroup
-% \path[coordinate](barycentric cs:#1=1,#2=1,#3=1)coordinate (tkzPointResult);
-% \endgroup
-% }
\def\tkzCentroid(#1,#2,#3){%
\begingroup
\pgf@process{\pgfpointanchor{#1}{center}}%
@@ -184,8 +190,9 @@
\advance\tkz@cy by\tkz@by\relax%
\divide\tkz@cx by3\relax%
\divide\tkz@cy by3\relax
- \pgfcoordinate{tkzPointResult}{\pgfqpoint{\tkz@cx}{\tkz@cy}}
- %\path[coordinate](barycentric cs:#1=1,#2=1,#3=1)coordinate (tkzPointResult);
+ \pgfinterruptboundingbox
+ \pgfcoordinate{tkzPointResult}{\pgfqpoint{\tkz@cx}{\tkz@cy}}
+ \endpgfinterruptboundingbox
\endgroup
}
\let\tkzBaryCenter\tkzCentroid
diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-polygons.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-polygons.tex
index b9b29a666e..d92acc3249 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-polygons.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-polygons.tex
@@ -1,11 +1,21 @@
% tkz-obj-eu-polygons.tex
-% Copyright 2020 by Alain Matthes
-% This file may be distributed and/or modified
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-obj-eu-polygons.tex}
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+% utf8 encoding
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-obj-eu-polygons.tex}
+% bug in regular polygon side 2020/03/03
\makeatletter
%<--------------------------------------------------------------------------–>
% Polygon
@@ -36,10 +46,10 @@
\def\tkzDefGoldRectangle(#1,#2){
\begingroup
- \tkzVecKOrth[-\tkzInvPhi](#2,#1)
- \pgfnodealias{tkzFirstPointResult}{tkzPointResult}
- \tkzVecKOrth[\tkzInvPhi](#1,#2)
- \pgfnodealias{tkzSecondPointResult}{tkzPointResult}
+ \tkzDefPointWith[K=-\tkzInvPhi](#2,#1)
+ \pgfnodealias{tkzFirstPointResult}{tkzPointResult}
+ \tkzDefPointWith[K=\tkzInvPhi](#1,#2)
+ \pgfnodealias{tkzSecondPointResult}{tkzPointResult}
\endgroup
}
\def\tkzDrawGoldRectangle{\pgfutil@ifnextchar[{\tkz@DrawGoldRectangle}{%
@@ -50,14 +60,13 @@
\pgfkeys{/defregpoly/.cd,
name/.store in = \tkz@regpolname,
sides/.store in = \tkz@regpolsides,
- center/.code = \def\tkz@numregpol{0},
- side/.code = \def\tkz@numregpol{1},
- center,
- name = P,
- sides = 5
+ center/.code = \def\tkz@numregpol{0},
+ side/.code = \def\tkz@numregpol{1},
+ name/.default = P,
+ sides/.default = 5,
+ center
}
-\def\tkzDefRegPolygon{\pgfutil@ifnextchar[{\tkz@DefRegPolygon}{%
- \tkz@DefRegPolygon[]}}
+\def\tkzDefRegPolygon{\pgfutil@ifnextchar[{\tkz@DefRegPolygon}{\tkz@DefRegPolygon[]}}
\def\tkz@DefRegPolygon[#1](#2,#3){%
\begingroup
\pgfqkeys{/defregpoly}{#1}
@@ -85,7 +94,7 @@
\pgfmathsetmacro{\tkz@regangleside}{(180-\tkz@regangle)/2}
\tkzDefMidPoint(#1,#2)
\pgfnodealias{tkz@tempPt}{tkzPointResult}
-\tkzCalcLength[cm](tkz@tempPt,B) \tkzGetLength{tkz@len}
+\tkzCalcLength[cm](tkz@tempPt,#1) \tkzGetLength{tkz@len}
\pgfmathsetmacro{\tkz@inscriberadius}{%
\tkz@len*tan(90*(\tkz@regpolsides-2)/\tkz@regpolsides)}
\tkzDefPointWith[orthogonal normed,K=\tkz@inscriberadius](tkz@tempPt,#2)
diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-protractor.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-protractor.tex
index b1426b206c..bfd37bc1ef 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-protractor.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-protractor.tex
@@ -1,11 +1,20 @@
% tkz-obj-eu-protractor.tex
-% Copyright 2020 by Alain Matthes
-% This file may be distributed and/or modified
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
- \typeout{2020/01/24 3.02c tkz-obj-eu-protractor.tex}
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+% utf8 encoding
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+ \typeout{2020/03/03 3.05c tkz-obj-eu-protractor.tex}
\makeatletter
%<--------------------------------------------------------------------------–>
% !!! idea from Y. Combe !!!
@@ -45,7 +54,6 @@
\draw [>=stealth',->, thick,black] (0:2.5) arc(0:32:2.5);
\draw [>=stealth',->, thick,black] (0:2) arc(0:32:2);
\draw [>=stealth',->, thick,black] (0:1.5) arc(0:32:1.5);
-\tkzActivOn
}
\def\FullProtractorReturn{%
@@ -94,8 +102,9 @@
\tkz@@extractxy{#2}
\global\tkz@ax\pgf@x
\global\tkz@ay\pgf@y
- \tkzFindSlopeAngle(#2,#3)\tkzGetAngle{cmdMO@Rap@rotate}%
-\iftkz@RappReturn
+ \tkzFindSlopeAngle(#2,#3)
+ \tkzGetAngle{cmdMO@Rap@rotate}%
+ \iftkz@RappReturn
\global\let\tkz@@Protractor\FullProtractorReturn
\fi
\pgfmathsetlengthmacro{\MO@lw}{\cmdMO@Rap@lw * \cmdMO@Rap@scale}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-sectors.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-sectors.tex
index 24fc845673..fad5b8e70b 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-sectors.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-sectors.tex
@@ -1,11 +1,20 @@
% tkz-obj-eu-sectors.tex
-% Copyright 2020 by Alain Matthes
-% This file may be distributed and/or modified
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-obj-eu-sectors.tex}
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+% utf8 encoding
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-obj-eu-sectors.tex}
\makeatletter
%<----------------------- Sectors ------------------------------–>
\tikzset{sstyle/.style={#1}}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-show.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-show.tex
index d1eb78b30e..40a39c87e3 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-show.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-show.tex
@@ -1,11 +1,20 @@
%tkz-obj-eu-show.tex
-% Copyright 2020 by Alain Matthes
-% This file may be distributed and/or modified
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-obj-eu-show.tex}
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+% utf8 encoding
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-obj-eu-show.tex}
\makeatletter
%<--------------------------------------------------------------------------–>
% finding specific points in a triangle
@@ -140,7 +149,7 @@
gap = -1,
size = 1}
\pgfkeys{show/.cd,#1}
- \tkzVecKOrth(#2,#3)
+ \tkzDefPointWith(#2,#3)
\pgfnodealias{tkz@OLtmp}{tkzPointResult}
\tkz@VecKCoLinear[1](#2,tkz@OLtmp,#4)
\pgfnodealias{tkzPointCo}{tkzPointResult}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-triangles.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-triangles.tex
index 5fe6b5d069..48fa5b973f 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-triangles.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-triangles.tex
@@ -1,11 +1,21 @@
% tkz-obj-eu-triangles.tex
-% Copyright 2019 by Alain Matthes
-% This file may be distributed and/or modified
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-obj-eu-triangles.tex}
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+
+% utf8 encoding
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-obj-eu-triangles.tex}
\makeatletter
%<--------------------------------------------------------------------------–>
% Triangle Equilateral
@@ -36,17 +46,17 @@
\def\tkzDefTwoOne(#1,#2){
\begingroup
- \tkzVecKOrth[-.5](#2,#1)
+ \tkzDefPointWith[K=-.5](#2,#1)
\endgroup
}
\def\tkzDefPythagore(#1,#2){
\begingroup
- \tkzVecKOrth[-0.75](#2,#1)
+ \tkzDefPointWith[K=-.75](#2,#1)
\endgroup
}
\def\tkzDefSchoolTriangle(#1,#2){
\begingroup
- \tkzVecKOrth[-1](#2,#1)
+ \tkzDefPointWith[K=-1](#2,#1)
\pgfnodealias{tkz@a}{tkzPointResult}
\tkzURotateAngle(#1,30)(#2)
\tkzInterLL(#1,tkzPointResult)(#2,tkz@a)
@@ -65,13 +75,13 @@
}
\def\tkzDefGoldenTriangle(#1,#2){
\begingroup
- \tkzVecKOrth[-\tkzInvPhi](#2,#1)
+ \tkzDefPointWith[K=-\tkzInvPhi](#2,#1)
\endgroup
}
\def\tkzDefCheopsTriangle(#1,#2){
\begingroup
-\tkzDefMidPoint(#1,#2)
- \tkzVecKOrth[-\tkzSqrtPhi](tkzPointResult,#1)
+ \tkzDefMidPoint(#1,#2)
+ \tkzDefPointWith[K=-\tkzSqrtPhi](tkzPointResult,#1)
\endgroup
}
\def\tkzDefTwoAnglesTriangle(#1,#2){
@@ -127,61 +137,11 @@
\or% 7
\tkzDefCheopsTriangle(#2,#3)
\or% 8
- \tkzDefTwoAnglesTriangle(#2,#3) \fi
+ \tkzDefTwoAnglesTriangle(#2,#3)
+ \fi
\endgroup
}
%<--------------------------------------------------------------------------–>
-% Draw Triangles
-%<--------------------------------------------------------------------------–>
-
-\def\tkz@numdtr{0}
-\pgfkeys{/drawtriangle/.cd,
- equilateral/.code = {\def\tkz@numdtr{0}},
- half/.code = {\def\tkz@numdtr{1}},
- pythagore/.code = {\def\tkz@numdtr{2}},
- school/.code = {\def\tkz@numdtr{3}},
- golden/.code = {\def\tkz@numdtr{4}},
- sublime/.code = {\def\tkz@numdtr{4}},
- euclide/.code = {\def\tkz@numdtr{5}},
- gold/.code = {\def\tkz@numdtr{6}},
- cheops/.code = {\def\tkz@numdtr{7}},
- two angles/.code args = {#1 and #2}{\def\tkz@numdtr{8}%
- \def\tkz@alpha{#1}%
- \def\tkz@beta{#2}},
- equilateral,
- /drawtriangle/.search also={/tikz}
-}
-
-\def\tkzDrawTriangle{\pgfutil@ifnextchar[{\tkz@DrawTriangle}{%
- \tkz@DrawTriangle[]}}
-\def\tkz@DrawTriangle[#1](#2,#3){%
-\begingroup
-\pgfkeys{/drawtriangle/.cd,equilateral}
-\pgfqkeys{/drawtriangle}{#1}
-\ifcase\tkz@numdtr%
- \tkzDefEquilateral(#2,#3)
-\or% 1
- \tkzDefTwoOne(#2,#3)
-\or% 2
- \tkzDefPythagore(#2,#3)
-\or% 3
- \tkzDefSchoolTriangle(#2,#3)
-\or% 4
- \tkzDefGoldenTriangle(#2,#3)
-\or% 5
- \tkzDefEuclideTriangle(#2,#3)
-\or% 6
- \tkzDefGoldTriangle(#2,#3)
-\or% 7
- \tkzDefCheopsTriangle(#2,#3)
-\or% 8
- \tkzDefTwoAnglesTriangle(#2,#3)
-\fi
- \draw[/drawtriangle/.cd,line style,#1] (#2)--(#3)--(tkzPointResult)--cycle;
-\endgroup
-}
-
-%<--------------------------------------------------------------------------–>
% les triangles sspécifiques
%<--------------------------------------------------------------------------–>
@@ -250,16 +210,15 @@
%<--------------------------------------------------------------------------–
%<--------------------------------------------------------------------------–>
\def\@DefIncentralTriangle(#1,#2,#3)(#4,#5){%
- \def\tkz@tmp{#5}%
+\def\tkz@tmp{#5}%
\tkz@recuplast(#3)
\tkzDefBisectorLine(#2,#1,\tkz@last)
- \tkzInterLL(#2,\tkz@last)(#1,tkzPointResult)
- \pgfnodealias{#4}{tkzPointResult}
+ \tkzInterLL(#2,\tkz@last)(#1,tkzPointResult)
+ \pgfnodealias{#4}{tkzPointResult}
\ifx\tkz@tmp\tkz@stop\else\@DefIncentralTriangle(#2,#3)(#5)\fi
\pgfnodealias{\tkz@pttr@name#4}{#4}
}
-
\def\tkzDefIncentralTriangle{\pgfutil@ifnextchar[{%
\tkz@DefIncentralTriangle}{%
\tkz@DefIncentralTriangle[]}}
@@ -397,12 +356,14 @@
\let\tkzDefMedialTriangle\tkzDefCentroidTriangle
\let\tkzDefMidpointTriangle\tkzDefCentroidTriangle
%<--------------------------------------------------------------------------–>
-% Orthic Triangle H Ha Hb Hc
+% Orthic Triangle H Ha Hb Hc modif 3.03
%<--------------------------------------------------------------------------–>
\def\@DefOrthicTriangle(#1,#2,#3)(#4,#5){%
\def\tkz@tmp{#5}%
\tkz@recuplast(#3)
- \tkzUProjection(#2,\tkz@last)(#1)
+ \pgfinterruptboundingbox
+ \tkzUProjection(#2,\tkz@last)(#1)
+ \endpgfinterruptboundingbox
\pgfnodealias{#4}{tkzPointResult}
\ifx\tkz@tmp\tkz@stop\else\@DefOrthicTriangle(#2,#3)(#5)\fi
\pgfnodealias{\tkz@pttr@name#4}{#4}
diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-angles.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-angles.tex
index 85595fe4ca..9a88ffeaac 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-angles.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-angles.tex
@@ -1,11 +1,20 @@
% tkz-tools-angles.tex
-% Copyright 2020 by Alain Matthes
-% This file may be distributed and/or modified
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-tools-angles.tex}
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+% utf8 encoding
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-tools-angles.tex}
\makeatletter
%<--------------------------------------------------------------------------–>
%<--------------------------------------------------------------------------–>
diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-intersections.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-intersections.tex
index 7bb8810796..58a8e6e6c0 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-intersections.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-intersections.tex
@@ -1,11 +1,20 @@
% tkz-tools-intersections.tex
-% Copyright 2020 by Alain Matthes
-% This file may be distributed and/or modified
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-tools-intersections.tex}
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+% utf8 encoding
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-tools-intersections.tex}
\makeatletter
%<--------------------------------------------------------------------------–>
% intersection de deux lignes
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-math.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-math.tex
index f42d57397b..97bc6c698a 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-math.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-math.tex
@@ -1,11 +1,20 @@
% tkz-tools-math.tex
-% Copyright 2020 by Alain Matthes
-% This file may be distributed and/or modified
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-\def\fileversion{3.02c}
-\def\filedate{2020/01/24}
-\typeout{2020/01/24 3.02c tkz-tools-math.tex}
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+% utf8 encoding
+\def\fileversion{3.05c}
+\def\filedate{2020/03/03}
+\typeout{2020/03/03 3.05c tkz-tools-math.tex}
\makeatletter
%<-------------------------------------------------------------------------->
% \tkzpointnormalised normalise un point A-->A' tq ||v(OA')=1||