diff options
29 files changed, 1087 insertions, 902 deletions
diff --git a/FILES.byname b/FILES.byname index 75ec31883b..77dbd52e5d 100644 --- a/FILES.byname +++ b/FILES.byname @@ -2056,12 +2056,12 @@ 2023/04/13 | 1675 | biblio/citation-style-language/README.md 2023/04/13 | 11957 | biblio/citation-style-language/vancouver.csl 2023/04/13 | 4516625 | biblio/citation-style-language.zip -2023/05/27 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx +2023/05/28 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx 2022/10/08 | 127 | biblio/ctan-bibdata/biblatex-ctan/ctan.cbx -2023/05/27 | 2786802 | biblio/ctan-bibdata/ctan.bib -2023/05/27 | 3677092 | biblio/ctan-bibdata/ctan.pdf +2023/05/28 | 2786803 | biblio/ctan-bibdata/ctan.bib +2023/05/28 | 3677982 | biblio/ctan-bibdata/ctan.pdf 2023/01/16 | 1489 | biblio/ctan-bibdata/README -2023/05/27 | 4076732 | biblio/ctan-bibdata.zip +2023/05/28 | 4076790 | 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 @@ -5417,7 +5417,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 -2023/05/27 | 153315 | FILES.last07days +2023/05/28 | 75671 | 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 @@ -156440,19 +156440,19 @@ 2011/05/31 | 231925 | graphics/mathspic/perl/sourcecode113.html 2011/05/31 | 183530 | graphics/mathspic/perl/sourcecode113.nw 2011/05/31 | 2864043 | graphics/mathspic/perl/sourcecode113.pdf -2023/05/15 | 20046 | graphics/mcf2graph/CHANGELOG -2023/05/15 | 105744 | graphics/mcf2graph/main_lib.mcf -2023/05/15 | 98582 | graphics/mcf2graph/mcf2graph.mp -2023/05/15 | 533462 | graphics/mcf2graph/mcf_example.pdf -2023/05/15 | 4814 | graphics/mcf2graph/mcf_example.tex -2023/05/15 | 1555 | graphics/mcf2graph/mcf_exa_soc.mp -2023/05/15 | 315122 | graphics/mcf2graph/mcf_manual.pdf -2023/05/15 | 99598 | graphics/mcf2graph/mcf_manual.tex +2023/05/28 | 20235 | graphics/mcf2graph/CHANGELOG +2023/05/28 | 105744 | graphics/mcf2graph/main_lib.mcf +2023/05/28 | 98780 | graphics/mcf2graph/mcf2graph.mp +2023/05/28 | 533160 | graphics/mcf2graph/mcf_example.pdf +2023/05/28 | 4820 | graphics/mcf2graph/mcf_example.tex +2023/05/27 | 1538 | graphics/mcf2graph/mcf_exa_soc.mp +2023/05/28 | 317381 | graphics/mcf2graph/mcf_manual.pdf +2023/05/28 | 98236 | graphics/mcf2graph/mcf_manual.tex 2023/05/07 | 824 | graphics/mcf2graph/mcf_to_graph.cmd -2023/05/15 | 3345 | graphics/mcf2graph/README -2023/05/15 | 3266 | graphics/mcf2graph/template_lib.mcf -2023/05/15 | 1196 | graphics/mcf2graph/template_soc.mp -2023/05/15 | 892401 | graphics/mcf2graph.zip +2023/05/27 | 3345 | graphics/mcf2graph/README +2023/05/14 | 3266 | graphics/mcf2graph/template_lib.mcf +2023/05/27 | 1179 | graphics/mcf2graph/template_soc.mp +2023/05/28 | 894898 | graphics/mcf2graph.zip 2004/07/13 | 8567 | graphics/metaplot/axes.mp 2004/06/28 | 1122 | graphics/metaplot/examples/cap1.cc 2004/06/28 | 2178 | graphics/metaplot/examples/cap1.mp @@ -160466,11 +160466,11 @@ 2015/02/15 | 21064 | graphics/pgf/contrib/ticollege/latex/ticollege.sty 2015/02/15 | 683 | graphics/pgf/contrib/ticollege/README 2015/02/17 | 374200 | graphics/pgf/contrib/ticollege.zip -2023/05/24 | 446784 | graphics/pgf/contrib/tikz2d-fr/doc/tikz2d-fr-doc.pdf -2023/05/24 | 16885 | graphics/pgf/contrib/tikz2d-fr/doc/tikz2d-fr-doc.tex +2023/05/27 | 590558 | graphics/pgf/contrib/tikz2d-fr/doc/tikz2d-fr-doc.pdf +2023/05/27 | 23254 | graphics/pgf/contrib/tikz2d-fr/doc/tikz2d-fr-doc.tex 2023/05/23 | 439 | graphics/pgf/contrib/tikz2d-fr/README.md -2023/05/24 | 6189 | graphics/pgf/contrib/tikz2d-fr/tex/tikz2d-fr.sty -2023/05/24 | 439355 | graphics/pgf/contrib/tikz2d-fr.zip +2023/05/27 | 8167 | graphics/pgf/contrib/tikz2d-fr/tex/tikz2d-fr.sty +2023/05/28 | 579952 | graphics/pgf/contrib/tikz2d-fr.zip 2023/05/24 | 604526 | graphics/pgf/contrib/tikz3d-fr/doc/tikz3d-fr-doc.pdf 2023/05/24 | 25862 | graphics/pgf/contrib/tikz3d-fr/doc/tikz3d-fr-doc.tex 2023/05/02 | 400 | graphics/pgf/contrib/tikz3d-fr/README.md @@ -202085,7 +202085,7 @@ 2013/04/01 | 14776 | macros/context/contrib/context-visualcounter/tex/context/third/visualcounter/t-visualcounter.mkvi 2018/03/05 | 11 | macros/context/contrib/context-visualcounter/VERSION 2018/03/22 | 276789 | macros/context/contrib/context-visualcounter.zip -2023/05/08 | 114676290 | macros/context/latest/cont-tmf.zip +2023/05/27 | 115290564 | macros/context/latest/cont-tmf.zip 2016/04/21 | 32846 | macros/cstex/base/cmexb.tar.gz 2016/06/26 | 1728262 | macros/cstex/base/csfonts-t1.tar.gz 2007/03/01 | 187106 | macros/cstex/base/csfonts.tar.gz @@ -233687,22 +233687,22 @@ 2023/01/02 | 9215 | macros/latex/contrib/proflycee/doc/graphics/pl-solve_b.png 2023/01/02 | 10175 | macros/latex/contrib/proflycee/doc/graphics/pl-solve_c.png 2023/01/02 | 10145 | macros/latex/contrib/proflycee/doc/graphics/pl-solve_d.png -2023/05/20 | 1032138 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf -2023/05/20 | 279860 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex +2023/05/28 | 1026834 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf +2023/05/28 | 280040 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex 2023/04/15 | 61451 | macros/latex/contrib/proflycee/doc/ProfLycee-exemples-pyluatex.pdf 2023/04/15 | 6656 | macros/latex/contrib/proflycee/doc/ProfLycee-exemples-pyluatex.tex 2023/04/15 | 44184 | macros/latex/contrib/proflycee/doc/ProfLycee-exemples-pythontex.pdf 2023/04/15 | 5409 | macros/latex/contrib/proflycee/doc/ProfLycee-exemples-pythontex.tex 2022/11/06 | 712614 | macros/latex/contrib/proflycee/doc/ProfLycee-old-doc.pdf 2022/11/06 | 192682 | macros/latex/contrib/proflycee/doc/ProfLycee-old-doc.tex -2023/05/20 | 529 | macros/latex/contrib/proflycee/doc/testscript.py +2023/05/28 | 529 | macros/latex/contrib/proflycee/doc/testscript.py 2022/08/10 | 439 | macros/latex/contrib/proflycee/README.md 2022/11/06 | 112967 | macros/latex/contrib/proflycee/tex/ProfLycee-old.sty -2023/05/20 | 6532 | macros/latex/contrib/proflycee/tex/ProfLycee.sty +2023/05/28 | 6540 | macros/latex/contrib/proflycee/tex/ProfLycee.sty 2023/05/18 | 4196 | macros/latex/contrib/proflycee/tex/proflycee-tools-aleatoire.tex 2023/05/14 | 22505 | macros/latex/contrib/proflycee/tex/proflycee-tools-analyse.tex 2023/05/20 | 17988 | macros/latex/contrib/proflycee/tex/proflycee-tools-arithm.tex -2023/05/20 | 25688 | macros/latex/contrib/proflycee/tex/proflycee-tools-geom.tex +2023/05/23 | 25515 | macros/latex/contrib/proflycee/tex/proflycee-tools-geom.tex 2023/04/23 | 15637 | macros/latex/contrib/proflycee/tex/proflycee-tools-graphiques.tex 2023/04/19 | 15705 | macros/latex/contrib/proflycee/tex/proflycee-tools-listings.tex 2023/04/19 | 3142 | macros/latex/contrib/proflycee/tex/proflycee-tools-minted.tex @@ -233713,7 +233713,7 @@ 2023/04/13 | 6616 | macros/latex/contrib/proflycee/tex/proflycee-tools-stats.tex 2023/04/13 | 6608 | macros/latex/contrib/proflycee/tex/proflycee-tools-suites.tex 2023/05/03 | 42723 | macros/latex/contrib/proflycee/tex/proflycee-tools-trigo.tex -2023/05/21 | 2114486 | macros/latex/contrib/proflycee.zip +2023/05/28 | 2109186 | macros/latex/contrib/proflycee.zip 1996/02/05 | 1760 | macros/latex/contrib/progkeys/demo/demo.tex 1996/02/05 | 459 | macros/latex/contrib/progkeys/demo/prog1.tex 1996/02/05 | 347 | macros/latex/contrib/progkeys/demo/prog2.tex @@ -293565,9 +293565,9 @@ 2022/01/24 | 461568 | systems/texlive/tlnet/archive/fdsymbol.doc.r61719.tar.xz 2022/01/24 | 920200 | systems/texlive/tlnet/archive/fdsymbol.r61719.tar.xz 2022/01/24 | 17720 | systems/texlive/tlnet/archive/fdsymbol.source.r61719.tar.xz -2023/02/27 | 1461628 | systems/texlive/tlnet/archive/fduthesis.doc.r66188.tar.xz -2023/02/27 | 108076 | systems/texlive/tlnet/archive/fduthesis.r66188.tar.xz -2023/02/27 | 116436 | systems/texlive/tlnet/archive/fduthesis.source.r66188.tar.xz +2023/05/28 | 1457052 | systems/texlive/tlnet/archive/fduthesis.doc.r67231.tar.xz +2023/05/28 | 108308 | systems/texlive/tlnet/archive/fduthesis.r67231.tar.xz +2023/05/28 | 116676 | systems/texlive/tlnet/archive/fduthesis.source.r67231.tar.xz 2019/02/28 | 17968016 | systems/texlive/tlnet/archive/featpost.doc.r35346.tar.xz 2019/02/28 | 31996 | systems/texlive/tlnet/archive/featpost.r35346.tar.xz 2022/12/25 | 441996 | systems/texlive/tlnet/archive/fei.doc.r65352.tar.xz @@ -293905,9 +293905,9 @@ 2019/02/28 | 196308 | systems/texlive/tlnet/archive/footbib.doc.r17115.tar.xz 2019/02/28 | 6692 | systems/texlive/tlnet/archive/footbib.r17115.tar.xz 2019/02/28 | 22456 | systems/texlive/tlnet/archive/footbib.source.r17115.tar.xz -2022/03/09 | 511244 | systems/texlive/tlnet/archive/footmisc.doc.r62524.tar.xz -2022/03/09 | 7672 | systems/texlive/tlnet/archive/footmisc.r62524.tar.xz -2022/03/09 | 22216 | systems/texlive/tlnet/archive/footmisc.source.r62524.tar.xz +2023/05/28 | 513832 | systems/texlive/tlnet/archive/footmisc.doc.r67232.tar.xz +2023/05/28 | 7676 | systems/texlive/tlnet/archive/footmisc.r67232.tar.xz +2023/05/28 | 22300 | systems/texlive/tlnet/archive/footmisc.source.r67232.tar.xz 2019/02/28 | 396 | systems/texlive/tlnet/archive/footmisx.doc.r42621.tar.xz 2019/02/28 | 6048 | systems/texlive/tlnet/archive/footmisx.r42621.tar.xz 2019/02/28 | 19832 | systems/texlive/tlnet/archive/footmisx.source.r42621.tar.xz @@ -294793,9 +294793,9 @@ 2019/02/28 | 186676 | systems/texlive/tlnet/archive/hypernat.doc.r17358.tar.xz 2019/02/28 | 1916 | systems/texlive/tlnet/archive/hypernat.r17358.tar.xz 2019/02/28 | 15680 | systems/texlive/tlnet/archive/hyper.r17357.tar.xz -2023/04/23 | 3684012 | systems/texlive/tlnet/archive/hyperref.doc.r66916.tar.xz -2023/04/23 | 90888 | systems/texlive/tlnet/archive/hyperref.r66916.tar.xz -2023/04/23 | 414980 | systems/texlive/tlnet/archive/hyperref.source.r66916.tar.xz +2023/05/28 | 3672932 | systems/texlive/tlnet/archive/hyperref.doc.r67233.tar.xz +2023/05/28 | 90480 | systems/texlive/tlnet/archive/hyperref.r67233.tar.xz +2023/05/28 | 413936 | systems/texlive/tlnet/archive/hyperref.source.r67233.tar.xz 2019/02/28 | 32960 | systems/texlive/tlnet/archive/hyper.source.r17357.tar.xz 2020/11/23 | 356 | systems/texlive/tlnet/archive/hyperxmp.aarch64-linux.r56984.tar.xz 2020/11/23 | 356 | systems/texlive/tlnet/archive/hyperxmp.amd64-freebsd.r56984.tar.xz @@ -295421,8 +295421,8 @@ 2023/02/18 | 40136 | systems/texlive/tlnet/archive/kpathsea.x86_64-linux.r65877.tar.xz 2023/02/18 | 44616 | systems/texlive/tlnet/archive/kpathsea.x86_64-solaris.r65877.tar.xz 2023/01/20 | 1622220 | systems/texlive/tlnet/archive/kpfonts.doc.r65583.tar.xz -2023/05/17 | 2100404 | systems/texlive/tlnet/archive/kpfonts-otf.doc.r67132.tar.xz -2023/05/17 | 1097192 | systems/texlive/tlnet/archive/kpfonts-otf.r67132.tar.xz +2023/05/28 | 2100296 | systems/texlive/tlnet/archive/kpfonts-otf.doc.r67230.tar.xz +2023/05/28 | 1096636 | systems/texlive/tlnet/archive/kpfonts-otf.r67230.tar.xz 2023/01/20 | 2246256 | systems/texlive/tlnet/archive/kpfonts.r65583.tar.xz 2019/02/28 | 3968 | systems/texlive/tlnet/archive/ksfh_nat.r24825.tar.xz 2019/02/28 | 146928 | systems/texlive/tlnet/archive/ksp-thesis.doc.r39080.tar.xz @@ -297501,9 +297501,9 @@ 2019/02/28 | 438652 | systems/texlive/tlnet/archive/nag.doc.r24741.tar.xz 2019/02/28 | 7800 | systems/texlive/tlnet/archive/nag.r24741.tar.xz 2019/02/28 | 17648 | systems/texlive/tlnet/archive/nag.source.r24741.tar.xz -2023/02/22 | 557808 | systems/texlive/tlnet/archive/naive-ebnf.doc.r66017.tar.xz -2023/02/22 | 2148 | systems/texlive/tlnet/archive/naive-ebnf.r66017.tar.xz -2023/02/22 | 4840 | systems/texlive/tlnet/archive/naive-ebnf.source.r66017.tar.xz +2023/05/28 | 560724 | systems/texlive/tlnet/archive/naive-ebnf.doc.r67234.tar.xz +2023/05/28 | 2172 | systems/texlive/tlnet/archive/naive-ebnf.r67234.tar.xz +2023/05/28 | 4928 | systems/texlive/tlnet/archive/naive-ebnf.source.r67234.tar.xz 2023/02/06 | 1431708 | systems/texlive/tlnet/archive/nameauth.doc.r65738.tar.xz 2023/02/06 | 7044 | systems/texlive/tlnet/archive/nameauth.r65738.tar.xz 2023/02/06 | 116900 | systems/texlive/tlnet/archive/nameauth.source.r65738.tar.xz @@ -300965,7 +300965,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 -2023/05/27 | 426884 | systems/texlive/tlnet/archive/texlive-scripts.doc.r67221.tar.xz +2023/05/28 | 427004 | systems/texlive/tlnet/archive/texlive-scripts.doc.r67229.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 @@ -300987,7 +300987,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 -2023/05/27 | 114036 | systems/texlive/tlnet/archive/texlive-scripts.r67221.tar.xz +2023/05/28 | 114068 | systems/texlive/tlnet/archive/texlive-scripts.r67229.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 @@ -302849,16 +302849,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 2023/03/12 | 125532 | systems/texlive/tlnet/install-tl -2023/05/27 | 5736106 | systems/texlive/tlnet/install-tl-unx.tar.gz -2023/05/27 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 -2023/05/27 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc +2023/05/28 | 5735757 | systems/texlive/tlnet/install-tl-unx.tar.gz +2023/05/28 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2023/05/28 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc 2023/05/13 | 5083 | systems/texlive/tlnet/install-tl-windows.bat -2023/05/27 | 21037524 | systems/texlive/tlnet/install-tl-windows.exe -2023/05/27 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 -2023/05/27 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc -2023/05/27 | 26025692 | systems/texlive/tlnet/install-tl.zip -2023/05/27 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 -2023/05/27 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc +2023/05/28 | 21036056 | systems/texlive/tlnet/install-tl-windows.exe +2023/05/28 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 +2023/05/28 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc +2023/05/28 | 26025726 | systems/texlive/tlnet/install-tl.zip +2023/05/28 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 +2023/05/28 | 488 | 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 2023/01/17 | 8401 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg @@ -302868,7 +302868,7 @@ 2023/01/17 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg 2023/01/17 | 49938 | systems/texlive/tlnet/tlpkg/installer/config.guess 2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt -2023/05/26 | 7296 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl +2023/05/27 | 7445 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl 2023/01/11 | 216583 | 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 @@ -302910,12 +302910,12 @@ 2023/02/21 | 20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm 2021/12/21 | 5429 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm 2023/04/08 | 28167 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm -2023/05/27 | 18112766 | systems/texlive/tlnet/tlpkg/texlive.tlpdb -2023/05/27 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2023/05/28 | 18112720 | systems/texlive/tlnet/tlpkg/texlive.tlpdb +2023/05/28 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 2023/02/20 | 86803 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm -2023/05/27 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 -2023/05/27 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc -2023/05/27 | 2450388 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +2023/05/28 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +2023/05/28 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +2023/05/28 | 2451100 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz 2023/02/20 | 58928 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm 2023/02/26 | 42350 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm 2023/02/21 | 16138 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm @@ -313428,7 +313428,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 -2023/05/28 | 186 | timestamp +2023/05/29 | 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 Binary files differindex 71a716112f..6bc9c0d63d 100644 --- a/FILES.byname.gz +++ b/FILES.byname.gz diff --git a/FILES.last07days b/FILES.last07days index 4dc0e4c536..4cc591a8fd 100644 --- a/FILES.last07days +++ b/FILES.last07days @@ -1,9 +1,59 @@ +2023/05/28 | 98780 | graphics/mcf2graph/mcf2graph.mp +2023/05/28 | 98236 | graphics/mcf2graph/mcf_manual.tex +2023/05/28 | 90480 | systems/texlive/tlnet/archive/hyperref.r67233.tar.xz +2023/05/28 | 894898 | graphics/mcf2graph.zip +2023/05/28 | 7676 | systems/texlive/tlnet/archive/footmisc.r67232.tar.xz +2023/05/28 | 6540 | macros/latex/contrib/proflycee/tex/ProfLycee.sty +2023/05/28 | 579952 | graphics/pgf/contrib/tikz2d-fr.zip +2023/05/28 | 5735757 | systems/texlive/tlnet/install-tl-unx.tar.gz +2023/05/28 | 560724 | systems/texlive/tlnet/archive/naive-ebnf.doc.r67234.tar.xz +2023/05/28 | 533160 | graphics/mcf2graph/mcf_example.pdf +2023/05/28 | 529 | macros/latex/contrib/proflycee/doc/testscript.py +2023/05/28 | 513832 | systems/texlive/tlnet/archive/footmisc.doc.r67232.tar.xz +2023/05/28 | 4928 | systems/texlive/tlnet/archive/naive-ebnf.source.r67234.tar.xz +2023/05/28 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2023/05/28 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +2023/05/28 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc +2023/05/28 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc +2023/05/28 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc +2023/05/28 | 4820 | graphics/mcf2graph/mcf_example.tex +2023/05/28 | 427004 | systems/texlive/tlnet/archive/texlive-scripts.doc.r67229.tar.xz +2023/05/28 | 413936 | systems/texlive/tlnet/archive/hyperref.source.r67233.tar.xz +2023/05/28 | 4076790 | biblio/ctan-bibdata.zip +2023/05/28 | 3677982 | biblio/ctan-bibdata/ctan.pdf +2023/05/28 | 3672932 | systems/texlive/tlnet/archive/hyperref.doc.r67233.tar.xz +2023/05/28 | 317381 | graphics/mcf2graph/mcf_manual.pdf +2023/05/28 | 280040 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex +2023/05/28 | 2786803 | biblio/ctan-bibdata/ctan.bib +2023/05/28 | 26025726 | systems/texlive/tlnet/install-tl.zip +2023/05/28 | 2451100 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +2023/05/28 | 22300 | systems/texlive/tlnet/archive/footmisc.source.r67232.tar.xz +2023/05/28 | 2172 | systems/texlive/tlnet/archive/naive-ebnf.r67234.tar.xz +2023/05/28 | 2109186 | macros/latex/contrib/proflycee.zip +2023/05/28 | 21036056 | systems/texlive/tlnet/install-tl-windows.exe +2023/05/28 | 2100296 | systems/texlive/tlnet/archive/kpfonts-otf.doc.r67230.tar.xz +2023/05/28 | 20235 | graphics/mcf2graph/CHANGELOG +2023/05/28 | 18112720 | systems/texlive/tlnet/tlpkg/texlive.tlpdb +2023/05/28 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx +2023/05/28 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 +2023/05/28 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2023/05/28 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 +2023/05/28 | 1457052 | systems/texlive/tlnet/archive/fduthesis.doc.r67231.tar.xz +2023/05/28 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +2023/05/28 | 116676 | systems/texlive/tlnet/archive/fduthesis.source.r67231.tar.xz +2023/05/28 | 114068 | systems/texlive/tlnet/archive/texlive-scripts.r67229.tar.xz +2023/05/28 | 1096636 | systems/texlive/tlnet/archive/kpfonts-otf.r67230.tar.xz +2023/05/28 | 108308 | systems/texlive/tlnet/archive/fduthesis.r67231.tar.xz +2023/05/28 | 105744 | graphics/mcf2graph/main_lib.mcf +2023/05/28 | 1026834 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf 2023/05/27 | 9952 | macros/latex/contrib/fduthesis/fudan-name.pdf 2023/05/27 | 977509 | macros/latex/contrib/fduthesis/fduthesis-code.pdf 2023/05/27 | 9262 | fonts/kpfonts-otf/README.md 2023/05/27 | 9096 | systems/texlive/tlnet/archive/covington.r67226.tar.xz 2023/05/27 | 88356 | systems/texlive/tlnet/archive/latex-lab-dev.source.r67224.tar.xz +2023/05/27 | 8167 | graphics/pgf/contrib/tikz2d-fr/tex/tikz2d-fr.sty 2023/05/27 | 7960 | systems/texlive/tlnet/archive/latex-firstaid-dev.source.r67225.tar.xz +2023/05/27 | 7445 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl 2023/05/27 | 66492 | fonts/kpfonts-otf/fonts/KpMono-Italic.otf 2023/05/27 | 65188 | fonts/kpfonts-otf/fonts/KpMono-BoldItalic.otf 2023/05/27 | 6393916 | systems/texlive/tlnet/archive/latex-lab-dev.doc.r67224.tar.xz @@ -12,44 +62,34 @@ 2023/05/27 | 591999 | macros/latex/contrib/naive-ebnf/naive-ebnf.pdf 2023/05/27 | 591863 | macros/latex/contrib/naive-ebnf.zip 2023/05/27 | 59108 | fonts/kpfonts-otf/fonts/KpMono-Regular.otf +2023/05/27 | 590558 | graphics/pgf/contrib/tikz2d-fr/doc/tikz2d-fr-doc.pdf 2023/05/27 | 57976 | fonts/kpfonts-otf/fonts/KpMono-Bold.otf -2023/05/27 | 5736106 | systems/texlive/tlnet/install-tl-unx.tar.gz 2023/05/27 | 536436 | systems/texlive/tlnet/archive/msu-thesis.doc.r67227.tar.xz 2023/05/27 | 535424 | systems/texlive/tlnet/archive/covington.doc.r67226.tar.xz -2023/05/27 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 -2023/05/27 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc -2023/05/27 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc -2023/05/27 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc -2023/05/27 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc 2023/05/27 | 480 | fonts/kpfonts-otf/tex/KpLight.fontspec 2023/05/27 | 469 | fonts/kpfonts-otf/tex/KpRoman.fontspec 2023/05/27 | 467916 | fonts/kpfonts-otf/fonts/KpMath-Light.otf 2023/05/27 | 4468083 | fonts/kpfonts-otf.zip 2023/05/27 | 444802 | macros/latex/contrib/fduthesis/fduthesis.pdf 2023/05/27 | 441588 | fonts/kpfonts-otf/fonts/KpMath-Regular.otf -2023/05/27 | 426884 | systems/texlive/tlnet/archive/texlive-scripts.doc.r67221.tar.xz -2023/05/27 | 4076732 | biblio/ctan-bibdata.zip -2023/05/27 | 3677092 | biblio/ctan-bibdata/ctan.pdf 2023/05/27 | 35658 | fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-French.ltx 2023/05/27 | 33536 | systems/texlive/tlnet/archive/latex-lab-dev.r67224.tar.xz +2023/05/27 | 3345 | graphics/mcf2graph/README 2023/05/27 | 33290 | fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-English.ltx 2023/05/27 | 3116 | systems/texlive/tlnet/archive/latex-firstaid-dev.r67225.tar.xz 2023/05/27 | 288272 | fonts/kpfonts-otf/fonts/KpMath-Sans.otf -2023/05/27 | 2786802 | biblio/ctan-bibdata/ctan.bib 2023/05/27 | 2765196 | systems/texlive/tlnet/archive/simpleicons.r67223.tar.xz 2023/05/27 | 263200 | systems/texlive/tlnet/archive/latex-firstaid-dev.doc.r67225.tar.xz 2023/05/27 | 2630 | macros/latex/contrib/naive-ebnf/naive-ebnf.ins -2023/05/27 | 26025692 | systems/texlive/tlnet/install-tl.zip 2023/05/27 | 259312 | macros/latex/contrib/fduthesis/fduthesis-logo.dtx 2023/05/27 | 2459 | macros/latex/contrib/fduthesis/README.md -2023/05/27 | 2450388 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz 2023/05/27 | 23 | macros/latex/contrib/naive-ebnf/DEPENDS.txt +2023/05/27 | 23254 | graphics/pgf/contrib/tikz2d-fr/doc/tikz2d-fr-doc.tex 2023/05/27 | 231 | fonts/kpfonts-otf/tex/KpSans.fontspec 2023/05/27 | 223741 | fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-French.pdf 2023/05/27 | 223522 | macros/latex/contrib/fduthesis/fduthesis.dtx 2023/05/27 | 223432 | macros/latex/contrib/fduthesis/fduthesis-code.dtx 2023/05/27 | 222292 | fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-English.pdf -2023/05/27 | 21037524 | systems/texlive/tlnet/install-tl-windows.exe 2023/05/27 | 204100 | fonts/kpfonts-otf/fonts/KpMath-Semibold.otf 2023/05/27 | 203384 | fonts/kpfonts-otf/fonts/KpMath-Bold.otf 2023/05/27 | 2028820 | systems/texlive/tlnet/archive/simpleicons.doc.r67223.tar.xz @@ -57,17 +97,12 @@ 2023/05/27 | 19065 | fonts/kpfonts-otf/tex/kpfonts-otf.sty 2023/05/27 | 185 | fonts/kpfonts-otf/tex/KpMono.fontspec 2023/05/27 | 1835409 | fonts/kpfonts-otf/doc/unimath-kpfonts.pdf -2023/05/27 | 18112766 | systems/texlive/tlnet/tlpkg/texlive.tlpdb 2023/05/27 | 1791241 | macros/latex/contrib/fduthesis.zip 2023/05/27 | 172348 | fonts/kpfonts-otf/fonts/KpMath-SansBold.otf 2023/05/27 | 16806 | fonts/kpfonts-otf/doc/unimath-kpfonts.ltx -2023/05/27 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx 2023/05/27 | 15957 | macros/latex/contrib/fduthesis/fudan-emblem.pdf -2023/05/27 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 -2023/05/27 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2023/05/27 | 1538 | graphics/mcf2graph/mcf_exa_soc.mp 2023/05/27 | 151400 | macros/latex/contrib/fduthesis/fduthesis-en.pdf -2023/05/27 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 -2023/05/27 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 2023/05/27 | 143672 | fonts/kpfonts-otf/fonts/KpRoman-BoldItalic.otf 2023/05/27 | 1428 | macros/latex/contrib/naive-ebnf/README.md 2023/05/27 | 141308 | fonts/kpfonts-otf/fonts/KpRoman-SemiboldItalic.otf @@ -79,7 +114,8 @@ 2023/05/27 | 13100 | systems/texlive/tlnet/archive/msu-thesis.r67227.tar.xz 2023/05/27 | 130572 | fonts/kpfonts-otf/fonts/KpRoman-Semibold.otf 2023/05/27 | 12817 | macros/latex/contrib/naive-ebnf/naive-ebnf.dtx -2023/05/27 | 114036 | systems/texlive/tlnet/archive/texlive-scripts.r67221.tar.xz +2023/05/27 | 1179 | graphics/mcf2graph/template_soc.mp +2023/05/27 | 115290564 | macros/context/latest/cont-tmf.zip 2023/05/27 | 111944 | fonts/kpfonts-otf/fonts/KpSans-BoldItalic.otf 2023/05/27 | 111904 | fonts/kpfonts-otf/fonts/KpSans-Italic.otf 2023/05/27 | 1078 | macros/latex/contrib/naive-ebnf/LICENSE.txt @@ -103,7 +139,6 @@ 2023/05/26 | 793 | macros/latex/contrib/hyperref/doc/hyperref-doc6.html 2023/05/26 | 7536 | macros/latex/contrib/hyperref/hyperref-patches.dtx 2023/05/26 | 735896 | systems/texlive/tlnet/archive/latex-base-dev.source.r67218.tar.xz -2023/05/26 | 7296 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl 2023/05/26 | 70914 | macros/latex/contrib/msu-thesis/samples/MSU-thesis-template.pdf 2023/05/26 | 6892 | systems/texlive/tlnet/archive/oststud.r67217.tar.xz 2023/05/26 | 6771 | macros/latex/contrib/msu-thesis/samples/MSU-thesis-template.tex @@ -740,7 +775,6 @@ 2023/05/24 | 629204 | graphics/pgf/contrib/quantikz.zip 2023/05/24 | 62752 | systems/texlive/tlnet/archive/lualatex-truncate.doc.r67201.tar.xz 2023/05/24 | 6236 | systems/texlive/tlnet/archive/latexdemo.source.r67201.tar.xz -2023/05/24 | 6189 | graphics/pgf/contrib/tikz2d-fr/tex/tikz2d-fr.sty 2023/05/24 | 6128 | systems/texlive/tlnet/archive/checkcites.r67201.tar.xz 2023/05/24 | 60908 | systems/texlive/tlnet/archive/caption.r67201.tar.xz 2023/05/24 | 604526 | graphics/pgf/contrib/tikz3d-fr/doc/tikz3d-fr-doc.pdf @@ -765,9 +799,7 @@ 2023/05/24 | 46626 | macros/optex/base/math-macros.opm 2023/05/24 | 4612 | systems/texlive/tlnet/archive/totalcount.source.r67201.tar.xz 2023/05/24 | 4488 | macros/optex/doc/optex-doc.tex -2023/05/24 | 446784 | graphics/pgf/contrib/tikz2d-fr/doc/tikz2d-fr-doc.pdf 2023/05/24 | 440896 | systems/texlive/tlnet/archive/templatetools.doc.r67201.tar.xz -2023/05/24 | 439355 | graphics/pgf/contrib/tikz2d-fr.zip 2023/05/24 | 439308 | systems/texlive/tlnet/archive/statistics.doc.r67201.tar.xz 2023/05/24 | 4180 | systems/texlive/tlnet/archive/gatherenum.source.r67201.tar.xz 2023/05/24 | 4074 | macros/optex/base/optex.ini @@ -814,7 +846,6 @@ 2023/05/24 | 1708 | systems/texlive/tlnet/archive/gatherenum.r67201.tar.xz 2023/05/24 | 1702312 | systems/texlive/tlnet/archive/oldstandard.r67201.tar.xz 2023/05/24 | 1700 | systems/texlive/tlnet/archive/glossaries-nynorsk.r67201.tar.xz -2023/05/24 | 16885 | graphics/pgf/contrib/tikz2d-fr/doc/tikz2d-fr-doc.tex 2023/05/24 | 1676 | systems/texlive/tlnet/archive/movement-arrows.r67201.tar.xz 2023/05/24 | 167564 | systems/texlive/tlnet/archive/perfectcut.doc.r67201.tar.xz 2023/05/24 | 1640 | systems/texlive/tlnet/archive/totalcount.r67201.tar.xz @@ -865,6 +896,7 @@ 2023/05/23 | 3736 | systems/texlive/tlnet/archive/fenetrecas.r67185.tar.xz 2023/05/23 | 283680 | systems/texlive/tlnet/archive/yb-book.doc.r67188.tar.xz 2023/05/23 | 272 | systems/texlive/tlnet/archive/texlive-en.r67184.tar.xz +2023/05/23 | 25515 | macros/latex/contrib/proflycee/tex/proflycee-tools-geom.tex 2023/05/23 | 1935648 | systems/texlive/tlnet/archive/proflycee.doc.r67191.tar.xz 2023/05/23 | 18964 | graphics/pstricks/contrib/luapstricks/luapstricks-plugin-pstmarble.lua 2023/05/23 | 1868584 | systems/texlive/tlnet/archive/texlive-en.doc.r67184.tar.xz @@ -997,56 +1029,3 @@ 2023/05/22 | 107383 | macros/latex/contrib/l3kernel/l3news09.tex 2023/05/22 | 105012 | macros/latex/contrib/l3kernel/l3fp-parse.dtx 2023/05/22 | 10328 | macros/latex/contrib/l3kernel/l3flag.dtx -2023/05/21 | 9096 | systems/texlive/tlnet/archive/counterz.source.r67169.tar.xz -2023/05/21 | 905288 | systems/texlive/tlnet/archive/beebe.r67167.tar.xz -2023/05/21 | 884064 | info/kaytannollista-latexia/kaytannollista-latexia.pdf -2023/05/21 | 88330 | info/kaytannollista-latexia/luku-merkintakieli.tex -2023/05/21 | 8772 | systems/texlive/tlnet/archive/starray.r67173.tar.xz -2023/05/21 | 844460 | systems/texlive/tlnet/archive/lineno.doc.r67171.tar.xz -2023/05/21 | 80418 | macros/luatex/latex/letgut/doc/letgut.tex -2023/05/21 | 791270 | macros/luatex/latex/letgut/doc/letgut-code.pdf -2023/05/21 | 779132 | systems/texlive/tlnet/archive/huawei.doc.r67170.tar.xz -2023/05/21 | 7532 | systems/texlive/tlnet/archive/bibcop.r67168.tar.xz -2023/05/21 | 73992 | systems/texlive/tlnet/archive/latexindent.r67174.tar.xz -2023/05/21 | 62736 | systems/texlive/tlnet/archive/lineno.r67171.tar.xz -2023/05/21 | 627278 | graphics/pgf/contrib/fenetrecas/doc/FenetreCas-doc.pdf -2023/05/21 | 624 | systems/texlive/tlnet/archive/collection-context.r67175.tar.xz -2023/05/21 | 615803 | graphics/pgf/contrib/fenetrecas.zip -2023/05/21 | 6138 | info/kaytannollista-latexia/README.md -2023/05/21 | 6032 | systems/texlive/tlnet/archive/bibcop.source.r67168.tar.xz -2023/05/21 | 461 | macros/luatex/latex/letgut/README.md -2023/05/21 | 402063 | macros/luatex/latex/letgut/doc/letgut.pdf -2023/05/21 | 3956 | macros/luatex/latex/letgut/doc/localconf.tex -2023/05/21 | 358760 | systems/texlive/tlnet/archive/bibcop.doc.r67168.tar.xz -2023/05/21 | 3548004 | systems/texlive/tlnet/archive/latexindent.windows.r67174.tar.xz -2023/05/21 | 321451 | macros/luatex/latex/letgut/source/letgut.org -2023/05/21 | 321321 | info/kaytannollista-latexia/luku-rakenne.tex -2023/05/21 | 29 | info/kaytannollista-latexia/versio.tex -2023/05/21 | 2994 | info/kaytannollista-latexia/kirjallisuutta.bib -2023/05/21 | 299288 | systems/texlive/tlnet/archive/counterz.doc.r67169.tar.xz -2023/05/21 | 274 | macros/luatex/latex/letgut/doc/letgut.bib -2023/05/21 | 2702 | macros/luatex/latex/letgut/doc/xindex-letgut.lua -2023/05/21 | 2633 | info/kaytannollista-latexia/luku-esipuhe.tex -2023/05/21 | 260236 | systems/texlive/tlnet/archive/huawei.r67170.tar.xz -2023/05/21 | 255 | macros/luatex/latex/letgut/doc/listings-conf.tex -2023/05/21 | 25212 | macros/luatex/latex/letgut/source/letgut-banner.org -2023/05/21 | 23716 | macros/latex/contrib/oststud/oststud.dtx -2023/05/21 | 220368 | systems/texlive/tlnet/archive/starray.doc.r67173.tar.xz -2023/05/21 | 2114486 | macros/latex/contrib/proflycee.zip -2023/05/21 | 20613 | info/kaytannollista-latexia/luku-erikoiset.tex -2023/05/21 | 20559 | info/kaytannollista-latexia/luku-valmistautuminen.tex -2023/05/21 | 19444 | macros/luatex/latex/letgut/doc/exemple-nouveautes.pdf -2023/05/21 | 1904 | systems/texlive/tlnet/archive/counterz.r67169.tar.xz -2023/05/21 | 18112 | graphics/pgf/contrib/fenetrecas/doc/FenetreCas-doc.tex -2023/05/21 | 1551331 | install/macros/luatex/latex/letgut.tds.zip -2023/05/21 | 152938 | macros/luatex/latex/letgut/doc/letgut-banner-code.pdf -2023/05/21 | 1520 | macros/luatex/latex/letgut/source/HOWTO.md -2023/05/21 | 14345 | info/kaytannollista-latexia/kaytannollista-latexia.tex -2023/05/21 | 1413270 | macros/luatex/latex/letgut.zip -2023/05/21 | 1321804 | systems/texlive/tlnet/archive/latexindent.doc.r67174.tar.xz -2023/05/21 | 12537 | graphics/pgf/contrib/fenetrecas/tex/FenetreCas.sty -2023/05/21 | 122838 | info/kaytannollista-latexia/luku-asetukset.tex -2023/05/21 | 1221 | macros/luatex/latex/letgut/doc/latexmkrc -2023/05/21 | 12174 | info/kaytannollista-latexia/tavutusvihjeet.tex -2023/05/21 | 1031672 | info/kaytannollista-latexia.zip -2023/05/21 | 10168 | systems/texlive/tlnet/archive/huawei.source.r67170.tar.xz diff --git a/biblio/ctan-bibdata/ctan.bib b/biblio/ctan-bibdata/ctan.bib index b800ff1a49..474e8ff363 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 28-05-2023, 02:00:15 +%% created at 29-05-2023, 02:02:59 %% %% This file is provided under the terms of the LPPL v1.3 or @@ -43582,8 +43582,8 @@ title = {The \texttt{mcf2graph} package}, subtitle = {Draw chemical structure diagrams with MetaPost}, author = {Akira Yamaji}, - date = {2023-05-15}, - version = {5.01}, + date = {2023-05-28}, + version = {5.02}, license = {mit}, mirror = {https://mirror.ctan.org/graphics/mcf2graph}, url = {https://ctan.org/pkg/mcf2graph}, @@ -54381,8 +54381,8 @@ title = {The \texttt{ProfLycee} package}, subtitle = {A \LaTeX{} package for French maths teachers in high school}, author = {Cédric Pierquet}, - date = {2023-05-21}, - version = {2.6.5}, + date = {2023-05-28}, + version = {2.6.6}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/macros/latex/contrib/proflycee}, url = {https://ctan.org/pkg/proflycee}, @@ -69356,13 +69356,15 @@ @manual{ctan-tikz2d-fr, title = {The \texttt{tikz2d-fr} package}, - subtitle = {Work with some 2D TikZ's command (french)}, + subtitle = {Work with some 2D TikZ commands (French)}, author = {Cédric Pierquet}, - date = {2023-05-24}, - version = {0.1.0}, + date = {2023-05-28}, + version = {0.1.1}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/graphics/pgf/contrib/tikz2d-fr}, url = {https://ctan.org/pkg/tikz2d-fr}, + annotation = {This is a small package to work with some + () 2D commands for TiZ:}, } @manual{ctan-tikz3d-fr, diff --git a/biblio/ctan-bibdata/ctan.pdf b/biblio/ctan-bibdata/ctan.pdf Binary files differindex 4ad3f5decf..526dc2c4a2 100644 --- a/biblio/ctan-bibdata/ctan.pdf +++ b/biblio/ctan-bibdata/ctan.pdf diff --git a/graphics/mcf2graph/CHANGELOG b/graphics/mcf2graph/CHANGELOG index 3e41294cc9..df27a40490 100644 --- a/graphics/mcf2graph/CHANGELOG +++ b/graphics/mcf2graph/CHANGELOG @@ -1,6 +1,14 @@ ******************************************************************************* - Changelog of mcf2graph software package by Akira Yamaji 2023-05-15 + Changelog of mcf2graph software package by Akira Yamaji 2023-05-28 ******************************************************************************* +[ver. 5.02 / 2023-05-28] + -change command name + cv() => drawm() + -add abbreviated form command + '',$,@,#,#@,##,|=,|<,_,\,\*,\\ + -delete command cvat() + -update MCF manual,example + [ver. 5.01 / 2023-05-15] -change command name cv_at() => cvat() diff --git a/graphics/mcf2graph/README b/graphics/mcf2graph/README index 1ee8252e7e..859c893f97 100644 --- a/graphics/mcf2graph/README +++ b/graphics/mcf2graph/README @@ -1,7 +1,7 @@ ******************************************************************************** mcf2graph : Convert Molecular Coding Format to graphics with MetaPost Author : Akira Yamaji - version : 5.01 2023-05-15 + version : 5.02 2023-05-28 E-mail : mcf2graph@gmail.com Located at : http://www.ctan.org/pkg/mcf2graph ******************************************************************************** @@ -44,7 +44,7 @@ (9) >mpost -s ahlength=7 filename.mp => output report file 4. License - mcf2graph ver 5.01 Copyright (c) 2013-2023 Akira Yamaji + mcf2graph ver 5.02 Copyright (c) 2013-2023 Akira Yamaji Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/graphics/mcf2graph/main_lib.mcf b/graphics/mcf2graph/main_lib.mcf index a95f540582..d393f0c7d8 100644 --- a/graphics/mcf2graph/main_lib.mcf +++ b/graphics/mcf2graph/main_lib.mcf @@ -1,5 +1,5 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% molecular library file main_lib.mcf by Akira Yamaji 2023.05.15 +% molecular library file main_lib.mcf by Akira Yamaji 2023.05.28 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % tag1:var1;tag2:var2;tag3:var3 ..... % first character of line "%" comment out diff --git a/graphics/mcf2graph/mcf2graph.mp b/graphics/mcf2graph/mcf2graph.mp index dfa85f00e2..cf2eb5683f 100644 --- a/graphics/mcf2graph/mcf2graph.mp +++ b/graphics/mcf2graph/mcf2graph.mp @@ -1,5 +1,5 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% mcf2graph ver 5.01 Copyright (c) 2013-2023 Akira Yamaji +% mcf2graph ver 5.02 Copyright (c) 2013-2023 Akira Yamaji % % Permission is hereby granted, free of charge, to any person obtaining a copy of this software % and associated documentation files (the "Software"), to deal in the Software without restriction, @@ -30,7 +30,7 @@ % Set output MOL file (V3000) : mpost -s ahlength=6 FILENAME % Set output report : mpost -s ahlength=7 FILENAME %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -message "* This is mcf2graph ver 5.01 2023.05.15"; +message "* This is mcf2graph ver 5.02 2023.05.28"; tracingstats:=1; prologues:=3; warningcheck:=0; %------------------------------------------------------------------------------------------------- newinternal string EN_; @@ -174,10 +174,10 @@ enddef; %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% def beginfigm= begingroup - save ',f_ext,blen,ext,add,ang_br,fw_n,bw_n,at_colon,at_dot,info_cnt,group_cnt,bond_cntA,firstc, - warning_cnt,hideH,hideH_cnt,cntM,cntA,cntB,minX,minY,maxX,maxY,posA,posM,lineB,sB,eB,angB, - angA,lenB,angX,numS,sumA,bond_num,wdM,htM,chargeA,addA,add_rot,mol_pic,color_list,filter_s, - no,mw,mi,fm; + save ','',//,@,#,#@,##,\,\\,\*,|=,|<,**,_,f_ext,blen,ext,add,ang_br,fw_n,bw_n,at_colon,at_dot, + info_cnt,group_cnt,bond_cntA,firstc,warning_cnt,hideH,hideH_cnt,cntM,cntA,cntB, + minX,minY,maxX,maxY,posA,posM,lineB,sB,eB,angB,angA,lenB,angX,numS,sumA,bond_num,wdM,htM, + chargeA,addA,add_rot,mol_pic,color_list,filter_s,no,mw,mi,fm; numeric hideH[],lineB[],sB[],eB[],angB[],angA[],lenB[],angX[],strA[],sumA[],bond_num[], wdM[],htM[],chargeA[],addA[],add_rot[]; pair posA[],posM[][]; @@ -189,7 +189,12 @@ def beginfigm= no:=mc:=ex:=ad:=op:=temps:=mw:=mi:=fm:=filter_s:=""; EN:=JN:=MW:=FM:=MI:=CAS:=CAT:=EXA:=EXB:=USE:="-"; f_ext:=cntM:=mc_row:=ex_row:=ad_row:=op_row:=info_cnt:=0; - let ext=ext_to_fig; let add=add_to_molecule; def '=read_ud enddef; + let ext=ext_to_fig; let add=add_to_molecule; + def ' = read_ud enddef; def '' = readm enddef; def \ = drawm enddef; def \\ = putm enddef; + def \* = checkm enddef; def $ = getm enddef; def @ expr p = mposition:=p; enddef; + def # expr p = fsize:=p; enddef; def #@ expr p = fmargin:=p; enddef; + def ## expr p = msize:=p; enddef; def |=(expr n) = blength:=n; enddef; + def |<(expr n) = max_blength:=n; enddef; def _ expr s = EN:=s; enddef; parts_num:=parts_usr_start; parts_int:=parts_int_start; fig_num:=fig_num+1; mol_pic[0]:=nullpicture; @@ -304,7 +309,7 @@ enddef; %------------------------------------------------------------------------------------------------- def putm= if op_row>=1: scantokens(op) fi - if mc_row>=1: if checkm(mc)=0: cv(scantokens(mc)) fi fi + if mc_row>=1: if checkm(mc)=0: drawm(scantokens(mc)) fi fi if ad_row>=1: add(scantokens(ad)) fi if ex_row>=1: ext(scantokens(ex)) fi enddef; @@ -340,9 +345,9 @@ def group_wv secondary n = /n~wv enddef; def group_nb secondary n = /n~nb endde def read_mcf(expr n)(text t)= begingroup save nCP; - if unknown inside_cv:: + if unknown inside_mc:: save /,//,/*,*/,**,*/*,~,^,',`,<,>,:,=,\,\\,*\,\*,*\*,@,@$,$,&,&$,#,##,{,},|,||,_,CP,CA, - --,---,----,inside_cv; + --,---,----,inside_mc; | :=mark_adress; || :=reset_adress; ##:=reset_length; _:=Me; \:=0; \\:=zero_dm; *\:=zero_wf; \*:=zero_zf; *\*:=zero_wv; let = ==op_equ; let : ==op_col; let ^==op_hat; let ~==op_til; let > ==op_lth; let `==op_bqu; @@ -352,7 +357,7 @@ def read_mcf(expr n)(text t)= let }==); let @$==jump_atom_abs; let < ==rot_angle; let @==jump_atom; let &==cyc_atom; let #==chg_length; let /==group_si; let //==group_dm; let */==group_wf; let /*==group_zf; let */*==group_wv; let **==group_nb; - inside_cv:=1; + inside_mc:=1; fi %---------------------------------------------------------------------------------------------- nCP:=0; @@ -583,10 +588,7 @@ vardef lone_pair_add expr n= image(draw (0,0) wpcs lonepairdiam; draw ((0,lonepairspace) rotated n) wpcs lonepairdiam;) enddef; %================================================================================================= -def cvat(expr w,h)(text t)= - save_mposition:=mposition; mposition:=(w,h); cv(t) mposition:=save_mposition; enddef; -%------------------------------------------------------------------------------------------------- -def cv(text t)= +def drawm(text t)= begingroup save f_bra,temp_strA,temp_lenE,temp_lenF,temp_cntB,f_term,f_at,f_lineT,f_rotT,angL,lenL,cpos, tpos,f_lenT,f_envT,factor,m_wd,m_ht,raise_pos,slen,sdir,char_wd,char_ht,tcol,f_col,knownA, diff --git a/graphics/mcf2graph/mcf_exa_soc.mp b/graphics/mcf2graph/mcf_exa_soc.mp index 9c1015a8f8..045e9679a7 100644 --- a/graphics/mcf2graph/mcf_exa_soc.mp +++ b/graphics/mcf2graph/mcf_exa_soc.mp @@ -1,8 +1,8 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% MCF metapost souce file example by Akira Yamaji 2023.05.15 +% MCF metapost souce file example by Akira Yamaji 2023.05.28 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -if unknown mcftograph: input mcf2graph; fi %%% it must be version 5.01 -message "* mcf_template 2023.05.14"; +if unknown mcftograph: input mcf2graph; fi %%% it must be version 5.02 +message "* mcf_template 2023.05.28"; message ""; %------------------------------------------------------------------------------ fsize:=(30mm,20mm); @@ -22,12 +22,7 @@ max_blength:=4mm; %%%%loadm("EN<>*"); % select all loadm("EXA=1"); % select EXA=1 %------------------------------------------------------------------------------ -for i=1 upto ucount: - beginfigm - getm(i); - putm; - endfigm -endfor +for i=1 upto ucount: beginfigm $(i) \\ endfigm endfor %****************************************************************************** %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% bye diff --git a/graphics/mcf2graph/mcf_example.pdf b/graphics/mcf2graph/mcf_example.pdf Binary files differindex ebe0054027..4b9c5c3461 100644 --- a/graphics/mcf2graph/mcf_example.pdf +++ b/graphics/mcf2graph/mcf_example.pdf diff --git a/graphics/mcf2graph/mcf_example.tex b/graphics/mcf2graph/mcf_example.tex index ff81da973c..987ac797dc 100644 --- a/graphics/mcf2graph/mcf_example.tex +++ b/graphics/mcf2graph/mcf_example.tex @@ -1,7 +1,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Example of MCF Typeset with LuaLaTeX(luamplib) by A.Yamaji 2023.05.15 +% Example of MCF Typeset with LuaLaTeX(luamplib) by A.Yamaji 2023.05.28 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% ** mcf2graph.mf must be version 5.01 +% ** mcf2graph.mf must be version 5.02 % ** use mcf_library.mcf % ** typeset by LuaLaTeX(luamplib) %------------------------------------------------------------------------- @@ -29,7 +29,7 @@ Author : Akira Yamaji \quad Date : \today \\ Located at : http://www.ctan.org/pkg/mcf2graph \end{center} -{\small *use 'mcf2grapf.mp' ver 5.01 \quad +{\small *use 'mcf2grapf.mp' ver 5.02 \quad *typeset with LuaLaTeX \quad *use molecular library file 'main\_lib.mcf' \\ ** FM(fm):molecular formula (calculated) \quad @@ -68,7 +68,7 @@ beginfigm getm(fig_num); if checkm(mc)=0: - cv(scantokens(mc)) + drawm(scantokens(mc)) VerbatimTeX("\gdef\EN{"&EN&"}"); VerbatimTeX("\gdef\MW{"&MW&"}"); VerbatimTeX("\gdef\mw{"&mw&"}"); @@ -116,7 +116,7 @@ beginfigm getm(fig_num); if checkm(mc)=0: - cv(scantokens(mc)) + drawm(scantokens(mc)) ext( defaultfont:="cmtt9"; label.lrt("["&decimal(fig_num)&"]",(0,h)); diff --git a/graphics/mcf2graph/mcf_manual.pdf b/graphics/mcf2graph/mcf_manual.pdf Binary files differindex ba64d326b9..e3ffcc334f 100644 --- a/graphics/mcf2graph/mcf_manual.pdf +++ b/graphics/mcf2graph/mcf_manual.pdf diff --git a/graphics/mcf2graph/mcf_manual.tex b/graphics/mcf2graph/mcf_manual.tex index afe294451f..5debd57a43 100644 --- a/graphics/mcf2graph/mcf_manual.tex +++ b/graphics/mcf2graph/mcf_manual.tex @@ -1,7 +1,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Molecular Coding Format manual by Akira Yamaji 2023.05.15 +% Molecular Coding Format manual by Akira Yamaji 2023.05.28 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% ** mcf2graph.mf must be version 5.01 +% ** mcf2graph.mf must be version 5.02 % ** use main_lib.mcf % ** typeset by LuaLaTeX(luamplib) %---------------------------------------------------------------------------- @@ -22,6 +22,7 @@ input mcf2graph; \end{mplibcode} %---------------------------------------------------------------------------- +\makeatletter% \edef\fext{mps}% \topmargin=-18mm \textheight=254mm @@ -36,7 +37,7 @@ \author{Akira Yamaji} \date{\today} \maketitle -\begin{center} mcf2graph version 5.01 \end{center} +\begin{center} mcf2graph version 5.02 \end{center} \begin{center} Located at http://www.ctan.org/pkg/mcf2graph \end{center} \begin{center} Suggestion or request mail to: mcf2graph@gmail.com \end{center} %----------------------------------------------------------------------------- @@ -53,79 +54,79 @@ fsize:=(40mm,24mm); blength:=5mm; sw_frame:=0; % Glycine", -beginfigm cv(<30,NH2,!2,COOH) endfigm +beginfigm \(<30,NH2,!2,COOH) endfigm % L-Alanine -beginfigm cv(<30,NH2,!~wb,/_,!,COOH) endfigm +beginfigm \(<30,NH2,!~wb,/_,!,COOH) endfigm % L-Valine -beginfigm cv(<30,NH2,!~wb,/?!,!,COOH) endfigm +beginfigm \(<30,NH2,!~wb,/?!,!,COOH) endfigm % L-Leucine -beginfigm cv(<30,NH2,!~wb,/'(!,?!),!,COOH) endfigm +beginfigm \(<30,NH2,!~wb,/'(!,?!),!,COOH) endfigm \end{mplibcode} \\ \begin{mplibcode} % L-Isoleucine -beginfigm cv(<30,NH2,!~wb,/'(/*_,!2),!,COOH) endfigm +beginfigm \(<30,NH2,!~wb,/'(/*_,!2),!,COOH) endfigm % L-Serine -beginfigm cv(<30,NH2,!~wb,/!OH,!,COOH) endfigm +beginfigm \(<30,NH2,!~wb,/!OH,!,COOH) endfigm % L-Threonine -beginfigm cv(<30,NH2,!~wb,/'(/_,!~wf,OH),!,COOH) endfigm +beginfigm \(<30,NH2,!~wb,/'(/_,!~wf,OH),!,COOH) endfigm % L-Cysteine -beginfigm cv(<30,NH2,!~wb,/!SH,!,COOH) endfigm +beginfigm \(<30,NH2,!~wb,/!SH,!,COOH) endfigm \end{mplibcode} \\ \begin{mplibcode} % L-Methionine -beginfigm cv(<30,NH2,!~wb,/'(!2,S,!),!,COOH) endfigm +beginfigm \(<30,NH2,!~wb,/'(!2,S,!),!,COOH) endfigm % L-Phenylalanine -beginfigm cv(<30,NH2,!~wb,/!Ph,!,COOH) endfigm +beginfigm \(<30,NH2,!~wb,/!Ph,!,COOH) endfigm % L-Tyrosine -beginfigm cv(<30,NH2,!~wb,/'(!Ph,-3:/OH),!,COOH) endfigm +beginfigm \(<30,NH2,!~wb,/'(!Ph,-3:/OH),!,COOH) endfigm % L-Triptophan -beginfigm cv(<30,NH2,!~wb,!,COOH,@2,\,!,<24,|,?5,-4=Ph,2=dr,5=dl,4:NH) endfigm +beginfigm \(<30,NH2,!~wb,!,COOH,@2,\,!,<24,|,?5,-4=Ph,2=dr,5=dl,4:NH) endfigm \end{mplibcode} \\ \begin{mplibcode} % L-Prorine -beginfigm cv(<18,?5,3:NH,4:*/COOH) endfigm +beginfigm \(<18,?5,3:NH,4:*/COOH) endfigm % L-Glutamine -beginfigm cv(<30,NH2,!~wb,!,COOH,@2,\`1,!`1,!,//O,!,NH2) endfigm +beginfigm \(<30,NH2,!~wb,!,COOH,@2,\`1,!`1,!,//O,!,NH2) endfigm % L-Asparagine -beginfigm cv(<30,NH2,!~wb,/'(!,//O,!,NH2),!,COOH) endfigm +beginfigm \(<30,NH2,!~wb,/'(!,//O,!,NH2),!,COOH) endfigm % L-Aspartic acid -beginfigm cv(<30,NH2,!~wb,/!COOH,!,COOH) endfigm +beginfigm \(<30,NH2,!~wb,/!COOH,!,COOH) endfigm \end{mplibcode} \\ \begin{mplibcode} % L-Glutamic acid -beginfigm cv(<30,NH2,!~wb,/'(!2,COOH),!,COOH) endfigm +beginfigm \(<30,NH2,!~wb,/'(!2,COOH),!,COOH) endfigm % L-Lysine -beginfigm cv(<30,NH2,!~wb,/'(!4,NH2),!,COOH) endfigm +beginfigm \(<30,NH2,!~wb,/'(!4,NH2),!,COOH) endfigm % L-Arginine -beginfigm cv(<30,NH2,!~wb,!,COOH,@2,\`1,!`1,!2,NH,!,//NH,!,NH2) endfigm +beginfigm \(<30,NH2,!~wb,!,COOH,@2,\`1,!`1,!2,NH,!,//NH,!,NH2) endfigm % L-Hystidine -beginfigm cv(<30,NH2,!~wb,!,COOH,@2,\,!,|,?5,{1,3}=dl,3:N,5:NH) endfigm +beginfigm \(<30,NH2,!~wb,!,COOH,@2,\,!,|,?5,{1,3}=dl,3:N,5:NH) endfigm \end{mplibcode} \\ \begin{mplibcode} % L-DOPA -beginfigm cv(<30,NH2,!~wb,!,COOH,@2,\,!,Ph,{-3,-4}:/OH) endfigm +beginfigm \(<30,NH2,!~wb,!,COOH,@2,\,!,Ph,{-3,-4}:/OH) endfigm % Ornithine -beginfigm cv(<30,NH2,!~wb,/'(!3,NH2),!,COOH) endfigm +beginfigm \(<30,NH2,!~wb,/'(!3,NH2),!,COOH) endfigm % Citrulline -beginfigm cv(<30,NH2,!~wb,/'(!3,NH,!,//O,!,NH2),!,COOH) endfigm +beginfigm \(<30,NH2,!~wb,/'(!3,NH,!,//O,!,NH2),!,COOH) endfigm % GABA -beginfigm cv(<30,NH2,!4,COOH) endfigm +beginfigm \(<30,NH2,!4,COOH) endfigm \end{mplibcode} \\ \begin{mplibcode} % amino Levulinic acid -beginfigm cv(<30,NH2,!2,//O,!3,COOH) endfigm +beginfigm \(<30,NH2,!2,//O,!3,COOH) endfigm % 4-amino benzoic acid -beginfigm cv(<30,Ph,1:/NH2,4:/COOH) endfigm +beginfigm \(<30,Ph,1:/NH2,4:/COOH) endfigm % L-Carboxyl glutamic acid -beginfigm cv(<30,NH2,!~wb,/'(!,/COOH,!,COOH),!,COOH) endfigm +beginfigm \(<30,NH2,!~wb,/'(!,/COOH,!,COOH),!,COOH) endfigm % L-Hydroxy Prorine -beginfigm cv(<18,?5,1:/OH,3:NH,4:*/COOH) endfigm +beginfigm \(<18,?5,1:/OH,3:NH,4:*/COOH) endfigm \end{mplibcode} %----------------------------------------------------------------------------- \twocolumn @@ -159,12 +160,12 @@ $n (0<=n<360): absolute angle sw_frame:=Outside; blength:=0; beginfigm - fsize:=(60mm,17mm); + #(60mm,17mm); sw_numbering:=Bond; numbering_end:=6; ratio_chain_ring:=1; %---------------------------------------------------------------------- - cv(<15,-30,45,-45,60,$300,$0, + \(<15,-30,45,-45,60,$300,$0, {1^$15,2^$345,3^$30,4^$345}:/_~dt,{5,6}=vf, ) add( @@ -190,12 +191,12 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(60mm,17mm); + #(60mm,17mm); sw_numbering:=Bond; numbering_end:=6; ratio_chain_ring:=1; %---------------------------------------------------------------------- - cv(<-30,!6, + \(<-30,!6, {1^-120,2^60,3^-60,4^60,5^-60,6^60}:/_~dt ) add( @@ -222,12 +223,11 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(60mm,16mm); - fmargin:=(2mm,2mm); + #(60mm,16mm) #@(2mm,2mm) sw_trimming:=1; sw_numbering:=Atom; ratio_chain_ring:=1; - cv(<-30,!6,@3,0,!,@5,-30) + \(<-30,!6,@3,0,!,@5,-30) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -241,12 +241,11 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(60mm,16mm); - fmargin:=(2mm,2mm); + #(60mm,16mm) #@(2mm,2mm) sw_numbering:=Atom; sw_trimming:=1; ratio_chain_ring:=1; - cv(<-30,!6,@3,\,!) + \(<-30,!6,@3,\,!) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -268,13 +267,12 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(60mm,16mm); - fmargin:=(2mm,2mm); + #(60mm,16mm) #@(2mm,2mm) sw_numbering:=Atom; sw_trimming:=1; numbering_end:=10; ratio_chain_ring:=1; - cv(<30,!10,@2,\,!,@4,*\,!,@6,\*,!,@8,\\,!,@10,*\*,!) + \(<30,!10,@2,\,!,@4,*\,!,@6,\*,!,@8,\\,!,@10,*\*,!) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -290,14 +288,13 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(60mm,20mm); - fmargin:=(2mm,2mm); + #(60mm,20mm) #@(2mm,2mm) sw_trimming:=1; sw_numbering:=Atom; numbering_end:=7; ratio_chain_ring:=1; %------------------------- - cv(<30,!6,@2,\~dr,!,@4,\`1.5,-90,@6,15,-60) + \(<30,!6,@2,\~dr,!,@4,\`1.5,-90,@6,15,-60) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -311,13 +308,12 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(60mm,20mm); - fmargin:=(2mm,2mm); + #(60mm,20mm) #@(2mm,2mm) sw_trimming:=1; sw_numbering:=Atom; ratio_chain_ring:=1; %---------------------------------- - cv(<-30,!6,@3,\,!3,&6~bd,@9,&4~bz) + \(<-30,!6,@3,\,!3,&6~bd,@9,&4~bz) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -331,12 +327,11 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(60mm,20mm); + #(60mm,20mm) #@(2mm,3mm) sw_trimming:=1; - fmargin:=(2mm,3mm); sw_numbering:=Bond; %--------------------------- - cv(?6) + \(?6) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -350,15 +345,14 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(60mm,20mm); - fmargin:=(2mm,3mm); + #(60mm,20mm) #@(2mm,3mm) sw_trimming:=1; sw_numbering:=Bond; ratio_chain_ring:=1; numbering_end:=7; defaultscale:=0.5; labeloffset:=2bp; - cv(#1,0,0,<90,0,<-90,0,<$315,0,<$90,0,<$0,0,{1:7}=vf, + \(#1,0,0,<90,0,<-90,0,<$315,0,<$90,0,<$0,0,{1:7}=vf, {3,4^180}:/_~dt) add( drawarrow B8/*.7{B8left}..{B3left}B3/*.7; label.urt("90",B8/*.7); @@ -394,11 +388,10 @@ tm : triple %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(70mm,10mm); - fmargin:=(2mm,2mm); + #(70mm,10mm) #@(2mm,2mm) sw_trimming:=0; ratio_chain_ring:=1; - cv(<-30,!~dm,!,!~dl,!,!~dr,!~db,!~db,!,!~tm) + \(<-30,!~dm,!,!~dl,!,!~dr,!~db,!~db,!,!~tm) add(defaultscale:=0.6; labeloffset:=0; label.rt("(dm)",A1+(0,-0.7l)); label.rt("(dl)",A3+(0,-0.7l)); @@ -434,11 +427,10 @@ vb:vector backward %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(70mm,10mm); - fmargin:=(2mm,2mm); + #(70mm,10mm) #@(2mm,2mm) sw_trimming:=0; ratio_chain_ring:=1; - cv(<-30,!~wf,!,!~wb,!,!~zf,!,!~zb,!,!~vf,!,!~vb) + \(<-30,!~wf,!,!~wb,!,!~zf,!,!~zb,!,!~vf,!,!~vb) add(defaultscale:=0.6; labeloffset:=0; label.rt("(wf)",A1+(0,-0.7l)); label.rt("(wb)",A3+(0,-0.7l)); @@ -468,12 +460,10 @@ bd : broad / bz : broad dotted %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(70mm,10mm); - fmargin:=(2mm,2mm); - blength:=9mm; + #(70mm,10mm) #@(2mm,2mm) |=(9mm) sw_trimming:=1; ratio_chain_ring:=1; - cv(<-30,!7,1=dt,3=wv,5=bd,7=bz) + \(<-30,!7,1=dt,3=wv,5=bd,7=bz) add(defaultscale:=0.6; labeloffset:=0; label.rt("(dt)",A1+(0,-0.6l)); label.rt("(wv)",A3+(0,-0.6l)); @@ -513,9 +503,9 @@ dm_ : duble over line \begin{mplibcode} beginfigm sw_trimming:=1; - fsize:=(75mm,20mm); + #(75mm,20mm); ratio_chain_ring:=1; - cv(<30,!18,$90`1.5,90`15.5, + \(<30,!18,$90`1.5,90`15.5, {2~si_,4~wf_,6~wb_,8~zf_,10~zb_, 12~bd_,14~dl_,16~dr_,18~dm_}:/_`2) endfigm @@ -537,16 +527,16 @@ wb_r : wedge backward (half width) %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(75mm,16mm); - cvat(0.05,0.5)(#1.25,-30~wf_r,30~bd_r`1,30~wb_r,120,O,30,&1,##, + #(75mm,16mm); + @(0.05,0.5)\(#1.25,-30~wf_r,30~bd_r`1,30~wb_r,120,O,30,&1,##, #.5,{1^$-90,2^$90,3^$-90,4^$90}:/OH,6^$90:/!OH) defaultscale:=0.6; - cvat(0.5,0.7)(0~wf_r) add(label.lft("wf_r:",A1);) - cvat(0.5,0.2)(0~wf) add(label.lft("wf:",A1);) - cvat(0.75,0.7)(0~bd_r) add(label.lft("bd_r:",A1);) - cvat(0.75,0.2)(0~bd) add(label.lft("bd:",A1);) - cvat(1,0.7)(0~wb_r) add(label.lft("wb_r:",A1);) - cvat(1,0.2)(0~wb) add(label.lft("wb:",A1);) + @(0.5,0.7)\(0~wf_r) add(label.lft("wf_r:",A1);) + @(0.5,0.2)\(0~wf) add(label.lft("wf:",A1);) + @(0.75,0.7)\(0~bd_r) add(label.lft("bd_r:",A1);) + @(0.75,0.2)\(0~bd) add(label.lft("bd:",A1);) + @(1,0.7)\(0~wb_r) add(label.lft("wb_r:",A1);) + @(1,0.2)\(0~wb) add(label.lft("wb:",A1);) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -560,10 +550,9 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(60mm,8mm); - fmargin:=(2mm,3mm); + #(60mm,8mm) #@(2mm,3mm) ratio_chain_ring:=1; - cv(<30,!9,{2,4,6,8'}=dl) + \(<30,!9,{2,4,6,8'}=dl) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -578,9 +567,9 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(55mm,8mm); + #(55mm,8mm); sw_numbering:=Bond; - cv(<-30,!2,!4`1.2,!2) + \(<-30,!2,!4`1.2,!2) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -595,9 +584,9 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(55mm,8mm); + #(55mm,8mm); sw_numbering:=Bond; - cv(<-30,!2,#1.2,!4,##,!2) + \(<-30,!2,#1.2,!4,##,!2) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -610,11 +599,10 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(60mm,16mm); - fmargin:=(2mm,2mm); + #(60mm,16mm) #@(2mm,2mm) sw_trimming:=1; sw_numbering:=Bond; - cv(?6,@4,\,?6`1.2) + \(?6,@4,\,?6`1.2) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -629,8 +617,8 @@ Insert hetero atom \begin{mplibcode} beginfigm sw_trimming:=1; - fsize:=(50mm,7mm); - cv(<-30,!2,O,!2,N,!2) + #(50mm,7mm); + \(<-30,!2,O,!2,N,!2) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -645,16 +633,15 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(70mm,10mm); - msize:=(0.48,1); - cvat(0,0.5)(<30,!5,2:O,{3,4}:N) + #(70mm,10mm) ##(0.48,1) + @(0,0.5)\(<30,!5,2:O,{3,4}:N) sw_numbering:=Atom; - cvat(1,0.5)(<30,!5,2:O,{3,4}:N) + @(1,0.5)\(<30,!5,2:O,{3,4}:N) endfigm \end{mplibcode} %----------------------------------------------------------------------------- \subsubsection{Brock address} -\index{\textbar}% | +\index{\textbar}% \begin{verbatim} | : divide brock @@ -663,17 +650,16 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(70mm,14mm); - fmargin:=(3mm,1.5mm); - cvat(0,.5)(?6,@4,\,|,?6,2:O) + #(70mm,14mm) #@(3mm,1.5mm) + @(0,.5)\(?6,@4,\,|,?6,2:O) sw_numbering:=Atom; - msize:=(1,.88); - cvat(1,.5)(?6,@4,\,|,?6,2:O) + ##(1,.88) + @(1,.5)\(?6,@4,\,|,?6,2:O) endfigm \end{mplibcode} %----------------------------------------------------------------------------- \subsubsection{Reset brock address} -\index{\textbar\textbar}% || +\index{\textbar\textbar}% \begin{verbatim} || : reset brock adress @@ -682,12 +668,11 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(70mm,14mm); - fmargin:=(3mm,1.5mm); - cvat(0,.5)(?6,@4,\,|,?6,||,2:N) + #(70mm,14mm) #@(3mm,1.5mm) + @(0,.5)\(?6,@4,\,|,?6,||,2:N) sw_numbering:=Atom; - msize:=(1,.88); - cvat(1,.5)(?6,@4,\,|,?6,||,2:N) + ##(1,.88) + @(1,.5)\(?6,@4,\,|,?6,||,2:N) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -701,12 +686,11 @@ $2:N : change A$2 C to N **1<=n<=3095 %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(70mm,14mm); - fmargin:=(3mm,1.5mm); - cvat(0,.5)(?6,@4,\,?6,$2:N) + #(70mm,14mm) #@(3mm,1.5mm) + @(0,.5)\(?6,@4,\,?6,$2:N) sw_numbering:=Atom; - msize:=(1,.88); - cvat(1,.5)(?6,@4,\,?6,$2:N) + ##(1,.88) + @(1,.5)\(?6,@4,\,?6,$2:N) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -719,12 +703,11 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(70mm,14mm); - fmargin:=(3mm,1.5mm); - cvat(0,.5)(?6,@4,\,?6,-2:N) + #(70mm,14mm) #@(3mm,1.5mm) + @(0,.5)\(?6,@4,\,?6,-2:N) sw_numbering:=Atom; - msize:=(1,.88); - cvat(1,.5)(?6,@4,\,?6,-2:N) + ##(1,.88) + @(1,.5)\(?6,@4,\,?6,-2:N) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -739,8 +722,8 @@ p_ : positive / n_ : negative \begin{mplibcode} beginfigm sw_trimming:=1; - fsize:=(60mm,12mm); - cv(<-30,!2,N,??,p_,!2,S,n_^180,!6,7:N,7:??,9:S,7:p_,9:n_^180) + #(60mm,12mm); + \(<-30,!2,N,??,p_,!2,S,n_^180,!6,7:N,7:??,9:S,7:p_,9:n_^180) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -759,11 +742,10 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(60mm,18mm); - fmargin:=(2mm,1.5mm); + #(60mm,18mm) #@(2mm,1.5mm) sw_trimming:=1; sw_numbering:=Bond; - cv(<30,?6,3=?6,3=dt,{7:11}=bd_r) + \(<30,?6,3=?6,3=dt,{7:11}=bd_r) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -776,11 +758,10 @@ attached bond length %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(60mm,25mm); - fmargin:=(2mm,2mm); + #(60mm,25mm) #@(2mm,2mm) sw_trimming:=1; sw_numbering:=Bond; - cv(?6,@4,\,?6`1.2,5=?6,11=?6, + \(?6,@4,\,?6`1.2,5=?6,11=?6, {14:23}=bd_r,{5,11}=dt) endfigm \end{mplibcode} @@ -795,12 +776,11 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(60mm,18mm); - fmargin:=(2mm,1.5mm); + #(60mm,18mm) #@(2mm,1.5mm) margin_top_bottom:=1.5mm; sw_numbering:=Bond; sw_trimming:=1; - cv(<30,?6,3=?6[13],3=dt,{7:11}=bd_r) + \(<30,?6,3=?6[13],3=dt,{7:11}=bd_r) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -811,11 +791,10 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(70mm,20mm); - fmargin:=(2mm,2mm); + #(70mm,20mm) #@(2mm,2mm) sw_numbering:=Bond; sw_trimming:=1; - cv(<30,?6,{-3,-4,-4,-2,-2,-4,-4}=?6,{4,8,13,20,25,28,33}=dt) + \(<30,?6,{-3,-4,-4,-2,-2,-4,-4}=?6,{4,8,13,20,25,28,33}=dt) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -834,17 +813,16 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(75mm,20mm); - fmargin:=(2mm,2mm); + #(75mm,20mm) #@(2mm,2mm) sw_numbering:=Bond; - msize:=(1,.9); - cvat( 0,.5)(<30,?6,{3,11--4}=?6,{11,4}=dt,{12:15}=bd_r) + ##(1,.9) + @( 0,.5)\(<30,?6,{3,11--4}=?6,{11,4}=dt,{12:15}=bd_r) add(defaultscale:=0.4; label("(1)",p0);) - msize:=(1,.9); - cvat(.5,.5)(<30,?6,3=?6,{11--4}=?5,{11,4}=dt,{12:14}=bd_r) + ##(1,.9) + @(.5,.5)\(<30,?6,3=?6,{11--4}=?5,{11,4}=dt,{12:14}=bd_r) add(defaultscale:=0.4; label("(2)",p0);) - msize:=(1,.9); - cvat( 1,.5)(<30,?6,3=?6,{11--4}=?4,{11,4}=dt,{12,13}=bd_r) + ##(1,.9) + @( 1,.5)\(<30,?6,3=?6,{11--4}=?4,{11,4}=dt,{12,13}=bd_r) add(defaultscale:=0.4; label("(3)",p0);) endfigm \end{mplibcode} @@ -864,12 +842,11 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(60mm,20mm); - fmargin:=(2mm,2mm); + #(60mm,20mm) #@(2mm,2mm) sw_numbering:=Bond; - cvat(0,1)(?6,{3,10}=?6,16---4=?6,{16,4}=dt,{17:19}=bd_r) + @(0,1)\(?6,{3,10}=?6,16---4=?6,{16,4}=dt,{17:19}=bd_r) add(defaultscale:=0.4; label("(1)",p0);) - cvat(1,0)(?6,{3,10}=?6,16---4=?5,{16,4}=dt,{17,18}=bd_r) + @(1,0)\(?6,{3,10}=?6,16---4=?5,{16,4}=dt,{17,18}=bd_r) add(defaultscale:=0.4; label("(2)",p0);) endfigm \end{mplibcode} @@ -887,10 +864,9 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(60mm,20mm); - fmargin:=(2mm,2mm); + #(60mm,20mm) #@(2mm,2mm) sw_numbering:=Bond; - cv(<-30,?6,{3,10,15}=?6,21----4=?6,{21,4}=dt,{22,23}=bd_r) + \(<-30,?6,{3,10,15}=?6,21----4=?6,{21,4}=dt,{22,23}=bd_r) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -903,11 +879,11 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(40mm,15mm); + #(40mm,15mm); sw_numbering:=Atom; numbering_end:=7; ratio_chain_ring:=1; - cv(<30,!6,@4,?5) + \(<30,!6,@4,?5) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -931,8 +907,8 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(75mm,18mm); - cv(<30,!,/_,!2,/!,!2,/!,!4,/?!,!4,/??!,!2,/'(Ph`0.8)^-60,!) + #(75mm,18mm); + \(<30,!,/_,!2,/!,!2,/!,!4,/?!,!4,/??!,!2,/'(Ph`0.8)^-60,!) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -954,8 +930,8 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(70mm,14mm); - cv(<30,!`1,//O,!2`1,*/H,!2`1,/*H,!2`1,*/*H,!2`1,**?3,!`1) + #(70mm,14mm); + \(<30,!`1,//O,!2`1,*/H,!2`1,/*H,!2`1,*/*H,!2`1,**?3,!`1) add(defaultscale:=0.75; label("//",A2-(0,0.45l)); label("*/",A4-(0,0.45l)); @@ -982,9 +958,9 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(60mm,16mm); + #(60mm,16mm); sw_trimming:=1; - cv(<-30,#1,!2,/_`2^30,!2,/!2>lr,!2,/!2>rl,!) + \(<-30,#1,!2,/_`2^30,!2,/!2>lr,!2,/!2>rl,!) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -997,11 +973,10 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(75mm,25mm); - fmargin:=(2mm,2mm); + #(75mm,25mm) #@(2mm,2mm) sw_numbering:=Atom; numbering_end:=17; - cv(<30,!17,2:/_,3:/!,4:/!2,7:/iPr,8:/tBu,10:/'(Ph`0.6)^-15, + \(<30,!17,2:/_,3:/!,4:/!2,7:/iPr,8:/tBu,10:/'(Ph`0.6)^-15, {11,12,13'}:*/_,{15,16,17'}:/*_) endfigm \end{mplibcode} @@ -1015,11 +990,10 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(60mm,18mm); + #(60mm,18mm) #@(2mm,2mm) sw_trimming:=1; - fmargin:=(2mm,2mm); sw_numbering:=Atom; numbering_end:=9; - cv(<30,!8`1,{2~wf,4~zf,6^-30,8^$120}:/_) + \(<30,!8`1,{2~wf,4~zf,6^-30,8^$120}:/_) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -1032,11 +1006,11 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(60mm,16mm); + #(60mm,16mm); sw_trimming:=1; sw_numbering:=Atom; numbering_end:=8; - cv(<-30,!7`1,3:/_`2^30,5:/!2>lr,7:/!2>rl) + \(<-30,!7`1,3:/_`2^30,5:/!2>lr,7:/!2>rl) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -1058,10 +1032,10 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(50mm,25mm); + #(50mm,25mm); sw_trimming:=1; ratio_chain_ring:=1; - cv(?4,{3^-90,3^-30,3^90}:/!3>hz, + \(?4,{3^-90,3^-30,3^90}:/!3>hz, {1^-60,1,1^60}:/!3>vt ) add(defaultscale:=0.5; labeloffset:=2bp; @@ -1090,9 +1064,9 @@ endfigm \begin{mplibcode} beginfigm %%%%% EN:Left-right_right-left - fsize:=(40mm,20mm); + #(40mm,20mm); sw_trimming:=1; - cv(<30,!4,2:/!6>30,4:/!4>-45) + \(<30,!4,2:/!6>30,4:/!4>-45) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -1109,9 +1083,9 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(40mm,20mm); + #(40mm,20mm); sw_trimming:=1; - cv(<30,!4,2:/!6>30,4:/!4>-45) + \(<30,!4,2:/!6>30,4:/!4>-45) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -1124,9 +1098,9 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(60mm,20mm); + #(60mm,20mm); sw_trimming:=1; - cv(<30,!6,6>'(90,-90,90,-90,90):/!5) + \(<30,!6,6>'(90,-90,90,-90,90):/!5) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -1148,9 +1122,9 @@ SO : S,//O SOO : S,//O^35,//^-35 %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(60mm,12mm); + #(60mm,12mm); sw_trimming:=1; - cv(<-30,!2,NH,!2,N!,!2,N!2,!2,SO,!2,SOO,!) + \(<-30,!2,NH,!2,N!,!2,N!2,!2,SO,!2,SOO,!) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -1168,9 +1142,9 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(60mm,12mm); + #(60mm,12mm); sw_trimming:=1; - cv(<30,!9`1,?!,!,??,!,2:??,4:/?!,6:/??!,8:/N?!) + \(<30,!9`1,?!,!,??,!,2:??,4:/?!,6:/??!,8:/N?!) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -1179,15 +1153,15 @@ endfigm '(..) : user defined parts iBuOH:='(!,/_,!,OH); -cv(<30,?6,{4,6}:/iBuOH) +\(<30,?6,{4,6}:/iBuOH) \end{verbatim} %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(60mm,13mm); + #(60mm,13mm); sw_trimming:=1; iBuOH:='(!,/_,!,OH); - cv(<30,?6,{4,6}:/iBuOH) + \(<30,?6,{4,6}:/iBuOH) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -1198,10 +1172,9 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(60mm,13mm); - fmargin:=(2mm,1mm); + #(60mm,13mm) #@(2mm,1mm) sw_trimming:=1; - cv(<30,!8,{2,6}:/'(!,/_,!,OH)) + \(<30,!8,{2,6}:/'(!,/_,!,OH)) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -1217,10 +1190,9 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(70mm,16mm); - fmargin:=(2mm,1mm); + #(70mm,16mm) #@(2mm,1mm) sw_trimming:=1; - cv(<30,?6,@3,\,!3,//O,!,O,n_^60,@$(6,1),H,p_^15) + \(<30,?6,@3,\,!3,//O,!,O,n_^60,@$(6,1),H,p_^15) add(drawdot A1 withpen pencircle scaled 2bp; pickup pencircle scaled 0.1bp; for i=0 upto 6: @@ -1241,10 +1213,9 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(75mm,14mm); - max_blength:=8mm; + #(75mm,14mm) |<(8mm) sw_numbering:=Atom; numbering_end:=15; - cv(<30,!14,{2,6:10,14}:/_~bd_r`0.5) + \(<30,!14,{2,6:10,14}:/_~bd_r`0.5) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -1255,7 +1226,7 @@ endfigm \index{green}% \begin{verbatim} beginfigm - cv( + \( <30,Ph,{2,5}:N,3:/NH2,4:/COOH, %--------------------- 2:red, % red A2 @@ -1268,9 +1239,8 @@ endfigm %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(50mm,20mm); - max_blength:=8mm; - cv( + #(50mm,20mm) |<(8mm) + \( <30,Ph,{2,5}:N,3:/NH2,4:/COOH, 2:red,5:blue,3=green ) @@ -1284,16 +1254,15 @@ beginfigm %---------------- atomfont:="cmr8"; %---------------- - cv(<30,Ph,{2,5}:N,3:/NH2,4:/COOH) + \(<30,Ph,{2,5}:N,3:/NH2,4:/COOH) endfigm \end{verbatim} %----------------------------------------- \begin{mplibcode} beginfigm - fsize:=(50mm,20mm); - max_blength:=8mm; + #(50mm,20mm) |<(8mm) atomfont:="cmr8"; - cv(<30,Ph,{2,5}:N,3:/NH2,4:/COOH) + \(<30,Ph,{2,5}:N,3:/NH2,4:/COOH) endfigm \end{mplibcode} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1304,30 +1273,32 @@ endfigm \begin{verbatim} mangle=0 ** default -cvat(0.2,0.5)(Ph) +@(0.2,0.5)\(Ph) mangle:=30; -cvat(0.8,0.5)(Ph) +@(0.8,0.5)\(Ph) \end{verbatim} %----------------------------------------- %% mangle \begin{mplibcode} beginfigm - fsize:=(50mm,15mm); - blength:=6mm; + #(50mm,15mm) |=(6mm) mangle:=0; - cvat(0.2,0.5)(Ph) + @(0.2,0.5)\(Ph) add(drawarrow((A1 shifted (aw,0)) rotated A1ang..A1);) mangle:=30; - cvat(0.8,0.5)(Ph) + @(0.8,0.5)\(Ph) add(drawarrow((A1 shifted (aw,0)) rotated A1ang..A1);) endfigm \end{mplibcode} %------------------------------------------------------------------------------ \subsection{Size/Ratio parameter} %----------------------------------------------------------------------------- -\subsubsection{Bond length} +\subsubsection{Bond length [ \textbar=() ]} \index{blength}% +\index{\textbar=()}% \begin{verbatim} +|=(n) : abbreviated form of blength:=n; + (fit to figure size) blength=0 ** default \end{verbatim} @@ -1336,8 +1307,8 @@ blength=0 ** default %%% blength=0 beginfigm sw_frame:=Bothside; - fsize:=(40mm,15mm); - cv(<30,Ph) + #(40mm,15mm); + \(<30,Ph) ext(pickup pencircle scaled 0.2pt; for i=0 upto w/mm: draw (i*mm,0)--(i*mm,-.5mm); endfor for i=0 upto h/mm: draw (0,i*mm)--(-.5mm,i*mm); endfor @@ -1357,9 +1328,8 @@ blength=60mm(width)*0.1=6mm %% 0<blength=<1 beginfigm sw_frame:=Bothside; - fsize:=(40mm,15mm); - blength:=0.1; - cv(<30,Ph) + #(40mm,15mm) |=(0.1) + \(<30,Ph) ext(pickup pencircle scaled 0.2pt; for i=0 upto w/mm: draw (i*mm,0)--(i*mm,-.5mm); endfor for i=0 upto h/mm: draw (0,i*mm)--(-.5mm,i*mm); endfor @@ -1379,9 +1349,8 @@ blength=9mm %%%% blength>1 beginfigm sw_frame:=Bothside; - fsize:=(40mm,15mm); - blength:=8mm; - cv(<30,Ph) + #(40mm,15mm) |=(8mm) + \(<30,Ph) ext(pickup pencircle scaled 0.2pt; for i=0 upto w/mm: draw (i*mm,0)--(i*mm,-.5mm); endfor for i=0 upto h/mm: draw (0,i*mm)--(-.5mm,i*mm); endfor @@ -1393,17 +1362,18 @@ endfigm %------------------------------------------------------------------------------ \subsubsection{Molecular size} \index{msize}% +\index{\#\#()}% \begin{verbatim} -msize=(1,1) ** default +##(1,1) : msize=(1,1) ** default +## p : abbreviated form of msize:=p; \end{verbatim} %--------------------------------------------- %% msize=(1) \begin{mplibcode} beginfigm sw_frame:=Bothside+Mol; - fsize:=(40mm,15mm); - msize:=(1,1); - cv(<30,Ph) + #(40mm,15mm) ##(1,1) + \(<30,Ph) ext(pickup pencircle scaled 0.2pt; for i=0 upto w/mm: draw (i*mm,0)--(i*mm,-.5mm); endfor for i=0 upto h/mm: draw (0,i*mm)--(-.5mm,i*mm); endfor @@ -1414,17 +1384,16 @@ endfigm \end{mplibcode} %----------------------------------------------------------- \begin{verbatim} -msize=(0.25,1) -msize=40mm-4mm*0.25=9mm +##(0.25,1) : msize=(0.25,1) +** msize=(40mm-4mm)*0.25=9mm \end{verbatim} %--------------------------------------------- %% msize=(0.25,1) \begin{mplibcode} beginfigm sw_frame:=Bothside+Mol; - fsize:=(40mm,15mm); - msize:=(0.25,1); - cv(<30,Ph) + #(40mm,15mm) ##(0.25,1) + \(<30,Ph) ext(pickup pencircle scaled 0.2pt; for i=0 upto w/mm: draw (i*mm,0)--(i*mm,-.5mm); endfor for i=0 upto h/mm: draw (0,i*mm)--(-.5mm,i*mm); endfor @@ -1435,16 +1404,15 @@ endfigm \end{mplibcode} %----------------------------------------------------------- \begin{verbatim} -msize=(11mm,11mm) +##(11mm,11mm) : msize=(11mm,11mm) \end{verbatim} %--------------------------------------------- %% msize=(11mm,11mm) \begin{mplibcode} beginfigm sw_frame:=Bothside+Mol; - fsize:=(40mm,15mm); - msize:=(11mm,11mm); - cv(<30,Ph) + #(40mm,15mm) ##(11mm,11mm) + \(<30,Ph) ext(pickup pencircle scaled 0.2pt; for i=0 upto w/mm: draw (i*mm,0)--(i*mm,-.5mm); endfor for i=0 upto h/mm: draw (0,i*mm)--(-.5mm,i*mm); endfor @@ -1457,46 +1425,42 @@ endfigm \subsubsection{Molecular position} \index{mposition}% \begin{verbatim} -mposition=(0.5,0.5) ** default +@(0.5,0.5) : mposition=(0.5,0.5) **default \end{verbatim} %--------------------------------------------- %% mposition \begin{mplibcode} beginfigm sw_frame:=Bothside+Mol; - fsize:=(40mm,15mm); - msize:=(1,0.8); - mposition:=(0.5,0.5); - cv(<30,Ph) + #(40mm,15mm) ##(1,0.8) + @(0.5,0.5); + \(<30,Ph) endfigm \end{mplibcode} %-------------------------------------------------------------- \begin{verbatim} -mposition=(1,0) +@(1,0) : mposition=(1,0) \end{verbatim} %--------------------------------------------- %% mposition \begin{mplibcode} beginfigm sw_frame:=Bothside+Mol; - fsize:=(40mm,15mm); - msize:=(1,0.8); - mposition:=(1,0); - cv(<30,Ph) + #(40mm,15mm) ##(1,0.8) + @(1,0); + \(<30,Ph) endfigm \end{mplibcode} %-------------------------------------------------------------- \begin{verbatim} -mposition=(10mm,4mm) +@(10mm,4mm) : mposition=(10mm,4mm) \end{verbatim} %--------------------------------------------- \begin{mplibcode} beginfigm sw_frame:=sw_frame+Mol; - fsize:=(40mm,15mm); - msize:=(1,0.8); - mposition:=(10mm,4mm); - cv(<30,Ph) + #(40mm,15mm) ##(1,0.8) @(10mm,4mm) + \(<30,Ph) ext(drawdot p1 withpen pencircle scaled 3pt; pickup pencircle scaled 0.2pt; for i=0 upto w/mm: draw (i*mm,0)--(i*mm,-.5mm); endfor @@ -1509,21 +1473,23 @@ endfigm %------------------------------------------------------------------------------ \subsection{Size parameter} %----------------------------------------------------------------------------- -\subsubsection{Figure size} +\subsubsection{Figure size [ \#(){ }]} \index{fsize}% +\index{\#()}% \begin{verbatim} fsize=(figure width,figure height) ** default: (30mm,20mm) +# p : abbreviated form of fsize:=p; -fsize=(40mm,15mm) +#(40mm,15mm) : fsize=(40mm,15mm) \end{verbatim} %--------------------------------------------- %% Figure size \begin{mplibcode} beginfigm - fsize:=(40mm,12mm); sw_frame:=Outside; - cv(<30,Ph) + #(40mm,12mm); + \(<30,Ph) ext(pickup pencircle scaled 0.2pt; for i=0 upto w/mm: draw (i*mm,0)--(i*mm,-.5mm); endfor for i=0 upto h/mm: draw (0,i*mm)--(-.5mm,i*mm); endfor @@ -1533,22 +1499,23 @@ beginfigm endfigm \end{mplibcode} %----------------------------------------------------------------------------- -\subsubsection{Figure margin} +\subsubsection{Figure margin [ \#@(){ }]} \index{fmargin}% +\index{\#"@()}% \begin{verbatim} fmargin=(margin left rigth,top bottom) ** default: (0.4mm,0.4mm) +#@ p : abbreviated form of fmargin:=p; -fmargin=(10mm,2mm) +#@(10mm,2mm) : fmargin=(10mm,2mm) \end{verbatim} %--------------------------------------------- %% fmargin \begin{mplibcode} beginfigm - fsize:=(40mm,12mm); sw_frame:=Bothside+Mol; - fmargin:=(10mm,2mm); - cv(<30,Ph) + #(40mm,12mm) #@(10mm,2mm) + \(<30,Ph) ext(pickup pencircle scaled 0.2pt; for i=0 upto w/mm: draw (i*mm,0)--(i*mm,-.5mm); endfor for i=0 upto h/mm: draw (0,i*mm)--(-.5mm,i*mm); endfor @@ -1568,10 +1535,10 @@ default: offset_thickness=0.2pt %%offset_thickness \begin{mplibcode} beginfigm - fsize:=(60mm,12mm); - offset_thickness:=0.0pt; cvat(0.1,0.5)(<30,Ph) - offset_thickness:=0.2pt; cvat(0.55,0.5)(<30,Ph) - offset_thickness:=0.5pt; cvat(1,0.5)(<30,Ph) + #(60mm,12mm); + offset_thickness:=0.0pt; @(0.1,0.5)\(<30,Ph) + offset_thickness:=0.2pt; @(0.55,0.5)\(<30,Ph) + offset_thickness:=0.5pt; @(1,0.5)\(<30,Ph) ext(defaultscale:=0.6; labeloffset:=1bp; label.urt("0.0pt",(0,1bp)); label.urt("0.2pt",(0.36w,1bp)); @@ -1588,10 +1555,10 @@ default: offset_bond_gap=0.3pt %--------------------------------------------- \begin{mplibcode} beginfigm - fsize:=(60mm,12mm); - offset_bond_gap:=0.0pt; cvat(0.1, 0.5)(<30,Ph) - offset_bond_gap:=0.3pt; cvat(0.55,0.5)(<30,Ph) %<<== default - offset_bond_gap:=1.0pt; cvat(1, 0.5)(<30,Ph) + #(60mm,12mm); + offset_bond_gap:=0.0pt; @(0.1, 0.5)\(<30,Ph) + offset_bond_gap:=0.3pt; @(0.55,0.5)\(<30,Ph) %<<== default + offset_bond_gap:=1.0pt; @(1, 0.5)\(<30,Ph) ext(defaultscale:=0.6; labeloffset:=1bp; label.urt("0.0pt",(0,1bp)); label.urt("0.3pt",(0.36w,1bp)); @@ -1608,10 +1575,10 @@ default: offset_atom=0.8pt %--------------------------------------------- \begin{mplibcode} beginfigm - fsize:=(60mm,12mm); - offset_atom:=0.0pt; cvat(0.1, .5)(<30,?6,3:O) - offset_atom:=0.8pt; cvat(.55, .5)(<30,?6,3:O) %<<== default - offset_atom:=2.0pt; cvat(1, .5)(<30,?6,3:O) + #(60mm,12mm); + offset_atom:=0.0pt; @(0.1, .5)\(<30,?6,3:O) + offset_atom:=0.8pt; @(.55, .5)\(<30,?6,3:O) %<<== default + offset_atom:=2.0pt; @(1, .5)\(<30,?6,3:O) ext(defaultscale:=0.6; labeloffset:=1bp; label.urt("0.0pt",(0,1bp)); label.urt("0.8pt",(0.36w,1bp)); @@ -1628,10 +1595,10 @@ default: offset_wedge=0.4pt %--------------------------------------------- \begin{mplibcode} beginfigm - fsize:=(60mm,12mm); - offset_wedge:=0.0pt; cvat(0.1,0.5)(<30,?6,5:*/_) - offset_wedge:=0.4pt; cvat(0.55,0.5)(<30,?6,5:*/_) %<<== default - offset_wedge:=1.0pt; cvat(1, 0.5)(<30,?6,5:*/_) + #(60mm,12mm); + offset_wedge:=0.0pt; @(0.1,0.5)\(<30,?6,5:*/_) + offset_wedge:=0.4pt; @(0.55,0.5)\(<30,?6,5:*/_) %<<== default + offset_wedge:=1.0pt; @(1, 0.5)\(<30,?6,5:*/_) ext(defaultscale:=0.6; labeloffset:=1bp; label.urt("0.0pt",(0,1bp)); label.urt("0.4pt",(0.36w,1bp)); @@ -1640,23 +1607,25 @@ beginfigm endfigm \end{mplibcode} %----------------------------------------------------------------------------- -\subsubsection{Max bond length} +\subsubsection{Max bond length [ \textbar\textless=(){ }]} \index{max\_blength}% +\index{\textbar\textless()}% \begin{verbatim} +|<(n): abbreviated form of max_blength:=n; default: max_blength=10mm \end{verbatim} %--------------------------------------------- \begin{mplibcode} beginfigm - fsize:=(60mm,20mm); + #(60mm,12mm) sw_frame:=sw_frame+Mol; - max_blength:=5mm; cvat(0, .5)(<30,Ph) - max_blength:=8mm; cvat(.4,.5)(<30,Ph) - max_blength:=10mm; cvat(1, .5)(<30,Ph) %<<== default + |<(5mm) @(0, .5)\(<45,?4) + |<(8mm) @(.4,.5)\(<45,?4) + |<(10mm) @(1, .5)\(<45,?4) %<<== default ext(defaultscale:=0.6; labeloffset:=1bp; - label("5mm", (0.1w,0.5h)); + label("5mm", (0.075w,0.5h)); label("8mm", (0.42w,0.5h)); - label("10mm",(0.82w,0.5h)); + label("10mm",(0.88w,0.5h)); ) endfigm \end{mplibcode} @@ -1671,10 +1640,10 @@ default: ratio_thickness_bond=0.015 %--------------------------------------------- \begin{mplibcode} beginfigm - fsize:=(60mm,12mm); - ratio_thickness_bond:=0.005; cvat(0.1,0.5)(<30,Ph) - ratio_thickness_bond:=0.015; cvat(.55,0.5)(<30,Ph) %<<== default - ratio_thickness_bond:=0.03; cvat(1, 0.5)(<30,Ph) + #(60mm,12mm); + ratio_thickness_bond:=0.005; @(0.1,0.5)\(<30,Ph) + ratio_thickness_bond:=0.015; @(.55,0.5)\(<30,Ph) %<<== default + ratio_thickness_bond:=0.03; @(1, 0.5)\(<30,Ph) ext(defaultscale:=0.6; labeloffset:=1bp; label.urt("0.005",(0,1bp)); label.urt("0.015",(0.36w,1bp)); @@ -1691,10 +1660,10 @@ default: ratio_char_bond=1.5 %--------------------------------------------- \begin{mplibcode} beginfigm - fsize:=(60mm,12mm); - ratio_char_bond:=1.0; cvat(0, .5)(<30,?6,6:O,3:NH) - ratio_char_bond:=1.5; cvat(.5, .5)(<30,?6,6:O,3:NH) %<<== default - ratio_char_bond:=2.0; cvat( 1, .5)(<30,?6,6:O,3:NH) + #(60mm,12mm) + ratio_char_bond:=1.0; @(0, 0.5)\(<30,?6,6:O,3:NH) + ratio_char_bond:=1.5; @(.5,0.5)\(<30,?6,6:O,3:NH) %<<== default + ratio_char_bond:=2.0; @( 1,0.5)\(<30,?6,6:O,3:NH) ext(defaultscale:=0.6; labeloffset:=1bp; label.urt("1.0",(0,1bp)); label.urt("1.5",(0.36w,1bp)); @@ -1711,10 +1680,10 @@ default: ratio_bondgap_bond= 0.15 %--------------------------------------------- \begin{mplibcode} beginfigm - fsize:=(60mm,12mm); - ratio_bondgap_bond:=0.10; cvat(0.1, .5)(<30,Ph) - ratio_bondgap_bond:=0.15; cvat(.55, .5)(<30,Ph) %<<== default - ratio_bondgap_bond:=0.20; cvat(1 , .5)(<30,Ph) + #(60mm,12mm); + ratio_bondgap_bond:=0.10; @(0.1,0.5)\(<30,Ph) + ratio_bondgap_bond:=0.15; @(.55,0.5)\(<30,Ph) %<<== default + ratio_bondgap_bond:=0.20; @(1 ,0.5)\(<30,Ph) ext(defaultscale:=0.6; labeloffset:=1bp; label.urt("0.10",(0,1bp)); label.urt("0.15",(0.36w,1bp)); @@ -1731,10 +1700,10 @@ default: ratio_atom_bond= 0.36 %--------------------------------------------- \begin{mplibcode} beginfigm - fsize:=(60mm,12mm); - ratio_atom_bond:=0.25; cvat(0.1, .5)(<30,?6,3:O) - ratio_atom_bond:=0.33; cvat(.55, .5)(<30,?6,3:O) %<<== default - ratio_atom_bond:=0.45; cvat(1, .5)(<30,?6,3:O) + #(60mm,12mm); + ratio_atom_bond:=0.25; @(0.1,0.5)\(<30,?6,3:O) + ratio_atom_bond:=0.33; @(.55,0.5)\(<30,?6,3:O) %<<== default + ratio_atom_bond:=0.45; @(1, 0.5)\(<30,?6,3:O) ext(defaultscale:=0.6; labeloffset:=1bp; label.urt("0.25",(0,1bp)); label.urt("0.33",(0.36w,1bp)); @@ -1751,10 +1720,10 @@ default: ratio_wedge_bond=0.12 %------------------------------------------------------ \begin{mplibcode} beginfigm - fsize:=(70mm,12mm); - ratio_wedge_bond:=0.1; cvat(0.05,.5)(?6,4:*/_) - ratio_wedge_bond:=0.12; cvat(.55, .5)(?6,4:*/_) %<<== default - ratio_wedge_bond:=0.2; cvat(1 , .5)(?6,4:*/_) + #(70mm,12mm); + ratio_wedge_bond:=0.1; @(0.05,.5)\(?6,4:*/_) + ratio_wedge_bond:=0.12; @(.55, .5)\(?6,4:*/_) %<<== default + ratio_wedge_bond:=0.2; @(1 , .5)\(?6,4:*/_) ext(defaultscale:=0.6; labeloffset:=1bp; label.urt("0.10",(0,1bp)); label.urt("0.12",(0.36w,1bp)); @@ -1772,12 +1741,12 @@ default: ratio_atomgap_atom= 0.050 %------------------------------------------------------ \begin{mplibcode} beginfigm - readm("<30,!2`0.5,2:O") - fsize:=(70mm,12mm); + ''("<30,!2`0.5,2:O") + #(70mm,12mm) sw_frame:=sw_frame+Atom; - ratio_atomgap_atom:=0.00; cvat(0, .5)(scantokens(mc)) - ratio_atomgap_atom:=0.050; cvat(.5,.5)(scantokens(mc)) %<<== default - ratio_atomgap_atom:=0.12; cvat(1, .5)(scantokens(mc)) + ratio_atomgap_atom:=0.00; @(0, .5)\(scantokens(mc)) + ratio_atomgap_atom:=0.050; @(.5,.5)\(scantokens(mc)) %<<== default + ratio_atomgap_atom:=0.12; @(1, .5)\(scantokens(mc)) ext(defaultscale:=0.75; labeloffset:=1bp; label.urt("0.00",(0.05w,1bp)); label.urt("0.05",(0.45w,1bp)); @@ -1794,10 +1763,10 @@ default: ratio_chain_ring= 0.66 %------------------------------------------------------ \begin{mplibcode} beginfigm - fsize:=(70mm,12mm); - ratio_chain_ring:= 0.4; cvat(0.05,.5)(<30,?6,4:/!) - ratio_chain_ring:= 0.66; cvat(.45, .5)(<30,?6,4:/!) %<<== default - ratio_chain_ring:= 1; cvat(1, .5)(<30,?6,4:/!) + #(70mm,12mm); + ratio_chain_ring:= 0.4; @(0.05,.5)\(<30,?6,4:/!) + ratio_chain_ring:= 0.66; @(.45, .5)\(<30,?6,4:/!) %<<== default + ratio_chain_ring:= 1; @(1, .5)\(<30,?6,4:/!) ext(defaultscale:=0.6; labeloffset:=1bp; label.urt("0.40",(0,1bp)); label.urt("0.66",(0.3w,1bp)); @@ -1814,11 +1783,11 @@ default: ratio_hashgap_bond=0.12 %------------------------------------------------------ \begin{mplibcode} beginfigm - readm("<30,!2,2:/*_`1.5") - fsize:=(70mm,15mm); - ratio_hashgap_bond:=0.06; cvat(0.08,.5)(scantokens(mc)) - ratio_hashgap_bond:=0.12; cvat( .55,.5)(scantokens(mc)) %<<== default - ratio_hashgap_bond:=0.20; cvat(1, .5)(scantokens(mc)) + ''("<30,!2,2:/*_`1.5") + #(70mm,15mm) + ratio_hashgap_bond:=0.06; @(0.08,.5)\(scantokens(mc)) + ratio_hashgap_bond:=0.12; @( .55,.5)\(scantokens(mc)) %<<== default + ratio_hashgap_bond:=0.20; @(1, .5)\(scantokens(mc)) ext(defaultscale:=0.6; labeloffset:=1bp; label.urt("0.06",(0,1bp)); label.urt("0.12",(0.4w,1bp)); @@ -1843,15 +1812,15 @@ numbering_end:=8; default: sw_numbering=0 sw_numbering:=Atom; -cv(<-30,!9) +\(<-30,!9) \end{verbatim} %------------------------------------------------------ \begin{mplibcode} beginfigm - fsize:=(60mm,10mm); + #(60mm,10mm); ratio_chain_ring:=1; numbering_start:=3; numbering_end:=8; - sw_numbering:=Atom; cv(<-30,!9) + sw_numbering:=Atom; \(<-30,!9) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -1866,15 +1835,15 @@ numbering_end:=8; default: sw_numbering=0 sw_numbering:=Bond; -cv(<-30,!9) +\(<-30,!9) \end{verbatim} %------------------------------------------------------ \begin{mplibcode} beginfigm - fsize:=(60mm,10mm); + #(60mm,10mm); ratio_chain_ring:=1; numbering_start:=3; numbering_end:=8; - sw_numbering:=Bond; cv(<-30,!9) + sw_numbering:=Bond; \(<-30,!9) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -1882,53 +1851,52 @@ endfigm \index{sw\_trimming}% \begin{verbatim} sw_trimming:=0; ** default -msize:=(1,0.7); -cvat(0.2,0.3)(Ph) -cvat(0.8,0.7)(Ph) +##(1,0.7) +@(0.2,0.3)\(Ph) +@(0.8,0.7)\(Ph) \end{verbatim} %------------------------------------------------------ \begin{mplibcode} beginfigm - fsize:=(60mm,20mm); + #(60mm,20mm) ##(1,.7) sw_frame:=Bothside+Mol; - msize:=(1,.7); cvat(.2,.3)(Ph) - cvat(.8,.7)(Ph) + @(.2,.3)\(Ph) + @(.8,.7)\(Ph) endfigm \end{mplibcode} %------------------------------------------------------ \begin{verbatim} sw_trimming:=1; -cvat(0.2,0.3)(Ph) -cvat(0.8,0.7)(Ph) +@(0.2,0.3)\(Ph) +@(0.8,0.7)\(Ph) \end{verbatim} %------------------------------------------------------ \begin{mplibcode} beginfigm - fsize:=(60mm,20mm); + #(60mm,20mm) ##(1,.7) sw_frame:=Bothside+Mol; sw_trimming:=1; - msize:=(1,.7); - cvat(.2,.3)(Ph) - cvat(.8,.7)(Ph) + @(.2,.3)\(Ph) + @(.8,.7)\(Ph) endfigm \end{mplibcode} %----------------------------------------------------------------------------- \subsubsection{Expand mode} \index{sw\_expand}% \begin{verbatim} -cvat(0, .5)(<30,Ph,4:/COOH,3:/NH2) +@(0, .5)\(<30,Ph,4:/COOH,3:/NH2) sw_expand:=1; -cvat(1, .5)(<30,Ph,4:/COOH,3:/NH2) +@(1, .5)\(<30,Ph,4:/COOH,3:/NH2) ** default: sw_expand=0 \end{verbatim} %------------------------------------------------------ \begin{mplibcode} beginfigm - readm("<30,Ph,4:/COOH,3:/NH2") - fsize:=(60mm,20mm); - cvat(0, .5)(scantokens(mc)) + ''("<30,Ph,4:/COOH,3:/NH2") + #(60mm,20mm) + @(0, .5)\(scantokens(mc)) sw_expand:=1; - cvat(1, .5)(scantokens(mc)) + @(1, .5)\(scantokens(mc)) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -1941,11 +1909,11 @@ endfigm %------------------------------------------------------ \begin{mplibcode} beginfigm - readm("<30,Ph,4:/Cl,3:/F") - fsize:=(60mm,12mm); - cvat(.15, .5)(scantokens(mc)) + ''("<30,Ph,4:/Cl,3:/F") + #(60mm,12mm) + @(.15, .5)\(scantokens(mc)) sw_abbreviate:=Group; - cvat(.85, .5)(scantokens(mc)) + @(.85, .5)\(scantokens(mc)) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -1958,11 +1926,11 @@ endfigm %------------------------------------------------------ \begin{mplibcode} beginfigm - readm("<30,Ph,4:/Cl,3:/F") - fsize:=(60mm,12mm); - cvat(.15, .5)(scantokens(mc)) + ''("<30,Ph,4:/Cl,3:/F") + #(60mm,12mm) + @(.15, .5)\(scantokens(mc)) sw_abbreviate:=Bond; - cvat(.85, .5)(scantokens(mc)) + @(.85, .5)\(scantokens(mc)) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -1982,10 +1950,9 @@ sw_frame=Outside %------------------------------------------------------ \begin{mplibcode} beginfigm - fsize:=(30mm,10mm); - fmargin:=(5mm,1.5mm); + #(30mm,10mm) #@(5mm,1.5mm) sw_frame:=Outside; - cv(<30,Ph) + \(<30,Ph) endfigm \end{mplibcode} %------------------------------------------------------ @@ -1996,10 +1963,9 @@ sw_frame=Inside %------------------------------------------------------ \begin{mplibcode} beginfigm - fsize:=(30mm,10mm); - fmargin:=(5mm,1.5mm); + #(30mm,10mm) #@(5mm,1.5mm) sw_frame:=Inside; - cv(<30,Ph) + \(<30,Ph) endfigm \end{mplibcode} %------------------------------------------------------ @@ -2010,10 +1976,9 @@ sw_frame=Bothside=Inside+Outside %------------------------------------------------------ \begin{mplibcode} beginfigm - fsize:=(30mm,10mm); - fmargin:=(5mm,1.5mm); + #(30mm,10mm) #@(5mm,1.5mm) sw_frame:=Bothside; - cv(<30,Ph) + \(<30,Ph) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -2027,10 +1992,9 @@ sw_frame=Mol \begin{mplibcode} beginfigm sw_frame:=Outside; - fsize:=(40mm,11mm); - msize:=(1,1); + #(40mm,11mm) ##(1,1) sw_frame:=sw_frame+Mol; - cv(<30,Ph) + \(<30,Ph) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -2040,14 +2004,14 @@ endfigm sw_frame=Atom ** default: sw_frame=0 -cv(<30,COOH,!,COOH) +\(<30,COOH,!,COOH) \end{verbatim} %--------------------------------------------- \begin{mplibcode} beginfigm - fsize:=(60mm,10mm); + #(60mm,10mm); sw_frame:=sw_frame+Atom; - cv(<30,COOH,!,COOH) + \(<30,COOH,!,COOH) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -2057,16 +2021,16 @@ endfigm \index{endfigm}% \begin{verbatim} beginfigm - cv(Ph) + \(Ph) endfigm beginfigm %-------------------------- ratio_thickness_bond:=0.05; %-------------------------- - cv(Ph) + \(Ph) endfigm beginfigm - cv(Ph) + \(Ph) endfigm \end{verbatim} %------------------------------------------------------ @@ -2074,30 +2038,30 @@ endfigm \begin{mplibcode} fsize:=(15mm,12mm); beginfigm - cv(Ph) + \(Ph) endfigm beginfigm ratio_thickness_bond:=0.05; - cv(Ph) + \(Ph) endfigm beginfigm - cv(Ph) + \(Ph) endfigm \end{mplibcode} %----------------------------------------------------------------------------- \subsubsection{Global parameter setting} \begin{verbatim} beginfigm - cv(Ph) + \(Ph) endfigm %-------------------------- ratio_thickness_bond:=0.05; %-------------------------- beginfigm - cv(Ph) + \(Ph) endfigm beginfigm - cv(Ph) + \(Ph) endfigm \end{verbatim} %---------------------------------------------------- @@ -2106,22 +2070,23 @@ endfigm save_ratio:=ratio_thickness_bond; fsize:=(15mm,12mm); beginfigm - cv(Ph) + \(Ph) endfigm ratio_thickness_bond:=0.05; beginfigm - cv(Ph) + \(Ph) endfigm beginfigm - cv(Ph) + \(Ph) endfigm ratio_thickness_bond:=save_ratio; \end{mplibcode} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \section{Command} %----------------------------------------------------------------------------- -\subsection{cv()} -\index{cv()}% +\subsection{drawm [ \textbackslash() ]} +\index{drawm}% +\index{\textbackslash()}% \begin{verbatim} (Draw molecule) @@ -2132,104 +2097,102 @@ a: ratio molecular width/figure width b: ratio molecular hight/figure hight c: x axis position d: y axis position +\(): abbreviated form of drawm() -beginfigm - cv(<30,Ph,3:/F,4:/Cl) -endfigm + drawm(<30,Ph,3:/F,4:/Cl) + \(<30,Ph,3:/F,4:/Cl) \end{verbatim} %------------------------------------------------ \begin{mplibcode} beginfigm - fmargin:=(0.5mm,0.5mm); - fsize:=(40mm,15mm); + #(40mm,15mm) #@(0.5mm,0.5mm) sw_frame:=Outside+Mol; - cv(<30,Ph,4:/Cl,3:/F) + \(<30,Ph,4:/Cl,3:/F) endfigm \end{mplibcode} %----------------------------------------------------------------------------- -\subsection{cvat()} -\index{cvat()}% +\subsection{readm() [ ''() ]} +\index{readm()}% +\index{''}% \begin{verbatim} -(Draw molecule at mposition) -cvat(c,d)(....) : - mposition:=(c,d); cv(....) - c: x axis position / d: y axis position +readm(string1,string2, ...); +** string = mcf code +''(): abbreviated form of readm() - cvat(0 ,0 )(?4) - cvat(0.5,0.5)(?5) - cvat(1 ,1 )(?6) +(example) +''("<30,Ph,{1,2,6}:/O!,{-4,-5}=?7,", + " {-1,-4,-6}=dl,-2://O,-3:/O!, ", + " @9,\,NH,!,//O,! ") \end{verbatim} -%--------------------------------------------- -\begin{mplibcode} -beginfigm - blength:=4mm; - fsize:=(60mm,12mm); - cvat(0 ,0 )(?4) - cvat(0.5,0.5)(?5) - cvat(1 ,1 )(?6) -endfigm -\end{mplibcode} %----------------------------------------------------------------------------- -\subsection{checkm()} +\subsection{checkm() [ \textbackslash*(){ }]} \index{checkm()}% +\index{\textbackslash*()}% \begin{verbatim} +\*(): abbreviated form of checkm() (immediately compile) -beginfigm cv(<30,Ph,2:N) endfigm +beginfigm \(<30,Ph,2:N) endfigm (check mcf and compile) beginfigm - readm("<30,Ph,}2:N") % ** extra '}' - if checkm(mc)=0: cv(scantokens(mc)) fi + ''("<30,Ph,}2:N") % ** extra '}' + if \*(mc)=0: \(scantokens(mc)) fi endfigm -** checkm(mc) : error count +** \*(mc) : error count \end{verbatim} %----------------------------------------------------- \quad \begin{mplibcode} beginfigm - readm("<30,Ph,2:N") + ''("<30,Ph,2:N") sw_trimming:=0; - fsize:=(12mm,12mm); - putm; + #(12mm,12mm); + \\ endfigm beginfigm - readm("<30,Ph,2):N") + ''("<30,Ph,2):N") sw_trimming:=0; - fsize:=(12mm,12mm); - putm; + #(12mm,12mm); + \\ endfigm \end{mplibcode} %----------------------------------------------------------------------------- -\subsection{getm()} +\subsection{getm() [ \$() ]} \index{getm()}% \index{ucount}% +\index{\$()}% \begin{verbatim} -getm(number): number=numeric -ucount: figure count +getm(number) +** number = numeric +** ucount = molecular data unit count +$() : abbreviated form of getm() for i=1 upto ucount: beginfigm - getm(i); % get data unit no=i - putm; % put figure + $(i) % get data unit no=i + \\ % put figure endfigm endfor getm("name"): "name"=string -loadm("EN<>*); beginfigm - getm("Adenine"); % get data EN="Adenine" - putm; % put figure + $("Adenine") % get data EN="Adenine" + \\ % put figure endfigm \end{verbatim} -\subsection{putm} +%------------------------------------------------------------------------------- +\subsection{putm [ \textbackslash\textbackslash{ }]} \index{putm}% +\index{\textbackslash\textbackslash}% \begin{verbatim} putm: put figure +\\ : abbreviated form of putm if op_row>=1: scantokens(op) fi if mc_row>=1: - if checkm(mc)=0: cv(scantokens(mc)) fi + if checkm(mc)=0: drawm(scantokens(mc)) + fi fi if ad_row>=1: add(scantokens(ad)) fi if ex_row>=1: ext(scantokens(ex)) fi @@ -2316,11 +2279,9 @@ lonepair r: ':' rotated r a /* b : point b of a beginfigm - fsize:=(70mm,40mm); + #(70mm,40mm) ##(.91,.9) |<(10mm) sw_frame:=sw_frame+Atom+Mol; - max_blength:=10mm; - msize:=(.91,.9); - cvat(.5,.85)(<30,?6,{2,5}:O) + @(.5,.85)\(<30,?6,{2,5}:O) add( defaultscale:=.8; labeloffset:=.3aw; @@ -2349,11 +2310,9 @@ endfigm %------------------------------------------------------------------------------ \begin{mplibcode} beginfigm - fsize:=(70mm,40mm); + #(70mm,40mm) ##(.91,.9) |<(10mm) sw_frame:=sw_frame+Atom+Mol; - max_blength:=10mm; - msize:=(.91,.9); - cvat(.5,.85)(<30,?6,{2,5}:O) + @(.5,.85)\(<30,?6,{2,5}:O) add( defaultscale:=.8; labeloffset:=.3aw; @@ -2382,10 +2341,9 @@ endfigm %------------------------------------------------------------------------------ \begin{verbatim} beginfigm - fsize:=(60mm,20mm); - msize:=(1,0.85); + #(60mm,20mm) ##(1,0.85) %--------------------------------------- - cvat(0,0)(<30,Ph,3=dl,4:/NH2) + @(0,0)\(<30,Ph,3=dl,4:/NH2) %--------------------------------------- add( labeloffset:=.7aw; @@ -2397,7 +2355,7 @@ beginfigm B3m..A3+B2up**1.5aw..{A3down}A3; ) %--------------------------------------- - cvat(1,0)(<30,?6,{1,5}=dl,4://NH2) + @(1,0)\(<30,?6,{1,5}=dl,4://NH2) %--------------------------------------- add( labeloffset:=.7aw; @@ -2413,10 +2371,9 @@ endfigm %------------------------------------------------------- \begin{mplibcode} beginfigm - fsize:=(70mm,20mm); - msize:=(1,0.85); + #(70mm,20mm) ##(1,0.85) %------------------------------------------- - cvat(0,0)(<30,Ph,3=dl,4:/NH2) + @(0,0)\(<30,Ph,3=dl,4:/NH2) %------------------------------------------- add(labeloffset:=.7aw; label.top(lonepair 90,A7); @@ -2424,7 +2381,7 @@ beginfigm drawarrow B3m..A3+B2up**1.5aw..{A3down}A3; ) %------------------------------------------- - cvat(1,0)(<30,?6,{1,5}=dl,4://NH2) + @(1,0)\(<30,?6,{1,5}=dl,4://NH2) %------------------------------------------- add(labeloffset:=.7aw; label.top(plus,A7); @@ -2465,10 +2422,9 @@ ratio_thickness_char: pen thickness / char width %---------------------------------------- beginfigm - fsize:=(70mm,30mm;); - blength:=0.065; + #(70mm,30mm) |=(0.065) %--------------------------------------- - cvat(0.1,0.5)( + @(0.1,0.5)\( <-210,60`1,60`1,60`1,{1,3}=dl, 1:/R1,4:/R2^-60 ) @@ -2476,12 +2432,12 @@ beginfigm defaultscale:=0.6; label.bot("Diene",p0+(0.5w,0)); ) - cvat(0.4,0.5)( + @(0.4,0.5)\( <-30,-60`1,1=dl,1:/R3,2:/R4^60) add(defaultscale:=0.6; label.bot("Dienophile",p0+(.5w,0)); ) - cvat(0.9,0.5)( + @(0.9,0.5)\( <30,?6,6=dl,2:/R2,3:/R4,4:/R3,5:/R1 ) %--------------------------------------- @@ -2499,10 +2455,9 @@ endfigm %------------------------------------------------------------------------------ \begin{mplibcode} beginfigm - fsize:=(70mm,30mm); - blength:=0.065; + #(70mm,30mm) |=(0.065) %--------------------------------------- - cvat(0.1,0.5)( + @(0.1,0.5)\( <-210,60`1,60`1,60`1,{1,3}=dl, 1:/R1,4:/R2^-60 ) @@ -2510,12 +2465,12 @@ beginfigm defaultscale:=0.6; label.bot("Diene",p0+(0.5w,0)); ) - cvat(0.4,0.5)( + @(0.4,0.5)\( <-30,-60`1,1=dl,1:/R3,2:/R4^60) add(defaultscale:=0.6; label.bot("Dienophile",p0+(.5w,0)); ) - cvat(0.9,0.5)( + @(0.9,0.5)\( <30,?6,6=dl,2:/R2,3:/R4,4:/R3,5:/R1 ) %--------------------------------------- @@ -2532,52 +2487,43 @@ endfigm \end{mplibcode} %----------------------------------------------------------------------------- \subsubsection{Local ext() setting} +\index{\_}% \begin{verbatim} +_s : abbreviated form of EN:=s; + beginfigm - EN:="?3"; - cvat(0.5,1)(<30,?3) + _"?3"@(0.5,1)\(<30,?3) endfigm beginfigm - EN:="?4"; - cvat(0.5,1)(?4) + _"?4"@(0.5,1)\(?4) %------------------------------- ext(label.top(EN,(0.5w,0));) %------------------------------- endfigm beginfigm - EN:="?5"; - cvat(0.5,1)(?5) + _"?5"@(0.5,1)\(?5) endfigm beginfigm - EN:="?6"; - cvat(0.5,1)(?6) + _"?6"@(0.5,1)\(?6) endfigm \end{verbatim} %---------------------------------------------------- \quad \begin{mplibcode} beginfigm - fsize:=(12mm,15mm); - EN:="?3"; - cvat(0.5,1)(<30,?3) + _"?3"#(12mm,15mm)@(0.5,1)\(<30,?3) endfigm beginfigm - fsize:=(12mm,15mm); - EN:="?4"; - cvat(0.5,1)(?4) + _"?4"#(12mm,15mm)@(0.5,1)\(?4) %------------------------------- ext(label.top(EN,(0.5w,0));) %------------------------------- endfigm beginfigm - fsize:=(12mm,15mm); - EN:="?5"; - cvat(0.5,1)(?5) + _"?5"#(12mm,15mm)@(0.5,1)\(?5) endfigm beginfigm - fsize:=(12mm,15mm); - EN:="?6"; - cvat(0.5,1)(?6) + _"?6"#(12mm,15mm)@(0.5,1)\(?6) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -2587,56 +2533,48 @@ endfigm ext_clear: reset global ext() beginfigm - EN:="?3"; - cvat(0.5,1)(<30,?3) + _"?3"@(0.5,1)\(<30,?3) endfigm %------------------------------- ext(label.top(EN,(0.5w,0));) %------------------------------- beginfigm - EN:="?4"; - cvat(0.5,1)(?4) + _"?4"@(0.5,1)\(?4) endfigm beginfigm - EN:="?5"; - cvat(0.5,1)(?5) + _"?5"@(0.5,1)\(?5) endfigm %--------- ext_clear; %--------- beginfigm - EN:="?6"; - cvat(0.5,1)(?6) + _"?6"@(0.5,1)\(?6) endfigm \end{verbatim} %------------------------------------- \quad \begin{mplibcode} beginfigm - fsize:=(12mm,15mm); - EN:="?3"; - cvat(0.5,1)(<30,?3) + _"?3"#(12mm,15mm) + @(0.5,1)\(<30,?3) endfigm %------------------------------- ext(label.top(EN,(0.5w,0));) %------------------------------- beginfigm - fsize:=(12mm,15mm); - EN:="?4"; - cvat(0.5,1)(?4) + _"?4"#(12mm,15mm) + @(0.5,1)\(?4) endfigm beginfigm - EN:="?5"; - fsize:=(12mm,15mm); - cvat(0.5,1)(?5) + _"?5"#(12mm,15mm) + @(0.5,1)\(?5) endfigm %--------- ext_clear; %--------- beginfigm - fsize:=(12mm,15mm); - EN:="?6"; - cvat(0.5,1)(?6) + _"?6"#(12mm,15mm) + @(0.5,1)\(?6) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -2645,20 +2583,20 @@ endfigm \onecolumn \section{Example} %----------------------------------------------------------------------------- -\subsection{cv() example} +\subsection{drawm() example} \paragraph{(Luciferin)} \begin{verbatim} beginfigm - fsize:=(50mm,15mm); - cv(<30,Ph,3=?5,@8,\,?5,{9,16}=dl,{9,14}:N,{7,11}:S,1:/OH,-2:*/COOH) + #(50mm,15mm) + \(<30,Ph,3=?5,@8,\,?5,{9,16}=dl,{9,14}:N,{7,11}:S,1:/OH,-2:*/COOH) endfigm \end{verbatim} %------------------------------------------- \begin{mplibcode} loadm("EN<>*"); beginfigm - fsize:=(50mm,15mm); - cv(<30,Ph,3=?5,@8,\,?5,{9,16}=dl,{9,14}:N,{7,11}:S,1:/OH,-2:*/COOH) + #(50mm,15mm) + \(<30,Ph,3=?5,@8,\,?5,{9,16}=dl,{9,14}:N,{7,11}:S,1:/OH,-2:*/COOH) endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -2667,24 +2605,22 @@ endfigm \paragraph{(Colchicine)} \begin{verbatim} beginfigm - readm( + ''( "<30,Ph,{1,2,6}:/O!,{-4,-5}=?7, ", " {-1,-4,-6}=dl,-2://O,-3:/O!, ", " @9,\,NH,!,//O,! ") - fsize:=(40mm,20mm); - putm; + #(40mm,20mm) \\ endfigm \end{verbatim} %--------------------------------------- % Colchicine MW:385.41 \begin{mplibcode} beginfigm - readm( + ''( "<30,Ph,{1,2,6}:/O!,{-4,-5}=?7, ", " {-1,-4,-6}=dl,-2://O,-3:/O!, ", " @9,\,NH,!,//O,! ") - fsize:=(40mm,20mm); - putm; + #(40mm,20mm) \\ endfigm \end{mplibcode} %----------------------------------------------------------------------------- @@ -2698,7 +2634,7 @@ arc_br : arc bottom right beginfigm %"EN:Maltose","MW:342.3", - readm( + ''( %---------------------------------------------------- "#1.25,-30~wf_r,30~bd_r`1,30~wb_r,120,O,30,&1,##, ", "#.5,{1^$-90,2^$90,3^$-90}:/OH,6^$90:/!OH, ", @@ -2706,15 +2642,14 @@ beginfigm "|,#1.25,-30~wf_r,30~bd_r`1,30~wb_r,120,O,30,&1,##, ", "#.5,{2^$90,3^$-90,4^$-90}:/OH,6^$90:/!OH ") %---------------------------------------------------- - fsize:=(50mm,20mm); - putm; + #(50mm,20mm) \\ endfigm \end{verbatim} %------------------------------------------------- \begin{mplibcode} beginfigm %"EN:Maltose","MW:342.3", - readm( + ''( %------------------------------------------------------- "#1.25,-30~wf_r,30~bd_r`1,30~wb_r,120,O,30,&1,##, ", "#.5,{1^$-90,2^$90,3^$-90}:/OH,6^$90:/!OH, ", @@ -2722,17 +2657,17 @@ beginfigm "|,#1.25,-30~wf_r,30~bd_r`1,30~wb_r,120,O,30,&1,##, ", "#.5,{2^$90,3^$-90,4^$-90}:/OH,6^$90:/!OH ") %------------------------------------------------------- - fsize:=(50mm,20mm); - putm; + #(50mm,20mm) \\ endfigm \end{mplibcode} %----------------------------------------------------------------------------- +\newpage \paragraph{(Erythromycin)} \begin{verbatim} beginfigm - EN:="Erythromycin"; MW:="733.93"; - fsize:=(60mm,30mm); mposition:=(1,0.5); - readm( + _"Erythromycin" MW:="733.93"; + #(60mm,30mm) @(1,0.5) + ''( %----------------------------------------------------------------------- "<30,#1,<-120,60,60,60,-60,60,60,-60,60,60,60,-60,60,60,##,&1, ", " 14:O,13:/*Et,{1,9}://O, ", @@ -2741,7 +2676,7 @@ beginfigm " @$3,\*,O,30~zb,|,?6`.7,6:O,#.5,{5~wf,3^35}:/_,4:/*OH,3^-35:/*O!,##, ", " @$5,\*^30`1.7,O,!~zb,|,?6`.7,6:O,#.5,5:/*_,2:*/OH,3:/*N?! ") %----------------------------------------------------------------------- - putm; + \\ ext(defaultscale:=0.8; label.lrt("EN: "&EN,(0,h)); label.lrt("fm: "&fm,(0,h-5mm)); @@ -2754,9 +2689,9 @@ endfigm; %%%% EN:Erythromycin MW:733.93 \begin{mplibcode} beginfigm - EN:="Erythromycin"; MW:="733.93"; - fsize:=(60mm,30mm); mposition:=(1,0.5); - readm( + _"Erythromycin" MW:="733.93"; + #(60mm,30mm) @(1,0.5) + ''( %----------------------------------------------------------------------- "<30,#1,<-120,60,60,60,-60,60,60,-60,60,60,60,-60,60,60,##,&1, ", " 14:O,13:/*Et,{1,9}://O, ", @@ -2765,7 +2700,7 @@ beginfigm " @$3,\*,O,30~zb,|,?6`.7,6:O,#.5,{5~wf,3^35}:/_,4:/*OH,3^-35:/*O!,##, ", " @$5,\*^30`1.7,O,!~zb,|,?6`.7,6:O,#.5,5:/*_,2:*/OH,3:/*N?! ") %----------------------------------------------------------------------- - putm; + \\ ext(defaultscale:=0.8; label.lrt("EN: "&EN,(0,h)); label.lrt("fm: "&fm,(0,h-5mm)); @@ -2779,20 +2714,20 @@ endfigm; \begin{verbatim} beginfigm % "EN:Paclitaxel","MW:853.918", - readm( + ''( %------------------------------------------------------------------ "?6,5=dl,@3,#1,36,45,45,45,45,##,&5,-4=?6,-4=?4,-1=wb,-3=wf,-1:O, ", " 4:??,6:/_,{3^-60,15}:*/OH,8:/*H^-60,9:*/_^60,10://O, ", " @1,\,O,!,//O,!,*/OH,!,/Ph,60~wf,NH,-60,//O,60,Ph, ", " @7,\*,O,-45,//O,60,Ph,11:*/OCO!>rl,12:/*OCO!^-15>lr ") %------------------------------------------------------------------ - fsize:=(140mm,30mm); - if checkm(mc)=0: - cvat(0,0.5)(scantokens(mc)) + #(140mm,30mm) + if \*(mc)=0: + @(0,0.5)\(scantokens(mc)) sw_numbering:=Atom; - cvat(0.6,0.5)(scantokens(mc)) + @(0.6,0.5)\(scantokens(mc)) sw_numbering:=Bond; - cvat(1,0.5)(scantokens(mc)) + @(1,0.5)\(scantokens(mc)) fi endfigm \end{verbatim} @@ -2800,17 +2735,17 @@ endfigm \begin{mplibcode} beginfigm % "EN:Paclitaxel","MW:853.918", - readm( + ''( %------------------------------------------------------------------- "?6,5=dl,@3,#1,36,45,45,45,45,##,&5,-4=?6,-4=?4,-1=wb,-3=wf,-1:O, ", " 4:??,6:/_,{3^-60,15}:*/OH,8:/*H^-60,9:*/_^60,10://O, ", " @1,\,O,!,//O,!,*/OH,!,/Ph,60~wf,NH,-60,//O,60,Ph, ", " @7,\*,O,-45,//O,60,Ph,11:*/OCO!>rl,12:/*OCO!^-15>lr ") %------------------------------------------------------------------- - fsize:=(160mm,40mm); - if checkm(mc)=0: cvat(0, 0.5)(scantokens(mc)) - sw_numbering:=Atom; cvat(0.5,0.5)(scantokens(mc)) - sw_numbering:=Bond; cvat(1, 0.5)(scantokens(mc)) + #(160mm,40mm) + if \*(mc)=0: @(0, 0.5)\(scantokens(mc)) + sw_numbering:=Atom; @(0.5,0.5)\(scantokens(mc)) + sw_numbering:=Bond; @(1, 0.5)\(scantokens(mc)) fi endfigm \end{mplibcode} @@ -2891,10 +2826,10 @@ MI : monoisotopic mass from data USE : the use \noindent% \begin{verbatim} beginfigm - getm("Chlorophyll a"); + $("Chlorophyll a") sw_output:=Fig+Calc+Mcode; - fsize:=(80mm,30mm); - cv(scantokens(mc)) + #(80mm,30mm) + \(scantokens(mc)) VerbatimTeX("\gdef\EN{"&EN&"}\gdef\MW{"&MW&"}"); VerbatimTeX("\gdef\mw{"&mw&"}\gdef\fm{"&fm&"}"); endfigm @@ -2905,10 +2840,10 @@ endfigm %------------------------------------------------------------------------------------ \begin{mplibcode} beginfigm - getm("Chlorophyll a"); + $("Chlorophyll a") sw_output:=Fig+Calc+Mcode; - fsize:=(80mm,30mm); - cv(scantokens(mc)) + #(80mm,30mm) + \(scantokens(mc)) VerbatimTeX("\gdef\EN{"&EN&"}\gdef\MW{"&MW&"}"); VerbatimTeX("\gdef\mw{"&mw&"}\gdef\fm{"&fm&"}"); endfigm @@ -2920,12 +2855,12 @@ endfigm \noindent% \begin{verbatim} beginfigm - getm("Okadaic acid"); - readm(",38:*/_,65=red") %%%% add methyl group (color red) %%%% + $("Okadaic acid") + ''(",38:*/_,65=red") %%%% add methyl group (color red) %%%% sw_output:=Fig+Calc+Mcode; %%%% output temp-mc.aux %%%% - EN:="Dinophysistoxin-1"; MW:="819"; - fsize:=(90mm,20mm); - if checkm(mc)=0: cv(scantokens(mc)) + _"Dinophysistoxin-1" #(90mm,20mm) + MW:="819"; + if \*(mc)=0: \(scantokens(mc)) VerbatimTeX("\gdef\EN{"&EN&"}\gdef\MW{"&MW&"}"); VerbatimTeX("\gdef\mw{"&mw&"}\gdef\fm{"&fm&"}"); fi @@ -2937,12 +2872,12 @@ endfigm; %---------------------------------------------------------------------------- \begin{mplibcode} beginfigm - getm("Okadaic acid"); - readm(",38:*/_,65=red") %%%% add methyl group (color red) %%%% + $("Okadaic acid") + ''(",38:*/_,65=red") %%%% add methyl group (color red) %%%% sw_output:=Fig+Calc+Mcode; %%%% output temp-mc.aux %%%% - EN:="Dinophysistoxin-1"; MW:="819"; - fsize:=(90mm,20mm); - if checkm(mc)=0: cv(scantokens(mc)) + MW:="819"; + _"Dinophysistoxin-1" #(90mm,20mm); + if \*(mc)=0: \(scantokens(mc)) VerbatimTeX("\gdef\EN{"&EN&"}\gdef\MW{"&MW&"}"); VerbatimTeX("\gdef\mw{"&mw&"}\gdef\fm{"&fm&"}"); fi @@ -2960,12 +2895,10 @@ endfigm; %-------------------------------------------------------------------------------- \begin{mplibcode} beginfigm - getm("Maitotoxin"); + $("Maitotoxin") #(150mm,80mm) #@(3mm,3mm) sw_output:=Fig+Calc+Mcode; %%%% output temp-mc.aux %%%% - fsize:=(150mm,80mm); - fmargin:=(3mm,3mm); sw_frame:=Outside; - if checkm(mc)=0: cv(scantokens(mc)) + if \*(mc)=0: \(scantokens(mc)) VerbatimTeX("\gdef\EN{"&EN&"}\gdef\MW{"&MW&"}"); VerbatimTeX("\gdef\mw{"&mw&"}\gdef\fm{"&fm&"}"); fi @@ -2978,10 +2911,10 @@ endfigm; %-------------------------------------------------------------------------------- \begin{mplibcode} beginfigm - getm("Maitotoxin"); + $("Maitotoxin") #(150mm,80mm) #@(3mm,3mm) sw_output:=Fig+Calc+Mcode; - fsize:=(150mm,80mm); fmargin:=(3mm,3mm); sw_frame:=Outside; %% mc_length:=40; - if checkm(mc)=0: cv(scantokens(mc)) + sw_frame:=Outside; %% mc_length:=40; + if \*(mc)=0: \(scantokens(mc)) VerbatimTeX("\gdef\EN{"&EN&"}\gdef\MW{"&MW&"}"); VerbatimTeX("\gdef\mw{"&mw&"}\gdef\fm{"&fm&"}"); fi @@ -2992,25 +2925,24 @@ endfigm; %-------------------------------------------------------------------------------- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \newpage -\subsection{cvat() example} +\subsection{User define parts example} \noindent% \begin{mplibcode} beginfigm -fsize:=(160mm,75mm); -max_blength:=5mm; +#(160mm,75mm) |<(5mm) %-------------------------------------------------------------------------------- COOH:='(//O,!,OH); HOCO:='(OH,!,//O,); -cvat(0.33, 1)(<30,HOCO,!,//O,!2,COOH) % Oxaloacetate -cvat(0.66, 1)(<30,HOCO,!4,COOH,@-4`1,\,COOH,4:/OH^-165) % Citrate -cvat(1, 1)(<30,HOCO,!2,!~dr,!,COOH,@-4`1,\,COOH) % cis-Aconitate -cvat(1, 0.58)(<30,HOCO,!4,COOH,@-4,\`1,COOH,5:/OH) % Isocitrate -cvat(1, 0.05)(<30,HOCO,!3,//O,!,COOH,@-4,\`1,COOH) % Oxalosuccinate -cvat(0.66,0.05)(<30,HOCO,!3,//O,!,COOH) % alfa-Ketoglutarate -cvat(0.33,0.05)(<30,HOCO,!3,//O,!,"{S-CoA}") % Succinyl-CoA -cvat(0, 0.05)(<30,HOCO,!3,COOH) % Succinate -cvat(0, 0.55)(<30,HOCO,!,!~dr,!,COOH) % Fumarate -cvat(0, 1)(<30,HOCO,!3,COOH,3:/OH) % L-Malate +@(0.33, 1)\(<30,HOCO,!,//O,!2,COOH) % Oxaloacetate +@(0.66, 1)\(<30,HOCO,!4,COOH,@-4`1,\,COOH,4:/OH^-165) % Citrate +@(1, 1)\(<30,HOCO,!2,!~dr,!,COOH,@-4`1,\,COOH) % cis-Aconitate +@(1, 0.58)\(<30,HOCO,!4,COOH,@-4,\`1,COOH,5:/OH) % Isocitrate +@(1, 0.05)\(<30,HOCO,!3,//O,!,COOH,@-4,\`1,COOH) % Oxalosuccinate +@(0.66,0.05)\(<30,HOCO,!3,//O,!,COOH) % alfa-Ketoglutarate +@(0.33,0.05)\(<30,HOCO,!3,//O,!,"{S-CoA}") % Succinyl-CoA +@(0, 0.05)\(<30,HOCO,!3,COOH) % Succinate +@(0, 0.55)\(<30,HOCO,!,!~dr,!,COOH) % Fumarate +@(0, 1)\(<30,HOCO,!3,COOH,3:/OH) % L-Malate %-------------------------------------------------------------------------------- ext( defaultfont:="uhvr8r"; defaultscale:=0.75; @@ -3064,19 +2996,19 @@ endfigm %------------------------------------------------------------------------ \begin{verbatim} beginfigm -fsize:=(160mm,75mm); -max_blength:=5mm; -COOH:='(//O,!,OH); HOCO:='(OH,!,//O,); -cvat(0.33, 1)(<30,HOCO,!,//O,!2,COOH) % Oxaloacetate -cvat(0.66, 1)(<30,HOCO,!4,COOH,@-4`1,\,COOH,4:/OH^-165) % Citrate -cvat(1, 1)(<30,HOCO,!2,!~dr,!,COOH,@-4`1,\,COOH) % cis-Aconitate -cvat(1, 0.58)(<30,HOCO,!4,COOH,@-4,\`1,COOH,5:/OH) % Isocitrate -cvat(1, 0.05)(<30,HOCO,!3,//O,!,COOH,@-4,\`1,COOH) % Oxalosuccinate -cvat(0.66,0.05)(<30,HOCO,!3,//O,!,COOH) % alfa-Ketoglutarate -cvat(0.33,0.05)(<30,HOCO,!3,//O,!,"{S-CoA}") % Succinyl-CoA -cvat(0, 0.05)(<30,HOCO,!3,COOH) % Succinate -cvat(0, 0.55)(<30,HOCO,!,!~dr,!,COOH) % Fumarate -cvat(0, 1)(<30,HOCO,!3,COOH,3:/OH) % L-Malate +#(160mm,75mm) |<(5mm) +COOH:='(//O,!,OH); % define COOH +HOCO:='(OH,!,//O,); % define HOCO +@(0.33, 1)\(<30,HOCO,!,//O,!2,COOH) % Oxaloacetate +@(0.66, 1)\(<30,HOCO,!4,COOH,@-4`1,\,COOH,4:/OH^-165) % Citrate +@(1, 1)\(<30,HOCO,!2,!~dr,!,COOH,@-4`1,\,COOH) % cis-Aconitate +@(1, 0.58)\(<30,HOCO,!4,COOH,@-4,\`1,COOH,5:/OH) % Isocitrate +@(1, 0.05)\(<30,HOCO,!3,//O,!,COOH,@-4,\`1,COOH) % Oxalosuccinate +@(0.66,0.05)\(<30,HOCO,!3,//O,!,COOH) % alfa-Ketoglutarate +@(0.33,0.05)\(<30,HOCO,!3,//O,!,"{S-CoA}") % Succinyl-CoA +@(0, 0.05)\(<30,HOCO,!3,COOH) % Succinate +@(0, 0.55)\(<30,HOCO,!,!~dr,!,COOH) % Fumarate +@(0, 1)\(<30,HOCO,!3,COOH,3:/OH) % L-Malate ext( defaultfont:="uhvr8r"; defaultscale:=0.75; ext_setup; @@ -3108,7 +3040,7 @@ endfigm \subsection{MetaPost souce file} \index{mcf2graph.mp}% \index{sw\_output}% -\index{cv()}% +\index{\textbackslash()}% \index{plus}% \index{getm()}% \index{putm}% @@ -3120,42 +3052,42 @@ input mcf2graph; > input main macro sw_output:=Info; % aux(information) file output on > global setting %%%% sw_output:=Report; > report output %%%% sw_output:=MOL2000; > MOL file output -fsize:=(60mm,40mm); % (figure width,figure height) > +#(60mm,40mm); % (figure width,figure height) > outputformat:="png"; hppp:=vppp:=0.1; > PNG output outputtemplate:="c%3c-%{EN_}.png"; > %------------------------------------------------------------------------------ beginfigm % EN:Ampicillin MW:349.405 - cv(<45,?4,-3=?5,2:N,7:S, > immediately compile + \(<45,?4,-3=?5,2:N,7:S, > immediately compile 3^45:/*H,1://O^15,5:/*COOH^-18,6:??, > @4,*\^15,NH,!,//O,!,/*NH2,!,Ph) > endfigm > %------------------------------------------------------------------------------ beginfigm % EN:Cholesterol MW:386.65 - readm( > read Mcode - ": <30,?6,{-4,-2}=?6,-4=?5,7=dl, ", > mc1 - ": 10:/*H^180,11:/*H^-60,17:/*H^-54, ", > mc2 - ": {4,12}:*/_^60, ", > mc3 - ": @-1,18,/*_,-60,!3,?! ") > mc4 - putm; > put figure + ''( > read Mcode + "<30,?6,{-4,-2}=?6,-4=?5,7=dl, ", > mc1 + "10:/*H^180,11:/*H^-60,17:/*H^-54, ", > mc2 + "{4,12}:*/_^60, ", > mc3 + "@-1,18,/*_,-60,!3,?! ") > mc4 + \\ > put figure endfigm > %------------------------------------------------------------------------------ loadm("EN<>*); > load all unit beginfigm - getm("Adenine"); > get EN=Adenine - putm; > ** put figure + $("Adenine") > get EN=Adenine + \\ > ** put figure endfigm > %------------------------------------------------------------------------------ beginfigm - getm(4); > select No.4 - putm; > put figure + $(4) > select No.4 + \\ > put figure endfigm > %------------------------------------------------------------------------------ for i=1 upto ucount: > figure count beginfigm - getm(i); > select No.i - putm; > put figure + $(i) > select No.i + \\ > put figure endfigm endfor %------------------------------------------------------------------------------ @@ -3425,11 +3357,11 @@ M END defaultsize:=8bp; defaultscale:=1; %-------------------------------------------------------- - fsize:=(50mm,50mm); EN:="Limonin"; MW="470.51"; beginfigm - readm( + #(50mm,50mm) + ''( %--------------------------------------- "<30,?6,{-3,-4}=?6, ", " -5=?3,-2=wf,-1=wb,6=?5,-4=?6,-5=wf, ", @@ -3438,23 +3370,23 @@ M END " {1^60,5^180,16^60}:/*H, ", " @14,\*,|,?5,{1,4}=dl,3:O ") %--------------------------------------- - putm; + \\ endfigm \end{mplibcode}\\ %-------------------------------------------------------------------- \begin{mplibcode} - fsize:=(80mm,50mm); EN:="beta-carotene"; MW:="536.87"; beginfigm - readm( + #(80mm,50mm) + ''( %----------------------------------------- "<30,?6,3=dl,{3,5^35,5^-35}:/_, ", " @4,\,|,!18,{1,3,5,7,9,11,13,15,17}=dr,", " {3,7,12,16}:/_, ", " |,?6,6=dl,{6,2^35,2^-35}:/_ ") %----------------------------------------- - putm; + \\ endfigm \end{mplibcode}\\ %-------------------------------------------------------------------- diff --git a/graphics/mcf2graph/template_soc.mp b/graphics/mcf2graph/template_soc.mp index 0c05bf332d..7354f51d48 100644 --- a/graphics/mcf2graph/template_soc.mp +++ b/graphics/mcf2graph/template_soc.mp @@ -14,12 +14,7 @@ sw_output:=Fig+Calc; %------------------------------------------------------------------------------ loadm("f:temp"); %------------------------------------------------------------------------------ -for i=1 upto ucount: - beginfigm - getm(i); - putm; - endfigm -endfor +for i=1 upto ucount: beginfigm $(i) \\ endfigm endfor %****************************************************************************** %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% bye diff --git a/graphics/pgf/contrib/tikz2d-fr/doc/tikz2d-fr-doc.pdf b/graphics/pgf/contrib/tikz2d-fr/doc/tikz2d-fr-doc.pdf Binary files differindex ee2cafa3bf..53cf19de19 100644 --- a/graphics/pgf/contrib/tikz2d-fr/doc/tikz2d-fr-doc.pdf +++ b/graphics/pgf/contrib/tikz2d-fr/doc/tikz2d-fr-doc.pdf diff --git a/graphics/pgf/contrib/tikz2d-fr/doc/tikz2d-fr-doc.tex b/graphics/pgf/contrib/tikz2d-fr/doc/tikz2d-fr-doc.tex index 50462633e1..b6b7f40490 100644 --- a/graphics/pgf/contrib/tikz2d-fr/doc/tikz2d-fr-doc.tex +++ b/graphics/pgf/contrib/tikz2d-fr/doc/tikz2d-fr-doc.tex @@ -4,12 +4,13 @@ \documentclass[french,a4paper,11pt]{article} \usepackage[margin=2cm,includefoot]{geometry} -\def\TPversion{0.1.0} -\def\TPdate{24 Mai 2023} +\def\TPversion{0.1.1} +\def\TPdate{28 Mai 2023} \usepackage[utf8]{inputenc} \usepackage[T1]{fontenc} \usepackage{amsmath,amssymb} \usepackage{tikz2d-fr} +\usepackage{tkz-euclide} \usepackage{awesomebox} \usepackage{fontawesome5} \usepackage{footnote} @@ -77,10 +78,10 @@ keywordstyle={\color{violet}},% classoffset=2,% alsoletter={-},% - morekeywords={\TracerSegments,\DefinirPoints,\DefinirPoint,\MarquerPoint,\MarquerPoints,mainlevee},% + morekeywords={\TracerSegments,\DefinirPoints,\DefinirPoint,\MarquerPoint,\MarquerPoints,mainlevee,\ImagePoint,\ImagesPoints},% keywordstyle={\color{green!50!black}},% classoffset=3,% - morekeywords={Cap,Style,Couleurs,Cycle,Join,line,cap,line,join,Suite,Couleurs,DecalLabel,StyleMarque,Couleur,Math},% + morekeywords={Cap,Style,Couleurs,Cycle,Join,line,cap,line,join,Suite,Couleurs,DecalLabel,StyleMarque,Couleur,Math,TaillePolice},% keywordstyle={\color{orange}} },% #1 @@ -94,9 +95,9 @@ \tcbset{vignetteMaJ/.style={% fontupper={\vphantom{pf}\footnotesize\ttfamily}, - vignettes,colframe=ForestGreen!50!black,coltitle=white,colback=purple!25,% + vignettes,colframe=purple!50!black,coltitle=white,colback=purple!10,% overlay={\begin{tcbclipinterior}% - \fill[fill=purple!75]($(interior.south west)$) rectangle node[rotate=90]{\tiny \sffamily{\textcolor{Black}{\scalebox{0.85}[0.75]{\textbf{MàJ}}}}} ($(interior.north west)+(5pt,0pt)$);% + \fill[fill=purple!75]($(interior.south west)$) rectangle node[rotate=90]{\tiny \sffamily{\textcolor{black}{\scalebox{0.66}[0.66]{\textbf{MàJ}}}}} ($(interior.north west)+(5pt,0pt)$);% \end{tcbclipinterior}} } } @@ -146,12 +147,20 @@ \vspace{0.25cm} -{$\blacktriangleright$~~Définir et marquer des points.} +{$\blacktriangleright$~~Définir des points par coordonnées.} + +\smallskip + +{$\blacktriangleright$~~Définir des points par transformations simples.} \smallskip {$\blacktriangleright$~~Tracer des segments, avec option(s) de couleurs.} +\smallskip + +{$\blacktriangleright$~~Marquer des points.} + \vspace{1cm} \begin{center} @@ -212,6 +221,8 @@ \part{Historique} +\verb|v0.1.1|~:~~~~Ajout d'une clé \Cle{[TaillePolice]} + Points définis par une transformation simple. + \verb|v0.1.0|~:~~~~Version initiale. \newpage @@ -228,6 +239,7 @@ Le package propose des commandes basiques -- francisées -- pour travailler sur \begin{itemize} \item de quoi simuler un tracé à \textit{main levée} ; \item de quoi définir des points (et donc des nœuds) via \textsf{nom/coordonnées/positionlabel} ; + \item \cmaj{0.1.1} de quoi définir des points images par des transformations simples ; \item de marquer des points (croix, disques) ; \item de quoi tracer des segments (enchaînés ou non) en spécifiant les couleurs éventuelles. \end{itemize} @@ -246,6 +258,18 @@ Ainsi, les éventuel points (nœuds) créés par \textsf{tikz2d-fr} seront réut On peut donc \textit{utiliser} le package \textsf{tikz2d-fr} comme \textit{base} de travail avant des choses plus poussées ! \end{importantblock} +\subsection{Autres solutions} + +\begin{importantblock} +À noter qu'il existe d'autres solutions graphiques, comme : + +\begin{itemize} + \item \textsf{\PSTricks} avec \textsf{pst-eucl}\footnotemark\footnotetext{\url{https://www.ctan.org/pkg/pst-eucl}} ; + \item \hologo{MetaPost} avec \textsf{ProfCollege} et son environnement \texttt{geometrie}\footnotemark\footnotetext{\url{https://www.ctan.org/pkg/profcollege}}. +\end{itemize} +\vspace*{-\baselineskip}\leavevmode +\end{importantblock} + \subsection{Chargement du package, packages utilisés} \begin{importantblock} @@ -351,12 +375,12 @@ Les valeurs \Cle{mainlevee=5mm et 0.6pt} donnent des résultats -- à mon sens - \pagebreak -\section{Définir des points} +\section{Définir des points par coordonnées} \subsection{Commandes} \begin{cautionblock} -Les commandes \textit{simplifiées} et \textit{francisées} disponible sont : +Les commandes \textit{simplifiées} et \textit{francisées} disponibles sont : \begin{itemize} \item \texttt{\textbackslash DefinirPoint} pour définir un point ; @@ -371,7 +395,7 @@ Les commandes \textit{simplifiées} et \textit{francisées} disponible sont : \begin{tikzpicture}[options tikz] %créer/placer/nommer un point \DefinirPoint(*)[clés]{noeud}{coordonnées}<label> - %créer/placer/nommer plusieurs points + %créer/placer/nommer plusieurs points, sans modification des labels ! \DefinirPoints(*)[clés]{liste} %marquer un point \MarquerPoint[clés]{point} @@ -391,6 +415,9 @@ L'argument optionnel et entre \texttt{[...]} propose les \Cle{clés} suivantes ( \begin{itemize} \item \Cle{PosLabel} pour préciser la position (francisée) du label pour les points ; \hfill{}défaut : \Cle{b} + \item \cmaj{0.1.1} \Cle{TaillePolice} pour spécifier la taille de la police du label ; + + \hfill{}défaut : \Cle{\textbackslash normalsize} \item \Cle{StyleMarque} parmi \Cle{x/o/+} pour spécifier le style de la marque des points ; \hfill{}défaut : \Cle{o} @@ -422,14 +449,15 @@ De manière un peu plus spécifique : \begin{itemize} \item le \texttt{<label>} pour la commande \texttt{\textbackslash DefinirPoint} est optionnel, et est identique à \texttt{\{nœud\}} ; - \item la \texttt{\{liste\}} pour la commande \texttt{\textbackslash DefinirPoints} est à donner -- par exemple -- sous la forme \texttt{A/2,0/bg B/50:2.5/hd}. + \item la \texttt{\{liste\}} pour la commande \texttt{\textbackslash DefinirPoints} est à donner -- par exemple -- sous la forme \texttt{A/xa,ya/poslabel B/alpha:r/poslabel ...}. \end{itemize} \vspace*{-\baselineskip}\leavevmode \end{tipblock} \begin{DemoCode}[] \begin{tikzpicture} - \DefinirPoints{A/0,0/ B/4,0/ C/3,2/} + \DefinirPoint{A}{0,0} + \DefinirPoints{B/4,0/ C/3,2/} \DefinirPoints[Math]{H_1/-1,2.5/} \MarquerPoints{A,B,C,H_1} \end{tikzpicture} @@ -438,7 +466,7 @@ De manière un peu plus spécifique : \begin{DemoCode}[] \begin{tikzpicture} \DefinirPoints[DecalLabel=1pt,Couleur=blue,Math]{A/0,0/bg B/4,0/bd} - \DefinirPoints[DecalLabel=1pt,Couleur=red]{C/3,2/h} + \DefinirPoints[DecalLabel=1pt,Couleur=red,TaillePolice=\LARGE]{C/3,2/h} \MarquerPoints[StyleMarque=x,Couleur=violet]{A} \MarquerPoints[Couleur=orange]{B} \MarquerPoint[StyleMarque=+,Couleur=red]{C} @@ -447,6 +475,158 @@ De manière un peu plus spécifique : \pagebreak +\section{Définir des points par transformation} + +\subsection{Commandes} + +\begin{cautionblock} +\cmaj{0.1.1} Les commandes \textit{simplifiées} et \textit{francisées} disponibles sont : + +\begin{itemize} + \item \texttt{\textbackslash ImagePoint} pour définir un point par transformation ; + \item \texttt{\textbackslash ImagesPoints} pour définir des points par transformation. +\end{itemize} +\vspace*{-\baselineskip}\leavevmode +\end{cautionblock} + +\begin{noteblock} +Les \textit{transformations} disponibles sont (l'écriture \textit{mathématique} sert à illustrer la syntaxe \LaTeX{} utilisée) : + +\begin{itemize} + \item les translations glissées $t(A)=A+k\times\vec{u}$ ; + \item les rotations $r(A)=A+{\text{rot}}(\Omega,\theta)$ ; + \item les symétries centrales $s(A)=A+{\text{sym}}(I)$. +\end{itemize} +\end{noteblock} + +\begin{DemoCode}[listing only] +\begin{tikzpicture}[options tikz] + %création des points utiles + \DefinirPoint... \DefinirPoints + %point défini par une transformation + \ImagePoint(*)[clés]{formule}<label point> + %points définis par des transformations, sans modification des labels ! + \ImagesPoints(*)[clés]{formule § formule § ...} +\end{tikzpicture} +\end{DemoCode} + +\begin{DemoCode}[listing only] +\begin{tikzpicture}[options tikz] + %création des points utiles + \DefinirPoint... + %point défini par une translation glissée + \ImagePoint(*)[clés]{PtArr=PTDep+t(k,DebVect>FinVect)} +\end{tikzpicture} +\end{DemoCode} + +\hfill +\begin{tikzpicture} + \draw[thin,lightgray] (-2,-1) grid (5,3) ; + \DefinirPoints{A/0,0/} + \DefinirPoints*{K/-1,1/ L/2,2/} + \draw[semithick,->,>=latex] (K)--(L) node[midway,sloped,above] {$\vec{u}$} ; + \ImagePoint[Math]{A'=A+t(1.5,K>L)} + \draw[semithick,->,>=latex,gray,dashed] (A)--(A') node[midway,sloped,below] {$k\times\vec{u}$} ; + \MarquerPoints{A,A'} +\end{tikzpicture} +\hfill~ + +\begin{DemoCode}[listing only] +\begin{tikzpicture}[options tikz] + %création des points utiles + \DefinirPoint... + %point défini par une rotation + \ImagePoint{PtArr=PTDep+r(centre,angle)} + %point défini par une symétrie centrale +\end{tikzpicture} +\end{DemoCode} + +\hfill +\begin{tikzpicture} + \draw[thin,lightgray] (-2,0) grid (4,4) ; + \DefinirPoint[Math]{Omega}{0,1}<\Omega> + \DefinirPoint{A}{3,0.5} + \ImagePoint[Math]{A'=A+r(Omega,55)} + \draw[semithick,->,>=latex,gray,dashed] (Omega)--(A) ; + \draw[semithick,->,>=latex,gray,dashed] (Omega)--(A') ; + \tkzPicAngle["$\mathcolor{gray}{\alpha}$",draw=gray,<->,angle eccentricity=1.2,angle radius=1cm](A,Omega,A') + \MarquerPoints{Omega,A,A'} +\end{tikzpicture} +\hfill~ + +\begin{DemoCode}[listing only] +\begin{tikzpicture}[options tikz] + %création des points utiles + \DefinirPoint... + \ImagePoint{PtArr=PTDep+s(centre)} +\end{tikzpicture} +\end{DemoCode} + +\hfill +\begin{tikzpicture} + \draw[thin,lightgray] (-4,-1) grid (5,2) ; + \DefinirPoints{A/4,1/ I/0.5,0.5/} + \ImagePoint[Math]{A'=A+s(I)} + \draw[semithick,->,>=latex,gray,dashed] (I)--(A) node[midway,sloped] {$/\!/$} ; + \draw[semithick,->,>=latex,gray,dashed] (I)--(A') node[midway,sloped] {$/\!/$} ; + \MarquerPoints{A,I,A'} +\end{tikzpicture} +\hfill~ + +\subsection{Clés, options et arguments} + +\begin{tipblock} +Les versions étoilées désactivent l'affichage des labels des points. + +\smallskip + +L'argument optionnel et entre \texttt{[...]} propose les \Cle{clés} suivantes (communes ou spécifiques) : + +\begin{itemize} + \item \Cle{PosLabel} pour préciser la position (francisée) du label pour les points ; \hfill{}défaut : \Cle{b} + \item \Cle{TaillePolice} pour spécifier la taille de la police du label ; + + \hfill{}défaut : \Cle{\textbackslash normalsize} + \item \Cle{StyleMarque} parmi \Cle{x/o/+} pour spécifier le style de la marque des points ; + + \hfill{}défaut : \Cle{o} + \item \Cle{Math} : booléen pour afficher le label en mode math ; \hfill{}défaut : \Cle{false} + \item \Cle{TailleMarque} pour spécifier la taille de la marque des points (disque/ croix) ; + + \hfill{}défaut : \Cle{2pt} + \item \Cle{Couleur} pour paramétrer la couleur.\hfill{}défaut : \Cle{black} +\end{itemize} +\vspace*{-\baselineskip}\leavevmode +\end{tipblock} + +\pagebreak + +\begin{noteblock} +On donne par exemple $A(0;0)$, $B(4;1)$ et $C(3;2)$ et on définit les points : +% +\begin{itemize} + \item $D$ image de $A$ par la translation de vecteur $\overrightarrow{AB}$ ; + \item $E$ image de $A$ par la translation de vecteur $\overrightarrow{CB}$ ; + \item $F$ image de $A$ par la translation-glissée de vecteur $2\overrightarrow{DB}$ ; + \item $G$ image de $F$ par la translation de vecteur $\overrightarrow{BD}$ ; + \item $K$ image de $G$ par la rotation de centre $F$ et d'angle 90° ; + \item $L$ image de $B$ par la symétrie centrale de centre $C$ ; + \item $H_1$ image de $A$ par la translation-glissée de vecteur $-0{,}5\overrightarrow{BA}$. +\end{itemize} +\vspace*{-\baselineskip}\leavevmode +\end{noteblock} + +\begin{DemoCode}[tikz lower] +\draw[thin,lightgray] (-5,-2) grid (8,5) ; +\DefinirPoints[Math,TaillePolice=\LARGE]{A/0,0/ B/4,1/ C/3,2/} +\ImagesPoints[TaillePolice=\tiny]{D=C+t(A>B) § E=A+t(C>B) § F=A+t(2,B>C) § G=F+t(B>D) § K=G+r(F,90) § L=B+s(C)} +\ImagePoint[Math,TaillePolice=\scriptsize]{H_1=A+t(-0.5,B>A)} +\MarquerPoints{A,B,C,D,E,F,G,K,L} +\MarquerPoint{H_1} +\end{DemoCode} + +\pagebreak + \section{Tracer des segments} \subsection{Commandes} diff --git a/graphics/pgf/contrib/tikz2d-fr/tex/tikz2d-fr.sty b/graphics/pgf/contrib/tikz2d-fr/tex/tikz2d-fr.sty index d9e112e796..e8413a5bf4 100644 --- a/graphics/pgf/contrib/tikz2d-fr/tex/tikz2d-fr.sty +++ b/graphics/pgf/contrib/tikz2d-fr/tex/tikz2d-fr.sty @@ -3,7 +3,8 @@ % or later, see http://www.latex-project.org/lppl.txtf \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tikz2d-fr}[2023/05/23 0.1.0 Petites aides pour l'utilisation de TikZ 2D] +\ProvidesPackage{tikz2d-fr}[2023/05/28 0.1.1 Petites aides pour l'utilisation de TikZ 2D] +%0.1.1 Ajout de [TaillePolice] + Commandes Point(s) par transformations (trans / rotat / sym) %0.1.0 Version initiale %------Packages utiles @@ -46,11 +47,12 @@ %%------Créer/Placer/Nommer Point(s) 2d \defKV[TkzTwoDimPoint]{% - PosLabel=\xdef\TwoDimLabel{#1},% - DecalLabel=\xdef\TwoDimDecalLabel{#1},% - StyleMarque=\xdef\TwoDimStylePt{#1},% - TailleMarque=\xdef\TwoDimtaillePt{#1},% - Couleur=\xdef\TwoDimCoul{#1} + PosLabel=\def\TwoDimLabel{#1},% + DecalLabel=\def\TwoDimDecalLabel{#1},% + StyleMarque=\def\TwoDimStylePt{#1},% + TailleMarque=\def\TwoDimtaillePt{#1},% + Couleur=\def\TwoDimCoul{#1},% + TaillePolice=\def\TwoDimFonte{#1} } \setKVdefault[TkzTwoDimPoint]{% @@ -59,14 +61,15 @@ StyleMarque=o,% TailleMarque=2.5pt,% Couleur=black,% - Math=false + Math=false,% + TaillePolice=\normalsize } \NewDocumentCommand\DefinirPoint{ s O{} m m D<>{#3} }{% %*=label %2=clés %3=nom nœud - %4=coordonnées x,y,z + %4=coordonnées x,y %5=label si différent \useKVdefault[TkzTwoDimPoint]% \setKV[TkzTwoDimPoint]{#2}% @@ -74,15 +77,15 @@ \coordinate (#3) at (#4) ; \IfBooleanTF{#1}%on désactive le label avec (*) {}% - {\draw (#3) node[\TwoDimCoul,\PosTmpLabel=\TwoDimDecalLabel] {\ifboolKV[TkzTwoDimPoint]{Math}{$#5$}{#5}} ;}% + {\draw (#3) node[\TwoDimCoul,\PosTmpLabel=\TwoDimDecalLabel,font=\TwoDimFonte] {\ifboolKV[TkzTwoDimPoint]{Math}{$#5$}{#5}} ;}% } \NewDocumentCommand\DefinirPoints{ s O{} m }{% %*=labels off %2=clés %3=liste nom/coordonnées/pos - \useKVdefault[TkzTwoDimPoint]% - \setKV[TkzTwoDimPoint]{#2}% + %\useKVdefault[TkzTwoDimPoint]% + %\setKV[TkzTwoDimPoint]{#2}% \setsepchar[.]{ ./}% \readlist*\ListePtsPlan{#3} \xintifboolexpr{\ListePtsPlanlen == 1}% @@ -125,8 +128,8 @@ \NewDocumentCommand\MarquerPoints{ O{} m }{% %1=clés %2=liste nom/coordonnées/pos - \useKVdefault[TkzTwoDimPoint]% - \setKV[TkzTwoDimPoint]{#1}% + %\useKVdefault[TkzTwoDimPoint]% + %\setKV[TkzTwoDimPoint]{#1}% \foreach \i in {#2} {% \MarquerPoint[#1]{\i} @@ -220,4 +223,68 @@ }% } +%------Définir des points par transformations +\NewDocumentCommand\ImagePoint{ s O{} m D<>{\tmpptdef} }{% + \useKVdefault[TkzTwoDimPoint]% + \setKV[TkzTwoDimPoint]{#2}% + %si c'est un translation + \IfSubStr{#3}{t(}% + {% + \StrBefore{#3}{=}[\tmpptdef]% + \StrBetween{#3}{=}{+}[\tmpptdeb]% + \IfSubStr{#3}{,}% + {% + \StrBetween{#3}{t(}{,}[\tmpk]% + \StrBetween{#3}{,}{>}[\tmpvecdeb]% + \StrBetween{#3}{>}{)}[\tmpvecfin]% + }% + {% + \xdef\tmpk{1}% + \StrBetween{#3}{t(}{>}[\tmpvecdeb]% + }% + \StrBetween{#3}{>}{)}[\tmpvecfin]% + \TransfPosTikzDD{\TwoDimLabel}% + \coordinate (\tmpptdef) at ($(\tmpptdeb) + \tmpk*(\tmpvecfin) - \tmpk*(\tmpvecdeb)$) ; + }{}% + %si c'est une rotation + \IfSubStr{#3}{r(}% + {% + \StrBefore{#3}{=}[\tmpptdef]% + \StrBetween{#3}{=}{+}[\tmpptdeb]% + \StrBetween{#3}{r(}{,}[\tmpptcenter]% + \StrBetween{#3}{,}{)}[\tmpangle]% + \TransfPosTikzDD{\TwoDimLabel}% + \coordinate (\tmpptdef) at ([rotate around={\tmpangle:(\tmpptcenter)}]\tmpptdeb); + }{}% + %si c'est une symetrie + \IfSubStr{#3}{s(}% + {% + \StrBefore{#3}{=}[\tmpptdef]% + \StrBetween{#3}{=}{+}[\tmpptdeb]% + \StrBetween{#3}{s(}{)}[\tmpptcenter]% + \TransfPosTikzDD{\TwoDimLabel}% + \coordinate (\tmpptdef) at ([rotate around={180:(\tmpptcenter)}]\tmpptdeb); + }% + {}% + \IfBooleanTF{#1}%on désactive le label avec (*) + {}% + {\draw (\tmpptdef) node[\TwoDimCoul,\PosTmpLabel=\TwoDimDecalLabel,font=\TwoDimFonte] {\ifboolKV[TkzTwoDimPoint]{Math}{$#4$}{#4}} ;}% +} + +\NewDocumentCommand\ImagesPoints{ s O{} m }{% + \useKVdefault[TkzTwoDimPoint]% + \setKV[TkzTwoDimPoint]{#2}% + \setsepchar{§}% + \readlist*\listetmptransf{#3}% + \foreachitem \formule \in \listetmptransf{% + \IfBooleanTF{#1}% + {% + \ImagePoint*[#2]{\formule}% + }% + {% + \ImagePoint[#2]{\formule}% + }% + }% +} + \endinput
\ No newline at end of file diff --git a/macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf b/macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf Binary files differindex f2128d1c2c..b5851c014e 100644 --- a/macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf +++ b/macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf diff --git a/macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex b/macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex index c3162621d8..70cef5314f 100644 --- a/macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex +++ b/macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex @@ -5,8 +5,8 @@ % arara: lualatex: {shell: yes, synctex: no, interaction: batchmode} if found('log', '(undefined references|Please rerun|Rerun to get)') \documentclass[a4paper,french,11pt]{article} -\def\PLversion{2.6.5} -\def\PLdate{20 mai 2023} +\def\PLversion{2.6.6} +\def\PLdate{28 mai 2023} \usepackage{amsfonts} \usepackage{ProfLycee} \useproflyclib{piton,minted,pythontex} @@ -3771,74 +3771,74 @@ Les \Cle{Clés} pour cette possibilité sont : \end{center} \end{PresCodeSortiePL} -\newpage - -\section{Style \og main levée \fg{} en \TikZ}\label{mainlevee} - -\subsection{Idée} - -\begin{tipblock} -L'idée est de \textit{proposer} un style \textit{tout prêt} pour simuler un tracé, en \TikZ, à \og main levée \fg. - -Il s'agit d'un style \textit{basique} utilisant la librairie \ctex{decorations} avec \textsf{random steps}. -\end{tipblock} - -\begin{PresCodeTexPL}{listing only} -\tikzset{% - mainlevee/.style args={#1et#2}{decorate,decoration={random steps, segment length=#1,amplitude=#2}}, - mainlevee/.default={5mm et 0.6pt} -} -\end{PresCodeTexPL} - -\subsection{Utilisation basique} - -\begin{noteblock} -Il s'agit ni plus ni moins d'un style \TikZ{} à intégrer dans les tracés et constructions \TikZ ! -\end{noteblock} - -\begin{cautionblock} -Concernant le style en lui-même, deux paramètres peuvent être précisés via \Cle{mainlevee=\#1 et \#2} : - -\begin{itemize} - \item \Cle{\#1} correspond à l'option \textsf{segment length} (longueur des segments \textit{types}) ;\hfill{}défaut \Cle{5mm} - \item \Cle{\#2} correspond à l'option \textsf{amplitude} (amplitude maximale de la \textit{déformation}).\hfill{}défaut \Cle{0.6pt} -\end{itemize} - -Les valeurs \Cle{mainlevee=5mm et 0.6pt} donnent des résultats -- à mon sens -- satisfaisants, mais l'utilisateur pourra modifier à loisir ces paramètres ! -\end{cautionblock} - -\begin{PresCodeTexPL}{listing only} -%la grille a été rajoutée pour la sortie -\begin{tikzpicture} - \draw[thick,mainlevee] (0,0) --++ (4,0) --++ (0,4) --++ (-4,0) --cycle ; -\end{tikzpicture} - -\begin{tikzpicture} - \draw[thick,mainlevee=5mm et 2pt] (0,0) --++ (4,0) --++ (0,4) --++ (-4,0) --cycle ; -\end{tikzpicture} - -\begin{tikzpicture} - \draw[thick,mainlevee=10mm et 3mm] (0,0) --++ (4,0) --++ (0,4) --++ (-4,0) --cycle ; -\end{tikzpicture} -\end{PresCodeTexPL} - -\begin{PresCodeSortiePL}{text only} -\hfill~\begin{tikzpicture} - \draw[xstep=0.5,ystep=0.5,ultra thin,lightgray] (0,0) grid (4,4); - \draw[thick,mainlevee] (0,0) --++ (4,0) --++ (0,4) --++ (-4,0) --cycle ; -\end{tikzpicture} -\hspace{1cm} -\begin{tikzpicture} - \draw[xstep=0.5,ystep=0.5,ultra thin,lightgray] (0,0) grid (4,4); - \draw[thick,mainlevee=5mm et 2pt] (0,0) --++ (4,0) --++ (0,4) --++ (-4,0) --cycle ; -\end{tikzpicture} -\hspace{1cm} -\begin{tikzpicture} - \draw[xstep=0.5,ystep=0.5,ultra thin,lightgray] (0,0) grid (4,4); - \draw[thick,mainlevee=10mm et 3mm] (0,0) --++ (4,0) --++ (0,4) --++ (-4,0) --cycle ; -\end{tikzpicture} -\hfill~ -\end{PresCodeSortiePL} +%\newpage +% +%\section{Style \og main levée \fg{} en \TikZ}\label{mainlevee} +% +%\subsection{Idée} +% +%\begin{tipblock} +%L'idée est de \textit{proposer} un style \textit{tout prêt} pour simuler un tracé, en \TikZ, à \og main levée \fg. +% +%Il s'agit d'un style \textit{basique} utilisant la librairie \ctex{decorations} avec \textsf{random steps}. +%\end{tipblock} +% +%\begin{PresCodeTexPL}{listing only} +%\tikzset{% +% mainlevee/.style args={#1et#2}{decorate,decoration={random steps, segment length=#1,amplitude=#2}}, +% mainlevee/.default={5mm et 0.6pt} +%} +%\end{PresCodeTexPL} +% +%\subsection{Utilisation basique} +% +%\begin{noteblock} +%Il s'agit ni plus ni moins d'un style \TikZ{} à intégrer dans les tracés et constructions \TikZ ! +%\end{noteblock} +% +%\begin{cautionblock} +%Concernant le style en lui-même, deux paramètres peuvent être précisés via \Cle{mainlevee=\#1 et \#2} : +% +%\begin{itemize} +% \item \Cle{\#1} correspond à l'option \textsf{segment length} (longueur des segments \textit{types}) ;\hfill{}défaut \Cle{5mm} +% \item \Cle{\#2} correspond à l'option \textsf{amplitude} (amplitude maximale de la \textit{déformation}).\hfill{}défaut \Cle{0.6pt} +%\end{itemize} +% +%Les valeurs \Cle{mainlevee=5mm et 0.6pt} donnent des résultats -- à mon sens -- satisfaisants, mais l'utilisateur pourra modifier à loisir ces paramètres ! +%\end{cautionblock} +% +%\begin{PresCodeTexPL}{listing only} +%%la grille a été rajoutée pour la sortie +%\begin{tikzpicture} +% \draw[thick,mainlevee] (0,0) --++ (4,0) --++ (0,4) --++ (-4,0) --cycle ; +%\end{tikzpicture} +% +%\begin{tikzpicture} +% \draw[thick,mainlevee=5mm et 2pt] (0,0) --++ (4,0) --++ (0,4) --++ (-4,0) --cycle ; +%\end{tikzpicture} +% +%\begin{tikzpicture} +% \draw[thick,mainlevee=10mm et 3mm] (0,0) --++ (4,0) --++ (0,4) --++ (-4,0) --cycle ; +%\end{tikzpicture} +%\end{PresCodeTexPL} +% +%\begin{PresCodeSortiePL}{text only} +%\hfill~\begin{tikzpicture} +% \draw[xstep=0.5,ystep=0.5,ultra thin,lightgray] (0,0) grid (4,4); +% \draw[thick,mainlevee] (0,0) --++ (4,0) --++ (0,4) --++ (-4,0) --cycle ; +%\end{tikzpicture} +%\hspace{1cm} +%\begin{tikzpicture} +% \draw[xstep=0.5,ystep=0.5,ultra thin,lightgray] (0,0) grid (4,4); +% \draw[thick,mainlevee=5mm et 2pt] (0,0) --++ (4,0) --++ (0,4) --++ (-4,0) --cycle ; +%\end{tikzpicture} +%\hspace{1cm} +%\begin{tikzpicture} +% \draw[xstep=0.5,ystep=0.5,ultra thin,lightgray] (0,0) grid (4,4); +% \draw[thick,mainlevee=10mm et 3mm] (0,0) --++ (4,0) --++ (0,4) --++ (-4,0) --cycle ; +%\end{tikzpicture} +%\hfill~ +%\end{PresCodeSortiePL} \pagebreak @@ -7145,6 +7145,8 @@ La grille, créée en \TikZ, est portée par le rectangle de \og coins \fg{} $(0 \part{Historique} +{\small \bverb|v 2.6.6|~:~~~~Style \textsf{mainlevee} en \TikZ{} désormais dans le package \textsf{tikz2d-fr} + {\small \bverb|v 2.6.5|~:~~~~Ajout d'une option \Cle{noamssymb} pour éviter de charger \textsf{amssymb} (page \pageref{amssymb}) {\small \bverb| |~:~~~~Ajout d'une commande pour la distance entre deux points (page \pageref{normevect})} diff --git a/macros/latex/contrib/proflycee/tex/ProfLycee.sty b/macros/latex/contrib/proflycee/tex/ProfLycee.sty index d07d2975a2..959754bc90 100644 --- a/macros/latex/contrib/proflycee/tex/ProfLycee.sty +++ b/macros/latex/contrib/proflycee/tex/ProfLycee.sty @@ -3,8 +3,9 @@ % or later, see http://www.latex-project.org/lppl.txtf \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{ProfLycee}[2023/05/20 2.6.5 Aide pour l'utilisation de LaTeX en lycee] -% 2.6.5 Ajout d'une option[noamssymb] pour éviter les clashs avec fourier (merci PfC) + Corections de bugs + Bug avec ; et pdflatex (utlisation de | à la place !) +\ProvidesPackage{ProfLycee}[2023/05/28 2.6.6 Aide pour l'utilisation de LaTeX en lycee] +% 2.6.6 Externalisation du style Tikz mainlevee (dans tikz2d-fr) +% 2.6.5 Ajout d'une option[noamssymb] pour éviter les clashs avec fourier (merci PfC) + Corections de bugs % 2.6.4 Correction d'un dysfonctionnement avec les racines (oubli du \num) + Equation diophantienne ax+by=c + Eq cartésiennes (plan & droite) + Corrections de bugs mineurs % 2.6.3 Ajout d'une commande pour rédiger l'obtention de l'équation affine d'une droite passant par deux points % 2.6.2 Correction de commandes pour la pseudo3d + nouvelle clé pour la trigo diff --git a/macros/latex/contrib/proflycee/tex/proflycee-tools-geom.tex b/macros/latex/contrib/proflycee/tex/proflycee-tools-geom.tex index b274d1a6ec..b49e23440d 100644 --- a/macros/latex/contrib/proflycee/tex/proflycee-tools-geom.tex +++ b/macros/latex/contrib/proflycee/tex/proflycee-tools-geom.tex @@ -129,12 +129,6 @@ {\draw[dashed,\PFTetraThick,line join=bevel] (\TetraA)--(\TetraC) ;} } -%%------MainLevée TikZ -\tikzset{% - mainlevee/.style args={#1et#2}{decorate,decoration={random steps,segment length=#1,amplitude=#2}}, - mainlevee/.default={5mm et 0.6pt} -} - %%Equations Cartésiennes + Affichages coordonnées \RequirePackage{nicematrix} %\RequirePackage{ifpdf} diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl index 5a478f5237..9826773442 100644 --- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl +++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl @@ -18,7 +18,6 @@ $mirrors = { 'https://mirrors.hit.edu.cn/CTAN/' => 1, 'https://mirrors.jlu.edu.cn/CTAN/' => 1, 'https://mirrors.nju.edu.cn/CTAN/' => 1, - 'https://mirrors.pku.edu.cn/ctan/' => 1, 'https://mirrors.sjtug.sjtu.edu.cn/ctan/' => 1, 'https://mirrors.sustech.edu.cn/CTAN/' => 1, 'https://mirrors.tuna.tsinghua.edu.cn/CTAN/' => 1, @@ -125,6 +124,7 @@ $mirrors = { }, 'Netherlands' => { 'https://ftp.snt.utwente.nl/pub/software/tex/' => 1, + 'https://mirror.koddos.net/CTAN/' => 1, 'https://mirror.lyrahosting.com/CTAN/' => 1, 'https://mirrors.evoluso.com/CTAN/' => 1, }, diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb index c5d7ced3d1..11a119debe 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/67235 +depend revision/67240 name 00texlive.image category TLCore -revision 67201 +revision 67239 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 @@ -4239,6 +4239,7 @@ runfiles size=13036 tlpkg/tlpsrc/tikz-timing.tlpsrc tlpkg/tlpsrc/tikz-trackschematic.tlpsrc tlpkg/tlpsrc/tikz-truchet.tlpsrc + tlpkg/tlpsrc/tikz2d-fr.tlpsrc tlpkg/tlpsrc/tikz3d-fr.tlpsrc tlpkg/tlpsrc/tikzbricks.tlpsrc tlpkg/tlpsrc/tikzcodeblocks.tlpsrc @@ -4747,7 +4748,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd name 00texlive.installer category TLCore -revision 67229 +revision 67237 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 @@ -72524,7 +72525,7 @@ containerchecksum 951e172129275fa2cb7ccea6bf23f27484503533ebee4c3bef7d2f4ddda594 name collection-pictures category Collection -revision 66992 +revision 67239 shortdesc Graphics, pictures, diagrams relocated 1 longdesc Including TikZ, pict, etc., but MetaPost and PStricks are @@ -72725,6 +72726,7 @@ depend tikz-swigs depend tikz-timing depend tikz-trackschematic depend tikz-truchet +depend tikz2d-fr depend tikz3d-fr depend tikzbricks depend tikzcodeblocks @@ -72772,7 +72774,7 @@ depend xistercian depend xpicture depend xypic containersize 1592 -containerchecksum 67ba69ac60989801887fc0d5429cc9d9c2e6f669869c1cd71b207f8aea6edceb6583725398c4e88ed0721e4c431e28a0c3f6ca2dee52ab9fb49470f04171a32c +containerchecksum 011ddefb832a87c93e977dab0343f6e0821c87ed04321e590035449256b3a781358b2294fe88c3b406e9077c836bbf47e81fa5391ad2ffae8b0e2c2ad8459d37 name collection-plaingeneric category Collection @@ -203195,16 +203197,16 @@ catalogue-version 0.5 name mcf2graph category Package -revision 67122 +revision 67238 shortdesc Draw chemical structure diagrams with MetaPost relocated 1 longdesc The Molecular Coding Format (MCF) is a linear notation for longdesc describing chemical structure diagrams. This package converts longdesc MCF to graphic files using MetaPost. -containersize 444 -containerchecksum 479a05d8e120950d5a5a35151846ba63a01c6fecf9a06d18f755474791b08380292bc260050694c3520b55a0d3b7af9bc2353d7fe1f0e1c5243dc38a40f0ce27 -doccontainersize 882512 -doccontainerchecksum a2e863a0fe0307b9fc6e849b178892a5029589a95494912078232ee73eb68f0399cc72760b718d982f78af6875419b6d8684c7055f1791678b9b88bc4ecb65b7 +containersize 448 +containerchecksum 4e94f1d4b3bcf502d0b2fbcf61f6d6ab6f8a331125cc51310d0ad71fe4aad90fa423bc362ef696de3a8d4f9e14ec6192c38efb7582acc1a133d9eb70950b7450 +doccontainersize 885084 +doccontainerchecksum 17d9e4d7cb0befb2db02dff1f2763d9c3f6ea68c84b4c7d582f5991d684e86d61f46cba21575cbaafa3626bee8a89af2e6d15452239b4fd14904f5d9c80f66d2 docfiles size=296 RELOC/doc/metapost/mcf2graph/CHANGELOG RELOC/doc/metapost/mcf2graph/README details="Readme" @@ -203221,7 +203223,7 @@ docfiles size=296 catalogue-ctan /graphics/mcf2graph catalogue-license mit catalogue-topics graphics graphics-mpost chemistry -catalogue-version 5.01 +catalogue-version 5.02 name mcite category Package @@ -256958,7 +256960,7 @@ catalogue-version 1.0 name proflycee category Package -revision 67191 +revision 67240 shortdesc A LaTeX package for French maths teachers in high school relocated 1 longdesc This package provides some commands to help French mathematics @@ -256967,11 +256969,11 @@ longdesc create splines with "derivative control"; longdesc \CalculFormelParametres and \CalculFormelLigne in order to longdesc create an xcas-windows-like; \CodePythonLstFichier to create longdesc code presentation and code execution with pythontex. -containersize 39608 -containerchecksum 286e76bc510d795c8ad639ea896574a71374abae62089b237529c7dd244e70688ffa39c55ad618b98760e3e04c095e69770b46a0bdd56f43bd3e4dc608724afa -doccontainersize 1935648 -doccontainerchecksum 80ccf3e39e6daa3da87e8aa255d56076d63d0ec5135e02742d4da2ada43f559c8037acab231dca0725087518e60c5deb0c8748792fbe51dff890bde0e3f223e2 -docfiles size=624 +containersize 39596 +containerchecksum 59060f83c88d14d1b35e99cec96e94d33479ea528682496356b2fe21e4333f91e6f7a8cc0d80e698ef387dcbb8695e31d9549c696f32a78135bf0b293b9f5407 +doccontainersize 1930608 +doccontainerchecksum 0be3b4c9608475f728f05f826ef932a725f4ec941e0980d622a370eb5e193121a32f69f8e1470a3c2fb56c3b12cd62d802586151aa88a19ff67ef64a9312455b +docfiles size=623 RELOC/doc/latex/proflycee/ProfLycee-doc.pdf details="Package documentation" language="fr" RELOC/doc/latex/proflycee/ProfLycee-doc.tex RELOC/doc/latex/proflycee/ProfLycee-exemples-pyluatex.pdf details="Examples using pyluatex" language="fr" @@ -257023,7 +257025,7 @@ catalogue-contact-repository https://github.com/cpierquet/ProfLycee catalogue-ctan /macros/latex/contrib/proflycee catalogue-license lppl1.3c catalogue-topics maths french teaching expl3 pgf-tikz -catalogue-version 2.6.5 +catalogue-version 2.6.6 name program category Package @@ -312835,7 +312837,7 @@ docfiles size=376 name texlive-scripts category TLCore -revision 67229 +revision 67237 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. @@ -312844,9 +312846,9 @@ depend texlive.infra execute addMap mathpple.map postaction shortcut type=menu name="TeX Live command-line" cmd=TEXDIR/tlpkg/installer/tl-cmd.bat containersize 114068 -containerchecksum 087edfd2e174a401b4f23c4704a9fc3c1e9097077409f09ed4f6b5f39809ed93a828e40fbe87d49fd23e32de43dced428c0a46bfb77486490497b198a33e31ca -doccontainersize 427004 -doccontainerchecksum d325084cc209482609bdcce7aaa790b63967c29a3fdbe91a2838cdf1141d879a43355b392b7849ff1b7d3322214b57608eef586de7daed8064d6652b8e312730 +containerchecksum ff1e1136c59c404196543ab64e3363e511879421a30cfe9fe920b4ea38ad38eb303f4f17b015b0948c68c6122794f11e9b34a78484c1b2ffbe8163c035670072 +doccontainersize 426888 +doccontainerchecksum 8264fa6b3d3c26dda9dab6538bd5492373ff7597e53b25b61387a12bf7db6a3a73ff29fa1f0d05084057dca4c5922cfbcb6b18d344be2910f50def1ede17cb25 docfiles size=545 doc.html texmf-dist/doc/man/man1/fmtutil-sys.1 @@ -319648,6 +319650,32 @@ catalogue-ctan /graphics/pgf/contrib/tikz-truchet catalogue-license mit catalogue-topics pgf-tikz +name tikz2d-fr +category Package +revision 67239 +shortdesc Work with some 2D TikZ commands (French) +relocated 1 +longdesc This is a small package to work with some (French) 2D commands +longdesc for TikZ: "freehand style" mainlevee define and mark points +longdesc \DefinirPoints, \MarquerPoints draw colored segments +longdesc \TracerSegments +containersize 2760 +containerchecksum 87cf1fd8343df4c6960e4bc004da9154f98146b57a723022e5a81db506805ebdd60db1edafc03d9d787f151cb333c1d141c5407023493bba316b8b41bc245537 +doccontainersize 579240 +doccontainerchecksum 4951babe22ffa5985e3533970b88a8a92f626e18b34e8f7f11051db21accd2977a926fd7e668ecd018324fa62c8b539fe52c279f8ceddd5a037b76dcf03f399c +docfiles size=152 + RELOC/doc/latex/tikz2d-fr/README.md details="Readme" + RELOC/doc/latex/tikz2d-fr/tikz2d-fr-doc.pdf details="Package documentation" + RELOC/doc/latex/tikz2d-fr/tikz2d-fr-doc.tex +runfiles size=2 + RELOC/tex/latex/tikz2d-fr/tikz2d-fr.sty +catalogue-contact-home https://github.com/cpierquet/tikz2dfr +catalogue-contact-support https://github.com/cpierquet/tikz2dfr/issues +catalogue-ctan /graphics/pgf/contrib/tikz2d-fr +catalogue-license lppl1.3c +catalogue-topics pgf-tikz +catalogue-version 0.1.1 + name tikz3d-fr category Package revision 67212 diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 index 3a7f850d43..06b404087f 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 @@ -1 +1 @@ -f096a9147534949d1223547af714f79c texlive.tlpdb +004cd7a56ebae4e5dc28b15233739c70 texlive.tlpdb diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 index 81f285eca5..5109e3e887 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 @@ -1 +1 @@ -3963cf0ddd414e3d622fb9bd1d3911845d3b9d04f5e6c4766ed4edf9a4c16f987a714984c68a0d99a335128117cc5e10f32135ad0d6ce3ff9233753d35e83b57 texlive.tlpdb +0c4da1d3f0f5adb85621f1ac6f1707b91c9d74fd28b0a607ed5014b48037c50fe43f96b912ac7f91226a6e0037518d9e398d667788c6777a08600487b7c494d0 texlive.tlpdb diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc index 6a4be921c4..08e41fea4e 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+QqiBBqTOGHfhlDjHAFAmRyl8IACgkQTOGHfhlD -jHDKkAgAsCH2mcvaINGNglNu8fU3BzbXBkA7JaPLB1bl8qOmHBRbYL+H3b5ZcTeU -v4+jtld0pT39kWirSax2Ec5rjd7BLodDQdZQ5mv76bsvq3tZ0vA8i7VXvToeGYFF -c8PpuPAvLNsR2/Qd72Ux6EQIkwyyk3HBKcbZjUWEsOUFpx8fdcit+zUnJnYnA92g -qDsos/aGZiXyWema2FbbbbGF8k6lgO4CLGGDZ+HR1p1hXfIiBiG7/CpVpfefMcPl -gTCtZn/a56XyQ/godP5x1F/yzU1awe93ST8KDnhj7KWXcwNLInf6Mbd+dtEjnrt3 -KjA0X1vtJDHuD3qRl229dRnw4nDOFw== -=FGBc +iQEzBAEBCgAdFiEE2PL4YFeoV+QqiBBqTOGHfhlDjHAFAmRz52kACgkQTOGHfhlD +jHDHsQf/ahGDSDUhreWyiEK8+A/fzIxDsvnwqiESbtaDgWjKX/dnSFPNbDpcywPH +IUuiA6TfpONMGtRn2HS85C0TrSNh2g+SkUEHhZ6HHcRQnI+lPpxVT3rju9VzyznZ +/9103PNB/omYPMQsp6OTu3hOLsXs0uLvQ38sYx2eCNgWJLkIUfitunFc/UCpm12H +X2Y9kfPi2/zTIEqj4Oi/lmF9SdaEQfU5LGTIQA2v15TMPZobbtNlVWgbyOEU4aVs +2kju3GZG5DGseUmRVNAqJVE7EgMotshSdUov9LNhdZRP73Jj/4Z7mbWOM47fMDaC +pfkqihg4S2FULllo+2u15EW2LLs06A== +=c1nB -----END PGP SIGNATURE----- diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz Binary files differindex fdd817f1a4..cc74c8988a 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz @@ -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: -2023-05-28-02-02 +2023-05-29-02-02 |