From 25b83ac051a8ec3bf79f47e3c3c66b3567a3216a Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 6 Feb 2024 03:00:37 +0000 Subject: CTAN sync 202402060300 --- FILES.byname | 217 ++++--- FILES.byname.gz | Bin 2634235 -> 2634356 bytes FILES.last07days | 189 +++--- biblio/ctan-bibdata/ctan.bib | 35 +- fonts/dictsym/README | 17 +- fonts/dictsym/afm/dictsym.afm | 707 +++++++++++++++++++++ fonts/dictsym/dictsym.afm | 707 --------------------- fonts/dictsym/dictsym.pdf | Bin 24058 -> 0 bytes fonts/dictsym/dictsym.pfb | Bin 29914 -> 0 bytes fonts/dictsym/dictsym.pfm | Bin 685 -> 0 bytes fonts/dictsym/doc/dictsym.pdf | Bin 0 -> 24058 bytes fonts/dictsym/doc/dictsym.tex | 64 ++ fonts/dictsym/latex/dictsym.sty | 68 ++ fonts/dictsym/map/dictsym.map | 1 + fonts/dictsym/tfm/dictsym.tfm | Bin 0 -> 1548 bytes fonts/dictsym/type1/dictsym.pfb | Bin 0 -> 29914 bytes fonts/dictsym/type1/dictsym.pfm | Bin 0 -> 685 bytes fonts/dictsym/vtex/dictsym.ali | 4 + macros/latex/contrib/easybook/easybook.dtx | 6 +- macros/latex/contrib/easybook/easybook.pdf | Bin 598476 -> 596407 bytes macros/latex/contrib/easybook/easybook.tex | 9 +- macros/latex/contrib/expex-glossonly/README.md | 4 +- .../contrib/expex-glossonly/expex-glossonly.pdf | Bin 52949 -> 53009 bytes .../contrib/expex-glossonly/expex-glossonly.sty | 8 +- .../contrib/expex-glossonly/expex-glossonly.tex | 6 +- .../expex-glossonly/testfiles/gb4e-expex.pdf | Bin 5519 -> 5519 bytes .../expex-glossonly/testfiles/linguex-expex.pdf | Bin 5438 -> 9201 bytes .../expex-glossonly/testfiles/linguex-expex.tex | 15 +- macros/latex/contrib/spbmark/spbmark.pdf | Bin 86672 -> 86873 bytes macros/latex/contrib/spbmark/spbmark.sty | 25 +- macros/latex/contrib/spbmark/spbmark.tex | 24 +- macros/latex/contrib/tkz/tkz-elements/README.md | 16 +- .../doc/latex/TKZdoc-elements-classes-circle.tex | 14 +- .../doc/latex/TKZdoc-elements-classes-line.tex | 5 +- .../doc/latex/TKZdoc-elements-classes-point.tex | 89 ++- .../latex/TKZdoc-elements-classes-rectangle.tex | 4 +- .../doc/latex/TKZdoc-elements-classes-triangle.tex | 81 ++- .../doc/latex/TKZdoc-elements-classes-vectors.tex | 193 ++++++ .../doc/latex/TKZdoc-elements-examples.tex | 480 +++++++------- .../doc/latex/TKZdoc-elements-indepthstudy.tex | 20 +- .../doc/latex/TKZdoc-elements-main.tex | 52 +- .../doc/latex/TKZdoc-elements-organization.tex | 11 +- .../doc/latex/TKZdoc-elements-presentation.tex | 12 +- .../contrib/tkz/tkz-elements/doc/tkz-elements.pdf | Bin 642250 -> 656453 bytes .../tkz/tkz-elements/latex/tkz-elements.sty | 21 +- .../tkz/tkz-elements/latex/tkz_elements_circle.lua | 41 +- .../tkz/tkz-elements/latex/tkz_elements_class.lua | 4 +- .../tkz-elements/latex/tkz_elements_ellipse.lua | 9 +- .../latex/tkz_elements_functions_circles.lua | 11 +- .../latex/tkz_elements_functions_intersections.lua | 21 +- .../latex/tkz_elements_functions_lines.lua | 13 +- .../latex/tkz_elements_functions_maths.lua | 41 +- .../latex/tkz_elements_functions_points.lua | 4 +- .../latex/tkz_elements_functions_regular.lua | 4 +- .../latex/tkz_elements_functions_triangles.lua | 9 +- .../tkz/tkz-elements/latex/tkz_elements_line.lua | 39 +- .../tkz/tkz-elements/latex/tkz_elements_main.lua | 4 +- .../tkz/tkz-elements/latex/tkz_elements_misc.lua | 4 +- .../latex/tkz_elements_parallelogram.lua | 9 +- .../tkz/tkz-elements/latex/tkz_elements_point.lua | 18 +- .../latex/tkz_elements_quadrilateral.lua | 9 +- .../tkz-elements/latex/tkz_elements_rectangle.lua | 11 +- .../tkz-elements/latex/tkz_elements_regular.lua | 4 +- .../tkz/tkz-elements/latex/tkz_elements_square.lua | 13 +- .../tkz-elements/latex/tkz_elements_triangle.lua | 11 +- .../tkz/tkz-elements/latex/tkz_elements_vector.lua | 72 ++- .../texlive/tlnet/tlpkg/installer/ctan-mirrors.pl | 4 - systems/texlive/tlnet/tlpkg/texlive.tlpdb | 162 +++-- systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 | 2 +- systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 | 2 +- .../texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc | 16 +- systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz | Bin 2546876 -> 2547588 bytes systems/texlive/tlnet/tlpkg/translations/ja.po | 43 +- timestamp | 2 +- 74 files changed, 2152 insertions(+), 1534 deletions(-) create mode 100644 fonts/dictsym/afm/dictsym.afm delete mode 100644 fonts/dictsym/dictsym.afm delete mode 100644 fonts/dictsym/dictsym.pdf delete mode 100644 fonts/dictsym/dictsym.pfb delete mode 100644 fonts/dictsym/dictsym.pfm create mode 100644 fonts/dictsym/doc/dictsym.pdf create mode 100644 fonts/dictsym/doc/dictsym.tex create mode 100644 fonts/dictsym/latex/dictsym.sty create mode 100644 fonts/dictsym/map/dictsym.map create mode 100644 fonts/dictsym/tfm/dictsym.tfm create mode 100644 fonts/dictsym/type1/dictsym.pfb create mode 100644 fonts/dictsym/type1/dictsym.pfm create mode 100644 fonts/dictsym/vtex/dictsym.ali create mode 100644 macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-vectors.tex diff --git a/FILES.byname b/FILES.byname index a733a260f3..cbfe601fd3 100644 --- a/FILES.byname +++ b/FILES.byname @@ -2077,12 +2077,12 @@ 2023/10/05 | 1710 | biblio/citation-style-language/README.md 2023/10/05 | 12878 | biblio/citation-style-language/vancouver.csl 2023/10/05 | 4531754 | biblio/citation-style-language.zip -2024/02/04 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx +2024/02/05 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx 2022/10/08 | 127 | biblio/ctan-bibdata/biblatex-ctan/ctan.cbx -2024/02/04 | 2843715 | biblio/ctan-bibdata/ctan.bib -2024/02/04 | 3708800 | biblio/ctan-bibdata/ctan.pdf +2024/02/05 | 2844136 | biblio/ctan-bibdata/ctan.bib +2024/02/05 | 3708800 | biblio/ctan-bibdata/ctan.pdf 2023/01/16 | 1489 | biblio/ctan-bibdata/README -2024/02/04 | 4116502 | biblio/ctan-bibdata.zip +2024/02/05 | 4116598 | biblio/ctan-bibdata.zip 2023/02/23 | 3126 | biblio/pbibtex/pbibtex-base/cpp.awk 2023/02/23 | 1009 | biblio/pbibtex/pbibtex-base/generate.sh 2023/02/23 | 22362 | biblio/pbibtex/pbibtex-base/jabbrv.bst @@ -5444,7 +5444,7 @@ 1990/10/02 | 5440 | dviware/vutex/vaxvms.hlp 1990/10/02 | 812 | dviware/vutex/vaxvms.ins 1990/10/02 | 127576 | dviware/vutex/vutex.web -2024/02/04 | 86435 | FILES.last07days +2024/02/05 | 70277 | FILES.last07days 2021/07/24 | 1139410 | fonts/aboensis/Aboensis.glyphs 2021/07/24 | 18907382 | fonts/aboensis/aboensis.pdf 2021/07/24 | 137860 | fonts/aboensis/Aboensis-Regular.otf @@ -32463,13 +32463,17 @@ 2012/12/11 | 17233 | fonts/dice/dice3d.mf 2001/01/30 | 1867 | fonts/dice/dice3d.tex 2012/12/11 | 4146 | fonts/dice.zip -2004/07/25 | 30565 | fonts/dictsym/dictsym.afm -2004/07/26 | 24058 | fonts/dictsym/dictsym.pdf -2004/07/25 | 29914 | fonts/dictsym/dictsym.pfb -2004/08/04 | 685 | fonts/dictsym/dictsym.pfm -2004/07/26 | 21483 | fonts/dictsym/dictsym.zip -2004/08/09 | 5158 | fonts/dictsym/README -2005/05/20 | 73018 | fonts/dictsym.zip +2004/07/25 | 30565 | fonts/dictsym/afm/dictsym.afm +2024/02/04 | 24058 | fonts/dictsym/doc/dictsym.pdf +2024/02/04 | 2428 | fonts/dictsym/doc/dictsym.tex +2024/02/04 | 2280 | fonts/dictsym/latex/dictsym.sty +2024/02/04 | 30 | fonts/dictsym/map/dictsym.map +2024/02/04 | 5201 | fonts/dictsym/README +2024/02/04 | 1548 | fonts/dictsym/tfm/dictsym.tfm +2004/07/25 | 29914 | fonts/dictsym/type1/dictsym.pfb +2004/08/04 | 685 | fonts/dictsym/type1/dictsym.pfm +2024/02/04 | 76 | fonts/dictsym/vtex/dictsym.ali +2024/02/05 | 55578 | fonts/dictsym.zip 1993/02/28 | 14398 | fonts/dingbat/ark10.mf 2001/04/27 | 10472 | fonts/dingbat/dingbat.dtx 2001/04/26 | 1884 | fonts/dingbat/dingbat.ins @@ -232321,12 +232325,12 @@ 2008/02/10 | 19110 | macros/latex/contrib/ean13isbn/License.txt 2021/01/24 | 422 | macros/latex/contrib/ean13isbn/README 2021/01/24 | 322624 | macros/latex/contrib/ean13isbn.zip -2024/02/04 | 75050 | macros/latex/contrib/easybook/easybook.dtx +2024/02/05 | 75050 | macros/latex/contrib/easybook/easybook.dtx 2024/01/04 | 2081 | macros/latex/contrib/easybook/easybook.ins -2024/02/04 | 598476 | macros/latex/contrib/easybook/easybook.pdf -2024/02/04 | 88420 | macros/latex/contrib/easybook/easybook.tex +2024/02/05 | 596407 | macros/latex/contrib/easybook/easybook.pdf +2024/02/05 | 88459 | macros/latex/contrib/easybook/easybook.tex 2024/01/03 | 801 | macros/latex/contrib/easybook/README.md -2024/02/04 | 641452 | macros/latex/contrib/easybook.zip +2024/02/05 | 639205 | macros/latex/contrib/easybook.zip 2009/06/17 | 82589 | macros/latex/contrib/easy/doc/docbib.pdf 2009/06/17 | 78378 | macros/latex/contrib/easy/doc/docbmat.pdf 2009/06/17 | 99132 | macros/latex/contrib/easy/doc/doceqn.pdf @@ -233880,17 +233884,17 @@ 2008/06/21 | 103808 | macros/latex/contrib/expdlist/expdlist.pdf 1999/09/23 | 2919 | macros/latex/contrib/expdlist/readme.txt 2008/06/23 | 157269 | macros/latex/contrib/expdlist.zip -2023/11/15 | 52949 | macros/latex/contrib/expex-glossonly/expex-glossonly.pdf -2023/11/15 | 4569 | macros/latex/contrib/expex-glossonly/expex-glossonly.sty -2023/11/15 | 7510 | macros/latex/contrib/expex-glossonly/expex-glossonly.tex -2023/11/15 | 1107 | macros/latex/contrib/expex-glossonly/README.md -2023/11/15 | 7800 | macros/latex/contrib/expex-glossonly/testfiles/covington-expex.pdf -2023/11/15 | 535 | macros/latex/contrib/expex-glossonly/testfiles/covington-expex.tex -2023/11/15 | 5519 | macros/latex/contrib/expex-glossonly/testfiles/gb4e-expex.pdf -2023/11/15 | 567 | macros/latex/contrib/expex-glossonly/testfiles/gb4e-expex.tex -2023/11/15 | 5438 | macros/latex/contrib/expex-glossonly/testfiles/linguex-expex.pdf -2023/11/15 | 767 | macros/latex/contrib/expex-glossonly/testfiles/linguex-expex.tex -2023/11/15 | 75830 | macros/latex/contrib/expex-glossonly.zip +2024/02/05 | 53009 | macros/latex/contrib/expex-glossonly/expex-glossonly.pdf +2024/02/05 | 4740 | macros/latex/contrib/expex-glossonly/expex-glossonly.sty +2024/02/05 | 7564 | macros/latex/contrib/expex-glossonly/expex-glossonly.tex +2024/02/05 | 1107 | macros/latex/contrib/expex-glossonly/README.md +2024/02/05 | 7800 | macros/latex/contrib/expex-glossonly/testfiles/covington-expex.pdf +2024/02/05 | 535 | macros/latex/contrib/expex-glossonly/testfiles/covington-expex.tex +2024/02/05 | 5519 | macros/latex/contrib/expex-glossonly/testfiles/gb4e-expex.pdf +2024/02/05 | 567 | macros/latex/contrib/expex-glossonly/testfiles/gb4e-expex.tex +2024/02/05 | 9201 | macros/latex/contrib/expex-glossonly/testfiles/linguex-expex.pdf +2024/02/05 | 1138 | macros/latex/contrib/expex-glossonly/testfiles/linguex-expex.tex +2024/02/05 | 79597 | macros/latex/contrib/expex-glossonly.zip 2000/10/16 | 1067 | macros/latex/contrib/export/00readme 2000/10/16 | 14070 | macros/latex/contrib/export/dvipaste.sty 2000/10/16 | 28622 | macros/latex/contrib/export/export.dtx @@ -250537,11 +250541,11 @@ 2016/10/05 | 1964 | macros/latex/contrib/spalign/spalign.ins 2016/10/06 | 136549 | macros/latex/contrib/spalign/spalign.pdf 2016/10/06 | 132943 | macros/latex/contrib/spalign.zip -2024/01/02 | 581 | macros/latex/contrib/spbmark/README.md -2024/02/04 | 86672 | macros/latex/contrib/spbmark/spbmark.pdf -2024/02/04 | 15394 | macros/latex/contrib/spbmark/spbmark.sty -2024/02/04 | 15379 | macros/latex/contrib/spbmark/spbmark.tex -2024/02/04 | 93007 | macros/latex/contrib/spbmark.zip +2024/01/03 | 581 | macros/latex/contrib/spbmark/README.md +2024/02/05 | 86873 | macros/latex/contrib/spbmark/spbmark.pdf +2024/02/05 | 15525 | macros/latex/contrib/spbmark/spbmark.sty +2024/02/05 | 16125 | macros/latex/contrib/spbmark/spbmark.tex +2024/02/05 | 93339 | macros/latex/contrib/spbmark.zip 2010/10/31 | 241052 | macros/latex/contrib/sphack/sphack-doc.pdf 2010/10/31 | 4122 | macros/latex/contrib/sphack/sphack-doc.tex 2010/12/23 | 4230 | macros/latex/contrib/sphack/sphack.sty @@ -253310,31 +253314,32 @@ 2021/01/21 | 1065010 | macros/latex/contrib/tkz/tkz-berge.zip 2023/12/13 | 1719 | macros/latex/contrib/tkz/tkz-elements/doc/latex/gold_preamble.lua 2024/01/09 | 352 | macros/latex/contrib/tkz/tkz-elements/doc/latex/sangaku.lua -2024/01/05 | 32944 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-circle.tex +2024/02/04 | 32971 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-circle.tex 2024/01/08 | 12905 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-ellipse.tex -2024/01/08 | 28698 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-line.tex +2024/02/04 | 28799 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-line.tex 2024/01/09 | 12872 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-misc.tex 2024/01/04 | 4300 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-parallelogram.tex -2024/01/08 | 19342 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-point.tex +2024/02/04 | 22017 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-point.tex 2024/01/04 | 4702 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-quadrilateral.tex -2024/01/04 | 8297 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-rectangle.tex +2024/02/03 | 8297 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-rectangle.tex 2024/01/04 | 3158 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-regular.tex 2024/01/04 | 5144 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-square.tex 2024/01/05 | 3257 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes.tex -2024/01/09 | 14228 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-triangle.tex +2024/02/03 | 15164 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-triangle.tex +2024/02/04 | 6338 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-vectors.tex 2023/12/05 | 5053 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-convention.tex -2024/01/08 | 135503 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-examples.tex -2024/01/07 | 21579 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-indepthstudy.tex +2024/02/04 | 135978 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-examples.tex +2024/02/04 | 21599 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-indepthstudy.tex 2023/12/23 | 7712 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-intersection.tex 2023/12/24 | 88 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-inversion.tex -2024/01/16 | 21987 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-main.tex -2024/01/09 | 3607 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-organization.tex -2023/12/22 | 9164 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-presentation.tex +2024/02/04 | 22957 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-main.tex +2024/02/04 | 3529 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-organization.tex +2024/02/04 | 9185 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-presentation.tex 2023/11/30 | 2777 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-structure.tex 2023/12/24 | 65 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-tests.tex 2024/01/09 | 4677 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-transferts.tex 2024/01/09 | 9289 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-why.tex -2024/01/16 | 642250 | macros/latex/contrib/tkz/tkz-elements/doc/tkz-elements.pdf +2024/02/04 | 656453 | macros/latex/contrib/tkz/tkz-elements/doc/tkz-elements.pdf 2023/10/25 | 20611 | macros/latex/contrib/tkz/tkz-elements/examples/tkz-elements-demo_1.pdf 2023/10/26 | 1491 | macros/latex/contrib/tkz/tkz-elements/examples/tkz-elements-demo_1.tex 2023/12/02 | 16392 | macros/latex/contrib/tkz/tkz-elements/examples/tkz-elements-demo_2.pdf @@ -253343,30 +253348,30 @@ 2023/10/25 | 2359 | macros/latex/contrib/tkz/tkz-elements/examples/tkz-elements-demo_3.tex 2023/11/09 | 11343 | macros/latex/contrib/tkz/tkz-elements/examples/tkz-elements-demo_4.pdf 2023/10/31 | 807 | macros/latex/contrib/tkz/tkz-elements/examples/tkz-elements-demo_4.tex -2024/01/16 | 8280 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_circle.lua -2024/01/16 | 1307 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_class.lua -2024/01/16 | 3903 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_ellipse.lua -2024/01/16 | 4685 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_circles.lua -2024/01/16 | 6464 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_intersections.lua -2024/01/16 | 3250 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_lines.lua -2024/01/16 | 2794 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_maths.lua -2024/01/16 | 2529 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_points.lua -2024/01/16 | 1021 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_regular.lua -2024/01/16 | 9130 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_triangles.lua -2024/01/16 | 12914 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_line.lua -2024/01/16 | 1490 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_main.lua -2024/01/16 | 1827 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_misc.lua -2024/01/16 | 2058 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_parallelogram.lua -2024/01/16 | 7860 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_point.lua -2024/01/16 | 2138 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_quadrilateral.lua -2024/01/16 | 4178 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_rectangle.lua -2024/01/16 | 2328 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_regular.lua -2024/01/16 | 3245 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_square.lua -2024/01/16 | 1789 | macros/latex/contrib/tkz/tkz-elements/latex/tkz-elements.sty -2024/01/16 | 11651 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_triangle.lua -2024/01/16 | 1388 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_vector.lua -2024/01/16 | 7236 | macros/latex/contrib/tkz/tkz-elements/README.md -2024/01/16 | 808825 | macros/latex/contrib/tkz/tkz-elements.zip +2024/02/04 | 8225 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_circle.lua +2024/02/04 | 1307 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_class.lua +2024/02/04 | 3875 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_ellipse.lua +2024/02/04 | 4662 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_circles.lua +2024/02/04 | 6388 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_intersections.lua +2024/02/04 | 3210 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_lines.lua +2024/02/04 | 2861 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_maths.lua +2024/02/04 | 2529 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_points.lua +2024/02/04 | 1021 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_regular.lua +2024/02/04 | 9107 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_triangles.lua +2024/02/04 | 12805 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_line.lua +2024/02/04 | 1490 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_main.lua +2024/02/04 | 1827 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_misc.lua +2024/02/04 | 2032 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_parallelogram.lua +2024/02/04 | 8104 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_point.lua +2024/02/04 | 2112 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_quadrilateral.lua +2024/02/04 | 4156 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_rectangle.lua +2024/02/04 | 2328 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_regular.lua +2024/02/04 | 3227 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_square.lua +2024/02/04 | 2335 | macros/latex/contrib/tkz/tkz-elements/latex/tkz-elements.sty +2024/02/04 | 11688 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_triangle.lua +2024/02/04 | 2101 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_vector.lua +2024/02/04 | 7962 | macros/latex/contrib/tkz/tkz-elements/README.md +2024/02/05 | 826324 | macros/latex/contrib/tkz/tkz-elements.zip 2023/01/17 | 10308 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-angles.tex 2022/06/11 | 5093 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-circleby.tex 2023/10/14 | 11711 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-circles.tex @@ -306244,7 +306249,7 @@ 2024/01/14 | 1668 | systems/texlive/tlnet/archive/collection-pictures.r69409.tar.xz 2023/10/28 | 1004 | systems/texlive/tlnet/archive/collection-plaingeneric.r68675.tar.xz 2022/12/27 | 816 | systems/texlive/tlnet/archive/collection-pstricks.r65367.tar.xz -2024/01/19 | 1740 | systems/texlive/tlnet/archive/collection-publishers.r69489.tar.xz +2024/02/05 | 1744 | systems/texlive/tlnet/archive/collection-publishers.r69701.tar.xz 2020/03/04 | 340 | systems/texlive/tlnet/archive/collection-texworks.r54074.tar.xz 2023/02/20 | 388 | systems/texlive/tlnet/archive/collection-wintools.r65952.tar.xz 2024/01/17 | 652 | systems/texlive/tlnet/archive/collection-xetex.r69452.tar.xz @@ -306561,12 +306566,12 @@ 2019/02/28 | 464 | systems/texlive/tlnet/archive/crossrefware.amd64-freebsd.r45927.tar.xz 2019/02/28 | 464 | systems/texlive/tlnet/archive/crossrefware.amd64-netbsd.r45927.tar.xz 2019/02/28 | 460 | systems/texlive/tlnet/archive/crossrefware.armhf-linux.r45927.tar.xz -2022/10/20 | 345376 | systems/texlive/tlnet/archive/crossrefware.doc.r64754.tar.xz +2024/02/05 | 345152 | systems/texlive/tlnet/archive/crossrefware.doc.r69700.tar.xz 2019/02/28 | 460 | systems/texlive/tlnet/archive/crossrefware.i386-freebsd.r45927.tar.xz 2019/02/28 | 460 | systems/texlive/tlnet/archive/crossrefware.i386-linux.r45927.tar.xz 2019/02/28 | 460 | systems/texlive/tlnet/archive/crossrefware.i386-netbsd.r45927.tar.xz 2019/02/28 | 460 | systems/texlive/tlnet/archive/crossrefware.i386-solaris.r45927.tar.xz -2022/10/20 | 16124 | systems/texlive/tlnet/archive/crossrefware.r64754.tar.xz +2024/02/05 | 16368 | systems/texlive/tlnet/archive/crossrefware.r69700.tar.xz 2021/02/25 | 468 | systems/texlive/tlnet/archive/crossrefware.universal-darwin.r57908.tar.xz 2023/02/20 | 2480 | systems/texlive/tlnet/archive/crossrefware.windows.r65891.tar.xz 2019/02/28 | 468 | systems/texlive/tlnet/archive/crossrefware.x86_64-cygwin.r45927.tar.xz @@ -307593,9 +307598,9 @@ 2021/07/19 | 313228 | systems/texlive/tlnet/archive/easing.doc.r59975.tar.xz 2021/07/19 | 2220 | systems/texlive/tlnet/archive/easing.r59975.tar.xz 2021/07/19 | 7876 | systems/texlive/tlnet/archive/easing.source.r59975.tar.xz -2024/02/01 | 622548 | systems/texlive/tlnet/archive/easybook.doc.r69650.tar.xz -2024/02/01 | 16488 | systems/texlive/tlnet/archive/easybook.r69650.tar.xz -2024/02/01 | 16388 | systems/texlive/tlnet/archive/easybook.source.r69650.tar.xz +2024/02/05 | 622480 | systems/texlive/tlnet/archive/easybook.doc.r69707.tar.xz +2024/02/05 | 16496 | systems/texlive/tlnet/archive/easybook.r69707.tar.xz +2024/02/05 | 16392 | systems/texlive/tlnet/archive/easybook.source.r69707.tar.xz 2019/02/28 | 4540 | systems/texlive/tlnet/archive/easy.doc.r19440.tar.xz 2023/10/12 | 344 | systems/texlive/tlnet/archive/easydtx.aarch64-linux.r68514.tar.xz 2023/10/12 | 344 | systems/texlive/tlnet/archive/easydtx.amd64-freebsd.r68514.tar.xz @@ -308333,9 +308338,9 @@ 2019/02/28 | 4768 | systems/texlive/tlnet/archive/feynmp-auto.source.r30223.tar.xz 2022/07/21 | 13508 | systems/texlive/tlnet/archive/feyn.r63945.tar.xz 2022/07/21 | 16364 | systems/texlive/tlnet/archive/feyn.source.r63945.tar.xz -2024/01/12 | 502300 | systems/texlive/tlnet/archive/ffcode.doc.r69383.tar.xz -2024/01/12 | 2116 | systems/texlive/tlnet/archive/ffcode.r69383.tar.xz -2024/01/12 | 4936 | systems/texlive/tlnet/archive/ffcode.source.r69383.tar.xz +2024/02/05 | 502924 | systems/texlive/tlnet/archive/ffcode.doc.r69706.tar.xz +2024/02/05 | 2116 | systems/texlive/tlnet/archive/ffcode.r69706.tar.xz +2024/02/05 | 4976 | systems/texlive/tlnet/archive/ffcode.source.r69706.tar.xz 2019/02/28 | 381912 | systems/texlive/tlnet/archive/ffslides.doc.r38895.tar.xz 2019/02/28 | 4952 | systems/texlive/tlnet/archive/ffslides.r38895.tar.xz 2023/09/24 | 137820 | systems/texlive/tlnet/archive/fge.doc.r68353.tar.xz @@ -309536,8 +309541,8 @@ 2024/01/25 | 2796 | systems/texlive/tlnet/archive/hvlogos.r69581.tar.xz 2022/03/05 | 22308 | systems/texlive/tlnet/archive/hvpygmentex.doc.r62405.tar.xz 2022/03/05 | 3576 | systems/texlive/tlnet/archive/hvpygmentex.r62405.tar.xz -2024/02/03 | 113960 | systems/texlive/tlnet/archive/hvqrurl.doc.r69677.tar.xz -2024/02/03 | 1352 | systems/texlive/tlnet/archive/hvqrurl.r69677.tar.xz +2024/02/05 | 115988 | systems/texlive/tlnet/archive/hvqrurl.doc.r69705.tar.xz +2024/02/05 | 1440 | systems/texlive/tlnet/archive/hvqrurl.r69705.tar.xz 2022/11/13 | 4360084 | systems/texlive/tlnet/archive/hwemoji.doc.r65001.tar.xz 2022/11/13 | 4274656 | systems/texlive/tlnet/archive/hwemoji.r65001.tar.xz 2020/01/29 | 375200 | systems/texlive/tlnet/archive/hycolor.doc.r53584.tar.xz @@ -315063,8 +315068,8 @@ 2022/10/28 | 1669756 | systems/texlive/tlnet/archive/spath3.doc.r64818.tar.xz 2022/10/28 | 25528 | systems/texlive/tlnet/archive/spath3.r64818.tar.xz 2022/10/28 | 37180 | systems/texlive/tlnet/archive/spath3.source.r64818.tar.xz -2024/01/09 | 88792 | systems/texlive/tlnet/archive/spbmark.doc.r69350.tar.xz -2024/01/09 | 3420 | systems/texlive/tlnet/archive/spbmark.r69350.tar.xz +2024/02/05 | 89196 | systems/texlive/tlnet/archive/spbmark.doc.r69704.tar.xz +2024/02/05 | 3468 | systems/texlive/tlnet/archive/spbmark.r69704.tar.xz 2022/09/28 | 80968 | systems/texlive/tlnet/archive/spectral.doc.r64528.tar.xz 2022/09/28 | 3545188 | systems/texlive/tlnet/archive/spectral.r64528.tar.xz 2023/01/30 | 2103268 | systems/texlive/tlnet/archive/spectralsequences.doc.r65667.tar.xz @@ -315504,9 +315509,9 @@ 2019/09/11 | 1292 | systems/texlive/tlnet/archive/tagging.r52064.tar.xz 2019/02/28 | 68912 | systems/texlive/tlnet/archive/tagpair.doc.r42138.tar.xz 2019/02/28 | 1244 | systems/texlive/tlnet/archive/tagpair.r42138.tar.xz -2024/02/04 | 2169544 | systems/texlive/tlnet/archive/tagpdf.doc.r69691.tar.xz -2024/02/04 | 36928 | systems/texlive/tlnet/archive/tagpdf.r69691.tar.xz -2024/02/04 | 68848 | systems/texlive/tlnet/archive/tagpdf.source.r69691.tar.xz +2024/02/05 | 2166424 | systems/texlive/tlnet/archive/tagpdf.doc.r69703.tar.xz +2024/02/05 | 36836 | systems/texlive/tlnet/archive/tagpdf.r69703.tar.xz +2024/02/05 | 68592 | systems/texlive/tlnet/archive/tagpdf.source.r69703.tar.xz 2019/02/28 | 131060 | systems/texlive/tlnet/archive/talk.doc.r42428.tar.xz 2019/02/28 | 4676 | systems/texlive/tlnet/archive/talk.r42428.tar.xz 2019/02/28 | 556 | systems/texlive/tlnet/archive/talk.source.r42428.tar.xz @@ -315872,7 +315877,7 @@ 2021/03/23 | 276 | systems/texlive/tlnet/archive/texlive-it.r58653.tar.xz 2023/03/09 | 1945084 | systems/texlive/tlnet/archive/texlive-ja.doc.r66482.tar.xz 2023/03/09 | 276 | systems/texlive/tlnet/archive/texlive-ja.r66482.tar.xz -2024/01/29 | 151648 | systems/texlive/tlnet/archive/texlive-msg-translations.r69618.tar.xz +2024/02/05 | 151688 | systems/texlive/tlnet/archive/texlive-msg-translations.r69696.tar.xz 2019/02/28 | 344 | systems/texlive/tlnet/archive/texliveonfly.aarch64-linux.r46208.tar.xz 2019/02/28 | 344 | systems/texlive/tlnet/archive/texliveonfly.amd64-freebsd.r24062.tar.xz 2019/02/28 | 344 | systems/texlive/tlnet/archive/texliveonfly.amd64-netbsd.r30191.tar.xz @@ -315898,7 +315903,7 @@ 2022/09/13 | 600 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.r64356.tar.xz 2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.r64356.tar.xz 2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.r64356.tar.xz -2024/02/04 | 431952 | systems/texlive/tlnet/archive/texlive-scripts.doc.r69683.tar.xz +2024/02/05 | 432108 | systems/texlive/tlnet/archive/texlive-scripts.doc.r69695.tar.xz 2020/01/27 | 916 | systems/texlive/tlnet/archive/texlive-scripts-extra.aarch64-linux.r53577.tar.xz 2020/01/27 | 924 | systems/texlive/tlnet/archive/texlive-scripts-extra.amd64-freebsd.r53577.tar.xz 2020/01/27 | 916 | systems/texlive/tlnet/archive/texlive-scripts-extra.amd64-netbsd.r53577.tar.xz @@ -315920,7 +315925,7 @@ 2022/09/13 | 592 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r64356.tar.xz 2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r64356.tar.xz 2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r64356.tar.xz -2024/02/04 | 114056 | systems/texlive/tlnet/archive/texlive-scripts.r69683.tar.xz +2024/02/05 | 114024 | systems/texlive/tlnet/archive/texlive-scripts.r69695.tar.xz 2022/09/13 | 580 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r64356.tar.xz 2023/05/14 | 60312 | systems/texlive/tlnet/archive/texlive-scripts.windows.r67095.tar.xz 2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r64356.tar.xz @@ -316436,8 +316441,8 @@ 2023/10/27 | 6744 | systems/texlive/tlnet/archive/tkz-doc.r68665.tar.xz 2024/01/17 | 747488 | systems/texlive/tlnet/archive/tkz-elements.doc.r69461.tar.xz 2024/01/17 | 17216 | systems/texlive/tlnet/archive/tkz-elements.r69461.tar.xz -2024/01/17 | 1172932 | systems/texlive/tlnet/archive/tkz-euclide.doc.r69462.tar.xz -2024/01/17 | 41944 | systems/texlive/tlnet/archive/tkz-euclide.r69462.tar.xz +2024/02/05 | 1172812 | systems/texlive/tlnet/archive/tkz-euclide.doc.r69702.tar.xz +2024/02/05 | 41960 | systems/texlive/tlnet/archive/tkz-euclide.r69702.tar.xz 2022/07/16 | 96832 | systems/texlive/tlnet/archive/tkzexample.doc.r63908.tar.xz 2022/07/16 | 3872 | systems/texlive/tlnet/archive/tkzexample.r63908.tar.xz 2022/02/09 | 749696 | systems/texlive/tlnet/archive/tkz-fct.doc.r61949.tar.xz @@ -316779,6 +316784,8 @@ 2023/11/10 | 40956 | systems/texlive/tlnet/archive/ucs.source.r68759.tar.xz 2019/02/28 | 6280 | systems/texlive/tlnet/archive/ucthesis.doc.r15878.tar.xz 2019/02/28 | 19284 | systems/texlive/tlnet/archive/ucthesis.r15878.tar.xz +2024/02/05 | 54692 | systems/texlive/tlnet/archive/udepcolor.doc.r69701.tar.xz +2024/02/05 | 1172 | systems/texlive/tlnet/archive/udepcolor.r69701.tar.xz 2023/09/02 | 140264 | systems/texlive/tlnet/archive/udes-genie-these.doc.r68141.tar.xz 2023/09/02 | 7508 | systems/texlive/tlnet/archive/udes-genie-these.r68141.tar.xz 2023/09/02 | 15696 | systems/texlive/tlnet/archive/udes-genie-these.source.r68141.tar.xz @@ -317826,16 +317833,16 @@ 2020/07/18 | 47816 | systems/texlive/tlnet/archive/zztex.doc.r55862.tar.xz 2020/07/18 | 101724 | systems/texlive/tlnet/archive/zztex.r55862.tar.xz 2024/01/27 | 125030 | systems/texlive/tlnet/install-tl -2024/02/04 | 5749158 | systems/texlive/tlnet/install-tl-unx.tar.gz -2024/02/04 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 -2024/02/04 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc +2024/02/05 | 5747457 | systems/texlive/tlnet/install-tl-unx.tar.gz +2024/02/05 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2024/02/05 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc 2023/05/13 | 5083 | systems/texlive/tlnet/install-tl-windows.bat -2024/02/04 | 21030860 | systems/texlive/tlnet/install-tl-windows.exe -2024/02/04 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 -2024/02/04 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc -2024/02/04 | 26035601 | systems/texlive/tlnet/install-tl.zip -2024/02/04 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 -2024/02/04 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc +2024/02/05 | 21030589 | systems/texlive/tlnet/install-tl-windows.exe +2024/02/05 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 +2024/02/05 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc +2024/02/05 | 26035486 | systems/texlive/tlnet/install-tl.zip +2024/02/05 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 +2024/02/05 | 484 | systems/texlive/tlnet/install-tl.zip.sha512.asc 2023/03/19 | 1229 | systems/texlive/tlnet/README.md 2023/03/19 | 0 | systems/texlive/tlnet/TEXLIVE_2023 2024/01/02 | 9011 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg @@ -317845,7 +317852,7 @@ 2024/01/02 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg 2024/01/16 | 50726 | systems/texlive/tlnet/tlpkg/installer/config.guess 2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt -2024/02/03 | 7410 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl +2024/02/04 | 7205 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl 2023/12/13 | 226639 | systems/texlive/tlnet/tlpkg/installer/curl/curl-ca-bundle.crt 2020/04/15 | 2606592 | systems/texlive/tlnet/tlpkg/installer/curl/curl.exe 2017/04/16 | 2629 | systems/texlive/tlnet/tlpkg/installer/installer-options.txt @@ -317887,12 +317894,12 @@ 2023/02/21 | 20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm 2024/01/31 | 5840 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm 2023/04/08 | 28167 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm -2024/02/04 | 19314070 | systems/texlive/tlnet/tlpkg/texlive.tlpdb -2024/02/04 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2024/02/05 | 19315551 | systems/texlive/tlnet/tlpkg/texlive.tlpdb +2024/02/05 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 2024/01/31 | 87229 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm -2024/02/04 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 -2024/02/04 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc -2024/02/04 | 2546876 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +2024/02/05 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +2024/02/05 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +2024/02/05 | 2547588 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz 2023/02/20 | 58928 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm 2023/06/11 | 42749 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm 2023/02/21 | 16138 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm @@ -320598,7 +320605,7 @@ 2024/01/28 | 82377 | systems/texlive/tlnet/tlpkg/translations/es.po 2024/01/28 | 95176 | systems/texlive/tlnet/tlpkg/translations/fr.po 2024/01/28 | 88685 | systems/texlive/tlnet/tlpkg/translations/it.po -2024/01/28 | 63597 | systems/texlive/tlnet/tlpkg/translations/ja.po +2024/02/04 | 62954 | systems/texlive/tlnet/tlpkg/translations/ja.po 2024/01/28 | 47389 | systems/texlive/tlnet/tlpkg/translations/messages.pot 2024/01/28 | 59045 | systems/texlive/tlnet/tlpkg/translations/nl.po 2024/01/28 | 68100 | systems/texlive/tlnet/tlpkg/translations/pl.po @@ -329023,7 +329030,7 @@ 2014/07/05 | 611 | systems/win32/yandy/README 2014/07/05 | 1004628 | systems/win32/yandy/yandy-src.tar.xz 2014/07/05 | 1012416 | systems/win32/yandy.zip -2024/02/05 | 186 | timestamp +2024/02/06 | 186 | timestamp 2002/08/26 | 61898 | usergrps/dante/antrag.pdf 2002/08/26 | 118217 | usergrps/dante/antrag.ps 2021/11/11 | 917 | usergrps/dante/dtk/doc/beispiel.bib diff --git a/FILES.byname.gz b/FILES.byname.gz index d0c636dd98..9db2b92ea2 100644 Binary files a/FILES.byname.gz and b/FILES.byname.gz differ diff --git a/FILES.last07days b/FILES.last07days index 290c2643f0..6c46be4e2d 100644 --- a/FILES.last07days +++ b/FILES.last07days @@ -1,56 +1,117 @@ +2024/02/05 | 93339 | macros/latex/contrib/spbmark.zip +2024/02/05 | 9201 | macros/latex/contrib/expex-glossonly/testfiles/linguex-expex.pdf +2024/02/05 | 89196 | systems/texlive/tlnet/archive/spbmark.doc.r69704.tar.xz +2024/02/05 | 88459 | macros/latex/contrib/easybook/easybook.tex +2024/02/05 | 86873 | macros/latex/contrib/spbmark/spbmark.pdf +2024/02/05 | 826324 | macros/latex/contrib/tkz/tkz-elements.zip +2024/02/05 | 79597 | macros/latex/contrib/expex-glossonly.zip +2024/02/05 | 7800 | macros/latex/contrib/expex-glossonly/testfiles/covington-expex.pdf +2024/02/05 | 7564 | macros/latex/contrib/expex-glossonly/expex-glossonly.tex +2024/02/05 | 75050 | macros/latex/contrib/easybook/easybook.dtx +2024/02/05 | 68592 | systems/texlive/tlnet/archive/tagpdf.source.r69703.tar.xz +2024/02/05 | 639205 | macros/latex/contrib/easybook.zip +2024/02/05 | 622480 | systems/texlive/tlnet/archive/easybook.doc.r69707.tar.xz +2024/02/05 | 596407 | macros/latex/contrib/easybook/easybook.pdf +2024/02/05 | 5747457 | systems/texlive/tlnet/install-tl-unx.tar.gz +2024/02/05 | 567 | macros/latex/contrib/expex-glossonly/testfiles/gb4e-expex.tex +2024/02/05 | 55578 | fonts/dictsym.zip +2024/02/05 | 5519 | macros/latex/contrib/expex-glossonly/testfiles/gb4e-expex.pdf +2024/02/05 | 54692 | systems/texlive/tlnet/archive/udepcolor.doc.r69701.tar.xz +2024/02/05 | 535 | macros/latex/contrib/expex-glossonly/testfiles/covington-expex.tex +2024/02/05 | 53009 | macros/latex/contrib/expex-glossonly/expex-glossonly.pdf +2024/02/05 | 502924 | systems/texlive/tlnet/archive/ffcode.doc.r69706.tar.xz +2024/02/05 | 4976 | systems/texlive/tlnet/archive/ffcode.source.r69706.tar.xz +2024/02/05 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2024/02/05 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +2024/02/05 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc +2024/02/05 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc +2024/02/05 | 484 | systems/texlive/tlnet/install-tl.zip.sha512.asc +2024/02/05 | 4740 | macros/latex/contrib/expex-glossonly/expex-glossonly.sty +2024/02/05 | 432108 | systems/texlive/tlnet/archive/texlive-scripts.doc.r69695.tar.xz +2024/02/05 | 41960 | systems/texlive/tlnet/archive/tkz-euclide.r69702.tar.xz +2024/02/05 | 4116598 | biblio/ctan-bibdata.zip +2024/02/05 | 3708800 | biblio/ctan-bibdata/ctan.pdf +2024/02/05 | 36836 | systems/texlive/tlnet/archive/tagpdf.r69703.tar.xz +2024/02/05 | 3468 | systems/texlive/tlnet/archive/spbmark.r69704.tar.xz +2024/02/05 | 345152 | systems/texlive/tlnet/archive/crossrefware.doc.r69700.tar.xz +2024/02/05 | 2844136 | biblio/ctan-bibdata/ctan.bib +2024/02/05 | 26035486 | systems/texlive/tlnet/install-tl.zip +2024/02/05 | 2547588 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +2024/02/05 | 2166424 | systems/texlive/tlnet/archive/tagpdf.doc.r69703.tar.xz +2024/02/05 | 2116 | systems/texlive/tlnet/archive/ffcode.r69706.tar.xz +2024/02/05 | 21030589 | systems/texlive/tlnet/install-tl-windows.exe +2024/02/05 | 19315551 | systems/texlive/tlnet/tlpkg/texlive.tlpdb +2024/02/05 | 1744 | systems/texlive/tlnet/archive/collection-publishers.r69701.tar.xz +2024/02/05 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx +2024/02/05 | 16496 | systems/texlive/tlnet/archive/easybook.r69707.tar.xz +2024/02/05 | 16392 | systems/texlive/tlnet/archive/easybook.source.r69707.tar.xz +2024/02/05 | 16368 | systems/texlive/tlnet/archive/crossrefware.r69700.tar.xz +2024/02/05 | 16125 | macros/latex/contrib/spbmark/spbmark.tex +2024/02/05 | 15525 | macros/latex/contrib/spbmark/spbmark.sty +2024/02/05 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 +2024/02/05 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2024/02/05 | 151688 | systems/texlive/tlnet/archive/texlive-msg-translations.r69696.tar.xz +2024/02/05 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 +2024/02/05 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +2024/02/05 | 1440 | systems/texlive/tlnet/archive/hvqrurl.r69705.tar.xz +2024/02/05 | 1172 | systems/texlive/tlnet/archive/udepcolor.r69701.tar.xz +2024/02/05 | 1172812 | systems/texlive/tlnet/archive/tkz-euclide.doc.r69702.tar.xz +2024/02/05 | 115988 | systems/texlive/tlnet/archive/hvqrurl.doc.r69705.tar.xz +2024/02/05 | 114024 | systems/texlive/tlnet/archive/texlive-scripts.r69695.tar.xz +2024/02/05 | 1138 | macros/latex/contrib/expex-glossonly/testfiles/linguex-expex.tex +2024/02/05 | 1107 | macros/latex/contrib/expex-glossonly/README.md 2024/02/04 | 950 | macros/latex/contrib/tagpdf/ex-formula-problem.tex -2024/02/04 | 93007 | macros/latex/contrib/spbmark.zip +2024/02/04 | 9185 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-presentation.tex +2024/02/04 | 9107 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_triangles.lua 2024/02/04 | 902 | macros/latex/contrib/tkz/tkz-euclide/latex/drawings/tkz-draw-eu-ellipses.tex 2024/02/04 | 9000 | macros/latex/contrib/tkz/tkz-euclide/latex/tools/tkz-tools-eu-math.tex 2024/02/04 | 8993 | macros/latex/contrib/tkz/tkz-euclide/latex/obj-lua/tkz-obj-eu-lua-circles.tex 2024/02/04 | 8983 | macros/latex/contrib/tkz/tkz-euclide/latex/obj/tkz-obj-eu-circles.tex -2024/02/04 | 88420 | macros/latex/contrib/easybook/easybook.tex -2024/02/04 | 86672 | macros/latex/contrib/spbmark/spbmark.pdf 2024/02/04 | 8281 | macros/latex/contrib/tagpdf/global-ex.png 2024/02/04 | 827 | macros/latex/contrib/tagpdf/ex-softhyphen.tex +2024/02/04 | 8225 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_circle.lua +2024/02/04 | 8104 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_point.lua +2024/02/04 | 7962 | macros/latex/contrib/tkz/tkz-elements/README.md 2024/02/04 | 7854 | macros/latex/contrib/tagpdf/ex-formula-problem-luatex.pdf -2024/02/04 | 75050 | macros/latex/contrib/easybook/easybook.dtx +2024/02/04 | 76 | fonts/dictsym/vtex/dictsym.ali 2024/02/04 | 72398 | macros/latex/contrib/tagpdf/tagpdf-struct.dtx +2024/02/04 | 7205 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl 2024/02/04 | 700 | macros/latex/contrib/tagpdf/ex-spaceglyph-listings.tex 2024/02/04 | 698 | macros/latex/contrib/tagpdf/ex-tagpdf-template.tex 2024/02/04 | 6892 | systems/texlive/tlnet/archive/pigpen.r69687.tar.xz -2024/02/04 | 68848 | systems/texlive/tlnet/archive/tagpdf.source.r69691.tar.xz 2024/02/04 | 68545 | macros/latex/contrib/udepcolor.zip 2024/02/04 | 6837 | macros/latex/contrib/tkz/tkz-euclide/latex/obj/tkz-obj-eu-points.tex 2024/02/04 | 6765 | macros/latex/contrib/tkz/tkz-euclide/latex/obj/tkz-obj-eu-axesmin.tex 2024/02/04 | 6626 | macros/latex/contrib/tagpdf/ex-attribute-luatex.pdf 2024/02/04 | 6591 | macros/latex/contrib/tkz/tkz-euclide/latex/obj-lua/tkz-obj-eu-lua-circles-by.tex 2024/02/04 | 6574 | macros/latex/contrib/tkz/tkz-euclide/latex/obj/tkz-obj-eu-circles-by.tex +2024/02/04 | 656453 | macros/latex/contrib/tkz/tkz-elements/doc/tkz-elements.pdf 2024/02/04 | 6554 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-euclide.sty 2024/02/04 | 6521 | macros/latex/contrib/tkz/tkz-euclide/latex/obj-lua/tkz-obj-eu-lua-points.tex -2024/02/04 | 641452 | macros/latex/contrib/easybook.zip +2024/02/04 | 6388 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_intersections.lua 2024/02/04 | 6364 | macros/latex/contrib/tkz/tkz-euclide/latex/drawings/tkz-draw-eu-points.tex +2024/02/04 | 6338 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-vectors.tex +2024/02/04 | 62954 | systems/texlive/tlnet/tlpkg/translations/ja.po 2024/02/04 | 6284 | systems/texlive/tlnet/archive/exesheet.r69688.tar.xz -2024/02/04 | 598476 | macros/latex/contrib/easybook/easybook.pdf 2024/02/04 | 5854 | macros/latex/contrib/tkz/tkz-euclide/latex/drawings/tkz-draw-eu-circles.tex 2024/02/04 | 5841 | macros/latex/contrib/tkz/tkz-euclide/latex/tools/tkz-tools-eu-utilities.tex -2024/02/04 | 5749158 | systems/texlive/tlnet/install-tl-unx.tar.gz 2024/02/04 | 5427 | macros/latex/contrib/tagpdf/tagpdfdocu-patches.sty 2024/02/04 | 5343 | macros/latex/contrib/tkz/tkz-euclide/latex/obj/tkz-obj-eu-points-rnd.tex +2024/02/04 | 5201 | fonts/dictsym/README 2024/02/04 | 518363 | macros/latex/contrib/ffcode/ffcode.pdf 2024/02/04 | 518050 | macros/latex/contrib/ffcode.zip 2024/02/04 | 5106 | macros/latex/contrib/tagpdf/tagpdf-space.dtx -2024/02/04 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 -2024/02/04 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc -2024/02/04 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc -2024/02/04 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc -2024/02/04 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc 2024/02/04 | 4819 | macros/latex/contrib/udepcolor/udepcolor-doc-ES.tex +2024/02/04 | 4662 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_circles.lua 2024/02/04 | 4653 | macros/latex/contrib/udepcolor/udepcolor-doc-EN.tex 2024/02/04 | 4601 | macros/latex/contrib/tkz/tkz-euclide/latex/drawings/tkz-draw-eu-protractor.tex 2024/02/04 | 44422 | macros/latex/contrib/tagpdf/tagpdf-backend.dtx 2024/02/04 | 44324 | macros/latex/contrib/tagpdf/tagpdf-roles.dtx 2024/02/04 | 4375 | macros/latex/contrib/tkz/tkz-euclide/latex/libs/tkz-lib-eu-marks.tex 2024/02/04 | 435 | macros/latex/contrib/udepcolor/README.md -2024/02/04 | 431952 | systems/texlive/tlnet/archive/texlive-scripts.doc.r69683.tar.xz 2024/02/04 | 42254 | macros/latex/contrib/tagpdf/tagpdf-user.dtx +2024/02/04 | 4156 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_rectangle.lua 2024/02/04 | 41420 | systems/texlive/tlnet/archive/projlib.doc.r69689.tar.xz -2024/02/04 | 4116502 | biblio/ctan-bibdata.zip 2024/02/04 | 4102 | macros/latex/contrib/tagpdf/ex-alt-actualtext.tex 2024/02/04 | 4085 | macros/latex/contrib/tkz/tkz-euclide/latex/obj/tkz-obj-eu-polygons.tex 2024/02/04 | 3976 | macros/latex/contrib/tkz/tkz-euclide/latex/drawings/tkz-draw-eu-compass.tex @@ -59,19 +120,24 @@ 2024/02/04 | 39449 | macros/latex/contrib/udepcolor/udepcolor-doc-ES.pdf 2024/02/04 | 38851 | macros/latex/contrib/udepcolor/udepcolor-doc-EN.pdf 2024/02/04 | 3884 | macros/latex/contrib/tkz/tkz-euclide/latex/tools-lua/tkz-tools-eu-lua-angles.tex -2024/02/04 | 3708800 | biblio/ctan-bibdata/ctan.pdf -2024/02/04 | 36928 | systems/texlive/tlnet/archive/tagpdf.r69691.tar.xz +2024/02/04 | 3875 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_ellipse.lua 2024/02/04 | 36877 | macros/latex/contrib/tagpdf/tagpdf-data.dtx +2024/02/04 | 3529 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-organization.tex 2024/02/04 | 3497 | macros/latex/contrib/tkz/tkz-euclide/latex/tools/tkz-tools-eu-base.tex 2024/02/04 | 3496 | macros/latex/contrib/tkz/tkz-euclide/latex/tools-lua/tkz-tools-eu-lua-base.tex 2024/02/04 | 34815 | macros/latex/contrib/tagpdf/tagpdf-checks.dtx 2024/02/04 | 3473 | macros/latex/contrib/tkz/tkz-euclide/latex/obj/tkz-obj-eu-grids.tex 2024/02/04 | 34295 | macros/latex/contrib/tagpdf/ex-alt-actualtext.pdf +2024/02/04 | 32971 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-circle.tex +2024/02/04 | 3227 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_square.lua +2024/02/04 | 3210 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_lines.lua 2024/02/04 | 31552 | macros/latex/contrib/tagpdf/ex-list.pdf +2024/02/04 | 30 | fonts/dictsym/map/dictsym.map 2024/02/04 | 3056 | macros/latex/contrib/tkz/tkz-euclide/latex/tools/tkz-tools-eu-angles.tex 2024/02/04 | 2987 | macros/latex/contrib/tkz/tkz-euclide/latex/tools/tkz-tools-eu-text.tex +2024/02/04 | 28799 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-line.tex +2024/02/04 | 2861 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_maths.lua 2024/02/04 | 28595 | macros/latex/contrib/tagpdf/tagpdf-mc-generic.dtx -2024/02/04 | 2843715 | biblio/ctan-bibdata/ctan.bib 2024/02/04 | 277 | macros/latex/contrib/ffcode/DEPENDS.txt 2024/02/04 | 277159 | support/crossrefware.zip 2024/02/04 | 2749 | macros/latex/contrib/tkz/tkz-euclide/latex/tools/tkz-tools-eu-modules.tex @@ -79,32 +145,39 @@ 2024/02/04 | 26904 | systems/texlive/tlnet/archive/projlib.source.r69689.tar.xz 2024/02/04 | 26708 | systems/texlive/tlnet/archive/projlib.r69689.tar.xz 2024/02/04 | 2628 | macros/latex/contrib/ffcode/ffcode.ins -2024/02/04 | 26035601 | systems/texlive/tlnet/install-tl.zip 2024/02/04 | 255352 | systems/texlive/tlnet/archive/exesheet.doc.r69688.tar.xz -2024/02/04 | 2546876 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +2024/02/04 | 2529 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_points.lua 2024/02/04 | 25253 | macros/latex/contrib/tkz/tkz-euclide/latex/obj-lua/tkz-obj-eu-lua-points-spc.tex 2024/02/04 | 2505788 | systems/texlive/tlnet/archive/wargame.doc.r69692.tar.xz 2024/02/04 | 24880 | macros/latex/contrib/tagpdf/ex-mc-manual-para-split-obsolete.pdf 2024/02/04 | 24806 | macros/latex/contrib/tagpdf/ex-structure-obsolete.pdf 2024/02/04 | 2429439 | macros/latex/contrib/tagpdf.zip +2024/02/04 | 2428 | fonts/dictsym/doc/dictsym.tex 2024/02/04 | 242576 | systems/texlive/tlnet/archive/wargame.r69692.tar.xz +2024/02/04 | 24058 | fonts/dictsym/doc/dictsym.pdf +2024/02/04 | 2335 | macros/latex/contrib/tkz/tkz-elements/latex/tkz-elements.sty 2024/02/04 | 23353 | macros/latex/contrib/tkz/tkz-euclide/latex/obj/tkz-obj-eu-points-spc.tex 2024/02/04 | 23311 | macros/latex/contrib/tagpdf/acrobat.png +2024/02/04 | 2328 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_regular.lua +2024/02/04 | 22957 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-main.tex 2024/02/04 | 2280 | macros/latex/contrib/tagpdf/tagpdf-code.tex +2024/02/04 | 2280 | fonts/dictsym/latex/dictsym.sty 2024/02/04 | 2267 | macros/latex/contrib/tkz/tkz-euclide/latex/tools/tkz-tools-eu-colors.tex 2024/02/04 | 22138 | macros/latex/contrib/tagpdf/ex-AF-file.pdf 2024/02/04 | 220792 | systems/texlive/tlnet/archive/randexam.doc.r69690.tar.xz +2024/02/04 | 22017 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-point.tex 2024/02/04 | 22002 | macros/latex/contrib/tagpdf/tagpdf.dtx 2024/02/04 | 21718 | macros/latex/contrib/tkz/tkz-euclide/latex/drawings/tkz-draw-eu-angles.tex -2024/02/04 | 2169544 | systems/texlive/tlnet/archive/tagpdf.doc.r69691.tar.xz +2024/02/04 | 21599 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-indepthstudy.tex 2024/02/04 | 2115 | macros/latex/contrib/tagpdf/ex-mc-manual-para-split-obsolete.tex -2024/02/04 | 21030860 | systems/texlive/tlnet/install-tl-windows.exe +2024/02/04 | 2112 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_quadrilateral.lua +2024/02/04 | 2101 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_vector.lua 2024/02/04 | 206492 | systems/texlive/tlnet/archive/wargame.source.r69692.tar.xz +2024/02/04 | 2032 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_parallelogram.lua 2024/02/04 | 2022 | macros/latex/contrib/tagpdf/link-figure-input.tex 2024/02/04 | 20066 | macros/latex/contrib/tagpdf/ex-formula-problem.pdf 2024/02/04 | 2005 | macros/latex/contrib/tkz/tkz-euclide/latex/libs/tkz-lib-eu-shape.tex 2024/02/04 | 1972 | macros/latex/contrib/udepcolor/udepcolor.sty -2024/02/04 | 19314070 | systems/texlive/tlnet/tlpkg/texlive.tlpdb 2024/02/04 | 19236 | macros/latex/contrib/tagpdf/ex-softhyphen.pdf 2024/02/04 | 19204 | macros/latex/contrib/tagpdf/ex-tagpdf-template.pdf 2024/02/04 | 19094 | macros/latex/contrib/tkz/tkz-euclide/latex/tools-lua/tkz-tools-eu-lua-intersections.tex @@ -112,28 +185,27 @@ 2024/02/04 | 18510 | macros/latex/contrib/tkz/tkz-euclide/latex/obj/tkz-obj-eu-points-by.tex 2024/02/04 | 18461 | macros/latex/contrib/tagpdf/ex-patch-sectioning-koma-luatex.pdf 2024/02/04 | 18295 | macros/latex/contrib/tkz/tkz-euclide/latex/obj-lua/tkz-obj-eu-lua-points-by.tex +2024/02/04 | 1827 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_misc.lua 2024/02/04 | 18272 | macros/latex/contrib/tkz/tkz-euclide/latex/tools/tkz-tools-eu-intersections.tex 2024/02/04 | 17804 | macros/latex/contrib/tkz/tkz-euclide/latex/obj/tkz-obj-eu-triangles.tex 2024/02/04 | 17742 | macros/latex/contrib/tagpdf/ex-alt-actualtext-luatex.pdf 2024/02/04 | 1730 | macros/latex/contrib/tagpdf/tagpdf.bib 2024/02/04 | 17038 | macros/latex/contrib/tagpdf/tagpdf-tree.dtx -2024/02/04 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx 2024/02/04 | 1667114 | macros/latex/contrib/tagpdf/tagpdf-code.pdf 2024/02/04 | 16524 | macros/latex/contrib/tagpdf/ex-spaceglyph-listings.pdf 2024/02/04 | 16348 | macros/latex/contrib/tagpdf/tagpdf-mc-luacode.dtx 2024/02/04 | 15940 | macros/latex/contrib/tagpdf/tagpdf-mc-shared.dtx -2024/02/04 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 -2024/02/04 | 15394 | macros/latex/contrib/spbmark/spbmark.sty -2024/02/04 | 15379 | macros/latex/contrib/spbmark/spbmark.tex -2024/02/04 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 -2024/02/04 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 -2024/02/04 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +2024/02/04 | 1548 | fonts/dictsym/tfm/dictsym.tfm +2024/02/04 | 1490 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_main.lua 2024/02/04 | 1445 | macros/latex/contrib/tagpdf/ex-structure-obsolete.tex 2024/02/04 | 14422 | macros/latex/contrib/tkz/tkz-euclide/latex/drawings/tkz-draw-eu-show.tex 2024/02/04 | 141163 | macros/latex/contrib/tagpdf/pac3.PNG +2024/02/04 | 135978 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-examples.tex 2024/02/04 | 1348 | macros/latex/contrib/ffcode/README.md 2024/02/04 | 1325 | macros/latex/contrib/tagpdf/ex-attribute.tex +2024/02/04 | 1307 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_class.lua 2024/02/04 | 1307156 | macros/latex/contrib/tkz/tkz-euclide.zip +2024/02/04 | 12805 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_line.lua 2024/02/04 | 126349 | macros/latex/contrib/tagpdf/tagpdf.tex 2024/02/04 | 124532 | systems/texlive/tlnet/archive/pigpen.doc.r69687.tar.xz 2024/02/04 | 12377 | macros/latex/contrib/tkz/tkz-euclide/README.md @@ -141,9 +213,9 @@ 2024/02/04 | 12163 | macros/latex/contrib/tkz/tkz-euclide/latex/drawings/tkz-draw-eu-sectors.tex 2024/02/04 | 1194 | macros/latex/contrib/tagpdf/README.md 2024/02/04 | 11822 | macros/latex/contrib/ffcode/ffcode.dtx +2024/02/04 | 11688 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_triangle.lua 2024/02/04 | 1160 | macros/latex/contrib/tagpdf/ex-AF-file.tex 2024/02/04 | 11541 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-news.tex -2024/02/04 | 114056 | systems/texlive/tlnet/archive/texlive-scripts.r69683.tar.xz 2024/02/04 | 11360 | systems/texlive/tlnet/archive/randexam.r69690.tar.xz 2024/02/04 | 11280 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-euclide.cfg 2024/02/04 | 1116500 | macros/latex/contrib/tkz/tkz-euclide/doc/tkz-euclide.pdf @@ -154,6 +226,7 @@ 2024/02/04 | 10652 | macros/latex/contrib/tkz/tkz-euclide/latex/obj/tkz-obj-eu-points-with.tex 2024/02/04 | 1063 | macros/latex/contrib/tagpdf/ex-list.tex 2024/02/04 | 10450 | macros/latex/contrib/tkz/tkz-euclide/latex/obj/tkz-obj-eu-lines.tex +2024/02/04 | 1021 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_regular.lua 2024/02/04 | 10203 | macros/latex/contrib/tkz/tkz-euclide/latex/drawings/tkz-draw-eu-lines.tex 2024/02/03 | 9929 | macros/latex/contrib/wargame/source/hex/terrain/swamp.dtx 2024/02/03 | 9488 | systems/texlive/tlnet/archive/unbtex.r69681.tar.xz @@ -165,13 +238,13 @@ 2024/02/03 | 8906 | macros/latex/contrib/wargame/source/Makefile 2024/02/03 | 88080 | systems/texlive/tlnet/archive/pstricks.r69674.tar.xz 2024/02/03 | 8374 | macros/latex/contrib/wargame/source/hex/terrain/village.dtx +2024/02/03 | 8297 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-rectangle.tex 2024/02/03 | 7801 | macros/latex/contrib/hvqrurl/doc/hvqrurl.tex 2024/02/03 | 75764 | macros/latex/contrib/projlib.zip 2024/02/03 | 755 | macros/latex/contrib/wargame/doc/tutorial/patch.py 2024/02/03 | 7531396 | systems/texlive/tlnet/archive/pstricks.doc.r69674.tar.xz 2024/02/03 | 7527 | macros/latex/contrib/wargame/source/wargame.ins 2024/02/03 | 742 | macros/latex/contrib/wargame/source/natoapp6c/compat/seamine.dtx -2024/02/03 | 7410 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl 2024/02/03 | 735800 | systems/texlive/tlnet/archive/refstyle.doc.r69680.tar.xz 2024/02/03 | 7264 | systems/texlive/tlnet/archive/docshots.source.r69676.tar.xz 2024/02/03 | 6791 | macros/latex/contrib/wargame/source/chit/table.dtx @@ -274,13 +347,13 @@ 2024/02/03 | 15911 | macros/latex/contrib/wargame/source/natoapp6c/frames/friendly.dtx 2024/02/03 | 15564 | macros/latex/contrib/wargame/source/hex/split.dtx 2024/02/03 | 15175 | macros/latex/contrib/wargame/source/natoapp6c/frames/neutral.dtx +2024/02/03 | 15164 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-triangle.tex 2024/02/03 | 15000 | macros/latex/contrib/wargame/source/hex/shape.dtx 2024/02/03 | 1469771 | macros/latex/contrib/wargame/doc/wargame.pdf 2024/02/03 | 145 | fonts/pigpen/map/pigpen.map 2024/02/03 | 14351 | support/crossrefware/ltx2crossrefxml.1 2024/02/03 | 140724 | systems/texlive/tlnet/archive/texdoc.doc.r69672.tar.xz 2024/02/03 | 1359 | macros/latex/contrib/wargame/source/natoapp6c/compat/activity.dtx -2024/02/03 | 1352 | systems/texlive/tlnet/archive/hvqrurl.r69677.tar.xz 2024/02/03 | 1344 | macros/latex/contrib/exesheet/README.md 2024/02/03 | 1342 | macros/latex/contrib/wargame/source/chit/core.dtx 2024/02/03 | 1323 | macros/latex/contrib/wargame/source/chit/stack.dtx @@ -296,7 +369,6 @@ 2024/02/03 | 117559 | macros/latex/contrib/hvqrurl.zip 2024/02/03 | 115679 | macros/latex/contrib/hvqrurl/doc/hvqrurl.pdf 2024/02/03 | 11431 | macros/latex/contrib/wargame/source/hex/paths.dtx -2024/02/03 | 113960 | systems/texlive/tlnet/archive/hvqrurl.doc.r69677.tar.xz 2024/02/03 | 11274 | macros/latex/contrib/wargame/source/chit/oob.dtx 2024/02/03 | 11263 | macros/latex/contrib/wargame/README.md 2024/02/03 | 11120 | macros/latex/contrib/wargame/source/natoapp6c/compat/land.dtx @@ -460,7 +532,6 @@ 2024/02/01 | 664 | macros/latex/contrib/europecv/templates/europecv_biber.conf 2024/02/01 | 66218 | macros/latex/contrib/refstyle/refstyle.dtx 2024/02/01 | 6593 | macros/latex/contrib/europecv/templates/europecv_photo.jpg -2024/02/01 | 622548 | systems/texlive/tlnet/archive/easybook.doc.r69650.tar.xz 2024/02/01 | 618378 | macros/latex/contrib/europecv/europecv.pdf 2024/02/01 | 60485 | macros/latex/contrib/europecv/europecv.tex 2024/02/01 | 60466 | macros/latex/contrib/unbtex/unbtexcite/unbtex-alf-en.bst @@ -548,9 +619,7 @@ 2024/02/01 | 1713 | macros/latex/contrib/europecv/ecvnl.def 2024/02/01 | 1671 | macros/latex/contrib/unbtex/unbtex-example/codigos/controleSmithPredictor.py 2024/02/01 | 16598 | macros/latex/contrib/unbtex/unbtex-example/figuras/blockdiagram.pdf -2024/02/01 | 16488 | systems/texlive/tlnet/archive/easybook.r69650.tar.xz 2024/02/01 | 163 | macros/latex/contrib/europecv/examples/minimal.tex -2024/02/01 | 16388 | systems/texlive/tlnet/archive/easybook.source.r69650.tar.xz 2024/02/01 | 14679 | macros/latex/contrib/europecv/europasslogo-eps-converted-to.pdf 2024/02/01 | 14480 | macros/latex/contrib/europecv/examples/europasslogo-eps-converted-to.pdf 2024/02/01 | 1356 | macros/latex/contrib/unbtex/unbtex-example/figuras/capa_fundo.pdf @@ -913,49 +982,3 @@ 2024/01/30 | 1031 | support/bib2gls/examples/baseunits.bib 2024/01/30 | 1029932 | install/macros/latex/contrib/achemso.tds.zip 2024/01/30 | 101601 | support/splint/cweb/splint.w -2024/01/29 | 992 | macros/latex/contrib/llncs/README.md -2024/01/29 | 97401 | macros/latex/contrib/mhchem/hpstatement.inc/hpstatement-bg.inc.sty -2024/01/29 | 94659 | macros/latex/contrib/mhchem/hpstatement.inc/hpstatement-de.inc.sty -2024/01/29 | 93867 | macros/latex/contrib/mhchem/hpstatement.inc/hpstatement-fr.inc.sty -2024/01/29 | 862 | macros/latex/contrib/mhchem/manifest.txt -2024/01/29 | 85645 | macros/latex/contrib/mhchem/hpstatement.inc/hpstatement-cs.inc.sty -2024/01/29 | 84984 | macros/latex/contrib/mhchem/hpstatement.inc/hpstatement-en.inc.sty -2024/01/29 | 84102 | macros/latex/contrib/mhchem/hpstatement.inc/hpstatement-pl.inc.sty -2024/01/29 | 8394 | macros/latex/contrib/llncs/history.txt -2024/01/29 | 83538 | macros/latex/contrib/mhchem/hpstatement.inc/hpstatement-sk.inc.sty -2024/01/29 | 82629 | macros/latex/contrib/mhchem/hpstatement.inc/hpstatement-es.inc.sty -2024/01/29 | 82489 | macros/latex/contrib/mhchem/hpstatement.inc/hpstatement-hu.inc.sty -2024/01/29 | 82473 | macros/latex/contrib/mhchem/hpstatement.inc/hpstatement-pt.inc.sty -2024/01/29 | 81360 | macros/latex/contrib/mhchem/hpstatement.inc/hpstatement-mt.inc.sty -2024/01/29 | 81043 | macros/latex/contrib/mhchem/hpstatement.inc/hpstatement-fi.inc.sty -2024/01/29 | 80993 | macros/latex/contrib/mhchem/hpstatement.inc/hpstatement-hr.inc.sty -2024/01/29 | 80803 | macros/latex/contrib/mhchem/hpstatement.inc/hpstatement-it.inc.sty -2024/01/29 | 80567 | macros/latex/contrib/mhchem/hpstatement.inc/hpstatement-lv.inc.sty -2024/01/29 | 80539 | macros/latex/contrib/mhchem/hpstatement.inc/hpstatement-lt.inc.sty -2024/01/29 | 79755 | macros/latex/contrib/mhchem/hpstatement.inc/hpstatement-sl.inc.sty -2024/01/29 | 79468 | macros/latex/contrib/mhchem/hpstatement.inc/hpstatement-et.inc.sty -2024/01/29 | 79049 | macros/latex/contrib/mhchem/hpstatement.inc/hpstatement-da.inc.sty -2024/01/29 | 79034 | macros/latex/contrib/mhchem/hpstatement.inc/hpstatement-nl.inc.sty -2024/01/29 | 79025 | macros/latex/contrib/mhchem/hpstatement.inc/hpstatement-sv.inc.sty -2024/01/29 | 736 | macros/latex/contrib/mhchem/README -2024/01/29 | 706861 | macros/latex/contrib/mhchem.zip -2024/01/29 | 67781 | macros/latex/contrib/mhchem/hpstatement.inc/hpstatement-ga.inc.sty -2024/01/29 | 51987 | macros/latex/contrib/mhchem/mhchem.tex -2024/01/29 | 504 | systems/texlive/tlnet/archive/comprehensive.r69619.tar.xz -2024/01/29 | 43402 | macros/latex/contrib/llncs/llncs.cls -2024/01/29 | 410230 | macros/latex/contrib/mhchem/mhchem.pdf -2024/01/29 | 383 | graphics/pstricks/contrib/pst-solarsystem/README -2024/01/29 | 340016 | support/TeX4ht/source/tex4ht-ooffice.tex -2024/01/29 | 32786992 | systems/texlive/tlnet/archive/comprehensive.doc.r69619.tar.xz -2024/01/29 | 246371 | macros/latex/contrib/proflycee/doc/ProfLycee-docctan.zip -2024/01/29 | 232527 | macros/latex/contrib/llncs/llncsdoc.pdf -2024/01/29 | 231160 | macros/latex/contrib/llncs.zip -2024/01/29 | 1885482 | macros/latex/contrib/proflycee.zip -2024/01/29 | 17763 | macros/latex/contrib/llncs/llncsdoc.tex -2024/01/29 | 15670 | macros/latex/contrib/mhchem/hpstatement.sty -2024/01/29 | 151648 | systems/texlive/tlnet/archive/texlive-msg-translations.r69618.tar.xz -2024/01/29 | 1421999 | language/japanese/BX/bxjscls.zip -2024/01/29 | 133877 | macros/latex/contrib/mhchem/mhchem.sty -2024/01/29 | 1184230 | support/TeX4ht/source/tex4ht-4ht.tex -2024/01/29 | 100832 | macros/latex/contrib/mhchem/hpstatement.inc/hpstatement-ro.inc.sty -2024/01/29 | 100186 | macros/latex/contrib/mhchem/hpstatement.inc/hpstatement-el.inc.sty diff --git a/biblio/ctan-bibdata/ctan.bib b/biblio/ctan-bibdata/ctan.bib index 8899fe30df..c0e0a58450 100644 --- a/biblio/ctan-bibdata/ctan.bib +++ b/biblio/ctan-bibdata/ctan.bib @@ -1,7 +1,7 @@ %% bib file of all CTAN packages %% (C) Herbert Voß %% -%% created at 04-02-2024, 02:00:04 +%% created at 05-02-2024, 02:00:03 %% %% This file is provided under the terms of the LPPL v1.3 or @@ -16253,7 +16253,7 @@ title = {The \texttt{crossrefware} package}, subtitle = {Scripts for working with crossref.org}, author = {Boris Veytsman}, - date = {2022-10-19}, + date = {2024-02-04}, version = {}, license = {gpl}, mirror = {https://mirror.ctan.org/support/crossrefware}, @@ -20707,8 +20707,8 @@ title = {The \texttt{easybook} package}, subtitle = {Easily typesetting Chinese theses or books}, author = {Qu Yi}, - date = {2024-01-31}, - version = {2024S}, + date = {2024-02-04}, + version = {2024T}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/macros/latex/contrib/easybook}, url = {https://ctan.org/pkg/easybook}, @@ -25213,8 +25213,8 @@ title = {The \texttt{ffcode} package}, subtitle = {Fixed-font code blocks formatted nicely}, author = {Yegor Bugayenko}, - date = {2024-01-11}, - version = {0.9.1}, + date = {2024-02-04}, + version = {0.9.2}, license = {mit}, mirror = {https://mirror.ctan.org/macros/latex/contrib/ffcode}, url = {https://ctan.org/pkg/ffcode}, @@ -64744,8 +64744,8 @@ title = {The \texttt{spbmark} package}, subtitle = {Customize superscripts and subscripts}, author = {Qu Yi}, - date = {2024-01-08}, - version = {1.43}, + date = {2024-02-04}, + version = {1.45}, license = {cc-by-4}, mirror = {https://mirror.ctan.org/macros/latex/contrib/spbmark}, url = {https://ctan.org/pkg/spbmark}, @@ -67086,8 +67086,8 @@ title = {The \texttt{tagpdf} package}, subtitle = {Tools for experimenting with tagging using pdfLaTeX and LuaLaTeX}, author = {{The LaTeX Project Team} and Ulrike Fischer}, - date = {2024-02-03}, - version = {0.98u}, + date = {2024-02-04}, + version = {0.98v}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/macros/latex/contrib/tagpdf}, url = {https://ctan.org/pkg/tagpdf}, @@ -71498,8 +71498,8 @@ title = {The \texttt{tkz-euclide} package}, subtitle = {Tools for drawing Euclidean geometry}, author = {Alain Matthes}, - date = {2024-01-16}, - version = {5.05c}, + date = {2024-02-04}, + version = {5.06c}, license = {lppl1.3}, mirror = {https://mirror.ctan.org/macros/latex/contrib/tkz/tkz-euclide}, url = {https://ctan.org/pkg/tkz-euclide}, @@ -73661,6 +73661,17 @@ the current one was being developed.}, } +@manual{ctan-udepcolor, + title = {The \texttt{udepcolor} package}, + subtitle = {University of Piura (UDEP) institutional and corporate colors for digital and electronic media}, + author = {Manuel Merino}, + date = {2024-02-04}, + version = {1.0}, + license = {lppl1.3c}, + mirror = {https://mirror.ctan.org/macros/latex/contrib/udepcolor}, + url = {https://ctan.org/pkg/udepcolor}, +} + @manual{ctan-udes-genie-these, title = {The \texttt{udes-genie-these} package}, subtitle = {A thesis class file for the Faculté de génie at the Université de Sherbrooke}, diff --git a/fonts/dictsym/README b/fonts/dictsym/README index e2f50e139b..a81d54b376 100644 --- a/fonts/dictsym/README +++ b/fonts/dictsym/README @@ -1,9 +1,10 @@ ============================================================ The DictSym font and the LaTeX macro package dictsym.sty - 2004-07-26 + 2024-02-04 ============================================================ Walter Schmidt - w.a.schmidt(at)gmx.net + Keiran Harcombe + kjh@harcombe.net This directory contains the "DictSym" Type1 font designed by @@ -39,24 +40,18 @@ Copy the file dictsym.afm to: Create these directories, if they do not yet exist. - - Installing the TeX support files -------------------------------- Unpack the ZIP archive dictsym.zip in the texmf directory of your TeX system; thus, all files will be copied to the appropriate directories. - - Updating the filename database ------------------------------ Many TeX systems require manual updating of a "filename database" after adding of new files. Please, consult the documentation of your TeX system! - - Configuring your TeX system --------------------------- The present distribution comprises several font map files @@ -134,7 +129,7 @@ following conditions of use and distribution: This work has the LPPL maintenance status "maintained". This Current Maintainer of this work is - Georg Verweyen" + Keiran Harcombe" The "dictsym" macro package and the related documentation file dictsym.tex are subject to the following conditions of @@ -153,7 +148,7 @@ use and distribution: This work has the LPPL maintenance status "maintained". This Current Maintainer of this work is - Walter Schmidt + Keiran Harcombe @@ -161,5 +156,5 @@ Credits ------- Special thanks to Rolf Niepraschk for his help with creating and testing the font. - == finis + diff --git a/fonts/dictsym/afm/dictsym.afm b/fonts/dictsym/afm/dictsym.afm new file mode 100644 index 0000000000..6fe3603bae --- /dev/null +++ b/fonts/dictsym/afm/dictsym.afm @@ -0,0 +1,707 @@ +StartFontMetrics 4.1 +FontName DictSym +FullName Dictionary Symbols Georg Verweyen +Notice Typeface Georg Michael Verweyen. 2004. All Rights Reserved +EncodingScheme FontSpecific +FamilyName Dictionary Symbols +Weight Regular +Version Version 1.00 July 20, 2004, initial release +Characters 653 +ItalicAngle 0.0 +Ascender 905 +Descender -212 +UnderlineThickness 73 +UnderlinePosition -106 +IsFixedPitch false +FontBBox -39 -49 778 797 +StartCharMetrics 688 +C 0 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 1 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 2 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 3 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 4 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 5 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 6 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 7 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 8 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 9 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 10 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 11 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 12 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 13 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 14 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 15 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 16 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 17 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 18 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 19 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 20 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 21 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 22 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 23 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 24 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 25 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 26 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 27 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 28 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 29 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 30 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 31 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 32 ; WX 278 ; N space ; B 0 0 760 596 ; +C 33 ; WX 278 ; N exclam ; B 0 0 760 596 ; +C 34 ; WX 355 ; N quotedbl ; B 0 0 760 596 ; +C 35 ; WX 556 ; N numbersign ; B 0 0 760 596 ; +C 36 ; WX 556 ; N dollar ; B 0 0 760 596 ; +C 37 ; WX 889 ; N percent ; B 0 0 760 596 ; +C 38 ; WX 667 ; N ampersand ; B 0 0 760 596 ; +C 39 ; WX 191 ; N quotesingle ; B 0 0 760 596 ; +C 40 ; WX 333 ; N parenleft ; B 0 0 760 596 ; +C 41 ; WX 333 ; N parenright ; B 0 0 760 596 ; +C 42 ; WX 389 ; N asterisk ; B 0 0 760 596 ; +C 43 ; WX 584 ; N plus ; B 0 0 760 596 ; +C 44 ; WX 278 ; N comma ; B 0 0 760 596 ; +C 45 ; WX 333 ; N hyphen ; B 0 0 760 596 ; +C 46 ; WX 278 ; N period ; B 0 0 760 596 ; +C 47 ; WX 278 ; N slash ; B 0 0 760 596 ; +C 48 ; WX 556 ; N zero ; B 0 0 760 596 ; +C 49 ; WX 556 ; N one ; B 0 0 760 596 ; +C 50 ; WX 556 ; N two ; B 0 0 760 596 ; +C 51 ; WX 556 ; N three ; B 0 0 760 596 ; +C 52 ; WX 556 ; N four ; B 0 0 760 596 ; +C 53 ; WX 556 ; N five ; B 0 0 760 596 ; +C 54 ; WX 556 ; N six ; B 0 0 760 596 ; +C 55 ; WX 556 ; N seven ; B 0 0 760 596 ; +C 56 ; WX 556 ; N eight ; B 0 0 760 596 ; +C 57 ; WX 556 ; N nine ; B 0 0 760 596 ; +C 58 ; WX 278 ; N colon ; B 0 0 760 596 ; +C 59 ; WX 278 ; N semicolon ; B 0 0 760 596 ; +C 60 ; WX 584 ; N less ; B 0 0 760 596 ; +C 61 ; WX 584 ; N equal ; B 0 0 760 596 ; +C 62 ; WX 584 ; N greater ; B 0 0 760 596 ; +C 63 ; WX 556 ; N question ; B 0 0 760 596 ; +C 64 ; WX 1015 ; N at ; B 0 0 760 596 ; +C 65 ; WX 799 ; N A ; B 0 0 760 596 ; +C 66 ; WX 522 ; N B ; B 29 -7 512 752 ; +C 67 ; WX 706 ; N C ; B 0 -8 667 623 ; +C 68 ; WX 722 ; N D ; B 0 0 748 710 ; +C 69 ; WX 667 ; N E ; B 0 0 748 710 ; +C 70 ; WX 611 ; N F ; B 0 0 748 710 ; +C 71 ; WX 787 ; N G ; B 0 0 748 710 ; +C 72 ; WX 669 ; N H ; B 0 -49 630 625 ; +C 73 ; WX 278 ; N I ; B -10 -14 763 662 ; +C 74 ; WX 812 ; N J ; B -10 -14 763 662 ; +C 75 ; WX 667 ; N K ; B 17 -11 681 713 ; +C 76 ; WX 703 ; N L ; B 17 -11 681 713 ; +C 77 ; WX 619 ; N M ; B 5 -16 585 769 ; +C 78 ; WX 722 ; N N ; B 0 0 666 616 ; +C 79 ; WX 778 ; N O ; B 0 0 666 616 ; +C 80 ; WX 667 ; N P ; B 0 0 666 616 ; +C 81 ; WX 778 ; N Q ; B 0 0 666 616 ; +C 82 ; WX 705 ; N R ; B 0 0 666 616 ; +C 83 ; WX 667 ; N S ; B -20 -17 725 749 ; +C 84 ; WX 784 ; N T ; B -20 -17 725 749 ; +C 85 ; WX 722 ; N U ; B -5 -6 681 695 ; +C 86 ; WX 667 ; N V ; B -5 -6 681 695 ; +C 87 ; WX 944 ; N W ; B -5 -6 681 695 ; +C 88 ; WX 725 ; N X ; B -5 -6 681 695 ; +C 89 ; WX 667 ; N Y ; B -27 -20 778 524 ; +C 90 ; WX 611 ; N Z ; B -27 -20 778 524 ; +C 91 ; WX 278 ; N bracketleft ; B -27 -20 778 524 ; +C 92 ; WX 278 ; N backslash ; B -27 -20 778 524 ; +C 93 ; WX 278 ; N bracketright ; B -27 -20 778 524 ; +C 94 ; WX 469 ; N asciicircum ; B -27 -20 778 524 ; +C 95 ; WX 556 ; N underscore ; B -27 -20 778 524 ; +C 96 ; WX 333 ; N grave ; B -27 -20 778 524 ; +C 97 ; WX 844 ; N a ; B -27 -20 778 524 ; +C 98 ; WX 556 ; N b ; B -39 0 766 773 ; +C 99 ; WX 844 ; N c ; B -39 0 766 773 ; +C 100 ; WX 556 ; N d ; B -5 -5 644 797 ; +C 101 ; WX 556 ; N e ; B -5 -5 644 797 ; +C 102 ; WX 278 ; N f ; B -5 -5 644 797 ; +C 103 ; WX 556 ; N g ; B -5 -5 644 797 ; +C 104 ; WX 556 ; N h ; B -5 -5 644 797 ; +C 105 ; WX 222 ; N i ; B -5 -5 644 797 ; +C 106 ; WX 222 ; N j ; B -5 -5 644 797 ; +C 107 ; WX 500 ; N k ; B -5 -5 644 797 ; +C 108 ; WX 222 ; N l ; B -5 -5 644 797 ; +C 109 ; WX 688 ; N m ; B -5 -5 644 797 ; +C 110 ; WX 556 ; N n ; B 20 243 0 0 ; +C 111 ; WX 556 ; N o ; B 20 243 0 0 ; +C 112 ; WX 556 ; N p ; B 20 243 0 0 ; +C 113 ; WX 556 ; N q ; B 20 243 0 0 ; +C 114 ; WX 333 ; N r ; B 20 243 0 0 ; +C 115 ; WX 500 ; N s ; B 20 243 0 0 ; +C 116 ; WX 278 ; N t ; B 20 243 0 0 ; +C 117 ; WX 556 ; N u ; B 20 243 0 0 ; +C 118 ; WX 500 ; N v ; B 20 243 0 0 ; +C 119 ; WX 722 ; N w ; B 20 243 0 0 ; +C 120 ; WX 500 ; N x ; B 20 243 0 0 ; +C 121 ; WX 500 ; N y ; B 20 243 0 0 ; +C 122 ; WX 500 ; N z ; B 20 243 0 0 ; +C 123 ; WX 334 ; N braceleft ; B 20 243 0 0 ; +C 124 ; WX 260 ; N bar ; B 20 243 0 0 ; +C 125 ; WX 334 ; N braceright ; B 20 243 0 0 ; +C 126 ; WX 584 ; N asciitilde ; B 20 243 0 0 ; +C 127 ; WX 750 ; N .notdef ; B 125 0 625 625 ; +C 128 ; WX 556 ; N Euro ; B 20 243 0 0 ; +C 129 ; WX 542 ; N afii10052 ; B 20 243 0 0 ; +C 130 ; WX 222 ; N quotesinglbase ; B 20 243 0 0 ; +C 131 ; WX 556 ; N florin ; B 20 243 0 0 ; +C 132 ; WX 333 ; N quotedblbase ; B 20 243 0 0 ; +C 133 ; WX 1000 ; N ellipsis ; B 20 243 0 0 ; +C 134 ; WX 556 ; N dagger ; B 20 243 0 0 ; +C 135 ; WX 556 ; N daggerdbl ; B 20 243 0 0 ; +C 136 ; WX 333 ; N circumflex ; B 20 243 0 0 ; +C 137 ; WX 1000 ; N perthousand ; B 20 243 0 0 ; +C 138 ; WX 667 ; N Scaron ; B 20 243 0 0 ; +C 139 ; WX 333 ; N guilsinglleft ; B 20 243 0 0 ; +C 140 ; WX 1000 ; N OE ; B 20 243 0 0 ; +C 141 ; WX 583 ; N afii10061 ; B 20 243 0 0 ; +C 142 ; WX 611 ; N Zcaron ; B 20 243 0 0 ; +C 143 ; WX 719 ; N afii10145 ; B 20 243 0 0 ; +C 144 ; WX 333 ; N quotedblbase ; B 20 243 0 0 ; +C 145 ; WX 222 ; N quoteleft ; B 20 243 0 0 ; +C 146 ; WX 222 ; N quoteright ; B 20 243 0 0 ; +C 147 ; WX 333 ; N quotedblleft ; B 20 243 0 0 ; +C 148 ; WX 333 ; N quotedblright ; B 20 243 0 0 ; +C 149 ; WX 350 ; N bullet ; B 20 243 0 0 ; +C 150 ; WX 556 ; N endash ; B 20 243 0 0 ; +C 151 ; WX 1000 ; N emdash ; B 20 243 0 0 ; +C 152 ; WX 333 ; N tilde ; B 20 243 0 0 ; +C 153 ; WX 1000 ; N trademark ; B 20 243 0 0 ; +C 154 ; WX 500 ; N scaron ; B 20 243 0 0 ; +C 155 ; WX 333 ; N guilsinglright ; B 20 243 0 0 ; +C 156 ; WX 944 ; N oe ; B 20 243 0 0 ; +C 157 ; WX 438 ; N afii10109 ; B 20 243 0 0 ; +C 158 ; WX 500 ; N zcaron ; B 20 243 0 0 ; +C 159 ; WX 667 ; N Ydieresis ; B 20 243 0 0 ; +C 160 ; WX 278 ; N space ; B 0 0 760 596 ; +C 161 ; WX 333 ; N exclamdown ; B 20 243 0 0 ; +C 162 ; WX 556 ; N cent ; B 20 243 0 0 ; +C 163 ; WX 556 ; N sterling ; B 20 243 0 0 ; +C 164 ; WX 167 ; N fraction ; B 20 243 0 0 ; +C 165 ; WX 556 ; N yen ; B 20 243 0 0 ; +C 166 ; WX 260 ; N brokenbar ; B 20 243 0 0 ; +C 167 ; WX 556 ; N section ; B 20 243 0 0 ; +C 168 ; WX 333 ; N dieresis ; B 20 243 0 0 ; +C 169 ; WX 737 ; N copyright ; B 20 243 0 0 ; +C 170 ; WX 370 ; N ordfeminine ; B 20 243 0 0 ; +C 171 ; WX 556 ; N guillemotleft ; B 20 243 0 0 ; +C 172 ; WX 584 ; N logicalnot ; B 20 243 0 0 ; +C 173 ; WX 333 ; N hyphen ; B 0 0 760 596 ; +C 174 ; WX 737 ; N registered ; B 20 243 0 0 ; +C 175 ; WX 552 ; N overscore ; B 20 243 0 0 ; +C 176 ; WX 400 ; N degree ; B 20 243 0 0 ; +C 177 ; WX 549 ; N plusminus ; B 20 243 0 0 ; +C 178 ; WX 333 ; N twosuperior ; B 20 243 0 0 ; +C 179 ; WX 333 ; N threesuperior ; B 20 243 0 0 ; +C 180 ; WX 333 ; N acute ; B 20 243 0 0 ; +C 181 ; WX 576 ; N mu1 ; B 20 243 0 0 ; +C 182 ; WX 537 ; N paragraph ; B 20 243 0 0 ; +C 183 ; WX 278 ; N periodcentered ; B 20 243 0 0 ; +C 184 ; WX 333 ; N cedilla ; B 20 243 0 0 ; +C 185 ; WX 333 ; N onesuperior ; B 20 243 0 0 ; +C 186 ; WX 365 ; N ordmasculine ; B 20 243 0 0 ; +C 187 ; WX 556 ; N guillemotright ; B 20 243 0 0 ; +C 188 ; WX 834 ; N onequarter ; B 20 243 0 0 ; +C 189 ; WX 834 ; N onehalf ; B 20 243 0 0 ; +C 190 ; WX 834 ; N threequarters ; B 20 243 0 0 ; +C 191 ; WX 611 ; N questiondown ; B 20 243 0 0 ; +C 192 ; WX 667 ; N Agrave ; B 20 243 0 0 ; +C 193 ; WX 667 ; N Aacute ; B 20 243 0 0 ; +C 194 ; WX 667 ; N Acircumflex ; B 20 243 0 0 ; +C 195 ; WX 667 ; N Atilde ; B 20 243 0 0 ; +C 196 ; WX 667 ; N Adieresis ; B 20 243 0 0 ; +C 197 ; WX 667 ; N Aring ; B 20 243 0 0 ; +C 198 ; WX 1000 ; N AE ; B 20 243 0 0 ; +C 199 ; WX 722 ; N Ccedilla ; B 20 243 0 0 ; +C 200 ; WX 667 ; N Egrave ; B 20 243 0 0 ; +C 201 ; WX 667 ; N Eacute ; B 20 243 0 0 ; +C 202 ; WX 667 ; N Ecircumflex ; B 20 243 0 0 ; +C 203 ; WX 667 ; N Edieresis ; B 20 243 0 0 ; +C 204 ; WX 278 ; N Igrave ; B 20 243 0 0 ; +C 205 ; WX 278 ; N Iacute ; B 20 243 0 0 ; +C 206 ; WX 278 ; N Icircumflex ; B 20 243 0 0 ; +C 207 ; WX 278 ; N Idieresis ; B 20 243 0 0 ; +C 208 ; WX 722 ; N Eth ; B 20 243 0 0 ; +C 209 ; WX 722 ; N Ntilde ; B 20 243 0 0 ; +C 210 ; WX 778 ; N Ograve ; B 20 243 0 0 ; +C 211 ; WX 778 ; N Oacute ; B 20 243 0 0 ; +C 212 ; WX 778 ; N Ocircumflex ; B 20 243 0 0 ; +C 213 ; WX 778 ; N Otilde ; B 20 243 0 0 ; +C 214 ; WX 778 ; N Odieresis ; B 20 243 0 0 ; +C 215 ; WX 584 ; N multiply ; B 20 243 0 0 ; +C 216 ; WX 778 ; N Oslash ; B 20 243 0 0 ; +C 217 ; WX 722 ; N Ugrave ; B 20 243 0 0 ; +C 218 ; WX 722 ; N Uacute ; B 20 243 0 0 ; +C 219 ; WX 722 ; N Ucircumflex ; B 20 243 0 0 ; +C 220 ; WX 722 ; N Udieresis ; B 20 243 0 0 ; +C 221 ; WX 667 ; N Yacute ; B 20 243 0 0 ; +C 222 ; WX 667 ; N Thorn ; B 20 243 0 0 ; +C 223 ; WX 611 ; N germandbls ; B 20 243 0 0 ; +C 224 ; WX 556 ; N agrave ; B 20 243 0 0 ; +C 225 ; WX 556 ; N aacute ; B 20 243 0 0 ; +C 226 ; WX 556 ; N acircumflex ; B 20 243 0 0 ; +C 227 ; WX 556 ; N atilde ; B 20 243 0 0 ; +C 228 ; WX 556 ; N adieresis ; B 20 243 0 0 ; +C 229 ; WX 556 ; N aring ; B 20 243 0 0 ; +C 230 ; WX 889 ; N ae ; B 20 243 0 0 ; +C 231 ; WX 500 ; N ccedilla ; B 20 243 0 0 ; +C 232 ; WX 556 ; N egrave ; B 20 243 0 0 ; +C 233 ; WX 556 ; N eacute ; B 20 243 0 0 ; +C 234 ; WX 556 ; N ecircumflex ; B 20 243 0 0 ; +C 235 ; WX 556 ; N edieresis ; B 20 243 0 0 ; +C 236 ; WX 278 ; N igrave ; B 20 243 0 0 ; +C 237 ; WX 278 ; N iacute ; B 20 243 0 0 ; +C 238 ; WX 278 ; N icircumflex ; B 20 243 0 0 ; +C 239 ; WX 278 ; N idieresis ; B 20 243 0 0 ; +C 240 ; WX 556 ; N eth ; B 20 243 0 0 ; +C 241 ; WX 556 ; N ntilde ; B 20 243 0 0 ; +C 242 ; WX 556 ; N ograve ; B 20 243 0 0 ; +C 243 ; WX 556 ; N oacute ; B 20 243 0 0 ; +C 244 ; WX 556 ; N ocircumflex ; B 20 243 0 0 ; +C 245 ; WX 556 ; N otilde ; B 20 243 0 0 ; +C 246 ; WX 556 ; N odieresis ; B 20 243 0 0 ; +C 247 ; WX 549 ; N divide ; B 20 243 0 0 ; +C 248 ; WX 611 ; N oslash ; B 20 243 0 0 ; +C 249 ; WX 556 ; N ugrave ; B 20 243 0 0 ; +C 250 ; WX 556 ; N uacute ; B 20 243 0 0 ; +C 251 ; WX 556 ; N ucircumflex ; B 20 243 0 0 ; +C 252 ; WX 556 ; N udieresis ; B 20 243 0 0 ; +C 253 ; WX 500 ; N yacute ; B 20 243 0 0 ; +C 254 ; WX 556 ; N thorn ; B 20 243 0 0 ; +C 255 ; WX 500 ; N ydieresis ; B 20 243 0 0 ; +C -1 ; WX 0 ; N .null ; B 0 0 760 596 ; +C -1 ; WX 278 ; N nonmarkingreturn ; B 0 0 760 596 ; +C -1 ; WX 549 ; N notequal ; B 20 243 0 0 ; +C -1 ; WX 713 ; N infinity ; B 20 243 0 0 ; +C -1 ; WX 549 ; N lessequal ; B 20 243 0 0 ; +C -1 ; WX 549 ; N greaterequal ; B 20 243 0 0 ; +C -1 ; WX 494 ; N partialdiff ; B 20 243 0 0 ; +C -1 ; WX 713 ; N summation ; B 20 243 0 0 ; +C -1 ; WX 823 ; N product ; B 20 243 0 0 ; +C -1 ; WX 549 ; N pi1 ; B 20 243 0 0 ; +C -1 ; WX 274 ; N integral ; B 20 243 0 0 ; +C -1 ; WX 768 ; N Ohm ; B 20 243 0 0 ; +C -1 ; WX 549 ; N radical ; B 20 243 0 0 ; +C -1 ; WX 549 ; N approxequal ; B 20 243 0 0 ; +C -1 ; WX 612 ; N increment ; B 20 243 0 0 ; +C -1 ; WX 494 ; N lozenge ; B 20 243 0 0 ; +C -1 ; WX 500 ; N fi ; B 20 243 0 0 ; +C -1 ; WX 500 ; N fl ; B 20 243 0 0 ; +C -1 ; WX 278 ; N dotlessi ; B 20 243 0 0 ; +C -1 ; WX 333 ; N macron ; B 20 243 0 0 ; +C -1 ; WX 333 ; N breve ; B 20 243 0 0 ; +C -1 ; WX 333 ; N dotaccent ; B 20 243 0 0 ; +C -1 ; WX 333 ; N ring ; B 20 243 0 0 ; +C -1 ; WX 333 ; N hungarumlaut ; B 20 243 0 0 ; +C -1 ; WX 333 ; N ogonek ; B 20 243 0 0 ; +C -1 ; WX 333 ; N caron ; B 20 243 0 0 ; +C -1 ; WX 556 ; N Lslash ; B 20 243 0 0 ; +C -1 ; WX 222 ; N lslash ; B 20 243 0 0 ; +C -1 ; WX 584 ; N minus ; B 20 243 0 0 ; +C -1 ; WX 556 ; N franc ; B 20 243 0 0 ; +C -1 ; WX 778 ; N Gbreve ; B 20 243 0 0 ; +C -1 ; WX 556 ; N gbreve ; B 20 243 0 0 ; +C -1 ; WX 278 ; N Idot ; B 20 243 0 0 ; +C -1 ; WX 667 ; N Scedilla ; B 20 243 0 0 ; +C -1 ; WX 500 ; N scedilla ; B 20 243 0 0 ; +C -1 ; WX 722 ; N Cacute ; B 20 243 0 0 ; +C -1 ; WX 500 ; N cacute ; B 20 243 0 0 ; +C -1 ; WX 722 ; N Ccaron ; B 20 243 0 0 ; +C -1 ; WX 500 ; N ccaron ; B 20 243 0 0 ; +C -1 ; WX 556 ; N dmacron ; B 20 243 0 0 ; +C -1 ; WX 333 ; N middot ; B 20 243 0 0 ; +C -1 ; WX 667 ; N Abreve ; B 20 243 0 0 ; +C -1 ; WX 556 ; N abreve ; B 20 243 0 0 ; +C -1 ; WX 667 ; N Aogonek ; B 20 243 0 0 ; +C -1 ; WX 556 ; N aogonek ; B 20 243 0 0 ; +C -1 ; WX 722 ; N Dcaron ; B 20 243 0 0 ; +C -1 ; WX 615 ; N dcaron ; B 20 243 0 0 ; +C -1 ; WX 722 ; N Dslash ; B 20 243 0 0 ; +C -1 ; WX 667 ; N Eogonek ; B 20 243 0 0 ; +C -1 ; WX 556 ; N eogonek ; B 20 243 0 0 ; +C -1 ; WX 667 ; N Ecaron ; B 20 243 0 0 ; +C -1 ; WX 556 ; N ecaron ; B 20 243 0 0 ; +C -1 ; WX 556 ; N Lacute ; B 20 243 0 0 ; +C -1 ; WX 222 ; N lacute ; B 20 243 0 0 ; +C -1 ; WX 556 ; N Lcaron ; B 20 243 0 0 ; +C -1 ; WX 292 ; N lcaron ; B 20 243 0 0 ; +C -1 ; WX 556 ; N Ldot ; B 20 243 0 0 ; +C -1 ; WX 334 ; N ldot ; B 20 243 0 0 ; +C -1 ; WX 722 ; N Nacute ; B 20 243 0 0 ; +C -1 ; WX 556 ; N nacute ; B 20 243 0 0 ; +C -1 ; WX 722 ; N Ncaron ; B 20 243 0 0 ; +C -1 ; WX 556 ; N ncaron ; B 20 243 0 0 ; +C -1 ; WX 778 ; N Odblacute ; B 20 243 0 0 ; +C -1 ; WX 556 ; N odblacute ; B 20 243 0 0 ; +C -1 ; WX 722 ; N Racute ; B 20 243 0 0 ; +C -1 ; WX 333 ; N racute ; B 20 243 0 0 ; +C -1 ; WX 722 ; N Rcaron ; B 20 243 0 0 ; +C -1 ; WX 333 ; N rcaron ; B 20 243 0 0 ; +C -1 ; WX 667 ; N Sacute ; B 20 243 0 0 ; +C -1 ; WX 500 ; N sacute ; B 20 243 0 0 ; +C -1 ; WX 611 ; N Tcedilla ; B 20 243 0 0 ; +C -1 ; WX 278 ; N tcedilla ; B 20 243 0 0 ; +C -1 ; WX 611 ; N Tcaron ; B 20 243 0 0 ; +C -1 ; WX 375 ; N tcaron ; B 20 243 0 0 ; +C -1 ; WX 722 ; N Uring ; B 20 243 0 0 ; +C -1 ; WX 556 ; N uring ; B 20 243 0 0 ; +C -1 ; WX 722 ; N Udblacute ; B 20 243 0 0 ; +C -1 ; WX 556 ; N udblacute ; B 20 243 0 0 ; +C -1 ; WX 611 ; N Zacute ; B 20 243 0 0 ; +C -1 ; WX 500 ; N zacute ; B 20 243 0 0 ; +C -1 ; WX 611 ; N Zdot ; B 20 243 0 0 ; +C -1 ; WX 500 ; N zdot ; B 20 243 0 0 ; +C -1 ; WX 551 ; N Gamma ; B 20 243 0 0 ; +C -1 ; WX 778 ; N Theta ; B 20 243 0 0 ; +C -1 ; WX 798 ; N Phi ; B 20 243 0 0 ; +C -1 ; WX 578 ; N alpha ; B 20 243 0 0 ; +C -1 ; WX 557 ; N delta ; B 20 243 0 0 ; +C -1 ; WX 446 ; N epsilon ; B 20 243 0 0 ; +C -1 ; WX 617 ; N sigma ; B 20 243 0 0 ; +C -1 ; WX 395 ; N tau ; B 20 243 0 0 ; +C -1 ; WX 648 ; N phi ; B 20 243 0 0 ; +C -1 ; WX 552 ; N underscoredbl ; B 20 243 0 0 ; +C -1 ; WX 500 ; N exclamdbl ; B 20 243 0 0 ; +C -1 ; WX 365 ; N nsuperior ; B 20 243 0 0 ; +C -1 ; WX 1094 ; N peseta ; B 20 243 0 0 ; +C -1 ; WX 1000 ; N arrowleft ; B 20 243 0 0 ; +C -1 ; WX 500 ; N arrowup ; B 20 243 0 0 ; +C -1 ; WX 1000 ; N arrowright ; B 20 243 0 0 ; +C -1 ; WX 500 ; N arrowdown ; B 20 243 0 0 ; +C -1 ; WX 1000 ; N arrowboth ; B 20 243 0 0 ; +C -1 ; WX 500 ; N arrowupdn ; B 20 243 0 0 ; +C -1 ; WX 500 ; N arrowupdnbse ; B 20 243 0 0 ; +C -1 ; WX 979 ; N orthogonal ; B 20 243 0 0 ; +C -1 ; WX 719 ; N intersection ; B 20 243 0 0 ; +C -1 ; WX 583 ; N equivalence ; B 20 243 0 0 ; +C -1 ; WX 604 ; N house ; B 20 243 0 0 ; +C -1 ; WX 584 ; N revlogicalnot ; B 20 243 0 0 ; +C -1 ; WX 604 ; N integraltp ; B 20 243 0 0 ; +C -1 ; WX 604 ; N integralbt ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF100000 ; B 20 243 0 0 ; +C -1 ; WX 625 ; N SF110000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF010000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF030000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF020000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF040000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF080000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF090000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF060000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF070000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF050000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF430000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF240000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF510000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF520000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF390000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF220000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF210000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF250000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF500000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF490000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF380000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF280000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF270000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF260000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF360000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF370000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF420000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF190000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF200000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF230000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF470000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF480000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF410000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF450000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF460000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF400000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF540000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF530000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N SF440000 ; B 20 243 0 0 ; +C -1 ; WX 708 ; N upblock ; B 20 243 0 0 ; +C -1 ; WX 708 ; N dnblock ; B 20 243 0 0 ; +C -1 ; WX 708 ; N block ; B 20 243 0 0 ; +C -1 ; WX 708 ; N lfblock ; B 20 243 0 0 ; +C -1 ; WX 708 ; N rtblock ; B 20 243 0 0 ; +C -1 ; WX 708 ; N ltshade ; B 20 243 0 0 ; +C -1 ; WX 708 ; N shade ; B 20 243 0 0 ; +C -1 ; WX 729 ; N dkshade ; B 20 243 0 0 ; +C -1 ; WX 604 ; N filledbox ; B 20 243 0 0 ; +C -1 ; WX 1000 ; N filledrect ; B 20 243 0 0 ; +C -1 ; WX 990 ; N triagup ; B 20 243 0 0 ; +C -1 ; WX 990 ; N triagrt ; B 20 243 0 0 ; +C -1 ; WX 990 ; N triagdn ; B 20 243 0 0 ; +C -1 ; WX 990 ; N triaglf ; B 20 243 0 0 ; +C -1 ; WX 604 ; N circle ; B 20 243 0 0 ; +C -1 ; WX 604 ; N invbullet ; B 20 243 0 0 ; +C -1 ; WX 604 ; N invcircle ; B 20 243 0 0 ; +C -1 ; WX 1021 ; N smileface ; B 20 243 0 0 ; +C -1 ; WX 1052 ; N invsmileface ; B 20 243 0 0 ; +C -1 ; WX 917 ; N sun ; B 20 243 0 0 ; +C -1 ; WX 750 ; N female ; B 20 243 0 0 ; +C -1 ; WX 750 ; N male ; B 20 243 0 0 ; +C -1 ; WX 531 ; N spade ; B 20 243 0 0 ; +C -1 ; WX 656 ; N club ; B 20 243 0 0 ; +C -1 ; WX 594 ; N heart ; B 20 243 0 0 ; +C -1 ; WX 510 ; N diamond ; B 20 243 0 0 ; +C -1 ; WX 500 ; N musicalnote ; B 20 243 0 0 ; +C -1 ; WX 750 ; N musicalnotedbl ; B 20 243 0 0 ; +C -1 ; WX 735 ; N IJ ; B 20 243 0 0 ; +C -1 ; WX 444 ; N ij ; B 20 243 0 0 ; +C -1 ; WX 604 ; N napostrophe ; B 20 243 0 0 ; +C -1 ; WX 188 ; N minute ; B 20 243 0 0 ; +C -1 ; WX 354 ; N second ; B 20 243 0 0 ; +C -1 ; WX 885 ; N afii61248 ; B 20 243 0 0 ; +C -1 ; WX 323 ; N afii61289 ; B 20 243 0 0 ; +C -1 ; WX 604 ; N H22073 ; B 20 243 0 0 ; +C -1 ; WX 354 ; N H18543 ; B 20 243 0 0 ; +C -1 ; WX 354 ; N H18551 ; B 20 243 0 0 ; +C -1 ; WX 604 ; N H18533 ; B 20 243 0 0 ; +C -1 ; WX 354 ; N openbullet ; B 20 243 0 0 ; +C -1 ; WX 667 ; N Amacron ; B 20 243 0 0 ; +C -1 ; WX 556 ; N amacron ; B 20 243 0 0 ; +C -1 ; WX 722 ; N Ccircumflex ; B 20 243 0 0 ; +C -1 ; WX 500 ; N ccircumflex ; B 20 243 0 0 ; +C -1 ; WX 722 ; N Cdot ; B 20 243 0 0 ; +C -1 ; WX 500 ; N cdot ; B 20 243 0 0 ; +C -1 ; WX 667 ; N Emacron ; B 20 243 0 0 ; +C -1 ; WX 556 ; N emacron ; B 20 243 0 0 ; +C -1 ; WX 667 ; N Ebreve ; B 20 243 0 0 ; +C -1 ; WX 556 ; N ebreve ; B 20 243 0 0 ; +C -1 ; WX 667 ; N Edot ; B 20 243 0 0 ; +C -1 ; WX 556 ; N edot ; B 20 243 0 0 ; +C -1 ; WX 778 ; N Gcircumflex ; B 20 243 0 0 ; +C -1 ; WX 556 ; N gcircumflex ; B 20 243 0 0 ; +C -1 ; WX 778 ; N Gdot ; B 20 243 0 0 ; +C -1 ; WX 556 ; N gdot ; B 20 243 0 0 ; +C -1 ; WX 778 ; N Gcedilla ; B 20 243 0 0 ; +C -1 ; WX 556 ; N gcedilla ; B 20 243 0 0 ; +C -1 ; WX 722 ; N Hcircumflex ; B 20 243 0 0 ; +C -1 ; WX 556 ; N hcircumflex ; B 20 243 0 0 ; +C -1 ; WX 722 ; N Hbar ; B 20 243 0 0 ; +C -1 ; WX 556 ; N hbar ; B 20 243 0 0 ; +C -1 ; WX 278 ; N Itilde ; B 20 243 0 0 ; +C -1 ; WX 278 ; N itilde ; B 20 243 0 0 ; +C -1 ; WX 278 ; N Imacron ; B 20 243 0 0 ; +C -1 ; WX 278 ; N imacron ; B 20 243 0 0 ; +C -1 ; WX 278 ; N Ibreve ; B 20 243 0 0 ; +C -1 ; WX 278 ; N ibreve ; B 20 243 0 0 ; +C -1 ; WX 278 ; N Iogonek ; B 20 243 0 0 ; +C -1 ; WX 222 ; N iogonek ; B 20 243 0 0 ; +C -1 ; WX 500 ; N Jcircumflex ; B 20 243 0 0 ; +C -1 ; WX 222 ; N jcircumflex ; B 20 243 0 0 ; +C -1 ; WX 667 ; N Kcedilla ; B 20 243 0 0 ; +C -1 ; WX 500 ; N kcedilla ; B 20 243 0 0 ; +C -1 ; WX 500 ; N kgreenlandic ; B 20 243 0 0 ; +C -1 ; WX 556 ; N Lcedilla ; B 20 243 0 0 ; +C -1 ; WX 222 ; N lcedilla ; B 20 243 0 0 ; +C -1 ; WX 722 ; N Ncedilla ; B 20 243 0 0 ; +C -1 ; WX 556 ; N ncedilla ; B 20 243 0 0 ; +C -1 ; WX 723 ; N Eng ; B 20 243 0 0 ; +C -1 ; WX 556 ; N eng ; B 20 243 0 0 ; +C -1 ; WX 778 ; N Omacron ; B 20 243 0 0 ; +C -1 ; WX 556 ; N omacron ; B 20 243 0 0 ; +C -1 ; WX 778 ; N Obreve ; B 20 243 0 0 ; +C -1 ; WX 556 ; N obreve ; B 20 243 0 0 ; +C -1 ; WX 722 ; N Rcedilla ; B 20 243 0 0 ; +C -1 ; WX 333 ; N rcedilla ; B 20 243 0 0 ; +C -1 ; WX 667 ; N Scircumflex ; B 20 243 0 0 ; +C -1 ; WX 500 ; N scircumflex ; B 20 243 0 0 ; +C -1 ; WX 611 ; N Tbar ; B 20 243 0 0 ; +C -1 ; WX 278 ; N tbar ; B 20 243 0 0 ; +C -1 ; WX 722 ; N Utilde ; B 20 243 0 0 ; +C -1 ; WX 556 ; N utilde ; B 20 243 0 0 ; +C -1 ; WX 722 ; N Umacron ; B 20 243 0 0 ; +C -1 ; WX 556 ; N umacron ; B 20 243 0 0 ; +C -1 ; WX 722 ; N Ubreve ; B 20 243 0 0 ; +C -1 ; WX 556 ; N ubreve ; B 20 243 0 0 ; +C -1 ; WX 722 ; N Uogonek ; B 20 243 0 0 ; +C -1 ; WX 556 ; N uogonek ; B 20 243 0 0 ; +C -1 ; WX 944 ; N Wcircumflex ; B 20 243 0 0 ; +C -1 ; WX 722 ; N wcircumflex ; B 20 243 0 0 ; +C -1 ; WX 667 ; N Ycircumflex ; B 20 243 0 0 ; +C -1 ; WX 500 ; N ycircumflex ; B 20 243 0 0 ; +C -1 ; WX 222 ; N longs ; B 20 243 0 0 ; +C -1 ; WX 667 ; N Aringacute ; B 20 243 0 0 ; +C -1 ; WX 556 ; N aringacute ; B 20 243 0 0 ; +C -1 ; WX 1000 ; N AEacute ; B 20 243 0 0 ; +C -1 ; WX 889 ; N aeacute ; B 20 243 0 0 ; +C -1 ; WX 778 ; N Oslashacute ; B 20 243 0 0 ; +C -1 ; WX 611 ; N oslashacute ; B 20 243 0 0 ; +C -1 ; WX 278 ; N anoteleia ; B 20 243 0 0 ; +C -1 ; WX 944 ; N Wgrave ; B 20 243 0 0 ; +C -1 ; WX 722 ; N wgrave ; B 20 243 0 0 ; +C -1 ; WX 944 ; N Wacute ; B 20 243 0 0 ; +C -1 ; WX 722 ; N wacute ; B 20 243 0 0 ; +C -1 ; WX 944 ; N Wdieresis ; B 20 243 0 0 ; +C -1 ; WX 722 ; N wdieresis ; B 20 243 0 0 ; +C -1 ; WX 667 ; N Ygrave ; B 20 243 0 0 ; +C -1 ; WX 500 ; N ygrave ; B 20 243 0 0 ; +C -1 ; WX 222 ; N quotereversed ; B 20 243 0 0 ; +C -1 ; WX 333 ; N radicalex ; B 20 243 0 0 ; +C -1 ; WX 556 ; N afii08941 ; B 20 243 0 0 ; +C -1 ; WX 600 ; N estimated ; B 20 243 0 0 ; +C -1 ; WX 834 ; N oneeighth ; B 20 243 0 0 ; +C -1 ; WX 834 ; N threeeighths ; B 20 243 0 0 ; +C -1 ; WX 834 ; N fiveeighths ; B 20 243 0 0 ; +C -1 ; WX 834 ; N seveneighths ; B 20 243 0 0 ; +C -1 ; WX 333 ; N commaaccent ; B 20 243 0 0 ; +C -1 ; WX 333 ; N undercommaaccent ; B 20 243 0 0 ; +C -1 ; WX 333 ; N tonos ; B 20 243 0 0 ; +C -1 ; WX 333 ; N dieresistonos ; B 20 243 0 0 ; +C -1 ; WX 667 ; N Alphatonos ; B 20 243 0 0 ; +C -1 ; WX 784 ; N Epsilontonos ; B 20 243 0 0 ; +C -1 ; WX 838 ; N Etatonos ; B 20 243 0 0 ; +C -1 ; WX 384 ; N Iotatonos ; B 20 243 0 0 ; +C -1 ; WX 774 ; N Omicrontonos ; B 20 243 0 0 ; +C -1 ; WX 855 ; N Upsilontonos ; B 20 243 0 0 ; +C -1 ; WX 752 ; N Omegatonos ; B 20 243 0 0 ; +C -1 ; WX 222 ; N iotadieresistonos ; B 20 243 0 0 ; +C -1 ; WX 667 ; N Alpha ; B 20 243 0 0 ; +C -1 ; WX 667 ; N Beta ; B 20 243 0 0 ; +C -1 ; WX 668 ; N _d_507 ; B 20 243 0 0 ; +C -1 ; WX 667 ; N Epsilon ; B 20 243 0 0 ; +C -1 ; WX 611 ; N Zeta ; B 20 243 0 0 ; +C -1 ; WX 722 ; N Eta ; B 20 243 0 0 ; +C -1 ; WX 278 ; N Iota ; B 20 243 0 0 ; +C -1 ; WX 667 ; N Kappa ; B 20 243 0 0 ; +C -1 ; WX 668 ; N Lambda ; B 20 243 0 0 ; +C -1 ; WX 833 ; N Mu ; B 20 243 0 0 ; +C -1 ; WX 722 ; N Nu ; B 20 243 0 0 ; +C -1 ; WX 650 ; N Xi ; B 20 243 0 0 ; +C -1 ; WX 778 ; N Omicron ; B 20 243 0 0 ; +C -1 ; WX 722 ; N Pi ; B 20 243 0 0 ; +C -1 ; WX 667 ; N Rho ; B 20 243 0 0 ; +C -1 ; WX 618 ; N Sigma ; B 20 243 0 0 ; +C -1 ; WX 611 ; N Tau ; B 20 243 0 0 ; +C -1 ; WX 667 ; N Upsilon ; B 20 243 0 0 ; +C -1 ; WX 667 ; N Chi ; B 20 243 0 0 ; +C -1 ; WX 835 ; N Psi ; B 20 243 0 0 ; +C -1 ; WX 748 ; N Omega ; B 20 243 0 0 ; +C -1 ; WX 278 ; N Iotadieresis ; B 20 243 0 0 ; +C -1 ; WX 667 ; N Upsilondieresis ; B 20 243 0 0 ; +C -1 ; WX 578 ; N alphatonos ; B 20 243 0 0 ; +C -1 ; WX 446 ; N epsilontonos ; B 20 243 0 0 ; +C -1 ; WX 556 ; N etatonos ; B 20 243 0 0 ; +C -1 ; WX 222 ; N iotatonos ; B 20 243 0 0 ; +C -1 ; WX 547 ; N upsilondieresistonos ; B 20 243 0 0 ; +C -1 ; WX 575 ; N beta ; B 20 243 0 0 ; +C -1 ; WX 500 ; N gamma ; B 20 243 0 0 ; +C -1 ; WX 441 ; N zeta ; B 20 243 0 0 ; +C -1 ; WX 556 ; N eta ; B 20 243 0 0 ; +C -1 ; WX 556 ; N theta ; B 20 243 0 0 ; +C -1 ; WX 222 ; N iota ; B 20 243 0 0 ; +C -1 ; WX 500 ; N kappa ; B 20 243 0 0 ; +C -1 ; WX 500 ; N lambda ; B 20 243 0 0 ; +C -1 ; WX 576 ; N mu ; B 20 243 0 0 ; +C -1 ; WX 500 ; N nu ; B 20 243 0 0 ; +C -1 ; WX 448 ; N xi ; B 20 243 0 0 ; +C -1 ; WX 556 ; N omicron ; B 20 243 0 0 ; +C -1 ; WX 569 ; N rho ; B 20 243 0 0 ; +C -1 ; WX 482 ; N sigma1 ; B 20 243 0 0 ; +C -1 ; WX 547 ; N upsilon ; B 20 243 0 0 ; +C -1 ; WX 525 ; N chi ; B 20 243 0 0 ; +C -1 ; WX 713 ; N psi ; B 20 243 0 0 ; +C -1 ; WX 781 ; N omega ; B 20 243 0 0 ; +C -1 ; WX 222 ; N iotadieresis ; B 20 243 0 0 ; +C -1 ; WX 547 ; N upsilondieresis ; B 20 243 0 0 ; +C -1 ; WX 556 ; N omicrontonos ; B 20 243 0 0 ; +C -1 ; WX 547 ; N upsilontonos ; B 20 243 0 0 ; +C -1 ; WX 781 ; N omegatonos ; B 20 243 0 0 ; +C -1 ; WX 667 ; N afii10023 ; B 20 243 0 0 ; +C -1 ; WX 865 ; N afii10051 ; B 20 243 0 0 ; +C -1 ; WX 719 ; N afii10053 ; B 20 243 0 0 ; +C -1 ; WX 667 ; N afii10054 ; B 20 243 0 0 ; +C -1 ; WX 278 ; N afii10055 ; B 20 243 0 0 ; +C -1 ; WX 278 ; N afii10056 ; B 20 243 0 0 ; +C -1 ; WX 500 ; N afii10057 ; B 20 243 0 0 ; +C -1 ; WX 1057 ; N afii10058 ; B 20 243 0 0 ; +C -1 ; WX 1010 ; N afii10059 ; B 20 243 0 0 ; +C -1 ; WX 854 ; N afii10060 ; B 20 243 0 0 ; +C -1 ; WX 635 ; N afii10062 ; B 20 243 0 0 ; +C -1 ; WX 667 ; N afii10017 ; B 20 243 0 0 ; +C -1 ; WX 656 ; N afii10018 ; B 20 243 0 0 ; +C -1 ; WX 667 ; N afii10019 ; B 20 243 0 0 ; +C -1 ; WX 542 ; N afii10020 ; B 20 243 0 0 ; +C -1 ; WX 677 ; N afii10021 ; B 20 243 0 0 ; +C -1 ; WX 667 ; N afii10022 ; B 20 243 0 0 ; +C -1 ; WX 923 ; N afii10024 ; B 20 243 0 0 ; +C -1 ; WX 604 ; N afii10025 ; B 20 243 0 0 ; +C -1 ; WX 719 ; N afii10026 ; B 20 243 0 0 ; +C -1 ; WX 719 ; N afii10027 ; B 20 243 0 0 ; +C -1 ; WX 583 ; N afii10028 ; B 20 243 0 0 ; +C -1 ; WX 656 ; N afii10029 ; B 20 243 0 0 ; +C -1 ; WX 833 ; N afii10030 ; B 20 243 0 0 ; +C -1 ; WX 722 ; N afii10031 ; B 20 243 0 0 ; +C -1 ; WX 778 ; N afii10032 ; B 20 243 0 0 ; +C -1 ; WX 719 ; N afii10033 ; B 20 243 0 0 ; +C -1 ; WX 667 ; N afii10034 ; B 20 243 0 0 ; +C -1 ; WX 722 ; N afii10035 ; B 20 243 0 0 ; +C -1 ; WX 611 ; N afii10036 ; B 20 243 0 0 ; +C -1 ; WX 635 ; N afii10037 ; B 20 243 0 0 ; +C -1 ; WX 760 ; N afii10038 ; B 20 243 0 0 ; +C -1 ; WX 667 ; N afii10039 ; B 20 243 0 0 ; +C -1 ; WX 740 ; N afii10040 ; B 20 243 0 0 ; +C -1 ; WX 667 ; N afii10041 ; B 20 243 0 0 ; +C -1 ; WX 917 ; N afii10042 ; B 20 243 0 0 ; +C -1 ; WX 938 ; N afii10043 ; B 20 243 0 0 ; +C -1 ; WX 792 ; N afii10044 ; B 20 243 0 0 ; +C -1 ; WX 885 ; N afii10045 ; B 20 243 0 0 ; +C -1 ; WX 656 ; N afii10046 ; B 20 243 0 0 ; +C -1 ; WX 719 ; N afii10047 ; B 20 243 0 0 ; +C -1 ; WX 1010 ; N afii10048 ; B 20 243 0 0 ; +C -1 ; WX 722 ; N afii10049 ; B 20 243 0 0 ; +C -1 ; WX 556 ; N afii10065 ; B 20 243 0 0 ; +C -1 ; WX 573 ; N afii10066 ; B 20 243 0 0 ; +C -1 ; WX 531 ; N afii10067 ; B 20 243 0 0 ; +C -1 ; WX 365 ; N afii10068 ; B 20 243 0 0 ; +C -1 ; WX 583 ; N afii10069 ; B 20 243 0 0 ; +C -1 ; WX 556 ; N afii10070 ; B 20 243 0 0 ; +C -1 ; WX 669 ; N afii10072 ; B 20 243 0 0 ; +C -1 ; WX 458 ; N afii10073 ; B 20 243 0 0 ; +C -1 ; WX 559 ; N afii10074 ; B 20 243 0 0 ; +C -1 ; WX 559 ; N afii10075 ; B 20 243 0 0 ; +C -1 ; WX 438 ; N afii10076 ; B 20 243 0 0 ; +C -1 ; WX 583 ; N afii10077 ; B 20 243 0 0 ; +C -1 ; WX 688 ; N afii10078 ; B 20 243 0 0 ; +C -1 ; WX 552 ; N afii10079 ; B 20 243 0 0 ; +C -1 ; WX 556 ; N afii10080 ; B 20 243 0 0 ; +C -1 ; WX 542 ; N afii10081 ; B 20 243 0 0 ; +C -1 ; WX 556 ; N afii10082 ; B 20 243 0 0 ; +C -1 ; WX 500 ; N afii10083 ; B 20 243 0 0 ; +C -1 ; WX 458 ; N afii10084 ; B 20 243 0 0 ; +C -1 ; WX 500 ; N afii10085 ; B 20 243 0 0 ; +C -1 ; WX 823 ; N afii10086 ; B 20 243 0 0 ; +C -1 ; WX 500 ; N afii10087 ; B 20 243 0 0 ; +C -1 ; WX 573 ; N afii10088 ; B 20 243 0 0 ; +C -1 ; WX 521 ; N afii10089 ; B 20 243 0 0 ; +C -1 ; WX 802 ; N afii10090 ; B 20 243 0 0 ; +C -1 ; WX 823 ; N afii10091 ; B 20 243 0 0 ; +C -1 ; WX 625 ; N afii10092 ; B 20 243 0 0 ; +C -1 ; WX 719 ; N afii10093 ; B 20 243 0 0 ; +C -1 ; WX 521 ; N afii10094 ; B 20 243 0 0 ; +C -1 ; WX 510 ; N afii10095 ; B 20 243 0 0 ; +C -1 ; WX 750 ; N afii10096 ; B 20 243 0 0 ; +C -1 ; WX 542 ; N afii10097 ; B 20 243 0 0 ; +C -1 ; WX 556 ; N afii10071 ; B 20 243 0 0 ; +C -1 ; WX 556 ; N afii10099 ; B 20 243 0 0 ; +C -1 ; WX 365 ; N afii10100 ; B 20 243 0 0 ; +C -1 ; WX 510 ; N afii10101 ; B 20 243 0 0 ; +C -1 ; WX 500 ; N afii10102 ; B 20 243 0 0 ; +C -1 ; WX 222 ; N afii10103 ; B 20 243 0 0 ; +C -1 ; WX 278 ; N afii10104 ; B 20 243 0 0 ; +C -1 ; WX 222 ; N afii10105 ; B 20 243 0 0 ; +C -1 ; WX 906 ; N afii10106 ; B 20 243 0 0 ; +C -1 ; WX 813 ; N afii10107 ; B 20 243 0 0 ; +C -1 ; WX 556 ; N afii10108 ; B 20 243 0 0 ; +C -1 ; WX 500 ; N afii10110 ; B 20 243 0 0 ; +C -1 ; WX 552 ; N afii10193 ; B 20 243 0 0 ; +C -1 ; WX 489 ; N afii10050 ; B 20 243 0 0 ; +C -1 ; WX 411 ; N afii10098 ; B 20 243 0 0 ; +C -1 ; WX 1000 ; N afii00208 ; B 20 243 0 0 ; +C -1 ; WX 1073 ; N afii61352 ; B 20 243 0 0 ; +C -1 ; WX 690 ; N pi ; B 20 243 0 0 ; +EndCharMetrics +EndFontMetrics diff --git a/fonts/dictsym/dictsym.afm b/fonts/dictsym/dictsym.afm deleted file mode 100644 index 6fe3603bae..0000000000 --- a/fonts/dictsym/dictsym.afm +++ /dev/null @@ -1,707 +0,0 @@ -StartFontMetrics 4.1 -FontName DictSym -FullName Dictionary Symbols Georg Verweyen -Notice Typeface Georg Michael Verweyen. 2004. All Rights Reserved -EncodingScheme FontSpecific -FamilyName Dictionary Symbols -Weight Regular -Version Version 1.00 July 20, 2004, initial release -Characters 653 -ItalicAngle 0.0 -Ascender 905 -Descender -212 -UnderlineThickness 73 -UnderlinePosition -106 -IsFixedPitch false -FontBBox -39 -49 778 797 -StartCharMetrics 688 -C 0 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 1 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 2 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 3 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 4 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 5 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 6 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 7 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 8 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 9 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 10 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 11 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 12 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 13 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 14 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 15 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 16 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 17 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 18 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 19 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 20 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 21 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 22 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 23 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 24 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 25 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 26 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 27 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 28 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 29 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 30 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 31 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 32 ; WX 278 ; N space ; B 0 0 760 596 ; -C 33 ; WX 278 ; N exclam ; B 0 0 760 596 ; -C 34 ; WX 355 ; N quotedbl ; B 0 0 760 596 ; -C 35 ; WX 556 ; N numbersign ; B 0 0 760 596 ; -C 36 ; WX 556 ; N dollar ; B 0 0 760 596 ; -C 37 ; WX 889 ; N percent ; B 0 0 760 596 ; -C 38 ; WX 667 ; N ampersand ; B 0 0 760 596 ; -C 39 ; WX 191 ; N quotesingle ; B 0 0 760 596 ; -C 40 ; WX 333 ; N parenleft ; B 0 0 760 596 ; -C 41 ; WX 333 ; N parenright ; B 0 0 760 596 ; -C 42 ; WX 389 ; N asterisk ; B 0 0 760 596 ; -C 43 ; WX 584 ; N plus ; B 0 0 760 596 ; -C 44 ; WX 278 ; N comma ; B 0 0 760 596 ; -C 45 ; WX 333 ; N hyphen ; B 0 0 760 596 ; -C 46 ; WX 278 ; N period ; B 0 0 760 596 ; -C 47 ; WX 278 ; N slash ; B 0 0 760 596 ; -C 48 ; WX 556 ; N zero ; B 0 0 760 596 ; -C 49 ; WX 556 ; N one ; B 0 0 760 596 ; -C 50 ; WX 556 ; N two ; B 0 0 760 596 ; -C 51 ; WX 556 ; N three ; B 0 0 760 596 ; -C 52 ; WX 556 ; N four ; B 0 0 760 596 ; -C 53 ; WX 556 ; N five ; B 0 0 760 596 ; -C 54 ; WX 556 ; N six ; B 0 0 760 596 ; -C 55 ; WX 556 ; N seven ; B 0 0 760 596 ; -C 56 ; WX 556 ; N eight ; B 0 0 760 596 ; -C 57 ; WX 556 ; N nine ; B 0 0 760 596 ; -C 58 ; WX 278 ; N colon ; B 0 0 760 596 ; -C 59 ; WX 278 ; N semicolon ; B 0 0 760 596 ; -C 60 ; WX 584 ; N less ; B 0 0 760 596 ; -C 61 ; WX 584 ; N equal ; B 0 0 760 596 ; -C 62 ; WX 584 ; N greater ; B 0 0 760 596 ; -C 63 ; WX 556 ; N question ; B 0 0 760 596 ; -C 64 ; WX 1015 ; N at ; B 0 0 760 596 ; -C 65 ; WX 799 ; N A ; B 0 0 760 596 ; -C 66 ; WX 522 ; N B ; B 29 -7 512 752 ; -C 67 ; WX 706 ; N C ; B 0 -8 667 623 ; -C 68 ; WX 722 ; N D ; B 0 0 748 710 ; -C 69 ; WX 667 ; N E ; B 0 0 748 710 ; -C 70 ; WX 611 ; N F ; B 0 0 748 710 ; -C 71 ; WX 787 ; N G ; B 0 0 748 710 ; -C 72 ; WX 669 ; N H ; B 0 -49 630 625 ; -C 73 ; WX 278 ; N I ; B -10 -14 763 662 ; -C 74 ; WX 812 ; N J ; B -10 -14 763 662 ; -C 75 ; WX 667 ; N K ; B 17 -11 681 713 ; -C 76 ; WX 703 ; N L ; B 17 -11 681 713 ; -C 77 ; WX 619 ; N M ; B 5 -16 585 769 ; -C 78 ; WX 722 ; N N ; B 0 0 666 616 ; -C 79 ; WX 778 ; N O ; B 0 0 666 616 ; -C 80 ; WX 667 ; N P ; B 0 0 666 616 ; -C 81 ; WX 778 ; N Q ; B 0 0 666 616 ; -C 82 ; WX 705 ; N R ; B 0 0 666 616 ; -C 83 ; WX 667 ; N S ; B -20 -17 725 749 ; -C 84 ; WX 784 ; N T ; B -20 -17 725 749 ; -C 85 ; WX 722 ; N U ; B -5 -6 681 695 ; -C 86 ; WX 667 ; N V ; B -5 -6 681 695 ; -C 87 ; WX 944 ; N W ; B -5 -6 681 695 ; -C 88 ; WX 725 ; N X ; B -5 -6 681 695 ; -C 89 ; WX 667 ; N Y ; B -27 -20 778 524 ; -C 90 ; WX 611 ; N Z ; B -27 -20 778 524 ; -C 91 ; WX 278 ; N bracketleft ; B -27 -20 778 524 ; -C 92 ; WX 278 ; N backslash ; B -27 -20 778 524 ; -C 93 ; WX 278 ; N bracketright ; B -27 -20 778 524 ; -C 94 ; WX 469 ; N asciicircum ; B -27 -20 778 524 ; -C 95 ; WX 556 ; N underscore ; B -27 -20 778 524 ; -C 96 ; WX 333 ; N grave ; B -27 -20 778 524 ; -C 97 ; WX 844 ; N a ; B -27 -20 778 524 ; -C 98 ; WX 556 ; N b ; B -39 0 766 773 ; -C 99 ; WX 844 ; N c ; B -39 0 766 773 ; -C 100 ; WX 556 ; N d ; B -5 -5 644 797 ; -C 101 ; WX 556 ; N e ; B -5 -5 644 797 ; -C 102 ; WX 278 ; N f ; B -5 -5 644 797 ; -C 103 ; WX 556 ; N g ; B -5 -5 644 797 ; -C 104 ; WX 556 ; N h ; B -5 -5 644 797 ; -C 105 ; WX 222 ; N i ; B -5 -5 644 797 ; -C 106 ; WX 222 ; N j ; B -5 -5 644 797 ; -C 107 ; WX 500 ; N k ; B -5 -5 644 797 ; -C 108 ; WX 222 ; N l ; B -5 -5 644 797 ; -C 109 ; WX 688 ; N m ; B -5 -5 644 797 ; -C 110 ; WX 556 ; N n ; B 20 243 0 0 ; -C 111 ; WX 556 ; N o ; B 20 243 0 0 ; -C 112 ; WX 556 ; N p ; B 20 243 0 0 ; -C 113 ; WX 556 ; N q ; B 20 243 0 0 ; -C 114 ; WX 333 ; N r ; B 20 243 0 0 ; -C 115 ; WX 500 ; N s ; B 20 243 0 0 ; -C 116 ; WX 278 ; N t ; B 20 243 0 0 ; -C 117 ; WX 556 ; N u ; B 20 243 0 0 ; -C 118 ; WX 500 ; N v ; B 20 243 0 0 ; -C 119 ; WX 722 ; N w ; B 20 243 0 0 ; -C 120 ; WX 500 ; N x ; B 20 243 0 0 ; -C 121 ; WX 500 ; N y ; B 20 243 0 0 ; -C 122 ; WX 500 ; N z ; B 20 243 0 0 ; -C 123 ; WX 334 ; N braceleft ; B 20 243 0 0 ; -C 124 ; WX 260 ; N bar ; B 20 243 0 0 ; -C 125 ; WX 334 ; N braceright ; B 20 243 0 0 ; -C 126 ; WX 584 ; N asciitilde ; B 20 243 0 0 ; -C 127 ; WX 750 ; N .notdef ; B 125 0 625 625 ; -C 128 ; WX 556 ; N Euro ; B 20 243 0 0 ; -C 129 ; WX 542 ; N afii10052 ; B 20 243 0 0 ; -C 130 ; WX 222 ; N quotesinglbase ; B 20 243 0 0 ; -C 131 ; WX 556 ; N florin ; B 20 243 0 0 ; -C 132 ; WX 333 ; N quotedblbase ; B 20 243 0 0 ; -C 133 ; WX 1000 ; N ellipsis ; B 20 243 0 0 ; -C 134 ; WX 556 ; N dagger ; B 20 243 0 0 ; -C 135 ; WX 556 ; N daggerdbl ; B 20 243 0 0 ; -C 136 ; WX 333 ; N circumflex ; B 20 243 0 0 ; -C 137 ; WX 1000 ; N perthousand ; B 20 243 0 0 ; -C 138 ; WX 667 ; N Scaron ; B 20 243 0 0 ; -C 139 ; WX 333 ; N guilsinglleft ; B 20 243 0 0 ; -C 140 ; WX 1000 ; N OE ; B 20 243 0 0 ; -C 141 ; WX 583 ; N afii10061 ; B 20 243 0 0 ; -C 142 ; WX 611 ; N Zcaron ; B 20 243 0 0 ; -C 143 ; WX 719 ; N afii10145 ; B 20 243 0 0 ; -C 144 ; WX 333 ; N quotedblbase ; B 20 243 0 0 ; -C 145 ; WX 222 ; N quoteleft ; B 20 243 0 0 ; -C 146 ; WX 222 ; N quoteright ; B 20 243 0 0 ; -C 147 ; WX 333 ; N quotedblleft ; B 20 243 0 0 ; -C 148 ; WX 333 ; N quotedblright ; B 20 243 0 0 ; -C 149 ; WX 350 ; N bullet ; B 20 243 0 0 ; -C 150 ; WX 556 ; N endash ; B 20 243 0 0 ; -C 151 ; WX 1000 ; N emdash ; B 20 243 0 0 ; -C 152 ; WX 333 ; N tilde ; B 20 243 0 0 ; -C 153 ; WX 1000 ; N trademark ; B 20 243 0 0 ; -C 154 ; WX 500 ; N scaron ; B 20 243 0 0 ; -C 155 ; WX 333 ; N guilsinglright ; B 20 243 0 0 ; -C 156 ; WX 944 ; N oe ; B 20 243 0 0 ; -C 157 ; WX 438 ; N afii10109 ; B 20 243 0 0 ; -C 158 ; WX 500 ; N zcaron ; B 20 243 0 0 ; -C 159 ; WX 667 ; N Ydieresis ; B 20 243 0 0 ; -C 160 ; WX 278 ; N space ; B 0 0 760 596 ; -C 161 ; WX 333 ; N exclamdown ; B 20 243 0 0 ; -C 162 ; WX 556 ; N cent ; B 20 243 0 0 ; -C 163 ; WX 556 ; N sterling ; B 20 243 0 0 ; -C 164 ; WX 167 ; N fraction ; B 20 243 0 0 ; -C 165 ; WX 556 ; N yen ; B 20 243 0 0 ; -C 166 ; WX 260 ; N brokenbar ; B 20 243 0 0 ; -C 167 ; WX 556 ; N section ; B 20 243 0 0 ; -C 168 ; WX 333 ; N dieresis ; B 20 243 0 0 ; -C 169 ; WX 737 ; N copyright ; B 20 243 0 0 ; -C 170 ; WX 370 ; N ordfeminine ; B 20 243 0 0 ; -C 171 ; WX 556 ; N guillemotleft ; B 20 243 0 0 ; -C 172 ; WX 584 ; N logicalnot ; B 20 243 0 0 ; -C 173 ; WX 333 ; N hyphen ; B 0 0 760 596 ; -C 174 ; WX 737 ; N registered ; B 20 243 0 0 ; -C 175 ; WX 552 ; N overscore ; B 20 243 0 0 ; -C 176 ; WX 400 ; N degree ; B 20 243 0 0 ; -C 177 ; WX 549 ; N plusminus ; B 20 243 0 0 ; -C 178 ; WX 333 ; N twosuperior ; B 20 243 0 0 ; -C 179 ; WX 333 ; N threesuperior ; B 20 243 0 0 ; -C 180 ; WX 333 ; N acute ; B 20 243 0 0 ; -C 181 ; WX 576 ; N mu1 ; B 20 243 0 0 ; -C 182 ; WX 537 ; N paragraph ; B 20 243 0 0 ; -C 183 ; WX 278 ; N periodcentered ; B 20 243 0 0 ; -C 184 ; WX 333 ; N cedilla ; B 20 243 0 0 ; -C 185 ; WX 333 ; N onesuperior ; B 20 243 0 0 ; -C 186 ; WX 365 ; N ordmasculine ; B 20 243 0 0 ; -C 187 ; WX 556 ; N guillemotright ; B 20 243 0 0 ; -C 188 ; WX 834 ; N onequarter ; B 20 243 0 0 ; -C 189 ; WX 834 ; N onehalf ; B 20 243 0 0 ; -C 190 ; WX 834 ; N threequarters ; B 20 243 0 0 ; -C 191 ; WX 611 ; N questiondown ; B 20 243 0 0 ; -C 192 ; WX 667 ; N Agrave ; B 20 243 0 0 ; -C 193 ; WX 667 ; N Aacute ; B 20 243 0 0 ; -C 194 ; WX 667 ; N Acircumflex ; B 20 243 0 0 ; -C 195 ; WX 667 ; N Atilde ; B 20 243 0 0 ; -C 196 ; WX 667 ; N Adieresis ; B 20 243 0 0 ; -C 197 ; WX 667 ; N Aring ; B 20 243 0 0 ; -C 198 ; WX 1000 ; N AE ; B 20 243 0 0 ; -C 199 ; WX 722 ; N Ccedilla ; B 20 243 0 0 ; -C 200 ; WX 667 ; N Egrave ; B 20 243 0 0 ; -C 201 ; WX 667 ; N Eacute ; B 20 243 0 0 ; -C 202 ; WX 667 ; N Ecircumflex ; B 20 243 0 0 ; -C 203 ; WX 667 ; N Edieresis ; B 20 243 0 0 ; -C 204 ; WX 278 ; N Igrave ; B 20 243 0 0 ; -C 205 ; WX 278 ; N Iacute ; B 20 243 0 0 ; -C 206 ; WX 278 ; N Icircumflex ; B 20 243 0 0 ; -C 207 ; WX 278 ; N Idieresis ; B 20 243 0 0 ; -C 208 ; WX 722 ; N Eth ; B 20 243 0 0 ; -C 209 ; WX 722 ; N Ntilde ; B 20 243 0 0 ; -C 210 ; WX 778 ; N Ograve ; B 20 243 0 0 ; -C 211 ; WX 778 ; N Oacute ; B 20 243 0 0 ; -C 212 ; WX 778 ; N Ocircumflex ; B 20 243 0 0 ; -C 213 ; WX 778 ; N Otilde ; B 20 243 0 0 ; -C 214 ; WX 778 ; N Odieresis ; B 20 243 0 0 ; -C 215 ; WX 584 ; N multiply ; B 20 243 0 0 ; -C 216 ; WX 778 ; N Oslash ; B 20 243 0 0 ; -C 217 ; WX 722 ; N Ugrave ; B 20 243 0 0 ; -C 218 ; WX 722 ; N Uacute ; B 20 243 0 0 ; -C 219 ; WX 722 ; N Ucircumflex ; B 20 243 0 0 ; -C 220 ; WX 722 ; N Udieresis ; B 20 243 0 0 ; -C 221 ; WX 667 ; N Yacute ; B 20 243 0 0 ; -C 222 ; WX 667 ; N Thorn ; B 20 243 0 0 ; -C 223 ; WX 611 ; N germandbls ; B 20 243 0 0 ; -C 224 ; WX 556 ; N agrave ; B 20 243 0 0 ; -C 225 ; WX 556 ; N aacute ; B 20 243 0 0 ; -C 226 ; WX 556 ; N acircumflex ; B 20 243 0 0 ; -C 227 ; WX 556 ; N atilde ; B 20 243 0 0 ; -C 228 ; WX 556 ; N adieresis ; B 20 243 0 0 ; -C 229 ; WX 556 ; N aring ; B 20 243 0 0 ; -C 230 ; WX 889 ; N ae ; B 20 243 0 0 ; -C 231 ; WX 500 ; N ccedilla ; B 20 243 0 0 ; -C 232 ; WX 556 ; N egrave ; B 20 243 0 0 ; -C 233 ; WX 556 ; N eacute ; B 20 243 0 0 ; -C 234 ; WX 556 ; N ecircumflex ; B 20 243 0 0 ; -C 235 ; WX 556 ; N edieresis ; B 20 243 0 0 ; -C 236 ; WX 278 ; N igrave ; B 20 243 0 0 ; -C 237 ; WX 278 ; N iacute ; B 20 243 0 0 ; -C 238 ; WX 278 ; N icircumflex ; B 20 243 0 0 ; -C 239 ; WX 278 ; N idieresis ; B 20 243 0 0 ; -C 240 ; WX 556 ; N eth ; B 20 243 0 0 ; -C 241 ; WX 556 ; N ntilde ; B 20 243 0 0 ; -C 242 ; WX 556 ; N ograve ; B 20 243 0 0 ; -C 243 ; WX 556 ; N oacute ; B 20 243 0 0 ; -C 244 ; WX 556 ; N ocircumflex ; B 20 243 0 0 ; -C 245 ; WX 556 ; N otilde ; B 20 243 0 0 ; -C 246 ; WX 556 ; N odieresis ; B 20 243 0 0 ; -C 247 ; WX 549 ; N divide ; B 20 243 0 0 ; -C 248 ; WX 611 ; N oslash ; B 20 243 0 0 ; -C 249 ; WX 556 ; N ugrave ; B 20 243 0 0 ; -C 250 ; WX 556 ; N uacute ; B 20 243 0 0 ; -C 251 ; WX 556 ; N ucircumflex ; B 20 243 0 0 ; -C 252 ; WX 556 ; N udieresis ; B 20 243 0 0 ; -C 253 ; WX 500 ; N yacute ; B 20 243 0 0 ; -C 254 ; WX 556 ; N thorn ; B 20 243 0 0 ; -C 255 ; WX 500 ; N ydieresis ; B 20 243 0 0 ; -C -1 ; WX 0 ; N .null ; B 0 0 760 596 ; -C -1 ; WX 278 ; N nonmarkingreturn ; B 0 0 760 596 ; -C -1 ; WX 549 ; N notequal ; B 20 243 0 0 ; -C -1 ; WX 713 ; N infinity ; B 20 243 0 0 ; -C -1 ; WX 549 ; N lessequal ; B 20 243 0 0 ; -C -1 ; WX 549 ; N greaterequal ; B 20 243 0 0 ; -C -1 ; WX 494 ; N partialdiff ; B 20 243 0 0 ; -C -1 ; WX 713 ; N summation ; B 20 243 0 0 ; -C -1 ; WX 823 ; N product ; B 20 243 0 0 ; -C -1 ; WX 549 ; N pi1 ; B 20 243 0 0 ; -C -1 ; WX 274 ; N integral ; B 20 243 0 0 ; -C -1 ; WX 768 ; N Ohm ; B 20 243 0 0 ; -C -1 ; WX 549 ; N radical ; B 20 243 0 0 ; -C -1 ; WX 549 ; N approxequal ; B 20 243 0 0 ; -C -1 ; WX 612 ; N increment ; B 20 243 0 0 ; -C -1 ; WX 494 ; N lozenge ; B 20 243 0 0 ; -C -1 ; WX 500 ; N fi ; B 20 243 0 0 ; -C -1 ; WX 500 ; N fl ; B 20 243 0 0 ; -C -1 ; WX 278 ; N dotlessi ; B 20 243 0 0 ; -C -1 ; WX 333 ; N macron ; B 20 243 0 0 ; -C -1 ; WX 333 ; N breve ; B 20 243 0 0 ; -C -1 ; WX 333 ; N dotaccent ; B 20 243 0 0 ; -C -1 ; WX 333 ; N ring ; B 20 243 0 0 ; -C -1 ; WX 333 ; N hungarumlaut ; B 20 243 0 0 ; -C -1 ; WX 333 ; N ogonek ; B 20 243 0 0 ; -C -1 ; WX 333 ; N caron ; B 20 243 0 0 ; -C -1 ; WX 556 ; N Lslash ; B 20 243 0 0 ; -C -1 ; WX 222 ; N lslash ; B 20 243 0 0 ; -C -1 ; WX 584 ; N minus ; B 20 243 0 0 ; -C -1 ; WX 556 ; N franc ; B 20 243 0 0 ; -C -1 ; WX 778 ; N Gbreve ; B 20 243 0 0 ; -C -1 ; WX 556 ; N gbreve ; B 20 243 0 0 ; -C -1 ; WX 278 ; N Idot ; B 20 243 0 0 ; -C -1 ; WX 667 ; N Scedilla ; B 20 243 0 0 ; -C -1 ; WX 500 ; N scedilla ; B 20 243 0 0 ; -C -1 ; WX 722 ; N Cacute ; B 20 243 0 0 ; -C -1 ; WX 500 ; N cacute ; B 20 243 0 0 ; -C -1 ; WX 722 ; N Ccaron ; B 20 243 0 0 ; -C -1 ; WX 500 ; N ccaron ; B 20 243 0 0 ; -C -1 ; WX 556 ; N dmacron ; B 20 243 0 0 ; -C -1 ; WX 333 ; N middot ; B 20 243 0 0 ; -C -1 ; WX 667 ; N Abreve ; B 20 243 0 0 ; -C -1 ; WX 556 ; N abreve ; B 20 243 0 0 ; -C -1 ; WX 667 ; N Aogonek ; B 20 243 0 0 ; -C -1 ; WX 556 ; N aogonek ; B 20 243 0 0 ; -C -1 ; WX 722 ; N Dcaron ; B 20 243 0 0 ; -C -1 ; WX 615 ; N dcaron ; B 20 243 0 0 ; -C -1 ; WX 722 ; N Dslash ; B 20 243 0 0 ; -C -1 ; WX 667 ; N Eogonek ; B 20 243 0 0 ; -C -1 ; WX 556 ; N eogonek ; B 20 243 0 0 ; -C -1 ; WX 667 ; N Ecaron ; B 20 243 0 0 ; -C -1 ; WX 556 ; N ecaron ; B 20 243 0 0 ; -C -1 ; WX 556 ; N Lacute ; B 20 243 0 0 ; -C -1 ; WX 222 ; N lacute ; B 20 243 0 0 ; -C -1 ; WX 556 ; N Lcaron ; B 20 243 0 0 ; -C -1 ; WX 292 ; N lcaron ; B 20 243 0 0 ; -C -1 ; WX 556 ; N Ldot ; B 20 243 0 0 ; -C -1 ; WX 334 ; N ldot ; B 20 243 0 0 ; -C -1 ; WX 722 ; N Nacute ; B 20 243 0 0 ; -C -1 ; WX 556 ; N nacute ; B 20 243 0 0 ; -C -1 ; WX 722 ; N Ncaron ; B 20 243 0 0 ; -C -1 ; WX 556 ; N ncaron ; B 20 243 0 0 ; -C -1 ; WX 778 ; N Odblacute ; B 20 243 0 0 ; -C -1 ; WX 556 ; N odblacute ; B 20 243 0 0 ; -C -1 ; WX 722 ; N Racute ; B 20 243 0 0 ; -C -1 ; WX 333 ; N racute ; B 20 243 0 0 ; -C -1 ; WX 722 ; N Rcaron ; B 20 243 0 0 ; -C -1 ; WX 333 ; N rcaron ; B 20 243 0 0 ; -C -1 ; WX 667 ; N Sacute ; B 20 243 0 0 ; -C -1 ; WX 500 ; N sacute ; B 20 243 0 0 ; -C -1 ; WX 611 ; N Tcedilla ; B 20 243 0 0 ; -C -1 ; WX 278 ; N tcedilla ; B 20 243 0 0 ; -C -1 ; WX 611 ; N Tcaron ; B 20 243 0 0 ; -C -1 ; WX 375 ; N tcaron ; B 20 243 0 0 ; -C -1 ; WX 722 ; N Uring ; B 20 243 0 0 ; -C -1 ; WX 556 ; N uring ; B 20 243 0 0 ; -C -1 ; WX 722 ; N Udblacute ; B 20 243 0 0 ; -C -1 ; WX 556 ; N udblacute ; B 20 243 0 0 ; -C -1 ; WX 611 ; N Zacute ; B 20 243 0 0 ; -C -1 ; WX 500 ; N zacute ; B 20 243 0 0 ; -C -1 ; WX 611 ; N Zdot ; B 20 243 0 0 ; -C -1 ; WX 500 ; N zdot ; B 20 243 0 0 ; -C -1 ; WX 551 ; N Gamma ; B 20 243 0 0 ; -C -1 ; WX 778 ; N Theta ; B 20 243 0 0 ; -C -1 ; WX 798 ; N Phi ; B 20 243 0 0 ; -C -1 ; WX 578 ; N alpha ; B 20 243 0 0 ; -C -1 ; WX 557 ; N delta ; B 20 243 0 0 ; -C -1 ; WX 446 ; N epsilon ; B 20 243 0 0 ; -C -1 ; WX 617 ; N sigma ; B 20 243 0 0 ; -C -1 ; WX 395 ; N tau ; B 20 243 0 0 ; -C -1 ; WX 648 ; N phi ; B 20 243 0 0 ; -C -1 ; WX 552 ; N underscoredbl ; B 20 243 0 0 ; -C -1 ; WX 500 ; N exclamdbl ; B 20 243 0 0 ; -C -1 ; WX 365 ; N nsuperior ; B 20 243 0 0 ; -C -1 ; WX 1094 ; N peseta ; B 20 243 0 0 ; -C -1 ; WX 1000 ; N arrowleft ; B 20 243 0 0 ; -C -1 ; WX 500 ; N arrowup ; B 20 243 0 0 ; -C -1 ; WX 1000 ; N arrowright ; B 20 243 0 0 ; -C -1 ; WX 500 ; N arrowdown ; B 20 243 0 0 ; -C -1 ; WX 1000 ; N arrowboth ; B 20 243 0 0 ; -C -1 ; WX 500 ; N arrowupdn ; B 20 243 0 0 ; -C -1 ; WX 500 ; N arrowupdnbse ; B 20 243 0 0 ; -C -1 ; WX 979 ; N orthogonal ; B 20 243 0 0 ; -C -1 ; WX 719 ; N intersection ; B 20 243 0 0 ; -C -1 ; WX 583 ; N equivalence ; B 20 243 0 0 ; -C -1 ; WX 604 ; N house ; B 20 243 0 0 ; -C -1 ; WX 584 ; N revlogicalnot ; B 20 243 0 0 ; -C -1 ; WX 604 ; N integraltp ; B 20 243 0 0 ; -C -1 ; WX 604 ; N integralbt ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF100000 ; B 20 243 0 0 ; -C -1 ; WX 625 ; N SF110000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF010000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF030000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF020000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF040000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF080000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF090000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF060000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF070000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF050000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF430000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF240000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF510000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF520000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF390000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF220000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF210000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF250000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF500000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF490000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF380000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF280000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF270000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF260000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF360000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF370000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF420000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF190000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF200000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF230000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF470000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF480000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF410000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF450000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF460000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF400000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF540000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF530000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N SF440000 ; B 20 243 0 0 ; -C -1 ; WX 708 ; N upblock ; B 20 243 0 0 ; -C -1 ; WX 708 ; N dnblock ; B 20 243 0 0 ; -C -1 ; WX 708 ; N block ; B 20 243 0 0 ; -C -1 ; WX 708 ; N lfblock ; B 20 243 0 0 ; -C -1 ; WX 708 ; N rtblock ; B 20 243 0 0 ; -C -1 ; WX 708 ; N ltshade ; B 20 243 0 0 ; -C -1 ; WX 708 ; N shade ; B 20 243 0 0 ; -C -1 ; WX 729 ; N dkshade ; B 20 243 0 0 ; -C -1 ; WX 604 ; N filledbox ; B 20 243 0 0 ; -C -1 ; WX 1000 ; N filledrect ; B 20 243 0 0 ; -C -1 ; WX 990 ; N triagup ; B 20 243 0 0 ; -C -1 ; WX 990 ; N triagrt ; B 20 243 0 0 ; -C -1 ; WX 990 ; N triagdn ; B 20 243 0 0 ; -C -1 ; WX 990 ; N triaglf ; B 20 243 0 0 ; -C -1 ; WX 604 ; N circle ; B 20 243 0 0 ; -C -1 ; WX 604 ; N invbullet ; B 20 243 0 0 ; -C -1 ; WX 604 ; N invcircle ; B 20 243 0 0 ; -C -1 ; WX 1021 ; N smileface ; B 20 243 0 0 ; -C -1 ; WX 1052 ; N invsmileface ; B 20 243 0 0 ; -C -1 ; WX 917 ; N sun ; B 20 243 0 0 ; -C -1 ; WX 750 ; N female ; B 20 243 0 0 ; -C -1 ; WX 750 ; N male ; B 20 243 0 0 ; -C -1 ; WX 531 ; N spade ; B 20 243 0 0 ; -C -1 ; WX 656 ; N club ; B 20 243 0 0 ; -C -1 ; WX 594 ; N heart ; B 20 243 0 0 ; -C -1 ; WX 510 ; N diamond ; B 20 243 0 0 ; -C -1 ; WX 500 ; N musicalnote ; B 20 243 0 0 ; -C -1 ; WX 750 ; N musicalnotedbl ; B 20 243 0 0 ; -C -1 ; WX 735 ; N IJ ; B 20 243 0 0 ; -C -1 ; WX 444 ; N ij ; B 20 243 0 0 ; -C -1 ; WX 604 ; N napostrophe ; B 20 243 0 0 ; -C -1 ; WX 188 ; N minute ; B 20 243 0 0 ; -C -1 ; WX 354 ; N second ; B 20 243 0 0 ; -C -1 ; WX 885 ; N afii61248 ; B 20 243 0 0 ; -C -1 ; WX 323 ; N afii61289 ; B 20 243 0 0 ; -C -1 ; WX 604 ; N H22073 ; B 20 243 0 0 ; -C -1 ; WX 354 ; N H18543 ; B 20 243 0 0 ; -C -1 ; WX 354 ; N H18551 ; B 20 243 0 0 ; -C -1 ; WX 604 ; N H18533 ; B 20 243 0 0 ; -C -1 ; WX 354 ; N openbullet ; B 20 243 0 0 ; -C -1 ; WX 667 ; N Amacron ; B 20 243 0 0 ; -C -1 ; WX 556 ; N amacron ; B 20 243 0 0 ; -C -1 ; WX 722 ; N Ccircumflex ; B 20 243 0 0 ; -C -1 ; WX 500 ; N ccircumflex ; B 20 243 0 0 ; -C -1 ; WX 722 ; N Cdot ; B 20 243 0 0 ; -C -1 ; WX 500 ; N cdot ; B 20 243 0 0 ; -C -1 ; WX 667 ; N Emacron ; B 20 243 0 0 ; -C -1 ; WX 556 ; N emacron ; B 20 243 0 0 ; -C -1 ; WX 667 ; N Ebreve ; B 20 243 0 0 ; -C -1 ; WX 556 ; N ebreve ; B 20 243 0 0 ; -C -1 ; WX 667 ; N Edot ; B 20 243 0 0 ; -C -1 ; WX 556 ; N edot ; B 20 243 0 0 ; -C -1 ; WX 778 ; N Gcircumflex ; B 20 243 0 0 ; -C -1 ; WX 556 ; N gcircumflex ; B 20 243 0 0 ; -C -1 ; WX 778 ; N Gdot ; B 20 243 0 0 ; -C -1 ; WX 556 ; N gdot ; B 20 243 0 0 ; -C -1 ; WX 778 ; N Gcedilla ; B 20 243 0 0 ; -C -1 ; WX 556 ; N gcedilla ; B 20 243 0 0 ; -C -1 ; WX 722 ; N Hcircumflex ; B 20 243 0 0 ; -C -1 ; WX 556 ; N hcircumflex ; B 20 243 0 0 ; -C -1 ; WX 722 ; N Hbar ; B 20 243 0 0 ; -C -1 ; WX 556 ; N hbar ; B 20 243 0 0 ; -C -1 ; WX 278 ; N Itilde ; B 20 243 0 0 ; -C -1 ; WX 278 ; N itilde ; B 20 243 0 0 ; -C -1 ; WX 278 ; N Imacron ; B 20 243 0 0 ; -C -1 ; WX 278 ; N imacron ; B 20 243 0 0 ; -C -1 ; WX 278 ; N Ibreve ; B 20 243 0 0 ; -C -1 ; WX 278 ; N ibreve ; B 20 243 0 0 ; -C -1 ; WX 278 ; N Iogonek ; B 20 243 0 0 ; -C -1 ; WX 222 ; N iogonek ; B 20 243 0 0 ; -C -1 ; WX 500 ; N Jcircumflex ; B 20 243 0 0 ; -C -1 ; WX 222 ; N jcircumflex ; B 20 243 0 0 ; -C -1 ; WX 667 ; N Kcedilla ; B 20 243 0 0 ; -C -1 ; WX 500 ; N kcedilla ; B 20 243 0 0 ; -C -1 ; WX 500 ; N kgreenlandic ; B 20 243 0 0 ; -C -1 ; WX 556 ; N Lcedilla ; B 20 243 0 0 ; -C -1 ; WX 222 ; N lcedilla ; B 20 243 0 0 ; -C -1 ; WX 722 ; N Ncedilla ; B 20 243 0 0 ; -C -1 ; WX 556 ; N ncedilla ; B 20 243 0 0 ; -C -1 ; WX 723 ; N Eng ; B 20 243 0 0 ; -C -1 ; WX 556 ; N eng ; B 20 243 0 0 ; -C -1 ; WX 778 ; N Omacron ; B 20 243 0 0 ; -C -1 ; WX 556 ; N omacron ; B 20 243 0 0 ; -C -1 ; WX 778 ; N Obreve ; B 20 243 0 0 ; -C -1 ; WX 556 ; N obreve ; B 20 243 0 0 ; -C -1 ; WX 722 ; N Rcedilla ; B 20 243 0 0 ; -C -1 ; WX 333 ; N rcedilla ; B 20 243 0 0 ; -C -1 ; WX 667 ; N Scircumflex ; B 20 243 0 0 ; -C -1 ; WX 500 ; N scircumflex ; B 20 243 0 0 ; -C -1 ; WX 611 ; N Tbar ; B 20 243 0 0 ; -C -1 ; WX 278 ; N tbar ; B 20 243 0 0 ; -C -1 ; WX 722 ; N Utilde ; B 20 243 0 0 ; -C -1 ; WX 556 ; N utilde ; B 20 243 0 0 ; -C -1 ; WX 722 ; N Umacron ; B 20 243 0 0 ; -C -1 ; WX 556 ; N umacron ; B 20 243 0 0 ; -C -1 ; WX 722 ; N Ubreve ; B 20 243 0 0 ; -C -1 ; WX 556 ; N ubreve ; B 20 243 0 0 ; -C -1 ; WX 722 ; N Uogonek ; B 20 243 0 0 ; -C -1 ; WX 556 ; N uogonek ; B 20 243 0 0 ; -C -1 ; WX 944 ; N Wcircumflex ; B 20 243 0 0 ; -C -1 ; WX 722 ; N wcircumflex ; B 20 243 0 0 ; -C -1 ; WX 667 ; N Ycircumflex ; B 20 243 0 0 ; -C -1 ; WX 500 ; N ycircumflex ; B 20 243 0 0 ; -C -1 ; WX 222 ; N longs ; B 20 243 0 0 ; -C -1 ; WX 667 ; N Aringacute ; B 20 243 0 0 ; -C -1 ; WX 556 ; N aringacute ; B 20 243 0 0 ; -C -1 ; WX 1000 ; N AEacute ; B 20 243 0 0 ; -C -1 ; WX 889 ; N aeacute ; B 20 243 0 0 ; -C -1 ; WX 778 ; N Oslashacute ; B 20 243 0 0 ; -C -1 ; WX 611 ; N oslashacute ; B 20 243 0 0 ; -C -1 ; WX 278 ; N anoteleia ; B 20 243 0 0 ; -C -1 ; WX 944 ; N Wgrave ; B 20 243 0 0 ; -C -1 ; WX 722 ; N wgrave ; B 20 243 0 0 ; -C -1 ; WX 944 ; N Wacute ; B 20 243 0 0 ; -C -1 ; WX 722 ; N wacute ; B 20 243 0 0 ; -C -1 ; WX 944 ; N Wdieresis ; B 20 243 0 0 ; -C -1 ; WX 722 ; N wdieresis ; B 20 243 0 0 ; -C -1 ; WX 667 ; N Ygrave ; B 20 243 0 0 ; -C -1 ; WX 500 ; N ygrave ; B 20 243 0 0 ; -C -1 ; WX 222 ; N quotereversed ; B 20 243 0 0 ; -C -1 ; WX 333 ; N radicalex ; B 20 243 0 0 ; -C -1 ; WX 556 ; N afii08941 ; B 20 243 0 0 ; -C -1 ; WX 600 ; N estimated ; B 20 243 0 0 ; -C -1 ; WX 834 ; N oneeighth ; B 20 243 0 0 ; -C -1 ; WX 834 ; N threeeighths ; B 20 243 0 0 ; -C -1 ; WX 834 ; N fiveeighths ; B 20 243 0 0 ; -C -1 ; WX 834 ; N seveneighths ; B 20 243 0 0 ; -C -1 ; WX 333 ; N commaaccent ; B 20 243 0 0 ; -C -1 ; WX 333 ; N undercommaaccent ; B 20 243 0 0 ; -C -1 ; WX 333 ; N tonos ; B 20 243 0 0 ; -C -1 ; WX 333 ; N dieresistonos ; B 20 243 0 0 ; -C -1 ; WX 667 ; N Alphatonos ; B 20 243 0 0 ; -C -1 ; WX 784 ; N Epsilontonos ; B 20 243 0 0 ; -C -1 ; WX 838 ; N Etatonos ; B 20 243 0 0 ; -C -1 ; WX 384 ; N Iotatonos ; B 20 243 0 0 ; -C -1 ; WX 774 ; N Omicrontonos ; B 20 243 0 0 ; -C -1 ; WX 855 ; N Upsilontonos ; B 20 243 0 0 ; -C -1 ; WX 752 ; N Omegatonos ; B 20 243 0 0 ; -C -1 ; WX 222 ; N iotadieresistonos ; B 20 243 0 0 ; -C -1 ; WX 667 ; N Alpha ; B 20 243 0 0 ; -C -1 ; WX 667 ; N Beta ; B 20 243 0 0 ; -C -1 ; WX 668 ; N _d_507 ; B 20 243 0 0 ; -C -1 ; WX 667 ; N Epsilon ; B 20 243 0 0 ; -C -1 ; WX 611 ; N Zeta ; B 20 243 0 0 ; -C -1 ; WX 722 ; N Eta ; B 20 243 0 0 ; -C -1 ; WX 278 ; N Iota ; B 20 243 0 0 ; -C -1 ; WX 667 ; N Kappa ; B 20 243 0 0 ; -C -1 ; WX 668 ; N Lambda ; B 20 243 0 0 ; -C -1 ; WX 833 ; N Mu ; B 20 243 0 0 ; -C -1 ; WX 722 ; N Nu ; B 20 243 0 0 ; -C -1 ; WX 650 ; N Xi ; B 20 243 0 0 ; -C -1 ; WX 778 ; N Omicron ; B 20 243 0 0 ; -C -1 ; WX 722 ; N Pi ; B 20 243 0 0 ; -C -1 ; WX 667 ; N Rho ; B 20 243 0 0 ; -C -1 ; WX 618 ; N Sigma ; B 20 243 0 0 ; -C -1 ; WX 611 ; N Tau ; B 20 243 0 0 ; -C -1 ; WX 667 ; N Upsilon ; B 20 243 0 0 ; -C -1 ; WX 667 ; N Chi ; B 20 243 0 0 ; -C -1 ; WX 835 ; N Psi ; B 20 243 0 0 ; -C -1 ; WX 748 ; N Omega ; B 20 243 0 0 ; -C -1 ; WX 278 ; N Iotadieresis ; B 20 243 0 0 ; -C -1 ; WX 667 ; N Upsilondieresis ; B 20 243 0 0 ; -C -1 ; WX 578 ; N alphatonos ; B 20 243 0 0 ; -C -1 ; WX 446 ; N epsilontonos ; B 20 243 0 0 ; -C -1 ; WX 556 ; N etatonos ; B 20 243 0 0 ; -C -1 ; WX 222 ; N iotatonos ; B 20 243 0 0 ; -C -1 ; WX 547 ; N upsilondieresistonos ; B 20 243 0 0 ; -C -1 ; WX 575 ; N beta ; B 20 243 0 0 ; -C -1 ; WX 500 ; N gamma ; B 20 243 0 0 ; -C -1 ; WX 441 ; N zeta ; B 20 243 0 0 ; -C -1 ; WX 556 ; N eta ; B 20 243 0 0 ; -C -1 ; WX 556 ; N theta ; B 20 243 0 0 ; -C -1 ; WX 222 ; N iota ; B 20 243 0 0 ; -C -1 ; WX 500 ; N kappa ; B 20 243 0 0 ; -C -1 ; WX 500 ; N lambda ; B 20 243 0 0 ; -C -1 ; WX 576 ; N mu ; B 20 243 0 0 ; -C -1 ; WX 500 ; N nu ; B 20 243 0 0 ; -C -1 ; WX 448 ; N xi ; B 20 243 0 0 ; -C -1 ; WX 556 ; N omicron ; B 20 243 0 0 ; -C -1 ; WX 569 ; N rho ; B 20 243 0 0 ; -C -1 ; WX 482 ; N sigma1 ; B 20 243 0 0 ; -C -1 ; WX 547 ; N upsilon ; B 20 243 0 0 ; -C -1 ; WX 525 ; N chi ; B 20 243 0 0 ; -C -1 ; WX 713 ; N psi ; B 20 243 0 0 ; -C -1 ; WX 781 ; N omega ; B 20 243 0 0 ; -C -1 ; WX 222 ; N iotadieresis ; B 20 243 0 0 ; -C -1 ; WX 547 ; N upsilondieresis ; B 20 243 0 0 ; -C -1 ; WX 556 ; N omicrontonos ; B 20 243 0 0 ; -C -1 ; WX 547 ; N upsilontonos ; B 20 243 0 0 ; -C -1 ; WX 781 ; N omegatonos ; B 20 243 0 0 ; -C -1 ; WX 667 ; N afii10023 ; B 20 243 0 0 ; -C -1 ; WX 865 ; N afii10051 ; B 20 243 0 0 ; -C -1 ; WX 719 ; N afii10053 ; B 20 243 0 0 ; -C -1 ; WX 667 ; N afii10054 ; B 20 243 0 0 ; -C -1 ; WX 278 ; N afii10055 ; B 20 243 0 0 ; -C -1 ; WX 278 ; N afii10056 ; B 20 243 0 0 ; -C -1 ; WX 500 ; N afii10057 ; B 20 243 0 0 ; -C -1 ; WX 1057 ; N afii10058 ; B 20 243 0 0 ; -C -1 ; WX 1010 ; N afii10059 ; B 20 243 0 0 ; -C -1 ; WX 854 ; N afii10060 ; B 20 243 0 0 ; -C -1 ; WX 635 ; N afii10062 ; B 20 243 0 0 ; -C -1 ; WX 667 ; N afii10017 ; B 20 243 0 0 ; -C -1 ; WX 656 ; N afii10018 ; B 20 243 0 0 ; -C -1 ; WX 667 ; N afii10019 ; B 20 243 0 0 ; -C -1 ; WX 542 ; N afii10020 ; B 20 243 0 0 ; -C -1 ; WX 677 ; N afii10021 ; B 20 243 0 0 ; -C -1 ; WX 667 ; N afii10022 ; B 20 243 0 0 ; -C -1 ; WX 923 ; N afii10024 ; B 20 243 0 0 ; -C -1 ; WX 604 ; N afii10025 ; B 20 243 0 0 ; -C -1 ; WX 719 ; N afii10026 ; B 20 243 0 0 ; -C -1 ; WX 719 ; N afii10027 ; B 20 243 0 0 ; -C -1 ; WX 583 ; N afii10028 ; B 20 243 0 0 ; -C -1 ; WX 656 ; N afii10029 ; B 20 243 0 0 ; -C -1 ; WX 833 ; N afii10030 ; B 20 243 0 0 ; -C -1 ; WX 722 ; N afii10031 ; B 20 243 0 0 ; -C -1 ; WX 778 ; N afii10032 ; B 20 243 0 0 ; -C -1 ; WX 719 ; N afii10033 ; B 20 243 0 0 ; -C -1 ; WX 667 ; N afii10034 ; B 20 243 0 0 ; -C -1 ; WX 722 ; N afii10035 ; B 20 243 0 0 ; -C -1 ; WX 611 ; N afii10036 ; B 20 243 0 0 ; -C -1 ; WX 635 ; N afii10037 ; B 20 243 0 0 ; -C -1 ; WX 760 ; N afii10038 ; B 20 243 0 0 ; -C -1 ; WX 667 ; N afii10039 ; B 20 243 0 0 ; -C -1 ; WX 740 ; N afii10040 ; B 20 243 0 0 ; -C -1 ; WX 667 ; N afii10041 ; B 20 243 0 0 ; -C -1 ; WX 917 ; N afii10042 ; B 20 243 0 0 ; -C -1 ; WX 938 ; N afii10043 ; B 20 243 0 0 ; -C -1 ; WX 792 ; N afii10044 ; B 20 243 0 0 ; -C -1 ; WX 885 ; N afii10045 ; B 20 243 0 0 ; -C -1 ; WX 656 ; N afii10046 ; B 20 243 0 0 ; -C -1 ; WX 719 ; N afii10047 ; B 20 243 0 0 ; -C -1 ; WX 1010 ; N afii10048 ; B 20 243 0 0 ; -C -1 ; WX 722 ; N afii10049 ; B 20 243 0 0 ; -C -1 ; WX 556 ; N afii10065 ; B 20 243 0 0 ; -C -1 ; WX 573 ; N afii10066 ; B 20 243 0 0 ; -C -1 ; WX 531 ; N afii10067 ; B 20 243 0 0 ; -C -1 ; WX 365 ; N afii10068 ; B 20 243 0 0 ; -C -1 ; WX 583 ; N afii10069 ; B 20 243 0 0 ; -C -1 ; WX 556 ; N afii10070 ; B 20 243 0 0 ; -C -1 ; WX 669 ; N afii10072 ; B 20 243 0 0 ; -C -1 ; WX 458 ; N afii10073 ; B 20 243 0 0 ; -C -1 ; WX 559 ; N afii10074 ; B 20 243 0 0 ; -C -1 ; WX 559 ; N afii10075 ; B 20 243 0 0 ; -C -1 ; WX 438 ; N afii10076 ; B 20 243 0 0 ; -C -1 ; WX 583 ; N afii10077 ; B 20 243 0 0 ; -C -1 ; WX 688 ; N afii10078 ; B 20 243 0 0 ; -C -1 ; WX 552 ; N afii10079 ; B 20 243 0 0 ; -C -1 ; WX 556 ; N afii10080 ; B 20 243 0 0 ; -C -1 ; WX 542 ; N afii10081 ; B 20 243 0 0 ; -C -1 ; WX 556 ; N afii10082 ; B 20 243 0 0 ; -C -1 ; WX 500 ; N afii10083 ; B 20 243 0 0 ; -C -1 ; WX 458 ; N afii10084 ; B 20 243 0 0 ; -C -1 ; WX 500 ; N afii10085 ; B 20 243 0 0 ; -C -1 ; WX 823 ; N afii10086 ; B 20 243 0 0 ; -C -1 ; WX 500 ; N afii10087 ; B 20 243 0 0 ; -C -1 ; WX 573 ; N afii10088 ; B 20 243 0 0 ; -C -1 ; WX 521 ; N afii10089 ; B 20 243 0 0 ; -C -1 ; WX 802 ; N afii10090 ; B 20 243 0 0 ; -C -1 ; WX 823 ; N afii10091 ; B 20 243 0 0 ; -C -1 ; WX 625 ; N afii10092 ; B 20 243 0 0 ; -C -1 ; WX 719 ; N afii10093 ; B 20 243 0 0 ; -C -1 ; WX 521 ; N afii10094 ; B 20 243 0 0 ; -C -1 ; WX 510 ; N afii10095 ; B 20 243 0 0 ; -C -1 ; WX 750 ; N afii10096 ; B 20 243 0 0 ; -C -1 ; WX 542 ; N afii10097 ; B 20 243 0 0 ; -C -1 ; WX 556 ; N afii10071 ; B 20 243 0 0 ; -C -1 ; WX 556 ; N afii10099 ; B 20 243 0 0 ; -C -1 ; WX 365 ; N afii10100 ; B 20 243 0 0 ; -C -1 ; WX 510 ; N afii10101 ; B 20 243 0 0 ; -C -1 ; WX 500 ; N afii10102 ; B 20 243 0 0 ; -C -1 ; WX 222 ; N afii10103 ; B 20 243 0 0 ; -C -1 ; WX 278 ; N afii10104 ; B 20 243 0 0 ; -C -1 ; WX 222 ; N afii10105 ; B 20 243 0 0 ; -C -1 ; WX 906 ; N afii10106 ; B 20 243 0 0 ; -C -1 ; WX 813 ; N afii10107 ; B 20 243 0 0 ; -C -1 ; WX 556 ; N afii10108 ; B 20 243 0 0 ; -C -1 ; WX 500 ; N afii10110 ; B 20 243 0 0 ; -C -1 ; WX 552 ; N afii10193 ; B 20 243 0 0 ; -C -1 ; WX 489 ; N afii10050 ; B 20 243 0 0 ; -C -1 ; WX 411 ; N afii10098 ; B 20 243 0 0 ; -C -1 ; WX 1000 ; N afii00208 ; B 20 243 0 0 ; -C -1 ; WX 1073 ; N afii61352 ; B 20 243 0 0 ; -C -1 ; WX 690 ; N pi ; B 20 243 0 0 ; -EndCharMetrics -EndFontMetrics diff --git a/fonts/dictsym/dictsym.pdf b/fonts/dictsym/dictsym.pdf deleted file mode 100644 index 5e78b8bbaa..0000000000 Binary files a/fonts/dictsym/dictsym.pdf and /dev/null differ diff --git a/fonts/dictsym/dictsym.pfb b/fonts/dictsym/dictsym.pfb deleted file mode 100644 index 50b924c3e8..0000000000 Binary files a/fonts/dictsym/dictsym.pfb and /dev/null differ diff --git a/fonts/dictsym/dictsym.pfm b/fonts/dictsym/dictsym.pfm deleted file mode 100644 index ed5369c000..0000000000 Binary files a/fonts/dictsym/dictsym.pfm and /dev/null differ diff --git a/fonts/dictsym/doc/dictsym.pdf b/fonts/dictsym/doc/dictsym.pdf new file mode 100644 index 0000000000..5e78b8bbaa Binary files /dev/null and b/fonts/dictsym/doc/dictsym.pdf differ diff --git a/fonts/dictsym/doc/dictsym.tex b/fonts/dictsym/doc/dictsym.tex new file mode 100644 index 0000000000..e94884ac2e --- /dev/null +++ b/fonts/dictsym/doc/dictsym.tex @@ -0,0 +1,64 @@ +%% dictsym.tex +%% Copyright 2004 Walter Schmidt +% +% 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 2003/12/01 or later. +% +% This work has the LPPL maintenance status "maintained". +% +% This Current Maintainer of this work is Walter Schmidt +% +% This work consists of the files dictsym.sty and dictsym.tex +% and the compiled file dictsym.pdf. +% +\documentclass[11pt]{ltxguide}[1995/11/28] +\usepackage[scaled=1.5]{dictsym} + +% a bit of logical markup: +\newcommand{\Lpack}[1]{\textsf{#1}} + +\title{The \Lpack{dictsym} package for \LaTeX} +\author{Walter Schmidt} +\date{version 2.0\,$\beta$ -- 2004-07-26} + +\begin{document} +\maketitle\thispagestyle{empty} + +The PostScript font `DictSym' (designed by Georg Verweyen) provides a +number of symbols commonly found in dictionaries. +The macro package +\Lpack{dictsym} serves to use of this font with \LaTeX{}. It provides +the following commands to print the symbols of the font: + +\renewcommand{\arraystretch}{1.5} +\begin{tabular}{ll@{\qquad}ll} + \dsarchitectural &|\dsarchitectural| & \dsmathematical &|\dsmathematical| \\ + \dsbiological &|\dsbiological| & \dsrailways &|\dsrailways| \\ + \dschemical &|\dschemical| & \dstechnical &|\dstechnical| \\ + \dsagricultural &|\dsagricultural| & \dsmilitary &|\dsmilitary| \\ + \dsheraldical &|\dsheraldical| & \dsaeronautical &|\dsaeronautical| \\ + \dsjuridical &|\dsjuridical| & \dscommercial &|\dscommercial| \\ + \dsliterary &|\dsliterary| & \dsmedical &|\dsmedical| \\ +\end{tabular} + +By default, the symbols are typeset at the same nominal font size +as the surrounding text. When the package is loaded with the option +\texttt{[scaled=}\m{scale}\texttt{]}, +the DictSym font will be scaled by the indicated factor. For instance, +\begin{quote} + |\usepackage[scaled=1.1]{dictsym}| +\end{quote} +will enlarge the symbols by 10\%. +Thus, you can make the `dictionary symbols' match exactly the optical +appearance of the surrounding typeface. The above table shows the +symbols at 150\% of their natural size. + + +\end{document} + + diff --git a/fonts/dictsym/latex/dictsym.sty b/fonts/dictsym/latex/dictsym.sty new file mode 100644 index 0000000000..dbd8ed2251 --- /dev/null +++ b/fonts/dictsym/latex/dictsym.sty @@ -0,0 +1,68 @@ +\ProvidesPackage{dictsym}[2004/07/26 v2.0beta1 Dictionary Symbols (GV/WaS)] +%% Copyright 2004 Walter Schmidt +% +% 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 2003/12/01 or later. +% +% This work has the LPPL maintenance status "maintained". +% +% This Current Maintainer of this work is Walter Schmidt +% +% This work consists of the files dictsym.sty and dictsym.tex +% and the compiled file dictsym.pdf. +% +\RequirePackage{pifont,keyval} +\define@key{dsy}{scaled}{% + \def\dsy@scale{#1}} +\def\ProcessOptionsWithKV#1{% + \let\@tempc\relax + \let\dsy@tempa\@empty + \@for\CurrentOption:=\@classoptionslist\do{% + \@ifundefined{KV@#1@\CurrentOption}% + {}% + {% + \edef\dsy@tempa{\dsy@tempa,\CurrentOption,}% + \@expandtwoargs\@removeelement\CurrentOption + \@unusedoptionlist\@unusedoptionlist + }% + }% + \edef\dsy@tempa{% + \noexpand\setkeys{#1}{% + \dsy@tempa\@ptionlist{\@currname.\@currext}% + }% + }% + \dsy@tempa + \let\CurrentOption\@empty +} +\ProcessOptionsWithKV{dsy} +\AtEndOfPackage{% + \let\@unprocessedoptions\relax +} +\expandafter\ifx\csname dsy@scale\endcsname\relax + \let\dsy@@scale\@empty +\else + \edef\dsy@@scale{s*[\csname dsy@scale\endcsname]}% +\fi +\DeclareFontFamily{U}{dictsym}{} +\DeclareFontShape{U}{dictsym}{m}{n}{<->\dsy@@scale dictsym}{} +% +\newcommand{\dsarchitectural}{{\Pifont{dictsym}A}} +\newcommand{\dsbiological}{{\Pifont{dictsym}B}} +\newcommand{\dschemical}{{\Pifont{dictsym}C}} +\newcommand{\dsagricultural}{{\Pifont{dictsym}G}} +\newcommand{\dsheraldical}{{\Pifont{dictsym}H}} +\newcommand{\dsjuridical}{{\Pifont{dictsym}J}} +\newcommand{\dsliterary}{{\Pifont{dictsym}L}} +\newcommand{\dsmathematical}{{\Pifont{dictsym}M}} +\newcommand{\dsrailways}{{\Pifont{dictsym}R}} +\newcommand{\dstechnical}{{\Pifont{dictsym}T}} +\newcommand{\dsmilitary}{{\Pifont{dictsym}X}} +\newcommand{\dsaeronautical}{{\Pifont{dictsym}a}} +\newcommand{\dscommercial}{{\Pifont{dictsym}c}} +\newcommand{\dsmedical}{{\Pifont{dictsym}m}} +\endinput diff --git a/fonts/dictsym/map/dictsym.map b/fonts/dictsym/map/dictsym.map new file mode 100644 index 0000000000..b4a61ea202 --- /dev/null +++ b/fonts/dictsym/map/dictsym.map @@ -0,0 +1 @@ +dictsym DictSym \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2024/02/04}{2024T} +\ProvidesExplClass{easybook}{2024/02/05}{2024u} {Easily typesetting Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -297,7 +297,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2024/02/04}{2024T} +\ProvidesExplPackage{easybase}{2024/02/05}{2024u} {Easily typesetting Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -2320,7 +2320,7 @@ } % %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2024/02/04}{2024T} +\ProvidesExplFile{eb-tcolorbox.cfg}{2024/02/05}{2024u} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf index 5cc576460f..990fdbea49 100644 Binary files a/macros/latex/contrib/easybook/easybook.pdf and b/macros/latex/contrib/easybook/easybook.pdf differ diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex index b7a120c2b0..69a64ddd92 100644 --- a/macros/latex/contrib/easybook/easybook.tex +++ b/macros/latex/contrib/easybook/easybook.tex @@ -23,8 +23,8 @@ name = easybook, color-scheme = blue, title = EASYBOOK使用手册, - version = v2024T, - date = 2024/02/04, + version = v2024u, + date = 2024/02/05, authors = 瞿毅, info = 简便地排版中文学位论文或书籍, email = toquyi@163.com, @@ -124,6 +124,7 @@ \end{center} } \renewcommand{\cnltx@package@abstract@width}{0.85\linewidth} +\renewcommand{\cnltx@write@lastname}{} \renewcommand{\cmltx@list@setup} { \setlength{\leftmargin}{0em} @@ -160,7 +161,7 @@ } \DefineVerbatimEnvironment{ctexexam}{Verbatim} { - label = \rule{0pt}{12pt}\textnormal{\bfseries 例 \arabic{ctexexam}}, + label = \rule{0pt}{12pt}\textnormal{\bfseries 例~\arabic{ctexexam}}, listparameters = { \setlength{\topsep}{\bigskipamount} @@ -1350,7 +1351,7 @@ \shortversion{v = 1.638,date = 2022/03/04,changes = 增加目录条目样式选项注册命令 \cs{RegisterTocName}。} \shortversion{v = 1.644,date = 2022/03/10,changes = 增加浮动环境目录声明命令 \cs{DeclareFloatList} 配合 \pkg*{caption} 宏包。} \shortversion{v = 1.682,date = 2022/05/01,changes = 将迷你页判断命令 \cs{notminipage} 改为被保护命令兼容 \pkg*{circledtext} 宏包。} - \begin{version}[v = 2024T,date = 2024/02/04,simple] + \begin{version}[v = 2024u,date = 2024/02/05,simple] \item 核对依赖宏包的更新改动,优化使用手册的内容细节。 \item 修复图表等浮动环境题注目录中条目标签编号的计数器值显示错误问题。 \item 修复附录命令 \cs{appendix} 的可选参数设置英文目录中条目名字和编号失效的问题。 diff --git a/macros/latex/contrib/expex-glossonly/README.md b/macros/latex/contrib/expex-glossonly/README.md index 6e4794381d..2b05c5d588 100644 --- a/macros/latex/contrib/expex-glossonly/README.md +++ b/macros/latex/contrib/expex-glossonly/README.md @@ -1,11 +1,11 @@ # The `expex-glossonly` package -## Version 0.8 2023/11/15 +## Version 0.9 2024/02/05 `expex-glossonly` is a package which allows users of other popular example numbering package (`gb4e`, `linguex`, and `covington`) to use the glossing macros of the ExPex package, while still using the standard example and subexample numbering macros of those respective packages. -Copyright 2016-2023 by Alan Munn +Copyright 2016-2024 by Alan Munn This package may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/expex-glossonly/expex-glossonly.pdf b/macros/latex/contrib/expex-glossonly/expex-glossonly.pdf index 4f104484d3..b696ad8916 100644 Binary files a/macros/latex/contrib/expex-glossonly/expex-glossonly.pdf and b/macros/latex/contrib/expex-glossonly/expex-glossonly.pdf differ diff --git a/macros/latex/contrib/expex-glossonly/expex-glossonly.sty b/macros/latex/contrib/expex-glossonly/expex-glossonly.sty index 8c0d721ac1..95547ec2e0 100644 --- a/macros/latex/contrib/expex-glossonly/expex-glossonly.sty +++ b/macros/latex/contrib/expex-glossonly/expex-glossonly.sty @@ -1,10 +1,10 @@ -\def\EPGL@version{0.8} -\def\EPGL@date{2023/11/15} +\def\EPGL@version{0.9} +\def\EPGL@date{2024/2/5} % expex-glossonly is a package which allows gb4e and linguex and covington users to use % the glossing macros of the ExPex package, while still using the standard example and % subexample numbering macros of those respective packages. % -% Copyright 2016-2023 by Alan Munn +% Copyright 2016-2024 by Alan Munn % % This package may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -90,6 +90,8 @@ linguex.code = { \EPGL@examplesloadedtrue \EPGL@patchexpexgloss \def\printGramm{\makebox[0pt][r]{\normalfont\the\CollectTokens}\renewcommand\EPGL@setglossmargin{\setlength{\leftskip}{0pt}}\ignorespaces} + \def\newb.{\renewcommand\EPGL@setglossmargin{\setlength{\leftskip}{\@totalleftmargin}}\ifindex\firstwordtrue\fi + \my@ifnextchar[{\newExitem}{\item\testforgramm}} \lingset{belowglpreambleskip=-0.5ex, aboveglftskip=-0.5ex,everygla=\eachwordone} \PackageInfo{expex-glossonly}{Patching ExPex for use with linguex} \typeout{Patching ExPex for use with linguex} diff --git a/macros/latex/contrib/expex-glossonly/expex-glossonly.tex b/macros/latex/contrib/expex-glossonly/expex-glossonly.tex index 02617bba4f..1301a2ad1e 100644 --- a/macros/latex/contrib/expex-glossonly/expex-glossonly.tex +++ b/macros/latex/contrib/expex-glossonly/expex-glossonly.tex @@ -1,6 +1,6 @@ % !TEX TS-program = lualatexmk -\def\EPGLversion{0.8} -\def\EPGLdate{November 15, 2023} +\def\EPGLversion{0.9} +\def\EPGLdate{February 5, 2024} \documentclass[11pt]{article} \title{\textbf{The \textsf{expex-glossonly} package}} \author{\textbf{Alan Munn}\\Department of Linguistics, Languages, and Cultures\\Michigan State University\\\texttt{\href{mailto:amunn@msu.edu}{amunn@msu.edu}}} @@ -181,7 +181,7 @@ Here are some sample documents using the supported packages: \section{Bugs and support} This is \emph{experimental} and has not been extensively tested. Use at your own risk. You're welcome to raise issues at the \href{https://github.com/amunn/expex-glossonly}{GitHub repository}, however. \section{Version history} -The initial version of the package (0.6) supported only \pkg{linguex} and \pkg{gb4e}. Version 0.7 changed the loading interface to provide support for \pkg{covington} and added support for \pkg{gb4e-emulate}. Version 0.8 fixed fixed a spacing bug with grammaticality judgements in \pkg{linguex}. +The initial version of the package (0.6) supported only \pkg{linguex} and \pkg{gb4e}. Version 0.7 changed the loading interface to provide support for \pkg{covington} and added support for \pkg{gb4e-emulate}. Version 0.8 fixed a spacing bug with grammaticality judgements in \pkg{linguex}. Version 0.9 fixed more spacing problems with \pkg{linguex}. \section{Acknowledgements} As always, thanks to the members of the LaTeX development team and other users who are always happy to answer questions in the \href{https://tex.stackexchange.com}{TeX.se} chat room. Thanks especially to Ulrike Fischer who told me of the magical |\@totalleftmargin| length. Thanks also to Jürgen Spitzmüller for discussion of the \pkg{covington} support. \end{document} \ No newline at end of file diff --git a/macros/latex/contrib/expex-glossonly/testfiles/gb4e-expex.pdf b/macros/latex/contrib/expex-glossonly/testfiles/gb4e-expex.pdf index dd79c4383d..3011a8b577 100644 Binary files a/macros/latex/contrib/expex-glossonly/testfiles/gb4e-expex.pdf and b/macros/latex/contrib/expex-glossonly/testfiles/gb4e-expex.pdf differ diff --git a/macros/latex/contrib/expex-glossonly/testfiles/linguex-expex.pdf b/macros/latex/contrib/expex-glossonly/testfiles/linguex-expex.pdf index 0f00058124..679b7e39c7 100644 Binary files a/macros/latex/contrib/expex-glossonly/testfiles/linguex-expex.pdf and b/macros/latex/contrib/expex-glossonly/testfiles/linguex-expex.pdf differ diff --git a/macros/latex/contrib/expex-glossonly/testfiles/linguex-expex.tex b/macros/latex/contrib/expex-glossonly/testfiles/linguex-expex.tex index e5a607df9e..dac96724ef 100644 --- a/macros/latex/contrib/expex-glossonly/testfiles/linguex-expex.tex +++ b/macros/latex/contrib/expex-glossonly/testfiles/linguex-expex.tex @@ -26,7 +26,7 @@ \endgl \ex. -\a. +\a. * \begingl \gla J\'anos h\'aza// \glb John house.his// @@ -36,5 +36,18 @@ John house.his\\ `John's house' +\ex. +\a. * +\begingl +\gla Zhangsan qi na-pi ma meiyou qi. // +\glb Z. ride that-\textsc{cl} horse \textsc{neg} ride-\textsc{pfv} // +\glft `Zhangsan did not ride the horse.' // +\endgl +\b. +\begingl +\gla Zhangsan qi na-pi ma MEIYOU qi. // +\glb Z. ride that-\textsc{cl} horse \textsc{neg} ride-\textsc{pfv} // +\glft `Zhangsan indeed did not ride the horse.' // +\endgl \end{document} \ No newline at end of file diff --git a/macros/latex/contrib/spbmark/spbmark.pdf b/macros/latex/contrib/spbmark/spbmark.pdf index 29809f57d1..bd7701a44a 100644 Binary files a/macros/latex/contrib/spbmark/spbmark.pdf and b/macros/latex/contrib/spbmark/spbmark.pdf differ diff --git a/macros/latex/contrib/spbmark/spbmark.sty b/macros/latex/contrib/spbmark/spbmark.sty index b6af3d93c2..4b7a7f981b 100644 --- a/macros/latex/contrib/spbmark/spbmark.sty +++ b/macros/latex/contrib/spbmark/spbmark.sty @@ -9,7 +9,7 @@ % https://creativecommons.org/licenses/by/4.0/legalcode \NeedsTeXFormat{LaTeX2e}[2018/12/31] \RequirePackage{xparse,l3keys2e} -\ProvidesExplPackage{spbmark}{2024/02/04}{1.45} +\ProvidesExplPackage{spbmark}{2024/02/05}{1.46} {Customize superscripts and subscripts} \cs_generate_variant:Nn \box_set_ht:Nn { cv } @@ -36,8 +36,8 @@ text .choice:, text/true .code:n = { - \cs_set:Npn \textsuperscript { \super } - \cs_set:Npn \textsubscript { \sub } + \cs_set:Npn \textsuperscript { \super[textsp] } + \cs_set:Npn \textsubscript { \sub[textsb] } }, text/false .code:n = { @@ -48,8 +48,8 @@ math .choice:, math/true .code:n = { - \cs_set:Npn \sp { \super } - \cs_set:Npn \sb { \sub } + \cs_set:Npn \sp { \super[mathsp] } + \cs_set:Npn \sb { \sub[mathsb] } }, math/false .code:n = { @@ -61,7 +61,7 @@ foot/true .code:n = { \cs_set:Npn \@makefnmark - { \hbox:n { \fnmarkfont{\super{\@thefnmark}} } } + { \hbox:n { \fnmarkfont{\super[fnmark]{\@thefnmark}} } } }, foot/false .code:n = { \cs_set:Npn \@makefnmark { \spb@@makefnmark@save } }, @@ -112,6 +112,12 @@ } \cs_new_protected:Npn \spbshortkv #1#2 { \spb_define:n { #1 .meta:n = {#2} } } +\clist_map_inline:nn + { textsp,textsb,mathsp,mathsb,fnmark } + { + \defspbstyle{#1}{} + \spbshortkv{#1}{style = #1} + } \spb_define:n { mode .tl_set:N = \l__spb_mode_value_tl, @@ -338,13 +344,13 @@ \cs_new_protected:Npn \spb_both_newcmd_map:n #1 { - \exp_args:Nc \NewDocumentCommand {#1}{sO{}mO{}} + \exp_args:Nc \NewDocumentCommand {#1}{sO{}O{}mO{}} { \group_begin: \mode_leave_vertical: \tl_gset:Nn \g__spb_mark_case_init_tl {#1} - \spb_set:n { ##2,##4 } - \spb_mode_switch:nnn {#1} {##3} { i } + \spb_set:n { ##2,##3,##5 } + \spb_mode_switch:nnn {#1} {##4} { i } \spb_content_hbox_set:nn {#1} {##1} \spb_ht_dp_assign:nnnn {#1} {#1} { i } { _outer } \box_use:c { l__#1_i_outer_box } @@ -397,7 +403,6 @@ \group_begin: \mode_leave_vertical: \tl_gset:Nn \g__spb_mark_case_init_tl { supersub } - \spb_define:n { unknown .undefine: } \spb_set:n {#2,#5} \spb_mode_switch:nnn {#3} {#4} { ii } \spb_ht_dp_assign:nnnn { super } { sub } { ii } { } diff --git a/macros/latex/contrib/spbmark/spbmark.tex b/macros/latex/contrib/spbmark/spbmark.tex index f4d22c3cfc..727ee086a7 100644 --- a/macros/latex/contrib/spbmark/spbmark.tex +++ b/macros/latex/contrib/spbmark/spbmark.tex @@ -6,8 +6,8 @@ { package = spbmark, title = the spbmark package, - version = v1.45, - date = 2024/02/04, + version = v1.46, + date = 2024/02/05, authors = Qu Yi, info = Customize superscript and subscript, email = toquyi@163.com, @@ -19,7 +19,7 @@ color-scheme = blue, title-format = \huge\bfseries\scshape, listings-options = {numbers = none,gobble = 2,lineskip = 1pt}, - pre-output = {\parindent = 0em \setstretch{1.3}}, + pre-output = {\parindent = 0em\setstretch{1.3}}, before-skip = \smallskipamount, after-skip = \smallskipamount } @@ -40,6 +40,7 @@ \newsplitarg{\splitdarg}{(}{)} \newnote{\newtag}[1][New]{\textcolor{red}{\ding{73}\ #1}} \renewcommand{\emph}[1]{\textcolor{red}{#1}} +\renewcommand{\cnltx@write@lastname}{} \makeatother \begin{document} @@ -47,12 +48,17 @@ \label{sec:macro package options} The following macro package options will redefine the script commands of the \LaTeX{} kernel. If you do not specify the values of boolean options, they default to \code{true}. These options can also be changed in the preamble area and main body using the global control command \cs{sbpset}. \begin{options} - \keychoice{text}{true,\fbox{false}} - \cs{textsuperscript} and \cs{textsubscript} are equivalent to the \cs{super} and \cs{sub} commands. - \keychoice{math}{true,\fbox{false}} - \cs{sp} and \cs{sb} are equivalent to the \cs{super} and \cs{sub} commands. - \keychoice{foot}{true,\fbox{false}} - The format of the footnote mark match the superscript global move and format settings. + \keychoice{text}{true,\fbox{false}}\newtag[Changed]% + \cs{textsuperscript} and \cs{textsubscript} are equivalent to the \cs{super} and \cs{sub} commands. At this point, you can use the \cs{defspbstyle} command to define the style \code{textsp} and \code{textsb} to change the format of the text superscript and subscript. + \keychoice{math}{true,\fbox{false}}\newtag[Changed]% + \cs{sp} and \cs{sb} are equivalent to the \cs{super} and \cs{sub} commands. At this point, you can use the \cs{defspbstyle} command to define the style \code{mathsp} and \code{mathsb} to change the format of the math superscript and subscript. + \keychoice{foot}{true,\fbox{false}}\newtag[Changed]% + The format of the footnote mark match the superscript global move and format settings. At this point, you can use the \cs{defspbstyle} command to define the superscript style \code{fnmark} to change the format of the footnote mark. + \begin{example}[code-only] + \defspbstyle{textsp}{vmove=-1pt,cmd=\bfseries} + \defspbstyle{mathsb}{hmove=0.5em} + \defspbstyle{fnmark}{cmd=\small\color{red}} + \end{example} \keychoice{both}{true,\fbox{false}} The values of \option{text} and \option{math} two options are \code{true} or \code{false} at the same time. \keychoice{all}{true,\fbox{false}} diff --git a/macros/latex/contrib/tkz/tkz-elements/README.md b/macros/latex/contrib/tkz/tkz-elements/README.md index f5bfcebc80..bf33121af3 100644 --- a/macros/latex/contrib/tkz/tkz-elements/README.md +++ b/macros/latex/contrib/tkz/tkz-elements/README.md @@ -1,10 +1,10 @@ # tkz-elements — for euclidean geometry -Release 1.82c 2024/01/16 +Release 2.00c 2024/02/04 ## Description -`tkz-elements v.1.82c` is the new version of a library written in lua, allowing to make all the necessary calculations to define the objects of a Euclidean geometry figure. You need to compile with `LuaLaTeX`. With `tkz-elements`, the definitions and calculations are only done with `Lua`. +`tkz-elements v.2.00c` is the new version of a library written in lua, allowing to make all the necessary calculations to define the objects of a Euclidean geometry figure. You need to compile with `LuaLaTeX`. With `tkz-elements`, the definitions and calculations are only done with `Lua`. The main possibility of programmation proposed is oriented "object programming" with object classes like point, line, triangle, circle and ellipse. For the moment, once the calculations are done, it is `tkz-euclide` or `TikZ` which allows the drawings. @@ -60,6 +60,18 @@ An important example `Golden Arbelos` using the package is on the site. All the are on the site. ## History + - version 2.00c + - class development “vector” + - added attribute “vec” + - added “at” and “orthogonal” methods to the class “point” + - rewriting the function angle\_normalize\_ + - modification of the slope attribute for the “line”, now the result is normalized. + - the angles of a triangle are also normalized + - added function format\_number(number,decimal) sets the number of digits in the decimal part. + - added \tkzDN a macro pour formater les nombres dans la partie TikZ + \tkzDN[nb_decimal]{number} + - added the macro \tkzDrawLuaEllipse draw an ellipse in tikz knowing its center, vertex and covertex. + - correction de la documentation - version 1.82c - Point object : name like z.App now gives a node with name A'' - Modification of methods north,south diff --git a/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-circle.tex b/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-circle.tex index 4dd3b75b60..2395f5f045 100644 --- a/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-circle.tex +++ b/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-circle.tex @@ -270,12 +270,12 @@ z.Q = intersection (L.tB,T.ca) \subsubsection{Inversion: point, line and circle} % (fold) \label{ssub:inversion} -The "inversion" method can be used on a point, a line or a circle. Depending on the type of object, the function determines the correct algorithm to use. +The “inversion” method can be used on a point, a line or a circle. Depending on the type of object, the function determines the correct algorithm to use. \subsubsection{Inversion: point} % (fold) \label{ssub:inversion_point} -The "inversion" method can be used on a point, a group of points, a line or a circle. Depending on the type of object, the function determines the correct algorithm to use. +The “inversion” method can be used on a point, a group of points, a line or a circle. Depending on the type of object, the function determines the correct algorithm to use. \begin{minipage}{.5\textwidth} \begin{verbatim} @@ -756,11 +756,11 @@ z.I,z.T = get_points ( C.IT ) Cette fonction retourne une chaîne qui indique la position du cercle par rapport à un autre. Utile pour créer une fonction. Les cas sont: \begin{itemize} - \item "outside" - \item "outside tangent" - \item "inside tangent" - \item "inside" - \item "intersect" + \item “outside” + \item “outside tangent” + \item “inside tangent” + \item “inside” + \item “intersect” \end{itemize} \begin{minipage}{.5\textwidth} diff --git a/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-line.tex b/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-line.tex index feab38af27..2aa2ce6537 100644 --- a/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-line.tex +++ b/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-line.tex @@ -28,12 +28,13 @@ The attributes are : \Iattr{line}{mid} & Middle of the segment& |z.M = L.AB.mid|\\ \Iattr{line}{slope} & Slope of the line & see (\ref{ssub:example_class_line})\\ \Iattr{line}{length} &|l = L.AB.length|&see (\ref{sub:transfer_from_lua_to_tex} ; \ref{ssub:example_class_line})\\ -\Iattr{line}{north\_pa} & See (\ref{ssub:example_class_line}) & \\ +\Iattr{line}{north\_pa} & &See (\ref{ssub:example_class_line}) \\ \Iattr{line}{north\_pb} & &\\ \Iattr{line}{south\_pa} & &\\ \Iattr{line}{south\_pb} & &See (\ref{ssub:example_class_line}) \\ \Iattr{line}{east} & &\\ \Iattr{line}{west} & &\\ +\Iattr{line}{vec} & |V.AB = L.AB.vec|& defines $\overrightarrow{AB}$ See (\ref{sec:class_vector})\\ \bottomrule \end{tabular} \egroup @@ -410,7 +411,7 @@ The side lengths are proportional to the lengths given in the table. They depend z.E = T.ABE.pc T.ABF = L.AB : golden () z.F = T.ABF.pc - T.ABG = L.AB : devine () + T.ABG = L.AB : divine () z.G = T.ABG.pc T.ABH = L.AB : pythagoras () z.H = T.ABH.pc diff --git a/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-point.tex b/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-point.tex index 45f7991c92..4efd21328f 100644 --- a/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-point.tex +++ b/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-point.tex @@ -103,9 +103,9 @@ This is the creation of a fixed point with coordinates 1 and 2 and which is name \textbf{Attributes} & \textbf{Application}& \textbf{Example}\\ \Iattr{point}{re} & |z.A.re = 1| & see (\ref{ssub:methods}) \\ \Iattr{point}{im} & |z.A.im = 2| &see (\ref{ssub:methods}) \\ -\Iattr{point}{type} & |z.A.type = 'point| & \\ +\Iattr{point}{type} & |z.A.type = 'point'| & \\ \Iattr{point}{argument} & |z.A.argument $\approx$ 0.78539816339745| & see (\ref{ssub:example_point_attributes})\\ -\Iattr{point}{module} & |z.A.module| $\approx$ |2.2360...| =$\sqrt{5}$ & see (\ref{ssub:example_point_attributes})\\ +\Iattr{point}{modulus} & |z.A.modulus| $\approx$ |2.2360...| =$\sqrt{5}$ & see (\ref{ssub:example_point_attributes})\\ \bottomrule \end{tabular} \egroup @@ -242,7 +242,7 @@ Attributes of \texttt{z.M} \subsection{Methods of the class point} % (fold) \label{sub:methods_of_the_class_point} -The methods described in the following table are standard. You'll find them in most of the examples at the end of this documentation. The result of the different methods presented in the following table is a \tkzNameObj{point}. +The methods described in the following table are standard. You'll find them in most of the examples at the end of this documentation. The result of the different methods presented in the following table is a \tkzNameObj{point}. See section (\ref{sub:complex_numbers}) for the metamethods. \vspace{1em} \bgroup @@ -265,6 +265,8 @@ The methods described in the following table are standard. You'll find them in m \Imeth{point}{west(r)} & & \\ \Imeth{point}{normalize()} & |z.b = z.a: normalize ()| & see (\ref{ssub:method_normalize}) \\ \Imeth{point}{get\_points (obj)} & retrieves points from the object & \\ +\Imeth{point}{orthogonal (d)} & |z.B=z.A:orthogonal(d)| & $\overrightarrow{OB}\perp \overrightarrow{OA}$ and $OB=d$\\ +\Imeth{point}{at ()} & |z.X = z.B : at (z.A)| & $\overrightarrow{OB}= \overrightarrow{AX}$ and $OB=d$\\ \midrule \textbf{Transformations} &&\\ \midrule @@ -369,7 +371,6 @@ Use of |north and east| functions linked to points, to transfer lengths, see (\r \tkzLabelPoints[above right](C,D,F) \end{tikzpicture} \end{minipage} - % subsubsection report_de_distance (end) @@ -460,6 +461,86 @@ z.I = point : new (1,0) \end{minipage} % subsubsection method_normalize (end) +\subsubsection{\Imeth{point}{Orthogonal (d)} method} % (fold) +\label{ssub:orthogonal_method} + +Let $O$ be the origin of the plane. The "orthogonal (d)" method is used to obtain a point $B$ from a point $A$ such that $\overrightarrow{OB}\perp \overrightarrow{OA}$ with $OB=OA$ if $d$ is empty, otherwise $OB = d$. + +\begin{minipage}{.6\textwidth} +\begin{verbatim} +\begin{tkzelements} + z.A = point : new ( 3 , 1 ) + z.B = z.A : orthogonal (1) + z.O = point : new ( 0,0 ) + z.C = z.A : orthogonal () +\end{tkzelements} +\begin{tikzpicture}[gridded] + \tkzGetNodes + \tkzDrawSegments(O,A O,C) + \tkzDrawPoints(O,A,B,C) + \tkzLabelPoints[below right](O,A,B,C) +\end{tikzpicture} +\end{verbatim} +\end{minipage} +\begin{minipage}{.4\textwidth} +\begin{tkzelements} + z.A = point : new ( 3 , 1 ) + z.B = z.A : orthogonal (1) + z.O = point : new ( 0,0 ) + z.C = z.A : orthogonal () +\end{tkzelements} +\begin{tikzpicture}[gridded] + \tkzGetNodes + \tkzDrawSegments(O,A O,C) + \tkzDrawPoints(O,A,B,C) + \tkzLabelPoints[below right](O,A,B,C) +\end{tikzpicture} +\end{minipage} +% subsubsection orthogonal_method (end) + +\subsubsection{\Imeth{point}{at} method} % (fold) +\label{ssub:_imeth_point_at_method} + +Cette méthode est complémentaire de la précédente, ainsi on peut souhaiter non pas avoir $\overrightarrow{OB}\perp \overrightarrow{OA}$ mais $\overrightarrow{AB}\perp \overrightarrow{OA}$. + +\begin{minipage}{.6\textwidth} +\begin{verbatim} +\begin{tkzelements} + z.A = point : new ( 3 , 1 ) + z.B = z.A : orthogonal (1) + z.O = point : new ( 0,0 ) + -- z.B = z.B : at (z.A) -- or + z.B = z.A : orthogonal (1) : at (z.A) + z.C = z.A+z.B + z.D =(z.C-z.A):orthogonal(2) : at (z.C) +\end{tkzelements} +\begin{tikzpicture}[gridded] + \tkzGetNodes + \tkzLabelPoints[below right](O,A,B,C,D) + \tkzDrawSegments(O,A A,B A,C C,D) + \tkzDrawPoints(O,A,B,C,D) +\end{tikzpicture} +\end{verbatim} +\end{minipage} +\begin{minipage}{.4\textwidth} +\begin{tkzelements} +z.A = point : new ( 3 , 1 ) +z.B = z.A : orthogonal (1) +z.O = point : new ( 0,0 ) +-- z.B = z.B : at (z.A) -- or +z.B = z.A : orthogonal (1) : at (z.A) +z.C = z.A+z.B +z.D =(z.C-z.A):orthogonal(2) : at (z.C) +\end{tkzelements} +\begin{tikzpicture}[gridded] +\tkzGetNodes +\tkzLabelPoints[below right](O,A,B,C,D) +\tkzDrawSegments(O,A A,B A,C C,D) +\tkzDrawPoints(O,A,B,C,D) +\end{tikzpicture} +\end{minipage} + +% subsubsection _imeth_point_at_method (end) \subsubsection{Example: \Imeth{point}{rotation of points}} % (fold) \label{ssub:example_rotation_of_points} diff --git a/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-rectangle.tex b/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-rectangle.tex index 8b591cc61e..e232980e64 100644 --- a/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-rectangle.tex +++ b/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-rectangle.tex @@ -258,8 +258,8 @@ z.I = R.diag.center z.X = point : new ( 0 , 0 ) z.Y = point : new ( 4 , 2 ) R.gold = rectangle : gold (z.X,z.Y) -z.C = R.gold.pc -z.D = R.gold.pd +z.Z = R.gold.pc +z.W = R.gold.pd z.I = R.gold.center \end{tkzelements} diff --git a/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-triangle.tex b/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-triangle.tex index a65899c0ef..9261d6fbe7 100644 --- a/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-triangle.tex +++ b/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-triangle.tex @@ -40,6 +40,46 @@ The triangle object is created using the \Imeth{triangle}{new} method, for examp \end{tabular} \egroup +\subsection{Triangle attributes: angles} % (fold) +\label{sub:triangle_attributes_angles} + +\begin{minipage}{.6\textwidth} +\begin{verbatim} +\begin{tkzelements} + z.A = point: new(0,0) + z.B = point: new(5,0) + z.C = point: new(2,3) + T.ABC = triangle: new (z.A,z.B,z.C) +\end{tkzelements} +\def\wangle#1{\tkzDN[2]{% + \tkzUseLua{math.deg(T.ABC.#1)}}} +\begin{tikzpicture} +\tkzGetNodes + \tkzDrawPolygons(A,B,C) + \tkzLabelAngle(B,A,C){$\wangle{alpha}^\circ$} + \tkzLabelAngle(C,B,A){$\wangle{beta}^\circ$} + \tkzLabelAngle(A,C,B){$\wangle{gamma}^\circ$} +\end{tikzpicture} +\end{verbatim} +\end{minipage} +\begin{minipage}{.4\textwidth} +\begin{tkzelements} + z.A = point: new(0,0) + z.B = point: new(5,0) + z.C = point: new(2,3) + T.ABC = triangle: new (z.A,z.B,z.C) +\end{tkzelements} +\def\wangle#1{\tkzDN[2]{\tkzUseLua{math.deg(T.ABC.#1)}}} +\begin{tikzpicture} +\tkzGetNodes +\tkzDrawPolygons(A,B,C) +\tkzLabelAngle(B,A,C){$\wangle{alpha}^\circ$} +\tkzLabelAngle(C,B,A){$\wangle{beta}^\circ$} +\tkzLabelAngle(A,C,B){$\wangle{gamma}^\circ$} +\end{tikzpicture} +\end{minipage} +% subsection triangle_attributes_angles (end) + \subsubsection{Example: triangle attributes} % (fold) \label{ssub:example_triangle_attributes} \begin{minipage}{.5\textwidth} @@ -149,6 +189,20 @@ The triangle object is created using the \Imeth{triangle}{new} method, for examp \Imeth{triangle}{euler\_line () } & the line through $N$ ,$G$, $H$ and $O$ if the triangle is not equilateral \footnote{N center of nine points circle, G centroid, H orthocenter , O circum center } \\ \Imeth{triangle}{antiparallel(pt,n)} & n=0 antiparallel through pt to $(BC)$, n=1 to $(AC)$ etc.\\ +\midrule + \textbf{Circles} &\\ +\midrule +\Imeth{triangle}{euler\_circle ()} & C.|NP = T.ABC : euler_circle ()| \tkzar $N$ euler point + \footnote{ The midpoint of each side of the triangle, the foot of each altitude, the midpoint of the line segment from each vertex of the triangle to the orthocenter.} \\ +\Imeth{triangle}{circum\_circle ()} & |C.OA = T.ABC : circum ()| Triangle's circumscribed circle \\ +\Imeth{triangle}{in\_circle ()} & Inscribed circle of the triangle\\ +\Imeth{triangle}{ex\_circle (n)} & Circle tangent to the three sides of the triangle ; n =1 swap ; n=2 2 swap \\ +\Imeth{triangle}{first\_lemoine\_circle ()} & The center is the midpoint between Lemoine point and the circumcenter.\footnote{ +Through the Lemoine point draw lines parallel to the triangle's sides. The points where the parallel lines intersect the sides of ABC + then lie on a circle known as the first Lemoine circle. } \\ +\Imeth{triangle}{second\_lemoine\_circle ()} & see example \ref{sub:antiparallel_through_lemoine_point}\\ +\Imeth{triangle}{spieker\_circle ()} & The incircle of the medial triangle\\ + \bottomrule \end{tabular} \end{minipage} @@ -168,19 +222,6 @@ Remark: If you don't need to use the triangle object several times, you can obta \begin{tabular}{ll} \toprule \textbf{Methods} & \textbf{Comments} \\ -\midrule - \textbf{Circles} &\\ -\midrule -\Imeth{triangle}{euler\_circle ()} & C.|NP = T.ABC : euler_circle ()| \tkzar $N$ euler point - \footnote{ The midpoint of each side of the triangle, the foot of each altitude, the midpoint of the line segment from each vertex of the triangle to the orthocenter.} \\ -\Imeth{triangle}{circum\_circle ()} & |C.OA = T.ABC : circum ()| Triangle's circumscribed circle \\ -\Imeth{triangle}{in\_circle ()} & Inscribed circle of the triangle\\ -\Imeth{triangle}{ex\_circle (n)} & Circle tangent to the three sides of the triangle ; n =1 swap ; n=2 2 swap \\ -\Imeth{triangle}{first\_lemoine\_circle ()} & The center is the midpoint between Lemoine point and the circumcenter.\footnote{ -Through the Lemoine point draw lines parallel to the triangle's sides. The points where the parallel lines intersect the sides of ABC - then lie on a circle known as the first Lemoine circle. } \\ -\Imeth{triangle}{second\_lemoine\_circle ()} & see example \ref{sub:antiparallel_through_lemoine_point}\\ -\Imeth{triangle}{spieker\_circle ()} & The incircle of the medial triangle\\ \midrule \textbf{Triangles} &\\ \midrule @@ -234,7 +275,7 @@ Through the Lemoine point draw lines parallel to the triangle's sides. The point \tkzDrawCircle[red](N,I) \tkzDrawCircles[teal](O,A) \tkzDrawSegments(A,P B,Q C,R) - \tkzDrawSegments[red](A,I B,J C,K)\include{TKZdoc-elements-classes-triangle.tex} + \tkzDrawSegments[red](A,I B,J C,K) \tkzDrawPolygons(A,B,C) \tkzDrawPoints(A,B,C,N,I,J,K,O,P,Q,R,H,G) \tkzLabelPoints(A,B,C,I,J,K,P,Q,R,H) @@ -331,11 +372,9 @@ Through the Lemoine point draw lines parallel to the triangle's sides. The point \tkzDrawPoints(A,B,M,C,D,E,F) \tkzLabelPoints[below right](A,B,C,D,E) \tkzLabelPoints[above](M,F) - \tkzFillAngles[opacity=.4,cyan!20](A,M,B B,E,M) - \tkzFillAngles[opacity=.4,purple!20](B,M,F M,F,B) \tkzMarkRightAngle[opacity=.4,fill=gray!20](C,M,D) - \tkzMarkAngles[mark=||](A,M,E E,M,B B,E,M) - \tkzMarkAngles[mark=|](B,M,F M,F,B) + \tkzMarkAngles[mark=||,size=.5](A,M,E E,M,B B,E,M) + \tkzMarkAngles[mark=|,size=.5](B,M,F M,F,B) \tkzMarkSegments(B,E B,M B,F) \end{tikzpicture} \end{minipage} @@ -350,11 +389,9 @@ Through the Lemoine point draw lines parallel to the triangle's sides. The point \tkzDrawPoints(A,B,M,C,D,E,F) \tkzLabelPoints[below right](A,B,C,D,E) \tkzLabelPoints[above](M,F) - \tkzFillAngles[opacity=.4,cyan!20](A,M,B B,E,M) - \tkzFillAngles[opacity=.4,purple!20](B,M,F M,F,B) \tkzMarkRightAngle[opacity=.4,fill=gray!20](C,M,D) - \tkzMarkAngles[mark=||](A,M,E E,M,B B,E,M) - \tkzMarkAngles[mark=|](B,M,F M,F,B) + \tkzMarkAngles[mark=||,size=.5](A,M,E E,M,B B,E,M) + \tkzMarkAngles[mark=|,size=.5](B,M,F M,F,B) \tkzMarkSegments(B,E B,M B,F) \end{tikzpicture} \end{verbatim} diff --git a/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-vectors.tex b/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-vectors.tex new file mode 100644 index 0000000000..00d924bb83 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-vectors.tex @@ -0,0 +1,193 @@ +\newpage + +\section{Class \Iclass{vector}} % (fold) +\label{sec:class_vector} + +In fact, they are more a class of oriented segments than vectors in the strict mathematical sense. + +A vector is defined by giving two points (i.e. two affixes). +|V.AB = vector : new (z.A,z.B)| creates the vector $\overrightarrow(AB)$, i.e. the oriented segment with origin $A$ representing a vector. A few rudimentary operations are defined, such as sum, subtraction and multiplication by a scalar. + +The sum is defined as follows: + +Let V.AB + V.CD result in a vector V.AE defined as follows + +If $\overrightarrow{CD} = \overrightarrow{BE} $ then $\overrightarrow{AB} + \overrightarrow{CD} = \overrightarrow{AB} + \overrightarrow{BE} =\overrightarrow(AE)$ + +\begin{mybox} + Creation |V.AB = vector: new (z.A,z.B)| +\end{mybox} + +\begin{verbatim} +z.A = ... +z.B = ... +z.C = ... +z.D = ... +V.AB = vector : new (z.A,z.B) +V.CD = vector : new (z.C,z.D) +V.AE = V.AB + V.CD -- possible V.AB : add (V.CD) +z.E = V.AE.h -- we recover the final point (h = head) +\end{verbatim} + +\subsection{Attributes of a vector} % (fold) +\label{sub:attributes_of_a_vector} + +% subsection attributes_of_a_vector (end) +\vspace{1em} +\bgroup +\small +\catcode`_=12 +\captionof{table}{Vector attributes.}\label{vector:att} +\begin{tabular}{lll} +\toprule +\textbf{Attributes} & \textbf{Application}& \textbf{Example}\\ +\Iattr{vector}{pa} & |V.AB.t = z.A| t for tail & see (\ref{ssub:methods}) \\ +\Iattr{vector}{pb} & |V.AB.h = z.B| h for head & see (\ref{ssub:methods}) \\ +\Iattr{vector}{type} & |V.AB.type = 'vector'| & \\ +\Iattr{vector}{slope} & |V.AB.slope| & see (\ref{ssub:example_vector_attributes})\\ +\Iattr{vector}{length} & |V.AB.norm|& see (\ref{ssub:example_vector_attributes})\\ +\bottomrule +\end{tabular} +\egroup + +\subsubsection{Example vector attributes} % (fold) +\label{ssub:example_vector_attributes} + +\begin{minipage}{.6\textwidth} + \begin{verbatim} + \begin{tkzelements} + z.O = point: new (0,0) + z.A = point: new (0,1) + z.B = point: new (3,4) + L.AB = line : new ( z.A , z.B ) + z.C = point: new (1,2) + z.D = point: new (2,1) + u = vector : new (z.A,z.B) + v = vector : new (z.C,z.D) + w =u+v + z.E = w.h + \end{tkzelements} + \begin{tikzpicture}[gridded] + \tkzGetNodes + \tkzLabelPoints(A,B,C,D,O,E) + \tkzDrawSegments[->,red](A,B C,D A,E) + \tkzLabelSegment(A,B){$\overrightarrow{u}$} + \tkzLabelSegment(C,D){$\overrightarrow{v}$} + \tkzLabelSegment(A,E){$\overrightarrow{w}$} + \end{tikzpicture} + $\overrightarrow{w}$ has slope : + $\tkzDN{\tkzUseLua{math.deg(w.slope)}}^\circ$ + \end{verbatim} +\end{minipage} +\begin{minipage}{.4\textwidth} +\begin{tkzelements} + z.O = point: new (0,0) + z.A = point: new (0,1) + z.B = point: new (3,4) + L.AB = line : new ( z.A , z.B ) + z.C = point: new (1,2) + z.D = point: new (2,1) + u = vector : new (z.A,z.B) + v = vector : new (z.C,z.D) + w = u+v + z.E = w.h +\end{tkzelements} +\begin{tikzpicture}[gridded] + \tkzGetNodes + \tkzLabelPoints(A,B,C,D,O,E) + \tkzDrawSegments[->,red](A,B C,D A,E) + \tkzLabelSegment(A,B){$\overrightarrow{u}$} + \tkzLabelSegment(C,D){$\overrightarrow{v}$} + \tkzLabelSegment(A,E){$\overrightarrow{w}$} +\end{tikzpicture} + +$\overrightarrow{w}$ has slope : +$\tkzDN{\tkzUseLua{math.deg(w.slope)}}^\circ$ +\end{minipage} +% subsubsection example_vector_attributes (end) + +\subsection{Methods of the class vector} % (fold) +\label{sub:methods_of_the_class_vector} + +\vspace{1em} +\bgroup +\catcode`_=12 +\small +\captionof{table}{Methods of the class vector.}\label{vector:met} +\begin{tabular}{lll} +\toprule + \textbf{Metamethods} & \textbf{Application}& \\ + \midrule +\Imeth{vector}{\_\_add (u,v)} & |V.AB + V.CD| & \\ +\Imeth{vector}{\_\_sub (u,v)} & |V.AB - V.CD| & \\ +\Imeth{vector}{\_\_unm (u)} & |V.CD = -V.AB| & \\ +\Imeth{vector}{\_\_mul (k,u)} & |V.CD = k*V.AB| & \\ + \midrule + \textbf{Methods} & \textbf{Application}& \\ +\Imeth{vector}{new(pt, pt)} & |V.AB = vector: new (z.A,z.B) | & \\ +\Imeth{vector}{normalize(V)} & |V.AB : normalize () | & \\ +\Imeth{vector}{orthogonal(d)} & |V.AB : orthogonal (d) | & \\ +\Imeth{vector}{scale(d)} & |V.CD = V.AB : scale (2) | & $\overrightarrow{CD} = 2\overrightarrow{AB} $ \\ +\Imeth{vector}{at (V)} & |V.DB = V.AC : at (z.D) | & $\overrightarrow{DB} = \overrightarrow{AC} $ \\ +\bottomrule +\end{tabular} +\egroup + +\subsubsection{Example of methods} % (fold) +\label{ssub:example_of_methods} + +\begin{minipage}{.5\textwidth} + \begin{verbatim} + \begin{tkzelements} + z.O = point: new (0,0) + z.A = point: new (0,1) + z.B = point: new (3,4) + V.AB = vector: new (z.A,z.B) + V.AC = V.AB : scale (.5) + z.C = V.AC.h + V.AD = V.AB : orthogonal () + z.D = V.AD.h + V.AN = V.AB : normalize () + z.N = V.AN.h + V.AR = V.AB : orthogonal (2*math.sqrt(2)) + z.R = V.AR.h + V.AX = 2*V.AC - V.AR + z.X = V.AX.h + V.OY = V.AX : at (z.O) + z.Y = V.OY.h + \end{tkzelements} + \begin{tikzpicture}[gridded] + \tkzGetNodes + \tkzDrawSegments[>=stealth,->,red](A,B A,C A,D A,N A,R A,X O,Y) + \tkzLabelPoints(A,B,C,D,O,N,R,X,Y) + \end{tikzpicture} + \end{verbatim} +\end{minipage} +\begin{minipage}{.5\textwidth} + \begin{tkzelements} + z.O = point: new (0,0) + z.A = point: new (0,1) + z.B = point: new (3,4) + V.AB = vector: new (z.A,z.B) + V.AC = V.AB : scale (.5) + z.C = V.AC.h + V.AD = V.AB : orthogonal () + z.D = V.AD.h + V.AN = V.AB : normalize () + z.N = V.AN.h + V.AR = V.AB : orthogonal (2*math.sqrt(2)) + z.R = V.AR.h + V.AX = 2*V.AC - V.AR + z.X = V.AX.h + V.OY = V.AX : at (z.O) + z.Y = V.OY.h + \end{tkzelements} + \begin{tikzpicture}[gridded] + \tkzGetNodes + \tkzDrawSegments[>=stealth,->,red](A,B A,C A,D A,N A,R A,X O,Y) + \tkzLabelPoints(A,B,C,D,O,N,R,X,Y) + \end{tikzpicture} +\end{minipage} +% subsubsection example_of_methods (end) +% section class_vector (end) +\endinput \ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-examples.tex b/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-examples.tex index 9e79877299..5efb52381f 100644 --- a/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-examples.tex +++ b/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-examples.tex @@ -179,22 +179,23 @@ z.E = intersection (L.AI,L.LLC) \subsection{Apollonius circle} % (fold) \label{sub:apollonius_circle} -\begin{tkzexample}[latex=0cm,small,code only] \begin{tkzelements} scale=.75 - z.A = point: new (0 , 0) - z.B = point: new (6 , 0) - z.M = point: new (5 , 3) + z.A = point: new (0 , 0) + z.B = point: new (6 , 0) + z.M = point: new (5 , 3) T.MAB = triangle : new (z.M,z.A,z.B) L.bis = T.MAB : bisector () - z.C = L.bis.pb + z.C = L.bis.pb L.bisext = T.MAB : bisector_ext () - z.D = intersection (T.MAB.bc, L.bisext) - L.CD = line: new (z.C,z.D) - z.O = L.CD.mid - L.AM = T.MAB.ab - z.E = z.M : symmetry (z.A) + z.D = intersection (T.MAB.bc, L.bisext) + L.CD = line: new (z.C,z.D) + z.O = L.CD.mid + L.AM = T.MAB.ab + z.E = z.M : symmetry (z.A) \end{tkzelements} + +\hspace*{\fill} \begin{tikzpicture} \tkzGetNodes \tkzDrawSegment[add=0 and 1](A,M) @@ -210,26 +211,24 @@ scale=.75 \tkzMarkAngles[mark=|](A,M,C C,M,B) \tkzMarkAngles[mark=||](B,M,D D,M,E) \end{tikzpicture} -\end{tkzexample} - +\hspace*{\fill} +\begin{tkzexample}[latex=0cm,small,code only] \begin{tkzelements} scale=.75 - z.A = point: new (0 , 0) - z.B = point: new (6 , 0) - z.M = point: new (5 , 3) + z.A = point: new (0 , 0) + z.B = point: new (6 , 0) + z.M = point: new (5 , 3) T.MAB = triangle : new (z.M,z.A,z.B) L.bis = T.MAB : bisector () - z.C = L.bis.pb + z.C = L.bis.pb L.bisext = T.MAB : bisector_ext () - z.D = intersection (T.MAB.bc, L.bisext) - L.CD = line: new (z.C,z.D) - z.O = L.CD.mid - L.AM = T.MAB.ab - z.E = z.M : symmetry (z.A) + z.D = intersection (T.MAB.bc, L.bisext) + L.CD = line: new (z.C,z.D) + z.O = L.CD.mid + L.AM = T.MAB.ab + z.E = z.M : symmetry (z.A) \end{tkzelements} - -\hspace*{\fill} \begin{tikzpicture} \tkzGetNodes \tkzDrawSegment[add=0 and 1](A,M) @@ -245,7 +244,12 @@ scale=.75 \tkzMarkAngles[mark=|](A,M,C C,M,B) \tkzMarkAngles[mark=||](B,M,D D,M,E) \end{tikzpicture} -\hspace*{\fill} +\end{tkzexample} + +Remark : The circle can be obtained with: + +|C.AB = T.MAB.bc : apollonius (length(z.M,z.A)/length(z.M,z.B))| + %subsection apollonius_circle (end) @@ -428,8 +432,8 @@ Same result using the function |T.ABC.ab : apollonius (k) | z.w1,z.t1 = get_points ( C.AB ) C.AC = T.ABC.ca : apollonius (length(z.B,z.C)/length(z.B,z.A)) z.w2,z.t2 = get_points ( C.AC ) - C.AC = T.ABC.bc : apollonius (length(z.A,z.B)/length(z.A,z.C)) - z.w3,z.t3 = get_points ( C.AC ) + C.BC = T.ABC.bc : apollonius (length(z.A,z.B)/length(z.A,z.C)) + z.w3,z.t3 = get_points ( C.BC ) \end{tkzelements} \end{verbatim} @@ -733,19 +737,19 @@ Same result using the function |T.ABC.ab : apollonius (k) | z.c = C.center \end{tkzelements} - \hspace*{\fill} - \begin{tikzpicture} - \tkzGetNodes - \tkzDrawCircle(O,A) - \tkzDrawCircle[orange](c,z1) - \tkzDrawPoints[orange](O,A,z1,z2,c) - \tkzLabelPoints[right](O,A,z1,z2,c) - \end{tikzpicture} - \hspace*{\fill} +\hspace*{\fill} +\begin{tikzpicture} +\tkzGetNodes +\tkzDrawCircle(O,A) +\tkzDrawCircle[orange](c,z1) +\tkzDrawPoints[orange](O,A,z1,z2,c) +\tkzLabelPoints[right](O,A,z1,z2,c) +\end{tikzpicture} +\hspace*{\fill} % subsection orthogonal_circle_through (end) -\subsection{Devine ratio} % (fold) -\label{sub:devine_ratio} +\subsection{Divine ratio} % (fold) +\label{sub:divine_ratio} \begin{tkzexample}[latex=0cm,small,code only] \begin{tkzelements} @@ -809,52 +813,53 @@ L.BG = line: new (z.B,z.G) z.L = intersection (L.AR,L.BG) \end{tkzelements} - \hspace*{\fill} - \begin{tikzpicture} - \tkzGetNodes - \tkzDrawPolygons(A,C,E,F A,B,G,H) - \tkzDrawCircles(O_1,C O_2,B O_0,B) - \tkzDrawSegments(H,C B,K A,L) - \tkzDrawPoints(A,B,C,K,E,F,G,H,O_0,O_1,O_2,R,S,T,L) - \tkzLabelPoints(A,B,C,K,E,F,G,H,O_0,O_1,O_2,R,S,T,L) - \end{tikzpicture} - \hspace*{\fill} -% subsection devine_ratio (end) +\hspace*{\fill} +\begin{tikzpicture} +\tkzGetNodes +\tkzDrawPolygons(A,C,E,F A,B,G,H) +\tkzDrawCircles(O_1,C O_2,B O_0,B) +\tkzDrawSegments(H,C B,K A,L) +\tkzDrawPoints(A,B,C,K,E,F,G,H,O_0,O_1,O_2,R,S,T,L) +\tkzLabelPoints(A,B,C,K,E,F,G,H,O_0,O_1,O_2,R,S,T,L) +\end{tikzpicture} +\hspace*{\fill} +% subsection divine_ratio (end) \subsection{Director circle} % (fold) \label{sub:director_circle} % modif C: point (0.25) instead of 2 \begin{minipage}[t]{.5\textwidth}\vspace{0pt}% - \begin{verbatim} - \begin{tkzelements} - scale = .5 - z.O = point: new (0 , 0) - z.F1 = point: new (4 , 0) - z.F2 = point: new (-4 , 0) - z.H = point: new (4*math.sqrt(2) , 0) - E = ellipse: foci (z.F2,z.F1,z.H) - a,b = E.Rx, E.Ry - z.A = E.covertex - T = triangle: new (z.H,z.O,z.A) - z.P = T: parallelogram () - C = circle: new (z.O,z.P) - z.L = C: point (0.25) - L.J,L.K = E: tangent_from (z.L) - z.J = L.J.pb - z.K = L.K.pb - \end{tkzelements} - \begin{tikzpicture} - \tkzGetNodes - \tkzDrawPoints(F1,F2,O) - \tkzDrawCircles[teal](O,P) - \tkzDrawPolygon(H,O,A,P) - \tkzDrawEllipse[red](O,\tkzUseLua{a},\tkzUseLua{b},0) - \tkzDrawSegments[orange](O,P O,L L,J L,K) - \tkzDrawPoints(F1,F2,O,H,A,P,L,J,K) - \tkzLabelPoints(F1,F2,O,H,A,P,L,J,K) - \tkzMarkRightAngles(A,P,H J,L,K) - \end{tikzpicture} - \end{verbatim} +\begin{verbatim} +\begin{tkzelements} + scale = .5 + z.O = point: new (0 , 0) + z.F1 = point: new (4 , 0) + z.F2 = point: new (-4 , 0) + z.H = point: new (4*math.sqrt(2) , 0) + E = ellipse: foci (z.F2,z.F1,z.H) + a,b = E.Rx, E.Ry + z.A = E.covertex + T = triangle: new (z.H,z.O,z.A) + z.P = T: parallelogram () + C = circle: new (z.O,z.P) + z.L = C: point (0.25) + L.J,L.K = E: tangent_from (z.L) + z.J = L.J.pb + z.K = L.K.pb +\end{tkzelements} +\begin{tikzpicture} + \tkzGetNodes + \tkzDrawPoints(F1,F2,O) + \tkzDrawCircles[teal](O,P) + \tkzDrawPolygon(H,O,A,P) + \tkzDrawEllipse[red](O,\tkzUseLua{a},\tkzUseLua{b},0) + \tkzDrawSegments[orange](O,P O,L L,J L,K) + \tkzDrawPoints(F1,F2,O,H,A,P,L,J,K) + \tkzLabelPoints(F1,F2,O,H,A,P,L,J,K) + \tkzLabelPoints[above](L) + \tkzMarkRightAngles(A,P,H J,L,K) +\end{tikzpicture} +\end{verbatim} \end{minipage} \begin{minipage}[t]{.5\textwidth}\vspace{0pt}% \begin{tkzelements} @@ -885,6 +890,7 @@ z.K = L.K.pb \tkzDrawSegments[orange](O,P O,L L,J L,K) \tkzDrawPoints(F1,F2,O,H,A,P,L,J,K) \tkzLabelPoints(F1,F2,O,H,A,P,L,J,K) +\tkzLabelPoints[above](L) \tkzMarkRightAngles(A,P,H J,L,K) \end{tikzpicture} \end{minipage} @@ -942,8 +948,8 @@ z.C = intersection (L.EG,L.AB) z.O = C.AB: antipode (z.B) \end{tkzelements} - \hspace*{\fill} - \begin{tikzpicture} +\hspace*{\fill} +\begin{tikzpicture} \tkzGetNodes \tkzDrawArc[delta=5](O,B)(G) \tkzDrawCircles(A,B B,A) @@ -952,13 +958,13 @@ z.O = C.AB: antipode (z.B) \tkzMarkSegments[mark=s||](A,E B,E O,A) \tkzDrawPoints(A,B,C,E,I,J,G,O,K) \tkzLabelPoints(A,B,C,E,I,J,G,O,K) - \end{tikzpicture} - \hspace*{\fill} +\end{tikzpicture} + \hspace*{\fill} % subsection gold_division (end) \subsection{Ellipse} % (fold) \label{sub:ellipse} - +\begin{minipage}{.5\textwidth} \begin{tkzexample}[latex=0cm,small,code only] \begin{tkzelements} z.C = point: new (3 , 2) @@ -971,7 +977,6 @@ z.O = C.AB: antipode (z.B) a = E.Rx b = E.Ry slope = math.deg(E.slope) - \end{tkzelements} \begin{tikzpicture} \tkzGetNodes @@ -981,7 +986,8 @@ z.O = C.AB: antipode (z.B) \tkzLabelPoints(C,A,B) \end{tikzpicture} \end{tkzexample} - +\end{minipage} +\begin{minipage}{.5\textwidth} \begin{tkzelements} z.C = point: new (3 , 2) z.A = point: new (5 , 1) @@ -1004,53 +1010,55 @@ slope = math.deg(E.slope) \tkzLabelPoints(C,A,B) \end{tikzpicture} \hspace*{\fill} +\end{minipage} % subsection ellipse (end) \subsection{Ellipse with radii} % (fold) \label{sub:ellipse_with_radii} - +\begin{minipage}{.5\textwidth} \begin{tkzexample}[latex=0cm,small,code only] \begin{tkzelements} -z.C = point: new (0 , 4) -z.B = point: new (4 , 0) -z.D = point: new (2 , 6) -b = math.sqrt(8) -a = math.sqrt(32) -ang = math.deg(math.pi/4) -E = ellipse: radii (z.C,a,b,math.pi/4) -z.V = E : point (0) -z.CoV = E : point (0.25) -\end{tkzelements} -\begin{tikzpicture} +scale=.5 +z.C = point: new (0 , 4) +b = value(math.sqrt(8)) +a = value(math.sqrt(32)) +ang = math.deg(math.pi/4) +E = ellipse: radii (z.C,a,b,math.pi/4) +z.V = E : point (0) +z.CoV = E : point (math.pi/2) +\end{tkzelements} +\begin{tikzpicture}[gridded] \tkzGetNodes -\tkzDrawEllipse[blue](C,\tkzUseLua{a},\tkzUseLua{b},\tkzUseLua{ang}) +\tkzDrawEllipse[blue](C,\tkzUseLua{a}, + \tkzUseLua{b},\tkzUseLua{ang}) \tkzDrawPoints(C,V,CoV) \end{tikzpicture} \end{tkzexample} - +\end{minipage} +\begin{minipage}{.5\textwidth} \begin{tkzelements} +scale=.5 z.C = point: new (0 , 4) -z.B = point: new (4 , 0) -z.D = point: new (2 , 6) -b = math.sqrt(8) -a = math.sqrt(32) +b = value(math.sqrt(8)) +a = value(math.sqrt(32)) ang = math.deg(math.pi/4) -E = ellipse: radii (z.C,a,b,math.pi/4) +E = ellipse: radii (z.C,a,b,math.pi/4) z.V = E : point (0) -z.CoV = E : point (0.25) -\end{tkzelements} +z.CoV = E : point (math.pi/2) +\end{tkzelements} \hspace*{\fill} -\begin{tikzpicture} +\begin{tikzpicture}[gridded] \tkzGetNodes \tkzDrawEllipse[blue](C,\tkzUseLua{a},\tkzUseLua{b},\tkzUseLua{ang}) \tkzDrawPoints(C,V,CoV) \end{tikzpicture} +\end{minipage} % subsection ellipse_with_radii (end) \subsection{Ellipse\_with\_foci} % (fold) \label{sub:ellipse_with_foci} - +\begin{minipage}{.5\textwidth} \begin{tkzexample}[latex=0cm,small,code only] \begin{tkzelements} local e @@ -1079,7 +1087,8 @@ z.CoV = E : point (0.25) \tkzDrawLines(K,F K,G) \end{tikzpicture} \end{tkzexample} - +\end{minipage} +\begin{minipage}{.5\textwidth} \begin{tkzelements} local e e = .8 @@ -1109,27 +1118,28 @@ z.G = L.tb.pb \tkzDrawLines(K,F K,G) \end{tikzpicture} \hspace*{\fill} + \end{minipage} % subsection ellipse_with_foci (end) \subsection{Euler relation} % (fold) \label{sub:euler_relation} - +\begin{minipage}{.5\textwidth} \begin{tkzexample}[latex=0cm,small,code only] \begin{tkzelements} - scale = .75 - z.A = point: new (0 , 0) - z.B = point: new (5 , 0) - z.C = point: new (-.4 , 4) - T.ABC = triangle: new (z.A,z.B,z.C) - z.J,z.K = get_points(T.ABC: ex_circle (2)) - z.X ,z.Y,z.K = T.ABC : projection (z.J) - z.I,z.H = get_points(T.ABC : in_circle()) - z.O = T.ABC.circumcenter - C.OA = circle : new (z.O,z.A) - T.IBA = triangle: new (z.I,z.B,z.A) - z.w = T.IBA.circumcenter - L.Ow = line : new (z.O,z.w) - _,z.E = intersection (L.Ow, C.OA) + scale = .75 + z.A = point: new (0 , 0) + z.B = point: new (5 , 0) + z.C = point: new (-.4 , 4) + T.ABC = triangle: new (z.A,z.B,z.C) + z.J,z.K = get_points(T.ABC: ex_circle (2)) + z.X,z.Y,z.K= T.ABC : projection (z.J) + z.I,z.H = get_points(T.ABC : in_circle()) + z.O = T.ABC.circumcenter + C.OA = circle : new (z.O,z.A) + T.IBA = triangle: new (z.I,z.B,z.A) + z.w = T.IBA.circumcenter + L.Ow = line : new (z.O,z.w) + _,z.E = intersection (L.Ow, C.OA) \end{tkzelements} \begin{tikzpicture} \tkzGetNodes @@ -1143,7 +1153,8 @@ z.G = L.tb.pb \tkzMarkRightAngles[fill=gray!20,opacity=.4](C,H,I A,K,J) \end{tikzpicture} \end{tkzexample} - +\end{minipage} +\begin{minipage}{.5\textwidth} \begin{tkzelements} z.A = point: new (0 , 0) z.B = point: new (5 , 0) @@ -1173,6 +1184,7 @@ _,z.E = intersection (L.Ow, C.OA) \tkzMarkRightAngles[fill=gray!20,opacity=.4](C,H,I A,K,J) \end{tikzpicture} \hspace*{\fill} +\end{minipage} % subsection euler_relation (end) \subsection{External angle} % (fold) @@ -1180,33 +1192,33 @@ _,z.E = intersection (L.Ow, C.OA) \begin{minipage}[t]{.5\textwidth}\vspace{0pt}% \begin{verbatim} \begin{tkzelements} - scale =.8 - z.A = point: new (0 , 0) - z.B = point: new (5 , 0) - z.C = point: new (-2 , 4) - T.ABC = triangle: new (z.A,z.B,z.C) - T.ext = T.ABC: excentral () - z.O = T.ABC.circumcenter - z.D = intersection (T.ext.ab,T.ABC.ab) - z.E = z.C: symmetry (z.B) + scale = .75 + z.A = point: new (0 , 0) + z.B = point: new (5 , 0) + z.C = point: new (-2 , 4) + T.ABC = triangle: new (z.A,z.B,z.C) + T.ext = T.ABC: excentral () + z.O = T.ABC.circumcenter + z.D = intersection (T.ext.ab,T.ABC.ab) + z.E = z.C: symmetry (z.B) \end{tkzelements} \begin{tikzpicture} - \tkzGetNodes - \tkzDrawPolygon(A,B,C) - \tkzDrawLine[purple,add=0 and .5](B,C) - \tkzDrawSegment[purple](A,D) - \tkzDrawSegment[orange](C,D) - \tkzFillAngles[purple!30,opacity=.2](D,C,A E,C,D) - \tkzMarkAngles[mark=|](D,C,A E,C,D) - \tkzDrawPoints(A,...,D) - \tkzLabelPoints[above](C) - \tkzLabelPoints(A,B,D) + \tkzGetNodes + \tkzDrawPolygon(A,B,C) + \tkzDrawLine[purple,add=0 and .5](B,C) + \tkzDrawSegment[purple](A,D) + \tkzDrawSegment[orange](C,D) + \tkzFillAngles[purple!30,opacity=.2](D,C,A E,C,D) + \tkzMarkAngles[mark=|](D,C,A E,C,D) + \tkzDrawPoints(A,...,D) + \tkzLabelPoints[above](C) + \tkzLabelPoints(A,B,D) \end{tikzpicture} \end{verbatim} \end{minipage} \begin{minipage}[t]{.5\textwidth}\vspace{0pt}% \begin{tkzelements} -scale = .8 +scale = .75 z.A = point: new (0 , 0) z.B = point: new (5 , 0) z.C = point: new (-2 , 4) @@ -1230,6 +1242,7 @@ z.E = z.C: symmetry (z.B) \tkzLabelPoints[above](C) \tkzLabelPoints(A,B,D) \end{tikzpicture} +\hspace*{\fill} \end{minipage} % subsection external_angle (end) @@ -1488,7 +1501,7 @@ z.O_0 = L.AB.mid \subsection{Harmonic division v1} % (fold) \label{sub:harmonic_division_v1} -\begin{minipage}[t]{.5\textwidth}\vspace{0pt}% +\begin{minipage}[t]{.4\textwidth}\vspace{0pt}% \begin{verbatim} \begin{tkzelements} scale=.75 @@ -1523,7 +1536,7 @@ z.C = intersection (L.XG,L.AB) \end{tikzpicture} \end{verbatim} \end{minipage} -\begin{minipage}[t]{.5\textwidth}\vspace{0pt}% +\begin{minipage}[t]{.6\textwidth}\vspace{0pt}% \begin{tkzelements} scale=.75 z.A = point: new (0 , 0) @@ -1556,6 +1569,7 @@ z.C = intersection (L.XG,L.AB) \tkzLabelPoints(A,B,G,E,F,C,D) \tkzMarkSegments(F,B B,E) \end{tikzpicture} +\hspace*{\fill} \end{minipage} % subsection harmonic_division_v1 (end) @@ -1621,7 +1635,7 @@ z.C = intersection (L.GX,L.AB) \subsection{Menelaus} % (fold) \label{sub:menelaus} -\begin{minipage}{.5\textwidth} +\begin{minipage}{.4\textwidth} \begin{verbatim} \begin{tkzelements} z.A = point: new (0 , 0) @@ -1645,7 +1659,7 @@ z.C = intersection (L.GX,L.AB) \end{tikzpicture} \end{verbatim} \end{minipage} -\begin{minipage}{.5\textwidth} +\begin{minipage}{.6\textwidth} \begin{tkzelements} z.A = point: new (0 , 0) z.B = point: new (6 , 0) @@ -1668,6 +1682,7 @@ z.R = intersection (L.BC,L.PX) \tkzDrawPoints(P,Q,R,A,B,C) \tkzLabelPoints(A,B,C,P,Q,R) \end{tikzpicture} +\hspace*{\fill} \end{minipage} % subsection menelaus (end) @@ -2041,7 +2056,7 @@ z.H = L.OOp : projection (z.X) \end{minipage} % subsection radical_circle (end) -\subsection{Hexagram} % (fold) +\subsection{Euler ellipse} % (fold) \label{sub:hexagram} \begin{tkzexample}[latex=0cm,small,code only] \begin{tkzelements} @@ -2080,6 +2095,9 @@ z.H = L.OOp : projection (z.X) _,z.V = intersection (L.YO,E) _,z.W = intersection (L.ZO,E) \end{tkzelements} + \end{tkzexample} + +\begin{tkzexample}[latex=0cm,small,code only] \begin{tikzpicture} \tkzGetNodes \tkzDrawPolygon(A,B,C) @@ -2419,7 +2437,7 @@ z.O = C.DC : inversion (z.W) \end{tkzexample} \begin{tkzelements} -scale =.3 +scale =.5 z.A = point: new (0,0) z.B = point: new (6,0) z.C = point: new (0.8,4) @@ -2665,6 +2683,84 @@ z.Kp = L.Kp.pb \subsection{Midcircles} % (fold) \label{sub:midcircles} +\begin{tkzelements} +z.A = point: new (0 , 0) +z.B = point: new (10 , 0) +L.AB = line : new (z.A,z.B) +z.C = L.AB: gold_ratio () +L.AC = line : new (z.A,z.C) +L.CB = line : new (z.C,z.B) +z.O_0 = L.AB.mid +z.O_1 = L.AC.mid +z.O_2 = L.CB.mid +C.O0B = circle : new (z.O_0,z.B) +C.O1C = circle : new (z.O_1,z.C) +C.O2C = circle : new (z.O_2,z.B) +z.Q = C.O1C : midarc (z.C,z.A) +z.P = C.O2C : midarc (z.B,z.C) +L.O1O2 = line : new (z.O_1,z.O_2) +L.O0O1 = line : new (z.O_0,z.O_1) +L.O0O2 = line : new (z.O_0,z.O_2) +z.M_0 = L.O1O2 : harmonic_ext (z.C) +z.M_1 = L.O0O1 : harmonic_int (z.A) +z.M_2 = L.O0O2 : harmonic_int (z.B) +L.BQ = line : new (z.B,z.Q) +L.AP = line : new (z.A,z.P) +z.S = intersection (L.BQ,L.AP) +L.CS = line : new (z.C,z.S) +C.M1A = circle : new (z.M_1,z.A) +C.M2B = circle : new (z.M_2,z.B) +z.P_0 = intersection (L.CS,C.O0B) +z.P_1 = intersection (C.M2B,C.O1C) +z.P_2 = intersection (C.M1A,C.O2C) +T.P012 = triangle : new (z.P_0,z.P_1,z.P_2) +z.O_4 = T.P012.circumcenter +T.CP12 = triangle : new (z.C,z.P_1,z.P_2) +z.O_5 = T.CP12.circumcenter +z.BN = z.B : north () +L.BBN = line : new (z.B,z.BN) +L.M1P2 = line : new (z.M_1,z.P_2) +z.J = intersection (L.BBN,L.M1P2) +L.AP0 = line : new (z.A,z.P_0) +L.BP0 = line : new (z.B,z.P_0) +C.O4P0 = circle : new (z.O_4,z.P_0) +_,z.G = intersection (L.AP0,C.O4P0) +z.H = intersection (L.BP0,C.O4P0) +z.Ap = z.M_1: symmetry (z.A) +z.H_4,z.F,z.E,z.H_0 = L.AB : projection (z.O_4,z.G,z.H,z.P_0) +\end{tkzelements} + +\hspace*{\fill} +\begin{tikzpicture} +\tkzGetNodes +\tkzDrawCircle[thin,fill=green!10](O_4,P_0) +\tkzDrawCircle[purple,fill=purple!10,opacity=.5](O_5,C) +\tkzDrawSemiCircles[teal](O_0,B) +\tkzDrawSemiCircles[thin,teal,fill=teal!20,opacity=.5](O_1,C O_2,B) +\tkzDrawSemiCircles[color = orange](M_2,B) +\tkzDrawSemiCircles[color = orange](M_1,A') +\tkzDrawArc[purple,delta=0](M_0,P_0)(C) +\tkzDrawSegments[very thin](A,B A,P B,Q) +\tkzDrawSegments[color=cyan](O_0,P_0 B,J G,J G,O_0 H,O_2) +\tkzDrawSegments[ultra thin,purple](M_1,P_0 M_2,P_0 M_1,M_0 M_0,P_1 M_0,P_0 M_1,J) +\tkzDrawPoints(A,B,C,P_0,P_2,P_1,M_0,M_1,M_2,J,P,Q,S) +\tkzDrawPoints(O_0,O_1,O_2,O_4,O_5,G,H) +\tkzMarkRightAngle[size=.2,fill=gray!20,opacity=.4](O_0,P_0,M_0) +\tkzLabelPoints[below](A,B,C,M_0,M_1,M_2,O_1,O_2,O_0) +\tkzLabelPoints[above](P_0,O_5,O_4) +\tkzLabelPoints[above](P_1,J) +\tkzLabelPoints[above](P_2,P,Q,S) +\tkzLabelPoints[above right](H,E) +\tkzLabelPoints[above left](F,G) +\tkzLabelPoints[below right](H_0) +\tkzLabelCircle[below=4pt,font=\scriptsize](O_1,C)(80){$(\beta)$} +\tkzLabelCircle[below=4pt,font=\scriptsize](O_2,B)(80){$(\gamma)$} +\tkzLabelCircle[below=4pt,font=\scriptsize](O_0,B)(110){$(\alpha)$} +\tkzLabelCircle[left,font=\scriptsize](O_4,P_2)(60){$(\delta)$} +\tkzLabelCircle[above left,font=\scriptsize](O_5,C)(40){$(\epsilon)$} +\end{tikzpicture} +\hspace*{\fill} + \begin{tkzexample}[latex=0cm,small,code only] \begin{tkzelements} z.A = point: new (0 , 0) @@ -2712,7 +2808,9 @@ z.Kp = L.Kp.pb z.Ap = z.M_1: symmetry (z.A) z.H_4,z.F,z.E,z.H_0 = L.AB : projection (z.O_4,z.G,z.H,z.P_0) \end{tkzelements} +\end{tkzexample} +\begin{tkzexample}[latex=0cm,small,code only] \begin{tikzpicture} \tkzGetNodes \tkzDrawCircle[thin,fill=green!10](O_4,P_0) @@ -2743,83 +2841,7 @@ z.Kp = L.Kp.pb \end{tikzpicture} \end{tkzexample} -\begin{tkzelements} -z.A = point: new (0 , 0) -z.B = point: new (10 , 0) -L.AB = line : new (z.A,z.B) -z.C = L.AB: gold_ratio () -L.AC = line : new (z.A,z.C) -L.CB = line : new (z.C,z.B) -z.O_0 = L.AB.mid -z.O_1 = L.AC.mid -z.O_2 = L.CB.mid -C.O0B = circle : new (z.O_0,z.B) -C.O1C = circle : new (z.O_1,z.C) -C.O2C = circle : new (z.O_2,z.B) -z.Q = C.O1C : midarc (z.C,z.A) -z.P = C.O2C : midarc (z.B,z.C) -L.O1O2 = line : new (z.O_1,z.O_2) -L.O0O1 = line : new (z.O_0,z.O_1) -L.O0O2 = line : new (z.O_0,z.O_2) -z.M_0 = L.O1O2 : harmonic_ext (z.C) -z.M_1 = L.O0O1 : harmonic_int (z.A) -z.M_2 = L.O0O2 : harmonic_int (z.B) -L.BQ = line : new (z.B,z.Q) -L.AP = line : new (z.A,z.P) -z.S = intersection (L.BQ,L.AP) -L.CS = line : new (z.C,z.S) -C.M1A = circle : new (z.M_1,z.A) -C.M2B = circle : new (z.M_2,z.B) -z.P_0 = intersection (L.CS,C.O0B) -z.P_1 = intersection (C.M2B,C.O1C) -z.P_2 = intersection (C.M1A,C.O2C) -T.P012 = triangle : new (z.P_0,z.P_1,z.P_2) -z.O_4 = T.P012.circumcenter -T.CP12 = triangle : new (z.C,z.P_1,z.P_2) -z.O_5 = T.CP12.circumcenter -z.BN = z.B : north () -L.BBN = line : new (z.B,z.BN) -L.M1P2 = line : new (z.M_1,z.P_2) -z.J = intersection (L.BBN,L.M1P2) -L.AP0 = line : new (z.A,z.P_0) -L.BP0 = line : new (z.B,z.P_0) -C.O4P0 = circle : new (z.O_4,z.P_0) -_,z.G = intersection (L.AP0,C.O4P0) -z.H = intersection (L.BP0,C.O4P0) -z.Ap = z.M_1: symmetry (z.A) -z.H_4,z.F,z.E,z.H_0 = L.AB : projection (z.O_4,z.G,z.H,z.P_0) -\end{tkzelements} -\hspace*{\fill} -\begin{tikzpicture} -\tkzGetNodes -\tkzDrawCircle[thin,fill=green!10](O_4,P_0) -\tkzDrawCircle[purple,fill=purple!10,opacity=.5](O_5,C) -\tkzDrawSemiCircles[teal](O_0,B) -\tkzDrawSemiCircles[thin,teal,fill=teal!20,opacity=.5](O_1,C O_2,B) -\tkzDrawSemiCircles[color = orange](M_2,B) -\tkzDrawSemiCircles[color = orange](M_1,A') -\tkzDrawArc[purple,delta=0](M_0,P_0)(C) -\tkzDrawSegments[very thin](A,B A,P B,Q) -\tkzDrawSegments[color=cyan](O_0,P_0 B,J G,J G,O_0 H,O_2) -\tkzDrawSegments[ultra thin,purple](M_1,P_0 M_2,P_0 M_1,M_0 M_0,P_1 M_0,P_0 M_1,J) -\tkzDrawPoints(A,B,C,P_0,P_2,P_1,M_0,M_1,M_2,J,P,Q,S) -\tkzDrawPoints(O_0,O_1,O_2,O_4,O_5,G,H) -\tkzMarkRightAngle[size=.2,fill=gray!20,opacity=.4](O_0,P_0,M_0) -\tkzLabelPoints[below](A,B,C,M_0,M_1,M_2,O_1,O_2,O_0) -\tkzLabelPoints[above](P_0,O_5,O_4) -\tkzLabelPoints[above](P_1,J) -\tkzLabelPoints[above](P_2,P,Q,S) -\tkzLabelPoints[above right](H,E) -\tkzLabelPoints[above left](F,G) -\tkzLabelPoints[below right](H_0) -\tkzLabelCircle[below=4pt,font=\scriptsize](O_1,C)(80){$(\beta)$} -\tkzLabelCircle[below=4pt,font=\scriptsize](O_2,B)(80){$(\gamma)$} -\tkzLabelCircle[below=4pt,font=\scriptsize](O_0,B)(110){$(\alpha)$} -\tkzLabelCircle[left,font=\scriptsize](O_4,P_2)(60){$(\delta)$} -\tkzLabelCircle[above left,font=\scriptsize](O_5,C)(40){$(\epsilon)$} -\end{tikzpicture} -\hspace*{\fill} % subsection midcircles (end) \subsection{Pencil v1} % (fold) @@ -4452,11 +4474,11 @@ z.L = T.golden.pc L.O0L = line:new(z.O_0,z.L) z.D = intersection (L.O0L,C.O0B) L.DB = line:new(z.D,z.B) -z.Z = intersection (L.DB,C.O2B) +_,z.Z = intersection (L.DB,C.O2B) L.DA = line:new(z.D,z.A) z.I = intersection (L.DA,C.O1C) L.O2Z = line:new(z.O_2,z.Z) -z.H = intersection (L.O2Z,C.O0B) +_,z.H = intersection (L.O2Z,C.O0B) C.BD = circle:new (z.B,z.D) C.DB = circle:new (z.D,z.B) _,z.G = intersection (C.BD,C.O0B) diff --git a/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-indepthstudy.tex b/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-indepthstudy.tex index 935c4fdeea..3bfc5fc4ea 100644 --- a/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-indepthstudy.tex +++ b/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-indepthstudy.tex @@ -172,16 +172,16 @@ The difference between |z.A = point : new (1,2)| and |za = point (1,2)| is that \toprule \textbf{Metamethods} & \textbf{Application} \\ \midrule -__add(z1,z2) & |z.a + z.b| & affix \\ -__sub(z1,z2) & |z.a - z.b| & affix\\ -__unm(z) & |- z.a| & affix\\ -__mul(z1,z2) & |z.a * z.b| & affix\\ -__concat(z1,z2)& |z.a .. z.b| & dot product = real number \footnote{If $O$ is the origin of the complex plan, then we get the dot product of the vectors $\overrightarrow{Oa}$ and $\overrightarrow{Ob}$} \\ -__pow(z1,z2) & |z.a ^ z.b| & determinant = real number\\ -__div(z1,z2) & |z.a / z.b| & affix \\ -__tostring(z) & tex.print(tostring(z)) & displays the affix \\ -__tonumber(z) & tonumber(z) & affix or nil\\ -__eq(z1,z2) & eq (z.a,z.b) & boolean\\ +\_\_add(z1,z2) & |z.a + z.b| & affix \\ +\_\_sub(z1,z2) & |z.a - z.b| & affix\\ +\_\_unm(z) & |- z.a| & affix\\ +\_\_mul(z1,z2) & |z.a * z.b| & affix\\ +\_\_concat(z1,z2)& |z.a .. z.b| & dot product = real number \footnote{If $O$ is the origin of the complex plan, then we get the dot product of the vectors $\overrightarrow{Oa}$ and $\overrightarrow{Ob}$} \\ +\_\_pow(z1,z2) & |z.a ^ z.b| & determinant = real number\\ +\_\_div(z1,z2) & |z.a / z.b| & affix \\ +\_\_tostring(z) & tex.print(tostring(z)) & displays the affix \\ +\_\_tonumber(z) & tonumber(z) & affix or nil\\ +\_\_eq(z1,z2) & eq (z.a,z.b) & boolean\\ \bottomrule \end{tabular} \end{minipage} diff --git a/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-main.tex b/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-main.tex index 862be86799..95ce56dbc3 100644 --- a/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-main.tex +++ b/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-main.tex @@ -1,6 +1,6 @@ % !TEX TS-program = lualatex % encoding : utf8 -% Documentation of tkz-elements v1.82c +% Documentation of tkz-elements v2.00c % Copyright 2023 Alain Matthes % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -21,10 +21,10 @@ headings = small ]{tkz-doc} \gdef\tkznameofpack{tkz-elements} -\gdef\tkzversionofpack{1.82c} +\gdef\tkzversionofpack{2.00c} \gdef\tkzdateofpack{\today} \gdef\tkznameofdoc{tkz-elements.pdf} -\gdef\tkzversionofdoc{1.82c} +\gdef\tkzversionofdoc{2.00c} \gdef\tkzdateofdoc{\today} \gdef\tkzauthorofpack{Alain Matthes} \gdef\tkzadressofauthor{} @@ -225,6 +225,7 @@ Project Public License Distributed from \href{http://www.ctan.org/}{CTAN}\ arch \input{TKZdoc-elements-classes-rectangle.tex} \input{TKZdoc-elements-classes-parallelogram.tex} \input{TKZdoc-elements-classes-regular.tex} +\input{TKZdoc-elements-classes-vectors.tex} \input{TKZdoc-elements-classes-misc.tex} \input{TKZdoc-elements-intersection.tex} \input{TKZdoc-elements-indepthstudy.tex} @@ -238,12 +239,12 @@ Project Public License Distributed from \href{http://www.ctan.org/}{CTAN}\ arch \label{sec:cheat_sheet} % section cheat_sheet (end) -|r| denotes a real number, |d| a positive real number, |n|an integer, |an| an angle, |b| a boolean, |s| a character string, |pt| a point, |v| variable, |L| a straight line, |C| a circle, |T| a triangle, |E| an ellipse, |Q| a quadrilateral, |P| a parallelogram, |R| a rectangle, |S| a square, |RP| a regular polygon, |O| an object (pt, L,C,T), . . a list of points or an object, < > optional argument. +|r| denotes a real number, |d| a positive real number, |n|an integer, |an| an angle, |b| a boolean, |s| a character string, |pt| a point, |v| variable, |L| a straight line, |C| a circle, |T| a triangle, |E| an ellipse, |V| a vector,|Q| a quadrilateral, |P| a parallelogram, |R| a rectangle, |S| a square, |RP| a regular polygon, |O| an object (pt, L,C,T), . . a list of points or an object, < > optional argument. \begin{multicols}{3} - -\fbox{\textbf{Point}}\\ -\textbf{Attributes} table(\ref{point:att}) \\ + +\fbox{\textbf{point}}\\ +\textbf{Attributes} table(\ref{point:att}) \\ |re -> r| \\ |im -> r| \\ |type -> s| \\ @@ -254,10 +255,10 @@ Project Public License Distributed from \href{http://www.ctan.org/}{CTAN}\ arch |.. -> r| \\ |^ -> r| \\ |conj -> pt| \\ -|abs -> | \\ -|mod -> | \\ -|norm -> | \\ -|arg -> r| \\ +|abs -> r| \\ +|mod -> d| \\ +|norm -> d| \\ +|arg -> d| \\ |get -> r,r| \\ |sqrt -> pt| \\ |new -> pt| \\ @@ -271,6 +272,8 @@ Project Public License Distributed from \href{http://www.ctan.org/}{CTAN}\ arch |symmetry (...) -> O| \\ |rotation (an , ...) -> O| \\ |homothety (r , ...) -> O| \\ +|orthogonal(d) -> pt| \\ +|at() -> pt| \\ \\ \fbox{\textbf{line}} \\ \textbf{Attributes} table(\ref{line:att}) \\ @@ -285,6 +288,7 @@ Project Public License Distributed from \href{http://www.ctan.org/}{CTAN}\ arch |west -> pt| \\ |slope -> r| \\ |length -> d| \\ +|vec -> V| \\ \textbf{Methods} table(\ref{line:met}) \\ |new (pt,pt) -> d| \\ |distance (pt) -> d| \\ @@ -327,7 +331,7 @@ Project Public License Distributed from \href{http://www.ctan.org/}{CTAN}\ arch |gold () -> T| \\ |euclide () -> T| \\ |golden () -> T| \\ -|devine () -> T| \\ +|divine () -> T| \\ |cheops () -> T| \\ |pythagoras () -> T| \\ |sublime () -> T| \\ @@ -406,6 +410,7 @@ Project Public License Distributed from \href{http://www.ctan.org/}{CTAN}\ arch |-> r,r,r| \\ |in_out (pt) -> pt| \\ |check_equilateral () -> b| \\ + \\ \fbox{\textbf{circle}} \\ \textbf{Attributes} table(\ref{circle:att}) \\ |center -> pt| \\ @@ -546,11 +551,27 @@ Project Public License Distributed from \href{http://www.ctan.org/}{CTAN}\ arch |incircle () -> C| \\ |name (s) -> ?| \\ \\ +\fbox{\textbf{vector}} \\ +\textbf{Attributes} table(\ref{vector:att}) \\ +|pa,pb -> pt| \\ +|type -> s| \\ +|norm -> d| \\ +|slope -> r| \\ +\textbf{Methods} table(\ref{vector:met})\\ +|new (pt,pt) -> V| \\ +|+ - * -> pt| \\ +|normalize (V) -> V| \\ +|orthogonal (d) -> V| \\ +|scale (r) -> V| \\ +|at (pt) -> V| \\ + \\ \fbox{\textbf{Misc.}} \\ - \textbf{Attributes} table(\ref{misc}) \\ + \textbf{Attributes} table(\ref{misc}) \\ +|scale (default =1) -> r| \\ |tkzphi -> r| \\ |tkzinvphi -> r | \\ |tkzsqrtphi -> r | \\ +|tkz_epsilon (default=1e-8)-> r | \\ |length -> d | \\ |islinear(pt,pt,pt) -> b | \\ |isortho(pt,pt,pt) -> b | \\ @@ -564,5 +585,10 @@ Project Public License Distributed from \href{http://www.ctan.org/}{CTAN}\ arch |altitude (pt,pt,pt) -> L| \\ |midpoint (pt,pt) -> pt| \\ |equilateral (pt,pt) -> T| \\ +|format_number(r,n) -> r| \\ + +\fbox{\textbf{Macros}} \\ +|\tkzDN[n]{r} -> r| \\ +|\tkzDrawLuaEllipse((pt,pt,pt))| \\ \end{multicols} \end{document} \ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-organization.tex b/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-organization.tex index f69e0a591d..0d59a2b80b 100644 --- a/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-organization.tex +++ b/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-organization.tex @@ -3,9 +3,8 @@ Here's a sample organization. -The line |% !TEX TS-program = lualatex| ensures that you don't forget to compile with Lua\LATEX{}. The "standalone" class is useful, as all you need to do here is create a figure. +The line |% !TEX TS-program = lualatex| ensures that you don't forget to compile with Lua\LATEX{}. The “standalone” class is useful, as all you need to do here is create a figure. -The "mini" option in \pkg{tkz-euclide} allows you to load and use only plot-related macros. The package \pkg{ifthen} is useful if you need to use some Boolean. @@ -13,7 +12,7 @@ The macro \tkzcname{LuaCodeDebugOn} allows you to try and find errors in Lua cod It is of course possible to leave the Lua code in the \tkzNameEnv{tkzelements} environment, but externalizing this code has its advantages. -The first advantage, if you use a good editor, is to have a good presentation of the code. Styles are different between "Lua" and \LATEX{}. This makes the code clearer. This is how I proceeded, then reintegrated the code into the main code. +The first advantage, if you use a good editor, is to have a good presentation of the code. Styles are different between “Lua” and \LATEX{}. This makes the code clearer. This is how I proceeded, then reintegrated the code into the main code. Another advantage is that you don't have to comment the code incorrectly. For Lua code, you comment lines with |--| (double minus sign), whereas for \LATEX{}, you comment with |%|. @@ -26,7 +25,7 @@ Third advantage: the code can be reused. % Created by Alain Matthes on 2024-01-09. \documentclass[margin = 12pt]{standalone} -\usepackage[mini]{tkz-euclide} +\usepackage{tkz-euclide} \usepackage{tkz-elements,ifthen} \begin{document} @@ -46,7 +45,7 @@ Third advantage: the code can be reused. \end{document} \end{verbatim} -And here is the code for the "Lua" part: the file |ex_sangaku.lua| +And here is the code for the “Lua” part: the file |ex_sangaku.lua| \begin{verbatim} z.A = point : new ( 0,0 ) @@ -79,7 +78,7 @@ z.I = intersection (L.Cc,L.BF) \subsection{Scale problem} % (fold) \label{sub:scale_problem} -If necessary, it's better to do the scaling in the "Lua" section. The reason is that it will be more accurate. There is, however, a problem to be aware of. I've made it a point of honor to avoid using numerical values in my codes whenever possible. In principle, these values only appear in the definition of fixed points. If the "scale" option is used, scaling is applied when points are created. Let's imagine you want to organize your code as follows: +If necessary, it's better to do the scaling in the “Lua” section. The reason is that it will be more accurate. There is, however, a problem to be aware of. I've made it a point of honor to avoid using numerical values in my codes whenever possible. In principle, these values only appear in the definition of fixed points. If the “scale” option is used, scaling is applied when points are created. Let's imagine you want to organize your code as follows: |scale = 1.5|\\ |xB = 8|\\ diff --git a/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-presentation.tex b/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-presentation.tex index 2dbc732666..86fcc479ab 100644 --- a/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-presentation.tex +++ b/macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-presentation.tex @@ -132,23 +132,23 @@ When all the points necessary for the drawing are obtained, they must be transfo z.A = point: new (0 , 0) z.B = point: new (10 , 0) -- creation of two fixed points $A$ and $B$ L.AB = line: new ( z.A, z.B) -z.C = L.AB: gold_ratio () -- use of a method linked to "line" -z.O_0 = line: new ( z.A, z.B).mid -- midpoint of segment with an attribute of "line" +z.C = L.AB: gold_ratio () -- use of a method linked to “line” +z.O_0 = line: new ( z.A, z.B).mid -- midpoint of segment with an attribute of “line” z.O_1 = line: new ( z.A, z.C).mid -- objects are not stored and cannot be reused. z.O_2 = line: new ( z.C, z.B).mid -C.AB = circle: new ( z.O_0, z.B) -- new object "circle" stored and reused +C.AB = circle: new ( z.O_0, z.B) -- new object “circle” stored and reused C.AC = circle: new ( z.O_1, z.C) C.CB = circle: new ( z.O_2, z.B) -z.P = C.CB.north -- "north" atrributes of a circle +z.P = C.CB.north -- no“rth atrributes of a circle z.Q = C.AC.north z.O = C.AB.south -z.c = z.C : north (2) -- "north" method of a point (needs a parameter) +z.c = z.C : north (2) -- “north” method of a point (needs a parameter) C.PC = circle: new ( z.P, z.C) C.QA = circle: new ( z.Q, z.A) z.P_0 = intersection (C.PC,C.AB) -- search for intersections of two circles. z.P_1 = intersection (C.PC,C.AC) -- idem _,z.P_2 = intersection (C.QA,C.CB) -- idem -z.O_3 = triangle: new ( z.P_0, z.P_1, z.P_2).circumcenter -- circumcenter attribute of "triangle" +z.O_3 = triangle: new ( z.P_0, z.P_1, z.P_2).circumcenter -- circumcenter attribute of “triangle” \end{tkzelements} \begin{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-elements/doc/tkz-elements.pdf b/macros/latex/contrib/tkz/tkz-elements/doc/tkz-elements.pdf index d5b920c981..14426183c2 100644 Binary files a/macros/latex/contrib/tkz/tkz-elements/doc/tkz-elements.pdf and b/macros/latex/contrib/tkz/tkz-elements/doc/tkz-elements.pdf differ diff --git a/macros/latex/contrib/tkz/tkz-elements/latex/tkz-elements.sty b/macros/latex/contrib/tkz/tkz-elements/latex/tkz-elements.sty index 2b388229e4..d3618f8e31 100644 --- a/macros/latex/contrib/tkz/tkz-elements/latex/tkz-elements.sty +++ b/macros/latex/contrib/tkz/tkz-elements/latex/tkz-elements.sty @@ -1,5 +1,5 @@ % encoding : utf8 -% tkz-elements.sty v1.82c +% tkz-elements.sty v2.00c % Copyright 2024 Alain Matthes % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -11,12 +11,13 @@ % This work has the LPPL maintenance status “maintained”. % The Current Maintainer of this work is Alain Matthes. -\ProvidesPackage{tkz-elements}[2024/01/16 v1.82c Graphic Object Library] +\ProvidesPackage{tkz-elements}[2024/02/04 v2.00c Graphic Object Library] \RequirePackage{luacode} \directlua{require "tkz_elements_main"} \newenvironment{tkzelements} { \directlua{scale=1} + \directlua{tkz_epsilon=1e-8} \directlua{indirect = true} \directlua{for k,v in pairs(z) do z[k] = nil end} \directlua{for k,v in pairs(C) do C[k] = nil end} @@ -45,4 +46,20 @@ end} } \def\tkzUseLua#1{\directlua{tex.print(tostring(#1))}} +\makeatletter +\def\tkzDrawLuaEllipse{\pgfutil@ifnextchar[{\tkz@DrawLuaEllipse}{\tkz@DrawLuaEllipse[]}} +\def\tkz@DrawLuaEllipse[#1](#2,#3,#4){% +\begingroup +\draw[#1](#2) ellipse [x radius=\tkzUseLua{length(z.#3,z.#2)}, y radius = \tkzUseLua{length(z.#4,z.#2)},rotate=\tkzUseLua{math.deg(slope_ (z.#3,z.#2))}]; +\endgroup +} +\def\tkzDN{\pgfutil@ifnextchar[{\tkz@DN}{\tkz@DN[2]}} +\def\tkz@DN[#1]#2{% +\begingroup +\pgfkeys{/pgf/number format/.cd,std,precision=#1} +\pgfmathprintnumber{#2} +\endgroup + } + +\makeatother \endinput diff --git a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_circle.lua b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_circle.lua index ae257221f4..e22e3eefd0 100644 --- a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_circle.lua +++ b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_circle.lua @@ -1,6 +1,6 @@ -- tkz_elements-circles.lua --- date 2024/01/16 --- version 1.82c +-- date 2024/02/04 +-- version 2.00c -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 @@ -52,10 +52,9 @@ end -- boolean -- ----------------------- function circle: in_out (pt) - local d,epsilon - epsilon = 10^(-12) + local d d = point.abs (pt - self.center) - if math.abs(d-self.radius) < epsilon + if math.abs(d-self.radius) < tkz_epsilon then return true else @@ -129,20 +128,6 @@ function circle: external_similitude (C) return external_similitude_ (self.center,self.radius,C.center,C.radius) end -function circle : common_tangent(C) - local o,s1,s2,t1,t2 - o = external_similitude_ (self.center,self.radius,C.center,C.radius) - - if self.radius < C.radius then - t1,t2 = tangent_from_ (C.center,C.through,o) - s1,s2 = tangent_from_ (self.center,self.through,o) - return s1,t1,t2,s2 - else - s1,s2 = tangent_from_ (C.center,C.through,o) - t1,t2 = tangent_from_ (self.center,self.through,o) - return s1,t1,t2,s2 - end -end ----------------------- -- lines -- ----------------------- @@ -190,7 +175,6 @@ function circle : radical_circle (C1,C2) end end - -- version 1.60 new function circle : external_tangent(C) local i,t1,t2,k,T1,T2 i = barycenter_ ({C.center,self.radius},{self.center,-C.radius}) @@ -200,7 +184,7 @@ end T2 = homothety_(i,k,t2) return line : new (t1,T1),line : new (t2,T2) end - -- version 1.60 new + function circle : internal_tangent(C) local i,t1,t2,k,T1,T2 i = barycenter_ ({C.center,self.radius},{self.center,C.radius}) @@ -210,6 +194,21 @@ end T2 = homothety_(i,k,t2) return line : new (t1,T1),line : new (t2,T2) end + + function circle : common_tangent(C) + local o,s1,s2,t1,t2 + o = external_similitude_ (self.center,self.radius,C.center,C.radius) + + if self.radius < C.radius then + t1,t2 = tangent_from_ (C.center,C.through,o) + s1,s2 = tangent_from_ (self.center,self.through,o) + return s1,t1,t2,s2 + else + s1,s2 = tangent_from_ (C.center,C.through,o) + t1,t2 = tangent_from_ (self.center,self.through,o) + return s1,t1,t2,s2 + end + end ----------------------- -- circles -- ----------------------- diff --git a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_class.lua b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_class.lua index 91b12ce31e..97bdc9449d 100644 --- a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_class.lua +++ b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_class.lua @@ -1,6 +1,6 @@ -- tkz_elements_class.lua --- date 2024/01/16 --- version 1.82c +-- date 2024/02/04 +-- version 2.00c -- from class.lua (Simple Lua Classes from Lua-users wiki) -- Compatible with Lua 5.1 (not 5.0). -- http://lua-users.org/wiki/SimpleLuaClasses DavidManura diff --git a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_ellipse.lua b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_ellipse.lua index f3fa0d173b..98800f791e 100644 --- a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_ellipse.lua +++ b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_ellipse.lua @@ -1,6 +1,6 @@ -- tkz_elements-ellipses.lua --- date 2024/01/16 --- version 1.82c +-- date 2024/02/04 +-- version 2.00c -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 @@ -105,13 +105,12 @@ function ellipse: tangent_from (pt) end function ellipse: in_out (pt) - local d,D,an,m,epsilon - epsilon = 10^(-12) + local d,D,an,m d = point.abs (pt - self.center) an = point.arg (pt - self.center) m = point(self.Rx*math.cos(an),self.Ry*math.sin(an)) D = point.abs (m - self.center) - if D-d > epsilon + if D-d > tkz_epsilon then return true else diff --git a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_circles.lua b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_circles.lua index 33477340d3..fe72c68c27 100644 --- a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_circles.lua +++ b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_circles.lua @@ -1,6 +1,6 @@ -- tkz_elements_functions_circles.lua --- date 2024/01/16 --- version 1.82c +-- date 2024/02/04 +-- version 2.00c -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 @@ -53,14 +53,13 @@ function inversion_ (c,p,pt) end function circles_position_ (c1,r1,c2,r2) - local d,max,min,epsilon - epsilon = 10^(-12) + local d,max,min d = point.mod(c1-c2) max = r1+r2 min = math.abs ( r1 - r2) if d > max then return "outside" - elseif math.abs(d - max) < epsilon then return "outside tangent" -- epsilon - elseif math.abs(d - min) < epsilon then return "inside tangent" -- epsilon + elseif math.abs(d - max) < tkz_epsilon then return "outside tangent" -- epsilon + elseif math.abs(d - min) < tkz_epsilon then return "inside tangent" -- epsilon elseif d < min then return "inside" else return "intersect" end diff --git a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_intersections.lua b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_intersections.lua index be7eea4461..7dd2c59c32 100644 --- a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_intersections.lua +++ b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_intersections.lua @@ -1,6 +1,6 @@ -- tkz_elements_intersections.lua --- date 2024/01/16 --- version 1.82c +-- date 2024/02/04 +-- version 2.00c -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 @@ -33,10 +33,9 @@ end -- function -- line ellipse function intersection_le (L,E) - local a,b,c,d,t1,t2,z1,z2,A,B,Bx,By,Ax,Ay,Rx,Ry,epsilon,sd + local a,b,c,d,t1,t2,z1,z2,A,B,Bx,By,Ax,Ay,Rx,Ry,sd A = (L.pa - E.center)*(point(math.cos(E.slope),-math.sin(E.slope))) B = (L.pb - E.center)*(point(math.cos(E.slope),-math.sin(E.slope))) - epsilon = 10^(-6) Rx = E.Rx Ry = E.Ry Ax = A.re @@ -62,7 +61,7 @@ function intersection_le (L,E) return z2*(point(math.cos(E.slope),math.sin(E.slope))) + E.center, z1*(point(math.cos(E.slope),math.sin(E.slope))) + E.center end -- if - elseif math.abs(d) < epsilon + elseif math.abs(d) < tkz_epsilon then t1 = (-(b))/(2*a) z1 = point ( Ax + (Bx-Ax)*t1 , Ay + (By-Ay)*t1 ) @@ -74,8 +73,7 @@ function intersection_le (L,E) end function intersection_ll_ (a,b,c,d) - local x1,x2,x3,x4,y1,y2,y3,y4,DN,NX,NY,epsilon - epsilon = 10^(-12) + local x1,x2,x3,x4,y1,y2,y3,y4,DN,NX,NY x1 = a.re y1 = a.im x2 = b.re @@ -85,7 +83,7 @@ function intersection_ll_ (a,b,c,d) x4 = d.re y4 = d.im DN = (x1-x2)*(y3-y4) - (y1-y2)*(x3-x4) - if math.abs ( DN ) < epsilon then + if math.abs ( DN ) < tkz_epsilon then return false else NX = (x1*y2-y1*x2)*(x3-x4) - (x1-x2)*(x3*y4-y3*x4) @@ -95,18 +93,17 @@ function intersection_ll_ (a,b,c,d) end function intersection_lc_ (pa,pb,c,p) - local zh, dh, arg_ab, test, phi,epsilon,c1,c2,r + local zh, dh, arg_ab, test, phi,c1,c2,r r = point.mod (c-p) - epsilon = 10^(-12) zh = projection_ (pa,pb,c) dh = point.abs (c - zh) arg_ab = point.arg (pa - pb) - if dh < epsilon + if dh < tkz_epsilon then return c + polar_ (r , math.pi + arg_ab), -- through center c + polar_ (r , arg_ab) - elseif math.abs (r - dh) < epsilon + elseif math.abs (r - dh) < tkz_epsilon then return zh , zh -- tangent elseif dh > r diff --git a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_lines.lua b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_lines.lua index 642d048809..c9d840d89c 100644 --- a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_lines.lua +++ b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_lines.lua @@ -1,6 +1,6 @@ -- tkz_elements_functions_lines.lua --- date 2024/01/16 --- version 1.82c +-- date 2024/02/04 +-- version 2.00c -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 @@ -28,9 +28,7 @@ function ll_from_ ( p , a , b ) end function slope_ (a,b) - local z = b - a - angle = point.arg(z) - return angle + return angle_normalize_ (point.arg(b-a)) end function gold_segment_ (a,b) @@ -132,10 +130,9 @@ function square_ (a,b) end function in_segment_ (a,b,pt) - local sc,epsilon - epsilon = 10^(-12) + local sc sc = point.mod (pt-a) + point.mod (pt-b) - point.mod(b-a) - if sc <= epsilon + if sc <= tkz_epsilon then return true else diff --git a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_maths.lua b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_maths.lua index 0702b0a568..63f5190f02 100644 --- a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_maths.lua +++ b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_maths.lua @@ -1,6 +1,6 @@ -- tkz_elements_functions_maths.lua --- date 2024/01/16 --- version 1.82c +-- date 2024/02/04 +-- version 2.00c -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 @@ -39,10 +39,9 @@ function Cramer22(a1,a2,b1,b2) end function aligned ( m,a,b ) - local z,epsilon - epsilon = 10^(-8) + local z z = (b-a)/(m-b) - if math.abs(z.im) < epsilon + if math.abs(z.im) < tkz_epsilon then return true else @@ -51,11 +50,9 @@ function aligned ( m,a,b ) end function islinear (z1,z2,z3) - local epsilon local dp - epsilon = 10^(-8) dp = (z2-z1) ^ (z3-z1) - if math.abs(dp) < epsilon + if math.abs(dp) < tkz_epsilon then return true else @@ -64,11 +61,9 @@ function islinear (z1,z2,z3) end function isortho (z1,z2,z3) - local epsilon local dp - epsilon = 10^(-8) dp = (z2-z1) .. (z3-z1) - if math.abs(dp) < epsilon + if math.abs(dp) < tkz_epsilon then return true else @@ -112,16 +107,13 @@ return angle_normalize_ (a) end function angle_normalize_ (a) -local dblpi - dblpi = 2 * math.pi - if a > dblpi - then - a = a - dblpi - end - if a < 0 then - a = a + dblpi - end - return a + while a < 0 do + a = a + 2*math.pi + end + while a >= 2*math.pi do + a = a - 2*math.pi + end + return a end function barycenter (...) @@ -133,4 +125,9 @@ function swap(a,b) a=b b=t return a,b -end \ No newline at end of file +end + +function format_number(number, decimal_places) + local format_string = string.format("%%.%df", decimal_places) + return string.format(format_string, number) +end diff --git a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_points.lua b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_points.lua index dfe86444df..cb91788424 100644 --- a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_points.lua +++ b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_points.lua @@ -1,6 +1,6 @@ -- tkz_elements_functions_points.lua --- date 2024/01/16 --- version 1.82c +-- date 2024/02/04 +-- version 2.00c -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_regular.lua b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_regular.lua index 4c0db75393..7f71760066 100644 --- a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_regular.lua +++ b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_regular.lua @@ -1,6 +1,6 @@ -- tkz_elements_functions_regular.lua --- date 2024/01/16 --- version 1.82c +-- date 2024/02/04 +-- version 2.00c -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_triangles.lua b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_triangles.lua index c574147912..d6a1cb1ecb 100644 --- a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_triangles.lua +++ b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_triangles.lua @@ -1,6 +1,6 @@ -- tkz_elements_functions_triangles.lua --- date 2024/01/16 --- version 1.82c +-- date 2024/02/04 +-- version 2.00c -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 @@ -268,12 +268,11 @@ function area_ (a,b,c) end function check_equilateral_ (a,b,c) - local A,B,C,epsilon - epsilon = 10 ^(-8) + local A,B,C A = b - c B = a - c C = a - b - if (point.abs(A)-point.abs(B) < epsilon) and (point.abs(B)-point.abs(C) < epsilon) + if (point.abs(A)-point.abs(B) < tkz_epsilon) and (point.abs(B)-point.abs(C) < tkz_epsilon) then return true else return false end diff --git a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_line.lua b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_line.lua index 1e45a544db..d8c8944835 100644 --- a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_line.lua +++ b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_line.lua @@ -1,6 +1,6 @@ -- tkz_elements_lines.lua --- date 2024/01/16 --- version 1.82c +-- date 2024/02/04 +-- version 2.00c -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 @@ -25,8 +25,9 @@ function line: new(za, zb) local south_pb = rotation_ (zb,math.pi/2,za) local west = rotation_ (za,math.pi/2,north_pa) local east = rotation_ (zb,math.pi/2,south_pb) - local slope = point.arg(zb-za) + local slope = angle_normalize_(point.arg(zb-za)) local length = point.mod(zb-za) + local vec = vector : new (za,zb) local o = {pa = za, pb = zb, north_pa = north_pa, @@ -38,6 +39,7 @@ function line: new(za, zb) slope = slope, mid = mid, type = type, + vec = vec, length = length} setmetatable(o, self) self.__index = self @@ -62,10 +64,9 @@ end -- Result -> boolean ------------------- function line: in_out (pt) - local sc,epsilon - epsilon = 10^(-12) + local sc sc = math.abs ((pt-self.pa)^(pt-self.pb)) - if sc <= epsilon + if sc <= tkz_epsilon then return true else @@ -74,10 +75,9 @@ function line: in_out (pt) end function line: in_out_segment (pt) - local sc,epsilon - epsilon = 10^(-12) + local sc sc = point.mod (pt-self.pa) + point.mod (pt-self.pb) - point.mod(self.pb-self.pa) - if sc <= epsilon + if sc <= tkz_epsilon then return true else @@ -430,14 +430,11 @@ end line.euclid = line.sublime function line: euclide (swap) - if swap == nil then - swap = false - end -if swap then + if swap == nil then + return triangle : new (self.pa,self.pb, rotation_ (self.pa,math.pi/5,self.pb)) + else return triangle : new (self.pa,self.pb, rotation_ (self.pa,-math.pi/5,self.pb)) -else - return triangle : new (self.pa,self.pb, rotation_ (self.pa,math.pi/5,self.pb)) - end + end end function line: divine () @@ -464,14 +461,8 @@ function line: egyptian () end line.pythagoras = line.egyptian line.isis = line.egyptian - -function line: golden () - local n,pt - n = rotation_ (self.pb,- math.pi/2,self.pa) - pt = self.pb + (n-self.pb)/tkzphi - return triangle : new (self.pa,self.pb,pt) -end - +line.golden = line.sublime +line.golden_gnomon = line.divine ------------------------------ -- Result -> couple of points diff --git a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_main.lua b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_main.lua index 132f193667..92eab43a84 100644 --- a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_main.lua +++ b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_main.lua @@ -1,6 +1,6 @@ -- tkz_elements-main.lua --- date 2024/01/16 --- version 1.82c +-- date 2024/02/04 +-- version 2.00c -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_misc.lua b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_misc.lua index 23f088983f..f95877a844 100644 --- a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_misc.lua +++ b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_misc.lua @@ -1,6 +1,6 @@ -- tkz_elements_functions_maths.lua --- date 2024/01/16 --- version 1.82c +-- date 2024/02/04 +-- version 2.00c -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_parallelogram.lua b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_parallelogram.lua index 386eb023e0..5ce1d2a9a4 100644 --- a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_parallelogram.lua +++ b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_parallelogram.lua @@ -1,6 +1,6 @@ -- tkz_elements_parallelogram.lua --- date 2024/01/16 --- version 1.82c +-- date 2024/02/04 +-- version 2.00c -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 @@ -17,11 +17,10 @@ parallelogram = {} function parallelogram: new (za, zb, zc, zd) - local d,epsilon - epsilon = 10^(-8) + local d local zi = midpoint_ (za,zc) local zj = midpoint_ (zb,zd) - if point.abs (zj-zi) < epsilon then else error ("it's not a parallelogram") + if point.abs (zj-zi) < tkz_epsilon then else error ("it's not a parallelogram") end local type = 'parallelogram' local center = midpoint_ (za,zc) diff --git a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_point.lua b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_point.lua index 7530dfc96a..8837299966 100644 --- a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_point.lua +++ b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_point.lua @@ -1,6 +1,6 @@ -- tkz_elements_point.lua --- date 2024/01/16 --- version 1.82c +-- date 2024/02/04 +-- version 2.00c -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 @@ -311,4 +311,18 @@ end function point: normalize() local d = point.abs(self) return point(self.re/d,self.im/d) +end + +function point: orthogonal(d) + local m + if d==nil then + return point(-self.im,self.re) +else + m = point.mod(self) + return point(-self.im*d/m,self.re*d/m) +end +end + +function point : at (z) + return point(self.re+z.re,self.im+z.im) end \ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_quadrilateral.lua b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_quadrilateral.lua index e80065540b..e1882c67cb 100644 --- a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_quadrilateral.lua +++ b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_quadrilateral.lua @@ -1,6 +1,6 @@ -- tkz_elements_quadrilateral.lua --- date 2024/01/16 --- version 1.82c +-- date 2024/02/04 +-- version 2.00c -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 @@ -50,11 +50,10 @@ function quadrilateral: new (za, zb, zc, zd) end ----------------------- function quadrilateral : iscyclic () - local d,epsilon - epsilon = 10^(-8) + local d local alpha = point.arg ((self.pd-self.pa) / (self.pb-self.pa)) local beta = point.arg ((self.pb-self.pc) / (self.pd-self.pc)) - if math.abs (alpha+beta-math.pi) < epsilon then return true + if math.abs (alpha+beta-math.pi) < tkz_epsilon then return true else return false end end diff --git a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_rectangle.lua b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_rectangle.lua index abb9c2f8e9..7c4f8f75ed 100644 --- a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_rectangle.lua +++ b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_rectangle.lua @@ -1,6 +1,6 @@ -- tkz_elements-rectangle.lua --- date 2024/01/16 --- version 1.82c +-- date 2024/02/04 +-- version 2.00c -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 @@ -17,13 +17,12 @@ rectangle = {} function rectangle: new (za, zb,zc,zd) - local d,epsilon - epsilon = 10^(-8) + local d local zi = midpoint_ (za,zc) local zj = midpoint_ (zb,zd) - if point.abs (zj-zi) < epsilon then else error ("it's not a rectangle") + if point.abs (zj-zi) < tkz_epsilon then else error ("it's not a rectangle") end - if math.abs(point.abs (zc-za)-point.abs (zd-zb)) < epsilon then else error ("it's not a rectangle") + if math.abs(point.abs (zc-za)-point.abs (zd-zb)) < tkz_epsilon then else error ("it's not a rectangle") end local type = 'rectangle' local center = midpoint_ (za,zc) diff --git a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_regular.lua b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_regular.lua index dbd6273205..2e00ab9598 100644 --- a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_regular.lua +++ b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_regular.lua @@ -1,6 +1,6 @@ -- tkz_elements_regular.lua --- date 2024/01/16 --- version 1.82c +-- date 2024/02/04 +-- version 2.00c -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_square.lua b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_square.lua index e9854efbe3..fe7b7a150b 100644 --- a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_square.lua +++ b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_square.lua @@ -1,6 +1,6 @@ -- tkz_elements-square.lua --- date 2024/01/16 --- version 1.82c +-- date 2024/02/04 +-- version 2.00c -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 @@ -17,15 +17,14 @@ square = {} function square: new (za, zb,zc,zd) - local d,epsilon - epsilon = 10^(-8) + local d local zi = midpoint_ (za,zc) local zj = midpoint_ (zb,zd) - if point.abs (zj-zi) < epsilon then else error ("it's not a square (center)") + if point.abs (zj-zi) < tkz_epsilon then else error ("it's not a square (center)") end - if math.abs(point.abs (zc-za) - point.abs (zd-zb)) < epsilon then else error ("it's not a square (diagonal)") + if math.abs(point.abs (zc-za) - point.abs (zd-zb)) < tkz_epsilon then else error ("it's not a square (diagonal)") end - if math.abs(point.abs (zb-za) - point.abs (zd-za)) < epsilon then else error ("it's not a square (side)") + if math.abs(point.abs (zb-za) - point.abs (zd-za)) < tkz_epsilon then else error ("it's not a square (side)") end local type = 'square' diff --git a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_triangle.lua b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_triangle.lua index d68084d5f8..0d2699ac55 100644 --- a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_triangle.lua +++ b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_triangle.lua @@ -1,6 +1,6 @@ -- tkz_elements_triangles.lua --- date 2024/01/16 --- version 1.82c +-- date 2024/02/04 +-- version 2.00c -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 @@ -24,9 +24,9 @@ function triangle: new (za, zb ,zc) local c = point.abs(zb-za) local a = point.abs(zc-zb) local b = point.abs(za-zc) - local alpha = point.arg ((zc-za) / (zb-za)) - local beta = point.arg ((za-zb) / (zc-zb)) - local gamma = point.arg ((zb-zc) / (za-zc)) + local alpha = angle_normalize_(point.arg ((zc-za) / (zb-za))) + local beta = angle_normalize_(point.arg ((za-zb) / (zc-zb))) + local gamma = angle_normalize_(point.arg ((zb-zc) / (za-zc))) local ab = line : new (za,zb) local ca = line : new (zc,za) local bc = line : new (zb,zc) @@ -139,7 +139,6 @@ function triangle : point (t) end function triangle : soddy_center () - local s,i,j,k return soddy_center_ (self.pa,self.pb,self.pc) end ------------------- diff --git a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_vector.lua b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_vector.lua index c2802cd41f..310b522788 100644 --- a/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_vector.lua +++ b/macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_vector.lua @@ -1,6 +1,6 @@ -- tkz_elements_vectors.lua --- date 2024/01/16 --- version 1.82c +-- date 2024/02/04 +-- version 2.00c -- Copyright 2024 Alain Matthes -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 @@ -14,33 +14,67 @@ -- ---------------------------------------------------------------------------- vector = {} -function vector: new(z1, z2) - local type = 'vector' - local norm = point.abs (z2-z1) - local arg = point.arg (z2-z1) - local o = {st = z1, - ed = z2, - norm = norm, - arg = arg, - type = type } +function vector: new(za, zb) + local type = 'vector' + local slope = angle_normalize_(point.arg(zb-za)) + local norm = point.mod(zb-za) + local o = {t = za, + h = zb, + norm = norm, + slope = slope, + type = type } setmetatable(o, self) self.__index = self return o end +function vector.__add(v1,v2) + return v1 : add (v2) +end + +function vector.__sub(v1,v2) + local v = v2 : scale(-1) + return v1 : add (v) +end + +function vector.__unm(v) + return v : scale(-1) +end + +function vector.__mul(r,v) + return v : scale(r) +end + function vector: normalize () - local z = self.ed-self.st + local z = self.h-self.t local d = point.abs(z) local nz = point(z.re/d,z.im/d) - return nz + self.st + return vector : new (self.t,nz + self.t) end - function vector: add (v) - return vector :new (self.st+v.st, self.ed,v.ed) - end + function vector: add (ve) + return vector :new (self.t,self.h+ve.h-ve.t) + end - function vector: ortho () - return vector : new (self.st, rotation_(self.st,math.pi/2,self.ed)) - end +function vector: orthogonal (d) +local z +if d == nil then + return vector : new (self.t, rotation_(self.t,math.pi/2,self.h)) +else + z = self.t+ point (d*math.cos(self.slope),d*math.sin(self.slope)) + return vector : new (self.t, rotation_(self.t,math.pi/2,z)) +end +end + +function vector: scale (d) + local l,z + l = self.norm + z = self.t+ point (d*l*math.cos(self.slope),d*l*math.sin(self.slope)) + return vector : new (self.t,z ) +end +function vector: at (zc) + return vector :new (zc,zc+self.h-self.t) +end + return vector diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl index 2adb5b5636..6de4e20891 100644 --- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl +++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl @@ -22,14 +22,12 @@ $mirrors = { 'https://mirrors.sjtug.sjtu.edu.cn/ctan/' => 1, 'https://mirrors.sustech.edu.cn/CTAN/' => 1, 'https://mirrors.tuna.tsinghua.edu.cn/CTAN/' => 1, - 'https://mirrors.ustc.edu.cn/CTAN/' => 1, }, 'Hong Kong' => { 'https://mirror-hk.koddos.net/CTAN/' => 1, }, 'India' => { 'https://in.mirrors.cicku.me/ctan/' => 1, - 'https://mirror.niser.ac.in/ctan/' => 1, }, 'Indonesia' => { 'http://repo.ugm.ac.id/ctan/' => 1, @@ -107,7 +105,6 @@ $mirrors = { 'https://ftp.fau.de/ctan/' => 1, 'https://ftp.gwdg.de/pub/ctan/' => 1, 'https://ftp.rrze.uni-erlangen.de/ctan/' => 1, - 'https://ftp.rrzn.uni-hannover.de/pub/mirror/tex-archive/' => 1, 'https://ftp.tu-chemnitz.de/pub/tex/' => 1, 'https://markov.htwsaar.de/tex-archive/' => 1, 'https://mirror.clientvps.com/CTAN/' => 1, @@ -155,7 +152,6 @@ $mirrors = { 'Spain' => { 'https://ctan.fisiquimicamente.com/' => 1, 'https://ctan.javinator9889.com/' => 1, - 'https://osl.ugr.es/CTAN/' => 1, }, 'Sweden' => { 'https://ftp.acc.umu.se/mirror/CTAN/' => 1, diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb index a3e37c079e..f1a3bfdfb0 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb @@ -26,11 +26,11 @@ depend container_split_src_files/1 depend frozen/0 depend minrelease/2016 depend release/2023 -depend revision/69693 +depend revision/69708 name 00texlive.image category TLCore -revision 69669 +revision 69701 shortdesc TeX Live files only in the source repository longdesc The files here are not copied by the installer and containers longdesc are not built for them; they exist only in the source @@ -4481,6 +4481,7 @@ runfiles size=14450 tlpkg/tlpsrc/ucs.tlpsrc tlpkg/tlpsrc/ucsmonograph.tlpsrc tlpkg/tlpsrc/ucthesis.tlpsrc + tlpkg/tlpsrc/udepcolor.tlpsrc tlpkg/tlpsrc/udes-genie-these.tlpsrc tlpkg/tlpsrc/udesoftec.tlpsrc tlpkg/tlpsrc/uebungsblatt.tlpsrc @@ -4845,7 +4846,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd name 00texlive.installer category TLCore -revision 69683 +revision 69695 shortdesc TeX Live standalone installer package longdesc This package defines the files to go into the installer longdesc archives (install-tl-unx.tar.gz, install-tl.zip) built by the @@ -74399,7 +74400,7 @@ containerchecksum 508276fe37018f3d9773fc7cda0cb37edcdd28e9cf8ab54ed5be16b07c2066 name collection-publishers category Collection -revision 69489 +revision 69701 shortdesc Publisher styles, theses, etc. relocated 1 depend aastex @@ -74646,6 +74647,7 @@ depend ucdavisthesis depend ucph-revy depend ucsmonograph depend ucthesis +depend udepcolor depend udes-genie-these depend uestcthesis depend ufrgscca @@ -74690,8 +74692,8 @@ depend yathesis depend yazd-thesis depend yb-book depend york-thesis -containersize 1740 -containerchecksum 83d8ee206831c95143062fa9f286f4248f83e87a9db2899c04dd9897cc88990f913d92cfd21fa6d2539da8a734db9d4aefeb93ca8a09ace5d2e6e2bdda7b3edb +containersize 1744 +containerchecksum 14987a1cad4ae1da14271f1bba11292f47f95fccb39c4fa8a0bb904c0bc643bf1f0463d1d9b50601fbbcb4077dbc436c83bf7cf7b63ab07283b80c640b68846e name collection-texworks category Collection @@ -87227,7 +87229,7 @@ catalogue-version 1.0 name crossrefware category Package -revision 64754 +revision 69700 shortdesc Scripts for working with crossref.org longdesc This bundle contains the following scripts: bibdoiadd.pl: add longdesc DOI numbers to papers in a given bib file, bibzbladd.pl: add @@ -87238,11 +87240,11 @@ longdesc convert urls pointing to doi.org to dois ltx2crossrefxml.pl: a longdesc tool for the creation of XML files for submitting to longdesc crossref.org. The scripts use bibtexperllibs. depend crossrefware.ARCH -containersize 16124 -containerchecksum 7e8836c9c1cec51676a01e3e631cd3a0155f081909415e8ae2a4143b5eb611c5c843a0c700af98dc983ace1f9e3492da5a42bd54e74757ca68da7f106f7eb6b5 -doccontainersize 345376 -doccontainerchecksum 7b7212f8a4b6f75d93ec573f9d7544f09df2e73e0b2a32e2f22866378f0d69e0b035511ee5cbc7eee4114b5540b3783d613aafd7508a41aa336195e49b070a78 -docfiles size=119 +containersize 16368 +containerchecksum 8559fe8e71e27f8417923bd2c7a73a560c29d699ddb77e5b4ac464aecf794fe0cbd02d19abf75f7063994df9ffe6e761f98555a9411e9c5108b38e96db971f1d +doccontainersize 345152 +doccontainerchecksum 41ef79c5487826500fa9465d371c30a8ac513c94cf4852eb1bcbdf08759f5c7384189f91362efba921e9d7f3801a12d1c1968492640dd1c1cf2f1d6001cdb79e +docfiles size=114 texmf-dist/doc/man/man1/bbl2bib.1 texmf-dist/doc/man/man1/bbl2bib.man1.pdf texmf-dist/doc/man/man1/bibdoiadd.1 @@ -105770,7 +105772,7 @@ catalogue-topics notes editorial name easybook category Package -revision 69650 +revision 69707 shortdesc Easily typesetting Chinese theses or books relocated 1 longdesc easybook is a pure academic template created based on the @@ -105781,16 +105783,16 @@ longdesc providing multiple commands and interfaces allows users to longdesc easily customize the thesis template. Its basic macro package longdesc easybase can also be used with CTeX and standard document longdesc classes. -containersize 16488 -containerchecksum 625e880e81c6cb9fd331fb3bfd87692f1d23dd02477f015aae82210bdccc0b4e7d856643c3cbc90865c15e03636e939cf2e71ee7803003694689074813d7f869 -doccontainersize 622548 -doccontainerchecksum 71c9c511cbffd82c9a19ea77d61bd88b941a795c2da942bf65d9f796eeb27a1a27b556788b24fc6e84c4e961d0e6ad363e5be29b18d971cf4eece3bb317da282 +containersize 16496 +containerchecksum 813b72494ec5460ad3f9565a4e72b213fddc0af8957dbcaaa67c5d05916ab3c8f7e2d7e2144a8543a11b926a94a8f993ebbfc16027494f6ee7de39780c2f38f3 +doccontainersize 622480 +doccontainerchecksum 91cb5a5d4f9c362898faa2900d8ff65dc676d566f78ff8a67ab4ef18d9a3d974d9ee1b15f2cc479c6b250d7810c4653f7ea0e577462c53d153c8196bff3ecfad docfiles size=170 RELOC/doc/latex/easybook/README.md details="Readme" RELOC/doc/latex/easybook/easybook.pdf details="Package documentation" language="zh" RELOC/doc/latex/easybook/easybook.tex -srccontainersize 16388 -srccontainerchecksum 7b82ff8de1c18c81a75a58328631d97ede44b3fdd3039a541a69c6f4b9953a43854898c35aea226568a3bf2a5583bae4e7264b134032c5fc7cc0a942dec40708 +srccontainersize 16392 +srccontainerchecksum e492518ae91763f7b7f5bc0dfd5144908caf143355ec709b8cdab8f80a67fec292438bcf1c95d6d8d873c7f18216061bbb2ab24e880559bb8352f460ec3be800 srcfiles size=20 RELOC/source/latex/easybook/easybook.dtx RELOC/source/latex/easybook/easybook.ins @@ -105803,7 +105805,7 @@ catalogue-contact-repository https://gitee.com/texno3/easybook catalogue-ctan /macros/latex/contrib/easybook catalogue-license lppl1.3c catalogue-topics book-pub dissertation class doc-templ chinese expl3 -catalogue-version 2024S +catalogue-version 2024T name easydtx category Package @@ -124095,7 +124097,7 @@ catalogue-version 1.1 name ffcode category Package -revision 69383 +revision 69706 shortdesc Fixed-font code blocks formatted nicely relocated 1 longdesc This LaTeX package helps you write source code in your academic @@ -124109,16 +124111,16 @@ depend pgf depend tcolorbox depend xkeyval containersize 2116 -containerchecksum c71ca2c5aaee2d7c14384fdb9655d08e92aec6b721ef906dc8524bf2833ae7893497ba67840935c97b76ebac9318a3c321af7030573a9a57c384c11dd1862faf -doccontainersize 502300 -doccontainerchecksum 9239c853483203eb42b1069ac1135b360af07161426c77bcf8684626b19aec169af9a2cdfe9caa7cc75ec322b191ad4ddad9b21daeb546dbe5541d66615abb12 +containerchecksum 0047a3b5ae171d3636a80ae583e2413b805546baa662862894dbe6dba92f3e4c20fa1b55d1862dfe968f0b738f2067a4aab294278b1003c864b5c6a8702590eb +doccontainersize 502924 +doccontainerchecksum 72f09440fd91ecf532ada964010fcd364ce30abb200da2285aec45a2bc1d11b97b7b557f19473e26cc4d690e96a9151f3cd8129aaeb28eaa3d3f26ed5d230333 docfiles size=130 RELOC/doc/latex/ffcode/DEPENDS.txt RELOC/doc/latex/ffcode/LICENSE.txt RELOC/doc/latex/ffcode/README.md details="Readme" RELOC/doc/latex/ffcode/ffcode.pdf details="Package documentation" -srccontainersize 4936 -srccontainerchecksum a52bdf256577148636f06a391d35a0a9c59dd73b91f33b43f3f9f0a796f4995140c5563f4644a1f99cd015adbc260b67785a5c50c3af649c45a69495fd8e7af9 +srccontainersize 4976 +srccontainerchecksum eaad3fcdcfbceeda1c991c5961094cd470b384e4c749ebec657c5b575190b35eb28ea7ee88aa113b829f1fffc225a61f38d5c61e28bdbefc133c55565ef03daf srcfiles size=4 RELOC/source/latex/ffcode/ffcode.dtx RELOC/source/latex/ffcode/ffcode.ins @@ -124128,7 +124130,7 @@ catalogue-contact-repository https://github.com/yegor256/ffcode catalogue-ctan /macros/latex/contrib/ffcode catalogue-license mit catalogue-topics listing verbatim line-nos -catalogue-version 0.9.1 +catalogue-version 0.9.2 name ffslides category Package @@ -148941,17 +148943,17 @@ catalogue-version 0.01 name hvqrurl category Package -revision 69677 +revision 69705 shortdesc Insert a QR code in the margin relocated 1 longdesc This package allows to draw an URL as a QR code into the margin longdesc of a one- or twosided document. The following packages are longdesc loaded by default: qrcode, marginnote, url, xcolor and xkeyval. -containersize 1352 -containerchecksum 860a257badbc202ffe08427bcf737495a38d18e37d7679cf832fb37473cb300b26b951a7aa9e4a9f83bc09959d52bcddb898345aae03b83cfeecb2e64a3bced3 -doccontainersize 113960 -doccontainerchecksum ba08cc8fc18d5f78d2d28c98dfb3d4067a80af5138eca0f2677d7b1e6f7ceac24573c2bc48537e9e5475c3d86aeb41f41828f5989c591196941326023112ee6f -docfiles size=32 +containersize 1440 +containerchecksum d6daa2adfdee1e072d2e5228a6a843586d513311562232449aee795208b812c2cbc2d74c53285210b6065089188ca2a425dd702a25933a8793e8242b74a8ae1c +doccontainersize 115988 +doccontainerchecksum cd83a7c7a0f2366bca24eed7ec9a2e7fa5569a19bfe036b632f0af2252b825b16fc4b9c5bc9611c4a5c5ab8eb7314b73439f3897085e222b77a62cb16139e64a +docfiles size=33 RELOC/doc/latex/hvqrurl/Changes RELOC/doc/latex/hvqrurl/README details="Readme" RELOC/doc/latex/hvqrurl/hvqrurl.pdf details="Package documentation" @@ -148961,7 +148963,7 @@ runfiles size=1 catalogue-ctan /macros/latex/contrib/hvqrurl catalogue-license lppl1.3 catalogue-topics qrcode -catalogue-version 0.05a +catalogue-version 0.06 name hwemoji category Package @@ -299852,17 +299854,17 @@ catalogue-version 2.7 name spbmark category Package -revision 69350 +revision 69704 shortdesc Customize superscripts and subscripts relocated 1 longdesc This package provides three commands \super, \sub and \supersub longdesc to improve the layout of superscripts and subscripts which can longdesc be adjusted with respect to relative position and format, and longdesc can be used in text and math mode. -containersize 3420 -containerchecksum 66ad2072225527c3ed64073ba5d33533a429b211794cf6cfb2c2623063629b4ad2869decea96237cda6c678dd35f46c6a63c61ee900a6a03c11e77130f911113 -doccontainersize 88792 -doccontainerchecksum 128962629c38e6dda2752eb003c1039cac0e3ea01ae9ffef3b784d4f28c364fd275c1169dd812293ce5bd68a4c6aee422a23a63e9ac5b3da4ea5388e3ca44bf5 +containersize 3468 +containerchecksum db89af3d2271cca52b9073e555b5a3abcb5ff56162173afccdedfb9496096f7643eca53feafbec6ab575c1f85466b95bb59128a5a5c5804f3fc00f864481ba62 +doccontainersize 89196 +doccontainerchecksum aef680d2df6f2d5263efa9012a9e49b85e6829f7d50ec349ba7f8d86f0dc2d9cfacfe8b1126cb9dcde4a7d9159ce1b12199ed4487ab016b1dea83c1e5a65377b docfiles size=26 RELOC/doc/latex/spbmark/README.md details="Readme" RELOC/doc/latex/spbmark/spbmark.pdf details="Package documentation" @@ -299873,7 +299875,7 @@ catalogue-contact-repository https://github.com/texno3/spbmark catalogue-ctan /macros/latex/contrib/spbmark catalogue-license cc-by-4 catalogue-topics subsup-pos expl3 -catalogue-version 1.43 +catalogue-version 1.45 name spectral category Package @@ -308202,7 +308204,7 @@ catalogue-version 1.1 name tagpdf category Package -revision 69691 +revision 69703 shortdesc Tools for experimenting with tagging using pdfLaTeX and LuaLaTeX relocated 1 longdesc The package offers tools to experiment with tagging and @@ -308213,11 +308215,11 @@ longdesc needed; to test what else is needed so that a pdf works e.g. longdesc with a screen reader. Its goal is to get a feeling for what has longdesc to be done, which kernel changes are needed, how packages longdesc should be adapted. -containersize 36928 -containerchecksum 698aa27002144074c56135d22f41fda3a2315859ee06a3ceed516832be3ee679251ba62f8f827676fd133136bfd3f9f7bf78e68ea89a8221a9d107c968db09f7 -doccontainersize 2169544 -doccontainerchecksum 175a334758fbcd8dccdc434308b95221c2cef649baa2ff65784bb8065b6f9a90c62b3d50a78f62050ffaf06e0f66fe3c4f23cc2cdf4e85fa6e4a7ce4df98471a -docfiles size=845 +containersize 36836 +containerchecksum 4caf8cb5a5e2c03f4ac073abfa273dd23fe5a839a04d982e2f3c462af5aabfaf6646f16f0d3534c6ac82909e3f2fcf958558b27b6ff7c7e569d80602cd0f9528 +doccontainersize 2166424 +doccontainerchecksum 7544b45ebf3a033a5cada52fb83ba521a103f667e17cba9cc12535150174738a0e426babea63bedb3640c831ec7bd74a15cc07f21399e4a01dbbe1702acd4b08 +docfiles size=844 RELOC/doc/latex/tagpdf/README.md details="Readme" RELOC/doc/latex/tagpdf/acrobat.png RELOC/doc/latex/tagpdf/ex-AF-file.pdf @@ -308252,9 +308254,9 @@ docfiles size=845 RELOC/doc/latex/tagpdf/tagpdf.bib RELOC/doc/latex/tagpdf/tagpdf.pdf details="Package documentation" RELOC/doc/latex/tagpdf/tagpdf.tex -srccontainersize 68848 -srccontainerchecksum dd2f0f4b01614841154928323a1fcd09adc6763af87c3e2dda208d6c820cc6c6467c68e0a7e2f159341d86eea6ce887e989d15cfcce318050af24240dd66ff36 -srcfiles size=100 +srccontainersize 68592 +srccontainerchecksum 7e5b32d7c5523ba40e0fb31b31527991696444600f584d22710e0276069876176925dec4728830d853d7833e57e42e36eaf54764d7e3e98d64690406f71087fb +srcfiles size=99 RELOC/source/latex/tagpdf/tagpdf-backend.dtx RELOC/source/latex/tagpdf/tagpdf-checks.dtx RELOC/source/latex/tagpdf/tagpdf-data.dtx @@ -308268,7 +308270,7 @@ srcfiles size=100 RELOC/source/latex/tagpdf/tagpdf-user.dtx RELOC/source/latex/tagpdf/tagpdf.dtx RELOC/source/latex/tagpdf/tagpdf.ins -runfiles size=71 +runfiles size=70 RELOC/tex/latex/tagpdf/tagpdf-base.sty RELOC/tex/latex/tagpdf/tagpdf-debug-generic.sty RELOC/tex/latex/tagpdf/tagpdf-debug-lua.sty @@ -308292,7 +308294,7 @@ catalogue-contact-support https://github.com/latex3/tagpdf/issues catalogue-ctan /macros/latex/contrib/tagpdf catalogue-license lppl1.3c catalogue-topics tagged-pdf accessible expl3 -catalogue-version 0.98u +catalogue-version 0.98v name talk category Package @@ -324359,14 +324361,14 @@ docfiles size=558 name texlive-msg-translations category TLCore -revision 69618 +revision 69696 shortdesc translations of the TeX Live installer and TeX Live Manager longdesc This package contains the translated messages of the TeX Live longdesc installer and TeX Live Manager. For information on creating or longdesc updating translations, see longdesc http://tug.org/texlive/doc.html#install-tl-xlate. -containersize 151648 -containerchecksum 215f88128c89bdcbb837e2892791e519fadbe0dd10bc8095a39776f8fb0caf62aae225e9e7350ceacfae3ade55ccd0f160d6d78ccb5372f78dae96e5ac0ca2aa +containersize 151688 +containerchecksum a1aa5720c1d56dc0602f0a4d535c4fb241a34433f622bf46215e1de231f946ae98c3cc336ce5f2b70d99363e1b919afc41f56a48aaa926c4957199c9a3b98165 runfiles size=377 tlpkg/translations/README tlpkg/translations/cs.po @@ -324428,7 +324430,7 @@ docfiles size=376 name texlive-scripts category TLCore -revision 69683 +revision 69695 shortdesc TeX Live infrastructure programs longdesc Includes install-tl, tl-portable, rungs, etc.; not needed for longdesc tlmgr to run but still ours. Not included in tlcritical. @@ -324436,10 +324438,10 @@ depend texlive-scripts.ARCH depend texlive.infra execute addMap mathpple.map postaction shortcut type=menu name="TeX Live command-line" cmd=TEXDIR/tlpkg/installer/tl-cmd.bat -containersize 114056 -containerchecksum 8fe8ec4037de243cac5dcc8e7c89195e424958a153dacfd397cdc3273d381c5f4540b650d98b826e1d0690c859c05783d99db9a1598f81d8210aaabf63eb33e4 -doccontainersize 431952 -doccontainerchecksum 1916365b63812e5f06ad20dad64058df0d224b6a55b74ed78936092919168920a36a55f05177b3d7110a1588308015c40e2d1c2f5a581e4c956c37711111645f +containersize 114024 +containerchecksum e9c60a1dee034fd6f226e2e7282d9b254f7a96743bbae56794f201bed3dd8632ef502506958097dce345dff68cd703a4afc413bfc8528dd0d36e3f4d499b532d +doccontainersize 432108 +doccontainerchecksum e4a9c32b3a1e8fc3aebc3bdd19dce6add8c94919aabd4b528cc644749e61b8296edc70bc88132f55cf4f8f22eb9c9339d4abf8777870f3294a3e628d263c3f0a docfiles size=563 doc.html texmf-dist/doc/man/man1/fmtutil-sys.1 @@ -333600,17 +333602,17 @@ catalogue-version 1.82c name tkz-euclide category Package -revision 69462 +revision 69702 shortdesc Tools for drawing Euclidean geometry relocated 1 longdesc The tkz-euclide package is a set of files designed to give math longdesc teachers and students easy access to the programming of longdesc Euclidean geometry with TikZ. -containersize 41944 -containerchecksum bdac2d5f2bb723b25612257659444a67efe515990bb1ae6a1901cd1eec40f645c8da55c9fd3652d3b7ef8e60162181db232c7fedf7f094cb31e9e74ea336095e -doccontainersize 1172932 -doccontainerchecksum 23e70d1723b07f7d802e71222611934876db06f238db13f2ac659ab064905060769947a08ea2e0812f2103c4f7a402ed34fc4b2ce51a7b7efe5e4e5327ee1135 -docfiles size=391 +containersize 41960 +containerchecksum ad51786dcfc0bb75edc35b53f753972be5112443901d9e3fb42707c33b08ce2ee16e66443f59b6e6d84767fe48088c1ad0532a7c9fccb70da29888db607f6b68 +doccontainersize 1172812 +doccontainerchecksum 8225a344b3c73e3fe4bf00d36517f3fce40cdac5580b605b3571568c58737d8981db8de1639fc5d5cab4ae881898dffd7799b390d6535dcbdcbd3f9264aebd03 +docfiles size=392 RELOC/doc/latex/tkz-euclide/README.md details="Readme" RELOC/doc/latex/tkz-euclide/TKZdoc-euclide-FAQ.tex RELOC/doc/latex/tkz-euclide/TKZdoc-euclide-angles.tex @@ -333696,7 +333698,7 @@ catalogue-contact-home https://altermundus.fr catalogue-ctan /macros/latex/contrib/tkz/tkz-euclide catalogue-license lppl1.3 catalogue-topics maths graphics-use use-luatex pgf-tikz -catalogue-version 5.05c +catalogue-version 5.06c name tkz-fct category Package @@ -344995,6 +344997,34 @@ catalogue-license lppl1.3 catalogue-topics dissertation catalogue-version 3.2 +name udepcolor +category Package +revision 69701 +shortdesc University of Piura (UDEP) institutional and corporate colors for digital and electronic media +relocated 1 +longdesc This package defines University of Piura (UDEP) institutional +longdesc and corporate colors for digital and electronic media according +longdesc to brand and style guidelines published by UDEP DIRCOM. The +longdesc colors have been selected and implemented using the xcolor +longdesc package and following the brand and visual identity guidelines +longdesc of the University of Piura. +containersize 1172 +containerchecksum 010172b3730b31b12a6f9e425203f9064b7c880e5abcfa0ed538ffaedf3517dd394030d55501b48c1582036bb78153d7d4f581cd2c396d658db58faaa00c0cef +doccontainersize 54692 +doccontainerchecksum 33e7057cdbcb2ee342d061194d5b0e36a1e3e7fd48c7e1d728b6b8b4a2b6fe1c4b0a4a9185b4cfa3a483cd084f93ac905a98f7140bdc0a8e4f37395bf9a55ffc +docfiles size=25 + RELOC/doc/latex/udepcolor/README.md details="Readme" + RELOC/doc/latex/udepcolor/udepcolor-doc-EN.pdf details="Package documentation (English)" + RELOC/doc/latex/udepcolor/udepcolor-doc-EN.tex + RELOC/doc/latex/udepcolor/udepcolor-doc-ES.pdf details="Package documentation (Spanish)" language="es-pe" + RELOC/doc/latex/udepcolor/udepcolor-doc-ES.tex +runfiles size=1 + RELOC/tex/latex/udepcolor/udepcolor.sty +catalogue-ctan /macros/latex/contrib/udepcolor +catalogue-license lppl1.3c +catalogue-topics colour +catalogue-version 1.0 + name udes-genie-these category Package revision 68141 diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 index b41599d9ec..3afb55edb8 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 @@ -1 +1 @@ -c9426edec84c28be5d5ba1dd855b7f01 texlive.tlpdb +9bcef613e91fa182f904475f7d68d616 texlive.tlpdb diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 index 2280d41fea..987487eef3 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 @@ -1 +1 @@ -e34bbbb672fc705acf683afc7e6901acd514def5f2b49a6562eb1798c7d894d12e5abb256113a8c1cee9fe8f89e8828b522c4c35b5c3f2018befb975ba7b38a7 texlive.tlpdb +80bc43402bf1f6072037004b9bf78b45dd431824cca805edc5c7082b962bf5be1315f6fdd106c9ab88efd4d44495fba39f864b05ad232db50d6383d4081efa0d texlive.tlpdb diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc index 3fa0d09ff0..f416176ecc 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc @@ -1,11 +1,11 @@ -----BEGIN PGP SIGNATURE----- -iQEzBAEBCgAdFiEE2PL4YFeoV+QqiBBqTOGHfhlDjHAFAmW+3wkACgkQTOGHfhlD -jHDmnwgAkQQ3jPANVfmbz/G4PvmsYBil/OBtgnU1xmRG70DXrbhT8tacxR40zOP0 -rssYOgFivlHZDXERKkFNPTzTCRKdd5J4SVT/7JsfvC45q1l61AR7jQ2qjrg/g9UD -pJvmmTIqGG92JQJu2grQgaBeoeXeK8/RWNbQs7ss44CTlSMp98SBguHZn0Pxddq6 -8sIXkvywJTa79w5DVwWo/+QnOAhun9frTUybkKyEqreOSTtURj10XiJTD8sslZ8c -1oTOQLC/Uc91Zh5y+OiGrrxs8AtY9P09/kXGzcticNmyZCRUMKV/DpGRzJsLYuMk -Te9n/1gc5q3qbCmKNecEQFwVtX+pyQ== -=2doP +iQEzBAEBCgAdFiEE2PL4YFeoV+QqiBBqTOGHfhlDjHAFAmXAL6MACgkQTOGHfhlD +jHD/iwf/SpGg1hvI0KAjCjh9dVpz9YBJUEXwL4yqpjjE/gM/leWhxb+rSy79Bj/W +JkF3+igBw8s0Nj0nsldR7GuAcwRAGp9sIxgDyhJcwEONxT/D7d4gUCuZ8IMkjv8l +7GdLBf5fkDtUVOytMUp18/atEub//+Y9GEsQbC5mNvUqJJLr+Oun6kThWlDFXZ6U +iPxhRlW8Ch8l8NH+5zqnS0lCeh7ZyLy3RnvhLzM8x15mcSJV/DitfhbX936sdWmd +rWp2U4YDM2AXQzHFHLt7lYSvSeWB7y8epwgd881B6jd8yw8V6cA+yDboKCaNSO3R +Ii7Ta3JbIqwbn1gVS43StJzlLTgYgA== +=Tg/z -----END PGP SIGNATURE----- diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz index 133238a87f..8ac4031768 100644 Binary files a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz and b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz differ diff --git a/systems/texlive/tlnet/tlpkg/translations/ja.po b/systems/texlive/tlnet/tlpkg/translations/ja.po index 5513ed8809..ecbecd7e2a 100644 --- a/systems/texlive/tlnet/tlpkg/translations/ja.po +++ b/systems/texlive/tlnet/tlpkg/translations/ja.po @@ -1,13 +1,13 @@ -# Copyright 2010-2023 TeX Live Team +# Copyright 2010-2024 TeX Live Team # This file is distributed under the same license as the TeX Live package. # Koji Yokota , 2010, 2011, 2012, 2014, 2015. -# Takuto Asakura , 2019-2023. +# Takuto Asakura , 2019-2024. msgid "" msgstr "" "Project-Id-Version: TeX Live translation\n" "Report-Msgid-Bugs-To: tex-live@tug.org\n" "POT-Creation-Date: 2024-01-28 01:50+0100\n" -"PO-Revision-Date: 2023-08-30 23:15+0900\n" +"PO-Revision-Date: 2024-02-04 15:32+0900\n" "Last-Translator: Takuto Asakura \n" "Language-Team: TL Translation Team \n" "Language: ja\n" @@ -1958,7 +1958,7 @@ msgstr "TeX Liveへようこそ!" #: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2867 #, perl-format msgid "See %s/index.html for links to documentation.\n" -msgstr "" +msgstr "ドキュメントの一覧は%s/index.htmlをご覧ください。\n" #: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2869 msgid "" @@ -1968,6 +1968,11 @@ msgid "" "best for you. The list of groups is available on the web\n" "at https://tug.org/usergroups.html.\n" msgstr "" +"TeX Liveのウェブサイト(https://tug.org/texlive/)にはすべてのアップデートと" +"コレクションの情報が掲載されています。TeX Liveは全世界のTeXユーザ会有志による" +"合同プロジェクトです。TeX Liveプロジェクトをサポートしていただける場合お好き" +"なTeXユーザ会に入会することをご検討ください。TeXユーザ会の一覧はhttps://tug." +"org/usergroups.htmlでご確認いただけます。\n" #: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2877 #, perl-format @@ -1977,29 +1982,7 @@ msgid "" "Most importantly, add %s/bin/%s\n" "to your PATH for current and future sessions.\n" msgstr "" - -#~ msgid "" -#~ "See %s/index.html for links to documentation.\n" -#~ "The TeX Live web site (https://tug.org/texlive/) contains any updates and " -#~ "corrections. TeX Live is a joint project of the TeX user groups around " -#~ "the world; please consider supporting it by joining the group best for " -#~ "you. The list of groups is available on the web at https://tug.org/" -#~ "usergroups.html." -#~ msgstr "" -#~ "ドキュメントの一覧は%s/index.htmlをご覧ください。TeX Liveのウェブサイト" -#~ "(https://tug.org/texlive/)にはすべてのアップデートとコレクションの情報が" -#~ "掲載されています。TeX Liveは全世界のTeXユーザ会有志による合同プロジェクト" -#~ "です。TeX Liveプロジェクトをサポートしていただける場合お好きなTeXユーザ会" -#~ "に入会することをご検討ください。TeXユーザ会の一覧はhttps://tug.org/" -#~ "usergroups.htmlでご確認いただけます。" - -#~ msgid "" -#~ "Add %s/texmf-dist/doc/man to MANPATH.\n" -#~ "Add %s/texmf-dist/doc/info to INFOPATH.\n" -#~ "Most importantly, add %s/bin/%s\n" -#~ "to your PATH for current and future sessions." -#~ msgstr "" -#~ "%s/texmf-dist/doc/manをMANPATHに追加してください。\n" -#~ "%s/texmf-dist/doc/infoをINFOPATHに追加してください。\n" -#~ "最重要:TeX Liveに含まれるバイナリを利用可能にするため\n" -#~ "%s/bin/%sをPATHに追加してください。" +"%s/texmf-dist/doc/manをMANPATHに追加してください。\n" +"%s/texmf-dist/doc/infoをINFOPATHに追加してください。\n" +"最重要:TeX Liveに含まれるバイナリを利用可能にするため\n" +"%s/bin/%sをPATHに追加してください。\n" diff --git a/timestamp b/timestamp index da09e8bfaf..9b79e9057e 100644 --- a/timestamp +++ b/timestamp @@ -2,4 +2,4 @@ # The source CTAN of this site's material: dante.ctan.org # The year-month-day-hour-minute of this site's material: -2024-02-05-02-02 +2024-02-06-02-02 -- cgit v1.2.3