diff options
162 files changed, 22411 insertions, 7472 deletions
diff --git a/FILES.byname b/FILES.byname index a00c8b9851..834f839f46 100644 --- a/FILES.byname +++ b/FILES.byname @@ -5087,7 +5087,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 -2021/03/13 | 73218 | FILES.last07days +2021/03/14 | 181718 | FILES.last07days 2020/08/14 | 104065 | fonts/academicons/academicons.pdf 2020/08/14 | 17247 | fonts/academicons/academicons.sty 2020/08/14 | 6546 | fonts/academicons/academicons.tex @@ -142300,48 +142300,48 @@ 2019/04/14 | 24014 | graphics/pgf/contrib/chordbox/chordbox.tex 2019/04/14 | 1125 | graphics/pgf/contrib/chordbox/README.md 2019/04/15 | 567774 | graphics/pgf/contrib/chordbox.zip -2021/02/20 | 30336 | graphics/pgf/contrib/circuitikz/doc/changelog.tex -2021/02/20 | 17743 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf -2021/02/20 | 938 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.tex -2021/02/20 | 1128438 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf -2021/02/20 | 394780 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex -2021/02/20 | 418 | graphics/pgf/contrib/circuitikz/doc/compatibility.tex -2021/02/20 | 6106 | graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty -2021/02/20 | 3277 | graphics/pgf/contrib/circuitikz/README.md -2021/02/20 | 364086 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.4.sty -2021/02/20 | 393856 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.6.sty -2021/02/20 | 403539 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.7.sty -2021/02/20 | 422268 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.8.3.sty -2021/02/20 | 690730 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3.sty -2021/02/20 | 758990 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.6.sty -2021/02/20 | 841461 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.0.sty -2021/02/20 | 937253 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.1.2.sty -2021/02/20 | 1021921 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.2.7.sty -2021/02/20 | 12348 | graphics/pgf/contrib/circuitikz/tex/circuitikz.sty -2021/02/20 | 280 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-example.tex -2021/02/20 | 3101 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-legacy.tex -2021/02/20 | 1877 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-romano.tex -2021/02/20 | 226090 | graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex -2021/02/20 | 8757 | graphics/pgf/contrib/circuitikz/tex/pgfcirccurrent.tex -2021/02/20 | 29007 | graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex -2021/02/20 | 9109 | graphics/pgf/contrib/circuitikz/tex/pgfcircflow.tex -2021/02/20 | 14437 | graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex -2021/02/20 | 54038 | graphics/pgf/contrib/circuitikz/tex/pgfcircmonopoles.tex -2021/02/20 | 105296 | graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex -2021/02/20 | 16580 | graphics/pgf/contrib/circuitikz/tex/pgfcircpath.tex -2021/02/20 | 114935 | graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex -2021/02/20 | 30990 | graphics/pgf/contrib/circuitikz/tex/pgfcircshapes.tex -2021/02/20 | 344519 | graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex -2021/02/20 | 2678 | graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex -2021/02/20 | 34691 | graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex -2021/02/20 | 416850 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.8.3.tex -2021/02/20 | 683433 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.3.tex -2021/02/20 | 751663 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.6.tex -2021/02/20 | 834142 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.0.tex -2021/02/20 | 929934 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.1.2.tex -2021/02/20 | 1014383 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.2.7.tex -2021/02/20 | 3590 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex -2021/02/20 | 2422826 | graphics/pgf/contrib/circuitikz.zip +2021/03/14 | 30689 | graphics/pgf/contrib/circuitikz/doc/changelog.tex +2021/03/14 | 17743 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf +2021/03/14 | 938 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.tex +2021/03/14 | 1133938 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf +2021/03/14 | 396132 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex +2021/03/14 | 418 | graphics/pgf/contrib/circuitikz/doc/compatibility.tex +2021/03/14 | 6106 | graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty +2021/03/14 | 3277 | graphics/pgf/contrib/circuitikz/README.md +2021/03/14 | 364086 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.4.sty +2021/03/14 | 393856 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.6.sty +2021/03/14 | 403539 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.7.sty +2021/03/14 | 422268 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.8.3.sty +2021/03/14 | 690730 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3.sty +2021/03/14 | 758990 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.6.sty +2021/03/14 | 841461 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.0.sty +2021/03/14 | 937253 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.1.2.sty +2021/03/14 | 1021921 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.2.7.sty +2021/03/14 | 12348 | graphics/pgf/contrib/circuitikz/tex/circuitikz.sty +2021/03/14 | 280 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-example.tex +2021/03/14 | 3101 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-legacy.tex +2021/03/14 | 1877 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-romano.tex +2021/03/14 | 226090 | graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex +2021/03/14 | 8757 | graphics/pgf/contrib/circuitikz/tex/pgfcirccurrent.tex +2021/03/14 | 29007 | graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex +2021/03/14 | 9109 | graphics/pgf/contrib/circuitikz/tex/pgfcircflow.tex +2021/03/14 | 14437 | graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex +2021/03/14 | 54038 | graphics/pgf/contrib/circuitikz/tex/pgfcircmonopoles.tex +2021/03/14 | 105296 | graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex +2021/03/14 | 16580 | graphics/pgf/contrib/circuitikz/tex/pgfcircpath.tex +2021/03/14 | 120283 | graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex +2021/03/14 | 30990 | graphics/pgf/contrib/circuitikz/tex/pgfcircshapes.tex +2021/03/14 | 356340 | graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex +2021/03/14 | 2678 | graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex +2021/03/14 | 34691 | graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex +2021/03/14 | 416850 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.8.3.tex +2021/03/14 | 683433 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.3.tex +2021/03/14 | 751663 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.6.tex +2021/03/14 | 834142 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.0.tex +2021/03/14 | 929934 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.1.2.tex +2021/03/14 | 1014383 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.2.7.tex +2021/03/14 | 3590 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex +2021/03/14 | 2429879 | graphics/pgf/contrib/circuitikz.zip 2019/07/12 | 14811 | graphics/pgf/contrib/codeanatomy/codeanatomy.dtx 2019/07/12 | 1475 | graphics/pgf/contrib/codeanatomy/codeanatomy.ins 2019/07/12 | 123921 | graphics/pgf/contrib/codeanatomy/codeanatomy.lstlisting.pdf @@ -142957,12 +142957,11 @@ 2013/12/11 | 213768 | graphics/pgf/contrib/rulercompass/rulercompass.pdf 2013/12/11 | 15551 | graphics/pgf/contrib/rulercompass/tikzlibraryrulercompass.code.tex 2013/12/11 | 488384 | graphics/pgf/contrib/rulercompass.zip -2021/01/27 | 247 | graphics/pgf/contrib/sankey/README -2021/01/27 | 672933 | graphics/pgf/contrib/sankey/sankey-doc.pdf -2021/01/27 | 49829 | graphics/pgf/contrib/sankey/sankey-doc.tex -2021/01/27 | 23122 | graphics/pgf/contrib/sankey/sankey.sty -2021/01/27 | 10959 | graphics/pgf/contrib/sankey/tikzlibrarydubins.code.tex -2021/01/27 | 685675 | graphics/pgf/contrib/sankey.zip +2021/03/14 | 415 | graphics/pgf/contrib/sankey/README +2021/03/14 | 155760 | graphics/pgf/contrib/sankey/sankey.dtx +2021/03/14 | 3013 | graphics/pgf/contrib/sankey/sankey.ins +2021/03/14 | 942336 | graphics/pgf/contrib/sankey/sankey.pdf +2021/03/14 | 944430 | graphics/pgf/contrib/sankey.zip 2013/12/20 | 51669 | graphics/pgf/contrib/sa-tikz/doc/macros/pgfmanual-en-macros.tex 2014/01/29 | 890448 | graphics/pgf/contrib/sa-tikz/doc/sa-tikz-doc.pdf 2014/01/29 | 48225 | graphics/pgf/contrib/sa-tikz/doc/sa-tikz-doc.tex @@ -172140,7 +172139,7 @@ 2020/12/27 | 13202142 | install/graphics/pgf/base/pgf.tds.zip 2013/02/23 | 92056 | install/graphics/pgf/contrib/battleship.tds.zip 2016/02/19 | 701759 | install/graphics/pgf/contrib/celtic.tds.zip -2021/02/20 | 2437590 | install/graphics/pgf/contrib/circuitikz.tds.zip +2021/03/14 | 2444742 | install/graphics/pgf/contrib/circuitikz.tds.zip 2020/06/12 | 573255 | install/graphics/pgf/contrib/commutative-diagrams.tds.zip 2017/06/01 | 1005947 | install/graphics/pgf/contrib/hobby.tds.zip 2014/06/15 | 843875 | install/graphics/pgf/contrib/logicpuzzle.tds.zip @@ -172158,7 +172157,7 @@ 2013/05/13 | 135206 | install/info/luatex/lualatex-doc.tds.zip 2018/03/19 | 2053336 | install/language/arabic/dad.tds.zip 2016/05/14 | 160646 | install/language/chinese/cjkpunct.tds.zip -2020/10/19 | 1582612 | install/language/chinese/ctex.tds.zip +2021/03/14 | 1668577 | install/language/chinese/ctex.tds.zip 2016/11/23 | 413896 | install/language/chinese/zhmcjk.tds.zip 2017/03/09 | 168862 | install/language/hebrew/cjhebrew.tds.zip 2020/12/29 | 10934115 | install/language/japanese/jlreq.tds.zip @@ -173904,15 +173903,15 @@ 2016/05/14 | 3497 | language/chinese/cjkpunct/setpunct/setpunct-macros.tex 2016/05/14 | 468 | language/chinese/cjkpunct/setpunct/setpunct-main.tex 2016/05/14 | 154735 | language/chinese/cjkpunct.zip -2020/10/19 | 441864 | language/chinese/ctex/ctex.dtx -2020/10/19 | 1115618 | language/chinese/ctex/ctex.pdf -2020/04/18 | 9752 | language/chinese/ctex/ctexpunct.spa -2020/05/02 | 6180 | language/chinese/ctex/ctex-zhconv.lua -2020/05/02 | 4099 | language/chinese/ctex/ctex-zhconv-make.lua -2020/10/19 | 29475 | language/chinese/ctex/ctxdoc.cls -2020/05/26 | 2894 | language/chinese/ctex/ctxdocstrip.tex -2020/10/19 | 6039 | language/chinese/ctex/README.md -2020/10/19 | 1195149 | language/chinese/ctex.zip +2021/03/14 | 443387 | language/chinese/ctex/ctex.dtx +2021/03/14 | 1214489 | language/chinese/ctex/ctex.pdf +2021/03/14 | 9752 | language/chinese/ctex/ctexpunct.spa +2021/03/14 | 6180 | language/chinese/ctex/ctex-zhconv.lua +2021/03/14 | 4099 | language/chinese/ctex/ctex-zhconv-make.lua +2021/03/14 | 29475 | language/chinese/ctex/ctxdoc.cls +2021/03/14 | 2894 | language/chinese/ctex/ctxdocstrip.tex +2021/03/14 | 6039 | language/chinese/ctex/README.md +2021/03/14 | 1291977 | language/chinese/ctex.zip 1992/09/26 | 1678 | language/chinese/ftp.sites 1998/12/28 | 219667 | language/chinese/ntu2cjk.tar.gz 1991/04/20 | 5464 | language/chinese/pmtex/wcksa4.300pk @@ -185620,13 +185619,13 @@ 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 -2021/03/09 | 124091060 | macros/context/latest/cont-tmf.zip +2021/03/13 | 124095501 | 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 1998/12/22 | 31778 | macros/cstex/base/csindex-19980713.tar.gz 2012/12/17 | 45256 | macros/cstex/base/cslatex.tar.gz -2020/04/11 | 961269 | macros/cstex/base/csplain.tar.gz +2021/03/14 | 961606 | macros/cstex/base/csplain.tar.gz 2014/05/08 | 1853706 | macros/cstex/base/cspsfonts.tar.gz 2007/03/01 | 139845 | macros/cstex/base/cstrip.tar.gz 2007/03/01 | 4730 | macros/cstex/base/macce.tar.gz @@ -196178,125 +196177,140 @@ 2002/10/20 | 1380 | macros/latex/contrib/dnaseq/DNAtest.tex 2002/10/20 | 238 | macros/latex/contrib/dnaseq/README 2010/02/23 | 211504 | macros/latex/contrib/dnaseq.zip -2020/08/10 | 69 | macros/latex/contrib/doclicense/doclicense-acadian.ldf -2020/08/10 | 71 | macros/latex/contrib/doclicense/doclicense-american.ldf -2020/08/10 | 73 | macros/latex/contrib/doclicense/doclicense-australian.ldf -2020/08/10 | 1411 | macros/latex/contrib/doclicense/doclicense-brazilian.ldf -2020/08/10 | 121 | macros/latex/contrib/doclicense/doclicense-british.ldf -2020/09/04 | 2049 | macros/latex/contrib/doclicense/doclicense-bulgarian.ldf -2020/08/10 | 71 | macros/latex/contrib/doclicense/doclicense-canadian.ldf -2020/08/10 | 70 | macros/latex/contrib/doclicense/doclicense-canadien.ldf -2020/08/10 | 1462 | macros/latex/contrib/doclicense/doclicense-catalan.ldf -2020/08/10 | 1217 | macros/latex/contrib/doclicense/doclicense-chinese-gbk.ldf -2020/08/10 | 1368 | macros/latex/contrib/doclicense/doclicense-chinese-utf8.ldf -2020/09/25 | 37898 | macros/latex/contrib/doclicense/doclicense.dtx -2020/08/10 | 1380 | macros/latex/contrib/doclicense/doclicense-english.ldf -2020/08/10 | 1944 | macros/latex/contrib/doclicense/doclicense-french.ldf -2020/08/10 | 1753 | macros/latex/contrib/doclicense/doclicense-galician.ldf -2020/08/10 | 1819 | macros/latex/contrib/doclicense/doclicense-german.ldf -2020/08/10 | 682 | macros/latex/contrib/doclicense/doclicense.ins -2020/08/10 | 1757 | macros/latex/contrib/doclicense/doclicense-italian.ldf -2020/08/10 | 1193 | macros/latex/contrib/doclicense/doclicense-japanese.ldf -2020/08/10 | 2763 | macros/latex/contrib/doclicense/doclicense-marathi.ldf -2020/08/10 | 73 | macros/latex/contrib/doclicense/doclicense-newzealand.ldf -2020/08/10 | 69 | macros/latex/contrib/doclicense/doclicense-ngerman.ldf -2020/09/25 | 254137 | macros/latex/contrib/doclicense/doclicense.pdf -2020/08/10 | 2755 | macros/latex/contrib/doclicense/doclicense-polish.ldf -2020/08/10 | 1424 | macros/latex/contrib/doclicense/doclicense-portuguese.ldf -2020/08/10 | 2566 | macros/latex/contrib/doclicense/doclicense-russian.ldf -2020/08/10 | 1427 | macros/latex/contrib/doclicense/doclicense-spanish.ldf -2020/08/10 | 72 | macros/latex/contrib/doclicense/doclicense-UKenglish.ldf -2020/08/10 | 72 | macros/latex/contrib/doclicense/doclicense-USenglish.ldf -2020/08/10 | 5675 | macros/latex/contrib/doclicense/images/doclicense-CC-by-80x15.eps -2020/08/10 | 2727 | macros/latex/contrib/doclicense/images/doclicense-CC-by-80x15.pdf -2020/08/10 | 7819 | macros/latex/contrib/doclicense/images/doclicense-CC-by-88x31.eps -2020/08/10 | 3052 | macros/latex/contrib/doclicense/images/doclicense-CC-by-88x31.pdf -2020/08/10 | 6616 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-80x15.eps -2020/08/10 | 3064 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-80x15.pdf -2020/08/10 | 11261 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-88x31.eps -2020/08/10 | 4312 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-88x31.pdf -2020/08/10 | 11390 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-eu-88x31.eps -2020/08/10 | 4365 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-eu-88x31.pdf -2020/08/10 | 7473 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-nd-80x15.eps -2020/08/10 | 3357 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-nd-80x15.pdf -2020/08/10 | 13437 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-nd-88x31.eps -2020/08/10 | 5058 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-nd-88x31.pdf -2020/08/10 | 13562 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-nd-eu-88x31.eps -2020/08/10 | 5116 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-nd-eu-88x31.pdf -2020/08/10 | 20897 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-nd-unofficial-mr-80x15.eps -2020/08/10 | 8126 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-nd-unofficial-mr-80x15.pdf -2020/08/10 | 31754 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-nd-unofficial-mr-88x31.eps -2020/08/10 | 12246 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-nd-unofficial-mr-88x31.pdf -2020/08/10 | 7940 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-sa-80x15.eps -2020/08/10 | 3579 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-sa-80x15.pdf -2020/08/10 | 15146 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-sa-88x31.eps -2020/08/10 | 5728 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-sa-88x31.pdf -2020/08/10 | 15260 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-sa-eu-88x31.eps -2020/08/10 | 5775 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-sa-eu-88x31.pdf -2020/08/10 | 19124 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-sa-unofficial-mr-80x15.eps -2020/08/10 | 7499 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-sa-unofficial-mr-80x15.pdf -2020/08/10 | 30123 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-sa-unofficial-mr-88x31.eps -2020/08/10 | 11686 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-sa-unofficial-mr-88x31.pdf -2020/08/10 | 14115 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-unofficial-mr-80x15.eps -2020/08/10 | 5640 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-unofficial-mr-80x15.pdf -2020/08/10 | 23182 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-unofficial-mr-88x31.eps -2020/08/10 | 9229 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-unofficial-mr-88x31.pdf -2020/08/10 | 6526 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nd-80x15.eps -2020/08/10 | 3022 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nd-80x15.pdf -2020/08/10 | 10011 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nd-88x31.eps -2020/08/10 | 3837 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nd-88x31.pdf -2020/08/10 | 15356 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nd-unofficial-mr-80x15.eps -2020/08/10 | 6129 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nd-unofficial-mr-80x15.pdf -2020/08/10 | 18889 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nd-unofficial-mr-88x31.eps -2020/08/10 | 6580 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nd-unofficial-mr-88x31.pdf -2020/08/10 | 7002 | macros/latex/contrib/doclicense/images/doclicense-CC-by-sa-80x15.eps -2020/08/10 | 3253 | macros/latex/contrib/doclicense/images/doclicense-CC-by-sa-80x15.pdf -2020/08/10 | 11647 | macros/latex/contrib/doclicense/images/doclicense-CC-by-sa-88x31.eps -2020/08/10 | 4460 | macros/latex/contrib/doclicense/images/doclicense-CC-by-sa-88x31.pdf -2020/08/10 | 13505 | macros/latex/contrib/doclicense/images/doclicense-CC-by-sa-unofficial-mr-80x15.eps -2020/08/10 | 5472 | macros/latex/contrib/doclicense/images/doclicense-CC-by-sa-unofficial-mr-80x15.pdf -2020/08/10 | 17092 | macros/latex/contrib/doclicense/images/doclicense-CC-by-sa-unofficial-mr-88x31.eps -2020/08/10 | 5965 | macros/latex/contrib/doclicense/images/doclicense-CC-by-sa-unofficial-mr-88x31.pdf -2020/08/10 | 8473 | macros/latex/contrib/doclicense/images/doclicense-CC-by-unofficial-mr-80x15.eps -2020/08/10 | 3638 | macros/latex/contrib/doclicense/images/doclicense-CC-by-unofficial-mr-80x15.pdf -2020/08/10 | 10917 | macros/latex/contrib/doclicense/images/doclicense-CC-by-unofficial-mr-88x31.eps -2020/08/10 | 3812 | macros/latex/contrib/doclicense/images/doclicense-CC-by-unofficial-mr-88x31.pdf -2020/08/10 | 14916 | macros/latex/contrib/doclicense/images/doclicense-CC-cc-zero-unofficial-mr-80x15.eps -2020/08/10 | 5530 | macros/latex/contrib/doclicense/images/doclicense-CC-cc-zero-unofficial-mr-80x15.pdf -2020/08/10 | 9114 | macros/latex/contrib/doclicense/images/doclicense-CC-zero-80x15.eps -2020/08/10 | 3538 | macros/latex/contrib/doclicense/images/doclicense-CC-zero-80x15.pdf -2020/08/10 | 12331 | macros/latex/contrib/doclicense/images/doclicense-CC-zero-88x31.eps -2020/08/10 | 4697 | macros/latex/contrib/doclicense/images/doclicense-CC-zero-88x31.pdf -2020/08/10 | 16411 | macros/latex/contrib/doclicense/images/doclicense-CC-zero-unofficial-mr-88x31.eps -2020/08/10 | 5920 | macros/latex/contrib/doclicense/images/doclicense-CC-zero-unofficial-mr-88x31.pdf -2020/08/10 | 19416 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-3.0-latex.tex -2020/08/10 | 19466 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-3.0-plaintext.tex -2020/08/10 | 18374 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-4.0-latex.tex -2020/08/10 | 18657 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-4.0-plaintext.tex -2020/08/10 | 20356 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-3.0-latex.tex -2020/08/10 | 20479 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-3.0-plaintext.tex -2020/08/10 | 19004 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-4.0-latex.tex -2020/08/10 | 19347 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-4.0-plaintext.tex -2020/08/10 | 18609 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-nd-3.0-latex.tex -2020/08/10 | 18650 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-nd-3.0-plaintext.tex -2020/08/10 | 18797 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-nd-4.0-latex.tex -2020/08/10 | 19127 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-nd-4.0-plaintext.tex -2020/08/10 | 22108 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-sa-3.0-latex.tex -2020/08/10 | 22306 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-sa-3.0-plaintext.tex -2020/08/10 | 20426 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-sa-4.0-latex.tex -2020/08/10 | 20850 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-sa-4.0-plaintext.tex -2020/08/10 | 17684 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nd-3.0-latex.tex -2020/08/10 | 17650 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nd-3.0-plaintext.tex -2020/08/10 | 18164 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nd-4.0-latex.tex -2020/08/10 | 18436 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nd-4.0-plaintext.tex -2020/08/10 | 22078 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-sa-3.0-latex.tex -2020/08/10 | 22239 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-sa-3.0-plaintext.tex -2020/08/10 | 19772 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-sa-4.0-latex.tex -2020/08/10 | 20138 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-sa-4.0-plaintext.tex -2020/08/10 | 7497 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-zero-1.0-latex.tex -2020/08/10 | 7048 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-zero-1.0-plaintext.tex -2020/08/10 | 2157 | macros/latex/contrib/doclicense/README -2020/09/25 | 728294 | macros/latex/contrib/doclicense.zip +2021/03/13 | 307 | macros/latex/contrib/doclicense/doclicense-acadian.ldf +2021/03/13 | 305 | macros/latex/contrib/doclicense/doclicense-american.ldf +2021/03/13 | 307 | macros/latex/contrib/doclicense/doclicense-australian.ldf +2021/03/13 | 1637 | macros/latex/contrib/doclicense/doclicense-brazilian.ldf +2021/03/13 | 421 | macros/latex/contrib/doclicense/doclicense-british.ldf +2021/03/13 | 2293 | macros/latex/contrib/doclicense/doclicense-bulgarian.ldf +2021/03/13 | 305 | macros/latex/contrib/doclicense/doclicense-canadian.ldf +2021/03/13 | 308 | macros/latex/contrib/doclicense/doclicense-canadien.ldf +2021/03/13 | 1702 | macros/latex/contrib/doclicense/doclicense-catalan.ldf +2021/03/13 | 1441 | macros/latex/contrib/doclicense/doclicense-chinese-gbk.ldf +2021/03/13 | 1592 | macros/latex/contrib/doclicense/doclicense-chinese-utf8.ldf +2021/03/13 | 38073 | macros/latex/contrib/doclicense/doclicense.dtx +2021/03/13 | 1613 | macros/latex/contrib/doclicense/doclicense-english.ldf +2021/03/13 | 2246 | macros/latex/contrib/doclicense/doclicense-french.ldf +2021/03/13 | 1991 | macros/latex/contrib/doclicense/doclicense-galician.ldf +2021/03/13 | 2057 | macros/latex/contrib/doclicense/doclicense-german.ldf +2021/03/13 | 860 | macros/latex/contrib/doclicense/doclicense.ins +2021/03/13 | 2004 | macros/latex/contrib/doclicense/doclicense-italian.ldf +2021/03/13 | 1397 | macros/latex/contrib/doclicense/doclicense-japanese.ldf +2021/03/13 | 3067 | macros/latex/contrib/doclicense/doclicense-marathi.ldf +2021/03/13 | 307 | macros/latex/contrib/doclicense/doclicense-newzealand.ldf +2021/03/13 | 303 | macros/latex/contrib/doclicense/doclicense-ngerman.ldf +2021/03/13 | 262200 | macros/latex/contrib/doclicense/doclicense.pdf +2021/03/13 | 2990 | macros/latex/contrib/doclicense/doclicense-polish.ldf +2021/03/13 | 1665 | macros/latex/contrib/doclicense/doclicense-portuguese.ldf +2021/03/13 | 2810 | macros/latex/contrib/doclicense/doclicense-russian.ldf +2021/03/13 | 1663 | macros/latex/contrib/doclicense/doclicense-spanish.ldf +2021/03/13 | 306 | macros/latex/contrib/doclicense/doclicense-UKenglish.ldf +2021/03/13 | 306 | macros/latex/contrib/doclicense/doclicense-USenglish.ldf +2021/03/13 | 5675 | macros/latex/contrib/doclicense/images/doclicense-CC-by-80x15.eps +2021/03/13 | 2727 | macros/latex/contrib/doclicense/images/doclicense-CC-by-80x15.pdf +2021/03/13 | 7819 | macros/latex/contrib/doclicense/images/doclicense-CC-by-88x31.eps +2021/03/13 | 3052 | macros/latex/contrib/doclicense/images/doclicense-CC-by-88x31.pdf +2021/03/13 | 6616 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-80x15.eps +2021/03/13 | 3064 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-80x15.pdf +2021/03/13 | 11261 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-88x31.eps +2021/03/13 | 4312 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-88x31.pdf +2021/03/13 | 11390 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-eu-88x31.eps +2021/03/13 | 4365 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-eu-88x31.pdf +2021/03/13 | 7473 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-nd-80x15.eps +2021/03/13 | 3357 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-nd-80x15.pdf +2021/03/13 | 13437 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-nd-88x31.eps +2021/03/13 | 5058 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-nd-88x31.pdf +2021/03/13 | 13562 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-nd-eu-88x31.eps +2021/03/13 | 5116 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-nd-eu-88x31.pdf +2021/03/13 | 20897 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-nd-unofficial-mr-80x15.eps +2021/03/13 | 8126 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-nd-unofficial-mr-80x15.pdf +2021/03/13 | 31754 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-nd-unofficial-mr-88x31.eps +2021/03/13 | 12246 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-nd-unofficial-mr-88x31.pdf +2021/03/13 | 7940 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-sa-80x15.eps +2021/03/13 | 3579 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-sa-80x15.pdf +2021/03/13 | 15146 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-sa-88x31.eps +2021/03/13 | 5728 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-sa-88x31.pdf +2021/03/13 | 15260 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-sa-eu-88x31.eps +2021/03/13 | 5775 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-sa-eu-88x31.pdf +2021/03/13 | 19124 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-sa-unofficial-mr-80x15.eps +2021/03/13 | 7499 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-sa-unofficial-mr-80x15.pdf +2021/03/13 | 30123 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-sa-unofficial-mr-88x31.eps +2021/03/13 | 11686 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-sa-unofficial-mr-88x31.pdf +2021/03/13 | 14115 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-unofficial-mr-80x15.eps +2021/03/13 | 5640 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-unofficial-mr-80x15.pdf +2021/03/13 | 23182 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-unofficial-mr-88x31.eps +2021/03/13 | 9229 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-unofficial-mr-88x31.pdf +2021/03/13 | 6526 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nd-80x15.eps +2021/03/13 | 3022 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nd-80x15.pdf +2021/03/13 | 10011 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nd-88x31.eps +2021/03/13 | 3837 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nd-88x31.pdf +2021/03/13 | 15356 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nd-unofficial-mr-80x15.eps +2021/03/13 | 6129 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nd-unofficial-mr-80x15.pdf +2021/03/13 | 18889 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nd-unofficial-mr-88x31.eps +2021/03/13 | 6580 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nd-unofficial-mr-88x31.pdf +2021/03/13 | 7002 | macros/latex/contrib/doclicense/images/doclicense-CC-by-sa-80x15.eps +2021/03/13 | 3253 | macros/latex/contrib/doclicense/images/doclicense-CC-by-sa-80x15.pdf +2021/03/13 | 11647 | macros/latex/contrib/doclicense/images/doclicense-CC-by-sa-88x31.eps +2021/03/13 | 4460 | macros/latex/contrib/doclicense/images/doclicense-CC-by-sa-88x31.pdf +2021/03/13 | 13505 | macros/latex/contrib/doclicense/images/doclicense-CC-by-sa-unofficial-mr-80x15.eps +2021/03/13 | 5472 | macros/latex/contrib/doclicense/images/doclicense-CC-by-sa-unofficial-mr-80x15.pdf +2021/03/13 | 17092 | macros/latex/contrib/doclicense/images/doclicense-CC-by-sa-unofficial-mr-88x31.eps +2021/03/13 | 5965 | macros/latex/contrib/doclicense/images/doclicense-CC-by-sa-unofficial-mr-88x31.pdf +2021/03/13 | 8473 | macros/latex/contrib/doclicense/images/doclicense-CC-by-unofficial-mr-80x15.eps +2021/03/13 | 3638 | macros/latex/contrib/doclicense/images/doclicense-CC-by-unofficial-mr-80x15.pdf +2021/03/13 | 10917 | macros/latex/contrib/doclicense/images/doclicense-CC-by-unofficial-mr-88x31.eps +2021/03/13 | 3812 | macros/latex/contrib/doclicense/images/doclicense-CC-by-unofficial-mr-88x31.pdf +2021/03/13 | 14916 | macros/latex/contrib/doclicense/images/doclicense-CC-cc-zero-unofficial-mr-80x15.eps +2021/03/13 | 5530 | macros/latex/contrib/doclicense/images/doclicense-CC-cc-zero-unofficial-mr-80x15.pdf +2021/03/13 | 9114 | macros/latex/contrib/doclicense/images/doclicense-CC-zero-80x15.eps +2021/03/13 | 3538 | macros/latex/contrib/doclicense/images/doclicense-CC-zero-80x15.pdf +2021/03/13 | 12331 | macros/latex/contrib/doclicense/images/doclicense-CC-zero-88x31.eps +2021/03/13 | 4697 | macros/latex/contrib/doclicense/images/doclicense-CC-zero-88x31.pdf +2021/03/13 | 16411 | macros/latex/contrib/doclicense/images/doclicense-CC-zero-unofficial-mr-88x31.eps +2021/03/13 | 5920 | macros/latex/contrib/doclicense/images/doclicense-CC-zero-unofficial-mr-88x31.pdf +2021/03/13 | 20781 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-3.0-latex.html +2021/03/13 | 19416 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-3.0-latex.tex +2021/03/13 | 19466 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-3.0-plaintext.tex +2021/03/13 | 38132 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-4.0-latex.html +2021/03/13 | 18374 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-4.0-latex.tex +2021/03/13 | 18657 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-4.0-plaintext.tex +2021/03/13 | 21724 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-3.0-latex.html +2021/03/13 | 20356 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-3.0-latex.tex +2021/03/13 | 20479 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-3.0-plaintext.tex +2021/03/13 | 38979 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-4.0-latex.html +2021/03/13 | 19004 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-4.0-latex.tex +2021/03/13 | 19347 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-4.0-plaintext.tex +2021/03/13 | 19976 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-nd-3.0-latex.html +2021/03/13 | 18609 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-nd-3.0-latex.tex +2021/03/13 | 18650 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-nd-3.0-plaintext.tex +2021/03/13 | 38937 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-nd-4.0-latex.html +2021/03/13 | 18797 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-nd-4.0-latex.tex +2021/03/13 | 19127 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-nd-4.0-plaintext.tex +2021/03/13 | 23486 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-sa-3.0-latex.html +2021/03/13 | 22108 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-sa-3.0-latex.tex +2021/03/13 | 22306 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-sa-3.0-plaintext.tex +2021/03/13 | 40787 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-sa-4.0-latex.html +2021/03/13 | 20426 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-sa-4.0-latex.tex +2021/03/13 | 20850 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-sa-4.0-plaintext.tex +2021/03/13 | 19048 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nd-3.0-latex.html +2021/03/13 | 17684 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nd-3.0-latex.tex +2021/03/13 | 17650 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nd-3.0-plaintext.tex +2021/03/13 | 38078 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nd-4.0-latex.html +2021/03/13 | 18164 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nd-4.0-latex.tex +2021/03/13 | 18436 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nd-4.0-plaintext.tex +2021/03/13 | 23457 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-sa-3.0-latex.html +2021/03/13 | 22078 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-sa-3.0-latex.tex +2021/03/13 | 22239 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-sa-3.0-plaintext.tex +2021/03/13 | 39915 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-sa-4.0-latex.html +2021/03/13 | 19772 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-sa-4.0-latex.tex +2021/03/13 | 20138 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-sa-4.0-plaintext.tex +2021/03/13 | 9934 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-zero-1.0-latex.html +2021/03/13 | 7497 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-zero-1.0-latex.tex +2021/03/13 | 7048 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-zero-1.0-plaintext.tex +2021/03/13 | 1570 | macros/latex/contrib/doclicense/Makefile +2021/03/13 | 7166 | macros/latex/contrib/doclicense/manifest.txt +2021/03/13 | 2476 | macros/latex/contrib/doclicense/README.md +2021/03/14 | 840970 | macros/latex/contrib/doclicense.zip 2009/09/02 | 27246 | macros/latex/contrib/docmfp/docmfp.dtx 2009/09/02 | 2475 | macros/latex/contrib/docmfp/docmfp.ins 2009/09/02 | 175153 | macros/latex/contrib/docmfp/docmfp.pdf @@ -196620,17 +196634,17 @@ 2021/01/24 | 422 | macros/latex/contrib/ean13isbn/README 2021/01/24 | 322624 | macros/latex/contrib/ean13isbn.zip 2021/02/07 | 99 | macros/latex/contrib/easybook/doc/appendix.tex -2021/03/11 | 4190 | macros/latex/contrib/easybook/doc/chapter1.tex +2021/03/14 | 4190 | macros/latex/contrib/easybook/doc/chapter1.tex 2021/03/13 | 3869 | macros/latex/contrib/easybook/doc/chapter2.tex 2021/03/13 | 2539 | macros/latex/contrib/easybook/doc/chapter3.tex -2021/03/13 | 287472 | macros/latex/contrib/easybook/doc/easybook-demo.pdf -2021/03/13 | 2459 | macros/latex/contrib/easybook/doc/easybook-demo.tex -2021/03/13 | 237329 | macros/latex/contrib/easybook/doc/easybook.pdf -2021/03/13 | 30290 | macros/latex/contrib/easybook/doc/easybook.tex +2021/03/14 | 287471 | macros/latex/contrib/easybook/doc/easybook-demo.pdf +2021/03/14 | 2459 | macros/latex/contrib/easybook/doc/easybook-demo.tex +2021/03/14 | 245151 | macros/latex/contrib/easybook/doc/easybook.pdf +2021/03/14 | 32016 | macros/latex/contrib/easybook/doc/easybook.tex 2021/02/23 | 830 | macros/latex/contrib/easybook/doc/refs.bib -2021/03/13 | 44638 | macros/latex/contrib/easybook/easybook.cls +2021/03/14 | 44729 | macros/latex/contrib/easybook/easybook.cls 2021/01/14 | 3005 | macros/latex/contrib/easybook/README.md -2021/03/13 | 527449 | macros/latex/contrib/easybook.zip +2021/03/14 | 535826 | macros/latex/contrib/easybook.zip 2009/06/17 | 82589 | macros/latex/contrib/easy/doc/docbib.pdf 2009/06/17 | 78378 | macros/latex/contrib/easy/doc/docbmat.pdf 2009/06/17 | 99132 | macros/latex/contrib/easy/doc/doceqn.pdf @@ -201041,6 +201055,32 @@ 2020/01/10 | 13502 | macros/latex/contrib/hithesis/README.md 2020/01/10 | 1730 | macros/latex/contrib/hithesis/reference.bib 2020/01/10 | 1079000 | macros/latex/contrib/hithesis.zip +2021/02/10 | 1102 | macros/latex/contrib/hitreport/data/abstract.tex +2021/03/13 | 1439 | macros/latex/contrib/hitreport/data/appendix.tex +2021/01/26 | 4652 | macros/latex/contrib/hitreport/data/chap01.tex +2021/02/09 | 4824 | macros/latex/contrib/hitreport/data/chap02.tex +2021/02/09 | 2874 | macros/latex/contrib/hitreport/data/chap03.tex +2021/01/14 | 12160 | macros/latex/contrib/hitreport/figures/example-image-a.pdf +2021/01/14 | 17201 | macros/latex/contrib/hitreport/figures/example-image-b.pdf +2021/01/14 | 35716 | macros/latex/contrib/hitreport/figures/scan-copyright.pdf +2021/01/14 | 108783 | macros/latex/contrib/hitreport/figures/scan-record.pdf +2021/01/14 | 31558 | macros/latex/contrib/hitreport/figures/scan-statement.pdf +2021/03/14 | 93579 | macros/latex/contrib/hitreport/hitreport.dtx +2021/03/14 | 416027 | macros/latex/contrib/hitreport/hitreport-example.pdf +2021/03/13 | 567 | macros/latex/contrib/hitreport/hitreport-example.tex +2021/02/23 | 2077 | macros/latex/contrib/hitreport/hitreport.ins +2021/03/14 | 485273 | macros/latex/contrib/hitreport/hitreport.pdf +2021/03/14 | 2184 | macros/latex/contrib/hitreport/hitsetup.tex +2021/01/14 | 490 | macros/latex/contrib/hitreport/latexmkrc +2021/01/14 | 19106 | macros/latex/contrib/hitreport/LICENSE +2021/02/24 | 1130 | macros/latex/contrib/hitreport/Makefile +2021/03/06 | 156229 | macros/latex/contrib/hitreport/photo/hithrb.pdf +2021/03/06 | 136064 | macros/latex/contrib/hitreport/photo/hitsz.pdf +2021/03/06 | 200504 | macros/latex/contrib/hitreport/photo/hitwh.pdf +2021/03/14 | 5874 | macros/latex/contrib/hitreport/README.md +2021/01/14 | 428 | macros/latex/contrib/hitreport/ref/appendix.bib +2021/01/14 | 9990 | macros/latex/contrib/hitreport/ref/refs.bib +2021/03/14 | 1526719 | macros/latex/contrib/hitreport.zip 2020/03/10 | 241 | macros/latex/contrib/hitszthesis/back/acknowledgements.tex 2020/06/23 | 4336 | macros/latex/contrib/hitszthesis/back/appendix01.tex 2020/06/22 | 8478 | macros/latex/contrib/hitszthesis/back/appendix02.tex @@ -206806,17 +206846,17 @@ 2011/02/19 | 183717 | macros/latex/contrib/parselines/parselines.pdf 2010/10/24 | 413 | macros/latex/contrib/parselines/README 2011/02/19 | 149199 | macros/latex/contrib/parselines.zip -2021/03/02 | 1630 | macros/latex/contrib/parskip/changes.txt -2021/03/02 | 2901 | macros/latex/contrib/parskip/MANIFEST.md -2021/03/02 | 2757 | macros/latex/contrib/parskip/parskip-2001-04-09.sty -2021/03/02 | 225639 | macros/latex/contrib/parskip/parskip-code.pdf -2021/03/02 | 101 | macros/latex/contrib/parskip/parskip-code.tex -2021/03/02 | 16291 | macros/latex/contrib/parskip/parskip.dtx -2021/03/02 | 1958 | macros/latex/contrib/parskip/parskip.ins -2021/03/02 | 174611 | macros/latex/contrib/parskip/parskip.pdf -2021/03/02 | 112 | macros/latex/contrib/parskip/parskip.tex -2021/03/02 | 408 | macros/latex/contrib/parskip/README.md -2021/03/02 | 407335 | macros/latex/contrib/parskip.zip +2021/03/14 | 1789 | macros/latex/contrib/parskip/changes.txt +2021/03/14 | 2901 | macros/latex/contrib/parskip/MANIFEST.md +2021/03/14 | 2757 | macros/latex/contrib/parskip/parskip-2001-04-09.sty +2021/03/14 | 225887 | macros/latex/contrib/parskip/parskip-code.pdf +2021/03/14 | 101 | macros/latex/contrib/parskip/parskip-code.tex +2021/03/14 | 16291 | macros/latex/contrib/parskip/parskip.dtx +2021/03/14 | 1958 | macros/latex/contrib/parskip/parskip.ins +2021/03/14 | 174843 | macros/latex/contrib/parskip/parskip.pdf +2021/03/14 | 112 | macros/latex/contrib/parskip/parskip.tex +2021/03/14 | 408 | macros/latex/contrib/parskip/README.md +2021/03/14 | 407854 | macros/latex/contrib/parskip.zip 2019/09/04 | 12784 | macros/latex/contrib/pas-cours/doc/MiKTeX-screenshot01.png 2019/09/04 | 18893 | macros/latex/contrib/pas-cours/doc/MiKTeX-screenshot02.png 2019/09/04 | 18571 | macros/latex/contrib/pas-cours/doc/MiKTeX-screenshot03.png @@ -208245,22 +208285,23 @@ 2002/02/04 | 5634 | macros/latex/contrib/procIAGssymp/procIAGssymp.sty 2002/02/04 | 7126 | macros/latex/contrib/procIAGssymp/TestPaper.tex 2019/07/29 | 5300 | macros/latex/contrib/procIAGssymp.zip -2021/01/30 | 1702509 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf -2021/01/30 | 1216103 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.zip -2021/01/17 | 22495 | macros/latex/contrib/profcollege/latex/PfC-EquationComposition1.tex +2021/03/13 | 2573778 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf +2021/03/13 | 1672987 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.zip +2021/03/13 | 22499 | macros/latex/contrib/profcollege/latex/PfC-EquationComposition2.tex 2021/01/17 | 18004 | macros/latex/contrib/profcollege/latex/PfC-EquationLaurent1.tex 2021/01/17 | 19267 | macros/latex/contrib/profcollege/latex/PfC-EquationPose1.tex -2021/01/17 | 25795 | macros/latex/contrib/profcollege/latex/PfC-EquationSoustraction1.tex +2021/03/13 | 27315 | macros/latex/contrib/profcollege/latex/PfC-EquationSoustraction2.tex 2021/01/17 | 13854 | macros/latex/contrib/profcollege/latex/PfC-EquationSymbole1.tex 2021/01/17 | 21822 | macros/latex/contrib/profcollege/latex/PfC-EquationTerme1.tex -2021/01/30 | 427197 | macros/latex/contrib/profcollege/latex/ProfCollege.sty -2021/01/17 | 13151 | macros/latex/contrib/profcollege/metapost/PfC-Calculatrice.mp -2021/01/17 | 583 | macros/latex/contrib/profcollege/metapost/PfC-Constantes.mp -2021/01/18 | 31952 | macros/latex/contrib/profcollege/metapost/PfC-Geometrie.mp -2021/01/17 | 921 | macros/latex/contrib/profcollege/metapost/PfC-LaTeX.mp -2021/01/17 | 6804 | macros/latex/contrib/profcollege/metapost/PfC-Svgnames.mp +2021/03/13 | 494745 | macros/latex/contrib/profcollege/latex/ProfCollege.sty +2021/03/13 | 5056 | macros/latex/contrib/profcollege/metapost/PfC-Afficheur.mp +2021/03/13 | 13296 | macros/latex/contrib/profcollege/metapost/PfC-Calculatrice.mp +2021/03/13 | 431 | macros/latex/contrib/profcollege/metapost/PfC-Constantes.mp +2021/03/13 | 31952 | macros/latex/contrib/profcollege/metapost/PfC-Geometrie.mp +2021/03/13 | 611 | macros/latex/contrib/profcollege/metapost/PfC-LaTeX.mp +2021/03/13 | 6652 | macros/latex/contrib/profcollege/metapost/PfC-Svgnames.mp 2021/01/18 | 435 | macros/latex/contrib/profcollege/README -2021/01/30 | 2782919 | macros/latex/contrib/profcollege.zip +2021/03/14 | 3994645 | macros/latex/contrib/profcollege.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 @@ -222321,11 +222362,11 @@ 2020/05/07 | 3848 | macros/luatex/latex/unitconv/latex/unitconv.sty 2020/05/07 | 540 | macros/luatex/latex/unitconv/README.md 2020/05/07 | 70979 | macros/luatex/latex/unitconv.zip -2020/09/21 | 482 | macros/luatex/latex/unitipa/README.txt -2020/09/21 | 16302 | macros/luatex/latex/unitipa/unitipa.dtx -2020/09/21 | 1352 | macros/luatex/latex/unitipa/unitipa.ins -2020/09/21 | 178561 | macros/luatex/latex/unitipa/unitipa.pdf -2020/09/21 | 178278 | macros/luatex/latex/unitipa.zip +2021/03/14 | 477 | macros/luatex/latex/unitipa/README.txt +2021/03/14 | 17117 | macros/luatex/latex/unitipa/unitipa.dtx +2021/03/14 | 1352 | macros/luatex/latex/unitipa/unitipa.ins +2021/03/14 | 191050 | macros/luatex/latex/unitipa/unitipa.pdf +2021/03/14 | 190589 | macros/luatex/latex/unitipa.zip 2017/10/21 | 5399 | macros/luatex/latex/wallcalendar/doc/auto/wallcalendar-code.el 2017/10/21 | 1846 | macros/luatex/latex/wallcalendar/doc/auto/wallcalendar.el 2017/10/21 | 444 | macros/luatex/latex/wallcalendar/doc/doc-setup.org @@ -257516,76 +257557,79 @@ 2018/04/15 | 1313 | support/latex-git-log/po/de.po 2020/02/26 | 3353 | support/latex-git-log/README.md 2020/02/27 | 87742 | support/latex-git-log.zip -2020/11/06 | 18181 | support/latexindent/defaultSettings.yaml -2020/11/06 | 11660 | support/latexindent/documentation/appendices.tex -2020/11/06 | 492 | support/latexindent/documentation/cmhlistings.tex -2020/11/06 | 1896 | support/latexindent/documentation/figure-schematic.tex -2020/11/06 | 888691 | support/latexindent/documentation/latexindent.pdf -2020/11/06 | 23161 | support/latexindent/documentation/latexindent.tex -2020/11/06 | 1595 | support/latexindent/documentation/logo.tex -2020/11/06 | 246 | support/latexindent/documentation/references.tex -2020/11/06 | 2538 | support/latexindent/documentation/sec-conclusions-know-limitations.tex -2020/11/06 | 58007 | support/latexindent/documentation/sec-default-user-local.tex -2020/11/06 | 2118 | support/latexindent/documentation/sec-demonstration.tex -2020/11/06 | 7522 | support/latexindent/documentation/sec-fine-tuning.tex -2020/11/06 | 17331 | support/latexindent/documentation/sec-how-to-use.tex -2020/11/06 | 9059 | support/latexindent/documentation/sec-indent-config-and-settings.tex -2020/11/06 | 7882 | support/latexindent/documentation/sec-introduction.tex -2020/11/06 | 20120 | support/latexindent/documentation/sec-replacements.tex -2020/11/06 | 103404 | support/latexindent/documentation/sec-the-m-switch.tex -2020/11/06 | 13839 | support/latexindent/documentation/subsec-commands-and-their-options.tex -2020/11/06 | 8985 | support/latexindent/documentation/subsec-conflicting-poly-switches.tex -2020/11/06 | 1646 | support/latexindent/documentation/subsec-noAdditionalIndent-indentRules.tex -2020/11/06 | 2786 | support/latexindent/documentation/subsec-partnering-poly-switches.tex -2020/11/06 | 5869 | support/latexindent/documentation/subsubsec-commands-with-arguments.tex -2020/11/06 | 16308 | support/latexindent/documentation/subsubsec-environments-and-their-arguments.tex -2020/11/06 | 3381 | support/latexindent/documentation/subsubsec-environments-with-items.tex -2020/11/06 | 5214 | support/latexindent/documentation/subsubsec-headings.tex -2020/11/06 | 4799 | support/latexindent/documentation/subsubsec-ifelsefi.tex -2020/11/06 | 7101 | support/latexindent/documentation/subsubsec-no-add-remaining-code-blocks.tex -2020/11/06 | 3688 | support/latexindent/documentation/subsubsec-special.tex -2020/11/06 | 1460 | support/latexindent/documentation/title.tex -2020/11/06 | 52219 | support/latexindent/LatexIndent/AlignmentAtAmpersand.pm -2020/11/06 | 23600 | support/latexindent/LatexIndent/Arguments.pm -2020/11/06 | 6042 | support/latexindent/LatexIndent/BackUpFileProcedure.pm -2020/11/06 | 5435 | support/latexindent/LatexIndent/BlankLines.pm -2020/11/06 | 12661 | support/latexindent/LatexIndent/Braces.pm -2020/11/06 | 10361 | support/latexindent/LatexIndent/Command.pm -2020/11/06 | 18156 | support/latexindent/LatexIndent/Document.pm -2020/11/06 | 1483 | support/latexindent/LatexIndent/DoubleBackSlash.pm -2020/11/06 | 5937 | support/latexindent/LatexIndent/Else.pm -2020/11/06 | 6353 | support/latexindent/LatexIndent/Environment.pm -2020/11/06 | 11472350 | support/latexindent/latexindent.exe -2020/11/06 | 11862 | support/latexindent/LatexIndent/FileContents.pm -2020/11/06 | 6513 | support/latexindent/LatexIndent/FileExtension.pm -2020/11/06 | 43703 | support/latexindent/LatexIndent/GetYamlSettings.pm -2020/11/06 | 10824 | support/latexindent/LatexIndent/Heading.pm -2020/11/06 | 9602 | support/latexindent/LatexIndent/HiddenChildren.pm -2020/11/06 | 3394 | support/latexindent/LatexIndent/HorizontalWhiteSpace.pm -2020/11/06 | 9542 | support/latexindent/LatexIndent/IfElseFi.pm -2020/11/06 | 20505 | support/latexindent/LatexIndent/Indent.pm -2020/11/06 | 6358 | support/latexindent/LatexIndent/Item.pm -2020/11/06 | 5330 | support/latexindent/LatexIndent/KeyEqualsValuesBraces.pm -2020/11/06 | 11308 | support/latexindent/LatexIndent/LogFile.pm -2020/11/06 | 6793 | support/latexindent/LatexIndent/MandatoryArgument.pm -2020/11/06 | 20764 | support/latexindent/LatexIndent/ModifyLineBreaks.pm -2020/11/06 | 1602 | support/latexindent/latexindent-module-installer.pl -2020/11/06 | 3176 | support/latexindent/LatexIndent/NamedGroupingBracesBrackets.pm -2020/11/06 | 6062 | support/latexindent/LatexIndent/OptionalArgument.pm -2020/11/06 | 2912 | support/latexindent/latexindent.pl -2020/11/06 | 3463 | support/latexindent/LatexIndent/Preamble.pm -2020/11/06 | 3636 | support/latexindent/LatexIndent/Replacement.pm -2020/11/06 | 4355 | support/latexindent/LatexIndent/RoundBrackets.pm -2020/11/06 | 19864 | support/latexindent/LatexIndent/Sentence.pm -2020/11/06 | 13154 | support/latexindent/LatexIndent/Special.pm -2020/11/06 | 1990 | support/latexindent/LatexIndent/Switches.pm -2020/11/06 | 3273 | support/latexindent/LatexIndent/Tokens.pm -2020/11/06 | 6036 | support/latexindent/LatexIndent/TrailingComments.pm -2020/11/06 | 5777 | support/latexindent/LatexIndent/UnNamedGroupingBracesBrackets.pm -2020/11/06 | 21098 | support/latexindent/LatexIndent/Verbatim.pm -2020/11/06 | 834 | support/latexindent/LatexIndent/Version.pm -2020/11/06 | 1875 | support/latexindent/README -2020/11/06 | 9549543 | support/latexindent.zip +2021/03/14 | 18128 | support/latexindent/defaultSettings.yaml +2021/03/14 | 11856 | support/latexindent/documentation/appendices.tex +2021/03/14 | 535 | support/latexindent/documentation/cmhlistings.tex +2021/03/14 | 7161 | support/latexindent/documentation/figure-schematic.png +2021/03/14 | 1896 | support/latexindent/documentation/figure-schematic.tex +2021/03/14 | 893716 | support/latexindent/documentation/latexindent.pdf +2021/03/14 | 23253 | support/latexindent/documentation/latexindent.tex +2021/03/14 | 44096 | support/latexindent/documentation/logo.png +2021/03/14 | 1595 | support/latexindent/documentation/logo.tex +2021/03/14 | 246 | support/latexindent/documentation/references.tex +2021/03/14 | 2539 | support/latexindent/documentation/sec-conclusions-know-limitations.tex +2021/03/14 | 61337 | support/latexindent/documentation/sec-default-user-local.tex +2021/03/14 | 2118 | support/latexindent/documentation/sec-demonstration.tex +2021/03/14 | 9258 | support/latexindent/documentation/sec-fine-tuning.tex +2021/03/14 | 18581 | support/latexindent/documentation/sec-how-to-use.tex +2021/03/14 | 10135 | support/latexindent/documentation/sec-indent-config-and-settings.tex +2021/03/14 | 7970 | support/latexindent/documentation/sec-introduction.tex +2021/03/14 | 21671 | support/latexindent/documentation/sec-replacements.tex +2021/03/14 | 110291 | support/latexindent/documentation/sec-the-m-switch.tex +2021/03/14 | 14049 | support/latexindent/documentation/subsec-commands-and-their-options.tex +2021/03/14 | 9353 | support/latexindent/documentation/subsec-conflicting-poly-switches.tex +2021/03/14 | 1891 | support/latexindent/documentation/subsec-noAdditionalIndent-indentRules.tex +2021/03/14 | 2902 | support/latexindent/documentation/subsec-partnering-poly-switches.tex +2021/03/14 | 5974 | support/latexindent/documentation/subsubsec-commands-with-arguments.tex +2021/03/14 | 16693 | support/latexindent/documentation/subsubsec-environments-and-their-arguments.tex +2021/03/14 | 3451 | support/latexindent/documentation/subsubsec-environments-with-items.tex +2021/03/14 | 5284 | support/latexindent/documentation/subsubsec-headings.tex +2021/03/14 | 4869 | support/latexindent/documentation/subsubsec-ifelsefi.tex +2021/03/14 | 7223 | support/latexindent/documentation/subsubsec-no-add-remaining-code-blocks.tex +2021/03/14 | 3847 | support/latexindent/documentation/subsubsec-special.tex +2021/03/14 | 1458 | support/latexindent/documentation/title.tex +2021/03/14 | 52219 | support/latexindent/LatexIndent/AlignmentAtAmpersand.pm +2021/03/14 | 23600 | support/latexindent/LatexIndent/Arguments.pm +2021/03/14 | 6042 | support/latexindent/LatexIndent/BackUpFileProcedure.pm +2021/03/14 | 5435 | support/latexindent/LatexIndent/BlankLines.pm +2021/03/14 | 12661 | support/latexindent/LatexIndent/Braces.pm +2021/03/14 | 10361 | support/latexindent/LatexIndent/Command.pm +2021/03/14 | 18536 | support/latexindent/LatexIndent/Document.pm +2021/03/14 | 1483 | support/latexindent/LatexIndent/DoubleBackSlash.pm +2021/03/14 | 5937 | support/latexindent/LatexIndent/Else.pm +2021/03/14 | 6353 | support/latexindent/LatexIndent/Environment.pm +2021/03/14 | 6371118 | support/latexindent/latexindent.exe +2021/03/14 | 11862 | support/latexindent/LatexIndent/FileContents.pm +2021/03/14 | 6438 | support/latexindent/LatexIndent/FileExtension.pm +2021/03/14 | 46755 | support/latexindent/LatexIndent/GetYamlSettings.pm +2021/03/14 | 10824 | support/latexindent/LatexIndent/Heading.pm +2021/03/14 | 9602 | support/latexindent/LatexIndent/HiddenChildren.pm +2021/03/14 | 3394 | support/latexindent/LatexIndent/HorizontalWhiteSpace.pm +2021/03/14 | 9559 | support/latexindent/LatexIndent/IfElseFi.pm +2021/03/14 | 20505 | support/latexindent/LatexIndent/Indent.pm +2021/03/14 | 6408 | support/latexindent/LatexIndent/Item.pm +2021/03/14 | 5330 | support/latexindent/LatexIndent/KeyEqualsValuesBraces.pm +2021/03/14 | 7886 | support/latexindent/LatexIndent/LogFile.pm +2021/03/14 | 1839 | support/latexindent/LatexIndent/Logger.pm +2021/03/14 | 6793 | support/latexindent/LatexIndent/MandatoryArgument.pm +2021/03/14 | 20764 | support/latexindent/LatexIndent/ModifyLineBreaks.pm +2021/03/14 | 1558 | support/latexindent/latexindent-module-installer.pl +2021/03/14 | 3176 | support/latexindent/LatexIndent/NamedGroupingBracesBrackets.pm +2021/03/14 | 6062 | support/latexindent/LatexIndent/OptionalArgument.pm +2021/03/14 | 2644 | support/latexindent/latexindent.pl +2021/03/14 | 3463 | support/latexindent/LatexIndent/Preamble.pm +2021/03/14 | 3636 | support/latexindent/LatexIndent/Replacement.pm +2021/03/14 | 4355 | support/latexindent/LatexIndent/RoundBrackets.pm +2021/03/14 | 19864 | support/latexindent/LatexIndent/Sentence.pm +2021/03/14 | 13154 | support/latexindent/LatexIndent/Special.pm +2021/03/14 | 1990 | support/latexindent/LatexIndent/Switches.pm +2021/03/14 | 3273 | support/latexindent/LatexIndent/Tokens.pm +2021/03/14 | 6036 | support/latexindent/LatexIndent/TrailingComments.pm +2021/03/14 | 5777 | support/latexindent/LatexIndent/UnNamedGroupingBracesBrackets.pm +2021/03/14 | 21098 | support/latexindent/LatexIndent/Verbatim.pm +2021/03/14 | 832 | support/latexindent/LatexIndent/Version.pm +2021/03/14 | 1873 | support/latexindent/README +2021/03/14 | 4596634 | support/latexindent.zip 2021/01/03 | 16380 | support/latex-make/figlatex.dtx 2021/01/03 | 221479 | support/latex-make/figlatex.pdf 2001/06/07 | 302 | support/latexmake/latexmake.diz @@ -265800,7 +265844,7 @@ 2021/02/16 | 1480 | systems/texlive/tlnet/archive/collection-mathscience.r57759.tar.xz 2019/03/09 | 540 | systems/texlive/tlnet/archive/collection-metapost.r50293.tar.xz 2020/04/12 | 472 | systems/texlive/tlnet/archive/collection-music.r54666.tar.xz -2021/03/02 | 1416 | systems/texlive/tlnet/archive/collection-pictures.r58034.tar.xz +2021/03/14 | 1424 | systems/texlive/tlnet/archive/collection-pictures.r58334.tar.xz 2020/10/01 | 932 | systems/texlive/tlnet/archive/collection-plaingeneric.r56496.tar.xz 2020/03/22 | 808 | systems/texlive/tlnet/archive/collection-pstricks.r54455.tar.xz 2021/01/04 | 1536 | systems/texlive/tlnet/archive/collection-publishers.r57312.tar.xz @@ -267116,8 +267160,8 @@ 2021/01/25 | 1828 | systems/texlive/tlnet/archive/ean13isbn.r57514.tar.xz 2019/02/28 | 948 | systems/texlive/tlnet/archive/ean.doc.r20851.tar.xz 2019/02/28 | 3148 | systems/texlive/tlnet/archive/ean.r20851.tar.xz -2021/03/13 | 512688 | systems/texlive/tlnet/archive/easybook.doc.r58307.tar.xz -2021/03/13 | 10096 | systems/texlive/tlnet/archive/easybook.r58307.tar.xz +2021/03/14 | 515024 | systems/texlive/tlnet/archive/easybook.doc.r58332.tar.xz +2021/03/14 | 10116 | systems/texlive/tlnet/archive/easybook.r58332.tar.xz 2019/02/28 | 4540 | systems/texlive/tlnet/archive/easy.doc.r19440.tar.xz 2020/09/08 | 175976 | systems/texlive/tlnet/archive/easyfig.doc.r56291.tar.xz 2020/09/08 | 1936 | systems/texlive/tlnet/archive/easyfig.r56291.tar.xz @@ -269250,8 +269294,8 @@ 2019/02/28 | 9096 | systems/texlive/tlnet/archive/jknapltx.r19440.tar.xz 2019/02/28 | 27008 | systems/texlive/tlnet/archive/jlabels.doc.r24858.tar.xz 2019/02/28 | 1564 | systems/texlive/tlnet/archive/jlabels.r24858.tar.xz -2021/01/11 | 62796 | systems/texlive/tlnet/archive/jlreq-deluxe.doc.r57363.tar.xz -2021/01/11 | 286924 | systems/texlive/tlnet/archive/jlreq-deluxe.r57363.tar.xz +2021/03/14 | 66024 | systems/texlive/tlnet/archive/jlreq-deluxe.doc.r58333.tar.xz +2021/03/14 | 22512 | systems/texlive/tlnet/archive/jlreq-deluxe.r58333.tar.xz 2020/12/30 | 501064 | systems/texlive/tlnet/archive/jlreq.doc.r57255.tar.xz 2020/12/30 | 134796 | systems/texlive/tlnet/archive/jlreq.r57255.tar.xz 2020/12/30 | 8196 | systems/texlive/tlnet/archive/jlreq.source.r57255.tar.xz @@ -269838,9 +269882,6 @@ 2019/02/28 | 5020492 | systems/texlive/tlnet/archive/latex-refsheet.doc.r45076.tar.xz 2019/02/28 | 480 | systems/texlive/tlnet/archive/latex-refsheet.r45076.tar.xz 2021/01/09 | 604512 | systems/texlive/tlnet/archive/latex.source.r57354.tar.xz -2020/07/08 | 84092 | systems/texlive/tlnet/archive/latex-tds.doc.r55777.tar.xz -2020/07/08 | 644 | systems/texlive/tlnet/archive/latex-tds.r55777.tar.xz -2020/07/08 | 128296 | systems/texlive/tlnet/archive/latex-tds.source.r55777.tar.xz 2021/02/28 | 5278232 | systems/texlive/tlnet/archive/latex-tools-dev.doc.r57998.tar.xz 2021/02/28 | 42164 | systems/texlive/tlnet/archive/latex-tools-dev.r57998.tar.xz 2021/02/28 | 227036 | systems/texlive/tlnet/archive/latex-tools-dev.source.r57998.tar.xz @@ -271562,6 +271603,8 @@ 2019/02/28 | 27360 | systems/texlive/tlnet/archive/nkarta.source.r16437.tar.xz 2020/02/14 | 692 | systems/texlive/tlnet/archive/nlctdoc.doc.r53768.tar.xz 2020/02/14 | 6580 | systems/texlive/tlnet/archive/nlctdoc.r53768.tar.xz +2021/03/14 | 63436 | systems/texlive/tlnet/archive/nl-interval.doc.r58334.tar.xz +2021/03/14 | 1592 | systems/texlive/tlnet/archive/nl-interval.r58334.tar.xz 2019/02/28 | 443656 | systems/texlive/tlnet/archive/nmbib.doc.r37984.tar.xz 2019/02/28 | 9092 | systems/texlive/tlnet/archive/nmbib.r37984.tar.xz 2019/02/28 | 11372 | systems/texlive/tlnet/archive/nmbib.source.r37984.tar.xz @@ -274607,8 +274650,8 @@ 2020/03/24 | 280 | systems/texlive/tlnet/archive/texlive-cz.r54496.tar.xz 2020/12/26 | 1338744 | systems/texlive/tlnet/archive/texlive-de.doc.r57223.tar.xz 2020/12/26 | 272 | systems/texlive/tlnet/archive/texlive-de.r57223.tar.xz -2021/03/13 | 173616 | systems/texlive/tlnet/archive/texlive-docindex.doc.r58288.tar.xz -2021/03/13 | 388 | systems/texlive/tlnet/archive/texlive-docindex.r58288.tar.xz +2021/03/14 | 173616 | systems/texlive/tlnet/archive/texlive-docindex.doc.r58321.tar.xz +2021/03/14 | 388 | systems/texlive/tlnet/archive/texlive-docindex.r58321.tar.xz 2020/04/16 | 1891392 | systems/texlive/tlnet/archive/texlive-en.doc.r54755.tar.xz 2020/04/16 | 272 | systems/texlive/tlnet/archive/texlive-en.r54755.tar.xz 2020/03/22 | 3090144 | systems/texlive/tlnet/archive/texlive-es.doc.r54465.tar.xz @@ -274664,7 +274707,7 @@ 2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.r55172.tar.xz 2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.r55172.tar.xz 2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.r55172.tar.xz -2021/03/12 | 218848 | systems/texlive/tlnet/archive/texlive-scripts.doc.r58272.tar.xz +2021/03/14 | 218848 | systems/texlive/tlnet/archive/texlive-scripts.doc.r58321.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 @@ -274688,7 +274731,7 @@ 2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r55172.tar.xz 2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r55172.tar.xz 2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r55172.tar.xz -2021/03/12 | 132316 | systems/texlive/tlnet/archive/texlive-scripts.r58272.tar.xz +2021/03/14 | 132288 | systems/texlive/tlnet/archive/texlive-scripts.r58321.tar.xz 2020/08/24 | 36336 | systems/texlive/tlnet/archive/texlive-scripts.win32.r56157.tar.xz 2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r55172.tar.xz 2020/05/12 | 592 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-darwinlegacy.r55117.tar.xz @@ -276358,16 +276401,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 2021/02/17 | 106037 | systems/texlive/tlnet/install-tl -2021/03/13 | 5824200 | systems/texlive/tlnet/install-tl-unx.tar.gz -2021/03/13 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 -2021/03/13 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc +2021/03/14 | 5824188 | systems/texlive/tlnet/install-tl-unx.tar.gz +2021/03/14 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2021/03/14 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc 2020/08/23 | 4889 | systems/texlive/tlnet/install-tl-windows.bat -2021/03/13 | 19657618 | systems/texlive/tlnet/install-tl-windows.exe -2021/03/13 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 -2021/03/13 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc -2021/03/13 | 24615517 | systems/texlive/tlnet/install-tl.zip -2021/03/13 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 -2021/03/13 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc +2021/03/14 | 19657513 | systems/texlive/tlnet/install-tl-windows.exe +2021/03/14 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 +2021/03/14 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc +2021/03/14 | 24615517 | systems/texlive/tlnet/install-tl.zip +2021/03/14 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 +2021/03/14 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc 2020/03/05 | 1215 | systems/texlive/tlnet/README.md 2020/04/06 | 5961 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg 2016/04/12 | 600 | systems/texlive/tlnet/tlpkg/gpg/random_seed @@ -276423,12 +276466,12 @@ 2020/05/17 | 20322 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm 2021/02/20 | 5400 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm 2020/09/22 | 27563 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm -2021/03/13 | 17050332 | systems/texlive/tlnet/tlpkg/texlive.tlpdb -2021/03/13 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2021/03/14 | 17061085 | systems/texlive/tlnet/tlpkg/texlive.tlpdb +2021/03/14 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 2020/05/13 | 86417 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm -2021/03/13 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 -2021/03/13 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc -2021/03/13 | 2281508 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +2021/03/14 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +2021/03/14 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +2021/03/14 | 2282820 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz 2020/04/15 | 58761 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm 2020/03/20 | 41736 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm 2020/05/11 | 15010 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm @@ -279078,7 +279121,7 @@ 2021/02/25 | 100617 | systems/texlive/tlnet/tlpkg/translations/fr.po 2021/02/25 | 93907 | systems/texlive/tlnet/tlpkg/translations/it.po 2021/02/25 | 78469 | systems/texlive/tlnet/tlpkg/translations/ja.po -2021/03/13 | 59335 | systems/texlive/tlnet/tlpkg/translations/messages.pot +2021/03/14 | 59335 | systems/texlive/tlnet/tlpkg/translations/messages.pot 2021/02/25 | 75535 | systems/texlive/tlnet/tlpkg/translations/nl.po 2021/02/25 | 73707 | systems/texlive/tlnet/tlpkg/translations/pl.po 2021/02/25 | 89191 | systems/texlive/tlnet/tlpkg/translations/pt_BR.po @@ -281022,7 +281065,7 @@ 2020/10/03 | 318630 | systems/win32/miktex/tm/packages/filehook.tar.lzma 2012/12/04 | 924573 | systems/win32/miktex/tm/packages/fileinfo.tar.lzma 2011/09/21 | 281409 | systems/win32/miktex/tm/packages/filemod.tar.lzma -2021/03/13 | 572428 | systems/win32/miktex/tm/packages/files.csv.lzma +2021/03/14 | 572428 | systems/win32/miktex/tm/packages/files.csv.lzma 2001/05/14 | 5617 | systems/win32/miktex/tm/packages/finbib.tar.lzma 2015/10/20 | 44379 | systems/win32/miktex/tm/packages/findhyph.tar.lzma 2011/10/21 | 89323 | systems/win32/miktex/tm/packages/fink.tar.lzma @@ -282214,9 +282257,9 @@ 2018/01/12 | 157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma 2021/03/13 | 39480 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma 2021/03/13 | 43368 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma -2021/03/13 | 207477 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma -2021/03/13 | 1259963 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma -2021/03/13 | 1176699 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma +2021/03/14 | 207522 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma +2021/03/14 | 1260213 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma +2021/03/14 | 1175820 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma 2021/03/13 | 13443 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma 2021/03/13 | 14317 | systems/win32/miktex/tm/packages/miktex-zzip-bin-x64-2.9.tar.lzma 2016/07/15 | 35914 | systems/win32/miktex/tm/packages/mil3.tar.lzma @@ -282375,189 +282418,189 @@ 2018/04/09 | 400132 | systems/win32/miktex/tm/packages/newunicodechar.tar.lzma 2011/09/19 | 101312 | systems/win32/miktex/tm/packages/newvbtm.tar.lzma 2020/09/06 | 231669 | systems/win32/miktex/tm/packages/newverbs.tar.lzma -2021/03/13 | 572176 | systems/win32/miktex/tm/packages/next/files.csv.lzma -2021/03/13 | 50847 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma -2021/03/13 | 56457 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma -2021/03/13 | 968699 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma -2021/03/13 | 1078877 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma -2021/03/13 | 29053 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma -2021/03/13 | 31343 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma -2021/03/13 | 29869 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma -2021/03/13 | 34634 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma -2021/03/13 | 49972 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma -2021/03/13 | 57598 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma -2021/03/13 | 84773 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma -2021/03/13 | 94737 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma -2021/03/13 | 67679 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma -2021/03/13 | 75419 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma -2021/03/13 | 27182 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma -2021/03/13 | 30885 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma -2021/03/13 | 330234 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma -2021/03/13 | 392598 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma -2021/03/13 | 32744 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma -2021/03/13 | 36680 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma -2021/03/13 | 51431 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma -2021/03/13 | 56718 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma -2021/03/13 | 239481 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma -2021/03/13 | 261964 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma -2021/03/13 | 179379 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma -2021/03/13 | 195665 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma -2021/03/13 | 52476 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma -2021/03/13 | 59144 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma -2021/03/13 | 21129 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma -2021/03/13 | 23289 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma -2021/03/13 | 461397 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma -2021/03/13 | 45648 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma -2021/03/13 | 51159 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma -2021/03/13 | 282105 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma -2021/03/13 | 321894 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma -2021/03/13 | 41102 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma -2021/03/13 | 45277 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma -2021/03/13 | 116932 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma -2021/03/13 | 131489 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma -2021/03/13 | 1281104 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma -2021/03/13 | 1425980 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma -2021/03/13 | 87636 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma -2021/03/13 | 99606 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma -2021/03/13 | 43058 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma -2021/03/13 | 47877 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma -2021/03/13 | 25154 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma -2021/03/13 | 28009 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma -2021/03/13 | 55823 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma -2021/03/13 | 62801 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma -2021/03/13 | 135004 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma -2021/03/13 | 152761 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma -2021/03/13 | 73181 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma -2021/03/13 | 77858 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma -2021/03/13 | 71567 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma -2021/03/13 | 80661 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma -2021/03/13 | 258663 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma -2021/03/13 | 295553 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma -2021/03/13 | 22039 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma -2021/03/13 | 25002 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma -2021/03/13 | 97489 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma -2021/03/13 | 112252 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma -2021/03/13 | 63836 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma -2021/03/13 | 72860 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma -2021/03/13 | 96145 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma -2021/03/13 | 115467 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma -2021/03/13 | 38070 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma -2021/03/13 | 42627 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma -2021/03/13 | 484053 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma -2021/03/13 | 567626 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma -2021/03/13 | 147139 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma -2021/03/13 | 159968 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma -2021/03/13 | 94802 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma -2021/03/13 | 109274 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma -2021/03/13 | 16327 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma -2021/03/13 | 17957 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma -2021/03/13 | 28119 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma -2021/03/13 | 30036 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma -2021/03/13 | 625283 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma -2021/03/13 | 680049 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma -2021/03/13 | 532037 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma -2021/03/13 | 594869 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma -2021/03/13 | 475936 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma -2021/03/13 | 511631 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma -2021/03/13 | 94268 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma -2021/03/13 | 103322 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma -2021/03/13 | 1725545 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma -2021/03/13 | 2009487 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma -2021/03/13 | 67649 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma -2021/03/13 | 74163 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma -2021/03/13 | 27360 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma -2021/03/13 | 31592 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma -2021/03/13 | 7746 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma -2021/03/13 | 8773 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma -2021/03/13 | 195567 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma -2021/03/13 | 214105 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma -2021/03/13 | 250211 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma -2021/03/13 | 283978 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma -2021/03/13 | 97135 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma -2021/03/13 | 101763 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma -2021/03/13 | 60552 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma -2021/03/13 | 67929 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma -2021/03/13 | 124973 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma -2021/03/13 | 136427 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma -2021/03/13 | 147152 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma -2021/03/13 | 163656 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma -2021/03/13 | 199699 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma -2021/03/13 | 180047 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma -2021/03/13 | 67450 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma -2021/03/13 | 77486 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma -2021/03/13 | 31191 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma -2021/03/13 | 35062 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma -2021/03/13 | 38064 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma -2021/03/13 | 42573 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma -2021/03/13 | 42924 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma -2021/03/13 | 47008 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma -2021/03/13 | 45936 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma -2021/03/13 | 52452 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma -2021/03/13 | 193716 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma -2021/03/13 | 211054 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma -2021/03/13 | 35463 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma -2021/03/13 | 39691 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma -2021/03/13 | 748363 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma -2021/03/13 | 816073 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma -2021/03/13 | 198130 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma -2021/03/13 | 202557 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma -2021/03/13 | 208181 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma -2021/03/13 | 243479 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma -2021/03/13 | 78746 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma -2021/03/13 | 87704 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma -2021/03/13 | 1171730 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma -2021/03/13 | 1307725 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma -2021/03/13 | 20122 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma -2021/03/13 | 23882 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma -2021/03/13 | 31543 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma -2021/03/13 | 37244 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma -2021/03/13 | 64016 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma -2021/03/13 | 72150 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma -2021/03/13 | 43678 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma -2021/03/13 | 51978 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma -2021/03/13 | 1295411 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma -2021/03/13 | 1424812 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma -2021/03/13 | 42388 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma -2021/03/13 | 51797 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma -2021/03/13 | 56222 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma -2021/03/13 | 59831 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma -2021/03/13 | 25341 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma -2021/03/13 | 27274 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma -2021/03/13 | 16110 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma -2021/03/13 | 18097 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma -2021/03/13 | 63673 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma -2021/03/13 | 70108 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma -2021/03/13 | 153889 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma -2021/03/13 | 167907 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma -2021/03/13 | 56908 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma -2021/03/13 | 65323 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma -2021/03/13 | 98518 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma -2021/03/13 | 104626 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma -2021/03/13 | 2499402 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma -2021/03/13 | 2616930 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma -2021/03/13 | 55219 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma -2021/03/13 | 62225 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma -2021/03/13 | 33441 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma -2021/03/13 | 37293 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma -2021/03/13 | 27197 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma -2021/03/13 | 33151 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma -2021/03/13 | 65732 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma -2021/03/13 | 70325 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma -2021/03/13 | 311191 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma -2021/03/13 | 345367 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma -2021/03/13 | 55562 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma -2021/03/13 | 57065 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma -2021/03/13 | 583631 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma -2021/03/13 | 618761 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma -2021/03/13 | 39563 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma -2021/03/13 | 43391 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma -2021/03/13 | 207544 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma -2021/03/13 | 1258954 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma -2021/03/13 | 1176037 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma -2021/03/13 | 13471 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma -2021/03/13 | 14353 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma +2021/03/14 | 572176 | systems/win32/miktex/tm/packages/next/files.csv.lzma +2021/03/14 | 50847 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma +2021/03/14 | 56457 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma +2021/03/14 | 968696 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma +2021/03/14 | 1078877 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma +2021/03/14 | 29053 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma +2021/03/14 | 31346 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma +2021/03/14 | 29868 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma +2021/03/14 | 34634 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma +2021/03/14 | 49971 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma +2021/03/14 | 57597 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma +2021/03/14 | 84774 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma +2021/03/14 | 94737 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma +2021/03/14 | 67679 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma +2021/03/14 | 75418 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma +2021/03/14 | 27183 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma +2021/03/14 | 30887 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma +2021/03/14 | 330233 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma +2021/03/14 | 392596 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma +2021/03/14 | 32744 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma +2021/03/14 | 36679 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma +2021/03/14 | 51432 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma +2021/03/14 | 56717 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma +2021/03/14 | 239478 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma +2021/03/14 | 261962 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma +2021/03/14 | 179378 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma +2021/03/14 | 195662 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma +2021/03/14 | 52472 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma +2021/03/14 | 59143 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma +2021/03/14 | 21127 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma +2021/03/14 | 23290 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma +2021/03/14 | 461400 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma +2021/03/14 | 45648 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma +2021/03/14 | 51159 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma +2021/03/14 | 282105 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma +2021/03/14 | 321894 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma +2021/03/14 | 41100 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma +2021/03/14 | 45277 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma +2021/03/14 | 116931 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma +2021/03/14 | 131489 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma +2021/03/14 | 1281099 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma +2021/03/14 | 1425978 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma +2021/03/14 | 87637 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma +2021/03/14 | 99605 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma +2021/03/14 | 43056 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma +2021/03/14 | 47876 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma +2021/03/14 | 25152 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma +2021/03/14 | 28009 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma +2021/03/14 | 55822 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma +2021/03/14 | 62800 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma +2021/03/14 | 135003 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma +2021/03/14 | 152764 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma +2021/03/14 | 73180 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma +2021/03/14 | 77858 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma +2021/03/14 | 71568 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma +2021/03/14 | 80659 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma +2021/03/14 | 258664 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma +2021/03/14 | 295553 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma +2021/03/14 | 22039 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma +2021/03/14 | 25000 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma +2021/03/14 | 97489 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma +2021/03/14 | 112252 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma +2021/03/14 | 63834 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma +2021/03/14 | 72860 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma +2021/03/14 | 96146 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma +2021/03/14 | 115469 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma +2021/03/14 | 38069 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma +2021/03/14 | 42626 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma +2021/03/14 | 484053 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma +2021/03/14 | 567626 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma +2021/03/14 | 147138 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma +2021/03/14 | 159968 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma +2021/03/14 | 94800 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma +2021/03/14 | 109274 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma +2021/03/14 | 16326 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma +2021/03/14 | 17957 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma +2021/03/14 | 28117 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma +2021/03/14 | 30036 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma +2021/03/14 | 625281 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma +2021/03/14 | 680048 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma +2021/03/14 | 532040 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma +2021/03/14 | 594868 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma +2021/03/14 | 475933 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma +2021/03/14 | 511633 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma +2021/03/14 | 94267 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma +2021/03/14 | 103322 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma +2021/03/14 | 1725545 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma +2021/03/14 | 2009489 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma +2021/03/14 | 67649 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma +2021/03/14 | 74163 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma +2021/03/14 | 27362 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma +2021/03/14 | 31593 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma +2021/03/14 | 7745 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma +2021/03/14 | 8773 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma +2021/03/14 | 195566 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma +2021/03/14 | 214103 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma +2021/03/14 | 250210 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma +2021/03/14 | 283977 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma +2021/03/14 | 97133 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma +2021/03/14 | 101763 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma +2021/03/14 | 60551 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma +2021/03/14 | 67929 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma +2021/03/14 | 124970 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma +2021/03/14 | 136426 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma +2021/03/14 | 147152 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma +2021/03/14 | 163655 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma +2021/03/14 | 199700 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma +2021/03/14 | 180047 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma +2021/03/14 | 67449 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma +2021/03/14 | 77486 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma +2021/03/14 | 31191 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma +2021/03/14 | 35064 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma +2021/03/14 | 38064 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma +2021/03/14 | 42574 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma +2021/03/14 | 42925 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma +2021/03/14 | 47006 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma +2021/03/14 | 45936 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma +2021/03/14 | 52453 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma +2021/03/14 | 193715 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma +2021/03/14 | 211054 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma +2021/03/14 | 35461 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma +2021/03/14 | 39690 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma +2021/03/14 | 748361 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma +2021/03/14 | 816072 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma +2021/03/14 | 198130 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma +2021/03/14 | 202558 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma +2021/03/14 | 208181 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma +2021/03/14 | 243479 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma +2021/03/14 | 78745 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma +2021/03/14 | 87703 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma +2021/03/14 | 1171731 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma +2021/03/14 | 1307722 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma +2021/03/14 | 20121 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma +2021/03/14 | 23882 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma +2021/03/14 | 31542 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma +2021/03/14 | 37243 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma +2021/03/14 | 64015 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma +2021/03/14 | 72150 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma +2021/03/14 | 43677 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma +2021/03/14 | 51978 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma +2021/03/14 | 1295413 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma +2021/03/14 | 1424810 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma +2021/03/14 | 42387 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma +2021/03/14 | 51797 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma +2021/03/14 | 56221 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma +2021/03/14 | 59830 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma +2021/03/14 | 25339 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma +2021/03/14 | 27273 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma +2021/03/14 | 16109 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma +2021/03/14 | 18098 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma +2021/03/14 | 63673 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma +2021/03/14 | 70108 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma +2021/03/14 | 153889 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma +2021/03/14 | 167906 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma +2021/03/14 | 56908 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma +2021/03/14 | 65322 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma +2021/03/14 | 98517 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma +2021/03/14 | 104625 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma +2021/03/14 | 2499402 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma +2021/03/14 | 2616929 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma +2021/03/14 | 55216 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma +2021/03/14 | 62226 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma +2021/03/14 | 33439 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma +2021/03/14 | 37291 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma +2021/03/14 | 27195 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma +2021/03/14 | 33150 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma +2021/03/14 | 65730 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma +2021/03/14 | 70322 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma +2021/03/14 | 311189 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma +2021/03/14 | 345365 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma +2021/03/14 | 55562 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma +2021/03/14 | 57066 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma +2021/03/14 | 583628 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma +2021/03/14 | 618761 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma +2021/03/14 | 39563 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma +2021/03/14 | 43391 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma +2021/03/14 | 207527 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma +2021/03/14 | 1259220 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma +2021/03/14 | 1176743 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma +2021/03/14 | 13470 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma +2021/03/14 | 14353 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma 2019/03/12 | 1412 | systems/win32/miktex/tm/packages/nextpage.tar.lzma -2021/03/13 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini +2021/03/14 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini 2018/07/06 | 145915 | systems/win32/miktex/tm/packages/nexus-otf.tar.lzma 2017/03/30 | 191149 | systems/win32/miktex/tm/packages/nfssext-cfr.tar.lzma 2012/12/20 | 612251 | systems/win32/miktex/tm/packages/nicefilelist.tar.lzma @@ -282889,7 +282932,7 @@ 2020/10/20 | 342254 | systems/win32/miktex/tm/packages/preview.tar.lzma 2019/06/20 | 375963 | systems/win32/miktex/tm/packages/prftree.tar.lzma 2021/03/03 | 372362 | systems/win32/miktex/tm/packages/principia.tar.lzma -2021/03/13 | 1155 | systems/win32/miktex/tm/packages/pr.ini +2021/03/14 | 1155 | systems/win32/miktex/tm/packages/pr.ini 2010/09/27 | 248469 | systems/win32/miktex/tm/packages/printlen.tar.lzma 2008/06/17 | 77313 | systems/win32/miktex/tm/packages/proba.tar.lzma 2017/07/12 | 988486 | systems/win32/miktex/tm/packages/probsoln.tar.lzma @@ -284067,7 +284110,7 @@ 2021/03/12 | 5533536 | systems/win32/w32tex/aleph-w32.tar.xz 2021/03/07 | 66726108 | systems/win32/w32tex/biblatex-biber.tar.xz 2016/12/13 | 65971452 | systems/win32/w32tex/cbfonts.tar.xz -2021/03/12 | 799655 | systems/win32/w32tex/ChangeLog +2021/03/13 | 800781 | systems/win32/w32tex/ChangeLog 2009/08/03 | 141221 | systems/win32/w32tex/ChangeLog.0 2009/08/03 | 221890 | systems/win32/w32tex/ChangeLog.1 2009/08/03 | 116462 | systems/win32/w32tex/ChangeLog.2 @@ -284080,7 +284123,7 @@ 2020/09/21 | 6434128 | systems/win32/w32tex/datetime2.tar.xz 2021/02/19 | 845892 | systems/win32/w32tex/dvi2ps-w32.tar.xz 2021/02/19 | 484028 | systems/win32/w32tex/dvi2tty-w32.tar.xz -2021/03/05 | 4662700 | systems/win32/w32tex/dvipdfm-w32.tar.xz +2021/03/13 | 4662772 | systems/win32/w32tex/dvipdfm-w32.tar.xz 2021/02/19 | 4551728 | systems/win32/w32tex/dvipsk-w32.tar.xz 2021/02/19 | 2652744 | systems/win32/w32tex/dvitools-w32.tar.xz 2021/03/02 | 1182048 | systems/win32/w32tex/extractpdfmark-w32.tar.xz @@ -284091,15 +284134,15 @@ 2021/03/06 | 34773604 | systems/win32/w32tex/latex.tar.xz 2021/02/19 | 1007832 | systems/win32/w32tex/lcdf-typetools-w32.tar.xz 2021/02/10 | 404777228 | systems/win32/w32tex/ltxpkgdocs.tar.xz -2021/03/11 | 34016060 | systems/win32/w32tex/ltxpkgs.tar.xz -2021/03/07 | 3839944 | systems/win32/w32tex/luajittex-dev-w32.tar.xz -2021/03/07 | 3831592 | systems/win32/w32tex/luajittex-exp-w32.tar.xz -2021/03/07 | 3834412 | systems/win32/w32tex/luajittex-w32.tar.xz +2021/03/13 | 34017908 | systems/win32/w32tex/ltxpkgs.tar.xz +2021/03/13 | 3842128 | systems/win32/w32tex/luajittex-dev-w32.tar.xz +2021/03/13 | 3847252 | systems/win32/w32tex/luajittex-exp-w32.tar.xz +2021/03/13 | 3842468 | systems/win32/w32tex/luajittex-w32.tar.xz 2021/02/17 | 837644 | systems/win32/w32tex/luasec-w32.tar.xz -2021/03/11 | 18840084 | systems/win32/w32tex/luatex-dev-w32.tar.xz -2021/03/11 | 18850500 | systems/win32/w32tex/luatex-exp-w32.tar.xz +2021/03/13 | 18839856 | systems/win32/w32tex/luatex-dev-w32.tar.xz +2021/03/13 | 18839204 | systems/win32/w32tex/luatex-exp-w32.tar.xz 2021/02/15 | 69098148 | systems/win32/w32tex/luatexja.tar.xz -2021/03/11 | 18838212 | systems/win32/w32tex/luatex-w32.tar.xz +2021/03/13 | 18833436 | systems/win32/w32tex/luatex-w32.tar.xz 2021/02/19 | 1609028 | systems/win32/w32tex/makeindex-w32.tar.xz 2015/05/26 | 1542676 | systems/win32/w32tex/manual.tar.xz 2021/02/19 | 439144 | systems/win32/w32tex/mftools.tar.xz @@ -284115,7 +284158,7 @@ 2021/02/14 | 2826912 | systems/win32/w32tex/platex.tar.xz 2021/02/19 | 1725864 | systems/win32/w32tex/pmx.tar.xz 2021/02/19 | 1170948 | systems/win32/w32tex/pstoedit-w32.tar.xz -2021/02/28 | 274224984 | systems/win32/w32tex/pstricks.tar.xz +2021/03/13 | 274224936 | systems/win32/w32tex/pstricks.tar.xz 2021/02/19 | 517744 | systems/win32/w32tex/psutils-w32.tar.xz 2021/03/06 | 6659456 | systems/win32/w32tex/ptex-ng-w32.tar.xz 2021/03/12 | 10639052 | systems/win32/w32tex/ptex-w32.tar.xz @@ -284134,7 +284177,7 @@ 2020/06/06 | 2168 | systems/win32/w32tex/TLTEXINFO/00README-TEXINFO.TL 2021/02/25 | 4291445 | systems/win32/w32tex/TLTEXINFO/tl-texinfo.zip 2021/01/03 | 2023 | systems/win32/w32tex/TLW64/00README.TLW64 -2021/03/12 | 99961360 | systems/win32/w32tex/TLW64/tl-win64.zip +2021/03/13 | 99962649 | systems/win32/w32tex/TLW64/tl-win64.zip 2021/02/19 | 826656 | systems/win32/w32tex/ttf2pk-w32.tar.xz 2021/02/19 | 838512 | systems/win32/w32tex/ttf2pt1-w32.tar.xz 2017/10/13 | 1773368 | systems/win32/w32tex/tuftelatex.tar.xz @@ -284146,7 +284189,7 @@ 2013/04/08 | 722652 | systems/win32/w32tex/utf.tar.xz 2013/04/08 | 13748 | systems/win32/w32tex/vf-n2bk.tar.xz 2020/12/24 | 52763124 | systems/win32/w32tex/w32tex-src.tar.xz -2021/03/08 | 129448096 | systems/win32/w32tex/web2c-lib.tar.xz +2021/03/13 | 129894268 | systems/win32/w32tex/web2c-lib.tar.xz 2021/03/12 | 50530160 | systems/win32/w32tex/web2c-w32.tar.xz 2021/03/12 | 811112 | systems/win32/w32tex/win64/aleph-w64.tar.xz 2020/08/20 | 22351540 | systems/win32/w32tex/win64/biblatex-biber-w64.tar.xz @@ -284162,13 +284205,13 @@ 2021/02/19 | 587952 | systems/win32/w32tex/win64/jtex-w64.tar.xz 2019/11/11 | 2568 | systems/win32/w32tex/win64/latex-dev-w64.tar.xz 2021/02/19 | 800468 | systems/win32/w32tex/win64/lcdf-typetools-w64.tar.xz -2021/03/07 | 3451788 | systems/win32/w32tex/win64/luajittex-dev-w64.tar.xz -2021/03/07 | 3450956 | systems/win32/w32tex/win64/luajittex-exp-w64.tar.xz -2021/03/07 | 3455312 | systems/win32/w32tex/win64/luajittex-w64.tar.xz +2021/03/13 | 3453852 | systems/win32/w32tex/win64/luajittex-dev-w64.tar.xz +2021/03/13 | 3447116 | systems/win32/w32tex/win64/luajittex-exp-w64.tar.xz +2021/03/13 | 3442004 | systems/win32/w32tex/win64/luajittex-w64.tar.xz 2021/02/17 | 935248 | systems/win32/w32tex/win64/luasec-w64.tar.xz -2021/03/07 | 3108992 | systems/win32/w32tex/win64/luatex-dev-w64.tar.xz -2021/03/07 | 3120500 | systems/win32/w32tex/win64/luatex-exp-w64.tar.xz -2021/03/07 | 3124720 | systems/win32/w32tex/win64/luatex-w64.tar.xz +2021/03/13 | 3113952 | systems/win32/w32tex/win64/luatex-dev-w64.tar.xz +2021/03/13 | 3115256 | systems/win32/w32tex/win64/luatex-exp-w64.tar.xz +2021/03/13 | 3114836 | systems/win32/w32tex/win64/luatex-w64.tar.xz 2021/02/19 | 1079424 | systems/win32/w32tex/win64/makeindex-w64.tar.xz 2021/02/19 | 431372 | systems/win32/w32tex/win64/mftools-w64.tar.xz 2021/02/19 | 376736 | systems/win32/w32tex/win64/mftrace-w64.tar.xz @@ -284288,7 +284331,7 @@ 2004/06/04 | 404 | tds/tds.sed 2004/06/23 | 65418 | tds/tds.tex 2019/05/29 | 304264 | tds.zip -2021/03/14 | 186 | timestamp +2021/03/15 | 186 | timestamp 2002/08/26 | 61898 | usergrps/dante/antrag.pdf 2002/08/26 | 118217 | usergrps/dante/antrag.ps 2017/06/30 | 917 | usergrps/dante/dtk/doc/beispiel.bib diff --git a/FILES.byname.gz b/FILES.byname.gz Binary files differindex 2ef2c4e6fe..9d2ce72093 100644 --- a/FILES.byname.gz +++ b/FILES.byname.gz diff --git a/FILES.last07days b/FILES.last07days index 6f3df643e6..3a3b3d0050 100644 --- a/FILES.last07days +++ b/FILES.last07days @@ -1,149 +1,495 @@ +2021/03/14 | 99605 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma +2021/03/14 | 98517 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma +2021/03/14 | 9752 | language/chinese/ctex/ctexpunct.spa +2021/03/14 | 97489 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma +2021/03/14 | 97133 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma +2021/03/14 | 968696 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma +2021/03/14 | 961606 | macros/cstex/base/csplain.tar.gz +2021/03/14 | 96146 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma +2021/03/14 | 9602 | support/latexindent/LatexIndent/HiddenChildren.pm +2021/03/14 | 9559 | support/latexindent/LatexIndent/IfElseFi.pm +2021/03/14 | 94800 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma +2021/03/14 | 94737 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma +2021/03/14 | 944430 | graphics/pgf/contrib/sankey.zip +2021/03/14 | 94267 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma +2021/03/14 | 942336 | graphics/pgf/contrib/sankey/sankey.pdf +2021/03/14 | 938 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.tex +2021/03/14 | 937253 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.1.2.sty +2021/03/14 | 93579 | macros/latex/contrib/hitreport/hitreport.dtx +2021/03/14 | 9353 | support/latexindent/documentation/subsec-conflicting-poly-switches.tex +2021/03/14 | 929934 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.1.2.tex +2021/03/14 | 9258 | support/latexindent/documentation/sec-fine-tuning.tex +2021/03/14 | 9109 | graphics/pgf/contrib/circuitikz/tex/pgfcircflow.tex +2021/03/14 | 893716 | support/latexindent/documentation/latexindent.pdf +2021/03/14 | 8773 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma +2021/03/14 | 87703 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma +2021/03/14 | 87637 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma +2021/03/14 | 8757 | graphics/pgf/contrib/circuitikz/tex/pgfcirccurrent.tex +2021/03/14 | 84774 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma +2021/03/14 | 841461 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.0.sty +2021/03/14 | 840970 | macros/latex/contrib/doclicense.zip +2021/03/14 | 834142 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.0.tex +2021/03/14 | 832 | support/latexindent/LatexIndent/Version.pm +2021/03/14 | 816072 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma +2021/03/14 | 80659 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma +2021/03/14 | 7970 | support/latexindent/documentation/sec-introduction.tex +2021/03/14 | 7886 | support/latexindent/LatexIndent/LogFile.pm +2021/03/14 | 78745 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma +2021/03/14 | 77858 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma +2021/03/14 | 77486 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma +2021/03/14 | 7745 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma +2021/03/14 | 758990 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.6.sty +2021/03/14 | 75418 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma +2021/03/14 | 751663 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.6.tex +2021/03/14 | 748361 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma +2021/03/14 | 74163 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma +2021/03/14 | 73180 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma +2021/03/14 | 72860 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma +2021/03/14 | 7223 | support/latexindent/documentation/subsubsec-no-add-remaining-code-blocks.tex +2021/03/14 | 72150 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma +2021/03/14 | 7161 | support/latexindent/documentation/figure-schematic.png +2021/03/14 | 71568 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma +2021/03/14 | 70322 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma +2021/03/14 | 70108 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma +2021/03/14 | 690730 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3.sty +2021/03/14 | 683433 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.3.tex +2021/03/14 | 680048 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma +2021/03/14 | 6793 | support/latexindent/LatexIndent/MandatoryArgument.pm +2021/03/14 | 67929 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma +2021/03/14 | 67679 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma +2021/03/14 | 67649 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma +2021/03/14 | 67449 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma +2021/03/14 | 66024 | systems/texlive/tlnet/archive/jlreq-deluxe.doc.r58333.tar.xz +2021/03/14 | 65730 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma +2021/03/14 | 65322 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma +2021/03/14 | 6438 | support/latexindent/LatexIndent/FileExtension.pm +2021/03/14 | 6408 | support/latexindent/LatexIndent/Item.pm +2021/03/14 | 64015 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma +2021/03/14 | 63834 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma +2021/03/14 | 6371118 | support/latexindent/latexindent.exe +2021/03/14 | 63673 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma +2021/03/14 | 6353 | support/latexindent/LatexIndent/Environment.pm +2021/03/14 | 63436 | systems/texlive/tlnet/archive/nl-interval.doc.r58334.tar.xz +2021/03/14 | 62800 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma +2021/03/14 | 625281 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma +2021/03/14 | 62226 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma +2021/03/14 | 618761 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma +2021/03/14 | 6180 | language/chinese/ctex/ctex-zhconv.lua +2021/03/14 | 61337 | support/latexindent/documentation/sec-default-user-local.tex +2021/03/14 | 6106 | graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty +2021/03/14 | 6062 | support/latexindent/LatexIndent/OptionalArgument.pm +2021/03/14 | 60551 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma +2021/03/14 | 6042 | support/latexindent/LatexIndent/BackUpFileProcedure.pm +2021/03/14 | 6039 | language/chinese/ctex/README.md +2021/03/14 | 6036 | support/latexindent/LatexIndent/TrailingComments.pm +2021/03/14 | 59830 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma +2021/03/14 | 5974 | support/latexindent/documentation/subsubsec-commands-with-arguments.tex +2021/03/14 | 594868 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma +2021/03/14 | 5937 | support/latexindent/LatexIndent/Else.pm +2021/03/14 | 59335 | systems/texlive/tlnet/tlpkg/translations/messages.pot +2021/03/14 | 59143 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma +2021/03/14 | 5874 | macros/latex/contrib/hitreport/README.md +2021/03/14 | 583628 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma +2021/03/14 | 5824188 | systems/texlive/tlnet/install-tl-unx.tar.gz +2021/03/14 | 5777 | support/latexindent/LatexIndent/UnNamedGroupingBracesBrackets.pm +2021/03/14 | 57597 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma +2021/03/14 | 572428 | systems/win32/miktex/tm/packages/files.csv.lzma +2021/03/14 | 572176 | systems/win32/miktex/tm/packages/next/files.csv.lzma +2021/03/14 | 57066 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma +2021/03/14 | 56908 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma +2021/03/14 | 567626 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma +2021/03/14 | 56717 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma +2021/03/14 | 56457 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma +2021/03/14 | 56221 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma +2021/03/14 | 55822 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma +2021/03/14 | 55562 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma +2021/03/14 | 55216 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma +2021/03/14 | 5435 | support/latexindent/LatexIndent/BlankLines.pm +2021/03/14 | 54038 | graphics/pgf/contrib/circuitikz/tex/pgfcircmonopoles.tex +2021/03/14 | 535 | support/latexindent/documentation/cmhlistings.tex +2021/03/14 | 535826 | macros/latex/contrib/easybook.zip +2021/03/14 | 5330 | support/latexindent/LatexIndent/KeyEqualsValuesBraces.pm +2021/03/14 | 532040 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma +2021/03/14 | 5284 | support/latexindent/documentation/subsubsec-headings.tex +2021/03/14 | 52472 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma +2021/03/14 | 52453 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma +2021/03/14 | 52219 | support/latexindent/LatexIndent/AlignmentAtAmpersand.pm +2021/03/14 | 51978 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma +2021/03/14 | 51797 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma +2021/03/14 | 515024 | systems/texlive/tlnet/archive/easybook.doc.r58332.tar.xz +2021/03/14 | 51432 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma +2021/03/14 | 511633 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma +2021/03/14 | 51159 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma +2021/03/14 | 50847 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma +2021/03/14 | 49971 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma +2021/03/14 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2021/03/14 | 4869 | support/latexindent/documentation/subsubsec-ifelsefi.tex +2021/03/14 | 485273 | macros/latex/contrib/hitreport/hitreport.pdf +2021/03/14 | 484053 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma +2021/03/14 | 47876 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma +2021/03/14 | 477 | macros/luatex/latex/unitipa/README.txt +2021/03/14 | 475933 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma +2021/03/14 | 47006 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma +2021/03/14 | 46755 | support/latexindent/LatexIndent/GetYamlSettings.pm +2021/03/14 | 461400 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma +2021/03/14 | 4596634 | support/latexindent.zip +2021/03/14 | 45936 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma +2021/03/14 | 45648 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma +2021/03/14 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +2021/03/14 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc +2021/03/14 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc +2021/03/14 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc +2021/03/14 | 45277 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma +2021/03/14 | 44729 | macros/latex/contrib/easybook/easybook.cls +2021/03/14 | 443387 | language/chinese/ctex/ctex.dtx +2021/03/14 | 44096 | support/latexindent/documentation/logo.png +2021/03/14 | 43677 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma +2021/03/14 | 4355 | support/latexindent/LatexIndent/RoundBrackets.pm +2021/03/14 | 43391 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma +2021/03/14 | 43056 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma +2021/03/14 | 42925 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma +2021/03/14 | 42626 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma +2021/03/14 | 42574 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma +2021/03/14 | 42387 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma +2021/03/14 | 422268 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.8.3.sty +2021/03/14 | 4190 | macros/latex/contrib/easybook/doc/chapter1.tex +2021/03/14 | 418 | graphics/pgf/contrib/circuitikz/doc/compatibility.tex +2021/03/14 | 416850 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.8.3.tex +2021/03/14 | 416027 | macros/latex/contrib/hitreport/hitreport-example.pdf +2021/03/14 | 415 | graphics/pgf/contrib/sankey/README +2021/03/14 | 41100 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma +2021/03/14 | 4099 | language/chinese/ctex/ctex-zhconv-make.lua +2021/03/14 | 408 | macros/latex/contrib/parskip/README.md +2021/03/14 | 407854 | macros/latex/contrib/parskip.zip +2021/03/14 | 403539 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.7.sty +2021/03/14 | 3994645 | macros/latex/contrib/profcollege.zip +2021/03/14 | 39690 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma +2021/03/14 | 396132 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex +2021/03/14 | 39563 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma +2021/03/14 | 393856 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.6.sty +2021/03/14 | 392596 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma +2021/03/14 | 388 | systems/texlive/tlnet/archive/texlive-docindex.r58321.tar.xz +2021/03/14 | 3847 | support/latexindent/documentation/subsubsec-special.tex +2021/03/14 | 38069 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma +2021/03/14 | 38064 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma +2021/03/14 | 37291 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma +2021/03/14 | 37243 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma +2021/03/14 | 36679 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma +2021/03/14 | 364086 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.4.sty +2021/03/14 | 3636 | support/latexindent/LatexIndent/Replacement.pm +2021/03/14 | 3590 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex +2021/03/14 | 356340 | graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex +2021/03/14 | 35461 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma +2021/03/14 | 35064 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma +2021/03/14 | 34691 | graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex +2021/03/14 | 3463 | support/latexindent/LatexIndent/Preamble.pm +2021/03/14 | 34634 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma +2021/03/14 | 345365 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma +2021/03/14 | 3451 | support/latexindent/documentation/subsubsec-environments-with-items.tex +2021/03/14 | 3394 | support/latexindent/LatexIndent/HorizontalWhiteSpace.pm +2021/03/14 | 33439 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma +2021/03/14 | 33150 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma +2021/03/14 | 330233 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma +2021/03/14 | 3277 | graphics/pgf/contrib/circuitikz/README.md +2021/03/14 | 32744 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma +2021/03/14 | 3273 | support/latexindent/LatexIndent/Tokens.pm +2021/03/14 | 321894 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma +2021/03/14 | 32016 | macros/latex/contrib/easybook/doc/easybook.tex +2021/03/14 | 3176 | support/latexindent/LatexIndent/NamedGroupingBracesBrackets.pm +2021/03/14 | 31593 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma +2021/03/14 | 31542 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma +2021/03/14 | 31346 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma +2021/03/14 | 31191 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma +2021/03/14 | 311189 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma +2021/03/14 | 3101 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-legacy.tex +2021/03/14 | 30990 | graphics/pgf/contrib/circuitikz/tex/pgfcircshapes.tex +2021/03/14 | 30887 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma +2021/03/14 | 30689 | graphics/pgf/contrib/circuitikz/doc/changelog.tex +2021/03/14 | 3013 | graphics/pgf/contrib/sankey/sankey.ins +2021/03/14 | 30036 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma +2021/03/14 | 29868 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma +2021/03/14 | 295553 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma +2021/03/14 | 29475 | language/chinese/ctex/ctxdoc.cls +2021/03/14 | 29053 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma +2021/03/14 | 2902 | support/latexindent/documentation/subsec-partnering-poly-switches.tex +2021/03/14 | 2901 | macros/latex/contrib/parskip/MANIFEST.md +2021/03/14 | 29007 | graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex +2021/03/14 | 2894 | language/chinese/ctex/ctxdocstrip.tex +2021/03/14 | 287471 | macros/latex/contrib/easybook/doc/easybook-demo.pdf +2021/03/14 | 283977 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma +2021/03/14 | 282105 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma +2021/03/14 | 28117 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma +2021/03/14 | 280 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-example.tex +2021/03/14 | 28009 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma +2021/03/14 | 2757 | macros/latex/contrib/parskip/parskip-2001-04-09.sty +2021/03/14 | 27362 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma +2021/03/14 | 27273 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma +2021/03/14 | 27195 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma +2021/03/14 | 27183 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma +2021/03/14 | 2678 | graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex +2021/03/14 | 2644 | support/latexindent/latexindent.pl +2021/03/14 | 261962 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma +2021/03/14 | 2616929 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma +2021/03/14 | 258664 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma +2021/03/14 | 2539 | support/latexindent/documentation/sec-conclusions-know-limitations.tex +2021/03/14 | 25339 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma +2021/03/14 | 25152 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma +2021/03/14 | 250210 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma +2021/03/14 | 25000 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma +2021/03/14 | 2499402 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma +2021/03/14 | 246 | support/latexindent/documentation/references.tex +2021/03/14 | 24615517 | systems/texlive/tlnet/install-tl.zip +2021/03/14 | 2459 | macros/latex/contrib/easybook/doc/easybook-demo.tex +2021/03/14 | 245151 | macros/latex/contrib/easybook/doc/easybook.pdf +2021/03/14 | 2444742 | install/graphics/pgf/contrib/circuitikz.tds.zip +2021/03/14 | 243479 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma +2021/03/14 | 2429879 | graphics/pgf/contrib/circuitikz.zip +2021/03/14 | 239478 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma +2021/03/14 | 23882 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma +2021/03/14 | 23600 | support/latexindent/LatexIndent/Arguments.pm +2021/03/14 | 23290 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma +2021/03/14 | 23253 | support/latexindent/documentation/latexindent.tex +2021/03/14 | 2282820 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +2021/03/14 | 226090 | graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex +2021/03/14 | 225887 | macros/latex/contrib/parskip/parskip-code.pdf +2021/03/14 | 22512 | systems/texlive/tlnet/archive/jlreq-deluxe.r58333.tar.xz +2021/03/14 | 22039 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma +2021/03/14 | 218848 | systems/texlive/tlnet/archive/texlive-scripts.doc.r58321.tar.xz +2021/03/14 | 2184 | macros/latex/contrib/hitreport/hitsetup.tex +2021/03/14 | 21671 | support/latexindent/documentation/sec-replacements.tex +2021/03/14 | 214103 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma +2021/03/14 | 2118 | support/latexindent/documentation/sec-demonstration.tex +2021/03/14 | 21127 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma +2021/03/14 | 211054 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma +2021/03/14 | 21098 | support/latexindent/LatexIndent/Verbatim.pm +2021/03/14 | 208181 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma +2021/03/14 | 20764 | support/latexindent/LatexIndent/ModifyLineBreaks.pm +2021/03/14 | 207527 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma +2021/03/14 | 207522 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma +2021/03/14 | 20505 | support/latexindent/LatexIndent/Indent.pm +2021/03/14 | 202558 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma +2021/03/14 | 20121 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma +2021/03/14 | 2009489 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma +2021/03/14 | 199700 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma +2021/03/14 | 1990 | support/latexindent/LatexIndent/Switches.pm +2021/03/14 | 19864 | support/latexindent/LatexIndent/Sentence.pm +2021/03/14 | 198130 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma +2021/03/14 | 19657513 | systems/texlive/tlnet/install-tl-windows.exe +2021/03/14 | 1958 | macros/latex/contrib/parskip/parskip.ins +2021/03/14 | 195662 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma +2021/03/14 | 195566 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma +2021/03/14 | 193715 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma +2021/03/14 | 191050 | macros/luatex/latex/unitipa/unitipa.pdf +2021/03/14 | 190589 | macros/luatex/latex/unitipa.zip +2021/03/14 | 1896 | support/latexindent/documentation/figure-schematic.tex +2021/03/14 | 1891 | support/latexindent/documentation/subsec-noAdditionalIndent-indentRules.tex +2021/03/14 | 1877 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-romano.tex +2021/03/14 | 1873 | support/latexindent/README +2021/03/14 | 18581 | support/latexindent/documentation/sec-how-to-use.tex +2021/03/14 | 18536 | support/latexindent/LatexIndent/Document.pm +2021/03/14 | 1839 | support/latexindent/LatexIndent/Logger.pm +2021/03/14 | 18128 | support/latexindent/defaultSettings.yaml +2021/03/14 | 18098 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma +2021/03/14 | 180047 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma +2021/03/14 | 17957 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma +2021/03/14 | 179378 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma +2021/03/14 | 1789 | macros/latex/contrib/parskip/changes.txt +2021/03/14 | 17743 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf +2021/03/14 | 174843 | macros/latex/contrib/parskip/parskip.pdf +2021/03/14 | 173616 | systems/texlive/tlnet/archive/texlive-docindex.doc.r58321.tar.xz +2021/03/14 | 1725545 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma +2021/03/14 | 17117 | macros/luatex/latex/unitipa/unitipa.dtx +2021/03/14 | 17061085 | systems/texlive/tlnet/tlpkg/texlive.tlpdb +2021/03/14 | 167906 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma +2021/03/14 | 16693 | support/latexindent/documentation/subsubsec-environments-and-their-arguments.tex +2021/03/14 | 1668577 | install/language/chinese/ctex.tds.zip +2021/03/14 | 16580 | graphics/pgf/contrib/circuitikz/tex/pgfcircpath.tex +2021/03/14 | 163655 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma +2021/03/14 | 16326 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma +2021/03/14 | 16291 | macros/latex/contrib/parskip/parskip.dtx +2021/03/14 | 16109 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma +2021/03/14 | 159968 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma +2021/03/14 | 1595 | support/latexindent/documentation/logo.tex +2021/03/14 | 1592 | systems/texlive/tlnet/archive/nl-interval.r58334.tar.xz +2021/03/14 | 1558 | support/latexindent/latexindent-module-installer.pl +2021/03/14 | 155760 | graphics/pgf/contrib/sankey/sankey.dtx +2021/03/14 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 +2021/03/14 | 153889 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma +2021/03/14 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2021/03/14 | 152764 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma +2021/03/14 | 1526719 | macros/latex/contrib/hitreport.zip +2021/03/14 | 1483 | support/latexindent/LatexIndent/DoubleBackSlash.pm +2021/03/14 | 147152 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma +2021/03/14 | 147138 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma +2021/03/14 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 +2021/03/14 | 1458 | support/latexindent/documentation/title.tex +2021/03/14 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +2021/03/14 | 14437 | graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex +2021/03/14 | 14353 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma +2021/03/14 | 1425978 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma +2021/03/14 | 1424 | systems/texlive/tlnet/archive/collection-pictures.r58334.tar.xz +2021/03/14 | 1424810 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma +2021/03/14 | 14049 | support/latexindent/documentation/subsec-commands-and-their-options.tex +2021/03/14 | 136426 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma +2021/03/14 | 1352 | macros/luatex/latex/unitipa/unitipa.ins +2021/03/14 | 135003 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma +2021/03/14 | 13470 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma +2021/03/14 | 132288 | systems/texlive/tlnet/archive/texlive-scripts.r58321.tar.xz +2021/03/14 | 13154 | support/latexindent/LatexIndent/Special.pm +2021/03/14 | 131489 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma +2021/03/14 | 1307722 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma +2021/03/14 | 1295413 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma +2021/03/14 | 1291977 | language/chinese/ctex.zip +2021/03/14 | 1281099 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma +2021/03/14 | 12661 | support/latexindent/LatexIndent/Braces.pm +2021/03/14 | 1260213 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma +2021/03/14 | 1259220 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma +2021/03/14 | 124970 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma +2021/03/14 | 12348 | graphics/pgf/contrib/circuitikz/tex/circuitikz.sty +2021/03/14 | 1214489 | language/chinese/ctex/ctex.pdf +2021/03/14 | 120283 | graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex +2021/03/14 | 11862 | support/latexindent/LatexIndent/FileContents.pm +2021/03/14 | 11856 | support/latexindent/documentation/appendices.tex +2021/03/14 | 1176743 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma +2021/03/14 | 1175820 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma +2021/03/14 | 1171731 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma +2021/03/14 | 116931 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma +2021/03/14 | 1155 | systems/win32/miktex/tm/packages/pr.ini +2021/03/14 | 115469 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma +2021/03/14 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini +2021/03/14 | 1133938 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf +2021/03/14 | 112 | macros/latex/contrib/parskip/parskip.tex +2021/03/14 | 112252 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma +2021/03/14 | 110291 | support/latexindent/documentation/sec-the-m-switch.tex +2021/03/14 | 109274 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma +2021/03/14 | 10824 | support/latexindent/LatexIndent/Heading.pm +2021/03/14 | 1078877 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma +2021/03/14 | 105296 | graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex +2021/03/14 | 104625 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma +2021/03/14 | 10361 | support/latexindent/LatexIndent/Command.pm +2021/03/14 | 103322 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma +2021/03/14 | 1021921 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.2.7.sty +2021/03/14 | 101 | macros/latex/contrib/parskip/parskip-code.tex +2021/03/14 | 101763 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma +2021/03/14 | 1014383 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.2.7.tex +2021/03/14 | 10135 | support/latexindent/documentation/sec-indent-config-and-settings.tex +2021/03/14 | 10116 | systems/texlive/tlnet/archive/easybook.r58332.tar.xz +2021/03/13 | 99962649 | systems/win32/w32tex/TLW64/tl-win64.zip 2021/03/13 | 99635 | support/gregoriotex/tex/luatex/gregoriotex-spaces.tex -2021/03/13 | 99606 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma 2021/03/13 | 99459 | systems/win32/miktex/tm/packages/miktex-epstopdf-bin-x64-2.9.tar.lzma +2021/03/13 | 9934 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-zero-1.0-latex.html 2021/03/13 | 99083 | support/gregoriotex/doc/Command_Index_User.tex -2021/03/13 | 98518 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma 2021/03/13 | 97960 | systems/win32/miktex/tm/packages/miktex-texware-bin-2.9.tar.lzma 2021/03/13 | 97919 | support/gregoriotex/tex/luatex/gregoriotex-signs.tex 2021/03/13 | 97633 | systems/win32/miktex/tm/packages/miktex-mfware-bin-2.9.tar.lzma -2021/03/13 | 97489 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma -2021/03/13 | 97135 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma 2021/03/13 | 97118 | systems/win32/miktex/tm/packages/miktex-gd-bin-2.9.tar.lzma -2021/03/13 | 968699 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma 2021/03/13 | 966559 | systems/win32/miktex/tm/packages/miktex-asymptote-bin-2.9.tar.lzma 2021/03/13 | 96334 | systems/win32/miktex/tm/packages/miktex-gregorio-bin-2.9.tar.lzma -2021/03/13 | 96145 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma 2021/03/13 | 94968 | systems/win32/miktex/tm/packages/miktex-bibtex8bit-bin-x64-2.9.tar.lzma -2021/03/13 | 94802 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma 2021/03/13 | 94750 | systems/win32/miktex/tm/packages/miktex-jpeg-bin-2.9.tar.lzma -2021/03/13 | 94737 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma 2021/03/13 | 94303 | systems/win32/miktex/tm/packages/miktex-lua53-bin-2.9.tar.lzma -2021/03/13 | 94268 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma +2021/03/13 | 9229 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-unofficial-mr-88x31.pdf +2021/03/13 | 9114 | macros/latex/contrib/doclicense/images/doclicense-CC-zero-80x15.eps 2021/03/13 | 8839 | support/gregoriotex/tex/luatex/gregoriotex-chars.tex -2021/03/13 | 8773 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma -2021/03/13 | 87704 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma 2021/03/13 | 87655 | systems/win32/miktex/tm/packages/miktex-png-bin-x64-2.9.tar.lzma -2021/03/13 | 87636 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma 2021/03/13 | 8753 | systems/win32/miktex/tm/packages/miktex-md5-bin-x64-2.9.tar.lzma 2021/03/13 | 87363 | systems/win32/miktex/tm/packages/miktex-epstopdf-bin-2.9.tar.lzma 2021/03/13 | 86245 | support/gregoriotex/CHANGELOG.md -2021/03/13 | 84773 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma +2021/03/13 | 860 | macros/latex/contrib/doclicense/doclicense.ins +2021/03/13 | 8473 | macros/latex/contrib/doclicense/images/doclicense-CC-by-unofficial-mr-80x15.eps 2021/03/13 | 833 | macros/latex/contrib/schulmathematik/README 2021/03/13 | 83241 | systems/win32/miktex/tm/packages/miktex-bibtex8bit-bin-2.9.tar.lzma 2021/03/13 | 826254 | support/gregoriotex/doc/GregorioRef.pdf 2021/03/13 | 8211 | support/gregoriotex/doc/GregorioRef.tex 2021/03/13 | 8175 | support/gregoriotex/tex/luatex/gregoriotex-symbols.tex -2021/03/13 | 816073 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma 2021/03/13 | 815296 | systems/win32/miktex/tm/packages/miktex-pdftex-bin-x64-2.9.tar.lzma +2021/03/13 | 8126 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-nd-unofficial-mr-80x15.pdf 2021/03/13 | 80691 | systems/win32/miktex/tm/packages/miktex-freeglut-bin-x64-2.9.tar.lzma -2021/03/13 | 80661 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma +2021/03/13 | 800781 | systems/win32/w32tex/ChangeLog +2021/03/13 | 7940 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-sa-80x15.eps 2021/03/13 | 78748 | systems/win32/miktex/tm/packages/miktex-png-bin-2.9.tar.lzma -2021/03/13 | 78746 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma -2021/03/13 | 77858 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma +2021/03/13 | 7819 | macros/latex/contrib/doclicense/images/doclicense-CC-by-88x31.eps 2021/03/13 | 77691 | systems/win32/miktex/tm/packages/miktex-fonts-bin-x64-2.9.tar.lzma 2021/03/13 | 7768 | systems/texlive/tlnet/archive/hvfloat.r58306.tar.xz -2021/03/13 | 77486 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma 2021/03/13 | 77475 | systems/win32/miktex/tm/packages/miktex-mpmcli-bin-x64-2.9.tar.lzma -2021/03/13 | 7746 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma 2021/03/13 | 7695 | systems/win32/miktex/tm/packages/miktex-md5-bin-2.9.tar.lzma -2021/03/13 | 75419 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma 2021/03/13 | 75399 | systems/win32/miktex/tm/packages/miktex-bibtex-bin-x64-2.9.tar.lzma -2021/03/13 | 748363 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma +2021/03/13 | 7499 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-sa-unofficial-mr-80x15.pdf +2021/03/13 | 7497 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-zero-1.0-latex.tex 2021/03/13 | 748145 | systems/win32/miktex/tm/packages/miktex-pdftex-bin-2.9.tar.lzma -2021/03/13 | 74163 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma +2021/03/13 | 7473 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-nd-80x15.eps 2021/03/13 | 74152 | systems/win32/miktex/tm/packages/miktex-lzma-bin-x64-2.9.tar.lzma 2021/03/13 | 7400 | systems/texlive/tlnet/archive/srdp-mathematik.r58303.tar.xz 2021/03/13 | 739252 | systems/texlive/tlnet/archive/lshort-english.doc.r58314.tar.xz -2021/03/13 | 73181 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma 2021/03/13 | 72962 | systems/win32/miktex/tm/packages/miktex-fonts-bin-2.9.tar.lzma -2021/03/13 | 72860 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma 2021/03/13 | 72805 | systems/win32/miktex/tm/packages/miktex-graphite2-bin-x64-2.9.tar.lzma 2021/03/13 | 72748 | support/gregoriotex/tex/luatex/gregoriotex-main.tex 2021/03/13 | 72156 | systems/win32/miktex/tm/packages/miktex-ps2pk-bin-x64-2.9.tar.lzma -2021/03/13 | 72150 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma -2021/03/13 | 71567 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma +2021/03/13 | 7166 | macros/latex/contrib/doclicense/manifest.txt 2021/03/13 | 71564 | systems/win32/miktex/tm/packages/miktex-freeglut-bin-2.9.tar.lzma +2021/03/13 | 7048 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-zero-1.0-plaintext.tex 2021/03/13 | 70340 | systems/win32/miktex/tm/packages/miktex-web-bin-x64-2.9.tar.lzma -2021/03/13 | 70325 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma -2021/03/13 | 70108 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma +2021/03/13 | 7002 | macros/latex/contrib/doclicense/images/doclicense-CC-by-sa-80x15.eps 2021/03/13 | 69916 | systems/win32/miktex/tm/packages/miktex-tex4ht-bin-x64-2.9.tar.lzma 2021/03/13 | 680059 | systems/win32/miktex/tm/packages/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma -2021/03/13 | 680049 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma -2021/03/13 | 67929 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma 2021/03/13 | 67837 | systems/win32/miktex/tm/packages/miktex-mkfntmap-bin-x64-2.9.tar.lzma -2021/03/13 | 67679 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma -2021/03/13 | 67649 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma 2021/03/13 | 67585 | systems/win32/miktex/tm/packages/miktex-lzma-bin-2.9.tar.lzma 2021/03/13 | 67460 | systems/win32/miktex/tm/packages/miktex-mpmcli-bin-2.9.tar.lzma -2021/03/13 | 67450 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma 2021/03/13 | 6743 | macros/latex/contrib/schulmathematik/schulma-mdlprf.cls 2021/03/13 | 67348 | systems/win32/miktex/tm/packages/miktex-bibtex-bin-2.9.tar.lzma 2021/03/13 | 66779 | graphics/pgf/contrib/nl-interval.zip 2021/03/13 | 6665 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl +2021/03/13 | 6652 | macros/latex/contrib/profcollege/metapost/PfC-Svgnames.mp +2021/03/13 | 6616 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-80x15.eps 2021/03/13 | 660446 | macros/latex/contrib/econlipsum.zip -2021/03/13 | 65732 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma +2021/03/13 | 6580 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nd-unofficial-mr-88x31.pdf 2021/03/13 | 65523 | systems/win32/miktex/tm/packages/miktex-texify-bin-x64-2.9.tar.lzma 2021/03/13 | 65401 | systems/win32/miktex/tm/packages/miktex-web-bin-2.9.tar.lzma -2021/03/13 | 65323 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma +2021/03/13 | 6526 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nd-80x15.eps 2021/03/13 | 651480 | support/gregoriotex/gregorio-6.0.0.zip 2021/03/13 | 64074 | systems/win32/miktex/tm/packages/miktex-ps2pk-bin-2.9.tar.lzma -2021/03/13 | 64016 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma -2021/03/13 | 63836 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma 2021/03/13 | 63822 | systems/win32/miktex/tm/packages/miktex-graphite2-bin-2.9.tar.lzma -2021/03/13 | 63673 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma 2021/03/13 | 63604 | language/japanese/jlreq-deluxe/jlreq-deluxe.pdf 2021/03/13 | 6356 | support/gregoriotex/tex/lualatex/gregoriotex.sty 2021/03/13 | 63566 | systems/win32/miktex/tm/packages/miktex-tex4ht-bin-2.9.tar.lzma 2021/03/13 | 63099 | support/gregoriotex/tex/luatex/gregoriotex-syllable.tex 2021/03/13 | 62861 | systems/win32/miktex/tm/packages/miktex-fmt-bin-x64-2.9.tar.lzma -2021/03/13 | 62801 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma 2021/03/13 | 6272 | systems/texlive/tlnet/archive/collection-latexextra.r58302.tar.xz 2021/03/13 | 62530 | systems/win32/miktex/tm/packages/miktex-ttf2pk2-bin-x64-2.9.tar.lzma -2021/03/13 | 625283 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma 2021/03/13 | 624689 | systems/win32/miktex/tm/packages/miktex-lcdf-typetools-bin-2.9.tar.lzma -2021/03/13 | 62225 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma 2021/03/13 | 62053 | support/gregoriotex/doc/Command_Index_gregorio.tex 2021/03/13 | 619849 | systems/win32/miktex/tm/packages/miktex-yap-bin-x64-2.9.tar.lzma -2021/03/13 | 618761 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma -2021/03/13 | 60552 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma +2021/03/13 | 6129 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nd-unofficial-mr-80x15.pdf +2021/03/13 | 611 | macros/latex/contrib/profcollege/metapost/PfC-LaTeX.mp 2021/03/13 | 60481 | systems/win32/miktex/tm/packages/miktex-mkfntmap-bin-2.9.tar.lzma 2021/03/13 | 6030 | macros/latex/contrib/schulmathematik/schulma-praes.cls 2021/03/13 | 6009 | support/gregoriotex/tex/luatex/gregoriotex.tex 2021/03/13 | 59962 | systems/win32/miktex/tm/packages/miktex-tdsutil-bin-x64.tar.lzma 2021/03/13 | 598694 | systems/win32/miktex/tm/packages/miktex-libressl-bin-x64-2.9.tar.lzma -2021/03/13 | 59831 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma -2021/03/13 | 594869 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma -2021/03/13 | 59335 | systems/texlive/tlnet/tlpkg/translations/messages.pot -2021/03/13 | 59144 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma +2021/03/13 | 5965 | macros/latex/contrib/doclicense/images/doclicense-CC-by-sa-unofficial-mr-88x31.pdf +2021/03/13 | 5920 | macros/latex/contrib/doclicense/images/doclicense-CC-zero-unofficial-mr-88x31.pdf 2021/03/13 | 59016 | systems/win32/miktex/tm/packages/miktex-cweb-bin-x64-2.9.tar.lzma 2021/03/13 | 584121 | systems/win32/miktex/tm/packages/miktex-yap-bin-2.9.tar.lzma -2021/03/13 | 583631 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma -2021/03/13 | 5824200 | systems/texlive/tlnet/install-tl-unx.tar.gz -2021/03/13 | 57598 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma +2021/03/13 | 5775 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-sa-eu-88x31.pdf 2021/03/13 | 5757 | macros/latex/contrib/schulmathematik/schulma-ab.cls 2021/03/13 | 57554 | systems/win32/miktex/tm/packages/miktex-bibarts-bin-x64-2.9.tar.lzma -2021/03/13 | 572428 | systems/win32/miktex/tm/packages/files.csv.lzma -2021/03/13 | 572176 | systems/win32/miktex/tm/packages/next/files.csv.lzma +2021/03/13 | 5728 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-sa-88x31.pdf 2021/03/13 | 571558 | macros/latex/contrib/econlipsum/econlipsum.pdf -2021/03/13 | 57065 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma 2021/03/13 | 57013 | systems/win32/miktex/tm/packages/miktex-xml2pmx-bin-x64.tar.lzma -2021/03/13 | 56908 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma +2021/03/13 | 567 | macros/latex/contrib/hitreport/hitreport-example.tex 2021/03/13 | 56767 | systems/win32/miktex/tm/packages/miktex-cjkutils-bin-x64-2.9.tar.lzma -2021/03/13 | 567626 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma +2021/03/13 | 5675 | macros/latex/contrib/doclicense/images/doclicense-CC-by-80x15.eps 2021/03/13 | 567418 | systems/win32/miktex/tm/packages/miktex-harfbuzz-bin-x64-2.9.tar.lzma 2021/03/13 | 56739 | systems/win32/miktex/tm/packages/miktex-texify-bin-2.9.tar.lzma -2021/03/13 | 56718 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma 2021/03/13 | 56540 | systems/win32/miktex/tm/packages/miktex-arctrl-bin-x64-2.9.tar.lzma -2021/03/13 | 56457 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma +2021/03/13 | 5640 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-unofficial-mr-80x15.pdf 2021/03/13 | 56299 | systems/win32/miktex/tm/packages/miktex-ttf2pk2-bin-2.9.tar.lzma -2021/03/13 | 56222 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma 2021/03/13 | 56138 | systems/win32/miktex/tm/packages/miktex-tdsutil-bin.tar.lzma 2021/03/13 | 55875 | systems/win32/miktex/tm/packages/miktex-fmt-bin-2.9.tar.lzma -2021/03/13 | 55823 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma -2021/03/13 | 55562 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma 2021/03/13 | 55465 | systems/win32/miktex/tm/packages/miktex-xml2pmx-bin.tar.lzma -2021/03/13 | 55219 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma +2021/03/13 | 5530 | macros/latex/contrib/doclicense/images/doclicense-CC-cc-zero-unofficial-mr-80x15.pdf 2021/03/13 | 54888 | systems/texlive/tlnet/archive/reledmac.r58312.tar.xz +2021/03/13 | 5472 | macros/latex/contrib/doclicense/images/doclicense-CC-by-sa-unofficial-mr-80x15.pdf 2021/03/13 | 54618 | macros/latex/contrib/schulmathematik/schulmathematik.tex 2021/03/13 | 54003 | support/gregoriotex/doc/Gabc.tex 2021/03/13 | 53970 | support/gregoriotex/tex/luatex/gregoriotex.lua @@ -151,350 +497,332 @@ 2021/03/13 | 536 | systems/texlive/tlnet/archive/lshort-english.r58314.tar.xz 2021/03/13 | 5348 | systems/texlive/tlnet/archive/pst-ode.r58308.tar.xz 2021/03/13 | 532170 | systems/win32/miktex/tm/packages/miktex-libressl-bin-2.9.tar.lzma -2021/03/13 | 532037 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma -2021/03/13 | 527449 | macros/latex/contrib/easybook.zip 2021/03/13 | 52632 | systems/win32/miktex/tm/packages/miktex-cweb-bin-2.9.tar.lzma -2021/03/13 | 52476 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma -2021/03/13 | 52452 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma 2021/03/13 | 52421 | systems/win32/miktex/tm/packages/miktex-m-tx-bin-x64-2.9.tar.lzma -2021/03/13 | 51978 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma -2021/03/13 | 51797 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma 2021/03/13 | 51668 | systems/win32/miktex/tm/packages/miktex-synctex-bin-x64-2.9.tar.lzma -2021/03/13 | 51431 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma 2021/03/13 | 51320 | systems/win32/miktex/tm/packages/miktex-psutils-bin-x64-2.9.tar.lzma -2021/03/13 | 512688 | systems/texlive/tlnet/archive/easybook.doc.r58307.tar.xz +2021/03/13 | 5116 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-nd-eu-88x31.pdf 2021/03/13 | 51166 | systems/win32/miktex/tm/packages/miktex-dvicopy-bin-x64-2.9.tar.lzma -2021/03/13 | 511631 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma -2021/03/13 | 51159 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma 2021/03/13 | 51109 | systems/win32/miktex/tm/packages/miktex-cjkutils-bin-2.9.tar.lzma 2021/03/13 | 510789 | systems/win32/miktex/tm/packages/miktex-log4cxx-bin-x64-2.9.tar.lzma 2021/03/13 | 509721 | systems/win32/miktex/doc/miktex.pdf -2021/03/13 | 50847 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma 2021/03/13 | 50627 | systems/win32/miktex/tm/packages/miktex-arctrl-bin-2.9.tar.lzma +2021/03/13 | 5058 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-nd-88x31.pdf +2021/03/13 | 5056 | macros/latex/contrib/profcollege/metapost/PfC-Afficheur.mp 2021/03/13 | 50148 | systems/win32/miktex/tm/packages/miktex-bibarts-bin-2.9.tar.lzma -2021/03/13 | 49972 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma -2021/03/13 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2021/03/13 | 494745 | macros/latex/contrib/profcollege/latex/ProfCollege.sty 2021/03/13 | 484809 | support/gregoriotex/doc/GregorioNabcRef.pdf -2021/03/13 | 484053 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma 2021/03/13 | 483272 | systems/win32/miktex/tm/packages/miktex-harfbuzz-bin-2.9.tar.lzma 2021/03/13 | 48204 | systems/win32/miktex/tm/packages/miktex-expat-bin-x64-2.9.tar.lzma -2021/03/13 | 47877 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma 2021/03/13 | 476114 | systems/win32/miktex/tm/packages/miktex-log4cxx-bin-2.9.tar.lzma -2021/03/13 | 475936 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma 2021/03/13 | 47335840 | install/support/gregoriotex.tds.zip -2021/03/13 | 47008 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma +2021/03/13 | 4697 | macros/latex/contrib/doclicense/images/doclicense-CC-zero-88x31.pdf 2021/03/13 | 46896 | systems/win32/miktex/tm/packages/miktex-mtprint-bin-x64-2.9.tar.lzma 2021/03/13 | 4680 | macros/latex/contrib/schulmathematik/schulma-physik.sty +2021/03/13 | 4662772 | systems/win32/w32tex/dvipdfm-w32.tar.xz 2021/03/13 | 464396 | systems/texlive/tlnet/archive/kotex-oblivoir.doc.r58313.tar.xz 2021/03/13 | 461425 | systems/win32/miktex/tm/packages/miktex-doc.tar.lzma -2021/03/13 | 461397 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma -2021/03/13 | 45936 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma 2021/03/13 | 45919 | systems/win32/miktex/tm/packages/miktex-m-tx-bin-2.9.tar.lzma 2021/03/13 | 45827 | systems/win32/miktex/tm/packages/miktex-dvicopy-bin-2.9.tar.lzma -2021/03/13 | 45648 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma -2021/03/13 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc -2021/03/13 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc -2021/03/13 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc -2021/03/13 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc 2021/03/13 | 4546 | support/gregoriotex/tex/luatex/gregorio-vowels.dat -2021/03/13 | 45277 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma 2021/03/13 | 45264 | systems/win32/miktex/tm/packages/miktex-dvipng-bin-x64-2.9.tar.lzma 2021/03/13 | 45108 | systems/texlive/tlnet/archive/thuthesis.source.r58301.tar.xz 2021/03/13 | 44724 | systems/texlive/tlnet/archive/l3packages.source.r58305.tar.xz -2021/03/13 | 44638 | macros/latex/contrib/easybook/easybook.cls +2021/03/13 | 4460 | macros/latex/contrib/doclicense/images/doclicense-CC-by-sa-88x31.pdf 2021/03/13 | 44479 | systems/win32/miktex/tm/packages/miktex-psutils-bin-2.9.tar.lzma -2021/03/13 | 43678 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma -2021/03/13 | 43391 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma +2021/03/13 | 4365 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-eu-88x31.pdf 2021/03/13 | 43368 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma -2021/03/13 | 43058 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma +2021/03/13 | 431 | macros/latex/contrib/profcollege/metapost/PfC-Constantes.mp +2021/03/13 | 4312 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-88x31.pdf 2021/03/13 | 43021 | systems/win32/miktex/tm/packages/miktex-expat-bin-2.9.tar.lzma 2021/03/13 | 42931 | systems/win32/miktex/tm/packages/miktex-gsf2pk-bin-x64-2.9.tar.lzma -2021/03/13 | 42924 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma 2021/03/13 | 42746 | systems/win32/miktex/tm/packages/miktex-mtprint-bin-2.9.tar.lzma 2021/03/13 | 42713 | systems/win32/miktex/tm/packages/miktex-mthelp-bin-x64-2.9.tar.lzma -2021/03/13 | 42627 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma -2021/03/13 | 42573 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma -2021/03/13 | 42388 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma 2021/03/13 | 42365 | systems/win32/miktex/tm/packages/miktex-synctex-bin-2.9.tar.lzma +2021/03/13 | 421 | macros/latex/contrib/doclicense/doclicense-british.ldf 2021/03/13 | 41412 | systems/texlive/tlnet/archive/kotex-oblivoir.r58313.tar.xz 2021/03/13 | 41211 | systems/win32/miktex/tm/packages/miktex-dvipng-bin-2.9.tar.lzma -2021/03/13 | 41102 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma 2021/03/13 | 41052 | systems/texlive/tlnet/archive/thuthesis.r58301.tar.xz +2021/03/13 | 40787 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-sa-4.0-latex.html +2021/03/13 | 39915 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-sa-4.0-latex.html 2021/03/13 | 39750 | systems/win32/miktex/tm/packages/miktex-patgen-bin-x64.tar.lzma -2021/03/13 | 39691 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma -2021/03/13 | 39563 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma 2021/03/13 | 39480 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma -2021/03/13 | 392598 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma 2021/03/13 | 392516 | systems/win32/miktex/tm/packages/miktex-cairo-bin-x64-2.9.tar.lzma -2021/03/13 | 388 | systems/texlive/tlnet/archive/texlive-docindex.r58288.tar.xz +2021/03/13 | 38979 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-4.0-latex.html +2021/03/13 | 38937 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-nd-4.0-latex.html 2021/03/13 | 3869 | macros/latex/contrib/easybook/doc/chapter2.tex +2021/03/13 | 3847252 | systems/win32/w32tex/luajittex-exp-w32.tar.xz 2021/03/13 | 3845 | support/gregoriotex/doc/Appendix_Font_Tables.tex 2021/03/13 | 3845 | language/japanese/jlreq-deluxe/jlreq-deluxe.tex +2021/03/13 | 3842468 | systems/win32/w32tex/luajittex-w32.tar.xz +2021/03/13 | 3842128 | systems/win32/w32tex/luajittex-dev-w32.tar.xz +2021/03/13 | 3837 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nd-88x31.pdf 2021/03/13 | 3831 | language/japanese/jlreq-deluxe/README-ja.md -2021/03/13 | 38070 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma -2021/03/13 | 38064 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma +2021/03/13 | 38132 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-4.0-latex.html +2021/03/13 | 3812 | macros/latex/contrib/doclicense/images/doclicense-CC-by-unofficial-mr-88x31.pdf +2021/03/13 | 38078 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nd-4.0-latex.html +2021/03/13 | 38073 | macros/latex/contrib/doclicense/doclicense.dtx 2021/03/13 | 38019 | systems/win32/miktex/tm/packages/miktex-gsf2pk-bin-2.9.tar.lzma 2021/03/13 | 37843 | systems/win32/miktex/tm/packages/miktex-mthelp-bin-2.9.tar.lzma -2021/03/13 | 37293 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma -2021/03/13 | 37244 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma 2021/03/13 | 37231 | systems/win32/miktex/tm/packages/miktex-posix-bin-x64-2.9.tar.lzma 2021/03/13 | 37227 | systems/win32/miktex/tm/packages/miktex-upmendex-bin-x64.tar.lzma 2021/03/13 | 36690 | support/gregoriotex/UPGRADE.md -2021/03/13 | 36680 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma 2021/03/13 | 36571 | systems/win32/miktex/tm/packages/miktex-chktex-bin-x64-2.9.tar.lzma 2021/03/13 | 36483 | support/gregoriotex/COPYING.md 2021/03/13 | 3641 | support/gregoriotex/tex/luatex/gregoriotex-common.tex -2021/03/13 | 35463 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma +2021/03/13 | 3638 | macros/latex/contrib/doclicense/images/doclicense-CC-by-unofficial-mr-80x15.pdf +2021/03/13 | 3579 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-sa-80x15.pdf +2021/03/13 | 3538 | macros/latex/contrib/doclicense/images/doclicense-CC-zero-80x15.pdf 2021/03/13 | 35273 | systems/win32/miktex/tm/packages/miktex-patgen-bin.tar.lzma -2021/03/13 | 35062 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma 2021/03/13 | 35059 | systems/win32/miktex/tm/packages/miktex-mspack-bin-x64-2.9.tar.lzma -2021/03/13 | 34634 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma 2021/03/13 | 34552 | systems/win32/miktex/tm/packages/miktex-axohelp-bin-x64-2.9.tar.lzma 2021/03/13 | 345472 | systems/win32/miktex/tm/packages/miktex-xetex-bin-x64-2.9.tar.lzma -2021/03/13 | 345367 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma +2021/03/13 | 3453852 | systems/win32/w32tex/win64/luajittex-dev-w64.tar.xz +2021/03/13 | 3447116 | systems/win32/w32tex/win64/luajittex-exp-w64.tar.xz +2021/03/13 | 3442004 | systems/win32/w32tex/win64/luajittex-w64.tar.xz +2021/03/13 | 34017908 | systems/win32/w32tex/ltxpkgs.tar.xz 2021/03/13 | 33619 | systems/win32/miktex/tm/packages/miktex-uriparser-bin-x64-2.9.tar.lzma -2021/03/13 | 33441 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma +2021/03/13 | 3357 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-nd-80x15.pdf 2021/03/13 | 33406 | systems/win32/miktex/tm/packages/miktex-upmendex-bin.tar.lzma -2021/03/13 | 33151 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma 2021/03/13 | 330595 | systems/win32/miktex/tm/packages/miktex-cairo-bin-2.9.tar.lzma -2021/03/13 | 330234 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma -2021/03/13 | 32744 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma 2021/03/13 | 32657 | systems/win32/miktex/tm/packages/miktex-chktex-bin-2.9.tar.lzma +2021/03/13 | 3253 | macros/latex/contrib/doclicense/images/doclicense-CC-by-sa-80x15.pdf 2021/03/13 | 322033 | systems/win32/miktex/tm/packages/miktex-dvipdfmx-bin-x64-2.9.tar.lzma -2021/03/13 | 321894 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma -2021/03/13 | 31592 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma -2021/03/13 | 31543 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma +2021/03/13 | 31952 | macros/latex/contrib/profcollege/metapost/PfC-Geometrie.mp +2021/03/13 | 31754 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-nd-unofficial-mr-88x31.eps 2021/03/13 | 31491 | systems/win32/miktex/tm/packages/miktex-posix-bin-2.9.tar.lzma 2021/03/13 | 31392 | systems/win32/miktex/tm/packages/miktex-makeindex-bin-x64-2.9.tar.lzma 2021/03/13 | 31356 | systems/win32/miktex/tm/packages/miktex-autosp-bin-x64-2.9.tar.lzma -2021/03/13 | 31343 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma -2021/03/13 | 31191 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma 2021/03/13 | 31188 | systems/win32/miktex/tm/packages/miktex-mspack-bin-2.9.tar.lzma -2021/03/13 | 311191 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma +2021/03/13 | 3115256 | systems/win32/w32tex/win64/luatex-exp-w64.tar.xz +2021/03/13 | 3114836 | systems/win32/w32tex/win64/luatex-w64.tar.xz +2021/03/13 | 3113952 | systems/win32/w32tex/win64/luatex-dev-w64.tar.xz 2021/03/13 | 311058 | systems/win32/miktex/tm/packages/miktex-xetex-bin-2.9.tar.lzma -2021/03/13 | 30885 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma +2021/03/13 | 308 | macros/latex/contrib/doclicense/doclicense-canadien.ldf +2021/03/13 | 307 | macros/latex/contrib/doclicense/doclicense-newzealand.ldf +2021/03/13 | 307 | macros/latex/contrib/doclicense/doclicense-australian.ldf +2021/03/13 | 307 | macros/latex/contrib/doclicense/doclicense-acadian.ldf 2021/03/13 | 30783 | systems/win32/miktex/tm/packages/miktex-bzip2-bin-x64-2.9.tar.lzma -2021/03/13 | 30290 | macros/latex/contrib/easybook/doc/easybook.tex +2021/03/13 | 306 | macros/latex/contrib/doclicense/doclicense-USenglish.ldf +2021/03/13 | 306 | macros/latex/contrib/doclicense/doclicense-UKenglish.ldf +2021/03/13 | 3067 | macros/latex/contrib/doclicense/doclicense-marathi.ldf +2021/03/13 | 3064 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-80x15.pdf +2021/03/13 | 305 | macros/latex/contrib/doclicense/doclicense-canadian.ldf +2021/03/13 | 305 | macros/latex/contrib/doclicense/doclicense-american.ldf +2021/03/13 | 3052 | macros/latex/contrib/doclicense/images/doclicense-CC-by-88x31.pdf +2021/03/13 | 303 | macros/latex/contrib/doclicense/doclicense-ngerman.ldf +2021/03/13 | 3022 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nd-80x15.pdf 2021/03/13 | 3016 | systems/texlive/tlnet/archive/mindflow.source.r58304.tar.xz -2021/03/13 | 30036 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma +2021/03/13 | 30123 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-sa-unofficial-mr-88x31.eps 2021/03/13 | 30026 | systems/win32/miktex/tm/packages/miktex-lacheck-bin-x64-2.9.tar.lzma -2021/03/13 | 29869 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma +2021/03/13 | 2990 | macros/latex/contrib/doclicense/doclicense-polish.ldf 2021/03/13 | 29739 | systems/win32/miktex/tm/packages/miktex-axohelp-bin-2.9.tar.lzma 2021/03/13 | 2968 | support/gregoriotex/tex/lualatex/gregoriosyms.sty -2021/03/13 | 295553 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma 2021/03/13 | 295413 | systems/win32/miktex/tm/packages/miktex-freetype2-bin-x64-2.9.tar.lzma -2021/03/13 | 29053 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma 2021/03/13 | 28991 | systems/win32/miktex/tm/packages/miktex-autosp-bin-2.9.tar.lzma -2021/03/13 | 287472 | macros/latex/contrib/easybook/doc/easybook-demo.pdf -2021/03/13 | 283978 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma 2021/03/13 | 283867 | systems/win32/miktex/tm/packages/miktex-metapost-bin-x64-2.9.tar.lzma 2021/03/13 | 28256 | systems/win32/miktex/tm/packages/miktex-lacheck-bin-2.9.tar.lzma -2021/03/13 | 282105 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma 2021/03/13 | 281877 | systems/win32/miktex/tm/packages/miktex-dvipdfmx-bin-2.9.tar.lzma -2021/03/13 | 28119 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma +2021/03/13 | 2810 | macros/latex/contrib/doclicense/doclicense-russian.ldf 2021/03/13 | 28105 | systems/win32/miktex/tm/packages/miktex-findtexmf-bin-x64-2.9.tar.lzma -2021/03/13 | 28009 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma 2021/03/13 | 2795400 | systems/win32/miktex/tm/packages/miktex-texworks-bin-x64-2.9.tar.lzma 2021/03/13 | 27721 | systems/win32/miktex/tm/packages/miktex-uriparser-bin-2.9.tar.lzma -2021/03/13 | 27360 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma +2021/03/13 | 274224936 | systems/win32/w32tex/pstricks.tar.xz 2021/03/13 | 27353 | systems/win32/miktex/tm/packages/miktex-makeindex-bin-2.9.tar.lzma -2021/03/13 | 27274 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma +2021/03/13 | 27315 | macros/latex/contrib/profcollege/latex/PfC-EquationSoustraction2.tex +2021/03/13 | 2727 | macros/latex/contrib/doclicense/images/doclicense-CC-by-80x15.pdf 2021/03/13 | 27239 | systems/win32/miktex/tm/packages/miktex-teckit-bin-x64-2.9.tar.lzma -2021/03/13 | 27197 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma -2021/03/13 | 27182 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma 2021/03/13 | 271637 | macros/latex/contrib/econlipsum/econlipsum.dtx 2021/03/13 | 27157 | systems/win32/miktex/tm/packages/miktex-bzip2-bin-2.9.tar.lzma 2021/03/13 | 2666475 | systems/win32/miktex/tm/packages/miktex-texworks-bin-2.9.tar.lzma 2021/03/13 | 26606 | support/gregoriotex/doc/gsp-sample.tex 2021/03/13 | 262464 | systems/win32/miktex/tm/packages/miktex-console-bin-x64-2.9.tar.lzma -2021/03/13 | 261964 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma -2021/03/13 | 2616930 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma +2021/03/13 | 262200 | macros/latex/contrib/doclicense/doclicense.pdf 2021/03/13 | 258833 | systems/win32/miktex/tm/packages/miktex-freetype2-bin-2.9.tar.lzma -2021/03/13 | 258663 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma 2021/03/13 | 25829 | support/gregoriotex/tex/luatex/gregoriotex-gsp-default.tex +2021/03/13 | 2573778 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf 2021/03/13 | 2539 | macros/latex/contrib/easybook/doc/chapter3.tex -2021/03/13 | 25341 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma 2021/03/13 | 25281 | systems/win32/miktex/tm/packages/miktex-teckit-bin-2.9.tar.lzma -2021/03/13 | 25154 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma 2021/03/13 | 250382 | systems/win32/miktex/tm/packages/miktex-metapost-bin-2.9.tar.lzma -2021/03/13 | 250211 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma -2021/03/13 | 25002 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma -2021/03/13 | 2499402 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma 2021/03/13 | 24973 | systems/win32/miktex/tm/packages/miktex-fribidixetex-bin-x64-2.9.tar.lzma 2021/03/13 | 24964 | systems/win32/miktex/tm/packages/miktex-findtexmf-bin-2.9.tar.lzma +2021/03/13 | 2476 | macros/latex/contrib/doclicense/README.md 2021/03/13 | 24760 | support/gregoriotex/fonts/truetype/greextra.ttf -2021/03/13 | 24615517 | systems/texlive/tlnet/install-tl.zip -2021/03/13 | 2459 | macros/latex/contrib/easybook/doc/easybook-demo.tex -2021/03/13 | 243479 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma 2021/03/13 | 243446 | systems/win32/miktex/tm/packages/miktex-pmx-bin-x64-2.9.tar.lzma 2021/03/13 | 2409 | macros/latex/contrib/schulmathematik/schulma.sty 2021/03/13 | 24029317 | support/gregoriotex.zip 2021/03/13 | 2396 | support/gregoriotex/README.md -2021/03/13 | 239481 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma -2021/03/13 | 23882 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma 2021/03/13 | 23863 | systems/win32/miktex/tm/packages/miktex-popt-bin-x64-2.9.tar.lzma -2021/03/13 | 237329 | macros/latex/contrib/easybook/doc/easybook.pdf 2021/03/13 | 2372 | support/gregoriotex/tex/luatex/gregoriotex-nabc.tex 2021/03/13 | 236783 | systems/win32/miktex/tm/packages/miktex-console-bin-2.9.tar.lzma 2021/03/13 | 23676 | support/gregoriotex/tex/luatex/gregoriotex-signs.lua +2021/03/13 | 23486 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-sa-3.0-latex.html +2021/03/13 | 23457 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-sa-3.0-latex.html 2021/03/13 | 23313 | systems/win32/miktex/tm/packages/miktex-devnag-bin-x64-2.9.tar.lzma -2021/03/13 | 23289 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma 2021/03/13 | 23227924 | systems/texlive/tlnet/archive/hvfloat.doc.r58306.tar.xz +2021/03/13 | 23182 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-unofficial-mr-88x31.eps 2021/03/13 | 2300 | macros/latex/contrib/schulmathematik/schulma-komp.cls +2021/03/13 | 2293 | macros/latex/contrib/doclicense/doclicense-bulgarian.ldf 2021/03/13 | 22902 | systems/win32/miktex/tm/packages/miktex-misc.tar.lzma -2021/03/13 | 2281508 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz -2021/03/13 | 22039 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma +2021/03/13 | 22499 | macros/latex/contrib/profcollege/latex/PfC-EquationComposition2.tex +2021/03/13 | 2246 | macros/latex/contrib/doclicense/doclicense-french.ldf +2021/03/13 | 22306 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-sa-3.0-plaintext.tex +2021/03/13 | 22239 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-sa-3.0-plaintext.tex +2021/03/13 | 22108 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-sa-3.0-latex.tex +2021/03/13 | 22078 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-sa-3.0-latex.tex 2021/03/13 | 22013 | systems/win32/miktex/tm/packages/miktex-fribidixetex-bin-2.9.tar.lzma +2021/03/13 | 21724 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-3.0-latex.html 2021/03/13 | 2169 | support/gregoriotex/tex/luatex/gregoriotex-symbols.lua 2021/03/13 | 215854 | macros/latex/contrib/schulmathematik.zip 2021/03/13 | 21520 | systems/texlive/tlnet/archive/l3packages.r58305.tar.xz 2021/03/13 | 214616 | systems/win32/miktex/tm/packages/miktex-metafont-bin-x64-2.9.tar.lzma -2021/03/13 | 214105 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma -2021/03/13 | 21129 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma -2021/03/13 | 211054 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma 2021/03/13 | 21101 | systems/win32/miktex/tm/packages/miktex-devnag-bin-2.9.tar.lzma -2021/03/13 | 208181 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma +2021/03/13 | 20897 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-nd-unofficial-mr-80x15.eps +2021/03/13 | 20850 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-sa-4.0-plaintext.tex 2021/03/13 | 207984 | systems/texlive/tlnet/archive/reledmac.source.r58312.tar.xz 2021/03/13 | 207863 | systems/win32/miktex/tm/packages/miktex-pmx-bin-2.9.tar.lzma +2021/03/13 | 20781 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-3.0-latex.html 2021/03/13 | 2076 | support/gregoriotex/fonts/sources/convertsfdtottf.py -2021/03/13 | 207544 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma -2021/03/13 | 207477 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma 2021/03/13 | 205932 | systems/win32/miktex/tm/packages/miktex-omegaware-bin-x64-2.9.tar.lzma +2021/03/13 | 2057 | macros/latex/contrib/doclicense/doclicense-german.ldf 2021/03/13 | 2050 | support/gregoriotex/fonts/sources/simplify.py +2021/03/13 | 20479 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-3.0-plaintext.tex +2021/03/13 | 20426 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-sa-4.0-latex.tex 2021/03/13 | 2038 | support/gregoriotex/CONTRIBUTORS.md +2021/03/13 | 20356 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-3.0-latex.tex 2021/03/13 | 203280 | support/gregoriotex/fonts/truetype/gresgmodern.ttf 2021/03/13 | 203115 | systems/win32/miktex/tm/packages/miktex-pixman-bin-x64-2.9.tar.lzma -2021/03/13 | 202557 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma -2021/03/13 | 20122 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma +2021/03/13 | 20138 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-sa-4.0-plaintext.tex 2021/03/13 | 20115 | systems/win32/miktex/tm/packages/miktex-popt-bin-2.9.tar.lzma -2021/03/13 | 2009487 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma 2021/03/13 | 20061 | support/gregoriotex/doc/GregorioRef.lua -2021/03/13 | 199699 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma +2021/03/13 | 2004 | macros/latex/contrib/doclicense/doclicense-italian.ldf +2021/03/13 | 19976 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-nd-3.0-latex.html 2021/03/13 | 199574 | systems/win32/miktex/tm/packages/miktex-mpfr-bin-2.9.tar.lzma +2021/03/13 | 1991 | macros/latex/contrib/doclicense/doclicense-galician.ldf 2021/03/13 | 1986456 | systems/win32/miktex/tm/packages/miktex-luatex-bin-x64-2.9.tar.lzma 2021/03/13 | 198502 | systems/win32/miktex/tm/packages/miktex-pixman-bin-2.9.tar.lzma -2021/03/13 | 198130 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma -2021/03/13 | 19657618 | systems/texlive/tlnet/install-tl-windows.exe -2021/03/13 | 195665 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma +2021/03/13 | 19772 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-sa-4.0-latex.tex 2021/03/13 | 195646 | systems/win32/miktex/tm/packages/miktex-curl-bin-x64-2.9.tar.lzma -2021/03/13 | 195567 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma 2021/03/13 | 195396 | systems/win32/miktex/tm/packages/miktex-metafont-bin-2.9.tar.lzma +2021/03/13 | 19466 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-3.0-plaintext.tex +2021/03/13 | 19416 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-3.0-latex.tex 2021/03/13 | 193915 | systems/win32/miktex/tm/packages/miktex-omegaware-bin-2.9.tar.lzma -2021/03/13 | 193716 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma +2021/03/13 | 19347 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-4.0-plaintext.tex 2021/03/13 | 192923 | macros/latex/contrib/schulmathematik/schulmathematik.pdf 2021/03/13 | 19158768 | support/gregoriotex/fonts/sources/gregall.sfd +2021/03/13 | 19127 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-nd-4.0-plaintext.tex +2021/03/13 | 19124 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-sa-unofficial-mr-80x15.eps +2021/03/13 | 19048 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nd-3.0-latex.html +2021/03/13 | 19004 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-4.0-latex.tex +2021/03/13 | 18889 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nd-unofficial-mr-88x31.eps +2021/03/13 | 18839856 | systems/win32/w32tex/luatex-dev-w32.tar.xz +2021/03/13 | 18839204 | systems/win32/w32tex/luatex-exp-w32.tar.xz +2021/03/13 | 18833436 | systems/win32/w32tex/luatex-w32.tar.xz +2021/03/13 | 18797 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-nd-4.0-latex.tex 2021/03/13 | 187532 | support/gregoriotex/fonts/truetype/grelaon.ttf 2021/03/13 | 1870272 | support/gregoriotex/fonts/truetype/greciliae-op-hollow.ttf +2021/03/13 | 18657 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-4.0-plaintext.tex +2021/03/13 | 18650 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-nd-3.0-plaintext.tex +2021/03/13 | 18609 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-nd-3.0-latex.tex 2021/03/13 | 18595 | support/gregoriotex/tex/luatex/gregoriotex-nabc.lua +2021/03/13 | 18436 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nd-4.0-plaintext.tex +2021/03/13 | 18374 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-4.0-latex.tex 2021/03/13 | 1832620 | support/gregoriotex/fonts/truetype/greciliae-hollow.ttf -2021/03/13 | 18097 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma +2021/03/13 | 18164 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nd-4.0-latex.tex 2021/03/13 | 18042 | systems/win32/miktex/tm/packages/miktex-tex2xindy-bin-x64-2.9.tar.lzma 2021/03/13 | 180148 | systems/win32/miktex/tm/packages/miktex-mpfr-bin-x64-2.9.tar.lzma -2021/03/13 | 180047 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma 2021/03/13 | 179610 | systems/win32/miktex/tm/packages/miktex-curl-bin-2.9.tar.lzma -2021/03/13 | 17957 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma -2021/03/13 | 179379 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma 2021/03/13 | 17928 | systems/win32/miktex/tm/packages/miktex-kpathsea-bin-x64-2.9.tar.lzma 2021/03/13 | 1784 | systems/texlive/tlnet/archive/suppose.r58302.tar.xz 2021/03/13 | 1773804 | systems/texlive/tlnet/archive/l3packages.doc.r58305.tar.xz +2021/03/13 | 17684 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nd-3.0-latex.tex +2021/03/13 | 17650 | macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nd-3.0-plaintext.tex 2021/03/13 | 175880 | systems/texlive/tlnet/archive/mindflow.doc.r58304.tar.xz -2021/03/13 | 173616 | systems/texlive/tlnet/archive/texlive-docindex.doc.r58288.tar.xz -2021/03/13 | 1725545 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma 2021/03/13 | 1721834 | systems/win32/miktex/tm/packages/miktex-luatex-bin-2.9.tar.lzma -2021/03/13 | 17050332 | systems/texlive/tlnet/tlpkg/texlive.tlpdb +2021/03/13 | 17092 | macros/latex/contrib/doclicense/images/doclicense-CC-by-sa-unofficial-mr-88x31.eps +2021/03/13 | 1702 | macros/latex/contrib/doclicense/doclicense-catalan.ldf 2021/03/13 | 167999 | systems/win32/miktex/tm/packages/miktex-tex-bin-x64-2.9.tar.lzma -2021/03/13 | 167907 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma 2021/03/13 | 167545 | support/gregoriotex/fonts/sources/greciliae-base.sfd +2021/03/13 | 1672987 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.zip +2021/03/13 | 1665 | macros/latex/contrib/doclicense/doclicense-portuguese.ldf +2021/03/13 | 1663 | macros/latex/contrib/doclicense/doclicense-spanish.ldf +2021/03/13 | 16411 | macros/latex/contrib/doclicense/images/doclicense-CC-zero-unofficial-mr-88x31.eps +2021/03/13 | 1637 | macros/latex/contrib/doclicense/doclicense-brazilian.ldf 2021/03/13 | 163663 | systems/win32/miktex/tm/packages/miktex-mo-bin-x64-2.9.tar.lzma -2021/03/13 | 163656 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma 2021/03/13 | 16333 | systems/win32/miktex/tm/packages/miktex-tex2xindy-bin-2.9.tar.lzma -2021/03/13 | 16327 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma 2021/03/13 | 16256 | systems/win32/miktex/tm/packages/miktex-kpathsea-bin-2.9.tar.lzma +2021/03/13 | 1613 | macros/latex/contrib/doclicense/doclicense-english.ldf 2021/03/13 | 1612 | systems/texlive/tlnet/archive/mindflow.r58304.tar.xz -2021/03/13 | 16110 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma 2021/03/13 | 160680 | systems/texlive/tlnet/archive/suppose.doc.r58302.tar.xz -2021/03/13 | 159968 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma 2021/03/13 | 159776 | systems/win32/miktex/tm/packages/miktex-hunspell-bin-x64-2.9.tar.lzma 2021/03/13 | 159476 | support/gregoriotex/fonts/truetype/gregall.ttf +2021/03/13 | 1592 | macros/latex/contrib/doclicense/doclicense-chinese-utf8.ldf +2021/03/13 | 1570 | macros/latex/contrib/doclicense/Makefile 2021/03/13 | 1554768 | systems/texlive/tlnet/archive/thuthesis.doc.r58301.tar.xz -2021/03/13 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 -2021/03/13 | 153889 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma 2021/03/13 | 153866 | systems/win32/miktex/tm/packages/miktex-tex-bin-2.9.tar.lzma -2021/03/13 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2021/03/13 | 15356 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nd-unofficial-mr-80x15.eps 2021/03/13 | 152984 | systems/win32/miktex/tm/packages/miktex-hunspell-bin-2.9.tar.lzma -2021/03/13 | 152761 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma +2021/03/13 | 15260 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-sa-eu-88x31.eps 2021/03/13 | 152515 | systems/win32/miktex/tm/packages/miktex-fontconfig-bin-x64-2.9.tar.lzma +2021/03/13 | 15146 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-sa-88x31.eps 2021/03/13 | 1506 | macros/latex/contrib/econlipsum/README.md 2021/03/13 | 14984 | macros/latex/contrib/schulmathematik/schulma-klausur.cls -2021/03/13 | 147152 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma -2021/03/13 | 147139 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma +2021/03/13 | 14916 | macros/latex/contrib/doclicense/images/doclicense-CC-cc-zero-unofficial-mr-80x15.eps 2021/03/13 | 146719 | systems/win32/miktex/tm/packages/miktex-mo-bin-2.9.tar.lzma -2021/03/13 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 -2021/03/13 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 2021/03/13 | 144942 | support/gregoriotex/doc/GregorioNabcRef.tex +2021/03/13 | 1441 | macros/latex/contrib/doclicense/doclicense-chinese-gbk.ldf +2021/03/13 | 1439 | macros/latex/contrib/hitreport/data/appendix.tex 2021/03/13 | 1438 | support/gregoriotex/doc/examples/main-lualatex.tex -2021/03/13 | 14353 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma 2021/03/13 | 14317 | systems/win32/miktex/tm/packages/miktex-zzip-bin-x64-2.9.tar.lzma 2021/03/13 | 1430325 | systems/win32/miktex/tm/packages/miktex-dvisvgm-bin-x64-2.9.tar.lzma 2021/03/13 | 1427259 | systems/win32/miktex/tm/packages/miktex-runtime-bin-x64-2.9.tar.lzma -2021/03/13 | 1425980 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma -2021/03/13 | 1424812 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma 2021/03/13 | 142376 | systems/texlive/tlnet/archive/srdp-mathematik.doc.r58303.tar.xz -2021/03/13 | 136427 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma +2021/03/13 | 14115 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-unofficial-mr-80x15.eps +2021/03/13 | 1397 | macros/latex/contrib/doclicense/doclicense-japanese.ldf 2021/03/13 | 136266 | systems/win32/miktex/tm/packages/miktex-mktex-bin-x64-2.9.tar.lzma +2021/03/13 | 13562 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-nd-eu-88x31.eps 2021/03/13 | 13555440 | support/gregoriotex/fonts/sources/grelaon.sfd -2021/03/13 | 135004 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma -2021/03/13 | 13471 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma +2021/03/13 | 13505 | macros/latex/contrib/doclicense/images/doclicense-CC-by-sa-unofficial-mr-80x15.eps 2021/03/13 | 134572 | systems/win32/miktex/tm/packages/miktex-fontconfig-bin-2.9.tar.lzma 2021/03/13 | 13443 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma -2021/03/13 | 131489 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma +2021/03/13 | 13437 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-nd-88x31.eps +2021/03/13 | 13296 | macros/latex/contrib/profcollege/metapost/PfC-Calculatrice.mp 2021/03/13 | 131434 | systems/win32/miktex/tm/packages/miktex-dvips-bin-x64-2.9.tar.lzma -2021/03/13 | 1307725 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma 2021/03/13 | 130576 | support/gregoriotex/doc/Command_Index_internal.tex 2021/03/13 | 1304069 | systems/win32/miktex/tm/packages/miktex-poppler-bin-x64-2.9.tar.lzma +2021/03/13 | 129894268 | systems/win32/w32tex/web2c-lib.tar.xz 2021/03/13 | 1296477 | systems/win32/miktex/tm/packages/miktex-runtime-bin-2.9.tar.lzma -2021/03/13 | 1295411 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma 2021/03/13 | 1286407 | systems/win32/miktex/tm/packages/miktex-dvisvgm-bin-2.9.tar.lzma -2021/03/13 | 1281104 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma -2021/03/13 | 1259963 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma 2021/03/13 | 125975 | support/gregoriotex/fonts/sources/squarize.py -2021/03/13 | 1258954 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma -2021/03/13 | 124973 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma +2021/03/13 | 124095501 | macros/context/latest/cont-tmf.zip 2021/03/13 | 124051 | systems/win32/miktex/tm/packages/miktex-mktex-bin-2.9.tar.lzma -2021/03/13 | 1176699 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma -2021/03/13 | 1176037 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma -2021/03/13 | 1171730 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma +2021/03/13 | 12331 | macros/latex/contrib/doclicense/images/doclicense-CC-zero-88x31.eps +2021/03/13 | 12246 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-nd-unofficial-mr-88x31.pdf 2021/03/13 | 1170650 | systems/win32/miktex/tm/packages/miktex-poppler-bin-2.9.tar.lzma 2021/03/13 | 116988 | systems/win32/miktex/tm/packages/miktex-dvips-bin-2.9.tar.lzma -2021/03/13 | 116932 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma +2021/03/13 | 11686 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-sa-unofficial-mr-88x31.pdf +2021/03/13 | 11647 | macros/latex/contrib/doclicense/images/doclicense-CC-by-sa-88x31.eps 2021/03/13 | 115660 | systems/texlive/tlnet/archive/pst-ode.doc.r58308.tar.xz -2021/03/13 | 1155 | systems/win32/miktex/tm/packages/pr.ini -2021/03/13 | 115467 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma 2021/03/13 | 11543 | macros/latex/contrib/schulmathematik/schulma-gutachten.cls -2021/03/13 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini 2021/03/13 | 115262 | systems/win32/miktex/tm/packages/miktex-gregorio-bin-x64-2.9.tar.lzma +2021/03/13 | 11390 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-eu-88x31.eps 2021/03/13 | 1138379 | language/japanese/jlreq-deluxe.zip 2021/03/13 | 1134592 | support/gregoriotex/fonts/truetype/greciliae-op.ttf -2021/03/13 | 112252 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma +2021/03/13 | 11261 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nc-88x31.eps 2021/03/13 | 112209 | systems/win32/miktex/tm/packages/miktex-gd-bin-x64-2.9.tar.lzma 2021/03/13 | 1105828 | support/gregoriotex/fonts/truetype/greciliae-op-hole.ttf 2021/03/13 | 1105828 | support/gregoriotex/fonts/truetype/greciliae-hole.ttf 2021/03/13 | 1096844 | support/gregoriotex/fonts/truetype/greciliae.ttf -2021/03/13 | 109274 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma +2021/03/13 | 10917 | macros/latex/contrib/doclicense/images/doclicense-CC-by-unofficial-mr-88x31.eps 2021/03/13 | 108984 | systems/win32/miktex/tm/packages/miktex-jpeg-bin-x64-2.9.tar.lzma -2021/03/13 | 1078877 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma 2021/03/13 | 1073075 | systems/win32/miktex/tm/packages/miktex-asymptote-bin-x64-2.9.tar.lzma 2021/03/13 | 1070662 | support/gregoriotex/fonts/sources/gresgmodern.sfd 2021/03/13 | 104987 | systems/win32/miktex/tm/packages/miktex-texware-bin-x64-2.9.tar.lzma -2021/03/13 | 104626 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma 2021/03/13 | 103377 | systems/win32/miktex/tm/packages/miktex-lua53-bin-x64-2.9.tar.lzma -2021/03/13 | 103322 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma 2021/03/13 | 103215 | systems/win32/miktex/tm/packages/miktex-mfware-bin-x64-2.9.tar.lzma 2021/03/13 | 10219616 | systems/texlive/tlnet/archive/reledmac.doc.r58312.tar.xz 2021/03/13 | 10198 | support/gregoriotex/fonts/sources/stemsschemas.py -2021/03/13 | 101763 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma -2021/03/13 | 10096 | systems/texlive/tlnet/archive/easybook.r58307.tar.xz -2021/03/12 | 99961360 | systems/win32/w32tex/TLW64/tl-win64.zip +2021/03/13 | 10011 | macros/latex/contrib/doclicense/images/doclicense-CC-by-nd-88x31.eps 2021/03/12 | 9990 | macros/latex/contrib/thuthesis/ref/refs.bib 2021/03/12 | 845 | macros/latex/contrib/thuthesis/thuthesis-numeric.bbx 2021/03/12 | 84537 | macros/latex/contrib/l3packages/xparse-2018-04-12.sty @@ -502,7 +830,6 @@ 2021/03/12 | 82402 | graphics/pgf/contrib/nl-interval/nl-interval.pdf 2021/03/12 | 811112 | systems/win32/w32tex/win64/aleph-w64.tar.xz 2021/03/12 | 80141 | macros/latex/contrib/l3packages/xparse-generic.tex -2021/03/12 | 799655 | systems/win32/w32tex/ChangeLog 2021/03/12 | 793 | graphics/pgf/contrib/nl-interval/README.txt 2021/03/12 | 778 | macros/latex/contrib/thuthesis/thuthesis-bachelor.bbx 2021/03/12 | 7476 | macros/latex/contrib/mindflow/mindflow.dtx @@ -557,7 +884,6 @@ 2021/03/12 | 22119 | graphics/pstricks/contrib/pst-ode/pst-ode-doc.tex 2021/03/12 | 2195433 | install/macros/latex/contrib/l3packages.tds.zip 2021/03/12 | 21915660 | systems/win32/w32tex/pdftex-w32.tar.xz -2021/03/12 | 218848 | systems/texlive/tlnet/archive/texlive-scripts.doc.r58272.tar.xz 2021/03/12 | 2176228 | macros/latex/contrib/l3packages.zip 2021/03/12 | 2024 | macros/latex/contrib/thuthesis/Makefile 2021/03/12 | 196998 | macros/latex/contrib/thuthesis/thuthesis.dtx @@ -590,7 +916,6 @@ 2021/03/12 | 1381 | language/japanese/jlreq-deluxe/README.md 2021/03/12 | 1350 | macros/latex/contrib/srdp-mathematik/README.txt 2021/03/12 | 132 | macros/latex/contrib/thuthesis/thuthesis-author-year.cbx -2021/03/12 | 132316 | systems/texlive/tlnet/archive/texlive-scripts.r58272.tar.xz 2021/03/12 | 131897 | graphics/pstricks/contrib/pst-ode/pst-ode-doc.pdf 2021/03/12 | 1306 | macros/latex/contrib/l3packages/xfrac.ins 2021/03/12 | 128767 | install/graphics/pstricks/contrib/pst-ode.tds.zip @@ -622,11 +947,9 @@ 2021/03/11 | 722 | macros/latex/contrib/mindflow/README.md 2021/03/11 | 5480 | systems/texlive/tlnet/archive/tokcycle.r58262.tar.xz 2021/03/11 | 5225 | macros/latex/contrib/suppose/suppose.sty -2021/03/11 | 4190 | macros/latex/contrib/easybook/doc/chapter1.tex 2021/03/11 | 4016 | macros/luatex/generic/luamplib/test-luamplib-latex.tex 2021/03/11 | 3872 | macros/luatex/generic/luamplib/test-luamplib-plain.tex 2021/03/11 | 3808 | language/japanese/jlreq-deluxe/jlreq-deluxe.sty -2021/03/11 | 34016060 | systems/win32/w32tex/ltxpkgs.tar.xz 2021/03/11 | 306375 | macros/unicodetex/latex/colorist.zip 2021/03/11 | 29014 | macros/unicodetex/latex/colorist/colorist.dtx 2021/03/11 | 2844 | systems/texlive/tlnet/archive/newverbs.r58259.tar.xz @@ -641,9 +964,6 @@ 2021/03/11 | 1996 | macros/luatex/generic/luamplib/README 2021/03/11 | 196753 | install/macros/luatex/generic/luamplib.tds.zip 2021/03/11 | 1912 | systems/texlive/tlnet/archive/collection-fontsextra.r58263.tar.xz -2021/03/11 | 18850500 | systems/win32/w32tex/luatex-exp-w32.tar.xz -2021/03/11 | 18840084 | systems/win32/w32tex/luatex-dev-w32.tar.xz -2021/03/11 | 18838212 | systems/win32/w32tex/luatex-w32.tar.xz 2021/03/11 | 182464 | macros/luatex/generic/luamplib.zip 2021/03/11 | 168506 | macros/latex/contrib/suppose/suppose.pdf 2021/03/11 | 166672 | macros/unicodetex/latex/colorist/colorist-doc-cn.pdf @@ -809,7 +1129,6 @@ 2021/03/09 | 134195 | info/knuth-pdf/mfware/gftype-changes.pdf 2021/03/09 | 1329449 | info/knuth-pdf/bibtex/bibtex.pdf 2021/03/09 | 13080 | language/korean/kotex-oblivoir/tex/memhangul-x/memhangul-x.sty -2021/03/09 | 124091060 | macros/context/latest/cont-tmf.zip 2021/03/09 | 122777 | info/knuth-pdf/tie/tie-changes.pdf 2021/03/09 | 121307 | info/knuth-pdf/other/pktogf-changes.pdf 2021/03/09 | 1209188 | info/knuth-pdf/mf/mf-changes.pdf @@ -962,7 +1281,6 @@ 2021/03/08 | 1328 | fonts/aesupp/map/aesupp.map 2021/03/08 | 13040 | fonts/aesupp/tfm/ec-aebkri.tfm 2021/03/08 | 12948 | fonts/aesupp/tfm/rm-aebkri.tfm -2021/03/08 | 129448096 | systems/win32/w32tex/web2c-lib.tar.xz 2021/03/08 | 12832 | fonts/aesupp/tfm/ec-aebkbi.tfm 2021/03/08 | 12732 | fonts/aesupp/tfm/rm-aebkbi.tfm 2021/03/08 | 125737 | systems/win32/miktex/tm/packages/ut-thesis.tar.lzma @@ -977,1230 +1295,3 @@ 2021/03/08 | 116928 | systems/texlive/tlnet/archive/ut-thesis.doc.r58216.tar.xz 2021/03/08 | 11624 | fonts/aesupp/tfm/rm-aeplri.tfm 2021/03/08 | 102984 | systems/texlive/tlnet/archive/arara.source.r58216.tar.xz -2021/03/07 | 9896 | fonts/aesupp/tfm/aebkri.tfm -2021/03/07 | 98329 | graphics/mcf2graph/mcf2graph.mf -2021/03/07 | 9668 | fonts/aesupp/tfm/aebkbi.tfm -2021/03/07 | 9584 | fonts/aesupp/tfm/aecsbi.tfm -2021/03/07 | 9580 | fonts/aesupp/tfm/aeplbi.tfm -2021/03/07 | 9260 | fonts/aesupp/tfm/aecsri.tfm -2021/03/07 | 911732 | systems/texlive/tlnet/archive/tex4ht.r58182.tar.xz -2021/03/07 | 873009 | macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdf -2021/03/07 | 862 | info/dtk-bibliography/dtk-bibliography.tex -2021/03/07 | 800972 | systems/texlive/tlnet/archive/widows-and-orphans.doc.r58173.tar.xz -2021/03/07 | 7719 | macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty -2021/03/07 | 74868 | fonts/aesupp/opentype/aemmono10-italic.otf -2021/03/07 | 723664 | systems/texlive/tlnet/archive/pxrubrica.doc.r58177.tar.xz -2021/03/07 | 7202506 | macros/latex/contrib/pdfmanagement-testphase.zip -2021/03/07 | 656456 | macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdf -2021/03/07 | 654 | info/dtk-bibliography/README.md -2021/03/07 | 649554 | macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdf -2021/03/07 | 6044 | language/japanese/jlreq-deluxe/vf/jlreq--expmgothrn-v.vf -2021/03/07 | 6044 | language/japanese/jlreq-deluxe/vf/jlreq--expmgothrn-h.vf -2021/03/07 | 6044 | language/japanese/jlreq-deluxe/vf/jlreq--expgothrn-v.vf -2021/03/07 | 6044 | language/japanese/jlreq-deluxe/vf/jlreq--expgothrn-h.vf -2021/03/07 | 6044 | language/japanese/jlreq-deluxe/vf/jlreq--expgothebn-v.vf -2021/03/07 | 6044 | language/japanese/jlreq-deluxe/vf/jlreq--expgothebn-h.vf -2021/03/07 | 6044 | language/japanese/jlreq-deluxe/vf/jlreq--expgothbn-v.vf -2021/03/07 | 6044 | language/japanese/jlreq-deluxe/vf/jlreq--expgothbn-h.vf -2021/03/07 | 6044 | language/japanese/jlreq-deluxe/vf/bjlreq--expmgothrn-v.vf -2021/03/07 | 6044 | language/japanese/jlreq-deluxe/vf/bjlreq--expmgothrn-h.vf -2021/03/07 | 6044 | language/japanese/jlreq-deluxe/vf/bjlreq--expgothrn-v.vf -2021/03/07 | 6044 | language/japanese/jlreq-deluxe/vf/bjlreq--expgothrn-h.vf -2021/03/07 | 6044 | language/japanese/jlreq-deluxe/vf/bjlreq--expgothebn-v.vf -2021/03/07 | 6044 | language/japanese/jlreq-deluxe/vf/bjlreq--expgothebn-h.vf -2021/03/07 | 6044 | language/japanese/jlreq-deluxe/vf/bjlreq--expgothbn-v.vf -2021/03/07 | 6044 | language/japanese/jlreq-deluxe/vf/bjlreq--expgothbn-h.vf -2021/03/07 | 6040 | language/japanese/jlreq-deluxe/vf/jlreq--expminrn-v.vf -2021/03/07 | 6040 | language/japanese/jlreq-deluxe/vf/jlreq--expminrn-h.vf -2021/03/07 | 6040 | language/japanese/jlreq-deluxe/vf/jlreq--expminln-v.vf -2021/03/07 | 6040 | language/japanese/jlreq-deluxe/vf/jlreq--expminln-h.vf -2021/03/07 | 6040 | language/japanese/jlreq-deluxe/vf/jlreq--expminbn-v.vf -2021/03/07 | 6040 | language/japanese/jlreq-deluxe/vf/jlreq--expminbn-h.vf -2021/03/07 | 6040 | language/japanese/jlreq-deluxe/vf/bjlreq--expminrn-v.vf -2021/03/07 | 6040 | language/japanese/jlreq-deluxe/vf/bjlreq--expminrn-h.vf -2021/03/07 | 6040 | language/japanese/jlreq-deluxe/vf/bjlreq--expminln-v.vf -2021/03/07 | 6040 | language/japanese/jlreq-deluxe/vf/bjlreq--expminln-h.vf -2021/03/07 | 6040 | language/japanese/jlreq-deluxe/vf/bjlreq--expminbn-v.vf -2021/03/07 | 6040 | language/japanese/jlreq-deluxe/vf/bjlreq--expminbn-h.vf -2021/03/07 | 582 | macros/latex/contrib/pdfmanagement-testphase/transparent-ltx.sty -2021/03/07 | 5824 | language/japanese/jlreq-deluxe/vf/zjlreq--expmgothrn-v.vf -2021/03/07 | 5824 | language/japanese/jlreq-deluxe/vf/zjlreq--expmgothrn-h.vf -2021/03/07 | 5824 | language/japanese/jlreq-deluxe/vf/zjlreq--expgothrn-v.vf -2021/03/07 | 5824 | language/japanese/jlreq-deluxe/vf/zjlreq--expgothrn-h.vf -2021/03/07 | 5824 | language/japanese/jlreq-deluxe/vf/zjlreq--expgothebn-v.vf -2021/03/07 | 5824 | language/japanese/jlreq-deluxe/vf/zjlreq--expgothebn-h.vf -2021/03/07 | 5824 | language/japanese/jlreq-deluxe/vf/zjlreq--expgothbn-v.vf -2021/03/07 | 5824 | language/japanese/jlreq-deluxe/vf/zjlreq--expgothbn-h.vf -2021/03/07 | 5824 | language/japanese/jlreq-deluxe/vf/bzjlreq--expmgothrn-v.vf -2021/03/07 | 5824 | language/japanese/jlreq-deluxe/vf/bzjlreq--expmgothrn-h.vf -2021/03/07 | 5824 | language/japanese/jlreq-deluxe/vf/bzjlreq--expgothrn-v.vf -2021/03/07 | 5824 | language/japanese/jlreq-deluxe/vf/bzjlreq--expgothrn-h.vf -2021/03/07 | 5824 | language/japanese/jlreq-deluxe/vf/bzjlreq--expgothebn-v.vf -2021/03/07 | 5824 | language/japanese/jlreq-deluxe/vf/bzjlreq--expgothebn-h.vf -2021/03/07 | 5824 | language/japanese/jlreq-deluxe/vf/bzjlreq--expgothbn-v.vf -2021/03/07 | 5824 | language/japanese/jlreq-deluxe/vf/bzjlreq--expgothbn-h.vf -2021/03/07 | 5820 | language/japanese/jlreq-deluxe/vf/zjlreq--expminrn-v.vf -2021/03/07 | 5820 | language/japanese/jlreq-deluxe/vf/zjlreq--expminrn-h.vf -2021/03/07 | 5820 | language/japanese/jlreq-deluxe/vf/zjlreq--expminln-v.vf -2021/03/07 | 5820 | language/japanese/jlreq-deluxe/vf/zjlreq--expminln-h.vf -2021/03/07 | 5820 | language/japanese/jlreq-deluxe/vf/zjlreq--expminbn-v.vf -2021/03/07 | 5820 | language/japanese/jlreq-deluxe/vf/zjlreq--expminbn-h.vf -2021/03/07 | 5820 | language/japanese/jlreq-deluxe/vf/bzjlreq--expminrn-v.vf -2021/03/07 | 5820 | language/japanese/jlreq-deluxe/vf/bzjlreq--expminrn-h.vf -2021/03/07 | 5820 | language/japanese/jlreq-deluxe/vf/bzjlreq--expminln-v.vf -2021/03/07 | 5820 | language/japanese/jlreq-deluxe/vf/bzjlreq--expminln-h.vf -2021/03/07 | 5820 | language/japanese/jlreq-deluxe/vf/bzjlreq--expminbn-v.vf -2021/03/07 | 5820 | language/japanese/jlreq-deluxe/vf/bzjlreq--expminbn-h.vf -2021/03/07 | 565792 | macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdf -2021/03/07 | 565696 | macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdf -2021/03/07 | 556128 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdf -2021/03/07 | 550289 | macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdf -2021/03/07 | 547500 | macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdf -2021/03/07 | 536 | language/japanese/jlreq-deluxe/vf/jlreq--upnmlmgothrn-h.vf -2021/03/07 | 536 | language/japanese/jlreq-deluxe/vf/jlreq--upnmlmgothr-h.vf -2021/03/07 | 536 | language/japanese/jlreq-deluxe/vf/jlreq--upnmlgothebn-h.vf -2021/03/07 | 536 | language/japanese/jlreq-deluxe/vf/bjlreq--upnmlmgothrn-h.vf -2021/03/07 | 536 | language/japanese/jlreq-deluxe/vf/bjlreq--upnmlmgothr-h.vf -2021/03/07 | 536 | language/japanese/jlreq-deluxe/vf/bjlreq--upnmlgothebn-h.vf -2021/03/07 | 532 | language/japanese/jlreq-deluxe/vf/jlreq--upnmlminrn-h.vf -2021/03/07 | 532 | language/japanese/jlreq-deluxe/vf/jlreq--upnmlminr-h.vf -2021/03/07 | 532 | language/japanese/jlreq-deluxe/vf/jlreq--upnmlminln-h.vf -2021/03/07 | 532 | language/japanese/jlreq-deluxe/vf/jlreq--upnmlminl-h.vf -2021/03/07 | 532 | language/japanese/jlreq-deluxe/vf/jlreq--upnmlminbn-h.vf -2021/03/07 | 532 | language/japanese/jlreq-deluxe/vf/jlreq--upnmlminb-h.vf -2021/03/07 | 532 | language/japanese/jlreq-deluxe/vf/jlreq--upnmlgothrn-h.vf -2021/03/07 | 532 | language/japanese/jlreq-deluxe/vf/jlreq--upnmlgothr-h.vf -2021/03/07 | 532 | language/japanese/jlreq-deluxe/vf/jlreq--upnmlgotheb-h.vf -2021/03/07 | 532 | language/japanese/jlreq-deluxe/vf/jlreq--upnmlgothbn-h.vf -2021/03/07 | 532 | language/japanese/jlreq-deluxe/vf/jlreq--upnmlgothb-h.vf -2021/03/07 | 532 | language/japanese/jlreq-deluxe/vf/bjlreq--upnmlminrn-h.vf -2021/03/07 | 532 | language/japanese/jlreq-deluxe/vf/bjlreq--upnmlminr-h.vf -2021/03/07 | 532 | language/japanese/jlreq-deluxe/vf/bjlreq--upnmlminln-h.vf -2021/03/07 | 532 | language/japanese/jlreq-deluxe/vf/bjlreq--upnmlminl-h.vf -2021/03/07 | 532 | language/japanese/jlreq-deluxe/vf/bjlreq--upnmlminbn-h.vf -2021/03/07 | 532 | language/japanese/jlreq-deluxe/vf/bjlreq--upnmlminb-h.vf -2021/03/07 | 532 | language/japanese/jlreq-deluxe/vf/bjlreq--upnmlgothrn-h.vf -2021/03/07 | 532 | language/japanese/jlreq-deluxe/vf/bjlreq--upnmlgothr-h.vf -2021/03/07 | 532 | language/japanese/jlreq-deluxe/vf/bjlreq--upnmlgotheb-h.vf -2021/03/07 | 532 | language/japanese/jlreq-deluxe/vf/bjlreq--upnmlgothbn-h.vf -2021/03/07 | 532 | language/japanese/jlreq-deluxe/vf/bjlreq--upnmlgothb-h.vf -2021/03/07 | 53138 | graphics/mcf2graph/mcf_manual.tex -2021/03/07 | 523596 | macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdf -2021/03/07 | 520 | info/dtk-bibliography/dtk-authoryear.dbx -2021/03/07 | 515714 | info/dtk-bibliography/dtk-bibliography.bib -2021/03/07 | 514001 | macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdf -2021/03/07 | 472 | language/japanese/jlreq-deluxe/vf/jlreq--upnmlminrn-v.vf -2021/03/07 | 472 | language/japanese/jlreq-deluxe/vf/jlreq--upnmlminln-v.vf -2021/03/07 | 472 | language/japanese/jlreq-deluxe/vf/jlreq--upnmlminbn-v.vf -2021/03/07 | 472 | language/japanese/jlreq-deluxe/vf/jlreq--upnmlmgothr-v.vf -2021/03/07 | 472 | language/japanese/jlreq-deluxe/vf/jlreq--upnmlmgothrn-v.vf -2021/03/07 | 472 | language/japanese/jlreq-deluxe/vf/jlreq--upnmlgothr-v.vf -2021/03/07 | 472 | language/japanese/jlreq-deluxe/vf/jlreq--upnmlgothrn-v.vf -2021/03/07 | 472 | language/japanese/jlreq-deluxe/vf/jlreq--upnmlgotheb-v.vf -2021/03/07 | 472 | language/japanese/jlreq-deluxe/vf/jlreq--upnmlgothebn-v.vf -2021/03/07 | 472 | language/japanese/jlreq-deluxe/vf/jlreq--upnmlgothb-v.vf -2021/03/07 | 472 | language/japanese/jlreq-deluxe/vf/jlreq--upnmlgothbn-v.vf -2021/03/07 | 472 | language/japanese/jlreq-deluxe/vf/bjlreq--upnmlminrn-v.vf -2021/03/07 | 472 | language/japanese/jlreq-deluxe/vf/bjlreq--upnmlminln-v.vf -2021/03/07 | 472 | language/japanese/jlreq-deluxe/vf/bjlreq--upnmlminbn-v.vf -2021/03/07 | 472 | language/japanese/jlreq-deluxe/vf/bjlreq--upnmlmgothr-v.vf -2021/03/07 | 472 | language/japanese/jlreq-deluxe/vf/bjlreq--upnmlmgothrn-v.vf -2021/03/07 | 472 | language/japanese/jlreq-deluxe/vf/bjlreq--upnmlgothr-v.vf -2021/03/07 | 472 | language/japanese/jlreq-deluxe/vf/bjlreq--upnmlgothrn-v.vf -2021/03/07 | 472 | language/japanese/jlreq-deluxe/vf/bjlreq--upnmlgotheb-v.vf -2021/03/07 | 472 | language/japanese/jlreq-deluxe/vf/bjlreq--upnmlgothebn-v.vf -2021/03/07 | 472 | language/japanese/jlreq-deluxe/vf/bjlreq--upnmlgothb-v.vf -2021/03/07 | 472 | language/japanese/jlreq-deluxe/vf/bjlreq--upnmlgothbn-v.vf -2021/03/07 | 469420 | systems/texlive/tlnet/archive/biblatex-trad.doc.r58176.tar.xz -2021/03/07 | 468 | language/japanese/jlreq-deluxe/vf/jlreq--upnmlminr-v.vf -2021/03/07 | 468 | language/japanese/jlreq-deluxe/vf/jlreq--upnmlminl-v.vf -2021/03/07 | 468 | language/japanese/jlreq-deluxe/vf/jlreq--upnmlminb-v.vf -2021/03/07 | 468 | language/japanese/jlreq-deluxe/vf/bjlreq--upnmlminr-v.vf -2021/03/07 | 468 | language/japanese/jlreq-deluxe/vf/bjlreq--upnmlminl-v.vf -2021/03/07 | 468 | language/japanese/jlreq-deluxe/vf/bjlreq--upnmlminb-v.vf -2021/03/07 | 444916 | macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdf -2021/03/07 | 435022 | macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdf -2021/03/07 | 422564 | info/dtk-bibliography.zip -2021/03/07 | 419964 | macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdf -2021/03/07 | 4196 | systems/texlive/tlnet/archive/biblatex-trad.r58176.tar.xz -2021/03/07 | 41524 | systems/texlive/tlnet/archive/tuda-ci.r58174.tar.xz -2021/03/07 | 41161 | graphics/mcf2graph/mcf_man_soc.mf -2021/03/07 | 3922 | graphics/mcf2graph/README -2021/03/07 | 3901 | macros/latex/contrib/pdfmanagement-testphase/hyperxmp-patches-tmp-ltx.sty -2021/03/07 | 3884 | language/japanese/jlreq-deluxe/vf/jlreq--uprubymgothr-h.vf -2021/03/07 | 3884 | language/japanese/jlreq-deluxe/vf/jlreq--uprubygotheb-h.vf -2021/03/07 | 3884 | language/japanese/jlreq-deluxe/vf/jlreq--upexpmgothrn-h.vf -2021/03/07 | 3884 | language/japanese/jlreq-deluxe/vf/jlreq--upexpmgothr-h.vf -2021/03/07 | 3884 | language/japanese/jlreq-deluxe/vf/jlreq--upexpgothrn-h.vf -2021/03/07 | 3884 | language/japanese/jlreq-deluxe/vf/jlreq--upexpgothebn-h.vf -2021/03/07 | 3884 | language/japanese/jlreq-deluxe/vf/jlreq--upexpgotheb-h.vf -2021/03/07 | 3884 | language/japanese/jlreq-deluxe/vf/jlreq--upexpgothbn-h.vf -2021/03/07 | 3884 | language/japanese/jlreq-deluxe/vf/bjlreq--uprubymgothr-h.vf -2021/03/07 | 3884 | language/japanese/jlreq-deluxe/vf/bjlreq--uprubygotheb-h.vf -2021/03/07 | 3884 | language/japanese/jlreq-deluxe/vf/bjlreq--upexpmgothrn-h.vf -2021/03/07 | 3884 | language/japanese/jlreq-deluxe/vf/bjlreq--upexpmgothr-h.vf -2021/03/07 | 3884 | language/japanese/jlreq-deluxe/vf/bjlreq--upexpgothrn-h.vf -2021/03/07 | 3884 | language/japanese/jlreq-deluxe/vf/bjlreq--upexpgothebn-h.vf -2021/03/07 | 3884 | language/japanese/jlreq-deluxe/vf/bjlreq--upexpgotheb-h.vf -2021/03/07 | 3884 | language/japanese/jlreq-deluxe/vf/bjlreq--upexpgothbn-h.vf -2021/03/07 | 3880 | language/japanese/jlreq-deluxe/vf/jlreq--uprubyminr-h.vf -2021/03/07 | 3880 | language/japanese/jlreq-deluxe/vf/jlreq--uprubyminl-h.vf -2021/03/07 | 3880 | language/japanese/jlreq-deluxe/vf/jlreq--uprubyminb-h.vf -2021/03/07 | 3880 | language/japanese/jlreq-deluxe/vf/jlreq--uprubygothr-h.vf -2021/03/07 | 3880 | language/japanese/jlreq-deluxe/vf/jlreq--uprubygothb-h.vf -2021/03/07 | 3880 | language/japanese/jlreq-deluxe/vf/jlreq--upexpminrn-h.vf -2021/03/07 | 3880 | language/japanese/jlreq-deluxe/vf/jlreq--upexpminr-h.vf -2021/03/07 | 3880 | language/japanese/jlreq-deluxe/vf/jlreq--upexpminln-h.vf -2021/03/07 | 3880 | language/japanese/jlreq-deluxe/vf/jlreq--upexpminl-h.vf -2021/03/07 | 3880 | language/japanese/jlreq-deluxe/vf/jlreq--upexpminbn-h.vf -2021/03/07 | 3880 | language/japanese/jlreq-deluxe/vf/jlreq--upexpminb-h.vf -2021/03/07 | 3880 | language/japanese/jlreq-deluxe/vf/jlreq--upexpgothr-h.vf -2021/03/07 | 3880 | language/japanese/jlreq-deluxe/vf/jlreq--upexpgothb-h.vf -2021/03/07 | 3880 | language/japanese/jlreq-deluxe/vf/bjlreq--uprubyminr-h.vf -2021/03/07 | 3880 | language/japanese/jlreq-deluxe/vf/bjlreq--uprubyminl-h.vf -2021/03/07 | 3880 | language/japanese/jlreq-deluxe/vf/bjlreq--uprubyminb-h.vf -2021/03/07 | 3880 | language/japanese/jlreq-deluxe/vf/bjlreq--uprubygothr-h.vf -2021/03/07 | 3880 | language/japanese/jlreq-deluxe/vf/bjlreq--uprubygothb-h.vf -2021/03/07 | 3880 | language/japanese/jlreq-deluxe/vf/bjlreq--upexpminrn-h.vf -2021/03/07 | 3880 | language/japanese/jlreq-deluxe/vf/bjlreq--upexpminr-h.vf -2021/03/07 | 3880 | language/japanese/jlreq-deluxe/vf/bjlreq--upexpminln-h.vf -2021/03/07 | 3880 | language/japanese/jlreq-deluxe/vf/bjlreq--upexpminl-h.vf -2021/03/07 | 3880 | language/japanese/jlreq-deluxe/vf/bjlreq--upexpminbn-h.vf -2021/03/07 | 3880 | language/japanese/jlreq-deluxe/vf/bjlreq--upexpminb-h.vf -2021/03/07 | 3880 | language/japanese/jlreq-deluxe/vf/bjlreq--upexpgothr-h.vf -2021/03/07 | 3880 | language/japanese/jlreq-deluxe/vf/bjlreq--upexpgothb-h.vf -2021/03/07 | 3848 | language/japanese/jlreq-deluxe/vf/jlreq--uprubymgothr-v.vf -2021/03/07 | 3848 | language/japanese/jlreq-deluxe/vf/jlreq--uprubygotheb-v.vf -2021/03/07 | 3848 | language/japanese/jlreq-deluxe/vf/jlreq--upexpmgothr-v.vf -2021/03/07 | 3848 | language/japanese/jlreq-deluxe/vf/jlreq--upexpmgothrn-v.vf -2021/03/07 | 3848 | language/japanese/jlreq-deluxe/vf/jlreq--upexpgothrn-v.vf -2021/03/07 | 3848 | language/japanese/jlreq-deluxe/vf/jlreq--upexpgotheb-v.vf -2021/03/07 | 3848 | language/japanese/jlreq-deluxe/vf/jlreq--upexpgothebn-v.vf -2021/03/07 | 3848 | language/japanese/jlreq-deluxe/vf/jlreq--upexpgothbn-v.vf -2021/03/07 | 3848 | language/japanese/jlreq-deluxe/vf/bjlreq--uprubymgothr-v.vf -2021/03/07 | 3848 | language/japanese/jlreq-deluxe/vf/bjlreq--uprubygotheb-v.vf -2021/03/07 | 3848 | language/japanese/jlreq-deluxe/vf/bjlreq--upexpmgothr-v.vf -2021/03/07 | 3848 | language/japanese/jlreq-deluxe/vf/bjlreq--upexpmgothrn-v.vf -2021/03/07 | 3848 | language/japanese/jlreq-deluxe/vf/bjlreq--upexpgothrn-v.vf -2021/03/07 | 3848 | language/japanese/jlreq-deluxe/vf/bjlreq--upexpgotheb-v.vf -2021/03/07 | 3848 | language/japanese/jlreq-deluxe/vf/bjlreq--upexpgothebn-v.vf -2021/03/07 | 3848 | language/japanese/jlreq-deluxe/vf/bjlreq--upexpgothbn-v.vf -2021/03/07 | 3844 | language/japanese/jlreq-deluxe/vf/jlreq--uprubyminr-v.vf -2021/03/07 | 3844 | language/japanese/jlreq-deluxe/vf/jlreq--uprubyminl-v.vf -2021/03/07 | 3844 | language/japanese/jlreq-deluxe/vf/jlreq--uprubyminb-v.vf -2021/03/07 | 3844 | language/japanese/jlreq-deluxe/vf/jlreq--uprubygothr-v.vf -2021/03/07 | 3844 | language/japanese/jlreq-deluxe/vf/jlreq--uprubygothb-v.vf -2021/03/07 | 3844 | language/japanese/jlreq-deluxe/vf/jlreq--upexpminr-v.vf -2021/03/07 | 3844 | language/japanese/jlreq-deluxe/vf/jlreq--upexpminrn-v.vf -2021/03/07 | 3844 | language/japanese/jlreq-deluxe/vf/jlreq--upexpminl-v.vf -2021/03/07 | 3844 | language/japanese/jlreq-deluxe/vf/jlreq--upexpminln-v.vf -2021/03/07 | 3844 | language/japanese/jlreq-deluxe/vf/jlreq--upexpminb-v.vf -2021/03/07 | 3844 | language/japanese/jlreq-deluxe/vf/jlreq--upexpminbn-v.vf -2021/03/07 | 3844 | language/japanese/jlreq-deluxe/vf/jlreq--upexpgothr-v.vf -2021/03/07 | 3844 | language/japanese/jlreq-deluxe/vf/jlreq--upexpgothb-v.vf -2021/03/07 | 3844 | language/japanese/jlreq-deluxe/vf/bjlreq--uprubyminr-v.vf -2021/03/07 | 3844 | language/japanese/jlreq-deluxe/vf/bjlreq--uprubyminl-v.vf -2021/03/07 | 3844 | language/japanese/jlreq-deluxe/vf/bjlreq--uprubyminb-v.vf -2021/03/07 | 3844 | language/japanese/jlreq-deluxe/vf/bjlreq--uprubygothr-v.vf -2021/03/07 | 3844 | language/japanese/jlreq-deluxe/vf/bjlreq--uprubygothb-v.vf -2021/03/07 | 3844 | language/japanese/jlreq-deluxe/vf/bjlreq--upexpminr-v.vf -2021/03/07 | 3844 | language/japanese/jlreq-deluxe/vf/bjlreq--upexpminrn-v.vf -2021/03/07 | 3844 | language/japanese/jlreq-deluxe/vf/bjlreq--upexpminl-v.vf -2021/03/07 | 3844 | language/japanese/jlreq-deluxe/vf/bjlreq--upexpminln-v.vf -2021/03/07 | 3844 | language/japanese/jlreq-deluxe/vf/bjlreq--upexpminb-v.vf -2021/03/07 | 3844 | language/japanese/jlreq-deluxe/vf/bjlreq--upexpminbn-v.vf -2021/03/07 | 3844 | language/japanese/jlreq-deluxe/vf/bjlreq--upexpgothr-v.vf -2021/03/07 | 3844 | language/japanese/jlreq-deluxe/vf/bjlreq--upexpgothb-v.vf -2021/03/07 | 3839944 | systems/win32/w32tex/luajittex-dev-w32.tar.xz -2021/03/07 | 38388 | systems/texlive/tlnet/archive/pxrubrica.source.r58177.tar.xz -2021/03/07 | 3834412 | systems/win32/w32tex/luajittex-w32.tar.xz -2021/03/07 | 3831592 | systems/win32/w32tex/luajittex-exp-w32.tar.xz -2021/03/07 | 365686 | info/dtk-bibliography/dtk-bibliography.pdf -2021/03/07 | 3604 | language/japanese/jlreq-deluxe/vf/zjlreq--uprubymgothr-h.vf -2021/03/07 | 3604 | language/japanese/jlreq-deluxe/vf/zjlreq--uprubygothr-h.vf -2021/03/07 | 3604 | language/japanese/jlreq-deluxe/vf/zjlreq--uprubygotheb-h.vf -2021/03/07 | 3604 | language/japanese/jlreq-deluxe/vf/zjlreq--uprubygothb-h.vf -2021/03/07 | 3604 | language/japanese/jlreq-deluxe/vf/zjlreq--upexpminrn-h.vf -2021/03/07 | 3604 | language/japanese/jlreq-deluxe/vf/zjlreq--upexpminln-h.vf -2021/03/07 | 3604 | language/japanese/jlreq-deluxe/vf/zjlreq--upexpminbn-h.vf -2021/03/07 | 3604 | language/japanese/jlreq-deluxe/vf/zjlreq--upexpmgothrn-h.vf -2021/03/07 | 3604 | language/japanese/jlreq-deluxe/vf/zjlreq--upexpmgothr-h.vf -2021/03/07 | 3604 | language/japanese/jlreq-deluxe/vf/zjlreq--upexpgothrn-h.vf -2021/03/07 | 3604 | language/japanese/jlreq-deluxe/vf/zjlreq--upexpgothr-h.vf -2021/03/07 | 3604 | language/japanese/jlreq-deluxe/vf/zjlreq--upexpgothebn-h.vf -2021/03/07 | 3604 | language/japanese/jlreq-deluxe/vf/zjlreq--upexpgotheb-h.vf -2021/03/07 | 3604 | language/japanese/jlreq-deluxe/vf/zjlreq--upexpgothbn-h.vf -2021/03/07 | 3604 | language/japanese/jlreq-deluxe/vf/zjlreq--upexpgothb-h.vf -2021/03/07 | 3604 | language/japanese/jlreq-deluxe/vf/bzjlreq--uprubymgothr-h.vf -2021/03/07 | 3604 | language/japanese/jlreq-deluxe/vf/bzjlreq--uprubygothr-h.vf -2021/03/07 | 3604 | language/japanese/jlreq-deluxe/vf/bzjlreq--uprubygotheb-h.vf -2021/03/07 | 3604 | language/japanese/jlreq-deluxe/vf/bzjlreq--uprubygothb-h.vf -2021/03/07 | 3604 | language/japanese/jlreq-deluxe/vf/bzjlreq--upexpminrn-h.vf -2021/03/07 | 3604 | language/japanese/jlreq-deluxe/vf/bzjlreq--upexpminln-h.vf -2021/03/07 | 3604 | language/japanese/jlreq-deluxe/vf/bzjlreq--upexpminbn-h.vf -2021/03/07 | 3604 | language/japanese/jlreq-deluxe/vf/bzjlreq--upexpmgothrn-h.vf -2021/03/07 | 3604 | language/japanese/jlreq-deluxe/vf/bzjlreq--upexpmgothr-h.vf -2021/03/07 | 3604 | language/japanese/jlreq-deluxe/vf/bzjlreq--upexpgothrn-h.vf -2021/03/07 | 3604 | language/japanese/jlreq-deluxe/vf/bzjlreq--upexpgothr-h.vf -2021/03/07 | 3604 | language/japanese/jlreq-deluxe/vf/bzjlreq--upexpgothebn-h.vf -2021/03/07 | 3604 | language/japanese/jlreq-deluxe/vf/bzjlreq--upexpgotheb-h.vf -2021/03/07 | 3604 | language/japanese/jlreq-deluxe/vf/bzjlreq--upexpgothbn-h.vf -2021/03/07 | 3604 | language/japanese/jlreq-deluxe/vf/bzjlreq--upexpgothb-h.vf -2021/03/07 | 3600 | language/japanese/jlreq-deluxe/vf/zjlreq--uprubyminr-h.vf -2021/03/07 | 3600 | language/japanese/jlreq-deluxe/vf/zjlreq--uprubyminl-h.vf -2021/03/07 | 3600 | language/japanese/jlreq-deluxe/vf/zjlreq--uprubyminb-h.vf -2021/03/07 | 3600 | language/japanese/jlreq-deluxe/vf/zjlreq--upexpminr-h.vf -2021/03/07 | 3600 | language/japanese/jlreq-deluxe/vf/zjlreq--upexpminl-h.vf -2021/03/07 | 3600 | language/japanese/jlreq-deluxe/vf/zjlreq--upexpminb-h.vf -2021/03/07 | 3600 | language/japanese/jlreq-deluxe/vf/bzjlreq--uprubyminr-h.vf -2021/03/07 | 3600 | language/japanese/jlreq-deluxe/vf/bzjlreq--uprubyminl-h.vf -2021/03/07 | 3600 | language/japanese/jlreq-deluxe/vf/bzjlreq--uprubyminb-h.vf -2021/03/07 | 3600 | language/japanese/jlreq-deluxe/vf/bzjlreq--upexpminr-h.vf -2021/03/07 | 3600 | language/japanese/jlreq-deluxe/vf/bzjlreq--upexpminl-h.vf -2021/03/07 | 3600 | language/japanese/jlreq-deluxe/vf/bzjlreq--upexpminb-h.vf -2021/03/07 | 358984 | macros/latex/contrib/pdfpages.zip -2021/03/07 | 3536 | language/japanese/jlreq-deluxe/vf/zjlreq--uprubymgothr-v.vf -2021/03/07 | 3536 | language/japanese/jlreq-deluxe/vf/zjlreq--uprubygothr-v.vf -2021/03/07 | 3536 | language/japanese/jlreq-deluxe/vf/zjlreq--uprubygotheb-v.vf -2021/03/07 | 3536 | language/japanese/jlreq-deluxe/vf/zjlreq--uprubygothb-v.vf -2021/03/07 | 3536 | language/japanese/jlreq-deluxe/vf/zjlreq--upexpminrn-v.vf -2021/03/07 | 3536 | language/japanese/jlreq-deluxe/vf/zjlreq--upexpminln-v.vf -2021/03/07 | 3536 | language/japanese/jlreq-deluxe/vf/zjlreq--upexpminbn-v.vf -2021/03/07 | 3536 | language/japanese/jlreq-deluxe/vf/zjlreq--upexpmgothr-v.vf -2021/03/07 | 3536 | language/japanese/jlreq-deluxe/vf/zjlreq--upexpmgothrn-v.vf -2021/03/07 | 3536 | language/japanese/jlreq-deluxe/vf/zjlreq--upexpgothr-v.vf -2021/03/07 | 3536 | language/japanese/jlreq-deluxe/vf/zjlreq--upexpgothrn-v.vf -2021/03/07 | 3536 | language/japanese/jlreq-deluxe/vf/zjlreq--upexpgotheb-v.vf -2021/03/07 | 3536 | language/japanese/jlreq-deluxe/vf/zjlreq--upexpgothebn-v.vf -2021/03/07 | 3536 | language/japanese/jlreq-deluxe/vf/zjlreq--upexpgothb-v.vf -2021/03/07 | 3536 | language/japanese/jlreq-deluxe/vf/zjlreq--upexpgothbn-v.vf -2021/03/07 | 3536 | language/japanese/jlreq-deluxe/vf/bzjlreq--uprubymgothr-v.vf -2021/03/07 | 3536 | language/japanese/jlreq-deluxe/vf/bzjlreq--uprubygothr-v.vf -2021/03/07 | 3536 | language/japanese/jlreq-deluxe/vf/bzjlreq--uprubygotheb-v.vf -2021/03/07 | 3536 | language/japanese/jlreq-deluxe/vf/bzjlreq--uprubygothb-v.vf -2021/03/07 | 3536 | language/japanese/jlreq-deluxe/vf/bzjlreq--upexpminrn-v.vf -2021/03/07 | 3536 | language/japanese/jlreq-deluxe/vf/bzjlreq--upexpminln-v.vf -2021/03/07 | 3536 | language/japanese/jlreq-deluxe/vf/bzjlreq--upexpminbn-v.vf -2021/03/07 | 3536 | language/japanese/jlreq-deluxe/vf/bzjlreq--upexpmgothr-v.vf -2021/03/07 | 3536 | language/japanese/jlreq-deluxe/vf/bzjlreq--upexpmgothrn-v.vf -2021/03/07 | 3536 | language/japanese/jlreq-deluxe/vf/bzjlreq--upexpgothr-v.vf -2021/03/07 | 3536 | language/japanese/jlreq-deluxe/vf/bzjlreq--upexpgothrn-v.vf -2021/03/07 | 3536 | language/japanese/jlreq-deluxe/vf/bzjlreq--upexpgotheb-v.vf -2021/03/07 | 3536 | language/japanese/jlreq-deluxe/vf/bzjlreq--upexpgothebn-v.vf -2021/03/07 | 3536 | language/japanese/jlreq-deluxe/vf/bzjlreq--upexpgothb-v.vf -2021/03/07 | 3536 | language/japanese/jlreq-deluxe/vf/bzjlreq--upexpgothbn-v.vf -2021/03/07 | 3532 | language/japanese/jlreq-deluxe/vf/zjlreq--uprubyminr-v.vf -2021/03/07 | 3532 | language/japanese/jlreq-deluxe/vf/zjlreq--uprubyminl-v.vf -2021/03/07 | 3532 | language/japanese/jlreq-deluxe/vf/zjlreq--uprubyminb-v.vf -2021/03/07 | 3532 | language/japanese/jlreq-deluxe/vf/zjlreq--upexpminr-v.vf -2021/03/07 | 3532 | language/japanese/jlreq-deluxe/vf/zjlreq--upexpminl-v.vf -2021/03/07 | 3532 | language/japanese/jlreq-deluxe/vf/zjlreq--upexpminb-v.vf -2021/03/07 | 3532 | language/japanese/jlreq-deluxe/vf/bzjlreq--uprubyminr-v.vf -2021/03/07 | 3532 | language/japanese/jlreq-deluxe/vf/bzjlreq--uprubyminl-v.vf -2021/03/07 | 3532 | language/japanese/jlreq-deluxe/vf/bzjlreq--uprubyminb-v.vf -2021/03/07 | 3532 | language/japanese/jlreq-deluxe/vf/bzjlreq--upexpminr-v.vf -2021/03/07 | 3532 | language/japanese/jlreq-deluxe/vf/bzjlreq--upexpminl-v.vf -2021/03/07 | 3532 | language/japanese/jlreq-deluxe/vf/bzjlreq--upexpminb-v.vf -2021/03/07 | 350539 | graphics/mcf2graph/mcf_manual.pdf -2021/03/07 | 3455312 | systems/win32/w32tex/win64/luajittex-w64.tar.xz -2021/03/07 | 3451788 | systems/win32/w32tex/win64/luajittex-dev-w64.tar.xz -2021/03/07 | 3450956 | systems/win32/w32tex/win64/luajittex-exp-w64.tar.xz -2021/03/07 | 340 | language/japanese/jlreq-deluxe/vf/jlreq--nmlmgothr-v.vf -2021/03/07 | 340 | language/japanese/jlreq-deluxe/vf/jlreq--nmlmgothr-h.vf -2021/03/07 | 340 | language/japanese/jlreq-deluxe/vf/jlreq--nmlgotheb-v.vf -2021/03/07 | 340 | language/japanese/jlreq-deluxe/vf/jlreq--nmlgotheb-h.vf -2021/03/07 | 340 | language/japanese/jlreq-deluxe/vf/bjlreq--nmlmgothr-v.vf -2021/03/07 | 340 | language/japanese/jlreq-deluxe/vf/bjlreq--nmlmgothr-h.vf -2021/03/07 | 340 | language/japanese/jlreq-deluxe/vf/bjlreq--nmlgotheb-v.vf -2021/03/07 | 340 | language/japanese/jlreq-deluxe/vf/bjlreq--nmlgotheb-h.vf -2021/03/07 | 340554 | fonts/aesupp/type1/aeplbi.pfb -2021/03/07 | 336 | language/japanese/jlreq-deluxe/vf/jlreq--nmlminr-v.vf -2021/03/07 | 336 | language/japanese/jlreq-deluxe/vf/jlreq--nmlminr-h.vf -2021/03/07 | 336 | language/japanese/jlreq-deluxe/vf/jlreq--nmlminl-v.vf -2021/03/07 | 336 | language/japanese/jlreq-deluxe/vf/jlreq--nmlminl-h.vf -2021/03/07 | 336 | language/japanese/jlreq-deluxe/vf/jlreq--nmlminb-v.vf -2021/03/07 | 336 | language/japanese/jlreq-deluxe/vf/jlreq--nmlminb-h.vf -2021/03/07 | 336 | language/japanese/jlreq-deluxe/vf/jlreq--nmlgothr-v.vf -2021/03/07 | 336 | language/japanese/jlreq-deluxe/vf/jlreq--nmlgothr-h.vf -2021/03/07 | 336 | language/japanese/jlreq-deluxe/vf/jlreq--nmlgothb-v.vf -2021/03/07 | 336 | language/japanese/jlreq-deluxe/vf/jlreq--nmlgothb-h.vf -2021/03/07 | 336 | language/japanese/jlreq-deluxe/vf/bjlreq--nmlminr-v.vf -2021/03/07 | 336 | language/japanese/jlreq-deluxe/vf/bjlreq--nmlminr-h.vf -2021/03/07 | 336 | language/japanese/jlreq-deluxe/vf/bjlreq--nmlminl-v.vf -2021/03/07 | 336 | language/japanese/jlreq-deluxe/vf/bjlreq--nmlminl-h.vf -2021/03/07 | 336 | language/japanese/jlreq-deluxe/vf/bjlreq--nmlminb-v.vf -2021/03/07 | 336 | language/japanese/jlreq-deluxe/vf/bjlreq--nmlminb-h.vf -2021/03/07 | 336 | language/japanese/jlreq-deluxe/vf/bjlreq--nmlgothr-v.vf -2021/03/07 | 336 | language/japanese/jlreq-deluxe/vf/bjlreq--nmlgothr-h.vf -2021/03/07 | 336 | language/japanese/jlreq-deluxe/vf/bjlreq--nmlgothb-v.vf -2021/03/07 | 336 | language/japanese/jlreq-deluxe/vf/bjlreq--nmlgothb-h.vf -2021/03/07 | 3324 | language/japanese/jlreq-deluxe/vf/jlreq--rubymgothr-v.vf -2021/03/07 | 3324 | language/japanese/jlreq-deluxe/vf/jlreq--rubymgothr-h.vf -2021/03/07 | 3324 | language/japanese/jlreq-deluxe/vf/jlreq--rubygotheb-v.vf -2021/03/07 | 3324 | language/japanese/jlreq-deluxe/vf/jlreq--rubygotheb-h.vf -2021/03/07 | 3324 | language/japanese/jlreq-deluxe/vf/jlreq--expmgothr-v.vf -2021/03/07 | 3324 | language/japanese/jlreq-deluxe/vf/jlreq--expmgothr-h.vf -2021/03/07 | 3324 | language/japanese/jlreq-deluxe/vf/jlreq--expgotheb-v.vf -2021/03/07 | 3324 | language/japanese/jlreq-deluxe/vf/jlreq--expgotheb-h.vf -2021/03/07 | 3324 | language/japanese/jlreq-deluxe/vf/bjlreq--rubymgothr-v.vf -2021/03/07 | 3324 | language/japanese/jlreq-deluxe/vf/bjlreq--rubymgothr-h.vf -2021/03/07 | 3324 | language/japanese/jlreq-deluxe/vf/bjlreq--rubygotheb-v.vf -2021/03/07 | 3324 | language/japanese/jlreq-deluxe/vf/bjlreq--rubygotheb-h.vf -2021/03/07 | 3324 | language/japanese/jlreq-deluxe/vf/bjlreq--expmgothr-v.vf -2021/03/07 | 3324 | language/japanese/jlreq-deluxe/vf/bjlreq--expmgothr-h.vf -2021/03/07 | 3324 | language/japanese/jlreq-deluxe/vf/bjlreq--expgotheb-v.vf -2021/03/07 | 3324 | language/japanese/jlreq-deluxe/vf/bjlreq--expgotheb-h.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/jlreq--rubyminr-v.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/jlreq--rubyminr-h.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/jlreq--rubyminl-v.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/jlreq--rubyminl-h.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/jlreq--rubyminb-v.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/jlreq--rubyminb-h.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/jlreq--rubygothr-v.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/jlreq--rubygothr-h.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/jlreq--rubygothb-v.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/jlreq--rubygothb-h.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/jlreq--expminr-v.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/jlreq--expminr-h.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/jlreq--expminl-v.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/jlreq--expminl-h.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/jlreq--expminb-v.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/jlreq--expminb-h.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/jlreq--expgothr-v.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/jlreq--expgothr-h.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/jlreq--expgothb-v.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/jlreq--expgothb-h.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/bjlreq--rubyminr-v.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/bjlreq--rubyminr-h.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/bjlreq--rubyminl-v.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/bjlreq--rubyminl-h.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/bjlreq--rubyminb-v.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/bjlreq--rubyminb-h.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/bjlreq--rubygothr-v.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/bjlreq--rubygothr-h.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/bjlreq--rubygothb-v.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/bjlreq--rubygothb-h.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/bjlreq--expminr-v.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/bjlreq--expminr-h.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/bjlreq--expminl-v.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/bjlreq--expminl-h.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/bjlreq--expminb-v.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/bjlreq--expminb-h.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/bjlreq--expgothr-v.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/bjlreq--expgothr-h.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/bjlreq--expgothb-v.vf -2021/03/07 | 3320 | language/japanese/jlreq-deluxe/vf/bjlreq--expgothb-h.vf -2021/03/07 | 3251 | macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty -2021/03/07 | 324217 | graphics/mcf2graph/mcf_example.pdf -2021/03/07 | 323676 | fonts/aesupp/type1/aeplri.pfb -2021/03/07 | 3124720 | systems/win32/w32tex/win64/luatex-w64.tar.xz -2021/03/07 | 3120500 | systems/win32/w32tex/win64/luatex-exp-w64.tar.xz -2021/03/07 | 3108992 | systems/win32/w32tex/win64/luatex-dev-w64.tar.xz -2021/03/07 | 3104 | language/japanese/jlreq-deluxe/vf/zjlreq--rubymgothr-v.vf -2021/03/07 | 3104 | language/japanese/jlreq-deluxe/vf/zjlreq--rubymgothr-h.vf -2021/03/07 | 3104 | language/japanese/jlreq-deluxe/vf/zjlreq--rubygotheb-v.vf -2021/03/07 | 3104 | language/japanese/jlreq-deluxe/vf/zjlreq--rubygotheb-h.vf -2021/03/07 | 3104 | language/japanese/jlreq-deluxe/vf/zjlreq--expmgothr-v.vf -2021/03/07 | 3104 | language/japanese/jlreq-deluxe/vf/zjlreq--expmgothr-h.vf -2021/03/07 | 3104 | language/japanese/jlreq-deluxe/vf/zjlreq--expgotheb-v.vf -2021/03/07 | 3104 | language/japanese/jlreq-deluxe/vf/zjlreq--expgotheb-h.vf -2021/03/07 | 3104 | language/japanese/jlreq-deluxe/vf/bzjlreq--rubymgothr-v.vf -2021/03/07 | 3104 | language/japanese/jlreq-deluxe/vf/bzjlreq--rubymgothr-h.vf -2021/03/07 | 3104 | language/japanese/jlreq-deluxe/vf/bzjlreq--rubygotheb-v.vf -2021/03/07 | 3104 | language/japanese/jlreq-deluxe/vf/bzjlreq--rubygotheb-h.vf -2021/03/07 | 3104 | language/japanese/jlreq-deluxe/vf/bzjlreq--expmgothr-v.vf -2021/03/07 | 3104 | language/japanese/jlreq-deluxe/vf/bzjlreq--expmgothr-h.vf -2021/03/07 | 3104 | language/japanese/jlreq-deluxe/vf/bzjlreq--expgotheb-v.vf -2021/03/07 | 3104 | language/japanese/jlreq-deluxe/vf/bzjlreq--expgotheb-h.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/zjlreq--rubyminr-v.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/zjlreq--rubyminr-h.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/zjlreq--rubyminl-v.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/zjlreq--rubyminl-h.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/zjlreq--rubyminb-v.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/zjlreq--rubyminb-h.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/zjlreq--rubygothr-v.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/zjlreq--rubygothr-h.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/zjlreq--rubygothb-v.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/zjlreq--rubygothb-h.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/zjlreq--expminr-v.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/zjlreq--expminr-h.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/zjlreq--expminl-v.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/zjlreq--expminl-h.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/zjlreq--expminb-v.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/zjlreq--expminb-h.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/zjlreq--expgothr-v.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/zjlreq--expgothr-h.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/zjlreq--expgothb-v.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/zjlreq--expgothb-h.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/bzjlreq--rubyminr-v.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/bzjlreq--rubyminr-h.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/bzjlreq--rubyminl-v.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/bzjlreq--rubyminl-h.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/bzjlreq--rubyminb-v.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/bzjlreq--rubyminb-h.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/bzjlreq--rubygothr-v.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/bzjlreq--rubygothr-h.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/bzjlreq--rubygothb-v.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/bzjlreq--rubygothb-h.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/bzjlreq--expminr-v.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/bzjlreq--expminr-h.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/bzjlreq--expminl-v.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/bzjlreq--expminl-h.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/bzjlreq--expminb-v.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/bzjlreq--expminb-h.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/bzjlreq--expgothr-v.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/bzjlreq--expgothr-h.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/bzjlreq--expgothb-v.vf -2021/03/07 | 3100 | language/japanese/jlreq-deluxe/vf/bzjlreq--expgothb-h.vf -2021/03/07 | 3088 | language/japanese/jlreq-deluxe/vf/jlreq--nmlmgothrn-v.vf -2021/03/07 | 3088 | language/japanese/jlreq-deluxe/vf/jlreq--nmlmgothrn-h.vf -2021/03/07 | 3088 | language/japanese/jlreq-deluxe/vf/bjlreq--nmlmgothrn-v.vf -2021/03/07 | 3088 | language/japanese/jlreq-deluxe/vf/bjlreq--nmlmgothrn-h.vf -2021/03/07 | 3084 | language/japanese/jlreq-deluxe/vf/jlreq--nmlminrn-v.vf -2021/03/07 | 3084 | language/japanese/jlreq-deluxe/vf/jlreq--nmlminrn-h.vf -2021/03/07 | 3084 | language/japanese/jlreq-deluxe/vf/jlreq--nmlminln-v.vf -2021/03/07 | 3084 | language/japanese/jlreq-deluxe/vf/jlreq--nmlminln-h.vf -2021/03/07 | 3084 | language/japanese/jlreq-deluxe/vf/jlreq--nmlminbn-v.vf -2021/03/07 | 3084 | language/japanese/jlreq-deluxe/vf/jlreq--nmlminbn-h.vf -2021/03/07 | 3084 | language/japanese/jlreq-deluxe/vf/jlreq--nmlgothrn-v.vf -2021/03/07 | 3084 | language/japanese/jlreq-deluxe/vf/jlreq--nmlgothrn-h.vf -2021/03/07 | 3084 | language/japanese/jlreq-deluxe/vf/jlreq--nmlgothebn-v.vf -2021/03/07 | 3084 | language/japanese/jlreq-deluxe/vf/jlreq--nmlgothebn-h.vf -2021/03/07 | 3084 | language/japanese/jlreq-deluxe/vf/jlreq--nmlgothbn-v.vf -2021/03/07 | 3084 | language/japanese/jlreq-deluxe/vf/jlreq--nmlgothbn-h.vf -2021/03/07 | 3084 | language/japanese/jlreq-deluxe/vf/bjlreq--nmlminrn-v.vf -2021/03/07 | 3084 | language/japanese/jlreq-deluxe/vf/bjlreq--nmlminrn-h.vf -2021/03/07 | 3084 | language/japanese/jlreq-deluxe/vf/bjlreq--nmlminln-v.vf -2021/03/07 | 3084 | language/japanese/jlreq-deluxe/vf/bjlreq--nmlminln-h.vf -2021/03/07 | 3084 | language/japanese/jlreq-deluxe/vf/bjlreq--nmlminbn-v.vf -2021/03/07 | 3084 | language/japanese/jlreq-deluxe/vf/bjlreq--nmlminbn-h.vf -2021/03/07 | 3084 | language/japanese/jlreq-deluxe/vf/bjlreq--nmlgothrn-v.vf -2021/03/07 | 3084 | language/japanese/jlreq-deluxe/vf/bjlreq--nmlgothrn-h.vf -2021/03/07 | 3084 | language/japanese/jlreq-deluxe/vf/bjlreq--nmlgothebn-v.vf -2021/03/07 | 3084 | language/japanese/jlreq-deluxe/vf/bjlreq--nmlgothebn-h.vf -2021/03/07 | 3084 | language/japanese/jlreq-deluxe/vf/bjlreq--nmlgothbn-v.vf -2021/03/07 | 3084 | language/japanese/jlreq-deluxe/vf/bjlreq--nmlgothbn-h.vf -2021/03/07 | 2896 | systems/texlive/tlnet/archive/widows-and-orphans.r58173.tar.xz -2021/03/07 | 2868 | language/japanese/jlreq-deluxe/vf/zjlreq--nmlmgothrn-v.vf -2021/03/07 | 2868 | language/japanese/jlreq-deluxe/vf/zjlreq--nmlmgothrn-h.vf -2021/03/07 | 2868 | language/japanese/jlreq-deluxe/vf/bzjlreq--nmlmgothrn-v.vf -2021/03/07 | 2868 | language/japanese/jlreq-deluxe/vf/bzjlreq--nmlmgothrn-h.vf -2021/03/07 | 2864 | language/japanese/jlreq-deluxe/vf/zjlreq--nmlminrn-v.vf -2021/03/07 | 2864 | language/japanese/jlreq-deluxe/vf/zjlreq--nmlminrn-h.vf -2021/03/07 | 2864 | language/japanese/jlreq-deluxe/vf/zjlreq--nmlminln-v.vf -2021/03/07 | 2864 | language/japanese/jlreq-deluxe/vf/zjlreq--nmlminln-h.vf -2021/03/07 | 2864 | language/japanese/jlreq-deluxe/vf/zjlreq--nmlminbn-v.vf -2021/03/07 | 2864 | language/japanese/jlreq-deluxe/vf/zjlreq--nmlminbn-h.vf -2021/03/07 | 2864 | language/japanese/jlreq-deluxe/vf/zjlreq--nmlgothrn-v.vf -2021/03/07 | 2864 | language/japanese/jlreq-deluxe/vf/zjlreq--nmlgothrn-h.vf -2021/03/07 | 2864 | language/japanese/jlreq-deluxe/vf/zjlreq--nmlgothebn-v.vf -2021/03/07 | 2864 | language/japanese/jlreq-deluxe/vf/zjlreq--nmlgothebn-h.vf -2021/03/07 | 2864 | language/japanese/jlreq-deluxe/vf/zjlreq--nmlgothbn-v.vf -2021/03/07 | 2864 | language/japanese/jlreq-deluxe/vf/zjlreq--nmlgothbn-h.vf -2021/03/07 | 2864 | language/japanese/jlreq-deluxe/vf/bzjlreq--nmlminrn-v.vf -2021/03/07 | 2864 | language/japanese/jlreq-deluxe/vf/bzjlreq--nmlminrn-h.vf -2021/03/07 | 2864 | language/japanese/jlreq-deluxe/vf/bzjlreq--nmlminln-v.vf -2021/03/07 | 2864 | language/japanese/jlreq-deluxe/vf/bzjlreq--nmlminln-h.vf -2021/03/07 | 2864 | language/japanese/jlreq-deluxe/vf/bzjlreq--nmlminbn-v.vf -2021/03/07 | 2864 | language/japanese/jlreq-deluxe/vf/bzjlreq--nmlminbn-h.vf -2021/03/07 | 2864 | language/japanese/jlreq-deluxe/vf/bzjlreq--nmlgothrn-v.vf -2021/03/07 | 2864 | language/japanese/jlreq-deluxe/vf/bzjlreq--nmlgothrn-h.vf -2021/03/07 | 2864 | language/japanese/jlreq-deluxe/vf/bzjlreq--nmlgothebn-v.vf -2021/03/07 | 2864 | language/japanese/jlreq-deluxe/vf/bzjlreq--nmlgothebn-h.vf -2021/03/07 | 2864 | language/japanese/jlreq-deluxe/vf/bzjlreq--nmlgothbn-v.vf -2021/03/07 | 2864 | language/japanese/jlreq-deluxe/vf/bzjlreq--nmlgothbn-h.vf -2021/03/07 | 2722 | graphics/mcf2graph/mcf_example.tex -2021/03/07 | 2600024 | systems/win32/w32tex/tex4htk-w32.tar.xz -2021/03/07 | 256 | language/japanese/jlreq-deluxe/vf/zjlreq--upnmlmgothrn-h.vf -2021/03/07 | 256 | language/japanese/jlreq-deluxe/vf/zjlreq--upnmlmgothr-h.vf -2021/03/07 | 256 | language/japanese/jlreq-deluxe/vf/zjlreq--upnmlgothrn-h.vf -2021/03/07 | 256 | language/japanese/jlreq-deluxe/vf/zjlreq--upnmlgothebn-h.vf -2021/03/07 | 256 | language/japanese/jlreq-deluxe/vf/zjlreq--upnmlgotheb-h.vf -2021/03/07 | 256 | language/japanese/jlreq-deluxe/vf/zjlreq--upnmlgothbn-h.vf -2021/03/07 | 256 | language/japanese/jlreq-deluxe/vf/bzjlreq--upnmlmgothrn-h.vf -2021/03/07 | 256 | language/japanese/jlreq-deluxe/vf/bzjlreq--upnmlmgothr-h.vf -2021/03/07 | 256 | language/japanese/jlreq-deluxe/vf/bzjlreq--upnmlgothrn-h.vf -2021/03/07 | 256 | language/japanese/jlreq-deluxe/vf/bzjlreq--upnmlgothebn-h.vf -2021/03/07 | 256 | language/japanese/jlreq-deluxe/vf/bzjlreq--upnmlgotheb-h.vf -2021/03/07 | 256 | language/japanese/jlreq-deluxe/vf/bzjlreq--upnmlgothbn-h.vf -2021/03/07 | 252 | language/japanese/jlreq-deluxe/vf/zjlreq--upnmlminrn-h.vf -2021/03/07 | 252 | language/japanese/jlreq-deluxe/vf/zjlreq--upnmlminr-h.vf -2021/03/07 | 252 | language/japanese/jlreq-deluxe/vf/zjlreq--upnmlminln-h.vf -2021/03/07 | 252 | language/japanese/jlreq-deluxe/vf/zjlreq--upnmlminl-h.vf -2021/03/07 | 252 | language/japanese/jlreq-deluxe/vf/zjlreq--upnmlminbn-h.vf -2021/03/07 | 252 | language/japanese/jlreq-deluxe/vf/zjlreq--upnmlminb-h.vf -2021/03/07 | 252 | language/japanese/jlreq-deluxe/vf/zjlreq--upnmlgothr-h.vf -2021/03/07 | 252 | language/japanese/jlreq-deluxe/vf/zjlreq--upnmlgothb-h.vf -2021/03/07 | 252 | language/japanese/jlreq-deluxe/vf/bzjlreq--upnmlminrn-h.vf -2021/03/07 | 252 | language/japanese/jlreq-deluxe/vf/bzjlreq--upnmlminr-h.vf -2021/03/07 | 252 | language/japanese/jlreq-deluxe/vf/bzjlreq--upnmlminln-h.vf -2021/03/07 | 252 | language/japanese/jlreq-deluxe/vf/bzjlreq--upnmlminl-h.vf -2021/03/07 | 252 | language/japanese/jlreq-deluxe/vf/bzjlreq--upnmlminbn-h.vf -2021/03/07 | 252 | language/japanese/jlreq-deluxe/vf/bzjlreq--upnmlminb-h.vf -2021/03/07 | 252 | language/japanese/jlreq-deluxe/vf/bzjlreq--upnmlgothr-h.vf -2021/03/07 | 252 | language/japanese/jlreq-deluxe/vf/bzjlreq--upnmlgothb-h.vf -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--uprubyminr-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--uprubyminr-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--uprubyminl-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--uprubyminl-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--uprubyminb-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--uprubyminb-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--uprubymgothr-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--uprubymgothr-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--uprubygothr-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--uprubygothr-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--uprubygotheb-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--uprubygotheb-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--uprubygothb-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--uprubygothb-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upnmlminr-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upnmlminrn-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upnmlminrn-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upnmlminr-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upnmlminl-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upnmlminln-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upnmlminln-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upnmlminl-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upnmlminb-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upnmlminbn-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upnmlminbn-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upnmlminb-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upnmlmgothr-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upnmlmgothrn-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upnmlmgothrn-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upnmlmgothr-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upnmlgothr-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upnmlgothrn-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upnmlgothrn-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upnmlgothr-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upnmlgotheb-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upnmlgothebn-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upnmlgothebn-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upnmlgotheb-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upnmlgothb-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upnmlgothbn-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upnmlgothbn-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upnmlgothb-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upexpminr-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upexpminrn-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upexpminrn-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upexpminr-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upexpminl-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upexpminln-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upexpminln-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upexpminl-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upexpminb-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upexpminbn-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upexpminbn-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upexpminb-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upexpmgothr-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upexpmgothrn-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upexpmgothrn-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upexpmgothr-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upexpgothr-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upexpgothrn-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upexpgothrn-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upexpgothr-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upexpgotheb-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upexpgothebn-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upexpgothebn-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upexpgotheb-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upexpgothb-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upexpgothbn-v.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upexpgothbn-h.tfm -2021/03/07 | 2368 | language/japanese/jlreq-deluxe/tfm/bzjlreq--upexpgothb-h.tfm -2021/03/07 | 236188 | fonts/aesupp/opentype/aepagella-italic.otf -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--uprubyminr-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--uprubyminr-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--uprubyminl-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--uprubyminl-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--uprubyminb-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--uprubyminb-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--uprubymgothr-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--uprubymgothr-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--uprubygothr-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--uprubygothr-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--uprubygotheb-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--uprubygotheb-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--uprubygothb-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--uprubygothb-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upnmlminr-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upnmlminrn-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upnmlminrn-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upnmlminr-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upnmlminl-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upnmlminln-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upnmlminln-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upnmlminl-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upnmlminb-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upnmlminbn-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upnmlminbn-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upnmlminb-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upnmlmgothr-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upnmlmgothrn-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upnmlmgothrn-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upnmlmgothr-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upnmlgothr-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upnmlgothrn-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upnmlgothrn-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upnmlgothr-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upnmlgotheb-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upnmlgothebn-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upnmlgothebn-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upnmlgotheb-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upnmlgothb-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upnmlgothbn-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upnmlgothbn-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upnmlgothb-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upexpminr-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upexpminrn-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upexpminrn-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upexpminr-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upexpminl-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upexpminln-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upexpminln-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upexpminl-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upexpminb-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upexpminbn-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upexpminbn-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upexpminb-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upexpmgothr-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upexpmgothrn-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upexpmgothrn-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upexpmgothr-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upexpgothr-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upexpgothrn-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upexpgothrn-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upexpgothr-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upexpgotheb-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upexpgothebn-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upexpgothebn-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upexpgotheb-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upexpgothb-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upexpgothbn-v.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upexpgothbn-h.tfm -2021/03/07 | 2340 | language/japanese/jlreq-deluxe/tfm/zjlreq--upexpgothb-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--uprubyminr-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--uprubyminr-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--uprubyminl-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--uprubyminl-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--uprubyminb-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--uprubyminb-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--uprubymgothr-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--uprubymgothr-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--uprubygothr-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--uprubygothr-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--uprubygotheb-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--uprubygotheb-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--uprubygothb-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--uprubygothb-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upnmlminr-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upnmlminrn-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upnmlminrn-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upnmlminr-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upnmlminl-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upnmlminln-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upnmlminln-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upnmlminl-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upnmlminb-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upnmlminbn-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upnmlminbn-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upnmlminb-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upnmlmgothr-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upnmlmgothrn-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upnmlmgothrn-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upnmlmgothr-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upnmlgothr-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upnmlgothrn-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upnmlgothrn-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upnmlgothr-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upnmlgotheb-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upnmlgothebn-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upnmlgothebn-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upnmlgotheb-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upnmlgothb-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upnmlgothbn-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upnmlgothbn-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upnmlgothb-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upexpminr-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upexpminrn-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upexpminrn-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upexpminr-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upexpminl-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upexpminln-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upexpminln-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upexpminl-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upexpminb-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upexpminbn-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upexpminbn-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upexpminb-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upexpmgothr-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upexpmgothrn-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upexpmgothrn-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upexpmgothr-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upexpgothr-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upexpgothrn-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upexpgothrn-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upexpgothr-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upexpgotheb-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upexpgothebn-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upexpgothebn-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upexpgotheb-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upexpgothb-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upexpgothbn-v.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upexpgothbn-h.tfm -2021/03/07 | 2332 | language/japanese/jlreq-deluxe/tfm/bjlreq--upexpgothb-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--uprubyminr-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--uprubyminr-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--uprubyminl-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--uprubyminl-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--uprubyminb-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--uprubyminb-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--uprubymgothr-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--uprubymgothr-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--uprubygothr-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--uprubygothr-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--uprubygotheb-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--uprubygotheb-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--uprubygothb-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--uprubygothb-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upnmlminr-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upnmlminrn-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upnmlminrn-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upnmlminr-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upnmlminl-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upnmlminln-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upnmlminln-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upnmlminl-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upnmlminb-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upnmlminbn-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upnmlminbn-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upnmlminb-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upnmlmgothr-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upnmlmgothrn-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upnmlmgothrn-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upnmlmgothr-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upnmlgothr-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upnmlgothrn-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upnmlgothrn-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upnmlgothr-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upnmlgotheb-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upnmlgothebn-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upnmlgothebn-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upnmlgotheb-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upnmlgothb-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upnmlgothbn-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upnmlgothbn-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upnmlgothb-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upexpminr-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upexpminrn-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upexpminrn-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upexpminr-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upexpminl-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upexpminln-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upexpminln-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upexpminl-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upexpminb-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upexpminbn-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upexpminbn-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upexpminb-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upexpmgothr-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upexpmgothrn-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upexpmgothrn-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upexpmgothr-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upexpgothr-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upexpgothrn-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upexpgothrn-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upexpgothr-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upexpgotheb-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upexpgothebn-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upexpgothebn-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upexpgotheb-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upexpgothb-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upexpgothbn-v.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upexpgothbn-h.tfm -2021/03/07 | 2304 | language/japanese/jlreq-deluxe/tfm/jlreq--upexpgothb-h.tfm -2021/03/07 | 229080 | fonts/aesupp/opentype/aepagella-bolditalic.otf -2021/03/07 | 202590 | graphics/mcf2graph/mcf_mplib_exa.pdf -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--rubyminr-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--rubyminr-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--rubyminl-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--rubyminl-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--rubyminb-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--rubyminb-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--rubymgothr-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--rubymgothr-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--rubygothr-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--rubygothr-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--rubygotheb-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--rubygotheb-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--rubygothb-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--rubygothb-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--nmlminr-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--nmlminrn-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--nmlminrn-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--nmlminr-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--nmlminl-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--nmlminln-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--nmlminln-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--nmlminl-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--nmlminb-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--nmlminbn-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--nmlminbn-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--nmlminb-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--nmlmgothr-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--nmlmgothrn-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--nmlmgothrn-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--nmlmgothr-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--nmlgothr-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--nmlgothrn-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--nmlgothrn-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--nmlgothr-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--nmlgotheb-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--nmlgothebn-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--nmlgothebn-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--nmlgotheb-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--nmlgothb-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--nmlgothbn-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--nmlgothbn-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--nmlgothb-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--expminr-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--expminrn-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--expminrn-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--expminr-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--expminl-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--expminln-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--expminln-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--expminl-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--expminb-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--expminbn-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--expminbn-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--expminb-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--expmgothr-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--expmgothrn-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--expmgothrn-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--expmgothr-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--expgothr-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--expgothrn-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--expgothrn-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--expgothr-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--expgotheb-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--expgothebn-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--expgothebn-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--expgotheb-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--expgothb-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--expgothbn-v.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--expgothbn-h.tfm -2021/03/07 | 1968 | language/japanese/jlreq-deluxe/tfm/bzjlreq--expgothb-h.tfm -2021/03/07 | 19505 | macros/latex/contrib/ut-thesis/ut-thesis.dtx -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--rubyminr-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--rubyminr-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--rubyminl-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--rubyminl-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--rubyminb-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--rubyminb-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--rubymgothr-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--rubymgothr-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--rubygothr-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--rubygothr-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--rubygotheb-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--rubygotheb-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--rubygothb-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--rubygothb-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--nmlminr-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--nmlminrn-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--nmlminrn-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--nmlminr-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--nmlminl-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--nmlminln-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--nmlminln-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--nmlminl-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--nmlminb-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--nmlminbn-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--nmlminbn-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--nmlminb-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--nmlmgothr-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--nmlmgothrn-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--nmlmgothrn-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--nmlmgothr-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--nmlgothr-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--nmlgothrn-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--nmlgothrn-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--nmlgothr-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--nmlgotheb-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--nmlgothebn-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--nmlgothebn-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--nmlgotheb-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--nmlgothb-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--nmlgothbn-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--nmlgothbn-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--nmlgothb-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--expminr-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--expminrn-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--expminrn-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--expminr-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--expminl-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--expminln-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--expminln-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--expminl-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--expminb-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--expminbn-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--expminbn-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--expminb-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--expmgothr-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--expmgothrn-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--expmgothrn-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--expmgothr-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--expgothr-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--expgothrn-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--expgothrn-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--expgothr-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--expgotheb-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--expgothebn-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--expgothebn-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--expgotheb-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--expgothb-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--expgothbn-v.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--expgothbn-h.tfm -2021/03/07 | 1940 | language/japanese/jlreq-deluxe/tfm/zjlreq--expgothb-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--rubyminr-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--rubyminr-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--rubyminl-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--rubyminl-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--rubyminb-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--rubyminb-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--rubymgothr-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--rubymgothr-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--rubygothr-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--rubygothr-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--rubygotheb-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--rubygotheb-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--rubygothb-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--rubygothb-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--nmlminr-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--nmlminrn-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--nmlminrn-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--nmlminr-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--nmlminl-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--nmlminln-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--nmlminln-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--nmlminl-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--nmlminb-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--nmlminbn-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--nmlminbn-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--nmlminb-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--nmlmgothr-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--nmlmgothrn-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--nmlmgothrn-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--nmlmgothr-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--nmlgothr-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--nmlgothrn-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--nmlgothrn-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--nmlgothr-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--nmlgotheb-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--nmlgothebn-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--nmlgothebn-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--nmlgotheb-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--nmlgothb-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--nmlgothbn-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--nmlgothbn-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--nmlgothb-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--expminr-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--expminrn-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--expminrn-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--expminr-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--expminl-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--expminln-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--expminln-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--expminl-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--expminb-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--expminbn-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--expminbn-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--expminb-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--expmgothr-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--expmgothrn-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--expmgothrn-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--expmgothr-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--expgothr-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--expgothrn-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--expgothrn-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--expgothr-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--expgotheb-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--expgothebn-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--expgothebn-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--expgotheb-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--expgothb-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--expgothbn-v.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--expgothbn-h.tfm -2021/03/07 | 1932 | language/japanese/jlreq-deluxe/tfm/bjlreq--expgothb-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--rubyminr-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--rubyminr-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--rubyminl-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--rubyminl-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--rubyminb-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--rubyminb-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--rubymgothr-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--rubymgothr-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--rubygothr-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--rubygothr-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--rubygotheb-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--rubygotheb-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--rubygothb-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--rubygothb-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--nmlminr-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--nmlminrn-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--nmlminrn-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--nmlminr-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--nmlminl-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--nmlminln-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--nmlminln-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--nmlminl-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--nmlminb-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--nmlminbn-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--nmlminbn-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--nmlminb-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--nmlmgothr-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--nmlmgothrn-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--nmlmgothrn-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--nmlmgothr-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--nmlgothr-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--nmlgothrn-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--nmlgothrn-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--nmlgothr-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--nmlgotheb-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--nmlgothebn-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--nmlgothebn-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--nmlgotheb-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--nmlgothb-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--nmlgothbn-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--nmlgothbn-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--nmlgothb-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--expminr-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--expminrn-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--expminrn-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--expminr-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--expminl-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--expminln-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--expminln-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--expminl-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--expminb-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--expminbn-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--expminbn-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--expminb-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--expmgothr-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--expmgothrn-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--expmgothrn-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--expmgothr-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--expgothr-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--expgothrn-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--expgothrn-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--expgothr-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--expgotheb-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--expgothebn-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--expgothebn-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--expgotheb-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--expgothb-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--expgothbn-v.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--expgothbn-h.tfm -2021/03/07 | 1904 | language/japanese/jlreq-deluxe/tfm/jlreq--expgothb-h.tfm -2021/03/07 | 1869 | info/dtk-bibliography/dtk-authoryear.bbx -2021/03/07 | 18598 | graphics/mcf2graph/mcf_mplib_exa.tex -2021/03/07 | 1823794 | fonts/aesupp/source/sfd/aepagella-italic.sfd -2021/03/07 | 178109 | fonts/aesupp/type1/aecsbi.pfb -2021/03/07 | 1778 | macros/latex/contrib/pdfmanagement-testphase/pdflscape-ltx.sty -2021/03/07 | 1767302 | fonts/aesupp/source/sfd/aepagella-bolditalic.sfd -2021/03/07 | 174230 | fonts/aesupp/type1/aebkri.pfb -2021/03/07 | 1673917 | fonts/aesupp/source/sfd/aeschola-bolditalic.sfd -2021/03/07 | 166816 | fonts/aesupp/type1/aebkbi.pfb -2021/03/07 | 160 | language/japanese/jlreq-deluxe/vf/zjlreq--upnmlminr-v.vf -2021/03/07 | 160 | language/japanese/jlreq-deluxe/vf/zjlreq--upnmlminrn-v.vf -2021/03/07 | 160 | language/japanese/jlreq-deluxe/vf/zjlreq--upnmlminl-v.vf -2021/03/07 | 160 | language/japanese/jlreq-deluxe/vf/zjlreq--upnmlminln-v.vf -2021/03/07 | 160 | language/japanese/jlreq-deluxe/vf/zjlreq--upnmlminb-v.vf -2021/03/07 | 160 | language/japanese/jlreq-deluxe/vf/zjlreq--upnmlminbn-v.vf -2021/03/07 | 160 | language/japanese/jlreq-deluxe/vf/zjlreq--upnmlmgothr-v.vf -2021/03/07 | 160 | language/japanese/jlreq-deluxe/vf/zjlreq--upnmlmgothrn-v.vf -2021/03/07 | 160 | language/japanese/jlreq-deluxe/vf/zjlreq--upnmlgothr-v.vf -2021/03/07 | 160 | language/japanese/jlreq-deluxe/vf/zjlreq--upnmlgothrn-v.vf -2021/03/07 | 160 | language/japanese/jlreq-deluxe/vf/zjlreq--upnmlgotheb-v.vf -2021/03/07 | 160 | language/japanese/jlreq-deluxe/vf/zjlreq--upnmlgothebn-v.vf -2021/03/07 | 160 | language/japanese/jlreq-deluxe/vf/zjlreq--upnmlgothb-v.vf -2021/03/07 | 160 | language/japanese/jlreq-deluxe/vf/zjlreq--upnmlgothbn-v.vf -2021/03/07 | 160 | language/japanese/jlreq-deluxe/vf/bzjlreq--upnmlminr-v.vf -2021/03/07 | 160 | language/japanese/jlreq-deluxe/vf/bzjlreq--upnmlminrn-v.vf -2021/03/07 | 160 | language/japanese/jlreq-deluxe/vf/bzjlreq--upnmlminl-v.vf -2021/03/07 | 160 | language/japanese/jlreq-deluxe/vf/bzjlreq--upnmlminln-v.vf -2021/03/07 | 160 | language/japanese/jlreq-deluxe/vf/bzjlreq--upnmlminb-v.vf -2021/03/07 | 160 | language/japanese/jlreq-deluxe/vf/bzjlreq--upnmlminbn-v.vf -2021/03/07 | 160 | language/japanese/jlreq-deluxe/vf/bzjlreq--upnmlmgothr-v.vf -2021/03/07 | 160 | language/japanese/jlreq-deluxe/vf/bzjlreq--upnmlmgothrn-v.vf -2021/03/07 | 160 | language/japanese/jlreq-deluxe/vf/bzjlreq--upnmlgothr-v.vf -2021/03/07 | 160 | language/japanese/jlreq-deluxe/vf/bzjlreq--upnmlgothrn-v.vf -2021/03/07 | 160 | language/japanese/jlreq-deluxe/vf/bzjlreq--upnmlgotheb-v.vf -2021/03/07 | 160 | language/japanese/jlreq-deluxe/vf/bzjlreq--upnmlgothebn-v.vf -2021/03/07 | 160 | language/japanese/jlreq-deluxe/vf/bzjlreq--upnmlgothb-v.vf -2021/03/07 | 160 | language/japanese/jlreq-deluxe/vf/bzjlreq--upnmlgothbn-v.vf -2021/03/07 | 153959 | fonts/aesupp/type1/aecsri.pfb -2021/03/07 | 140624 | fonts/aesupp/opentype/aeschola-bolditalic.otf -2021/03/07 | 140316 | fonts/aesupp/opentype/aebonum-italic.otf -2021/03/07 | 139460 | fonts/aesupp/opentype/aebonum-bolditalic.otf -2021/03/07 | 137232 | fonts/aesupp/opentype/aeschola-italic.otf -2021/03/07 | 13656 | systems/texlive/tlnet/archive/pxrubrica.r58177.tar.xz -2021/03/07 | 136156 | systems/texlive/tlnet/archive/tex4ht.doc.r58182.tar.xz -2021/03/07 | 13240 | fonts/aesupp/tfm/aemri9.tfm -2021/03/07 | 13232 | fonts/aesupp/tfm/aemri8.tfm -2021/03/07 | 13232 | fonts/aesupp/tfm/aemri12.tfm -2021/03/07 | 13228 | fonts/aesupp/tfm/aemri10.tfm -2021/03/07 | 13220 | fonts/aesupp/tfm/aemri7.tfm -2021/03/07 | 130749 | macros/latex/contrib/newpax.zip -2021/03/07 | 128085 | fonts/aesupp/type1/aemri10.pfb -2021/03/07 | 12684 | fonts/aesupp/tfm/aembxi10.tfm -2021/03/07 | 124036 | fonts/aesupp/type1/aemri7.pfb -2021/03/07 | 123751 | fonts/aesupp/type1/aemri12.pfb -2021/03/07 | 122814 | macros/latex/contrib/ut-thesis.zip -2021/03/07 | 122666 | fonts/aesupp/type1/aembxi10.pfb -2021/03/07 | 12120 | systems/texlive/tlnet/archive/widows-and-orphans.source.r58173.tar.xz -2021/03/07 | 120 | language/japanese/jlreq-deluxe/vf/zjlreq--nmlmgothr-v.vf -2021/03/07 | 120 | language/japanese/jlreq-deluxe/vf/zjlreq--nmlmgothr-h.vf -2021/03/07 | 120 | language/japanese/jlreq-deluxe/vf/zjlreq--nmlgotheb-v.vf -2021/03/07 | 120 | language/japanese/jlreq-deluxe/vf/zjlreq--nmlgotheb-h.vf -2021/03/07 | 120 | language/japanese/jlreq-deluxe/vf/bzjlreq--nmlmgothr-v.vf -2021/03/07 | 120 | language/japanese/jlreq-deluxe/vf/bzjlreq--nmlmgothr-h.vf -2021/03/07 | 120 | language/japanese/jlreq-deluxe/vf/bzjlreq--nmlgotheb-v.vf -2021/03/07 | 120 | language/japanese/jlreq-deluxe/vf/bzjlreq--nmlgotheb-h.vf -2021/03/07 | 12012 | fonts/aesupp/tfm/aeplri.tfm -2021/03/07 | 11968 | graphics/mcf2graph/CHANGELOG -2021/03/07 | 118535 | fonts/aesupp/type1/aemri9.pfb -2021/03/07 | 117782 | fonts/aesupp/type1/aemri8.pfb -2021/03/07 | 1172 | fonts/aesupp/tfm/aemtti10.tfm -2021/03/07 | 116 | language/japanese/jlreq-deluxe/vf/zjlreq--nmlminr-v.vf -2021/03/07 | 116 | language/japanese/jlreq-deluxe/vf/zjlreq--nmlminr-h.vf -2021/03/07 | 116 | language/japanese/jlreq-deluxe/vf/zjlreq--nmlminl-v.vf -2021/03/07 | 116 | language/japanese/jlreq-deluxe/vf/zjlreq--nmlminl-h.vf -2021/03/07 | 116 | language/japanese/jlreq-deluxe/vf/zjlreq--nmlminb-v.vf -2021/03/07 | 116 | language/japanese/jlreq-deluxe/vf/zjlreq--nmlminb-h.vf -2021/03/07 | 116 | language/japanese/jlreq-deluxe/vf/zjlreq--nmlgothr-v.vf -2021/03/07 | 116 | language/japanese/jlreq-deluxe/vf/zjlreq--nmlgothr-h.vf -2021/03/07 | 116 | language/japanese/jlreq-deluxe/vf/zjlreq--nmlgothb-v.vf -2021/03/07 | 116 | language/japanese/jlreq-deluxe/vf/zjlreq--nmlgothb-h.vf -2021/03/07 | 116 | language/japanese/jlreq-deluxe/vf/bzjlreq--nmlminr-v.vf -2021/03/07 | 116 | language/japanese/jlreq-deluxe/vf/bzjlreq--nmlminr-h.vf -2021/03/07 | 116 | language/japanese/jlreq-deluxe/vf/bzjlreq--nmlminl-v.vf -2021/03/07 | 116 | language/japanese/jlreq-deluxe/vf/bzjlreq--nmlminl-h.vf -2021/03/07 | 116 | language/japanese/jlreq-deluxe/vf/bzjlreq--nmlminb-v.vf -2021/03/07 | 116 | language/japanese/jlreq-deluxe/vf/bzjlreq--nmlminb-h.vf -2021/03/07 | 116 | language/japanese/jlreq-deluxe/vf/bzjlreq--nmlgothr-v.vf -2021/03/07 | 116 | language/japanese/jlreq-deluxe/vf/bzjlreq--nmlgothr-h.vf -2021/03/07 | 116 | language/japanese/jlreq-deluxe/vf/bzjlreq--nmlgothb-v.vf -2021/03/07 | 116 | language/japanese/jlreq-deluxe/vf/bzjlreq--nmlgothb-h.vf -2021/03/07 | 116658 | macros/latex/contrib/ut-thesis/ut-thesis.pdf -2021/03/07 | 1146776 | systems/texlive/tlnet/archive/tuda-ci.doc.r58174.tar.xz -2021/03/07 | 1140 | macros/latex/contrib/ut-thesis/ut-thesis.ins -2021/03/07 | 112807 | fonts/aesupp/type1/aemtti10.pfb -2021/03/07 | 11169 | macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx -2021/03/07 | 109320 | fonts/aesupp/opentype/aemroman10-italic.otf -2021/03/07 | 107360 | fonts/aesupp/opentype/aemroman12-italic.otf -2021/03/07 | 107144 | fonts/aesupp/opentype/aemroman7-italic.otf -2021/03/07 | 106524 | fonts/aesupp/opentype/aemroman9-italic.otf -2021/03/07 | 106460 | fonts/aesupp/opentype/aemroman10-bolditalic.otf -2021/03/07 | 106324 | fonts/aesupp/opentype/aemroman8-italic.otf diff --git a/graphics/pgf/contrib/circuitikz/doc/changelog.tex b/graphics/pgf/contrib/circuitikz/doc/changelog.tex index cbf38e1cf8..5b4be6d089 100644 --- a/graphics/pgf/contrib/circuitikz/doc/changelog.tex +++ b/graphics/pgf/contrib/circuitikz/doc/changelog.tex @@ -5,6 +5,21 @@ full list of changes. \begin{itemize} \item + Version 1.3.2 (2021-03-14) + + \begin{itemize} + \tightlist + \item + Added the simplified (2-waves) highpass and lowpass blocks + \item + Added graphene FETs (suggested by Cees Keyer) + \item + Added left/right anchors to transistors + \item + Fixed a bug in flip-flops + (https://tex.stackexchange.com/q/587213/38080) + \end{itemize} +\item Version 1.3.1 (2021-02-20) \begin{itemize} diff --git a/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf b/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf Binary files differindex 047b3dd378..f26913dd19 100644 --- a/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf +++ b/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf diff --git a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf Binary files differindex 00a4f91763..d0a6ea3ea3 100644 --- a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf +++ b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf diff --git a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex index f69ca43b06..1f3d694044 100644 --- a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex +++ b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex @@ -2595,6 +2595,8 @@ It also has a \texttt{zero} anchor if you need to rotate it about its real cente \circuitdescbip*{highpass}{highpass}{} \circuitdescbip*{lowpass}{lowpass}{} \circuitdescbip*{allpass}{allpass}{} + \circuitdescbip*{highpass2}{simplified highpass (with only 2 waves)}{} + \circuitdescbip*{lowpass2}{simplified lowpass (with only 2 waves)}{} \circuitdescbip*{adc}{A/D converter}{} \circuitdescbip*{dac}{D/A converter}{} \circuitdescbip*{dsp}{DSP}{} @@ -2867,6 +2869,13 @@ Basically they are the same as the normal \texttt{npn} and \texttt{pnp}, and the \circuitdesc{isfet}{isfet}{Q} \end{groupdesc} +\textsc{Graphene fet} have been added in version \texttt{1.3.2}\footnote{added by Romano Giannetti after a suggestion by Cees Keyer.}. They look better if you set \texttt{transistors/arrow pos=end} and \texttt{transistor/thickness=3} or higher for them, so they are plotted with this option here. +\begin{groupdesc} + \ctikzset{transistors/thickness=3, transistors/arrow pos=end} + \circuitdesc*{ngfet}{N-type graphene FET}{Q}(outer hex up/45/0.3, outer hex down/-45/0.3, right/0/0.4) + \circuitdesc*{pgfet}{pgfet}{Q}(inner hex up/135/0.3, inner hex down/-135/0.3) +\end{groupdesc} + \subsubsection{Transistor texts (labels)}\label{sec:transistors-labels} In versions before \texttt{0.9.7}, transistors text (the node text) was positioned near the collector terminal; since version \texttt{0.9.7} the default has been changed to a more natural position near the center of the device, similar to the multi-teminal transistors. You can revert to the old behavior locally with the key \texttt{legacy transistors text}, or globally by setting the package option \texttt{legacytransistorstext}. @@ -2918,7 +2927,7 @@ You can go back to the no-arrows mos with \texttt{noarrowmos} locally or with \texttt{\textbackslash ctikzset\{tripoles/mos style/no arrows\}}. -\paragraph{Circles.} Since \texttt{1.2.6}, you can add a circle\footnote{Suggested by Matthias Jung \href{https://github.com/circuitikz/circuitikz/issues/442}{on GitHub}} to most of the transistor shapes --- with the exception of multi-terminal ones (\texttt{bjtnpn} and \texttt{bjtpnp}, where it would be awkward anyway). The circle is intended in some case as the component's housing, and used to distinguish discrete components from integrated ones. +\paragraph{Circles.} Since \texttt{1.2.6}, you can add a circle\footnote{Suggested by Matthias Jung \href{https://github.com/circuitikz/circuitikz/issues/442}{on GitHub}} to most of the transistor shapes --- with the exception of multi-terminal (\texttt{bjtnpn} and \texttt{bjtpnp}, where it would be awkward anyway) and graphene FETs. The circle is intended in some case as the component's housing, and used to distinguish discrete components from integrated ones. To add the circle to a single transistor, you use the \texttt{tr circle} keys in the node; if you want all of your transistors with a circle, you can set the property \texttt{tr circle} with a \verb|\ctikzset| command (it will respect normal grouping, of course); in that case, you can use \texttt{tr circle=false} to locally disable them. @@ -3218,7 +3227,15 @@ For \textsc{npn}, \textsc{pnp}, \textsc{nigbt} and \textsc{pigbt} transistors, t ;\end{circuitikz} \end{LTXexample} -Finally, all transistors, except the multi-terminal \texttt{bjtnpn} and \texttt{bjtpnp}, (since \texttt{0.9.6}) have internal nodes on the terminal corners, called \texttt{inner up} and \texttt{inner down}; you do not normally need them, but they are here for special applications: + +Notice that the geographical anchors of transistors are \emph{not} affected by either the bodydiode and the circle options; the label text is also outside of them. This is to permit to align the components independently from that features. On the other hand, that can sometimes create problems because that element are outside the bounding box automatically calculated by \TikZ{}. + +The exception is the \texttt{right} anchor which, when a circle is present, indicates the edge of the circle itself (since \texttt{v1.3.2}) + +{\geolrcoord{npn} \geolrcoord{npn, bodydiode} \geolrcoord{npn, bodydiode, tr circle}} + + +All transistors, except the multi-terminal \texttt{bjtnpn} and \texttt{bjtpnp}, (since \texttt{0.9.6}) have internal nodes on the terminal corners, called \texttt{inner up} and \texttt{inner down}; you do not normally need them, but they are here for special applications: \begin{LTXexample}[varwidth=true] \begin{circuitikz} diff --git a/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty b/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty index a5ec75f3af..83ac0f569d 100644 --- a/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty +++ b/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty @@ -12,8 +12,8 @@ \NeedsTeXFormat{LaTeX2e} -\def\pgfcircversion{1.3.1} -\def\pgfcircversiondate{2021/02/20} +\def\pgfcircversion{1.3.2} +\def\pgfcircversiondate{2021/03/14} \ProvidesPackage{circuitikz}% [\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion] diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex index 3454f6dd34..82b156c46d 100644 --- a/graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex +++ b/graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex @@ -1406,7 +1406,7 @@ \ifx\@@tmp\@@x\else\edef\@@or{1}\fi \edef\@@tmp{\ctikzvalof{multipoles/flipflop/cd}} \ifnum\@@tmp>0\edef\@@or{1}\fi - \edef\@@tmp{\ctikzvalof{multipoles/flipflop/nu}} + \edef\@@tmp{\ctikzvalof{multipoles/flipflop/nd}} \ifnum\@@tmp>0\edef\@@or{1}\fi % \typeout{TEST\space\@@tmp\space\@@x} \ifnum\@@or>0 diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex index e00b33ad59..7b26709540 100644 --- a/graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex +++ b/graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex @@ -417,7 +417,9 @@ \ctikzset{bipoles/bandpass/width/.initial=.7} \ctikzset{bipoles/bandstop/width/.initial=.7} \ctikzset{bipoles/highpass/width/.initial=.7} +\ctikzset{bipoles/highpass2/width/.initial=.7} \ctikzset{bipoles/lowpass/width/.initial=.7} +\ctikzset{bipoles/lowpass2/width/.initial=.7} \ctikzset{bipoles/allpass/width/.initial=.7} \ctikzset{bipoles/adc/width/.initial=.7} \ctikzset{bipoles/dac/width/.initial=.7} @@ -870,6 +872,70 @@ \pgfusepath{draw} } +%% highpass2 filter ---simplyfied with just two waves +\pgfcircdeclarebipolescaled{blocks} +{} +{\ctikzvalof{bipoles/highpass2/width}} +{highpass2} +{\ctikzvalof{bipoles/highpass2/width}} +{\ctikzvalof{bipoles/highpass2/width}} +{ + \pgf@circ@res@step = \ctikzvalof{bipoles/highpass2/width}\pgf@circ@scaled@Rlen + \divide \pgf@circ@res@step by 2 + + \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}} + \pgf@circ@res@other = \pgf@circ@res@left + \advance\pgf@circ@res@other by \pgf@circ@res@step + + \ifpgf@circuit@dashed + \pgfsetdash{{0.1cm}{0.1cm}}{0cm} + \fi + + % draw outer box + \pgf@circ@twoportbox + + \ifpgf@circuit@inputarrow + { + \advance \pgf@circ@res@left by -.5\ctikzvalof{bipoles/thickness}\pgfstartlinewidth + \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}} + \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}} + } + \fi + + % rotate inner symbol + \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil} + \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135 + \pgftransformrotate{270} + \fi\fi + \ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225 % 134 degree, because >= 135 is not possible + \pgftransformrotate{180} + \fi\fi + \ifnum \pgfcircmathresult > 224 \ifnum \pgfcircmathresult < 315 + \pgftransformrotate{90} + \fi\fi + + % draw inner symbol + \pgfsetdash{}{0pt} % always draw solid line for inner symbol + \pgfsetarrows{-} %never draw arrows + \pgfsetlinewidth{\pgfstartlinewidth} + \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0.25\pgf@circ@res@step}} + \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}} + \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}} + \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}} + \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}} + \pgfusepath{draw} + + \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{-0.25\pgf@circ@res@step}} + \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}} + \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}} + \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}} + \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}} + \pgfusepath{draw} + \pgfpathmoveto{\pgfpoint{-0.3\pgf@circ@res@step}{-0.5\pgf@circ@res@step}} + \pgfpathlineto{\pgfpoint{0.3\pgf@circ@res@step}{-0.1\pgf@circ@res@step}} + \pgfusepath{draw} +} + %% lowpass filter \pgfcircdeclarebipolescaled{blocks} {} @@ -944,6 +1010,70 @@ \pgfusepath{draw} } +%% lowpass2 filter: simplyfied with just two waves +\pgfcircdeclarebipolescaled{blocks} +{} +{\ctikzvalof{bipoles/lowpass2/width}} +{lowpass2} +{\ctikzvalof{bipoles/lowpass2/width}} +{\ctikzvalof{bipoles/lowpass2/width}} +{ + \pgf@circ@res@step = \ctikzvalof{bipoles/lowpass2/width}\pgf@circ@scaled@Rlen + \divide \pgf@circ@res@step by 2 + + \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}} + \pgf@circ@res@other = \pgf@circ@res@left + \advance\pgf@circ@res@other by \pgf@circ@res@step + + \ifpgf@circuit@dashed + \pgfsetdash{{0.1cm}{0.1cm}}{0cm} + \fi + + % draw outer box + \pgf@circ@twoportbox + + \ifpgf@circuit@inputarrow + { + \advance \pgf@circ@res@left by -.5\ctikzvalof{bipoles/thickness}\pgfstartlinewidth + \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}} + \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}} + } + \fi + + % rotate inner symbol + \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil} + \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135 + \pgftransformrotate{270} + \fi\fi + \ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225 % 134 degree, because >= 135 is not possible + \pgftransformrotate{180} + \fi\fi + \ifnum \pgfcircmathresult > 224 \ifnum \pgfcircmathresult < 315 + \pgftransformrotate{90} + \fi\fi + + % draw inner symbol + \pgfsetdash{}{0pt} % always draw solid line for inner symbol + \pgfsetarrows{-} %never draw arrows + \pgfsetlinewidth{\pgfstartlinewidth} + \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0.25\pgf@circ@res@step}} + \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}} + \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}} + \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}} + \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}} + \pgfusepath{draw} + \pgfpathmoveto{\pgfpoint{-0.3\pgf@circ@res@step}{0.1\pgf@circ@res@step}} + \pgfpathlineto{\pgfpoint{0.3\pgf@circ@res@step}{0.5\pgf@circ@res@step}} + \pgfusepath{draw} + + \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{-0.25\pgf@circ@res@step}} + \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}} + \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}} + \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}} + \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}} + \pgfusepath{draw} +} + %% allpass filter \pgfcircdeclarebipolescaled{blocks} {} @@ -2121,7 +2251,9 @@ \pgfcirc@activate@bipole@simple{l}{bandpass} \pgfcirc@activate@bipole@simple{l}{bandstop} \pgfcirc@activate@bipole@simple{l}{highpass} +\pgfcirc@activate@bipole@simple{l}{highpass2} \pgfcirc@activate@bipole@simple{l}{lowpass} +\pgfcirc@activate@bipole@simple{l}{lowpass2} \pgfcirc@activate@bipole@simple{l}{allpass} \pgfcirc@activate@bipole@simple{l}{adc} \pgfcirc@activate@bipole@simple{l}{dac} diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex index f6ebcf61a3..1fa81e7326 100644 --- a/graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex +++ b/graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex @@ -3255,6 +3255,38 @@ \ctikzset{tripoles/isfet/bodydiode conn/.initial=.6} \ctikzset{tripoles/isfet/curr direction/.initial=1} % +% graphene FET +% +\ctikzset{tripoles/pgfet/width/.initial=.6} +\ctikzset{tripoles/pgfet/gate height/.initial=.5} +\ctikzset{tripoles/pgfet/gate height 2/.initial=0.25} % must be "gate height"/2 +\ctikzset{tripoles/pgfet/base height/.initial=.5} % must be "gate height" +\ctikzset{tripoles/pgfet/outer base height/.initial=.25} % must be "gate height 2" +\ctikzset{tripoles/pgfet/outer base thickness/.initial=1} +\ctikzset{tripoles/pgfet/conn height/.initial=0} +\ctikzset{tripoles/pgfet/height/.initial=1.1} +\ctikzset{tripoles/pgfet/gate width/.initial=.5} +\ctikzset{tripoles/pgfet/base width/.initial=0.36084} % must be "gate height"*cos(60)/(2*width) +\ctikzset{tripoles/pgfet/bodydiode scale/.initial=.3} +\ctikzset{tripoles/pgfet/bodydiode distance/.initial=.6} +\ctikzset{tripoles/pgfet/bodydiode conn/.initial=.6} +\ctikzset{tripoles/pgfet/curr direction/.initial=-1} + +\ctikzset{tripoles/ngfet/width/.initial=.6} +\ctikzset{tripoles/ngfet/gate height/.initial=.5} +\ctikzset{tripoles/ngfet/gate height 2/.initial=0.25} % must be "gate height"/2 +\ctikzset{tripoles/ngfet/base height/.initial=.5} % must be "gate height" +\ctikzset{tripoles/ngfet/outer base height/.initial=.25} % must be "gate height 2" +\ctikzset{tripoles/ngfet/outer base thickness/.initial=1} +\ctikzset{tripoles/ngfet/conn height/.initial=0} +\ctikzset{tripoles/ngfet/height/.initial=1.1} +\ctikzset{tripoles/ngfet/gate width/.initial=.5} +\ctikzset{tripoles/ngfet/base width/.initial=0.36084} % must be "gate height"*cos(60)/(2*width) +\ctikzset{tripoles/ngfet/bodydiode scale/.initial=.3} +\ctikzset{tripoles/ngfet/bodydiode distance/.initial=.6} +\ctikzset{tripoles/ngfet/bodydiode conn/.initial=.6} +\ctikzset{tripoles/ngfet/curr direction/.initial=1} +% % multi-emitter and multi-collector BJTs by Romano Giannetti % \ctikzset{tripoles/bjt/emitters/.initial=1} @@ -3349,7 +3381,7 @@ \pgf@x=0pt\relax \fi } - \savedmacro{\scaecircleradius}{ + \savedmacro{\scalecircleradius}{ \edef\scalecircleradius{\ctikzvalof{transistor circle/scale circle radius}} } \saveddimen{\circleradius}{ @@ -3400,9 +3432,39 @@ \pgfmathsetlength{\pgf@circ@scaled@Rlen}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen} \pgf@x=-\ctikzvalof{tripoles/#1/width}\pgf@circ@scaled@Rlen } - \savedanchor\right{%center right -- added by Burak Kelleci % this is really 0,0 - \pgf@y=0pt - \pgf@x=0pt + \savedanchor\right{ + \pgf@x=0pt\pgf@y=0pt + \ifpgf@circ@trcircle + % repeat the \circleradius computation (GRRRR) + \pgfmathsetlength{\pgf@circ@scaled@Rlen}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen} + % repeat the extrabodydiodelen (grrr) + \ifpgf@circuit@fet@bodydiode + % try to put the text to the right of the flyback diode + \pgfmathsetlength{\pgf@circ@res@other}{( + \ctikzvalof{tripoles/#1/bodydiode distance}* + \ctikzvalof{tripoles/#1/width} + + \ctikzvalof{tripoles/#1/bodydiode scale}* + \ctikzvalof{bipoles/diode/height}/2 + )*\pgf@circ@scaled@Rlen} + \else + \pgf@circ@res@other=0pt\relax + \fi + % left + \pgf@xa=-\ctikzvalof{tripoles/#1/width}\pgf@circ@scaled@Rlen + \pgf@xa=\circlebase\pgf@xa % this is the base point of the circle + % northeast + \pgf@yb=\ctikzvalof{tripoles/#1/height}\pgf@circ@scaled@Rlen % y of the left point of circle + \pgf@yb=.5\pgf@yb + \pgf@xb=\pgf@circ@res@other % this is the x of the right points of the circle + % + \pgf@yb=\ctikzvalof{tripoles/#1/bodydiode conn}\pgf@yb %this is #3 of the circle + % find the radius of the circle + \pgfmathsetlength{\pgf@circ@res@other}{((\pgf@xb)-(\pgf@xa)+(\pgf@yb)*(\pgf@yb)/((\pgf@xb)-(\pgf@xa)))/2*\scalecircleradius} + % repeat the circleleft computation + \pgf@xa=-\ctikzvalof{tripoles/#1/width}\pgf@circ@scaled@Rlen + \pgf@xb=\circlebase\pgf@xa + \pgfmathsetlength{\pgf@x}{\pgf@xb+2*\pgf@circ@res@other} + \fi } \anchor{text}{ \northeast @@ -3442,10 +3504,16 @@ \anchor{west}{ \left } + \anchor{left}{ + \left + } \anchor{east}{ \northeast \pgf@y=0pt } + \anchor{right}{ + \right + } \anchor{south}{ \northeast \pgf@circ@res@step=\pgf@y @@ -4302,6 +4370,187 @@ \declareigbt{Lnigbt} \declareigbt{Lpigbt} +% Graphene FET, See https://github.com/circuitikz/circuitikz/issues/496 +\long\def\declaregfet#1{ + \pgfcircdeclaretransistor{#1}{ + \anchor{inner up}{ + \northeast + \pgf@y=\ctikzvalof{tripoles/#1/gate height}\pgf@y + } + \anchor{inner down}{ + \northeast + \pgf@y=-\ctikzvalof{tripoles/#1/gate height}\pgf@y + } + \anchor{outer hex up}{ + \left + \pgf@xa=\ctikzvalof{tripoles/#1/base width}\pgf@x + \northeast + \pgf@y=\ctikzvalof{tripoles/#1/gate height 2}\pgf@y + \pgf@x=-\pgf@xa + } + \anchor{outer hex down}{ + \left + \pgf@xa=\ctikzvalof{tripoles/#1/base width}\pgf@x + \northeast + \pgf@y=\ctikzvalof{tripoles/#1/gate height 2}\pgf@y + \pgf@y=-\pgf@y + \pgf@x=-\pgf@xa + } + \anchor{inner hex up}{ + \left + \pgf@xa=\ctikzvalof{tripoles/#1/base width}\pgf@x + \northeast + \pgf@y=\ctikzvalof{tripoles/#1/gate height 2}\pgf@y + \pgf@x=\pgf@xa + } + \anchor{inner hex down}{ + \left + \pgf@xa=\ctikzvalof{tripoles/#1/base width}\pgf@x + \northeast + \pgf@y=\ctikzvalof{tripoles/#1/gate height 2}\pgf@y + \pgf@y=-\pgf@y + \pgf@x=\pgf@xa + } + \anchor{right}{ + \northeast\pgf@y=0pt\relax + \pgfmathsetlength{\pgf@xa}{\ctikzvalof{tripoles/#1/base width}* + \ctikzvalof{tripoles/#1/width}*\pgf@circ@scaled@Rlen} + \advance \pgf@x by \pgf@xa + } + \anchor{text}{% need a different text: no circle, shift to the right + \northeast + \pgfmathsetlength{\pgf@circ@scaled@Rlen}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen} + \ifpgf@circuit@transisors@fixlabels + \ifpgf@circuit@fet@bodydiode + \advance \pgf@x by \extrabodydiodelen + \else + \pgfmathsetlength{\pgf@xa}{\ctikzvalof{tripoles/#1/base width}* + \ctikzvalof{tripoles/#1/width}*\pgf@circ@scaled@Rlen} + \advance \pgf@x by \pgf@xa + \fi + % no circle for gfets + % add a bit of space to avoid central (substrate) terminal if drawn + \advance\pgf@x by 0.05\pgf@circ@scaled@Rlen\relax + \pgf@y=\dimexpr.5\dp\pgfnodeparttextbox-.5\ht\pgfnodeparttextbox\relax + \else + \pgf@y=.7\pgf@y + \pgf@x= \pgf@circ@scaled@Rlen + \pgf@x=0.1\pgf@x + \fi + } + } + { + % no circle for gfets (clearly!) + %draw upper connection to hexagon + \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up+\pgfverticaltransformationadjustment*.5*\pgflinewidth}} + \pgfpathlineto{\pgfpoint{\pgf@circ@res@right} + {\ctikzvalof{tripoles/#1/gate height}\pgf@circ@res@up}} + \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right} + {\ctikzvalof{tripoles/#1/gate height}\pgf@circ@res@down}} + \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down-\pgfverticaltransformationadjustment*.5*\pgflinewidth}} + \pgfusepath{draw} + % draw (fillable) hexagon + \pgfscope + \pgfpathmoveto{\pgfpoint + {\ctikzvalof{tripoles/#1/base width}\pgf@circ@res@left} + {\ctikzvalof{tripoles/#1/gate height 2}\pgf@circ@res@up}} + \pgfpathlineto{\pgfpoint{\pgf@circ@res@right} + {\ctikzvalof{tripoles/#1/gate height}\pgf@circ@res@up}} + \pgfpathlineto{\pgfpoint + {-\ctikzvalof{tripoles/#1/base width}\pgf@circ@res@left} + {\ctikzvalof{tripoles/#1/gate height 2}\pgf@circ@res@up}} + \pgfpathlineto{\pgfpoint + {-\ctikzvalof{tripoles/#1/base width}\pgf@circ@res@left} + {\ctikzvalof{tripoles/#1/gate height 2}\pgf@circ@res@down}} + \pgfpathlineto{\pgfpoint{\pgf@circ@res@right} + {\ctikzvalof{tripoles/#1/gate height}\pgf@circ@res@down}} + \pgfpathlineto{\pgfpoint + {\ctikzvalof{tripoles/#1/base width}\pgf@circ@res@left} + {-\ctikzvalof{tripoles/#1/gate height 2}\pgf@circ@res@up}} + \pgfpathclose + \pgf@circ@draworfill + \endpgfscope + %draw thicker gate lines + \pgfscope + \pgfscope + \pgfpathmoveto{\pgfpoint + {\ctikzvalof{tripoles/#1/gate width}\pgf@circ@res@left} + {\ctikzvalof{tripoles/#1/outer base height}\pgf@circ@res@up+\pgfverticaltransformationadjustment*.5\pgflinewidth}} + \pgfpathlineto{\pgfpoint + {\ctikzvalof{tripoles/#1/gate width}\pgf@circ@res@left} + {\ctikzvalof{tripoles/#1/outer base height}\pgf@circ@res@down-\pgfverticaltransformationadjustment*.5\pgflinewidth}} + % set the normal thickness + \pgf@circ@setlinewidth{tripoles}{\pgflinewidth} + \edef\@@extrat{\ctikzvalof{tripoles/#1/outer base thickness}} + \pgfsetlinewidth{\@@extrat\pgflinewidth} + \pgfusepath{draw} + \endpgfscope + \pgfpathmoveto{\pgfpoint + {\ctikzvalof{tripoles/#1/base width}\pgf@circ@res@left} + {\ctikzvalof{tripoles/#1/base height}\pgf@circ@res@up+\pgfverticaltransformationadjustment*.5\pgflinewidth}} + \pgfpathlineto{\pgfpoint + {\ctikzvalof{tripoles/#1/base width}\pgf@circ@res@left} + {\ctikzvalof{tripoles/#1/base height}\pgf@circ@res@down-\pgfverticaltransformationadjustment*.5\pgflinewidth}} + \pgf@circ@setlinewidth{tripoles}{\pgflinewidth} + \pgfusepath{draw} + \endpgfscope + %draw arrow depending on type of transistor + \pgfscope + \pgfslopedattimetrue + \pgfallowupsidedownattimetrue + \pgfresetnontranslationattimefalse + \ifpgf@circuit@trans@arrowatend + \ifpgf@circuit@trans@ntype + \edef\@@anchor{btip}\edef\@@pos{1.0} + \else + \edef\@@anchor{tip}\edef\@@pos{1.0} + \fi + \else + \edef\@@anchor{center}\edef\@@pos{0.5} + \fi + \ifpgf@circuit@trans@ntype + \pgftransformlineattime{\@@pos}{% + \pgfpoint% + {\ctikzvalof{tripoles/#1/base width}\pgf@circ@res@left}% + {\ctikzvalof{tripoles/#1/gate height 2}\pgf@circ@res@down}% + }{% + \pgfpoint{\pgf@circ@res@right}% + {\ctikzvalof{tripoles/#1/gate height}\pgf@circ@res@down}% + } + \else + \pgftransformlineattime{\@@pos}{% + \pgfpoint{\pgf@circ@res@right}% + {\ctikzvalof{tripoles/#1/gate height}\pgf@circ@res@up}% + }{% + \pgfpoint{\ctikzvalof{tripoles/#1/base width}\pgf@circ@res@left}% + {\ctikzvalof{tripoles/#1/gate height 2}\pgf@circ@res@up}% + } + \fi + \pgfnode{trarrow}{\@@anchor}{}{}{\pgfusepath{stroke}} + \endpgfscope + %draw gate + \ifpgf@circuit@trans@ntype + \pgfpathmoveto{\pgfpoint + {\ctikzvalof{tripoles/#1/gate width}\pgf@circ@res@left} + {\ctikzvalof{tripoles/#1/conn height}\pgf@circ@res@down}} + \pgfpathlineto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*.5*\pgflinewidth}% + {\ctikzvalof{tripoles/#1/conn height}\pgf@circ@res@down}} + \else + \pgfpathmoveto{\pgfpoint + {\ctikzvalof{tripoles/#1/gate width}\pgf@circ@res@left} + {\ctikzvalof{tripoles/#1/conn height}\pgf@circ@res@up}} + \pgfpathlineto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*.5*\pgflinewidth}% + {\ctikzvalof{tripoles/#1/conn height}\pgf@circ@res@up}} + \fi + \pgfusepath{draw} + } +} + +\declaregfet{pgfet} +\declaregfet{ngfet} + +% Plain MOSes + \pgfcircdeclaretransistor{nmos}{ \anchor{inner up}{ \northeast diff --git a/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex b/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex index 76090560e1..fcc31889fe 100644 --- a/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex +++ b/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex @@ -10,8 +10,8 @@ % % See the files gpl-3.0_license.txt and lppl-1-3c_license.txt for more details. -\def\pgfcircversion{1.3.1} -\def\pgfcircversiondate{2021/02/20} +\def\pgfcircversion{1.3.2} +\def\pgfcircversiondate{2021/03/14} \writestatus{loading}{\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion} \usemodule[tikz] diff --git a/graphics/pgf/contrib/sankey/README b/graphics/pgf/contrib/sankey/README index ae6f9721be..aa0a7f627a 100644 --- a/graphics/pgf/contrib/sankey/README +++ b/graphics/pgf/contrib/sankey/README @@ -1,8 +1,11 @@ sankey ====== -LaTeX package to build Sankey diagram. +sankey – Draw Sankey diagrams with TikZ +This package provides macros and environment to build Sankey diagrams, +i.e. flow diagrams in which the width of the arrows is proportional to +the flow rate. license ======= @@ -11,6 +14,8 @@ Copyright (C) 2016-2021 by Paul Gaborit This file may be distributed and/or modified - 1. under the LaTeX Project Public License and/or + 1. under the LaTeX Project Public License v1.3 + + and/or 2. under the GNU Public License. diff --git a/graphics/pgf/contrib/sankey/sankey-doc.pdf b/graphics/pgf/contrib/sankey/sankey-doc.pdf Binary files differdeleted file mode 100644 index f8d77bd13b..0000000000 --- a/graphics/pgf/contrib/sankey/sankey-doc.pdf +++ /dev/null diff --git a/graphics/pgf/contrib/sankey/sankey-doc.tex b/graphics/pgf/contrib/sankey/sankey-doc.tex deleted file mode 100644 index 768e2d0be1..0000000000 --- a/graphics/pgf/contrib/sankey/sankey-doc.tex +++ /dev/null @@ -1,1599 +0,0 @@ -% -*- coding: utf-8; -*- - -% Copyright (C) 2016-2021 by Paul Gaborit -% -% This file may be distributed and/or modified -% -% 1. under the LaTeX Project Public License and/or -% -% 2. under the GNU Public License. - -\documentclass[a4paper,onecolumn,10pt]{article} -%\usepackage[rgb]{xcolor} -\usepackage[paper=a4paper,vmargin=1.5cm,hmargin=4cm]{geometry} -\usepackage[utf8]{inputenc} -\usepackage[T1]{fontenc} -\usepackage{xcolor} -\usepackage[colorlinks]{hyperref} -\usepackage{fancyvrb} -\usepackage{listings} -\usepackage{enumitem} -\usepackage{pgfilecontents} -\usepackage{microtype} -\usepackage{bookmark} -\usepackage{cmap} -\usepackage{sankey} -\usepackage{siunitx} -\usepackage{mdframed} -\usepackage{footnote} -\usepackage{accsupp} -\usetikzlibrary{positioning,patterns.meta} -\usepackage[british]{babel} - -\colorlet{fondcode}{gray!5!white} -\colorlet{keyword}{blue!50!cyan!50!black} -\colorlet{comment}{red!75!black} - -\newcommand\emptyaccsupp[1]{\BeginAccSupp{ActualText={}}#1\EndAccSupp{}} - -\lstset{ - literate= - {á}{{\'a}}1 {é}{{\'e}}1 {Ã}{{\'i}}1 {ó}{{\'o}}1 {ú}{{\'u}}1 - {Ã}{{\'A}}1 {É}{{\'E}}1 {Ã}{{\'I}}1 {Ó}{{\'O}}1 {Ú}{{\'U}}1 - {à }{{\`a}}1 {è}{{\`e}}1 {ì}{{\`i}}1 {ò}{{\`o}}1 {ù}{{\`u}}1 - {À}{{\`A}}1 {È}{{\'E}}1 {ÃŒ}{{\`I}}1 {Ã’}{{\`O}}1 {Ù}{{\`U}}1 - {ä}{{\"a}}1 {ë}{{\"e}}1 {ï}{{\"i}}1 {ö}{{\"o}}1 {ü}{{\"u}}1 - {Ä}{{\"A}}1 {Ë}{{\"E}}1 {Ã}{{\"I}}1 {Ö}{{\"O}}1 {Ãœ}{{\"U}}1 - {â}{{\^a}}1 {ê}{{\^e}}1 {î}{{\^i}}1 {ô}{{\^o}}1 {û}{{\^u}}1 - {Â}{{\^A}}1 {Ê}{{\^E}}1 {ÃŽ}{{\^I}}1 {Ô}{{\^O}}1 {Û}{{\^U}}1 - {Å“}{{\oe}}1 {Å’}{{\OE}}1 {æ}{{\ae}}1 {Æ}{{\AE}}1 {ß}{{\ss}}1 - {ç}{{\c c}}1 {Ç}{{\c C}}1 {ø}{{\o}}1 {Ã¥}{{\r a}}1 {Ã…}{{\r A}}1 - {€}{{\texteuro}}1 {£}{{\pounds}}1 {°}{{\degres}}1 - {’}{{\textquoteright}}1 {‘}{{\textquoteleft}}1 - {«}{{<<}}1 {»}{{>>}}1 - {—}{{---}}1 {−}{{$-$}}1 -} - -\lstset{ - fancyvrb=true, - %fvcmdparams=samepage, - escapechar=`, % pour introduire du latex dans un environnement verbatim - extendedchars=true, - fontadjust=true, - columns=fullflexible, % pour pouvoir copier/coller les chaines de caractères - flexiblecolumns=true, - % frame=leftline, - inputencoding=utf8, - keepspaces=true, % keeps spaces in text, code indentation - backgroundcolor=\color{fondcode}, - basicstyle=\mdseries\ttfamily, - keywordstyle=\color{keyword}\bfseries,% - stringstyle=\ttfamily\color{green!50!black},% - commentstyle=\color{comment}\itshape,% - emphstyle=\bfseries\color{red}, - numbersep=5pt, - %numbers=left, - numberstyle=\tiny\emptyaccsupp, - showstringspaces=false, - upquote=true, % pour pouvoir copier/coller le code avec des quotes - aboveskip=\parskip, - belowskip=\parskip, - framexleftmargin=1pt, - framexrightmargin=1pt, -} - -\lstdefinestyle{textsmall}{basicstyle=\color{black}\small\mdseries\ttfamily} -\lstdefinestyle{textfootnotesize}{basicstyle=\color{black}\footnotesize\mdseries\ttfamily} -\lstdefinestyle{textscriptsize}{basicstyle=\color{black}\scriptsize\mdseries\ttfamily} -\lstdefinestyle{texttiny}{basicstyle=\color{black}\tiny\mdseries\ttfamily} - -\lstdefinestyle{LaTeX}{ - language=[LaTeX]TeX, - %backgroundcolor=\color{latexbg}, - moretexcs={ - coordinate, - definecolor, - draw, - fill, - foreach, - hashband, - node, - sankeyadvance, - sankeydubins, - sankeyend, - sankeyend, - sankeyfork, - sankeynode, - sankeynodealias, - sankeynodeend, - sankeynodestart, - sankeyoutin, - sankeyset, - sankeystart, - sankeyturn, - sisetup, - tikzset, - turnandstop, - usepackage, - } -} -\lstdefinestyle{LaTeXsmall}{style=LaTeX,style=textsmall} -\lstdefinestyle{LaTeXfootnotesize}{style=LaTeX,style=textfootnotesize} -\lstdefinestyle{LaTeXscriptsize}{style=LaTeX,style=textscriptsize} -\lstdefinestyle{LaTeXtiny}{style=LaTeX,style=texttiny} - -\def\code{\lstinline[basicstyle=\mdseries\ttfamily\color{red!50!black}]} - -\edef\samplecodename{\jobname-code.vrb} - -\newcommand\constant[1]{\textcolor{violet}{\texttt{#1}}} -\newcommand\ARG[1]{\texttt{\{#1\}}} -\newcommand\OPTARG[1]{\textcolor{green!50!black}{\texttt{[#1]}}} -\newcommand\VAR[1]{\textit{\texttt{<#1>}}} -\newcommand\NOTE[1]{\leavevmode\marginpar{#1}} - -\makeatletter -\def\mynobreakpar{\par\nobreak\@afterheading} -\makeatother -\def\docprefix#1{\texttt{\textcolor{gray}{#1}}} -\def\sankeykeysprefix{/sankey} - -\newenvironment{sankeyoption}[5][]{% [prefix] key, val, default, initially - % \begingroup - \bgroup% - % - \def\path{#1}% - \def\key{#2}% - \def\val{#3}% - \def\default{#4}% - \def\initially{#5}% - %\setlength\parindent{\dimexpr.5\parindent\relax}% - % \vspace{.25\baselineskip plus .25\baselineskip minus 0mm} - \parfillskip 0pt plus 1fil% - \leavevmode% - \ttfamily% - \hspace*{-1cm}\textcolor{red!75!black}{\texttt{\docprefix{\ifdefempty{\path}{\sankeykeysprefix/}{\path/}}\key}}% - \ifdefempty{\val}{}{=\textit{\val}}% - \hfill - \ifdefempty{\default}{\null}{(default:\,\constant{\default})}% - \ifdefempty{\initially}{\null}{(initially:\,\constant{\initially})}% - \mynobreakpar\egroup% - \parskip=.5\baselineskip plus .25\baselineskip minus .25\baselineskip - \parfillskip=30pt plus 1fil - \itemize[topsep=0pt,partopsep=0pt,itemsep=0pt]\item[] -}{% - \enditemize% -} - -\newcommand\MACRO{\hspace*{-1cm}} - -\newlist{sankeyconstantsdesc}{description}{1} -\setlist[sankeyconstantsdesc]{align=right,labelindent=1.5em,labelsep=.5em,leftmargin=!,font=\normalfont} - -\newlength{\myparskip} -\setlength{\myparskip}{.75\baselineskip plus 8\baselineskip minus .25\baselineskip} -\usepackage[skip=\myparskip]{parskip} -%\setlength{\parskip}{\myparskip} -\newenvironment{miniblock}{% - \vspace{.5\parskip}% - \csname minipage*\endcsname[t]{1.0\linewidth}% - \setlength{\parskip}{\myparskip}% -}{% - \csname endminipage*\endcsname% -} - - -\makeatletter -\title{How to use the \texttt{sankey} package\\ to build Sankey diagrams\footnote{This file described version v\sankey@version.}} -\date{Released \sankey@date} -\author{Paul Gaborit\footnote{\href{mailto:paul.gaborit@gmail.com}{\texttt{paul.gaborit@gmail.com}}}} - -\hypersetup{ - pdftitle=How to use the sankey package to buid Sankey diagrams (v\sankey@version), - pdfauthor=Paul Gaborit, -} -\makeatother - - -\begin{document} -\maketitle - -\begin{abstract} - The \texttt{sankey} package provides macros and environments to build - \emph{Sankey diagrams}% - \footnote{\url{https://en.wikipedia.org/wiki/Sankey_diagram}} (or - \emph{flow diagram} in which the width of the arrows is proportional - to the flow rate). The idea cames out from - \href{https://tex.stackexchange.com/q/40159/14500}{this question} on - \href{https://tex.stackexchange.com/}{TeX.StackExchange}. - % -\end{abstract} - -{ - \setlength{\parskip}{0pt} - \tableofcontents - \listoffigures -} - -% ------------------------------------------------------------ -\section{Preamble} -% ------------------------------------------------------------ - -To use the \code{sankey} package, insert the following line in your preamble: - -\begin{lstlisting}[style=LaTeXsmall] -\usepackage{sankey} -\end{lstlisting} - -% ------------------------------------------------------------ -\section{The \texttt{sankeydiagram} environment} -% ------------------------------------------------------------ - -A \code{sankeydiagram} environment nested in a \code{tikzpicture} -environment activates the sankey macros: - -\begin{lstlisting}[style=LaTeXsmall] -\begin{tikzpicture} - \begin{sankeydiagram}[... options ...] - ... sankey macros ... - \end{sankeydiagram} -\end{tikzpicture} -\end{lstlisting} - -% ------------------------------------------------------------ -\section{Sankey diagram options} -% ------------------------------------------------------------ - -The \code{sankey} package uses \code{pgfkeys} to define options via -\emph{key=value} pairs. - -The options can be defined via the optional argument of the -\code{sankeydiagram} environment: - -\begin{lstlisting}[style=LaTeXsmall] -\begin{sankeydiagram}[debug=true] - \sankeynode{name=a,quantity=1,angle=0,at={0,0}} -\end{sankeydiagram} -\end{lstlisting} - -The options can also be modified via the \code{\sankeyset} macro: - -\begin{lstlisting}[style=LaTeXsmall] -\begin{sankeydiagram} - \sankeyset{debug=true} - \sankeynode{name=a,quantity=1,angle=0,at={0,0}} -\end{sankeydiagram} -\end{lstlisting} - -The options can be temporarily modified for a single macro: -\begin{lstlisting}[style=LaTeXsmall] -\begin{sankeydiagram} - \sankeynode[debug=true]{name=a,quantity=1,angle=0,at={0,0}} -\end{sankeydiagram} -\end{lstlisting} -% ------------------------------------------------------------ -\subsection{Keys to choose the scale} -% ------------------------------------------------------------ - -The scale or ratio of the Sankey diagram is the ratio between the % -\code{ratio length} and the \code{ratio quantity}. - -\begin{sankeyoption}{ratio quantity}{\VAR{number}}{}{10} - Quantity (in units of flow) to define ratio. The \VAR{number} can be - any math expression. -\end{sankeyoption} - -\begin{sankeyoption}{ratio length}{\VAR{distance}}{}{1cm} - Distance (a graphical distance) to define scale. -\end{sankeyoption} - -\begin{sankeyoption}{ratio}{\VAR{distance}/\VAR{number}}{}{1cm/10} - Fix the ratio to \VAR{distance}/\VAR{number}. -\end{sankeyoption} - -The initial ratio is 1\,cm/10 units. - - -\textbf{Note:} the \code{sankey} package uses the \code{xfp} package to -evaluate all math expressions that use quantities (in units of -flow). You can therefore use quantities of a very large or very small -order of magnitude. In contrast, for graphic distances, the sankey -package uses the \code{pgfmath} package (all calculations must not -exceed $\pm 16383.99999$). - -% ------------------------------------------------------------ -\subsection{Keys to define drawing parameters} -% ------------------------------------------------------------ - -\begin{sankeyoption}{minimum radius}{\VAR{distance}}{}{5mm} - The minimum radius used by \code{\sankeyturn} and - \code{\sankeydubins}. -\end{sankeyoption} - -\begin{sankeyoption}{outin steps}{\VAR{integer}}{}{10} - Number of steps used by the \code{\sankeyoutin} macro to simulate flow - lanes with constant width. -\end{sankeyoption} - -% ------------------------------------------------------------ -\subsection{Keys to choose drawing styles} -% ------------------------------------------------------------ - -\begin{sankeyoption}{fill/.style}{\VAR{style}}{}{{line width=0pt,fill=white}} - This TikZ style is used to \emph{fill} all sankey paths. -\end{sankeyoption} - -\begin{sankeyoption}{draw/.style}{\VAR{style}}{}{draw=black,line width=.4pt} - This TikZ style is used to \emph{draw} all sankey paths. -\end{sankeyoption} - -\begin{sankeyoption}{start style}{\VAR{style name}}{}{none} - There are three predefined \emph{start} styles: \constant{none}, - \constant{simple}, \constant{arrow}. -\end{sankeyoption} - -\begin{sankeyoption}{end style}{\VAR{style name}}{}{none} - There are three predefined \emph{end} styles: \constant{none}, - \constant{simple}, \constant{arrow}. -\end{sankeyoption} - -% ------------------------------------------------------------ -\subsection{Keys to define new \emph{start} and \emph{end} styles} -% ------------------------------------------------------------ - -\begin{sankeyoption}{new start style}{\{\VAR{name}\}\{\VAR{fill - path}\}\{\VAR{draw path}\}}{}{} - Define the new start style named \VAR{name} with its \VAR{fill - path} and its \VAR{draw path}. -\end{sankeyoption} - -\begin{sankeyoption}{new end style}{\{\VAR{name}\}\{\VAR{fill - path}\}\{\VAR{draw path}\}}{}{} - Define the new end style named \VAR{name} with its \VAR{fill - path} and its \VAR{draw path}. -\end{sankeyoption} - -\emph{Fill} and \emph{draw} paths are composed in a TikZ scope where -the origin is the current Sankey node center (and its name is -\code{\name}) and the coordinate system is rotated by its orientation. - -% ------------------------------------------------------------ -\subsection{The \emph{debug} key} -% ------------------------------------------------------------ - -\begin{sankeyoption}{debug}{\VAR{boolean}}{true}{false} - To debug a sankey diagram. -\end{sankeyoption} - -% ------------------------------------------------------------ -\section{Sankey nodes and flows} -% ------------------------------------------------------------ - -% ------------------------------------------------------------ -\subsection{Create Sankey nodes} -% ------------------------------------------------------------ - -% ------------------------------------------------------------ - -\begin{miniblock} -\MACRO\code{\sankeynode}\OPTARG{\VAR{options}}\ARG{\VAR{node parameters}} - -The \code{\sankeynode} macro defines a Sankey node. The \VAR{options} -can be any Sankey diagram keys. To define a Sankey node, you must -provide a \emph{name}, a \emph{quantity}, an \emph{angle} and a -\emph{position} as \VAR{node parameters}. - -\begin{sankeyoption}[/sankey/node parameters]{name}{\VAR{name}}{}{} - The \VAR{name} of the new Sankey node (and the associated TikZ node). -\end{sankeyoption} - -\begin{sankeyoption}[/sankey/node parameters]{quantity}{\VAR{quantity}}{}{} - The quantity (in flow unit) of the new Sankey node. The \VAR{quantity} - can be any math expression. -\end{sankeyoption} - -\begin{sankeyoption}[/sankey/node parameters]{angle}{\VAR{angle}}{}{} - The orientation of the flow (0 points to the right) of the new Sankey - node. -\end{sankeyoption} - -\begin{sankeyoption}[/sankey/node parameters]{at}{\VAR{at}}{}{} - The position of the new Sankey node (a TikZ coordinate \emph{without} - round brackets or parentheses). -\end{sankeyoption} - -\begin{sankeyoption}[/sankey/node parameters]{anchor}{\VAR{anchor}}{center}{center} - Specify the anchor of the Sankey node. Possible values are - \constant{center}, \constant{left} or \constant{right}. -\end{sankeyoption} - -\begin{sankeyoption}[/sankey/node parameters]{as}{\VAR{name}}{}{} - Copy the \emph{name}, the \emph{quantity}, the \emph{angle} and the - \emph{position} of the Sankey node named \VAR{name}. -\end{sankeyoption} - -A Sankey node is also a Tikz node but with only three anchors: -\code{left}, \code{center} and \code{right}. - -\begin{filecontents*}{\samplecodename} -\begin{tikzpicture} - \begin{sankeydiagram}[debug] - \draw[gray!30] (-1,-1) grid (8,2); - \sankeynode{name=a,quantity=10,angle=0,at={0,0}} - \sankeynode{name=b,quantity=5,angle=45,at={2,1},anchor=left} - \sankeynode{name=c,quantity=20,angle=-90,at={5,1},anchor=right} - - \foreach \nodename/\pos in {a/left,b/below left,c/above}{ - \foreach \ancname in {left,center,right}{ - \node[node font=\ttfamily\footnotesize,\pos=1mm of \nodename.\ancname, - inner sep=0pt,rotate=\sankeygetnodeorient{\nodename},anchor=east] - {\ancname\vphantom{g}}; - \fill[black] (\nodename.\ancname) circle(1pt); - } - } - \end{sankeydiagram} -\end{tikzpicture} -\end{filecontents*} -% -\lstinputlisting[style=LaTeXsmall]{\samplecodename} -% -{\centering\input{\samplecodename}\par} -\end{miniblock} -% ------------------------------------------------------------ - -\begin{miniblock} -\MACRO\code{\sankeynodestart}\OPTARG{\VAR{options}}\ARG{\VAR{node parameters}} - -The \code{\sankeynodestart} creates and fills/draws a starting Sankey node: - - -\begin{filecontents*}{\samplecodename} -\begin{tikzpicture} - \begin{sankeydiagram}[start style=arrow,fill/.style={fill=orange!20}] - \draw[gray!30] (-1,-1) grid (8,2); - \sankeynodestart{name=a,quantity=10,angle=0,at={0,0}} - \sankeynodestart{name=b,quantity=5,angle=45,at={2,1},anchor=left} - \sankeynodestart{name=c,quantity=20,angle=-90,at={5,1},anchor=right} - \end{sankeydiagram} -\end{tikzpicture} -\end{filecontents*} -% -\lstinputlisting[style=LaTeXsmall]{\samplecodename} -% -{\centering\input{\samplecodename}\par} -\end{miniblock} -% ------------------------------------------------------------ - - -\begin{miniblock} -\MACRO\code{\sankeynodeend}\OPTARG{\VAR{options}}\ARG{\VAR{node - parameters}} - -The \code{\sankeynodeend} creates -and fills/draws an ending Sankey node: - -\begin{filecontents*}{\samplecodename} -\begin{tikzpicture} - \begin{sankeydiagram}[end style=simple,fill/.style={fill=orange!20}] - \draw[gray!30] (-1,-1) grid (8,2); - \sankeynodeend{name=a,quantity=10,angle=0,at={0,0}} - \sankeynodeend{name=b,quantity=5,angle=45,at={2,1},anchor=left} - \sankeynodeend{name=c,quantity=20,angle=-90,at={5,1},anchor=right} - \end{sankeydiagram} -\end{tikzpicture} -\end{filecontents*} -% -\lstinputlisting[style=LaTeXsmall]{\samplecodename} -% -{\centering\input{\samplecodename}\par} -\end{miniblock} - -\subsection{Retrieve informations from a Sankey node} - -\MACRO\code{\sankeygetnodeqty}\ARG{\VAR{node name}} - -The expandable command \code{\sankeygetnodeqty} returns the quantity -assigned to the Sankey node named \VAR{node name}. - -\MACRO\code{\sankeygetnodeorient}\ARG{\VAR{node name}} - -The expandable command \code{\sankeygetnodeorient} returns the angle -(orientation) assigned to the Sankey node named \VAR{node name}. - -% ------------------------------------------------------------ -\newpage -\subsection{Move nodes} -% ------------------------------------------------------------ - -The \code{\sankeyadvance} and \code{\sankeyturn} commands move a Sankey -node (and fill/draw a portion of the Sankey flow). Then the previous -position of the Sankey node is accessible via the \code{-old} suffix (if -you move the \code{a} node, its previous position is the \code{a-old} -node). - -\subsubsection{forward commands} - -\begin{miniblock} -\MACRO\code{\sankeyadvance}\OPTARG{\VAR{options}}\ARG{\VAR{node - name}}\ARG{\VAR{distance}} - -The \code{\sankeyadvance} moves the sankey node straight ahead and -fills/draws this portion of the sankey path. - -\begin{filecontents*}{\samplecodename} -\begin{tikzpicture} - \begin{sankeydiagram}[start style=arrow,fill/.style={fill=orange!20}] - \draw[gray!30] (-1,-1) grid (8,2); - \sankeynodestart{name=a,quantity=10,angle=0,at={0,0}} - \sankeyadvance{a}{1cm} - \sankeynode[debug]{as=a} - \sankeynode[debug]{as=a-old} - \sankeynodestart{name=b,quantity=5,angle=45,at={2,1},anchor=left} - \sankeyadvance{b}{1cm} - \sankeynodestart{name=c,quantity=10,angle=-90,at={5,1},anchor=right} - \sankeyadvance{c}{5mm} - \end{sankeydiagram} -\end{tikzpicture} -\end{filecontents*} -% -\lstinputlisting[style=LaTeXsmall]{\samplecodename} -% -{\centering\input{\samplecodename}\par} -\end{miniblock} - -\begin{miniblock} -\MACRO\code{\sankeyturn}\OPTARG{\VAR{options}}\ARG{\VAR{node - name}}\ARG{\VAR{angle}} - -The \code{\sankeyturn} macro moves the sankey node by turning to one -side or the other and fills/draws this portion of the sankey path. A -\emph{positive} \VAR{angle} turns left while a \emph{negative} -\VAR{angle} turns right. - -\begin{filecontents*}{\samplecodename} -\begin{tikzpicture} - \begin{sankeydiagram}[start style=arrow,fill/.style={fill=orange!20}] - \draw[gray!30] (-1,-1) grid (8,2); - \sankeynodestart{name=a,quantity=10,angle=0,at={0,0}} - \sankeyturn{a}{90} - \sankeynode[debug]{as=a} - \sankeynode[debug]{as=a-old} - \sankeynodestart{name=b,quantity=5,angle=45,at={2,1},anchor=left} - \sankeyturn[minimum radius=1cm]{b}{-45} - \sankeynodestart{name=c,quantity=10,angle=-90,at={5,1},anchor=right} - \sankeyturn{c}{180} - \end{sankeydiagram} -\end{tikzpicture} -\end{filecontents*} -% -\lstinputlisting[style=LaTeXsmall]{\samplecodename} -% -{\centering\input{\samplecodename}\par} -\end{miniblock} - -\subsubsection{backward commands} - -\begin{miniblock} -\MACRO\code{\sankeyadvance*}\OPTARG{\VAR{options}}\ARG{\VAR{node - name}}\ARG{\VAR{distance}} - -The \code{\sankeyadvance*} moves the sankey node straight back and -fills/draws this portion of the sankey path. - -\begin{filecontents*}{\samplecodename} -\begin{tikzpicture} - \begin{sankeydiagram}[end style=arrow,fill/.style={fill=orange!20}] - \draw[gray!30] (-1,-1) grid (8,2); - \sankeynodeend{name=a,quantity=10,angle=0,at={0,0}} - \sankeyadvance*{a}{1cm} - \sankeynode[debug]{as=a} - \sankeynode[debug]{as=a-old} - \sankeynodeend{name=b,quantity=5,angle=45,at={2,1},anchor=left} - \sankeyadvance*{b}{1cm} - \sankeynodeend{name=c,quantity=10,angle=-90,at={5,1},anchor=right} - \sankeyadvance*{c}{5mm} - \end{sankeydiagram} -\end{tikzpicture} -\end{filecontents*} -% -\lstinputlisting[style=LaTeXsmall]{\samplecodename} -% -{\centering\input{\samplecodename}\par} -\end{miniblock} - -\begin{miniblock} -\MACRO\code{\sankeyturn*}\OPTARG{\VAR{options}}\ARG{\VAR{node - name}}\ARG{\VAR{angle}} - -The \code{\sankeyturn*} macro moves the sankey node backwards by turning -right or left and fills/draws this portion of the sankey path. A -\emph{positive} \VAR{angle} turns left while a \emph{negative} -\VAR{angle} turns right. - -\begin{filecontents*}{\samplecodename} -\begin{tikzpicture} - \begin{sankeydiagram}[end style=simple,fill/.style={fill=orange!20}] - \draw[gray!30] (-1,-1) grid (8,2); - \sankeynodeend{name=a,quantity=10,angle=0,at={0,0}} - \sankeyturn*{a}{90} - \sankeynode[debug]{as=a} - \sankeynode[debug]{as=a-old} - \sankeynodeend{name=b,quantity=5,angle=45,at={2,1},anchor=left} - \sankeyturn*[minimum radius=1cm]{b}{-45} - \sankeynodeend{name=c,quantity=10,angle=-90,at={5,1},anchor=right} - \sankeyturn*{c}{180} - \end{sankeydiagram} -\end{tikzpicture} -\end{filecontents*} -% -\lstinputlisting[style=LaTeXsmall]{\samplecodename} -% -{\centering\input{\samplecodename}\par} -\end{miniblock} - -\subsection{Links between nodes} - -\begin{miniblock} - \MACRO\code{\sankeyoutin}\OPTARG{\VAR{options}}\ARG{\VAR{node - A}}\ARG{\VAR{node B}} - - The \code{\sankeyoutin} macro fills/draws a lane between \VAR{node A} - and \VAR{node B} using a Bézier curve with regular steps (10 steps by - default) to simulate constant width lane. - - The constant width and the minimum curvature are \emph{not} guaranted! -\end{miniblock} - -\begin{miniblock} - \MACRO\code{\sankeydubins}\OPTARG{\VAR{options}}\ARG{\VAR{node - A}}\ARG{\VAR{node B}} - - The \code{\sankeydubins} macro fills/draws a lane between \VAR{node A} - and \VAR{node B} using a Dubins - path\footnote{\url{https://en.wikipedia.org/wiki/Dubins_path}}. - - The constant width and the minimum curvature are guaranted. -\end{miniblock} - -\subsubsection{Comparison betwen \texttt{outin} and \texttt{dubins} - paths} - -\begin{miniblock} -\begin{filecontents*}{\samplecodename} -\begin{tikzpicture} - \begin{sankeydiagram}[start style=simple,end style=arrow] - \draw[gray!30] (0,-1) grid (10,3.5); - % - \sankeyset{fill/.style={fill=orange!20}} - \sankeynodestart{name=a,at={1,0},angle=0,quantity=5} - \sankeynodeend{name=b,at={5,3},angle=0,quantity=5} - \sankeyoutin{a}{b} - % - \sankeyset{fill/.style={fill=red!20}} - \sankeynodestart{name=a,at={3,0},angle=0,quantity=5} - \sankeynodeend{name=b,at={7,3},angle=0,quantity=5} - \sankeyoutin[outin steps=2]{a}{b} - % - \sankeyset{fill/.style={fill=lime!40}} - \sankeynodestart{name=a,at={5,0},angle=0,quantity=5} - \sankeynodeend{name=b,at={(9,3},angle=0,quantity=5} - \sankeydubins[minimum radius=5mm]{a}{b} - \end{sankeydiagram} -\end{tikzpicture} -\end{filecontents*} -% -\lstinputlisting[style=LaTeXsmall]{\samplecodename} -% -{\centering\input{\samplecodename}\par} -\end{miniblock} - -\begin{miniblock} -\begin{filecontents*}{\samplecodename} -\begin{tikzpicture} - \begin{sankeydiagram}[start style=simple,end style=arrow] - \draw[gray!30] (0,0) grid (8,4.5); - % - \sankeyset{fill/.style={fill=orange!20}} - \sankeynodestart{name=a,at={1,1},angle=0,quantity=5} - \sankeynodeend{name=b,at={3,4},angle=0,quantity=5} - \sankeyoutin{a}{b} - % - \sankeyset{fill/.style={fill=red!20}} - \sankeynodestart{name=a,at={3,1},angle=0,quantity=5} - \sankeynodeend{name=b,at={5,4},angle=0,quantity=5} - \sankeyoutin[outin steps=2]{a}{b} - % - \sankeyset{fill/.style={fill=lime!40}} - \sankeynodestart{name=a,at={5,1},angle=0,quantity=5} - \sankeynodeend{name=b,at={(7,4},angle=0,quantity=5} - \sankeydubins[minimum radius=5mm]{a}{b} - \end{sankeydiagram} -\end{tikzpicture} -\end{filecontents*} -% -\lstinputlisting[style=LaTeXsmall]{\samplecodename} -% -{\centering\input{\samplecodename}\par} -\end{miniblock} - -\begin{miniblock} -\begin{filecontents*}{\samplecodename} -\begin{tikzpicture} - \begin{sankeydiagram}[start style=simple,end style=arrow] - \draw[gray!30] (0,0) grid ((6,4.5); - % - \sankeyset{fill/.style={fill=orange!20}} - \sankeynodestart{name=a,at={1,1},angle=0,quantity=5} - \sankeynodeend{name=b,at={1,4},angle=0,quantity=5} - \sankeyoutin{a}{b} - % - \sankeyset{fill/.style={fill=red!20}} - \sankeynodestart{name=a,at={3,1},angle=0,quantity=5} - \sankeynodeend{name=b,at={3,4},angle=0,quantity=5} - \sankeyoutin[outin steps=2]{a}{b} - % - \sankeyset{fill/.style={fill=lime!40}} - \sankeynodestart{name=a,at={5,1},angle=0,quantity=5} - \sankeynodeend{name=b,at={(5,4},angle=0,quantity=5} - \sankeydubins[minimum radius=5mm]{a}{b} - \end{sankeydiagram} -\end{tikzpicture} -\end{filecontents*} -% -\lstinputlisting[style=LaTeXsmall]{\samplecodename} -% -{\centering\input{\samplecodename}\par} -\end{miniblock} - -\subsubsection{Examples of \texttt{dubins} paths} - -\begin{miniblock} -\begin{filecontents*}{\samplecodename} -\begin{tikzpicture} - \begin{sankeydiagram}[start style=simple,end style=arrow] - \draw[gray!30] (-1,-1) grid (10,2.5); - - \sankeyset{ - fill/.style={fill=lime!40}, - draw/.style={draw=green!50!black,line width=2pt}, - } - - \sankeynodestart{name=a,at={0,0},angle=0,quantity=5} - \sankeynodeend{name=b,at={0,2},angle=0,quantity=5} - \sankeydubins[minimum radius=2mm]{a}{b} - - \fill[green!50!black] (2,0) coordinate (c) circle(2pt); - \sankeynodestart{name=a,at={[shift={(c)}]90:5mm},angle=0,quantity=5} - \sankeynodeend{name=b,at={[shift={(c)}]150:5mm},angle=60,quantity=5} - \sankeydubins[minimum radius=2.5mm]{a}{b} - - \sankeynodestart{name=a,at={3.5,0},angle=0,quantity=5} - \sankeynodeend{name=b,at={3.5,.75},angle=-180,quantity=5} - \sankeydubins[minimum radius=5mm]{a}{b} - - \sankeynodestart{name=a,at={7,1},angle=0,quantity=5} - \sankeynodeend{name=b,at={7,1.75},angle=0,quantity=5} - \sankeydubins[minimum radius=2.5mm]{a}{b} - - \sankeynodestart{name=a,at={9,0},angle=0,quantity=5} - \sankeynodeend{name=b,at={9,2},angle=180,quantity=5} - \sankeydubins[minimum radius=2.5mm]{a}{b} - \end{sankeydiagram} -\end{tikzpicture} -\end{filecontents*} -% -\lstinputlisting[style=LaTeXsmall]{\samplecodename} -% -{\centering\input{\samplecodename}\par} -\end{miniblock} - -\subsection{Pure filling/drawing macros} - -\begin{miniblock} -\MACRO\code{\sankeystart}\OPTARG{\VAR{options}}\ARG{\VAR{name}} - -The \code{\sankeystart} fills/draws a starting extremity attached to the -preexistent Sankey node \VAR{name}: - - -\begin{filecontents*}{\samplecodename} -\begin{tikzpicture} - \begin{sankeydiagram} - [start style=arrow,fill/.style={fill=cyan!20},draw/.style={draw=blue}] - \draw[gray!30] (-1,-1) grid (8,2); - \sankeynode{name=a,quantity=10,angle=0,at={0,0}} - \sankeystart{a} - \sankeynode{name=b,quantity=5,angle=45,at={2,1},anchor=left} - \sankeystart{b} - \sankeynode{name=c,quantity=20,angle=-90,at={5,1},anchor=right} - \sankeystart{c} - \end{sankeydiagram} -\end{tikzpicture} -\end{filecontents*} -% -\lstinputlisting[style=LaTeXsmall]{\samplecodename} -% -{\centering\input{\samplecodename}\par} -\end{miniblock} -% ------------------------------------------------------------ - - -\begin{miniblock} - \MACRO\code{\sankeyend}\OPTARG{\VAR{options}}\ARG{\VAR{name}} - - The \code{\sankeyend} fills/draws an ending extremity attached to the - preexistent Sankey node \VAR{name}: - -\begin{filecontents*}{\samplecodename} -\begin{tikzpicture} - \begin{sankeydiagram} - [end style=simple,fill/.style={fill=cyan!20},draw/.style={draw=blue}] - \draw[gray!30] (-1,-1) grid (8,2); - \sankeynode{name=a,quantity=10,angle=0,at={0,0}} - \sankeyend{a} - \sankeynode{name=b,quantity=5,angle=45,at={2,1},anchor=left} - \sankeyend{b} - \sankeynode{name=c,quantity=20,angle=-90,at={5,1},anchor=right} - \sankeyend{c} - \end{sankeydiagram} -\end{tikzpicture} -\end{filecontents*} -% -\lstinputlisting[style=LaTeXsmall]{\samplecodename} -% -{\centering\input{\samplecodename}\par} -\end{miniblock} - -\subsection{Forked node} - -\begin{miniblock} - \MACRO\code{\sankeyfork}\OPTARG{\VAR{options}}\ARG{\VAR{node}}\ARG{\VAR{quantity/name pairs}} - - The \code{\sankeyfork} macro splits a Sankey node in a list of new - Sankey nodes. The \VAR{quantity/name pairs} is a comma separated list - of \emph{quantity/name} pairs. The sum of all quantities \emph{must} - be equal to the quantity of the node to fork. - -\begin{filecontents*}{\samplecodename} -\begin{tikzpicture} - \begin{sankeydiagram}[debug] - \draw[gray!30] (-3,-2) grid (3,1); - \sankeynode{name=a,quantity=50,angle=-80,at={0,0}} - \sankeyfork{a}{30/b,10/c,10/d} - \end{sankeydiagram} -\end{tikzpicture} -\end{filecontents*} -% -\lstinputlisting[style=LaTeXsmall]{\samplecodename} -% -{\centering\input{\samplecodename}\par} - -\begin{filecontents*}{\samplecodename} -\begin{tikzpicture} - \begin{sankeydiagram} - \sankeyset{ - start style=arrow,end style=arrow, - fill/.style={fill=yellow!10,line width=0pt,draw=yellow!10}, - } - \draw[gray!30] (-4,-3) grid (4,4); - \sankeynode{name=a,quantity=40,angle=-90,at={0,0}} - \sankeyfork{a}{25/b,10/c,5/d} - \sankeyturn*{b}{90} - \sankeyturn*[minimum radius=2cm]{c}{-45} - \sankeyturn*[minimum radius=2cm]{c}{45} - \sankeyturn*[minimum radius=5mm]{d}{-90} - \sankeyadvance{a}{2cm} - \foreach \nodename in {b,c,d}{ - \sankeystart{\nodename} - } - \sankeyend{a} - \end{sankeydiagram} -\end{tikzpicture} -\end{filecontents*} -% -\lstinputlisting[style=LaTeXsmall]{\samplecodename} -% -{\centering\input{\samplecodename}\par} -\end{miniblock} - -\section{Miscellaneous} - -\subsection{The \texttt{debug} layer} - -The \code{debug} option key uses the \code{sankeydebug} layer to draw -above the \code{main} TikZ layer (via \code{\pgfsetlayers}, the -\code{sankey} package installs four layers: \code{background}, -\code{main}, \code{foreground}, \code{sankeydebug}). - -The four following styles define how to display debug informations: - - -\begin{lstlisting}[style=LaTeXsmall] -\sankeyset{ - % debug color used by all debug macros - debug color/.style={/utils/exec={\colorlet{debug color}{#1}}}, - debug color=red!75!black, - % debug line between left and right anchors - debug line/.style={draw=debug color,|-|}, - % debug line between center and label - debug normal/.style={draw=debug color}, - % debug node label - debug label/.style={ - draw, - font=\ttfamily\tiny, - text=debug color,text opacity=1, - inner sep=.1em, - fill=white,fill opacity=1, - rounded corners=.1em, - }, -} -\end{lstlisting} - -\subsection{The \texttt{dubins} TikZ library} - -The \code{sankey} package uses the \code{dubins} TikZ library (the -\code{tikzlibrarydubins.code.tex} file) to compute Dubins paths. The -documentation for this library does not yet exist. - -\subsection{How to duplicate a Sankey node} - -\MACRO\code{\sankeynodealias}\ARG{\VAR{origname}}\ARG{\VAR{clonename}} - -The \code{\sankeynodealias} macro clones the Sankey node named -\VAR{origname} into the Sankey node named \VAR{clonename}. - -So, you can clone a Sankey node via two methods: - -\begin{lstlisting}[style=LaTeXsmall] -\sankeynode{name=a,quantity=10,angle=0,at={0,0}} -\sankeynode{as=a,name=b} -\end{lstlisting} - -\begin{lstlisting}[style=LaTeXsmall] -\sankeynode{name=a,quantity=10,angle=0,at={0,0}} -\sankeynodealias{a}{b} -\end{lstlisting} - -\subsection{How to define new start and end styles} - -Here are the definitions of the \code{arrow} styles: - -\begin{lstlisting}[style=LaTeXsmall] -\sankeyset{ - % arrow style - new start style={arrow}{ - (\name.left) -- ++(-10pt,0) - -- ([xshift=-10pt/6]\name.center) - -- ([xshift=-10pt]\name.right) - -- (\name.right) -- cycle - }{ - (\name.left) -- ++(-10pt,0) - -- ([xshift=-10pt/6]\name.center) - -- ([xshift=-10pt]\name.right) - -- (\name.right) - }, - new end style={arrow}{ - (\name.left) -- ([yshift=1mm]\name.left) - -- ([xshift=10pt]\name.center) - -- ([yshift=-1mm]\name.right) -- (\name.right) -- cycle - }{ - (\name.left) -- ([yshift=1mm]\name.left) - -- ([xshift=10pt]\name.center) - -- ([yshift=-1mm]\name.right) -- (\name.right) - }, -} -\end{lstlisting} - -\section{History} - -\begin{itemize} -\item[v2.0] (2021/01/27) - \begin{itemize} - \item First public version (on CTAN). - \end{itemize} -\item[v1.0] (2016/03/06) - \begin{itemize} - \item First version. - \end{itemize} -\end{itemize} - -\clearpage -\section{Examples} - -\subsection{Simple example} - -See figure~\ref{fig:simple-example}. - -\begin{filecontents*}{\samplecodename} -\begin{tikzpicture} - \colorlet{cold}[rgb]{cyan!75!blue!50!white} - \colorlet{hot}[rgb]{red!50!orange!75!white} - \begin{sankeydiagram} - \sankeyset{ - ratio=90pt/6, - minimum radius=15pt, - start style=simple, - end style=simple, - % debug, - draw/.style={ - draw=blue!50!cyan, - line width=1pt, - line cap=round,line join=round, - }, - cold/.style={ - fill/.style={ - draw=cold, - line width=0pt, - fill=cold, - }, - }, - cold to hot/.style={ - fill/.style={ - fill=none, - top color=cold, - bottom color=hot, - middle color=yellow, - }, - }, - hot/.style={ - fill/.style={ - draw=hot, - line width=0pt, - fill=hot, - }, - }, - } - - \sankeyset{cold} - \sankeynodestart{name=p0,at={0,100},angle=-90,quantity=6} - \sankeyadvance{p0}{50pt} - - \sankeyfork{p0}{3/p1,3/p2} - - \sankeyturn{p1}{90} - \sankeyadvance{p1}{20pt} - - \sankeyadvance{p2}{60pt} - - \sankeyfork{p2}{2/p3,1/p4} - - \sankeyturn{p3}{90} - \sankeyadvance{p3}{50pt} - - \sankeyfork{p3}{1/p5,1/p6} - - \sankeyadvance{p5}{70pt} - - \sankeyfork{p1}{1/p7,1/p8,1/p9} - \sankeyadvance{p7}{50pt} - \sankeyadvance{p9}{50pt} - - \sankeyadvance{p4}{40pt} - \sankeyturn{p4}{90} - \sankeyadvance{p4}{65pt} - - \sankeyadvance{p7}{40pt} - - \sankeynode{name=p11,at={[shift={(50pt,-15pt)}]p7},angle=0,quantity=3} - \sankeyfork{p11}{1/p7a,1/p9a,1/p5a} - \sankeyoutin{p7}{p7a} - \sankeyoutin{p9}{p9a} - \sankeyoutin{p5}{p5a} - \sankeyadvance{p11}{30pt} - \sankeyend{p11} - - \sankeyturn{p8}{-90} - \sankeyturn{p6}{-90} - \sankeyturn{p4}{-90} - - \sankeyset{hot} - - \sankeyadvance[cold to hot]{p8}{40pt} - - \sankeynode{name=p10,at={[shift={(-15pt,-60pt)}]p8},angle=-90,quantity=3} - \sankeyfork{p10}{1/p8a,1/p6a,1/p4a} - \sankeyoutin[cold to hot]{p4}{p4a} - \sankeyoutin[cold to hot]{p6}{p6a} - \sankeyoutin{p8}{p8a} - \sankeyadvance{p10}{30pt} - \sankeyend{p10} - \end{sankeydiagram} -\end{tikzpicture} -\end{filecontents*} -% -\lstinputlisting[style=LaTeXsmall]{\samplecodename} -\begin{figure}[b!] - \centering - \input{\samplecodename} - \caption{Simple example} - \label{fig:simple-example} -\end{figure} -\clearpage -\subsection{Example from question on TeX.se} - -This example cames from -\href{https://tex.stackexchange.com/q/40159/14500}{this question} on -\href{https://tex.stackexchange.com/}{TeX.StackExchange}. - -See figure~\ref{fig:texse-example}. - -\begin{filecontents*}{\samplecodename} -\begin{tikzpicture} - \renewcommand*\sfdefault{txss} - - \begin{sankeydiagram} - - \sankeyset{ - ratio=4cm/524.3, - minimum radius=3mm, - start style=arrow, - end style=arrow, - % debug, - fill/.style={ - line width=0pt, - fill=cyan!50!blue!50!black, - draw=cyan!50!blue!50!black, - }, - draw/.style={draw=none}, - } - - \sankeynodestart{name=B,at={-.5,0},angle=-90,quantity=7.2} - \coordinate[below=1mm of B.center] (B label); - \sankeyadvance{B}{5mm} - \sankeynodestart{name=GI,at={1,0},angle=-90,quantity=137.3} - \coordinate[below=1mm of GI.center] (GI label); - \sankeyadvance{GI}{5mm} - \sankeynodestart{name=I,at={4,0},angle=-90,quantity=397.8} - \coordinate[below=1mm of I.center] (I label); - \sankeynode{name=EI,at={2.86,-3},angle=-90,quantity=542.3} - \sankeyfork{EI}{397.8/Ia,137.3/GIa,7.2/Ba} - \sankeydubins[minimum radius=1.2cm]{I}{Ia} - \sankeyoutin{GI}{GIa} - \sankeyoutin{B}{Ba} - \sankeyadvance{EI}{5mm} - \coordinate (EI label) at (EI); - \sankeyadvance{EI}{5mm} - \sankeyfork{EI}{63.1/EB,479.2/P} - - \sankeyturn{EB}{90} - \sankeyadvance{EB}{4cm} - \coordinate (EB label) at ($(EB)!.5!(EB-old)$); - \sankeyend{EB} - - \sankeyadvance{P}{10mm} - \coordinate (P label) at (P); - \sankeyadvance{P}{5mm} - - \sankeyfork{P}{33.5/NV,445.7/P} - - { - \colorlet{NV color}{cyan!80!lime!50!gray} - \sankeyset{fill/.append style={fill=NV color,draw=NV color}} - \sankeyturn{NV}{90} - \sankeynode{as=NV,name=NV2,at=NV -| EB} - \sankeyoutin{NV}{NV2} - \coordinate (NV label) at (NV -| EB label); - \sankeyend{NV2} - } - - \sankeyadvance{P}{10mm} - \sankeyfork{P}{118.1/U,327.6/P} - - { - \sankeyset{ - fill/.style={fill=orange!70!gray!50,draw=orange!70!gray!50} - } - \sankeyturn{U}{90} - \sankeynode{as=U,name=U2,at=U -| EB} - \sankeyoutin{U}{U2} - \coordinate (U label) at (U -| EB label); - \sankeyend{U2} - } - - \sankeyadvance{P}{10mm} - - \sankeyfork{P}{327.2/P,0.4/SD} - - { - \sankeyturn{SD}{-90} - \sankeyadvance{SD}{15mm} - \coordinate (SD label) at (SD); - \sankeyadvance{SD}{15mm} - \sankeyend{SD} - } - - \sankeyadvance{P}{8mm} - \sankeyfork{P}{18.8/VE,308.4/E} - - { - \sankeyset{fill/.append style={orange!70!gray!30}} - \sankeyturn{VE}{90} - \sankeynode{as=VE,name=VE2,at=VE -| EB} - \sankeyoutin{VE}{VE2} - \coordinate (VE label) at (VE -| EB label); - \sankeyend{VE2} - } - - \sankeyadvance{E}{8mm} - \coordinate (E label) at (E); - \sankeyadvance{E}{20mm} - - \sankeyfork{E}{135.1/H+GHD,87.2/V,86.1/In} - - \sankeyturn{In}{-90} - \sankeyadvance{In}{10mm} - \sankeyturn{In}{90} - \sankeyadvance{In}{5mm} - \coordinate (In label) at (In); - \sankeyadvance{In}{10mm} - \sankeyend{In} - - \sankeynode{as=V,name=V2,at=V|-In label} - \sankeyoutin{V}{V2} - \coordinate (V label) at (V2); - \sankeyadvance{V2}{10mm} - \sankeyend{V2} - - \sankeyturn{H+GHD}{90} - \sankeyadvance{H+GHD}{5mm} - \sankeyfork{H+GHD}{47.0/GHD,88.1/H} - - \sankeyturn{H}{-90} - \sankeynode{as=H,name=H2,at=H|-In label} - \sankeyoutin{H}{H2} - \coordinate (H label) at (H2); - \sankeyadvance{H2}{10mm} - \sankeyend{H2} - - \sankeyadvance{GHD}{30mm} - \sankeyturn{GHD}{-90} - \sankeynode{as=GHD,name=GHD2,at=GHD|-In label} - \sankeyoutin{GHD}{GHD2} - \coordinate (GHD label) at (GHD2); - \sankeyadvance{GHD2}{10mm} - \sankeyend{GHD2} - \end{sankeydiagram} - - % labels - \tikzset{ - label/.style={ - fill=white,fill opacity=.8,text opacity=1, - inner sep=1mm, - text=cyan!50!blue!50!black, - inner xsep=2mm, - font=\sffamily\bfseries\footnotesize, - align=center, - }, - } - \node[label,anchor=north] (B label) at (B label) {7.2}; - \node[label,left=1mm of B label] {Bestands-\\entnahme}; - \node[label,anchor=north] at (GI label) {137.3}; - \node[label,above=5mm of GI label] {Gewinnung\\im Inland}; - \node[label,anchor=north] at (I label) {397.8}; - \node[label,above=5mm of I label] {Import}; - - \node[label] at (EI label) {542.3\\Energieaufkommen im Inland}; - - \node[label,anchor=center] (EB label) at (EB label) {63.1}; - \node[label,above=1mm of EB label] {Export und\\Bunkerung}; - - \node[label] at (P label) {479.2\\Primärenergieverbrauch}; - - \node[label,anchor=center] (NV label) at (NV label) {33.5}; - \node[label,above=0mm of NV label] {Nichtenergetischer Verbrauch}; - - \node[label,anchor=center] (U label) at (U label) {118.1}; - \node[label,below=3mm of U label] {Umwandlungsverluste}; - - \node[label,anchor=center] (SD label) at (SD label) {0.4}; - \node[label,above=0mm of SD label] {Statistische\\Differenzen}; - - \node[label,anchor=center] (VE label) at (VE label) {18.8}; - \node[label,below=0mm of VE label] {Verbrauch in den\\Energiesktoren}; - - \node[label,anchor=north] (E label) at (E label) - {308.4\\Endenergieverbrauch}; - - \node[label,anchor=north] (In label) at (In label) {86.1}; - \node[label,anchor=north,below=1cm of In label] {Industrie}; - - \node[label,anchor=north] (V label) at (V label) {87.2}; - \node[label,anchor=north,below=1cm of V label] {Verkehr}; - - \node[label,anchor=north] (H label) at (H label) {88.1}; - \node[label,anchor=north,below=1cm of H label] {Haushalte}; - - \node[label,anchor=north] (GHD label) at (GHD label) {47.0}; - \node[label,anchor=north,below=1cm of GHD label] - {Gewerbe, Handel\\Diensleistungen}; -\end{tikzpicture} -\end{filecontents*} -% -\lstinputlisting[style=LaTeXsmall]{\samplecodename} -% -\begin{figure} - \centering - %\rule{\linewidth}{1pt}\\ - \input{\samplecodename} - \caption{Example from TeX.se question} - \label{fig:texse-example} -\end{figure} - -\clearpage -\subsection{Very nice example -- Nadieh Bremer creation} - -Graphic designer Nadieh Bremer created this very nice Sankey -diagram\footnote{\url{https://www.visualcinnamon.com/portfolio/adyen-report-2019/}} -for Adyen's second half 2018 report to shareholders. It is coded here -with her kind permission. - -You can change the data values between lines 28 and 53. - -See figure~\ref{fig:nice-example}. - -\begin{filecontents*}{\samplecodename} -\begin{tikzpicture} - % - \renewcommand*\sfdefault{txss} - \sffamily - \sisetup{ - detect-all=true, - group-separator={,}, - group-minimum-digits=4, - } - % storage of labels - \newcommand\LabSet[2]{% none name, label - \expandafter\edef\csname #1Lab\endcsname{#2}} - \newcommand\Lab[1]{% node name - \csname #1Lab\endcsname} - % storage of quantities - \newcommand\QtySet[2]{% node name, quantity - \expandafter\edef\csname #1Qty\endcsname{\fpeval{#2}}} - \newcommand\Qty[1]{% node name - \csname #1Qty\endcsname} - % all nodes with their name, label and quantity - \sankeyset{ - def data/.code args={#1/#2/#3}{% node name/label/values - \LabSet{#1}{#2} - \QtySet{#1}{#3} - \typeout{#1: \Qty{#1}€ (\Lab{#1})} - }, - def data/.list={ - {Pf/Processing\\fees/71713}, - {Sog/Sales of\\good/4547}, - {Sf/Settlement\\fees/842075}, - {Os/Other\\services/37532}, - {R/Revenues/\Qty{Pf}+\Qty{Sog}+\Qty{Sf}+\Qty{Os}}, - {Coi/Cost of Inventory/5151}, - {Ciffi/Cost insecure from financial institutions/758234}, - {Nr/Net revenue/\Qty{R}-\Qty{Coi}-\Qty{Ciffi}}, - {Aadotaifa/Amortization and\\depreciation of tangible and\\% - intangible fixed assets/4688}, - {Ssapc/Social securities and\\pension costs/7860}, - {Was/Wages and salaries/35627}, - {Ooe/Other operating expenses/37346}, - {Nr2/-/\Qty{Nr}-\Qty{Aadotaifa}-\Qty{Ssapc}-\Qty{Was}-\Qty{Ooe}}, - {Oi/Other income/47}, - {Ibiiieait/Income before interest income,\\interest expense and % - income taxes/\Qty{Nr2}+\Qty{Oi}}, - {Fe/Finance expense/561}, - {Ofr/Other financial results/2533}, - {Ibiiieait2/-/\Qty{Ibiiieait}-\Qty{Fe}-\Qty{Ofr}}, - {Fi/Finance income/204}, - {Ibit/Income before income taxes/\Qty{Ibiiieait2}+\Qty{Fi}}, - {It/Income taxes/21134}, - {Niftp/Net income for the period/\Qty{Ibit}-\Qty{It}}, - {Octa/Other currency\\translation adjustments/785}, - {Tci/Total comprehensive income/\Qty{Niftp}+\Qty{Octa}} - }, - } - - \definecolor{mygreen}{RGB}{9,192,82} - \tikzset{ - cost node/.style 2 args={ - overlay, - align=flush center, - node font=\footnotesize\sffamily\bfseries, - inner sep=0, - node contents={% - {\mdseries€\,\num{#1}}\\% - #2\vphantom{g}% - }, - }, - white hash/.style={ - draw=none,fill=none, - pattern={Lines[angle=60,line width=2pt,distance=4pt]}, - pattern color=white, - }, - line sep/.style={draw=white,line width=1pt}, - left label/.style={left=#1,align=flush right,anchor=north east}, - right label/.style={right=#1,align=flush left}, - right label hashed/.style={ - right=1mm of $(#1.left)!.5!(#1-old.left)$,align=flush left, - }, - left label hashed/.style={ - left=1mm of $(#1.right)!.5!(#1-old.right)$,align=flush right, - }, - } - - \newcommand\turnandstop[1]{ - \sankeyturn[green to greenwhite]{#1}{-90} - \sankeynode{as=#1,name=#1-e,at={#1 -| Coi}} - \sankeyoutin[greenwhite to white]{#1}{#1-e} - \node[cost node={\Qty{#1}}{\Lab{#1}},left label={1mm of #1-e.right}]; - } - - \begin{sankeydiagram} - \sankeyset{ - ratio=28em/1000000, - minimum radius=2cm, - start style=none, - % default fill and draw styles - fill/.style={ - line width=0pt, - fill=mygreen, - }, - draw/.style={draw=none}, - % specific fill and draw styles - green to greenwhite/.style={ - fill/.style={ - line width=0pt, - right color=mygreen, - left color=mygreen!20!white, - } - }, - greenwhite to white/.style={ - fill/.style={ - line width=0pt, - right color=mygreen!20!white, - left color=mygreen!5!white, - } - }, - dashed/.style={draw/.style={draw=mygreen,dashed}}, - % debug, - } - - \coordinate (top) at (0,2em); - - \sankeynodestart{name=Pf,quantity=\Qty{Pf}, - at={0,0},angle=-90} - \node[cost node={\Qty{Pf}}{\Lab{Pf}},above=.5em of Pf.center]; - - \sankeynodestart{name=Sog,quantity=\Qty{Sog}, - at={[xshift=4em]Pf.left},angle=-90,anchor=right} - \node[cost node={\Qty{Sog}}{\Lab{Sog}},above=.5em of Sog.center]; - - \sankeynodestart{name=Sf,quantity=\Qty{Sf}, - at={[xshift=2em]Sog.left},angle=-90,anchor=right} - \node[cost node={\Qty{Sf}}{\Lab{Sf}},above=.5em of Sf.center]; - - \sankeynodestart{name=Os,quantity=\Qty{Os}, - at={[xshift=2em]Sf.left},angle=-90,anchor=right} - \node[cost node={\Qty{Os}}{\Lab{Os}},above=.5em of Os.center]; - - \sankeynode{name=R,quantity=\Qty{R}, - at={[yshift=-10em]Sf.center},angle=-90} - \sankeyfork{R}{\Qty{Os}/Os-a,\Qty{Sf}/Sf-a,\Qty{Sog}/Sog-a,\Qty{Pf}/Pf-a} - - \foreach \nodename in {Pf,Sog,Sf,Os}{ - \sankeyoutin[fill/.style={top color=white,bottom color=mygreen}] - {\nodename}{\nodename-a} - } - - \sankeyadvance{R}{1em} - \node[cost node={\Qty{R}}{\Lab{R}},right label hashed=R]; - - \sankeyfork{R}{\Qty{Ciffi}/Ciffi,\Qty{Nr}/Nr,\Qty{Coi}/Coi} - - \sankeyturn[minimum radius=1.cm]{Ciffi}{90} - \node[cost node={\Qty{Ciffi}}{\Lab{Ciffi}}, - at={([shift={(1mm,0)}]Ciffi.center)},rotate=-90, - anchor=south,align=flush left,node font=\scriptsize\sffamily\bfseries]; - - \sankeyturn[green to greenwhite]{Coi}{-90} - \sankeyadvance[greenwhite to white]{Coi}{1em} - \node[cost node={\Qty{Coi}}{\Lab{Coi}}, - left={1mm of [yshift=.75ex]Coi.left}, - align=flush right,anchor=north east,overlay]; - - \sankeyadvance{Nr}{9em} - \sankeyadvance{Nr}{1em} - \node[cost node={\Qty{Nr}}{\Lab{Nr}}, - left label hashed=Nr,node font=\large\sffamily\bfseries]; - - \sankeyfork{Nr}{\Qty{Nr2}/Nr2,\Qty{Ooe}/Ooe, - \Qty{Was}/Was,\Qty{Ssapc}/Ssapc,\Qty{Aadotaifa}/Aadotaifa} - - \turnandstop{Aadotaifa} - - \sankeyadvance{Ssapc}{5em} - \turnandstop{Ssapc} - - \sankeyadvance{Was}{9em} - \turnandstop{Was} - - \sankeyadvance{Ooe}{12em} - \turnandstop{Ooe} - - \sankeyadvance{Nr2}{15em} - \sankeynode{name=Ibiiieait,quantity=\Qty{Ibiiieait}, - angle=-90,anchor=right,at={Nr2.right}} - \sankeyfork{Ibiiieait}{\Qty{Oi}/Oi,\Qty{Nr2}/Nr2-e} - - \sankeyturn*[minimum radius=1cm,dashed]{Oi}{90} - \node[cost node={\Qty{Oi}}{\Lab{Oi}},right label=1mm of Oi.left]; - - \sankeyadvance{Ibiiieait}{1em} - \node[cost node={\Qty{Ibiiieait}}{\Lab{Ibiiieait}}, - right label hashed=Ibiiieait]; - - \sankeyfork{Ibiiieait} - {\Qty{Ibiiieait2}/Ibiiieait2,\Qty{Ofr}/Ofr,\Qty{Fe}/Fe} - - \turnandstop{Fe} - - \sankeyadvance{Ofr}{3em} - \turnandstop{Ofr} - - \sankeyadvance{Ibiiieait2}{6em} - \sankeynode{name=Ibit,quantity={\Qty{Ibiiieait2}+\Qty{Fi}}, - angle=-90,anchor=right,at={Ibiiieait2.right}} - \sankeyfork{Ibit}{\Qty{Fi}/Fi,\Qty{Ibiiieait2}/Ibiiieait2-e} - - \sankeyturn*[minimum radius=1cm,dashed]{Fi}{90} - \node[cost node={\Qty{Fi}}{\Lab{Fi}},right label=1mm of Fi.left]; - - \sankeyadvance{Ibit}{1em} - \node[cost node={\Qty{Ibit}}{\Lab{Ibit}},right label hashed=Ibit]; - - \sankeyfork{Ibit}{\Qty{Niftp}/Niftp,\Qty{It}/It} - - \turnandstop{It} - - \sankeyadvance{Niftp}{6em} - - \sankeyadvance{Niftp}{1em} - \node[cost node={\Qty{Niftp}}{\Lab{Niftp}},right label hashed=Niftp]; - - \sankeynode{name=Tci,quantity=\Qty{Niftp}+\Qty{Octa}, - angle=-90,anchor=right,at={[yshift=-6em]Niftp.right}} - \sankeyfork{Tci}{\Qty{Octa}/Octa,\Qty{Niftp}/Niftp-e} - \sankeyoutin{Niftp}{Niftp-e} - - \sankeyturn*[minimum radius=1cm]{Octa}{90} - \node[cost node={\Qty{Octa}}{\Lab{Octa}},right label=1mm of Octa.left]; - - \sankeyadvance{Tci}{1em} - \node[cost node={\Qty{Tci}}{\Lab{Tci}},right label hashed=Tci]; - - \newcommand\hashband[1]{ - \draw[line sep] (#1-old.right) -- (#1-old.left); - \draw[line sep] (#1.right) -- (#1.left); - \path[white hash] (#1-old.right) rectangle (#1.left); - } - - \foreach \nodename in {R,Nr,Nr,Ibiiieait,Ibit,Niftp,Tci}{ - \hashband{\nodename} - } - - \end{sankeydiagram} -\end{tikzpicture} -\end{filecontents*} -% -\lstinputlisting[numbers=left,style=LaTeXsmall]{\samplecodename} -% -\begin{figure} - \centering - \input{\samplecodename} - \caption{Very nice example -- Nadieh Bremer's creation} - (from - \href{https://www.visualcinnamon.com/portfolio/adyen-report-2019/}{Adyen's - Shareholder Report}) - \label{fig:nice-example} -\end{figure} -\end{document} - -%%% Local Variables: -%%% mode: latex -%%% TeX-master: t -%%% End: diff --git a/graphics/pgf/contrib/sankey/sankey.dtx b/graphics/pgf/contrib/sankey/sankey.dtx new file mode 100644 index 0000000000..451472c5b2 --- /dev/null +++ b/graphics/pgf/contrib/sankey/sankey.dtx @@ -0,0 +1,4678 @@ +% \iffalse meta-comment +% +% Copyright (C) 2016, 2021 by Paul Gaborit +% ----------------------------------- +% +% This work may be distributed and/or modified under the conditions of +% the LaTeX Project Public License, either version 1.3 of this license +% or (at your option) any later version. The latest version of this +% license is in +% +% <http://www.latex-project.org/lppl.txt> +% +% and version 1.3 or later is part of all distributions of LaTeX version +% 2005/12/01 or later. +% +% This work has the LPPL maintenance status “maintainedâ€. +% +% The Current Maintainer of this work is Paul Gaborit. +% +% This work consists of the files sankey.dtx, sankey.ins and the derived +% files sankey.sty, tikzlibrarydubins.code.tex, sankey-doc-preamble.sty, +% sankey-example1.tex, sankey-example2.tex, sankey-example3.tex, +% sankey-example3-variation.tex, sankey-example4.tex, +% sankey-example-energy.tex +% +% +% \fi +% +% \iffalse +% +%<*driver> +\documentclass[a4paper,10pt,draft]{ltxdoc} +\usepackage{sankey-doc-preamble} +\EnableCrossrefs +\CodelineIndex +\RecordChanges +\begin{document} +\DocInput{sankey.dtx} +\end{document} +%</driver> +% \fi +% +% \CharacterTable +% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +% Digits \0\1\2\3\4\5\6\7\8\9 +% Exclamation \! Double quote \" Hash (number) \# +% Dollar \$ Percent \% Ampersand \& +% Acute accent \' Left paren \( Right paren \) +% Asterisk \* Plus \+ Comma \, +% Minus \- Point \. Solidus \/ +% Colon \: Semicolon \; Less than \< +% Equals \= Greater than \> Question mark \? +% Commercial at \@ Left bracket \[ Backslash \\ +% Right bracket \] Circumflex \^ Underscore \_ +% Grave accent \` Left brace \{ Vertical bar \| +% Right brace \} Tilde \~} +% +% +% \CheckSum{1718} +% +% +% \GetFileInfo{\jobname.dtx} +% +% \DoNotIndex{\newcommand,\newenvironment} +% \DoNotIndex{\#,\$,\%,\&,\@,\\,\{,\},\^,\_,\~,\ } +% \DoNotIndex{\begingroup,\endgroup,\begin,\end} +% \DoNotIndex{\def,\edef,\gdef,\xdef,\ifx,\else,\string,\relax} +% \DoNotIndex{\csname,\endcsname,\ifcsdef,\expandafter,\ifnumgreater} +% \DoNotIndex{\NewDocumentCommand,\NewDocumentEnvironment,\IfBooleanTF} +% \DoNotIndex{\NeedsTeXFormat,\ProvidesPackage,\RequirePackage,\PackageError,\PackageWarning} +% \DoNotIndex{\newtoggle,\toggletrue,\togglefalse,\iftoggle,\ifdefempty,\ifundef,\ifdefstrequal} +% \DoNotIndex{\ifbool,\ifdef,\ifnumequal,\ifpgfmathcond,\colorlet,\fpeval,\inteval,\newbool} +% \DoNotIndex{\pgfmathsetmacro,\pgfdeclarelayer,\pgfdeclareshape,\pgfkeys,\pgfset,\usetikzlibrary} +% \DoNotIndex{\the,\pgf@x,\pgf@y,\tikz@scan@one@point,\pgfutil@firstofone} +% \DoNotIndex{\pgfsetlayers,\inheritsavedanchors,\inheritanchor,\inheritanchorborder,\anchor,\pgf@process,\northeast,\southwest} +% \DoNotIndex{\pgfmathresult,\pgfinterruptpath,\endpgfinterruptpath,\pgfkeysvalueof,\pgfmathtruncatemacro,\pgfmathparse} +% \DoNotIndex{\tikzset,\pgfextra,\pgflinewidth,\foreach,\coordinate} +% \DoNotIndex{\path,\node,\pgfmathprintnumber,\n,\p,\x,\y} +% \DoNotIndex{\tiny,\ttfamily,\space} +% +% \title{The \textsf{sankey} package\\ +% Draw Sankey diagrams via TikZ} +% +% \author{Paul Gaborit +% (\href{mailto:paul.gaborit@gmail.com}{\texttt{paul.gaborit@gmail.com}})} +% \date{\fileversion{} -- \filedate{}} +% +% \GetFileInfo{sankey.sty} +% +% \def\manualparts{ +% \begin{quote} +% This manual contains three parts: +% \nameref{usermanual} (p.\pageref{usermanual}), +% \nameref{examples} (p.\pageref{examples}) +% and \nameref{implementation} (p.\pageref{implementation}). +% \end{quote} +% } +% +% \maketitle +% +% \hypersetup{ +% pdftitle=How to use the sankey package to build Sankey diagrams (\fileversion), +% pdfauthor=Paul Gaborit, +% } +% +% +% +% \begin{abstract} +% The \texttt{sankey} package provides macros and environments to +% build \emph{Sankey +% diagrams}\footnote{\url{https://en.wikipedia.org/wiki/Sankey_diagram}}, +% i.e. \emph{flow diagrams} in which the width of the arrows is +% proportional to the flow rate. The initial idea for the first +% implementation came out from +% \href{https://tex.stackexchange.com/q/40159/14500}{this question} on +% \href{https://tex.stackexchange.com/}{TeX.StackExchange}. +% +% +% \end{abstract} +% +% \manualparts +% +% \begin{quote} +% {\footnotesize Note: the \code{sankey.dtx} and \code{sankey.ins} +% files are attachments of the current PDF document.\par} +% \end{quote} +% +%^^A % ------------------------------------------------------------ +% \part{User manual} +% \label{usermanual} +%^^A % ------------------------------------------------------------ +% +% { +% \setlength{\parskip}{0pt} +% \localtableofcontents +% } +% +%^^A % ------------------------------------------------------------ +% \section{Preamble} +%^^A % ------------------------------------------------------------ +% +% To use the \code{sankey} package, insert the following line in your preamble: +% +% \begin{lstlisting}[style=LaTeXsmall] +% \usepackage{sankey} +% \end{lstlisting} +% +% {\small Note: the +% \code{sankey} package requires automatically the +% \code{xparse}, \code{etoolbox}, \code{xfp} and +% \code{tikz} packages, and the \code{calc}, +% \code{decorations.markings} and +% \code{dubins} (cf. \vref{sec:dubins}) TikZ libraries.\par} +% +% +%^^A % ------------------------------------------------------------ +% \section{The \texttt{sankeydiagram} environment} +%^^A % ------------------------------------------------------------ +% +% \DescribeEnv{sankeydiagram} % +% A \code{sankeydiagram} environment nested in a \code{tikzpicture} +% environment activates the sankey macros: +% +% \begin{lstlisting}[style=LaTeXsmall] +% \begin{tikzpicture} +% \begin{sankeydiagram}[... options ...] +% ... sankey macros ... +% \end{sankeydiagram} +% \end{tikzpicture} +% \end{lstlisting} +% +%^^A % ------------------------------------------------------------ +% \section{Sankey diagram options} +%^^A % ------------------------------------------------------------ +% +% The \code{sankey} package uses \code{pgfkeys} to set options via +% \emph{key=value} pairs with default path \texttt{/sankey} (and +% \texttt{/sankey/node parameters} for Sankey node parameters). +% +% The options can be defined via the optional argument of the +% \code{sankeydiagram} environment: +% +% \begin{lstlisting}[style=LaTeXsmall] +% \begin{sankeydiagram}[debug=true] +% \sankeynode{name=a,quantity=1,angle=0,at={0,0}} +% \end{sankeydiagram} +% \end{lstlisting} +% +% \DescribeMacro{\sankeyset} % +% The options can also be modified via the \code{\sankeyset} macro: +% +% \begin{lstlisting}[style=LaTeXsmall] +% \begin{sankeydiagram} +% \sankeyset{debug=true} +% \sankeynode{name=a,quantity=1,angle=0,at={0,0}} +% \end{sankeydiagram} +% \end{lstlisting} +% +% The options can be temporarily modified for a single macro: +% \begin{lstlisting}[style=LaTeXsmall] +% \begin{sankeydiagram} +% \sankeynode[debug=true]{name=a,quantity=1,angle=0,at={0,0}} +% \end{sankeydiagram} +% \end{lstlisting} +% +% At the begining of each Sankey diagram, all options are initialized +% with initial values then the \code{every diagram} style is applied. +% +% \begin{sankeyoption}{every diagram}{}{}{empty} +% This style is installed at beginning of each Sankey diagram. +% \end{sankeyoption} +% +% For instance, to use a ratio of 5mm/10 by default (instead of 1cm/10) +% for all Sankey diagrams, add the following line: +% +% \begin{lstlisting}[style=LaTeXsmall] +% \sankeyset{every diagram/.style={ratio=5mm/10}} +% \end{lstlisting} +% +%^^A % ------------------------------------------------------------ +% \subsection{Keys to choose the scale} +%^^A % ------------------------------------------------------------ +% +% The scale or ratio of the Sankey diagram is the ratio between the % +% \code{ratio length} and the \code{ratio quantity}. +% +% \begin{sankeyoption}{ratio quantity}{\VAR{number}}{}{10} +% Quantity (in units of flow) to define ratio. The \VAR{number} can be +% any math expression. +% \end{sankeyoption} +% +% \begin{sankeyoption}{ratio length}{\VAR{distance}}{}{1cm} +% Distance (a graphical distance) to define scale. +% \end{sankeyoption} +% +% \begin{sankeyoption}{ratio}{\VAR{distance}/\VAR{number}}{}{1cm/10} +% Fix the ratio to \VAR{distance}\texttt{/}\VAR{number}. +% \end{sankeyoption} +% +% The initial ratio is 1\,cm/10 units. +% +% +% \textbf{Note:} the \code{sankey} package uses the \code{xfp} package to +% evaluate all math expressions that use quantities (in units of +% flow). You can therefore use quantities of a very large or very small +% order of magnitude. In contrast, for graphic distances, the sankey +% package uses the \code{pgfmath} package (all calculations must not +% exceed $\pm 16383.99999$). +% +%^^A % ------------------------------------------------------------ +% \subsection{Keys to define rotate offset} +%^^A % ------------------------------------------------------------ +% +% \begin{sankeyoption}{rotate}{\VAR{angle}}{}{0} +% +% The \code{rotate} key stores an offset angle applied to all Sankey +% nodes. This is useful when using the \code{rotate} option within a +% \code{tikzpicture} or a \code{scope}. This TikZ option is only +% applied to coordinates and not to TikZ nodes (remember that Sankey +% nodes are TikZ nodes). It's up to the author to keep the +% \code{rotate} option of the \code{tikzpicture} and that of the +% \code{sankeydiagram} synchronous. +% +% \end{sankeyoption} +% +%^^A % ------------------------------------------------------------ +% \subsection{Keys to define drawing parameters} +%^^A % ------------------------------------------------------------ +% +% \begin{sankeyoption}{minimum radius}{\VAR{distance}}{}{5mm} +% The minimum radius used by \code{\sankeyturn} and +% \code{\sankeydubins}. +% \end{sankeyoption} +% +% \begin{sankeyoption}{outin steps}{\VAR{integer}}{}{10} +% Number of steps used by the \code{\sankeyoutin} macro to simulate flow +% lanes with constant width. +% \end{sankeyoption} +% +%^^A % ------------------------------------------------------------ +% \subsection{Keys to choose drawing styles} +%^^A % ------------------------------------------------------------ +% +% \begin{sankeyoption}{fill/.style}{\VAR{style}}{}{{line width=0pt,fill=white}} +% This TikZ style is used to \emph{fill} all sankey paths. +% \end{sankeyoption} +% +% \begin{sankeyoption}{draw/.style}{\VAR{style}}{}{draw=black,line width=.4pt} +% This TikZ style is used to \emph{draw} all sankey paths. +% \end{sankeyoption} +% +% \begin{sankeyoption}{start style}{\VAR{style name}}{}{none} +% There are three predefined \emph{start} styles: \constant{none}, +% \constant{simple}, \constant{arrow}. +% \end{sankeyoption} +% +% \begin{sankeyoption}{end style}{\VAR{style name}}{}{none} +% There are three predefined \emph{end} styles: \constant{none}, +% \constant{simple}, \constant{arrow}. +% \end{sankeyoption} +% +%^^A % ------------------------------------------------------------ +% \subsection{Keys to define new \emph{start} and \emph{end} styles} +%^^A % ------------------------------------------------------------ +% +% \begin{sankeyoption}{new start style}{\{\VAR{name}\}\{\VAR{fill +% path}\}\{\VAR{draw path}\}}{}{} +% Define the new start style named \VAR{name} with its \VAR{fill +% path} and its \VAR{draw path}. +% \end{sankeyoption} +% +% \begin{sankeyoption}{new end style}{\{\VAR{name}\}\{\VAR{fill +% path}\}\{\VAR{draw path}\}}{}{} +% Define the new end style named \VAR{name} with its \VAR{fill +% path} and its \VAR{draw path}. +% \end{sankeyoption} +% +% \emph{Fill} and \emph{draw} paths are build in a TikZ scope where the +% origin is the center of the current Sankey node (its name is accessible +% via \code{\name}) and the coordinate system is rotated by its +% orientation. +% +%^^A % ------------------------------------------------------------ +% \subsection{The \emph{debug} key} +%^^A % ------------------------------------------------------------ +% +% \begin{sankeyoption}{debug}{\VAR{boolean}}{true}{false} +% To debug a sankey diagram. +% \end{sankeyoption} +% +%^^A % ------------------------------------------------------------ +% \section{Sankey nodes and flows} +%^^A % ------------------------------------------------------------ +% +%^^A % ------------------------------------------------------------ +% \subsection{Create Sankey nodes} +%^^A % ------------------------------------------------------------ +% +%^^A % ------------------------------------------------------------ +% +% \begin{miniblock} +% \MACRO\code{\sankeynode}\OPTARG{\VAR{options}}\ARG{\VAR{node parameters}} +% +% \DescribeMacro{\sankeynode} % +% The \code{\sankeynode} macro defines a Sankey node. The \VAR{options} +% can be any Sankey diagram keys. To define a Sankey node, you must +% provide a \emph{name}, a \emph{quantity} and an \emph{angle} as +% \VAR{node parameters}. +% +% \begin{sankeyoption}[/sankey/node parameters]{name}{\VAR{name}}{}{} +% The \VAR{name} of the new Sankey node (and the associated TikZ node). +% \end{sankeyoption} +% +% \begin{sankeyoption}[/sankey/node parameters]{quantity}{\VAR{quantity}}{}{} +% The quantity (in flow unit) of the new Sankey node. The \VAR{quantity} +% can be any math expression. +% \end{sankeyoption} +% +% \begin{sankeyoption}[/sankey/node parameters]{angle}{\VAR{angle}}{}{} +% The orientation of the flow (0 points to the right) of the new Sankey +% node. +% \end{sankeyoption} +% +% \begin{sankeyoption}[/sankey/node parameters]{at}{\VAR{at}}{}{0,0} +% The position of the new Sankey node (a TikZ coordinate \emph{without} +% round brackets or parentheses). +% \end{sankeyoption} +% +% \begin{sankeyoption}[/sankey/node parameters]{anchor}{\VAR{anchor}}{}{center} +% Specify the anchor of the Sankey node. Possible values are +% \constant{center}, \constant{left} or \constant{right}. +% \end{sankeyoption} +% +% \begin{sankeyoption}[/sankey/node parameters]{as}{\VAR{name}}{}{} +% Copy the \emph{name}, the \emph{quantity}, the \emph{angle} and the +% \emph{position} of the Sankey node named \VAR{name}. +% \end{sankeyoption} +% +% A Sankey node is also a Tikz node but with only three anchors: +% \code{left}, \code{center} and \code{right}\footnote{In fact, to be +% able to use the TikZ \code{fit} library, the % +% \code{north}, \code{north east} and \code{north west} anchors exist +% and are equal to \code{left}, % +% the \code{east} and \code{west} anchors exist and are equal to +% \code{center} and % +% the \code{south}, \code{south east} and \code{south west} anchors +% exist and are equal to \code{right}.}: +% +% \begin{VerbatimOut}[gobble=2]{\samplecodename} +% \begin{tikzpicture} +% \begin{sankeydiagram}[debug] +% \sankeynode{name=a,quantity=10} +% \sankeynode{name=b,quantity=5,angle=45,at={2,1},anchor=left} +% \sankeynode{name=c,quantity=20,angle=-90,at={5,1},anchor=right} +% +% \foreach \nodename/\pos in {a/left,b/below left,c/above}{ +% \foreach \ancname in {left,center,right}{ +% \node[node font=\ttfamily\footnotesize,\pos=1mm of \nodename.\ancname, +% inner sep=0pt,rotate=\sankeygetnodeorient{\nodename},anchor=east] +% {\ancname\vphantom{g}}; +% \fill[black] (\nodename.\ancname) circle(1pt); +% } +% } +% \end{sankeydiagram} +% \end{tikzpicture} +% \end{VerbatimOut} +% % +% {\centering\input{\samplecodename}\par} +% % +% \lstinputlisting[style=LaTeXsmall]{\samplecodename} +% \end{miniblock} +%^^A % ------------------------------------------------------------ +% \subsubsection{Choose default parameters} +%^^A % ------------------------------------------------------------ +% +% \begin{sankeyoption}{every node/.style}{\{\VAR{node parameters}\}}{}{empty} +% The \VAR{node parameters} defined by the +% \code{every node} style is installed at the creation of every Sankey node. +% \end{sankeyoption} +% +%^^A % ------------------------------------------------------------ +% \subsubsection{Create starting and ending nodes via macros} +%^^A % ------------------------------------------------------------ +% +% \begin{miniblock} +% \MACRO\code{\sankeynodestart}\OPTARG{\VAR{options}}\ARG{\VAR{node parameters}} +% +% \DescribeMacro{\sankeynodestart} % +% The \code{\sankeynodestart} creates and fills/draws a starting Sankey +% node: +% +% +% \begin{VerbatimOut}[gobble=2]{\samplecodename} +% \begin{tikzpicture} +% \begin{sankeydiagram}[start style=arrow,fill/.style={fill=orange!20}] +% \sankeynodestart{name=a,quantity=10} +% \sankeynodestart{name=b,quantity=5,angle=45,at={2,1},anchor=left} +% \sankeynodestart{name=c,quantity=20,angle=-90,at={5,1},anchor=right} +% \end{sankeydiagram} +% \end{tikzpicture} +% \end{VerbatimOut} +% % +% {\centering\input{\samplecodename}\par} +% % +% \lstinputlisting[style=LaTeXsmall]{\samplecodename} +% \end{miniblock} +%^^A % ------------------------------------------------------------ +% +% +% \begin{miniblock} +% \MACRO\code{\sankeynodeend}\OPTARG{\VAR{options}}\ARG{\VAR{node +% parameters}} +% +% \DescribeMacro{\sankeynodeend} % +% The \code{\sankeynodeend} creates and fills/draws an ending Sankey +% node: +% +% \begin{VerbatimOut}[gobble=2]{\samplecodename} +% \begin{tikzpicture} +% \begin{sankeydiagram}[end style=simple,fill/.style={fill=orange!20}] +% \sankeynodeend{name=a,quantity=10} +% \sankeynodeend{name=b,quantity=5,angle=45,at={2,1},anchor=left} +% \sankeynodeend{name=c,quantity=20,angle=-90,at={5,1},anchor=right} +% \end{sankeydiagram} +% \end{tikzpicture} +% \end{VerbatimOut} +% % +% {\centering\input{\samplecodename}\par} +% % +% \lstinputlisting[style=LaTeXsmall]{\samplecodename} +% \end{miniblock} +% +%^^A % ------------------------------------------------------------ +% \subsubsection{Create starting and ending nodes via options} +%^^A % ------------------------------------------------------------ +% +% \begin{miniblock} +% \begin{sankeyoption}[/sankey/node parameters]{start}{\VAR{boolean}}{true}{false} +% The \code{\sankeynode} macro acts as the +% \code{\sankeynodestart} macro if you add the +% \code{start} option to its options. +% \end{sankeyoption} +% +% \begin{VerbatimOut}[gobble=2]{\samplecodename} +% \begin{tikzpicture} +% \begin{sankeydiagram}[start style=arrow,fill/.style={fill=orange!20}] +% \sankeynode{name=a,quantity=10,start} +% \sankeynode{name=b,quantity=5,angle=45,at={2,1},anchor=left,start} +% \sankeynode{name=c,quantity=20,angle=-90,at={5,1},anchor=right,start} +% \end{sankeydiagram} +% \end{tikzpicture} +% \end{VerbatimOut} +% % +% {\centering\input{\samplecodename}\par} +% % +% \lstinputlisting[style=LaTeXsmall]{\samplecodename} +% \end{miniblock} +% +% \begin{miniblock} +% \begin{sankeyoption}[/sankey/node parameters]{end}{\VAR{boolean}}{true}{false} +% The \code{\sankeynode} macro acts as the \code{\sankeynodeend} +% macro if you add the \code{end} option to its options. +% \end{sankeyoption} +% +% \begin{VerbatimOut}[gobble=2]{\samplecodename} +% \begin{tikzpicture} +% \begin{sankeydiagram}[end style=simple,fill/.style={fill=orange!20}] +% \sankeynode{name=a,quantity=10,end} +% \sankeynode{name=b,quantity=5,angle=45,at={2,1},anchor=left,end} +% \sankeynode{name=c,quantity=20,angle=-90,at={5,1},anchor=right,end} +% \end{sankeydiagram} +% \end{tikzpicture} +% \end{VerbatimOut} +% % +% {\centering\input{\samplecodename}\par} +% % +% \lstinputlisting[style=LaTeXsmall]{\samplecodename} +% \end{miniblock} +% +% +% \begin{miniblock} +% Although rarely necessary, you can mix these two parameters: +% +% \begin{VerbatimOut}[gobble=2]{\samplecodename} +% \begin{tikzpicture} +% \begin{sankeydiagram} +% \sankeyset{ +% end style=arrow, +% start style=arrow, +% fill/.style={fill=orange!20} +% } +% \sankeynode{name=a,quantity=10,start,end} +% \sankeynode{name=b,quantity=5,angle=45,at={2,1},anchor=left,start,end} +% \sankeynode{name=c,quantity=20,angle=-90,at={5,1},anchor=right,start,end} +% \end{sankeydiagram} +% \end{tikzpicture} +% \end{VerbatimOut} +% % +% {\centering\input{\samplecodename}\par} +% % +% \lstinputlisting[style=LaTeXsmall]{\samplecodename} +% +% \end{miniblock} +% +%^^A % ------------------------------------------------------------ +% \subsection{Retrieve information from Sankey nodes} +%^^A % ------------------------------------------------------------ +% +% \MACRO\code{\sankeygetnodeqty}\ARG{\VAR{node name}} +% +% \DescribeMacro{\sankeygetnodeqty} % +% The expandable command \code{\sankeygetnodeqty} returns the quantity +% assigned to the Sankey node named \VAR{node name}. +% +% \MACRO\code{\sankeyqtytolen}\ARG{\VAR{quantity}} +% +% \DescribeMacro{\sankeyqtytolen} % +% The expandable \code{\sankeyqtytolen} macro converts \VAR{quantity} to +% graphical length using the current ratio. +% +% \MACRO\code{\sankeygetnodeorient}\ARG{\VAR{node name}} +% +% \DescribeMacro{\sankeygetnodeorient} % +% The expandable command \code{\sankeygetnodeorient} returns the angle +% (orientation) assigned to the Sankey node named \VAR{node name}. +% +%^^A % ------------------------------------------------------------ +% \subsection{Move nodes} +%^^A % ------------------------------------------------------------ +% +% All the macros of this section move a Sankey node and fill/draw a +% portion of the Sankey flow. Then the previous position of the Sankey +% node is accessible via the \code{-old} suffix (i.e. if you move the +% \code{a} node, its previous position is the \code{a-old} node). +% +% The starred version of each of these macros moves in the opposite +% direction to their non-starred version. +% +% Except for the \code{\sankeyturn} macro, a negative value (distance or +% angle) moves in the opposite direction (the \code{\sankeyturn} macro +% is an exception: a negative angle turns right while a positive value +% turns left). +% +% {\centering +% \begin{tikzpicture} +% \begin{sankeydiagram} +% \tikzset{com/.style={node font=\ttfamily\scriptsize, +% fill=bgcode,fill opacity=1,text opacity=1}} +% \sankeyset{end style=simple,start style=simple} +% \sankeynode{name=ac,quantity=5} +% \sankeynode{name=al,quantity=5,at={[yshift=2mm]ac.left},anchor=right} +% \sankeynode{name=ar,quantity=5,at={[yshift=-2mm]ac.right},anchor=left} +% \sankeyturnleft{al}{60} +% \sankeyadvance{ac}{1cm} +% \sankeyturnright{ar}{60} +% \sankeyturnleft*{al-old}{60} +% \sankeyadvance*{ac-old}{1cm} +% \sankeyturnright*{ar-old}{60} +% \sankeystart{al-old} +% \sankeystart{ac-old} +% \sankeystart{ar-old} +% \sankeyend{al} +% \sankeyend{ac} +% \sankeyend{ar} +% \draw[red,very thick] +% (al-old-old.left) -- node[com]{n} (al-old-old.right) +% (ac-old-old.left) -- node[com]{n} (ac-old-old.right) +% (ar-old-old.left) -- node[com]{n} (ar-old-old.right); +% \path +% (al) ++(2mm,2mm) node[com,anchor=south west,align=left] { +% \string\sankeyturnleft\{n\}\{angle>0\}\\ +% \string\sankeyturnleftbackward\{n\}\{angle<0\}\\ +% \string\sankeyturnleft*\{n\}\{angle<0\}\\ +% \string\sankeyturnleftbackward*\{n\}\{angle>0\}\\ +% \string\sankeyturn\{n\}\{angle>0\} +% }; +% \path +% (al-old) ++(-2mm,2mm) node[com,anchor=south east,align=right] { +% \string\sankeyturnleftbackward\{n\}\{angle>0\}\\ +% \string\sankeyturnleft\{n\}\{angle<0\}\\ +% \string\sankeyturnleft*\{n\}\{angle>0\}\\ +% \string\sankeyturnleftbackward*\{n\}\{angle<0\}\\ +% \string\sankeyturn*\{n\}\{angle>0\} +% }; +% \path +% (ac) ++(2mm,0) node[com,anchor=west,align=left] { +% \string\sankeyadvance\{n\}\{distance>0\}\\ +% \string\sankeyadvance*\{n\}\{distance<0\} +% }; +% \path +% (ac-old) ++(-2mm,0) node[com,anchor=east,align=right] { +% \string\sankeyadvance\{n\}\{distance<0\}\\ +% \string\sankeyadvance*\{n\}\{distance>0\} +% }; +% \path +% (ar) ++(2mm,-2mm) node[com,anchor=north west,align=left] { +% \string\sankeyturnright\{n\}\{angle>0\}\\ +% \string\sankeyturnrightbackward\{n\}\{angle<0\}\\ +% \string\sankeyturnright*\{n\}\{angle<0\}\\ +% \string\sankeyturnrightbackward*\{n\}\{angle>0\}\\ +% \string\sankeyturn\{n\}\{angle<0\} +% }; +% \path +% (ar-old) ++(-2mm,-2mm) node[com,anchor=north east,align=right] { +% \string\sankeyturnrightbackward\{n\}\{angle>0\}\\ +% \string\sankeyturnright\{n\}\{angle<0\}\\ +% \string\sankeyturnright*\{n\}\{angle>0\}\\ +% \string\sankeyturnrightbackward*\{n\}\{angle<0\}\\ +% \string\sankeyturn*\{n\}\{angle<0\} +% }; +% \end{sankeydiagram} +% \end{tikzpicture} +% \par} +%^^A % ------------------------------------------------------------ +% \subsubsection{Macro to move straight (forward or backward)} +%^^A % ------------------------------------------------------------ +% +% +% \begin{miniblock} +% \MACRO\code{\sankeyadvance}\OPTARG{\VAR{options}}\ARG{\VAR{node +% name}}\ARG{\VAR{distance}} +% +% \DescribeMacro{\sankeyadvance} The \code{\sankeyadvance} moves the +% sankey node straight ahead and fills/draws this portion of the +% sankey path. A positive \VAR{distance} moves forward while a +% negative \VAR{distance} moves backward. +% +% \begin{VerbatimOut}[gobble=2]{\samplecodename} +% \begin{tikzpicture} +% \begin{sankeydiagram}[start style=arrow,fill/.style={fill=orange!20}] +% \sankeynodestart{name=a,quantity=10} +% \sankeyadvance{a}{1cm} +% \sankeynode[debug]{as=a} +% \sankeynode[debug]{as=a-old} +% \sankeynodestart{name=b,quantity=5,angle=45,at={2,1},anchor=left} +% \sankeyadvance{b}{1cm} +% \sankeynodestart{name=c,quantity=10,angle=-90,at={5,1},anchor=right} +% \sankeyadvance{c}{5mm} +% \end{sankeydiagram} +% \end{tikzpicture} +% \end{VerbatimOut} +% % +% {\centering\input{\samplecodename}\par} +% % +% \lstinputlisting[style=LaTeXsmall]{\samplecodename} +% \end{miniblock} +% +% \begin{miniblock} +% \MACRO\code{\sankeyadvance*}\OPTARG{\VAR{options}}\ARG{\VAR{node +% name}}\ARG{\VAR{distance}} +% +% \DescribeMacro{\sankeyadvance*} The \code{\sankeyadvance*} moves +% the sankey node straight back and fills/draws this portion of the +% sankey path. A positive \VAR{distance} moves backward while a +% negative \VAR{distance} moves forward. +% +% \begin{VerbatimOut}[gobble=2]{\samplecodename} +% \begin{tikzpicture} +% \begin{sankeydiagram}[end style=arrow,fill/.style={fill=orange!20}] +% \sankeynodeend{name=a,quantity=10} +% \sankeyadvance*{a}{1cm} +% \sankeynode[debug]{as=a} +% \sankeynode[debug]{as=a-old} +% \sankeynodeend{name=b,quantity=5,angle=45,at={2,1},anchor=left} +% \sankeyadvance*{b}{1cm} +% \sankeynodeend{name=c,quantity=10,angle=-90,at={5,1},anchor=right} +% \sankeyadvance*{c}{5mm} +% \end{sankeydiagram} +% \end{tikzpicture} +% \end{VerbatimOut} +% % +% {\centering\input{\samplecodename}\par} +% % +% \lstinputlisting[style=LaTeXsmall]{\samplecodename} +% \end{miniblock} +% +%^^A % ------------------------------------------------------------ +% \subsubsection{Macro to turn forward or backward} +%^^A % ------------------------------------------------------------ +% +%\begin{miniblock} +% \MACRO\code{\sankeyturn}\OPTARG{\VAR{options}}\ARG{\VAR{node +% name}}\ARG{\VAR{angle}} +% +% \DescribeMacro{\sankeyturn} The \code{\sankeyturn} macro moves the +% sankey node by turning to one side or the other and fills/draws +% this portion of the sankey path. A \emph{positive} \VAR{angle} +% turns left while a \emph{negative} \VAR{angle} turns right. +% +% \begin{VerbatimOut}[gobble=2]{\samplecodename} +% \begin{tikzpicture} +% \begin{sankeydiagram}[start style=arrow,fill/.style={fill=orange!20}] +% \sankeynodestart{name=a,quantity=10} +% \sankeyturn{a}{90} +% \sankeynode[debug]{as=a} +% \sankeynode[debug]{as=a-old} +% \sankeynodestart{name=b,quantity=5,angle=45,at={2,1},anchor=left} +% \sankeyturn[minimum radius=1cm]{b}{-45} +% \sankeynodestart{name=c,quantity=10,angle=-90,at={5,1},anchor=right} +% \sankeyturn{c}{180} +% \end{sankeydiagram} +% \end{tikzpicture} +% \end{VerbatimOut} +% +% {\centering\input{\samplecodename}\par} +% % +% \lstinputlisting[style=LaTeXsmall]{\samplecodename} +% \end{miniblock} +% +% \begin{miniblock} +% \MACRO\code{\sankeyturn*}\OPTARG{\VAR{options}}\ARG{\VAR{node +% name}}\ARG{\VAR{angle}} +% +% \DescribeMacro{\sankeyturn*} The \code{\sankeyturn*} macro moves the +% sankey node backward by turning right or left and fills/draws this +% portion of the sankey path. A \emph{positive} \VAR{angle} turns left +% while a \emph{negative} \VAR{angle} turns right. +% +% \begin{VerbatimOut}[gobble=2]{\samplecodename} +% \begin{tikzpicture} +% \begin{sankeydiagram}[end style=simple,fill/.style={fill=orange!20}] +% \sankeynodeend{name=a,quantity=10} +% \sankeyturn*{a}{90} +% \sankeynode[debug]{as=a} +% \sankeynode[debug]{as=a-old} +% \sankeynodeend{name=b,quantity=5,angle=45,at={2,1},anchor=left} +% \sankeyturn*[minimum radius=1cm]{b}{-45} +% \sankeynodeend{name=c,quantity=10,angle=-90,at={3,1},anchor=right} +% \sankeyturn*{c}{180} +% \end{sankeydiagram} +% \end{tikzpicture} +% \end{VerbatimOut} +% % +% {\centering\input{\samplecodename}\par} +% % +% \lstinputlisting[style=LaTeXsmall]{\samplecodename} +% \end{miniblock} +% +%^^A % ------------------------------------------------------------ +% \subsubsection{Macros to turn left (forward or backward)} +%^^A % ------------------------------------------------------------ +% +% \begin{miniblock} +% \MACRO\code{\sankeyturnleft}\OPTARG{\VAR{options}}\ARG{\VAR{node +% name}}\ARG{\VAR{angle}} +% +% \DescribeMacro{\sankeyturnleft} The +% \code{\sankeyturnleft} macro moves the sankey node by turning left +% and fills/draws this portion of the sankey path. A \emph{positive} +% \VAR{angle} turns forward while a \emph{negative} \VAR{angle} turns backward. +% +% \begin{VerbatimOut}[gobble=2]{\samplecodename} +% \begin{tikzpicture} +% \begin{sankeydiagram}[start style=arrow,end style=arrow] +% \sankeyset{fill/.style={fill=orange!20}} +% \sankeynodestart{name=a,quantity=10} +% \sankeyturnleft{a}{90} +% \sankeynode[debug]{as=a} +% \sankeynode[debug]{as=a-old} +% \sankeyset{fill/.style={fill=lime!20}} +% \sankeynodeend{name=b,quantity=5,angle=-135,at={1,2},anchor=left} +% \sankeyturnleft[minimum radius=1cm]{b}{-225} +% \end{sankeydiagram} +% \end{tikzpicture} +% \end{VerbatimOut} +% +% {\centering\input{\samplecodename}\par} +% % +% \lstinputlisting[style=LaTeXsmall]{\samplecodename} +% \end{miniblock} +% +% \begin{miniblock} +% \MACRO\code{\sankeyturnleft*}\OPTARG{\VAR{options}}\ARG{\VAR{node +% name}}\ARG{\VAR{angle}} +% +% \DescribeMacro{\sankeyturnleft*} The +% \code{\sankeyturnleft*} macro moves the sankey node backward +% by turning left and fills/draws this portion of the sankey path. +% A \emph{positive} \VAR{angle} turns backward while a +% \emph{negative} \VAR{angle} turns forward. +% +% \begin{VerbatimOut}[gobble=2]{\samplecodename} +% \begin{tikzpicture} +% \begin{sankeydiagram}[start style=arrow,end style=arrow] +% \sankeyset{fill/.style={fill=orange!20}} +% \sankeynodeend{name=a,quantity=10} +% \sankeyturnleft*{a}{90} +% \sankeynode[debug]{as=a} +% \sankeynode[debug]{as=a-old} +% \sankeyset{fill/.style={fill=lime!20}} +% \sankeynodestart{name=b,quantity=5,angle=-135,at={1,2},anchor=left} +% \sankeyturnleft*[minimum radius=.75cm]{b}{-225} +% \end{sankeydiagram} +% \end{tikzpicture} +% \end{VerbatimOut} +% +% {\centering\input{\samplecodename}\par} +% % +% \lstinputlisting[style=LaTeXsmall]{\samplecodename} +% \end{miniblock} +% +% \begin{miniblock} +% \MACRO\code{\sankeyturnleftbackward}\OPTARG{\VAR{options}}\ARG{\VAR{node +% name}}\ARG{\VAR{angle}} +% +% \DescribeMacro{\sankeyturnleftbackward} The +% \code{\sankeyturnleftbackward} macro moves the sankey node backward +% by turning left and fills/draws this portion of the sankey path. +% A \emph{positive} \VAR{angle} turns backward while a +% \emph{negative} \VAR{angle} turns forward. +% +% \begin{VerbatimOut}[gobble=2]{\samplecodename} +% \begin{tikzpicture} +% \begin{sankeydiagram}[start style=arrow,end style=arrow] +% \sankeyset{fill/.style={fill=orange!20}} +% \sankeynodeend{name=a,quantity=10} +% \sankeyturnleftbackward{a}{90} +% \sankeynode[debug]{as=a} +% \sankeynode[debug]{as=a-old} +% \sankeyset{fill/.style={fill=lime!20}} +% \sankeynodestart{name=b,quantity=5,angle=-135,at={1,2},anchor=left} +% \sankeyturnleftbackward[minimum radius=.75cm]{b}{-225} +% \end{sankeydiagram} +% \end{tikzpicture} +% \end{VerbatimOut} +% +% {\centering\input{\samplecodename}\par} +% % +% \lstinputlisting[style=LaTeXsmall]{\samplecodename} +% \end{miniblock} +% +% \begin{miniblock} +% \MACRO\code{\sankeyturnleftbackward*}\OPTARG{\VAR{options}}\ARG{\VAR{node +% name}}\ARG{\VAR{angle}} +% +% \DescribeMacro{\sankeyturnleftbackward*} The +% \code{\sankeyturnleftbackward*} macro moves the sankey node by turning left +% and fills/draws this portion of the sankey path. A \emph{positive} +% \VAR{angle} turns forward while a \emph{negative} \VAR{angle} turns backward. +% +% \begin{VerbatimOut}[gobble=2]{\samplecodename} +% \begin{tikzpicture} +% \begin{sankeydiagram}[start style=arrow,end style=arrow] +% \sankeyset{fill/.style={fill=orange!20}} +% \sankeynodestart{name=a,quantity=10} +% \sankeyturnleftbackward*{a}{90} +% \sankeynode[debug]{as=a} +% \sankeynode[debug]{as=a-old} +% \sankeyset{fill/.style={fill=lime!20}} +% \sankeynodeend{name=b,quantity=5,angle=-135,at={1,2},anchor=left} +% \sankeyturnleftbackward*[minimum radius=1cm]{b}{-225} +% \end{sankeydiagram} +% \end{tikzpicture} +% \end{VerbatimOut} +% +% {\centering\input{\samplecodename}\par} +% % +% \lstinputlisting[style=LaTeXsmall]{\samplecodename} +% \end{miniblock} +% +% +%^^A % ------------------------------------------------------------ +% \subsubsection{Macros to turn right (forward or backward)} +%^^A % ------------------------------------------------------------ +% +% \begin{miniblock} +% \MACRO\code{\sankeyturnright}\OPTARG{\VAR{options}}\ARG{\VAR{node +% name}}\ARG{\VAR{angle}} +% +% \DescribeMacro{\sankeyturnright} The \code{\sankeyturnright} macro +% moves the sankey node by turning right and fills/draws this portion +% of the sankey path. A \emph{positive} \VAR{angle} turns forward +% while a \emph{negative} \VAR{angle} turns backward. +% +% \begin{VerbatimOut}[gobble=2]{\samplecodename} +% \begin{tikzpicture} +% \begin{sankeydiagram}[start style=arrow,end style=arrow] +% \sankeyset{fill/.style={fill=orange!20}} +% \sankeynodestart{name=a,quantity=10} +% \sankeyturnright[fill/.style={fill=orange!20}]{a}{90} +% \sankeynode[debug]{as=a} +% \sankeynode[debug]{as=a-old} +% \sankeyset{fill/.style={fill=lime!20}} +% \sankeynodeend{name=b,quantity=5,angle=45,at={2,1},anchor=left} +% \sankeyturnright[minimum radius=.75cm]{b}{-225} +% \end{sankeydiagram} +% \end{tikzpicture} +% \end{VerbatimOut} +% +% {\centering\input{\samplecodename}\par} +% % +% \lstinputlisting[style=LaTeXsmall]{\samplecodename} +% \end{miniblock} +% +% \begin{miniblock} +% \MACRO\code{\sankeyturnright*}\OPTARG{\VAR{options}}\ARG{\VAR{node +% name}}\ARG{\VAR{angle}} +% +% \DescribeMacro{\sankeyturnright*} The \code{\sankeyturnright*} macro +% moves the sankey node backward by turning right and fills/draws +% this portion of the sankey path. A \emph{positive} \VAR{angle} turns +% backward while a \emph{negative} \VAR{angle} turns forward. +% +% \begin{VerbatimOut}[gobble=2]{\samplecodename} +% \begin{tikzpicture} +% \begin{sankeydiagram}[start style=arrow,end style=arrow] +% \sankeyset{fill/.style={fill=orange!20}} +% \sankeynodeend{name=a,quantity=10} +% \sankeyturnright*[fill/.style={fill=orange!20}]{a}{90} +% \sankeynode[debug]{as=a} +% \sankeynode[debug]{as=a-old} +% \sankeyset{fill/.style={fill=lime!20}} +% \sankeynodestart{name=b,quantity=5,angle=45,at={1,1},anchor=left} +% \sankeyturnright*[minimum radius=.75cm]{b}{-225} +% \end{sankeydiagram} +% \end{tikzpicture} +% \end{VerbatimOut} +% +% {\centering\input{\samplecodename}\par} +% % +% \lstinputlisting[style=LaTeXsmall]{\samplecodename} +% \end{miniblock} +% +% \begin{miniblock} +% \MACRO\code{\sankeyturnrightbackward}\OPTARG{\VAR{options}}\ARG{\VAR{node +% name}}\ARG{\VAR{angle}} +% +% \DescribeMacro{\sankeyturnrightbackward} +% The \code{\sankeyturnrightbackward} macro +% moves the sankey node backward by turning right and fills/draws +% this portion of the sankey path. A \emph{positive} \VAR{angle} turns +% backward while a \emph{negative} \VAR{angle} turns forward. +% +% \begin{VerbatimOut}[gobble=2]{\samplecodename} +% \begin{tikzpicture} +% \begin{sankeydiagram}[start style=arrow,end style=arrow] +% \sankeyset{fill/.style={fill=orange!20}} +% \sankeynodeend{name=a,quantity=10} +% \sankeyturnrightbackward[fill/.style={fill=orange!20}]{a}{90} +% \sankeynode[debug]{as=a} +% \sankeynode[debug]{as=a-old} +% \sankeyset{fill/.style={fill=lime!20}} +% \sankeynodestart{name=b,quantity=5,angle=45,at={1,1},anchor=left} +% \sankeyturnrightbackward[minimum radius=.75cm]{b}{-225} +% \end{sankeydiagram} +% \end{tikzpicture} +% \end{VerbatimOut} +% +% {\centering\input{\samplecodename}\par} +% % +% \lstinputlisting[style=LaTeXsmall]{\samplecodename} +% \end{miniblock} +% +% \begin{miniblock} +% \MACRO\code{\sankeyturnrightbackward*}\OPTARG{\VAR{options}}\ARG{\VAR{node +% name}}\ARG{\VAR{angle}} +% +% \DescribeMacro{\sankeyturnrightbackward*} The +% \code{\sankeyturnrightbackward*} macro moves the sankey +% node forward by turning right and fills/draws this portion +% of the sankey path. A \emph{positive} \VAR{angle} turns forward +% while a \emph{negative} \VAR{angle} turns backward. +% +% \begin{VerbatimOut}[gobble=2]{\samplecodename} +% \begin{tikzpicture} +% \begin{sankeydiagram}[start style=arrow,end style=arrow] +% \sankeyset{fill/.style={fill=orange!20}} +% \sankeynodestart{name=a,quantity=10} +% \sankeyturnrightbackward*[fill/.style={fill=orange!20}]{a}{90} +% \sankeynode[debug]{as=a} +% \sankeynode[debug]{as=a-old} +% \sankeyset{fill/.style={fill=lime!20}} +% \sankeynodeend{name=b,quantity=5,angle=45,at={2,1},anchor=left} +% \sankeyturnrightbackward*[minimum radius=.75cm]{b}{-225} +% \end{sankeydiagram} +% \end{tikzpicture} +% \end{VerbatimOut} +% +% {\centering\input{\samplecodename}\par} +% % +% \lstinputlisting[style=LaTeXsmall]{\samplecodename} +% \end{miniblock} +% +% +%^^A % ------------------------------------------------------------ +% \subsection{Links between nodes} +%^^A % ------------------------------------------------------------ +% +% The macros described in this section fill/draw a lane between two +% Sankey nodes. +% +% Note: since Sankey nodes are oriented, linking \code{A} node to +% \code{B} node does not produce the same result as linking \code{B} +% node to \code{A} node! +% +% \begin{miniblock} +% \MACRO\code{\sankeyoutin}\OPTARG{\VAR{options}}\ARG{\VAR{node +% A}}\ARG{\VAR{node B}} +% +% \DescribeMacro{\sankeyoutin} The \code{\sankeyoutin} macro +% fills/draws a lane from \VAR{node A} to \VAR{node B} using a +% Bézier curve with regular steps (10 steps by default) to +% simulate constant width lane. +% +% The constant width and the minimum curvature are \emph{not} guaranteed! +% \end{miniblock} +% +% \begin{miniblock} +% \MACRO\code{\sankeydubins}\OPTARG{\VAR{options}}\ARG{\VAR{node +% A}}\ARG{\VAR{node B}} +% +% \DescribeMacro{\sankeydubins} % +% The \code{\sankeydubins} macro fills/draws a lane between +% \VAR{node A} and \VAR{node B} using a Dubins +% path\footnote{\url{https://en.wikipedia.org/wiki/Dubins_path}}. +% +% The constant width and the minimum curvature are guaranteed. +% \end{miniblock} +% +%^^A % ------------------------------------------------------------ +% \subsubsection{Comparison between \texttt{outin} and \texttt{dubins} +% paths} +%^^A % ------------------------------------------------------------ +% +% The following diagrams compare \texttt{outin} path with +% 10 steps (orange), \texttt{outin} path with 2 steps (red) +% and \texttt{dubins} path (lime) in various positions. +% +% \begin{miniblock} +% \begin{VerbatimOut}[gobble=2]{\samplecodename} +% \begin{tikzpicture} +% \begin{sankeydiagram}[start style=simple,end style=arrow] +% \sankeyset{fill/.style={fill=orange!20}} +% \sankeynodestart{name=a,quantity=5} +% \sankeynodeend{name=b,at={4,3},quantity=5} +% \sankeyoutin{a}{b} +% +% \sankeyset{fill/.style={fill=red!20}} +% \sankeynodestart{name=a,at={2,0},quantity=5} +% \sankeynodeend{name=b,at={6,3},quantity=5} +% \sankeyoutin[outin steps=2]{a}{b} +% +% \sankeyset{fill/.style={fill=lime!40}} +% \sankeynodestart{name=a,at={4,0},quantity=5} +% \sankeynodeend{name=b,at={(8,3},quantity=5} +% \sankeydubins[minimum radius=5mm]{a}{b} +% \end{sankeydiagram} +% \end{tikzpicture} +% \end{VerbatimOut} +% % +% {\centering\input{\samplecodename}\par} +% % +% \lstinputlisting[style=LaTeXsmall]{\samplecodename} +% \end{miniblock} +% +% \begin{miniblock} +% \begin{VerbatimOut}[gobble=2]{\samplecodename} +% \begin{tikzpicture} +% \begin{sankeydiagram}[start style=simple,end style=arrow] +% \sankeyset{fill/.style={fill=orange!20}} +% \sankeynodestart{name=a,quantity=5} +% \sankeynodeend{name=b,at={2,3},quantity=5} +% \sankeyoutin{a}{b} +% +% \sankeyset{fill/.style={fill=red!20}} +% \sankeynodestart{name=a,at={2,0},quantity=5} +% \sankeynodeend{name=b,at={4,3},quantity=5} +% \sankeyoutin[outin steps=2]{a}{b} +% +% \sankeyset{fill/.style={fill=lime!40}} +% \sankeynodestart{name=a,at={4,0},quantity=5} +% \sankeynodeend{name=b,at={(6,3},quantity=5} +% \sankeydubins[minimum radius=5mm]{a}{b} +% \end{sankeydiagram} +% \end{tikzpicture} +% \end{VerbatimOut} +% % +% {\centering\input{\samplecodename}\par} +% % +% \lstinputlisting[style=LaTeXsmall]{\samplecodename} +% \end{miniblock} +% +% \begin{miniblock} +% \begin{VerbatimOut}[gobble=2]{\samplecodename} +% \begin{tikzpicture} +% \begin{sankeydiagram}[start style=simple,end style=arrow] +% \sankeyset{fill/.style={fill=orange!20}} +% \sankeynodestart{name=a,quantity=5} +% \sankeynodeend{name=b,at={0,3},quantity=5} +% \sankeyoutin{a}{b} +% +% \sankeyset{fill/.style={fill=red!20}} +% \sankeynodestart{name=a,at={2,0},quantity=5} +% \sankeynodeend{name=b,at={2,3},quantity=5} +% \sankeyoutin[outin steps=2]{a}{b} +% +% \sankeyset{fill/.style={fill=lime!40}} +% \sankeynodestart{name=a,at={4,0},quantity=5} +% \sankeynodeend{name=b,at={(4,3},quantity=5} +% \sankeydubins[minimum radius=5mm]{a}{b} +% \end{sankeydiagram} +% \end{tikzpicture} +% \end{VerbatimOut} +% % +% {\centering\input{\samplecodename}\par} +% % +% \lstinputlisting[style=LaTeXsmall]{\samplecodename} +% \end{miniblock} +% +%^^A % ------------------------------------------------------------ +% \subsubsection{Examples of \texttt{dubins} paths} +%^^A % ------------------------------------------------------------ +% +% \begin{miniblock} +% \begin{VerbatimOut}[gobble=2]{\samplecodename} +% \begin{tikzpicture} +% \begin{sankeydiagram}[start style=simple,end style=arrow] +% \sankeyset{ +% fill/.style={fill=lime!40}, +% draw/.style={draw=green!50!black,line width=2pt}, +% } +% +% \sankeynodestart{name=a,quantity=5} +% \sankeynodeend{name=b,at={0,2},quantity=5} +% \sankeydubins[minimum radius=2mm]{a}{b} +% +% \fill[green!50!black] (2,0) coordinate (c) circle(2pt); +% \sankeynodestart{name=a,at={[shift={(c)}]90:5mm},quantity=5} +% \sankeynodeend{name=b,at={[shift={(c)}]150:5mm},angle=60,quantity=5} +% \sankeydubins[minimum radius=2.5mm]{a}{b} +% +% \sankeynodestart{name=a,at={3.5,0},quantity=5} +% \sankeynodeend{name=b,at={3.5,.75},angle=-180,quantity=5} +% \sankeydubins[minimum radius=5mm]{a}{b} +% +% \sankeynodestart{name=a,at={7,1},quantity=5} +% \sankeynodeend{name=b,at={7,1.75},quantity=5} +% \sankeydubins[minimum radius=2.5mm]{a}{b} +% +% \sankeynodestart{name=a,at={9,0},quantity=5} +% \sankeynodeend{name=b,at={9,2},angle=180,quantity=5} +% \sankeydubins[minimum radius=2.5mm]{a}{b} +% \end{sankeydiagram} +% \end{tikzpicture} +% \end{VerbatimOut} +% % +% {\centering\input{\samplecodename}\par} +% % +% \lstinputlisting[style=LaTeXsmall]{\samplecodename} +% \end{miniblock} +% +%^^A % ------------------------------------------------------------ +% \subsection{Pure filling/drawing macros} +%^^A % ------------------------------------------------------------ +% +% \begin{miniblock} +% \MACRO\code{\sankeystart}\OPTARG{\VAR{options}}\ARG{\VAR{name}} +% +% \DescribeMacro{\sankeystart} % +% The \code{\sankeystart} fills/draws a starting extremity attached to +% the preexisting Sankey node \VAR{name}: +% +% +% \begin{VerbatimOut}[gobble=2]{\samplecodename} +% \begin{tikzpicture} +% \begin{sankeydiagram} +% [start style=arrow,fill/.style={fill=cyan!20},draw/.style={draw=blue}] +% \sankeynode{name=a,quantity=10} +% \sankeystart{a} +% \sankeynode{name=b,quantity=5,angle=45,at={2,1},anchor=left} +% \sankeystart{b} +% \sankeynode{name=c,quantity=20,angle=-90,at={5,1},anchor=right} +% \sankeystart{c} +% \end{sankeydiagram} +% \end{tikzpicture} +% \end{VerbatimOut} +% % +% {\centering\input{\samplecodename}\par} +% % +% \lstinputlisting[style=LaTeXsmall]{\samplecodename} +% \end{miniblock} +%^^A % ------------------------------------------------------------ +% +% +% \begin{miniblock} +% \MACRO\code{\sankeyend}\OPTARG{\VAR{options}}\ARG{\VAR{name}} +% +% \DescribeMacro{\sankeyend} % +% The \code{\sankeyend} fills/draws an ending extremity attached to +% the preexisting Sankey node \VAR{name}: +% +% \begin{VerbatimOut}[gobble=2]{\samplecodename} +% \begin{tikzpicture} +% \begin{sankeydiagram} +% [end style=simple,fill/.style={fill=cyan!20},draw/.style={draw=blue}] +% \sankeynode{name=a,quantity=10} +% \sankeyend{a} +% \sankeynode{name=b,quantity=5,angle=45,at={2,1},anchor=left} +% \sankeyend{b} +% \sankeynode{name=c,quantity=20,angle=-90,at={5,1},anchor=right} +% \sankeyend{c} +% \end{sankeydiagram} +% \end{tikzpicture} +% \end{VerbatimOut} +% % +% \lstinputlisting[style=LaTeXsmall]{\samplecodename} +% % +% {\centering\input{\samplecodename}\par} +% \end{miniblock} +% +%^^A % ------------------------------------------------------------ +% \subsection{Forked node} +%^^A % ------------------------------------------------------------ +% +%^^A % ------------------------------------------------------------ +% \subsubsection{Create and fork a Sankey node} +%^^A % ------------------------------------------------------------ +% +% \changes{v3.0}{2021/03/14}{add keys to fork a Sankey node during its +% creation} +% +% \begin{miniblock} +% When creating a new Sankey node, the \code{forked} and % +% \code{fork anchor} keys allow to fork the node directly \emph{and} to +% anchor it on an anchor of a forked subnode. +% +% \begin{sankeyoption}[/sankey/node parameters]{forked}{\{\VAR{quantity/name pairs}\}}{}{} +% The \VAR{quantity/name pairs} is a comma separated list of +% \emph{quantity/name} pairs (one for each subnode, from left to +% right). The sum of all quantities \emph{must} be equal to the quantity +% of the new node to fork. +% \end{sankeyoption} +% +% \begin{sankeyoption}[/sankey/node parameters]{fork anchor}{\VAR{node.anchor}}{}{} +% An anchor belonging to the new node \emph{or} belonging to a subnode +% (the anchor name must be prefixed by the name of the +% node). \emph{Note:} when a \code{fork anchor} key is supplied, the +% \code{anchor} key is ignored (with a \emph{warning} message). +% \end{sankeyoption} +% +% \begin{VerbatimOut}[gobble=2]{\samplecodename} +% \begin{tikzpicture} +% \begin{sankeydiagram} +% \sankeyset{ +% start style=arrow,end style=arrow, +% fill/.style={fill=yellow!10,line width=0pt,draw=yellow!10} +% } +% +% \sankeynode[debug]{ +% name=a,quantity=40,angle=-80, +% forked={25/b,10/c,5/d}, +% fork anchor=c.right, +% } +% +% \sankeyadvance*{b}{1cm} +% \sankeyturn*[minimum radius=2cm]{c}{-30} +% \sankeyturn*[minimum radius=2cm]{c}{30} +% \sankeyturn*[minimum radius=5mm]{d}{-90} +% \sankeyadvance{a}{1.5cm} +% \foreach \nodename in {b,c,d}{ \sankeystart{\nodename} } +% \sankeyend{a} +% \end{sankeydiagram} +% \end{tikzpicture} +% \end{VerbatimOut} +% % +% {\centering\input{\samplecodename}\par} +% % +% \lstinputlisting[style=LaTeXsmall]{\samplecodename} +% \end{miniblock} +% +% +%^^A % ------------------------------------------------------------ +% \subsubsection{Fork a Sankey node} +%^^A % ------------------------------------------------------------ +% \begin{miniblock} +% \MACRO\code{\sankeyfork}\OPTARG{\VAR{options}}\ARG{\VAR{name}}\ARG{\VAR{quantity/name pairs}} +% +% \DescribeMacro{\sankeyfork} % +% The \code{\sankeyfork} macro splits the preexisting Sankey node +% named \VAR{name} in a list of new Sankey subnodes. The +% \VAR{quantity/name pairs} is a comma separated list of +% \emph{quantity/name} pairs, one for each subnode from left to +% right. The sum of all quantities \emph{must} be equal to the +% quantity of the node to fork. +% +% \begin{VerbatimOut}[gobble=2]{\samplecodename} +% \begin{tikzpicture} +% \begin{sankeydiagram} +% \sankeynode{name=a,quantity=40,angle=-45} +% \sankeyfork[debug]{a}{25/b,10/c,5/d} +% \path (a.left) rectangle (a.right); %^^A create a bounding box +% \end{sankeydiagram} +% \end{tikzpicture} +% \end{VerbatimOut} +% % +% {\centering\input{\samplecodename}\par} +% % +% \lstinputlisting[style=LaTeXsmall]{\samplecodename} +% \end{miniblock} +% +%^^A % ------------------------------------------------------------ +% \section{Miscellaneous} +%^^A % ------------------------------------------------------------ +% +%^^A % ------------------------------------------------------------ +% \subsection{The \texttt{debug} layer} +%^^A % ------------------------------------------------------------ +% +% The options \code{debug} key uses the \code{sankeydebug} layer to draw +% above the \code{main} TikZ layer (via \code{\pgfsetlayers}, the +% \code{sankey} package installs four layers: \code{background}, +% \code{main}, \code{foreground}, \code{sankeydebug}). +% +% The four following styles define how to display debug information: +% +% \begin{lstlisting}[style=LaTeXsmall] +% \sankeyset{ +% debug color/.style={/utils/exec={\colorlet{debug color}{#1}}}, +% % debug color used by all debug macros +% debug color=red!75!black, +% % debug line between left and right anchors +% debug line/.style={overlay,draw=debug color,|-|}, +% % debug line between center and label +% debug normal/.style={overlay,draw=debug color}, +% % debug node label +% debug label/.style={ +% overlay, +% draw, +% font=\ttfamily\tiny, +% text=debug color,text opacity=1, +% inner sep=.1em, +% fill=white,fill opacity=1, +% rounded corners=.1em, +% node contents={\name}, +% }, +% } +% \end{lstlisting} +% +%^^A % ------------------------------------------------------------ +% \subsection{The \texttt{dubins} TikZ library} +% \label{sec:dubins} +%^^A % ------------------------------------------------------------ +% +% The \code{sankey} package uses the \code{dubins} TikZ library (the +% \code{tikzlibrarydubins.code.tex} file) to compute Dubins paths. The +% documentation for this library does not yet exist. +% +%^^A % ------------------------------------------------------------ +% \subsection{How to duplicate a Sankey node} +%^^A % ------------------------------------------------------------ +% +% \MACRO\code{\sankeynodealias}\ARG{\VAR{origname}}\ARG{\VAR{clonename}} +% +% \DescribeMacro{\sankeynodealias} % +% The \code{\sankeynodealias} macro clones the Sankey node named +% \VAR{origname} into the Sankey node named \VAR{clonename}. +% +% So, you can clone a Sankey node via two methods: +% +% \begin{lstlisting}[style=LaTeXsmall] +% \sankeynode{name=a,quantity=10} +% \sankeynode{as=a,name=b} +% \end{lstlisting} +% +% \begin{lstlisting}[style=LaTeXsmall] +% \sankeynode{name=a,quantity=10} +% \sankeynodealias{a}{b} +% \end{lstlisting} +% +%^^A % ------------------------------------------------------------ +% \subsection{How to define new start and end styles} +%^^A % ------------------------------------------------------------ +% +% Here are the definitions of the \code{arrow} styles: +% +% \begin{lstlisting}[style=LaTeXsmall] +% \sankeyset{ +% %% arrow style +% new start style={arrow}{ +% (\name.left) -- ++(-10pt,0) +% -- ([xshift=-10pt/6]\name.center) +% -- ([xshift=-10pt]\name.right) +% -- (\name.right) -- cycle +% }{ +% (\name.left) -- ++(-10pt,0) +% -- ([xshift=-10pt/6]\name.center) +% -- ([xshift=-10pt]\name.right) +% -- (\name.right) +% }, +% new end style={arrow}{ +% (\name.left) -- ([yshift=1mm]\name.left) +% -- ([xshift=10pt]\name.center) +% -- ([yshift=-1mm]\name.right) -- (\name.right) -- cycle +% }{ +% (\name.left) -- ([yshift=1mm]\name.left) +% -- ([xshift=10pt]\name.center) +% -- ([yshift=-1mm]\name.right) -- (\name.right) +% }, +% } +% \end{lstlisting} +% +%^^A % ------------------------------------------------------------ +% \section{Todo} +%^^A % ------------------------------------------------------------ +% +% \begin{itemize} +% \item Document the \code{dubins} TikZ library. +% \item Add a tutorial. +% \item Add examples with cycle(s). +% \end{itemize} +% +% ^^A % ------------------------------------------------------------ +% \clearpage +% +% \manualparts +% +% \part{Examples} +% \label{examples} +%^^A % ------------------------------------------------------------ +% { +% \setlength{\parskip}{0pt} +% \localtableofcontents +% \listoffigures +% } +% +% \tikzset{every picture/.style={}} +%^^A % ------------------------------------------------------------ +% +%^^A % ------------------------------------------------------------ +% \clearpage +% \section{Simple example} +%^^A % ------------------------------------------------------------ +% +% \embedfile[mimetype=text/plain]{sankey-example1.tex} +% +% \begin{figure} +% \centering +% {\MakePercentComment\input{sankey-example1.tex}} +% \caption{Simple example} +% \label{fig:simple-example} +% \end{figure} +% +% See figure~\vref{fig:simple-example}. The \code{sankey-example1.tex} +% file contains the following code and is an attachement of the current +% PDF document. +% +% \lstinputlisting[style=LaTeXsmall]{sankey-example1.tex} +% +% \iffalse +%<*example1> +\begin{tikzpicture} + \begin{sankeydiagram}%[debug] + \colorlet{cold}[rgb]{cyan!75!blue!50!white} + \colorlet{hot}[rgb]{red!50!orange!75!white} + \sankeyset{ + ratio=90pt/6,minimum radius=15pt, + start style=simple,end style=simple, + draw/.style={ + draw=blue!50!cyan, + line width=1pt,line cap=round,line join=round, + }, + cold/.style={ + fill/.style={ + draw=cold,line width=0pt,fill=cold, + }, + }, + cold to hot/.style={ + fill/.style={ + fill=none,top color=cold, + bottom color=hot,middle color=yellow, + }, + }, + hot/.style={ + fill/.style={ + draw=hot,line width=0pt,fill=hot, + }, + }, + } + + \sankeyset{cold} + \sankeynodestart{name=p0,at={100,0},angle=-90,quantity=6} + \sankeyadvance{p0}{50pt} + \sankeyfork{p0}{3/p1,3/p2} + \sankeyturnleft{p1}{90} + \sankeyadvance{p1}{20pt} + \sankeyadvance{p2}{60pt} + \sankeyfork{p2}{2/p3,1/p4} + \sankeyturnleft{p3}{90} + \sankeyadvance{p3}{50pt} + \sankeyfork{p3}{1/p5,1/p6} + \sankeyadvance{p5}{70pt} + \sankeyfork{p1}{1/p7,1/p8,1/p9} + \sankeyadvance{p7}{50pt} + \sankeyadvance{p9}{50pt} + \sankeyadvance{p4}{40pt} + \sankeyturnleft{p4}{90} + \sankeyadvance{p4}{65pt} + \sankeyadvance{p7}{40pt} + \sankeynode{ + name=p11,at={[shift={(50pt,-15pt)}]p7},quantity=3, + forked={1/p7a,1/p9a,1/p5a}, + } + \sankeyoutin{p7}{p7a} + \sankeyoutin{p9}{p9a} + \sankeyoutin{p5}{p5a} + \sankeyadvance{p11}{30pt} + \sankeyend{p11} + \sankeyturnright{p8}{90} + \sankeyturnright{p6}{90} + \sankeyturnright{p4}{90} + \sankeyset{hot} + \sankeyadvance[cold to hot]{p8}{40pt} + \sankeynode{ + name=p10,at={[shift={(-15pt,-60pt)}]p8},angle=-90,quantity=3, + forked={1/p8a,1/p6a,1/p4a}, + } + \sankeyoutin[cold to hot]{p4}{p4a} + \sankeyoutin[cold to hot]{p6}{p6a} + \sankeyoutin{p8}{p8a} + \sankeyadvance{p10}{30pt} + \sankeyend{p10} + \end{sankeydiagram} +\end{tikzpicture} +%</example1> +% \fi +% +%^^A % ------------------------------------------------------------ +% \clearpage +% \section{Energy diagram} +%^^A % ------------------------------------------------------------ +% +% \embedfile[mimetype=text/plain]{sankey-example-energy.tex} +% +% \begin{figure} +% \centering +% {\MakePercentComment\input{sankey-example-energy.tex}} +% \caption{Energy diagram} +% \label{fig:very-simple-example} +% \end{figure} +% +% This example comes from +% \href{https://ibphysicsblog.wordpress.com/2015/10/23/sankey-diagrams/}{IB +% Pysics Blog} by Kyu Won Shim. +% +% See figure~\vref{fig:very-simple-example}. The \code{sankey-example-energy.tex} +% file contains the following code and is an attachement of the current +% PDF document. +% +% \lstinputlisting[style=LaTeXsmall]{sankey-example-energy.tex} +% +% \iffalse +%<*example-energy> +\begin{tikzpicture} + % font choice + \renewcommand\rmdefault{txr}\rmfamily\footnotesize + \sisetup{ + round-mode=places, + round-precision=1, + add-decimal-zero, + round-integer-to-decimal, + } + \begin{sankeydiagram} + \colorlet{energy}{blue!30!cyan!80!black} + \colorlet{lost energy}{red!50!orange!90!black} + \sankeyset{ + ratio=13em/100, + minimum radius=1em, + start style=simple,end style=simple, + draw/.style={draw=none,line width=0}, + energy/.style={ + fill/.style={ + draw=energy, + line width=0, + fill=energy, + } + }, + lost energy/.style={ + fill/.style={ + draw=lost energy, + line width=0, + fill=lost energy, + } + } + } + + \newcommand\abovelabel[2]{ % valname, label + \node[anchor=south east,align=center,inner xsep=0] at (#1.left) {#2}; + } + + \newcommand\energylabel[1]{ % valname + \node[anchor=north east,text=energy,inner xsep=0] at (#1.right) + {\num{\sankeygetnodeqty{#1}}}; + } + + \newcommand\lostenergylabel[2]{ % valname, label + \node[anchor=north,text=lost energy] at ([yshift=-2.5mm]#1.center) + (value) + {\num{\sankeygetnodeqty{#1}}}; + \node[anchor=north,inner sep=0,align=center] at (value.south) {#2}; + } + + \newcommand\lostenergylabelbottom[2]{ % valname, label + \draw[draw=lost energy,dashed,thick] + ([yshift=-3mm]#1.center) coordinate (#1) -- ([yshift=-3mm]#1.center); + \lostenergylabel{#1}{#2} + } + + \sankeynode{name=Co,quantity=100.0} + \path (Co.right) ++(0,-7mm) coordinate (c); + + \newcommand\turnandstop[2]{ % valname, label + \begingroup + \sankeyset{lost energy} + \sankeyturnright{#1}{90} + \sankeynode{as=#1,name=#1-stop,at={#1 |- c}} + \sankeyoutin{#1}{#1-stop} + \sankeynode{as=#1-stop,name=#1} + \sankeyend{#1} + \lostenergylabel{#1}{#2} + \endgroup + } + + \newcommand\turnandstopbottom[2]{ % valname, label + \begingroup + \sankeyset{lost energy} + \sankeyturnright{#1}{90} + \sankeynode{as=#1,name=#1-stop,at={#1 |- c}} + \sankeyoutin{#1}{#1-stop} + \sankeynode{as=#1-stop,name=#1} + \sankeyend{#1} + \lostenergylabelbottom{#1}{#2} + \endgroup + } + + \def\hshift{6.25em} + + \sankeyadvance[energy]{Co}{1.2*\hshift} + \abovelabel{Co}{\textbf{Coal}\\(Primary energy)} + \energylabel{Co} + \sankeyfork{Co}{35/El1,65/Pg} + \turnandstop{Pg}{Power generation} + + \sankeyadvance[energy]{El1}{1.8*\hshift} + \abovelabel{El1}{\textbf{Electricity}\\(Secondary energy)} + \energylabel{El1} + \sankeyfork{El1}{33.5/El2,1.5/Tr} + \turnandstopbottom{Tr}{Transmission} + + \sankeyadvance[energy]{El2}{.65*\hshift} + \energylabel{El2} + \sankeyfork{El2}{31.5/El3,2.0/Di} + \turnandstop{Di}{Distribution} + + \sankeyadvance[energy]{El3}{.65*\hshift} + \energylabel{El3} + \sankeyfork{El3}{31.0/El4,0.5/Wi} + \turnandstopbottom{Wi}{Wiring} + + \sankeyadvance[energy]{El4}{.65*\hshift} + \abovelabel{El4}{\textbf{Electricity}\\(Final energy)} + \energylabel{El4} + \sankeyfork{El4}{3.0/Lr1,28.0/Lb} + \turnandstop{Lb}{Lightbulb} + + \sankeyadvance[energy]{Lr1}{1.1*\hshift} + \abovelabel{Lr1}{\textbf{Light radiation}\\(Useful energy)} + \energylabel{Lr1} + \sankeyfork{Lr1}{2.0/Lr2,1.0/Ls} + \turnandstopbottom{Ls}{Lampshade} + + \sankeyadvance[energy]{Lr2}{.6*\hshift} + \energylabel{Lr2} + \sankeyfork{Lr2}{1.0/Il,1.0/Id} + \turnandstop{Id}{Idle} + + \sankeyadvance[energy]{Il}{.6*\hshift} + \abovelabel{Il}{\textbf{Illumination}\\(Energy services)} + \energylabel{Il} + \sankeyend[energy]{Il} + \end{sankeydiagram} +\end{tikzpicture} +%</example-energy> +% \fi +%^^A % ------------------------------------------------------------ +% \clearpage +% \section{Example from question on TeX.se} +%^^A % ------------------------------------------------------------ +% +% \changes{v3.0}{2021/03/14}{fix bad names in second example} +% +% \embedfile[mimetype=text/plain]{sankey-example2.tex} +% +% \begin{figure} +% \centering +% {\MakePercentComment\input{sankey-example2}} +% \caption{Example from TeX.se question} +% \label{fig:texse-example} +% \end{figure} +% +% This example came from +% \href{https://tex.stackexchange.com/q/40159/14500}{this question} on +% \href{https://tex.stackexchange.com/}{TeX.StackExchange}. +% +% See figure~\vref{fig:texse-example}. The \code{sankey-example2.tex} +% file contains the following code and is an attachement of the current +% PDF document. +% +% \lstinputlisting[style=LaTeXsmall]{sankey-example2} +% +% \iffalse +%<*example2> +\begin{tikzpicture} + \renewcommand*\sfdefault{txss} + + \begin{sankeydiagram}%[debug] + \sankeyset{ + ratio=4cm/524.3, + minimum radius=3mm, + start style=arrow, + end style=arrow, + fill/.style={ + line width=0pt, + fill=cyan!50!blue!50!black, + draw=cyan!50!blue!50!black, + }, + draw/.style={draw=none}, + every node/.style={angle=-90}, + } + + \sankeynodestart{name=B,at={-.5,0},quantity=7.2} + \coordinate[below=1mm of B.center] (B label); + \sankeyadvance{B}{5mm} + \sankeynodestart{name=GI,at={1,0},quantity=137.3} + \coordinate[below=1mm of GI.center] (GI label); + \sankeyadvance{GI}{5mm} + \sankeynodestart{name=I,at={4,0},quantity=397.8} + \coordinate[below=1mm of I.center] (I label); + \sankeynode{ + name=EI,at={2.86,-3},quantity=542.3, + forked={397.8/Ia,137.3/GIa,7.2/Ba} + } + \sankeydubins[minimum radius=1.2cm]{I}{Ia} + \sankeyoutin{GI}{GIa} + \sankeyoutin{B}{Ba} + \sankeyadvance{EI}{5mm} + \coordinate (EI label) at (EI); + \sankeyadvance{EI}{5mm} + \sankeyfork{EI}{63.1/EB,479.2/P} + + \sankeyturnleft{EB}{90} + \sankeyadvance{EB}{4cm} + \coordinate (EB label) at ($(EB)!.5!(EB-old)$); + \sankeyend{EB} + + \sankeyadvance{P}{10mm} + \coordinate (P label) at (P); + \sankeyadvance{P}{5mm} + + \sankeyfork{P}{33.5/NV,445.7/P-NV} + + { + \colorlet{NV color}{cyan!80!lime!50!gray} + \sankeyset{fill/.append style={fill=NV color,draw=NV color}} + \sankeyturnleft{NV}{90} + \sankeynode{as=NV,name=NV2,at=NV -| EB} + \sankeyoutin{NV}{NV2} + \coordinate (NV label) at (NV -| EB label); + \sankeyend{NV2} + } + + \sankeyadvance{P-NV}{10mm} + \sankeyfork{P-NV}{118.1/U,327.6/P-NV-U} + + { + \sankeyset{ + fill/.style={fill=orange!70!gray!50,draw=orange!70!gray!50} + } + \sankeyturnleft{U}{90} + \sankeynode{as=U,name=U2,at=U -| EB} + \sankeyoutin{U}{U2} + \coordinate (U label) at (U -| EB label); + \sankeyend{U2} + } + + \sankeyadvance{P-NV-U}{10mm} + \sankeyfork{P-NV-U}{327.2/P-NV-U-SD,0.4/SD} + + { + \sankeyturnright{SD}{90} + \sankeyadvance{SD}{15mm} + \coordinate (SD label) at (SD); + \sankeyadvance{SD}{15mm} + \sankeyend{SD} + } + + \sankeyadvance{P-NV-U-SD}{8mm} + \sankeyfork{P-NV-U-SD}{18.8/VE,308.4/E} + + { + \sankeyset{fill/.append style={orange!70!gray!30}} + \sankeyturnleft{VE}{90} + \sankeynode{as=VE,name=VE2,at=VE -| EB} + \sankeyoutin{VE}{VE2} + \coordinate (VE label) at (VE -| EB label); + \sankeyend{VE2} + } + + \sankeyadvance{E}{8mm} + \coordinate (E label) at (E); + \sankeyadvance{E}{20mm} + \sankeyfork{E}{135.1/H+GHD,87.2/V,86.1/In} + + \sankeyturnright{In}{90} + \sankeyadvance{In}{10mm} + \sankeyturnleft{In}{90} + \sankeyadvance{In}{5mm} + \coordinate (In label) at (In); + \sankeyadvance{In}{10mm} + \sankeyend{In} + + \sankeynode{as=V,name=V2,at=V|-In label} + \sankeyoutin{V}{V2} + \coordinate (V label) at (V2); + \sankeyadvance{V2}{10mm} + \sankeyend{V2} + + \sankeyturnleft{H+GHD}{90} + \sankeyadvance{H+GHD}{5mm} + \sankeyfork{H+GHD}{47.0/GHD,88.1/H} + + \sankeyturnright{H}{90} + \sankeynode{as=H,name=H2,at=H|-In label} + \sankeyoutin{H}{H2} + \coordinate (H label) at (H2); + \sankeyadvance{H2}{10mm} + \sankeyend{H2} + + \sankeyadvance{GHD}{30mm} + \sankeyturnright{GHD}{90} + \sankeynode{as=GHD,name=GHD2,at=GHD|-In label} + \sankeyoutin{GHD}{GHD2} + \coordinate (GHD label) at (GHD2); + \sankeyadvance{GHD2}{10mm} + \sankeyend{GHD2} + \end{sankeydiagram} + + % labels + \tikzset{ + label/.style={ + fill=white,fill opacity=.8,text opacity=1, + inner sep=1mm, + text=cyan!50!blue!50!black, + inner xsep=2mm, + font=\sffamily\bfseries\footnotesize, + align=center, + }, + } + \node[label,anchor=north] (B label) at (B label) {7.2}; + \node[label,left=1mm of B label] {Bestands-\\entnahme}; + \node[label,anchor=north] at (GI label) {137.3}; + \node[label,above=5mm of GI label] {Gewinnung\\im Inland}; + \node[label,anchor=north] at (I label) {397.8}; + \node[label,above=5mm of I label] {Import}; + + \node[label] at (EI label) {542.3\\Energieaufkommen im Inland}; + + \node[label,anchor=center] (EB label) at (EB label) {63.1}; + \node[label,above=1mm of EB label] {Export und\\Bunkerung}; + + \node[label] at (P label) {479.2\\Primärenergieverbrauch}; + + \node[label,anchor=center] (NV label) at (NV label) {33.5}; + \node[label,above=0mm of NV label] {Nichtenergetischer Verbrauch}; + + \node[label,anchor=center] (U label) at (U label) {118.1}; + \node[label,below=3mm of U label] {Umwandlungsverluste}; + + \node[label,anchor=center] (SD label) at (SD label) {0.4}; + \node[label,above=0mm of SD label] {Statistische\\Differenzen}; + + \node[label,anchor=center] (VE label) at (VE label) {18.8}; + \node[label,below=0mm of VE label] {Verbrauch in den\\Energiesktoren}; + + \node[label,anchor=north] (E label) at (E label) + {308.4\\Endenergieverbrauch}; + + \node[label,anchor=north] (In label) at (In label) {86.1}; + \node[label,anchor=north,below=1cm of In label] {Industrie}; + + \node[label,anchor=north] (V label) at (V label) {87.2}; + \node[label,anchor=north,below=1cm of V label] {Verkehr}; + + \node[label,anchor=north] (H label) at (H label) {88.1}; + \node[label,anchor=north,below=1cm of H label] {Haushalte}; + + \node[label,anchor=north] (GHD label) at (GHD label) {47.0}; + \node[label,anchor=north,below=1cm of GHD label] + {Gewerbe, Handel\\Diensleistungen}; +\end{tikzpicture} +%</example2> +% \fi +% +%^^A % ------------------------------------------------------------ +% \clearpage +% \section{Reproduction of an example from Google Charts documentation} +%^^A % ------------------------------------------------------------ +% +% \changes{v3.0}{2021/03/14}{add the reproduction of an example from +% Google Charts documentation} +% +% \embedfile[mimetype=text/plain]{sankey-example3.tex} +% +% This example is a reproduction of an example of Google +% Charts Documentation\footnote{\url{https://developers.google.com/chart/interactive/docs/gallery/sankey}}. +% +% See figure \vref{fig:google-example}. The \code{sankey-example3.tex} +% file contains the following code and is an attachement of the current +% PDF document. +% +% \begin{figure} +% \centering +% {\MakePercentComment\input{sankey-example3}} +% \caption{Reproduction of an example from Google Charts +% documentation} +% \label{fig:google-example} +% \end{figure} +% +% \lstinputlisting[style=LaTeXsmall]{sankey-example3} +% +% \iffalse +%<*example3> +\begin{tikzpicture} + \begin{sankeydiagram}%[debug] + \sffamily + \sankeyset{ + ratio=1cm/10, + outin steps=2, + draw/.style={draw=none,line width=0pt}, + color/.style={fill/.style={fill=#1,fill opacity=.75}}, + shade/.style 2 args={fill/.style={left color=#1, + right color=#2,fill opacity=.5}}, + % colors + @define HTML color/.code args={#1/#2}{\definecolor{#1}{HTML}{#2}}, + @define HTML color/.list={ + cyan/a6cee3,lime/b2df8a,red/fb9a99,orange/fdbf6f, + violet/cab2d6,yellow/ffff99,blue/1f78b4,green/33a02c + }, + % colors of countries + @let country color/.code args={#1/#2}{\colorlet{#1}[rgb]{#2}}, + @let country color/.list={ + CA/red,US/orange,MX/orange,BR/cyan,FR/lime,GB/red, + SP/lime,PT/cyan,ML/blue,SN/violet,MA/yellow, + AO/violet,ZA/yellow,IN/green,JP/green,CN/blue + }, + } + \def\vdist{5mm} + \def\hwidth{.5em} + \def\hdist{4.1cm} + + \sankeynode{name=CA,quantity=7} + \sankeynode{name=US,quantity=8,at={[yshift=\vdist]CA.left},anchor=right} + \sankeynode{name=MX,quantity=8,at={[yshift=\vdist]US.left},anchor=right} + \sankeynode{name=BR,quantity=8,at={[yshift=\vdist]MX.left},anchor=right} + + \foreach \country in {CA,US,MX,BR}{ + \sankeyadvance[color=\country]{\country}{\hwidth} + } + + \sankeyfork{CA}{1/CA-to-PT,1/CA-to-GB,5/CA-to-FR} + \sankeyfork{US}{1/US-to-PT,1/US-to-SP,5/US-to-GB,1/US-to-FR} + \sankeyfork{MX}{1/MX-to-PT,5/MX-to-SP,1/MX-to-GB,1/MX-to-FR} + \sankeyfork{BR}{5/BR-to-PT,1/BR-to-SP,1/BR-to-GB,1/BR-to-FR} + + \sankeynode{name=FR,quantity=11, + at={[xshift=\hdist]CA.right},anchor=right} + \sankeynode{name=GB,quantity=11, + at={[yshift=\vdist]FR.left},anchor=right} + \sankeynode{name=SP,quantity=7, + at={[yshift=\vdist]GB.left},anchor=right} + \sankeynode{name=PT,quantity=8, + at={[yshift=\vdist]SP.left},anchor=right} + + \sankeyfork{FR} + {1/FR-from-BR,1/FR-from-MX,1/FR-from-US,5/FR-from-CA,3/FR-from-00} + \sankeyfork{GB} + {1/GB-from-BR,1/GB-from-MX,5/GB-from-US,1/GB-from-CA,3/GB-from-00} + \sankeyfork{SP}{1/SP-from-BR,5/SP-from-MX,1/SP-from-US} + \sankeyfork{PT}{5/PT-from-BR,1/PT-from-MX,1/PT-from-US,1/PT-from-CA} + + \foreach \country in {FR,GB,SP,PT}{ + \sankeyadvance[color=\country]{\country}{\hwidth} + } + + \sankeyfork{FR}{1/FR-to-ZA,1/FR-to-AO,3/FR-to-MA,3/FR-to-SN,3/FR-to-ML} + \sankeyfork{GB}{7/GB-to-ZA,1/GB-to-AO,2/GB-to-MA,1/GB-to-SN} + \sankeyfork{SP}{1/SP-to-ZA,3/SP-to-MA,1/SP-to-SN,2/SP-to-00} + \sankeyfork{PT}{3/PT-to-ZA,2/PT-to-AO,1/PT-to-MA,1/PT-to-SN,1/PT-to-00} + + \sankeynode{name=ML,quantity=9, + at={[xshift=\hdist]FR.right},anchor=right} + \sankeynode{name=SN,quantity=9, + at={[yshift=\vdist]ML.left},anchor=right} + \sankeynode{name=MA,quantity=9, + at={[yshift=\vdist]SN.left},anchor=right} + \sankeynode{name=AO,quantity=9, + at={[yshift=\vdist]MA.left},anchor=right} + \sankeynode{name=ZA,quantity=12, + at={[yshift=\vdist]AO.left},anchor=right} + + \sankeyfork{ML}{3/ML-from-FR,6/Mail-from-00} + \sankeyfork{SN} + {1/SN-from-PT,1/SN-from-SP,1/SN-from-GB,3/SN-from-FR,3/SN-from-00} + \sankeyfork{MA}{1/MA-from-PT,3/MA-from-SP,2/MA-from-GB,3/MA-from-FR} + \sankeyfork{AO}{2/AO-from-PT,1/AO-from-GB,1/AO-from-FR,5/AO-from-00} + \sankeyfork{ZA}{3/ZA-from-PT,1/ZA-from-SP,7/ZA-from-GB,1/ZA-from-FR} + + \foreach \country in {ML,SN,MA,AO,ZA}{ + \sankeyadvance[color=\country]{\country}{\hwidth} + } + + \sankeyfork{ML}{5/ML-to-CN,3/ML-to-JP,1/ML-to-IN} + \sankeyfork{SN}{5/SN-to-CN,3/SN-to-JP,1/SN-to-IN} + \sankeyfork{MA}{5/MA-to-CN,3/MA-to-JP,1/MA-to-IN} + \sankeyfork{AO}{5/AO-to-CN,3/AO-to-JP,1/AO-to-IN} + \sankeyfork{ZA}{5/ZA-to-CN,3/ZA-to-JP,1/ZA-to-IN,3/ZA-to-00} + + \sankeynode{name=IN,quantity=5, + at={[xshift=\hdist]ML.right},anchor=right} + \sankeynode{name=JP,quantity=15, + at={[yshift=\vdist]IN.left},anchor=right} + \sankeynode{name=CN,quantity=25, + at={[yshift=\vdist]JP.left},anchor=right} + + \sankeyfork{IN} + {1/IN-from-ZA,1/IN-from-AO,1/IN-from-MA,1/IN-from-SN,1/IN-from-ML} + \sankeyfork{JP} + {3/JP-from-ZA,3/JP-from-AO,3/JP-from-MA,3/JP-from-SN,3/JP-from-ML} + \sankeyfork{CN} + {5/CN-from-ZA,5/CN-from-AO,5/CN-from-MA,5/CN-from-SN,5/CN-from-ML} + + \foreach \country in {IN,JP,CN}{ + \sankeyadvance[color=\country]{\country}{\hwidth} + } + + \foreach \startcountry/\countries in { + CA/{PT,GB,FR}, US/{PT,SP,GB,FR}, MX/{PT,SP,GB,FR}, + BR/{PT,SP,GB,FR}, FR/{ML,SN,MA,AO,ZA}, GB/{SN,MA,AO,ZA}, + SP/{SN,MA,ZA}, PT/{SN,MA,AO,ZA}, ML/{IN,JP,CN}, + SN/{IN,JP,CN}, MA/{IN,JP,CN}, AO/{IN,JP,CN}, + ZA/{IN,JP,CN}} + { + \foreach \endcountry in \countries { + \sankeyoutin[shade={\startcountry}{\endcountry}] + {\startcountry-to-\endcountry}{\endcountry-from-\startcountry} + } + } + + \foreach \country/\countryname in {CA/Canada, US/USA, MX/Mexico, + BR/Brazil, FR/France, GB/England, SP/Spain, PT/Portugal} + { + \node[anchor=west,inner sep=.1em,font=\small] + at (\country) {\countryname\vphantom{Ag}}; + } + + \foreach \country/\countryname in { + ML/Mali, SN/Senegal, MA/Morocco, AO/Angola, + ZA/South Africa, IN/India, JP/Japan, CN/China} + { + \node[anchor=east,inner sep=.1em,font=\small] + at (\country-old) {\countryname\vphantom{Ag}}; + } + \end{sankeydiagram} +\end{tikzpicture} +%</example3> +% \fi +% +%^^A % ------------------------------------------------------------ +% \subsection{Variation} +%^^A % ------------------------------------------------------------ +% +% Here is a variation of the previous example using the \code{rotate} +% key. +% +% See figure \vref{fig:google-example-variation}. The +% \code{sankey-example3-variation.tex} file contains the following code +% and is an attachement of the current PDF document. +% +% \begin{figure} +% \centering +% {\MakePercentComment\input{sankey-example3-variation}} +% \caption{Reproduction of an example from Google Charts documentation +% -- variation using the \protect\texttt{rotate} key.} +% \label{fig:google-example-variation} +% \end{figure} +% +% \lstinputlisting[style=LaTeXsmall]{sankey-example3-variation} +% +% \iffalse +%<*example3-variation> +\begin{tikzpicture}[rotate=-90] + \begin{sankeydiagram}[rotate=-90] + \sffamily + \sankeyset{ + ratio=1.7cm/10, + outin steps=2, + start style=arrow, + end style=simple, + draw/.style={draw=white,line width=.4pt}, + color/.style={fill/.style={fill=#1,fill opacity=.75}}, + shade/.style 2 args={fill/.style={ + fill=none,line width=0, + top color=#1,bottom color=#2, + middle color=#1!50!#2!50!white, + fill opacity=.75}}, + % colors + @define HTML color/.code args={#1/#2}{\definecolor{#1}{HTML}{#2}}, + @define HTML color/.list={ + cyan/a6cee3,lime/b2df8a,red/fb9a99,orange/fdbf6f, + violet/cab2d6,yellow/ffff99,blue/1f78b4,green/33a02c + }, + % colors of countries + @let country color/.code args={#1/#2}{\colorlet{#1}[rgb]{#2}}, + @let country color/.list={ + CA/red,US/orange,MX/lime,BR/violet,FR/yellow,GB/blue, + SP/green,PT/cyan,ML/cyan,SN/red,MA/orange, + AO/violet,ZA/lime,IN/blue,JP/yellow,CN/green + }, + } + \def\vdist{5mm} + \def\hwidth{1em} + \def\hdist{6cm} + + \sankeynode{name=CA,quantity=7} + \sankeynode{name=US,quantity=8,at={[yshift=\vdist]CA.left},anchor=right} + \sankeynode{name=MX,quantity=8,at={[yshift=\vdist]US.left},anchor=right} + \sankeynode{name=BR,quantity=8,at={[yshift=\vdist]MX.left},anchor=right} + + \foreach \country in {CA,US,MX,BR}{ + \sankeystart[color=\country]{\country} + \sankeyadvance[color=\country]{\country}{\hwidth} + } + + \sankeyfork{CA}{1/CA-to-PT,1/CA-to-GB,5/CA-to-FR} + \sankeyfork{US}{1/US-to-PT,1/US-to-SP,5/US-to-GB,1/US-to-FR} + \sankeyfork{MX}{1/MX-to-PT,5/MX-to-SP,1/MX-to-GB,1/MX-to-FR} + \sankeyfork{BR}{5/BR-to-PT,1/BR-to-SP,1/BR-to-GB,1/BR-to-FR} + + \sankeynode{name=FR,quantity=11, + at={[xshift=\hdist]CA.right},anchor=right} + \sankeynode{name=GB,quantity=11, + at={[yshift=\vdist]FR.left},anchor=right} + \sankeynode{name=SP,quantity=7, + at={[yshift=\vdist]GB.left},anchor=right} + \sankeynode{name=PT,quantity=8, + at={[yshift=\vdist]SP.left},anchor=right} + + \sankeyfork{FR} + {1/FR-from-BR,1/FR-from-MX,1/FR-from-US,5/FR-from-CA,3/FR-from-00} + \sankeyfork{GB} + {1/GB-from-BR,1/GB-from-MX,5/GB-from-US,1/GB-from-CA,3/GB-from-00} + \sankeyfork{SP}{1/SP-from-BR,5/SP-from-MX,1/SP-from-US} + \sankeyfork{PT}{5/PT-from-BR,1/PT-from-MX,1/PT-from-US,1/PT-from-CA} + + \foreach \country in {FR,GB,SP,PT}{ + \sankeyadvance[color=\country]{\country}{\hwidth} + } + + \sankeyfork{FR}{1/FR-to-ZA,1/FR-to-AO,3/FR-to-MA,3/FR-to-SN,3/FR-to-ML} + \sankeyfork{GB}{7/GB-to-ZA,1/GB-to-AO,2/GB-to-MA,1/GB-to-SN} + \sankeyfork{SP}{1/SP-to-ZA,3/SP-to-MA,1/SP-to-SN,2/SP-to-00} + \sankeyfork{PT}{3/PT-to-ZA,2/PT-to-AO,1/PT-to-MA,1/PT-to-SN,1/PT-to-00} + + \sankeynode{name=ML,quantity=9, + at={[xshift=\hdist]FR.right},anchor=right} + \sankeynode{name=SN,quantity=9, + at={[yshift=\vdist]ML.left},anchor=right} + \sankeynode{name=MA,quantity=9, + at={[yshift=\vdist]SN.left},anchor=right} + \sankeynode{name=AO,quantity=9, + at={[yshift=\vdist]MA.left},anchor=right} + \sankeynode{name=ZA,quantity=12, + at={[yshift=\vdist]AO.left},anchor=right} + + \sankeyfork{ML}{3/ML-from-FR,6/Mail-from-00} + \sankeyfork{SN} + {1/SN-from-PT,1/SN-from-SP,1/SN-from-GB,3/SN-from-FR,3/SN-from-00} + \sankeyfork{MA}{1/MA-from-PT,3/MA-from-SP,2/MA-from-GB,3/MA-from-FR} + \sankeyfork{AO}{2/AO-from-PT,1/AO-from-GB,1/AO-from-FR,5/AO-from-00} + \sankeyfork{ZA}{3/ZA-from-PT,1/ZA-from-SP,7/ZA-from-GB,1/ZA-from-FR} + + \foreach \country in {ML,SN,MA,AO,ZA}{ + \sankeyadvance[color=\country]{\country}{\hwidth} + } + + \sankeyfork{ML}{5/ML-to-CN,3/ML-to-JP,1/ML-to-IN} + \sankeyfork{SN}{5/SN-to-CN,3/SN-to-JP,1/SN-to-IN} + \sankeyfork{MA}{5/MA-to-CN,3/MA-to-JP,1/MA-to-IN} + \sankeyfork{AO}{5/AO-to-CN,3/AO-to-JP,1/AO-to-IN} + \sankeyfork{ZA}{5/ZA-to-CN,3/ZA-to-JP,1/ZA-to-IN,3/ZA-to-00} + + \sankeynode{name=IN,quantity=5, + at={[xshift=\hdist]ML.right},anchor=right} + \sankeynode{name=JP,quantity=15, + at={[yshift=\vdist]IN.left},anchor=right} + \sankeynode{name=CN,quantity=25, + at={[yshift=\vdist]JP.left},anchor=right} + + \sankeyfork{IN} + {1/IN-from-ZA,1/IN-from-AO,1/IN-from-MA,1/IN-from-SN,1/IN-from-ML} + \sankeyfork{JP} + {3/JP-from-ZA,3/JP-from-AO,3/JP-from-MA,3/JP-from-SN,3/JP-from-ML} + \sankeyfork{CN} + {5/CN-from-ZA,5/CN-from-AO,5/CN-from-MA,5/CN-from-SN,5/CN-from-ML} + + \foreach \country in {IN,JP,CN}{ + \sankeyadvance[color=\country]{\country}{\hwidth} + \sankeyend[color=\country]{\country} + } + + \foreach \startcountry/\countries in { + CA/{PT,GB,FR}, US/{PT,SP,GB,FR}, MX/{PT,SP,GB,FR}, + BR/{PT,SP,GB,FR}, FR/{ML,SN,MA,AO,ZA}, GB/{SN,MA,AO,ZA}, + SP/{SN,MA,ZA}, PT/{SN,MA,AO,ZA}, ML/{IN,JP,CN}, + SN/{IN,JP,CN}, MA/{IN,JP,CN}, AO/{IN,JP,CN}, + ZA/{IN,JP,CN}} + { + \foreach \endcountry in \countries { + \sankeyoutin[shade={\startcountry}{\endcountry}] + {\startcountry-to-\endcountry}{\endcountry-from-\startcountry} + } + } + + + \foreach \country/\countryname in {CA/Canada, US/USA, MX/Mexico, + BR/Brazil, FR/France, GB/England, SP/Spain, PT/Portugal} + { + \node[anchor=south,inner sep=.1em,font=\small] + at (\country) {\countryname\vphantom{Ag}}; + } + + \foreach \country/\countryname in { + ML/Mali, SN/Senegal, MA/Morocco, AO/Angola, + ZA/South Africa, IN/India, JP/Japan, CN/China} + { + \node[anchor=south,inner sep=.1em,font=\small] + at (\country) {\countryname\vphantom{Ag}}; + } + \end{sankeydiagram} +\end{tikzpicture} +%</example3-variation> +% \fi +% +%^^A % ------------------------------------------------------------ +% \clearpage +% \section{Very nice example -- Nadieh Bremer creation} +%^^A % ------------------------------------------------------------ +% +% \embedfile[mimetype=text/plain]{sankey-example4.tex} +% +% \begin{figure} +% \centering +% {\MakePercentComment\input{sankey-example4}} +% \caption{Very nice example -- Nadieh Bremer's creation} +% (from +% \href{https://www.visualcinnamon.com/portfolio/adyen-report-2019/}{Adyen's +% Shareholder Report}) +% \label{fig:nice-example} +% \end{figure} +% +% Graphic designer Nadieh Bremer created this very nice Sankey +% diagram\footnote{\url{https://www.visualcinnamon.com/portfolio/adyen-report-2019/}} +% for Adyen's second half 2018 report to shareholders. It is coded here +% with her kind permission. +% +% You can change the data values between lines 28 and 53. +% +% See figure~\vref{fig:nice-example}. The \code{sankey-example4.tex} +% file contains the following code and is an attachement of the current +% PDF document. +% +% \lstinputlisting[numbers=left,style=LaTeXsmall]{sankey-example4} +% +% \iffalse +%<*example4> +\begin{tikzpicture} + \renewcommand*\sfdefault{txss} + \sffamily + \sisetup{ + detect-all=true, + group-separator={,}, + group-minimum-digits=4, + } + % storage of labels + \newcommand\LabSet[2]{% node name, label + \expandafter\edef\csname#1@Lab\endcsname{#2}} + \newcommand\Lab[1]{% node name + \csname#1@Lab\endcsname} + % storage of quantities + \newcommand\QtySet[2]{% node name, quantity + \expandafter\edef\csname#1@Qty\endcsname{\fpeval{#2}}} + \newcommand\Qty[1]{% node name + \csname#1@Qty\endcsname} + % all nodes with their name, label and quantity + \sankeyset{ + def data/.code args={#1/#2/#3}{% node name/label/values + \LabSet{#1}{#2} + \QtySet{#1}{#3} + \typeout{#1: \Qty{#1}€ (\Lab{#1})} + }, + def data/.list={ + {Pf/Processing\\fees/71713}, + {Sog/Sales of\\good/4547}, + {Sf/Settlement\\fees/842075}, + {Os/Other\\services/37532}, + {R/Revenues/\Qty{Pf}+\Qty{Sog}+\Qty{Sf}+\Qty{Os}}, + {Coi/Cost of Inventory/5151}, + {Ciffi/Cost insecure from financial institutions/758234}, + {Nr/Net revenue/\Qty{R}-\Qty{Coi}-\Qty{Ciffi}}, + {Aadotaifa/Amortization and\\depreciation of tangible and\\ + intangible fixed assets/4688}, + {Ssapc/Social securities and\\pension costs/7860}, + {Was/Wages and salaries/35627}, + {Ooe/Other operating expenses/37346}, + {Nr2/-/\Qty{Nr}-\Qty{Aadotaifa}-\Qty{Ssapc}-\Qty{Was}-\Qty{Ooe}}, + {Oi/Other income/47}, + {Ibiiieait/Income before interest income,\\interest expense and + income taxes/\Qty{Nr2}+\Qty{Oi}}, + {Fe/Finance expense/561}, + {Ofr/Other financial results/2533}, + {Ibiiieait2/-/\Qty{Ibiiieait}-\Qty{Fe}-\Qty{Ofr}}, + {Fi/Finance income/204}, + {Ibit/Income before income taxes/\Qty{Ibiiieait2}+\Qty{Fi}}, + {It/Income taxes/21134}, + {Niftp/Net income for the period/\Qty{Ibit}-\Qty{It}}, + {Octa/Other currency\\translation adjustments/785}, + {Tci/Total comprehensive income/\Qty{Niftp}+\Qty{Octa}} + }, + } + + \definecolor{mygreen}{RGB}{9,192,82} + \tikzset{ + cost node/.style={ + overlay, + align=flush center, + node font=\footnotesize\sffamily\bfseries, + inner sep=0, + node contents={% + {\mdseries€\,\num{\Qty{#1}}}\\ + \Lab{#1}\vphantom{g}% + }, + }, + white hash/.style={ + draw=none,fill=none, + pattern={Lines[angle=60,line width=2pt,distance=4pt]}, + pattern color=white, + }, + line sep/.style={draw=white,line width=1pt}, + left label/.style={left=#1,align=flush right,anchor=north east}, + right label/.style={right=#1,align=flush left}, + right label hashed/.style={ + right=1mm of $(#1.left)!.5!(#1-old.left)$,align=flush left, + }, + left label hashed/.style={ + left=1mm of $(#1.right)!.5!(#1-old.right)$,align=flush right, + }, + } + + \newcommand\turnandstop[1]{ + \sankeyturn[green to greenwhite]{#1}{-90} + \sankeynode{as=#1,name=#1-e,at={#1 -| Coi}} + \sankeyoutin[greenwhite to white]{#1}{#1-e} + \node[cost node=#1,left label={1mm of #1-e.right}]; + } + + \begin{sankeydiagram}%[debug] + \sankeyset{ + ratio=28em/1000000, + minimum radius=2cm, + start style=none, + every node/.style={angle=-90}, + % default fill and draw styles + fill/.style={ + line width=0pt, + fill=mygreen, + }, + draw/.style={draw=none}, + % specific fill and draw styles + green to greenwhite/.style={ + fill/.style={ + line width=0pt, + right color=mygreen, + left color=mygreen!20!white, + } + }, + greenwhite to white/.style={ + fill/.style={ + line width=0pt, + right color=mygreen!20!white, + left color=mygreen!5!white, + } + }, + dashed/.style={draw/.style={draw=mygreen,dashed}}, + } + + \coordinate (top) at (0,2em); + + \sankeynodestart{name=Pf,quantity=\Qty{Pf}} + \node[cost node=Pf,above=.5em of Pf.center]; + + \sankeynodestart{name=Sog,quantity=\Qty{Sog}, + at={[xshift=4em]Pf.left},anchor=right} + \node[cost node=Sog,above=.5em of Sog.center]; + + \sankeynodestart{name=Sf,quantity=\Qty{Sf}, + at={[xshift=2em]Sog.left},anchor=right} + \node[cost node=Sf,above=.5em of Sf.center]; + + \sankeynodestart{name=Os,quantity=\Qty{Os}, + at={[xshift=2em]Sf.left},anchor=right} + \node[cost node=Os,above=.5em of Os.center]; + + \sankeynode{ + name=R,quantity=\Qty{R},at={[yshift=-10em]Sf.center}, + forked={\Qty{Os}/Os-a,\Qty{Sf}/Sf-a,\Qty{Sog}/Sog-a,\Qty{Pf}/Pf-a}, + } + + \foreach \nodename in {Pf,Sog,Sf,Os}{ + \sankeyoutin[fill/.style={top color=white,bottom color=mygreen}] + {\nodename}{\nodename-a} + } + + \sankeyadvance{R}{1em} + \node[cost node=R,right label hashed=R]; + + \sankeyfork{R}{\Qty{Ciffi}/Ciffi,\Qty{Nr}/Nr,\Qty{Coi}/Coi} + + \sankeyturnleft[minimum radius=1.cm]{Ciffi}{90} + \node[cost node=Ciffi,at={([shift={(1mm,0)}]Ciffi.center)},rotate=-90, + anchor=south,align=flush left,node font=\scriptsize\sffamily\bfseries]; + + \sankeyturnright[green to greenwhite]{Coi}{90} + \sankeyadvance[greenwhite to white]{Coi}{1em} + \node[cost node=Coi,left={1mm of [yshift=.75ex]Coi.left}, + align=flush right,anchor=north east,overlay]; + + \sankeyadvance{Nr}{9em} + \sankeyadvance{Nr}{1em} + \node[cost node=Nr,left label hashed=Nr, + node font=\large\sffamily\bfseries]; + + \sankeyfork{Nr}{\Qty{Nr2}/Nr2,\Qty{Ooe}/Ooe, + \Qty{Was}/Was,\Qty{Ssapc}/Ssapc,\Qty{Aadotaifa}/Aadotaifa} + + \turnandstop{Aadotaifa} + + \sankeyadvance{Ssapc}{5em} + \turnandstop{Ssapc} + + \sankeyadvance{Was}{9em} + \turnandstop{Was} + + \sankeyadvance{Ooe}{12em} + \turnandstop{Ooe} + + \sankeyadvance{Nr2}{15em} + \sankeynode{name=Ibiiieait,quantity=\Qty{Ibiiieait}, + anchor=right,at={Nr2.right}, + forked={\Qty{Oi}/Oi,\Qty{Nr2}/Nr2-e}} + + \sankeyturnleftbackward[minimum radius=1cm,dashed]{Oi}{90} + \node[cost node=Oi,right label=1mm of Oi.left]; + + \sankeyadvance{Ibiiieait}{1em} + \node[cost node=Ibiiieait,right label hashed=Ibiiieait]; + + \sankeyfork{Ibiiieait} + {\Qty{Ibiiieait2}/Ibiiieait2,\Qty{Ofr}/Ofr,\Qty{Fe}/Fe} + + \turnandstop{Fe} + + \sankeyadvance{Ofr}{3em} + \turnandstop{Ofr} + + \sankeyadvance{Ibiiieait2}{6em} + \sankeynode{name=Ibit,quantity={\Qty{Ibiiieait2}+\Qty{Fi}}, + anchor=right,at={Ibiiieait2.right}, + forked={\Qty{Fi}/Fi,\Qty{Ibiiieait2}/Ibiiieait2-e}} + + \sankeyturnleftbackward[minimum radius=1cm,dashed]{Fi}{90} + \node[cost node=Fi,right label=1mm of Fi.left]; + + \sankeyadvance{Ibit}{1em} + \node[cost node=Ibit,right label hashed=Ibit]; + + \sankeyfork{Ibit}{\Qty{Niftp}/Niftp,\Qty{It}/It} + + \turnandstop{It} + + \sankeyadvance{Niftp}{6em} + + \sankeyadvance{Niftp}{1em} + \node[cost node=Niftp,right label hashed=Niftp]; + + \sankeynode{name=Tci,quantity=\Qty{Niftp}+\Qty{Octa}, + anchor=right,at={[yshift=-6em]Niftp.right}, + forked={\Qty{Octa}/Octa,\Qty{Niftp}/Niftp-e}} + \sankeyoutin{Niftp}{Niftp-e} + + \sankeyturnleftbackward[minimum radius=1cm]{Octa}{90} + \node[cost node=Octa,right label=1mm of Octa.left]; + + \sankeyadvance{Tci}{1em} + \node[cost node=Tci,right label hashed=Tci]; + + \newcommand\hashband[1]{ + \draw[line sep] (#1-old.right) -- (#1-old.left); + \draw[line sep] (#1.right) -- (#1.left); + \path[white hash] (#1-old.right) rectangle (#1.left); + } + + \foreach \nodename in {R,Nr,Nr,Ibiiieait,Ibit,Niftp,Tci}{ + \hashband{\nodename} + } + + \end{sankeydiagram} +\end{tikzpicture} +%</example4> +% \fi +% +% \clearpage +% +% \StopEventually{} +%^^A % ------------------------------------------------------------ +% +% \manualparts +% +% \part{Implementation} +% \label{implementation} +%^^A % ------------------------------------------------------------ +% +% { +% \setlength{\parskip}{0pt} +% \localtableofcontents +% } +% +%^^A % ------------------------------------------------------------ +% \section{The \texttt{sankey.sty} file} +%^^A % ------------------------------------------------------------ +% +% Poorly commented source code... +% +% \changes{v1.0}{2016/03/06}{first version} +% \changes{v2.0}{2021/01/27}{first public version (on CTAN)} +% \changes{v3.0}{2021/03/14}{better naming rule} +% \changes{v3.0}{2021/03/14}{use .ins and .dtx files} +% +% \iffalse +%<*sankey> +% \fi +% +% Version information: +% +% \begin{macrocode} +\NeedsTeXFormat{LaTeX2e}[2015/10/01] +\ProvidesPackage{sankey}[2021/03/14 v3.0 to draw Sankey diagrams] +% \end{macrocode} +% +% All required packages and TikZ libraries: +% \begin{macrocode} +\RequirePackage{xparse} +\RequirePackage{etoolbox} +\RequirePackage{xfp} +\RequirePackage{tikz} +\usetikzlibrary{ + calc, + decorations.markings, + dubins +} +% \end{macrocode} +% +% Declarations of PGF layers (to debug Sankey diagrams): +% +% \begin{macrocode} +%% add a new layer to debug sankey diagrams +\pgfdeclarelayer{background} +\pgfdeclarelayer{foreground} +\pgfdeclarelayer{sankeydebug} +\pgfsetlayers{background,main,foreground,sankeydebug} +% \end{macrocode} +% +% +%^^A % ------------------------------------------------------------ +% \subsection{Fields} +%^^A % ------------------------------------------------------------ +% +% \begin{macro}{\snk@newfield} +% +% The \code{sankeynewfield} macro defines +% setter and getter macros for \emph{key}/\emph{value} pairs. +% It requires five parameters: the \emph{def} macro used to +% store a new value, the \emph{setter} macro name, the \emph{getter} macro name, +% the \emph{cs name} used by the new field (including a \texttt{\#1} +% parameter -- the \emph{key}) and the \emph{error message} (used by the getter +% macro if the key is not defined). +% +% The \emph{setter} macro requires +% two parameters: the key and the value. +% The \emph{getter} macro requires +% one parameter: the key. +% +% \begin{macrocode} +\def\snk@newfield#1#2#3#4#5{ + % setter + \def#2##1##2{\expandafter#1\csname #4\endcsname{##2}} + % getter + \def#3##1{% + \ifcsdef{#4}{% + \csname#4\endcsname% + }{% + \PackageError{sankey}{#5}{unknown key with \string#3}% + }% + } +} +% \end{macrocode} +% \end{macro} +% +%^^A % ------------------------------------------------------------ +% \subsubsection{Definition of \emph{global} and \emph{expanded} fields (using +% \texttt{\protect\string\xdef})} +%^^A % ------------------------------------------------------------ +% +% \begin{macro}{\snk@setnodeqty} +% \begin{macro}{\sankeygetnodeqty} +% The setter and getter macros to store and retrieve +% the \emph{quantity} field associated with +% each Sankey node (the key is the name of the Sankey node). +% \begin{macrocode} +\snk@newfield\xdef\snk@setnodeqty\sankeygetnodeqty% +{@snk@node@qty@#1}{Unknown sankey node '#1'} +% \end{macrocode} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\snk@setnodeorient} +% \begin{macro}{\sankeygetnodeorient} +% The setter and getter macros to store and retrieve +% the \emph{angle} (or orientation) field +% associated with each Sankey node (the key is the name of the Sankey node). +% \begin{macrocode} +\snk@newfield\xdef\snk@setnodeorient\sankeygetnodeorient% +{@snk@node@orient@#1}{Unknown sankey node '#1'} +% \end{macrocode} +% \end{macro} +% \end{macro} +% +%^^A % ------------------------------------------------------------ +% \subsubsection{Definitions of \emph{local} fields (using \texttt{\protect\string\def})} +%^^A % ------------------------------------------------------------ +% +% \begin{macro}{\snk@setstartfill} +% \begin{macro}{\snk@getstartfill} +% \begin{macro}{\snk@setstartdraw} +% \begin{macro}{\snk@getstartdraw} +% The setter and getter macros to store and retrieve the starting fill/draw +% paths (the key is the style name). +% \begin{macrocode} +\snk@newfield\def\snk@setstartfill\snk@getstartfill% +{@snk@start@fill@#1}{Unknown sankey start fill path #1} + +\snk@newfield\def\snk@setstartdraw\snk@getstartdraw% +{@snk@start@draw@#1}{Unknown sankey start draw path #1} +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\snk@setendfill} +% \begin{macro}{\snk@getendfill} +% \begin{macro}{\snk@setenddraw} +% \begin{macro}{\snk@getenddraw} +% The setter and getter macros to store and retrieve the ending fill/draw +% paths (the key is the style name). +% \begin{macrocode} +\snk@newfield\def\snk@setendfill\snk@getendfill% +{@snk@end@fill@#1}{Unknown sankey end fill path #1} + +\snk@newfield\def\snk@setenddraw\snk@getenddraw% +{@snk@end@draw@#1}{Unknown sankey end draw path #1} +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% +%^^A % ------------------------------------------------------------ +% \subsubsection{Check if a sankey node is defined} +%^^A % ------------------------------------------------------------ +% +% \begin{macro}{\snk@ifnodedefined} + +% The \code{\snk@ifnodedefined} macro checks if a Sankey +% node is defined by checking if its name is associated to +% a \emph{quantity}. +% \begin{macrocode} +\newcommand\snk@ifnodedefined[3]{% + \ifcsdef{@snk@node@qty@#1}{#2}{#3}% +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\snk@errorifnotdefined} +% The \code{\snk@errorifnotdefined} macro generares +% an error message if the Sankye node is not defined. +% \begin{macrocode} +\newcommand\snk@errorifnotdefined[1]{% + \snk@ifnodedefined{#1}{}% + {\PackageError{sankey}{Unknown sankey node '#1'}{}}% +} +% \end{macrocode} +% \end{macro} +% +%^^A % ------------------------------------------------------------ +% \subsection{The \texttt{sankey node} shape} +%^^A % ------------------------------------------------------------ +% +% +% A \code{sankey node} is defined as a TikZ node +% with a particular \emph{shape}: its width is null and its +% height matches the associated \emph{quantity}. +% This shape requires only three anchors: \code{center}, \code{left} +% and \code{right}. +% These threee anchors are sufficient to use the +% \code{sankey} package. But the \code{fit} library needs +% anchors defined by rectangular node. +% +% \begin{macrocode} +\pgfdeclareshape{sankey node}{ + \inheritsavedanchors[from=rectangle] + \inheritanchor[from=rectangle]{center} + \inheritanchorborder[from=rectangle] + \anchor{left}{\pgf@process{\northeast}} + \anchor{right}{\pgf@process{\southwest}} + % compatibility with 'fit' library + \inheritanchor[from=rectangle]{west} + \inheritanchor[from=rectangle]{east} + \inheritanchor[from=rectangle]{north} + \inheritanchor[from=rectangle]{south} + \inheritanchor[from=rectangle]{north west} + \inheritanchor[from=rectangle]{south east} + \inheritanchor[from=rectangle]{north east} + \inheritanchor[from=rectangle]{south west} +} +% \end{macrocode} +% +%^^A % ------------------------------------------------------------ +% \subsection{Keys} +%^^A % ------------------------------------------------------------ +% +% \begin{macro}{\sankeyset} +% The \code{sankey} package uses \code{pgfkeys} to set options via +% \emph{key=value} pairs using the \texttt{/sankey} path +% (for Sankey diagram options) and using the +% \texttt{/sankey/node parameters} path (for Sankey node parameters). +% +% The \code{\sankeyset} macro processes +% its parameter as a list of comma separated pairs of the form +% \emph{key=value} with the default path set to \texttt{/sankey}. +% +% \begin{macrocode} +\pgfkeys{/sankey/.is family} +\NewDocumentCommand\sankeyset{m}{\pgfkeys{sankey,#1}} +% \end{macrocode} +% \end{macro} +% +%^^A % ------------------------------------------------------------ +% \subsubsection{Keys to define the scale} +%^^A % ------------------------------------------------------------ +% \begin{macro}{\snk@totalqty} +% \begin{macro}{\snk@totallen} +% +% The \code{ratio quantity}, \code{ratio length} and +% \code{ratio} keys define the ratio between +% \emph{flow quantity} and \emph{graphic length} (the scale). +% The \code{\snk@totalqty} and \code{\snk@totallen} macros store the values. +% All \emph{quantities} are processed by \code{\fpeval} and +% all \emph{lengths} are processed by \code{pgfmath}. +% \begin{macrocode} +\sankeyset{ + ratio quantity/.code={\edef\snk@totalqty{\fpeval{#1}}}, + ratio quantity/.value required, + ratio length/.code={ + \pgfmathsetmacro\snk@totallen{#1} + \edef\snk@totallen{\snk@totallen pt} + }, + ratio length/.value required, + ratio/.style args={#1/#2}{ + ratio length=#1, + ratio quantity=#2, + }, + ratio/.value required, +} +% \end{macrocode} +% \end{macro} +% \end{macro} +% +%^^A % ------------------------------------------------------------ +% \subsubsection{Rotate offset} +%^^A % ------------------------------------------------------------ +% +% \begin{macro}{\snk@rotate} +% +% The \code{rotate} key stores an offset angle applied to all Sankey +% nodes. This is useful when using the \code{rotate} option within a +% \code{tikzpicture} or a \code{scope}. This TikZ option is only +% applied to coordinates and not to TikZ nodes (remember that Sankey +% nodes are TikZ nodes). It's up to the author to keep the +% \code{rotate} option of the \code{tikzpicture} and that of the +% \code{sankeydiagram} synchronous. +% +% \begin{macrocode} +\sankeyset{ + rotate/.code={\edef\snk@rotate{\fpeval{#1}}}, + rotate/.value required, +} +% \end{macrocode} +% \end{macro} +% +%^^A % ------------------------------------------------------------ +% \subsubsection{Minimum radius} +%^^A % ------------------------------------------------------------ +% +% \begin{macro}{\snk@minradius} +% +% The \code{minimum radius} key processes the minimum radius +% of curvature by \code{pgfmath} then stores it in +% the \code{\snk@minradius} macro. +% \begin{macrocode} +\sankeyset{ + minimum radius/.code={ + \pgfmathsetmacro\snk@minradius{#1} + \edef\snk@minradius{\snk@minradius pt} + }, + minimum radius/.value required, +} +% \end{macrocode} +% \end{macro} +% +%^^A % ------------------------------------------------------------ +% \subsubsection{Outin step} +%^^A % ------------------------------------------------------------ +% +% \begin{macro}{\snk@stepoutin} +% The \code{outin} key stores its value in +% the \code{\snk@stepoutin} macro. +% +% \begin{macrocode} +\sankeyset{ + outin steps/.estore in=\snk@stepoutin, + outon steps/.value required, +} +% \end{macrocode} +% \end{macro} +% +%^^A % ------------------------------------------------------------ +% \subsubsection{Sankey debug} +%^^A % ------------------------------------------------------------ +% +% +% The \code{debug} key drives the \code{sankey debug} toggle. +% +% \begin{macrocode} +\newtoggle{sankey debug} +\sankeyset{ + debug/.is choice, + debug/true/.code={\toggletrue{sankey debug}}, + debug/false/.code={\togglefalse{sankey debug}}, + debug/.default=true, +} +% \end{macrocode} +% +%^^A % ------------------------------------------------------------ +% \subsubsection{Start and end styles} +%^^A % ------------------------------------------------------------ +% +% \begin{macro}{\snk@startstyle} +% \begin{macro}{\snk@endstyle} +% The \code{start style} and \code{end style} keys are choices. +% +% The \code{new start style} and \code{new end style} keys +% add new option to these choices. +% They use the \code{startfill}, \code{startdraw} fields +% or the \code{endfill} and \code{enddraw} +% fields (using the style \emph{name} as key) to store the fill and draw +% paths then create a new option to install the new +% start (\code{\snk@startstyle}) or end (\code{\snk@endstyle}) style. +% +% \begin{macrocode} +\sankeyset{ + start style/.is choice, + end style/.is choice, + % to define new start and end styles + new start style/.code n args={3}{% name, fill path, draw path + \snk@setstartfill{#1}{#2} + \snk@setstartdraw{#1}{#3} + \sankeyset{start style/#1/.code={\def\snk@startstyle{#1}}} + }, + new end style/.code n args={3}{% name, fill path, draw path + \snk@setendfill{#1}{#2} + \snk@setenddraw{#1}{#3} + \sankeyset{end style/#1/.code={\def\snk@endstyle{#1}}} + }, +} +% \end{macrocode} +% \end{macro} +% \end{macro} +% +%^^A % ------------------------------------------------------------ +% \subsubsection{Initial parameters} +%^^A % ------------------------------------------------------------ +% +% The \code{@initial options} style defines default values for +% options of Sankey diagram. The \code{every diagram} style (initially +% empty) allows the user to choose its own default values. +% +% The \code{@initial options} and the \code{every diagram} styles are +% applied (in this order) at the beginning of each Sankey diagram. +% +% \begin{macrocode} +\sankeyset{ + debug color/.style={/utils/exec={\colorlet{debug color}{#1}}}, + @initial options/.style={ + ratio=1cm/10, + minimum radius=5mm,% + outin steps=10, + debug=false, + start style=none, + end style=none, + rotate=0, + % default fill/draw styles, + fill/.style={line width=0pt,fill=white}, + draw/.style={draw=black,line width=.4pt}, + % debug color used by all debug macros + debug color=red!75!black, + % debug line between left and right anchors + debug line/.style={overlay,draw=debug color,|-|}, + % debug line between center and label + debug normal/.style={overlay,draw=debug color}, + % debug node label + debug label/.style={ + overlay, + draw, + font=\ttfamily\tiny, + text=debug color,text opacity=1, + inner sep=.1em, + fill=white,fill opacity=1, + rounded corners=.1em, + node contents={\name}, + }, + every node/.style={}, + }, + every diagram/.style={}, +} + +% \end{macrocode} +% +%^^A % ------------------------------------------------------------ +% \subsubsection{Sankey node parameters} +%^^A % ------------------------------------------------------------ +% +% The \code{/sankey/node parameters} family defines all parameters during +% creation of Sankey node. +% +% \begin{macrocode} +\sankeyset{node parameters/.is family} +% \end{macrocode} +% \begin{macro}{\name} +% \begin{macro}{\qty} +% \begin{macro}{\orient} +% \begin{macro}{\pos} +% +% The \code{name}, \code{quantity}, \code{angle} and \code{at} keys use the +% \code{\name}, \code{\qty}, \code{\orient} and \code{\pos} macros +% to store the \emph{name}, the \emph{quantity}, the \emph{orientation} (or +% \emph{angle}) and the \emph{position} of a Sankey node during its +% creation. +% +% The \emph{quantity} is processed via \code{\fpeval}. The +% \emph{orientation} is normalized. +% +% \begin{macrocode} +\sankeyset{node parameters, + name/.estore in=\name, + name/.value required, + quantity/.code={\edef\qty{\fpeval{#1}}}, + quantity/.value required, + angle/.code={\edef\orient{\snk@normalize@angle{#1}}}, + angle/.value required, + at/.code={\snk@getpos\pos{#1}}, + at/.value required, +} +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% +% The \code{as} key is just a shortcut to define the four current node +% parameters by copying them from an existing Sankey node. +% +% \begin{macrocode} +\sankeyset{node parameters, + as/.style={ + name=#1, + quantity=\sankeygetnodeqty{#1}, + angle=\sankeygetnodeorient{#1}, + at={#1.center}, + }, + as/.value required, +} +% \end{macrocode} +% +% \begin{macro}{\snk@anchor} +% +% The \code{anchor} key stores in the \code{\snk@anchor} macro +% the anchor name to use to create the new current Sankey node +% +% \begin{macrocode} +\sankeyset{node parameters, + anchor/.is choice, + anchor/left/.code={\def\snk@anchor{left}}, + anchor/right/.code={\def\snk@anchor{right}}, + anchor/center/.code={\def\snk@anchor{center}}, + anchor/.value required, +} +% \end{macrocode} +% \end{macro} +% +% The \code{start} and \code{end} keys drive the +% \code{sankey node start} and \code{sankey node end} +% toggles. +% +% \begin{macrocode} +\newtoggle{sankey node start} +\newtoggle{sankey node end} +\sankeyset{node parameters, + start/.is choice, + start/true/.code={\toggletrue{sankey node start}}, + start/false/.code={\togglefalse{sankey node start}}, + start/.default=true, + % + end/.is choice, + end/true/.code={\toggletrue{sankey node end}}, + end/false/.code={\togglefalse{sankey node end}}, + end/.default=true, +} +% \end{macrocode} +% \begin{macro}{\snk@listofforks} +% \begin{macro}{\snk@forkanchor} +% +% The \code{forked} and \code{fork anchor} keys store their value in the +% \code{\snk@listofforks} and \code{\snk@forkanchor} macros. +% +% \begin{macrocode} +\sankeyset{node parameters, + forked/.estore in=\snk@listofforks, + forked/.value required, + fork anchor/.estore in=\snk@forkanchor, + fork anchor/.value required, +} +% \end{macrocode} +% \end{macro} +% \end{macro} +% +% The \code{@initial parameters} style initialises all Sankey node +% parameters at the start of the creation of a new Sankey node. +% +% \begin{macrocode} +\sankeyset{node parameters, + @initial parameters/.style={ + start=false, + end=false, + forked=, + fork anchor=, + anchor=center, + at={0,0}, + angle=0, + }, +} +% \end{macrocode} +% +% +%^^A % ------------------------------------------------------------ +% \subsubsection{Internal Tikz style} +%^^A % ------------------------------------------------------------ +% +% To apply this style with Tikz, use absolute key name +% (\texttt{/sankey/@sankey node}). This style is used to create the Tikz +% node assoicated to a Sankey node. +% +% \begin{macrocode} +\sankeyset{ + % sankey node TikZ style + @sankey node/.style n args={3}{% name, pos, anchor + shape=sankey node, + inner sep=0, + minimum height={\sankeyqtytolen{\sankeygetnodeqty{#1}}}, + minimum width=0, + draw=none, + line width=0pt, + fill=none, + node contents={}, + rotate=\sankeygetnodeorient{#1}+\snk@rotate, + at={(#2)}, + name=#1, + anchor=#3, + }, +} +% \end{macrocode} +% +%^^A % ------------------------------------------------------------ +% \subsection{The \texttt{sankeydiagram} environment} +% ^^A % ------------------------------------------------------------ +% +% \begin{environment}{sankeydiagram} +% +% The \code{sankeydiagram} environment defines locally all the macros +% used by a Sankey diagram. Then it applies the % +% \code{@initial options} and \code{every diagram} styles (in this +% order) and applies all the keys provided in its optional argument. +% +% \begin{macrocode} +\NewDocumentEnvironment{sankeydiagram}{O{}}{ +% \end{macrocode} +% +%^^A % ------------------------------------------------------------ +% \subsection{Internal macros} +%^^A % ------------------------------------------------------------ +% +% \begin{macro}{\snk@getpos} +% +% The \code{\snk@getpos} macro extracts the position of a TikZ +% node\footnote{Thanks to Andrew Stacey \url{https://tex.stackexchange.com/a/33765/14500}}. +% +% \begin{macrocode} + \def\snk@getpos##1##2{% + \tikz@scan@one@point\pgfutil@firstofone(##2)\relax% + \edef##1{\the\pgf@x,\the\pgf@y}% + } +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\snk@modulo} +% +% The \code{\snk@modulo} macro evaluates \#1 modulo \#2 using \code{\fpeval}. +% +% \begin{macrocode} + \def\snk@modulo##1##2{\fpeval{##1-(floor((##1)/(##2),0)*##2)}} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\snk@normalize@angle} +% +% The \code{\snk@normalize@angle} macro normalizes \#1 (an angle) between +% $-180$ and $180$ (using \code{\fpeval}). +% +% \begin{macrocode} + \def\snk@normalize@angle##1{% + \fpeval{\snk@modulo{(##1)+180}{360}-180}% + } +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\snk@show@debug} +% +% The \code{snk@show@debug} macro draws debug information +% of the Sankey node named \#1 but only if the \code{sankey debug} +% toogle is true. Everything is drawn on the \code{sankeydebug} +% layer. It uses the \code{/sankey/debug line}, +% \code{/sankey/debug normal} and \code{/sankey/debug label} Tikz styles. +% +% \begin{macrocode} + \def\snk@show@debug##1{% node name + \iftoggle{sankey debug}{ + \begingroup + \edef\name{##1} + \edef\qty{\sankeygetnodeqty{\name}} + \edef\orient{\sankeygetnodeorient{\name}} + \begin{pgfonlayer}{sankeydebug} + \path[/sankey/debug line] (\name.left) -- (\name.right); + \pgfmathsetmacro{\snk@len}{\sankeyqtytolen{\qty}/3} + \path[/sankey/debug normal] (\name.center) + -- ($(\name.center)!\snk@len pt!90:(\name.right)$) + node[/sankey/debug label,rotate=\orient+90+\snk@rotate,anchor=north]; + \end{pgfonlayer} + \endgroup + }{} + } +% \end{macrocode} +% \end{macro} +% \begin{macro}{\snk@makeforkednode} +% \begin{macro}{\snk@tot} +% \begin{macro}{\snk@subnodeqty} +% \begin{macro}{\snk@subnodename} +% \begin{macro}{\snk@added@values} +% +% The \code{\snk@makeforkednode} forks a Sankey node. +% +% \begin{macrocode} + \def\snk@makeforkednode{ + \begingroup + \ifdefempty{\snk@listofforks}{ + \ifdefempty{\snk@forkanchor}{}{ + \PackageWarning{sankey}% + {Can't use 'fork anchor' key without 'forked' key} + } + }{ + \def\snk@tot{0} + \def\snk@added@values{} + \sankeyset{ + @add forked node/.code args={####1/####2}{ + \coordinate (####2) at ($(\name.left)% + !\fpeval{(\snk@tot+.5*(####1))/\qty}% + !(\name.right)$); + \edef\snk@orient{\orient} + \sankeynode[debug=false] + {name=####2,quantity=####1,at=####2,angle=\snk@orient} + \edef\snk@tot{\fpeval{\snk@tot+####1}} + \edef\snk@added@values{\snk@added@values+####1} + }, + @add forked node/.list/.expand once=\snk@listofforks, + } + \edef\snk@diff{\fpeval{abs(\qty-\snk@tot)}} + \ifnumequal{\snk@diff}{0}{}{ + \PackageWarning{sankey}% + {^^J*** Warning: bad sankey fork: % + \qty\space!=\space\snk@added@values(=\snk@tot)% + ^^J\snk@listofforks} + } + \ifdefempty{\snk@forkanchor}{ + \edef\snk@forkanchor{\name.\snk@anchor} + }{} + \snk@getpos\snk@c{$(\snk@forkanchor) - (\pos)$} + \sankeynode{as=\name,at={$(\name) - (\snk@c)$}} + \foreach \snk@subnodeqty/\snk@subnodename in \snk@listofforks { + \sankeynode{as=\snk@subnodename,at={$(\snk@subnodename) - (\snk@c)$}} + } + } + \endgroup + } +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \begin{macro}{\snk@makenode} +% +% The \code{\snk@makenode} macro creates a new Sankey node named +% \code{\name} with \code{\qty} quantity, oriented at +% \code{\orient} degrees (but modified by the \code{\snk@rotate} +% angle offset), anchored by its \code{\anchor} (or its \emph{center} +% by default) at \code{\pos} position. +% +% \begin{macrocode} + \def\snk@makenode{ + \begingroup + \snk@setnodeqty{\name}{\qty} + \edef\orient{\snk@normalize@angle{\orient}} + \snk@setnodeorient{\name}{\orient} + \ifundef{\snk@anchor}{\def\snk@anchor{center}}{} + \node[/sankey/@sankey node={\name}{\pos}{\snk@anchor}]; + \endgroup + } +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\snk@filldrawstart} +% +% The \code{\snk@filldrawstart} macro fills +% (with the \code{/sankey/fill} TikZ style) then draws +% (with the \code{/sankey/draw} TikZ style) +% a start of flow using paths from style \code{\snk@startstyle} on +% the Sankey node named \code{\name}. +% +% \begin{macrocode} + \def\snk@filldrawstart{ + \begin{scope}[shift={(\name)},rotate=\orient] + \path[/sankey/fill] \snk@getstartfill{\snk@startstyle}; + \path[/sankey/draw] \snk@getstartdraw{\snk@startstyle}; + \end{scope} + } +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\snk@filldrawend} +% +% The \code{\snk@filldrawend} macro fills +% (with the \code{/sankey/fill} TikZ style) then draws +% (with the \code{/sankey/draw} TikZ style) +% a end of flow using paths from style \code{\snk@endstyle} on +% the Sankey node named \code{\name}. +% +% \begin{macrocode} + \def\snk@filldrawend{ + \begin{scope}[shift={(\name)},rotate=\sankeygetnodeorient{\name}] + \path[/sankey/fill] \snk@getendfill{\snk@endstyle}; + \path[/sankey/draw] \snk@getenddraw{\snk@endstyle}; + \end{scope} + } +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\snk@checkquantities} +% \begin{macro}{\snk@qtyi} +% \begin{macro}{\snk@qtyii} +% The \code{\snk@checkquantities} compares quantities +% from Sankey nodes \code{#1} and \code{#2} and emits +% an error message if they differ (\code{#3} is the name +% of the macro which requested the verification). +% +% \begin{macrocode} + \def\snk@checkquantities##1##2##3{ + \begingroup + \edef\snk@qtyi{\sankeygetnodeqty{##1}} + \edef\snk@qtyii{\sankeygetnodeqty{##2}} + \ifdefstrequal{\snk@qtyi}{\snk@qtyii}{}{ + \PackageError{sankey}% + {^^J*** \string##3: quantities differ between % + ##1 (\snk@qtyi) and ##2 (\snk@qtyii)% + ^^J}% + {The quantities of the two Sankey nodes must be equal.} + } + \endgroup + } +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% +%^^A % ------------------------------------------------------------ +% \subsection{User macros} +%^^A % ------------------------------------------------------------ +% +% \begin{macro}{\sankeydubins} +% +% The \code{\sankeydubins} macro links two Sankey nodes via +% a Dubins path. First, it computes the Dubins path between +% centers (left and right radii are the same) and stores the +% result in \code{sankey}. Then it uses the stored result +% to fill and draw the lane (left border and right borders +% use Dubins paths with asymmetric radii). +% +% \begin{macrocode} + \NewDocumentCommand\sankeydubins{O{}mm}{% options, sn, en + \snk@errorifnotdefined{##2} + \snk@errorifnotdefined{##3} + \snk@checkquantities{##2}{##3}{\sankeydubins} + \begingroup + \sankeyset{##1} + \pgfmathsetmacro\qty{\sankeygetnodeqty{##2}} + \dubinspathset{ + sankey/.style={ + start point=##2.center,start angle=\sankeygetnodeorient{##2}, + end point=##3.center,end angle=\sankeygetnodeorient{##3}, + minimum radius=\snk@minradius + .5 * \sankeyqtytolen{\qty} pt, + }, + } + \dubinspathcalc{sankey,store=sankey} + \dubinspathset{ + left border/.style={ + sankey, use store=sankey, + left and right minimum radii={\snk@minradius} + and {\snk@minradius + \sankeyqtytolen{\qty} pt}, + }, + right border/.style={ + sankey, use store=sankey, + left and right minimum radii= + {\snk@minradius + \sankeyqtytolen{\qty} pt} + and {\snk@minradius}, + }, + } + % fill the region + \path[/sankey/fill] (##2.left) \dubinspath{left border} + -- (##3.left) -- (##3.right) \dubinspath{right border,reverse} + -- (##2.right) -- cycle; + % draw left and right borders + \path[/sankey/draw] (##2.left) \dubinspath{left border} + (##2.right) \dubinspath{right border}; + \endgroup + } +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\sankeyoutin} +% +% The \code{\sankeyoutin} macro links two Sankey nodes via a Bézier curve. +% First, to simulate constant width, it creates \code{\snk@stepoutin} +% intermediate Sankey nodes along the Bézier curve. Then, the lane is +% filled and drawn linking all the intermediate Sankey node via smaller +% Bézier curves. +% +% \begin{macrocode} + \NewDocumentCommand\sankeyoutin{O{}mm}{% options, sn, en + \snk@errorifnotdefined{##2} + \snk@errorifnotdefined{##3} + \snk@checkquantities{##2}{##3}{\sankeyoutin} + \begingroup + \sankeyset{##1} + \edef\qty{\sankeygetnodeqty{##2}} + \pgfmathsetmacro\snk@len{\sankeyqtytolen{\qty}/2} + \edef\snk@step{\fpeval{1/\snk@stepoutin}} + \edef\snk@laststep{\inteval{\snk@stepoutin-1}} + \path[overlay,decorate,decoration={ + markings, + mark=between positions \snk@step and {\fpeval{1-.5*\snk@step}} + step \snk@step with { + \edef\snk@outinmidptname{% + snk@outinmidpt-% + \pgfkeysvalueof{/pgf/decoration/mark info/sequence number}% + } + \path + (0,0) coordinate(\snk@outinmidptname) + (0,-\snk@len pt) coordinate (\snk@outinmidptname-r) + (0,\snk@len pt) coordinate (\snk@outinmidptname-l) + ; + } + }] + (##2.center) + to[out=\sankeygetnodeorient{##2},in=\sankeygetnodeorient{##3}+180] + (##3.center); + \foreach \snk@ptnum in {1,...,\snk@laststep}{ + \edef\snk@outinmidptname{snk@outinmidpt-\snk@ptnum} + \dbp@anglebetween\snk@outinmidptangle% + {\snk@outinmidptname-r}{\snk@outinmidptname-l} + \sankeynode[debug=false]{% + name=\snk@outinmidptname, + quantity=\qty, + angle=\snk@outinmidptangle-90,% + at=\snk@outinmidptname% + } + } + \sankeynode[debug=false]{% + name={snk@outinmidpt-0}, + quantity=\sankeygetnodeqty{##2}, + angle=\sankeygetnodeorient{##2},% + at={##2}% + } + \sankeynode[debug=false]{% + name={snk@outinmidpt-\snk@stepoutin}, + quantity={\sankeygetnodeqty{##3}}, + angle={\sankeygetnodeorient{##3}},% + at={##3}% + } + \path[/sankey/fill,looseness=1] + (snk@outinmidpt-0.left) + \foreach \snk@curpt + [remember=\snk@curpt as \snk@prevpt (initially 0)] + in {1,...,\snk@stepoutin}{ + to[out=\sankeygetnodeorient{snk@outinmidpt-\snk@prevpt}, + in=\sankeygetnodeorient{snk@outinmidpt-\snk@curpt}+180] + (snk@outinmidpt-\snk@curpt.left) + } + -- + (snk@outinmidpt-\snk@stepoutin.right) + \foreach \snk@curpt + [remember=\snk@curpt as \snk@prevpt (initially \snk@stepoutin)] + in {\snk@laststep,...,0}{ + to[out=\sankeygetnodeorient{snk@outinmidpt-\snk@prevpt}+180, + in=\sankeygetnodeorient{snk@outinmidpt-\snk@curpt}] + (snk@outinmidpt-\snk@curpt.right) + } + -- cycle; + \path[/sankey/draw,looseness=1] + (snk@outinmidpt-0.left) + \foreach \snk@curpt + [remember=\snk@curpt as \snk@prevpt (initially 0)] + in {1,...,\snk@stepoutin}{ + to[out=\sankeygetnodeorient{snk@outinmidpt-\snk@prevpt}, + in=\sankeygetnodeorient{snk@outinmidpt-\snk@curpt}+180] + (snk@outinmidpt-\snk@curpt.left) + } + (snk@outinmidpt-\snk@stepoutin.right) + \foreach \snk@curpt + [remember=\snk@curpt as \snk@prevpt (initially \snk@stepoutin)] + in {\snk@laststep,...,0}{ + to[out=\sankeygetnodeorient{snk@outinmidpt-\snk@prevpt}+180, + in=\sankeygetnodeorient{snk@outinmidpt-\snk@curpt}] + (snk@outinmidpt-\snk@curpt.right) + }; + \endgroup + } +% \end{macrocode} +% \end{macro} +% \begin{macro}{\sankeynodealias} +% +% The \code{\sankeynodealias} macro clones the Sankey node +% named \code{#1} into a Sankey node named \code{#2}. +% +% \begin{macrocode} + \NewDocumentCommand\sankeynodealias{mm}{%name, alias + \snk@errorifnotdefined{##1} + \path[late options={name=##1,alias=##2}]; + \snk@setnodeqty{##2}{\sankeygetnodeqty{##1}} + \snk@setnodeorient{##2}{\sankeygetnodeorient{##1}} + } +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\sankeynode} +% +% The \code{\sankeynode} macro creates the new Sankey +% node named \code{#2}. +% +% \begin{macrocode} + \NewDocumentCommand\sankeynode{O{}m}{% options, node parameters + \begingroup + \sankeyset{##1} + \sankeyset{node parameters,@initial parameters,/sankey/every node,##2} + \snk@makenode{} + \snk@makeforkednode{} + \iftoggle{sankey node start}{\snk@filldrawstart}{} + \iftoggle{sankey node end}{\snk@filldrawend}{} + \snk@show@debug{\name} + \endgroup + } +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\sankeystart} +% +% The \code{\sankeystart} macro fills and draws a starting lane +% attached to the Sankey node named \code{#2}. +% +% \begin{macrocode} + \NewDocumentCommand\sankeystart{O{}m}{% options, name + \snk@errorifnotdefined{##2} + \begingroup + \sankeyset{##1} + \edef\name{##2} + \edef\orient{\sankeygetnodeorient{##2}} + \edef\qty{\sankeygetnodeqty{##2}} + \snk@filldrawstart + \endgroup + } +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\sankeynodestart} +% +% The \code{\sankeynodestart} macro creates the new Sankey +% node named \code{#2} then fills and draws a starting lane +% attached to this new Sankey node. +% +% \begin{macrocode} + \NewDocumentCommand\sankeynodestart{O{}m}{% option, node parameters + \sankeynode[##1]{start,##2} + } +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\sankeyend} +% +% The \code{\sankeyend} macro fills and draws an ending lane +% attached to the Sankey node named \code{#2}. +% +% \begin{macrocode} + \NewDocumentCommand\sankeyend{O{}m}{%options, name + \snk@errorifnotdefined{##2} + \begingroup + \sankeyset{##1} + \edef\name{##2} + \edef\orient{\sankeygetnodeorient{##2}} + \edef\qty{\sankeygetnodeqty{##2}} + \snk@filldrawend + \endgroup + } +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\sankeynodeend} +% +% The \code{\sankeynodeend} macro creates the new Sankey +% node named \code{#2} then fills and draws an ending lane +% attached to this new Sankey node. +% +% \begin{macrocode} + \NewDocumentCommand\sankeynodeend{O{}m}{% options, node parameters + \sankeynode[##1]{end,##2} + } +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\sankeyadvance} +% \begin{macro}{\sankeyadvance*} +% +% The \code{\sankeyadvance} macro moves toward (or backward if +% \emph{starred} calls -- \code{#1}) the Sankey node named \code{#3}. +% \code{#4} is a distance. The previous position is keeped +% by a Sankey node named \code{#3-old}. +% +% \begin{macrocode} + \NewDocumentCommand\sankeyadvance{sO{}mm}{% + %params: *(reverse), options, name, distance + \snk@errorifnotdefined{##3} + \begingroup + \sankeyset{##2} + \edef\name{##3} + \edef\snk@oldname{##3-old} + \sankeynodealias{\name}{\snk@oldname} + \IfBooleanTF{##1}{ + % move backward + \sankeynode{ + at={$(\snk@oldname.center)!##4!90:(\snk@oldname.left)$}, + angle=\sankeygetnodeorient{\snk@oldname}, + quantity=\sankeygetnodeqty{\snk@oldname}, + name=\name, + } + \path[/sankey/fill] + (\name.left) -- (\snk@oldname.left) + -- (\snk@oldname.right) -- (\name.right) -- cycle; + \path[/sankey/draw] + (\name.left) -- (\snk@oldname.left) + (\snk@oldname.right) -- (\name.right); + }{ + % move forward + \sankeynode{ + at={$(\snk@oldname.center)!##4!-90:(\snk@oldname.left)$}, + angle=\sankeygetnodeorient{\snk@oldname}, + quantity=\sankeygetnodeqty{\snk@oldname}, + name=\name, + } + \path[/sankey/fill] + (\snk@oldname.left) -- (\name.left) + -- (\name.right) -- (\snk@oldname.right) -- cycle; + \path[/sankey/draw] + (\snk@oldname.left) -- (\name.left) + (\name.right) -- (\snk@oldname.right); + } + \snk@show@debug{\name} + \endgroup + } +% \end{macrocode} +% \end{macro} +% \end{macro} +% \begin{macro}{\sankeyturnright} +% \begin{macro}{\sankeyturnright*} +% +% \changes{v3.0}{2021/03/14}{new macro} +% +% The \code{sankeyturnright} macro moves forward the Sankey node +% named \code{#3} by turning right. The angle is \code{#4} (the starred +% version uses the opposite of \code{#4}). If the angle is \emph{negative}, the +% macro calls the \code{\sankeyturnrightbackward} macro to move backward else +% the macro fills/draws the lane between the previous position and the new +% position. The previous position is keeped by a Sankey +% node named \code{#3-old}. +% +% \begin{macrocode} + \NewDocumentCommand\sankeyturnright{sO{}mm}{ + % *(reverse), options, name, angle + \snk@errorifnotdefined{##3} + \begingroup + \IfBooleanTF{##1} + {\edef\snk@angle{\fpeval{-1*##4}}} + {\edef\snk@angle{\fpeval{1*##4}}} + \edef\snk@anglesign{\fpeval{sign(\snk@angle)}} + \ifnumgreater{\snk@anglesign}{-1}{ + \sankeyset{##2} + \edef\name{##3} + \edef\snk@oldname{##3-old} + \sankeynodealias{\name}{\snk@oldname} + \edef\qty{\sankeygetnodeqty{\name}} + \edef\orient{\snk@normalize@angle{\sankeygetnodeorient{\name}-\snk@angle}} + \snk@getpos\snk@c{$(\name.right)!-\snk@minradius!(\name.left)$} + \snk@getpos\pos{$(\snk@c)!1!-\snk@angle:(\name.center)$} + \snk@makenode{} + % fill the region + \path[/sankey/fill] let + \p1=(\snk@oldname.left),\p2=(\snk@oldname.right), + \p3=(\name.left),\p4=(\name.right), + \n1={\sankeyqtytolen{\qty}}, + \n{maxr}={\snk@minradius+\n1}, + \n{minr}={\snk@minradius} + in + (\p1) arc(\orient+\snk@angle+90:\orient+90:\n{maxr}) -- (\p3) -- + (\p4) arc(\orient+90:\orient+\snk@angle+90:\n{minr}) -- (\p2) -- cycle; + % draw left and right borders + \path[/sankey/draw] let + \p1=(\snk@oldname.left),\p2=(\snk@oldname.right), + \p3=(\name.left),\p4=(\name.right), + \n1={\sankeyqtytolen{\qty}}, + \n{maxr}={\snk@minradius+\n1}, + \n{minr}={\snk@minradius} + in + (\p1) arc(\orient+\snk@angle+90:\orient+90:\n{maxr}) + (\p4) arc(\orient+90:\orient+\snk@angle+90:\n{minr}); + \snk@show@debug{\name} + }{ + \sankeyturnrightbackward[##2]{##3}{-1*\snk@angle} + } + \endgroup + } +% \end{macrocode} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\sankeyturnrightbackward} +% \begin{macro}{\sankeyturnrightbackward*} +% +% \changes{v3.0}{2021/03/14}{new macro} +% +% The \code{sankeyturnrightbackward} macro moves backward the Sankey node +% named \code{#3} by turning right. The angle is \code{#4} (the starred +% version uses the opposite of \code{#4}). If the angle is \emph{negative}, the +% macro calls the \code{\sankeyturnright} macro to move forward else +% the macro fills/draws the lane between the previous position and the new +% position. The previous position is keeped by a Sankey +% node named \code{#3-old}. +% +% \begin{macrocode} + \NewDocumentCommand\sankeyturnrightbackward{sO{}mm}{ + % *(reverse), options, name, angle + \snk@errorifnotdefined{##3} + \begingroup + \IfBooleanTF{##1} + {\edef\snk@angle{\fpeval{-1*##4}}} + {\edef\snk@angle{\fpeval{1*##4}}} + \edef\snk@anglesign{\fpeval{sign(\snk@angle)}} + \ifnumgreater{\snk@anglesign}{-1}{ + \sankeyset{##2} + \edef\name{##3} + \edef\snk@oldname{##3-old} + \sankeynodealias{\name}{\snk@oldname} + \edef\qty{\sankeygetnodeqty{\name}} + \edef\orient{\snk@normalize@angle{\sankeygetnodeorient{\name}+\snk@angle}} + \snk@getpos\snk@c{$(\name.right)!-\snk@minradius!(\name.left)$} + \snk@getpos\pos{$(\snk@c)!1!\snk@angle:(\name.center)$} + \snk@makenode{} + % fill the region + \path[/sankey/fill] let + \p1=(\name.left),\p2=(\name.right), + \p3=(\snk@oldname.left),\p4=(\snk@oldname.right), + \n1={\sankeyqtytolen{\qty}}, + \n{maxr}={\snk@minradius+\n1}, \n{minr}={\snk@minradius} + in + (\p1) arc(\orient+90:\orient-\snk@angle+90:\n{maxr}) -- (\p3) -- + (\p4) arc(\orient-\snk@angle+90:\orient+90:\n{minr}) -- (\p2) -- cycle; + % draw left and right borders + \path[/sankey/draw] let + \p1=(\name.left),\p2=(\name.right), + \p3=(\snk@oldname.left),\p4=(\snk@oldname.right), + \n1={\sankeyqtytolen{\qty}}, + \n{maxr}={\snk@minradius+\n1}, \n{minr}={\snk@minradius} + in + (\p1) arc(\orient+90:\orient-\snk@angle+90:\n{maxr}) + (\p4) arc(\orient-\snk@angle+90:\orient+90:\n{minr}); + \snk@show@debug{\name} + }{ + \sankeyturnright[##2]{##3}{-1*\snk@angle} + } + \endgroup + } +% \end{macrocode} +% \end{macro} +% \end{macro} +% \begin{macro}{\sankeyturnleft} +% \begin{macro}{\sankeyturnleft*} +% +% \changes{v3.0}{2021/03/14}{new macro} +% +% The \code{sankeyturnleft} macro moves forward the Sankey node +% named \code{#3} by turning left. The angle is \code{#4} (the starred +% version uses the opposite of \code{#4}). If the angle is \emph{negative}, the +% macro calls the \code{\sankeyturnleftbackward} macro to move backward else +% the macro fills/draws the lane between the previous position and the new +% position. The previous position is keeped by a Sankey +% node named \code{#3-old}. +% +% \begin{macrocode} + \NewDocumentCommand\sankeyturnleft{sO{}mm}{ + % *(reverse), options, name, angle + \snk@errorifnotdefined{##3} + \begingroup + \IfBooleanTF{##1} + {\edef\snk@angle{\fpeval{-1*##4}}} + {\edef\snk@angle{\fpeval{1*##4}}} + \edef\snk@anglesign{\fpeval{sign(\snk@angle)}} + \ifnumgreater{\snk@anglesign}{-1}{ + \sankeyset{##2} + \edef\name{##3} + \edef\snk@oldname{##3-old} + \sankeynodealias{\name}{\snk@oldname} + \edef\qty{\sankeygetnodeqty{\name}} + \edef\orient{\snk@normalize@angle{\sankeygetnodeorient{\name}+\snk@angle}} + \snk@getpos\snk@c{$(\name.left)!-\snk@minradius!(\name.right)$} + \snk@getpos\pos{$(\snk@c)!1!\snk@angle:(\name.center)$} + \snk@makenode{} + % fill the region + \path[/sankey/fill] let + \p1=(\snk@oldname.left),\p2=(\snk@oldname.right), + \p3=(\name.left),\p4=(\name.right), + \n1={\sankeyqtytolen{\qty}}, + \n{maxr}={\snk@minradius+\n1}, \n{minr}={\snk@minradius} + in + (\p1) arc(\orient-\snk@angle-90:\orient-90:\n{minr}) -- (\p3) -- + (\p4) arc(\orient-90:\orient-\snk@angle-90:\n{maxr}) -- (\p2) -- cycle; + % draw left and right borders + \path[/sankey/draw] let + \p1=(\snk@oldname.left),\p2=(\snk@oldname.right), + \p3=(\name.left),\p4=(\name.right), + \n1={\sankeyqtytolen{\qty}}, + \n{maxr}={\snk@minradius+\n1}, \n{minr}={\snk@minradius} + in + (\p1) arc(\orient-\snk@angle-90:\orient-90:\n{minr}) + (\p4) arc(\orient-90:\orient-\snk@angle-90:\n{maxr}); + \snk@show@debug{\name} + }{ + \sankeyturnleftbackward[##2]{##3}{-1*\snk@angle} + } + \endgroup + } +% \end{macrocode} +% \end{macro} +% \end{macro} +% \begin{macro}{\sankeyturnleftbackward} +% \begin{macro}{\sankeyturnleftbackward*} +% +% \changes{v3.0}{2021/03/14}{new macro} +% +% The \code{sankeyturnleftbackward} macro moves backward the Sankey node +% named \code{#3} by turning left. The angle is \code{#4} (the starred +% version uses the opposite of \code{#4}). If the angle is \emph{negative}, the +% macro calls the \code{\sankeyturnleft} macro to move forward else +% the macro fills/draws the lane between the previous position and the new +% position. The previous position is keeped by a Sankey +% node named \code{#3-old}. +% +% \begin{macrocode} + \NewDocumentCommand\sankeyturnleftbackward{sO{}mm}{ + % *(reverse), options, name, angle + \snk@errorifnotdefined{##3} + \begingroup + \IfBooleanTF{##1} + {\edef\snk@angle{\fpeval{-1*##4}}} + {\edef\snk@angle{\fpeval{1*##4}}} + \edef\snk@anglesign{\fpeval{sign(\snk@angle)}} + \ifnumgreater{\snk@anglesign}{-1}{ + \sankeyset{##2} + \edef\name{##3} + \edef\snk@oldname{##3-old} + \sankeynodealias{\name}{\snk@oldname} + \edef\qty{\sankeygetnodeqty{\name}} + \edef\orient{\snk@normalize@angle{\sankeygetnodeorient{\name}-\snk@angle}} + \snk@getpos\snk@c{$(\name.left)!-\snk@minradius!(\name.right)$} + \snk@getpos\pos{$(\snk@c)!1!-\snk@angle:(\name.center)$} + \snk@makenode{} + % fill the region + \path[/sankey/fill] let + \p1=(\name.left),\p2=(\name.right), + \p3=(\snk@oldname.left),\p4=(\snk@oldname.right), + \n1={\sankeyqtytolen{\qty}}, + \n{maxr}={\snk@minradius+\n1}, \n{minr}={\snk@minradius} + in + (\p1) arc(\orient-90:\orient+\snk@angle-90:\n{minr}) -- (\p3) -- + (\p4) arc(\orient+\snk@angle-90:\orient-90:\n{maxr}) -- (\p2) -- cycle; + % draw left and right borders + \path[/sankey/draw] let + \p1=(\name.left),\p2=(\name.right), + \p3=(\snk@oldname.left),\p4=(\snk@oldname.right), + \n1={\sankeyqtytolen{\qty}}, + \n{maxr}={\snk@minradius+\n1}, \n{minr}={\snk@minradius} + in + (\p1) arc(\orient-90:\orient+\snk@angle-90:\n{minr}) + (\p4) arc(\orient+\snk@angle-90:\orient-90:\n{maxr}); + \snk@show@debug{\name} + }{ + \sankeyturnleft[##2]{##3}{-1*\snk@angle} + } + \endgroup + } +% \end{macrocode} +% \end{macro} +% \end{macro} +% \begin{macro}{\sankeyturn} +% \begin{macro}{\sankeyturn*} +% +% \changes{v3.0}{2021/03/14}{simplification by using new \emph{turn} macros} +% +% The \code{\sankeyturn} macro moves toward (or backward if +% \emph{starred} calls -- \code{#1}) the Sankey node named +% \code{#3} by turning left (angle \code{#4} is positive) +% or right (angle \code{#4} is negative). +% The previous position is keeped by a Sankey node named +% \code{#3-old}. +% +% \begin{macrocode} + \NewDocumentCommand\sankeyturn{sO{}mm}{% + % *(reverse), options, name, angle + \snk@errorifnotdefined{##3} + \begingroup + \edef\snk@anglesign{\fpeval{sign(##4)}} + \IfBooleanTF{##1}{ + \ifnumgreater{\snk@anglesign}{-1} + {\sankeyturnleftbackward[##2]{##3}{##4}} + {\sankeyturnrightbackward[##2]{##3}{-1*##4}} + }{ + \ifnumgreater{\snk@anglesign}{-1} + {\sankeyturnleft[##2]{##3}{##4}} + {\sankeyturnright[##2]{##3}{-1*##4}} + } + \endgroup + } +% \end{macrocode} +% \end{macro} +% \end{macro} +% \begin{macro}{\sankeyfork} +% +% The \code{\sankeyfork} macro forks the Sankey node named +% \code{#2} to the list of subnodes given by \code{#3}. +% The subnodes are cloned to take into account +% the \code{debug} option. +% +% \begin{macrocode} + \NewDocumentCommand\sankeyfork{O{}mm}{%options, name, list of forks + \snk@errorifnotdefined{##2} + \begingroup + \sankeyset{##1} + \sankeynode[debug=false]{as={##2},forked={##3}} + \foreach \qty/\snk@subnodename in {##3}{\sankeynode{as={\snk@subnodename}}} + \endgroup + } +% \end{macrocode} +% \end{macro} +% \begin{macro}{\sankeyqtytolen} +% +% The \code{\sankeyqtytolen} macro converts quantity +% to length using \code{\fpeval} and the ratio determined +% by \code{\snk@totalqty} and \code{sankeytotallen}. +% +% \begin{macrocode} + \def\sankeyqtytolen##1{\fpeval{(##1)/\snk@totalqty*\snk@totallen}} +% \end{macrocode} +% \end{macro} +% +%^^A % ------------------------------------------------------------ +% \subsection{The \protect\texttt{sankeydiagram} environment (the end)} +%^^A % ------------------------------------------------------------ +% +% Here is the end of the definition of the \code{sankeydiagram} +% environment. The \code{@initial options} style and the % +% \code{every diagram} style are applied before options provided by +% user. +% +% \begin{macrocode} + \sankeyset{ + @initial options, + every diagram, + % user values + #1} +} +{} % empty but mandatory ! :-) +% \end{macrocode} +% \end{environment} +% +%^^A % ------------------------------------------------------------ +% \subsection{Predefined start and end styles} +%^^A % ------------------------------------------------------------ +% +% The \code{none} style. +% +% \begin{macrocode} +\sankeyset{ + new start style={none}{}{}, + new end style={none}{}{}, +} +% \end{macrocode} +% +% The \code{simple} style. +% +% \begin{macrocode} +\sankeyset{ + new start style={simple}{ + (\name.left) -- ([xshift=-.5\pgflinewidth]\name.left) + -- ([xshift=-.5\pgflinewidth]\name.right) -- (\name.right) -- cycle + }{ + (\name.left) -- ([xshift=-.5\pgflinewidth]\name.left) + -- ([xshift=-.5\pgflinewidth]\name.right) -- (\name.right) + }, + new end style={simple}{ + (\name.left) -- ([xshift=2mm]\name.center) + -- (\name.right) -- cycle + }{ + (\name.left) -- ([xshift=2mm]\name.center) -- (\name.right) + }, +} +% \end{macrocode} +% +% The \code{arrow} style. +% +% \begin{macrocode} +\sankeyset{ + new start style={arrow}{ + (\name.left) -- ++(-10pt,0) -- ([xshift=-10pt/6]\name.center) + -- ([xshift=-10pt]\name.right) -- (\name.right) -- cycle + }{ + (\name.left) -- ++(-10pt,0) -- ([xshift=-10pt/6]\name.center) + -- ([xshift=-10pt]\name.right) -- (\name.right) + }, + new end style={arrow}{ + (\name.left) -- ([yshift=1mm]\name.left) + -- ([xshift=10pt]\name.center) -- ([yshift=-1mm]\name.right) + -- (\name.right) -- cycle + }{ + (\name.left) -- ([yshift=1mm]\name.left) + -- ([xshift=10pt]\name.center) -- ([yshift=-1mm]\name.right) + -- (\name.right) + }, +} +% \end{macrocode} +% \iffalse +%</sankey> +% \fi +% +%^^A % ------------------------------------------------------------ +% \section{\texttt{tikzlibrarydubins.code.tex}} +%^^A % ------------------------------------------------------------ +% +% Not yet documented nor commented... +% +% \iffalse +%<*tikzlibrarydubins.code.tex> +% \fi +% \begin{macrocode} +\def\tikzlibrarydubins@version{v3.0} +\def\tikzlibrarydubins@date{2021/03/14} + +\usetikzlibrary{calc} +\RequirePackage{etoolbox} +\RequirePackage{xfp} + +\newbool{dubinspathreverse} + +\def\ifpgfmathcond#1{% + \pgfmathparse{(#1)?1:0}% + \ifnumequal{\pgfmathresult}{1}% +} + + +\def\dbp@getxy#1#2#3{% + \tikz@scan@one@point\pgfutil@firstofone(#3)\relax% + \edef#1{\the\pgf@x}% + \edef#2{\the\pgf@y}% +} + +\def\dbp@anglebetween#1#2#3{%macro, s, t + \dbp@getxy\dbp@ax\dbp@ay{#2} + \dbp@getxy\dbp@bx\dbp@by{#3} + \pgfmathsetmacro#1{atan2(\dbp@by-\dbp@ay,\dbp@bx-\dbp@ax)} +} + +\def\dbp@distancebetween#1#2#3{%macro, s, t + \dbp@getxy\dbp@ax\dbp@ay{#2} + \dbp@getxy\dbp@bx\dbp@by{#3} + \edef#1{\fpeval{sqrt(% + (\dbp@bx-\dbp@ax)*(\dbp@bx-\dbp@ax)% + +(\dbp@by-\dbp@ay)*(\dbp@by-\dbp@ay)% + )}}% +} + +\newcommand\dbp@rsr{% s, sa, t, ta, as, len, at, r + let + \p{tr}=([shift={(\dbp@angb-90:\dbp@radius pt)}]\dbp@b), + \n1={\dbp@anga+90}, + \n2={\dbp@angb+90}, + \n3={\n2+\dbp@lastangle} + in + arc(\n1:\n1-\dbp@firstangle:\dbp@rradius pt) + -- ([shift={(\p{tr})}]\n3:\dbp@rradius pt) + arc(\n3:\n2:\dbp@rradius pt) +} + +\newcommand\dbp@lsl{% s, sa, t, ta, as, len, at, r + let + \p{tl}=([shift={(\dbp@angb+90:\dbp@radius pt)}]\dbp@b), + \n1={\dbp@anga-90},\n2={\n1+\dbp@firstangle}, + \n3={\dbp@angb-90},\n4={\n3-\dbp@lastangle} + in + arc(\n1:\n2:\dbp@lradius pt) + -- ([shift={(\p{tl})}]\n4:\dbp@lradius pt) + arc(\n4:\n3:\dbp@lradius pt) +} + +\newcommand\dbp@rsl{% s, sa, t, ta, as, len, at, r + let + \p{tl}=([shift={(\dbp@angb+90:\dbp@radius pt)}]\dbp@b), + \n1={\dbp@anga+90},\n2={\n1-\dbp@firstangle}, + \n3={\dbp@angb-90},\n4={\n3-\dbp@lastangle} + in + arc(\n1:\n2:\dbp@rradius pt) + -- ([shift={(\p{tl})}]\n4:\dbp@lradius pt) + arc(\n4:\n3:\dbp@lradius pt) +} + +\newcommand\dbp@lsr{% s, sa, t, ta, as, len, at, r + let + \p{tr}=([shift={(\dbp@angb-90:\dbp@radius pt)}]\dbp@b), + \n1={\dbp@anga-90},\n2={\n1+\dbp@firstangle}, + \n3={\dbp@angb+90},\n4={\n3+\dbp@lastangle} + in + arc(\n1:\n2:\dbp@lradius pt) + -- ([shift={(\p{tr})}]\n4:\dbp@rradius pt) + arc(\n4:\n3:\dbp@rradius pt) +} + +\newcommand\dbp@lrl{% s, sa, t, ta, as, ai, at, r + let + \n1={\dbp@anga-90},\n2={\n1+\dbp@firstangle}, + \n3={\dbp@angb-90},\n4={\n3-\dbp@lastangle} + in + arc(\n1:\n2:\dbp@lradius pt) + arc(\n2+180:\n2+180-\dbp@midparam:\dbp@rradius pt) + arc(\n4:\n3:\dbp@lradius pt) +} + +\newcommand\dbp@rlr{% s, sa, t, ta, as, ai, at, r + let + \n1={\dbp@anga+90},\n2={\n1-\dbp@firstangle}, + \n3={\dbp@angb+90},\n4={\n3+\dbp@lastangle} + in + arc(\n1:\n2:\dbp@rradius pt) + arc(\n2+180:\n2+180+\dbp@midparam:\dbp@lradius pt) + arc(\n4:\n3:\dbp@rradius pt) +} +\newcommand\dbp@rev@lsl{\dbp@rsr} +\newcommand\dbp@rev@rsr{\dbp@lsl} +\newcommand\dbp@rev@lsr{\dbp@lsr} +\newcommand\dbp@rev@rsl{\dbp@rsl} +\newcommand\dbp@rev@lrl{\dbp@rlr} +\newcommand\dbp@rev@rlr{\dbp@lrl} + + +\newcommand\dubinspath[1]{% + \pgfextra{ + \dubinspathset{#1} + \ifbool{dubinspathreverse}{ + \edef\dbp@newa{\dbp@b} + \edef\dbp@newb{\dbp@a} + \pgfmathsetmacro\dbp@newanga{180+\dbp@angb} + \pgfmathsetmacro\dbp@newangb{180+\dbp@anga} + \edef\dbp@newfirstangle{\dbp@lastangle} + \edef\dbp@newlastangle{\dbp@firstangle} + \edef\dbp@newmethod{rev@\dbp@method} + \edef\dbp@newlradius{\dbp@rradius} + \edef\dbp@newrradius{\dbp@lradius} + \dubinspathset{ + start point=\dbp@newa, + end point=\dbp@newb, + start angle=\dbp@newanga, + end angle=\dbp@newangb, + first angle=\dbp@newfirstangle, + last angle=\dbp@newlastangle, + left and right minimum radii=\dbp@newlradius pt and \dbp@newrradius pt, + method=\dbp@newmethod, + } + }{} + } + \csname dbp@\dbp@method\endcsname% +} + + +%% solution + +\def\dbp@store#1#2{% + \expandafter\xdef\csname dbp@store@#1@#2\endcsname% + {\csname dbp@#2\endcsname}% +} +\def\dbp@get#1#2{% + \csname dbp@store@#1@#2\endcsname% +} + +\def\dbp@setparams#1#2#3#4#5{% + % method, length, fisrt angle, middle param, last angle + \edef\dbp@method{#1} + \edef\dbp@length{#2} + \edef\dbp@firstangle{#3} + \edef\dbp@middleparam{#4} + \edef\dbp@lastangle{#5} + \ifdef{\dbp@storename}{ + \foreach \p in {method,length,firstangle,middleparam,lastangle}{ + \dbp@store{\dbp@storename}{\p} + } + }{} +} + +\def\dbp@updateparams#1#2#3#4#5{ + \ifpgfmathcond{#2<\dbp@length}{ + \dbp@setparams{#1}{#2}{#3}{#4}{#5} + }{} +} + +\tikzset{ + dubins path/.is family, + dubins path, + start point/.store in=\dbp@a, + start angle/.store in=\dbp@anga, + end point/.store in=\dbp@b, + end angle/.store in=\dbp@angb, + store/.store in=\dbp@storename, + use store/.style={ + method=\dbp@get{#1}{method}, + first angle=\dbp@get{#1}{firstangle}, + last angle=\dbp@get{#1}{lastangle}, + middle param=\dbp@get{#1}{middleparam}, + }, + minimum radius/.code={ + \pgfmathsetmacro\dbp@radius{#1} + \pgfmathsetmacro\dbp@rradius{#1} + \pgfmathsetmacro\dbp@lradius{#1} + }, + left and right minimum radii/.code args={#1 and #2}{ + \pgfmathsetmacro\dbp@lradius{#1} + \pgfmathsetmacro\dbp@rradius{#2} + \pgfmathsetmacro\dbp@radius{(\dbp@lradius + \dbp@rradius)/2} + }, + method/.store in=\dbp@method, + first angle/.store in=\dbp@firstangle, + last angle/.store in=\dbp@lastangle, + middle param/.store in=\dbp@midparam, + reverse/.is if=dubinspathreverse, +} + +\newcommand\dubinspathset[1]{\tikzset{dubins path,#1}} + +\newcommand\dubinspathcalc[1]{% + \begingroup + \dubinspathset{#1} + \tikzset{ + declare function={ + angtodist(\dbp@a,\dbp@r)={abs(\dbp@a)*.01745329*\dbp@r}; + modangr(\dbp@a,\dbp@b)={ + ( + Mod(\dbp@a,360)<Mod(\dbp@b,360) + ? + Mod(\dbp@a,360) + : + Mod(\dbp@a,360)-360)+\dbp@b-Mod(\dbp@b,360 + ) + }; + modangl(\dbp@a,\dbp@b)={ + ( + Mod(\dbp@a,360)<Mod(\dbp@b,360) + ? + Mod(\dbp@a,360)+360 + : + Mod(\dbp@a,360))+(\dbp@b)-Mod(\dbp@b,360) + }; + }, + } + + \pgfmathsetmacro\dbp@radius{\dbp@rradius} + \pgfmathsetmacro\dbp@anga{mod((\dbp@anga)+180,360)-180} + \pgfmathsetmacro\dbp@angb{mod((\dbp@angb)+180,360)-180} + \path + let + \p{a}=(\dbp@a), + \p{b}=(\dbp@b), + \p{ar}=($(\p{a}) + (\dbp@anga-90:\dbp@radius pt)$), + \p{al}=($(\p{a}) + (\dbp@anga+90:\dbp@radius pt)$), + \p{br}=($(\p{b}) + (\dbp@angb-90:\dbp@radius pt)$), + \p{bl}=($(\p{b}) + (\dbp@angb+90:\dbp@radius pt)$) + in \pgfextra{ + \pgfinterruptpath + + % RSR (ar and br) + \dbp@anglebetween\dbp@rsrarbr{\p{ar}}{\p{br}} + \dbp@distancebetween\dbp@rsrdarbr{\p{ar}}{\p{br}} + \pgfmathsetmacro\dbp@rsrangone{Mod(\dbp@anga-\dbp@rsrarbr,360)} + \pgfmathsetmacro\dbp@rsrangtwo{Mod(\dbp@rsrarbr-\dbp@angb,360)} + \pgfmathsetmacro\dbp@rsrlen{\dbp@rsrdarbr} + \pgfmathsetmacro\dbp@rsrdist{ + angtodist(\dbp@rsrangone,\dbp@radius) + +\dbp@rsrlen + +angtodist(\dbp@rsrangtwo,\dbp@radius) + } + \dbp@setparams{rsr}{\dbp@rsrdist}{\dbp@rsrangone}{\dbp@rsrlen}{\dbp@rsrangtwo} + + % LSL (al and bl) + \dbp@anglebetween\dbp@lslalbl{\p{al}}{\p{bl}} + \dbp@distancebetween\dbp@lsldalbl{\p{al}}{\p{bl}} + \pgfmathsetmacro{\dbp@lslangone}{mod(\dbp@lslalbl-\dbp@anga+720,360)} + \pgfmathsetmacro{\dbp@lslangtwo}{mod(\dbp@angb-\dbp@lslalbl+720,360)} + \pgfmathsetmacro\dbp@lsllen{\dbp@lsldalbl} + \pgfmathsetmacro\dbp@lsldist{ + angtodist(\dbp@lslangone,\dbp@radius) + +\dbp@lsllen + +angtodist(\dbp@lslangtwo,\dbp@radius) + } + \dbp@updateparams% + {lsl}{\dbp@lsldist}{\dbp@lslangone}{\dbp@lsllen}{\dbp@lslangtwo} + + % RSL (ar and bl) + \dbp@distancebetween\dbp@rsldarbl{\p{ar}}{\p{bl}} + \pgfmathtruncatemacro\dbp@rslok{(\dbp@rsldarbl>=2*\dbp@radius)?1:0} + \ifnumequal{\dbp@rslok}{1}{ + \dbp@anglebetween\dbp@rslarbl{\p{ar}}{\p{bl}} + \pgfmathsetmacro\dbp@rslanglesup{ + asin(\dbp@radius/\dbp@rsldarbl*2)} + \pgfmathsetmacro\dbp@rslangone + {Mod(\dbp@anga-\dbp@rslarbl+\dbp@rslanglesup,360)} + \pgfmathsetmacro\dbp@rslangtwo + {Mod(\dbp@angb-\dbp@rslarbl+\dbp@rslanglesup,360)} + \pgfmathsetmacro\dbp@rsllen{veclen(\dbp@rsldarbl,\dbp@radius)} + \pgfmathsetmacro\dbp@rsldist{ + angtodist(\dbp@rslangone,\dbp@radius) + +\dbp@rsllen + +angtodist(\dbp@rslangtwo,\dbp@radius) + } + + \dbp@updateparams% + {rsl}{\dbp@rsldist}{\dbp@rslangone}{\dbp@rsllen}{\dbp@rslangtwo} + }{} + + % LSR (al and br) + \dbp@distancebetween\dbp@lsrdalbr{\p{al}}{\p{br}} + \pgfmathtruncatemacro\dbp@lsrok{(\dbp@lsrdalbr>=2*\dbp@radius)?1:0} + \ifnumequal{\dbp@lsrok}{1}{ + \dbp@anglebetween\dbp@lsralbr{\p{al}}{\p{br}} + \pgfmathsetmacro\dbp@lsranglesup{ + asin(\dbp@radius/\dbp@lsrdalbr*2)} + \pgfmathsetmacro\dbp@lsrangone + {Mod(\dbp@lsralbr+\dbp@lsranglesup-\dbp@anga,360)} + \pgfmathsetmacro\dbp@lsrangtwo + {Mod(\dbp@lsralbr+\dbp@lsranglesup-\dbp@angb,360)} + \pgfmathsetmacro\dbp@lsrlen{veclen(\dbp@lsrdalbr,\dbp@radius)} + \pgfmathsetmacro\dbp@lsrdist{ + angtodist(\dbp@lsrangone,\dbp@radius) + +\dbp@lsrlen + +angtodist(\dbp@lsrangtwo,\dbp@radius) + } + \dbp@updateparams% + {lsr}{\dbp@lsrdist}{\dbp@lsrangone}{\dbp@lsrlen}{\dbp@lsrangtwo} + }{} + + % LRL (al and bl) + \dbp@distancebetween\dbp@lrldalbl{\p{al}}{\p{bl}} + \pgfmathtruncatemacro\dbp@lrlok{(\dbp@lrldalbl<=4*\dbp@radius)?1:0} + \ifnumequal{\dbp@lrlok}{1}{ + \dbp@anglebetween\dbp@lrlalbl{\p{al}}{\p{bl}} + \pgfmathsetmacro\dbp@lrlangsup{acos(\dbp@lrldalbl/\dbp@radius/4)} + \pgfmathsetmacro\dbp@lrlangone{ + modangl(\dbp@lrlalbl+\dbp@lrlangsup,\dbp@anga-90)-(\dbp@anga-90)} + \pgfmathsetmacro\dbp@lrlangtwo{% + (\dbp@angb-90)-modangr(\dbp@lrlalbl+180-\dbp@lrlangsup,\dbp@angb-90)} + \pgfmathsetmacro\dbp@lrlangthree{360-2*(90-\dbp@lrlangsup)} + \pgfmathsetmacro\dbp@lrldist{ + angtodist(\dbp@lrlangone,\dbp@radius) + +angtodist(\dbp@lrlangthree,\dbp@radius) + +angtodist(\dbp@lrlangtwo,\dbp@radius) + } + \dbp@updateparams% + {lrl}{\dbp@lrldist}{\dbp@lrlangone}{\dbp@lrlangthree}{\dbp@lrlangtwo} + }{} + + % RLR (ar and br) + \dbp@distancebetween\dbp@rlrdarbr{\p{ar}}{\p{br}} + \pgfmathtruncatemacro\dbp@rlrok{(\dbp@rlrdarbr<=4*\dbp@radius)?1:0} + \ifnumequal{\dbp@rlrok}{1}{ + \dbp@anglebetween\dbp@rlrarbr{\p{ar}}{\p{br}} + \pgfmathsetmacro\dbp@rlrangsup{acos(\dbp@rlrdarbr/\dbp@radius/4)} + \pgfmathsetmacro\dbp@rlrangone{ + (\dbp@anga+90)-modangr(\dbp@rlrarbr-\dbp@rlrangsup,\dbp@anga+90)} + \pgfmathsetmacro\dbp@rlrangtwo{% + modangl(\dbp@rlrarbr+180+\dbp@rlrangsup,\dbp@angb+90)-(\dbp@angb+90)} + \pgfmathsetmacro\dbp@rlrangthree{360-2*(90-\dbp@rlrangsup)} + \pgfmathsetmacro\dbp@rlrdist{ + angtodist(\dbp@rlrangone,\dbp@radius) + +angtodist(\dbp@rlrangthree,\dbp@radius) + +angtodist(\dbp@rlrangtwo,\dbp@radius) + } + \dbp@updateparams% + {rlr}{\dbp@rlrdist}{\dbp@rlrangone}{\dbp@rlrangthree}{\dbp@rlrangtwo} + }{} + + \endpgfinterruptpath + }; + \endgroup +} +% \end{macrocode} +% \iffalse +%</tikzlibrarydubins.code.tex> +% \fi +% +% \PrintChanges +% +% \setcounter{IndexColumns}{2} +% \PrintIndex +% +% \Finale +% +% \iffalse +%<*sankeydocpreamble> +\usepackage[paper=a4paper,vmargin=1.5cm,left=4.5cm,right=3.5cm]{geometry} +\usepackage[utf8]{inputenc} +\usepackage{cmap} +\usepackage[T1]{fontenc} +\usepackage{lmodern} +\usepackage[final,protrusion=true,expansion=true]{microtype} +\usepackage{xcolor} +\PassOptionsToPackage{final,colorlinks,linkcolor=red!60!orange!85!black}{hyperref} +\usepackage[numbered]{hypdoc} +\usepackage{fancyvrb} +\usepackage[final]{listings} +\usepackage{enumitem} +\usepackage{bookmark} +\usepackage{siunitx} +\usepackage{footnote} +\usepackage{etoc} +\usepackage{accsupp} +\usepackage{tikz} +\usetikzlibrary{positioning,patterns.meta,fit} +\usepackage[british]{babel} +\usepackage{varioref} +\usepackage{embedfile} +\usepackage{dtx-attach} +\embedfile[mimetype=text/plain]{sankey.ins} +\usepackage{sankey} + +\colorlet{bgcode}{yellow!50!gray!5} +\colorlet{keyword}{blue!50!cyan!50!black} +\colorlet{comment}{red!75!black} + +\newcommand\emptyaccsupp[1]{\BeginAccSupp{ActualText={}}#1\EndAccSupp{}} + +\lstset{ + literate= + {á}{{\'a}}1 {é}{{\'e}}1 {Ã}{{\'i}}1 {ó}{{\'o}}1 {ú}{{\'u}}1 + {Ã}{{\'A}}1 {É}{{\'E}}1 {Ã}{{\'I}}1 {Ó}{{\'O}}1 {Ú}{{\'U}}1 + {à }{{\`a}}1 {è}{{\`e}}1 {ì}{{\`i}}1 {ò}{{\`o}}1 {ù}{{\`u}}1 + {À}{{\`A}}1 {È}{{\'E}}1 {ÃŒ}{{\`I}}1 {Ã’}{{\`O}}1 {Ù}{{\`U}}1 + {ä}{{\"a}}1 {ë}{{\"e}}1 {ï}{{\"i}}1 {ö}{{\"o}}1 {ü}{{\"u}}1 + {Ä}{{\"A}}1 {Ë}{{\"E}}1 {Ã}{{\"I}}1 {Ö}{{\"O}}1 {Ãœ}{{\"U}}1 + {â}{{\^a}}1 {ê}{{\^e}}1 {î}{{\^i}}1 {ô}{{\^o}}1 {û}{{\^u}}1 + {Â}{{\^A}}1 {Ê}{{\^E}}1 {ÃŽ}{{\^I}}1 {Ô}{{\^O}}1 {Û}{{\^U}}1 + {Å“}{{\oe}}1 {Å’}{{\OE}}1 {æ}{{\ae}}1 {Æ}{{\AE}}1 {ß}{{\ss}}1 + {ç}{{\c c}}1 {Ç}{{\c C}}1 {ø}{{\o}}1 {Ã¥}{{\r a}}1 {Ã…}{{\r A}}1 + {€}{{\texteuro}}1 {£}{{\pounds}}1 {°}{{\degres}}1 + {’}{{\textquoteright}}1 {‘}{{\textquoteleft}}1 + {«}{{<<}}1 {»}{{>>}}1 + {—}{{---}}1 {−}{{$-$}}1 + {\^\^A}{{}}0 % verbatim in .dtx file +} + +\lstset{ + fancyvrb=true, + escapechar=`, + extendedchars=true, + fontadjust=true, + columns=fullflexible, + flexiblecolumns=true, + inputencoding=utf8, + keepspaces=true, + backgroundcolor=\color{bgcode}, + basicstyle=\mdseries\ttfamily, + keywordstyle=\color{keyword}, + stringstyle=\ttfamily\color{green!50!black}, + commentstyle=\color{comment}\itshape, + emphstyle=\bfseries\color{red}, + numbersep=5pt, + %numbers=left, + numberstyle=\tiny\emptyaccsupp, + showstringspaces=false, + upquote=true, + aboveskip=.5\parskip, + belowskip=.5\parskip, + framexleftmargin=1pt, + framexrightmargin=1pt, + gobble=2, % \lstlisting code in .dtx +} + +\lstdefinestyle{textsmall}{basicstyle=\color{black}\small\mdseries\ttfamily} +\lstdefinestyle{textfootnotesize}{basicstyle=\color{black}\footnotesize\mdseries\ttfamily} +\lstdefinestyle{textscriptsize}{basicstyle=\color{black}\scriptsize\mdseries\ttfamily} +\lstdefinestyle{texttiny}{basicstyle=\color{black}\tiny\mdseries\ttfamily} + +\lstdefinestyle{LaTeX}{ + language=[LaTeX]TeX, + moretexcs={ + Lab, + LabSet, + Qty, + QtySet, + colorlet, + coordinate, + countries, + country, + countryname, + definecolor, + draw, + endcountry, + fill, + foreach, + hashband, + hdist, + hwidth, + node, + nodename, + path, + sankeyadvance, + sankeydubins, + sankeyend, + sankeyend, + sankeyfork, + sankeynode, + sankeynodealias, + sankeynodeend, + sankeynodestart, + sankeyoutin, + sankeyset, + sankeystart, + sankeyturn, + sankeyturnleft, + sankeyturnleftbackward, + sankeyturnright, + sankeyturnrightbackward, + sisetup, + startcountry, + tikzset, + turnandstop, + usepackage, + vdist, + } +} +\lstdefinestyle{LaTeXsmall}{style=LaTeX,style=textsmall} +\lstdefinestyle{LaTeXfootnotesize}{style=LaTeX,style=textfootnotesize} +\lstdefinestyle{LaTeXscriptsize}{style=LaTeX,style=textscriptsize} +\lstdefinestyle{LaTeXtiny}{style=LaTeX,style=texttiny} + +\def\code{\lstinline[basicstyle=\mdseries\ttfamily\color{red!50!black}]} + +\edef\samplecodename{\jobname-code.vrb} + +\newcommand\constant[1]{\textcolor{violet}{\texttt{#1}}} +\newcommand\ARG[1]{\texttt{\{#1\}}} +\newcommand\OPTARG[1]{\textcolor{green!50!black}{\texttt{[#1]}}} +\newcommand\VAR[1]{\textit{\texttt{\ensuremath{\langle}#1\ensuremath{\rangle}}}} +\newcommand\NOTE[1]{\leavevmode\marginpar{#1}} + +\def\mynobreakpar{\par\nobreak\@afterheading} +\def\docprefix#1{\texttt{\textcolor{gray}{#1}}} +\def\sankeykeysprefix{/sankey} + +\newenvironment{sankeyoption}[5][]{% [prefix] key, val, default, initially + \begingroup + % + \def\keypath{#1}% + \def\key{#2}% + \def\val{#3}% + \def\default{#4}% + \def\initially{#5}% + %\setlength\parindent{\dimexpr.5\parindent\relax}% + % \vspace{.25\baselineskip plus .25\baselineskip minus 0mm} + \parfillskip 0pt plus 1fil% + \leavevmode% + \ttfamily% + \hspace*{-1cm}% + \textcolor{red!75!black}{\texttt{\docprefix{\ifdefempty{\keypath}{\sankeykeysprefix/}{\keypath/}}\key}}% + \ifdefempty{\val}{}{=\val}% + \hfill% + \ifdefempty{\default}{\null}{(default:\,\constant{\default})}% + \ifdefempty{\initially}{\null}{(initially:\,\constant{\initially})}% + \mynobreakpar% + \endgroup% + \parskip=.5\baselineskip plus .25\baselineskip minus .25\baselineskip + \parfillskip=30pt plus 1fil + \itemize[topsep=0pt,partopsep=0pt,itemsep=0pt]\item[] +}{% + \enditemize% +} + +\newcommand\MACRO{\hspace*{-1cm}} + +\newlist{sankeyconstantsdesc}{description}{1} +\setlist[sankeyconstantsdesc]{align=right,labelindent=1.5em,labelsep=.5em,leftmargin=!,font=\normalfont} + +\newlength{\myparskip} +\setlength{\myparskip}{.75\baselineskip plus 8\baselineskip minus .25\baselineskip} +\usepackage[skip=\myparskip]{parskip} +\newenvironment{miniblock}{% + \vspace{.5\parskip}% +}{% +} + +\tikzset{ + every picture/.style={ + execute at end picture={ + \begin{pgfonlayer}{background} + \node[fit=(current bounding box),inner sep=0](bb){}; + \def\rs{5mm} + \draw[gray!25] let + \p{sw}=(bb.south west), \p{ne}=(bb.north east), + \n{maxx}={ceil(\x{ne}/\rs)*\rs}, \n{minx}={floor(\x{sw}/\rs)*\rs}, + \n{maxy}={ceil(\y{ne}/\rs)*\rs}, \n{miny}={floor(\y{sw}/\rs)*\rs} + in (\n{minx},\n{miny}) grid (\n{maxx},\n{maxy}); + \begin{scope}[overlay] + \draw[gray!50,-latex] let + \p{sw}=(bb.south west), \p{ne}=(bb.north east), + \n{maxx}={ceil(\x{ne}/\rs)*\rs}, \n{minx}={floor(\x{sw}/\rs)*\rs}, + \n{maxy}={ceil(\y{ne}/\rs)*\rs}, \n{miny}={floor(\y{sw}/\rs)*\rs} + in (\n{minx},0) -- (\n{maxx}+1mm,0); + \draw[gray!50,-latex] let + \p{sw}=(bb.south west), \p{ne}=(bb.north east), + \n{maxx}={ceil(\x{ne}/\rs)*\rs}, \n{minx}={floor(\x{sw}/\rs)*\rs}, + \n{maxy}={ceil(\y{ne}/\rs)*\rs}, \n{miny}={floor(\y{sw}/\rs)*\rs} + in (0,\n{miny}) -- (0,\n{maxy}+1mm); + \end{scope} + \end{pgfonlayer} + } + } +} + +\def\MacroFont{ + \fontencoding\encodingdefault + \fontfamily\ttdefault + \fontseries\mddefault + \fontshape\shapedefault + \footnotesize% +} +%</sankeydocpreamble> +% \fi +\endinput + +% Local Variables: +% mode: doctex +% LaTeX-verbatim-macros-with-braces-local: ("code") +% TeX-master: t +% End: diff --git a/graphics/pgf/contrib/sankey/sankey.ins b/graphics/pgf/contrib/sankey/sankey.ins new file mode 100644 index 0000000000..ab11ca1dc1 --- /dev/null +++ b/graphics/pgf/contrib/sankey/sankey.ins @@ -0,0 +1,85 @@ +%% +%% Copyright (C) 2016, 2021 by Paul Gaborit +%% +%% This work may be distributed and/or modified under the conditions of +%% the LaTeX Project Public License, either version 1.3 of this license +%% or (at your option) any later version. The latest version of this +%% license is in +%% +%% <http://www.latex-project.org/lppl.txt> +%% +%% and version 1.3 or later is part of all distributions of LaTeX version +%% 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status “maintainedâ€. +%% +%% The Current Maintainer of this work is Paul Gaborit. +%% +%% This work consists of the files sankey.dtx, sankey.ins and the derived +%% files sankey.sty, tikzlibrarydubins.code.tex, sankey-doc-preamble.sty, +%% sankey-example1.tex, sankey-example2.tex, sankey-example3.tex, +%% sankey-example3-variation.tex, sankey-example4.tex, +%% sankey-example-energy.tex +%% + +\input docstrip.tex +\keepsilent + +\usedir{tex/latex/sankey} + +\preamble + +This is a generated file. + +Copyright (C) 2016, 2021 by Paul Gaborit + +This work may be distributed and/or modified under the conditions of the +LaTeX Project Public License, either version 1.3 of this license or (at +your option) any later version. The latest version of this license is +in + +<http://www.latex-project.org/lppl.txt> + +and version 1.3 or later is part of all distributions of LaTeX version +2005/12/01 or later. + +This work has the LPPL maintenance status “maintainedâ€. + +The Current Maintainer of this work is Paul Gaborit. + +This work consists of the files sankey.dtx, sankey.ins and the derived +files sankey.sty, tikzlibrarydubins.code.tex, sankey-doc-preamble.sty, +sankey-example1.tex, sankey-example2.tex, sankey-example3.tex, +sankey-example3-variation.tex, sankey-example4.tex, +sankey-example-energy.tex + +\endpreamble + +\generate{% + \askforoverwritefalse + \file{sankey.sty}{\from{sankey.dtx}{sankey}}% + \file{tikzlibrarydubins.code.tex}{\from{sankey.dtx}{tikzlibrarydubins.code.tex}}% + \file{sankey-example-energy.tex}{\nopreamble\nopostamble\from{sankey.dtx}{example-energy}}% + \file{sankey-example1.tex}{\nopreamble\nopostamble\from{sankey.dtx}{example1}}% + \file{sankey-example2.tex}{\nopreamble\nopostamble\from{sankey.dtx}{example2}}% + \file{sankey-example3.tex}{\nopreamble\nopostamble\from{sankey.dtx}{example3}}% + \file{sankey-example3-variation.tex}{\nopreamble\nopostamble\from{sankey.dtx}{example3-variation}}% + \file{sankey-example4.tex}{\nopreamble\nopostamble\from{sankey.dtx}{example4}}% + \file{sankey-doc-preamble.sty}{\from{sankey.dtx}{sankeydocpreamble}}% +} + +\Msg{*********************************************************} +\Msg{*} +\Msg{* To finish the installation you have to move the} +\Msg{* following file into a directory searched by TeX:} +\Msg{*} +\Msg{* \space\space sankey.sty} +\Msg{* \space\space tikzlibrarydubins.code.tex} +\Msg{*} +\Msg{* To produce the documentation run the file sankey.dtx} +\Msg{* through (pdf)LaTeX.} +\Msg{*} +\Msg{* Happy TeXing!} +\Msg{*********************************************************} + +\endbatchfile
\ No newline at end of file diff --git a/graphics/pgf/contrib/sankey/sankey.pdf b/graphics/pgf/contrib/sankey/sankey.pdf Binary files differnew file mode 100644 index 0000000000..f1b0fbf2df --- /dev/null +++ b/graphics/pgf/contrib/sankey/sankey.pdf diff --git a/graphics/pgf/contrib/sankey/sankey.sty b/graphics/pgf/contrib/sankey/sankey.sty deleted file mode 100644 index 4c28a1fe0d..0000000000 --- a/graphics/pgf/contrib/sankey/sankey.sty +++ /dev/null @@ -1,722 +0,0 @@ -% Copyright (C) 2016-2021 by Paul Gaborit -% -% This file may be distributed and/or modified -% -% 1. under the LaTeX Project Public License and/or -% -% 2. under the GNU Public License. - -\def\sankey@version{2.0} -\def\sankey@date{2021/01/27} -\ProvidesPackage{sankey}[\sankey@date\space\sankey@version\space sankey package] - -\RequirePackage{xparse} -\RequirePackage{xfp} -\RequirePackage{tikz} -\usetikzlibrary{calc,decorations.markings,dubins} -\usepackage{etoolbox} - -% add a new layer to debug sankey diagrams -\pgfdeclarelayer{background} -\pgfdeclarelayer{foreground} -\pgfdeclarelayer{sankeydebug} -\pgfsetlayers{background,main,foreground,sankeydebug} - -% flag to debug sankey diagrams -\newtoggle{sankey debug} -\newtoggle{sankey node start} -\newtoggle{sankey node end} - -% macros to store and to retrieve the orientation and the quantity -% associated with each sankey node - -\def\sankeysetnodeqty#1#2{\expandafter\xdef\csname sankey@node@#1@qty\endcsname{#2}} - -\def\sankeygetnodeqty#1{% - \ifcsmacro{sankey@node@#1@qty}{% - \csname sankey@node@#1@qty\endcsname% - }{% - \PackageWarning{sankey}{Unknown sankey node '#1'}% - }% -} - -\def\sankeysetnodeorient#1#2{\expandafter\xdef\csname sankey@node@#1@orient\endcsname{#2}} - -\def\sankeygetnodeorient#1{% - \ifcsmacro{sankey@node@#1@orient}{% - \csname sankey@node@#1@orient\endcsname% - }{% - \PackageWarning{sankey}{Unknown sankey node '#1'}% - }% -} - -\def\sankeysetstartfill#1#2{\expandafter\gdef\csname sankey@start@fill@#1\endcsname{#2}} -\def\sankeysetstartdraw#1#2{\expandafter\gdef\csname sankey@start@draw@#1\endcsname{#2}} -\def\sankeysetendfill#1#2{\expandafter\gdef\csname sankey@end@fill@#1\endcsname{#2}} -\def\sankeysetenddraw#1#2{\expandafter\gdef\csname sankey@end@draw@#1\endcsname{#2}} -% -\def\sankeygetstartfill#1{\csname sankey@start@fill@#1\endcsname} -\def\sankeygetstartdraw#1{\csname sankey@start@draw@#1\endcsname} -\def\sankeygetendfill#1{\csname sankey@end@fill@#1\endcsname} -\def\sankeygetenddraw#1{\csname sankey@end@draw@#1\endcsname} - -% new shape -\pgfdeclareshape{sankey node}{ - \inheritsavedanchors[from=rectangle] - \inheritanchor[from=rectangle]{center} - %\inheritanchorborder[from=rectangle] - \anchor{left}{\pgf@process{\northeast}} - \anchor{right}{\pgf@process{\southwest}} -} - -% pgfkeys family 'sankey' -\pgfkeys{/sankey/.is family} - -\NewDocumentCommand\sankeyset{m}{\pgfkeys{sankey,#1}} - -\sankeyset{ - ratio length/.code={ - \pgfmathsetmacro\sankeytotallen{#1} - \edef\sankeytotallen{\sankeytotallen pt} - }, - ratio length/.value required, - ratio quantity/.code={\edef\sankeytotalqty{\fpeval{#1}}}, - ratio quantity/.value required, - ratio/.style args={#1/#2}{ - ratio length=#1, - ratio quantity=#2, - }, - ratio/.value required, - minimum radius/.estore in=\sankeyminradius, - minimum radius/.value required, - outin steps/.estore in=\sankeystepoutin, - outon steps/.value required, - % - debug/.is choice, - debug/true/.code={\toggletrue{sankey debug}}, - debug/false/.code={\togglefalse{sankey debug}}, - debug/.default=true, - % - start style/.is choice, - % - end style/.is choice, - % default values - default parameters/.style={ - % default values - ratio=1cm/10, - minimum radius=5mm,% - outin steps=10, - debug=false, - start style=none, - end style=none, - }, - % to make node - node parameters/.style={ - quantity/.code={% - %\typeout{quantity=##1}% - \edef\qty{\fpeval{##1}}% - %\typeout{qty=\qty}% - }, - quantity/.value required, - angle/.code={% - %\typeout{angle:##1}% - \pgfmathsetmacro\orient{##1}% - }, - angle/.value required, - name/.store in=\name, - name/.value required, - at/.store in=\pos, - at/.value required, - as/.style={ - name=##1, - quantity=\sankeygetnodeqty{##1}, - angle=\sankeygetnodeorient{##1}, - at={##1.center}, - }, - as/.value required, - % - anchor/.is choice, - anchor/left/.code={\def\sankeyanchor{left}}, - anchor/right/.code={\def\sankeyanchor{right}}, - anchor/center/.code={\def\sankeyanchor{center}}, - anchor=center, - % - start/.is choice, - start/true/.code={\toggletrue{sankey node start}}, - start/false/.code={\togglefalse{sankey node start}}, - start/.default=true, - start=false, - % - end/.is choice, - end/true/.code={\toggletrue{sankey node end}}, - end/false/.code={\togglefalse{sankey node end}}, - end/.default=true, - end=false, - }, -} - -% some styles -\sankeyset{ - node/.style={ - shape=sankey node, - inner sep=0,minimum height={\sankeyqtytolen{#1}}, - minimum width=0,draw=none,line width=0pt, - node contents={}, - }, - fill/.style={line width=0pt,fill=white}, - draw/.style={draw=black,line width=.4pt}, - % debug color used by all debug macros - debug color/.style={/utils/exec={\colorlet{debug color}{#1}}}, - debug color=red!75!black, - % debug line between left and right anchors - debug line/.style={draw=debug color,|-|}, - % debug line between center and label - debug normal/.style={draw=debug color}, - % debug node label - debug label/.style={ - draw, - font=\ttfamily\tiny, - text=debug color,text opacity=1, - inner sep=.1em, - fill=white,fill opacity=1, - rounded corners=.1em, - }, -} - -\sankeyset{ - new start style/.code n args={3}{% name, fill path, draw path - \sankeysetstartfill{#1}{#2} - \sankeysetstartdraw{#1}{#3} - \sankeyset{start style/#1/.code={\def\sankeystartstyle{#1}}} - }, - new end style/.code n args={3}{% name, fill path, draw path - \sankeysetendfill{#1}{#2} - \sankeysetenddraw{#1}{#3} - \sankeyset{end style/#1/.code={\def\sankeyendstyle{#1}}} - }, -} - -% the new 'sankeydiagram' environment -\NewDocumentEnvironment{sankeydiagram}{O{}+b}{ - - \newcommand\sankeyarc[2]{% sn, en - \begingroup - \pgfmathsetmacro\startangle{\sankeygetnodeorient{##1}} - \pgfmathsetmacro\endangle{\sankeygetnodeorient{##2}} - \pgfmathsetmacro\rotateangle{\endangle-\startangle} - \pgfmathtruncatemacro\acwrotate{\rotateangle>0?1:0} - \path let - \p1=(##1.left),\p2=(##1.right), - \p3=(##2.left),\p4=(##2.right), - \n1={\sankeyqtytolen{\sankeygetnodeqty{##1}}}, - \n{maxr}={\sankeyminradius+\n1}, - \n{minr}={\sankeyminradius} - in \pgfextra{ - \ifnumequal{\acwrotate}{1}{ - \begin{pgfinterruptpath} - % fill the region - \path[/sankey/fill] - (\p1) arc(\startangle-90:\endangle-90:\n{minr}) -- (\p3) -- - (\p4) arc(\endangle-90:\startangle-90:\n{maxr}) -- (\p2) -- cycle; - % draw left and right borders - \path[/sankey/draw] - (\p1) arc(\startangle-90:\endangle-90:\n{minr}) - (\p4) arc(\endangle-90:\startangle-90:\n{maxr}); - \end{pgfinterruptpath} - }{ - \begin{pgfinterruptpath} - % fill the region - \path[/sankey/fill] - (\p1) arc(\startangle+90:\endangle+90:\n{maxr}) -- (\p3) -- - (\p4) arc(\endangle+90:\startangle+90:\n{minr}) -- (\p2) -- cycle; - % draw left and right borders - \path[/sankey/draw] - (\p1) arc(\startangle+90:\endangle+90:\n{maxr}) - (\p4) arc(\endangle+90:\startangle+90:\n{minr}); - \end{pgfinterruptpath} - } - }; - \endgroup - } - - \newcommand\sankeymakenodenodebug{ - \begingroup - \sankeysetnodeqty{\name}{\qty} - \sankeysetnodeorient{\name}{\orient} - % \typeout{\qty,\orient} - \ifundef{\sankeyanchor}{\def\sankeyanchor{center}}{} - \node[/sankey/node=\qty,rotate=\orient,at/.expanded={(\pos)},name=\name,anchor=\sankeyanchor]; - \endgroup - } - - \newcommand\sankeymakenode{ - \begingroup - \sankeymakenodenodebug{} - \iftoggle{sankey debug}{ - \begin{pgfonlayer}{sankeydebug} - \pgfset{ - number format/relative*=-1, - number format/precision=1, - number format/fixed, - } - \path[/sankey/debug line] (\name.left) -- (\name.right); - \pgfmathsetmacro{\len}{\sankeyqtytolen{\qty}/3} - \path[/sankey/debug normal] (\name.center) - -- ($(\name.center)!\len pt!90:(\name.right)$) - node[/sankey/debug label,rotate=\orient+90,anchor=north] {\name:\pgfmathprintnumber{\qty}}; - \end{pgfonlayer} - }{} - \endgroup - } - - \newcommand\sankeynodenodebug[1]{ - \begingroup - \sankeyset{node parameters,##1} - %\typeout{sankeynodenodebug: '\name' at(\pos) angle(\orient) qty(\qty)} - \sankeymakenodenodebug{} - \endgroup - } - - % ============================================================ - % user commands - % ============================================================ - - \NewDocumentCommand\sankeydubins{O{}mm}{% options, sn, en - \begingroup - \sankeyset{##1} - \pgfmathsetmacro\startangle{\sankeygetnodeorient{##2}} - \pgfmathsetmacro\endangle{\sankeygetnodeorient{##3}} - \edef\sqty{\sankeygetnodeqty{##2}} - \edef\eqty{\sankeygetnodeqty{##3}} - \ifdefstrequal{\sqty}{\eqty}{}{ - \PackageError{sankey}% - {^^J*** \string\sankeyoutin: quantities differ between ##2 (\sqty) and ##3 (\eqty)^^J}% - {The quantities of the two Sankey nodes must be equal.} - } - \pgfmathsetmacro\qty{\sankeygetnodeqty{##2}} - \pgfmathsetmacro\width{\sankeyqtytolen{\qty}} - %\typeout{startangle:\startangle,endangle:\endangle,qty:\qty,width:\width} - \dubinspathset{ - sankey/.style={ - start point=##2.center,start angle=\startangle, - end point=##3.center,end angle=\endangle, - minimum radius=\sankeyminradius + .5 * \width pt, - }, - } - \dubinspathcalc{sankey,store=sankey} - - \dubinspathset{ - left border/.style={ - sankey, use store=sankey, - left and right minimum radii= - {\sankeyminradius} and {\sankeyminradius + \width pt}, - }, - right border/.style={ - sankey, use store=sankey, - left and right minimum radii= - {\sankeyminradius + \width pt} and {\sankeyminradius}, - }, - } - - \path let - \p1=(##2.left),\p2=(##2.right), - \p3=(##3.left),\p4=(##3.right) - in \pgfextra{ - \begin{pgfinterruptpath} - % fill the region - \path[/sankey/fill] - (\p1) - \dubinspath{left border} - -- (\p3) -- - (\p4) \dubinspath{right border,reverse} - -- (\p2) -- cycle; - - % draw left and right borders - \path[/sankey/draw] - (\p1) - \dubinspath{left border} - (\p2) - \dubinspath{right border} - ; - \end{pgfinterruptpath} - }; - \endgroup - } - - - \NewDocumentCommand\sankeyoutin{O{}mm}{% options, sn, en - \begingroup - \sankeyset{##1} - \edef\sn{##2} - \edef\en{##3} - \edef\sqty{\sankeygetnodeqty{\sn}} - \edef\eqty{\sankeygetnodeqty{\en}} - \ifdefstrequal{\sqty}{\eqty}{}{ - \PackageError{sankey}% - {^^J*** \string\sankeyoutin: quantities differ between \sn (\sqty) and \en (\eqty)^^J}% - {The quantities of the two Sankey nodes must be equal.} - } - %\typeout{*** sankeyoutin: \sn\space to \en\space (\sankeystepoutin)} - \pgfmathsetmacro\qty{\sankeygetnodeqty{\sn}} - \pgfmathsetmacro\mylength{\sankeyqtytolen{\qty}/2} - \pgfmathsetmacro\mystep{1/\sankeystepoutin} - %\typeout{*** a} - \pgfmathsetmacro\mybound{1-.5*\mystep} - %\typeout{*** b} - \pgfmathsetmacro\laststep{int(\sankeystepoutin-1)} - %\typeout{sankeystepoutin(\sankeystepoutin) mystep(\mystep) mybound(\mybound) laststep(\laststep)} - %\typeout{*** sankeyoutin: \startangle to \endangle} - \path[decorate,overlay,decoration={ - markings, - mark=between positions \mystep and \mybound step \mystep with { - \def\sankeyoutinmidptname{sankeyoutinmidpt \pgfkeysvalueof{/pgf/decoration/mark info/sequence number}} - \path - (0,0) coordinate(\sankeyoutinmidptname) - (0,-\mylength pt) coordinate (\sankeyoutinmidptname\space r) - (0,\mylength pt) coordinate (\sankeyoutinmidptname\space l) - ; - } - }](\sn.center) to[out=\sankeygetnodeorient{\sn},in=\sankeygetnodeorient{\en}+180] (\en.center); - \foreach \myptnum in {1,...,\laststep}{ - \def\sankeyoutinmidptname{sankeyoutinmidpt \myptnum} - \anglebetween\sankeyoutinmidptangle{\sankeyoutinmidptname\space r}{\sankeyoutinmidptname\space l} - \sankeynodenodebug{quantity=\qty,angle=\sankeyoutinmidptangle-90,name=\sankeyoutinmidptname,at=\sankeyoutinmidptname} - } - \sankeynodenodebug{quantity=\sankeygetnodeqty{\sn},angle=\sankeygetnodeorient{\sn},name={sankeyoutinmidpt 0},at={\sn}} - \sankeynodenodebug{quantity={\sankeygetnodeqty{\en}},angle={\sankeygetnodeorient{\en}},name={sankeyoutinmidpt \sankeystepoutin},at={\en}} - - %\typeout{*********************} - \path[/sankey/fill,looseness=1] - (sankeyoutinmidpt 0.left) - \foreach \curpt[remember=\curpt as \prevpt (initially 0)] in {1,...,\sankeystepoutin}{ - to[out=\sankeygetnodeorient{sankeyoutinmidpt \prevpt},in=\sankeygetnodeorient{sankeyoutinmidpt \curpt}+180] - (sankeyoutinmidpt \curpt.left) - } - -- - (sankeyoutinmidpt \sankeystepoutin.right) - \foreach \curpt[remember=\curpt as \prevpt (initially \sankeystepoutin)] in {\laststep,...,0}{ - to[out=\sankeygetnodeorient{sankeyoutinmidpt \prevpt}+180,in=\sankeygetnodeorient{sankeyoutinmidpt \curpt}] - (sankeyoutinmidpt \curpt.right) - } - -- cycle; - - \path[/sankey/draw,looseness=1] - (sankeyoutinmidpt 0.left) - \foreach \curpt[remember=\curpt as \prevpt (initially 0)] in {1,...,\sankeystepoutin}{ - to[out=\sankeygetnodeorient{sankeyoutinmidpt \prevpt},in=\sankeygetnodeorient{sankeyoutinmidpt \curpt}+180] - (sankeyoutinmidpt \curpt.left) - } - % - (sankeyoutinmidpt \sankeystepoutin.right) - \foreach \curpt[remember=\curpt as \prevpt (initially \sankeystepoutin)] in {\laststep,...,0}{ - to[out=\sankeygetnodeorient{sankeyoutinmidpt \prevpt}+180,in=\sankeygetnodeorient{sankeyoutinmidpt \curpt}] - (sankeyoutinmidpt \curpt.right) - } - ; - - \endgroup - } - - \NewDocumentCommand\sankeynodealias{mm}{%name, alias - \path [late options={name=##1,alias=##2}]; - \sankeysetnodeqty{##2}{\sankeygetnodeqty{##1}} - \sankeysetnodeorient{##2}{\sankeygetnodeorient{##1}} - } - - \newcommand\sankeynode[2][]{ - \begingroup - \sankeyset{##1} - \sankeyset{node parameters,##2} - %\typeout{sankeynode: '\name' at(\pos) angle(\orient) qty(\qty)} - \sankeymakenode{} - \endgroup - } - - \def\sankeyfilldrawstart{ - \begin{scope}[shift={(\name)},rotate=\orient] - \path[/sankey/fill] \sankeygetstartfill{\sankeystartstyle}; - \path[/sankey/draw] \sankeygetstartdraw{\sankeystartstyle}; - \end{scope} - } - - \NewDocumentCommand\sankeystart{O{}m}{ - \begingroup - \sankeyset{##1} - \edef\name{##2} - \edef\orient{\sankeygetnodeorient{##2}} - \edef\qty{\sankeygetnodeqty{##2}} - \sankeyfilldrawstart - \endgroup - } - - \NewDocumentCommand\sankeynodestart{O{}m}{ - \begingroup - %\typeout{sankeynodestart: ##2} - \sankeyset{##1} - \sankeyset{node parameters,##2} - %\typeout{sankeynodestart: '\name' at(\pos) angle(\orient) qty(\qty)} - \sankeymakenode{} - %\typeout{sankeynodestart: sankeynode ok} - %\typeout{sankeynodestart: '\name' at(\pos) angle(\orient) qty(\qty)} - \sankeyfilldrawstart - \endgroup - } - - \def\sankeyfilldrawend{ - \begin{scope}[shift={(\name)},rotate=\sankeygetnodeorient{\name}] - \path[/sankey/fill] \sankeygetendfill{\sankeyendstyle}; - \path[/sankey/draw] \sankeygetenddraw{\sankeyendstyle}; - \end{scope} - } - - \NewDocumentCommand\sankeyend{O{}m}{%name - \begingroup - \sankeyset{##1} - \edef\name{##2} - \edef\orient{\sankeygetnodeorient{##2}} - \edef\qty{\sankeygetnodeqty{##2}} - \sankeyfilldrawend - \endgroup - } - - \NewDocumentCommand\sankeynodeend{O{}m}{ - \begingroup - %\typeout{sankeynodestart: ##2} - \sankeyset{##1} - \sankeyset{node parameters,##2} - %\typeout{sankeynodestart: '\name' at(\pos) angle(\orient) qty(\qty)} - \sankeymakenode{} - %\typeout{sankeynodestart: sankeynode ok} - %\typeout{sankeynodestart: '\name' at(\pos) angle(\orient) qty(\qty)} - \sankeyfilldrawend - \endgroup - } - - - - \NewDocumentCommand\sankeyadvance{sO{}mm}{% *(reverse), options, name, distance - \begingroup - \sankeyset{##2} - \def\newname{##3} - \def\oldname{##3-old} - \sankeynodealias{\newname}{\oldname} - % \typeout{*** sankeyadvance: ok (\oldname => \newname)} - \IfBooleanTF{##1}{ - % reverse advance - \sankeynode{ - at={$(\oldname.center)!##4!90:(\oldname.left)$}, - angle=\sankeygetnodeorient{\oldname}, - quantity=\sankeygetnodeqty{\oldname}, - name=\newname, - } - \path[/sankey/fill] - (\newname.left) -- (\oldname.left) - -- - (\oldname.right) -- (\newname.right) - -- cycle; - \path[/sankey/draw] - (\newname.left) -- (\oldname.left) - (\oldname.right) -- (\newname.right); - \endgroup - }{ - % advance - \sankeynode{ - at={$(\oldname.center)!##4!-90:(\oldname.left)$}, - angle=\sankeygetnodeorient{\oldname}, - quantity=\sankeygetnodeqty{\oldname}, - name=\newname, - } - \path[/sankey/fill] - (\oldname.left) -- (\newname.left) - -- - (\newname.right) -- (\oldname.right) - -- cycle; - \path[/sankey/draw] - (\oldname.left) -- (\newname.left) - (\newname.right) -- (\oldname.right); - \endgroup - } - } - - \NewDocumentCommand\sankeyturn{sO{}mm}{% *(reverse), options, name, angle - \begingroup - \sankeyset{##2} - \def\name{##3} - \def\oldname{##3-old} - \sankeynodealias{\name}{\oldname} - \pgfmathsetmacro\qty{\sankeygetnodeqty{\oldname}} - \pgfmathsetmacro\oldangle{\sankeygetnodeorient{\oldname}} - \IfBooleanTF{##1}{ - % turn in reverse - \pgfmathsetmacro\orient{\oldangle-##4} - % \typeout{TURN: \oldangle=>\orient} - \ifnumgreater{##4}{0}{% anti-clockwise turn - \path let - \p1=(##3.left), \p2=(##3.right), - % center of rotation - \p{c}=($(\p1)!-\sankeyminradius!(\p2)$), - % starting position - \p{s}=(##3.center), - % ending position - \p{e}=($(\p{c})!1!-##4:(\p{s})$) - in \pgfextra{ - \begin{pgfinterruptpath} - % \typeout{acw turn:\qty:\orient} - \def\pos{\p{e}} - \sankeymakenode{} - \sankeyarc{\name}{\oldname} - \end{pgfinterruptpath} - }; - }{ % clockwise turn - \path let - \p1=(##3.right), \p2=(##3.left), - % center of rotation - \p{c}=($(\p1)!-\sankeyminradius!(\p2)$), - % starting position - \p{s}=(##3.center), - % ending position - \p{e}=($(\p{c})!1!-##4:(\p{s})$) - in \pgfextra{ - % \typeout{cw turn:\qty:\orient} - \begin{pgfinterruptpath} - \def\pos{\p{e}} - \sankeymakenode{} - \sankeyarc{\name}{\oldname} - \end{pgfinterruptpath} - }; - } - }{ - % turn - \pgfmathsetmacro\orient{\oldangle+##4} - % \typeout{TURN: \oldangle=>\orient} - \ifnumgreater{##4}{0}{% anti-clockwise turn - \path let - \p1=(##3.left), \p2=(##3.right), - % center of rotation - \p{c}=($(\p1)!-\sankeyminradius!(\p2)$), - % starting position - \p{s}=(##3.center), - % ending position - \p{e}=($(\p{c})!1!##4:(\p{s})$) - in \pgfextra{ - \begin{pgfinterruptpath} - % \typeout{acw turn:\qty:\orient} - \def\pos{\p{e}} - \sankeymakenode{} - \sankeyarc{\oldname}{\name} - \end{pgfinterruptpath} - }; - }{ % clockwise turn - \path let - \p1=(##3.right), \p2=(##3.left), - % center of rotation - \p{c}=($(\p1)!-\sankeyminradius!(\p2)$), - % starting position - \p{s}=(##3.center), - % ending position - \p{e}=($(\p{c})!1!##4:(\p{s})$) - in \pgfextra{ - % \typeout{cw turn:\qty:\orient} - \begin{pgfinterruptpath} - \def\pos{\p{e}} - \sankeymakenode{} - \sankeyarc{\oldname}{\name} - \end{pgfinterruptpath} - }; - } - } - \endgroup - } - - \NewDocumentCommand\sankeyfork{mm}{%name,list of forks - \def\listofforks{##2} - \xdef\sankeytot{0} - \xdef\sankeycalculus{0} - \pgfmathsetmacro\iqty{\sankeygetnodeqty{##1}} - \pgfmathsetmacro\iorient{\sankeygetnodeorient{##1}} - \pgfmathsetmacro\orient{\iorient} - %\typeout{iname:##1, iqty:\iqty,iorient:\iorient} - \foreach \qty/\name[count=\c] in \listofforks { - %\typeout{sankeyfork foreach: qty(\qty) name(\name) count(\c)} - \path - let - \p1=(##1.left),\p2=(##1.right), - \p{start}=($(\p1)!\fpeval{\sankeytot/\iqty}!(\p2)$), - \n{nexttot}={\fpeval{\sankeytot+\qty}}, - \p{end}=($(\p1)!\fpeval{\n{nexttot}/\iqty}!(\p2)$), - \p{mid}=($(\p{start})!.5!(\p{end})$) - in \pgfextra{ - %\typeout{new fork:\name} - %\typeout{qty:\qty,name:\name,count:\c,pos=\p{mid}} - \xdef\sankeytot{\n{nexttot}} - \xdef\sankeycalculus{\fpeval{\sankeycalculus+\qty}} - \begin{pgfinterruptpath} - \def\pos{\p{mid}} - \sankeymakenode{} - \end{pgfinterruptpath} - }; - } - \edef\diff{\fpeval{abs(\iqty-\sankeytot)}} - %\typeout{sankeyfork diff: \diff} - %\pgfmathsetmacro{\diff}{abs(\iqty-\sankeytot)} - %\pgfmathtruncatemacro{\finish}{\diff<0.01?1:0} - \ifnumequal{\diff}{0}{}{ - \PackageWarning{sankey}{^^J*** Warning: bad sankey fork: \iqty\space!=\space\sankeycalculus(=\sankeytot)^^J##2} - } - } - - \def\sankeyqtytolen##1{\fpeval{(##1)/\sankeytotalqty*\sankeytotallen}} - - \sankeyset{ - % % default values, - % /tikz/declare function={ - % % sankeyqtytolen(\qty)=\qty/\sankeytotalqty*\sankeytotallen; - % % sankeylentoqty(\len)=\len/\sankeytotallen*\sankeytotalqty; - % },% - default parameters,% - % user values - #1} - - %\typeout{sankeytotallen: \sankeytotallen} - - #2 % body of sankeydiagram environment -} - - -\sankeyset{ - % none style - new start style={none}{}{}, - new end style={none}{}{}, - % simple style - new start style={simple}{ - (\name.left) -- ([xshift=-.5\pgflinewidth]\name.left) -- ([xshift=-.5\pgflinewidth]\name.right) -- (\name.right) -- cycle - }{ - (\name.left) -- ([xshift=-.5\pgflinewidth]\name.left) -- ([xshift=-.5\pgflinewidth]\name.right) -- (\name.right) - }, - new end style={simple}{ - (\name.left) -- ([xshift=2mm]\name.center) -- (\name.right) -- cycle - }{ - (\name.left) -- ([xshift=2mm]\name.center) -- (\name.right) - }, - % arrow style - new start style={arrow}{ - (\name.left) -- ++(-10pt,0) - -- ([xshift=-10pt/6]\name.center) - -- ([xshift=-10pt]\name.right) - -- (\name.right) -- cycle - }{ - (\name.left) -- ++(-10pt,0) - -- ([xshift=-10pt/6]\name.center) - -- ([xshift=-10pt]\name.right) - -- (\name.right) - }, - new end style={arrow}{ - (\name.left) -- ([yshift=1mm]\name.left) - -- ([xshift=10pt]\name.center) - -- ([yshift=-1mm]\name.right) -- (\name.right) -- cycle - }{ - (\name.left) -- ([yshift=1mm]\name.left) - -- ([xshift=10pt]\name.center) - -- ([yshift=-1mm]\name.right) -- (\name.right) - }, -}
\ No newline at end of file diff --git a/graphics/pgf/contrib/sankey/tikzlibrarydubins.code.tex b/graphics/pgf/contrib/sankey/tikzlibrarydubins.code.tex deleted file mode 100644 index da1dc120dc..0000000000 --- a/graphics/pgf/contrib/sankey/tikzlibrarydubins.code.tex +++ /dev/null @@ -1,361 +0,0 @@ -% Copyright (C) 2016-2021 by Paul Gaborit -% -% This file may be distributed and/or modified -% -% 1. under the LaTeX Project Public License and/or -% -% 2. under the GNU Public License. - -\usetikzlibrary{calc} - -\RequirePackage{etoolbox} -\RequirePackage{etextools} -\RequirePackage{xfp} - -\newbool{dubinspathreverse} - -\def\ifpgfmathcond#1{% - \pgfmathparse{(#1)?1:0}% - \ifnumequal{\pgfmathresult}{1}% -} - -\def\anglebetween#1#2#3{%macro, s, t - \path let - \p{s}=(#2), \p{t}=(#3), - \n{angle}={atan2(\y{t}-\y{s},\x{t}-\x{s})} - in \pgfextra { - \pgfmathsetmacro#1{\n{angle}} - \aftergroup@def#1 - }; -} - -\def\distancebetween#1#2#3{%macro, s, t - \path let - \p{s}=(#2), \p{t}=(#3), - %\n{dist}={veclen(\x{t}-\x{s},\y{t}-\y{s}))} - \n{dist}={\fpeval{sqrt((\x{t}-\x{s})*(\x{t}-\x{s})+(\y{t}-\y{s})*(\y{t}-\y{s}))}} - in \pgfextra { - %\typeout{n{dist}:\n{dist}} - \pgfmathsetmacro#1{\n{dist}} - \aftergroup@def#1 - }; -} - -\newcommand\dubinspath@rsr{% s, sa, t, ta, as, len, at, r - let - \p{tr}=([shift={(\dbp@angb-90:\dbp@radius pt)}]\dbp@b), - \n1={\dbp@anga+90}, - \n2={\dbp@angb+90}, - \n3={\n2+\dbp@lastangle} - in - arc(\n1:\n1-\dbp@firstangle:\dbp@rradius pt) - -- ([shift={(\p{tr})}]\n3:\dbp@rradius pt) - arc(\n3:\n2:\dbp@rradius pt) -} - -\newcommand\dubinspath@lsl{% s, sa, t, ta, as, len, at, r - let - \p{tl}=([shift={(\dbp@angb+90:\dbp@radius pt)}]\dbp@b), - \n1={\dbp@anga-90},\n2={\n1+\dbp@firstangle}, - \n3={\dbp@angb-90},\n4={\n3-\dbp@lastangle} - in - arc(\n1:\n2:\dbp@lradius pt) - -- ([shift={(\p{tl})}]\n4:\dbp@lradius pt) - arc(\n4:\n3:\dbp@lradius pt) -} - -\newcommand\dubinspath@rsl{% s, sa, t, ta, as, len, at, r - let - \p{tl}=([shift={(\dbp@angb+90:\dbp@radius pt)}]\dbp@b), - \n1={\dbp@anga+90},\n2={\n1-\dbp@firstangle}, - \n3={\dbp@angb-90},\n4={\n3-\dbp@lastangle} - in - arc(\n1:\n2:\dbp@rradius pt) - -- ([shift={(\p{tl})}]\n4:\dbp@lradius pt) - arc(\n4:\n3:\dbp@lradius pt) -} - -\newcommand\dubinspath@lsr{% s, sa, t, ta, as, len, at, r - let - \p{tr}=([shift={(\dbp@angb-90:\dbp@radius pt)}]\dbp@b), - \n1={\dbp@anga-90},\n2={\n1+\dbp@firstangle}, - \n3={\dbp@angb+90},\n4={\n3+\dbp@lastangle} - in - arc(\n1:\n2:\dbp@lradius pt) - -- ([shift={(\p{tr})}]\n4:\dbp@rradius pt) - arc(\n4:\n3:\dbp@rradius pt) -} - -\newcommand\dubinspath@lrl{% s, sa, t, ta, as, ai, at, r - let - \n1={\dbp@anga-90},\n2={\n1+\dbp@firstangle}, - \n3={\dbp@angb-90},\n4={\n3-\dbp@lastangle} - in - arc(\n1:\n2:\dbp@lradius pt) - arc(\n2+180:\n2+180-\dbp@midparam:\dbp@rradius pt) - arc(\n4:\n3:\dbp@lradius pt) -} - -\newcommand\dubinspath@rlr{% s, sa, t, ta, as, ai, at, r - let - \n1={\dbp@anga+90},\n2={\n1-\dbp@firstangle}, - \n3={\dbp@angb+90},\n4={\n3+\dbp@lastangle} - in - arc(\n1:\n2:\dbp@rradius pt) - arc(\n2+180:\n2+180+\dbp@midparam:\dbp@lradius pt) - arc(\n4:\n3:\dbp@rradius pt) -} -\newcommand\dubinspath@rev@lsl{\dubinspath@rsr} -\newcommand\dubinspath@rev@rsr{\dubinspath@lsl} -\newcommand\dubinspath@rev@lsr{\dubinspath@lsr} -\newcommand\dubinspath@rev@rsl{\dubinspath@rsl} -\newcommand\dubinspath@rev@lrl{\dubinspath@rlr} -\newcommand\dubinspath@rev@rlr{\dubinspath@lrl} - - -\newcommand\dubinspath[1]{% - \pgfextra{ - \dubinspathset{#1} - \ifbool{dubinspathreverse}{ - \edef\newa{\dbp@b} - \edef\newb{\dbp@a} - \pgfmathsetmacro\newanga{180+\dbp@angb} - \pgfmathsetmacro\newangb{180+\dbp@anga} - \edef\newfirstangle{\dbp@lastangle} - \edef\newlastangle{\dbp@firstangle} - \edef\newmethod{rev@\dbp@method} - \edef\newlradius{\dbp@rradius} - \edef\newrradius{\dbp@lradius} - \dubinspathset{ - start point=\newa, - end point=\newb, - start angle=\newanga, - end angle=\newangb, - first angle=\newfirstangle, - last angle=\newlastangle, - left and right minimum radii=\newlradius pt and \newrradius pt, - method=\newmethod, - } - }{} - %\typeout{dbp@lradius:\dbp@lradius} - %\typeout{dbp@rradius:\dbp@rradius} - } - \csname dubinspath@\dbp@method\endcsname% -} - - -% solution -% \xdef\dubinspathmethod{} % type of dubins path -% \xdef\dubinspathlength{} % lenght (pt) -% \xdef\dubinspathfirstangle{} % first angle -% \xdef\dubinspathmiddleparam{} % intermediate angle or straight distance -% \xdef\dubinspathlastangle{} % last angle - -\def\dubinspathstore#1#2{% - \expandafter\xdef\csname dubinspath@store@#1@#2\endcsname% - {\csname dubinspath#2\endcsname}% -} -\def\dubinspathget#1#2{% - \csname dubinspath@store@#1@#2\endcsname% -} - -% -\def\dubinspathsetparams#1#2#3#4#5{% method, length, fisrt angle, middle param, last angle - \edef\dubinspathmethod{#1} - \edef\dubinspathlength{#2} - \edef\dubinspathfirstangle{#3} - \edef\dubinspathmiddleparam{#4} - \edef\dubinspathlastangle{#5} - \ifdef{\dbp@storename}{ - \foreach \p in {method,length,firstangle,middleparam,lastangle}{ - \dubinspathstore{\dbp@storename}{\p} - } - }{} -} - -\def\dubinspathupdateparams#1#2#3#4#5{ - \ifpgfmathcond{#2<\dubinspathlength}{ - \dubinspathsetparams{#1}{#2}{#3}{#4}{#5} - }{} -} - -\tikzset{ - dubins path/.is family, - dubins path, - start point/.store in=\dbp@a, - start angle/.store in=\dbp@anga, - end point/.store in=\dbp@b, - end angle/.store in=\dbp@angb, - store/.store in=\dbp@storename, - use store/.style={ - method=\dubinspathget{#1}{method}, - first angle=\dubinspathget{#1}{firstangle}, - last angle=\dubinspathget{#1}{lastangle}, - middle param=\dubinspathget{#1}{middleparam}, - }, - minimum radius/.code={ - \pgfmathsetmacro\dbp@radius{#1} - \pgfmathsetmacro\dbp@rradius{#1} - \pgfmathsetmacro\dbp@lradius{#1} - }, - left and right minimum radii/.code args={#1 and #2}{ - \pgfmathsetmacro\dbp@lradius{#1} - \pgfmathsetmacro\dbp@rradius{#2} - \pgfmathsetmacro\dbp@radius{(\dbp@lradius + \dbp@rradius)/2} - }, - method/.store in=\dbp@method, - first angle/.store in=\dbp@firstangle, - last angle/.store in=\dbp@lastangle, - middle param/.store in=\dbp@midparam, - reverse/.is if=dubinspathreverse, -} - -\newcommand\dubinspathset[1]{\tikzset{dubins path,#1}} - -\newcommand\dubinspathcalc[1]{% - \begingroup - \dubinspathset{#1} - \tikzset{ - declare function={ - angtodist(\a,\r)={abs(\a)*.01745329*\r}; - modangr(\a,\b)={ - (Mod(\a,360)<Mod(\b,360)?Mod(\a,360):Mod(\a,360)-360)+\b-Mod(\b,360) - }; - modangl(\a,\b)={ - (Mod(\a,360)<Mod(\b,360)?Mod(\a,360)+360:Mod(\a,360))+(\b)-Mod(\b,360) - }; - }, - } - - \pgfmathsetmacro\radius{\dbp@rradius} - \pgfmathsetmacro\anga{mod((\dbp@anga)+180,360)-180} - \pgfmathsetmacro\angb{mod((\dbp@angb)+180,360)-180} - %\typeout{radius:\radius,anga:\anga,angb:\angb} - \path - let - \p{a}=(\dbp@a), - \p{b}=(\dbp@b), - \p{ar}=($(\p{a}) + (\anga-90:\radius pt)$), - \p{al}=($(\p{a}) + (\anga+90:\radius pt)$), - \p{br}=($(\p{b}) + (\angb-90:\radius pt)$), - \p{bl}=($(\p{b}) + (\angb+90:\radius pt)$) - in \pgfextra{ - \pgfinterruptpath - - % RSR (ar et br) - %\typeout{RSR begin} - \anglebetween\rsrarbr{\p{ar}}{\p{br}} - \distancebetween\rsrdarbr{\p{ar}}{\p{br}} - \pgfmathsetmacro\rsrangone{Mod(\anga-\rsrarbr,360)} - \pgfmathsetmacro\rsrangtwo{Mod(\rsrarbr-\angb,360)} - \pgfmathsetmacro\rsrlen{\rsrdarbr} - \pgfmathsetmacro\rsrdist{ - angtodist(\rsrangone,\radius) - +\rsrlen - +angtodist(\rsrangtwo,\radius) - } - \dubinspathsetparams{rsr}{\rsrdist}{\rsrangone}{\rsrlen}{\rsrangtwo} - - % LSL (al et bl) - %\typeout{LSL begin} - \anglebetween\lslalbl{\p{al}}{\p{bl}} - \distancebetween\lsldalbl{\p{al}}{\p{bl}} - \pgfmathsetmacro{\lslangone}{mod(\lslalbl-\anga+720,360)} - \pgfmathsetmacro{\lslangtwo}{mod(\angb-\lslalbl+720,360)} - \pgfmathsetmacro\lsllen{\lsldalbl} - \pgfmathsetmacro\lsldist{ - angtodist(\lslangone,\radius) - +\lsllen - +angtodist(\lslangtwo,\radius) - } - \dubinspathupdateparams{lsl}{\lsldist}{\lslangone}{\lsllen}{\lslangtwo} - - % RSL (ar et bl) - %\typeout{RSL begin} - \distancebetween\rsldarbl{\p{ar}}{\p{bl}} - \pgfmathtruncatemacro\rslok{(\rsldarbl>=2*\radius)?1:0} - \ifnumequal{\rslok}{1}{ - \anglebetween\rslarbl{\p{ar}}{\p{bl}} - \pgfmathsetmacro\rslanglesup{ - asin(\radius/\rsldarbl*2)} - \pgfmathsetmacro\rslangone{Mod(\anga-\rslarbl+\rslanglesup,360)} - \pgfmathsetmacro\rslangtwo{Mod(\angb-\rslarbl+\rslanglesup,360)} - \pgfmathsetmacro\rsllen{veclen(\rsldarbl,\radius)} - \pgfmathsetmacro\rsldist{ - angtodist(\rslangone,\radius) - +\rsllen - +angtodist(\rslangtwo,\radius) - } - - \dubinspathupdateparams{rsl}{\rsldist}{\rslangone}{\rsllen}{\rslangtwo} - }{} - - % LSR (al et br) - %\typeout{LSR begin} - \distancebetween\lsrdalbr{\p{al}}{\p{br}} - \pgfmathtruncatemacro\lsrok{(\lsrdalbr>=2*\radius)?1:0} - \ifnumequal{\lsrok}{1}{ - \anglebetween\lsralbr{\p{al}}{\p{br}} - \pgfmathsetmacro\lsranglesup{ - asin(\radius/\lsrdalbr*2)} - \pgfmathsetmacro\lsrangone{Mod(\lsralbr+\lsranglesup-\anga,360)} - \pgfmathsetmacro\lsrangtwo{Mod(\lsralbr+\lsranglesup-\angb,360)} - \pgfmathsetmacro\lsrlen{veclen(\lsrdalbr,\radius)} - \pgfmathsetmacro\lsrdist{ - angtodist(\lsrangone,\radius) - +\lsrlen - +angtodist(\lsrangtwo,\radius) - } - \dubinspathupdateparams{lsr}{\lsrdist}{\lsrangone}{\lsrlen}{\lsrangtwo} - }{} - - % LRL (al et bl) - %\typeout{LRL begin} - \distancebetween\lrldalbl{\p{al}}{\p{bl}} - \pgfmathtruncatemacro\lrlok{(\lrldalbl<=4*\radius)?1:0} - \ifnumequal{\lrlok}{1}{ - % \debug{LRL} - \anglebetween\lrlalbl{\p{al}}{\p{bl}} - \pgfmathsetmacro\lrlangsup{acos(\lrldalbl/\radius/4)} - \pgfmathsetmacro\lrlangone{ - modangl(\lrlalbl+\lrlangsup,\anga-90)-(\anga-90)} - \pgfmathsetmacro\lrlangtwo{% - (\angb-90)-modangr(\lrlalbl+180-\lrlangsup,\angb-90)} - \pgfmathsetmacro\lrlangthree{360-2*(90-\lrlangsup)} - \pgfmathsetmacro\lrldist{ - angtodist(\lrlangone,\radius) - +angtodist(\lrlangthree,\radius) - +angtodist(\lrlangtwo,\radius) - } - \dubinspathupdateparams{lrl}{\lrldist}{\lrlangone}{\lrlangthree}{\lrlangtwo} - }{} - - % RLR (ar et br) - %\typeout{RLR begin} - \distancebetween\rlrdarbr{\p{ar}}{\p{br}} - \pgfmathtruncatemacro\rlrok{(\rlrdarbr<=4*\radius)?1:0} - \ifnumequal{\rlrok}{1}{ - \anglebetween\rlrarbr{\p{ar}}{\p{br}} - \pgfmathsetmacro\rlrangsup{acos(\rlrdarbr/\radius/4)} - \pgfmathsetmacro\rlrangone{ - (\anga+90)-modangr(\rlrarbr-\rlrangsup,\anga+90)} - \pgfmathsetmacro\rlrangtwo{% - modangl(\rlrarbr+180+\rlrangsup,\angb+90)-(\angb+90)} - \pgfmathsetmacro\rlrangthree{360-2*(90-\rlrangsup)} - \pgfmathsetmacro\rlrdist{ - angtodist(\rlrangone,\radius) - +angtodist(\rlrangthree,\radius) - +angtodist(\rlrangtwo,\radius) - } - \dubinspathupdateparams{rlr}{\rlrdist}{\rlrangone}{\rlrangthree}{\rlrangtwo} - }{} - - \endpgfinterruptpath - }; - \endgroup -} - -%%% Local Variables: -%%% mode: latex -%%% TeX-master: t -%%% End: diff --git a/language/chinese/ctex/README.md b/language/chinese/ctex/README.md index 1bbdb561fa..fc0e62555f 100644 --- a/language/chinese/ctex/README.md +++ b/language/chinese/ctex/README.md @@ -30,7 +30,7 @@ Issues and pull requests are welcome. Copyright and Licence --------------------- - Copyright (C) 2003--2020 + Copyright (C) 2003--2021 CTEX.ORG and any individual authors listed elsewhere in this file. ---------------------------------------------------------------------- diff --git a/language/chinese/ctex/ctex.dtx b/language/chinese/ctex/ctex.dtx index 6d349c415c..a1af5c1bf5 100644 --- a/language/chinese/ctex/ctex.dtx +++ b/language/chinese/ctex/ctex.dtx @@ -2,7 +2,7 @@ % !TeX program = XeLaTeX % !TeX encoding = UTF-8 % -% Copyright (C) 2003--2020 +% Copyright (C) 2003--2021 % CTEX.ORG and any individual authors listed elsewhere in this file. % -------------------------------------------------------------------------- % @@ -56,7 +56,7 @@ Issues and pull requests are welcome. Copyright and Licence --------------------- - Copyright (C) 2003--2020 + Copyright (C) 2003--2021 CTEX.ORG and any individual authors listed elsewhere in this file. ---------------------------------------------------------------------- @@ -163,7 +163,7 @@ Copyright and Licence \preamble - Copyright (C) 2003--2020 + Copyright (C) 2003--2021 CTEX.ORG and any individual authors listed in the documentation. --------------------------------------------------------------------- @@ -443,7 +443,7 @@ Copyright and Licence %<class|style|ctexcap|ctexhook|ctexpatch>\NeedsTeXFormat{LaTeX2e} %<class>\input{ctexbackend.cfg} %<class|style|ctexcap|ctexhook|ctexpatch>\RequirePackage{expl3} -%<+!driver>\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee@gmail.com> $ +%<+!driver>\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96@gmail.com> $ %<ctex> {Chinese adapter in LaTeX (CTEX)} %<ctex>\ProvidesExplPackage{\ExplFileName} %<ctexsize> {Chinese font size definition (CTEX)} @@ -530,7 +530,7 @@ Copyright and Licence %<founder>\ProvidesExplFile{ctex-fontset-founder.def} %<ubuntu> {Ubuntu fonts definition (CTEX)} %<ubuntu>\ProvidesExplFile{ctex-fontset-ubuntu.def} -%<!driver> {\ExplFileDate}{2.5.5}{\ExplFileDescription} +%<!driver> {\ExplFileDate}{2.5.6}{\ExplFileDescription} %</!(fd|ctexspa|dict|backend)> %<c19&rm>\ProvidesFile{c19rm.fd}% %<c19&sf>\ProvidesFile{c19sf.fd}% @@ -548,10 +548,10 @@ Copyright and Licence %<backend>\ProvidesFile{ctexbackend.cfg}% %<dict&theorem&GBK>\ProvidesDictionary{translator-theorem-dictionary}{ChineseGBK}% %<dict&theorem&UTF8>\ProvidesDictionary{translator-theorem-dictionary}{ChineseUTF8}% -%<fd> [2020/10/19 v2.5.5 Chinese font definition (CTEX)] -%<ctexspa> [2020/10/19 v2.5.5 Space info for CJKpunct (CTEX)] -%<backend> [2020/10/19 v2.5.5 Backend configuration file (CTEX)] -%<dict&theorem> [2020/10/19 v2.5.5 Chinese translation for theorem name (CTEX)] +%<fd> [2021/03/14 v2.5.6 Chinese font definition (CTEX)] +%<ctexspa> [2021/03/14 v2.5.6 Space info for CJKpunct (CTEX)] +%<backend> [2021/03/14 v2.5.6 Backend configuration file (CTEX)] +%<dict&theorem> [2021/03/14 v2.5.6 Chinese translation for theorem name (CTEX)] %</!(driver|readme|install|zhmap|spa|docstrip)> %<*driver> \documentclass{ctxdoc} @@ -575,7 +575,7 @@ Copyright and Licence % \changes{v2.4.15}{2019/03/23}{åŒæ¥ \LaTeXiii{} 2019/03/05。} % \changes{v2.5.1}{2020/05/02}{\pkg{zhconv} æ›´å为 \pkg{ctex-zhconv}。} % -% \CheckSum{6265} +% \CheckSum{6335} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -8801,29 +8801,65 @@ Copyright and Licence % \end{macro} % % -% \begin{macro}[int]{\ps@fancy} +% \begin{macro}[int]{\f@nch@initialise} % 这里对 \pkg{fancyhdr} å®åŒ…打补ä¸ã€‚åŽŸæ¥ \pkg{fancyhdr} å®åŒ…ä¸ä½¿ç”¨ % \tn{thesection} ç‰å®è¡¨ç¤ºé¡µçœ‰ä¸çš„ç« èŠ‚ç¼–å·ï¼Œè¿™é‡Œæ”¹ç”¨ \pkg{ctex} 包所用的 % \tn{CTEXthesection} 系列å®ã€‚ +% \changes{v2.5.6}{2021/01/11}{æ›´æ–° \pkg{fancyhdr} å®åŒ…çš„è¡¥ä¸ã€‚} % \begin{macrocode} \ctex_at_end_package:nn { fancyhdr } { -%<*article> - \ctex_patch_cmd:Nnn \ps@fancy + \ctex_patch_cmd:Nnn \f@nch@initialise { \ifnum \c@secnumdepth > \z@ \thesection \hskip 1em \relax \fi } { \CTEXifname { \CTEXthesection \quad } { } } - \ctex_patch_cmd:Nnn \ps@fancy + \ctex_patch_cmd:Nnn \f@nch@initialise { \ifnum \c@secnumdepth > \@ne \thesubsection \hskip 1em \relax \fi } { \CTEXifname { \CTEXthesubsection \quad } { } } -%</article> -%<*book|report> - \ctex_patch_cmd:Nnn \ps@fancy - { \ifnum \c@secnumdepth > \m@ne \@chapapp \ \thechapter . ~ \ \fi } + \ctex_patch_cmd:Nnn \f@nch@initialise + { \ifnum \c@secnumdepth > \m@ne \@chapapp\ \thechapter . ~ \ \fi } { \CTEXifname { \CTEXthechapter \quad } { } } - \ctex_patch_cmd:Nnn \ps@fancy + \ctex_patch_cmd:Nnn \f@nch@initialise { \ifnum \c@secnumdepth > \z@ \thesection . ~ \ \fi } { \CTEXifname { \CTEXthesection \quad } { } } + \f@nch@initialise +% \end{macrocode} +% \pkg{fancyhdr} çš„ \opt{headings} 选项会é‡å®šä¹‰ \cs{ps@headings}， +% 这里也è¦æ‰“è¡¥ä¸ã€‚ +% \begin{macrocode} + \@ifpackagewith { fancyhdr } { headings } + { +%<*article> + \if@twoside + \ctex_patch_cmd:Nnn \ps@headings + { \ifnum \c@secnumdepth > \z@ \thesection \quad \fi } + { \CTEXifname { \CTEXthesection \quad } { } } + \ctex_patch_cmd:Nnn \ps@headings + { \ifnum \c@secnumdepth > \@ne \thesubsection \quad \fi } + { \CTEXifname { \CTEXthesubsection \quad } { } } + \else: + \ctex_patch_cmd:Nnn \ps@headings + { \ifnum \c@secnumdepth > \z@ \thesection \quad \fi } + { \CTEXifname { \CTEXthesection \quad } { } } + \fi: +%</article> +%<*book|report> + \ctex_patch_cmd:Nnn \ps@headings + { +%<book> \ifnum \c@secnumdepth > \m@ne \if@mainmatter +%<report> \ifnum \c@secnumdepth > \m@ne + \@chapapp \ \thechapter . ~ \ % +%<report> \fi +%<book> \fi \fi + } + { \CTEXifname { \CTEXthechapter \quad } { } } + \if@twoside + \ctex_patch_cmd:Nnn \ps@headings + { \ifnum \c@secnumdepth > \z@ \thesection . ~ \ \fi } + { \CTEXifname { \CTEXthesection \quad } { } } + \fi: %</book|report> + } + { } } % \end{macrocode} % \end{macro} @@ -10855,17 +10891,17 @@ Copyright and Licence % æ–‡ä»¶æ ‡è¯†ä¿¡æ¯ã€‚ % \begin{macrocode} %<adobe>\ProvidesFile{ctex-zhmap-adobe.tex}% -%<adobe> [2020/10/19 v2.5.5 Adobe font map loader for DVIPDFMx (CTEX)] +%<adobe> [2021/03/14 v2.5.6 Adobe font map loader for DVIPDFMx (CTEX)] %<fandol>\ProvidesFile{ctex-zhmap-fandol.tex}% -%<fandol> [2020/10/19 v2.5.5 Fandol font map loader for DVIPDFMx (CTEX)] +%<fandol> [2021/03/14 v2.5.6 Fandol font map loader for DVIPDFMx (CTEX)] %<founder>\ProvidesFile{ctex-zhmap-founder.tex}% -%<founder> [2020/10/19 v2.5.5 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)] +%<founder> [2021/03/14 v2.5.6 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)] %<mac>\ProvidesFile{ctex-zhmap-mac.tex}% -%<mac> [2020/10/19 v2.5.5 Mac font map loader for DVIPDFMx (CTEX)] +%<mac> [2021/03/14 v2.5.6 Mac font map loader for DVIPDFMx (CTEX)] %<ubuntu>\ProvidesFile{ctex-zhmap-ubuntu.tex}% -%<ubuntu> [2020/10/19 v2.5.5 Ubuntu font map loader for DVIPDFMx (CTEX)] +%<ubuntu> [2021/03/14 v2.5.6 Ubuntu font map loader for DVIPDFMx (CTEX)] %<windows>\ProvidesFile{ctex-zhmap-windows.tex}% -%<windows> [2020/10/19 v2.5.5 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)] +%<windows> [2021/03/14 v2.5.6 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)] % \end{macrocode} % % \paragraph{\pkg{ctex-zhmap-adobe.tex}} @@ -11459,6 +11495,8 @@ Copyright and Licence % \end{macrocode} % \end{macro} % +% \changes{v2.5.6}{2021/02/16}{使用æ£ç¡®çš„导言区末尾钩å。} +% % \LaTeX \ 2020/10/01 开始æ供常用钩å管ç†æœºåˆ¶ã€‚在新机制下，我们åªéœ€è¦åšç®€å•çš„包装。 % \begin{macrocode} \@ifl@t@r \fmtversion { 2020/10/01 } @@ -11466,7 +11504,7 @@ Copyright and Licence \cs_new_protected:Npx \ctex_gadd_ltxhook:nn #1 { \hook_gput_code:nnn {#1} { \c_novalue_tl } } \cs_new_protected:Npn \ctex_at_end_preamble:n - { \ctex_gadd_ltxhook:nn { env/document/before } } + { \ctex_gadd_ltxhook:nn { begindocument/before } } \cs_new_protected:Npn \ctex_after_end_preamble:n { \ctex_gadd_ltxhook:nn { begindocument/end } } \cs_new_protected:Npn \ctex_gadd_package_hook:nnn #1#2 diff --git a/language/chinese/ctex/ctex.pdf b/language/chinese/ctex/ctex.pdf Binary files differindex f98806f664..76adf7b92c 100644 --- a/language/chinese/ctex/ctex.pdf +++ b/language/chinese/ctex/ctex.pdf diff --git a/macros/latex/contrib/doclicense/Makefile b/macros/latex/contrib/doclicense/Makefile new file mode 100644 index 0000000000..62eb5c63ca --- /dev/null +++ b/macros/latex/contrib/doclicense/Makefile @@ -0,0 +1,52 @@ +# SPDX-FileCopyrightText: 2015,2020-2021 Robin Schneider <ypid@riseup.net> +# +# SPDX-License-Identifier: LPPL-1.3c +# +# This work consists of all files listed in manifest.txt. +# For more details about the licensing, refer to the README.md file. + +TEXMFHOME ?= $(shell kpsewhich -var-value TEXMFHOME) + +all: install build manifest.txt + +build: check-quick doclicense.sty doclicense.pdf + +install: + mkdir --parents "$(TEXMFHOME)/tex/latex/" + test -L "$(TEXMFHOME)/tex/latex/doclicense" || ln --no-target-directory --symbolic "$$PWD" "$(TEXMFHOME)/tex/latex/doclicense" + +check-quick: doclicense.dtx + chktex "$<" + +check: run_tests doclicense.sty lint + ./"$<" + +lint: + find -regextype posix-egrep -iregex '.*\.(tex|ldf)' -and -not -iname '*-plaintext.tex' -print0 | xargs --null chktex + reuse lint + +clean: + rm -rf *.sty *.pdf *.aux *.out *.glo *.gls *.hd *.idx *.ilg *.ind *.log *.toc + +doclicense.sty: +doclicense.pdf: + +%.sty: %.ins %.dtx + tex "$<" + +%.pdf: %.dtx doclicense.sty + lualatex "$<" + makeindex -s gglo.ist -o doclicense.gls doclicense.glo + makeindex -s gind doclicense + lualatex "$<" + # thumbpdf doclicense + # lualatex "$<" + +# The `cd .. && git archive` trick was needed with 2.29.2 so that evaluation of +# the `.gitattributes` file worked correctly. +manifest.txt: manifest_header.txt Makefile + cat "$<" > "$@" + echo "% This work consists of the files:" >> "$@" + cd .. && git archive --worktree-attributes HEAD doclicense | tar -t -f - | grep -v '/$$' | sort >> "$(PWD)/$@" + echo "% and the derived files:" >> "$@" + echo doclicense.sty doclicense.pdf | tr ' ' '\n' >> "$@" diff --git a/macros/latex/contrib/doclicense/README b/macros/latex/contrib/doclicense/README deleted file mode 100644 index cac1ca77eb..0000000000 --- a/macros/latex/contrib/doclicense/README +++ /dev/null @@ -1,56 +0,0 @@ -LaTeX package 'doclicense' -~~~~~~~~~~~~~~~~~~~~~~~~~~ -Copyright (C) 2015-2020 by Robin Schneider <ypid@riseup.net> - -This work may be distributed and/or modified under the -conditions of the LaTeX Project Public License, either version 1.3 -of this license or (at your option) any later version. -The latest version of this license is in - http://www.latex-project.org/lppl.txt -and version 1.3 or later is part of all distributions of LaTeX -version 2005/12/01 or later. - -CTAN: https://www.ctan.org/pkg/doclicense -Code repository: https://github.com/ypid/latex-packages/tree/master/doclicense - -Question on Stackexchange: https://tex.stackexchange.com/a/226788/32320 - - - DESCRIPTION -Support for putting documents under a license. - -The doclicense package allows you to put your document under a license and include a link -to read about the license or include an icon or image of the license. -Currently, only Creative Commons is supported but this package is designed to -handle all kinds of licenses. - - GENERATING THE FILES -You can generate the doclicense.sty file with: tex doclicense.ins - -The documentation can be generated with: - - pdflatex doclicense.dtx - makeindex -s gglo.ist -o doclicense.gls doclicense.glo - makeindex -s gind doclicense - pdflatex doclicense.dtx - thumbpdf doclicense - pdflatex doclicense.dtx - -Note that this will only work when this directory is below your -$TEXMFHOME tree (unless the doclicense package is already installed -for example by your TeX distribution). Example for doing this manually: - - mkdir --parents ~/texmf/tex/latex/ && cd ~/texmf/tex/latex/ - git clone https://github.com/ypid/latex-packages.git ypid-latex-packages - cd ypid-latex-packages/doclicense && make build - ## Or - make all - -If you have not worked with $TEXMFHOME you might want to refer to the -documentation of your TeX distribution for details. See also the next section. - - IMPORTANT NOTES REGARDING TDS - -Please note that the images/ and the license-texts/ subdirectories must end up in the runtime tex/ -subtree (that is tex/latex/doclicense/) for the \doclicenseImage macro and the \doclicense*FullText macros to work -correctly. diff --git a/macros/latex/contrib/doclicense/README.md b/macros/latex/contrib/doclicense/README.md new file mode 100644 index 0000000000..2a0fd5ed8a --- /dev/null +++ b/macros/latex/contrib/doclicense/README.md @@ -0,0 +1,78 @@ +<!-- +SPDX-FileCopyrightText: 2015,2021 Robin Schneider <ypid@riseup.net> + +SPDX-License-Identifier: LPPL-1.3c + +This work consists of all files listed in manifest.txt. +For more details about the licensing, refer "License" section of this file. +--> + +# LaTeX package 'doclicense' + +[](https://ctan.org/pkg/doclicense) + +CTAN: https://www.ctan.org/pkg/doclicense + +Code repository: https://github.com/ypid/latex-packages/tree/master/doclicense + +Question on Stackexchange: https://tex.stackexchange.com/a/226788/32320 + +## Description + +Support for putting documents under a license. + +The doclicense package allows you to put your document under a license and include a link +to read about the license or include an icon or image of the license. +Currently, only Creative Commons is supported but this package is designed to +handle all kinds of licenses. + +## Generating the files + +You can generate the `doclicense.sty` file with: + +```Shell +tex doclicense.ins +``` + +The documentation can be generated with: + +```Shell +make doclicense.pdf +``` + +Note that this will only work when this directory is below your +`$TEXMFHOME` tree (unless the doclicense package is already installed +for example by your TeX distribution). Example for doing this manually: + +```Shell +mkdir --parents ~/texmf/tex/latex/ && cd ~/texmf/tex/latex/ +git clone https://github.com/ypid/latex-packages.git ypid-latex-packages +cd ypid-latex-packages/doclicense && make build +``` + +If you have not worked with `$TEXMFHOME` you might want to refer to the +documentation of your TeX distribution for details. See also the next section. + +## Important notes regarding TDS + +Please note that the `images/` and the `license-texts/` subdirectories must end up +in the runtime `tex/` subtree (that is `tex/latex/doclicense/`) for the +`\doclicenseImage` macro and the `\doclicense*FullText` macros to work correctly. + +## License + +SPDX-License-Identifier: LPPL-1.3c + +This work may be distributed and/or modified under the +conditions of the LaTeX Project Public License, either version 1.3 +of this license or (at your option) any later version. +The latest version of this license is in + https://www.latex-project.org/lppl.txt +and version 1.3 or later is part of all distributions of LaTeX +version 2005/12/01 or later. + +This work has the LPPL maintenance status `maintained'. + +The Current Maintainer of this work is Robin Schneider. + +This work consists of all files listed in manifest.txt. diff --git a/macros/latex/contrib/doclicense/doclicense-UKenglish.ldf b/macros/latex/contrib/doclicense/doclicense-UKenglish.ldf index 19daf65d5b..5c95f38d6b 100644 --- a/macros/latex/contrib/doclicense/doclicense-UKenglish.ldf +++ b/macros/latex/contrib/doclicense/doclicense-UKenglish.ldf @@ -1,3 +1,10 @@ +% SPDX-FileCopyrightText: 2015 Robin Schneider <ypid@riseup.net> +% +% SPDX-License-Identifier: LPPL-1.3c +% +% This work consists of all files listed in manifest.txt. +% For more details about the licensing, refer to the README.md file. + \ProvidesFile{doclicense-UKenglish.ldf} \input{doclicense-british.ldf} diff --git a/macros/latex/contrib/doclicense/doclicense-USenglish.ldf b/macros/latex/contrib/doclicense/doclicense-USenglish.ldf index 3c6a45f461..abcdb987ea 100644 --- a/macros/latex/contrib/doclicense/doclicense-USenglish.ldf +++ b/macros/latex/contrib/doclicense/doclicense-USenglish.ldf @@ -1,3 +1,10 @@ +% SPDX-FileCopyrightText: 2015 Robin Schneider <ypid@riseup.net> +% +% SPDX-License-Identifier: LPPL-1.3c +% +% This work consists of all files listed in manifest.txt. +% For more details about the licensing, refer to the README.md file. + \ProvidesFile{doclicense-USenglish.ldf} \input{doclicense-english.ldf} diff --git a/macros/latex/contrib/doclicense/doclicense-acadian.ldf b/macros/latex/contrib/doclicense/doclicense-acadian.ldf index 7301dfa4ac..c7ffb022c0 100644 --- a/macros/latex/contrib/doclicense/doclicense-acadian.ldf +++ b/macros/latex/contrib/doclicense/doclicense-acadian.ldf @@ -1,3 +1,10 @@ +% SPDX-FileCopyrightText: 2015 Eric Guirbal <eric.guirbal@gmail.com> +% +% SPDX-License-Identifier: LPPL-1.3c +% +% This work consists of all files listed in manifest.txt. +% For more details about the licensing, refer to the README.md file. + \ProvidesFile{doclicense-acadian.ldf} \input{doclicense-french.ldf} diff --git a/macros/latex/contrib/doclicense/doclicense-american.ldf b/macros/latex/contrib/doclicense/doclicense-american.ldf index 6cdb358fbb..d23f24217c 100644 --- a/macros/latex/contrib/doclicense/doclicense-american.ldf +++ b/macros/latex/contrib/doclicense/doclicense-american.ldf @@ -1,3 +1,10 @@ +% SPDX-FileCopyrightText: 2015 Robin Schneider <ypid@riseup.net> +% +% SPDX-License-Identifier: LPPL-1.3c +% +% This work consists of all files listed in manifest.txt. +% For more details about the licensing, refer to the README.md file. + \ProvidesFile{doclicense-american.ldf} \input{doclicense-english.ldf} diff --git a/macros/latex/contrib/doclicense/doclicense-australian.ldf b/macros/latex/contrib/doclicense/doclicense-australian.ldf index c40d1caae9..5b69834c3c 100644 --- a/macros/latex/contrib/doclicense/doclicense-australian.ldf +++ b/macros/latex/contrib/doclicense/doclicense-australian.ldf @@ -1,3 +1,10 @@ +% SPDX-FileCopyrightText: 2015 Robin Schneider <ypid@riseup.net> +% +% SPDX-License-Identifier: LPPL-1.3c +% +% This work consists of all files listed in manifest.txt. +% For more details about the licensing, refer to the README.md file. + \ProvidesFile{doclicense-australian.ldf} \input{doclicense-english.ldf} diff --git a/macros/latex/contrib/doclicense/doclicense-brazilian.ldf b/macros/latex/contrib/doclicense/doclicense-brazilian.ldf index 4b1251246d..4201316075 100644 --- a/macros/latex/contrib/doclicense/doclicense-brazilian.ldf +++ b/macros/latex/contrib/doclicense/doclicense-brazilian.ldf @@ -1,10 +1,17 @@ +% SPDX-FileCopyrightText: 2019 Iago <el.iagows@gmail.com> +% +% SPDX-License-Identifier: LPPL-1.3c +% +% This work consists of all files listed in manifest.txt. +% For more details about the licensing, refer to the README.md file. + \ProvidesFile{doclicense-brazilian.ldf} \@namedef{doclicense@lang@thisDoc}{Essa obra tem a licença}% \@namedef{doclicense@lang@word@license}{}% \@namedef{doclicense@lang@lic@CC@code}{pt}% -%% Using: https://en.wikipedia.org/wiki/ISO_639-1 +% Using: https://en.wikipedia.org/wiki/ISO_639-1 \@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universal}% diff --git a/macros/latex/contrib/doclicense/doclicense-british.ldf b/macros/latex/contrib/doclicense/doclicense-british.ldf index 0676b7d3f2..79bbcf86fe 100644 --- a/macros/latex/contrib/doclicense/doclicense-british.ldf +++ b/macros/latex/contrib/doclicense/doclicense-british.ldf @@ -1,3 +1,11 @@ +% SPDX-FileCopyrightText: 2015 by Robin Schneider <ypid@riseup.net> +% SPDX-FileCopyrightText: 2016 Alex Ball <a.j.ball@bath.ac.uk> +% +% SPDX-License-Identifier: LPPL-1.3c +% +% This work consists of all files listed in manifest.txt. +% For more details about the licensing, refer to the README.md file. + \ProvidesFile{doclicense-british.ldf} \input{doclicense-english.ldf} diff --git a/macros/latex/contrib/doclicense/doclicense-bulgarian.ldf b/macros/latex/contrib/doclicense/doclicense-bulgarian.ldf index 96f5be7abc..bf111f4b02 100644 --- a/macros/latex/contrib/doclicense/doclicense-bulgarian.ldf +++ b/macros/latex/contrib/doclicense/doclicense-bulgarian.ldf @@ -1,3 +1,10 @@ +% SPDX-FileCopyrightText: 2020 Hristo Hristov <hristo.dr.hristov@gmail.com> +% +% SPDX-License-Identifier: LPPL-1.3c +% +% This work consists of all files listed in manifest.txt. +% For more details about the licensing, refer to the README.md file. + \ProvidesFile{doclicense-bulgarian.ldf} \@namedef{doclicense@lang@thisDoc}{Това произведение е лицензирано под}% @@ -5,7 +12,7 @@ \@namedef{doclicense@lang@word@license}{ лиценз}% \@namedef{doclicense@lang@lic@CC@code}{bg}% -%% Using: https://en.wikipedia.org/wiki/ISO_639-1 +% Using: https://en.wikipedia.org/wiki/ISO_639-1 \@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 УниверÑален}% diff --git a/macros/latex/contrib/doclicense/doclicense-canadian.ldf b/macros/latex/contrib/doclicense/doclicense-canadian.ldf index 855aa5718e..3e67333a04 100644 --- a/macros/latex/contrib/doclicense/doclicense-canadian.ldf +++ b/macros/latex/contrib/doclicense/doclicense-canadian.ldf @@ -1,3 +1,10 @@ +% SPDX-FileCopyrightText: 2015 Robin Schneider <ypid@riseup.net> +% +% SPDX-License-Identifier: LPPL-1.3c +% +% This work consists of all files listed in manifest.txt. +% For more details about the licensing, refer to the README.md file. + \ProvidesFile{doclicense-canadian.ldf} \input{doclicense-english.ldf} diff --git a/macros/latex/contrib/doclicense/doclicense-canadien.ldf b/macros/latex/contrib/doclicense/doclicense-canadien.ldf index fc5484c8d8..f86161f43b 100644 --- a/macros/latex/contrib/doclicense/doclicense-canadien.ldf +++ b/macros/latex/contrib/doclicense/doclicense-canadien.ldf @@ -1,3 +1,10 @@ +% SPDX-FileCopyrightText: 2015 Eric Guirbal <eric.guirbal@gmail.com> +% +% SPDX-License-Identifier: LPPL-1.3c +% +% This work consists of all files listed in manifest.txt. +% For more details about the licensing, refer to the README.md file. + \ProvidesFile{doclicense-canadien.ldf} \input{doclicense-french.ldf} diff --git a/macros/latex/contrib/doclicense/doclicense-catalan.ldf b/macros/latex/contrib/doclicense/doclicense-catalan.ldf index 5bcb168319..7d7ee780cb 100644 --- a/macros/latex/contrib/doclicense/doclicense-catalan.ldf +++ b/macros/latex/contrib/doclicense/doclicense-catalan.ldf @@ -1,10 +1,17 @@ +% SPDX-FileCopyrightText: 2018 Ernesto Lanchares <e.lancha98@gmail.com> +% +% SPDX-License-Identifier: LPPL-1.3c +% +% This work consists of all files listed in manifest.txt. +% For more details about the licensing, refer to the README.md file. + \ProvidesFile{doclicense-catalan.ldf} \@namedef{doclicense@lang@thisDoc}{Aquesta obra està subjecta a una llicència de}% \@namedef{doclicense@lang@word@license}{}% \@namedef{doclicense@lang@lic@CC@code}{ca}% -%% Using: https://en.wikipedia.org/wiki/ISO_639-1 +% Using: https://en.wikipedia.org/wiki/ISO_639-1 \@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universal}% diff --git a/macros/latex/contrib/doclicense/doclicense-chinese-gbk.ldf b/macros/latex/contrib/doclicense/doclicense-chinese-gbk.ldf index 0b197eb7c1..e042127cf5 100644 --- a/macros/latex/contrib/doclicense/doclicense-chinese-gbk.ldf +++ b/macros/latex/contrib/doclicense/doclicense-chinese-gbk.ldf @@ -1,10 +1,17 @@ +% SPDX-FileCopyrightText: 2019 sd44 <sd44sd44@yeah.net> +% +% SPDX-License-Identifier: LPPL-1.3c +% +% This work consists of all files listed in manifest.txt. +% For more details about the licensing, refer to the README.md file. + \ProvidesFile{doclicense-chinese.ldf} \@namedef{doclicense@lang@thisDoc}{±¾×÷Æ·²ÉÓÃ}% \@namedef{doclicense@lang@word@license}{Ðí¿ÉÐÒé½øÐÐÐí¿É}% \@namedef{doclicense@lang@lic@CC@code}{zh}% -%% Using:https://en.wikipedia.org/wiki/ISO_639-1 +% Using:https://en.wikipedia.org/wiki/ISO_639-1 \@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 ͨÓÃ}% diff --git a/macros/latex/contrib/doclicense/doclicense-chinese-utf8.ldf b/macros/latex/contrib/doclicense/doclicense-chinese-utf8.ldf index 4770ae9938..e61621a98d 100644 --- a/macros/latex/contrib/doclicense/doclicense-chinese-utf8.ldf +++ b/macros/latex/contrib/doclicense/doclicense-chinese-utf8.ldf @@ -1,10 +1,17 @@ +% SPDX-FileCopyrightText: 2019 sd44 <sd44sd44@yeah.net> +% +% SPDX-License-Identifier: LPPL-1.3c +% +% This work consists of all files listed in manifest.txt. +% For more details about the licensing, refer to the README.md file. + \ProvidesFile{doclicense-chinese.ldf} \@namedef{doclicense@lang@thisDoc}{本作å“采用}% \@namedef{doclicense@lang@word@license}{许å¯å议进行许å¯}% \@namedef{doclicense@lang@lic@CC@code}{zh}% -%% Using:https://en.wikipedia.org/wiki/ISO_639-1 +% Using:https://en.wikipedia.org/wiki/ISO_639-1 \@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 通用}% diff --git a/macros/latex/contrib/doclicense/doclicense-english.ldf b/macros/latex/contrib/doclicense/doclicense-english.ldf index 525345d362..a8e97cd4ea 100644 --- a/macros/latex/contrib/doclicense/doclicense-english.ldf +++ b/macros/latex/contrib/doclicense/doclicense-english.ldf @@ -1,10 +1,17 @@ +% SPDX-FileCopyrightText: 2015 Robin Schneider <ypid@riseup.net> +% +% SPDX-License-Identifier: LPPL-1.3c +% +% This work consists of all files listed in manifest.txt. +% For more details about the licensing, refer to the README.md file. + \ProvidesFile{doclicense-english.ldf} \@namedef{doclicense@lang@thisDoc}{This work is licensed under a}% \@namedef{doclicense@lang@word@license}{ license}% \@namedef{doclicense@lang@lic@CC@code}{en}% -%% Using: https://en.wikipedia.org/wiki/ISO_639-1 +% Using: https://en.wikipedia.org/wiki/ISO_639-1 \@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universal}% diff --git a/macros/latex/contrib/doclicense/doclicense-french.ldf b/macros/latex/contrib/doclicense/doclicense-french.ldf index fbf2be022a..9411fe3fb0 100644 --- a/macros/latex/contrib/doclicense/doclicense-french.ldf +++ b/macros/latex/contrib/doclicense/doclicense-french.ldf @@ -1,3 +1,11 @@ +% SPDX-FileCopyrightText: 2015 Eric Guirbal <eric.guirbal@gmail.com> +% SPDX-FileCopyrightText: 2015 Robin Schneider <ypid@riseup.net> +% +% SPDX-License-Identifier: LPPL-1.3c +% +% This work consists of all files listed in manifest.txt. +% For more details about the licensing, refer to the README.md file. + \ProvidesFile{doclicense-french.ldf} \ifthenelse{\equal{\doclicense@imagemodifier}{-88x31}}{% chktex 29 @@ -8,7 +16,7 @@ \@namedef{doclicense@lang@word@license}{}% \@namedef{doclicense@lang@lic@CC@code}{fr}% -%% Using: https://en.wikipedia.org/wiki/ISO_639-1 +% Using: https://en.wikipedia.org/wiki/ISO_639-1 \@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universel}% diff --git a/macros/latex/contrib/doclicense/doclicense-galician.ldf b/macros/latex/contrib/doclicense/doclicense-galician.ldf index 257e607568..9e5bb62b6c 100644 --- a/macros/latex/contrib/doclicense/doclicense-galician.ldf +++ b/macros/latex/contrib/doclicense/doclicense-galician.ldf @@ -1,10 +1,17 @@ +% SPDX-FileCopyrightText: 2019 Entity who prefers to remain anonymous +% +% SPDX-License-Identifier: LPPL-1.3c +% +% This work consists of all files listed in manifest.txt. +% For more details about the licensing, refer to the README.md file. + \ProvidesFile{doclicense-galician.ldf} \@namedef{doclicense@lang@thisDoc}{Esta obra está baixo unha licenza}% \@namedef{doclicense@lang@word@license}{}% \@namedef{doclicense@lang@lic@CC@code}{gl}% -%% Using: https://en.wikipedia.org/wiki/ISO_639-1 +% Using: https://en.wikipedia.org/wiki/ISO_639-1 \@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universal}% diff --git a/macros/latex/contrib/doclicense/doclicense-german.ldf b/macros/latex/contrib/doclicense/doclicense-german.ldf index 802e89225b..8fb47a05b2 100644 --- a/macros/latex/contrib/doclicense/doclicense-german.ldf +++ b/macros/latex/contrib/doclicense/doclicense-german.ldf @@ -1,3 +1,10 @@ +% SPDX-FileCopyrightText: 2015,2020 Robin Schneider <ypid@riseup.net> +% +% SPDX-License-Identifier: LPPL-1.3c +% +% This work consists of all files listed in manifest.txt. +% For more details about the licensing, refer to the README.md file. + \ProvidesFile{doclicense-german.ldf} \@namedef{doclicense@lang@thisDoc}{Dieses Werk ist lizenziert unter einer}% @@ -7,7 +14,7 @@ }{} \@namedef{doclicense@lang@lic@CC@code}{de}% -%% Using: https://en.wikipedia.org/wiki/ISO_639-1 +% Using: https://en.wikipedia.org/wiki/ISO_639-1 \@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universell}% diff --git a/macros/latex/contrib/doclicense/doclicense-italian.ldf b/macros/latex/contrib/doclicense/doclicense-italian.ldf index e3a4454cf2..87c78f38a5 100644 --- a/macros/latex/contrib/doclicense/doclicense-italian.ldf +++ b/macros/latex/contrib/doclicense/doclicense-italian.ldf @@ -1,3 +1,10 @@ +% SPDX-FileCopyrightText: 2017 Filippo Rigotto <rigottofilippo@altervista.org> +% +% SPDX-License-Identifier: LPPL-1.3c +% +% This work consists of all files listed in manifest.txt. +% For more details about the licensing, refer to the README.md file. + \ProvidesFile{doclicense-italian.ldf} \@namedef{doclicense@lang@thisDoc}{Quest'opera è distribuita con licenza}% @@ -7,7 +14,7 @@ }{} \@namedef{doclicense@lang@lic@CC@code}{it}% -%% Using: https://en.wikipedia.org/wiki/ISO_639-1 +% Using: https://en.wikipedia.org/wiki/ISO_639-1 \@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universale}% diff --git a/macros/latex/contrib/doclicense/doclicense-japanese.ldf b/macros/latex/contrib/doclicense/doclicense-japanese.ldf index 8b9f778db9..4d6c05bf54 100644 --- a/macros/latex/contrib/doclicense/doclicense-japanese.ldf +++ b/macros/latex/contrib/doclicense/doclicense-japanese.ldf @@ -1,3 +1,10 @@ +% SPDX-FileCopyrightText: 2020 BÌ… +% +% SPDX-License-Identifier: LPPL-1.3c +% +% This work consists of all files listed in manifest.txt. +% For more details about the licensing, refer to the README.md file. + \ProvidesFile{doclicense-japanese.ldf} \@namedef{doclicense@lang@thisDoc}{本作å“ãŒæŽ¡ç”¨ã—ã¦ã„ã‚‹ã®ã¯}% diff --git a/macros/latex/contrib/doclicense/doclicense-marathi.ldf b/macros/latex/contrib/doclicense/doclicense-marathi.ldf index e39b7ef8ca..af7b1924f3 100644 --- a/macros/latex/contrib/doclicense/doclicense-marathi.ldf +++ b/macros/latex/contrib/doclicense/doclicense-marathi.ldf @@ -1,3 +1,11 @@ +% SPDX-FileCopyrightText: 2020 Niranjan <niranjanvikastambe@gmail.com> +% SPDX-FileCopyrightText: 2020 Robin Schneider <ypid@riseup.net> +% +% SPDX-License-Identifier: LPPL-1.3c +% +% This work consists of all files listed in manifest.txt. +% For more details about the licensing, refer to the README.md file. + \ProvidesFile{doclicense-marathi.ldf} \@namedef{doclicense@lang@thisDoc}{हे काम}% @@ -9,7 +17,7 @@ \@namedef{doclicense@lang@lic@CC}{कà¥à¤°à¤¿à¤à¤Ÿà¤¿à¤µà¥à¤¹ कॉमनà¥à¤¸à¤šà¥à¤¯à¤¾}% \@namedef{doclicense@lang@lic@CC@code}{mr}% -%% Using: https://en.wikipedia.org/wiki/ISO_639-1 +% Using: https://en.wikipedia.org/wiki/ISO_639-1 \@namedef{doclicense@lang@lic@CC@code}{mr}% % Reference: https://en.wikipedia.org/wiki/List_of_ISO_639-2_codes diff --git a/macros/latex/contrib/doclicense/doclicense-newzealand.ldf b/macros/latex/contrib/doclicense/doclicense-newzealand.ldf index 9775602edc..22ab0c1ec9 100644 --- a/macros/latex/contrib/doclicense/doclicense-newzealand.ldf +++ b/macros/latex/contrib/doclicense/doclicense-newzealand.ldf @@ -1,3 +1,10 @@ +% SPDX-FileCopyrightText: 2015 Robin Schneider <ypid@riseup.net> +% +% SPDX-License-Identifier: LPPL-1.3c +% +% This work consists of all files listed in manifest.txt. +% For more details about the licensing, refer to the README.md file. + \ProvidesFile{doclicense-newzealand.ldf} \input{doclicense-english.ldf} diff --git a/macros/latex/contrib/doclicense/doclicense-ngerman.ldf b/macros/latex/contrib/doclicense/doclicense-ngerman.ldf index 5f4247c1db..042e59b817 100644 --- a/macros/latex/contrib/doclicense/doclicense-ngerman.ldf +++ b/macros/latex/contrib/doclicense/doclicense-ngerman.ldf @@ -1,3 +1,10 @@ +% SPDX-FileCopyrightText: 2015 Robin Schneider <ypid@riseup.net> +% +% SPDX-License-Identifier: LPPL-1.3c +% +% This work consists of all files listed in manifest.txt. +% For more details about the licensing, refer to the README.md file. + \ProvidesFile{doclicense-ngerman.ldf} \input{doclicense-german.ldf} diff --git a/macros/latex/contrib/doclicense/doclicense-polish.ldf b/macros/latex/contrib/doclicense/doclicense-polish.ldf index 484a7123ad..76e7af9305 100644 --- a/macros/latex/contrib/doclicense/doclicense-polish.ldf +++ b/macros/latex/contrib/doclicense/doclicense-polish.ldf @@ -1,3 +1,10 @@ +% SPDX-FileCopyrightText: 2018 Janusz S. BieÅ„ jsbien@mimuw.edu.pl +% +% SPDX-License-Identifier: LPPL-1.3c +% +% This work consists of all files listed in manifest.txt. +% For more details about the licensing, refer to the README.md file. + \ProvidesFile{doclicense-polish.ldf} \@namedef{doclicense@lang@thisDoc}{Na ten utwór udzielona jest licencja}% @@ -6,7 +13,7 @@ % In Polish the word "licencja" should precede the license name \@namedef{doclicense@lang@lic@CC@code}{pl}% -%% Using: https://en.wikipedia.org/wiki/ISO_639-1 +% Using: https://en.wikipedia.org/wiki/ISO_639-1 \@namedef{doclicense@lang@lic@CC@zero@1.0}{Przekazanie do Domeny Publicznej (CC0 1.0)}% % https://creativecommons.org/publicdomain/zero/1.0/deed.pl diff --git a/macros/latex/contrib/doclicense/doclicense-portuguese.ldf b/macros/latex/contrib/doclicense/doclicense-portuguese.ldf index 416253e0b3..d1029d5245 100644 --- a/macros/latex/contrib/doclicense/doclicense-portuguese.ldf +++ b/macros/latex/contrib/doclicense/doclicense-portuguese.ldf @@ -1,10 +1,17 @@ +% SPDX-FileCopyrightText: 2018 Daniel Santos <danisantos@protonmail.com> +% +% SPDX-License-Identifier: LPPL-1.3c +% +% This work consists of all files listed in manifest.txt. +% For more details about the licensing, refer to the README.md file. + \ProvidesFile{doclicense-portuguese.ldf} \@namedef{doclicense@lang@thisDoc}{Esta obra tem a licença}% \@namedef{doclicense@lang@word@license}{}% \@namedef{doclicense@lang@lic@CC@code}{pt}% -%% Using: https://en.wikipedia.org/wiki/ISO_639-1 +% Using: https://en.wikipedia.org/wiki/ISO_639-1 \@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universal}% diff --git a/macros/latex/contrib/doclicense/doclicense-russian.ldf b/macros/latex/contrib/doclicense/doclicense-russian.ldf index 09f66ea778..167af54814 100644 --- a/macros/latex/contrib/doclicense/doclicense-russian.ldf +++ b/macros/latex/contrib/doclicense/doclicense-russian.ldf @@ -1,10 +1,17 @@ +% SPDX-FileCopyrightText: 2017 Anton Karmanov <bergertroll@openmailbox.org> +% +% SPDX-License-Identifier: LPPL-1.3c +% +% This work consists of all files listed in manifest.txt. +% For more details about the licensing, refer to the README.md file. + \ProvidesFile{doclicense-russian.ldf} \@namedef{doclicense@lang@thisDoc}{Ðто произведение доÑтупно по лицензии}% \@namedef{doclicense@lang@word@license}{}% \@namedef{doclicense@lang@lic@CC@code}{ru}% -%% Using: https://en.wikipedia.org/wiki/ISO_639-1 +% Using: https://en.wikipedia.org/wiki/ISO_639-1 \@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 УниверÑальнаÑ}% diff --git a/macros/latex/contrib/doclicense/doclicense-spanish.ldf b/macros/latex/contrib/doclicense/doclicense-spanish.ldf index 9be63aaa4f..726defd672 100644 --- a/macros/latex/contrib/doclicense/doclicense-spanish.ldf +++ b/macros/latex/contrib/doclicense/doclicense-spanish.ldf @@ -1,10 +1,17 @@ +% SPDX-FileCopyrightText: 2015 Carlos <pepitogrillo148@hotmail.com> +% +% SPDX-License-Identifier: LPPL-1.3c +% +% This work consists of all files listed in manifest.txt. +% For more details about the licensing, refer to the README.md file. + \ProvidesFile{doclicense-spanish.ldf} \@namedef{doclicense@lang@thisDoc}{Esta obra está bajo una licencia}% \@namedef{doclicense@lang@word@license}{}% \@namedef{doclicense@lang@lic@CC@code}{es}% -%% Using: https://en.wikipedia.org/wiki/ISO_639-1 +% Using: https://en.wikipedia.org/wiki/ISO_639-1 \@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universal}% diff --git a/macros/latex/contrib/doclicense/doclicense.dtx b/macros/latex/contrib/doclicense/doclicense.dtx index 75e34f64a8..5932dabaa4 100644 --- a/macros/latex/contrib/doclicense/doclicense.dtx +++ b/macros/latex/contrib/doclicense/doclicense.dtx @@ -1,21 +1,11 @@ % \iffalse meta-comment % -% Copyright (C) 2015-2020 by Robin Schneider <ypid@riseup.net> +% SPDX-FileCopyrightText: 2015-2021 Robin Schneider <ypid@riseup.net> % -% This work may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3 -% of this license or (at your option) any later version. -% The latest version of this license is in -% http://www.latex-project.org/lppl.txt -% and version 1.3 or later is part of all distributions of LaTeX -% version 2005/12/01 or later. +% SPDX-License-Identifier: LPPL-1.3c % -% This work has the LPPL maintenance status `maintained'. -% -% The Current Maintainer of this work is Robin Schneider. -% -% This work consists of the files doclicense.dtx and doclicense.ins -% and the derived files doclicense.sty and doclicense.pdf. +% This work consists of all files listed in manifest.txt. +% For more details about the licensing, refer to the README.md file. % % \fi % @@ -23,11 +13,18 @@ %<*driver> \ProvidesFile{doclicense.dtx} %</driver> -%<package>%% See file 'doclicense.dtx' for copyright and license. +%<package>% SPDX-FileCopyrightText: 2015-2021 Robin Schneider <ypid@riseup.net> +%<package>% +%<package>% SPDX-License-Identifier: LPPL-1.3c +%<package>% +%<package>% This work consists of all files listed in manifest.txt. +%<package>% For more details about the licensing, refer to the README.md file. +%<package>% If you don't have those files, you can find them at: https://ctan.org/pkg/doclicense +%<package> %<package>\NeedsTeXFormat{LaTeX2e}[1998/12/01] %<package>\ProvidesPackage{doclicense} %<*package> - [2020/09/25 v2.2.1 Support for putting documents under a license] + [2021/03/13 v2.3.0 Support for putting documents under a license] %</package> % %<*driver> @@ -39,8 +36,8 @@ \newcommand{\PackageAuthorEmail}{ypid@riseup.net} \newcommand{\PackageName}{\PrintPackage{doclicense}} \newcommand{\PrintPackage}[1]{\textsf{#1}} -\newcommand{\PrintOptionF}[1]{\emph{#1}} %% ^^A This macro is used for -%% ^^A explaining any parameter when they first come up in the manual. +\newcommand{\PrintOptionF}[1]{\emph{#1}} % ^^A This macro is used for +% ^^A explaining any parameter when they first come up in the manual. \newcommand{\DescribePara}[1]{\marginpar{\raggedleft\strut\MacroFont\string#1}} \usepackage[ hyphens, @@ -56,7 +53,7 @@ eqlist, } \usepackage[iso]{isodate} -%% ^^A https://tex.stackexchange.com/a/95893/32320 +% ^^A https://tex.stackexchange.com/a/95893/32320 \setlength\IndexMin{100pt} \usepackage[ type={CC}, @@ -138,11 +135,12 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \printdateTeX{\filed % \changes{2.1.0}{2020/07/26}{Fix regression: Proper language default image variants (Euro variants for example) was broken and the US variant was always used. This bug was introduced in v2.0.0. Documentation fixes. Added Marathi translation.} % \changes{2.2.0}{2020/09/18}{Add Japanese and Bulgarian translation. Add hint how to use Chinese to docs. Load hyperxmp by default when it is installed. Before, doclicense just suggested to load it and made use of the package when the user did.} % \changes{2.2.1}{2020/09/25}{Fix compatibility issue with newer versions of hyperxmp (bug confirmed with Tex Live 2020) resulting in an compile error by loading hyperxmp and hyperref in the order the packages expect it.} +% \changes{2.3.0}{2021/03/13}{Add option to disable the use of hyperxmp and add compatibility for pdfx. Use \url{https://reuse.software/} for the doclicense source code itself.} % % % -%% ^^A nag warned about the center environment and it really messes up spacing. +% ^^A nag warned about the center environment and it really messes up spacing. % % \DoNotIndex{\RequirePackage, \DeclareOption, \ProcessOptions} % \DoNotIndex{\PackageWarning, \MessageBreak} @@ -193,16 +191,22 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \printdateTeX{\filed % % This will explicitly set the license to \doclicenseNameRef. % -% If the \PrintPackage{hyperxmp} package is installed, it will be loaded and the options -% \PrintOptionF{pdflicenseurl} and \PrintOptionF{pdfcopyright} will be set -% by \PackageName{} to the corresponding values -% (\enquote{\url{\doclicenseURL}} and \enquote{\doclicenseLongText{}}). -% This embeds license metadata into the PDF which proper PDF readers can show. -% For example Evince shows it in the \enquote{Document License} tab under -% \enquote{Properties}. You may check this manual for how your PDF reader -% handles such metadata. -% If the package is not installed, a warning will be emitted to allow you to -% install the package as needed. +% With the default settings and if the \PrintPackage{hyperxmp} package is +% installed, it will be loaded and the options \PrintOptionF{pdflicenseurl} +% and \PrintOptionF{pdfcopyright} will be set by \PackageName{} to the +% corresponding values (\enquote{\url{\doclicenseURL}} and +% \enquote{\doclicenseLongText{}}). This embeds license metadata into the PDF +% which proper PDF readers can show. For example Evince shows it in the +% \enquote{Document License} tab under \enquote{Properties}. You may check +% this manual for how your PDF reader handles such metadata. +% +% In case you are using other package to manipulate the metadata which is +% incompatible to the use of hyperxmp, e.\,g. \PrintPackage{pdfx} you can use +% the \PrintOptionF{hyperxmp=false} to disable this automatism. If +% \PrintPackage{pdfx} is loaded before \PrintPackage{doclicense} or if +% \PrintPackage{hyperxmp} is not installed this automatism is disabled. +% In these cases a warning is emitted to inform you about the reasons. +% The warning will not show up if \PrintOptionF{hyperxmp} is set to false. % % \section{Package options} % @@ -227,23 +231,23 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \printdateTeX{\filed % % Supported languages: % ^^A Sorted alphabetically. -% \begin{eqlist} -% \item[Brazilian] Added by \href{https://github.com/iagows}{Iago}. -% \item[Bulgarian] Added by \href{https://github.com/hristo-d-hristov}{hristo-d-hristov}. -% \item[Catalan] Added by \href{https://github.com/elancha98}{Ernesto Lanchares}. -% \item[Chinese] Added by \href{https://github.com/sd44}{sd44}. Note that you might need to pass \verb+lang={chinese-utf8}+ or \verb+chinese-gbk+. -% \item[English] Added by \href{https://me.ypid.de/}{Robin Schneider}. -% \item[French] Added by \href{https://github.com/ericguirbal}{\'Eric Guirbal}. -% \item[Galician] Submitted by Email. -% \item[German] Added by \href{https://me.ypid.de/}{Robin Schneider}. -% \item[Italian] Added by \href{https://github.com/rig8f}{Filippo Rigotto}. -% \item[Japanese] Added by \href{https://github.com/cmplstofB}{cmplstofB}. -% \item[Marathi] Added by \href{https://github.com/NiranjanTambe}{Niranjan}. Note that Niranjan also translated the images which are considered unofficial by the package. Creative Commons has no plans to support additional currencies. -% \item[Polish] Added by \href{https://github.com/jsbien}{jsbien}. -% \item[Portuguese] Added by \href{https://github.com/alexandre1985}{Daniel Alexandre Cerqueira Santos}. -% \item[Russian] Added by \href{https://github.com/bergentroll}{Anton Karmanov}. -% \item[Spanish] Added by \href{https://github.com/elsudano}{Carlos}. Updated by \href{https://github.com/IgnacioFDM}{IgnacioFDM}. -% \end{eqlist} +% \begin{itemize} +% \item Brazilian +% \item Bulgarian +% \item Catalan +% \item Chinese: Note that you might need to pass \verb+lang={chinese-utf8}+ or \verb+chinese-gbk+. +% \item English +% \item French +% \item Galician +% \item German +% \item Italian +% \item Japanese +% \item Marathi: Note that Niranjan also translated the images which are considered unofficial by the package. Creative Commons has no plans to support additional currencies. +% \item Polish +% \item Portuguese +% \item Russian +% \item Spanish +% \end{itemize} % % Image position for \cmd{\doclicenseThis}: right (default) or left. % \DescribePara{imageposition} @@ -328,6 +332,12 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \printdateTeX{\filed % |]{doclicense}| % \end{quote} % +% This option allows to disable the automatic loading of \PrintPackage{hyperxmp}. +% \DescribePara{hyperxmp} +% It's initialized to true. This might also be used to suppress the warning if +% \PrintPackage{hyperxmp} is not available or \PrintPackage{pdfx} was loaded before +% \PrintPackage{doclicense}. +% % \section{Macros} % \DescribeMacro{\doclicenseType} % Expands to the type as set in the package options. Example: \enquote{\doclicenseType{}} @@ -545,7 +555,7 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \printdateTeX{\filed % \fi % \subsection{Declaring the options} % \begin{macrocode} -%% Parameters ((( +% Parameters ((( \RequirePackage{kvoptions} \DeclareStringOption{type} \DeclareStringOption{modifier} @@ -556,7 +566,8 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \printdateTeX{\filed \DeclareStringOption[10em]{imagewidth} \DeclareStringOption[2em]{imagedistance} \DeclareStringOption{hyphenation} -%% ))) +\DeclareBoolOption[true]{hyperxmp} +% ))) % \end{macrocode} % To test if all parameters are valid the macro |\ProcessLocalKeyvalOptions*| @@ -568,15 +579,15 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \printdateTeX{\filed % \end{macrocode} % \subsection{Dependencies} % \begin{macrocode} -%% Dependencies ((( +% Dependencies ((( \RequirePackage{xifthen} \RequirePackage{xstring} -\RequirePackage{etoolbox} %% \ifcsdef +\RequirePackage{etoolbox} % \ifcsdef \RequirePackage{xspace} \RequirePackage{verbatim} -%% Custom enumerate list with adjusted labels -%% that match the license text conventions +% Custom enumerate list with adjusted labels +% that match the license text conventions \newenvironment{doclicense@enumerate}{% \begin{enumerate} \renewcommand{\labelenumi}{(\alph{enumi})}% @@ -597,10 +608,10 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \printdateTeX{\filed } \AtEndPreamble{% \@ifpackageloaded{csquotes}{ - %% csquotes has already been loaded so we are fine. + % csquotes has already been loaded so we are fine. }{ \ifcsdef{enquote}{ - %% \enquote is defined but not by csquotes. + % \enquote is defined but not by csquotes. \@ifpackageloaded{biblatex}{ \PackageError{doclicense}{The enquote macro is defined by biblatex} {This package assumes that the enquote macro is defined by the @@ -618,32 +629,42 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \printdateTeX{\filed } } \@ifpackageloaded{ccicons}{}{\RequirePackage{ccicons}} - %% For \doclicenseIcon + % For \doclicenseIcon \@ifpackageloaded{graphicx}{}{\RequirePackage{graphicx}} - %% For \doclicenseImage + % For \doclicenseImage \@ifpackageloaded{hyperref}{}{\RequirePackage{hyperref}} \@ifpackageloaded{hyperxmp}{ - %% The following options are only defined when the hyperxmp package was loaded. + % The following options are only defined when the hyperxmp package was loaded. \hypersetup{ pdfcopyright = {\doclicenseLongText}, pdflicenseurl = {\doclicenseURL}, } }{} } -\IfFileExists{hyperxmp.sty}{ - \@ifpackageloaded{hyperxmp}{}{\RequirePackage{hyperxmp}} -}{ - \PackageWarning{doclicense}{% - The hyperxmp package is missing so no license metadata can be embedded - into the PDF. Consider installing hyperxmp.% chktex 13 +\ifdoclicense@hyperxmp + \@ifpackageloaded{pdfx}{% + \PackageWarning{doclicense}{% + The pdfx package was detected. Therefore the mechanism to add license + metadata won't work. Ensure to setup \string\Copyright\space and + corresponding settings to your xmpdata-file. } -} -%% ))) + }{ + \IfFileExists{hyperxmp.sty}{ + \@ifpackageloaded{hyperxmp}{}{\RequirePackage{hyperxmp}} + }{ + \PackageWarning{doclicense}{% + The hyperxmp package is missing so no license metadata can be embedded + into the PDF. Consider installing hyperxmp.% chktex 13 + } + } + } +\fi +% ))) % \end{macrocode} % \subsection{Deprecation handling} % \begin{macrocode} -%% Deprecation handling ((( +% Deprecation handling ((( \ifthenelse{ \equal{\doclicense@type}{} }{ @@ -678,12 +699,12 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \printdateTeX{\filed Please explicitly pick a license of your choosing. } }{} -%% ))) +% ))) % \end{macrocode} % \subsection{Declare variables and macros} % \begin{macrocode} -%% Declare variables ((( +% Declare variables ((( \@namedef{doclicense@lang@lic@CC}{Creative Commons}% \newcommand{\doclicense@baseUrlCC}{https://creativecommons.org} \newcommand{\doclicense@versionFallback}{} @@ -703,12 +724,12 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \printdateTeX{\filed }{% \doclicense@modifier}% } -%% ))) +% ))) % \end{macrocode} % \subsection{User macros} % \begin{macrocode} -%% User macros ((( +% User macros ((( \newcommand{\doclicenseType}{\doclicense@type\xspace} \newcommand{\doclicenseLongType}{} \newcommand{\doclicenseModifier}{\doclicense@modifier@uppercase\xspace} @@ -733,7 +754,7 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \printdateTeX{\filed } \newcommand{\doclicenseIcon}{\doclicense@icon\xspace} \newcommand{\doclicenseTypeIcon}{\doclicenseType} -% \newcommand{\doclicenseModifierIcon}{} %% Not directly provided by ccicons. +% \newcommand{\doclicenseModifierIcon}{} % Not directly provided by ccicons. \newcommand{\doclicenseImageFileName}{% doclicense-\doclicense@type-\doclicense@modifier\doclicense@imagemodifier} \newcommand{\doclicenseImage}[1][]{% @@ -755,7 +776,7 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \printdateTeX{\filed doclicense-\doclicense@type-\doclicense@modifier-\doclicense@versionUsed-latex} \newcommand{\doclicenseFullText}{\input{\doclicenseFullTextFileName}}% chktex 27 -\newcommand{\doclicenseLicense}{\doclicenseThis} %% legacy support +\newcommand{\doclicenseLicense}{\doclicenseThis} % legacy support \newcommand{\doclicenseThis}{% \setlength{\doclicense@hsize}{\linewidth-\doclicense@imagewidth-\doclicense@imagedistance}% \ifthenelse{\equal{\doclicense@imageposition}{left}}{% @@ -793,7 +814,7 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \printdateTeX{\filed % } } } -%% ))) +% ))) % \end{macrocode} % \subsection{Language selection} @@ -801,7 +822,7 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \printdateTeX{\filed % should be stored and changed there. Note that one could also redefine % macros like \cmd{\doclicenseLongText} if necessary. % \begin{macrocode} -%% Language support ((( +% Language support ((( \ifthenelse{\equal{\doclicense@lang}{}}{% \renewcommand{\doclicense@lang}{\languagename}}{} \IfFileExists{doclicense-\doclicense@lang.ldf}{% @@ -818,12 +839,12 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \printdateTeX{\filed \@namedef{doclicense@imagemodifier}{-88x31}% chktex 29 }{} -%% ))) +% ))) % \end{macrocode} % \subsection{Internals} % \begin{macrocode} -%% Set license ((( +% Set license ((( \newcommand{\doclicense@setVersion}[1][]{% \ifthenelse{\equal{#1}{}}{}{% \renewcommand{\doclicense@versionFallback}{#1} @@ -835,14 +856,14 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \printdateTeX{\filed } } \newcommand{\doclicense@set}{% - %% CC ((( + % CC ((( \ifthenelse{\equal{\doclicense@type}{CC}}{% \renewcommand{\doclicenseLongType}{\doclicense@lang@lic@CC\xspace} \renewcommand{\doclicenseTypeIcon}{\ccLogo\xspace} \doclicense@setVersion[3.0] - %% Allow to predefine the following macros in ldf files. + % Allow to predefine the following macros in ldf files. \ifcsdef{doclicense@UrlLangPart}{}{% \ifthenelse{\equal{\doclicense@lang@lic@CC@code}{}}{% \edef\doclicense@UrlLangPart{} @@ -910,7 +931,7 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \printdateTeX{\filed }% }{} \IfSubStr{\doclicense@modifier}{nc}{}{ - %% eu (Euro) does only exist for nc (non commercial) so if not nc then reset -eu. + % eu (Euro) does only exist for nc (non commercial) so if not nc then reset -eu. \IfBeginWith{\doclicense@imagemodifier}{-eu}{% \renewcommand{\doclicense@imagemodifier}{-88x31}% chktex 29 }{} @@ -929,7 +950,7 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \printdateTeX{\filed } \setboolean{doclicense@licenseKnown}{true} - }{}%% ))) + }{}% ))) \ifthenelse{\not\boolean{doclicense@licenseKnown}}{% \PackageError{doclicense}{License unknown}{% Please check the manual of doclicense @@ -937,7 +958,7 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \printdateTeX{\filed }% }{}% } -%% ))) +% ))) \doclicense@set% % \end{macrocode} diff --git a/macros/latex/contrib/doclicense/doclicense.ins b/macros/latex/contrib/doclicense/doclicense.ins index 8e98df8fab..2b5f1ef966 100644 --- a/macros/latex/contrib/doclicense/doclicense.ins +++ b/macros/latex/contrib/doclicense/doclicense.ins @@ -1,4 +1,10 @@ -%% See file 'doclicense.dtx' for copyright and license. +% SPDX-FileCopyrightText: 2015 Robin Schneider <ypid@riseup.net> +% +% SPDX-License-Identifier: LPPL-1.3c +% +% This work consists of all files listed in manifest.txt. +% For more details about the licensing, refer to the README.md file. + \input docstrip.tex \keepsilent diff --git a/macros/latex/contrib/doclicense/doclicense.pdf b/macros/latex/contrib/doclicense/doclicense.pdf Binary files differindex 0ae88d6b61..03d059eacf 100644 --- a/macros/latex/contrib/doclicense/doclicense.pdf +++ b/macros/latex/contrib/doclicense/doclicense.pdf diff --git a/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-3.0-latex.html b/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-3.0-latex.html new file mode 100644 index 0000000000..44f1c24340 --- /dev/null +++ b/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-3.0-latex.html @@ -0,0 +1,421 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta name="generator" content="HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" /> +<title>Creative Commons Legal Code</title> +<meta http-equiv="content-type" content="text/html; charset=utf-8" /> +<link rel="stylesheet" type="text/css" href="https://creativecommons.org/includes/deed3.css" media="screen" /> +<link rel="stylesheet" type="text/css" href="https://creativecommons.org/includes/deed3-print.css" media="print" /> +<!--[if lt IE 7]><link rel="stylesheet" type="text/css" href="https://creativecommons.org/includes/deed3-ie.css" media="screen" /><![endif]--> +<script type="text/javascript" src="https://creativecommons.org/includes/errata.js"> +</script> +</head> +<body> +<p align="center" id="header"><a href="https://creativecommons.org/">Creative Commons</a></p> +<div id="deed" class="green"> +<div id="deed-head"> +<div id="cc-logo"> +<img src="https://creativecommons.org/images/deed/cc-logo.jpg" alt="" /> +</div> +<h1><span>Creative Commons Legal Code</span></h1> +<div id="deed-license"> +<h2>Attribution 3.0 Unported</h2> +</div> +</div> +<div id="deed-main"> +<div id="deed-main-content"> +<img src="https://creativecommons.org/images/international/unported.png" alt="" /> +<blockquote> +CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES +NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE +DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE +COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. +CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE +INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES +RESULTING FROM ITS USE. +</blockquote> +<h3><em>License</em></h3> +<p>THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS +OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR +"LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER +APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS +AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS +PROHIBITED.</p> +<p>BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU +ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. +TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A +CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE +IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND +CONDITIONS.</p> +<p><strong>1. Definitions</strong></p> +<ol type="a"> +<li><strong>"Adaptation"</strong> means a work based upon +the Work, or upon the Work and other pre-existing works, +such as a translation, adaptation, derivative work, +arrangement of music or other alterations of a literary +or artistic work, or phonogram or performance and +includes cinematographic adaptations or any other form in +which the Work may be recast, transformed, or adapted +including in any form recognizably derived from the +original, except that a work that constitutes a +Collection will not be considered an Adaptation for the +purpose of this License. For the avoidance of doubt, +where the Work is a musical work, performance or +phonogram, the synchronization of the Work in +timed-relation with a moving image ("synching") will be +considered an Adaptation for the purpose of this +License.</li> +<li><strong>"Collection"</strong> means a collection of +literary or artistic works, such as encyclopedias and +anthologies, or performances, phonograms or broadcasts, +or other works or subject matter other than works listed +in Section 1(f) below, which, by reason of the selection +and arrangement of their contents, constitute +intellectual creations, in which the Work is included in +its entirety in unmodified form along with one or more +other contributions, each constituting separate and +independent works in themselves, which together are +assembled into a collective whole. A work that +constitutes a Collection will not be considered an +Adaptation (as defined above) for the purposes of this +License.</li> +<li><strong>"Distribute"</strong> means to make available +to the public the original and copies of the Work or +Adaptation, as appropriate, through sale or other +transfer of ownership.</li> +<li><strong>"Licensor"</strong> means the individual, +individuals, entity or entities that offer(s) the Work +under the terms of this License.</li> +<li><strong>"Original Author"</strong> means, in the case +of a literary or artistic work, the individual, +individuals, entity or entities who created the Work or +if no individual or entity can be identified, the +publisher; and in addition (i) in the case of a +performance the actors, singers, musicians, dancers, and +other persons who act, sing, deliver, declaim, play in, +interpret or otherwise perform literary or artistic works +or expressions of folklore; (ii) in the case of a +phonogram the producer being the person or legal entity +who first fixes the sounds of a performance or other +sounds; and, (iii) in the case of broadcasts, the +organization that transmits the broadcast.</li> +<li><strong>"Work"</strong> means the literary and/or +artistic work offered under the terms of this License +including without limitation any production in the +literary, scientific and artistic domain, whatever may be +the mode or form of its expression including digital +form, such as a book, pamphlet and other writing; a +lecture, address, sermon or other work of the same +nature; a dramatic or dramatico-musical work; a +choreographic work or entertainment in dumb show; a +musical composition with or without words; a +cinematographic work to which are assimilated works +expressed by a process analogous to cinematography; a +work of drawing, painting, architecture, sculpture, +engraving or lithography; a photographic work to which +are assimilated works expressed by a process analogous to +photography; a work of applied art; an illustration, map, +plan, sketch or three-dimensional work relative to +geography, topography, architecture or science; a +performance; a broadcast; a phonogram; a compilation of +data to the extent it is protected as a copyrightable +work; or a work performed by a variety or circus +performer to the extent it is not otherwise considered a +literary or artistic work.</li> +<li><strong>"You"</strong> means an individual or entity +exercising rights under this License who has not +previously violated the terms of this License with +respect to the Work, or who has received express +permission from the Licensor to exercise rights under +this License despite a previous violation.</li> +<li><strong>"Publicly Perform"</strong> means to perform +public recitations of the Work and to communicate to the +public those public recitations, by any means or process, +including by wire or wireless means or public digital +performances; to make available to the public Works in +such a way that members of the public may access these +Works from a place and at a place individually chosen by +them; to perform the Work to the public by any means or +process and the communication to the public of the +performances of the Work, including by public digital +performance; to broadcast and rebroadcast the Work by any +means including signs, sounds or images.</li> +<li><strong>"Reproduce"</strong> means to make copies of +the Work by any means including without limitation by +sound or visual recordings and the right of fixation and +reproducing fixations of the Work, including storage of a +protected performance or phonogram in digital form or +other electronic medium.</li> +</ol> +<p><strong>2. Fair Dealing Rights.</strong> Nothing in this +License is intended to reduce, limit, or restrict any uses +free from copyright or rights arising from limitations or +exceptions that are provided for in connection with the +copyright protection under copyright law or other +applicable laws.</p> +<p><strong>3. License Grant.</strong> Subject to the terms +and conditions of this License, Licensor hereby grants You +a worldwide, royalty-free, non-exclusive, perpetual (for +the duration of the applicable copyright) license to +exercise the rights in the Work as stated below:</p> +<ol type="a"> +<li>to Reproduce the Work, to incorporate the Work into +one or more Collections, and to Reproduce the Work as +incorporated in the Collections;</li> +<li>to create and Reproduce Adaptations provided that any +such Adaptation, including any translation in any medium, +takes reasonable steps to clearly label, demarcate or +otherwise identify that changes were made to the original +Work. For example, a translation could be marked "The +original work was translated from English to Spanish," or +a modification could indicate "The original work has been +modified.";</li> +<li>to Distribute and Publicly Perform the Work including +as incorporated in Collections; and,</li> +<li>to Distribute and Publicly Perform Adaptations.</li> +<li> +<p>For the avoidance of doubt:</p> +<ol type="i"> +<li><strong>Non-waivable Compulsory License +Schemes</strong>. In those jurisdictions in which the +right to collect royalties through any statutory or +compulsory licensing scheme cannot be waived, the +Licensor reserves the exclusive right to collect such +royalties for any exercise by You of the rights +granted under this License;</li> +<li><strong>Waivable Compulsory License +Schemes</strong>. In those jurisdictions in which the +right to collect royalties through any statutory or +compulsory licensing scheme can be waived, the +Licensor waives the exclusive right to collect such +royalties for any exercise by You of the rights +granted under this License; and,</li> +<li><strong>Voluntary License Schemes</strong>. The +Licensor waives the right to collect royalties, +whether individually or, in the event that the +Licensor is a member of a collecting society that +administers voluntary licensing schemes, via that +society, from any exercise by You of the rights +granted under this License.</li> +</ol> +</li> +</ol> +<p>The above rights may be exercised in all media and +formats whether now known or hereafter devised. The above +rights include the right to make such modifications as are +technically necessary to exercise the rights in other media +and formats. Subject to Section 8(f), all rights not +expressly granted by Licensor are hereby reserved.</p> +<p><strong>4. Restrictions.</strong> The license granted in +Section 3 above is expressly made subject to and limited by +the following restrictions:</p> +<ol type="a"> +<li>You may Distribute or Publicly Perform the Work only +under the terms of this License. You must include a copy +of, or the Uniform Resource Identifier (URI) for, this +License with every copy of the Work You Distribute or +Publicly Perform. You may not offer or impose any terms +on the Work that restrict the terms of this License or +the ability of the recipient of the Work to exercise the +rights granted to that recipient under the terms of the +License. You may not sublicense the Work. You must keep +intact all notices that refer to this License and to the +disclaimer of warranties with every copy of the Work You +Distribute or Publicly Perform. When You Distribute or +Publicly Perform the Work, You may not impose any +effective technological measures on the Work that +restrict the ability of a recipient of the Work from You +to exercise the rights granted to that recipient under +the terms of the License. This Section 4(a) applies to +the Work as incorporated in a Collection, but this does +not require the Collection apart from the Work itself to +be made subject to the terms of this License. If You +create a Collection, upon notice from any Licensor You +must, to the extent practicable, remove from the +Collection any credit as required by Section 4(b), as +requested. If You create an Adaptation, upon notice from +any Licensor You must, to the extent practicable, remove +from the Adaptation any credit as required by Section +4(b), as requested.</li> +<li>If You Distribute, or Publicly Perform the Work or +any Adaptations or Collections, You must, unless a +request has been made pursuant to Section 4(a), keep +intact all copyright notices for the Work and provide, +reasonable to the medium or means You are utilizing: (i) +the name of the Original Author (or pseudonym, if +applicable) if supplied, and/or if the Original Author +and/or Licensor designate another party or parties (e.g., +a sponsor institute, publishing entity, journal) for +attribution ("Attribution Parties") in Licensor's +copyright notice, terms of service or by other reasonable +means, the name of such party or parties; (ii) the title +of the Work if supplied; (iii) to the extent reasonably +practicable, the URI, if any, that Licensor specifies to +be associated with the Work, unless such URI does not +refer to the copyright notice or licensing information +for the Work; and (iv) , consistent with Section 3(b), in +the case of an Adaptation, a credit identifying the use +of the Work in the Adaptation (e.g., "French translation +of the Work by Original Author," or "Screenplay based on +original Work by Original Author"). The credit required +by this Section 4 (b) may be implemented in any +reasonable manner; provided, however, that in the case of +a Adaptation or Collection, at a minimum such credit will +appear, if a credit for all contributing authors of the +Adaptation or Collection appears, then as part of these +credits and in a manner at least as prominent as the +credits for the other contributing authors. For the +avoidance of doubt, You may only use the credit required +by this Section for the purpose of attribution in the +manner set out above and, by exercising Your rights under +this License, You may not implicitly or explicitly assert +or imply any connection with, sponsorship or endorsement +by the Original Author, Licensor and/or Attribution +Parties, as appropriate, of You or Your use of the Work, +without the separate, express prior written permission of +the Original Author, Licensor and/or Attribution +Parties.</li> +<li>Except as otherwise agreed in writing by the Licensor +or as may be otherwise permitted by applicable law, if +You Reproduce, Distribute or Publicly Perform the Work +either by itself or as part of any Adaptations or +Collections, You must not distort, mutilate, modify or +take other derogatory action in relation to the Work +which would be prejudicial to the Original Author's honor +or reputation. Licensor agrees that in those +jurisdictions (e.g. Japan), in which any exercise of the +right granted in Section 3(b) of this License (the right +to make Adaptations) would be deemed to be a distortion, +mutilation, modification or other derogatory action +prejudicial to the Original Author's honor and +reputation, the Licensor will waive or not assert, as +appropriate, this Section, to the fullest extent +permitted by the applicable national law, to enable You +to reasonably exercise Your right under Section 3(b) of +this License (right to make Adaptations) but not +otherwise.</li> +</ol> +<p><strong>5. Representations, Warranties and +Disclaimer</strong></p> +<p>UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN +WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO +REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE +WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, +WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, +FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE +ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE +PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. +SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED +WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.</p> +<p><strong>6. Limitation on Liability.</strong> EXCEPT TO +THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL +LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY +SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY +DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, +EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES.</p> +<p><strong>7. Termination</strong></p> +<ol type="a"> +<li>This License and the rights granted hereunder will +terminate automatically upon any breach by You of the +terms of this License. Individuals or entities who have +received Adaptations or Collections from You under this +License, however, will not have their licenses terminated +provided such individuals or entities remain in full +compliance with those licenses. Sections 1, 2, 5, 6, 7, +and 8 will survive any termination of this License.</li> +<li>Subject to the above terms and conditions, the +license granted here is perpetual (for the duration of +the applicable copyright in the Work). Notwithstanding +the above, Licensor reserves the right to release the +Work under different license terms or to stop +distributing the Work at any time; provided, however that +any such election will not serve to withdraw this License +(or any other license that has been, or is required to +be, granted under the terms of this License), and this +License will continue in full force and effect unless +terminated as stated above.</li> +</ol> +<p><strong>8. Miscellaneous</strong></p> +<ol type="a"> +<li>Each time You Distribute or Publicly Perform the Work +or a Collection, the Licensor offers to the recipient a +license to the Work on the same terms and conditions as +the license granted to You under this License.</li> +<li>Each time You Distribute or Publicly Perform an +Adaptation, Licensor offers to the recipient a license to +the original Work on the same terms and conditions as the +license granted to You under this License.</li> +<li>If any provision of this License is invalid or +unenforceable under applicable law, it shall not affect +the validity or enforceability of the remainder of the +terms of this License, and without further action by the +parties to this agreement, such provision shall be +reformed to the minimum extent necessary to make such +provision valid and enforceable.</li> +<li>No term or provision of this License shall be deemed +waived and no breach consented to unless such waiver or +consent shall be in writing and signed by the party to be +charged with such waiver or consent.</li> +<li>This License constitutes the entire agreement between +the parties with respect to the Work licensed here. There +are no understandings, agreements or representations with +respect to the Work not specified here. Licensor shall +not be bound by any additional provisions that may appear +in any communication from You. This License may not be +modified without the mutual written agreement of the +Licensor and You.</li> +<li>The rights granted under, and the subject matter +referenced, in this License were drafted utilizing the +terminology of the Berne Convention for the Protection of +Literary and Artistic Works (as amended on September 28, +1979), the Rome Convention of 1961, the WIPO Copyright +Treaty of 1996, the WIPO Performances and Phonograms +Treaty of 1996 and the Universal Copyright Convention (as +revised on July 24, 1971). These rights and subject +matter take effect in the relevant jurisdiction in which +the License terms are sought to be enforced according to +the corresponding provisions of the implementation of +those treaty provisions in the applicable national law. +If the standard suite of rights granted under applicable +copyright law includes additional rights not granted +under this License, such additional rights are deemed to +be included in the License; this License is not intended +to restrict the license of any rights under applicable +law.</li> +</ol> + +<blockquote> +<h3>Creative Commons Notice</h3> +<p>Creative Commons is not a party to this License, and +makes no warranty whatsoever in connection with the Work. +Creative Commons will not be liable to You or any party +on any legal theory for any damages whatsoever, including +without limitation any general, special, incidental or +consequential damages arising in connection to this +license. Notwithstanding the foregoing two (2) sentences, +if Creative Commons has expressly identified itself as +the Licensor hereunder, it shall have all rights and +obligations of Licensor.</p> +<p>Except for the limited purpose of indicating to the +public that the Work is licensed under the CCPL, Creative +Commons does not authorize the use by either party of the +trademark "Creative Commons" or any related trademark or +logo of Creative Commons without the prior written +consent of Creative Commons. Any permitted use will be in +compliance with Creative Commons' then-current trademark +usage guidelines, as may be published on its website or +otherwise made available upon request from time to time. +For the avoidance of doubt, this trademark restriction +does not form part of this License.</p> +<p>Creative Commons may be contacted at <a href="https://creativecommons.org/">https://creativecommons.org/</a>.</p> +</blockquote> +</div> +</div> +<div id="deed-foot"> +<p id="footer"><a href="./">« Back to Commons Deed</a></p> +</div> +</div> +</body> +</html> diff --git a/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-4.0-latex.html b/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-4.0-latex.html new file mode 100644 index 0000000000..9a693a62bb --- /dev/null +++ b/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-4.0-latex.html @@ -0,0 +1,397 @@ +<!DOCTYPE html> +<html> +<head> +<title>Creative Commons — Attribution 4.0 International — CC BY 4.0</title> +<meta charset="UTF-8"> +<script type="text/javascript" src="//creativecommons.org/includes/errata.js"></script> + +<meta name="viewport" content="width=device-width, initial-scale=1"> +<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700" rel="stylesheet"> +<link rel='stylesheet' id='cc-fontello-css' href="https://creativecommons.org/wp-content/themes/cc/fonts/fontello/css/cc-fontello.css" type='text/css' media='all' /> +<link rel='stylesheet' id='parent-style-css' href="https://creativecommons.org/wp-content/themes/twentysixteen/style.css" type='text/css' media='all' /> +<link rel='stylesheet' id='cc-style-css' href="https://creativecommons.org/wp-content/themes/cc/css/app.css" type='text/css' media='all' /> +<link rel="stylesheet" type="text/css" href="/includes/legalcode.css" media="screen" /> +<link rel="stylesheet" type="text/css" href="/includes/legalcode-print.css" media="print" /> +<script src="https://code.jquery.com/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=" crossorigin="anonymous"></script> + +</head> +<body class="lang-en"> + +<div class="site-header-wrapper"> +<header id="masthead" class="site-header sticky-nav-main sticky attached" role="banner"> +<div class="site-header-main"> +<div class="site-branding"> +<a class="cc-site-logo-link" href="https://creativecommons.org/" rel="home"> +<img class="cc-site-logo" src="https://creativecommons.org/wp-content/themes/cc/images/cc.logo.white.svg" height="72" width="303"> +</a> +</div> +<button id="menu-toggle" class="menu-toggle"><i class="cc-icon-menu"></i> <span>Menu</span></button> +<div id="site-header-menu" class="site-header-menu"> +<nav id="mobile-navigation" class="mobile-navigation" role="navigation" aria-label="Mobile Menu"> +<div class="menu-mobile-menu-container"><ul id="menu-mobile-menu" class="mobile-menu"> +<li id="menu-item-48798" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48798"><a href="https://creativecommons.org/share-your-work/">Share your work</a></li> +<li id="menu-item-48799" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48799"><a href="https://creativecommons.org/use-remix/">Use & remix</a></li> +<li id="menu-item-48800" class="menu-item menu-item-type-post_type menu-item-object-page page_item page-item-7466 menu-item-48800"><a href="https://creativecommons.org/about/">What we do</a></li> +<li id="menu-item-48801" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48801"><a href="https://creativecommons.org/blog/">Blog</a></li> +<li id="menu-item-48802" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48802"><a href="https://creativecommons.org/about/global-affiliate-network/">Global Affiliate Network</a></li> +<li id="menu-item-48803" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48803"><a href="https://creativecommons.org/use-remix/search-the-commons/">Search the Commons</a></li> +</ul></div> +</nav> +<nav id="site-navigation" class="main-navigation" role="navigation" aria-label="Primary Menu"> +<div class="menu-primary-menu-container"><ul id="menu-primary-menu" class="primary-menu"> +<li id="menu-item-48791" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48791"><a href="https://creativecommons.org/share-your-work/">Share your work</a></li> +<li id="menu-item-48792" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48792"><a href="https://creativecommons.org/use-remix/">Use & remix</a></li> +<li id="menu-item-48570" class="menu-item menu-item-type-post_type menu-item-object-page page_item page-item-7466 menu-item-48570"><a href="https://creativecommons.org/about/">What we do</a></li> +<li id="menu-item-48793" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48793"><a href="https://creativecommons.org/blog/">Blog</a></li> +</ul></div> +</nav> +<nav id="secondary-navigation" class="secondary-navigation" role="navigation" aria-label="Secondary Menu"> +<div class="menu-secondary-menu-container"><ul id="menu-secondary-menu" class="secondary-menu"><li id="menu-item-48804" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48804"><a href="https://creativecommons.org/about/global-affiliate-network/">Global Affiliate Network</a></li> +<li id="menu-item-48805" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48805"><a href="https://creativecommons.org/use-remix/search-the-commons/">Search the Commons</a></li> +<li id="menu-item-48806" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48806"><a href="https://creativecommons.org/about/contact/">Contact</a></li> +</ul></div> +</nav> +<nav id="social-navigation" class="social-navigation" role="navigation" aria-label="Social Links Menu"> +<div class="menu-social-links-container"><ul id="menu-social-links" class="social-links-menu"> +<li id="menu-item-48807" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48807"><a href="https://www.facebook.com/creativecommons"><span class="screen-reader-text">Facebook</span></a></li> +<li id="menu-item-48808" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48808"><a href="https://twitter.com/creativecommons"><span class="screen-reader-text">Twitter</span></a></li> +<li id="menu-item-48809" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48809"><a href="mailto:info@creativecommons.org"><span class="screen-reader-text">Mail</span></a></li> +</ul></div> +</nav> +</div> +</div> +</header> +<header class="site-header spacer" role="banner"> +<div class="site-header-main"> +<div class="site-branding"> +<a class="cc-site-logo-link" href="https://creativecommons.org/" rel="home"> +<img class="cc-site-logo" src="https://creativecommons.org/wp-content/themes/cc/images/cc.logo.white.svg" height="72" width="303"> +</a> +</div> +<button id="menu-toggle" class="menu-toggle"><i class="cc-icon-menu"></i> <span>Menu</span></button> +<div id="site-header-menu" class="site-header-menu"> +<nav id="mobile-navigation" class="mobile-navigation" role="navigation" aria-label="Mobile Menu"> +<div class="menu-mobile-menu-container"><ul id="menu-mobile-menu" class="mobile-menu"> +<li id="menu-item-48798" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48798"><a href="https://creativecommons.org/share-your-work/">Share your work</a></li> +<li id="menu-item-48799" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48799"><a href="https://creativecommons.org/use-remix/">Use & remix</a></li> +<li id="menu-item-48800" class="menu-item menu-item-type-post_type menu-item-object-page page_item page-item-7466 menu-item-48800"><a href="https://creativecommons.org/about/">What we do</a></li> +<li id="menu-item-48801" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48801"><a href="https://creativecommons.org/blog/">Blog</a></li> +<li id="menu-item-48802" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48802"><a href="https://creativecommons.org/about/global-affiliate-network/">Global Affiliate Network</a></li> +<li id="menu-item-48803" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48803"><a href="https://creativecommons.org/use-remix/search-the-commons/">Search the Commons</a></li> + </ul></div> +</nav> +<nav id="site-navigation" class="main-navigation" role="navigation" aria-label="Primary Menu"> +<div class="menu-primary-menu-container"><ul id="menu-primary-menu" class="primary-menu"> +<li id="menu-item-48791" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48791"><a href="https://creativecommons.org/share-your-work/">Share your work</a></li> +<li id="menu-item-48792" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48792"><a href="https://creativecommons.org/use-remix/">Use & remix</a></li> +<li id="menu-item-48570" class="menu-item menu-item-type-post_type menu-item-object-page page_item page-item-7466 menu-item-48570"><a href="https://creativecommons.org/about/">What we do</a></li> +<li id="menu-item-48793" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48793"><a href="https://creativecommons.org/blog/">Blog</a></li> +</ul></div> +</nav> +<nav id="secondary-navigation" class="secondary-navigation" role="navigation" aria-label="Secondary Menu"> +<div class="menu-secondary-menu-container"><ul id="menu-secondary-menu" class="secondary-menu"><li id="menu-item-48804" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48804"><a href="https://creativecommons.org/about/global-affiliate-network/">Global Affiliate Network</a></li> +<li id="menu-item-48805" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48805"><a href="https://creativecommons.org/use-remix/search-the-commons/">Search the Commons</a></li> +<li id="menu-item-48806" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48806"><a href="https://creativecommons.org/about/contact/">Contact</a></li> +</ul></div> +</nav> +<nav id="social-navigation" class="social-navigation" role="navigation" aria-label="Social Links Menu"> +<div class="menu-social-links-container"><ul id="menu-social-links" class="social-links-menu"> +<li id="menu-item-48807" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48807"><a href="https://www.facebook.com/creativecommons"><span class="screen-reader-text">Facebook</span></a></li> +<li id="menu-item-48808" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48808"><a href="https://twitter.com/creativecommons"><span class="screen-reader-text">Twitter</span></a></li> +<li id="menu-item-48809" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48809"><a href="mailto:info@creativecommons.org"><span class="screen-reader-text">Mail</span></a></li> +</ul></div> +</nav> +</div> +</div> +</header> +</div> +<aside id="header-below" class="widget-area"> +<section id="text-15" class="widget-1 widget-first widget-last widget-odd widget widget_text"> +<div class="textwidget"> +<div id="donation-bar-wrapper" class="donation-bar-wrapper"> +<div id="donation-bar-inner" class="donation-bar-inner"> +<p class="donate-text">Help us build a vibrant, collaborative global commons</p> +<div class="donate-action"><a href="/donate?utm_campaign=2018fund&utm_source=license_header2018" class="button donate arrow">Donate<span class="hide-on-mobile"> Now</span></a></div> +</div> +</div> +</div> +</section> +</aside> + + +<div id="language-selector-block" class="container"> +<div class="language-selector-inner"> +This page is available in the following languages: +<img class="language-icon" src="/images/language_icon_x2.png" alt="Languages"> +<select> +<option value="legalcode.ar">العربية</option> +<option value="legalcode.cs">ÄeÅ¡tina</option> +<option value="legalcode.de">Deutsch</option> +<option value="legalcode.el">Ελληνικά</option> +<option value="legalcode" selected="selected">English</option> +<option value="legalcode.es">Español</option> +<option value="legalcode.eu">euskara</option> +<option value="legalcode.fi">suomeksi</option> +<option value="legalcode.fr">français</option> +<option value="legalcode.hr">hrvatski</option> +<option value="legalcode.id">Bahasa Indonesia</option> +<option value="legalcode.it">italiano</option> +<option value="legalcode.ja">日本語</option> +<option value="legalcode.ko">í•œêµì–´</option> +<option value="legalcode.lt">Lietuvių</option> +<option value="legalcode.lv">latviski</option> +<option value="legalcode.mi">te reo MÄori</option> +<option value="legalcode.nl">Nederlands</option> +<option value="legalcode.no">norsk</option> +<option value="legalcode.pl">polski</option> +<option value="legalcode.pt">português</option> +<option value="legalcode.ro">română</option> +<option value="legalcode.ru">руÑÑкий</option> +<option value="legalcode.sl">SlovenÅ¡Äina</option> +<option value="legalcode.sv">svenska</option> +<option value="legalcode.tr">Türkçe</option> +<option value="legalcode.uk">українÑька</option> +<option value="legalcode.zh-Hans">ä¸æ–‡</option> +<option value="legalcode.zh-Hant">è¯èªž</option> +</select> +</div> +</div> + + +<div id="deed" class="green"> +<div id="deed-head"> +<div id="cc-logo"><span class="cc-icon-logo"><img src="/images/deed/svg/cc_white.svg" alt="CC" /></span><span class="cc-icon-by"><img src="/images/deed/svg/attribution_icon_white.svg" alt="Attribution" /></span></div> +<h1><span>Creative Commons Legal Code</span></h1> +<div id="deed-license"> +<h2>Attribution 4.0 International</h2> +</div> +</div> +<div id="deed-main"> +<div id="deed-main-content"> +<div id="deed-disclaimer"> +<div class="summary"> +Official translations of this license are available <a href="#languages">in other languages</a>. +</div> +</div> +<div class="shaded"> +<p>Creative Commons Corporation (“Creative Commonsâ€) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is†basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible.</p> +</div> +<div class="shaded"> +<p><strong>Using Creative Commons Public Licenses</strong></p> +<p>Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses.</p> +<p class="usage-considerations"><strong>Considerations for licensors:</strong> Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. <a href="//wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensors">More considerations for licensors.</a></p> +<p class="usage-considerations"><strong>Considerations for the public:</strong> By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensor’s permission is not necessary for any reason–for example, because of any applicable exception or limitation to copyright–then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to respect those requests where reasonable. +<a href="//wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensees">More considerations for the public.</a></p> +</div> +<h3>Creative Commons Attribution 4.0 International Public License</h3> +<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p> +<p id="s1"><strong>Section 1 – Definitions.</strong></p> +<ol type="a"> +<li id="s1a"><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li> +<li id="s1b"><strong>Adapter's License</strong> means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.</li> +<li id="s1c"><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section <a href="#s2b">2(b)(1)-(2)</a> are not Copyright and Similar Rights.</li> +<li id="s1d"><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may not +be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar +international agreements.</li> +<li id="s1e"><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li> +<li id="s1f"><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li> +<li id="s1g"><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li> +<li id="s1h"><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li> +<li id="s1i"><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li> +<li id="s1j"><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li> +<li id="s1k"><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li> +</ol> +<p id="s2"><strong>Section 2 – Scope.</strong></p> +<ol type="a"> +<li id="s2a"><strong>License grant</strong>. +<ol> +<li id="s2a1">Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to: +<ol type="A"> +<li id="s2a1A">reproduce and Share the Licensed Material, in whole or in part; and</li> +<li id="s2a1B">produce, reproduce, and Share Adapted Material.</li> +</ol> +<li id="s2a2"><span style="text-decoration: underline;">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li> +<li id="s2a3"><span style="text-decoration: underline;">Term</span>. The term of this Public License is specified in Section <a href="#s6a">6(a)</a>.</li> +<li id="s2a4"><span style="text-decoration: underline;">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section <a href="#s2a4">2(a)(4)</a> never produces Adapted Material.</li> +<li id="s2a5"><span style="text-decoration: underline;">Downstream recipients</span>. +<div class="para"> +<ol type="A"> +<li id="s2a5A"><span style="text-decoration: underline;">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li> +<li id="s2a5B"><span style="text-decoration: underline;">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li> +</ol> +</div> +<li id="s2a6"><span style="text-decoration: underline;">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section <a href="#s3a1Ai">3(a)(1)(A)(i)</a>.</li> +</ol> +<li id="s2b"><p><strong>Other rights</strong>.</p> +<ol> +<li id="s2b1">Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li> +<li id="s2b2">Patent and trademark rights are not licensed under this Public License.</li> +<li id="s2b3">To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.</li> +</ol> +</li> +</ol> +<p id="s3"><strong>Section 3 – License Conditions.</strong></p> +<p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p> +<ol type="a"> +<li id="s3a"><p><strong>Attribution</strong>.</p> +<ol> +<li id="s3a1"><p>If You Share the Licensed Material (including in modified form), You must:</p> +<ol type="A"> +<li id="s3a1A">retain the following if it is supplied by the Licensor with the Licensed Material: +<ol type="i"> +<li id="s3a1Ai">identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li> +<li id="s3a1Aii">a copyright notice;</li> +<li id="s3a1Aiii">a notice that refers to this Public License; </li> +<li id="s3a1Aiv">a notice that refers to the disclaimer of warranties;</li> +<li id="s3a1Av">a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li> +</ol> +<li id="s3a1B">indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li> +<li id="s3a1C">indicate the Licensed Material is licensed under this Public License, +and include the text of, or the URI or hyperlink to, this Public +License.</li> +</ol> +</li> +<li id="s3a2">You may satisfy the conditions in Section <a href="#s3a1">3(a)(1)</a> in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li> +<li id="s3a3">If requested by the Licensor, You must remove any of the information required by Section <a href="#s3a1A">3(a)(1)(A)</a> to the extent reasonably practicable.</li> + <li id="s3a4">If You Share Adapted Material You produce, the Adapter's License You apply must not prevent recipients of the Adapted Material from complying with this Public License.</li> +</ol> +</li> +</ol> +<p id="s4"><strong>Section 4 – Sui Generis Database Rights.</strong></p> +<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p> +<ol type="a"> +<li id="s4a">for the avoidance of doubt, Section <a href="#s2a1">2(a)(1)</a> grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database;</li> +<li id="s4b">if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and</li> +<li id="s4c">You must comply with the conditions in Section <a href="#s3a">3(a)</a> if You Share all or a substantial portion of the contents of the database.</li> +</ol> +For the avoidance of doubt, this Section <a href="#s4">4</a> supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights. +<p id="s5"><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p> +<ol style="font-weight: bold;" type="a"> +<li id="s5a"><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li> +<li id="s5b"><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li> +</ol> +<ol start="3" type="a"> +<li id="s5c">The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li> +</ol> +<p id="s6"><strong>Section 6 – Term and Termination.</strong></p> +<ol type="a"> +<li id="s6a">This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li> +<li id="s6b"> +<p>Where Your right to use the Licensed Material has terminated under Section <a href="#s6a">6(a)</a>, it reinstates:</p> +<ol> +<li id="s6b1">automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li> +<li id="s6b2">upon express reinstatement by the Licensor.</li> +</ol> +For the avoidance of doubt, this Section <a href="#s6b">6(b)</a> does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.</li> +<li id="s6c">For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li> +<li id="s6d">Sections <a href="#s1">1</a>, <a href="#s5">5</a>, <a href="#s6">6</a>, <a href="#s7">7</a>, and <a href="#s8">8</a> survive termination of this Public License.</li> +</ol> +<p id="s7"><strong>Section 7 – Other Terms and Conditions.</strong></p> +<ol type="a"> +<li id="s7a">The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li> +<li id="s7b">Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li> +</ol> +<p id="s8"><strong>Section 8 – Interpretation.</strong></p> +<ol type="a"> +<li id="s8a">For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li> +<li id="s8b">To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li> +<li id="s8c">No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li> +<li id="s8d">Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li> +</ol> + +<p class="shaded">Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.†The text of the Creative Commons public licenses is dedicated to the public domain under the <a href="//creativecommons.org/publicdomain/zero/1.0/legalcode">CC0 Public Domain Dedication</a>. Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at <a href="//creativecommons.org/policies">creativecommons.org/policies</a>, Creative Commons does not authorize the use of the trademark “Creative Commons†or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses.<br><br> +Creative Commons may be contacted at <a href="//creativecommons.org/">creativecommons.org</a>.</p> +<p class="shaded"><a id="languages"></a>Additional languages available: + +<a href="/licenses/by/4.0/legalcode.ar">العربية</a>, +<a href="/licenses/by/4.0/legalcode.cs">ÄeÅ¡tina</a>, +<a href="/licenses/by/4.0/legalcode.de">Deutsch</a>, +<a href="/licenses/by/4.0/legalcode.el">Ελληνικά</a>, +<a href="/licenses/by/4.0/legalcode.es">Español</a>, +<a href="/licenses/by/4.0/legalcode.eu">euskara</a>, +<a href="/licenses/by/4.0/legalcode.fi">suomeksi</a>, +<a href="/licenses/by/4.0/legalcode.fr">français</a>, +<a href="/licenses/by/4.0/legalcode.hr">hrvatski</a>, +<a href="/licenses/by/4.0/legalcode.id">Bahasa Indonesia</a>, +<a href="/licenses/by/4.0/legalcode.it">italiano</a>, +<a href="/licenses/by/4.0/legalcode.ja">日本語</a>, +<a href="/licenses/by/4.0/legalcode.ko">í•œêµì–´</a>, +<a href="/licenses/by/4.0/legalcode.lt">Lietuvių</a>, +<a href="/licenses/by/4.0/legalcode.lv">latviski</a>, +<a href="/licenses/by/4.0/legalcode.mi">te reo MÄori</a>, +<a href="/licenses/by/4.0/legalcode.nl">Nederlands</a>, +<a href="/licenses/by/4.0/legalcode.no">norsk</a>, +<a href="/licenses/by/4.0/legalcode.pl">polski</a>, +<a href="/licenses/by/4.0/legalcode.pt">português</a>, +<a href="/licenses/by/4.0/legalcode.ro">română</a>, +<a href="/licenses/by/4.0/legalcode.ru">руÑÑкий</a>, +<a href="/licenses/by/4.0/legalcode.sl">SlovenÅ¡Äina</a>, +<a href="/licenses/by/4.0/legalcode.sv">svenska</a>, +<a href="/licenses/by/4.0/legalcode.tr">Türkçe</a>, +<a href="/licenses/by/4.0/legalcode.uk">українÑька</a>, +<a href="/licenses/by/4.0/legalcode.zh-Hans">ä¸æ–‡</a>, +<a href="/licenses/by/4.0/legalcode.zh-Hant">è¯èªž</a>. + +Please read the <a href="/faq/#officialtranslations">FAQ</a> for more information about official translations. </p> +</div> +</div> +<div id="deed-foot"> +<p id="footer"><a href="./">« Back to Commons Deed</a></p> +</div> +</div> + +<div class="site-footer-wrapper"> +<footer id="colophon" class="site-footer sticky-nav-main" role="contentinfo"> +<div class="cc-footer"> +<div class="column cc-footer-main"> +<div class="cc-footer-logo"> +<a href="https://creativecommons.org/" class="custom-logo-link" rel="home" itemprop="url"><img src="https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_.png" class="custom-logo" alt="cc.logo.white" itemprop="logo" srcset="https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_.png 980w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-300x73.png 300w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-768x188.png 768w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-140x34.png 140w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-50x12.png 50w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-270x66.png 270w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-245x60.png 245w" sizes="(max-width: 709px) 85vw, (max-width: 909px) 67vw, (max-width: 1362px) 62vw, 840px" height="240" width="980"></a> +</div> +<div class="cc-footer-links"> +<div class="menu-footer-links-container"> +<ul id="menu-footer-links" class="menu"> +<li id="menu-item-48794" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48794"><a href="https://creativecommons.org/about/contact/">Contact</a></li> +<li id="menu-item-48795" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48795"><a href="https://creativecommons.org/privacy/">Privacy</a></li> +<li id="menu-item-48796" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48796"><a href="https://creativecommons.org/policies/">Policies</a></li> +<li id="menu-item-48797" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48797"><a href="https://creativecommons.org/terms/">Terms</a></li> +</ul> +</div> +</div> +</div> +<div class="column cc-footer-contact"> +<h6><a href="https://creativecommons.org/about/contact">We'd love to hear from you!</a></h6> +<address> +Creative Commons<br> +PO Box 1866, Mountain View, CA 94042 +</address> +<ul> +<li><a href="mailto:info@creativecommons.org" class="mail">info@creativecommons.org</a></li> +<li><a href="https://creativecommons.org/faq">Frequently Asked Questions</a></li> +</ul> +</div> +<div class="column cc-footer-license"> +<div class="license-icons"> +<a rel="license" href="https://creativecommons.org/licenses/by/4.0/" title="Creative Commons Attribution 4.0 International license"> +<i class="cc-icon-cc"></i> +<i class="cc-icon-cc-by"></i> +</a> +</div> +<aside> +<div xmlns:cc="https://creativecommons.org/ns#" about="https://creativecommons.org"> +<p>Except where otherwise <a class="subfoot" href="https://creativecommons.org/policies#license">noted</a>, content on this site is licensed under a <a class="subfoot" href="https://creativecommons.org/licenses/by/4.0/" rel="license">Creative Commons Attribution 4.0 International license</a>. <a class="subfoot" href="https://creativecommons.org/website-icons" target="blank">Icons</a> by The Noun Project.</p> +</div> +</aside> +</div> +</div> +</footer> +</div> +<script type='text/javascript'> + /* <![CDATA[ */ + var screenReaderText = {"expand":"expand child menu","collapse":"collapse child menu"}; + /* ]]> */ +</script> +<script type='text/javascript' src='https://creativecommons.org/wp-content/themes/twentysixteen/js/functions.js'></script> +<script type='text/javascript' src='/includes/legalcode.js'></script> + +</body> +</html> diff --git a/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-3.0-latex.html b/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-3.0-latex.html new file mode 100644 index 0000000000..fa21a30438 --- /dev/null +++ b/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-3.0-latex.html @@ -0,0 +1,440 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta name="generator" content="HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" /> +<title>Creative Commons Legal Code</title> +<meta http-equiv="content-type" content="text/html; charset=utf-8" /> +<link rel="stylesheet" type="text/css" href="https://creativecommons.org/includes/deed3.css" media="screen" /> +<link rel="stylesheet" type="text/css" href="https://creativecommons.org/includes/deed3-print.css" media="print" /> +<!--[if lt IE 7]><link rel="stylesheet" type="text/css" href="https://creativecommons.org/includes/deed3-ie.css" media="screen" /><![endif]--> +<script type="text/javascript" src="https://creativecommons.org/includes/errata.js"> +</script> +</head> +<body> +<p align="center" id="header"><a href="https://creativecommons.org/">Creative Commons</a></p> +<div id="deed" class="yellow"> +<div id="deed-head"> +<div id="cc-logo"> +<img src="https://creativecommons.org/images/deed/cc-logo.jpg" alt="" /> +</div> +<h1><span>Creative Commons Legal Code</span></h1> +<div id="deed-license"> +<h2>Attribution-NonCommercial 3.0 Unported</h2> +</div> +</div> +<div id="deed-main"> +<div id="deed-main-content"> +<img src="https://creativecommons.org/images/international/unported.png" alt="" /> +<blockquote> +CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES +NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE +DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE +COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. +CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE +INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES +RESULTING FROM ITS USE. +</blockquote> +<h3><em>License</em></h3> +<p>THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS +OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR +"LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER +APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS +AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS +PROHIBITED.</p> +<p>BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU +ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. +TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A +CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE +IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND +CONDITIONS.</p> +<p><strong>1. Definitions</strong></p> +<ol type="a"> +<li><strong>"Adaptation"</strong> means a work based upon +the Work, or upon the Work and other pre-existing works, +such as a translation, adaptation, derivative work, +arrangement of music or other alterations of a literary +or artistic work, or phonogram or performance and +includes cinematographic adaptations or any other form in +which the Work may be recast, transformed, or adapted +including in any form recognizably derived from the +original, except that a work that constitutes a +Collection will not be considered an Adaptation for the +purpose of this License. For the avoidance of doubt, +where the Work is a musical work, performance or +phonogram, the synchronization of the Work in +timed-relation with a moving image ("synching") will be +considered an Adaptation for the purpose of this +License.</li> +<li><strong>"Collection"</strong> means a collection of +literary or artistic works, such as encyclopedias and +anthologies, or performances, phonograms or broadcasts, +or other works or subject matter other than works listed +in Section 1(f) below, which, by reason of the selection +and arrangement of their contents, constitute +intellectual creations, in which the Work is included in +its entirety in unmodified form along with one or more +other contributions, each constituting separate and +independent works in themselves, which together are +assembled into a collective whole. A work that +constitutes a Collection will not be considered an +Adaptation (as defined above) for the purposes of this +License.</li> +<li><strong>"Distribute"</strong> means to make available +to the public the original and copies of the Work or +Adaptation, as appropriate, through sale or other +transfer of ownership.</li> +<li><strong>"Licensor"</strong> means the individual, +individuals, entity or entities that offer(s) the Work +under the terms of this License.</li> +<li><strong>"Original Author"</strong> means, in the case +of a literary or artistic work, the individual, +individuals, entity or entities who created the Work or +if no individual or entity can be identified, the +publisher; and in addition (i) in the case of a +performance the actors, singers, musicians, dancers, and +other persons who act, sing, deliver, declaim, play in, +interpret or otherwise perform literary or artistic works +or expressions of folklore; (ii) in the case of a +phonogram the producer being the person or legal entity +who first fixes the sounds of a performance or other +sounds; and, (iii) in the case of broadcasts, the +organization that transmits the broadcast.</li> +<li><strong>"Work"</strong> means the literary and/or +artistic work offered under the terms of this License +including without limitation any production in the +literary, scientific and artistic domain, whatever may be +the mode or form of its expression including digital +form, such as a book, pamphlet and other writing; a +lecture, address, sermon or other work of the same +nature; a dramatic or dramatico-musical work; a +choreographic work or entertainment in dumb show; a +musical composition with or without words; a +cinematographic work to which are assimilated works +expressed by a process analogous to cinematography; a +work of drawing, painting, architecture, sculpture, +engraving or lithography; a photographic work to which +are assimilated works expressed by a process analogous to +photography; a work of applied art; an illustration, map, +plan, sketch or three-dimensional work relative to +geography, topography, architecture or science; a +performance; a broadcast; a phonogram; a compilation of +data to the extent it is protected as a copyrightable +work; or a work performed by a variety or circus +performer to the extent it is not otherwise considered a +literary or artistic work.</li> +<li><strong>"You"</strong> means an individual or entity +exercising rights under this License who has not +previously violated the terms of this License with +respect to the Work, or who has received express +permission from the Licensor to exercise rights under +this License despite a previous violation.</li> +<li><strong>"Publicly Perform"</strong> means to perform +public recitations of the Work and to communicate to the +public those public recitations, by any means or process, +including by wire or wireless means or public digital +performances; to make available to the public Works in +such a way that members of the public may access these +Works from a place and at a place individually chosen by +them; to perform the Work to the public by any means or +process and the communication to the public of the +performances of the Work, including by public digital +performance; to broadcast and rebroadcast the Work by any +means including signs, sounds or images.</li> +<li><strong>"Reproduce"</strong> means to make copies of +the Work by any means including without limitation by +sound or visual recordings and the right of fixation and +reproducing fixations of the Work, including storage of a +protected performance or phonogram in digital form or +other electronic medium.</li> +</ol> +<p><strong>2. Fair Dealing Rights.</strong> Nothing in this +License is intended to reduce, limit, or restrict any uses +free from copyright or rights arising from limitations or +exceptions that are provided for in connection with the +copyright protection under copyright law or other +applicable laws.</p> +<p><strong>3. License Grant.</strong> Subject to the terms +and conditions of this License, Licensor hereby grants You +a worldwide, royalty-free, non-exclusive, perpetual (for +the duration of the applicable copyright) license to +exercise the rights in the Work as stated below:</p> +<ol type="a"> +<li>to Reproduce the Work, to incorporate the Work into +one or more Collections, and to Reproduce the Work as +incorporated in the Collections;</li> +<li>to create and Reproduce Adaptations provided that any +such Adaptation, including any translation in any medium, +takes reasonable steps to clearly label, demarcate or +otherwise identify that changes were made to the original +Work. For example, a translation could be marked "The +original work was translated from English to Spanish," or +a modification could indicate "The original work has been +modified.";</li> +<li>to Distribute and Publicly Perform the Work including +as incorporated in Collections; and,</li> +<li>to Distribute and Publicly Perform Adaptations.</li> +</ol> +<p>The above rights may be exercised in all media and +formats whether now known or hereafter devised. The above +rights include the right to make such modifications as are +technically necessary to exercise the rights in other media +and formats. Subject to Section 8(f), all rights not +expressly granted by Licensor are hereby reserved, +including but not limited to the rights set forth in +Section 4(d).</p> +<p><strong>4. Restrictions.</strong> The license granted in +Section 3 above is expressly made subject to and limited by +the following restrictions:</p> +<ol type="a"> +<li>You may Distribute or Publicly Perform the Work only +under the terms of this License. You must include a copy +of, or the Uniform Resource Identifier (URI) for, this +License with every copy of the Work You Distribute or +Publicly Perform. You may not offer or impose any terms +on the Work that restrict the terms of this License or +the ability of the recipient of the Work to exercise the +rights granted to that recipient under the terms of the +License. You may not sublicense the Work. You must keep +intact all notices that refer to this License and to the +disclaimer of warranties with every copy of the Work You +Distribute or Publicly Perform. When You Distribute or +Publicly Perform the Work, You may not impose any +effective technological measures on the Work that +restrict the ability of a recipient of the Work from You +to exercise the rights granted to that recipient under +the terms of the License. This Section 4(a) applies to +the Work as incorporated in a Collection, but this does +not require the Collection apart from the Work itself to +be made subject to the terms of this License. If You +create a Collection, upon notice from any Licensor You +must, to the extent practicable, remove from the +Collection any credit as required by Section 4(c), as +requested. If You create an Adaptation, upon notice from +any Licensor You must, to the extent practicable, remove +from the Adaptation any credit as required by Section +4(c), as requested.</li> +<li>You may not exercise any of the rights granted to You +in Section 3 above in any manner that is primarily +intended for or directed toward commercial advantage or +private monetary compensation. The exchange of the Work +for other copyrighted works by means of digital +file-sharing or otherwise shall not be considered to be +intended for or directed toward commercial advantage or +private monetary compensation, provided there is no +payment of any monetary compensation in connection with +the exchange of copyrighted works.</li> +<li>If You Distribute, or Publicly Perform the Work or +any Adaptations or Collections, You must, unless a +request has been made pursuant to Section 4(a), keep +intact all copyright notices for the Work and provide, +reasonable to the medium or means You are utilizing: (i) +the name of the Original Author (or pseudonym, if +applicable) if supplied, and/or if the Original Author +and/or Licensor designate another party or parties (e.g., +a sponsor institute, publishing entity, journal) for +attribution ("Attribution Parties") in Licensor's +copyright notice, terms of service or by other reasonable +means, the name of such party or parties; (ii) the title +of the Work if supplied; (iii) to the extent reasonably +practicable, the URI, if any, that Licensor specifies to +be associated with the Work, unless such URI does not +refer to the copyright notice or licensing information +for the Work; and, (iv) consistent with Section 3(b), in +the case of an Adaptation, a credit identifying the use +of the Work in the Adaptation (e.g., "French translation +of the Work by Original Author," or "Screenplay based on +original Work by Original Author"). The credit required +by this Section 4(c) may be implemented in any reasonable +manner; provided, however, that in the case of a +Adaptation or Collection, at a minimum such credit will +appear, if a credit for all contributing authors of the +Adaptation or Collection appears, then as part of these +credits and in a manner at least as prominent as the +credits for the other contributing authors. For the +avoidance of doubt, You may only use the credit required +by this Section for the purpose of attribution in the +manner set out above and, by exercising Your rights under +this License, You may not implicitly or explicitly assert +or imply any connection with, sponsorship or endorsement +by the Original Author, Licensor and/or Attribution +Parties, as appropriate, of You or Your use of the Work, +without the separate, express prior written permission of +the Original Author, Licensor and/or Attribution +Parties.</li> +<li> +<p>For the avoidance of doubt:</p> +<ol type="i"> +<li><strong>Non-waivable Compulsory License +Schemes</strong>. In those jurisdictions in which the +right to collect royalties through any statutory or +compulsory licensing scheme cannot be waived, the +Licensor reserves the exclusive right to collect such +royalties for any exercise by You of the rights +granted under this License;</li> +<li><strong>Waivable Compulsory License +Schemes</strong>. In those jurisdictions in which the +right to collect royalties through any statutory or +compulsory licensing scheme can be waived, the +Licensor reserves the exclusive right to collect such +royalties for any exercise by You of the rights +granted under this License if Your exercise of such +rights is for a purpose or use which is otherwise +than noncommercial as permitted under Section 4(b) +and otherwise waives the right to collect royalties +through any statutory or compulsory licensing scheme; +and,</li> +<li><strong>Voluntary License Schemes</strong>. The +Licensor reserves the right to collect royalties, +whether individually or, in the event that the +Licensor is a member of a collecting society that +administers voluntary licensing schemes, via that +society, from any exercise by You of the rights +granted under this License that is for a purpose or +use which is otherwise than noncommercial as +permitted under Section 4(c).</li> +</ol> +</li> +<li>Except as otherwise agreed in writing by the Licensor +or as may be otherwise permitted by applicable law, if +You Reproduce, Distribute or Publicly Perform the Work +either by itself or as part of any Adaptations or +Collections, You must not distort, mutilate, modify or +take other derogatory action in relation to the Work +which would be prejudicial to the Original Author's honor +or reputation. Licensor agrees that in those +jurisdictions (e.g. Japan), in which any exercise of the +right granted in Section 3(b) of this License (the right +to make Adaptations) would be deemed to be a distortion, +mutilation, modification or other derogatory action +prejudicial to the Original Author's honor and +reputation, the Licensor will waive or not assert, as +appropriate, this Section, to the fullest extent +permitted by the applicable national law, to enable You +to reasonably exercise Your right under Section 3(b) of +this License (right to make Adaptations) but not +otherwise.</li> +</ol> +<p><strong>5. Representations, Warranties and +Disclaimer</strong></p> +<p>UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN +WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO +REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE +WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, +WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, +FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE +ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE +PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. +SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED +WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.</p> +<p><strong>6. Limitation on Liability.</strong> EXCEPT TO +THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL +LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY +SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY +DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, +EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES.</p> +<p><strong>7. Termination</strong></p> +<ol type="a"> +<li>This License and the rights granted hereunder will +terminate automatically upon any breach by You of the +terms of this License. Individuals or entities who have +received Adaptations or Collections from You under this +License, however, will not have their licenses terminated +provided such individuals or entities remain in full +compliance with those licenses. Sections 1, 2, 5, 6, 7, +and 8 will survive any termination of this License.</li> +<li>Subject to the above terms and conditions, the +license granted here is perpetual (for the duration of +the applicable copyright in the Work). Notwithstanding +the above, Licensor reserves the right to release the +Work under different license terms or to stop +distributing the Work at any time; provided, however that +any such election will not serve to withdraw this License +(or any other license that has been, or is required to +be, granted under the terms of this License), and this +License will continue in full force and effect unless +terminated as stated above.</li> +</ol> +<p><strong>8. Miscellaneous</strong></p> +<ol type="a"> +<li>Each time You Distribute or Publicly Perform the Work +or a Collection, the Licensor offers to the recipient a +license to the Work on the same terms and conditions as +the license granted to You under this License.</li> +<li>Each time You Distribute or Publicly Perform an +Adaptation, Licensor offers to the recipient a license to +the original Work on the same terms and conditions as the +license granted to You under this License.</li> +<li>If any provision of this License is invalid or +unenforceable under applicable law, it shall not affect +the validity or enforceability of the remainder of the +terms of this License, and without further action by the +parties to this agreement, such provision shall be +reformed to the minimum extent necessary to make such +provision valid and enforceable.</li> +<li>No term or provision of this License shall be deemed +waived and no breach consented to unless such waiver or +consent shall be in writing and signed by the party to be +charged with such waiver or consent.</li> +<li>This License constitutes the entire agreement between +the parties with respect to the Work licensed here. There +are no understandings, agreements or representations with +respect to the Work not specified here. Licensor shall +not be bound by any additional provisions that may appear +in any communication from You. This License may not be +modified without the mutual written agreement of the +Licensor and You.</li> +<li>The rights granted under, and the subject matter +referenced, in this License were drafted utilizing the +terminology of the Berne Convention for the Protection of +Literary and Artistic Works (as amended on September 28, +1979), the Rome Convention of 1961, the WIPO Copyright +Treaty of 1996, the WIPO Performances and Phonograms +Treaty of 1996 and the Universal Copyright Convention (as +revised on July 24, 1971). These rights and subject +matter take effect in the relevant jurisdiction in which +the License terms are sought to be enforced according to +the corresponding provisions of the implementation of +those treaty provisions in the applicable national law. +If the standard suite of rights granted under applicable +copyright law includes additional rights not granted +under this License, such additional rights are deemed to +be included in the License; this License is not intended +to restrict the license of any rights under applicable +law.</li> +</ol> + +<blockquote> +<h3>Creative Commons Notice</h3> +<p>Creative Commons is not a party to this License, and +makes no warranty whatsoever in connection with the Work. +Creative Commons will not be liable to You or any party + on any legal theory for any damages whatsoever, including +without limitation any general, special, incidental or +consequential damages arising in connection to this +license. Notwithstanding the foregoing two (2) sentences, +if Creative Commons has expressly identified itself as +the Licensor hereunder, it shall have all rights and +obligations of Licensor.</p> +<p>Except for the limited purpose of indicating to the +public that the Work is licensed under the CCPL, Creative +Commons does not authorize the use by either party of the +trademark "Creative Commons" or any related trademark or +logo of Creative Commons without the prior written +consent of Creative Commons. Any permitted use will be in +compliance with Creative Commons' then-current trademark +usage guidelines, as may be published on its website or +otherwise made available upon request from time to time. +For the avoidance of doubt, this trademark restriction +does not form part of the License.</p> +<p>Creative Commons may be contacted at <a href="https://creativecommons.org/">https://creativecommons.org/</a>.</p> +</blockquote> +</div> +</div> +<div id="deed-foot"> +<p id="footer"><a href="./">« Back to Commons Deed</a></p> +</div> +</div> +</body> +</html> diff --git a/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-4.0-latex.html b/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-4.0-latex.html new file mode 100644 index 0000000000..6bc780e9b2 --- /dev/null +++ b/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-4.0-latex.html @@ -0,0 +1,398 @@ +<!DOCTYPE html> +<html> +<head> +<title>Creative Commons — Attribution-NonCommercial 4.0 International — CC BY-NC 4.0</title> +<meta charset="UTF-8"> +<script type="text/javascript" src="//creativecommons.org/includes/errata.js"></script> + +<meta name="viewport" content="width=device-width, initial-scale=1"> +<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700" rel="stylesheet"> +<link rel='stylesheet' id='cc-fontello-css' href="https://creativecommons.org/wp-content/themes/cc/fonts/fontello/css/cc-fontello.css" type='text/css' media='all' /> +<link rel='stylesheet' id='parent-style-css' href="https://creativecommons.org/wp-content/themes/twentysixteen/style.css" type='text/css' media='all' /> +<link rel='stylesheet' id='cc-style-css' href="https://creativecommons.org/wp-content/themes/cc/css/app.css" type='text/css' media='all' /> +<link rel="stylesheet" type="text/css" href="/includes/legalcode.css" media="screen" /> +<link rel="stylesheet" type="text/css" href="/includes/legalcode-print.css" media="print" /> +<script src="https://code.jquery.com/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=" crossorigin="anonymous"></script> + +</head> +<body class="lang-en"> + +<div class="site-header-wrapper"> +<header id="masthead" class="site-header sticky-nav-main sticky attached" role="banner"> +<div class="site-header-main"> +<div class="site-branding"> +<a class="cc-site-logo-link" href="https://creativecommons.org/" rel="home"> +<img class="cc-site-logo" src="https://creativecommons.org/wp-content/themes/cc/images/cc.logo.white.svg" height="72" width="303"> +</a> +</div> +<button id="menu-toggle" class="menu-toggle"><i class="cc-icon-menu"></i> <span>Menu</span></button> +<div id="site-header-menu" class="site-header-menu"> +<nav id="mobile-navigation" class="mobile-navigation" role="navigation" aria-label="Mobile Menu"> +<div class="menu-mobile-menu-container"><ul id="menu-mobile-menu" class="mobile-menu"> +<li id="menu-item-48798" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48798"><a href="https://creativecommons.org/share-your-work/">Share your work</a></li> +<li id="menu-item-48799" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48799"><a href="https://creativecommons.org/use-remix/">Use & remix</a></li> +<li id="menu-item-48800" class="menu-item menu-item-type-post_type menu-item-object-page page_item page-item-7466 menu-item-48800"><a href="https://creativecommons.org/about/">What we do</a></li> +<li id="menu-item-48801" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48801"><a href="https://creativecommons.org/blog/">Blog</a></li> +<li id="menu-item-48802" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48802"><a href="https://creativecommons.org/about/global-affiliate-network/">Global Affiliate Network</a></li> +<li id="menu-item-48803" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48803"><a href="https://creativecommons.org/use-remix/search-the-commons/">Search the Commons</a></li> +</ul></div> +</nav> +<nav id="site-navigation" class="main-navigation" role="navigation" aria-label="Primary Menu"> +<div class="menu-primary-menu-container"><ul id="menu-primary-menu" class="primary-menu"> +<li id="menu-item-48791" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48791"><a href="https://creativecommons.org/share-your-work/">Share your work</a></li> +<li id="menu-item-48792" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48792"><a href="https://creativecommons.org/use-remix/">Use & remix</a></li> +<li id="menu-item-48570" class="menu-item menu-item-type-post_type menu-item-object-page page_item page-item-7466 menu-item-48570"><a href="https://creativecommons.org/about/">What we do</a></li> +<li id="menu-item-48793" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48793"><a href="https://creativecommons.org/blog/">Blog</a></li> +</ul></div> +</nav> +<nav id="secondary-navigation" class="secondary-navigation" role="navigation" aria-label="Secondary Menu"> +<div class="menu-secondary-menu-container"><ul id="menu-secondary-menu" class="secondary-menu"><li id="menu-item-48804" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48804"><a href="https://creativecommons.org/about/global-affiliate-network/">Global Affiliate Network</a></li> +<li id="menu-item-48805" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48805"><a href="https://creativecommons.org/use-remix/search-the-commons/">Search the Commons</a></li> +<li id="menu-item-48806" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48806"><a href="https://creativecommons.org/about/contact/">Contact</a></li> +</ul></div> +</nav> +<nav id="social-navigation" class="social-navigation" role="navigation" aria-label="Social Links Menu"> +<div class="menu-social-links-container"><ul id="menu-social-links" class="social-links-menu"> +<li id="menu-item-48807" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48807"><a href="https://www.facebook.com/creativecommons"><span class="screen-reader-text">Facebook</span></a></li> +<li id="menu-item-48808" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48808"><a href="https://twitter.com/creativecommons"><span class="screen-reader-text">Twitter</span></a></li> +<li id="menu-item-48809" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48809"><a href="mailto:info@creativecommons.org"><span class="screen-reader-text">Mail</span></a></li> +</ul></div> +</nav> +</div> +</div> +</header> +<header class="site-header spacer" role="banner"> +<div class="site-header-main"> +<div class="site-branding"> +<a class="cc-site-logo-link" href="https://creativecommons.org/" rel="home"> +<img class="cc-site-logo" src="https://creativecommons.org/wp-content/themes/cc/images/cc.logo.white.svg" height="72" width="303"> +</a> +</div> +<button id="menu-toggle" class="menu-toggle"><i class="cc-icon-menu"></i> <span>Menu</span></button> +<div id="site-header-menu" class="site-header-menu"> +<nav id="mobile-navigation" class="mobile-navigation" role="navigation" aria-label="Mobile Menu"> +<div class="menu-mobile-menu-container"><ul id="menu-mobile-menu" class="mobile-menu"> +<li id="menu-item-48798" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48798"><a href="https://creativecommons.org/share-your-work/">Share your work</a></li> +<li id="menu-item-48799" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48799"><a href="https://creativecommons.org/use-remix/">Use & remix</a></li> +<li id="menu-item-48800" class="menu-item menu-item-type-post_type menu-item-object-page page_item page-item-7466 menu-item-48800"><a href="https://creativecommons.org/about/">What we do</a></li> +<li id="menu-item-48801" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48801"><a href="https://creativecommons.org/blog/">Blog</a></li> +<li id="menu-item-48802" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48802"><a href="https://creativecommons.org/about/global-affiliate-network/">Global Affiliate Network</a></li> +<li id="menu-item-48803" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48803"><a href="https://creativecommons.org/use-remix/search-the-commons/">Search the Commons</a></li> +</ul></div> +</nav> +<nav id="site-navigation" class="main-navigation" role="navigation" aria-label="Primary Menu"> +<div class="menu-primary-menu-container"><ul id="menu-primary-menu" class="primary-menu"> +<li id="menu-item-48791" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48791"><a href="https://creativecommons.org/share-your-work/">Share your work</a></li> +<li id="menu-item-48792" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48792"><a href="https://creativecommons.org/use-remix/">Use & remix</a></li> +<li id="menu-item-48570" class="menu-item menu-item-type-post_type menu-item-object-page page_item page-item-7466 menu-item-48570"><a href="https://creativecommons.org/about/">What we do</a></li> +<li id="menu-item-48793" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48793"><a href="https://creativecommons.org/blog/">Blog</a></li> +</ul></div> +</nav> +<nav id="secondary-navigation" class="secondary-navigation" role="navigation" aria-label="Secondary Menu"> +<div class="menu-secondary-menu-container"><ul id="menu-secondary-menu" class="secondary-menu"><li id="menu-item-48804" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48804"><a href="https://creativecommons.org/about/global-affiliate-network/">Global Affiliate Network</a></li> +<li id="menu-item-48805" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48805"><a href="https://creativecommons.org/use-remix/search-the-commons/">Search the Commons</a></li> +<li id="menu-item-48806" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48806"><a href="https://creativecommons.org/about/contact/">Contact</a></li> +</ul></div> +</nav> +<nav id="social-navigation" class="social-navigation" role="navigation" aria-label="Social Links Menu"> +<div class="menu-social-links-container"><ul id="menu-social-links" class="social-links-menu"> +<li id="menu-item-48807" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48807"><a href="https://www.facebook.com/creativecommons"><span class="screen-reader-text">Facebook</span></a></li> +<li id="menu-item-48808" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48808"><a href="https://twitter.com/creativecommons"><span class="screen-reader-text">Twitter</span></a></li> +<li id="menu-item-48809" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48809"><a href="mailto:info@creativecommons.org"><span class="screen-reader-text">Mail</span></a></li> +</ul></div> +</nav> +</div> +</div> +</header> +</div> +<aside id="header-below" class="widget-area"> +<section id="text-15" class="widget-1 widget-first widget-last widget-odd widget widget_text"> +<div class="textwidget"> +<div id="donation-bar-wrapper" class="donation-bar-wrapper"> +<div id="donation-bar-inner" class="donation-bar-inner"> +<p class="donate-text">Help us build a vibrant, collaborative global commons</p> +<div class="donate-action"><a href="/donate?utm_campaign=2018fund&utm_source=license_header2018" class="button donate arrow">Donate<span class="hide-on-mobile"> Now</span></a></div> +</div> +</div> +</div> +</section> +</aside> + + +<div id="language-selector-block" class="container"> +<div class="language-selector-inner"> +This page is available in the following languages: +<img class="language-icon" src="/images/language_icon_x2.png" alt="Languages"> +<select> +<option value="legalcode.ar">العربية</option> +<option value="legalcode.cs">ÄeÅ¡tina</option> +<option value="legalcode.de">Deutsch</option> +<option value="legalcode.el">Ελληνικά</option> +<option value="legalcode" selected="selected">English</option> +<option value="legalcode.es">Español</option> +<option value="legalcode.eu">euskara</option> +<option value="legalcode.fi">suomeksi</option> +<option value="legalcode.fr">français</option> +<option value="legalcode.hr">hrvatski</option> +<option value="legalcode.id">Bahasa Indonesia</option> +<option value="legalcode.it">italiano</option> +<option value="legalcode.ja">日本語</option> +<option value="legalcode.ko">í•œêµì–´</option> +<option value="legalcode.lt">Lietuvių</option> +<option value="legalcode.lv">latviski</option> +<option value="legalcode.mi">te reo MÄori</option> +<option value="legalcode.nl">Nederlands</option> +<option value="legalcode.no">norsk</option> +<option value="legalcode.pl">polski</option> +<option value="legalcode.pt">português</option> +<option value="legalcode.ro">română</option> +<option value="legalcode.ru">руÑÑкий</option> +<option value="legalcode.sl">SlovenÅ¡Äina</option> +<option value="legalcode.sv">svenska</option> +<option value="legalcode.tr">Türkçe</option> +<option value="legalcode.uk">українÑька</option> +<option value="legalcode.zh-Hans">ä¸æ–‡</option> +<option value="legalcode.zh-Hant">è¯èªž</option> +</select> +</div> +</div> + + +<div id="deed" class="yellow"> +<div id="deed-head"> +<div id="cc-logo"><span class="cc-icon-logo"><img src="/images/deed/svg/cc_white.svg" alt="CC" /></span><span class="cc-icon-by"><img src="/images/deed/svg/attribution_icon_white.svg" alt="Attribution" /></span><span class="cc-icon-nc"><img src="/images/deed/svg/nc_white.svg" alt="Non-Commerical" /></span></div> +<h1><span>Creative Commons Legal Code</span></h1> +<div id="deed-license"> +<h2>Attribution-NonCommercial 4.0 International</h2> +</div> +</div> +<div id="deed-main"> +<div id="deed-main-content"> +<div id="deed-disclaimer"> +<div class="summary"> +Official translations of this license are available <a href="#languages">in other languages</a>. +</div> +</div> +<div class="shaded"> +<p>Creative Commons Corporation (“Creative Commonsâ€) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is†basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible.</p> +</div> +<div class="shaded"> +<p><strong>Using Creative Commons Public Licenses</strong></p> +<p>Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses.</p> +<p class="usage-considerations"><strong>Considerations for licensors:</strong> Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. <a href="//wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensors">More considerations for licensors.</a></p> +<p class="usage-considerations"><strong>Considerations for the public:</strong> By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensor’s permission is not necessary for any reason–for example, because of any applicable exception or limitation to copyright–then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to respect those requests where reasonable. +<a href="//wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensees">More considerations for the public.</a></p> +</div> +<h3>Creative Commons Attribution-NonCommercial 4.0 International Public License</h3> +<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p> +<p id="s1"><strong>Section 1 – Definitions.</strong></p> +<ol type="a"> +<li id="s1a"><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li> +<li id="s1b"><strong>Adapter's License</strong> means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.</li> +<li id="s1c"><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section <a href="#s2b">2(b)(1)-(2)</a> are not Copyright and Similar Rights.</li> +<li id="s1d"><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may not +be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar +international agreements.</li> +<li id="s1e"><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li> +<li id="s1f"><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li> +<li id="s1g"><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li> +<li id="s1h"><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li> +<li id="s1i"><strong>NonCommercial</strong> means not primarily intended for or directed towards commercial advantage or monetary compensation. For purposes of this Public License, the exchange of the Licensed Material for other material subject to Copyright and Similar Rights by digital file-sharing or similar means is NonCommercial provided there is no payment of monetary compensation in connection with the exchange.</li> +<li id="s1j"><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li> +<li id="s1k"><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li> +<li id="s1l"><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li> +</ol> +<p id="s2"><strong>Section 2 – Scope.</strong></p> +<ol type="a"> +<li id="s2a"><strong>License grant</strong>. +<ol> +<li id="s2a1">Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to: +<ol type="A"> +<li id="s2a1A">reproduce and Share the Licensed Material, in whole or in part, for NonCommercial purposes only; and</li> +<li id="s2a1B">produce, reproduce, and Share Adapted Material for NonCommercial purposes only.</li> +</ol> +<li id="s2a2"><span style="text-decoration: underline;">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li> +<li id="s2a3"><span style="text-decoration: underline;">Term</span>. The term of this Public License is specified in Section <a href="#s6a">6(a)</a>.</li> +<li id="s2a4"><span style="text-decoration: underline;">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section <a href="#s2a4">2(a)(4)</a> never produces Adapted Material.</li> +<li id="s2a5"><span style="text-decoration: underline;">Downstream recipients</span>. +<div class="para"> +<ol type="A"> +<li id="s2a5A"><span style="text-decoration: underline;">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li> +<li id="s2a5B"><span style="text-decoration: underline;">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li> +</ol> +</div> +<li id="s2a6"><span style="text-decoration: underline;">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section <a href="#s3a1Ai">3(a)(1)(A)(i)</a>.</li> +</ol> +<li id="s2b"><p><strong>Other rights</strong>.</p> +<ol> +<li id="s2b1">Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li> +<li id="s2b2">Patent and trademark rights are not licensed under this Public License.</li> +<li id="s2b3">To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties, including when the Licensed Material is used other than for NonCommercial purposes.</li> +</ol> +</li> +</ol> +<p id="s3"><strong>Section 3 – License Conditions.</strong></p> +<p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p> +<ol type="a"> +<li id="s3a"><p><strong>Attribution</strong>.</p> +<ol> +<li id="s3a1"><p>If You Share the Licensed Material (including in modified form), You must:</p> +<ol type="A"> +<li id="s3a1A">retain the following if it is supplied by the Licensor with the Licensed Material: +<ol type="i"> +<li id="s3a1Ai">identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li> +<li id="s3a1Aii">a copyright notice;</li> +<li id="s3a1Aiii">a notice that refers to this Public License; </li> +<li id="s3a1Aiv">a notice that refers to the disclaimer of warranties;</li> +<li id="s3a1Av">a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li> +</ol> +<li id="s3a1B">indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li> +<li id="s3a1C">indicate the Licensed Material is licensed under this Public License, +and include the text of, or the URI or hyperlink to, this Public +License.</li> +</ol> +</li> +<li id="s3a2">You may satisfy the conditions in Section <a href="#s3a1">3(a)(1)</a> in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li> +<li id="s3a3">If requested by the Licensor, You must remove any of the information required by Section <a href="#s3a1A">3(a)(1)(A)</a> to the extent reasonably practicable.</li> +<li id="s3a4">If You Share Adapted Material You produce, the Adapter's License You apply must not prevent recipients of the Adapted Material from complying with this Public License.</li> +</ol> +</li> +</ol> +<p id="s4"><strong>Section 4 – Sui Generis Database Rights.</strong></p> +<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p> +<ol type="a"> +<li id="s4a">for the avoidance of doubt, Section <a href="#s2a1">2(a)(1)</a> grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database for NonCommercial purposes only;</li> +<li id="s4b">if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and</li> +<li id="s4c">You must comply with the conditions in Section <a href="#s3a">3(a)</a> if You Share all or a substantial portion of the contents of the database.</li> +</ol> +For the avoidance of doubt, this Section <a href="#s4">4</a> supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights. +<p id="s5"><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p> +<ol style="font-weight: bold;" type="a"> +<li id="s5a"><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li> +<li id="s5b"><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li> +</ol> +<ol start="3" type="a"> +<li id="s5c">The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li> +</ol> + <p id="s6"><strong>Section 6 – Term and Termination.</strong></p> +<ol type="a"> +<li id="s6a">This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li> +<li id="s6b"> +<p>Where Your right to use the Licensed Material has terminated under Section <a href="#s6a">6(a)</a>, it reinstates:</p> +<ol> +<li id="s6b1">automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li> +<li id="s6b2">upon express reinstatement by the Licensor.</li> +</ol> +For the avoidance of doubt, this Section <a href="#s6b">6(b)</a> does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.</li> +<li id="s6c">For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li> +<li id="s6d">Sections <a href="#s1">1</a>, <a href="#s5">5</a>, <a href="#s6">6</a>, <a href="#s7">7</a>, and <a href="#s8">8</a> survive termination of this Public License.</li> +</ol> +<p id="s7"><strong>Section 7 – Other Terms and Conditions.</strong></p> +<ol type="a"> +<li id="s7a">The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li> +<li id="s7b">Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li> +</ol> +<p id="s8"><strong>Section 8 – Interpretation.</strong></p> +<ol type="a"> +<li id="s8a">For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li> +<li id="s8b">To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li> +<li id="s8c">No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li> +<li id="s8d">Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li> +</ol> + +<p class="shaded">Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.†The text of the Creative Commons public licenses is dedicated to the public domain under the <a href="//creativecommons.org/publicdomain/zero/1.0/legalcode">CC0 Public Domain Dedication</a>. Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at <a href="//creativecommons.org/policies">creativecommons.org/policies</a>, Creative Commons does not authorize the use of the trademark “Creative Commons†or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses.<br><br> +Creative Commons may be contacted at <a href="//creativecommons.org/">creativecommons.org</a>.</p> +<p class="shaded"><a id="languages"></a>Additional languages available: + +<a href="/licenses/by-nc/4.0/legalcode.ar">العربية</a>, +<a href="/licenses/by-nc/4.0/legalcode.cs">ÄeÅ¡tina</a>, +<a href="/licenses/by-nc/4.0/legalcode.de">Deutsch</a>, +<a href="/licenses/by-nc/4.0/legalcode.el">Ελληνικά</a>, +<a href="/licenses/by-nc/4.0/legalcode.es">Español</a>, +<a href="/licenses/by-nc/4.0/legalcode.eu">euskara</a>, +<a href="/licenses/by-nc/4.0/legalcode.fi">suomeksi</a>, +<a href="/licenses/by-nc/4.0/legalcode.fr">français</a>, +<a href="/licenses/by-nc/4.0/legalcode.hr">hrvatski</a>, +<a href="/licenses/by-nc/4.0/legalcode.id">Bahasa Indonesia</a>, +<a href="/licenses/by-nc/4.0/legalcode.it">italiano</a>, +<a href="/licenses/by-nc/4.0/legalcode.ja">日本語</a>, +<a href="/licenses/by-nc/4.0/legalcode.ko">í•œêµì–´</a>, +<a href="/licenses/by-nc/4.0/legalcode.lt">Lietuvių</a>, +<a href="/licenses/by-nc/4.0/legalcode.lv">latviski</a>, +<a href="/licenses/by-nc/4.0/legalcode.mi">te reo MÄori</a>, +<a href="/licenses/by-nc/4.0/legalcode.nl">Nederlands</a>, +<a href="/licenses/by-nc/4.0/legalcode.no">norsk</a>, +<a href="/licenses/by-nc/4.0/legalcode.pl">polski</a>, +<a href="/licenses/by-nc/4.0/legalcode.pt">português</a>, +<a href="/licenses/by-nc/4.0/legalcode.ro">română</a>, +<a href="/licenses/by-nc/4.0/legalcode.ru">руÑÑкий</a>, +<a href="/licenses/by-nc/4.0/legalcode.sl">SlovenÅ¡Äina</a>, +<a href="/licenses/by-nc/4.0/legalcode.sv">svenska</a>, +<a href="/licenses/by-nc/4.0/legalcode.tr">Türkçe</a>, +<a href="/licenses/by-nc/4.0/legalcode.uk">українÑька</a>, +<a href="/licenses/by-nc/4.0/legalcode.zh-Hans">ä¸æ–‡</a>, +<a href="/licenses/by-nc/4.0/legalcode.zh-Hant">è¯èªž</a>. + +Please read the <a href="/faq/#officialtranslations">FAQ</a> for more information about official translations.</p> +</div> +</div> +<div id="deed-foot"> +<p id="footer"><a href="./">« Back to Commons Deed</a></p> +</div> +</div> + +<div class="site-footer-wrapper"> +<footer id="colophon" class="site-footer sticky-nav-main" role="contentinfo"> +<div class="cc-footer"> +<div class="column cc-footer-main"> +<div class="cc-footer-logo"> +<a href="https://creativecommons.org/" class="custom-logo-link" rel="home" itemprop="url"><img src="https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_.png" class="custom-logo" alt="cc.logo.white" itemprop="logo" srcset="https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_.png 980w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-300x73.png 300w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-768x188.png 768w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-140x34.png 140w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-50x12.png 50w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-270x66.png 270w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-245x60.png 245w" sizes="(max-width: 709px) 85vw, (max-width: 909px) 67vw, (max-width: 1362px) 62vw, 840px" height="240" width="980"></a> +</div> +<div class="cc-footer-links"> +<div class="menu-footer-links-container"> +<ul id="menu-footer-links" class="menu"> +<li id="menu-item-48794" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48794"><a href="https://creativecommons.org/about/contact/">Contact</a></li> +<li id="menu-item-48795" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48795"><a href="https://creativecommons.org/privacy/">Privacy</a></li> +<li id="menu-item-48796" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48796"><a href="https://creativecommons.org/policies/">Policies</a></li> +<li id="menu-item-48797" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48797"><a href="https://creativecommons.org/terms/">Terms</a></li> +</ul> +</div> +</div> +</div> +<div class="column cc-footer-contact"> +<h6><a href="https://creativecommons.org/about/contact">We'd love to hear from you!</a></h6> +<address> +Creative Commons<br> +PO Box 1866, Mountain View, CA 94042 +</address> +<ul> +<li><a href="mailto:info@creativecommons.org" class="mail">info@creativecommons.org</a></li> +<li><a href="https://creativecommons.org/faq">Frequently Asked Questions</a></li> +</ul> +</div> +<div class="column cc-footer-license"> +<div class="license-icons"> +<a rel="license" href="https://creativecommons.org/licenses/by/4.0/" title="Creative Commons Attribution 4.0 International license"> +<i class="cc-icon-cc"></i> +<i class="cc-icon-cc-by"></i> +</a> +</div> +<aside> +<div xmlns:cc="https://creativecommons.org/ns#" about="https://creativecommons.org"> +<p>Except where otherwise <a class="subfoot" href="https://creativecommons.org/policies#license">noted</a>, content on this site is licensed under a <a class="subfoot" href="https://creativecommons.org/licenses/by/4.0/" rel="license">Creative Commons Attribution 4.0 International license</a>. <a class="subfoot" href="https://creativecommons.org/website-icons" target="blank">Icons</a> by The Noun Project.</p> +</div> +</aside> +</div> +</div> +</footer> +</div> +<script type='text/javascript'> + /* <![CDATA[ */ + var screenReaderText = {"expand":"expand child menu","collapse":"collapse child menu"}; + /* ]]> */ +</script> +<script type='text/javascript' src='https://creativecommons.org/wp-content/themes/twentysixteen/js/functions.js'></script> +<script type='text/javascript' src='/includes/legalcode.js'></script> + +</body> +</html> diff --git a/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-nd-3.0-latex.html b/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-nd-3.0-latex.html new file mode 100644 index 0000000000..0f5d4148a1 --- /dev/null +++ b/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-nd-3.0-latex.html @@ -0,0 +1,406 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta name="generator" content="HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" /> +<title>Creative Commons Legal Code</title> +<meta http-equiv="content-type" content="text/html; charset=utf-8" /> +<link rel="stylesheet" type="text/css" href="https://creativecommons.org/includes/deed3.css" media="screen" /> +<link rel="stylesheet" type="text/css" href="https://creativecommons.org/includes/deed3-print.css" media="print" /> +<!--[if lt IE 7]><link rel="stylesheet" type="text/css" href="https://creativecommons.org/includes/deed3-ie.css" media="screen" /><![endif]--> +<script type="text/javascript" src="https://creativecommons.org/includes/errata.js"> +</script> +</head> +<body> +<p align="center" id="header"><a href="https://creativecommons.org/">Creative Commons</a></p> +<div id="deed" class="yellow"> +<div id="deed-head"> +<div id="cc-logo"> +<img src="https://creativecommons.org/images/deed/cc-logo.jpg" alt="" /> +</div> +<h1><span>Creative Commons Legal Code</span></h1> +<div id="deed-license"> +<h2>Attribution-NonCommercial-NoDerivs 3.0 Unported</h2> +</div> +</div> +<div id="deed-main"> +<div id="deed-main-content"> +<img src="https://creativecommons.org/images/international/unported.png" alt="" /> +<blockquote> +CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES +NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE +DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE +COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. +CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE +INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES +RESULTING FROM ITS USE. +</blockquote> +<h3><em>License</em></h3> +<p>THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS +OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR +"LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER +APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS +AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS +PROHIBITED.</p> +<p>BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU +ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. +TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A +CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE +IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND +CONDITIONS.</p> +<p><strong>1. Definitions</strong></p> +<ol type="a"> +<li><strong>"Adaptation"</strong> means a work based upon +the Work, or upon the Work and other pre-existing works, +such as a translation, adaptation, derivative work, +arrangement of music or other alterations of a literary +or artistic work, or phonogram or performance and +includes cinematographic adaptations or any other form in +which the Work may be recast, transformed, or adapted +including in any form recognizably derived from the +original, except that a work that constitutes a +Collection will not be considered an Adaptation for the +purpose of this License. For the avoidance of doubt, +where the Work is a musical work, performance or +phonogram, the synchronization of the Work in +timed-relation with a moving image ("synching") will be +considered an Adaptation for the purpose of this +License.</li> +<li><strong>"Collection"</strong> means a collection of +literary or artistic works, such as encyclopedias and +anthologies, or performances, phonograms or broadcasts, +or other works or subject matter other than works listed +in Section 1(f) below, which, by reason of the selection +and arrangement of their contents, constitute +intellectual creations, in which the Work is included in +its entirety in unmodified form along with one or more +other contributions, each constituting separate and +independent works in themselves, which together are +assembled into a collective whole. A work that +constitutes a Collection will not be considered an +Adaptation (as defined above) for the purposes of this +License.</li> +<li><strong>"Distribute"</strong> means to make available +to the public the original and copies of the Work through +sale or other transfer of ownership.</li> +<li><strong>"Licensor"</strong> means the individual, +individuals, entity or entities that offer(s) the Work +under the terms of this License.</li> +<li><strong>"Original Author"</strong> means, in the case +of a literary or artistic work, the individual, +individuals, entity or entities who created the Work or +if no individual or entity can be identified, the +publisher; and in addition (i) in the case of a +performance the actors, singers, musicians, dancers, and +other persons who act, sing, deliver, declaim, play in, +interpret or otherwise perform literary or artistic works +or expressions of folklore; (ii) in the case of a +phonogram the producer being the person or legal entity +who first fixes the sounds of a performance or other +sounds; and, (iii) in the case of broadcasts, the +organization that transmits the broadcast.</li> +<li><strong>"Work"</strong> means the literary and/or +artistic work offered under the terms of this License +including without limitation any production in the +literary, scientific and artistic domain, whatever may be +the mode or form of its expression including digital +form, such as a book, pamphlet and other writing; a +lecture, address, sermon or other work of the same +nature; a dramatic or dramatico-musical work; a +choreographic work or entertainment in dumb show; a +musical composition with or without words; a +cinematographic work to which are assimilated works +expressed by a process analogous to cinematography; a +work of drawing, painting, architecture, sculpture, +engraving or lithography; a photographic work to which +are assimilated works expressed by a process analogous to +photography; a work of applied art; an illustration, map, +plan, sketch or three-dimensional work relative to +geography, topography, architecture or science; a +performance; a broadcast; a phonogram; a compilation of +data to the extent it is protected as a copyrightable +work; or a work performed by a variety or circus +performer to the extent it is not otherwise considered a +literary or artistic work.</li> +<li><strong>"You"</strong> means an individual or entity +exercising rights under this License who has not +previously violated the terms of this License with +respect to the Work, or who has received express +permission from the Licensor to exercise rights under +this License despite a previous violation.</li> +<li><strong>"Publicly Perform"</strong> means to perform +public recitations of the Work and to communicate to the +public those public recitations, by any means or process, +including by wire or wireless means or public digital +performances; to make available to the public Works in +such a way that members of the public may access these +Works from a place and at a place individually chosen by +them; to perform the Work to the public by any means or +process and the communication to the public of the +performances of the Work, including by public digital +performance; to broadcast and rebroadcast the Work by any +means including signs, sounds or images.</li> +<li><strong>"Reproduce"</strong> means to make copies of +the Work by any means including without limitation by +sound or visual recordings and the right of fixation and +reproducing fixations of the Work, including storage of a +protected performance or phonogram in digital form or +other electronic medium.</li> +</ol> +<p><strong>2. Fair Dealing Rights.</strong> Nothing in this +License is intended to reduce, limit, or restrict any uses +free from copyright or rights arising from limitations or +exceptions that are provided for in connection with the +copyright protection under copyright law or other +applicable laws.</p> +<p><strong>3. License Grant.</strong> Subject to the terms +and conditions of this License, Licensor hereby grants You +a worldwide, royalty-free, non-exclusive, perpetual (for +the duration of the applicable copyright) license to +exercise the rights in the Work as stated below:</p> +<ol type="a"> +<li>to Reproduce the Work, to incorporate the Work into +one or more Collections, and to Reproduce the Work as +incorporated in the Collections; and,</li> +<li>to Distribute and Publicly Perform the Work including +as incorporated in Collections.</li> +</ol> +<p>The above rights may be exercised in all media and +formats whether now known or hereafter devised. The above +rights include the right to make such modifications as are +technically necessary to exercise the rights in other media +and formats, but otherwise you have no rights to make +Adaptations. Subject to 8(f), all rights not expressly +granted by Licensor are hereby reserved, including but not +limited to the rights set forth in Section 4(d).</p> +<p><strong>4. Restrictions.</strong> The license granted in +Section 3 above is expressly made subject to and limited by +the following restrictions:</p> +<ol type="a"> +<li>You may Distribute or Publicly Perform the Work only +under the terms of this License. You must include a copy +of, or the Uniform Resource Identifier (URI) for, this +License with every copy of the Work You Distribute or +Publicly Perform. You may not offer or impose any terms +on the Work that restrict the terms of this License or +the ability of the recipient of the Work to exercise the +rights granted to that recipient under the terms of the +License. You may not sublicense the Work. You must keep +intact all notices that refer to this License and to the +disclaimer of warranties with every copy of the Work You +Distribute or Publicly Perform. When You Distribute or +Publicly Perform the Work, You may not impose any +effective technological measures on the Work that +restrict the ability of a recipient of the Work from You +to exercise the rights granted to that recipient under +the terms of the License. This Section 4(a) applies to +the Work as incorporated in a Collection, but this does +not require the Collection apart from the Work itself to +be made subject to the terms of this License. If You +create a Collection, upon notice from any Licensor You +must, to the extent practicable, remove from the +Collection any credit as required by Section 4(c), as +requested.</li> +<li>You may not exercise any of the rights granted to You +in Section 3 above in any manner that is primarily +intended for or directed toward commercial advantage or +private monetary compensation. The exchange of the Work + for other copyrighted works by means of digital +file-sharing or otherwise shall not be considered to be +intended for or directed toward commercial advantage or +private monetary compensation, provided there is no +payment of any monetary compensation in connection with +the exchange of copyrighted works.</li> +<li>If You Distribute, or Publicly Perform the Work or +Collections, You must, unless a request has been made +pursuant to Section 4(a), keep intact all copyright +notices for the Work and provide, reasonable to the +medium or means You are utilizing: (i) the name of the +Original Author (or pseudonym, if applicable) if +supplied, and/or if the Original Author and/or Licensor +designate another party or parties (e.g., a sponsor +institute, publishing entity, journal) for attribution +("Attribution Parties") in Licensor's copyright notice, +terms of service or by other reasonable means, the name +of such party or parties; (ii) the title of the Work if +supplied; (iii) to the extent reasonably practicable, the +URI, if any, that Licensor specifies to be associated +with the Work, unless such URI does not refer to the +copyright notice or licensing information for the Work. +The credit required by this Section 4(c) may be +implemented in any reasonable manner; provided, however, +that in the case of a Collection, at a minimum such +credit will appear, if a credit for all contributing +authors of Collection appears, then as part of these +credits and in a manner at least as prominent as the +credits for the other contributing authors. For the +avoidance of doubt, You may only use the credit required +by this Section for the purpose of attribution in the +manner set out above and, by exercising Your rights under +this License, You may not implicitly or explicitly assert +or imply any connection with, sponsorship or endorsement +by the Original Author, Licensor and/or Attribution +Parties, as appropriate, of You or Your use of the Work, +without the separate, express prior written permission of +the Original Author, Licensor and/or Attribution +Parties.</li> +<li> +<p>For the avoidance of doubt:</p> +<ol type="i"> +<li><strong>Non-waivable Compulsory License +Schemes</strong>. In those jurisdictions in which the +right to collect royalties through any statutory or +compulsory licensing scheme cannot be waived, the +Licensor reserves the exclusive right to collect such +royalties for any exercise by You of the rights +granted under this License;</li> +<li><strong>Waivable Compulsory License +Schemes</strong>. In those jurisdictions in which the +right to collect royalties through any statutory or +compulsory licensing scheme can be waived, the +Licensor reserves the exclusive right to collect such +royalties for any exercise by You of the rights +granted under this License if Your exercise of such +rights is for a purpose or use which is otherwise +than noncommercial as permitted under Section 4(b) +and otherwise waives the right to collect royalties +through any statutory or compulsory licensing scheme; +and,</li> +<li><strong>Voluntary License Schemes</strong>. The +Licensor reserves the right to collect royalties, +whether individually or, in the event that the +Licensor is a member of a collecting society that +administers voluntary licensing schemes, via that +society, from any exercise by You of the rights +granted under this License that is for a purpose or +use which is otherwise than noncommercial as +permitted under Section 4(b).</li> +</ol> +</li> +<li>Except as otherwise agreed in writing by the Licensor +or as may be otherwise permitted by applicable law, if +You Reproduce, Distribute or Publicly Perform the Work +either by itself or as part of any Collections, You must +not distort, mutilate, modify or take other derogatory +action in relation to the Work which would be prejudicial +to the Original Author's honor or reputation.</li> +</ol> +<p><strong>5. Representations, Warranties and +Disclaimer</strong></p> +<p>UNLESS OTHERWISE MUTUALLY AGREED BY THE PARTIES IN +WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO +REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE +WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, +WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, +FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE +ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE +PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. +SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED +WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.</p> +<p><strong>6. Limitation on Liability.</strong> EXCEPT TO +THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL +LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY +SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY +DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, +EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES.</p> +<p><strong>7. Termination</strong></p> +<ol type="a"> +<li>This License and the rights granted hereunder will +terminate automatically upon any breach by You of the +terms of this License. Individuals or entities who have +received Collections from You under this License, +however, will not have their licenses terminated provided +such individuals or entities remain in full compliance +with those licenses. Sections 1, 2, 5, 6, 7, and 8 will +survive any termination of this License.</li> +<li>Subject to the above terms and conditions, the +license granted here is perpetual (for the duration of +the applicable copyright in the Work). Notwithstanding +the above, Licensor reserves the right to release the +Work under different license terms or to stop +distributing the Work at any time; provided, however that +any such election will not serve to withdraw this License +(or any other license that has been, or is required to +be, granted under the terms of this License), and this +License will continue in full force and effect unless +terminated as stated above.</li> +</ol> +<p><strong>8. Miscellaneous</strong></p> +<ol type="a"> +<li>Each time You Distribute or Publicly Perform the Work +or a Collection, the Licensor offers to the recipient a +license to the Work on the same terms and conditions as +the license granted to You under this License.</li> +<li>If any provision of this License is invalid or +unenforceable under applicable law, it shall not affect +the validity or enforceability of the remainder of the +terms of this License, and without further action by the +parties to this agreement, such provision shall be +reformed to the minimum extent necessary to make such +provision valid and enforceable.</li> +<li>No term or provision of this License shall be deemed +waived and no breach consented to unless such waiver or +consent shall be in writing and signed by the party to be +charged with such waiver or consent.</li> +<li>This License constitutes the entire agreement between +the parties with respect to the Work licensed here. There +are no understandings, agreements or representations with +respect to the Work not specified here. Licensor shall +not be bound by any additional provisions that may appear +in any communication from You. This License may not be +modified without the mutual written agreement of the +Licensor and You.</li> +<li>The rights granted under, and the subject matter +referenced, in this License were drafted utilizing the +terminology of the Berne Convention for the Protection of +Literary and Artistic Works (as amended on September 28, +1979), the Rome Convention of 1961, the WIPO Copyright +Treaty of 1996, the WIPO Performances and Phonograms +Treaty of 1996 and the Universal Copyright Convention (as +revised on July 24, 1971). These rights and subject +matter take effect in the relevant jurisdiction in which +the License terms are sought to be enforced according to +the corresponding provisions of the implementation of +those treaty provisions in the applicable national law. +If the standard suite of rights granted under applicable +copyright law includes additional rights not granted +under this License, such additional rights are deemed to +be included in the License; this License is not intended +to restrict the license of any rights under applicable +law.</li> +</ol> + +<blockquote> +<h3>Creative Commons Notice</h3> +<p>Creative Commons is not a party to this License, and +makes no warranty whatsoever in connection with the Work. +Creative Commons will not be liable to You or any party +on any legal theory for any damages whatsoever, including +without limitation any general, special, incidental or +consequential damages arising in connection to this +license. Notwithstanding the foregoing two (2) sentences, +if Creative Commons has expressly identified itself as +the Licensor hereunder, it shall have all rights and +obligations of Licensor.</p> +<p>Except for the limited purpose of indicating to the +public that the Work is licensed under the CCPL, Creative +Commons does not authorize the use by either party of the +trademark "Creative Commons" or any related trademark or +logo of Creative Commons without the prior written +consent of Creative Commons. Any permitted use will be in +compliance with Creative Commons' then-current trademark +usage guidelines, as may be published on its website or +otherwise made available upon request from time to time. +For the avoidance of doubt, this trademark restriction +does not form part of this License.</p> +<p>Creative Commons may be contacted at <a href="https://creativecommons.org/">https://creativecommons.org/</a>.</p> +</blockquote> +</div> +</div> +<div id="deed-foot"> +<p id="footer"><a href="./">« Back to Commons Deed</a></p> +</div> +</div> +</body> +</html> diff --git a/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-nd-4.0-latex.html b/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-nd-4.0-latex.html new file mode 100644 index 0000000000..5342ef7e49 --- /dev/null +++ b/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-nd-4.0-latex.html @@ -0,0 +1,397 @@ +<!DOCTYPE html> +<html> +<head> +<title>Creative Commons — Attribution-NonCommercial-NoDerivatives 4.0 International — CC BY-NC-ND 4.0</title> +<meta charset="UTF-8"> +<script type="text/javascript" src="//creativecommons.org/includes/errata.js"></script> + +<meta name="viewport" content="width=device-width, initial-scale=1"> +<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700" rel="stylesheet"> +<link rel='stylesheet' id='cc-fontello-css' href="https://creativecommons.org/wp-content/themes/cc/fonts/fontello/css/cc-fontello.css" type='text/css' media='all' /> +<link rel='stylesheet' id='parent-style-css' href="https://creativecommons.org/wp-content/themes/twentysixteen/style.css" type='text/css' media='all' /> +<link rel='stylesheet' id='cc-style-css' href="https://creativecommons.org/wp-content/themes/cc/css/app.css" type='text/css' media='all' /> +<link rel="stylesheet" type="text/css" href="/includes/legalcode.css" media="screen" /> +<link rel="stylesheet" type="text/css" href="/includes/legalcode-print.css" media="print" /> +<script src="https://code.jquery.com/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=" crossorigin="anonymous"></script> + +</head> +<body class="lang-en"> + +<div class="site-header-wrapper"> +<header id="masthead" class="site-header sticky-nav-main sticky attached" role="banner"> +<div class="site-header-main"> +<div class="site-branding"> +<a class="cc-site-logo-link" href="https://creativecommons.org/" rel="home"> +<img class="cc-site-logo" src="https://creativecommons.org/wp-content/themes/cc/images/cc.logo.white.svg" height="72" width="303"> +</a> +</div> +<button id="menu-toggle" class="menu-toggle"><i class="cc-icon-menu"></i> <span>Menu</span></button> +<div id="site-header-menu" class="site-header-menu"> +<nav id="mobile-navigation" class="mobile-navigation" role="navigation" aria-label="Mobile Menu"> +<div class="menu-mobile-menu-container"><ul id="menu-mobile-menu" class="mobile-menu"> +<li id="menu-item-48798" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48798"><a href="https://creativecommons.org/share-your-work/">Share your work</a></li> +<li id="menu-item-48799" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48799"><a href="https://creativecommons.org/use-remix/">Use & remix</a></li> +<li id="menu-item-48800" class="menu-item menu-item-type-post_type menu-item-object-page page_item page-item-7466 menu-item-48800"><a href="https://creativecommons.org/about/">What we do</a></li> +<li id="menu-item-48801" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48801"><a href="https://creativecommons.org/blog/">Blog</a></li> +<li id="menu-item-48802" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48802"><a href="https://creativecommons.org/about/global-affiliate-network/">Global Affiliate Network</a></li> +<li id="menu-item-48803" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48803"><a href="https://creativecommons.org/use-remix/search-the-commons/">Search the Commons</a></li> +</ul></div> +</nav> +<nav id="site-navigation" class="main-navigation" role="navigation" aria-label="Primary Menu"> +<div class="menu-primary-menu-container"><ul id="menu-primary-menu" class="primary-menu"> +<li id="menu-item-48791" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48791"><a href="https://creativecommons.org/share-your-work/">Share your work</a></li> +<li id="menu-item-48792" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48792"><a href="https://creativecommons.org/use-remix/">Use & remix</a></li> +<li id="menu-item-48570" class="menu-item menu-item-type-post_type menu-item-object-page page_item page-item-7466 menu-item-48570"><a href="https://creativecommons.org/about/">What we do</a></li> +<li id="menu-item-48793" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48793"><a href="https://creativecommons.org/blog/">Blog</a></li> +</ul></div> +</nav> +<nav id="secondary-navigation" class="secondary-navigation" role="navigation" aria-label="Secondary Menu"> +<div class="menu-secondary-menu-container"><ul id="menu-secondary-menu" class="secondary-menu"><li id="menu-item-48804" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48804"><a href="https://creativecommons.org/about/global-affiliate-network/">Global Affiliate Network</a></li> +<li id="menu-item-48805" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48805"><a href="https://creativecommons.org/use-remix/search-the-commons/">Search the Commons</a></li> +<li id="menu-item-48806" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48806"><a href="https://creativecommons.org/about/contact/">Contact</a></li> +</ul></div> +</nav> +<nav id="social-navigation" class="social-navigation" role="navigation" aria-label="Social Links Menu"> +<div class="menu-social-links-container"><ul id="menu-social-links" class="social-links-menu"> +<li id="menu-item-48807" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48807"><a href="https://www.facebook.com/creativecommons"><span class="screen-reader-text">Facebook</span></a></li> +<li id="menu-item-48808" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48808"><a href="https://twitter.com/creativecommons"><span class="screen-reader-text">Twitter</span></a></li> +<li id="menu-item-48809" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48809"><a href="mailto:info@creativecommons.org"><span class="screen-reader-text">Mail</span></a></li> +</ul></div> +</nav> +</div> +</div> +</header> +<header class="site-header spacer" role="banner"> +<div class="site-header-main"> +<div class="site-branding"> +<a class="cc-site-logo-link" href="https://creativecommons.org/" rel="home"> +<img class="cc-site-logo" src="https://creativecommons.org/wp-content/themes/cc/images/cc.logo.white.svg" height="72" width="303"> +</a> +</div> +<button id="menu-toggle" class="menu-toggle"><i class="cc-icon-menu"></i> <span>Menu</span></button> +<div id="site-header-menu" class="site-header-menu"> +<nav id="mobile-navigation" class="mobile-navigation" role="navigation" aria-label="Mobile Menu"> +<div class="menu-mobile-menu-container"><ul id="menu-mobile-menu" class="mobile-menu"> +<li id="menu-item-48798" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48798"><a href="https://creativecommons.org/share-your-work/">Share your work</a></li> +<li id="menu-item-48799" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48799"><a href="https://creativecommons.org/use-remix/">Use & remix</a></li> +<li id="menu-item-48800" class="menu-item menu-item-type-post_type menu-item-object-page page_item page-item-7466 menu-item-48800"><a href="https://creativecommons.org/about/">What we do</a></li> +<li id="menu-item-48801" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48801"><a href="https://creativecommons.org/blog/">Blog</a></li> +<li id="menu-item-48802" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48802"><a href="https://creativecommons.org/about/global-affiliate-network/">Global Affiliate Network</a></li> +<li id="menu-item-48803" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48803"><a href="https://creativecommons.org/use-remix/search-the-commons/">Search the Commons</a></li> +</ul></div> +</nav> +<nav id="site-navigation" class="main-navigation" role="navigation" aria-label="Primary Menu"> +<div class="menu-primary-menu-container"><ul id="menu-primary-menu" class="primary-menu"> +<li id="menu-item-48791" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48791"><a href="https://creativecommons.org/share-your-work/">Share your work</a></li> +<li id="menu-item-48792" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48792"><a href="https://creativecommons.org/use-remix/">Use & remix</a></li> +<li id="menu-item-48570" class="menu-item menu-item-type-post_type menu-item-object-page page_item page-item-7466 menu-item-48570"><a href="https://creativecommons.org/about/">What we do</a></li> +<li id="menu-item-48793" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48793"><a href="https://creativecommons.org/blog/">Blog</a></li> +</ul></div> +</nav> +<nav id="secondary-navigation" class="secondary-navigation" role="navigation" aria-label="Secondary Menu"> +<div class="menu-secondary-menu-container"><ul id="menu-secondary-menu" class="secondary-menu"><li id="menu-item-48804" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48804"><a href="https://creativecommons.org/about/global-affiliate-network/">Global Affiliate Network</a></li> +<li id="menu-item-48805" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48805"><a href="https://creativecommons.org/use-remix/search-the-commons/">Search the Commons</a></li> +<li id="menu-item-48806" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48806"><a href="https://creativecommons.org/about/contact/">Contact</a></li> +</ul></div> +</nav> +<nav id="social-navigation" class="social-navigation" role="navigation" aria-label="Social Links Menu"> +<div class="menu-social-links-container"><ul id="menu-social-links" class="social-links-menu"> +<li id="menu-item-48807" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48807"><a href="https://www.facebook.com/creativecommons"><span class="screen-reader-text">Facebook</span></a></li> +<li id="menu-item-48808" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48808"><a href="https://twitter.com/creativecommons"><span class="screen-reader-text">Twitter</span></a></li> +<li id="menu-item-48809" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48809"><a href="mailto:info@creativecommons.org"><span class="screen-reader-text">Mail</span></a></li> +</ul></div> +</nav> +</div> +</div> +</header> +</div> +<aside id="header-below" class="widget-area"> +<section id="text-15" class="widget-1 widget-first widget-last widget-odd widget widget_text"> +<div class="textwidget"> +<div id="donation-bar-wrapper" class="donation-bar-wrapper"> +<div id="donation-bar-inner" class="donation-bar-inner"> +<p class="donate-text">Help us build a vibrant, collaborative global commons</p> +<div class="donate-action"><a href="/donate?utm_campaign=2018fund&utm_source=license_header2018" class="button donate arrow">Donate<span class="hide-on-mobile"> Now</span></a></div> +</div> +</div> +</div> +</section> +</aside> + + +<div id="language-selector-block" class="container"> +<div class="language-selector-inner"> +This page is available in the following languages: +<img class="language-icon" src="/images/language_icon_x2.png" alt="Languages"> +<select> +<option value="legalcode.ar">العربية</option> +<option value="legalcode.cs">ÄeÅ¡tina</option> +<option value="legalcode.de">Deutsch</option> +<option value="legalcode.el">Ελληνικά</option> +<option value="legalcode" selected="selected">English</option> +<option value="legalcode.es">Español</option> +<option value="legalcode.eu">euskara</option> +<option value="legalcode.fi">suomeksi</option> +<option value="legalcode.fr">français</option> +<option value="legalcode.hr">hrvatski</option> +<option value="legalcode.id">Bahasa Indonesia</option> +<option value="legalcode.it">italiano</option> +<option value="legalcode.ja">日本語</option> +<option value="legalcode.ko">í•œêµì–´</option> +<option value="legalcode.lt">Lietuvių</option> +<option value="legalcode.lv">latviski</option> +<option value="legalcode.mi">te reo MÄori</option> +<option value="legalcode.nl">Nederlands</option> +<option value="legalcode.no">norsk</option> +<option value="legalcode.pl">polski</option> +<option value="legalcode.pt">português</option> +<option value="legalcode.ro">română</option> +<option value="legalcode.ru">руÑÑкий</option> +<option value="legalcode.sl">SlovenÅ¡Äina</option> +<option value="legalcode.sv">svenska</option> +<option value="legalcode.tr">Türkçe</option> +<option value="legalcode.uk">українÑька</option> +<option value="legalcode.zh-Hans">ä¸æ–‡</option> +<option value="legalcode.zh-Hant">è¯èªž</option> +</select> +</div> +</div> + + +<div id="deed" class="yellow"> +<div id="deed-head"> +<div id="cc-logo"><span class="cc-icon-logo"><img src="/images/deed/svg/cc_white.svg" alt="CC" /></span><span class="cc-icon-by"><img src="/images/deed/svg/attribution_icon_white.svg" alt="Attribution" /></span><span class="cc-icon-nc"><img src="/images/deed/svg/nc_white.svg" alt="Non-Commerical" /></span><span class="cc-icon-nd"><img src="/images/deed/svg/nd_white.svg" alt="No Derivatives" /></span></div> +<h1><span>Creative Commons Legal Code</span></h1> +<div id="deed-license"> +<h2>Attribution-NonCommercial-NoDerivatives 4.0 International</h2> +</div> +</div> +<div id="deed-main"> +<div id="deed-main-content"> +<div id="deed-disclaimer"> +<div class="summary"> +Official translations of this license are available <a href="#languages">in other languages</a>. +</div> +</div> +<div class="shaded"> +<p>Creative Commons Corporation (“Creative Commonsâ€) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is†basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible.</p> +</div> +<div class="shaded"> +<p><strong>Using Creative Commons Public Licenses</strong></p> +<p>Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses.</p> +<p class="usage-considerations"><strong>Considerations for licensors:</strong> Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. <a href="//wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensors">More considerations for licensors.</a></p> +<p class="usage-considerations"><strong>Considerations for the public:</strong> By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensor’s permission is not necessary for any reason–for example, because of any applicable exception or limitation to copyright–then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to respect those requests where reasonable. +<a href="//wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensees">More considerations for the public.</a></p> +</div> +<h3>Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License</h3> +<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p> +<p id="s1"><strong>Section 1 – Definitions.</strong></p> +<ol type="a"> +<li id="s1a"><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li> +<li id="s1b"><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section <a href="#s2b">2(b)(1)-(2)</a> are not Copyright and Similar Rights.</li> +<li id="s1c"><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may not +be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar +international agreements.</li> +<li id="s1d"><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li> +<li id="s1e"><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li> +<li id="s1f"><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li> +<li id="s1g"><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li> +<li id="s1h"><strong>NonCommercial</strong> means not primarily intended for or directed towards commercial advantage or monetary compensation. For purposes of this Public License, the exchange of the Licensed Material for other material subject to Copyright and Similar Rights by digital file-sharing or similar means is NonCommercial provided there is no payment of monetary compensation in connection with the exchange.</li> +<li id="s1i"><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li> +<li id="s1j"><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li> +<li id="s1k"><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li> +</ol> +<p id="s2"><strong>Section 2 – Scope.</strong></p> +<ol type="a"> +<li id="s2a"><strong>License grant</strong>. +<ol> +<li id="s2a1">Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to: +<ol type="A"> +<li id="s2a1A">reproduce and Share the Licensed Material, in whole or in part, for NonCommercial purposes only; and</li> +<li id="s2a1B">produce and reproduce, but not Share, Adapted Material for NonCommercial purposes only.</li> +</ol> +<li id="s2a2"><span style="text-decoration: underline;">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li> +<li id="s2a3"><span style="text-decoration: underline;">Term</span>. The term of this Public License is specified in Section <a href="#s6a">6(a)</a>.</li> +<li id="s2a4"><span style="text-decoration: underline;">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section <a href="#s2a4">2(a)(4)</a> never produces Adapted Material.</li> +<li id="s2a5"><span style="text-decoration: underline;">Downstream recipients</span>. +<div class="para"> + <ol type="A"> +<li id="s2a5A"><span style="text-decoration: underline;">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li> +<li id="s2a5B"><span style="text-decoration: underline;">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li> +</ol> +</div> +<li id="s2a6"><span style="text-decoration: underline;">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section <a href="#s3a1Ai">3(a)(1)(A)(i)</a>.</li> +</ol> +<li id="s2b"><p><strong>Other rights</strong>.</p> +<ol> +<li id="s2b1">Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li> +<li id="s2b2">Patent and trademark rights are not licensed under this Public License.</li> +<li id="s2b3">To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties, including when the Licensed Material is used other than for NonCommercial purposes.</li> +</ol> +</li> +</ol> +<p id="s3"><strong>Section 3 – License Conditions.</strong></p> +<p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p> +<ol type="a"> +<li id="s3a"><p><strong>Attribution</strong>.</p> +<ol> +<li id="s3a1"><p>If You Share the Licensed Material, You must:</p> +<ol type="A"> +<li id="s3a1A">retain the following if it is supplied by the Licensor with the Licensed Material: +<ol type="i"> +<li id="s3a1Ai">identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li> +<li id="s3a1Aii">a copyright notice;</li> +<li id="s3a1Aiii">a notice that refers to this Public License; </li> +<li id="s3a1Aiv">a notice that refers to the disclaimer of warranties;</li> +<li id="s3a1Av">a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li> +</ol> +<li id="s3a1B">indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li> +<li id="s3a1C">indicate the Licensed Material is licensed under this Public License, +and include the text of, or the URI or hyperlink to, this Public +License.</li> +</ol> +For the avoidance of doubt, You do not have permission under this Public License to Share Adapted Material. +</li> +<li id="s3a2">You may satisfy the conditions in Section <a href="#s3a1">3(a)(1)</a> in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li> +<li id="s3a3">If requested by the Licensor, You must remove any of the information required by Section <a href="#s3a1A">3(a)(1)(A)</a> to the extent reasonably practicable.</li> +</ol> +</li> +</ol> +<p id="s4"><strong>Section 4 – Sui Generis Database Rights.</strong></p> +<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p> +<ol type="a"> +<li id="s4a">for the avoidance of doubt, Section <a href="#s2a1">2(a)(1)</a> grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database for NonCommercial purposes only and provided You do not Share Adapted Material;</li> +<li id="s4b">if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and</li> +<li id="s4c">You must comply with the conditions in Section <a href="#s3a">3(a)</a> if You Share all or a substantial portion of the contents of the database.</li> +</ol> +For the avoidance of doubt, this Section <a href="#s4">4</a> supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights. +<p id="s5"><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p> +<ol style="font-weight: bold;" type="a"> +<li id="s5a"><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li> +<li id="s5b"><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li> +</ol> +<ol start="3" type="a"> +<li id="s5c">The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li> +</ol> +<p id="s6"><strong>Section 6 – Term and Termination.</strong></p> +<ol type="a"> +<li id="s6a">This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li> +<li id="s6b"> +<p>Where Your right to use the Licensed Material has terminated under Section <a href="#s6a">6(a)</a>, it reinstates:</p> +<ol> +<li id="s6b1">automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li> +<li id="s6b2">upon express reinstatement by the Licensor.</li> +</ol> +For the avoidance of doubt, this Section <a href="#s6b">6(b)</a> does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.</li> +<li id="s6c">For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li> +<li id="s6d">Sections <a href="#s1">1</a>, <a href="#s5">5</a>, <a href="#s6">6</a>, <a href="#s7">7</a>, and <a href="#s8">8</a> survive termination of this Public License.</li> +</ol> +<p id="s7"><strong>Section 7 – Other Terms and Conditions.</strong></p> +<ol type="a"> +<li id="s7a">The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li> +<li id="s7b">Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li> +</ol> +<p id="s8"><strong>Section 8 – Interpretation.</strong></p> +<ol type="a"> +<li id="s8a">For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li> +<li id="s8b">To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li> +<li id="s8c">No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li> +<li id="s8d">Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li> +</ol> + +<p class="shaded">Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.†The text of the Creative Commons public licenses is dedicated to the public domain under the <a href="//creativecommons.org/publicdomain/zero/1.0/legalcode">CC0 Public Domain Dedication</a>. Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at <a href="//creativecommons.org/policies">creativecommons.org/policies</a>, Creative Commons does not authorize the use of the trademark “Creative Commons†or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses.<br><br> +Creative Commons may be contacted at <a href="//creativecommons.org/">creativecommons.org</a>.</p> +<p class="shaded"><a id="languages"></a>Additional languages available: + +<a href="/licenses/by-nc-nd/4.0/legalcode.ar">العربية</a>, +<a href="/licenses/by-nc-nd/4.0/legalcode.cs">ÄeÅ¡tina</a>, +<a href="/licenses/by-nc-nd/4.0/legalcode.de">Deutsch</a>, +<a href="/licenses/by-nc-nd/4.0/legalcode.el">Ελληνικά</a>, +<a href="/licenses/by-nc-nd/4.0/legalcode.es">Español</a>, +<a href="/licenses/by-nc-nd/4.0/legalcode.eu">euskara</a>, +<a href="/licenses/by-nc-nd/4.0/legalcode.fi">suomeksi</a>, +<a href="/licenses/by-nc-nd/4.0/legalcode.fr">français</a>, +<a href="/licenses/by-nc-nd/4.0/legalcode.hr">hrvatski</a>, +<a href="/licenses/by-nc-nd/4.0/legalcode.id">Bahasa Indonesia</a>, +<a href="/licenses/by-nc-nd/4.0/legalcode.it">italiano</a>, +<a href="/licenses/by-nc-nd/4.0/legalcode.ja">日本語</a>, +<a href="/licenses/by-nc-nd/4.0/legalcode.ko">í•œêµì–´</a>, +<a href="/licenses/by-nc-nd/4.0/legalcode.lt">Lietuvių</a>, +<a href="/licenses/by-nc-nd/4.0/legalcode.lv">latviski</a>, +<a href="/licenses/by-nc-nd/4.0/legalcode.mi">te reo MÄori</a>, +<a href="/licenses/by-nc-nd/4.0/legalcode.nl">Nederlands</a>, +<a href="/licenses/by-nc-nd/4.0/legalcode.no">norsk</a>, +<a href="/licenses/by-nc-nd/4.0/legalcode.pl">polski</a>, +<a href="/licenses/by-nc-nd/4.0/legalcode.pt">português</a>, +<a href="/licenses/by-nc-nd/4.0/legalcode.ro">română</a>, +<a href="/licenses/by-nc-nd/4.0/legalcode.ru">руÑÑкий</a>, +<a href="/licenses/by-nc-nd/4.0/legalcode.sl">SlovenÅ¡Äina</a>, +<a href="/licenses/by-nc-nd/4.0/legalcode.sv">svenska</a>, +<a href="/licenses/by-nc-nd/4.0/legalcode.tr">Türkçe</a>, +<a href="/licenses/by-nc-nd/4.0/legalcode.uk">українÑька</a>, +<a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hans">ä¸æ–‡</a>, +<a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hant">è¯èªž</a>. + +Please read the <a href="/faq/#officialtranslations">FAQ</a> for more information about official translations.</p> +</div> +</div> +<div id="deed-foot"> +<p id="footer"><a href="./">« Back to Commons Deed</a></p> +</div> +</div> + +<div class="site-footer-wrapper"> +<footer id="colophon" class="site-footer sticky-nav-main" role="contentinfo"> +<div class="cc-footer"> +<div class="column cc-footer-main"> +<div class="cc-footer-logo"> +<a href="https://creativecommons.org/" class="custom-logo-link" rel="home" itemprop="url"><img src="https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_.png" class="custom-logo" alt="cc.logo.white" itemprop="logo" srcset="https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_.png 980w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-300x73.png 300w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-768x188.png 768w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-140x34.png 140w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-50x12.png 50w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-270x66.png 270w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-245x60.png 245w" sizes="(max-width: 709px) 85vw, (max-width: 909px) 67vw, (max-width: 1362px) 62vw, 840px" height="240" width="980"></a> +</div> +<div class="cc-footer-links"> +<div class="menu-footer-links-container"> +<ul id="menu-footer-links" class="menu"> +<li id="menu-item-48794" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48794"><a href="https://creativecommons.org/about/contact/">Contact</a></li> +<li id="menu-item-48795" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48795"><a href="https://creativecommons.org/privacy/">Privacy</a></li> +<li id="menu-item-48796" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48796"><a href="https://creativecommons.org/policies/">Policies</a></li> +<li id="menu-item-48797" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48797"><a href="https://creativecommons.org/terms/">Terms</a></li> +</ul> +</div> +</div> +</div> +<div class="column cc-footer-contact"> +<h6><a href="https://creativecommons.org/about/contact">We'd love to hear from you!</a></h6> +<address> +Creative Commons<br> +PO Box 1866, Mountain View, CA 94042 +</address> +<ul> +<li><a href="mailto:info@creativecommons.org" class="mail">info@creativecommons.org</a></li> +<li><a href="https://creativecommons.org/faq">Frequently Asked Questions</a></li> +</ul> +</div> +<div class="column cc-footer-license"> +<div class="license-icons"> +<a rel="license" href="https://creativecommons.org/licenses/by/4.0/" title="Creative Commons Attribution 4.0 International license"> +<i class="cc-icon-cc"></i> +<i class="cc-icon-cc-by"></i> +</a> +</div> +<aside> +<div xmlns:cc="https://creativecommons.org/ns#" about="https://creativecommons.org"> +<p>Except where otherwise <a class="subfoot" href="https://creativecommons.org/policies#license">noted</a>, content on this site is licensed under a <a class="subfoot" href="https://creativecommons.org/licenses/by/4.0/" rel="license">Creative Commons Attribution 4.0 International license</a>. <a class="subfoot" href="https://creativecommons.org/website-icons" target="blank">Icons</a> by The Noun Project.</p> +</div> +</aside> +</div> +</div> +</footer> +</div> +<script type='text/javascript'> + /* <![CDATA[ */ + var screenReaderText = {"expand":"expand child menu","collapse":"collapse child menu"}; + /* ]]> */ +</script> +<script type='text/javascript' src='https://creativecommons.org/wp-content/themes/twentysixteen/js/functions.js'></script> +<script type='text/javascript' src='/includes/legalcode.js'></script> + +</body> +</html> diff --git a/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-sa-3.0-latex.html b/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-sa-3.0-latex.html new file mode 100644 index 0000000000..43d0bfd9e9 --- /dev/null +++ b/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-sa-3.0-latex.html @@ -0,0 +1,472 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta name="generator" content="HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" /> +<title>Creative Commons Legal Code</title> +<meta http-equiv="content-type" content="text/html; charset=utf-8" /> +<link rel="stylesheet" type="text/css" href="https://creativecommons.org/includes/deed3.css" media="screen" /> +<link rel="stylesheet" type="text/css" href="https://creativecommons.org/includes/deed3-print.css" media="print" /> +<!--[if lt IE 7]><link rel="stylesheet" type="text/css" href="https://creativecommons.org/includes/deed3-ie.css" media="screen" /><![endif]--> +<script type="text/javascript" src="https://creativecommons.org/includes/errata.js"> +</script> +</head> +<body> +<p align="center" id="header"><a href="https://creativecommons.org/">Creative Commons</a></p> +<div id="deed" class="yellow"> +<div id="deed-head"> +<div id="cc-logo"> +<img src="https://creativecommons.org/images/deed/cc-logo.jpg" alt="" /> +</div> +<h1><span>Creative Commons Legal Code</span></h1> +<div id="deed-license"> +<h2>Attribution-NonCommercial-ShareAlike 3.0 Unported</h2> +</div> +</div> +<div id="deed-main"> +<div id="deed-main-content"> +<img src="https://creativecommons.org/images/international/unported.png" alt="" /> +<blockquote> +CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES +NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE +DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE +COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. +CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE +INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES +RESULTING FROM ITS USE. +</blockquote> +<h3><em>License</em></h3> +<p>THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS +OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR +"LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER +APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS +AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS +PROHIBITED.</p> +<p>BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU +ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. +TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A +CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE +IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND +CONDITIONS.</p> +<p><strong>1. Definitions</strong></p> +<ol type="a"> +<li><strong>"Adaptation"</strong> means a work based upon +the Work, or upon the Work and other pre-existing works, +such as a translation, adaptation, derivative work, +arrangement of music or other alterations of a literary +or artistic work, or phonogram or performance and +includes cinematographic adaptations or any other form in +which the Work may be recast, transformed, or adapted +including in any form recognizably derived from the +original, except that a work that constitutes a +Collection will not be considered an Adaptation for the +purpose of this License. For the avoidance of doubt, +where the Work is a musical work, performance or +phonogram, the synchronization of the Work in +timed-relation with a moving image ("synching") will be +considered an Adaptation for the purpose of this +License.</li> +<li><strong>"Collection"</strong> means a collection of +literary or artistic works, such as encyclopedias and +anthologies, or performances, phonograms or broadcasts, +or other works or subject matter other than works listed +in Section 1(g) below, which, by reason of the selection +and arrangement of their contents, constitute +intellectual creations, in which the Work is included in +its entirety in unmodified form along with one or more +other contributions, each constituting separate and +independent works in themselves, which together are +assembled into a collective whole. A work that +constitutes a Collection will not be considered an +Adaptation (as defined above) for the purposes of this +License.</li> +<li><strong>"Distribute"</strong> means to make available +to the public the original and copies of the Work or +Adaptation, as appropriate, through sale or other +transfer of ownership.</li> +<li><strong>"License Elements"</strong> means the +following high-level license attributes as selected by +Licensor and indicated in the title of this License: +Attribution, Noncommercial, ShareAlike.</li> +<li><strong>"Licensor"</strong> means the individual, +individuals, entity or entities that offer(s) the Work +under the terms of this License.</li> +<li><strong>"Original Author"</strong> means, in the case +of a literary or artistic work, the individual, +individuals, entity or entities who created the Work or +if no individual or entity can be identified, the +publisher; and in addition (i) in the case of a +performance the actors, singers, musicians, dancers, and +other persons who act, sing, deliver, declaim, play in, +interpret or otherwise perform literary or artistic works +or expressions of folklore; (ii) in the case of a +phonogram the producer being the person or legal entity +who first fixes the sounds of a performance or other +sounds; and, (iii) in the case of broadcasts, the +organization that transmits the broadcast.</li> +<li><strong>"Work"</strong> means the literary and/or +artistic work offered under the terms of this License +including without limitation any production in the +literary, scientific and artistic domain, whatever may be +the mode or form of its expression including digital +form, such as a book, pamphlet and other writing; a +lecture, address, sermon or other work of the same +nature; a dramatic or dramatico-musical work; a +choreographic work or entertainment in dumb show; a +musical composition with or without words; a +cinematographic work to which are assimilated works +expressed by a process analogous to cinematography; a +work of drawing, painting, architecture, sculpture, +engraving or lithography; a photographic work to which +are assimilated works expressed by a process analogous to +photography; a work of applied art; an illustration, map, +plan, sketch or three-dimensional work relative to +geography, topography, architecture or science; a +performance; a broadcast; a phonogram; a compilation of +data to the extent it is protected as a copyrightable +work; or a work performed by a variety or circus +performer to the extent it is not otherwise considered a +literary or artistic work.</li> +<li><strong>"You"</strong> means an individual or entity +exercising rights under this License who has not +previously violated the terms of this License with +respect to the Work, or who has received express +permission from the Licensor to exercise rights under +this License despite a previous violation.</li> +<li><strong>"Publicly Perform"</strong> means to perform +public recitations of the Work and to communicate to the +public those public recitations, by any means or process, +including by wire or wireless means or public digital +performances; to make available to the public Works in +such a way that members of the public may access these +Works from a place and at a place individually chosen by +them; to perform the Work to the public by any means or +process and the communication to the public of the +performances of the Work, including by public digital +performance; to broadcast and rebroadcast the Work by any +means including signs, sounds or images.</li> +<li><strong>"Reproduce"</strong> means to make copies of +the Work by any means including without limitation by +sound or visual recordings and the right of fixation and +reproducing fixations of the Work, including storage of a +protected performance or phonogram in digital form or +other electronic medium.</li> +</ol> +<p><strong>2. Fair Dealing Rights.</strong> Nothing in this +License is intended to reduce, limit, or restrict any uses +free from copyright or rights arising from limitations or +exceptions that are provided for in connection with the +copyright protection under copyright law or other +applicable laws.</p> +<p><strong>3. License Grant.</strong> Subject to the terms +and conditions of this License, Licensor hereby grants You +a worldwide, royalty-free, non-exclusive, perpetual (for +the duration of the applicable copyright) license to +exercise the rights in the Work as stated below:</p> +<ol type="a"> +<li>to Reproduce the Work, to incorporate the Work into +one or more Collections, and to Reproduce the Work as +incorporated in the Collections;</li> +<li>to create and Reproduce Adaptations provided that any +such Adaptation, including any translation in any medium, +takes reasonable steps to clearly label, demarcate or +otherwise identify that changes were made to the original +Work. For example, a translation could be marked "The +original work was translated from English to Spanish," or +a modification could indicate "The original work has been +modified.";</li> +<li>to Distribute and Publicly Perform the Work including +as incorporated in Collections; and,</li> +<li>to Distribute and Publicly Perform Adaptations.</li> +</ol> +<p>The above rights may be exercised in all media and +formats whether now known or hereafter devised. The above +rights include the right to make such modifications as are +technically necessary to exercise the rights in other media +and formats. Subject to Section 8(f), all rights not +expressly granted by Licensor are hereby reserved, +including but not limited to the rights described in +Section 4(e).</p> +<p><strong>4. Restrictions.</strong> The license granted in +Section 3 above is expressly made subject to and limited by +the following restrictions:</p> +<ol type="a"> +<li>You may Distribute or Publicly Perform the Work only +under the terms of this License. You must include a copy +of, or the Uniform Resource Identifier (URI) for, this +License with every copy of the Work You Distribute or +Publicly Perform. You may not offer or impose any terms +on the Work that restrict the terms of this License or +the ability of the recipient of the Work to exercise the +rights granted to that recipient under the terms of the +License. You may not sublicense the Work. You must keep +intact all notices that refer to this License and to the +disclaimer of warranties with every copy of the Work You +Distribute or Publicly Perform. When You Distribute or +Publicly Perform the Work, You may not impose any +effective technological measures on the Work that +restrict the ability of a recipient of the Work from You + to exercise the rights granted to that recipient under +the terms of the License. This Section 4(a) applies to +the Work as incorporated in a Collection, but this does +not require the Collection apart from the Work itself to +be made subject to the terms of this License. If You +create a Collection, upon notice from any Licensor You +must, to the extent practicable, remove from the +Collection any credit as required by Section 4(d), as +requested. If You create an Adaptation, upon notice from +any Licensor You must, to the extent practicable, remove +from the Adaptation any credit as required by Section +4(d), as requested.</li> +<li>You may Distribute or Publicly Perform an Adaptation +only under: (i) the terms of this License; (ii) a later +version of this License with the same License Elements as +this License; (iii) a Creative Commons jurisdiction +license (either this or a later license version) that +contains the same License Elements as this License (e.g., +Attribution-NonCommercial-ShareAlike 3.0 US) ("Applicable +License"). You must include a copy of, or the URI, for +Applicable License with every copy of each Adaptation You +Distribute or Publicly Perform. You may not offer or +impose any terms on the Adaptation that restrict the +terms of the Applicable License or the ability of the +recipient of the Adaptation to exercise the rights +granted to that recipient under the terms of the +Applicable License. You must keep intact all notices that +refer to the Applicable License and to the disclaimer of +warranties with every copy of the Work as included in the +Adaptation You Distribute or Publicly Perform. When You +Distribute or Publicly Perform the Adaptation, You may +not impose any effective technological measures on the +Adaptation that restrict the ability of a recipient of +the Adaptation from You to exercise the rights granted to +that recipient under the terms of the Applicable License. +This Section 4(b) applies to the Adaptation as +incorporated in a Collection, but this does not require +the Collection apart from the Adaptation itself to be +made subject to the terms of the Applicable License.</li> +<li>You may not exercise any of the rights granted to You +in Section 3 above in any manner that is primarily +intended for or directed toward commercial advantage or +private monetary compensation. The exchange of the Work +for other copyrighted works by means of digital +file-sharing or otherwise shall not be considered to be +intended for or directed toward commercial advantage or +private monetary compensation, provided there is no +payment of any monetary compensation in con-nection with +the exchange of copyrighted works.</li> +<li>If You Distribute, or Publicly Perform the Work or +any Adaptations or Collections, You must, unless a +request has been made pursuant to Section 4(a), keep +intact all copyright notices for the Work and provide, +reasonable to the medium or means You are utilizing: (i) +the name of the Original Author (or pseudonym, if +applicable) if supplied, and/or if the Original Author +and/or Licensor designate another party or parties (e.g., +a sponsor institute, publishing entity, journal) for +attribution ("Attribution Parties") in Licensor's +copyright notice, terms of service or by other reasonable +means, the name of such party or parties; (ii) the title +of the Work if supplied; (iii) to the extent reasonably +practicable, the URI, if any, that Licensor specifies to +be associated with the Work, unless such URI does not +refer to the copyright notice or licensing information +for the Work; and, (iv) consistent with Section 3(b), in +the case of an Adaptation, a credit identifying the use +of the Work in the Adaptation (e.g., "French translation +of the Work by Original Author," or "Screenplay based on +original Work by Original Author"). The credit required +by this Section 4(d) may be implemented in any reasonable +manner; provided, however, that in the case of a +Adaptation or Collection, at a minimum such credit will +appear, if a credit for all contributing authors of the +Adaptation or Collection appears, then as part of these +credits and in a manner at least as prominent as the +credits for the other contributing authors. For the +avoidance of doubt, You may only use the credit required +by this Section for the purpose of attribution in the +manner set out above and, by exercising Your rights under +this License, You may not implicitly or explicitly assert +or imply any connection with, sponsorship or endorsement +by the Original Author, Licensor and/or Attribution +Parties, as appropriate, of You or Your use of the Work, +without the separate, express prior written permission of +the Original Author, Licensor and/or Attribution +Parties.</li> +<li> +<p>For the avoidance of doubt:</p> +<ol type="i"> +<li><strong>Non-waivable Compulsory License +Schemes</strong>. In those jurisdictions in which the +right to collect royalties through any statutory or +compulsory licensing scheme cannot be waived, the +Licensor reserves the exclusive right to collect such +royalties for any exercise by You of the rights +granted under this License;</li> +<li><strong>Waivable Compulsory License +Schemes</strong>. In those jurisdictions in which the +right to collect royalties through any statutory or +compulsory licensing scheme can be waived, the +Licensor reserves the exclusive right to collect such +royalties for any exercise by You of the rights +granted under this License if Your exercise of such +rights is for a purpose or use which is otherwise +than noncommercial as permitted under Section 4(c) +and otherwise waives the right to collect royalties +through any statutory or compulsory licensing scheme; +and,</li> +<li><strong>Voluntary License Schemes</strong>. The +Licensor reserves the right to collect royalties, +whether individually or, in the event that the +Licensor is a member of a collecting society that +administers voluntary licensing schemes, via that +society, from any exercise by You of the rights +granted under this License that is for a purpose or +use which is otherwise than noncommercial as +permitted under Section 4(c).</li> +</ol> +</li> +<li>Except as otherwise agreed in writing by the Licensor +or as may be otherwise permitted by applicable law, if +You Reproduce, Distribute or Publicly Perform the Work +either by itself or as part of any Adaptations or +Collections, You must not distort, mutilate, modify or +take other derogatory action in relation to the Work +which would be prejudicial to the Original Author's honor +or reputation. Licensor agrees that in those +jurisdictions (e.g. Japan), in which any exercise of the +right granted in Section 3(b) of this License (the right +to make Adaptations) would be deemed to be a distortion, +mutilation, modification or other derogatory action + prejudicial to the Original Author's honor and +reputation, the Licensor will waive or not assert, as +appropriate, this Section, to the fullest extent +permitted by the applicable national law, to enable You +to reasonably exercise Your right under Section 3(b) of +this License (right to make Adaptations) but not +otherwise.</li> +</ol> +<p><strong>5. Representations, Warranties and +Disclaimer</strong></p> +<p>UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN +WRITING AND TO THE FULLEST EXTENT PERMITTED BY APPLICABLE +LAW, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO +REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE +WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, +WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE +ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE +PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. +SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED +WARRANTIES, SO THIS EXCLUSION MAY NOT APPLY TO YOU.</p> +<p><strong>6. Limitation on Liability.</strong> EXCEPT TO +THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL +LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY +SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY +DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, +EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES.</p> +<p><strong>7. Termination</strong></p> +<ol type="a"> +<li>This License and the rights granted hereunder will +terminate automatically upon any breach by You of the +terms of this License. Individuals or entities who have +received Adaptations or Collections from You under this +License, however, will not have their licenses terminated +provided such individuals or entities remain in full +compliance with those licenses. Sections 1, 2, 5, 6, 7, +and 8 will survive any termination of this License.</li> +<li>Subject to the above terms and conditions, the +license granted here is perpetual (for the duration of +the applicable copyright in the Work). Notwithstanding +the above, Licensor reserves the right to release the +Work under different license terms or to stop +distributing the Work at any time; provided, however that +any such election will not serve to withdraw this License +(or any other license that has been, or is required to +be, granted under the terms of this License), and this +License will continue in full force and effect unless +terminated as stated above.</li> +</ol> +<p><strong>8. Miscellaneous</strong></p> +<ol type="a"> +<li>Each time You Distribute or Publicly Perform the Work +or a Collection, the Licensor offers to the recipient a +license to the Work on the same terms and conditions as +the license granted to You under this License.</li> +<li>Each time You Distribute or Publicly Perform an +Adaptation, Licensor offers to the recipient a license to +the original Work on the same terms and conditions as the +license granted to You under this License.</li> +<li>If any provision of this License is invalid or +unenforceable under applicable law, it shall not affect +the validity or enforceability of the remainder of the +terms of this License, and without further action by the +parties to this agreement, such provision shall be +reformed to the minimum extent necessary to make such +provision valid and enforceable.</li> +<li>No term or provision of this License shall be deemed +waived and no breach consented to unless such waiver or +consent shall be in writing and signed by the party to be +charged with such waiver or consent.</li> +<li>This License constitutes the entire agreement between +the parties with respect to the Work licensed here. There +are no understandings, agreements or representations with +respect to the Work not specified here. Licensor shall +not be bound by any additional provisions that may appear +in any communication from You. This License may not be +modified without the mutual written agreement of the +Licensor and You.</li> +<li>The rights granted under, and the subject matter +referenced, in this License were drafted utilizing the +terminology of the Berne Convention for the Protection of +Literary and Artistic Works (as amended on September 28, +1979), the Rome Convention of 1961, the WIPO Copyright +Treaty of 1996, the WIPO Performances and Phonograms +Treaty of 1996 and the Universal Copyright Convention (as +revised on July 24, 1971). These rights and subject +matter take effect in the relevant jurisdiction in which +the License terms are sought to be enforced according to +the corresponding provisions of the implementation of +those treaty provisions in the applicable national law. +If the standard suite of rights granted under applicable +copyright law includes additional rights not granted +under this License, such additional rights are deemed to +be included in the License; this License is not intended +to restrict the license of any rights under applicable +law.</li> +</ol> + +<blockquote> +<h3>Creative Commons Notice</h3> +<p>Creative Commons is not a party to this License, and +makes no warranty whatsoever in connection with the Work. +Creative Commons will not be liable to You or any party +on any legal theory for any damages whatsoever, including +without limitation any general, special, incidental or +consequential damages arising in connection to this +license. Notwithstanding the foregoing two (2) sentences, +if Creative Commons has expressly identified itself as +the Licensor hereunder, it shall have all rights and +obligations of Licensor.</p> +<p>Except for the limited purpose of indicating to the +public that the Work is licensed under the CCPL, Creative +Commons does not authorize the use by either party of the +trademark "Creative Commons" or any related trademark or +logo of Creative Commons without the prior written +consent of Creative Commons. Any permitted use will be in +compliance with Creative Commons' then-current trademark +usage guidelines, as may be published on its website or +otherwise made available upon request from time to time. +For the avoidance of doubt, this trademark restriction +does not form part of this License.</p> +<p>Creative Commons may be contacted at <a href="https://creativecommons.org/">https://creativecommons.org/</a>.</p> +</blockquote> +</div> +</div> +<div id="deed-foot"> +<p id="footer"><a href="./">« Back to Commons Deed</a></p> +</div> +</div> +</body> +</html> diff --git a/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-sa-4.0-latex.html b/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-sa-4.0-latex.html new file mode 100644 index 0000000000..e76f866fcd --- /dev/null +++ b/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nc-sa-4.0-latex.html @@ -0,0 +1,409 @@ +<!DOCTYPE html> +<html> +<head> +<title>Creative Commons — Attribution-NonCommercial-ShareAlike 4.0 International — CC BY-NC-SA 4.0</title> +<meta charset="UTF-8"> +<script type="text/javascript" src="//creativecommons.org/includes/errata.js"></script> + +<meta name="viewport" content="width=device-width, initial-scale=1"> +<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700" rel="stylesheet"> +<link rel='stylesheet' id='cc-fontello-css' href="https://creativecommons.org/wp-content/themes/cc/fonts/fontello/css/cc-fontello.css" type='text/css' media='all' /> +<link rel='stylesheet' id='parent-style-css' href="https://creativecommons.org/wp-content/themes/twentysixteen/style.css" type='text/css' media='all' /> +<link rel='stylesheet' id='cc-style-css' href="https://creativecommons.org/wp-content/themes/cc/css/app.css" type='text/css' media='all' /> +<link rel="stylesheet" type="text/css" href="/includes/legalcode.css" media="screen" /> +<link rel="stylesheet" type="text/css" href="/includes/legalcode-print.css" media="print" /> +<script src="https://code.jquery.com/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=" crossorigin="anonymous"></script> + +</head> +<body class="lang-en"> + +<div class="site-header-wrapper"> +<header id="masthead" class="site-header sticky-nav-main sticky attached" role="banner"> +<div class="site-header-main"> +<div class="site-branding"> +<a class="cc-site-logo-link" href="https://creativecommons.org/" rel="home"> +<img class="cc-site-logo" src="https://creativecommons.org/wp-content/themes/cc/images/cc.logo.white.svg" height="72" width="303"> +</a> +</div> +<button id="menu-toggle" class="menu-toggle"><i class="cc-icon-menu"></i> <span>Menu</span></button> +<div id="site-header-menu" class="site-header-menu"> +<nav id="mobile-navigation" class="mobile-navigation" role="navigation" aria-label="Mobile Menu"> +<div class="menu-mobile-menu-container"><ul id="menu-mobile-menu" class="mobile-menu"> +<li id="menu-item-48798" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48798"><a href="https://creativecommons.org/share-your-work/">Share your work</a></li> +<li id="menu-item-48799" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48799"><a href="https://creativecommons.org/use-remix/">Use & remix</a></li> +<li id="menu-item-48800" class="menu-item menu-item-type-post_type menu-item-object-page page_item page-item-7466 menu-item-48800"><a href="https://creativecommons.org/about/">What we do</a></li> +<li id="menu-item-48801" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48801"><a href="https://creativecommons.org/blog/">Blog</a></li> +<li id="menu-item-48802" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48802"><a href="https://creativecommons.org/about/global-affiliate-network/">Global Affiliate Network</a></li> +<li id="menu-item-48803" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48803"><a href="https://creativecommons.org/use-remix/search-the-commons/">Search the Commons</a></li> +</ul></div> +</nav> +<nav id="site-navigation" class="main-navigation" role="navigation" aria-label="Primary Menu"> +<div class="menu-primary-menu-container"><ul id="menu-primary-menu" class="primary-menu"> +<li id="menu-item-48791" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48791"><a href="https://creativecommons.org/share-your-work/">Share your work</a></li> +<li id="menu-item-48792" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48792"><a href="https://creativecommons.org/use-remix/">Use & remix</a></li> +<li id="menu-item-48570" class="menu-item menu-item-type-post_type menu-item-object-page page_item page-item-7466 menu-item-48570"><a href="https://creativecommons.org/about/">What we do</a></li> +<li id="menu-item-48793" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48793"><a href="https://creativecommons.org/blog/">Blog</a></li> +</ul></div> +</nav> +<nav id="secondary-navigation" class="secondary-navigation" role="navigation" aria-label="Secondary Menu"> +<div class="menu-secondary-menu-container"><ul id="menu-secondary-menu" class="secondary-menu"><li id="menu-item-48804" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48804"><a href="https://creativecommons.org/about/global-affiliate-network/">Global Affiliate Network</a></li> +<li id="menu-item-48805" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48805"><a href="https://creativecommons.org/use-remix/search-the-commons/">Search the Commons</a></li> +<li id="menu-item-48806" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48806"><a href="https://creativecommons.org/about/contact/">Contact</a></li> +</ul></div> +</nav> +<nav id="social-navigation" class="social-navigation" role="navigation" aria-label="Social Links Menu"> +<div class="menu-social-links-container"><ul id="menu-social-links" class="social-links-menu"> +<li id="menu-item-48807" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48807"><a href="https://www.facebook.com/creativecommons"><span class="screen-reader-text">Facebook</span></a></li> +<li id="menu-item-48808" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48808"><a href="https://twitter.com/creativecommons"><span class="screen-reader-text">Twitter</span></a></li> +<li id="menu-item-48809" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48809"><a href="mailto:info@creativecommons.org"><span class="screen-reader-text">Mail</span></a></li> +</ul></div> +</nav> +</div> +</div> +</header> +<header class="site-header spacer" role="banner"> +<div class="site-header-main"> +<div class="site-branding"> +<a class="cc-site-logo-link" href="https://creativecommons.org/" rel="home"> +<img class="cc-site-logo" src="https://creativecommons.org/wp-content/themes/cc/images/cc.logo.white.svg" height="72" width="303"> +</a> +</div> +<button id="menu-toggle" class="menu-toggle"><i class="cc-icon-menu"></i> <span>Menu</span></button> +<div id="site-header-menu" class="site-header-menu"> +<nav id="mobile-navigation" class="mobile-navigation" role="navigation" aria-label="Mobile Menu"> +<div class="menu-mobile-menu-container"><ul id="menu-mobile-menu" class="mobile-menu"> +<li id="menu-item-48798" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48798"><a href="https://creativecommons.org/share-your-work/">Share your work</a></li> +<li id="menu-item-48799" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48799"><a href="https://creativecommons.org/use-remix/">Use & remix</a></li> +<li id="menu-item-48800" class="menu-item menu-item-type-post_type menu-item-object-page page_item page-item-7466 menu-item-48800"><a href="https://creativecommons.org/about/">What we do</a></li> +<li id="menu-item-48801" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48801"><a href="https://creativecommons.org/blog/">Blog</a></li> +<li id="menu-item-48802" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48802"><a href="https://creativecommons.org/about/global-affiliate-network/">Global Affiliate Network</a></li> +<li id="menu-item-48803" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48803"><a href="https://creativecommons.org/use-remix/search-the-commons/">Search the Commons</a></li> +</ul></div> +</nav> +<nav id="site-navigation" class="main-navigation" role="navigation" aria-label="Primary Menu"> +<div class="menu-primary-menu-container"><ul id="menu-primary-menu" class="primary-menu"> +<li id="menu-item-48791" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48791"><a href="https://creativecommons.org/share-your-work/">Share your work</a></li> +<li id="menu-item-48792" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48792"><a href="https://creativecommons.org/use-remix/">Use & remix</a></li> +<li id="menu-item-48570" class="menu-item menu-item-type-post_type menu-item-object-page page_item page-item-7466 menu-item-48570"><a href="https://creativecommons.org/about/">What we do</a></li> +<li id="menu-item-48793" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48793"><a href="https://creativecommons.org/blog/">Blog</a></li> +</ul></div> +</nav> +<nav id="secondary-navigation" class="secondary-navigation" role="navigation" aria-label="Secondary Menu"> +<div class="menu-secondary-menu-container"><ul id="menu-secondary-menu" class="secondary-menu"><li id="menu-item-48804" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48804"><a href="https://creativecommons.org/about/global-affiliate-network/">Global Affiliate Network</a></li> +<li id="menu-item-48805" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48805"><a href="https://creativecommons.org/use-remix/search-the-commons/">Search the Commons</a></li> +<li id="menu-item-48806" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48806"><a href="https://creativecommons.org/about/contact/">Contact</a></li> +</ul></div> +</nav> +<nav id="social-navigation" class="social-navigation" role="navigation" aria-label="Social Links Menu"> +<div class="menu-social-links-container"><ul id="menu-social-links" class="social-links-menu"> +<li id="menu-item-48807" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48807"><a href="https://www.facebook.com/creativecommons"><span class="screen-reader-text">Facebook</span></a></li> +<li id="menu-item-48808" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48808"><a href="https://twitter.com/creativecommons"><span class="screen-reader-text">Twitter</span></a></li> +<li id="menu-item-48809" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48809"><a href="mailto:info@creativecommons.org"><span class="screen-reader-text">Mail</span></a></li> +</ul></div> +</nav> +</div> +</div> +</header> +</div> +<aside id="header-below" class="widget-area"> +<section id="text-15" class="widget-1 widget-first widget-last widget-odd widget widget_text"> +<div class="textwidget"> +<div id="donation-bar-wrapper" class="donation-bar-wrapper"> +<div id="donation-bar-inner" class="donation-bar-inner"> +<p class="donate-text">Help us build a vibrant, collaborative global commons</p> +<div class="donate-action"><a href="/donate?utm_campaign=2018fund&utm_source=license_header2018" class="button donate arrow">Donate<span class="hide-on-mobile"> Now</span></a></div> +</div> +</div> +</div> +</section> +</aside> + + +<div id="language-selector-block" class="container"> +<div class="language-selector-inner"> +This page is available in the following languages: +<img class="language-icon" src="/images/language_icon_x2.png" alt="Languages"> +<select> +<option value="legalcode.ar">العربية</option> +<option value="legalcode.cs">ÄeÅ¡tina</option> +<option value="legalcode.de">Deutsch</option> +<option value="legalcode.el">Ελληνικά</option> +<option value="legalcode" selected="selected">English</option> +<option value="legalcode.es">Español</option> +<option value="legalcode.eu">euskara</option> +<option value="legalcode.fi">suomeksi</option> +<option value="legalcode.fr">français</option> +<option value="legalcode.hr">hrvatski</option> +<option value="legalcode.id">Bahasa Indonesia</option> +<option value="legalcode.it">italiano</option> +<option value="legalcode.ja">日本語</option> +<option value="legalcode.ko">í•œêµì–´</option> +<option value="legalcode.lt">Lietuvių</option> +<option value="legalcode.lv">latviski</option> +<option value="legalcode.mi">te reo MÄori</option> +<option value="legalcode.nl">Nederlands</option> +<option value="legalcode.no">norsk</option> +<option value="legalcode.pl">polski</option> +<option value="legalcode.pt">português</option> +<option value="legalcode.ro">română</option> +<option value="legalcode.ru">руÑÑкий</option> +<option value="legalcode.sl">SlovenÅ¡Äina</option> +<option value="legalcode.sv">svenska</option> +<option value="legalcode.tr">Türkçe</option> +<option value="legalcode.uk">українÑька</option> +<option value="legalcode.zh-Hans">ä¸æ–‡</option> +<option value="legalcode.zh-Hant">è¯èªž</option> +</select> +</div> +</div> + + +<div id="deed" class="yellow"> +<div id="deed-head"> +<div id="cc-logo"><span class="cc-icon-logo"><img src="/images/deed/svg/cc_white.svg" alt="CC" /></span><span class="cc-icon-by"><img src="/images/deed/svg/attribution_icon_white.svg" alt="Attribution" /></span><span class="cc-icon-nc"><img src="/images/deed/svg/nc_white.svg" alt="Non-Commerical" /></span><span class="cc-icon-sa"><img src="/images/deed/svg/sa_white.svg" alt="Share Alike" /></span></div> +<h1><span>Creative Commons Legal Code</span></h1> +<div id="deed-license"> +<h2>Attribution-NonCommercial-ShareAlike 4.0 International</h2> +</div> +</div> +<div id="deed-main"> +<div id="deed-main-content"> +<div id="deed-disclaimer"> +<div class="summary"> +Official translations of this license are available <a href="#languages">in other languages</a>. +</div> +</div> +<div class="shaded"> +<p>Creative Commons Corporation (“Creative Commonsâ€) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is†basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible.</p> +</div> +<div class="shaded"> +<p><strong>Using Creative Commons Public Licenses</strong></p> +<p>Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use +to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses.</p> +<p class="usage-considerations"><strong>Considerations for licensors:</strong> Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. <a href="//wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensors">More considerations for licensors.</a></p> +<p class="usage-considerations"><strong>Considerations for the public:</strong> By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensor’s permission is not necessary for any reason–for example, because of any applicable exception or limitation to copyright–then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to respect those requests where reasonable. +<a href="//wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensees">More considerations for the public.</a></p> +</div> +<h3>Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public License</h3> +<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p> +<p id="s1"><strong>Section 1 – Definitions.</strong></p> +<ol type="a"> +<li id="s1a"><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li> +<li id="s1b"><strong>Adapter's License</strong> means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.</li> +<li id="s1c"><strong>BY-NC-SA Compatible License</strong> means a license listed at <a href="//creativecommons.org/compatiblelicenses"> creativecommons.org/compatiblelicenses</a>, approved by Creative Commons as essentially the equivalent of this Public License.</li> +<li id="s1d"><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section <a href="#s2b">2(b)(1)-(2)</a> are not Copyright and Similar Rights.</li> +<li id="s1e"><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may not +be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar +international agreements.</li> +<li id="s1f"><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li> +<li id="s1g"><strong>License Elements</strong> means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution, NonCommercial, and ShareAlike.</li> +<li id="s1h"><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li> +<li id="s1i"><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li> +<li id="s1j"><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li> +<li id="s1k"><strong>NonCommercial</strong> means not primarily intended for or directed towards commercial advantage or monetary compensation. For purposes of this Public License, the exchange of the Licensed Material for other material subject to Copyright and Similar Rights by digital file-sharing or similar means is NonCommercial provided there is no payment of monetary compensation in connection with the exchange.</li> +<li id="s1l"><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li> +<li id="s1m"><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li> +<li id="s1n"><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li> +</ol> +<p id="s2"><strong>Section 2 – Scope.</strong></p> +<ol type="a"> +<li id="s2a"><strong>License grant</strong>. +<ol> +<li id="s2a1">Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to: +<ol type="A"> +<li id="s2a1A">reproduce and Share the Licensed Material, in whole or in part, for NonCommercial purposes only; and</li> +<li id="s2a1B">produce, reproduce, and Share Adapted Material for NonCommercial purposes only.</li> +</ol> +<li id="s2a2"><span style="text-decoration: underline;">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li> +<li id="s2a3"><span style="text-decoration: underline;">Term</span>. The term of this Public License is specified in Section <a href="#s6a">6(a)</a>.</li> +<li id="s2a4"><span style="text-decoration: underline;">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section <a href="#s2a4">2(a)(4)</a> never produces Adapted Material.</li> +<li id="s2a5"><span style="text-decoration: underline;">Downstream recipients</span>. +<div class="para"> +<ol type="A"> +<li id="s2a5A"><span style="text-decoration: underline;">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li> +<li id="s2a5B"><span style="text-decoration: underline;">Additional offer from the Licensor – Adapted Material</span>. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter’s License You apply.</li> +<li id="s2a5C"><span style="text-decoration: underline;">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li> +</ol> +</div> +<li id="s2a6"><span style="text-decoration: underline;">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section <a href="#s3a1Ai">3(a)(1)(A)(i)</a>.</li> +</ol> +<li id="s2b"><p><strong>Other rights</strong>.</p> +<ol> +<li id="s2b1">Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li> +<li id="s2b2">Patent and trademark rights are not licensed under this Public License.</li> +<li id="s2b3">To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties, including when the Licensed Material is used other than for NonCommercial purposes.</li> +</ol> +</li> +</ol> +<p id="s3"><strong>Section 3 – License Conditions.</strong></p> +<p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p> +<ol type="a"> +<li id="s3a"><p><strong>Attribution</strong>.</p> +<ol> +<li id="s3a1"><p>If You Share the Licensed Material (including in modified form), You must:</p> +<ol type="A"> +<li id="s3a1A">retain the following if it is supplied by the Licensor with the Licensed Material: +<ol type="i"> +<li id="s3a1Ai">identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li> +<li id="s3a1Aii">a copyright notice;</li> +<li id="s3a1Aiii">a notice that refers to this Public License; </li> +<li id="s3a1Aiv">a notice that refers to the disclaimer of warranties;</li> +<li id="s3a1Av">a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li> +</ol> +<li id="s3a1B">indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li> +<li id="s3a1C">indicate the Licensed Material is licensed under this Public License, +and include the text of, or the URI or hyperlink to, this Public +License.</li> +</ol> +</li> +<li id="s3a2">You may satisfy the conditions in Section <a href="#s3a1">3(a)(1)</a> in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li> +<li id="s3a3">If requested by the Licensor, You must remove any of the information required by Section <a href="#s3a1A">3(a)(1)(A)</a> to the extent reasonably practicable.</li> +</ol> +</li> +<li id="s3b"><strong>ShareAlike</strong>. +<p>In addition to the conditions in Section <a href="#s3a">3(a)</a>, if You Share Adapted Material You produce, the following conditions also apply.</p> +<ol> +<li id="s3b1">The Adapter’s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-NC-SA Compatible License.</li> +<li id="s3b2">You must include the text of, or the URI or hyperlink to, the Adapter's License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material.</li> +<li id="s3b3">You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter's License You apply.</li> +</ol> +</li> +</ol> +<p id="s4"><strong>Section 4 – Sui Generis Database Rights.</strong></p> +<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p> +<ol type="a"> +<li id="s4a">for the avoidance of doubt, Section <a href="#s2a1">2(a)(1)</a> grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database for NonCommercial purposes only;</li> +<li id="s4b">if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material, including for purposes of Section <a href="#s3b">3(b)</a>; and</li> +<li id="s4c">You must comply with the conditions in Section <a href="#s3a">3(a)</a> if You Share all or a substantial portion of the contents of the database.</li> +</ol> +For the avoidance of doubt, this Section <a href="#s4">4</a> supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights. +<p id="s5"><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p> +<ol style="font-weight: bold;" type="a"> +<li id="s5a"><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li> +<li id="s5b"><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li> +</ol> +<ol start="3" type="a"> +<li id="s5c">The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li> +</ol> +<p id="s6"><strong>Section 6 – Term and Termination.</strong></p> +<ol type="a"> +<li id="s6a">This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li> +<li id="s6b"> +<p>Where Your right to use the Licensed Material has terminated under Section <a href="#s6a">6(a)</a>, it reinstates:</p> +<ol> +<li id="s6b1">automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li> +<li id="s6b2">upon express reinstatement by the Licensor.</li> +</ol> +For the avoidance of doubt, this Section <a href="#s6b">6(b)</a> does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.</li> +<li id="s6c">For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li> +<li id="s6d">Sections <a href="#s1">1</a>, <a href="#s5">5</a>, <a href="#s6">6</a>, <a href="#s7">7</a>, and <a href="#s8">8</a> survive termination of this Public License.</li> +</ol> +<p id="s7"><strong>Section 7 – Other Terms and Conditions.</strong></p> +<ol type="a"> +<li id="s7a">The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li> +<li id="s7b">Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li> +</ol> +<p id="s8"><strong>Section 8 – Interpretation.</strong></p> + <ol type="a"> +<li id="s8a">For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li> +<li id="s8b">To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li> +<li id="s8c">No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li> +<li id="s8d">Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li> +</ol> + +<p class="shaded">Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.†The text of the Creative Commons public licenses is dedicated to the public domain under the <a href="//creativecommons.org/publicdomain/zero/1.0/legalcode">CC0 Public Domain Dedication</a>. Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at <a href="//creativecommons.org/policies">creativecommons.org/policies</a>, Creative Commons does not authorize the use of the trademark “Creative Commons†or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses.<br><br> +Creative Commons may be contacted at <a href="//creativecommons.org/">creativecommons.org</a>.</p> +<p class="shaded"><a id="languages"></a>Additional languages available: + +<a href="/licenses/by-nc-sa/4.0/legalcode.ar">العربية</a>, +<a href="/licenses/by-nc-sa/4.0/legalcode.cs">ÄeÅ¡tina</a>, +<a href="/licenses/by-nc-sa/4.0/legalcode.de">Deutsch</a>, +<a href="/licenses/by-nc-sa/4.0/legalcode.el">Ελληνικά</a>, +<a href="/licenses/by-nc-sa/4.0/legalcode.es">Español</a>, +<a href="/licenses/by-nc-sa/4.0/legalcode.eu">euskara</a>, +<a href="/licenses/by-nc-sa/4.0/legalcode.fi">suomeksi</a>, +<a href="/licenses/by-nc-sa/4.0/legalcode.fr">français</a>, +<a href="/licenses/by-nc-sa/4.0/legalcode.hr">hrvatski</a>, +<a href="/licenses/by-nc-sa/4.0/legalcode.id">Bahasa Indonesia</a>, +<a href="/licenses/by-nc-sa/4.0/legalcode.it">italiano</a>, +<a href="/licenses/by-nc-sa/4.0/legalcode.ja">日本語</a>, +<a href="/licenses/by-nc-sa/4.0/legalcode.ko">í•œêµì–´</a>, +<a href="/licenses/by-nc-sa/4.0/legalcode.lt">Lietuvių</a>, +<a href="/licenses/by-nc-sa/4.0/legalcode.lv">latviski</a>, +<a href="/licenses/by-nc-sa/4.0/legalcode.mi">te reo MÄori</a>, +<a href="/licenses/by-nc-sa/4.0/legalcode.nl">Nederlands</a>, +<a href="/licenses/by-nc-sa/4.0/legalcode.no">norsk</a>, +<a href="/licenses/by-nc-sa/4.0/legalcode.pl">polski</a>, +<a href="/licenses/by-nc-sa/4.0/legalcode.pt">português</a>, +<a href="/licenses/by-nc-sa/4.0/legalcode.ro">română</a>, +<a href="/licenses/by-nc-sa/4.0/legalcode.ru">руÑÑкий</a>, +<a href="/licenses/by-nc-sa/4.0/legalcode.sl">SlovenÅ¡Äina</a>, +<a href="/licenses/by-nc-sa/4.0/legalcode.sv">svenska</a>, +<a href="/licenses/by-nc-sa/4.0/legalcode.tr">Türkçe</a>, +<a href="/licenses/by-nc-sa/4.0/legalcode.uk">українÑька</a>, +<a href="/licenses/by-nc-sa/4.0/legalcode.zh-Hans">ä¸æ–‡</a>, +<a href="/licenses/by-nc-sa/4.0/legalcode.zh-Hant">è¯èªž</a>. + +Please read the <a href="/faq/#officialtranslations">FAQ</a> for more information about official translations. +</div> +</div> +<div id="deed-foot"> +<p id="footer"><a href="./">« Back to Commons Deed</a></p> +</div> +</div> + +<div class="site-footer-wrapper"> +<footer id="colophon" class="site-footer sticky-nav-main" role="contentinfo"> +<div class="cc-footer"> +<div class="column cc-footer-main"> +<div class="cc-footer-logo"> +<a href="https://creativecommons.org/" class="custom-logo-link" rel="home" itemprop="url"><img src="https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_.png" class="custom-logo" alt="cc.logo.white" itemprop="logo" srcset="https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_.png 980w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-300x73.png 300w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-768x188.png 768w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-140x34.png 140w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-50x12.png 50w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-270x66.png 270w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-245x60.png 245w" sizes="(max-width: 709px) 85vw, (max-width: 909px) 67vw, (max-width: 1362px) 62vw, 840px" height="240" width="980"></a> +</div> +<div class="cc-footer-links"> +<div class="menu-footer-links-container"> +<ul id="menu-footer-links" class="menu"> +<li id="menu-item-48794" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48794"><a href="https://creativecommons.org/about/contact/">Contact</a></li> +<li id="menu-item-48795" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48795"><a href="https://creativecommons.org/privacy/">Privacy</a></li> +<li id="menu-item-48796" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48796"><a href="https://creativecommons.org/policies/">Policies</a></li> +<li id="menu-item-48797" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48797"><a href="https://creativecommons.org/terms/">Terms</a></li> +</ul> +</div> +</div> +</div> +<div class="column cc-footer-contact"> +<h6><a href="https://creativecommons.org/about/contact">We'd love to hear from you!</a></h6> +<address> +Creative Commons<br> +PO Box 1866, Mountain View, CA 94042 +</address> +<ul> +<li><a href="mailto:info@creativecommons.org" class="mail">info@creativecommons.org</a></li> +<li><a href="https://creativecommons.org/faq">Frequently Asked Questions</a></li> +</ul> +</div> +<div class="column cc-footer-license"> +<div class="license-icons"> +<a rel="license" href="https://creativecommons.org/licenses/by/4.0/" title="Creative Commons Attribution 4.0 International license"> +<i class="cc-icon-cc"></i> +<i class="cc-icon-cc-by"></i> +</a> +</div> +<aside> +<div xmlns:cc="https://creativecommons.org/ns#" about="https://creativecommons.org"> +<p>Except where otherwise <a class="subfoot" href="https://creativecommons.org/policies#license">noted</a>, content on this site is licensed under a <a class="subfoot" href="https://creativecommons.org/licenses/by/4.0/" rel="license">Creative Commons Attribution 4.0 International license</a>. <a class="subfoot" href="https://creativecommons.org/website-icons" target="blank">Icons</a> by The Noun Project.</p> +</div> +</aside> +</div> +</div> +</footer> +</div> +<script type='text/javascript'> + /* <![CDATA[ */ + var screenReaderText = {"expand":"expand child menu","collapse":"collapse child menu"}; + /* ]]> */ +</script> +<script type='text/javascript' src='https://creativecommons.org/wp-content/themes/twentysixteen/js/functions.js'></script> +<script type='text/javascript' src='/includes/legalcode.js'></script> + +</body> +</html> diff --git a/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nd-3.0-latex.html b/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nd-3.0-latex.html new file mode 100644 index 0000000000..e90174f162 --- /dev/null +++ b/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nd-3.0-latex.html @@ -0,0 +1,388 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta name="generator" content="HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" /> +<title>Creative Commons Legal Code</title> +<meta http-equiv="content-type" content="text/html; charset=utf-8" /> +<link rel="stylesheet" type="text/css" href="https://creativecommons.org/includes/deed3.css" media="screen" /> +<link rel="stylesheet" type="text/css" href="https://creativecommons.org/includes/deed3-print.css" media="print" /> +<!--[if lt IE 7]><link rel="stylesheet" type="text/css" href="https://creativecommons.org/includes/deed3-ie.css" media="screen" /><![endif]--> +<script type="text/javascript" src="https://creativecommons.org/includes/errata.js"> +</script> +</head> +<body> +<p align="center" id="header"><a href="https://creativecommons.org/">Creative Commons</a></p> +<div id="deed" class="yellow"> +<div id="deed-head"> +<div id="cc-logo"> +<img src="https://creativecommons.org/images/deed/cc-logo.jpg" alt="" /> +</div> +<h1><span>Creative Commons Legal Code</span></h1> +<div id="deed-license"> +<h2>Attribution-NoDerivs 3.0 Unported</h2> +</div> +</div> +<div id="deed-main"> +<div id="deed-main-content"> +<img src="https://creativecommons.org/images/international/unported.png" alt="" /> +<blockquote> +CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES +NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE +DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE +COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. +CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE +INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES +RESULTING FROM ITS USE. +</blockquote> +<h3><em>License</em></h3> +<p>THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS +OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR +"LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER +APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS +AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS +PROHIBITED.</p> +<p>BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU +ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. +TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A +CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE +IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND +CONDITIONS.</p> +<p><strong>1. Definitions</strong></p> +<ol type="a"> +<li><strong>"Adaptation"</strong> means a work based upon +the Work, or upon the Work and other pre-existing works, +such as a translation, adaptation, derivative work, +arrangement of music or other alterations of a literary +or artistic work, or phonogram or performance and +includes cinematographic adaptations or any other form in +which the Work may be recast, transformed, or adapted +including in any form recognizably derived from the +original, except that a work that constitutes a +Collection will not be considered an Adaptation for the +purpose of this License. For the avoidance of doubt, +where the Work is a musical work, performance or +phonogram, the synchronization of the Work in +timed-relation with a moving image ("synching") will be +considered an Adaptation for the purpose of this +License.</li> +<li><strong>"Collection"</strong> means a collection of +literary or artistic works, such as encyclopedias and +anthologies, or performances, phonograms or broadcasts, +or other works or subject matter other than works listed +in Section 1(f) below, which, by reason of the selection + and arrangement of their contents, constitute +intellectual creations, in which the Work is included in +its entirety in unmodified form along with one or more +other contributions, each constituting separate and +independent works in themselves, which together are +assembled into a collective whole. A work that +constitutes a Collection will not be considered an +Adaptation (as defined above) for the purposes of this +License.</li> +<li><strong>"Distribute"</strong> means to make available +to the public the original and copies of the Work through +sale or other transfer of ownership.</li> +<li><strong>"Licensor"</strong> means the individual, +individuals, entity or entities that offer(s) the Work +under the terms of this License.</li> +<li><strong>"Original Author"</strong> means, in the case +of a literary or artistic work, the individual, +individuals, entity or entities who created the Work or +if no individual or entity can be identified, the +publisher; and in addition (i) in the case of a +performance the actors, singers, musicians, dancers, and +other persons who act, sing, deliver, declaim, play in, +interpret or otherwise perform literary or artistic works +or expressions of folklore; (ii) in the case of a +phonogram the producer being the person or legal entity +who first fixes the sounds of a performance or other +sounds; and, (iii) in the case of broadcasts, the +organization that transmits the broadcast.</li> +<li><strong>"Work"</strong> means the literary and/or +artistic work offered under the terms of this License +including without limitation any production in the +literary, scientific and artistic domain, whatever may be +the mode or form of its expression including digital +form, such as a book, pamphlet and other writing; a +lecture, address, sermon or other work of the same +nature; a dramatic or dramatico-musical work; a +choreographic work or entertainment in dumb show; a +musical composition with or without words; a +cinematographic work to which are assimilated works +expressed by a process analogous to cinematography; a +work of drawing, painting, architecture, sculpture, +engraving or lithography; a photographic work to which +are assimilated works expressed by a process analogous to +photography; a work of applied art; an illustration, map, +plan, sketch or three-dimensional work relative to +geography, topography, architecture or science; a +performance; a broadcast; a phonogram; a compilation of +data to the extent it is protected as a copyrightable +work; or a work performed by a variety or circus +performer to the extent it is not otherwise considered a +literary or artistic work.</li> +<li><strong>"You"</strong> means an individual or entity +exercising rights under this License who has not +previously violated the terms of this License with +respect to the Work, or who has received express +permission from the Licensor to exercise rights under +this License despite a previous violation.</li> +<li><strong>"Publicly Perform"</strong> means to perform +public recitations of the Work and to communicate to the +public those public recitations, by any means or process, +including by wire or wireless means or public digital +performances; to make available to the public Works in +such a way that members of the public may access these +Works from a place and at a place individually chosen by +them; to perform the Work to the public by any means or +process and the communication to the public of the + performances of the Work, including by public digital +performance; to broadcast and rebroadcast the Work by any +means including signs, sounds or images.</li> +<li><strong>"Reproduce"</strong> means to make copies of +the Work by any means including without limitation by +sound or visual recordings and the right of fixation and +reproducing fixations of the Work, including storage of a +protected performance or phonogram in digital form or +other electronic medium.</li> +</ol> +<p><strong>2. Fair Dealing Rights.</strong> Nothing in this +License is intended to reduce, limit, or restrict any uses +free from copyright or rights arising from limitations or +exceptions that are provided for in connection with the +copyright protection under copyright law or other +applicable laws.</p> +<p><strong>3. License Grant.</strong> Subject to the terms +and conditions of this License, Licensor hereby grants You +a worldwide, royalty-free, non-exclusive, perpetual (for +the duration of the applicable copyright) license to +exercise the rights in the Work as stated below:</p> +<ol type="a"> +<li>to Reproduce the Work, to incorporate the Work into +one or more Collections, and to Reproduce the Work as +incorporated in the Collections; and,</li> +<li>to Distribute and Publicly Perform the Work including +as incorporated in Collections.</li> +<li> +<p>For the avoidance of doubt:</p> +<ol type="i"> +<li><strong>Non-waivable Compulsory License +Schemes</strong>. In those jurisdictions in which the +right to collect royalties through any statutory or +compulsory licensing scheme cannot be waived, the +Licensor reserves the exclusive right to collect such +royalties for any exercise by You of the rights +granted under this License;</li> +<li><strong>Waivable Compulsory License +Schemes</strong>. In those jurisdictions in which the +right to collect royalties through any statutory or +compulsory licensing scheme can be waived, the +Licensor waives the exclusive right to collect such +royalties for any exercise by You of the rights +granted under this License; and,</li> +<li><strong>Voluntary License Schemes</strong>. The +Licensor waives the right to collect royalties, +whether individually or, in the event that the +Licensor is a member of a collecting society that +administers voluntary licensing schemes, via that +society, from any exercise by You of the rights +granted under this License.</li> +</ol> +</li> +</ol> +<p>The above rights may be exercised in all media and +formats whether now known or hereafter devised. The above +rights include the right to make such modifications as are +technically necessary to exercise the rights in other media +and formats, but otherwise you have no rights to make +Adaptations. Subject to Section 8(f), all rights not +expressly granted by Licensor are hereby reserved.</p> +<p><strong>4. Restrictions.</strong> The license granted in +Section 3 above is expressly made subject to and limited by +the following restrictions:</p> +<ol type="a"> +<li>You may Distribute or Publicly Perform the Work only +under the terms of this License. You must include a copy +of, or the Uniform Resource Identifier (URI) for, this +License with every copy of the Work You Distribute or +Publicly Perform. You may not offer or impose any terms +on the Work that restrict the terms of this License or +the ability of the recipient of the Work to exercise the +rights granted to that recipient under the terms of the +License. You may not sublicense the Work. You must keep +intact all notices that refer to this License and to the +disclaimer of warranties with every copy of the Work You +Distribute or Publicly Perform. When You Distribute or +Publicly Perform the Work, You may not impose any +effective technological measures on the Work that +restrict the ability of a recipient of the Work from You +to exercise the rights granted to that recipient under +the terms of the License. This Section 4(a) applies to +the Work as incorporated in a Collection, but this does +not require the Collection apart from the Work itself to +be made subject to the terms of this License. If You +create a Collection, upon notice from any Licensor You +must, to the extent practicable, remove from the +Collection any credit as required by Section 4(b), as +requested.</li> +<li>If You Distribute, or Publicly Perform the Work or +Collections, You must, unless a request has been made +pursuant to Section 4(a), keep intact all copyright +notices for the Work and provide, reasonable to the +medium or means You are utilizing: (i) the name of the +Original Author (or pseudonym, if applicable) if +supplied, and/or if the Original Author and/or Licensor +designate another party or parties (e.g., a sponsor +institute, publishing entity, journal) for attribution +("Attribution Parties") in Licensor's copyright notice, +terms of service or by other reasonable means, the name +of such party or parties; (ii) the title of the Work if +supplied; (iii) to the extent reasonably practicable, the +URI, if any, that Licensor specifies to be associated +with the Work, unless such URI does not refer to the +copyright notice or licensing information for the Work. +The credit required by this Section 4(b) may be +implemented in any reasonable manner; provided, however, +that in the case of a Collection, at a minimum such +credit will appear, if a credit for all contributing +authors of the Collection appears, then as part of these +credits and in a manner at least as prominent as the +credits for the other contributing authors. For the +avoidance of doubt, You may only use the credit required +by this Section for the purpose of attribution in the +manner set out above and, by exercising Your rights under +this License, You may not implicitly or explicitly assert +or imply any connection with, sponsorship or endorsement +by the Original Author, Licensor and/or Attribution +Parties, as appropriate, of You or Your use of the Work, +without the separate, express prior written permission of +the Original Author, Licensor and/or Attribution +Parties.</li> +<li>Except as otherwise agreed in writing by the Licensor +or as may be otherwise permitted by applicable law, if +You Reproduce, Distribute or Publicly Perform the Work +either by itself or as part of any Collections, You must +not distort, mutilate, modify or take other derogatory +action in relation to the Work which would be prejudicial +to the Original Author's honor or reputation.</li> +</ol> +<p><strong>5. Representations, Warranties and +Disclaimer</strong></p> +<p>UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN +WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO +REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE +WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, +WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, +FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE +ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE +PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. +SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED +WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.</p> +<p><strong>6. Limitation on Liability.</strong> EXCEPT TO +THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL +LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY +SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY +DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, +EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES.</p> +<p><strong>7. Termination</strong></p> +<ol type="a"> +<li>This License and the rights granted hereunder will +terminate automatically upon any breach by You of the +terms of this License. Individuals or entities who have +received Collections from You under this License, +however, will not have their licenses terminated provided +such individuals or entities remain in full compliance +with those licenses. Sections 1, 2, 5, 6, 7, and 8 will +survive any termination of this License.</li> +<li>Subject to the above terms and conditions, the +license granted here is perpetual (for the duration of +the applicable copyright in the Work). Notwithstanding +the above, Licensor reserves the right to release the +Work under different license terms or to stop +distributing the Work at any time; provided, however that +any such election will not serve to withdraw this License +(or any other license that has been, or is required to +be, granted under the terms of this License), and this +License will continue in full force and effect unless +terminated as stated above.</li> +</ol> +<p><strong>8. Miscellaneous</strong></p> +<ol type="a"> +<li>Each time You Distribute or Publicly Perform the Work +or a Collection, the Licensor offers to the recipient a +license to the Work on the same terms and conditions as +the license granted to You under this License.</li> +<li>If any provision of this License is invalid or +unenforceable under applicable law, it shall not affect +the validity or enforceability of the remainder of the +terms of this License, and without further action by the +parties to this agreement, such provision shall be +reformed to the minimum extent necessary to make such +provision valid and enforceable.</li> +<li>No term or provision of this License shall be deemed +waived and no breach consented to unless such waiver or +consent shall be in writing and signed by the party to be +charged with such waiver or consent.</li> +<li>This License constitutes the entire agreement between +the parties with respect to the Work licensed here. There +are no understandings, agreements or representations with +respect to the Work not specified here. Licensor shall +not be bound by any additional provisions that may appear +in any communication from You. This License may not be +modified without the mutual written agreement of the +Licensor and You.</li> +<li>The rights granted under, and the subject matter +referenced, in this License were drafted utilizing the +terminology of the Berne Convention for the Protection of +Literary and Artistic Works (as amended on September 28, +1979), the Rome Convention of 1961, the WIPO Copyright +Treaty of 1996, the WIPO Performances and Phonograms +Treaty of 1996 and the Universal Copyright Convention (as +revised on July 24, 1971). These rights and subject +matter take effect in the relevant jurisdiction in which +the License terms are sought to be enforced according to +the corresponding provisions of the implementation of +those treaty provisions in the applicable national law. +If the standard suite of rights granted under applicable +copyright law includes additional rights not granted +under this License, such additional rights are deemed to +be included in the License; this License is not intended +to restrict the license of any rights under applicable +law.</li> +</ol> + +<blockquote> +<h3>Creative Commons Notice</h3> +<p>Creative Commons is not a party to this License, and +makes no warranty whatsoever in connection with the Work. +Creative Commons will not be liable to You or any party +on any legal theory for any damages whatsoever, including +without limitation any general, special, incidental or +consequential damages arising in connection to this +license. Notwithstanding the foregoing two (2) sentences, +if Creative Commons has expressly identified itself as +the Licensor hereunder, it shall have all rights and +obligations of Licensor.</p> +<p>Except for the limited purpose of indicating to the +public that the Work is licensed under the CCPL, Creative +Commons does not authorize the use by either party of the +trademark "Creative Commons" or any related trademark or +logo of Creative Commons without the prior written +consent of Creative Commons. Any permitted use will be in +compliance with Creative Commons' then-current trademark +usage guidelines, as may be published on its website or +otherwise made available upon request from time to time. +For the avoidance of doubt, this trademark restriction +does not form part of this License.</p> +<p>Creative Commons may be contacted at <a href="https://creativecommons.org/">https://creativecommons.org/</a>.</p> +</blockquote> +</div> +</div> +<div id="deed-foot"> +<p id="footer"><a href="./">« Back to Commons Deed</a></p> +</div> +</div> +</body> +</html> diff --git a/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nd-4.0-latex.html b/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nd-4.0-latex.html new file mode 100644 index 0000000000..3ada736c68 --- /dev/null +++ b/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-nd-4.0-latex.html @@ -0,0 +1,395 @@ +<!DOCTYPE html> +<html> +<head> +<title>Creative Commons — Attribution-NoDerivatives 4.0 International — CC BY-ND 4.0</title> +<meta charset="UTF-8"> +<script type="text/javascript" src="//creativecommons.org/includes/errata.js"></script> + +<meta name="viewport" content="width=device-width, initial-scale=1"> +<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700" rel="stylesheet"> +<link rel='stylesheet' id='cc-fontello-css' href="https://creativecommons.org/wp-content/themes/cc/fonts/fontello/css/cc-fontello.css" type='text/css' media='all' /> +<link rel='stylesheet' id='parent-style-css' href="https://creativecommons.org/wp-content/themes/twentysixteen/style.css" type='text/css' media='all' /> +<link rel='stylesheet' id='cc-style-css' href="https://creativecommons.org/wp-content/themes/cc/css/app.css" type='text/css' media='all' /> +<link rel="stylesheet" type="text/css" href="/includes/legalcode.css" media="screen" /> +<link rel="stylesheet" type="text/css" href="/includes/legalcode-print.css" media="print" /> +<script src="https://code.jquery.com/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=" crossorigin="anonymous"></script> + +</head> +<body class="lang-en"> + +<div class="site-header-wrapper"> +<header id="masthead" class="site-header sticky-nav-main sticky attached" role="banner"> +<div class="site-header-main"> +<div class="site-branding"> +<a class="cc-site-logo-link" href="https://creativecommons.org/" rel="home"> +<img class="cc-site-logo" src="https://creativecommons.org/wp-content/themes/cc/images/cc.logo.white.svg" height="72" width="303"> +</a> +</div> +<button id="menu-toggle" class="menu-toggle"><i class="cc-icon-menu"></i> <span>Menu</span></button> +<div id="site-header-menu" class="site-header-menu"> +<nav id="mobile-navigation" class="mobile-navigation" role="navigation" aria-label="Mobile Menu"> +<div class="menu-mobile-menu-container"><ul id="menu-mobile-menu" class="mobile-menu"> +<li id="menu-item-48798" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48798"><a href="https://creativecommons.org/share-your-work/">Share your work</a></li> +<li id="menu-item-48799" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48799"><a href="https://creativecommons.org/use-remix/">Use & remix</a></li> +<li id="menu-item-48800" class="menu-item menu-item-type-post_type menu-item-object-page page_item page-item-7466 menu-item-48800"><a href="https://creativecommons.org/about/">What we do</a></li> +<li id="menu-item-48801" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48801"><a href="https://creativecommons.org/blog/">Blog</a></li> +<li id="menu-item-48802" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48802"><a href="https://creativecommons.org/about/global-affiliate-network/">Global Affiliate Network</a></li> +<li id="menu-item-48803" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48803"><a href="https://creativecommons.org/use-remix/search-the-commons/">Search the Commons</a></li> +</ul></div> +</nav> +<nav id="site-navigation" class="main-navigation" role="navigation" aria-label="Primary Menu"> +<div class="menu-primary-menu-container"><ul id="menu-primary-menu" class="primary-menu"> +<li id="menu-item-48791" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48791"><a href="https://creativecommons.org/share-your-work/">Share your work</a></li> +<li id="menu-item-48792" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48792"><a href="https://creativecommons.org/use-remix/">Use & remix</a></li> +<li id="menu-item-48570" class="menu-item menu-item-type-post_type menu-item-object-page page_item page-item-7466 menu-item-48570"><a href="https://creativecommons.org/about/">What we do</a></li> +<li id="menu-item-48793" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48793"><a href="https://creativecommons.org/blog/">Blog</a></li> +</ul></div> +</nav> +<nav id="secondary-navigation" class="secondary-navigation" role="navigation" aria-label="Secondary Menu"> +<div class="menu-secondary-menu-container"><ul id="menu-secondary-menu" class="secondary-menu"><li id="menu-item-48804" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48804"><a href="https://creativecommons.org/about/global-affiliate-network/">Global Affiliate Network</a></li> +<li id="menu-item-48805" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48805"><a href="https://creativecommons.org/use-remix/search-the-commons/">Search the Commons</a></li> +<li id="menu-item-48806" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48806"><a href="https://creativecommons.org/about/contact/">Contact</a></li> +</ul></div> +</nav> +<nav id="social-navigation" class="social-navigation" role="navigation" aria-label="Social Links Menu"> +<div class="menu-social-links-container"><ul id="menu-social-links" class="social-links-menu"> +<li id="menu-item-48807" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48807"><a href="https://www.facebook.com/creativecommons"><span class="screen-reader-text">Facebook</span></a></li> +<li id="menu-item-48808" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48808"><a href="https://twitter.com/creativecommons"><span class="screen-reader-text">Twitter</span></a></li> +<li id="menu-item-48809" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48809"><a href="mailto:info@creativecommons.org"><span class="screen-reader-text">Mail</span></a></li> +</ul></div> +</nav> +</div> +</div> +</header> +<header class="site-header spacer" role="banner"> +<div class="site-header-main"> +<div class="site-branding"> +<a class="cc-site-logo-link" href="https://creativecommons.org/" rel="home"> +<img class="cc-site-logo" src="https://creativecommons.org/wp-content/themes/cc/images/cc.logo.white.svg" height="72" width="303"> +</a> +</div> +<button id="menu-toggle" class="menu-toggle"><i class="cc-icon-menu"></i> <span>Menu</span></button> +<div id="site-header-menu" class="site-header-menu"> +<nav id="mobile-navigation" class="mobile-navigation" role="navigation" aria-label="Mobile Menu"> +<div class="menu-mobile-menu-container"><ul id="menu-mobile-menu" class="mobile-menu"> +<li id="menu-item-48798" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48798"><a href="https://creativecommons.org/share-your-work/">Share your work</a></li> +<li id="menu-item-48799" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48799"><a href="https://creativecommons.org/use-remix/">Use & remix</a></li> +<li id="menu-item-48800" class="menu-item menu-item-type-post_type menu-item-object-page page_item page-item-7466 menu-item-48800"><a href="https://creativecommons.org/about/">What we do</a></li> +<li id="menu-item-48801" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48801"><a href="https://creativecommons.org/blog/">Blog</a></li> +<li id="menu-item-48802" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48802"><a href="https://creativecommons.org/about/global-affiliate-network/">Global Affiliate Network</a></li> +<li id="menu-item-48803" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48803"><a href="https://creativecommons.org/use-remix/search-the-commons/">Search the Commons</a></li> +</ul></div> +</nav> +<nav id="site-navigation" class="main-navigation" role="navigation" aria-label="Primary Menu"> +<div class="menu-primary-menu-container"><ul id="menu-primary-menu" class="primary-menu"> +<li id="menu-item-48791" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48791"><a href="https://creativecommons.org/share-your-work/">Share your work</a></li> +<li id="menu-item-48792" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48792"><a href="https://creativecommons.org/use-remix/">Use & remix</a></li> +<li id="menu-item-48570" class="menu-item menu-item-type-post_type menu-item-object-page page_item page-item-7466 menu-item-48570"><a href="https://creativecommons.org/about/">What we do</a></li> +<li id="menu-item-48793" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48793"><a href="https://creativecommons.org/blog/">Blog</a></li> +</ul></div> +</nav> +<nav id="secondary-navigation" class="secondary-navigation" role="navigation" aria-label="Secondary Menu"> +<div class="menu-secondary-menu-container"><ul id="menu-secondary-menu" class="secondary-menu"><li id="menu-item-48804" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48804"><a href="https://creativecommons.org/about/global-affiliate-network/">Global Affiliate Network</a></li> +<li id="menu-item-48805" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48805"><a href="https://creativecommons.org/use-remix/search-the-commons/">Search the Commons</a></li> +<li id="menu-item-48806" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48806"><a href="https://creativecommons.org/about/contact/">Contact</a></li> +</ul></div> +</nav> +<nav id="social-navigation" class="social-navigation" role="navigation" aria-label="Social Links Menu"> +<div class="menu-social-links-container"><ul id="menu-social-links" class="social-links-menu"> +<li id="menu-item-48807" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48807"><a href="https://www.facebook.com/creativecommons"><span class="screen-reader-text">Facebook</span></a></li> +<li id="menu-item-48808" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48808"><a href="https://twitter.com/creativecommons"><span class="screen-reader-text">Twitter</span></a></li> +<li id="menu-item-48809" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48809"><a href="mailto:info@creativecommons.org"><span class="screen-reader-text">Mail</span></a></li> +</ul></div> +</nav> +</div> +</div> +</header> +</div> +<aside id="header-below" class="widget-area"> +<section id="text-15" class="widget-1 widget-first widget-last widget-odd widget widget_text"> +<div class="textwidget"> +<div id="donation-bar-wrapper" class="donation-bar-wrapper"> +<div id="donation-bar-inner" class="donation-bar-inner"> +<p class="donate-text">Help us build a vibrant, collaborative global commons</p> +<div class="donate-action"><a href="/donate?utm_campaign=2018fund&utm_source=license_header2018" class="button donate arrow">Donate<span class="hide-on-mobile"> Now</span></a></div> +</div> +</div> +</div> +</section> +</aside> + + +<div id="language-selector-block" class="container"> +<div class="language-selector-inner"> +This page is available in the following languages: +<img class="language-icon" src="/images/language_icon_x2.png" alt="Languages"> +<select> +<option value="legalcode.ar">العربية</option> +<option value="legalcode.cs">ÄeÅ¡tina</option> +<option value="legalcode.de">Deutsch</option> +<option value="legalcode.el">Ελληνικά</option> +<option value="legalcode" selected="selected">English</option> +<option value="legalcode.es">Español</option> +<option value="legalcode.eu">euskara</option> +<option value="legalcode.fi">suomeksi</option> +<option value="legalcode.fr">français</option> +<option value="legalcode.hr">hrvatski</option> +<option value="legalcode.id">Bahasa Indonesia</option> +<option value="legalcode.it">italiano</option> +<option value="legalcode.ja">日本語</option> +<option value="legalcode.ko">í•œêµì–´</option> +<option value="legalcode.lt">Lietuvių</option> +<option value="legalcode.lv">latviski</option> +<option value="legalcode.mi">te reo MÄori</option> +<option value="legalcode.nl">Nederlands</option> +<option value="legalcode.no">norsk</option> +<option value="legalcode.pl">polski</option> +<option value="legalcode.pt">português</option> +<option value="legalcode.ro">română</option> +<option value="legalcode.ru">руÑÑкий</option> +<option value="legalcode.sl">SlovenÅ¡Äina</option> +<option value="legalcode.sv">svenska</option> +<option value="legalcode.tr">Türkçe</option> +<option value="legalcode.uk">українÑька</option> +<option value="legalcode.zh-Hans">ä¸æ–‡</option> +<option value="legalcode.zh-Hant">è¯èªž</option> +</select> +</div> +</div> + + +<div id="deed" class="yellow"> +<div id="deed-head"> +<div id="cc-logo"><span class="cc-icon-logo"><img src="/images/deed/svg/cc_white.svg" alt="CC" /></span><span class="cc-icon-by"><img src="/images/deed/svg/attribution_icon_white.svg" alt="Attribution" /></span><span class="cc-icon-nd"><img src="/images/deed/svg/nd_white.svg" alt="No Derivatives" /></span></div> +<h1><span>Creative Commons Legal Code</span></h1> +<div id="deed-license"> +<h2>Attribution-NoDerivatives 4.0 International</h2> +</div> +</div> +<div id="deed-main"> +<div id="deed-main-content"> +<div id="deed-disclaimer"> +<div class="summary"> +Official translations of this license are available <a href="#languages">in other languages</a>. +</div> +</div> +<div class="shaded"> +<p>Creative Commons Corporation (“Creative Commonsâ€) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is†basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible.</p> +</div> +<div class="shaded"> +<p><strong>Using Creative Commons Public Licenses</strong></p> +<p>Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses.</p> +<p class="usage-considerations"><strong>Considerations for licensors:</strong> Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. <a href="//wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensors">More considerations for licensors.</a></p> +<p class="usage-considerations"><strong>Considerations for the public:</strong> By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensor’s permission is not necessary for any reason–for example, because of any applicable exception or limitation to copyright–then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to respect those requests where reasonable. +<a href="//wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensees">More considerations for the public.</a></p> +</div> +<h3>Creative Commons Attribution-NoDerivatives 4.0 International Public License</h3> +<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NoDerivatives 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p> +<p id="s1"><strong>Section 1 – Definitions.</strong></p> +<ol type="a"> +<li id="s1a"><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li> +<li id="s1b"><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section <a href="#s2b">2(b)(1)-(2)</a> are not Copyright and Similar Rights.</li> +<li id="s1c"><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may not +be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar +international agreements.</li> +<li id="s1d"><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li> +<li id="s1e"><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li> +<li id="s1f"><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li> +<li id="s1g"><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li> +<li id="s1h"><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li> +<li id="s1i"><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li> +<li id="s1j"><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li> +</ol> +<p id="s2"><strong>Section 2 – Scope.</strong></p> +<ol type="a"> +<li id="s2a"><strong>License grant</strong>. +<ol> +<li id="s2a1">Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to: +<ol type="A"> +<li id="s2a1A">reproduce and Share the Licensed Material, in whole or in part; and</li> +<li id="s2a1B">produce and reproduce, but not Share, Adapted Material.</li> +</ol> +<li id="s2a2"><span style="text-decoration: underline;">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li> +<li id="s2a3"><span style="text-decoration: underline;">Term</span>. The term of this Public License is specified in Section <a href="#s6a">6(a)</a>.</li> +<li id="s2a4"><span style="text-decoration: underline;">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section <a href="#s2a4">2(a)(4)</a> never produces Adapted Material.</li> +<li id="s2a5"><span style="text-decoration: underline;">Downstream recipients</span>. +<div class="para"> +<ol type="A"> +<li id="s2a5A"><span style="text-decoration: underline;">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li> +<li id="s2a5B"><span style="text-decoration: underline;">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li> +</ol> +</div> +<li id="s2a6"><span style="text-decoration: underline;">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section <a href="#s3a1Ai">3(a)(1)(A)(i)</a>.</li> +</ol> +<li id="s2b"><p><strong>Other rights</strong>.</p> +<ol> +<li id="s2b1">Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li> +<li id="s2b2">Patent and trademark rights are not licensed under this Public License.</li> +<li id="s2b3">To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.</li> +</ol> +</li> +</ol> +<p id="s3"><strong>Section 3 – License Conditions.</strong></p> +<p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p> +<ol type="a"> +<li id="s3a"><p><strong>Attribution</strong>.</p> +<ol> +<li id="s3a1"><p>If You Share the Licensed Material, You must:</p> +<ol type="A"> +<li id="s3a1A">retain the following if it is supplied by the Licensor with the Licensed Material: +<ol type="i"> +<li id="s3a1Ai">identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li> +<li id="s3a1Aii">a copyright notice;</li> +<li id="s3a1Aiii">a notice that refers to this Public License; </li> +<li id="s3a1Aiv">a notice that refers to the disclaimer of warranties;</li> +<li id="s3a1Av">a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li> +</ol> +<li id="s3a1B">indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li> +<li id="s3a1C">indicate the Licensed Material is licensed under this Public License, +and include the text of, or the URI or hyperlink to, this Public +License.</li> +</ol> +For the avoidance of doubt, You do not have permission under this Public License to Share Adapted Material. +</li> +<li id="s3a2">You may satisfy the conditions in Section <a href="#s3a1">3(a)(1)</a> in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li> +<li id="s3a3">If requested by the Licensor, You must remove any of the information required by Section <a href="#s3a1A">3(a)(1)(A)</a> to the extent reasonably practicable.</li> +</ol> +</li> +</ol> +<p id="s4"><strong>Section 4 – Sui Generis Database Rights.</strong></p> +<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p> +<ol type="a"> +<li id="s4a">for the avoidance of doubt, Section <a href="#s2a1">2(a)(1)</a> grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database, provided You do not Share Adapted Material;</li> +<li id="s4b">if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and</li> +<li id="s4c">You must comply with the conditions in Section <a href="#s3a">3(a)</a> if You Share all or a substantial portion of the contents of the database.</li> +</ol> +For the avoidance of doubt, this Section <a href="#s4">4</a> supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights. +<p id="s5"><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p> +<ol style="font-weight: bold;" type="a"> +<li id="s5a"><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li> +<li id="s5b"><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li> +</ol> +<ol start="3" type="a"> +<li id="s5c">The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li> +</ol> +<p id="s6"><strong>Section 6 – Term and Termination.</strong></p> +<ol type="a"> +<li id="s6a">This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li> +<li id="s6b"> +<p>Where Your right to use the Licensed Material has terminated under Section <a href="#s6a">6(a)</a>, it reinstates:</p> +<ol> +<li id="s6b1">automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li> +<li id="s6b2">upon express reinstatement by the Licensor.</li> +</ol> +For the avoidance of doubt, this Section <a href="#s6b">6(b)</a> does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.</li> +<li id="s6c">For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li> +<li id="s6d">Sections <a href="#s1">1</a>, <a href="#s5">5</a>, <a href="#s6">6</a>, <a href="#s7">7</a>, and <a href="#s8">8</a> survive termination of this Public License.</li> +</ol> +<p id="s7"><strong>Section 7 – Other Terms and Conditions.</strong></p> +<ol type="a"> +<li id="s7a">The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li> +<li id="s7b">Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li> +</ol> +<p id="s8"><strong>Section 8 – Interpretation.</strong></p> +<ol type="a"> +<li id="s8a">For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li> +<li id="s8b">To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li> +<li id="s8c">No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li> +<li id="s8d">Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li> +</ol> + +<p class="shaded">Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.†The text of the Creative Commons public licenses is dedicated to the public domain under the <a href="//creativecommons.org/publicdomain/zero/1.0/legalcode">CC0 Public Domain Dedication</a>. Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at <a href="//creativecommons.org/policies">creativecommons.org/policies</a>, Creative Commons does not authorize the use of the trademark “Creative Commons†or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses.<br><br> +Creative Commons may be contacted at <a href="//creativecommons.org/">creativecommons.org</a>.</p> +<p class="shaded"><a id="languages"></a>Additional languages available: + +<a href="/licenses/by-nd/4.0/legalcode.ar">العربية</a>, +<a href="/licenses/by-nd/4.0/legalcode.cs">ÄeÅ¡tina</a>, +<a href="/licenses/by-nd/4.0/legalcode.de">Deutsch</a>, +<a href="/licenses/by-nd/4.0/legalcode.el">Ελληνικά</a>, +<a href="/licenses/by-nd/4.0/legalcode.es">Español</a>, +<a href="/licenses/by-nd/4.0/legalcode.eu">euskara</a>, +<a href="/licenses/by-nd/4.0/legalcode.fi">suomeksi</a>, +<a href="/licenses/by-nd/4.0/legalcode.fr">français</a>, +<a href="/licenses/by-nd/4.0/legalcode.hr">hrvatski</a>, +<a href="/licenses/by-nd/4.0/legalcode.id">Bahasa Indonesia</a>, +<a href="/licenses/by-nd/4.0/legalcode.it">italiano</a>, +<a href="/licenses/by-nd/4.0/legalcode.ja">日本語</a>, +<a href="/licenses/by-nd/4.0/legalcode.ko">í•œêµì–´</a>, +<a href="/licenses/by-nd/4.0/legalcode.lt">Lietuvių</a>, +<a href="/licenses/by-nd/4.0/legalcode.lv">latviski</a>, +<a href="/licenses/by-nd/4.0/legalcode.mi">te reo MÄori</a>, +<a href="/licenses/by-nd/4.0/legalcode.nl">Nederlands</a>, +<a href="/licenses/by-nd/4.0/legalcode.no">norsk</a>, +<a href="/licenses/by-nd/4.0/legalcode.pl">polski</a>, +<a href="/licenses/by-nd/4.0/legalcode.pt">português</a>, +<a href="/licenses/by-nd/4.0/legalcode.ro">română</a>, +<a href="/licenses/by-nd/4.0/legalcode.ru">руÑÑкий</a>, +<a href="/licenses/by-nd/4.0/legalcode.sl">SlovenÅ¡Äina</a>, +<a href="/licenses/by-nd/4.0/legalcode.sv">svenska</a>, +<a href="/licenses/by-nd/4.0/legalcode.tr">Türkçe</a>, +<a href="/licenses/by-nd/4.0/legalcode.uk">українÑька</a>, +<a href="/licenses/by-nd/4.0/legalcode.zh-Hans">ä¸æ–‡</a>, +<a href="/licenses/by-nd/4.0/legalcode.zh-Hant">è¯èªž</a>. + +Please read the <a href="/faq/#officialtranslations">FAQ</a> for more information about official translations.</p> +</div> +<div id="deed-foot"> +<p id="footer"><a href="./">« Back to Commons Deed</a></p> +</div> +</div> + +<div class="site-footer-wrapper"> +<footer id="colophon" class="site-footer sticky-nav-main" role="contentinfo"> +<div class="cc-footer"> +<div class="column cc-footer-main"> +<div class="cc-footer-logo"> +<a href="https://creativecommons.org/" class="custom-logo-link" rel="home" itemprop="url"><img src="https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_.png" class="custom-logo" alt="cc.logo.white" itemprop="logo" srcset="https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_.png 980w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-300x73.png 300w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-768x188.png 768w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-140x34.png 140w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-50x12.png 50w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-270x66.png 270w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-245x60.png 245w" sizes="(max-width: 709px) 85vw, (max-width: 909px) 67vw, (max-width: 1362px) 62vw, 840px" height="240" width="980"></a> +</div> +<div class="cc-footer-links"> +<div class="menu-footer-links-container"> +<ul id="menu-footer-links" class="menu"> +<li id="menu-item-48794" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48794"><a href="https://creativecommons.org/about/contact/">Contact</a></li> +<li id="menu-item-48795" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48795"><a href="https://creativecommons.org/privacy/">Privacy</a></li> +<li id="menu-item-48796" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48796"><a href="https://creativecommons.org/policies/">Policies</a></li> +<li id="menu-item-48797" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48797"><a href="https://creativecommons.org/terms/">Terms</a></li> +</ul> +</div> +</div> +</div> +<div class="column cc-footer-contact"> +<h6><a href="https://creativecommons.org/about/contact">We'd love to hear from you!</a></h6> +<address> +Creative Commons<br> +PO Box 1866, Mountain View, CA 94042 +</address> +<ul> +<li><a href="mailto:info@creativecommons.org" class="mail">info@creativecommons.org</a></li> +<li><a href="https://creativecommons.org/faq">Frequently Asked Questions</a></li> +</ul> +</div> +<div class="column cc-footer-license"> +<div class="license-icons"> +<a rel="license" href="https://creativecommons.org/licenses/by/4.0/" title="Creative Commons Attribution 4.0 International license"> +<i class="cc-icon-cc"></i> +<i class="cc-icon-cc-by"></i> +</a> +</div> +<aside> +<div xmlns:cc="https://creativecommons.org/ns#" about="https://creativecommons.org"> +<p>Except where otherwise <a class="subfoot" href="https://creativecommons.org/policies#license">noted</a>, content on this site is licensed under a <a class="subfoot" href="https://creativecommons.org/licenses/by/4.0/" rel="license">Creative Commons Attribution 4.0 International license</a>. <a class="subfoot" href="https://creativecommons.org/website-icons" target="blank">Icons</a> by The Noun Project.</p> +</div> +</aside> +</div> +</div> +</footer> +</div> +<script type='text/javascript'> + /* <![CDATA[ */ + var screenReaderText = {"expand":"expand child menu","collapse":"collapse child menu"}; + /* ]]> */ +</script> +<script type='text/javascript' src='https://creativecommons.org/wp-content/themes/twentysixteen/js/functions.js'></script> +<script type='text/javascript' src='/includes/legalcode.js'></script> + +</body> +</html> diff --git a/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-sa-3.0-latex.html b/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-sa-3.0-latex.html new file mode 100644 index 0000000000..db7aa35251 --- /dev/null +++ b/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-sa-3.0-latex.html @@ -0,0 +1,472 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta name="generator" content="HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" /> +<title>Creative Commons Legal Code</title> +<meta http-equiv="content-type" content="text/html; charset=utf-8" /> +<link rel="stylesheet" type="text/css" href="https://creativecommons.org/includes/deed3.css" media="screen" /> +<link rel="stylesheet" type="text/css" href="https://creativecommons.org/includes/deed3-print.css" media="print" /> +<!--[if lt IE 7]><link rel="stylesheet" type="text/css" href="https://creativecommons.org/includes/deed3-ie.css" media="screen" /><![endif]--> +<script type="text/javascript" src="https://creativecommons.org/includes/errata.js"> +</script> +</head> +<body> +<p align="center" id="header"><a href="https://creativecommons.org/">Creative Commons</a></p> +<div id="deed" class="green"> +<div id="deed-head"> +<div id="cc-logo"> +<img src="https://creativecommons.org/images/deed/cc-logo.jpg" alt="" /> +</div> +<h1><span>Creative Commons Legal Code</span></h1> +<div id="deed-license"> +<h2>Attribution-ShareAlike 3.0 Unported</h2> +</div> +</div> +<div id="deed-main"> +<div id="deed-main-content"> +<img src="https://creativecommons.org/images/international/unported.png" alt="" /> +<blockquote> +CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES +NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE +DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE +COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. +CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE +INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES +RESULTING FROM ITS USE. +</blockquote> +<h3><em>License</em></h3> +<p>THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS +OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR +"LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER +APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS +AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS +PROHIBITED.</p> +<p>BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU +ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. +TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A +CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE +IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND +CONDITIONS.</p> +<p><strong>1. Definitions</strong></p> +<ol type="a"> +<li><strong>"Adaptation"</strong> means a work based upon +the Work, or upon the Work and other pre-existing works, +such as a translation, adaptation, derivative work, +arrangement of music or other alterations of a literary +or artistic work, or phonogram or performance and +includes cinematographic adaptations or any other form in +which the Work may be recast, transformed, or adapted +including in any form recognizably derived from the +original, except that a work that constitutes a +Collection will not be considered an Adaptation for the +purpose of this License. For the avoidance of doubt, +where the Work is a musical work, performance or +phonogram, the synchronization of the Work in +timed-relation with a moving image ("synching") will be +considered an Adaptation for the purpose of this +License.</li> +<li><strong>"Collection"</strong> means a collection of +literary or artistic works, such as encyclopedias and +anthologies, or performances, phonograms or broadcasts, +or other works or subject matter other than works listed +in Section 1(f) below, which, by reason of the selection + and arrangement of their contents, constitute +intellectual creations, in which the Work is included in +its entirety in unmodified form along with one or more +other contributions, each constituting separate and +independent works in themselves, which together are +assembled into a collective whole. A work that +constitutes a Collection will not be considered an +Adaptation (as defined below) for the purposes of this +License.</li> +<li><strong>"Creative Commons Compatible +License"</strong> means a license that is listed at +https://creativecommons.org/compatiblelicenses that has +been approved by Creative Commons as being essentially +equivalent to this License, including, at a minimum, +because that license: (i) contains terms that have the +same purpose, meaning and effect as the License Elements +of this License; and, (ii) explicitly permits the +relicensing of adaptations of works made available under +that license under this License or a Creative Commons +jurisdiction license with the same License Elements as +this License.</li> +<li><strong>"Distribute"</strong> means to make available +to the public the original and copies of the Work or +Adaptation, as appropriate, through sale or other +transfer of ownership.</li> +<li><strong>"License Elements"</strong> means the +following high-level license attributes as selected by +Licensor and indicated in the title of this License: +Attribution, ShareAlike.</li> +<li><strong>"Licensor"</strong> means the individual, +individuals, entity or entities that offer(s) the Work +under the terms of this License.</li> +<li><strong>"Original Author"</strong> means, in the case +of a literary or artistic work, the individual, +individuals, entity or entities who created the Work or +if no individual or entity can be identified, the +publisher; and in addition (i) in the case of a +performance the actors, singers, musicians, dancers, and +other persons who act, sing, deliver, declaim, play in, +interpret or otherwise perform literary or artistic works +or expressions of folklore; (ii) in the case of a +phonogram the producer being the person or legal entity +who first fixes the sounds of a performance or other +sounds; and, (iii) in the case of broadcasts, the +organization that transmits the broadcast.</li> +<li><strong>"Work"</strong> means the literary and/or +artistic work offered under the terms of this License +including without limitation any production in the +literary, scientific and artistic domain, whatever may be +the mode or form of its expression including digital +form, such as a book, pamphlet and other writing; a +lecture, address, sermon or other work of the same +nature; a dramatic or dramatico-musical work; a +choreographic work or entertainment in dumb show; a +musical composition with or without words; a +cinematographic work to which are assimilated works +expressed by a process analogous to cinematography; a +work of drawing, painting, architecture, sculpture, +engraving or lithography; a photographic work to which +are assimilated works expressed by a process analogous to +photography; a work of applied art; an illustration, map, +plan, sketch or three-dimensional work relative to +geography, topography, architecture or science; a +performance; a broadcast; a phonogram; a compilation of +data to the extent it is protected as a copyrightable +work; or a work performed by a variety or circus +performer to the extent it is not otherwise considered a +literary or artistic work.</li> +<li><strong>"You"</strong> means an individual or entity +exercising rights under this License who has not +previously violated the terms of this License with +respect to the Work, or who has received express +permission from the Licensor to exercise rights under +this License despite a previous violation.</li> +<li><strong>"Publicly Perform"</strong> means to perform +public recitations of the Work and to communicate to the +public those public recitations, by any means or process, +including by wire or wireless means or public digital +performances; to make available to the public Works in +such a way that members of the public may access these +Works from a place and at a place individually chosen by +them; to perform the Work to the public by any means or +process and the communication to the public of the +performances of the Work, including by public digital +performance; to broadcast and rebroadcast the Work by any +means including signs, sounds or images.</li> +<li><strong>"Reproduce"</strong> means to make copies of +the Work by any means including without limitation by +sound or visual recordings and the right of fixation and +reproducing fixations of the Work, including storage of a +protected performance or phonogram in digital form or +other electronic medium.</li> +</ol> +<p><strong>2. Fair Dealing Rights.</strong> Nothing in this +License is intended to reduce, limit, or restrict any uses +free from copyright or rights arising from limitations or +exceptions that are provided for in connection with the +copyright protection under copyright law or other +applicable laws.</p> +<p><strong>3. License Grant.</strong> Subject to the terms +and conditions of this License, Licensor hereby grants You +a worldwide, royalty-free, non-exclusive, perpetual (for +the duration of the applicable copyright) license to +exercise the rights in the Work as stated below:</p> +<ol type="a"> +<li>to Reproduce the Work, to incorporate the Work into +one or more Collections, and to Reproduce the Work as +incorporated in the Collections;</li> +<li>to create and Reproduce Adaptations provided that any +such Adaptation, including any translation in any medium, +takes reasonable steps to clearly label, demarcate or +otherwise identify that changes were made to the original +Work. For example, a translation could be marked "The +original work was translated from English to Spanish," or +a modification could indicate "The original work has been +modified.";</li> +<li>to Distribute and Publicly Perform the Work including +as incorporated in Collections; and,</li> +<li>to Distribute and Publicly Perform Adaptations.</li> +<li> +<p>For the avoidance of doubt:</p> +<ol type="i"> +<li><strong>Non-waivable Compulsory License +Schemes</strong>. In those jurisdictions in which the +right to collect royalties through any statutory or +compulsory licensing scheme cannot be waived, the +Licensor reserves the exclusive right to collect such +royalties for any exercise by You of the rights +granted under this License;</li> +<li><strong>Waivable Compulsory License +Schemes</strong>. In those jurisdictions in which the +right to collect royalties through any statutory or +compulsory licensing scheme can be waived, the +Licensor waives the exclusive right to collect such +royalties for any exercise by You of the rights +granted under this License; and,</li> +<li><strong>Voluntary License Schemes</strong>. The +Licensor waives the right to collect royalties, +whether individually or, in the event that the +Licensor is a member of a collecting society that +administers voluntary licensing schemes, via that +society, from any exercise by You of the rights +granted under this License.</li> +</ol> +</li> +</ol> +<p>The above rights may be exercised in all media and +formats whether now known or hereafter devised. The above +rights include the right to make such modifications as are +technically necessary to exercise the rights in other media +and formats. Subject to Section 8(f), all rights not +expressly granted by Licensor are hereby reserved.</p> +<p><strong>4. Restrictions.</strong> The license granted in +Section 3 above is expressly made subject to and limited by +the following restrictions:</p> +<ol type="a"> +<li>You may Distribute or Publicly Perform the Work only +under the terms of this License. You must include a copy +of, or the Uniform Resource Identifier (URI) for, this +License with every copy of the Work You Distribute or +Publicly Perform. You may not offer or impose any terms +on the Work that restrict the terms of this License or +the ability of the recipient of the Work to exercise the +rights granted to that recipient under the terms of the +License. You may not sublicense the Work. You must keep +intact all notices that refer to this License and to the +disclaimer of warranties with every copy of the Work You +Distribute or Publicly Perform. When You Distribute or +Publicly Perform the Work, You may not impose any +effective technological measures on the Work that +restrict the ability of a recipient of the Work from You +to exercise the rights granted to that recipient under +the terms of the License. This Section 4(a) applies to +the Work as incorporated in a Collection, but this does +not require the Collection apart from the Work itself to +be made subject to the terms of this License. If You +create a Collection, upon notice from any Licensor You +must, to the extent practicable, remove from the +Collection any credit as required by Section 4(c), as +requested. If You create an Adaptation, upon notice from +any Licensor You must, to the extent practicable, remove +from the Adaptation any credit as required by Section +4(c), as requested.</li> +<li>You may Distribute or Publicly Perform an Adaptation +only under the terms of: (i) this License; (ii) a later +version of this License with the same License Elements as +this License; (iii) a Creative Commons jurisdiction +license (either this or a later license version) that +contains the same License Elements as this License (e.g., +Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons +Compatible License. If you license the Adaptation under +one of the licenses mentioned in (iv), you must comply +with the terms of that license. If you license the +Adaptation under the terms of any of the licenses +mentioned in (i), (ii) or (iii) (the "Applicable +License"), you must comply with the terms of the +Applicable License generally and the following +provisions: (I) You must include a copy of, or the URI +for, the Applicable License with every copy of each +Adaptation You Distribute or Publicly Perform; (II) You +may not offer or impose any terms on the Adaptation that +restrict the terms of the Applicable License or the +ability of the recipient of the Adaptation to exercise +the rights granted to that recipient under the terms of +the Applicable License; (III) You must keep intact all +notices that refer to the Applicable License and to the +disclaimer of warranties with every copy of the Work as +included in the Adaptation You Distribute or Publicly +Perform; (IV) when You Distribute or Publicly Perform the +Adaptation, You may not impose any effective +technological measures on the Adaptation that restrict +the ability of a recipient of the Adaptation from You to +exercise the rights granted to that recipient under the +terms of the Applicable License. This Section 4(b) +applies to the Adaptation as incorporated in a +Collection, but this does not require the Collection +apart from the Adaptation itself to be made subject to +the terms of the Applicable License.</li> +<li>If You Distribute, or Publicly Perform the Work or +any Adaptations or Collections, You must, unless a +request has been made pursuant to Section 4(a), keep +intact all copyright notices for the Work and provide, +reasonable to the medium or means You are utilizing: (i) +the name of the Original Author (or pseudonym, if +applicable) if supplied, and/or if the Original Author +and/or Licensor designate another party or parties (e.g., +a sponsor institute, publishing entity, journal) for +attribution ("Attribution Parties") in Licensor's +copyright notice, terms of service or by other reasonable +means, the name of such party or parties; (ii) the title +of the Work if supplied; (iii) to the extent reasonably +practicable, the URI, if any, that Licensor specifies to +be associated with the Work, unless such URI does not +refer to the copyright notice or licensing information +for the Work; and (iv) , consistent with Ssection 3(b), +in the case of an Adaptation, a credit identifying the +use of the Work in the Adaptation (e.g., "French +translation of the Work by Original Author," or +"Screenplay based on original Work by Original Author"). +The credit required by this Section 4(c) may be +implemented in any reasonable manner; provided, however, +that in the case of a Adaptation or Collection, at a +minimum such credit will appear, if a credit for all +contributing authors of the Adaptation or Collection +appears, then as part of these credits and in a manner at +least as prominent as the credits for the other +contributing authors. For the avoidance of doubt, You may +only use the credit required by this Section for the +purpose of attribution in the manner set out above and, +by exercising Your rights under this License, You may not +implicitly or explicitly assert or imply any connection +with, sponsorship or endorsement by the Original Author, +Licensor and/or Attribution Parties, as appropriate, of +You or Your use of the Work, without the separate, +express prior written permission of the Original Author, +Licensor and/or Attribution Parties.</li> +<li>Except as otherwise agreed in writing by the Licensor +or as may be otherwise permitted by applicable law, if +You Reproduce, Distribute or Publicly Perform the Work +either by itself or as part of any Adaptations or +Collections, You must not distort, mutilate, modify or +take other derogatory action in relation to the Work +which would be prejudicial to the Original Author's honor +or reputation. Licensor agrees that in those +jurisdictions (e.g. Japan), in which any exercise of the +right granted in Section 3(b) of this License (the right +to make Adaptations) would be deemed to be a distortion, +mutilation, modification or other derogatory action +prejudicial to the Original Author's honor and +reputation, the Licensor will waive or not assert, as +appropriate, this Section, to the fullest extent +permitted by the applicable national law, to enable You +to reasonably exercise Your right under Section 3(b) of +this License (right to make Adaptations) but not +otherwise.</li> +</ol> +<p><strong>5. Representations, Warranties and +Disclaimer</strong></p> +<p>UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN +WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO +REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE +WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, +WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, +FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE +ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE +PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. +SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED +WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.</p> +<p><strong>6. Limitation on Liability.</strong> EXCEPT TO +THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL +LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY +SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY +DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, +EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES.</p> +<p><strong>7. Termination</strong></p> +<ol type="a"> +<li>This License and the rights granted hereunder will +terminate automatically upon any breach by You of the +terms of this License. Individuals or entities who have +received Adaptations or Collections from You under this +License, however, will not have their licenses terminated +provided such individuals or entities remain in full +compliance with those licenses. Sections 1, 2, 5, 6, 7, +and 8 will survive any termination of this License.</li> +<li>Subject to the above terms and conditions, the +license granted here is perpetual (for the duration of +the applicable copyright in the Work). Notwithstanding +the above, Licensor reserves the right to release the +Work under different license terms or to stop +distributing the Work at any time; provided, however that +any such election will not serve to withdraw this License +(or any other license that has been, or is required to +be, granted under the terms of this License), and this +License will continue in full force and effect unless +terminated as stated above.</li> +</ol> +<p><strong>8. Miscellaneous</strong></p> +<ol type="a"> +<li>Each time You Distribute or Publicly Perform the Work +or a Collection, the Licensor offers to the recipient a +license to the Work on the same terms and conditions as +the license granted to You under this License.</li> +<li>Each time You Distribute or Publicly Perform an +Adaptation, Licensor offers to the recipient a license to +the original Work on the same terms and conditions as the +license granted to You under this License.</li> +<li>If any provision of this License is invalid or +unenforceable under applicable law, it shall not affect +the validity or enforceability of the remainder of the +terms of this License, and without further action by the +parties to this agreement, such provision shall be +reformed to the minimum extent necessary to make such +provision valid and enforceable.</li> +<li>No term or provision of this License shall be deemed +waived and no breach consented to unless such waiver or +consent shall be in writing and signed by the party to be + charged with such waiver or consent.</li> +<li>This License constitutes the entire agreement between +the parties with respect to the Work licensed here. There +are no understandings, agreements or representations with +respect to the Work not specified here. Licensor shall +not be bound by any additional provisions that may appear +in any communication from You. This License may not be +modified without the mutual written agreement of the +Licensor and You.</li> +<li>The rights granted under, and the subject matter +referenced, in this License were drafted utilizing the +terminology of the Berne Convention for the Protection of +Literary and Artistic Works (as amended on September 28, +1979), the Rome Convention of 1961, the WIPO Copyright +Treaty of 1996, the WIPO Performances and Phonograms +Treaty of 1996 and the Universal Copyright Convention (as +revised on July 24, 1971). These rights and subject +matter take effect in the relevant jurisdiction in which +the License terms are sought to be enforced according to +the corresponding provisions of the implementation of +those treaty provisions in the applicable national law. +If the standard suite of rights granted under applicable +copyright law includes additional rights not granted +under this License, such additional rights are deemed to +be included in the License; this License is not intended +to restrict the license of any rights under applicable +law.</li> +</ol> + +<blockquote> +<h3>Creative Commons Notice</h3> +<p>Creative Commons is not a party to this License, and +makes no warranty whatsoever in connection with the Work. +Creative Commons will not be liable to You or any party +on any legal theory for any damages whatsoever, including +without limitation any general, special, incidental or +consequential damages arising in connection to this +license. Notwithstanding the foregoing two (2) sentences, +if Creative Commons has expressly identified itself as +the Licensor hereunder, it shall have all rights and +obligations of Licensor.</p> +<p>Except for the limited purpose of indicating to the +public that the Work is licensed under the CCPL, Creative +Commons does not authorize the use by either party of the +trademark "Creative Commons" or any related trademark or +logo of Creative Commons without the prior written +consent of Creative Commons. Any permitted use will be in +compliance with Creative Commons' then-current trademark +usage guidelines, as may be published on its website or +otherwise made available upon request from time to time. +For the avoidance of doubt, this trademark restriction +does not form part of the License.</p> +<p>Creative Commons may be contacted at <a href="https://creativecommons.org/">https://creativecommons.org/</a>.</p> +</blockquote> +</div> +</div> +<div id="deed-foot"> +<p id="footer"><a href="./">« Back to Commons Deed</a></p> +</div> +</div> +</body> +</html> diff --git a/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-sa-4.0-latex.html b/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-sa-4.0-latex.html new file mode 100644 index 0000000000..81bd383ab6 --- /dev/null +++ b/macros/latex/contrib/doclicense/license-texts/doclicense-CC-by-sa-4.0-latex.html @@ -0,0 +1,407 @@ +<!DOCTYPE html> +<html> +<head> +<title>Creative Commons — Attribution-ShareAlike 4.0 International — CC BY-SA 4.0</title> +<meta charset="UTF-8"> +<script type="text/javascript" src="//creativecommons.org/includes/errata.js"></script> + +<meta name="viewport" content="width=device-width, initial-scale=1"> +<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700" rel="stylesheet"> +<link rel='stylesheet' id='cc-fontello-css' href="https://creativecommons.org/wp-content/themes/cc/fonts/fontello/css/cc-fontello.css" type='text/css' media='all' /> +<link rel='stylesheet' id='parent-style-css' href="https://creativecommons.org/wp-content/themes/twentysixteen/style.css" type='text/css' media='all' /> +<link rel='stylesheet' id='cc-style-css' href="https://creativecommons.org/wp-content/themes/cc/css/app.css" type='text/css' media='all' /> +<link rel="stylesheet" type="text/css" href="/includes/legalcode.css" media="screen" /> +<link rel="stylesheet" type="text/css" href="/includes/legalcode-print.css" media="print" /> +<script src="https://code.jquery.com/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=" crossorigin="anonymous"></script> + +</head> +<body class="lang-en"> + +<div class="site-header-wrapper"> +<header id="masthead" class="site-header sticky-nav-main sticky attached" role="banner"> +<div class="site-header-main"> +<div class="site-branding"> +<a class="cc-site-logo-link" href="https://creativecommons.org/" rel="home"> +<img class="cc-site-logo" src="https://creativecommons.org/wp-content/themes/cc/images/cc.logo.white.svg" height="72" width="303"> +</a> +</div> +<button id="menu-toggle" class="menu-toggle"><i class="cc-icon-menu"></i> <span>Menu</span></button> +<div id="site-header-menu" class="site-header-menu"> +<nav id="mobile-navigation" class="mobile-navigation" role="navigation" aria-label="Mobile Menu"> +<div class="menu-mobile-menu-container"><ul id="menu-mobile-menu" class="mobile-menu"> +<li id="menu-item-48798" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48798"><a href="https://creativecommons.org/share-your-work/">Share your work</a></li> +<li id="menu-item-48799" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48799"><a href="https://creativecommons.org/use-remix/">Use & remix</a></li> +<li id="menu-item-48800" class="menu-item menu-item-type-post_type menu-item-object-page page_item page-item-7466 menu-item-48800"><a href="https://creativecommons.org/about/">What we do</a></li> +<li id="menu-item-48801" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48801"><a href="https://creativecommons.org/blog/">Blog</a></li> +<li id="menu-item-48802" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48802"><a href="https://creativecommons.org/about/global-affiliate-network/">Global Affiliate Network</a></li> +<li id="menu-item-48803" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48803"><a href="https://creativecommons.org/use-remix/search-the-commons/">Search the Commons</a></li> +</ul></div> +</nav> +<nav id="site-navigation" class="main-navigation" role="navigation" aria-label="Primary Menu"> +<div class="menu-primary-menu-container"><ul id="menu-primary-menu" class="primary-menu"> +<li id="menu-item-48791" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48791"><a href="https://creativecommons.org/share-your-work/">Share your work</a></li> +<li id="menu-item-48792" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48792"><a href="https://creativecommons.org/use-remix/">Use & remix</a></li> +<li id="menu-item-48570" class="menu-item menu-item-type-post_type menu-item-object-page page_item page-item-7466 menu-item-48570"><a href="https://creativecommons.org/about/">What we do</a></li> +<li id="menu-item-48793" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48793"><a href="https://creativecommons.org/blog/">Blog</a></li> +</ul></div> +</nav> +<nav id="secondary-navigation" class="secondary-navigation" role="navigation" aria-label="Secondary Menu"> +<div class="menu-secondary-menu-container"><ul id="menu-secondary-menu" class="secondary-menu"><li id="menu-item-48804" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48804"><a href="https://creativecommons.org/about/global-affiliate-network/">Global Affiliate Network</a></li> +<li id="menu-item-48805" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48805"><a href="https://creativecommons.org/use-remix/search-the-commons/">Search the Commons</a></li> +<li id="menu-item-48806" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48806"><a href="https://creativecommons.org/about/contact/">Contact</a></li> +</ul></div> +</nav> +<nav id="social-navigation" class="social-navigation" role="navigation" aria-label="Social Links Menu"> +<div class="menu-social-links-container"><ul id="menu-social-links" class="social-links-menu"> +<li id="menu-item-48807" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48807"><a href="https://www.facebook.com/creativecommons"><span class="screen-reader-text">Facebook</span></a></li> +<li id="menu-item-48808" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48808"><a href="https://twitter.com/creativecommons"><span class="screen-reader-text">Twitter</span></a></li> +<li id="menu-item-48809" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48809"><a href="mailto:info@creativecommons.org"><span class="screen-reader-text">Mail</span></a></li> +</ul></div> +</nav> +</div> +</div> +</header> +<header class="site-header spacer" role="banner"> +<div class="site-header-main"> +<div class="site-branding"> +<a class="cc-site-logo-link" href="https://creativecommons.org/" rel="home"> +<img class="cc-site-logo" src="https://creativecommons.org/wp-content/themes/cc/images/cc.logo.white.svg" height="72" width="303"> +</a> +</div> +<button id="menu-toggle" class="menu-toggle"><i class="cc-icon-menu"></i> <span>Menu</span></button> +<div id="site-header-menu" class="site-header-menu"> +<nav id="mobile-navigation" class="mobile-navigation" role="navigation" aria-label="Mobile Menu"> +<div class="menu-mobile-menu-container"><ul id="menu-mobile-menu" class="mobile-menu"> +<li id="menu-item-48798" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48798"><a href="https://creativecommons.org/share-your-work/">Share your work</a></li> +<li id="menu-item-48799" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48799"><a href="https://creativecommons.org/use-remix/">Use & remix</a></li> +<li id="menu-item-48800" class="menu-item menu-item-type-post_type menu-item-object-page page_item page-item-7466 menu-item-48800"><a href="https://creativecommons.org/about/">What we do</a></li> +<li id="menu-item-48801" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48801"><a href="https://creativecommons.org/blog/">Blog</a></li> +<li id="menu-item-48802" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48802"><a href="https://creativecommons.org/about/global-affiliate-network/">Global Affiliate Network</a></li> +<li id="menu-item-48803" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48803"><a href="https://creativecommons.org/use-remix/search-the-commons/">Search the Commons</a></li> +</ul></div> +</nav> +<nav id="site-navigation" class="main-navigation" role="navigation" aria-label="Primary Menu"> +<div class="menu-primary-menu-container"><ul id="menu-primary-menu" class="primary-menu"> +<li id="menu-item-48791" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48791"><a href="https://creativecommons.org/share-your-work/">Share your work</a></li> +<li id="menu-item-48792" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48792"><a href="https://creativecommons.org/use-remix/">Use & remix</a></li> +<li id="menu-item-48570" class="menu-item menu-item-type-post_type menu-item-object-page page_item page-item-7466 menu-item-48570"><a href="https://creativecommons.org/about/">What we do</a></li> +<li id="menu-item-48793" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48793"><a href="https://creativecommons.org/blog/">Blog</a></li> +</ul></div> +</nav> +<nav id="secondary-navigation" class="secondary-navigation" role="navigation" aria-label="Secondary Menu"> +<div class="menu-secondary-menu-container"><ul id="menu-secondary-menu" class="secondary-menu"><li id="menu-item-48804" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48804"><a href="https://creativecommons.org/about/global-affiliate-network/">Global Affiliate Network</a></li> +<li id="menu-item-48805" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48805"><a href="https://creativecommons.org/use-remix/search-the-commons/">Search the Commons</a></li> +<li id="menu-item-48806" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48806"><a href="https://creativecommons.org/about/contact/">Contact</a></li> +</ul></div> +</nav> +<nav id="social-navigation" class="social-navigation" role="navigation" aria-label="Social Links Menu"> +<div class="menu-social-links-container"><ul id="menu-social-links" class="social-links-menu"> +<li id="menu-item-48807" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48807"><a href="https://www.facebook.com/creativecommons"><span class="screen-reader-text">Facebook</span></a></li> +<li id="menu-item-48808" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48808"><a href="https://twitter.com/creativecommons"><span class="screen-reader-text">Twitter</span></a></li> +<li id="menu-item-48809" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-48809"><a href="mailto:info@creativecommons.org"><span class="screen-reader-text">Mail</span></a></li> +</ul></div> +</nav> +</div> +</div> +</header> +</div> +<aside id="header-below" class="widget-area"> +<section id="text-15" class="widget-1 widget-first widget-last widget-odd widget widget_text"> +<div class="textwidget"> +<div id="donation-bar-wrapper" class="donation-bar-wrapper"> +<div id="donation-bar-inner" class="donation-bar-inner"> +<p class="donate-text">Help us build a vibrant, collaborative global commons</p> +<div class="donate-action"><a href="/donate?utm_campaign=2018fund&utm_source=license_header2018" class="button donate arrow">Donate<span class="hide-on-mobile"> Now</span></a></div> +</div> +</div> +</div> +</section> +</aside> + + +<div id="language-selector-block" class="container"> +<div class="language-selector-inner"> +This page is available in the following languages: +<img class="language-icon" src="/images/language_icon_x2.png" alt="Languages"> +<select> +<option value="legalcode.ar">العربية</option> +<option value="legalcode.cs">ÄeÅ¡tina</option> +<option value="legalcode.de">Deutsch</option> +<option value="legalcode.el">Ελληνικά</option> +<option value="legalcode" selected="selected">English</option> +<option value="legalcode.es">Español</option> +<option value="legalcode.eu">euskara</option> +<option value="legalcode.fi">suomeksi</option> +<option value="legalcode.fr">français</option> +<option value="legalcode.hr">hrvatski</option> +<option value="legalcode.id">Bahasa Indonesia</option> +<option value="legalcode.it">italiano</option> +<option value="legalcode.ja">日本語</option> +<option value="legalcode.ko">í•œêµì–´</option> +<option value="legalcode.lt">Lietuvių</option> +<option value="legalcode.lv">latviski</option> +<option value="legalcode.mi">te reo MÄori</option> +<option value="legalcode.nl">Nederlands</option> +<option value="legalcode.no">norsk</option> +<option value="legalcode.pl">polski</option> +<option value="legalcode.pt">português</option> +<option value="legalcode.ro">română</option> +<option value="legalcode.ru">руÑÑкий</option> +<option value="legalcode.sl">SlovenÅ¡Äina</option> +<option value="legalcode.sv">svenska</option> +<option value="legalcode.tr">Türkçe</option> +<option value="legalcode.uk">українÑька</option> +<option value="legalcode.zh-Hans">ä¸æ–‡</option> +<option value="legalcode.zh-Hant">è¯èªž</option> +</select> +</div> +</div> + + +<div id="deed" class="green"> +<div id="deed-head"> +<div id="cc-logo"><span class="cc-icon-logo"><img src="/images/deed/svg/cc_white.svg" alt="CC" /></span><span class="cc-icon-by"><img src="/images/deed/svg/attribution_icon_white.svg" alt="Attribution" /></span><span class="cc-icon-sa"><img src="/images/deed/svg/sa_white.svg" alt="Share Alike" /></span></div> +<h1><span>Creative Commons Legal Code</span></h1> +<div id="deed-license"> +<h2>Attribution-ShareAlike 4.0 International</h2> +</div> +</div> +<div id="deed-main"> +<div id="deed-main-content"> +<div id="deed-disclaimer"> +<div class="summary"> +Official translations of this license are available <a href="#languages">in other languages</a>. +</div> +</div> +<div class="shaded"> +<p>Creative Commons Corporation (“Creative Commonsâ€) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is†basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible.</p> +</div> +<div class="shaded"> +<p><strong>Using Creative Commons Public Licenses</strong></p> +<p>Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses.</p> +<p class="usage-considerations"><strong>Considerations for licensors:</strong> Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. <a href="//wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensors">More considerations for licensors.</a></p> +<p class="usage-considerations"><strong>Considerations for the public:</strong> By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensor’s permission is not necessary for any reason–for example, because of any applicable exception or limitation to copyright–then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to respect those requests where reasonable. +<a href="//wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensees">More considerations for the public.</a></p> +</div> +<h3>Creative Commons Attribution-ShareAlike 4.0 International Public License</h3> +<p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.</p> +<p id="s1"><strong>Section 1 – Definitions.</strong></p> +<ol type="a"> +<li id="s1a"><strong>Adapted Material</strong> means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.</li> +<li id="s1b"><strong>Adapter's License</strong> means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.</li> +<li id="s1c"><strong>BY-SA Compatible License</strong> means a license listed at <a href="//creativecommons.org/compatiblelicenses"> creativecommons.org/compatiblelicenses</a>, approved by Creative Commons as essentially the equivalent of this Public License.</li> +<li id="s1d"><strong>Copyright and Similar Rights</strong> means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section <a href="#s2b">2(b)(1)-(2)</a> are not Copyright and Similar Rights.</li> +<li id="s1e"><strong>Effective Technological Measures</strong> means those measures that, in the absence of proper authority, may not +be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar +international agreements.</li> +<li id="s1f"><strong>Exceptions and Limitations</strong> means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.</li> +<li id="s1g"><strong>License Elements</strong> means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution and ShareAlike.</li> +<li id="s1h"><strong>Licensed Material</strong> means the artistic or literary work, database, or other material to which the Licensor applied this Public License.</li> +<li id="s1i"><strong>Licensed Rights</strong> means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.</li> +<li id="s1j"><strong>Licensor</strong> means the individual(s) or entity(ies) granting rights under this Public License.</li> +<li id="s1k"><strong>Share</strong> means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.</li> +<li id="s1l"><strong>Sui Generis Database Rights</strong> means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.</li> +<li id="s1m"><strong>You</strong> means the individual or entity exercising the Licensed Rights under this Public License. <strong>Your</strong> has a corresponding meaning.</li> +</ol> +<p id="s2"><strong>Section 2 – Scope.</strong></p> +<ol type="a"> +<li id="s2a"><strong>License grant</strong>. +<ol> +<li id="s2a1">Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to: +<ol type="A"> +<li id="s2a1A">reproduce and Share the Licensed Material, in whole or in part; and</li> +<li id="s2a1B">produce, reproduce, and Share Adapted Material.</li> +</ol> +<li id="s2a2"><span style="text-decoration: underline;">Exceptions and Limitations</span>. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.</li> +<li id="s2a3"><span style="text-decoration: underline;">Term</span>. The term of this Public License is specified in Section <a href="#s6a">6(a)</a>.</li> +<li id="s2a4"><span style="text-decoration: underline;">Media and formats; technical modifications allowed</span>. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section <a href="#s2a4">2(a)(4)</a> never produces Adapted Material.</li> +<li id="s2a5"><span style="text-decoration: underline;">Downstream recipients</span>. +<div class="para"> +<ol type="A"> +<li id="s2a5A"><span style="text-decoration: underline;">Offer from the Licensor – Licensed Material</span>. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.</li> +<li id="s2a5B"><span style="text-decoration: underline;">Additional offer from the Licensor – Adapted Material</span>. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter’s License You apply.</li> +<li id="s2a5C"><span style="text-decoration: underline;">No downstream restrictions</span>. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.</li> +</ol> +</div> +<li id="s2a6"><span style="text-decoration: underline;">No endorsement</span>. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section <a href="#s3a1Ai">3(a)(1)(A)(i)</a>.</li> +</ol> +<li id="s2b"><p><strong>Other rights</strong>.</p> +<ol> +<li id="s2b1">Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.</li> +<li id="s2b2">Patent and trademark rights are not licensed under this Public License.</li> +<li id="s2b3">To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.</li> +</ol> +</li> +</ol> +<p id="s3"><strong>Section 3 – License Conditions.</strong></p> +<p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p> +<ol type="a"> +<li id="s3a"><p><strong>Attribution</strong>.</p> +<ol> +<li id="s3a1"><p>If You Share the Licensed Material (including in modified form), You must:</p> +<ol type="A"> +<li id="s3a1A">retain the following if it is supplied by the Licensor with the Licensed Material: +<ol type="i"> +<li id="s3a1Ai">identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);</li> +<li id="s3a1Aii">a copyright notice;</li> +<li id="s3a1Aiii">a notice that refers to this Public License; </li> +<li id="s3a1Aiv">a notice that refers to the disclaimer of warranties;</li> +<li id="s3a1Av">a URI or hyperlink to the Licensed Material to the extent reasonably practicable;</li> +</ol> +<li id="s3a1B">indicate if You modified the Licensed Material and retain an indication of any previous modifications; and</li> +<li id="s3a1C">indicate the Licensed Material is licensed under this Public License, +and include the text of, or the URI or hyperlink to, this Public +License.</li> +</ol> +</li> +<li id="s3a2">You may satisfy the conditions in Section <a href="#s3a1">3(a)(1)</a> in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.</li> +<li id="s3a3">If requested by the Licensor, You must remove any of the information required by Section <a href="#s3a1A">3(a)(1)(A)</a> to the extent reasonably practicable.</li> +</ol> +</li> +<li id="s3b"><strong>ShareAlike</strong>. +<p>In addition to the conditions in Section <a href="#s3a">3(a)</a>, if You Share Adapted Material You produce, the following conditions also apply.</p> +<ol> +<li id="s3b1">The Adapter’s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-SA Compatible License.</li> +<li id="s3b2">You must include the text of, or the URI or hyperlink to, the Adapter's License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material.</li> +<li id="s3b3">You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter's License You apply.</li> +</ol> +</li> +</ol> +<p id="s4"><strong>Section 4 – Sui Generis Database Rights.</strong></p> +<p>Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:</p> +<ol type="a"> +<li id="s4a">for the avoidance of doubt, Section <a href="#s2a1">2(a)(1)</a> grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database;</li> +<li id="s4b">if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material, including for purposes of Section <a href="#s3b">3(b)</a>; and</li> +<li id="s4c">You must comply with the conditions in Section <a href="#s3a">3(a)</a> if You Share all or a substantial portion of the contents of the database.</li> +</ol> +For the avoidance of doubt, this Section <a href="#s4">4</a> supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights. +<p id="s5"><strong>Section 5 – Disclaimer of Warranties and Limitation of Liability.</strong></p> +<ol style="font-weight: bold;" type="a"> +<li id="s5a"><strong>Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.</strong></li> +<li id="s5b"><strong>To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.</strong></li> +</ol> +<ol start="3" type="a"> +<li id="s5c">The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.</li> +</ol> +<p id="s6"><strong>Section 6 – Term and Termination.</strong></p> +<ol type="a"> +<li id="s6a">This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.</li> +<li id="s6b"> +<p>Where Your right to use the Licensed Material has terminated under Section <a href="#s6a">6(a)</a>, it reinstates:</p> +<ol> +<li id="s6b1">automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or</li> +<li id="s6b2">upon express reinstatement by the Licensor.</li> +</ol> +For the avoidance of doubt, this Section <a href="#s6b">6(b)</a> does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.</li> +<li id="s6c">For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.</li> +<li id="s6d">Sections <a href="#s1">1</a>, <a href="#s5">5</a>, <a href="#s6">6</a>, <a href="#s7">7</a>, and <a href="#s8">8</a> survive termination of this Public License.</li> +</ol> +<p id="s7"><strong>Section 7 – Other Terms and Conditions.</strong></p> +<ol type="a"> +<li id="s7a">The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.</li> +<li id="s7b">Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.</li> +</ol> +<p id="s8"><strong>Section 8 – Interpretation.</strong></p> +<ol type="a"> +<li id="s8a">For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.</li> +<li id="s8b">To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.</li> +<li id="s8c">No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.</li> +<li id="s8d">Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.</li> +</ol> + +<p class="shaded">Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.†The text of the Creative Commons public licenses is dedicated to the public domain under the <a href="//creativecommons.org/publicdomain/zero/1.0/legalcode">CC0 Public Domain Dedication</a>. Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at <a href="//creativecommons.org/policies">creativecommons.org/policies</a>, Creative Commons does not authorize the use of the trademark “Creative Commons†or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses.<br><br> +Creative Commons may be contacted at <a href="//creativecommons.org/">creativecommons.org</a>.</p> +<p class="shaded"><a id="languages"></a>Additional languages available: + +<a href="/licenses/by-sa/4.0/legalcode.ar">العربية</a>, +<a href="/licenses/by-sa/4.0/legalcode.cs">ÄeÅ¡tina</a>, +<a href="/licenses/by-sa/4.0/legalcode.de">Deutsch</a>, +<a href="/licenses/by-sa/4.0/legalcode.el">Ελληνικά</a>, +<a href="/licenses/by-sa/4.0/legalcode.es">Español</a>, +<a href="/licenses/by-sa/4.0/legalcode.eu">euskara</a>, +<a href="/licenses/by-sa/4.0/legalcode.fi">suomeksi</a>, +<a href="/licenses/by-sa/4.0/legalcode.fr">français</a>, +<a href="/licenses/by-sa/4.0/legalcode.hr">hrvatski</a>, +<a href="/licenses/by-sa/4.0/legalcode.id">Bahasa Indonesia</a>, +<a href="/licenses/by-sa/4.0/legalcode.it">italiano</a>, +<a href="/licenses/by-sa/4.0/legalcode.ja">日本語</a>, +<a href="/licenses/by-sa/4.0/legalcode.ko">í•œêµì–´</a>, +<a href="/licenses/by-sa/4.0/legalcode.lt">Lietuvių</a>, +<a href="/licenses/by-sa/4.0/legalcode.lv">latviski</a>, +<a href="/licenses/by-sa/4.0/legalcode.mi">te reo MÄori</a>, +<a href="/licenses/by-sa/4.0/legalcode.nl">Nederlands</a>, +<a href="/licenses/by-sa/4.0/legalcode.no">norsk</a>, +<a href="/licenses/by-sa/4.0/legalcode.pl">polski</a>, +<a href="/licenses/by-sa/4.0/legalcode.pt">português</a>, +<a href="/licenses/by-sa/4.0/legalcode.ro">română</a>, +<a href="/licenses/by-sa/4.0/legalcode.ru">руÑÑкий</a>, +<a href="/licenses/by-sa/4.0/legalcode.sl">SlovenÅ¡Äina</a>, +<a href="/licenses/by-sa/4.0/legalcode.sv">svenska</a>, +<a href="/licenses/by-sa/4.0/legalcode.tr">Türkçe</a>, +<a href="/licenses/by-sa/4.0/legalcode.uk">українÑька</a>, +<a href="/licenses/by-sa/4.0/legalcode.zh-Hans">ä¸æ–‡</a>, +<a href="/licenses/by-sa/4.0/legalcode.zh-Hant">è¯èªž</a>. + +Please read the <a href="/faq/#officialtranslations">FAQ</a> for more information about official translations. +</div> +</div> +<div id="deed-foot"> +<p id="footer"><a href="./">« Back to Commons Deed</a></p> +</div> +</div> + +<div class="site-footer-wrapper"> +<footer id="colophon" class="site-footer sticky-nav-main" role="contentinfo"> +<div class="cc-footer"> +<div class="column cc-footer-main"> +<div class="cc-footer-logo"> +<a href="https://creativecommons.org/" class="custom-logo-link" rel="home" itemprop="url"><img src="https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_.png" class="custom-logo" alt="cc.logo.white" itemprop="logo" srcset="https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_.png 980w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-300x73.png 300w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-768x188.png 768w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-140x34.png 140w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-50x12.png 50w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-270x66.png 270w, https://creativecommons.org/wp-content/uploads/2016/06/cc.logo_.white_-245x60.png 245w" sizes="(max-width: 709px) 85vw, (max-width: 909px) 67vw, (max-width: 1362px) 62vw, 840px" height="240" width="980"></a> +</div> +<div class="cc-footer-links"> +<div class="menu-footer-links-container"> +<ul id="menu-footer-links" class="menu"> +<li id="menu-item-48794" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48794"><a href="https://creativecommons.org/about/contact/">Contact</a></li> +<li id="menu-item-48795" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48795"><a href="https://creativecommons.org/privacy/">Privacy</a></li> +<li id="menu-item-48796" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48796"><a href="https://creativecommons.org/policies/">Policies</a></li> +<li id="menu-item-48797" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-48797"><a href="https://creativecommons.org/terms/">Terms</a></li> +</ul> +</div> +</div> +</div> +<div class="column cc-footer-contact"> +<h6><a href="https://creativecommons.org/about/contact">We'd love to hear from you!</a></h6> +<address> +Creative Commons<br> +PO Box 1866, Mountain View, CA 94042 +</address> +<ul> +<li><a href="mailto:info@creativecommons.org" class="mail">info@creativecommons.org</a></li> +<li><a href="https://creativecommons.org/faq">Frequently Asked Questions</a></li> +</ul> +</div> +<div class="column cc-footer-license"> +<div class="license-icons"> +<a rel="license" href="https://creativecommons.org/licenses/by/4.0/" title="Creative Commons Attribution 4.0 International license"> +<i class="cc-icon-cc"></i> +<i class="cc-icon-cc-by"></i> +</a> +</div> +<aside> +<div xmlns:cc="https://creativecommons.org/ns#" about="https://creativecommons.org"> +<p>Except where otherwise <a class="subfoot" href="https://creativecommons.org/policies#license">noted</a>, content on this site is licensed under a <a class="subfoot" href="https://creativecommons.org/licenses/by/4.0/" rel="license">Creative Commons Attribution 4.0 International license</a>. <a class="subfoot" href="https://creativecommons.org/website-icons" target="blank">Icons</a> by The Noun Project.</p> +</div> +</aside> +</div> +</div> +</footer> +</div> +<script type='text/javascript'> + /* <![CDATA[ */ + var screenReaderText = {"expand":"expand child menu","collapse":"collapse child menu"}; + /* ]]> */ +</script> +<script type='text/javascript' src='https://creativecommons.org/wp-content/themes/twentysixteen/js/functions.js'></script> +<script type='text/javascript' src='/includes/legalcode.js'></script> + +</body> +</html> diff --git a/macros/latex/contrib/doclicense/license-texts/doclicense-CC-zero-1.0-latex.html b/macros/latex/contrib/doclicense/license-texts/doclicense-CC-zero-1.0-latex.html new file mode 100644 index 0000000000..6f1bb597c9 --- /dev/null +++ b/macros/latex/contrib/doclicense/license-texts/doclicense-CC-zero-1.0-latex.html @@ -0,0 +1,200 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<title>Creative Commons Legal Code</title> +<meta name="viewport" content="width=device-width, initial-scale=1.0" /> +<meta http-equiv="content-type" content="text/html; charset=utf-8" /> +<link rel="stylesheet" type="text/css" href="//creativecommons.org/includes/deed3.css" media="screen" /> +<link rel="stylesheet" type="text/css" href="//creativecommons.org/includes/deed3-print.css" media="print" /> +<!--[if lt IE 7]><link rel="stylesheet" type="text/css" href="https://creativecommons.org/includes/deed3-ie.css" media="screen" /><![endif]--> +<script type="text/javascript" src="https://creativecommons.org/includes/errata.js"> +</script> +</head> +<body> +<p align="center" id="header"><a href="//creativecommons.org/">Creative Commons</a></p> + +<div id="deed" class="green"> +<div id="deed-head"> +<div id="cc-logo"> +<img src="//creativecommons.org/images/deed/cc-logo.jpg" alt="" /> +</div> +<h1><span>Creative Commons Legal Code</span></h1> +<div id="deed-license"> +<h2>CC0 1.0 Universal</h2> +</div> +</div> +<div id="deed-main"> +<div id="deed-main-content"> +<img src="//creativecommons.org/images/international/unported.png" alt="" /> +<div id="deed-disclaimer"> +<div class="summary"> +Official translations of this legal tool are available <a href="#languages">in other languages</a>. +</div> +</div> +<blockquote> +CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT +PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES +NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS +PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE +COMMONS MAKES NO WARRANTIES REGARDING THE USE OF THIS +DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER, AND +DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM THE USE OF +THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED +HEREUNDER. +</blockquote> +<h3><em>Statement of Purpose</em></h3> +<p>The laws of most jurisdictions throughout the world +automatically confer exclusive Copyright and Related Rights +(defined below) upon the creator and subsequent owner(s) (each +and all, an "owner") of an original work of authorship and/or +a database (each, a "Work").</p> +<p>Certain owners wish to permanently relinquish those rights +to a Work for the purpose of contributing to a commons of +creative, cultural and scientific works ("Commons") that the +public can reliably and without fear of later claims of +infringement build upon, modify, incorporate in other works, +reuse and redistribute as freely as possible in any form +whatsoever and for any purposes, including without limitation +commercial purposes. These owners may contribute to the +Commons to promote the ideal of a free culture and the further +production of creative, cultural and scientific works, or to +gain reputation or greater distribution for their Work in part +through the use and efforts of others.</p> +<p>For these and/or other purposes and motivations, and +without any expectation of additional consideration or +compensation, the person associating CC0 with a Work (the +"Affirmer"), to the extent that he or she is an owner of +Copyright and Related Rights in the Work, voluntarily elects +to apply CC0 to the Work and publicly distribute the Work +under its terms, with knowledge of his or her Copyright and +Related Rights in the Work and the meaning and intended legal +effect of CC0 on those rights.</p> +<p><strong>1. Copyright and Related Rights.</strong> +A Work made available under CC0 may be protected by +copyright and related or neighboring rights ("Copyright and + Related Rights"). Copyright and Related Rights include, but +are not limited to, the following: +</p> +<ol type="i"> +<li>the right to reproduce, adapt, distribute, perform, +display, communicate, and translate a Work;</li> +<li> moral rights retained by the original author(s) and/or +performer(s);</li> +<li>publicity and privacy rights pertaining to a person's +image or likeness depicted in a Work;</li> +<li>rights protecting against unfair competition in regards +to a Work, subject to the limitations in paragraph 4(a), +below;</li> +<li>rights protecting the extraction, dissemination, use and +reuse of data in a Work;</li> +<li>database rights (such as those arising under Directive +96/9/EC of the European Parliament and of the Council of 11 +March 1996 on the legal protection of databases, and under +any national implementation thereof, including any amended +or successor version of such directive); and</li> +<li>other similar, equivalent or corresponding rights +throughout the world based on applicable law or treaty, and +any national implementations thereof.</li> +</ol> +<p><strong>2. Waiver.</strong> To the greatest extent +permitted by, but not in contravention of, applicable law, +Affirmer hereby overtly, fully, permanently, irrevocably and +unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims +and causes of action, whether now known or unknown (including +existing as well as future claims and causes of action), in +the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty +(including future time extensions), (iii) in any current or +future medium and for any number of copies, and (iv) for any +purpose whatsoever, including without limitation commercial, +advertising or promotional purposes (the "Waiver"). Affirmer +makes the Waiver for the benefit of each member of the public +at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be +subject to revocation, rescission, cancellation, termination, +or any other legal or equitable action to disrupt the quiet +enjoyment of the Work by the public as contemplated by +Affirmer's express Statement of Purpose. +</p> +<p><strong>3. Public License Fallback.</strong> Should any +part of the Waiver for any reason be judged legally invalid or +ineffective under applicable law, then the Waiver shall be +preserved to the maximum extent permitted taking into account +Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each +affected person a royalty-free, non transferable, non +sublicensable, non exclusive, irrevocable and unconditional +license to exercise Affirmer's Copyright and Related Rights +in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty +(including future time extensions), (iii) in any current or +future medium and for any number of copies, and (iv) for any +purpose whatsoever, including without limitation commercial, +advertising or promotional purposes (the "License"). The +License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the +License for any reason be judged legally invalid or +ineffective under applicable law, such partial invalidity or +ineffectiveness shall not invalidate the remainder of the +License, and in such case Affirmer hereby affirms that he or +she will not (i) exercise any of his or her remaining +Copyright and Related Rights in the Work or (ii) assert any +associated claims and causes of action with respect to the +Work, in either case contrary to Affirmer's express Statement +of Purpose.</p> +<p><strong>4. Limitations and Disclaimers.</strong></p> +<ol type="a"> +<li>No trademark or patent rights held by Affirmer are +waived, abandoned, surrendered, licensed or otherwise +affected by this document.</li> +<li>Affirmer offers the Work as-is and makes no +representations or warranties of any kind concerning the +Work, express, implied, statutory or otherwise, including +without limitation warranties of title, merchantability, +fitness for a particular purpose, non infringement, or the +absence of latent or other defects, accuracy, or the present +or absence of errors, whether or not discoverable, all to +the greatest extent permissible under applicable law.</li> +<li>Affirmer disclaims responsibility for clearing rights of +other persons that may apply to the Work or any use thereof, +including without limitation any person's Copyright and +Related Rights in the Work. Further, Affirmer disclaims +responsibility for obtaining any necessary consents, +permissions or other rights required for any use of the +Work.</li> +<li>Affirmer understands and acknowledges that Creative +Commons is not a party to this document and has no duty or +obligation with respect to this CC0 or use of the Work.</li> +</ol> + +<blockquote><a id="languages"></a>Additional languages available: + +<a href="/publicdomain/zero/1.0/legalcode.el">Ελληνικά</a>, +<a href="/publicdomain/zero/1.0/legalcode.es">Español</a>, +<a href="/publicdomain/zero/1.0/legalcode.eu">euskara</a>, +<a href="/publicdomain/zero/1.0/legalcode.fi">suomeksi</a>, +<a href="/publicdomain/zero/1.0/legalcode.fr">français</a>, +<a href="/publicdomain/zero/1.0/legalcode.it">italiano</a>, +<a href="/publicdomain/zero/1.0/legalcode.ja">日本語</a>, +<a href="/publicdomain/zero/1.0/legalcode.ko">í•œêµì–´</a>, +<a href="/publicdomain/zero/1.0/legalcode.lt">Lietuvių</a>, +<a href="/publicdomain/zero/1.0/legalcode.lv">latviski</a>, +<a href="/publicdomain/zero/1.0/legalcode.nl">Nederlands</a>, +<a href="/publicdomain/zero/1.0/legalcode.pl">polski</a>, +<a href="/publicdomain/zero/1.0/legalcode.ro">română</a>, +<a href="/publicdomain/zero/1.0/legalcode.sl">SlovenÅ¡Äina</a>, +<a href="/publicdomain/zero/1.0/legalcode.sv">svenska</a>, +<a href="/publicdomain/zero/1.0/legalcode.zh-Hans">ä¸æ–‡</a>, +<a href="/publicdomain/zero/1.0/legalcode.zh-Hant">è¯èªž</a>. + +Please read the <a href="/faq/#officialtranslations">FAQ</a> for more information about official translations.</blockquote> +</div> +</div> +<div id="deed-foot"> +<p id="footer"><a href="./">« Back to Commons Deed</a></p> +</div> +</div> +</body> +</html> diff --git a/macros/latex/contrib/doclicense/manifest.txt b/macros/latex/contrib/doclicense/manifest.txt new file mode 100644 index 0000000000..424cae1e28 --- /dev/null +++ b/macros/latex/contrib/doclicense/manifest.txt @@ -0,0 +1,143 @@ +% SPDX-FileCopyrightText: 2021 Robin Schneider <ypid@riseup.net> +% +% SPDX-License-Identifier: LPPL-1.3c +% +% This work consists of all files listed in this file (manifest.txt). +% For more details about the licensing, refer to the README.md file. + +% This work consists of the files: +doclicense/Makefile +doclicense/README.md +doclicense/doclicense-UKenglish.ldf +doclicense/doclicense-USenglish.ldf +doclicense/doclicense-acadian.ldf +doclicense/doclicense-american.ldf +doclicense/doclicense-australian.ldf +doclicense/doclicense-brazilian.ldf +doclicense/doclicense-british.ldf +doclicense/doclicense-bulgarian.ldf +doclicense/doclicense-canadian.ldf +doclicense/doclicense-canadien.ldf +doclicense/doclicense-catalan.ldf +doclicense/doclicense-chinese-gbk.ldf +doclicense/doclicense-chinese-utf8.ldf +doclicense/doclicense-english.ldf +doclicense/doclicense-french.ldf +doclicense/doclicense-galician.ldf +doclicense/doclicense-german.ldf +doclicense/doclicense-italian.ldf +doclicense/doclicense-japanese.ldf +doclicense/doclicense-marathi.ldf +doclicense/doclicense-newzealand.ldf +doclicense/doclicense-ngerman.ldf +doclicense/doclicense-polish.ldf +doclicense/doclicense-portuguese.ldf +doclicense/doclicense-russian.ldf +doclicense/doclicense-spanish.ldf +doclicense/doclicense.dtx +doclicense/doclicense.ins +doclicense/images/doclicense-CC-by-80x15.eps +doclicense/images/doclicense-CC-by-80x15.pdf +doclicense/images/doclicense-CC-by-88x31.eps +doclicense/images/doclicense-CC-by-88x31.pdf +doclicense/images/doclicense-CC-by-nc-80x15.eps +doclicense/images/doclicense-CC-by-nc-80x15.pdf +doclicense/images/doclicense-CC-by-nc-88x31.eps +doclicense/images/doclicense-CC-by-nc-88x31.pdf +doclicense/images/doclicense-CC-by-nc-eu-88x31.eps +doclicense/images/doclicense-CC-by-nc-eu-88x31.pdf +doclicense/images/doclicense-CC-by-nc-nd-80x15.eps +doclicense/images/doclicense-CC-by-nc-nd-80x15.pdf +doclicense/images/doclicense-CC-by-nc-nd-88x31.eps +doclicense/images/doclicense-CC-by-nc-nd-88x31.pdf +doclicense/images/doclicense-CC-by-nc-nd-eu-88x31.eps +doclicense/images/doclicense-CC-by-nc-nd-eu-88x31.pdf +doclicense/images/doclicense-CC-by-nc-nd-unofficial-mr-80x15.eps +doclicense/images/doclicense-CC-by-nc-nd-unofficial-mr-80x15.pdf +doclicense/images/doclicense-CC-by-nc-nd-unofficial-mr-88x31.eps +doclicense/images/doclicense-CC-by-nc-nd-unofficial-mr-88x31.pdf +doclicense/images/doclicense-CC-by-nc-sa-80x15.eps +doclicense/images/doclicense-CC-by-nc-sa-80x15.pdf +doclicense/images/doclicense-CC-by-nc-sa-88x31.eps +doclicense/images/doclicense-CC-by-nc-sa-88x31.pdf +doclicense/images/doclicense-CC-by-nc-sa-eu-88x31.eps +doclicense/images/doclicense-CC-by-nc-sa-eu-88x31.pdf +doclicense/images/doclicense-CC-by-nc-sa-unofficial-mr-80x15.eps +doclicense/images/doclicense-CC-by-nc-sa-unofficial-mr-80x15.pdf +doclicense/images/doclicense-CC-by-nc-sa-unofficial-mr-88x31.eps +doclicense/images/doclicense-CC-by-nc-sa-unofficial-mr-88x31.pdf +doclicense/images/doclicense-CC-by-nc-unofficial-mr-80x15.eps +doclicense/images/doclicense-CC-by-nc-unofficial-mr-80x15.pdf +doclicense/images/doclicense-CC-by-nc-unofficial-mr-88x31.eps +doclicense/images/doclicense-CC-by-nc-unofficial-mr-88x31.pdf +doclicense/images/doclicense-CC-by-nd-80x15.eps +doclicense/images/doclicense-CC-by-nd-80x15.pdf +doclicense/images/doclicense-CC-by-nd-88x31.eps +doclicense/images/doclicense-CC-by-nd-88x31.pdf +doclicense/images/doclicense-CC-by-nd-unofficial-mr-80x15.eps +doclicense/images/doclicense-CC-by-nd-unofficial-mr-80x15.pdf +doclicense/images/doclicense-CC-by-nd-unofficial-mr-88x31.eps +doclicense/images/doclicense-CC-by-nd-unofficial-mr-88x31.pdf +doclicense/images/doclicense-CC-by-sa-80x15.eps +doclicense/images/doclicense-CC-by-sa-80x15.pdf +doclicense/images/doclicense-CC-by-sa-88x31.eps +doclicense/images/doclicense-CC-by-sa-88x31.pdf +doclicense/images/doclicense-CC-by-sa-unofficial-mr-80x15.eps +doclicense/images/doclicense-CC-by-sa-unofficial-mr-80x15.pdf +doclicense/images/doclicense-CC-by-sa-unofficial-mr-88x31.eps +doclicense/images/doclicense-CC-by-sa-unofficial-mr-88x31.pdf +doclicense/images/doclicense-CC-by-unofficial-mr-80x15.eps +doclicense/images/doclicense-CC-by-unofficial-mr-80x15.pdf +doclicense/images/doclicense-CC-by-unofficial-mr-88x31.eps +doclicense/images/doclicense-CC-by-unofficial-mr-88x31.pdf +doclicense/images/doclicense-CC-cc-zero-unofficial-mr-80x15.eps +doclicense/images/doclicense-CC-cc-zero-unofficial-mr-80x15.pdf +doclicense/images/doclicense-CC-zero-80x15.eps +doclicense/images/doclicense-CC-zero-80x15.pdf +doclicense/images/doclicense-CC-zero-88x31.eps +doclicense/images/doclicense-CC-zero-88x31.pdf +doclicense/images/doclicense-CC-zero-unofficial-mr-88x31.eps +doclicense/images/doclicense-CC-zero-unofficial-mr-88x31.pdf +doclicense/license-texts/doclicense-CC-by-3.0-latex.html +doclicense/license-texts/doclicense-CC-by-3.0-latex.tex +doclicense/license-texts/doclicense-CC-by-3.0-plaintext.tex +doclicense/license-texts/doclicense-CC-by-4.0-latex.html +doclicense/license-texts/doclicense-CC-by-4.0-latex.tex +doclicense/license-texts/doclicense-CC-by-4.0-plaintext.tex +doclicense/license-texts/doclicense-CC-by-nc-3.0-latex.html +doclicense/license-texts/doclicense-CC-by-nc-3.0-latex.tex +doclicense/license-texts/doclicense-CC-by-nc-3.0-plaintext.tex +doclicense/license-texts/doclicense-CC-by-nc-4.0-latex.html +doclicense/license-texts/doclicense-CC-by-nc-4.0-latex.tex +doclicense/license-texts/doclicense-CC-by-nc-4.0-plaintext.tex +doclicense/license-texts/doclicense-CC-by-nc-nd-3.0-latex.html +doclicense/license-texts/doclicense-CC-by-nc-nd-3.0-latex.tex +doclicense/license-texts/doclicense-CC-by-nc-nd-3.0-plaintext.tex +doclicense/license-texts/doclicense-CC-by-nc-nd-4.0-latex.html +doclicense/license-texts/doclicense-CC-by-nc-nd-4.0-latex.tex +doclicense/license-texts/doclicense-CC-by-nc-nd-4.0-plaintext.tex +doclicense/license-texts/doclicense-CC-by-nc-sa-3.0-latex.html +doclicense/license-texts/doclicense-CC-by-nc-sa-3.0-latex.tex +doclicense/license-texts/doclicense-CC-by-nc-sa-3.0-plaintext.tex +doclicense/license-texts/doclicense-CC-by-nc-sa-4.0-latex.html +doclicense/license-texts/doclicense-CC-by-nc-sa-4.0-latex.tex +doclicense/license-texts/doclicense-CC-by-nc-sa-4.0-plaintext.tex +doclicense/license-texts/doclicense-CC-by-nd-3.0-latex.html +doclicense/license-texts/doclicense-CC-by-nd-3.0-latex.tex +doclicense/license-texts/doclicense-CC-by-nd-3.0-plaintext.tex +doclicense/license-texts/doclicense-CC-by-nd-4.0-latex.html +doclicense/license-texts/doclicense-CC-by-nd-4.0-latex.tex +doclicense/license-texts/doclicense-CC-by-nd-4.0-plaintext.tex +doclicense/license-texts/doclicense-CC-by-sa-3.0-latex.html +doclicense/license-texts/doclicense-CC-by-sa-3.0-latex.tex +doclicense/license-texts/doclicense-CC-by-sa-3.0-plaintext.tex +doclicense/license-texts/doclicense-CC-by-sa-4.0-latex.html +doclicense/license-texts/doclicense-CC-by-sa-4.0-latex.tex +doclicense/license-texts/doclicense-CC-by-sa-4.0-plaintext.tex +doclicense/license-texts/doclicense-CC-zero-1.0-latex.html +doclicense/license-texts/doclicense-CC-zero-1.0-latex.tex +doclicense/license-texts/doclicense-CC-zero-1.0-plaintext.tex +doclicense/manifest.txt +% and the derived files: +doclicense.sty +doclicense.pdf diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.pdf b/macros/latex/contrib/easybook/doc/easybook-demo.pdf Binary files differindex 2cccc3ed38..0217ebec00 100644 --- a/macros/latex/contrib/easybook/doc/easybook-demo.pdf +++ b/macros/latex/contrib/easybook/doc/easybook-demo.pdf diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.tex b/macros/latex/contrib/easybook/doc/easybook-demo.tex index 621c21ece2..9ad0b579c1 100644 --- a/macros/latex/contrib/easybook/doc/easybook-demo.tex +++ b/macros/latex/contrib/easybook/doc/easybook-demo.tex @@ -97,7 +97,7 @@ \url{https://latexstudio.net} \\ \url{https://gitee.com/texl3/easybook}\thanks{Gitee为项目的主è¦å‘布地å€ã€‚} } -\date{2021/03/13\hskip\ccwd\relax v1.23p} +\date{2021/03/14\hskip\ccwd\relax v1.23q} \frontmatter[roman] \maketitle diff --git a/macros/latex/contrib/easybook/doc/easybook.pdf b/macros/latex/contrib/easybook/doc/easybook.pdf Binary files differindex 32776a80be..25192edcd6 100644 --- a/macros/latex/contrib/easybook/doc/easybook.pdf +++ b/macros/latex/contrib/easybook/doc/easybook.pdf diff --git a/macros/latex/contrib/easybook/doc/easybook.tex b/macros/latex/contrib/easybook/doc/easybook.tex index 0b20284e28..b8b375c333 100644 --- a/macros/latex/contrib/easybook/doc/easybook.tex +++ b/macros/latex/contrib/easybook/doc/easybook.tex @@ -2,7 +2,7 @@ \title{\sffamily easybook书ç±æ–‡æ¡£ç±»} \author{瞿毅} -\date{2021/03/13\hskip\ccwd\relax v1.23p\thanks{\url{https://gitee.com/texl3/easybook}}} +\date{2021/03/14\hskip\ccwd\relax v1.23q\thanks{\url{https://gitee.com/texl3/easybook}}} \begin{document} \maketitle @@ -98,7 +98,7 @@ \tn{printindex}\oarg{索引å} \end{syntax} \tn{frontmatter} 为å‰è¨€åŒºå‘½ä»¤ï¼Œç« æ ‡é¢˜ä¸ç¼–å·ï¼Œé¡µç å¯è®¾ç½®ä¸ºä¾‹å¦‚ \opt{roman}ã€\opt{Alph} ç‰æ ¼å¼ï¼Œå¸¦æœ‰æ˜Ÿå·çš„命令 \tn{frontmatter*} ä¸ä½¿ç”¨ \tn{cleardoublepage}。\tn{mainmatter} ä¸ºä¸»æ–‡åŒºå‘½ä»¤ï¼Œç« æ ‡é¢˜æ£å¸¸ç¼–å·ä¸”页ç 为从1开始计数的阿拉伯数å—，\tn{mainmatter*} 命令ä¸ä½¿ç”¨ \tn{cleardoublepage}。\tn{backmatter} 为åŽè®°åŒºå‘½ä»¤ï¼Œé¡µç æ ¼å¼ä¸Žç¼–å·ä¿æŒä¸å˜ï¼Œç« æ ‡é¢˜ä¸ç¼–å·ã€‚\tn{listoffigures} 命令输出图片目录，\tn{listoftables} å‘½ä»¤è¾“å‡ºè¡¨æ ¼ç›®å½•ï¼Œ\tn{listoflistings} 命令输出代ç 目录。 -\changes{v1.23p}{2021/02/20}{é‡æ–°å®šä¹‰æ–‡æ¡£ç»“构划分命令。} +\changes{v1.23q}{2021/02/20}{é‡æ–°å®šä¹‰æ–‡æ¡£ç»“构划分命令。} \end{function} \section{接å£é€‰é¡¹} @@ -132,8 +132,8 @@ \end{syntax} \opt{style} é€‰é¡¹æŽ§åˆ¶æ–‡ç« çš„é£Žæ ¼ã€‚ \changes{v1.10}{2021/01/08}{更改颜色实现方å¼ä¸Žé€‰é¡¹å。} -\changes{v1.23p}{2021/02/02}{notoé£Žæ ¼çš„æ•°å¦å—体独立出æ¥ï¼Œå¯è‡ªå®šä¹‰è®¾ç½®ã€‚} -\changes{v1.23p}{2021/02/09}{å¢žåŠ æŽ§åˆ¶é¡µé¢æ¨ªçº¿ç²—细的选项。} +\changes{v1.23q}{2021/02/02}{notoé£Žæ ¼çš„æ•°å¦å—体独立出æ¥ï¼Œå¯è‡ªå®šä¹‰è®¾ç½®ã€‚} +\changes{v1.23q}{2021/02/09}{å¢žåŠ æŽ§åˆ¶é¡µé¢æ¨ªçº¿ç²—细的选项。} \end{function} \begin{optdesc} @@ -190,7 +190,7 @@ \end{syntax} è¡Œè·å› å用于设置å„ç§è¡Œè·å€æ•°ï¼Œåªèƒ½æ˜¯æµ®ç‚¹æ•°ï¼Œä¸èƒ½å¸¦æœ‰é•¿åº¦å•ä½ã€‚\tn{ctexset} 原有的行è·é€‰é¡¹\opt{linespread}失效。å„è¡Œè·æ—¢å¯åœ¨å¯¼è¨€åŒºå…¨å±€è®¾ç½®ä¹Ÿå¯æ£æ–‡ä¸è®¾ç½®å¯¹åŽé¢ç”Ÿæ•ˆï¼Œè¡Œè·çš„æ„义为 \changes{v1.21}{2021/01/12}{å¢žåŠ è„šæ³¨çº¿é—´çš„è·ç¦»é€‰é¡¹ã€‚} -\changes{v1.23p}{2021/02/09}{å–消使用 \pkg{zhlineskip} å®åŒ…设置数å¦é—´è·ã€‚} +\changes{v1.23q}{2021/02/09}{å–消使用 \pkg{zhlineskip} å®åŒ…设置数å¦é—´è·ã€‚} \end{function} \begin{optdesc} @@ -211,7 +211,7 @@ marginpart = <\tn{rmfamily}\tn{footnotesize}> \end{syntax} \changes{v1.10}{2021/01/08}{åŠ å…¥è‡ªå®šä¹‰éžæ£æ–‡å—体选项。} -\changes{v1.23p}{2021/02/08}{ä¿®å¤ä½¿ç”¨ \tn{zihao} 命令设置å—体失效的问题。} +\changes{v1.23q}{2021/02/08}{ä¿®å¤ä½¿ç”¨ \tn{zihao} 命令设置å—体失效的问题。} \end{function} \begin{optdesc} @@ -229,10 +229,10 @@ bib-style = <(numerical)|authoryear|å…¶å®ƒæ ¼å¼> cite-style = <æ ‡æ³¨é£Žæ ¼> bibfile = <refs.bib> - \tn{printbibliography}\oarg{选项列表} + \tn{printbibliography}\oarg{键值列表} \end{syntax} \changes{v1.21}{2021/01/11}{å¢žåŠ \opt{bibset} 选项，å¯ä»¥ä½¿ç”¨ \hologo{BibTeX} 或 \hologo{biber} 编译å‚考文献。} -\changes{v1.23p}{2021/02/23}{使用 \opt{bibset} 选项时å¯è®¾ç½®æ ‡æ³¨é£Žæ ¼ã€‚} +\changes{v1.23q}{2021/02/23}{使用 \opt{bibset} 选项时å¯è®¾ç½®æ ‡æ³¨é£Žæ ¼ã€‚} \end{function} \begin{optdesc} @@ -260,7 +260,7 @@ \tn{declaretheoremstyle}\oarg{键值列表}\marg{定ç†æ ·å¼å} \end{syntax} \changes{v1.21}{2021/01/12}{å¢žåŠ é…置定ç†çŽ¯å¢ƒæ ·å¼çš„选项。} -\changes{v1.23p}{2021/03/12}{é‡æ–°å®šä¹‰äº†æ–°å®šç†çŽ¯å¢ƒå‘½ä»¤ \tn{newtheorem}。} +\changes{v1.23q}{2021/03/12}{é‡æ–°å®šä¹‰äº†æ–°å®šç†çŽ¯å¢ƒå‘½ä»¤ \tn{newtheorem}。} \end{function} \begin{optdesc} @@ -285,7 +285,7 @@ \end{optdesc} \subsubsection{新的定ç†æ ·å¼} -定ç†ç”± \pkg{thmtools} 设置，自带定ç†çš„æ ·å¼ä¸º \opt{mythm}，上述定ç†æ ·å¼é€‰é¡¹å°†å¯¹è¿™ä¸ªå®šç†æ ·å¼ç”Ÿæ•ˆã€‚å¦‚æžœä½¿ç”¨è¿™ä¸ªæ ·å¼è€Œåªæ˜¯å¢žåŠ 新的定ç†å称，å¯ä»¥è¿™æ · +定ç†ç”± \pkg{thmtools} 设置，预置定ç†çš„æ ·å¼ä¸º \opt{mythm}，上述定ç†æ ·å¼é€‰é¡¹å°†å¯¹è¿™ä¸ªå®šç†æ ·å¼ç”Ÿæ•ˆã€‚å¦‚æžœä½¿ç”¨è¿™ä¸ªæ ·å¼è€Œåªæ˜¯å¢žåŠ 新的定ç†å称，å¯ä»¥è¿™æ · \begin{ctexexam} \newtheorem[style = mythm,name = 定ç†å]{定ç†çŽ¯å¢ƒå} \end{ctexexam} @@ -324,15 +324,20 @@ \end{function} \subsection{页眉页脚} -\begin{function}[EXP,added = 2021-01-13,updated = 2021-03-08]{hdrset/head-foot,hdrset/chap-mark,hdrset/sec-mark,\easyhead,\easyfoot,...} +\begin{function}[EXP,added = 2021-01-13,updated = 2021-03-14]{hdrset/head-foot,hdrset/chap-mark,hdrset/sec-mark,hdrset/headrule,hdrset/footrule,hdrset/footnoterule,\easyhead,\easyfoot,...} \begin{syntax} head-foot = <页眉页脚ä¸çš„内容> chap-mark = <\tn{chaptermark} æ ‡å¿—å‘½ä»¤ \tn{markboth} ä¸çš„内容> sec-mark = <\tn{sectionmark} æ ‡å¿—å‘½ä»¤ \tn{markright} ä¸çš„内容> + headrule = <é¡µçœ‰æ¨ªçº¿æ ¼å¼> + footrule = <é¡µè„šæ¨ªçº¿æ ¼å¼> + footnoterule = <è„šæ³¨æ¨ªçº¿æ ¼å¼> \tn{easyhead}\oarg{ä½ç½®}\marg{内容} \tn{easyfoot}\oarg{ä½ç½®}\marg{内容} \end{syntax} \opt{hdrset} 设置的命令由 \pkg{fancyhdr} å®åŒ…æ供支æŒï¼Œå‘½ä»¤ \tn{easyhead} å’Œ \tn{easyfoot} çš„å«ä¹‰ä¸Ž \tn{fancyhead} å’Œ \tn{fancyfoot} 相åŒï¼Œå®ƒä»¬ç”¨äºŽ \opt{head-foot} 选项ä¸ï¼Œè®¾ç½®çš„是一个å为 \opt{fancy} 的页é¢é£Žæ ¼ã€‚\pkg{fancyhdr} 将页眉页脚分æˆäº†å·¦ä¸å³å’Œå¥‡æ•°é¡µï¼ˆodd）ã€å¶æ•°é¡µï¼ˆeven）共12个部分，å¯é€‰å‚æ•°ä¸Eã€O代表å¶æ•°ã€å¥‡æ•°ï¼ŒLã€Cã€R代表左ã€ä¸ã€å³éƒ¨åˆ†ã€‚å•é¢æ‰“å°æ—¶ï¼Œå«æœ‰å¶æ•°çš„é€‰é¡¹æ— æ•ˆã€‚ + +\opt{headrule}ã€\opt{footrule} å’Œ \opt{footnoterule} 三个横线选项一般å¯ä»¥ä½¿ç”¨ \tn{hrule} width \meta{长度} height \meta{高度} 命令æ¥ç»˜åˆ¶ï¼Œè„šæ³¨æ¨ªçº¿é»˜è®¤ä¸ºç©ºã€‚当然，手动绘制横线时线æ¡ç²—细选项 \opt{style/rulewidth} 会失效。 \begin{ctexexam} \ctexset { @@ -343,13 +348,16 @@ \easyhead[ER]{\leftmark} \easyhead[OL]{\rightmark} \easyhead[EL,OR]{\textbf{\thepage}} - } + }, + sec-mark = {\CTEXthesection\hspace{0.5\ccwd}}, + headrule = {\hrule width \textwidth height 1pt} } } \end{ctexexam} \changes{v1.21}{2021/01/11}{ä¿®å¤å•é¢æ–‡æ¡£æ—¶é¡µçœ‰æ¨ªçº¿æ¶ˆå¤±çš„问题。} \changes{v1.21}{2021/01/13}{å¢žåŠ é…置页眉页脚的选项。} -\changes{v1.23p}{2021/03/08}{ä¼˜åŒ–é¡µçœ‰é¡µè„šè®¾ç½®ï¼Œå¢žåŠ \opt{chap-mark} å’Œ \opt{sec-mark} 选项。} +\changes{v1.23q}{2021/03/08}{ä¼˜åŒ–é¡µçœ‰é¡µè„šè®¾ç½®ï¼Œå¢žåŠ \opt{chap-mark} å’Œ \opt{sec-mark} 选项。} +\changes{v1.23q}{2021/03/14}{å¯ä»¥æ‰‹åŠ¨ç»˜åˆ¶é¡µçœ‰ã€é¡µè„šå’Œè„šæ³¨çš„横线。} \end{function} \subsection{ç›®å½•æ ·å¼} @@ -404,7 +412,7 @@ \tn{item} <列表内容> \tn{end}\marg{环境å} \end{syntax} -\pkg{enumitem} å®åŒ…为系统自带的列表环境æ供了更çµæ´»çš„æ ‡ç¾ä»¥åŠé—´è·çš„控制，å¯ä½¿ç”¨ \tn{setlist} 命令设置原有的三ç§åˆ—è¡¨æ ¼å¼ã€‚å·²è®¾ç½®é»˜è®¤æ ¼å¼ï¼Œè‹¥è‡ªå®šä¹‰æ ‡ç¾å¯ä¾‹å¦‚ +\pkg{enumitem} å®åŒ…为系统预置的列表环境æ供了更çµæ´»çš„æ ‡ç¾ä»¥åŠé—´è·çš„控制，å¯ä½¿ç”¨ \tn{setlist} 命令设置原有的三ç§åˆ—è¡¨æ ¼å¼ã€‚å·²è®¾ç½®é»˜è®¤æ ¼å¼ï¼Œè‹¥è‡ªå®šä¹‰æ ‡ç¾å¯ä¾‹å¦‚ \begin{ctexexam} \begin{enumerate}[label = \arabic*(a),leftmargin = 1cm,resume] \begin{itemize}[label = \textbullet] @@ -445,7 +453,7 @@ <定ç†å†…容> \tn{end}\marg{环境å} \end{syntax} -这些是默认自带的定ç†çŽ¯å¢ƒï¼Œå®šç†çŽ¯å¢ƒé™¤äº†æ³¨å’Œè¯æ˜Žè·Ÿéšç« ç¼–å·å¹¶å¯å¸¦æœ‰è¾¹æ¡†ï¼Œè¾¹æ¡†å’Œä¹ é¢˜æ ‡é¢˜ç›’åå¯ä½¿ç”¨ \opt{thmbox = false} å¼€å¯ï¼Œè¯æ˜Žæœ«å°¾ä¼šè‡ªåŠ¨æ·»åŠ è¯æ˜Žç»“æŸç¬¦ã€‚ +这些是预置的定ç†çŽ¯å¢ƒï¼Œå®šç†çŽ¯å¢ƒé™¤äº†æ³¨å’Œè¯æ˜Žè·Ÿéšç« ç¼–å·å¹¶å¯å¸¦æœ‰è¾¹æ¡†ï¼Œè¾¹æ¡†å’Œä¹ é¢˜æ ‡é¢˜ç›’åå¯ä½¿ç”¨ \opt{thmbox = false} å¼€å¯ï¼Œè¯æ˜Žæœ«å°¾ä¼šè‡ªåŠ¨æ·»åŠ è¯æ˜Žç»“æŸç¬¦ã€‚ \end{function} \subsection{ä¹ é¢˜} @@ -463,11 +471,11 @@ \item ä¹ é¢˜å†…å®¹ \end{exercise} \end{ctexexam} -\changes{v1.23p}{2021/02/08}{å¢žåŠ å‡†ç¡®çš„ä¹ é¢˜ç›’åæ ‡é¢˜ç›®å½•é”šç‚¹ã€‚} +\changes{v1.23q}{2021/02/08}{å¢žåŠ å‡†ç¡®çš„ä¹ é¢˜ç›’åæ ‡é¢˜ç›®å½•é”šç‚¹ã€‚} \end{function} \subsection{ç›’å} -ç›’å以åŠå°èŠ‚ \ref{exercise} ä¸ \opt{exercise} 环境é…置的选项由 \pkg{tcolorbox} æ供支æŒï¼Œå…·ä½“选项å¯è§å®åŒ…文档的 Option Keys 一节，一些é…置会覆盖之å‰çš„默认设置。 +ç›’å以åŠå°èŠ‚ \ref{exercise} ä¸ \opt{exercise} 环境é…置的选项由 \pkg{tcolorbox} æ供支æŒï¼Œå…·ä½“选项å¯è§å®åŒ…文档的 Option Keys 一节，å¯ä»¥è¿›è¡Œè¾¹è·ã€å—体åŠèƒŒæ™¯é¢œè‰²ç‰å„ç§ä¸ªæ€§åŒ–设置，一些é…置会覆盖之å‰é¢„置的设置。 \subsubsection{摘è¦ç›’å} \begin{function}[added = 2021-01-05,updated = 2021-03-13]{outline} @@ -511,7 +519,7 @@ 设置了两个å‚数选项相åŒçš„行内盒å，盒å \opt{concise} 为抄录盒å有三个å‚数，行内盒å内容是必选å‚数其他å¯é€‰ã€‚ç›’å \opt{fuzzy} 也是抄录盒å，具有模糊边缘类似高亮的效果。 \end{function} -\section{å…¶å®ƒæ ¼å¼} +\section{其它用法} \subsection{代ç } \begin{function}[added = 2021-01-05]{\lstinline,lstlisting,\listoflistings} @@ -585,7 +593,35 @@ \begin{syntax} \tn{marginnote}\oarg{左文本}\marg{å³æ–‡æœ¬}\oarg{åž‚ç›´å移} \end{syntax} -命令 \tn{marginnote} å¯ä»¥ç”Ÿæˆç®€å•çš„边注，如果åªç»™å®šäº†\meta{å³æ–‡æœ¬}，那么边注在奇å¶æ•°é¡µæ–‡å—相åŒã€‚如果åŒæ—¶ç»™å®šäº†\meta{左文本}，则å¶æ•°é¡µä½¿ç”¨\meta{左文本}çš„æ–‡å—。 +命令 \tn{marginnote} å¯ä»¥ç”Ÿæˆç®€å•çš„边注，如果åªç»™å®šäº† \meta{å³æ–‡æœ¬}，那么边注在奇å¶æ•°é¡µæ–‡å—相åŒã€‚如果åŒæ—¶ç»™å®šäº† \meta{左文本}，则å¶æ•°é¡µä½¿ç”¨ \meta{左文本} çš„æ–‡å—。 +\end{function} + +\subsection{æ’入文档} +\begin{function}[added = 2021-03-14]{\includepdf} +\begin{syntax} + \tn{includepdf}\oarg{键值列表}\marg{文档å} +\end{syntax} +该命令由 \pkg{pdfpages} æ供，将其他 pdf 文档æ’入当å‰æ–‡æ¡£ï¼Œå¯ä»¥æŒ‡å®šæ’入页数ã€é€»è¾‘页和横å‘ç‰ï¼Œè¯¦æƒ…查看å®åŒ…文档。 +\end{function} + +\subsection{横å‘页é¢} +\begin{function}[added = 2021-03-14]{sidewaysfigure,sidewaystable} +\begin{syntax} + \tn{begin}\marg{环境å}\oarg{ä½ç½®} + <æ’å…¥å›¾ç‰‡æˆ–è¡¨æ ¼> + \tn{end}\marg{环境å} +\end{syntax} +该环境由 \pkg{rotfloat} æ供，用于横å‘æ’å…¥å®½å¤§çš„å›¾ç‰‡æˆ–è¡¨æ ¼ï¼Œç”¨æ³•ä¸Ž \opt{figure} å’Œ \opt{table} 环境类似。 +\end{function} + +\subsection{指定行è·çš„段è½} +\begin{function}[added = 2021-03-14]{spacing} +\begin{syntax} + \tn{begin}\marg{spacing}\marg{浮点数} + <段è½å†…容> + \tn{end}\marg{spacing} +\end{syntax} +该环境由 \pkg{setspace} æ供，å¯ä»¥æŒ‡å®šçŽ¯å¢ƒå†…段è½çš„è¡Œè·ï¼Œä½¿ç”¨æµ®ç‚¹æ•°æŽ§åˆ¶è¡Œè·å€æ•°ã€‚ \end{function} \IndexLayout diff --git a/macros/latex/contrib/easybook/easybook.cls b/macros/latex/contrib/easybook/easybook.cls index a1a78fa847..cfb30bc1ca 100644 --- a/macros/latex/contrib/easybook/easybook.cls +++ b/macros/latex/contrib/easybook/easybook.cls @@ -9,7 +9,7 @@ %% https://creativecommons.org/licenses/by/4.0/legalcode \NeedsTeXFormat{LaTeX2e} \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/03/13}{1.23p}{} +\ProvidesExplClass{easybook}{2021/03/14}{1.23q}{} \cs_generate_variant:Nn \keys_define:nn {nx} \cs_generate_variant:Nn \int_to_arabic:n {v} @@ -345,6 +345,21 @@ \CTEXthesection\hspace{0.5\ccwd} \fi } + }, + headrule .tl_gset:N = \headrule, + headrule .initial:n = + { + \color{ctex@frame}\vspace{1.5pt} + \hrule width \textwidth height \l__rule_width_dim + }, + footrule .tl_gset:N = \footrule, + footrule .initial:n = {}, + footnoterule .tl_gset:N = \footnoterule, + footnoterule .initial:n = + { + \color{ctex@frame} + \hrule width 0.35\columnwidth height \l__rule_width_dim + \vspace*{2.6pt}\color{black} } } \ctex_at_end_preamble:n @@ -391,11 +406,6 @@ {\text_titlecase_first:n {\l__fancyhf_sec_mark_tl#1}} } } - \cs_gset:Npn \headrule - { - \color{ctex@frame}\vspace{1.5pt} - \hrule width\textwidth height \l__rule_width_dim - } \bool_if:NT \l__draft_bool { \bool_if:NTF \l__page_twoside_bool @@ -629,7 +639,6 @@ \tl_new:N \l__font_figure_tl \tl_new:N \l__font_listing_tl \tl_new:N \l__font_footnote_tl -\tl_new:N \l__font_marginpar_tl \__ctex_define:nn {elfont} { @@ -641,7 +650,7 @@ listing-cap .initial:n = \sffamily\small, footnote .tl_set:N = \l__font_footnote_tl, footnote .initial:n = \rmfamily, - marginpar .tl_set:N = \l__font_marginpar_tl, + marginpar .tl_set:N = \marginfont, marginpar .initial:n = \rmfamily\footnotesize } @@ -1135,11 +1144,6 @@ \skip_gset:Nn \footnotesep{\ht\strutbox} \group_end: \cs_gset:Npn \hangfootparskip{0ex} - \cs_gset:Npn \footnoterule - { - \color{ctex@frame}\hrule width 0.35\columnwidth height \l__rule_width_dim - \vspace*{2.6pt}\color{black} - } \bool_if:NT \l__lang_chinese_bool {\cs_gset:Npn \hangfootparindent{2\ccwd}} \bool_if:NT \l__chap_withpart_bool @@ -1163,7 +1167,6 @@ {\def\baselinestretch{\fp_use:N \l__spread_footnote_fp}\l__font_footnote_tl} \__patch_cmd:Nnn \@makefnmark {\normalfont}{\l__font_footnote_tl} -\cs_gset:Npn \marginfont{\l__font_marginpar_tl} \lstdefinestyle{mystyle} { diff --git a/macros/latex/contrib/hitreport/LICENSE b/macros/latex/contrib/hitreport/LICENSE new file mode 100644 index 0000000000..2244313901 --- /dev/null +++ b/macros/latex/contrib/hitreport/LICENSE @@ -0,0 +1,416 @@ +The LaTeX Project Public License +=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- + +LPPL Version 1.3c 2008-05-04 + +Copyright 1999 2002-2008 LaTeX3 Project + Everyone is allowed to distribute verbatim copies of this + license document, but modification of it is not allowed. + + +PREAMBLE +======== + +The LaTeX Project Public License (LPPL) is the primary license under +which the LaTeX kernel and the base LaTeX packages are distributed. + +You may use this license for any work of which you hold the copyright +and which you wish to distribute. This license may be particularly +suitable if your work is TeX-related (such as a LaTeX package), but +it is written in such a way that you can use it even if your work is +unrelated to TeX. + +The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE', +below, gives instructions, examples, and recommendations for authors +who are considering distributing their works under this license. + +This license gives conditions under which a work may be distributed +and modified, as well as conditions under which modified versions of +that work may be distributed. + +We, the LaTeX3 Project, believe that the conditions below give you +the freedom to make and distribute modified versions of your work +that conform with whatever technical specifications you wish while +maintaining the availability, integrity, and reliability of +that work. If you do not see how to achieve your goal while +meeting these conditions, then read the document `cfgguide.tex' +and `modguide.tex' in the base LaTeX distribution for suggestions. + + +DEFINITIONS +=========== + +In this license document the following terms are used: + + `Work' + Any work being distributed under this License. + + `Derived Work' + Any work that under any applicable law is derived from the Work. + + `Modification' + Any procedure that produces a Derived Work under any applicable + law -- for example, the production of a file containing an + original file associated with the Work or a significant portion of + such a file, either verbatim or with modifications and/or + translated into another language. + + `Modify' + To apply any procedure that produces a Derived Work under any + applicable law. + + `Distribution' + Making copies of the Work available from one person to another, in + whole or in part. Distribution includes (but is not limited to) + making any electronic components of the Work accessible by + file transfer protocols such as FTP or HTTP or by shared file + systems such as Sun's Network File System (NFS). + + `Compiled Work' + A version of the Work that has been processed into a form where it + is directly usable on a computer system. This processing may + include using installation facilities provided by the Work, + transformations of the Work, copying of components of the Work, or + other activities. Note that modification of any installation + facilities provided by the Work constitutes modification of the Work. + + `Current Maintainer' + A person or persons nominated as such within the Work. If there is + no such explicit nomination then it is the `Copyright Holder' under + any applicable law. + + `Base Interpreter' + A program or process that is normally needed for running or + interpreting a part or the whole of the Work. + + A Base Interpreter may depend on external components but these + are not considered part of the Base Interpreter provided that each + external component clearly identifies itself whenever it is used + interactively. Unless explicitly specified when applying the + license to the Work, the only applicable Base Interpreter is a + `LaTeX-Format' or in the case of files belonging to the + `LaTeX-format' a program implementing the `TeX language'. + + + +CONDITIONS ON DISTRIBUTION AND MODIFICATION +=========================================== + +1. Activities other than distribution and/or modification of the Work +are not covered by this license; they are outside its scope. In +particular, the act of running the Work is not restricted and no +requirements are made concerning any offers of support for the Work. + +2. You may distribute a complete, unmodified copy of the Work as you +received it. Distribution of only part of the Work is considered +modification of the Work, and no right to distribute such a Derived +Work may be assumed under the terms of this clause. + +3. You may distribute a Compiled Work that has been generated from a +complete, unmodified copy of the Work as distributed under Clause 2 +above, as long as that Compiled Work is distributed in such a way that +the recipients may install the Compiled Work on their system exactly +as it would have been installed if they generated a Compiled Work +directly from the Work. + +4. If you are the Current Maintainer of the Work, you may, without +restriction, modify the Work, thus creating a Derived Work. You may +also distribute the Derived Work without restriction, including +Compiled Works generated from the Derived Work. Derived Works +distributed in this manner by the Current Maintainer are considered to +be updated versions of the Work. + +5. If you are not the Current Maintainer of the Work, you may modify +your copy of the Work, thus creating a Derived Work based on the Work, +and compile this Derived Work, thus creating a Compiled Work based on +the Derived Work. + +6. If you are not the Current Maintainer of the Work, you may +distribute a Derived Work provided the following conditions are met +for every component of the Work unless that component clearly states +in the copyright notice that it is exempt from that condition. Only +the Current Maintainer is allowed to add such statements of exemption +to a component of the Work. + + a. If a component of this Derived Work can be a direct replacement + for a component of the Work when that component is used with the + Base Interpreter, then, wherever this component of the Work + identifies itself to the user when used interactively with that + Base Interpreter, the replacement component of this Derived Work + clearly and unambiguously identifies itself as a modified version + of this component to the user when used interactively with that + Base Interpreter. + + b. Every component of the Derived Work contains prominent notices + detailing the nature of the changes to that component, or a + prominent reference to another file that is distributed as part + of the Derived Work and that contains a complete and accurate log + of the changes. + + c. No information in the Derived Work implies that any persons, + including (but not limited to) the authors of the original version + of the Work, provide any support, including (but not limited to) + the reporting and handling of errors, to recipients of the + Derived Work unless those persons have stated explicitly that + they do provide such support for the Derived Work. + + d. You distribute at least one of the following with the Derived Work: + + 1. A complete, unmodified copy of the Work; + if your distribution of a modified component is made by + offering access to copy the modified component from a + designated place, then offering equivalent access to copy + the Work from the same or some similar place meets this + condition, even though third parties are not compelled to + copy the Work along with the modified component; + + 2. Information that is sufficient to obtain a complete, + unmodified copy of the Work. + +7. If you are not the Current Maintainer of the Work, you may +distribute a Compiled Work generated from a Derived Work, as long as +the Derived Work is distributed to all recipients of the Compiled +Work, and as long as the conditions of Clause 6, above, are met with +regard to the Derived Work. + +8. The conditions above are not intended to prohibit, and hence do not +apply to, the modification, by any method, of any component so that it +becomes identical to an updated version of that component of the Work as +it is distributed by the Current Maintainer under Clause 4, above. + +9. Distribution of the Work or any Derived Work in an alternative +format, where the Work or that Derived Work (in whole or in part) is +then produced by applying some process to that format, does not relax or +nullify any sections of this license as they pertain to the results of +applying that process. + +10. a. A Derived Work may be distributed under a different license + provided that license itself honors the conditions listed in + Clause 6 above, in regard to the Work, though it does not have + to honor the rest of the conditions in this license. + + b. If a Derived Work is distributed under a different license, that + Derived Work must provide sufficient documentation as part of + itself to allow each recipient of that Derived Work to honor the + restrictions in Clause 6 above, concerning changes from the Work. + +11. This license places no restrictions on works that are unrelated to +the Work, nor does this license place any restrictions on aggregating +such works with the Work by any means. + +12. Nothing in this license is intended to, or may be used to, prevent +complete compliance by all parties with all applicable laws. + + +NO WARRANTY +=========== + +There is no warranty for the Work. Except when otherwise stated in +writing, the Copyright Holder provides the Work `as is', without +warranty of any kind, either expressed or implied, including, but not +limited to, the implied warranties of merchantability and fitness for a +particular purpose. The entire risk as to the quality and performance +of the Work is with you. Should the Work prove defective, you assume +the cost of all necessary servicing, repair, or correction. + +In no event unless required by applicable law or agreed to in writing +will The Copyright Holder, or any author named in the components of the +Work, or any other party who may distribute and/or modify the Work as +permitted above, be liable to you for damages, including any general, +special, incidental or consequential damages arising out of any use of +the Work or out of inability to use the Work (including, but not limited +to, loss of data, data being rendered inaccurate, or losses sustained by +anyone as a result of any failure of the Work to operate with any other +programs), even if the Copyright Holder or said author or said other +party has been advised of the possibility of such damages. + + +MAINTENANCE OF THE WORK +======================= + +The Work has the status `author-maintained' if the Copyright Holder +explicitly and prominently states near the primary copyright notice in +the Work that the Work can only be maintained by the Copyright Holder +or simply that it is `author-maintained'. + +The Work has the status `maintained' if there is a Current Maintainer +who has indicated in the Work that they are willing to receive error +reports for the Work (for example, by supplying a valid e-mail +address). It is not required for the Current Maintainer to acknowledge +or act upon these error reports. + +The Work changes from status `maintained' to `unmaintained' if there +is no Current Maintainer, or the person stated to be Current +Maintainer of the work cannot be reached through the indicated means +of communication for a period of six months, and there are no other +significant signs of active maintenance. + +You can become the Current Maintainer of the Work by agreement with +any existing Current Maintainer to take over this role. + +If the Work is unmaintained, you can become the Current Maintainer of +the Work through the following steps: + + 1. Make a reasonable attempt to trace the Current Maintainer (and + the Copyright Holder, if the two differ) through the means of + an Internet or similar search. + + 2. If this search is successful, then enquire whether the Work + is still maintained. + + a. If it is being maintained, then ask the Current Maintainer + to update their communication data within one month. + + b. If the search is unsuccessful or no action to resume active + maintenance is taken by the Current Maintainer, then announce + within the pertinent community your intention to take over + maintenance. (If the Work is a LaTeX work, this could be + done, for example, by posting to comp.text.tex.) + + 3a. If the Current Maintainer is reachable and agrees to pass + maintenance of the Work to you, then this takes effect + immediately upon announcement. + + b. If the Current Maintainer is not reachable and the Copyright + Holder agrees that maintenance of the Work be passed to you, + then this takes effect immediately upon announcement. + + 4. If you make an `intention announcement' as described in 2b. above + and after three months your intention is challenged neither by + the Current Maintainer nor by the Copyright Holder nor by other + people, then you may arrange for the Work to be changed so as + to name you as the (new) Current Maintainer. + + 5. If the previously unreachable Current Maintainer becomes + reachable once more within three months of a change completed + under the terms of 3b) or 4), then that Current Maintainer must + become or remain the Current Maintainer upon request provided + they then update their communication data within one month. + +A change in the Current Maintainer does not, of itself, alter the fact +that the Work is distributed under the LPPL license. + +If you become the Current Maintainer of the Work, you should +immediately provide, within the Work, a prominent and unambiguous +statement of your status as Current Maintainer. You should also +announce your new status to the same pertinent community as +in 2b) above. + + +WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE +====================================================== + +This section contains important instructions, examples, and +recommendations for authors who are considering distributing their +works under this license. These authors are addressed as `you' in +this section. + +Choosing This License or Another License +---------------------------------------- + +If for any part of your work you want or need to use *distribution* +conditions that differ significantly from those in this license, then +do not refer to this license anywhere in your work but, instead, +distribute your work under a different license. You may use the text +of this license as a model for your own license, but your license +should not refer to the LPPL or otherwise give the impression that +your work is distributed under the LPPL. + +The document `modguide.tex' in the base LaTeX distribution explains +the motivation behind the conditions of this license. It explains, +for example, why distributing LaTeX under the GNU General Public +License (GPL) was considered inappropriate. Even if your work is +unrelated to LaTeX, the discussion in `modguide.tex' may still be +relevant, and authors intending to distribute their works under any +license are encouraged to read it. + +A Recommendation on Modification Without Distribution +----------------------------------------------------- + +It is wise never to modify a component of the Work, even for your own +personal use, without also meeting the above conditions for +distributing the modified component. While you might intend that such +modifications will never be distributed, often this will happen by +accident -- you may forget that you have modified that component; or +it may not occur to you when allowing others to access the modified +version that you are thus distributing it and violating the conditions +of this license in ways that could have legal implications and, worse, +cause problems for the community. It is therefore usually in your +best interest to keep your copy of the Work identical with the public +one. Many works provide ways to control the behavior of that work +without altering any of its licensed components. + +How to Use This License +----------------------- + +To use this license, place in each of the components of your work both +an explicit copyright notice including your name and the year the work +was authored and/or last substantially modified. Include also a +statement that the distribution and/or modification of that +component is constrained by the conditions in this license. + +Here is an example of such a notice and statement: + + %% pig.dtx + %% Copyright 2005 M. Y. Name + % + % This work may be distributed and/or modified under the + % conditions of the LaTeX Project Public License, either version 1.3 + % of this license or (at your option) any later version. + % The latest version of this license is in + % http://www.latex-project.org/lppl.txt + % and version 1.3 or later is part of all distributions of LaTeX + % version 2005/12/01 or later. + % + % This work has the LPPL maintenance status `maintained'. + % + % The Current Maintainer of this work is M. Y. Name. + % + % This work consists of the files pig.dtx and pig.ins + % and the derived file pig.sty. + +Given such a notice and statement in a file, the conditions +given in this license document would apply, with the `Work' referring +to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being +generated from `pig.dtx' using `pig.ins'), the `Base Interpreter' +referring to any `LaTeX-Format', and both `Copyright Holder' and +`Current Maintainer' referring to the person `M. Y. Name'. + +If you do not want the Maintenance section of LPPL to apply to your +Work, change `maintained' above into `author-maintained'. +However, we recommend that you use `maintained', as the Maintenance +section was added in order to ensure that your Work remains useful to +the community even when you can no longer maintain and support it +yourself. + +Derived Works That Are Not Replacements +--------------------------------------- + +Several clauses of the LPPL specify means to provide reliability and +stability for the user community. They therefore concern themselves +with the case that a Derived Work is intended to be used as a +(compatible or incompatible) replacement of the original Work. If +this is not the case (e.g., if a few lines of code are reused for a +completely different task), then clauses 6b and 6d shall not apply. + + +Important Recommendations +------------------------- + + Defining What Constitutes the Work + + The LPPL requires that distributions of the Work contain all the + files of the Work. It is therefore important that you provide a + way for the licensee to determine which files constitute the Work. + This could, for example, be achieved by explicitly listing all the + files of the Work near the copyright notice of each file or by + using a line such as: + + % This work consists of all files listed in manifest.txt. + + in that place. In the absence of an unequivocal list it might be + impossible for the licensee to determine what is considered by you + to comprise the Work and, in such a case, the licensee would be + entitled to make reasonable conjectures as to which files comprise + the Work. + diff --git a/macros/latex/contrib/hitreport/Makefile b/macros/latex/contrib/hitreport/Makefile new file mode 100644 index 0000000000..08b80f62f9 --- /dev/null +++ b/macros/latex/contrib/hitreport/Makefile @@ -0,0 +1,63 @@ +# Makefile for HITReport + +PACKAGE = hitreport +REPORT = hitreport-example + +SOURCES = $(PACKAGE).ins $(PACKAGE).dtx +CLSFILE = dtx-style.sty $(PACKAGE).cls + +LATEXMK = latexmk +SHELL := /bin/bash +NPM ?= npm + +# make deletion work on Windows +ifdef SystemRoot + RM = del /Q +else + RM = rm -f +endif + +.PHONY: all all-dev clean distclean dist report viewreport spine viewspine doc viewdoc cls check save savepdf test FORCE_MAKE + +report: $(REPORT).pdf + +all: report + +all-dev: doc all + +cls: $(CLSFILE) + +$(CLSFILE): $(SOURCES) + xetex $(PACKAGE).ins + +doc: $(PACKAGE).pdf + +$(PACKAGE).pdf: cls FORCE_MAKE + $(LATEXMK) $(PACKAGE).dtx + +$(REPORT).pdf: cls FORCE_MAKE + $(LATEXMK) $(REPORT) + +viewdoc: doc + $(LATEXMK) -pv $(PACKAGE).dtx + +viewreport: report + $(LATEXMK) -pv $(REPORT) + + +clean: + $(LATEXMK) -c $(PACKAGE).dtx $(REPORT) + +cleanall: clean + -@$(RM) $(PACKAGE).pdf $(REPORT).pdf + +distclean: cleanall + -@$(RM) $(CLSFILE) + -@$(RM) -r dist + + +dist: check all-dev + # use l3build for CTAN release (zip with .tds.zip) + l3build ctan --config build-ctan + # use gulp for GitHub release (zip with generated file) + $(NPM) run build -- --version=$(version) diff --git a/macros/latex/contrib/hitreport/README.md b/macros/latex/contrib/hitreport/README.md new file mode 100644 index 0000000000..86c012fea8 --- /dev/null +++ b/macros/latex/contrib/hitreport/README.md @@ -0,0 +1,150 @@ +[](https://github.com/DemerzelSun12/hitreport/actions/workflows/test.yml) +[](https://github.com/demerzelsun12/hitreport/releases/latest) + +# hitreport + +Scroll down for the English version of README. + +# What's hitreport + +**hitreport** stands for **H**arbin **I**nstitute of **T**echnology **Report** LaTeX Template. + +hitreport是为哈尔滨工业大å¦ä¸€æ ¡ä¸‰åŒºæœ¬ç§‘生设计的一个å…于é…置的作业ã€å®žéªŒæŠ¥å‘Šæ¨¡æ¿ã€‚希望它å¯ä»¥ä½¿ä½ 的作业/实验报告ä¸ä¼šå› å½¢å¼ä¸Šçš„缺陷导致评分的下é™ã€‚ + +该文档主è¦å®Œæˆäº†é™¤äº†ä¸»ä½“å†…å®¹ä»¥å¤–çš„å‡ ä¹Ž**全部**工作。åŒæ—¶ï¼Œé€šè¿‡ä½¿ç”¨ Github 版本å®åŒ…ï¼Œä½ è¿˜å¯ä»¥æ›´å¥½çš„管ç†è‡ªå·±çš„ LaTeX 文档。 + +## 安装方法 + +推è下载**å‘布版**模æ¿ï¼Œé‡Œé¢åŒ…括具体使用说明以åŠç¤ºä¾‹æ–‡æ¡£ï¼š + +* 模æ¿ä½¿ç”¨è¯´æ˜Ž (hitreport.pdf) +* 示例文档 (hitreport-example.pdf) + +为方便对 LaTeX ä¸ç†Ÿæ‚‰çš„用户使用本模æ¿ï¼Œæœ¬æ¨¡æ¿çš„å‘布版也æ供预生æˆçš„ `cls` 文件ã€æ–‡æ¡£å’Œæºç 。如需使用稳定版本，请从 CTAN 下载（虽然还在申请ä¸ï¼‰ã€‚ + +下载途径： + +* å‘布版： + * CTANï¼šæš‚æ— ï¼Œåœ¨ç”³è¯·ä¸ã€‚ + * [GitHub Releases](https://github.com/demerzelsun12/hitreport/releases)：最新版的åŠæ—¶å‘布途径之一。 + * [Gitee Releases](https://gitee.com/demerzel/hitreport/releases)：最新版的åŠæ—¶å‘布途径之二。 + +## å‡çº§ + +### 自动更新 + +通过 TeX å‘行版工具（如 `tlmgr`）自动从 [CTAN](https://www.ctan.org/pkg/hitreport) 更新。 + +### 手动更新 + +#### å‘布版 + +下载å‘布版的的 zip 包，使用其ä¸çš„ `hitreport.cls` ç‰æ–‡ä»¶è¦†ç›–原有的å³å¯ï¼Œæ— é¡»é¢å¤–æ“作。 + +#### å¼€å‘版 + +从 GitHub clone 项目æºç 或者下载æºç zip 包，执行命令（Windows 用户在文件夹空白处按 `Shift + é¼ æ ‡å³é”®`，点击“在æ¤å¤„打开命令行窗å£â€ï¼‰ï¼š + +```shell +xetex hitreport.ins +``` + +å³å¯å¾—到 `hitreport.cls` ç‰æ¨¡æ¿æ–‡ä»¶ã€‚ + +## æé—® + +请在 Github Issues 上æ出问题： + +* [GitHub Issues](https://github.com/demerzelsun12/hitreport/issues) + +## Makefile的用法 + +```shell +make [{report|doc|clean|cleanall|distclean}] +``` + +### ç›®æ ‡ + +* `make report` 生æˆæŠ¥å‘Š hitreport-example.pdfï¼› +* `make doc` 生æˆæ¨¡æ¿ä½¿ç”¨è¯´æ˜Žä¹¦ hitreport.pdfï¼› +* `make clean` åˆ é™¤ç¤ºä¾‹æ–‡ä»¶çš„ä¸é—´æ–‡ä»¶ï¼ˆä¸å« hitreport-example.pdf）； +* `make cleanall` åˆ é™¤ç¤ºä¾‹æ–‡ä»¶çš„ä¸é—´æ–‡ä»¶å’Œ hitreport-example.pdfï¼› +* `make distclean` åˆ é™¤ç¤ºä¾‹æ–‡ä»¶å’Œæ¨¡æ¿çš„所有ä¸é—´æ–‡ä»¶å’Œ PDF。 + +--- + +## Contact + +å¦‚æžœä½ ä½¿ç”¨æ—¶å‘现任何 bug 或得ä¸åˆ°çš„æ ¼å¼ï¼Œå¯ä»¥è”系我或开 issue +å¦‚æžœä½ æœ‰æ›´å¥½çš„ä½œä¸š/æŠ¥å‘Šæ ¼å¼ï¼Œæ¬¢è¿Žæ·»åŠ 或è”ç³»æˆ‘å¸®å¿™æ·»åŠ + +## License + +LaTeX Project Public License, Version 1.3c (LPPL-1.3c). + +# hitreport? + +**hitreport** stands for **H**arbin **I**nstitute of **T**echnology **Report** LaTeX Template. + +hitreport is an assignment and experiment report template free of configuration designed for undergraduates in the three campus of Harbin Institute of Technology. I hope it can prevent your homework/experiment report from falling down due to formal defects. + +This document mainly completes almost **all** work except the main document. At the same time, by using the Github version macro package, you can better manage your own LaTeX documents. An English translation of this README follows the Chinese below. + +**This template is subject to frequent changes. Please make sure you have read the usage documentation and example code completely and carefully before using and asking questions.** + +## Downloads + +**Publish versions** are recommended. Specific usage documentation and examples can be found in the archive. At present, these documents are <b>only available in Chinese</b>: + +* Template usage documentation (hitreport.pdf) +* Template example (hitreport-example.pdf) + +For the convenience of users who are not familiar with latex to use this template all versions contain source code, pre-comlied `cls` file and documentations. No warranties are provided. + +* Published versions: + * CTAN：in application... + * [Github Releases](https://github.com/demerzelsun12/hitreport/releases) : + * [GitHub Releases](https://github.com/demerzelsun12/hitreport/releases)：One of the methods for timely release of the latest version. + * [Gitee Releases](https://gitee.com/demerzel/hitreport/releases)：Another method for timely release of the latest version. + +## Updates + +### Automic + +Get the most up-to-date published version with your TeX distribution from [CTAN](https://www.ctan.org/pkg/hitreport). + +### Manual + +#### Published + +Download the published zip files, extract `hitreport.cls` and other files (if needed) and override the existing ones in your report. + +#### Developer versions + +Download the source code package and unzip to the root dictionary of your report (or clone this project), then execute the command (Windows users `Shift + right click` white area in the file window and click "Open command line window here" from the popup menu): + +```shell +xetex hitreport.ins +``` + +you'll get `hitreport.cls` along with other template files. + +## Reporting Issues + +Please report your issues on Github Issues: + +* [Github Issues](https://github.com/demerzelsun12/hitreport/issues) + +## Makefile Usage + +```shell +make [{report|doc|clean|cleanall|distclean}] +``` + +### Targets + +* `make report` generate report +* `make doc` generate template documentation +* `make clean` delete all examples' files (excluding hitreport-example.pdf) +* `make cleanall` delete all examples' files and hitreport-example.pdf +* `make distclean` delete all examples' and templates' files and PDFs. diff --git a/macros/latex/contrib/hitreport/data/abstract.tex b/macros/latex/contrib/hitreport/data/abstract.tex new file mode 100644 index 0000000000..11770a0edd --- /dev/null +++ b/macros/latex/contrib/hitreport/data/abstract.tex @@ -0,0 +1,22 @@ +% !TeX root = ../hitreport-example.tex + +% ä¸è‹±æ–‡æ‘˜è¦å’Œå…³é”®å— + +\begin{abstract} + 论文的摘è¦æ˜¯å¯¹è®ºæ–‡ç ”究内容和æˆæžœçš„高度概括。 + 摘è¦åº”å¯¹è®ºæ–‡æ‰€ç ”ç©¶çš„é—®é¢˜åŠå…¶ç ”究目的进行æè¿°ï¼Œå¯¹ç ”ç©¶æ–¹æ³•å’Œè¿‡ç¨‹è¿›è¡Œç®€å•ä»‹ç»ï¼Œå¯¹ç ”究æˆæžœå’Œæ‰€å¾—结论进行概括。 + 摘è¦åº”具有独立性和自明性，其内容应包å«ä¸Žè®ºæ–‡å…¨æ–‡åŒç‰é‡çš„主è¦ä¿¡æ¯ã€‚ + 使读者å³ä½¿ä¸é˜…读全文，通过摘è¦å°±èƒ½äº†è§£è®ºæ–‡çš„总体内容和主è¦æˆæžœã€‚ + + 论文摘è¦çš„书写应力求精确ã€ç®€æ˜Žã€‚ + 切忌写æˆå¯¹è®ºæ–‡ä¹¦å†™å†…容进行æè¦çš„å½¢å¼ï¼Œå°¤å…¶è¦é¿å…“第 1 ç« â€¦â€¦ï¼›ç¬¬ 2 ç« â€¦â€¦ï¼›â€¦â€¦â€è¿™ç§æˆ–类似的陈述方å¼ã€‚ + + 关键è¯æ˜¯ä¸ºäº†æ–‡çŒ®æ ‡å¼•å·¥ä½œã€ç”¨ä»¥è¡¨ç¤ºå…¨æ–‡ä¸»è¦å†…容信æ¯çš„å•è¯æˆ–术è¯ã€‚ + 关键è¯ä¸è¶…过 5 个，æ¯ä¸ªå…³é”®è¯ä¸é—´ç”¨åˆ†å·åˆ†éš”。 + + % 关键è¯ç”¨â€œè‹±æ–‡é€—å·â€åˆ†éš”，输出时会自动处ç†ä¸ºæ£ç¡®çš„分隔符 + \hitsetup{ + keywords = {å…³é”®è¯ 1, å…³é”®è¯ 2, å…³é”®è¯ 3, å…³é”®è¯ 4, å…³é”®è¯ 5}, + } +\end{abstract} + diff --git a/macros/latex/contrib/hitreport/data/appendix.tex b/macros/latex/contrib/hitreport/data/appendix.tex new file mode 100644 index 0000000000..4c2ec5dd20 --- /dev/null +++ b/macros/latex/contrib/hitreport/data/appendix.tex @@ -0,0 +1,48 @@ +\chapter{附录} + +附录是与论文内容密切相关ã€ä½†ç¼–å…¥æ£æ–‡åˆå½±å“整篇论文编排的æ¡ç†å’Œé€»è¾‘性的资料，例如æŸäº›é‡è¦çš„æ•°æ®è¡¨æ ¼ã€è®¡ç®—程åºã€ç»Ÿè®¡è¡¨ç‰ï¼Œæ˜¯è®ºæ–‡ä¸»ä½“的补充内容，å¯æ ¹æ®éœ€è¦è®¾ç½®ã€‚ + + +\section{图表示例} + +\subsection{图} + +附录ä¸çš„图片示例（图~\ref{fig:appendix-figure}）。 + +\begin{figure} + \centering + \includegraphics[width=0.6\linewidth]{example-image-a.pdf} + \caption{附录ä¸çš„图片示例} + \label{fig:appendix-figure} +\end{figure} + + +\subsection{è¡¨æ ¼} + +附录ä¸çš„è¡¨æ ¼ç¤ºä¾‹ï¼ˆè¡¨~\ref{tab:appendix-table}）。 + +\begin{table} + \centering + \caption{附录ä¸çš„è¡¨æ ¼ç¤ºä¾‹} + \begin{tabular}{ll} + \toprule + 文件å & æè¿° \\ + \midrule + thuthesis.dtx & 模æ¿çš„æºæ–‡ä»¶ï¼ŒåŒ…括文档和注释 \\ + thuthesis.cls & 模æ¿æ–‡ä»¶ \\ + thuthesis-*.bst & BibTeX å‚è€ƒæ–‡çŒ®è¡¨æ ·å¼æ–‡ä»¶ \\ + thuthesis-*.bbx & BibLaTeX å‚è€ƒæ–‡çŒ®è¡¨æ ·å¼æ–‡ä»¶ \\ + thuthesis-*.cbx & BibLaTeX å¼•ç”¨æ ·å¼æ–‡ä»¶ \\ + \bottomrule + \end{tabular} + \label{tab:appendix-table} +\end{table} + + +\section{æ•°å¦å…¬å¼} + +附录ä¸çš„æ•°å¦å…¬å¼ç¤ºä¾‹ï¼ˆå…¬å¼~\eqref{eq:appendix-equation}）。 +\begin{equation} + \frac{1}{2 \symup{\pi} \symup{i}} \int_\gamma f = \sum_{k=1}^m n(\gamma; a_k) \mathscr{R}(f; a_k) + \label{eq:appendix-equation} +\end{equation} diff --git a/macros/latex/contrib/hitreport/data/chap01.tex b/macros/latex/contrib/hitreport/data/chap01.tex new file mode 100644 index 0000000000..505a882a9f --- /dev/null +++ b/macros/latex/contrib/hitreport/data/chap01.tex @@ -0,0 +1,78 @@ +% !TeX root = ../hitreport-example.tex + +\chapter{论文主è¦éƒ¨åˆ†çš„写法} + +ç ”ç©¶ç”Ÿå¦ä½è®ºæ–‡æ’°å†™ï¼Œé™¤è¡¨è¾¾å½¢å¼ä¸Šéœ€è¦ç¬¦åˆä¸€å®šçš„æ ¼å¼è¦æ±‚外，内容方é¢ä¸Šä¹Ÿè¦éµå¾ªä¸€äº›å…±æ€§åŽŸåˆ™ã€‚ + +é€šå¸¸ç ”ç©¶ç”Ÿå¦ä½è®ºæ–‡åªèƒ½æœ‰ä¸€ä¸ªä¸»é¢˜(ä¸èƒ½æ˜¯å‡ å—工作拼凑在一起)，该主题应针对æŸå¦ç§‘领域ä¸çš„一个具体问题展开深入ã€ç³»ç»Ÿçš„ç ”ç©¶ï¼Œå¹¶å¾—å‡ºæœ‰ä»·å€¼çš„ç ”ç©¶ç»“è®ºã€‚ +å¦ä½è®ºæ–‡çš„ç ”ç©¶ä¸»é¢˜åˆ‡å¿Œè¿‡å¤§ï¼Œä¾‹å¦‚ï¼Œâ€œä¸å›½å›½æœ‰ä¼ä¸šæ”¹åˆ¶é—®é¢˜ç ”究â€è¿™æ ·çš„ç ”ç©¶ä¸»é¢˜è¿‡å¤§ï¼Œå› ä¸ºâ€œå›½ä¼æ”¹åˆ¶â€æ¶‰åŠçš„é—®é¢˜èŒƒå›´å¤ªå¹¿ï¼Œå¾ˆéš¾åœ¨ä¸€æœ¬ç ”ç©¶ç”Ÿå¦ä½è®ºæ–‡ä¸å®Œå…¨ç ”究é€å½»ã€‚ + + + +\section{论文的è¯è¨€åŠè¡¨è¿°} + +é™¤å›½é™…ç ”ç©¶ç”Ÿå¤–ï¼Œå¦ä½è®ºæ–‡ä¸€å¾‹é¡»ç”¨æ±‰è¯ä¹¦å†™ã€‚ +å¦ä½è®ºæ–‡åº”当用规范汉å—进行撰写，除å¤æ±‰è¯ç ”究ä¸æ¶‰åŠçš„å¤æ–‡å—å’Œå‚考文献ä¸å¼•ç”¨çš„外文文献之外，å‡é‡‡ç”¨ç®€ä½“汉å—撰写。 + +å›½é™…ç ”ç©¶ç”Ÿä¸€èˆ¬åº”ä»¥ä¸æ–‡æˆ–英文书写å¦ä½è®ºæ–‡ï¼Œæ ¼å¼è¦æ±‚åŒä¸Šã€‚ +论文须用ä¸æ–‡å°é¢ã€‚ + +ç ”ç©¶ç”Ÿå¦ä½è®ºæ–‡æ˜¯å¦æœ¯ä½œå“ï¼Œå› æ¤å…¶è¡¨è¿°è¦ä¸¥è°¨ç®€æ˜Žï¼Œé‡ç‚¹çªå‡ºï¼Œä¸“业常识应简写或ä¸å†™ï¼Œåšåˆ°ç«‹è®ºæ£ç¡®ã€æ•°æ®å¯é ã€è¯´æ˜Žé€å½»ã€æŽ¨ç†ä¸¥è°¨ã€æ–‡å—å‡ç»ƒã€å±‚次分明，é¿å…使用文å¦æ€§è´¨çš„或带感情色彩的éžå¦æœ¯æ€§è¯è¨€ã€‚ + +论文ä¸å¦‚出现一个éžé€šç”¨æ€§çš„æ–°åè¯ã€æ–°æœ¯è¯æˆ–新概念，需éšå³è§£é‡Šæ¸…楚。 + + + +\section{论文题目的写法} + +论文题目应简明扼è¦åœ°åæ˜ è®ºæ–‡å·¥ä½œçš„ä¸»è¦å†…容，力求精炼ã€å‡†ç¡®ï¼Œåˆ‡å¿Œç¬¼ç»Ÿã€‚ +è®ºæ–‡é¢˜ç›®æ˜¯å¯¹ç ”ç©¶å¯¹è±¡çš„å‡†ç¡®ã€å…·ä½“æ述，一般è¦åœ¨ä¸€å®šç¨‹åº¦ä¸Šä½“çŽ°ç ”ç©¶ç»“è®ºï¼Œå› æ¤ï¼Œè®ºæ–‡é¢˜ç›®ä¸ä»…åº”å‘Šè¯‰è¯»è€…è¿™æœ¬è®ºæ–‡ç ”ç©¶äº†ä»€ä¹ˆé—®é¢˜ï¼Œæ›´è¦å‘Šè¯‰è¯»è€…è¿™ä¸ªç ”ç©¶å¾—å‡ºçš„ç»“è®ºã€‚ +例如：“在事实与虚构之间：梅ä¹ã€å¡å½ç‰¹ã€æ²ƒå°”夫的新闻观â€å°±æ¯”â€œä¸‰ä¸ªç¾Žå›½ä½œå®¶çš„æ–°é—»è§‚ç ”ç©¶â€æ›´ä¸“业ã€æ›´å‡†ç¡®ã€‚ + + + +\section{摘è¦çš„写法} + +论文摘è¦æ˜¯å¯¹è®ºæ–‡ç ”究内容的高度概括，应具有独立性和自å«æ€§ï¼Œå³åº”是 一篇简çŸä½†æ„ä¹‰å®Œæ•´çš„æ–‡ç« ã€‚ +通过阅读论文摘è¦ï¼Œè¯»è€…åº”è¯¥èƒ½å¤Ÿå¯¹è®ºæ–‡çš„ç ”ç©¶ 方法åŠç»“è®ºæœ‰ä¸€ä¸ªæ•´ä½“æ€§çš„äº†è§£ï¼Œå› æ¤æ‘˜è¦çš„写法应力求精确简明。 +è®ºæ–‡æ‘˜è¦ åº”åŒ…æ‹¬å¯¹é—®é¢˜åŠç ”究目的的æè¿°ã€å¯¹ä½¿ç”¨çš„æ–¹æ³•å’Œç ”ç©¶è¿‡ç¨‹è¿›è¡Œçš„ç®€è¦ä»‹ç»ã€ å¯¹ç ”ç©¶ç»“è®ºçš„é«˜åº¦å‡ç»ƒç‰ï¼Œé‡ç‚¹æ˜¯ç»“果和结论。 + +论文摘è¦åˆ‡å¿Œå†™æˆå…¨æ–‡çš„æ纲，尤其è¦é¿å…“第 1 ç« â€¦â€¦ï¼›ç¬¬ 2 ç« â€¦â€¦ï¼›â€¦â€¦â€è¿™æ ·çš„陈述方å¼ã€‚ + + + +\section{引言的写法} + +一篇å¦ä½è®ºæ–‡çš„引言大致包å«å¦‚ä¸‹å‡ ä¸ªéƒ¨åˆ†ï¼š +1ã€é—®é¢˜çš„æ出； +2ã€é€‰é¢˜èƒŒ 景åŠæ„义； +3ã€æ–‡çŒ®ç»¼è¿°ï¼› +4ã€ç ”究方法； +5ã€è®ºæ–‡ç»“构安排。 +\begin{itemize} + \item 问题的æ出：è¦æ¸…晰地é˜è¿°æ‰€è¦ç ”究的问题“是什么â€ã€‚ + \footnote{选题时切记è¦æœ‰â€œé—®é¢˜æ„识â€ï¼Œä¸è¦é€‰ä¸æ˜¯é—®é¢˜çš„问题æ¥ç ”究。} + \item 选题背景åŠæ„义：论述清楚为什么选择这个题目æ¥ç ”究，å³é˜è¿°è¯¥ç ”究对å¦ç§‘å‘展的贡献ã€å¯¹å›½è®¡æ°‘生的ç†è®ºä¸ŽçŽ°å®žæ„义ç‰ã€‚ + \item æ–‡çŒ®ç»¼è¿°ï¼šå¯¹æœ¬ç ”ç©¶ä¸»é¢˜èŒƒå›´å†…çš„æ–‡çŒ®è¿›è¡Œè¯¦å°½çš„ç»¼åˆè¿°è¯„，“述â€çš„åŒæ—¶ä¸€å®šè¦æœ‰â€œè¯„â€ï¼ŒæŒ‡å‡ºçŽ°æœ‰ç ”究状æ€ï¼Œä»å˜åœ¨å“ªäº›å°šå¾…è§£å†³çš„é—®é¢˜ï¼Œè®²å‡ºè‡ªå·±çš„ç ”ç©¶æœ‰å“ªäº›æŽ¢ç´¢æ€§å†…å®¹ã€‚ + \item ç ”ç©¶æ–¹æ³•ï¼šè®²æ¸…è®ºæ–‡æ‰€ä½¿ç”¨çš„å¦æœ¯ç ”究方法。 + \item 论文结构安排：介ç»æœ¬è®ºæ–‡çš„写作结构安排。 +\end{itemize} + + + +\section{æ£æ–‡çš„写法} + +æœ¬éƒ¨åˆ†æ˜¯è®ºæ–‡ä½œè€…çš„ç ”ç©¶å†…å®¹ï¼Œä¸èƒ½å°†ä»–äººç ”ç©¶æˆæžœä¸åŠ 区分地掺和进æ¥ã€‚ +å·²ç»åœ¨å¼•è¨€çš„文献综述部分讲过的内容，这里ä¸éœ€è¦å†é‡å¤ã€‚ +å„ç« ä¹‹é—´è¦å˜åœ¨æœ‰æœºè”系，符åˆé€»è¾‘顺åºã€‚ + + + +\section{结论的写法} + +结论是对论文主è¦ç ”究结果ã€è®ºç‚¹çš„æ炼与概括，应精炼ã€å‡†ç¡®ã€å®Œæ•´ï¼Œä½¿è¯»è€…看åŽèƒ½å…¨é¢äº†è§£è®ºæ–‡çš„æ„义ã€ç›®çš„和工作内容。 +结论是最终的ã€æ€»ä½“的结论，ä¸æ˜¯æ£æ–‡å„ç« å°ç»“的简å•é‡å¤ã€‚ +ç»“è®ºåº”åŒ…æ‹¬è®ºæ–‡çš„æ ¸å¿ƒè§‚ç‚¹ï¼Œä¸»è¦é˜è¿°ä½œè€…çš„åˆ›é€ æ€§å·¥ä½œåŠæ‰€å–å¾—çš„ç ”ç©¶æˆæžœåœ¨æœ¬é¢†åŸŸä¸çš„地ä½ã€ä½œç”¨å’Œæ„ä¹‰ï¼Œäº¤ä»£ç ”ç©¶å·¥ä½œçš„å±€é™ï¼Œæ出未æ¥å·¥ä½œçš„æ„è§æˆ–建议。 +åŒæ—¶ï¼Œè¦ä¸¥æ ¼åŒºåˆ†è‡ªå·±å–å¾—çš„æˆæžœä¸ŽæŒ‡å¯¼æ•™å¸ˆåŠä»–人的å¦æœ¯æˆæžœã€‚ + +åœ¨è¯„ä»·è‡ªå·±çš„ç ”ç©¶å·¥ä½œæˆæžœæ—¶ï¼Œè¦å®žäº‹æ±‚是，除éžæœ‰è¶³å¤Ÿçš„è¯æ®è¡¨æ˜Žè‡ªå·±çš„ç ”ç©¶æ˜¯â€œé¦–æ¬¡â€ã€â€œé¢†å…ˆâ€ã€â€œå¡«è¡¥ç©ºç™½â€çš„，å¦åˆ™åº”é¿å…使用这些或类似è¯è¯ã€‚ diff --git a/macros/latex/contrib/hitreport/data/chap02.tex b/macros/latex/contrib/hitreport/data/chap02.tex new file mode 100644 index 0000000000..834789e384 --- /dev/null +++ b/macros/latex/contrib/hitreport/data/chap02.tex @@ -0,0 +1,153 @@ +% !TeX root = ../hitreport-example.tex + +\chapter{图表示例} + +\section{æ’图} + +图片通常在 {figure} 环境ä¸ä½¿ç”¨ {includegraphics} æ’入，如图~\ref{fig:example} çš„æºä»£ç 。 +建议矢é‡å›¾ç‰‡ä½¿ç”¨ PDF æ ¼å¼ï¼Œæ¯”如数æ®å¯è§†åŒ–的绘图； +照片应使用 JPG æ ¼å¼ï¼› +å…¶ä»–çš„æ …æ ¼å›¾åº”ä½¿ç”¨æ— æŸçš„ PNG æ ¼å¼ã€‚ +注æ„，LaTeX ä¸æ”¯æŒ TIFF æ ¼å¼ï¼›EPS æ ¼å¼å·²ç»è¿‡æ—¶ã€‚ + +\begin{figure} + \centering + \includegraphics[width=0.6\linewidth]{example-image-a.pdf} + \caption{示例图片} + \label{fig:example} +\end{figure} + +若图或表ä¸æœ‰é™„注，采用英文å°å†™å—æ¯é¡ºåºç¼–å·ï¼Œé™„注写在图或表的下方。 +% LaTeX ä¼ ç»Ÿä¸Šä¸€èˆ¬å°†é™„æ³¨çš„å†…å®¹åŒå›¾è¡¨çš„æ ‡é¢˜å†™åœ¨ä¸€èµ·ï¼Œå½¢æˆå¾ˆé•¿çš„一段文å—。 + +如果一个图由两个或两个以上分图组æˆæ—¶ï¼Œå„分图分别以(a)ã€(b)ã€(c)...... 作为图åºï¼Œå¹¶é¡»æœ‰åˆ†å›¾é¢˜ã€‚ +推è使用 {subcaption} å®åŒ…æ¥å¤„ç†ï¼Œ 比如图~\ref{fig:subfig-a} 和图~\ref{fig:subfig-b}。 + +\begin{figure} + \centering + \subcaptionbox{分图 A\label{fig:subfig-a}} + {\includegraphics[width=0.45\linewidth]{example-image-a.pdf}} + \subcaptionbox{分图 B\label{fig:subfig-b}} + {\includegraphics[width=0.45\linewidth]{example-image-b.pdf}} + \caption{多个分图的示例} + \label{fig:multi-image} +\end{figure} + + + +\section{è¡¨æ ¼} + +è¡¨åº”å…·æœ‰è‡ªæ˜Žæ€§ã€‚ä¸ºä½¿è¡¨æ ¼ç®€æ´æ˜“读，尽å¯èƒ½é‡‡ç”¨ä¸‰çº¿è¡¨ï¼Œå¦‚表~\ref{tab:three-line}。 +三æ¡çº¿å¯ä»¥ä½¿ç”¨ {booktabs} å®åŒ…æ供的命令生æˆã€‚ + +\begin{table} + \centering + \caption{三线表示例} + \begin{tabular}{ll} + \toprule + 文件å & æè¿° \\ + \midrule + thuthesis.dtx & 模æ¿çš„æºæ–‡ä»¶ï¼ŒåŒ…括文档和注释 \\ + thuthesis.cls & 模æ¿æ–‡ä»¶ \\ + thuthesis-*.bst & BibTeX å‚è€ƒæ–‡çŒ®è¡¨æ ·å¼æ–‡ä»¶ \\ + thuthesis-*.bbx & BibLaTeX å‚è€ƒæ–‡çŒ®è¡¨æ ·å¼æ–‡ä»¶ \\ + thuthesis-*.cbx & BibLaTeX å¼•ç”¨æ ·å¼æ–‡ä»¶ \\ + \bottomrule + \end{tabular} + \label{tab:three-line} +\end{table} + +è¡¨æ ¼å¦‚æžœæœ‰é™„æ³¨ï¼Œå°¤å…¶æ˜¯éœ€è¦åœ¨è¡¨æ ¼ä¸è¿›è¡Œæ ‡æ³¨æ—¶ï¼Œå¯ä»¥ä½¿ç”¨ {threeparttable} å®åŒ…。 +ç ”ç©¶ç”Ÿè¦æ±‚使用英文å°å†™å—æ¯ aã€bã€c……顺åºç¼–å·ï¼Œæœ¬ç§‘生使用圈ç â‘ ã€â‘¡ã€â‘¢â€¦â€¦ç¼–å·ã€‚ + +\begin{table} + \centering + \begin{threeparttable}[c] + \caption{å¸¦é™„æ³¨çš„è¡¨æ ¼ç¤ºä¾‹} + \label{tab:three-part-table} + \begin{tabular}{ll} + \toprule + 文件å & æè¿° \\ + \midrule + thuthesis.dtx\tnote{a} & 模æ¿çš„æºæ–‡ä»¶ï¼ŒåŒ…括文档和注释 \\ + thuthesis.cls\tnote{b} & 模æ¿æ–‡ä»¶ \\ + thuthesis-*.bst & BibTeX å‚è€ƒæ–‡çŒ®è¡¨æ ·å¼æ–‡ä»¶ \\ + thuthesis-*.bbx & BibLaTeX å‚è€ƒæ–‡çŒ®è¡¨æ ·å¼æ–‡ä»¶ \\ + thuthesis-*.cbx & BibLaTeX å¼•ç”¨æ ·å¼æ–‡ä»¶ \\ + \bottomrule + \end{tabular} + \begin{tablenotes} + \item [a] å¯ä»¥é€šè¿‡ xelatex 编译生æˆæ¨¡æ¿çš„使用说明文档； + 使用 xetex 编译 {thuthesis.ins} 时则会从 {.dtx} ä¸åŽ»é™¤æŽ‰æ–‡æ¡£å’Œæ³¨é‡Šï¼Œå¾—到精简的 {.cls} 文件。 + \item [b] 更新模æ¿æ—¶ï¼Œä¸€å®šè¦è®°å¾—ç¼–è¯‘ç”Ÿæˆ {.cls} 文件，å¦åˆ™ç¼–译论文时载入的ä¾ç„¶æ˜¯æ—§ç‰ˆçš„模æ¿ã€‚ + \end{tablenotes} + \end{threeparttable} +\end{table} + +如æŸä¸ªè¡¨éœ€è¦è½¬é¡µæŽ¥æŽ’，å¯ä»¥ä½¿ç”¨ {longtable} å®åŒ…，需è¦åœ¨éšåŽçš„å„页上é‡å¤è¡¨çš„ç¼–å·ã€‚ +ç¼–å·åŽè·Ÿè¡¨é¢˜ï¼ˆå¯çœç•¥ï¼‰å’Œâ€œï¼ˆç»ï¼‰â€ï¼Œç½®äºŽè¡¨ä¸Šæ–¹ã€‚ç»è¡¨å‡åº”é‡å¤è¡¨å¤´ã€‚ + +\begin{longtable}{cccc} + \caption{è·¨é¡µé•¿è¡¨æ ¼çš„è¡¨é¢˜} \\ + \toprule + 表头 1 & 表头 2 & 表头 3 & 表头 4 \\ + \midrule + \endfirsthead + \caption[]{è·¨é¡µé•¿è¡¨æ ¼çš„è¡¨é¢˜ï¼ˆç»ï¼‰} \\ + \toprule + 表头 1 & 表头 2 & 表头 3 & 表头 4 \\ + \midrule + \endhead + \bottomrule + \endfoot + Row 1 & & & \\ + Row 2 & & & \\ + Row 3 & & & \\ + Row 4 & & & \\ + Row 5 & & & \\ + Row 6 & & & \\ + Row 7 & & & \\ + Row 8 & & & \\ + Row 9 & & & \\ + Row 10 & & & \\ + Row 11 & & & \\ + Row 12 & & & \\ + Row 13 & & & \\ + Row 14 & & & \\ + Row 15 & & & \\ + Row 16 & & & \\ + Row 17 & & & \\ + Row 18 & & & \\ + Row 19 & & & \\ + Row 20 & & & \\ + Row 21 & & & \\ + Row 22 & & & \\ + Row 23 & & & \\ + Row 24 & & & \\ + Row 25 & & & \\ + Row 26 & & & \\ + Row 27 & & & \\ + Row 28 & & & \\ + Row 29 & & & \\ + Row 30 & & & \\ + Row 31 & & & \\ + Row 32 & & & \\ + Row 33 & & & \\ + Row 34 & & & \\ + Row 35 & & & \\ + Row 36 & & & \\ + Row 37 & & & \\ + Row 38 & & & \\ + Row 39 & & & \\ + Row 40 & & & \\ + Row 41 & & & \\ + Row 42 & & & \\ + Row 43 & & & \\ + Row 44 & & & \\ + Row 45 & & & \\ + Row 46 & & & \\ + Row 47 & & & \\ + Row 48 & & & \\ + Row 49 & & & \\ + Row 50 & & & \\ +\end{longtable} diff --git a/macros/latex/contrib/hitreport/data/chap03.tex b/macros/latex/contrib/hitreport/data/chap03.tex new file mode 100644 index 0000000000..fff827b9d4 --- /dev/null +++ b/macros/latex/contrib/hitreport/data/chap03.tex @@ -0,0 +1,71 @@ +% !TeX root = ../hitreport-example.tex + +\chapter{æ•°å¦ç¬¦å·å’Œå…¬å¼} + +\section{æ•°å¦ç¬¦å·} + +ä¸æ–‡è®ºæ–‡çš„æ•°å¦ç¬¦å·é»˜è®¤é‡‡ç”¨ GB/T 3102.11—1993《物ç†ç§‘å¦å’ŒæŠ€æœ¯ä¸ä½¿ç”¨çš„æ•°å¦ç¬¦å·ã€‹ã€‚ +è¯¥æ ‡å‡†å‚照采纳 ISO 31-11:1992（目å‰æœ€æ–°ç‰ˆä¸º ISO 80000-2:2019）， +但是与 \TeX{} 默认的英美国家的符å·ä¹ 惯有许多差异，主è¦æœ‰ï¼š +\begin{enumerate} + \item 大写希腊å—æ¯é»˜è®¤ä¸ºæ–œä½“，如 $\Delta$ã€$\Sigma$， + 有é™å¢žé‡ç¬¦å· $\increment$（{increment}）固定使用æ£ä½“。 + \item æ•°å¦å¸¸æ•°å’Œç‰¹æ®Šå‡½æ•°å用æ£ä½“，如 $\symup{\pi} = 3.14\dots$ï¼›$\symup{e} = 2.718\dots$。 + \item 微分å·ä½¿ç”¨æ£ä½“，比如 $\dif y / \dif x$。 + \item å‘é‡ã€çŸ©é˜µå’Œå¼ é‡ç”¨ç²—斜体（{symbf}），如 $\symbf{x}$ã€$\symbf{\Sigma}$。 + \item çœç•¥å·æŒ‰ç…§ä¸æ–‡çš„ä¹ æƒ¯å›ºå®šå±…ä¸ï¼Œå¦‚ $1, 2, \dots, n$。 +\end{enumerate} + +英文论文的数å¦ç¬¦å·ä½¿ç”¨ \TeX{} é»˜è®¤çš„æ ·å¼ã€‚ +如果有必è¦ï¼Œä¹Ÿå¯ä»¥é€šè¿‡è®¾ç½® \verb|math-style| 选择数å¦ç¬¦å·æ ·å¼ã€‚ + +关于é‡å’Œå•ä½æŽ¨è使用 +\href{http://mirrors.ctan.org/macros/latex/contrib/siunitx/siunitx.pdf}{{siunitx}} +å®åŒ…， +å¯ä»¥æ–¹ä¾¿åœ°å¤„ç†å¸Œè…Šå—æ¯ä»¥åŠæ•°å—与å•ä½ä¹‹é—´çš„空白， +比如： +\SI{6.4e6}{m}， +\SI{9}{\micro\meter}， +\si{kg.m.s^{-1}}， +\SIrange{10}{20}{\degreeCelsius}。 + + + +\section{æ•°å¦å…¬å¼} + +æ•°å¦å…¬å¼å¯ä»¥ä½¿ç”¨ {equation} å’Œ {equation*} 环境。 +注æ„æ•°å¦å…¬å¼çš„引用应å‰åŽå¸¦æ‹¬å·ï¼Œå»ºè®®ä½¿ç”¨ {eqref} å‘½ä»¤ï¼Œæ¯”å¦‚å¼ \eqref{eq:example}。 +\begin{equation} + \frac{1}{2 \symup{\pi} \symup{i}} \int_\gamma f = \sum_{k=1}^m n(\gamma; a_k) \mathscr{R}(f; a_k) + \label{eq:example} +\end{equation} +注æ„å…¬å¼ç¼–å·çš„引用应å«æœ‰åœ†æ‹¬å·ï¼Œå¯ä»¥ä½¿ç”¨ {eqref} 命令。 + +多行公å¼å°½å¯èƒ½åœ¨â€œ=â€å¤„对é½ï¼ŒæŽ¨è使用 {align} 环境。 +\begin{align} + a & = b + c + d + e \\ + & = f + g +\end{align} + + + +\section{æ•°å¦å®šç†} + +定ç†çŽ¯å¢ƒçš„æ ¼å¼å¯ä»¥ä½¿ç”¨ {amsthm} 或者 {ntheorem} å®åŒ…é…置。 +用户在导言区载入这两者之一åŽï¼Œæ¨¡æ¿ä¼šè‡ªåŠ¨é…ç½® {thoerem}ã€{proof} ç‰çŽ¯å¢ƒã€‚ + +\begin{theorem}[Lindeberg--Lévy ä¸å¿ƒæžé™å®šç†] + 设éšæœºå˜é‡ $X_1, X_2, \dots, X_n$ 独立åŒåˆ†å¸ƒï¼Œ 且具有期望 $\mu$ 和有é™çš„方差 $\sigma^2 \ne 0$， + è®° $\bar{X}_n = \frac{1}{n} \sum_{i+1}^n X_i$，则 + \begin{equation} + \lim_{n \to \infty} P \left(\frac{\sqrt{n} \left( \bar{X}_n - \mu \right)}{\sigma} \le z \right) = \Phi(z), + \end{equation} + å…¶ä¸ $\Phi(z)$ æ˜¯æ ‡å‡†æ£æ€åˆ†å¸ƒçš„分布函数。 +\end{theorem} +%\begin{proof} +% Trivial. +%\end{proof} + +%åŒæ—¶æ¨¡æ¿è¿˜æ供了 \env{assumption}ã€\env{definition}ã€\env{proposition}〠+%\env{lemma}ã€\env{theorem}ã€\env{axiom}ã€\env{corollary}ã€\env{exercise}〠+%\env{example}ã€\env{remar}ã€\env{problem}ã€\env{conjecture} 这些相关的环境。 diff --git a/macros/latex/contrib/hitreport/figures/example-image-a.pdf b/macros/latex/contrib/hitreport/figures/example-image-a.pdf Binary files differnew file mode 100644 index 0000000000..6d7ecb88a0 --- /dev/null +++ b/macros/latex/contrib/hitreport/figures/example-image-a.pdf diff --git a/macros/latex/contrib/hitreport/figures/example-image-b.pdf b/macros/latex/contrib/hitreport/figures/example-image-b.pdf Binary files differnew file mode 100644 index 0000000000..7b404afa22 --- /dev/null +++ b/macros/latex/contrib/hitreport/figures/example-image-b.pdf diff --git a/macros/latex/contrib/hitreport/figures/scan-copyright.pdf b/macros/latex/contrib/hitreport/figures/scan-copyright.pdf Binary files differnew file mode 100644 index 0000000000..9d5c5a5665 --- /dev/null +++ b/macros/latex/contrib/hitreport/figures/scan-copyright.pdf diff --git a/macros/latex/contrib/hitreport/figures/scan-record.pdf b/macros/latex/contrib/hitreport/figures/scan-record.pdf Binary files differnew file mode 100644 index 0000000000..db0dcef7b2 --- /dev/null +++ b/macros/latex/contrib/hitreport/figures/scan-record.pdf diff --git a/macros/latex/contrib/hitreport/figures/scan-statement.pdf b/macros/latex/contrib/hitreport/figures/scan-statement.pdf Binary files differnew file mode 100644 index 0000000000..25e1494d7a --- /dev/null +++ b/macros/latex/contrib/hitreport/figures/scan-statement.pdf diff --git a/macros/latex/contrib/hitreport/hitreport-example.pdf b/macros/latex/contrib/hitreport/hitreport-example.pdf Binary files differnew file mode 100644 index 0000000000..669dc242a1 --- /dev/null +++ b/macros/latex/contrib/hitreport/hitreport-example.pdf diff --git a/macros/latex/contrib/hitreport/hitreport-example.tex b/macros/latex/contrib/hitreport/hitreport-example.tex new file mode 100644 index 0000000000..9e28cf8fe0 --- /dev/null +++ b/macros/latex/contrib/hitreport/hitreport-example.tex @@ -0,0 +1,42 @@ +% !TeX encoding = UTF-8 +% !TeX program = xelatex + +\documentclass{hitreport} + + +% 报告基本é…ç½®ï¼ŒåŠ è½½å®åŒ…ç‰å…¨å±€é…ç½® +\input{hitsetup} + + +\begin{document} + +% å°é¢ +\maketitle + +\frontmatter +\input{data/abstract} + +% 目录 +\tableofcontents + + +% æ£æ–‡éƒ¨åˆ† +\mainmatter +\input{data/chap01} +\input{data/chap02} +\input{data/chap03} + + +% 其他部分 +\backmatter + +% å‚考文献 +%\bibliography{ref/refs} % å‚考文献使用 BibTeX 编译 +% \printbibliography % å‚考文献使用 BibLaTeX 编译 + +% 附录 +\appendix +\input{data/appendix} + + +\end{document} diff --git a/macros/latex/contrib/hitreport/hitreport.dtx b/macros/latex/contrib/hitreport/hitreport.dtx new file mode 100644 index 0000000000..326147d327 --- /dev/null +++ b/macros/latex/contrib/hitreport/hitreport.dtx @@ -0,0 +1,3191 @@ +% \iffalse meta-comment +% +% Copyright (C) 2021 by Xiao Sun <demerzelsun@gmail.com> +% +% This file may be distributed and/or modified under the conditions of +% the LaTeX Project Public License, either version 1.3c of this license +% or (at your option) any later version. The latest version of this +% license is in: +% +% http://www.latex-project.org/lppl.txt +% +% and version 1.3c or later is part of all distributions of LaTeX +% version 2005/12/01 or later. +% +% This work has the LPPL maintenance status `maintained'. +% +% \fi +% +% \iffalse +%<*driver> +\ProvidesFile{hitreport.dtx}[2021/01/14 1.0.0 Harbin Institute of Technology Report Template] +\documentclass{ltxdoc} +\usepackage{dtx-style} + +\EnableCrossrefs +\CodelineIndex + +\begin{document} + \DocInput{hitreport.dtx} +\end{document} +%</driver> +% \fi +% +% \CharacterTable +% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +% Digits \0\1\2\3\4\5\6\7\8\9 +% Exclamation \! Double quote \" Hash (number) \# +% Dollar \$ Percent \% Ampersand \& +% Acute accent \' Left paren \( Right paren \) +% Asterisk \* Plus \+ Comma \, +% Minus \- Point \. Solidus \/ +% Colon \: Semicolon \; Less than \< +% Equals \= Greater than \> Question mark \? +% Commercial at \@ Left bracket \[ Backslash \\ +% Right bracket \] Circumflex \^ Underscore \_ +% Grave accent \` Left brace \{ Vertical bar \| +% Right brace \} Tilde \~} +% +% \DoNotIndex{\newenvironment,\@bsphack,\@empty,\@esphack,\sfcode} +% \DoNotIndex{\addtocounter,\label,\let,\linewidth,\newcounter} +% \DoNotIndex{\noindent,\normalfont,\par,\parskip,\phantomsection} +% \DoNotIndex{\providecommand,\ProvidesPackage,\refstepcounter} +% \DoNotIndex{\RequirePackage,\setcounter,\setlength,\string,\strut} +% \DoNotIndex{\textbackslash,\texttt,\ttfamily,\usepackage} +% \DoNotIndex{\begin,\end,\begingroup,\endgroup,\par,\\} +% \DoNotIndex{\if,\ifx,\ifdim,\ifnum,\ifcase,\else,\or,\fi} +% \DoNotIndex{\let,\def,\xdef,\edef,\newcommand,\renewcommand} +% \DoNotIndex{\expandafter,\csname,\endcsname,\relax,\protect} +% \DoNotIndex{\Huge,\huge,\LARGE,\Large,\large,\normalsize} +% \DoNotIndex{\small,\footnotesize,\scriptsize,\tiny} +% \DoNotIndex{\normalfont,\bfseries,\slshape,\sffamily,\interlinepenalty} +% \DoNotIndex{\textbf,\textit,\textsf,\textsc} +% \DoNotIndex{\hfil,\par,\hskip,\vskip,\vspace,\quad} +% \DoNotIndex{\centering,\raggedright,\ref} +% \DoNotIndex{\c@secnumdepth,\@startsection,\@setfontsize} +% \DoNotIndex{\ ,\@plus,\@minus,\p@,\z@,\@m,\@M,\@ne,\m@ne} +% \DoNotIndex{\@@par,\DeclareOperation,\RequirePackage,\LoadClass} +% \DoNotIndex{\AtBeginDocument,\AtEndDocument} +% +% \changes{v1.0.0}{2021/01/14}{Initial version} +% +% \GetFileInfo{\jobname.dtx} +% +% \def\indexname{索引} +% \def\glossaryname{修改记录} +% \IndexPrologue{\section{\indexname}} +% \GlossaryPrologue{\section{\glossaryname}} + +% \title{\bfseries\color{violet} \hitreport: 哈尔滨工业大å¦æœ¬ç§‘生泛用报告} +% \author{å™éª \\[5pt]\texttt{demerzelsun@gmail.com}} +% \date{\fileversion\ (\filedate)} +% \maketitle\thispagestyle{empty} +% +% \begin{abstract}\noindent +% æ¤å®åŒ…旨在建立一个å…于é…置的ã€æŒ‡ä»¤ç›¸å¯¹ç®€å•çš„哈尔滨工业大å¦ä½œä¸šã€å®žéªŒæŠ¥å‘Šé€šç”¨æ¨¡æ¿ã€‚ +% \end{abstract} +% +% +% \vskip2cm +% \def\abstractname{å…责声明} +% \begin{abstract} +% \noindent +% \begin{enumerate} +% \item 本模æ¿çš„å‘布éµå®ˆ \LaTeX\ Project Public License，使用å‰è¯·è®¤çœŸé˜…读å议内 +% 容。 +% \item \textbf{本模æ¿ä¸ºä½œè€…编写的报告模æ¿ï¼Œä¸Žå“ˆå°”滨工业大å¦å®˜æ–¹æ²¡æœ‰ä»»ä½•å…³ç³»}。本模æ¿çš„æ ¼å¼æ— 法兼顾所有课程è¦æ±‚， +% 但已ç»é€‚é…了ç»å¤§å¤šæ•°çš„需求场景。 +% 任何使用本å®åŒ…进行实验报告制作时，请\textbf{åŠ¡å¿…æ ¹æ®è¯¾ç¨‹è¦æ±‚进行写作}。 +% 由于使用本模æ¿è€Œå¼•èµ·çš„作业验收问题， +% å‡ä¸Žæœ¬æ¨¡æ¿ä½œè€…æ— å…³ã€‚ +% \item 任何个人或组织以本模æ¿ä¸ºåŸºç¡€è¿›è¡Œä¿®æ”¹ã€æ‰©å±•è€Œç”Ÿæˆçš„新的专用模æ¿ï¼Œ +% è¯·ä¸¥æ ¼éµå®ˆ \LaTeX\ Project Public License å议。 +% 由于è¿çŠ¯åè®®è€Œå¼•èµ·çš„ä»»ä½•çº çº·äº‰ç«¯å‡ä¸Ž +% 本模æ¿ä½œè€…æ— å…³ã€‚ +% \end{enumerate} +% \end{abstract} +% +% \clearpage +% \pagestyle{fancy} +% \begin{multicols}{2}[ +% \setlength{\columnseprule}{.4pt} +% \setlength{\columnsep}{18pt}] +% \tableofcontents +% \end{multicols} +% \clearpage +% +% \section{模æ¿ä»‹ç»} +% \hitreport (\textbf{H}arbin \textbf{I}istitute of \textbf{T}echnology \LaTeX\ Versatile \textbf{Report} Template)是为哈尔滨工业大å¦ä¸€æ ¡ä¸‰åŒºçš„本科生设计的一个å…于é…置的作业ã€å®žéªŒæŠ¥å‘Šæ¨¡æ¿ã€‚希望它å¯ä»¥ä½¿ä½ 的作业或实验报告ä¸ä¼šå› å½¢å¼ä¸Šçš„缺陷导致评分的下é™ã€‚ +% +% è¯¥æ–‡æ¡£æ ¼å¼åŸºäºŽ ctexbook, 主è¦å®Œæˆäº†é™¤äº†ä¸»ä½“å†…å®¹ä»¥å¤–çš„å‡ ä¹Ž\textbf{全部}工作。åŒæ—¶ï¼Œé€šè¿‡ä½¿ç”¨ Github 版本å®åŒ…ï¼Œä½ è¿˜å¯ä»¥æ›´å¥½çš„管ç†è‡ªå·±çš„ \LaTeX 文档。 +% +% 本文档将尽é‡å®Œæ•´çš„介ç»æ¨¡æ¿çš„使用方法，如有ä¸æ¸…楚之处å¯ä»¥å‚è€ƒç¤ºä¾‹æ–‡æ¡£æˆ–è€…æ ¹æ®ç¬¬ 节说明æ问，有兴趣者都å¯ä»¥å‚与完善æ¤æ‰‹å†Œï¼Œä¹Ÿéžå¸¸æ¬¢è¿Žåœ¨Github上æ出Issues。 +% +% \section{安装} +% \label{sec:installation} +% \subsection{CTAN} +% 本å®åŒ…已被收纳于 CTAN ä¸ï¼Œå‡¡å®‰è£…完整版 Texlive 用户å¯ç›´æŽ¥ä½¿ç”¨ï¼š +% \begin{latex} +% \usepackage{hitreport} +% \end{latex} +% 进行写作，但是通常版本较旧，且ä¸ä¾¿æ›´æ–°ã€‚ +% +% \subsection{Github} +% 想获得最新版本的请å‰å¾€ Github 主页下载： +% \url{https://github.com/demerzelsun12/hitreport} +% +% åŒæ—¶ï¼Œé¢å‘ Github 版本的说明主è¦åœ¨ README.md ä¸ï¼Œ +% 如果使用的是 Github 版本，请阅读 README.md +% +% \subsection{Gitee} +% 为解决部分åŒå¦æ— 法æ£å¸¸è®¿é—® GitHub 或者下载速度过慢的情况， +% 本模æ¿åœ¨ Gitee 上也åšåŒæ¥æ›´æ–°ï¼ŒGitee下载地å€ä¸ºï¼š +% \url{https://gitee.com/demerzel/hitreport} +% +% 模æ¿æ”¯æŒåœ¨ TeX Liveã€MacTeX å’Œ MIKTeX å¹³å°ä¸‹è¿›è¡Œç¼–译， +% 使用最新版本å¯ä»¥é¿å… bug。 +% +% \subsection{模æ¿çš„组æˆ} +% 由于报告的çŸæ—¶æ€§çš„特点，也方便更多零基础的åŒå¦ä½¿ç”¨æœ¬æ¨¡æ¿ï¼Œ +% 本模æ¿è¿›æœ€å¤§å¯èƒ½ç®€åŒ–了éžå®žé™…报告文å—çš„é…置部分。下表列出了模æ¿çš„主è¦æ–‡ä»¶åŠå…¶åŠŸèƒ½ä»‹ç»ï¼š +% +% \begin{longtable}{l|p{8cm}} +% \toprule +% {\heiti 文件（夹）} & {\heiti 功能æè¿°}\\\midrule +% \endfirsthead +% \midrule +% {\heiti 文件（夹）} & {\heiti 功能æè¿°}\\\midrule +% \endhead +% \endfoot +% \endlastfoot +% hitreport.ins & \textsc{DocStrip} 驱动文件（开å‘用） \\ +% hitreport.dtx & \textsc{DocStrip} æºæ–‡ä»¶ï¼ˆå¼€å‘用）\\\midrule +% ref/ & 示例文档å‚考文献目录 \\ +% figures/ & 示例文档图片路径 \\ +% data/ & 实例文档å„ç« èŠ‚è·¯å¾„ \\ +% photo/ & 模æ¿å°é¢å¼•ç”¨å›¾ç‰‡è·¯å¾„ \\ +% code/ & 示例文档引用代ç 路径 \\\midrule +% report.tex & 示例文档基本é…ç½® \\ +% hitreport.cls & 模æ¿ç±»æ–‡ä»¶ \\ +% hitreport-example.tex & 示例文档主文件\\ +% hitreport-example.pdf & 示例文档 \\ +% hitsetup.tex & 示例文档基本é…ç½®\\\midrule +% Makefile & 自动è¿è¡Œè„šæœ¬ \\ +% latexmkrc & latexmk é…置文件 \\ +% README.md & 说明文件 \\ +% \textbf{hitreport.pdf} & 用户手册（本文档）\\ \bottomrule +% \end{longtable} +% +% å‡ ç‚¹è¯´æ˜Žï¼š +% \begin{itemize} +% \item \file{hitreport.cls} å¯ç”± \file{hitreport.ins} +% å’Œ \file{hitreport.dtx} 生æˆï¼Œä½†ä¸ºäº†é™ä½Žæ–°æ‰‹ç”¨æˆ·çš„使用难度，故 +% å°† \file{hitreport.cls} 文件一起å‘布。新手å¯ç›´æŽ¥ä¸‹è½½ Release 版 +% 本，Release 版本ä¸åŒ…å« \file{hitreport.ins} å’Œ +% \file{hitreport.dtx}。 +% \item 使用模æ¿æ–‡ä»¶æˆ–对模æ¿æ–‡ä»¶è¿›è¡Œä¿®æ”¹å‰è¯·é˜…读本文档： +% \file{hitreport.pdf}。 +% \end{itemize} +% +% +% \subsection{生æˆæ¨¡æ¿} +% \label{sec:generate-cls} +% 模æ¿çš„æºæ–‡ä»¶ï¼ˆ\file{hitreport.dtx}）ä¸åŒ…å«äº†å¤§é‡çš„注释，需è¦å°†æ³¨ +% 释去掉生æˆè½»é‡çº§çš„ \file{.cls} 文件供 \cs{documentclass} 调用。 +% 使用Makefile或 \XeLaTeX 生æˆæ¨¡æ¿æ–‡ä»¶ã€‚ +% \begin{shell} +% $ make cls +% \end{shell} +% 或 +% \begin{shell} +% $ xelatex hitreport.ins +% \end{shell} +% +% \note[注æ„：]{如果没有生æˆçš„æ¨¡æ¿ \file{hitreport.cls} 文件 +% （与 \file{hitreport-example.tex} 在åŒä¸€ç›®å½•ä¸‹ï¼‰ï¼Œ +% \LaTeX{} 在编译时å¯èƒ½æ‰¾åˆ°å‘行版ä¸è¾ƒæ—§ç‰ˆæœ¬çš„ \file{.cls}ï¼Œä»Žè€Œé€ æˆç¼–译冲çªã€‚} +% +% \subsection{生æˆæŠ¥å‘Š} +% \label{sec:gengrate-report} +% 本节介ç»å‡ ç§å¸¸è§çš„生æˆæŠ¥å‘Šçš„方法。用户å¯æ ¹æ®è‡ªå·±çš„情况选择。 +% +% 在撰写报告时，需è¦æ³¨æ„，代ç 引用å¯ä»¥ä½¿ç”¨ç›¸å¯¹è·¯å¾„，但是图片引用则必须 +% 放在 figures 文件夹下。如果需è¦å¯¹æ ¡å¾½ä»¥åŠæ ¡å图片å称进行修改， +% \file{hitreport.cls} 文件ä¸ç›¸åº”ä½ç½®ä¹Ÿéœ€è¦ä¿®æ”¹ã€‚ +% +% 在撰写报告时，\textbf{ä¸æŽ¨è}使用原有的 \file{hitreport-example.tex} 这一å称。 +% 建议将其å¤åˆ¶ä¸€ä»½ï¼Œæ”¹ä¸ºå…¶ä»–çš„åå—（如 \file{report.tex} 或者 \file{main.tex}）。 +% 需è¦æ³¨æ„，如果使用了æ¥è‡ª \file{data} 目录ä¸çš„ \file{tex} 文件， +% 则é‡å‘½å主文件åŽï¼Œå…¶é¡¶ç«¯çš„ \texttt{!TeX root} 选项也需è¦ç›¸åº”修改。 +% +% \subsubsection{GNU make} +% \label{sec:make} +% 如果用户å¯ä»¥ä½¿ç”¨ GNU make 工具，这是最方便的办法。 +% 所以 \hitreport æ供了 \file{Makefile}： +% \begin{shell} +% $ make report # 生æˆæŠ¥å‘Šç¤ºä¾‹ hitreport-example.pdf +% $ make doc # 生æˆè¯´æ˜Žæ–‡æ¡£ hitreport.pdf +% $ make clean # 清ç†ç¼–译生æˆçš„辅助文件 +% \end{shell} +% +% 需è¦æ³¨æ„，如果更改了主文件的å称，则需è¦ä¿®æ”¹ \file{Makefile} 顶端的 \texttt{REPORT} å˜é‡å®šä¹‰ã€‚ +% +% \subsubsection{latexmk} +% latexmk 命令支æŒå…¨è‡ªåŠ¨ç”Ÿæˆ\LaTeX{}编写的文档，并且支æŒä½¿ç”¨ä¸åŒçš„工具链æ¥è¿›è¡Œç”Ÿæˆï¼Œå®ƒä¼šè‡ªåŠ¨è¿è¡Œå¤šæ¬¡å·¥å…·ç›´åˆ°äº¤å‰å¼•ç”¨éƒ½è¢«è§£å†³ã€‚下é¢ç»™å‡ºäº†ä¸€ä¸ªç”¨ latexmk 调用 xelatex 生æˆæœ€ç»ˆæ–‡æ¡£çš„示例: +% \begin{shell} +% $ latexmk hitreport-example.tex # 生æˆç¤ºä¾‹æŠ¥å‘Š +% $ latexmk hitreport.dtx # 生æˆè¯´æ˜Žæ–‡æ¡£hitreport.pdf +% $ latexmk -c # 清ç†ç¼–译生æˆçš„辅助文件 +% \end{shell} +% \texttt{latexmk} 的编译过程是通过 \file{latexmkrc} 文件æ¥é…置的，如果è¦è¿›ä¸€æ¥äº†è§£ï¼Œ +% å¯ä»¥å‚考 \pkg{latexmk} 文档。 +% +% +% \subsubsection{\XeLaTeX} +% \label{sec:xelatex} +% å¦‚æžœç”¨æˆ·æ— æ³•ä½¿ç”¨ä»¥ä¸Šä¸¤ç§è¾ƒä¸ºæ–¹ä¾¿çš„编译方法，就åªèƒ½æŒ‰ç…§ä»¥ä¸‹å¤æ‚的办法手动编译。 +% +% 首先，更新模æ¿ï¼š +% \begin{shell} +% $ xetex hitreport.ins # ç”Ÿæˆ hitreport.cls +% \end{shell} +% +% 然åŽï¼Œç”Ÿæˆè®ºæ–‡ï¼š +% \begin{shell} +% $ xelatex hitreport-example.tex +% $ bibtex hitreport-example.aux # ç”Ÿæˆ bbl 文件 +% $ xelatex hitreport-example.tex # 解决引用 +% $ xelatex hitreport-example.tex # 生æˆæŠ¥å‘Š PDF +% +% \end{shell} +% +% 使用下é¢çš„命令用æ¥ç”Ÿæˆç”¨æˆ·æ‰‹å†Œï¼š +% \begin{shell} +% $ xelatex -shell-escape hitreport.dtx +% $ makeindex -s gind.ist -o hitreport.ind hitreport.idx +% $ xelatex -shell-escape hitreport.dtx +% $ xelatex -shell-escape hitreport.dtx # 生æˆè¯´æ˜Žæ–‡æ¡£ hitreport.pdf +% \end{shell} +% +% \subsection{å‡çº§} +% \label{sec:upgrade} +% 如果需è¦å‡çº§ \hitreport{}，应当从 GitHub 下载最新的版本， +% å°† \file{hitreport.dtx}，\file{hitreport.ins}，拷è´è‡³å·¥ä½œç›®å½•è¦†ç›–相应的文件，然åŽæŒ‰ç…§ +% 第~\ref{sec:generate-cls} 节的内容生æˆæ–°çš„模æ¿å’Œä½¿ç”¨è¯´æ˜Žã€‚ +% +% 有时模æ¿å¯èƒ½è¿›è¡Œäº†é‡è¦çš„修改，ä¸å…¼å®¹å·²å†™å¥½çš„æ£æ–‡å†…容，用户应按照示例 +% 文档é‡æ–°è°ƒæ•´ã€‚ +% +% +% \section{使用说明} +% \label{sec:usage} +% \subsection{示例文件} +% 推è从模æ¿è‡ªå¸¦çš„示例文档入手，其ä¸åŒ…括了写作用到的所有命令åŠå…¶ä½¿ç”¨æ–¹æ³•ï¼Œåªéœ€è¦ç”¨è‡ªå·±çš„内容进行相应替æ¢å°±å¯ä»¥ã€‚对于ä¸æ¸…楚的命令å¯ä»¥æŸ¥é˜…本手册。下é¢çš„例åæ述了模æ¿ä¸ç« 节的组织形å¼ï¼Œæ¥è‡ªäºŽç¤ºä¾‹æ–‡æ¡£ï¼Œå…·ä½“内容å¯ä»¥å‚考模æ¿é™„带的 \file{hitreport-example.tex}。 +% +% \subsection{选项} +% \label{sec:option} +% 报告的è¯è¨€æ˜¯ä¸æ–‡ï¼Œæš‚ä¸æ”¯æŒè‹±æ–‡ã€‚ +% \DescribeOption{open} +% æ£è§„å‡ºç‰ˆç‰©çš„ç« èŠ‚å‡ºçŽ°åœ¨å¥‡æ•°é¡µï¼Œä¹Ÿå°±æ˜¯å³æ‰‹è¾¹çš„页é¢ï¼Œè¿™å°±æ˜¯ \option{right}，。在这ç§æƒ…况下，如果å‰ä¸€ç« 的最åŽä¸€é¡µä¹Ÿæ˜¯å¥‡æ•°ï¼Œé‚£ä¹ˆæ¨¡æ¿ä¼šè‡ªåŠ¨ç”Ÿæˆä¸€ä¸ªçº¯ç²¹çš„空白页。 +% æ交的作业如果是电å稿的è¯ï¼Œå¯ä»¥ä½¿ç”¨è¿žç»é¡µï¼Œå³ä½¿ç”¨\option{any} +% \DescribeOption{wide} +% 是å¦ä½¿ç”¨å®½é¡µé¢ã€‚如果生æˆä½œä¸šçš„è¯ï¼Œå®½é¡µé¢æˆ–许好看。 +% \DescribeOption{draft} +% 是å¦ç”Ÿæˆæ°´å°ã€‚生æˆçš„æ°´å°ä¸º Draft 表示æ¤æ–‡æ¡£å°šä¸ºè‰ç¨¿ +% +% \subsection{å—体é…ç½®} +% \label{sec:font-config} +% 模æ¿é»˜è®¤å¯ä»¥è‡ªåŠ¨æ£€æµ‹æ“作系统，并é…置改平å°ä¸Šåˆé€‚çš„å—体， +% 具体的é…ç½®ç–略如表~\ref{tab:font}。 +% \begin{table}[htb] +% \centering +% \caption{hitreport 自动é…ç½®å—体ç–ç•¥} +% \label{tab:font} +% \begin{tabular}{ccc} +% \toprule +% Windows & macOS & 其他 \\ +% \midrule +% Times New Roman & Times New Roman & TeX Gyre Termes \\ +% Arial & Arial & TeX Gyre Heros \\ +% Courier & Menlo & TeX Gyre Cursor \\ +% ä¸æ˜“宋体 & åŽæ–‡å®‹ä½“ & Noto 宋体 \\ +% ä¸æ˜“黑体 & åŽæ–‡é»‘体 & Noto 黑体 \\ +% \bottomrule +% \end{tabular} +% \end{table} +% +% 然而自动é…置的å—体åªèƒ½ä¿è¯ç¼–译通过，但是还å˜åœ¨ä¸€äº›é—®é¢˜ï¼š +% \begin{enumerate} +% \item 在其他平å°ä¸Šé…置的 TeX Gyre 系列å—ä½“ï¼Œè™½ç„¶åœ¨é£Žæ ¼ä¸Šæ¯”è¾ƒæŽ¥è¿‘ Times å’Œ Arial， +% 但是毕竟跟部分课程è¦æ±‚çš„å—体ä¸å®Œå…¨ä¸€è‡´ï¼› +% \item åŽæ–‡å—库虽然ä¸è¿å一般的写作è¦æ±‚， +% 但是其å—形跟ä¸æ˜“å—库有所差别，å¯èƒ½è¢«æ‰¹æ”¹è€å¸ˆè®¤ä¸ºæ ¼å¼ä¸ç¬¦åˆè¦æ±‚。 +% \end{enumerate} +% +% 所以建议在æ交最终版å‰ä½¿ç”¨ Windows å¹³å°çš„å—体进行编译。 +% +% 用户也å¯ä»¥åœ¨è°ƒç”¨ hitreport 时手动指定使用的å—库，如： +% +% \begin{latex} +% \documentclass[fontset=windows]{hitreport} +% \end{latex} +% +% å…许的选项有 \option{windows}ã€\option{mac}，详 +% è§ \pkg{ctex}ã€\pkg{xeCJK}ã€\pkg{fontspec} ç‰å®åŒ…的使用说明。 +% +% +% \subsection{论文设置} +% 论文的设置å¯ä»¥é€šè¿‡ç»Ÿä¸€å‘½ä»¤ \cs{hitsetup} 设置 \emph{key=value} å½¢å¼å®Œæˆã€‚ +% +% \DescribeMacro{\hitsetup} +% \cs{hitsetup} ç”¨æ³•ä¸Žå¸¸è§ \emph{key=value} 命令相åŒï¼Œå¦‚下： +% \begin{latex} +% \hitsetup{ +% key1 = value1, +% key2 = {a value, with comma}, +% } +% % å¯ä»¥å¤šæ¬¡è°ƒç”¨ +% \hitsetup{ +% key3 = value3, +% key1 = value11, % 覆盖 value1 +% } +% \end{latex} +% +% \note[注æ„：]{\cs{hitsetup} 使用 \pkg{kvsetkeys} 机制，所以é…置项之间ä¸èƒ½æœ‰ç©ºè¡Œï¼Œå¦åˆ™ +% 会报错。} +% +% +% +% \subsection{å°é¢ä¿¡æ¯} +% +% \label{sec:titlepage} +% å°é¢ä¿¡æ¯å¯ä»¥é€šè¿‡ç»Ÿä¸€è®¾ç½®å‘½ä»¤ \cs{hitsetup} 设置 \emph{key=value} å½¢å¼å®Œæˆï¼› +% +% \subsubsection{æŠ¥å‘Šæ ¡åŒº} +% 选择ä¸åŒæ ¡åŒºçš„æ ¡å。备选为harbinã€shenzhenã€weihai。 +% \begin{latex} +% \hitsetup{ +% campus = {harbin}, +% } +% \end{latex} +% +% +% \subsubsection{æŠ¥å‘Šä¸»æ ‡é¢˜} +% ä¸æ–‡æ ‡é¢˜ã€‚å¯ä»¥åœ¨æ ‡é¢˜å†…部使用æ¢è¡Œ|\\|。 +% \begin{latex} +% \hitsetup{ +% title = {æŠ¥å‘Šä¸»æ ‡é¢˜}, +% } +% \end{latex} +% +% \subsubsection{æŠ¥å‘Šå‰¯æ ‡é¢˜} +% ä¸æ–‡æ ‡é¢˜ã€‚å¯ä»¥åœ¨æ ‡é¢˜å†…部使用æ¢è¡Œ|\\|。 +% \begin{latex} +% \hitsetup{ +% expand = {æŠ¥å‘Šå‰¯æ ‡é¢˜}, +% } +% \end{latex} +% +% \subsubsection{院系å称} +% 院系å称。 +% \begin{latex} +% \hitsetup{ +% department = {ç³»å全称}, +% } +% \end{latex} +% +% \subsubsection{专业å称} +% +% \begin{latex} +% \hitsetup{ +% discipline = {专业å称}, +% } +% \end{latex} +% +% \subsubsection{作者姓å} +% 作者姓å。 +% \begin{latex} +% \hitsetup{ +% author = {ä¸æ–‡å§“å}, +% } +% \end{latex} +% +% \subsubsection{å¦å·} +% å¦å·ã€‚ +% \begin{latex} +% \hitsetup{ +% student-id = {1180310840}, +% } +% \end{latex} +% +% \subsubsection{指导教师} +% 指导教师。 +% \begin{latex} +% \hitsetup{ +% supervisor = {指导教师}, +% } +% \end{latex} +% +% \subsubsection{实验地点} +% 直接ä¸æ–‡ä¹¦å†™å®žéªŒåœ°ç‚¹ã€‚ +% \begin{latex} +% \hitsetup{ +% lablocation = {æ ¼ç‰©207}, +% } +% \end{latex} +% +% \subsubsection{å¦æœŸ} +% 课程å¦æœŸï¼Œç›´æŽ¥ä¹¦å†™ä¸æ–‡å³å¯ã€‚ +% \begin{latex} +% \hitsetup{ +% term = {2021春å£å¦æœŸ}, +% } +% \end{latex} +% +% \subsubsection{æˆæ–‡æ—¥æœŸ} +% 默认为当å‰æ—¥æœŸï¼Œä¹Ÿå¯ä»¥è‡ªå·±æŒ‡å®šï¼Œè¦æ±‚使用 ISO æ ¼å¼ã€‚ +% \begin{latex} +% \hitsetup{ +% date = {2021-03-01}, +% } +% \end{latex} +% +% +% \myentry{生æˆå°é¢} +% \DescribeMacro{\maketitle} +% 生æˆå°é¢ã€‚ +% \begin{latex} +% % 直接生æˆå°é¢ +% \maketitle +% \end{latex} +% +% \subsection{æ£æ–‡éƒ¨åˆ†} +% \subsubsection{æ•°å¦ç¬¦å·} +% \label{sec:math} +% 报告的数å¦ç¬¦å·é»˜è®¤éµå¾ª GB/T 3102.11—1993《物ç†ç§‘å¦å’ŒæŠ€æœ¯ä¸ä½¿ç”¨çš„æ•°å¦ç¬¦å·ã€‹ã€‚ +% è¯¥æ ‡å‡†å‚照采纳 ISO 31-11:1992， +% 但是与 \TeX{} 默认的英美国家的符å·ä¹ 惯有许多差异，主è¦æœ‰ï¼š +% \newcommand\dif{\mathop{}\!\mathrm{d}} +% \begin{enumerate} +% \item 大写希腊å—æ¯é»˜è®¤ä¸ºæ–œä½“， +% 有é™å¢žé‡ç¬¦å· 固定使用æ£ä½“。 +% \item æ•°å¦å¸¸æ•°å’Œç‰¹æ®Šå‡½æ•°å用æ£ä½“。 +% \item 微分å·ä½¿ç”¨æ£ä½“。 +% \item å‘é‡ã€çŸ©é˜µå’Œå¼ é‡ç”¨ç²—斜体。 +% \item çœç•¥å·æŒ‰ç…§ä¸æ–‡çš„ä¹ æƒ¯å›ºå®šå±…ä¸ã€‚ +% \end{enumerate} +% +% \DescribeOption{math-style} +% 英文论文的数å¦ç¬¦å·é»˜è®¤ä½¿ç”¨ \TeX{} æ ·å¼ã€‚ +% 如果有必è¦ï¼Œä¹Ÿå¯ä»¥é€šè¿‡è®¾ç½® \option{math-style} 选择数å¦ç¬¦å·æ ·å¼ï¼Œ +% å¯é€‰ï¼š\option{GB}（ä¸æ–‡é»˜è®¤ï¼‰ï¼Œ\option{TeX}（英文默认），\option{ISO}。 +% \begin{latex} +% \hitsetup{ +% math-style = ISO, +% } +% \end{latex} +% +% 模æ¿ä½¿ç”¨ +% \href{http://mirrors.ctan.org/macros/latex/contrib/unicode-math/unicode-math.pdf}{\pkg{unicode-math}} +% é…置数å¦ç¬¦å·çš„å—体。 +% 全部数å¦ç¬¦å·çš„命令å‚考 +% \href{http://mirrors.ctan.org/macros/latex/contrib/unicode-math/unimath-symbols.pdf}{\pkg{unimath-symbols}}。 +% 注æ„，\pkg{unicode-math} å®åŒ…与 \pkg{amsfonts}ã€\pkg{amssymb}ã€\pkg{bm}〠+% \pkg{mathrsfs}ã€\pkg{upgreek} ç‰å®åŒ…\emph{ä¸}兼容。 +% 模æ¿ä½œäº†å¤„ç†ï¼Œç”¨æˆ·å¯ä»¥ç›´æŽ¥ä½¿ç”¨è¿™äº›å®åŒ…的命令，如 \cs{bm}ã€\cs{mathscr}〠+% \cs{uppi}。 +% +% +% \subsubsection{定ç†çŽ¯å¢ƒ} +% \label{sec:theorem} +% \hitreport 定义了常用的数å¦çŽ¯å¢ƒï¼š +% +% \begin{center} +% \begin{tabular}{*{7}{l}}\toprule +% axiom & theorem & definition & proposition & lemma & conjecture &\\ +% å…¬ç† & å®šç† & 定义 & 命题 & å¼•ç† & 猜想 &\\\midrule +% proof & corollary & example & assumption & remark & problem & solution\\ +% è¯æ˜Ž & 推论 & 例å & å‡è®¾ & 注释 & 问题 & 解\\\bottomrule +% \end{tabular} +% \end{center} +% +% 比如： +% \begin{latex} +% \begin{definition} +% é“åƒä¹˜ä¹‹å›½ï¼Œæ•¬äº‹è€Œä¿¡ï¼ŒèŠ‚用而爱人，使民以时。 +% \end{definition} +% \end{latex} +% 产生（自动编å·ï¼‰ï¼š +% \medskip +% +% \noindent\framebox[\linewidth][l]{{\heiti 定义~1.1~~~} % {é“åƒä¹˜ä¹‹å›½ï¼Œæ•¬äº‹è€Œä¿¡ï¼ŒèŠ‚用而爱人，使民以时。}} +% +% \smallskip +% 列举出æ¥çš„æ•°å¦çŽ¯å¢ƒæ¯•ç«Ÿæ˜¯æœ‰é™çš„，如果想用\emph{胡说}è¿™æ ·çš„æ•°å¦çŽ¯å¢ƒï¼Œé‚£ä¹ˆå¯ä»¥å®šä¹‰ï¼š +% \begin{latex} +% \newtheorem{nonsense}{胡说}[chapter] +% \end{latex} +% +% 然åŽè¿™æ ·ä½¿ç”¨ï¼š +% \begin{latex} +% \begin{nonsense} +% 契丹æ¦å£«è¦æ¥ä¸åŽŸå¤ºæ¦æž—秘笈。—— æ…•å®¹åš +% \end{nonsense} +% \end{latex} +% +% 产生（自动编å·ï¼‰ï¼š +% +% \medskip +% \noindent\framebox[\linewidth][l]{{\heiti 胡说~1.1~~~} % {契丹æ¦å£«è¦æ¥ä¸åŽŸå¤ºæ¦æž—秘笈。—— 慕容åš}} +% +% \subsection{其他部分} +% \subsubsection{å‚考文献} +% \label{sec:bibliography} +% +% å‚考文献通常å¯ä»¥ä½¿ç”¨ \hologo{BibTeX} 或 biblatex 生æˆã€‚ +% \hologo{BibTeX} 是 LaTeX 处ç†å‚è€ƒæ–‡çŒ®çš„ä¼ ç»Ÿçš„æ–¹å¼ï¼Œ +% 需è¦åœ¨ä½¿ç”¨ \cs{bibliographystyle}\marg{style} é€‰æ‹©æ ·å¼ +% 并用 \cs{bibliography} 设置 \file{.bib} 的路径。 +% 然åŽä½¿ç”¨ \texttt{bibtex} 对 \file{.aux} 文件进行编译得到 \file{.bbl} 文件。 +% å…¶ä¸çš„å‚考文献表内容会在åŽç»ç¼–译时替æ¢åˆ° \cs{bibliography} çš„ä½ç½®ã€‚ +% Biblatex 是较新的方å¼ï¼Œéœ€è¦åœ¨è½½å…¥å®åŒ…时通过 \option{style} é€‰æ‹©æ ·å¼ï¼Œ +% 在导言区使用 \cs{addbibresource} 声明数æ®åº“的路径， +% 并在输出å‚考文献表的ä½ç½®ä½¿ç”¨ \cs{printbibliography} 命令, +% 而且编译å‚考文献的命令需è¦æ¢ä¸º biber。 +% 这两ç§æ–¹å¼å„有优缺点，比如 BibTeX æ— æ³•å¯¹ä¸æ–‡æŒ‰ç…§æ‹¼éŸ³æŽ’åºï¼Œä¸€äº›æ ·å¼æ›´æ–°ä¸å¤ŸåŠæ—¶ï¼› +% Biblatex è¿è¡Œè¾ƒç¼“æ…¢ï¼Œæ— æ³•å¯¹å¤šä¸ªå‚考文献表使用ä¸åŒæ ·å¼ã€‚ +% 用户需è¦æ ¹æ®å®žé™…选择åˆé€‚çš„æ–¹å¼ã€‚ +% +% 由于报告基本ä¸åšå‚è€ƒæ–‡çŒ®çš„æ ¼å¼è¦æ±‚，æ¤å¤„的制作较为宽泛，采用 APA æ ¼å¼ï¼Œ +% APA çš„ BibTeX æ ·å¼ç”± \pkg{apacite} å®åŒ…æ供，需è¦åœ¨å¯¼è¨€åŒºè°ƒç”¨ï¼š +% \begin{latex} +% \usepackage[natbibapa]{apacite} +% \bibliographystyle{apacite} +% \end{latex} +% å…¶ä¸ \option{natbibapa} 会调用 \pkg{natbib} æ¥å¤„ç†å¼•ç”¨ï¼Œ +% 这也是å®åŒ…推è的用法。 +% 注æ„ç›®å‰çš„ \pkg{apacite} åªæ”¯æŒåˆ° APA 第 6 版。 +% 更推è使用已ç»æ›´æ–°åˆ° APA 第 7 版的 \pkg{biblatex-apa}： +% \begin{latex} +% \usepackage[style=apa]{biblatex} +% \addbibresource{refs-apa.bib} +% \end{latex} +% 注æ„，如果å‚考文献ä¸å¼•ç”¨äº†ä¸æ–‡æ–‡çŒ®çš„è¯ï¼Œè¿™ä¸¤ç§æ–¹æ³•éƒ½ä¸èƒ½æ£ç¡®è°ƒæ•´æ ¼å¼ï¼Œ +% 需è¦æ‰‹åŠ¨è¿›è¡Œä¿®æ”¹ \file{.bbl} 文件的内容， +% 这时 BibTeX 比 biblatex 更简å•äº›ã€‚ +% +% +% +% \subsubsection{附录} +% +% 附录由 \cs{appendix} 命令开å¯ï¼Œç„¶åŽåƒæ£æ–‡ä¸€æ ·ä¹¦å†™ã€‚部分实验报告è¦æ±‚附录 +% 引用代ç ，å¯ä»¥ä½¿ç”¨ç›¸å¯¹è·¯å¾„引用。 +% \begin{latex} +% \appendix +% \chapter{...} +% ... +% \end{latex} +% +% +% \section{致谢} +% 报告一般ä¸éœ€è¦æ·»åŠ è‡´è°¢çš„ç« èŠ‚ï¼Œæ•…æœ¬æ¨¡æ¿ä¸åšç›¸åº”的制作。 +% 感谢以下å®åŒ…的作者，本å®åŒ…从ä¸ä½¿ç”¨äº†éƒ¨åˆ†ä»£ç 和借鉴： +% \begin{itemize} +% \item 清åŽå¤§å¦\thuthesis \quad https://github.com/tuna/thuthesis +% \item å“ˆå°”æ»¨å·¥ä¸šå¤§å¦ \hithesis \quad https://github.com/dustincys/hithesis +% \end{itemize} +% +% \StopEventually{\PrintIndex} +% \clearpage +% +% \section{实现细节} +% \subsection{基本信æ¯} +% \begin{macrocode} +%<cls>\NeedsTeXFormat{LaTeX2e}[2017/04/15] +%<cls>\ProvidesClass{hitreport} +%<cls>[2020/12/31 v1.1 Standard LaTeX Template for hitreport] +% \end{macrocode} +% +% 报错 +% \begin{macrocode} +\newcommand\hit@error[1]{% + \ClassError{hitreport}{#1}{}% +} +\newcommand\hit@warning[1]{% + \ClassWarning{hitreport}{#1}% +} +\newcommand\hit@patch@error[1]{% + \hit@error{Failed to patch command \protect#1}% +} +\newcommand\hit@deprecate[2]{% + \def\hit@@tmp{#2}% + \hit@warning{% + The #1 is deprecated% + \ifx\hit@@tmp\@empty\else + . Use #2 instead% + \fi + }% +} +% \end{macrocode} +% +% 检查 \LaTeXe{} kernel 版本 +% \begin{macrocode} +\@ifl@t@r\fmtversion{2017/04/15}{}{ + \hit@error{% + TeX Live 2017 or later version is required to compile this document% + } +} +% \end{macrocode} +% +% 检查编译引擎，è¦æ±‚使用 \XeLaTeX。 +% \begin{macrocode} +\RequirePackage{ifxetex} +\RequireXeTeX +\ifxetex\else +\ClassError{hitreport}{You must use the `xelatex' driver\MessageBreak +Please choose `xelatex'}{Just choose `xelatex', no `pdflatex' or `latex' and so on.} +\fi +% \end{macrocode} +% +% \subsection{定义选项} +% \label{sec:defoption} +% åˆå§‹åŒ–ä¿¡æ¯ +% \begin{macrocode} +%<*cls> +\RequirePackage{kvdefinekeys} +\RequirePackage{kvsetkeys} +\RequirePackage{kvoptions} +\SetupKeyvalOptions{ + family=hit, + prefix=hit@, + setkeys=\kvsetkeys} +% \end{macrocode} +% +% \begin{macro}{\hitsetup} +% æ供一个 \cs{hitsetup} å‘½ä»¤æ”¯æŒ \emph{key-value} çš„æ–¹å¼æ¥è®¾ç½®ã€‚ +% \begin{macrocode} +\newcommand\hitsetup[1]{% + \kvsetkeys{hit}{#1}% +} +% \end{macrocode} +% \end{macro} +% +% åŒæ—¶ç”¨ \emph{key-value} çš„æ–¹å¼æ¥å®šä¹‰è¿™äº›æŽ¥å£ï¼š +% \begin{latex} +% \hit@define@key{ +% <key> = { +% name = <name>, +% choices = { +% <choice1>, +% <choice2>, +% }, +% default = <default>, +% }, +% } +% \end{latex} +% +% å…¶ä¸ |choices| 设置å…许使用的值，默认为第一个（或者 \meta{default}）； +% \meta{code} 是相应的内容被设置时执行的代ç 。 +% +% \begin{macrocode} +\newcommand\hit@define@key[1]{% + \kvsetkeys{hit@key}{#1}% +} +\kv@set@family@handler{hit@key}{% +% \end{macrocode} +% +% \cs{hitsetup} 会将 \meta{value} å˜åˆ° \cs{hit@\meta{key}}， +% 但是å®çš„åå—åŒ…å« â€œ-â€ è¿™æ ·çš„ç‰¹æ®Šå—符时ä¸æ–¹ä¾¿ç›´æŽ¥è°ƒç”¨ï¼Œæ¯”如 |key = math-style|， +% 这时å¯ä»¥ç”¨ |name| 设置 \meta{key} 的别称，比如 |key = math@style|， +% è¿™æ ·å°±å¯ä»¥é€šè¿‡ \cs{hit@math@style} æ¥å¼•ç”¨ã€‚ +% |default| 是定义该 \meta{key} 时默认的值，缺çœä¸ºç©ºã€‚ +% +% \begin{macrocode} + \@namedef{hit@#1@@name}{#1}% + \def\hit@@default{}% + \def\hit@@choices{}% + \kv@define@key{hit@value}{name}{% + \@namedef{hit@#1@@name}{##1}% + }% +% \end{macrocode} +% +% 由于在定义接å£æ—¶ï¼Œ\cs{hit@\meta{key}@@code} ä¸ä¸€å®šæœ‰å®šä¹‰ï¼Œ +% 而且在文档类/å®åŒ…ä¸è¿˜æœ‰å¯èƒ½å¯¹è¯¥ |key| çš„ |code| è¿›è¡Œæ·»åŠ ã€‚ +% 所以 \cs{hit@\meta{key}@@code} 会检查如果在定义文档类/å®åŒ…时则推迟执行，å¦åˆ™ç«‹å³æ‰§è¡Œã€‚ +% +% \begin{macrocode} + \@namedef{hit@#1@@check}{}% + \@namedef{hit@#1@@code}{}% +% \end{macrocode} +% +% ä¿å˜ä¸‹ |choices = {}| 定义的内容，在定义 \cs{hit@\meta{name}} åŽå†æ‰§è¡Œã€‚ +% +% \begin{macrocode} + \kv@define@key{hit@value}{choices}{% + \def\hit@@choices{##1}% + \@namedef{hit@#1@@reset}{}% +% \end{macrocode} +% +% \cs{hit@\meta{key}@check} 检查 |value| 是å¦æœ‰æ•ˆï¼Œ +% 并设置 \cs{ifhit@\meta{name}@\meta{value}}。 +% +% \begin{macrocode} + \@namedef{hit@#1@@check}{% + \@ifundefined{% + ifhit@\@nameuse{hit@#1@@name}@\@nameuse{hit@\@nameuse{hit@#1@@name}}% + }{% + \hit@error{Invalid value "#1 = \@nameuse{hit@\@nameuse{hit@#1@@name}}"}% + }% + \@nameuse{hit@#1@@reset}% + \@nameuse{hit@\@nameuse{hit@#1@@name}@\@nameuse{hit@\@nameuse{hit@#1@@name}}true}% + }% + }% + \kv@define@key{hit@value}{default}{% + \def\hit@@default{##1}% + }% + \kvsetkeys{hit@value}{#2}% + \@namedef{hit@\@nameuse{hit@#1@@name}}{}% +% \end{macrocode} +% +% 第一个 \meta{choice} 设为 \meta{default}， +% 并且对æ¯ä¸ª \meta{choice} 定义 \cs{ifhit@\meta{name}@\meta{choice}}。 +% +% \begin{macrocode} + \kv@set@family@handler{hit@choice}{% + \ifx\hit@@default\@empty + \def\hit@@default{##1}% + \fi + \expandafter\newif\csname ifhit@\@nameuse{hit@#1@@name}@##1\endcsname + \expandafter\g@addto@macro\csname hit@#1@@reset\endcsname{% + \@nameuse{hit@\@nameuse{hit@#1@@name}@##1false}% + }% + }% + \kvsetkeys@expandafter{hit@choice}{\hit@@choices}% +% \end{macrocode} +% +% å°† \meta{default} 赋值到 \cs{hit@\meta{name}}，如果éžç©ºåˆ™æ‰§è¡Œç›¸åº”的代ç 。 +% +% \begin{macrocode} + \expandafter\let\csname hit@\@nameuse{hit@#1@@name}\endcsname\hit@@default + \expandafter\ifx\csname hit@\@nameuse{hit@#1@@name}\endcsname\@empty\else + \@nameuse{hit@#1@@check}% + \fi +% \end{macrocode} +% +% 定义 \cs{hitsetup} 接å£ã€‚ +% +% \begin{macrocode} + \kv@define@key{hit}{#1}{% + \@namedef{hit@\@nameuse{hit@#1@@name}}{##1}% + \@nameuse{hit@#1@@check}% + \@nameuse{hit@#1@@code}% + }% +} +% \end{macrocode} +% +% 定义接å£å‘ |key| æ·»åŠ |code|： +% +% \begin{macrocode} +\newcommand\hit@option@hook[2]{% + \expandafter\g@addto@macro\csname hit@#1@@code\endcsname{#2}% +} +% \end{macrocode} +% æŠ¥å‘Šæ’°å†™çš„æ ¡åŒº +% \begin{macrocode} +\hit@define@key{ + campus = { + name = campus, + choices = { + harbin, + shenzhen, + weihai, + }, + }, +% \end{macrocode} +% +% å—体 +% \begin{macrocode} + fontset = { + choices = { + windows, + mac, + ubuntu, + fandol, + none, + }, + default = none, + }, + system = { + choices = { + mac, + unix, + windows, + auto, + }, + default = auto, + }, + font = { + choices = { + times, + termes, + xits, + libertinus, + lm, + auto, + none, + }, + default = auto, + }, + cjk-font = { + name = cjk@font, + choices = { + windows, + mac, + noto, + fandol, + auto, + none, + }, + default = auto, + }, + math-font = { + name = math@font, + choices = { + xits, + stix, + libertinus, + lm, + none, + }, + default = xits, + }, + math-style = { + name = math@style, + choices = { + GB, + ISO, + TeX, + }, + default = GB, + }, +} +% \end{macrocode} +% +% +% å®šä¹‰å…³é”®å— +% \begin{macrocode} +\newcommand\hit@tokens@keywords{} +\ProcessOptions\relax +% \end{macrocode} +% +% +% +% \subsection{装载å®åŒ…} +% \label{sec:loadpackage} +% +% 设置默认 \option{openany}。 +% \begin{macrocode} +\DeclareBoolOption[false]{openright} +\DeclareComplementaryOption{openany}{openright} +% \end{macrocode} +% +% \option{raggedbottom} 选项（默认打开） +% \begin{macrocode} +\DeclareBoolOption[true]{raggedbottom} +% \end{macrocode} +% å°†é€‰é¡¹ä¼ é€’ç»™ \pkg{ctexbook}。 +% \begin{macrocode} +\DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{ctexbook}} +% \end{macrocode} +% +% 解æžç”¨æˆ·ä¼ 递过æ¥çš„é€‰é¡¹ï¼Œå¹¶åŠ è½½ \pkg{ctexbook}。 +% \begin{macrocode} +\ProcessKeyvalOptions* +% \end{macrocode} +% +% 设置默认 \option{openany}。 +% \begin{macrocode} +\ifhit@openright + \PassOptionsToClass{openright}{book} +\else + \PassOptionsToClass{openany}{book} +\fi +% \end{macrocode} +% +% 使用 \pkg{ctexbook} å®åŒ…，优于调用 \pkg{ctex} å®åŒ… +% \begin{macrocode} +\PassOptionsToPackage{quiet}{fontspec} +\LoadClass[a4paper,UTF8,zihao=-4,scheme=plain,fontset=none]{ctexbook}[2017/04/01] +% \end{macrocode} +% +% 引用å®åŒ…和相关定义 +% \begin{macrocode} +\RequirePackage{etoolbox} +\RequirePackage{filehook} +\RequirePackage{xparse} +% \end{macrocode} +% +% 设置页é¢å¸ƒå±€ +% \begin{macrocode} +\RequirePackage{geometry} +\geometry{ + paper = a4paper, % 210 * 297mm + marginparwidth = 2cm, + marginparsep = 0.5cm, +} +\newcommand\hit@set@geometry{% + \geometry{ + margin = 3cm, + headheight = 0.5cm, + headsep = 0.3cm, + footskip = 0.8cm, + }% +} +\hit@set@geometry +% \end{macrocode} +% +% 利用 \pkg{fancyhdr} 设置页眉页脚。 +% \begin{macrocode} +\RequirePackage{fancyhdr} +% \end{macrocode} +% +% 设置目录 +% \begin{macrocode} +\RequirePackage{titletoc} +% \end{macrocode} +% +% 利用 \pkg{notoccite} é¿å…目录ä¸å¼•ç”¨ç¼–å·æ··ä¹±ã€‚ +% \begin{macrocode} +\RequirePackage{notoccite} +% \end{macrocode} +% +% +% æ•°å¦å®åŒ…，\AmSTeX\ å®åŒ…，用æ¥æŽ’å…¬å¼ã€‚ +% \begin{macrocode} +\RequirePackage{amsmath} +% \end{macrocode} +% +% 使用 \pkg{unicode-math} 处ç†æ•°å¦å—体。 +% \begin{macrocode} +\RequirePackage{unicode-math} +% \end{macrocode} +% +% 支æŒtikz画图 +% \begin{macrocode} +\RequirePackage{tikz} +% \end{macrocode} +% +% \pkg{pdfpages} å®åŒ…便于æ’å…¥ PDF 文档。 +% \begin{macrocode} +\RequirePackage{pdfpages} +\includepdfset{fitpaper=true} +% \end{macrocode} +% +% 设置颜色 +% \begin{macrocode} +\RequirePackage{xcolor} +% \end{macrocode} +% +% 支æŒæ’入图片 +% \begin{macrocode} +\RequirePackage{graphicx} +% \end{macrocode} +% +% 并排图形。\pkg{subfigure}ã€\pkg{subfig} å·²ç»ä¸å†æŽ¨è，用新的 \pkg{subcaption}。 +% æµ®åŠ¨å›¾å½¢å’Œè¡¨æ ¼æ ‡é¢˜æ ·å¼ã€‚\pkg{caption2} å·²ç»ä¸æŽ¨è使用，采用新的 \pkg{caption}。 +% \begin{macrocode} +\RequirePackage[labelformat=simple]{subcaption} +% \end{macrocode} +% +% 支æŒæ–‡ç« 内部引用 +% \begin{macrocode} +\RequirePackage{hyperref} +% \end{macrocode} +% +% 支æŒæ·»åŠ è¡¨æ ¼ +% \begin{macrocode} +\RequirePackage{array} +% \end{macrocode} +% +% 支æŒè¡¨æ ¼è·¨é¡µæ˜¾ç¤ºï¼Œbooktabs æ供了 \cs{toprule} ç‰å‘½ä»¤. +% \begin{macrocode} +\RequirePackage{longtable} +\RequirePackage{booktabs} +% \end{macrocode} +% +% multirow 支æŒåœ¨è¡¨æ ¼ä¸è·¨è¡Œ +% \begin{macrocode} +\RequirePackage{multirow} +% \end{macrocode} +% +% 支æŒè¡¨æ ¼è¿‡é•¿è·¨é¡µæ˜¾ç¤º +% \begin{macrocode} +\RequirePackage{threeparttable} +% \end{macrocode} +% +% 调整间隔, è®©è¡¨æ ¼æ›´å¥½çœ‹äº› +% \begin{macrocode} +\RequirePackage{bigstrut} +% \end{macrocode} +% +% åœ¨è·¨è¡Œè¡¨æ ¼ä¸è¾“入定界符 +% \begin{macrocode} +\RequirePackage{bigdelim} +% \end{macrocode} +% +% 设置代ç 环境 +% \begin{macrocode} +\RequirePackage{listings} +% \end{macrocode} +% +% 支æŒä»£ç æ ¹æ®è¯è¨€ç±»åž‹é«˜äº® +% \begin{macrocode} +\RequirePackage{xcolor} +% \end{macrocode} +% +% 支æŒurl引用 +% \begin{macrocode} +\RequirePackage{url} +% \end{macrocode} +% +% +% \subsubsection{\pkg{algorithm} å®åŒ…} +% +% 使 \env{algorithm} å’Œ \env{listing} 环境的å称éšè¯è¨€è®¾ç½®è€Œæ”¹å˜ï¼Œ +% 并使其在附录ä¸çš„ç¼–å·è§„则与图ã€è¡¨ç‰ä¸€è‡´ã€‚ +% +% \begin{macro}{\listofalgorithm} +% \begin{macro}{\listofalgorithm*} +% \begin{macrocode} +\PassOptionsToPackage{chapter}{algorithm} +\AtEndOfPackageFile*{algorithm}{ + \floatname{algorithm}{\thu@algorithm@name} + \renewcommand\listofalgorithms{% + \hit@listof{algorithm}% + } + \renewcommand\listalgorithmname{\hit@list@algorithm@name} + \def\ext@algorithm{loa} + \contentsuse{algorithm}{loa} + \titlecontents{algorithm} + [\z@]{} + {\contentspush{\fname@algorithm~\thecontentslabel\quad}}{} + {\hit@leaders\thecontentspage} +} +% \end{macrocode} +% \end{macro} +% \end{macro} +% +% +% \subsubsection{\pkg{algorithm2e} å®åŒ…} +% +% \begin{macrocode} +\PassOptionsToPackage{algochapter}{algorithm2e} +\AtEndOfPackageFile*{algorithm2e}{ + \renewcommand\algorithmcfname{\hit@algorithm@name} + \SetAlgoCaptionLayout{thu@caption@font} + \SetAlCapSty{relax} + \SetAlgoCaptionSeparator{\hspace*{1em}} + \SetAlFnt{\fontsize{11bp}{14.3bp}\selectfont} + \renewcommand\listofalgorithms{% + \hit@listof{algorithmcf}% + } + \renewcommand\listalgorithmcfname{\hit@list@algorithm@name} + \def\ext@algorithmcf{loa} + \contentsuse{algocf}{loa} + \titlecontents{algocf} + [\z@]{} + {\contentspush{\algorithmcfname~\thecontentslabel\quad}}{} + {\hit@leaders\thecontentspage} +} +% \end{macrocode} +% +% \subsubsection{\pkg{minted} å®åŒ…} +% +% \begin{macrocode} +\AtEndOfPackageFile*{minted}{ + \newcommand\hit@set@listing@language{% + \floatname{listing}{代ç }% + } + \hit@set@listing@language +} +% \end{macrocode} +% +% +% +% 如果用户在导言区未调用 \pkg{biblatex}，则自动调用 \pkg{natbib}。 +% \begin{macrocode} +\AtEndPreamble{ + \@ifpackageloaded{biblatex}{}{ + \@ifpackageloaded{apacite}{}{ + \RequirePackage{natbib} + } + } +} +\AtEndOfPackageFile*{natbib}{ + \@ifpackageloaded{apacite}{}{ + \RequirePackage{bibunits} + } +} +% \end{macrocode} +% +% 对冲çªçš„å®åŒ…报错。 +% \begin{macrocode} +\newcommand\hit@package@conflict[2]{ + \AtBeginOfPackageFile*{#2}{ + \hit@error{The "#2" package is incompatible with required "#1"} + } +} +\hit@package@conflict{unicode-math}{amscd} +\hit@package@conflict{unicode-math}{amsfonts} +\hit@package@conflict{unicode-math}{amssymb} +\hit@package@conflict{unicode-math}{bbm} +\hit@package@conflict{unicode-math}{bm} +\hit@package@conflict{unicode-math}{eucal} +\hit@package@conflict{unicode-math}{eufrak} +\hit@package@conflict{unicode-math}{mathrsfs} +% \end{macrocode} +% +% 支æŒæ–‡ä¸å¼•ç”¨ +% \begin{macrocode} +\RequirePackage{cite} +% \end{macrocode} +% +% æ’入代ç ，进行设置 +% \begin{macrocode} +\RequirePackage{listings} +\lstset{ + numbers=left, %设置行å·ä½ç½® + numberstyle=\tiny, %设置行å·å¤§å° + keywordstyle=\color{blue}, %设置关键å—颜色 + commentstyle=\color[cmyk]{1,0,1,0}, %设置注释颜色 + frame=single, %è®¾ç½®è¾¹æ¡†æ ¼å¼ + escapeinside=``, %逃逸å—符(1å·¦é¢çš„é”®)，用于显示ä¸æ–‡ + breaklines, %自动折行 + extendedchars=false, %解决代ç è·¨é¡µæ—¶ï¼Œç« èŠ‚æ ‡é¢˜ï¼Œé¡µçœ‰ç‰æ±‰å—ä¸æ˜¾ç¤ºçš„问题 + xleftmargin=2em, + xrightmargin=2em, + aboveskip=1em, %è®¾ç½®è¾¹è· + tabsize=4, %设置tabç©ºæ ¼æ•° + showspaces=false, %ä¸æ˜¾ç¤ºç©ºæ ¼ + belowskip=3mm, + showstringspaces=false,columns=flexible, + framerule=1pt, + rulecolor=\color{gray!35}, + backgroundcolor=\color{gray!5}, + basicstyle={\small\ttfamily}, + stringstyle=\color{mauve}, + breakatwhitespace=true +} +% \end{macrocode} +% +% é‡å®šä¹‰é¢œè‰² +% \begin{macrocode} +\definecolor{dkgreen}{rgb}{0,0.6,0} +\definecolor{gray}{rgb}{0.5,0.5,0.5} +\definecolor{mauve}{rgb}{0.58,0,0.82} +% \end{macrocode} +% 定义首行缩进 +% \begin{macrocode} +\RequirePackage{indentfirst} +% \end{macrocode} +% è®¾ç½®æµ®åŠ¨ä½“æ ‡é¢˜ +% \begin{macrocode} +\RequirePackage{caption} +% \end{macrocode} +% 设置列表环境 +% \begin{macrocode} +\RequirePackage[shortlabels]{enumitem} +\RequirePackage{environ} +% \end{macrocode} +% +% ç¦æ¢ \LaTeX{} 自动调整多余的页é¢åº•éƒ¨ç©ºç™½ï¼Œå¹¶ä¿æŒè„šæ³¨ä»ç„¶åœ¨åº•éƒ¨ã€‚ +% 脚注按页编å·ã€‚ +% \begin{macrocode} +\ifhit@raggedbottom + \RequirePackage[bottom,perpage,hang]{footmisc} + \raggedbottom +\else + \RequirePackage[perpage,hang]{footmisc} +\fi +% \end{macrocode} +% +% 利用 \pkg{xeCJKfntef} 实现汉å—的下划线和盒å内两段对é½ï¼Œå¹¶å¯ä»¥é¿å… +% \cs{makebox}\oarg{width}\oarg{s} å¯èƒ½äº§ç”Ÿçš„ underful boxes。 +% \begin{macrocode} +\RequirePackage{xeCJKfntef} +\RequirePackage{soul} +% \end{macrocode} +% +% 下划线 +% \begin{macrocode} +\RequirePackage{ulem} +% +% \end{macrocode} +% 尺寸计算 +% \begin{macrocode} +\RequirePackage{calc} +% \end{macrocode} +% 支æŒæ’入附录 +% \begin{macrocode} +\RequirePackage[titletoc,title]{appendix} +\AtBeginEnvironment{thebibliography}{% + \phantomsection + \addcontentsline{toc}{section}{\refname} + } +% \end{macrocode} +% +% 修改tabular 环境, è®¾ç½®è¡¨æ ¼ä¸çš„行间è·ä¸ºæ£æ–‡è¡Œé—´è·. +% \begin{macrocode} +\let\hitreport@oldtabular\tabular +\let\hitreport@endoldtabular\endtabular +\renewenvironment{tabular}% + {\bgroup% + \renewcommand{\arraystretch}{1.2}% + \hitreport@oldtabular}% + {\hitreport@endoldtabular\egroup} +% \end{macrocode} +% æ®µé¦–ç¼©è¿›ä¸¤ä¸ªæ±‰å— +% \begin{macrocode} +\setlength\parindent{2em} +% \end{macrocode} +% +% \subsection{ä¸»æ–‡æ¡£æ ¼å¼} +% \label{sec:mainbody} +% +% \subsubsection{Three matters} +% \begin{macro}{\cleardoublepage} +% 对于 \textsl{openright} 选项，必须ä¿è¯ç« 首页å³å¼€ï¼Œä¸”如果å‰ç« æœ«é¡µæ— å†…å®¹é¡» +% 清空其页眉页脚。 +% \begin{macrocode} +\def\cleardoublepage{% + \clearpage + \if@twoside + \ifodd\c@page + \fi + \fi +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\frontmatter} +% \begin{macro}{\mainmatter} +% \begin{macro}{\backmatter} +% 我们的å•é¢å’ŒåŒé¢æ¨¡å¼ä¸Žå¸¸è§„çš„ä¸å¤ªä¸€æ ·ã€‚ +% \begin{macrocode} +\renewcommand\frontmatter{% + \cleardoublepage + \@mainmatterfalse + \pagenumbering{Roman}% +} +\renewcommand\mainmatter{% + \cleardoublepage + \@mainmattertrue + \pagenumbering{arabic}% +} +\renewcommand\backmatter{% + \if@openright + \cleardoublepage + \else + \clearpage + \fi + \@mainmatterfalse +} +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% +% +% \subsubsection{å—体} +% \label{sec:font} +% 使用 \pkg{fontspec} é…ç½®å—体。 +% \begin{macrocode} +\ifhit@fontset@mac + \hitsetup{ + font = times, + cjk-font = mac, + } +\else + \ifhit@fontset@windows + \hitsetup{ + font = times, + cjk-font = windows, + } + \else + \ifhit@fontset@fandol + \hitsetup{ + font = termes, + cjk-font = fandol, + } + \else + \ifhit@fontset@ubuntu + \hitsetup{ + font = termes, + cjk-font = noto, + } + \fi + \fi + \fi +\fi +% \end{macrocode} +% +% 检测系统 +% \begin{macrocode} +\ifhit@system@auto + \IfFileExists{/System/Library/Fonts/Menlo.ttc}{ + \hitsetup{system = mac} + }{ + \IfFileExists{/dev/null}{ + \IfFileExists{null:}{ + \hitsetup{system = windows} + }{ + \hitsetup{system = unix} + } + }{ + \hitsetup{system = windows} + } + } +\fi +% \end{macrocode} +% +% XITS å—体于 2018-10-03 更改了å—体的文件å，所以需è¦åˆ¤æ–。 +% 原文件å为 \file{xits-regular.otf}ã€\file{xits-math.otf} ç‰ï¼Œ +% åŽæ”¹ä¸º \file{XITS-Regular.otf}ã€\file{XITSMath-Regular.otf} ç‰ã€‚ +% +% Libertinus å—体åŒæ ·ã€‚ +% \begin{macrocode} +\let\hit@font@family@xits\@empty +\newcommand\hit@set@xits@names{% + \ifx\hit@font@family@xits\@empty + \IfFontExistsTF{XITSMath-Regular.otf}{% + \gdef\hit@font@family@xits{XITS}% + \gdef\hit@font@style@xits@rm{Regular}% + \gdef\hit@font@style@xits@bf{Bold}% + \gdef\hit@font@style@xits@it{Italic}% + \gdef\hit@font@style@xits@bfit{BoldItalic}% + \gdef\hit@font@name@xits@math@rm{XITSMath-Regular}% + \gdef\hit@font@name@xits@math@bf{XITSMath-Bold}% + }{% + \gdef\hit@font@family@xits{xits}% + \gdef\hit@font@style@xits@rm{regular}% + \gdef\hit@font@style@xits@bf{bold}% + \gdef\hit@font@style@xits@it{italic}% + \gdef\hit@font@style@xits@bfit{bolditalic}% + \gdef\hit@font@name@xits@math@rm{xits-math}% + \gdef\hit@font@name@xits@math@bf{xits-mathbold}% + }% + \fi +} +\let\hit@font@family@libertinus\@empty +\newcommand\hit@set@libertinus@names{% + \ifx\hit@font@family@libertinus\@empty + \IfFontExistsTF{LibertinusSerif-Regular.otf}{% + \gdef\hit@font@family@libertinus@serif{LibertinusSerif}% + \gdef\hit@font@family@libertinus@sans{LibertinusSans}% + \gdef\hit@font@name@libertinus@math{LibertinusMath-Regular}% + \gdef\hit@font@style@libertinus@rm{Regular}% + \gdef\hit@font@style@libertinus@bf{Bold}% + \gdef\hit@font@style@libertinus@it{Italic}% + \gdef\hit@font@style@libertinus@bfit{BoldItalic}% + }{% + \gdef\hit@font@family@libertinus@serif{libertinusserif}% + \gdef\hit@font@family@libertinus@sans{libertinussans}% + \gdef\hit@font@name@libertinus@math{libertinusmath-regular}% + \gdef\hit@font@style@libertinus@rm{regular}% + \gdef\hit@font@style@libertinus@bf{bold}% + \gdef\hit@font@style@libertinus@it{italic}% + \gdef\hit@font@style@libertinus@bfit{bolditalic}% + }% + \fi +} +% \end{macrocode} +% +% 一般的报告è¦æ±‚西文å—体使用 Times New Roman å’Œ Arial， +% 但是在 Linux 下没有这两个å—体，所以使用它们的克隆版 TeX Gyre Termes å’Œ +% TeX Gyre Heros。 +% \begin{macrocode} +\ifhit@font@auto + \ifhit@system@unix + \hitsetup{font=termes} + \else + \hitsetup{font=times} + \fi +\fi +\newcommand\hit@load@font@times{% + \setmainfont{Times New Roman}% + \setsansfont{Arial}% + \ifhit@system@mac + \setmonofont{Menlo}[Scale = MatchLowercase]% + \else + \setmonofont{Courier New}[Scale = MatchLowercase]% + \fi +} +\newcommand\hit@load@font@termes{% + \setmainfont{texgyretermes}[ + Extension = .otf, + UprightFont = *-regular, + BoldFont = *-bold, + ItalicFont = *-italic, + BoldItalicFont = *-bolditalic, + ]% + \hit@load@texgyre@sans@mono +} +\newcommand\hit@load@texgyre@sans@mono{% + \setsansfont{texgyreheros}[ + Extension = .otf, + UprightFont = *-regular, + BoldFont = *-bold, + ItalicFont = *-italic, + BoldItalicFont = *-bolditalic, + ]% + \setmonofont{texgyrecursor}[ + Extension = .otf, + UprightFont = *-regular, + BoldFont = *-bold, + ItalicFont = *-italic, + BoldItalicFont = *-bolditalic, + Ligatures = CommonOff, + ]% +} +\newcommand\hit@load@font@xits{% + \hit@set@xits@names + \setmainfont{\hit@font@family@xits}[ + Extension = .otf, + UprightFont = *-\hit@font@style@xits@rm, + BoldFont = *-\hit@font@style@xits@bf, + ItalicFont = *-\hit@font@style@xits@it, + BoldItalicFont = *-\hit@font@style@xits@bfit, + ]% + \hit@load@texgyre@sans@mono +} +\newcommand\hit@load@font@libertinus{% + \hit@set@libertinus@names + \setmainfont{\hit@font@family@libertinus@serif}[ + Extension = .otf, + UprightFont = *-\hit@font@style@libertinus@rm, + BoldFont = *-\hit@font@style@libertinus@bf, + ItalicFont = *-\hit@font@style@libertinus@it, + BoldItalicFont = *-\hit@font@style@libertinus@bfit, + ]% + \setsansfont{\hit@font@family@libertinus@sans}[ + Extension = .otf, + UprightFont = *-\hit@font@style@libertinus@rm, + BoldFont = *-\hit@font@style@libertinus@bf, + ItalicFont = *-\hit@font@style@libertinus@it, + ]% + \setmonofont{lmmonolt10}[ + Extension = .otf, + UprightFont = *-regular, + BoldFont = *-bold, + ItalicFont = *-oblique, + BoldItalicFont = *-boldoblique, + ]% +} +\@namedef{hit@load@font@lm}{% + \setmainfont{lmroman10}[ + Extension = .otf, + UprightFont = *-regular, + BoldFont = *-bold, + ItalicFont = *-italic, + BoldItalicFont = *-bolditalic, + ]% + \setsansfont{lmsans10}[ + Extension = .otf, + UprightFont = *-regular, + BoldFont = *-bold, + ItalicFont = *-oblique, + BoldItalicFont = *-boldoblique, + ]% + \setmonofont{lmmonolt10}[ + Extension = .otf, + UprightFont = *-regular, + BoldFont = *-bold, + ItalicFont = *-oblique, + BoldItalicFont = *-boldoblique, + ]% +} +\newcommand\hit@load@font{% + \@nameuse{hit@load@font@\hit@font}% +} +\hit@load@font +\hit@option@hook{font}{\hit@load@font} +% \end{macrocode} +% +% 使用 \pkg{unicode-math} é…置数å¦ç¬¦å·æ ¼å¼ã€‚ +% \begin{macrocode} +\newcommand\hit@stix@stylistic@set{% + \ifhit@math@style@TeX\else + 8 + \fi +} +\newcommand\hit@set@math@style{% + \ifhit@math@style@TeX + \unimathsetup{ + math-style = TeX, + bold-style = TeX, + partial = italic, + }% + \else + \unimathsetup{ + math-style = ISO, + bold-style = ISO, + partial = upright, + }% + \fi + \ifhit@math@style@GB + \protected\def\le{\leqslant}% + \protected\def\ge{\geqslant}% + \DeclareRobustCommand\mathellipsis{\mathinner{\unicodecdots}}% + \else + \protected\def\le{\leq}% + \protected\def\ge{\geq}% + \DeclareRobustCommand\mathellipsis{\mathinner{\unicodeellipsis}}% + \fi +} +\hitsetup{math-style=GB}% +\hit@set@math@style +\hit@option@hook{math-style}{\hit@set@math@style} +% \end{macrocode} +% +% \begin{macrocode} +\newcommand\hit@load@math@font@xits{% + \hit@set@xits@names + \setmathfont{\hit@font@name@xits@math@rm}[ + Extension = .otf, + StylisticSet = \hit@stix@stylistic@set, + ]% + \setmathfont{\hit@font@name@xits@math@rm}[ + Extension = .otf, + StylisticSet = 1, + range = {cal,bfcal}, + ]% +} +\newcommand\hit@load@math@font@stix{% + \setmathfont{STIX2Math}[ + Extension = .otf, + StylisticSet = \hit@stix@stylistic@set, + ]% + \setmathfont{STIX2Math}[ + Extension = .otf, + StylisticSet = 1, + range = {cal,bfcal}, + ]% +} +\newcommand\hit@load@math@font@libertinus{% + \hit@set@libertinus@names + \setmathfont{\hit@font@name@libertinus@math .otf}% +} +\newcommand\hit@load@math@font@lm{% + \setmathfont{latinmodern-math.otf}% +} +\newcommand\hit@load@math@font{% + \@nameuse{hit@load@math@font@\hit@math@font} +} +\hit@load@math@font +\hit@option@hook{math-font}{\hit@load@math@font} +\hit@option@hook{math-style}{\hit@load@math@font} +% \end{macrocode} +% +% +% ä¸æ–‡å—体 +% \begin{macrocode} +\ifhit@cjk@font@auto + \ifhit@system@mac + \hitsetup{cjk-font = mac} + \else + \ifhit@system@windows + \hitsetup{cjk-font = windows} + \else + \IfFontExistsTF{Noto Serif CJK SC}{ + \hitsetup{cjk-font = noto} + }{ + \hitsetup{cjk-font = fandol} + } + \fi + \fi +\fi +\newcommand\hit@load@cjk@font@windows{% + \xeCJKsetup{EmboldenFactor=3}% + \setCJKmainfont{SimSun}[ + AutoFakeBold = true, + ItalicFont = KaiTi, + ]% + \setCJKsansfont{SimHei}[AutoFakeBold]% + \setCJKmonofont{FangSong}% + \setCJKfamilyfont{zhsong}{SimSun}[AutoFakeBold]% + \setCJKfamilyfont{zhhei}{SimHei}[AutoFakeBold]% + \setCJKfamilyfont{zhkai}{KaiTi}% + \setCJKfamilyfont{zhfs}{FangSong}% + \setCJKfamilyfont{hwxk}{STXingkai}% +} +\newcommand\hit@load@cjk@font@mac{% + \setCJKmainfont{Songti SC}[ + UprightFont = * Light, + BoldFont = * Bold, + ItalicFont = Kaiti SC, + BoldItalicFont = Kaiti SC Bold, + ]% + \setCJKsansfont{Heiti SC}[BoldFont=* Medium]% + \setCJKmonofont{STFangsong} + \setCJKfamilyfont{zhsong}{Songti SC}[ + UprightFont = * Light, + BoldFont = * Bold, + ]% + \setCJKfamilyfont{zhhei}{Heiti SC}[ + UprightFont = * Light, + BoldFont = * Medium, + ]% + \setCJKfamilyfont{zhfs}{STFangsong}% + \setCJKfamilyfont{hwxk}{STXingkai}% + \setCJKfamilyfont{zhkai}{Kaiti SC}[BoldFont = * Bold]% + \setCJKfamilyfont{zhli}{Baoli SC}% + \setCJKfamilyfont{zhyuan}{Yuanyi SC}[ + UprightFont = * Light, + BoldFont = * Bold, + ]% +} +% \end{macrocode} +% +% æ³¨æ„ Noto CJK çš„ regular å—é‡åå—ä¸å¸¦â€œRegularâ€ã€‚ +% \begin{macrocode} +\newcommand\hit@load@cjk@font@noto{% + \setCJKmainfont{Noto Serif CJK SC}[ + UprightFont = * Light, + BoldFont = * Bold, + ItalicFont = FandolKai-Regular, + ItalicFeatures = {Extension = .otf}, + ]% + \setCJKsansfont{Noto Sans CJK SC}[ + BoldFont = * Medium, + ]% + \setCJKmonofont{Noto Sans Mono CJK SC}% + \setCJKfamilyfont{zhsong}{Noto Serif CJK SC}[ + UprightFont = * Light, + UprightFont = * Bold, + ]% + \setCJKfamilyfont{zhhei}{Noto Sans CJK SC}[ + BoldFont = * Medium, + ]% + \setCJKfamilyfont{zhfs}{FandolFang}[ + Extension = .otf, + UprightFont = *-Regular, + ]% + \setCJKfamilyfont{zhkai}{FandolKai}[ + Extension = .otf, + UprightFont = *-Regular, + ]% + \setCJKfamilyfont{hwxk}{STXingkai}[ + Extension = .otf, + UprightFont = *-Regular, + ]% +} +\newcommand\hit@load@cjk@font@fandol{% + \setCJKmainfont{FandolSong}[ + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = FandolKai-Regular, + ]% + \setCJKsansfont{FandolHei}[ + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ]% + \setCJKmonofont{FandolFang}[ + Extension = .otf, + UprightFont = *-Regular, + ]% + \setCJKfamilyfont{zhsong}{FandolSong}[ + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ]% + \setCJKfamilyfont{zhhei}{FandolHei}[ + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ]% + \setCJKfamilyfont{zhfs}{FandolFang}[ + Extension = .otf, + UprightFont = *-Regular, + ]% + \setCJKfamilyfont{zhkai}{FandolKai}[ + Extension = .otf, + UprightFont = *-Regular, + ]% + \setCJKfamilyfont{hwxk}{FandolKai}[ + Extension = .otf, + UprightFont = *-Regular, + ]% +} +\ifhit@cjk@font@none\else + \providecommand\songti{\CJKfamily{zhsong}} + \providecommand\heiti{\CJKfamily{zhhei}} + \providecommand\fangsong{\CJKfamily{zhfs}} + \providecommand\kaishu{\CJKfamily{zhkai}} + \providecommand\huawenxingkai{\CJKfamily{hwxk}} +\fi +\newcommand\hit@load@cjk@font{% + \@nameuse{hit@load@cjk@font@\hit@cjk@font}% +} +\hit@load@cjk@font +\hit@option@hook{cjk-font}{\hit@load@cjk@font} +% \end{macrocode} +% +% \begin{macro}{\normalsize} +% æ£æ–‡å°å››å· (12bp) å—，行è·ä¸ºå›ºå®šå€¼ 20 bp。 +% 其他å—å·çš„è¡Œè·æŒ‰ç…§ç›¸åŒçš„比例设置。 +% +% 表达å¼è¡Œçš„è¡Œè·ä¸ºå•å€è¡Œè·ï¼Œæ®µå‰ç©º 6 磅，段åŽç©º 6 磅。 +% \begin{macrocode} +\renewcommand\normalsize{% + \@setfontsize\normalsize{12bp}{20bp}% + \abovedisplayskip 6bp% + \abovedisplayshortskip 6bp% + \belowdisplayskip 6bp + \belowdisplayshortskip \abovedisplayshortskip} + +\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi +\DeclareRobustCommand\small{% + \@setfontsize\small{10.5bp}{17.5bp}% + \abovedisplayskip 6bp% + \abovedisplayshortskip 6bp% + \belowdisplayshortskip 6bp% + \def\@listi{\leftmargin\leftmargini + \topsep \z@skip + \parsep \z@skip + \itemsep \z@skip}% + \belowdisplayskip \abovedisplayskip +} +\DeclareRobustCommand\footnotesize{% + \@setfontsize\footnotesize{9bp}{15bp}% + \abovedisplayskip 6bp% + \abovedisplayshortskip 6bp% + \belowdisplayshortskip 6bp% + \def\@listi{\leftmargin\leftmargini + \topsep \z@skip + \parsep \z@skip + \itemsep \z@skip}% + \belowdisplayskip \abovedisplayskip +} +\DeclareRobustCommand\scriptsize{\@setfontsize\scriptsize{7.5bp}{12.5bp}} +\DeclareRobustCommand\tiny{\@setfontsize\tiny{6.5bp}{10.83bp}} +\DeclareRobustCommand\large{\@setfontsize\large{15bp}{25bp}} +\DeclareRobustCommand\Large{\@setfontsize\Large{18bp}{30bp}} +\DeclareRobustCommand\LARGE{\@setfontsize\LARGE{22bp}{36.67bp}} +\DeclareRobustCommand\huge{\@setfontsize\huge{24bp}{40bp}} +\DeclareRobustCommand\Huge{\@setfontsize\Huge{26bp}{43.33bp}} +% \end{macrocode} +% \end{macro} +% +% WORD ä¸çš„å—å·å¯¹åº”该关系如下（1bp = 72.27/72 pt）: +% \begin{center} +% \begin{longtable}{llll} +% \toprule +% åˆå· & 42bp & 14.82mm & 42.1575pt \\ +% å°åˆ & 36bp & 12.70mm & 36.135 pt \\ +% ä¸€å· & 26bp & 9.17mm & 26.0975pt \\ +% å°ä¸€ & 24bp & 8.47mm & 24.09pt \\ +% äºŒå· & 22bp & 7.76mm & 22.0825pt \\ +% å°äºŒ & 18bp & 6.35mm & 18.0675pt \\ +% ä¸‰å· & 16bp & 5.64mm & 16.06pt \\ +% å°ä¸‰ & 15bp & 5.29mm & 15.05625pt \\ +% å››å· & 14bp & 4.94mm & 14.0525pt \\ +% å°å›› & 12bp & 4.23mm & 12.045pt \\ +% äº”å· & 10.5bp & 3.70mm & 10.59375pt \\ +% å°äº” & 9bp & 3.18mm & 9.03375pt \\ +% å…å· & 7.5bp & 2.56mm & \\ +% å°å… & 6.5bp & 2.29mm & \\ +% ä¸ƒå· & 5.5bp & 1.94mm & \\ +% å…«å· & 5bp & 1.76mm & \\\bottomrule +% \end{longtable} +% \end{center} +% +% \begin{macro}{\hit@def@fontsize} +% æ ¹æ®ä¹ 惯定义å—å·ã€‚用法： +% +% \cs{hit@def@fontsize}\marg{å—å·å称}\marg{磅数} +% +% é¿å…了å—å·é€‰æ‹©å’Œè¡Œè·çš„紧耦åˆã€‚所有å—å·å®šä¹‰æ—¶ä¸ºå•å€è¡Œè·ï¼Œå¹¶æ供选项指定行è·å€æ•°ã€‚ +% \begin{macrocode} +\def\hit@def@fontsize#1#2{% + \expandafter\newcommand\csname #1\endcsname[1][1.3]{% + \fontsize{#2}{##1\dimexpr #2}\selectfont}} +% \end{macrocode} +% \end{macro} +% +% +% \begin{macro}{\chuhao} +% \begin{macro}{\xiaochu} +% \begin{macro}{\yihao} +% \begin{macro}{\xiaoyi} +% \begin{macro}{\erhao} +% \begin{macro}{\xiaoer} +% \begin{macro}{\sanhao} +% \begin{macro}{\xiaosan} +% \begin{macro}{\sihao} +% \begin{macro}{\xiaosi} +% \begin{macro}{\wuhao} +% \begin{macro}{\xiaowu} +% \begin{macro}{\liuhao} +% \begin{macro}{\xiaoliu} +% \begin{macro}{\qihao} +% \begin{macro}{\bahao} +% 一组å—å·å®šä¹‰ã€‚ +% \begin{macrocode} +\hit@def@fontsize{chuhao}{42bp} +\hit@def@fontsize{xiaochu}{36bp} +\hit@def@fontsize{yihao}{26bp} +\hit@def@fontsize{xiaoyi}{24bp} +\hit@def@fontsize{erhao}{22bp} +\hit@def@fontsize{xiaoer}{18bp} +\hit@def@fontsize{sanhao}{16bp} +\hit@def@fontsize{xiaosan}{15bp} +\hit@def@fontsize{sihao}{14bp} +\hit@def@fontsize{xiaosi}{12bp} +\hit@def@fontsize{wuhao}{10.5bp} +\hit@def@fontsize{xiaowu}{9bp} +\hit@def@fontsize{liuhao}{7.5bp} +\hit@def@fontsize{xiaoliu}{6.5bp} +\hit@def@fontsize{qihao}{5.5bp} +\hit@def@fontsize{bahao}{5bp} +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% +% +% \subsubsection{æ–‡ç« æ ‡é¢˜è®¾ç½®} +% \label{sec:paragraphlanguage} +% +% 。 +% \begin{macrocode} +\newcommand\hit@set@chapter@names{% + \ctexset{ + chapter/name = {第,ç« }, + }% + \def\bibname{å‚考文献}% + \def\appendixname{附录}% + \def\indexname{索引}% + \def\contentsname{ç›®\quad 录}% + \def\listfigurename{æ’图索引}% + \def\listtablename{è¡¨æ ¼ç´¢å¼•}% + \def\hit@list@figure@table@name{æ’图和附表索引}% + \def\hit@list@algorithm@name{算法索引}% + \def\listequationname{å…¬å¼ç´¢å¼•}% +} +\hit@set@chapter@names +% \end{macrocode} +% +% \begin{macrocode} +\newcommand\hit@set@names{% + \ctexset{ + figurename = 图, + tablename = 表, + }% + \def\hit@algorithm@name{算法}% + \def\hit@equation@name{å…¬å¼}% + \def\hit@assumption@name{å‡è®¾}% + \def\hit@definition@name{定义}% + \def\hit@proposition@name{命题}% + \def\hit@lemma@name{引ç†}% + \def\hit@theorem@name{定ç†}% + \def\hit@axiom@name{å…¬ç†}% + \def\hit@corollary@name{推论}% + \def\hit@exercise@name{ç»ƒä¹ }% + \def\hit@example@name{例}% + \def\hit@remark@name{注释}% + \def\hit@problem@name{问题}% + \def\hit@conjecture@name{猜想}% + \def\hit@proof@name{è¯æ˜Ž}% + \def\hit@theorem@separator{：}% +} +\hit@set@names +% \end{macrocode} +% +% 带圈数å—和星å·ä½¿ç”¨ä¸æ–‡å—体。 +% \begin{macrocode} +\xeCJKDeclareCharClass{CJK}{"2460 -> "2473} +\xeCJKDeclareCharClass{CJK}{"2605} +% \end{macrocode} +% +% \newcommand\unicodechar[1]{U+#1（\symbol{"#1}）} +% 由于 Unicode çš„ä¸€äº›æ ‡ç‚¹ç¬¦å·æ˜¯ä¸è¥¿æ–‡æ··ç”¨çš„： +% \unicodechar{00B7}〠+% \unicodechar{2013}〠+% \unicodechar{2014}〠+% \unicodechar{2018}〠+% \unicodechar{2019}〠+% \unicodechar{201C}〠+% \unicodechar{201D}〠+% \unicodechar{2025}〠+% \unicodechar{2026}〠+% \unicodechar{2E3A}， +% 所以è¦æ ¹æ®è¯è¨€è®¾ç½®æ£ç¡®çš„å—体。 +% \footnote{\url{https://github.com/CTeX-org/ctex-kit/issues/389}} +% æ¤å¤–切æ¢è¯è¨€æ—¶ï¼Œæœ‰ä¸€éƒ¨åˆ†å称是需è¦è¢«é‡æ–°å®šä¹‰çš„。 +% \begin{macrocode} +\newcommand\hit@set@punctuations{% + \xeCJKDeclareCharClass{FullLeft}{"2018, "201C}% + \xeCJKDeclareCharClass{FullRight}{ + "00B7, "2019, "201D, "2013, "2014, "2025, "2026, "2E3A, + }% +} +\hit@set@punctuations +% \end{macrocode} +% +% \subsubsection{页眉页脚} +% \label{sec:headerfooter} +% +% \pkg{fancyhdr} 定义页眉页脚很方便，但是有一个éžå¸¸éšè”½çš„å‘。 +% 第一次调用 \pkg{fancyhdr} å®šä¹‰çš„æ ·å¼æ—¶ä¼šä¿®æ”¹ \cs{chaptermark}， +% 这会导致页眉信æ¯é”™è¯¯ï¼ˆå¤šä½™ç« å·å¹¶ä¸”英文大写）。 +% è¿™æ˜¯å› ä¸ºåœ¨ \cs{ps@fancy} ä¸å¯¹ \cs{chaptermark} 进行é‡å®šä¹‰ï¼Œ +% 所以我们先调用 \cs{ps@fancy}，å†ä¿®æ”¹ \cs{chaptermark}。 +% \begin{macrocode} +\pagestyle{fancy} +% \end{macrocode} +% +% 定义页眉和页脚。 +% 页眉宋体五å·å—，居ä¸ä¹¦å†™ï¼› +% 页ç äº”å· Times New Roman ，ä½äºŽé¡µé¢åº•ç«¯ï¼Œå±…ä¸ä¹¦å†™ã€‚ +% +% \begin{macrocode} +\fancypagestyle{plain}{% + \fancyhf{}% + \renewcommand\footrulewidth{0pt}% + \renewcommand\headrulewidth{0.75bp}% + \fancyhead[C]{% + \wuhao + \leftmark + }% + \fancyfoot[C]{\wuhao\thepage}% + \let\@mkboth\markboth + \def\chaptermark##1{% + \markboth{\CTEXifname{\CTEXthechapter\quad}{}##1}{}% + }% + \let\sectionmark\@gobble +} +\pagestyle{plain} +% \end{macrocode} +% +% \cs{chapter} 会调用特殊的 page style。 +% \begin{macrocode} +\ctexset{chapter/pagestyle = plain} +% \end{macrocode} +% +% +% \subsubsection{段è½} +% \label{sec:paragraph} +% +% 全文首行缩进 2 å—ç¬¦ï¼Œæ ‡ç‚¹ç¬¦å·ç”¨å…¨è§’ +% \begin{macrocode} +\ctexset{% + punct=quanjiao, + space=auto, +} +\newcommand\hit@set@indent{% + \ctexset{autoindent=2}% +} +\hit@set@indent +% \end{macrocode} +% +% 设置 url æ ·å¼ï¼Œä¸Žä¸Šä¸‹æ–‡ä¸€è‡´ +% \begin{macrocode} +\urlstyle{same} +% \end{macrocode} +% +% 使用 \pkg{xurl} çš„æ–¹æ³•ï¼Œå¢žåŠ URL å¯æ–行的ä½ç½®ã€‚ +% \begin{macrocode} +\g@addto@macro\UrlBreaks{% + \do0\do1\do2\do3\do4\do5\do6\do7\do8\do9% + \do\A\do\B\do\C\do\D\do\E\do\F\do\G\do\H\do\I\do\J\do\K\do\L\do\M + \do\N\do\O\do\P\do\Q\do\R\do\S\do\T\do\U\do\V\do\W\do\X\do\Y\do\Z + \do\a\do\b\do\c\do\d\do\e\do\f\do\g\do\h\do\i\do\j\do\k\do\l\do\m + \do\n\do\o\do\p\do\q\do\r\do\s\do\t\do\u\do\v\do\w\do\x\do\y\do\z +} +\Urlmuskip=0mu plus 0.1mu +% \end{macrocode} +% +% å–消列表的间è·ï¼Œä»¥ç¬¦åˆä¸æ–‡ä¹ 惯。 +% \begin{macrocode} +\partopsep=\z@skip +\def\@listi{\leftmargin\leftmargini + \parsep \z@skip + \topsep \z@skip + \itemsep\z@skip} +\let\@listI\@listi +\@listi +\def\@listii {\leftmargin\leftmarginii + \labelwidth\leftmarginii + \advance\labelwidth-\labelsep + \topsep \z@skip + \parsep \z@skip + \itemsep \z@skip} +\def\@listiii{\leftmargin\leftmarginiii + \labelwidth\leftmarginiii + \advance\labelwidth-\labelsep + \topsep \z@skip + \parsep \z@skip + \partopsep \z@skip + \itemsep \z@skip} +% \end{macrocode} +% +% 使用 \pkg{enumitem} 命令调整默认列表环境间的è·ç¦»ï¼Œ +% \begin{macrocode} +\setlist{nosep} +% \end{macrocode} +% +% +% \subsubsection{脚注} +% \label{sec:footnote} +% 脚注内容采用å°äº”å·å—，ä¸æ–‡ç”¨å®‹ä½“，英文和数å—用 Times New Roman 体按两端对é½æ ¼å¼ä¹¦å†™ï¼Œ +% å•å€è¡Œè·ï¼Œæ®µå‰æ®µåŽå‡ç©º 0 磅。 +% 脚注的åºå·æŒ‰é¡µç¼–排，ä¸åŒé¡µçš„脚注åºå·ä¸éœ€è¦è¿žç»ã€‚ +% +% 脚注处åºå·â€œ1，……，10â€çš„å—体是“æ£æ–‡â€ï¼Œä¸æ˜¯â€œä¸Šæ ‡â€ï¼Œåºå·ä¸Žè„šæ³¨å†…容文å—之间空åŠä¸ªæ±‰å—符， +% 脚注的段è½æ ¼å¼ä¸ºï¼šå•å€è¡Œè·ï¼Œæ®µå‰ç©º 0 磅，段åŽç©º 0 磅，悬挂缩进 1.5 å—符； +% å—å·ä¸ºå°äº”å·å—，汉å—用宋体，外文用 Times New Roman 体。 +% +% 脚注åºå·ä½¿ç”¨å¸¦åœˆæ•°å—。 +% \begin{macro}{\hit@circled} +% 生æˆå¸¦åœˆçš„脚注数å—，最多处ç†åˆ° 10。 +% \begin{macrocode} +\newcommand\hit@circled[1]{% + \ifnum#1 >10\relax + \hit@error{% + Too many footnotes in this page. + Keep footnote less than 10% + }% + \fi + {\symbol{\the\numexpr#1+"245F\relax}}% +} +\renewcommand{\thefootnote}{\hit@circled{\c@footnote}} +\renewcommand{\thempfootnote}{\hit@circled{\c@mpfootnote}} +% \end{macrocode} +% \end{macro} +% +% 定义脚注分割线，å—å·ï¼ˆå®‹ä½“å°äº”），以åŠæ‚¬æŒ‚缩进（1.5å—符）。 +% \begin{macrocode} +\def\footnoterule{\vskip-3\p@\hrule\@width0.3\textwidth\@height0.4\p@\vskip2.6\p@} +\footnotemargin=13.5bp +% \end{macrocode} +% +% 修改 \pkg{footmisc} å®šä¹‰çš„è„šæ³¨æ ¼å¼ã€‚ +% \begin{macrocode} +\long\def\@makefntext#1{% + \begingroup + % åºå·å–æ¶ˆä¸Šæ ‡ + \def\@makefnmark{\hbox{\normalfont\@thefnmark}}% + \xiaowu + \ifFN@hangfoot + \bgroup + \setbox\@tempboxa\hbox{% + \ifdim\footnotemargin>\z@ + \hb@xt@\footnotemargin{\@makefnmark\hss}% + \else + \@makefnmark + \fi + }% + \leftmargin\wd\@tempboxa + \rightmargin\z@ + \linewidth \columnwidth + \advance \linewidth -\leftmargin + \parshape \@ne \leftmargin \linewidth + % \footnotesize + \xiaowu + \@setpar{{\@@par}}% + \leavevmode + \llap{\box\@tempboxa}% + \parskip\hangfootparskip\relax + \parindent\hangfootparindent\relax + \else + \parindent1em% + \noindent + \ifdim\footnotemargin>\z@ + \hb@xt@ \footnotemargin{\hss\@makefnmark}% + \else + \ifdim\footnotemargin=\z@ + \llap{\@makefnmark}% + \else + \llap{\hb@xt@ -\footnotemargin{\@makefnmark\hss}}% + \fi + \fi + \fi + \footnotelayout#1% + \ifFN@hangfoot + \par\egroup + \fi + \endgroup +} +% \end{macrocode} +% +% +% \subsubsection{摘è¦} +% \label{sec:abstractformat} +% 摘è¦ä¸¤ä¸ªå—设置为 3 å·. +% 定义摘è¦çŽ¯å¢ƒ +% +% \begin{macro}{\hit@clist@use} +% ä¸åŒè®ºæ–‡æ ¼å¼å…³é”®è¯ä¹‹é—´çš„分割ä¸å¤ªç›¸åŒï¼Œæˆ‘们用 \option{keywords} +% æ¥æ”¶é›†å…³é”®è¯åˆ—表，然åŽç”¨æœ¬å‘½ä»¤æ¥ç”Ÿæˆç¬¦åˆè¦æ±‚çš„æ ¼å¼ï¼Œ +% 类似于 \LaTeX3 çš„ \cs{clist\_use:Nn}。 +% \begin{macrocode} +\hit@define@key{ + keywords, +} +\newcommand\hit@clist@use[2]{% + \def\hit@@tmp{}% + \def\hit@clist@processor##1{% + \ifx\hit@@tmp\@empty + \def\hit@@tmp{#2}% + \else + #2% + \fi + ##1% + }% + \expandafter\comma@parse\expandafter{#1}{\hit@clist@processor}% +} +% \end{macrocode} +% \end{macro} +% +% \begin{environment}{abstract} +% ä¸æ–‡æ‘˜è¦éƒ¨åˆ†çš„æ ‡é¢˜ä¸ºâ€œ\textbf{摘è¦}â€ï¼Œç”¨é»‘体三å·å—。 +% 摘è¦å†…容用å°å››å·å—书写，两端对é½ï¼Œæ±‰å—用宋体，外文å—用 Times New Roman 体， +% æ ‡ç‚¹ç¬¦å·ä¸€å¾‹ç”¨ä¸æ–‡è¾“入状æ€ä¸‹çš„æ ‡ç‚¹ç¬¦å·ã€‚ +% \begin{macrocode} +\newenvironment{abstract}{% + \cleardoublepage + \begingroup + \hit@chapter*{\hit@abstract@name}% + \endgroup +}{% +% \end{macrocode} +% +% æ¯ä¸ªå…³é”®è¯ä¹‹é—´ç©ºä¸¤ä¸ªæ±‰å—符宽度， 且为悬挂缩进。 +% \begin{macrocode} + \par + \null\par + \textbf{关键è¯ï¼š}% + \hit@clist@use{\hit@keywords}{ï¼›}% + \cleardoublepage +} +% \end{macrocode} +% \end{environment} +% +% +% \subsection{æ•°å¦çŽ¯å¢ƒã€å®šç†è®¾ç½®} +% \label{sec:mathenv} +% +% \begin{macro}{\bm} +% \begin{macro}{\boldsymbol} +% 兼容旧的粗体命令：\pkg{bm} çš„ \cs{bm} å’Œ \pkg{amsmath} çš„ \cs{boldsymbol}。 +% \begin{macrocode} +\DeclareRobustCommand\bm[1]{{\symbf{#1}}} +\DeclareRobustCommand\boldsymbol[1]{{\symbf{#1}}} +% \end{macrocode} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\square} +% 兼容 \pkg{amssymb} ä¸çš„命令。 +% \begin{macrocode} +\newcommand\square{\mdlgwhtsquare} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\checkmark} +% å…许在文本模å¼ä¸ä½¿ç”¨ \cs{checkmark}。 +% \begin{macrocode} +\AtBeginDocument{% + \renewcommand\checkmark{\ensuremath{✓}}% +} +% \end{macrocode} +% \end{macro} +% +% å…许太长的公å¼æ–è¡Œã€åˆ†é¡µç‰ã€‚ +% \begin{macrocode} +\allowdisplaybreaks[4] +% \end{macrocode} +% +% \subsubsection{浮动对象：æ’å›¾å’Œè¡¨æ ¼} +% \label{sec:float} +% +% 图表浮动体的默认ä½ç½®è®¾ä¸º |h|。 +% \begin{macrocode} +\def\fps@figure{h} +\def\fps@table{h} +% \end{macrocode} +% +% 设置浮动对象和文å—之间的è·ç¦» +% \begin{macrocode} +\setlength{\floatsep}{6bp} +\setlength{\textfloatsep}{6bp} +\setlength{\intextsep}{6bp} +\setlength{\@fptop}{0bp \@plus1.0fil} +\setlength{\@fpsep}{12bp \@plus2.0fil} +\setlength{\@fpbot}{0bp \@plus1.0fil} +% \end{macrocode} +% +% 下é¢è¿™ç»„命令使浮动对象的缺çœå€¼ç¨å¾®å®½æ¾ä¸€ç‚¹ï¼Œä»Žè€Œé˜²æ¢å¹…度对象å æ®è¿‡å¤šçš„文本页é¢ï¼Œ +% 也å¯ä»¥é˜²æ¢åœ¨å¾ˆå¤§ç©ºç™½çš„浮动页上放置很å°çš„图形。 +% \begin{macrocode} +\renewcommand{\textfraction}{0.15} +\renewcommand{\topfraction}{0.85} +\renewcommand{\bottomfraction}{0.65} +\renewcommand{\floatpagefraction}{0.60} +% \end{macrocode} +% +% å…许用户设置图表编å·çš„连接符。 +% \begin{macrocode} +\hit@define@key{ + figure-number-separator = { + name = figure@number@separator, + default = {.}, + }, + table-number-separator = { + name = table@number@separator, + default = {.}, + }, + equation-number-separator = { + name = equation@number@separator, + default = {.}, + }, + number-separator = { + name = number@separator, + default = {.}, + }, +} +\renewcommand\thefigure{% + \ifnum\c@chapter>\z@ + \thechapter + \hit@figure@number@separator + \fi + \@arabic\c@figure +} +\renewcommand\thetable{% + \ifnum\c@chapter>\z@ + \thechapter + \hit@table@number@separator + \fi + \@arabic\c@table +} +\renewcommand\theequation{% + \ifnum\c@chapter>\z@ + \thechapter + \hit@equation@number@separator + \fi + \@arabic\c@equation +} +\newcommand\hit@set@number@separator{% + \let\hit@figure@number@separator\hit@number@separator + \let\hit@table@number@separator\hit@number@separator + \let\hit@equation@number@separator\hit@number@separator +} +\hit@option@hook{number-separator}{\hit@set@number@separator} +% \end{macrocode} +% +% +% 对 \pkg{longtable} è·¨é¡µè¡¨æ ¼è¿›è¡Œç›¸åŒçš„设置。 +% \begin{macrocode} +\AtEndOfPackageFile*{longtable}{ + \AtBeginEnvironment{longtable}{% + \fontsize{11bp}{20.3bp}\selectfont + } +} +% \end{macrocode} +% +% å®šåˆ¶æµ®åŠ¨å›¾å½¢å’Œè¡¨æ ¼æ ‡é¢˜æ ·å¼ï¼Œä»¥åŠæ”¹å˜é™„录ä¸æµ®åŠ¨ä½“çš„ç¼–å·è§„则： +% \begin{itemize} +% \item å›¾è¡¨æ ‡é¢˜å—体为 11pt +% \item 去掉图表å·åŽé¢çš„冒å·ï¼Œå›¾åºä¸Žå›¾åæ–‡å—之间空一个汉å—符宽度 +% \item 图：caption 在下，段å‰ç©º 6 磅，段åŽç©º 12 磅 +% \item 表：caption 在上，段å‰ç©º 12 磅，段åŽç©º 6 磅 +% \end{itemize} +% \begin{macrocode} +\DeclareCaptionFont{hit}{% + \fontsize{11bp}{15bp}\selectfont +} +\captionsetup{ + font = hit, + labelsep = quad, + aboveskip = 6bp, + belowskip = 6bp, + figureposition = bottom, + tableposition = top, +} +\captionsetup[sub]{font=hit} +\renewcommand{\thesubfigure}{(\alph{subfigure})} +\renewcommand{\thesubtable}{(\alph{subtable})} +% \renewcommand{\p@subfigure}{:} +% \end{macrocode} +% +% ç ”ç©¶ç”Ÿå’Œæœ¬ç§‘ç”Ÿéƒ½æŽ¨è使用三线表，并且è¦æ±‚表的上ã€ä¸‹è¾¹çº¿ä¸ºå•ç›´çº¿ï¼Œçº¿ç²—为 1.5 磅； +% 第三æ¡çº¿ä¸ºå•ç›´çº¿ï¼Œçº¿ç²—为 1 磅。 +% 这里设置 \pkg{booktabs} 线粗的默认值。 +% \begin{macrocode} +\heavyrulewidth=1.5bp +\lightrulewidth=1bp +% \end{macrocode} +% +% \begin{macrocode} +\AtEndOfPackageFile*{threeparttable}{ + \g@addto@macro\TPT@defaults{\wuhao} +} +% \end{macrocode} +% +% \subsubsection{ç« èŠ‚æ ‡é¢˜} +% \label{sec:theor} +% \begin{macrocode} +\newcommand{\hit@abstract@name}{摘 \quad è¦} +\newcommand{\hit@abstract@name@en}{Abstract} +% \end{macrocode} +% +% å„çº§æ ‡é¢˜æ ¼å¼è®¾ç½®ã€‚ +% \begin{macrocode} +\ctexset{% + chapter = { + nameformat = {}, + numberformat = {}, + titleformat = {}, + fixskip = true, + afterindent = true, + lofskip = 0pt, + lotskip = 0pt, + }, + section = { + afterindent = true, + }, + subsection = { + afterindent = true, + }, + subsubsection = { + afterindent = true, + }, + paragraph/afterindent = true, + subparagraph/afterindent = true, +} +% \end{macrocode} +% +% 本模æ¿è®¾ç½®ï¼š +% \begin{itemize} +% \item å„ç« æ ‡é¢˜ï¼Œä¾‹å¦‚ï¼šâ€œ\textsf{第 1 ç« å¼•è¨€}â€ã€‚ +% +% ç« åºå·ä¸Žç« å之间空一个汉å—符。 +% 采用黑体三å·å—，居ä¸ä¹¦å†™ï¼Œå•å€è¡Œè·ï¼Œ +% 段å‰ç©º 24 磅，段åŽç©º 18 磅。 +% +% \item ä¸€çº§èŠ‚æ ‡é¢˜ï¼Œä¾‹å¦‚ï¼šâ€œ\textsf{2.1 实验装置与实验方法}â€ã€‚ +% +% èŠ‚æ ‡é¢˜åºå·ä¸Žæ ‡é¢˜å之间空一个汉å—符（下åŒï¼‰ã€‚ +% 采用黑体四å·ï¼ˆ14pt）å—居左书写，行è·ä¸ºå›ºå®šå€¼ 20 磅， +% 段å‰ç©º 24 磅，段åŽç©º 6 磅。 +% +% \item äºŒçº§èŠ‚æ ‡é¢˜ï¼Œä¾‹å¦‚ï¼šâ€œ\textsf{2.1.1 实验装置}â€ã€‚ +% +% 采用黑体 13pt å—居左书写，行è·ä¸ºå›ºå®šå€¼ 20 磅， +% 段å‰ç©º 12 磅，段åŽç©º 6 磅。 +% +% \item ä¸‰çº§èŠ‚æ ‡é¢˜ï¼Œä¾‹å¦‚ï¼šâ€œ\textsf{2.1.2.1 归纳法}â€ã€‚ +% +% 采用黑体å°å››å·ï¼ˆ12pt）å—居左书写，行è·ä¸ºå›ºå®šå€¼ 20 磅， +% 段å‰ç©º 12 磅，段åŽç©º 6 磅。 +% \end{itemize} +% +% è¿™é‡Œä¸‰çº§èŠ‚æ ‡é¢˜çš„â€œä¸æ–‡é»‘体å°å››å·â€å– 13pt。 +% \begin{macrocode} +\newcommand\hit@set@section@format{% + \ctexset{% + chapter = { + format = \centering\sffamily\sanhao, + nameformat = {}, + titleformat = {}, + beforeskip = 27bp, + afterskip = 27bp, + aftername = \quad, + }, + section = { + format = \sffamily\fontsize{14bp}{20bp}\selectfont, + beforeskip = 24bp, + afterskip = 6bp, + aftername = \quad, + }, + subsection = { + format = \sffamily\fontsize{13bp}{20bp}\selectfont, + beforeskip = 12bp, + afterskip = 6bp, + aftername = \quad, + }, + subsubsection = { + format = \sffamily\fontsize{12bp}{20bp}\selectfont, + beforeskip = 12bp, + afterskip = 6bp, + aftername = \quad, + }, + }% + \ctexset{chapter/number = \thechapter}% +} +\hit@set@section@format +% \end{macrocode} +% +% \begin{macro}{\hit@chapter*} +% 模æ¿å®šä¹‰æ‰€æœ‰çš„ç« éƒ½å‡ºçŽ°åœ¨ç›®å½•é‡Œï¼Œæ¯”å¦‚æ‘˜è¦ã€Abstractã€ä¸»è¦ç¬¦å·è¡¨ç‰ã€‚ +% +% \begin{macrocode} +\newcommand\hit@pdfbookmark[2]{} +\newcommand\hit@phantomsection{} +\NewDocumentCommand\hit@chapter{s o m o}{% + \IfBooleanF{#1}{% + \hit@error{You have to use the star form: \string\hit@chapter*}% + }% + \if@openright\cleardoublepage\else\clearpage\fi% + \IfValueTF{#2}{% + \ifthenelse{\equal{#2}{}}{% + \hit@pdfbookmark{0}{#3}% + }{% + \hit@phantomsection + \addcontentsline{toc}{chapter}{#2}% + }% + }{% + \hit@phantomsection + \addcontentsline{toc}{chapter}{#3}% + }% + \ctexset{chapter/beforeskip=40bp} + \chapter*{#3}% + \ctexset{chapter/beforeskip=30bp} + \IfValueTF{#4}{% + \ifthenelse{\equal{#4}{}}{% + \@mkboth{}{}% + }{% + \@mkboth{#4}{#4}% + }% + }{% + \@mkboth{#3}{#3}% + }% +} +% \end{macrocode} +% \end{macro} +% +% +% \subsubsection{目录} +% \label{sec:toc} +% 最多 4 层，å³: x.x.x.x，对应的命令和层åºå·åˆ†åˆ«æ˜¯ï¼š +% \cs{chapter}(0), \cs{section}(1), \cs{subsection}(2), \cs{subsubsection}(3)。 +% \begin{macrocode} +\setcounter{secnumdepth}{3} +\setcounter{tocdepth}{2} +% \end{macrocode} +% +% \begin{macro}{\tableofcontents} +% 目录生æˆå‘½ä»¤ã€‚ +% \begin{macrocode} +\renewcommand\tableofcontents{% + \hit@chapter*[]{\contentsname}% + \@starttoc{toc}% +} +\hit@define@key{ + toc-chapter-style = { + name = toc@chapter@style, + choices = { + arial, + times, + }, + default = arial, + }, +} +\newcommand\hit@leaders{\titlerule*[4bp]{.}} +\newcommand\hit@set@toc@format{% + \contentsmargin{\z@}% +% \end{macrocode} +% +% 目录从第 1 ç« å¼€å§‹ï¼Œæ¯ç« æ ‡é¢˜ç”¨é»‘ä½“å°å››å·å—，行间è·ä¸º 20pt， +% è¡Œå‰ç©º 6pt，行åŽç©º 0pt。 +% å…¶å®ƒçº§èŠ‚æ ‡é¢˜ç”¨å®‹ä½“å°å››å—，行间è·ä¸º 20pt。 +% +% 注æ„示例ä¸ç« æ ‡é¢˜çš„å—æ¯å’Œæ•°å—是衬线体，所以这里用 \cs{heiti}。 +% 示例ä¸çš„ä¸€çº§å’ŒäºŒçº§èŠ‚æ ‡é¢˜åˆ†åˆ«ç¼©è¿› 1 å’Œ 1.5 个汉å—符。 +% \begin{macrocode} +\titlecontents{chapter} + [\z@]{\addvspace{6bp}\sffamily} + {\contentspush{\thecontentslabel\quad}}{} + {\rmfamily\hit@leaders\thecontentspage}% +\titlecontents{section} + [1em]{} + {\contentspush{\thecontentslabel\quad}}{} + {\hit@leaders\thecontentspage}% +\titlecontents{subsection} + [2em]{} + {\contentspush{\thecontentslabel\quad}}{} + {\hit@leaders\thecontentspage}% +} +% \end{macrocode} +% +% \begin{macrocode} +\hit@set@toc@format +% \end{macrocode} +% \end{macro} +% +% +% +% \subsection{å‚考文献环境设置} +% \label{sec:bib} +% +% é‡å®šä¹‰å‚考文献环境 +% \begin{macrocode} +\renewenvironment{thebibliography}[1] + {\section*{\refname}% + \@mkboth{\MakeUppercase\refname}{\MakeUppercase\refname}% + \list{\@biblabel{\@arabic\c@enumiv}}% + {\settowidth\labelwidth{\@biblabel{#1}}% + \leftmargin\labelwidth + \advance\leftmargin\labelsep + \@openbib@code + \usecounter{enumiv}% + \let\p@enumiv\@empty + \renewcommand\theenumiv{\@arabic\c@enumiv}}% + \sloppy + \clubpenalty4000 + \@clubpenalty \clubpenalty + \widowpenalty4000% + \sfcode`\.\@m} + {\def\@noitemerr + {\@latex@warning{Empty `thebibliography' environment}}% + \endlist} +% \end{macrocode} +% +% +% \subsection{其他环境设置} +% \label{sec:config} +% +% \subsubsection{\pkg{amsthm} å®åŒ…} +% +% 定ç†æ ‡é¢˜ä½¿ç”¨é»‘体，æ£æ–‡ä½¿ç”¨å®‹ä½“，冒å·éš”开。 +% \begin{macrocode} +\AtEndOfPackageFile*{amsthm}{% + \newtheoremstyle{hit} + {\z@}{\z@} + {\normalfont}{\z@} + {\normalfont\sffamily}{\hit@theorem@separator} + {0.5em}{} + \theoremstyle{hit} + \newtheorem{assumption}{\hit@assumption@name}[chapter]% + \newtheorem{definition}{\hit@definition@name}[chapter]% + \newtheorem{proposition}{\hit@proposition@name}[chapter]% + \newtheorem{lemma}{\hit@lemma@name}[chapter]% + \newtheorem{theorem}{\hit@theorem@name}[chapter]% + \newtheorem{axiom}{\hit@axiom@name}[chapter]% + \newtheorem{corollary}{\hit@corollary@name}[chapter]% + \newtheorem{exercise}{\hit@exercise@name}[chapter]% + \newtheorem{example}{\hit@example@name}[chapter]% + \newtheorem{remark}{\hit@remark@name}[chapter]% + \newtheorem{problem}{\hit@problem@name}[chapter]% + \newtheorem{conjecture}{\hit@conjecture@name}[chapter]% + \renewenvironment{proof}[1][\hit@proof@name]{\par + \pushQED{\qed}% + % \normalfont \topsep6\p@\@plus6\p@\relax + \normalfont \topsep\z@\relax + \trivlist + \item[\hskip\labelsep + % \itshape + % #1\@addpunct{.}]\ignorespaces + \sffamily + #1\@addpunct{\hit@theorem@separator}]\ignorespaces + }{% + \popQED\endtrivlist\@endpefalse + } + \renewcommand\qedsymbol{\ensuremath{\QED}} +} +% \end{macrocode} +% +% \subsubsection{\pkg{ntheorem} å®åŒ…} +% +% 定ç†æ ‡é¢˜ä½¿ç”¨é»‘体，æ£æ–‡ä½¿ç”¨å®‹ä½“，冒å·éš”开。 +% \begin{macrocode} +\AtEndOfPackageFile*{ntheorem}{% + \theorembodyfont{\normalfont}% + \theoremheaderfont{\normalfont\sffamily}% + \theoremsymbol{\ensuremath{\QED}}% + \newtheorem*{proof}{\hit@proof@name}% + \theoremstyle{plain}% + \theoremsymbol{}% + \theoremseparator{\hit@theorem@separator}% + \newtheorem{assumption}{\hit@assumption@name}[chapter]% + \newtheorem{definition}{\hit@definition@name}[chapter]% + \newtheorem{proposition}{\hit@proposition@name}[chapter]% + \newtheorem{lemma}{\hit@lemma@name}[chapter]% + \newtheorem{theorem}{\hit@theorem@name}[chapter]% + \newtheorem{axiom}{\hit@axiom@name}[chapter]% + \newtheorem{corollary}{\hit@corollary@name}[chapter]% + \newtheorem{exercise}{\hit@exercise@name}[chapter]% + \newtheorem{example}{\hit@example@name}[chapter]% + \newtheorem{remark}{\hit@remark@name}[chapter]% + \newtheorem{problem}{\hit@problem@name}[chapter]% + \newtheorem{conjecture}{\hit@conjecture@name}[chapter]% +} +% \end{macrocode} +% +% \subsubsection{\pkg{algorithm} å®åŒ…} +% +% 使 \env{algorithm} å’Œ \env{listing} 环境的å称éšè¯è¨€è®¾ç½®è€Œæ”¹å˜ï¼Œ +% 并使其在附录ä¸çš„ç¼–å·è§„则与图ã€è¡¨ç‰ä¸€è‡´ã€‚ +% +% \begin{macro}{\listofalgorithm} +% \begin{macro}{\listofalgorithm*} +% \begin{macrocode} +\PassOptionsToPackage{chapter}{algorithm} +\AtEndOfPackageFile*{algorithm}{ + \floatname{algorithm}{\hit@algorithm@name} + \renewcommand\listofalgorithms{% + \hit@listof{algorithm}% + } + \renewcommand\listalgorithmname{\hit@list@algorithm@name} + \def\ext@algorithm{loa} + \contentsuse{algorithm}{loa} + \titlecontents{algorithm} + [\z@]{} + {\contentspush{\fname@algorithm~\thecontentslabel\quad}}{} + {\hit@leaders\thecontentspage} +} +% \end{macrocode} +% \end{macro} +% \end{macro} +% +% \subsubsection{\pkg{algorithm2e} å®åŒ…} +% +% \begin{macrocode} +\PassOptionsToPackage{algochapter}{algorithm2e} +\AtEndOfPackageFile*{algorithm2e}{ + \renewcommand\algorithmcfname{\hit@algorithm@name} + \SetAlgoCaptionLayout{hit@caption@font} + \SetAlCapSty{relax} + \SetAlgoCaptionSeparator{\hspace*{1em}} + \SetAlFnt{\fontsize{11bp}{14.3bp}\selectfont} + \renewcommand\listofalgorithms{% + \hit@listof{algorithmcf}% + } + \renewcommand\listalgorithmcfname{\hit@list@algorithm@name} + \def\ext@algorithmcf{loa} + \contentsuse{algocf}{loa} + \titlecontents{algocf} + [\z@]{} + {\contentspush{\algorithmcfname~\thecontentslabel\quad}}{} + {\hit@leaders\thecontentspage} +} +% \end{macrocode} +% +% \subsubsection{\pkg{minted} å®åŒ…} +% +% \begin{macrocode} +\AtEndOfPackageFile*{minted}{ + \newcommand\hit@set@listing@language{% + \floatname{listing}{代ç }% + } + \hit@set@listing@language +} +% \end{macrocode} +% +% +% \subsubsection{\pkg{hyperref} å®åŒ…} +% +% \begin{macrocode} +\AtEndOfPackageFile*{hyperref}{ + \hypersetup{ + linktoc = all, + bookmarksnumbered = true, + bookmarksopen = true, + bookmarksopenlevel = 1, + unicode = true, + psdextra = true, + breaklinks = true, + plainpages = false, + pdfdisplaydoctitle = true, + hidelinks, + }% +% \end{macrocode} +% +% \pkg{hyperref} 与 \pkg{unicode-math} å˜åœ¨ä¸€äº›å…¼å®¹æ€§é—®é¢˜ï¼Œè§ +% \href{https://github.com/ustctug/ustcthesis/issues/223}{% +% ustctug/ustcthesis\#223}， +% \href{https://github.com/ho-tex/hyperref/pull/90}{ho-tex/hyperref\#90} å’Œ +% \href{https://github.com/ustctug/ustcthesis/issues/235}{% +% ustctug/ustcthesis/\#235}。 +% \begin{macrocode} + \@ifpackagelater{hyperref}{2019/04/27}{}{% + \g@addto@macro\psdmapshortnames{\let\mu\textmu} + }% + \hypersetup{ + pdflang = zh-CN, + }% + \AtBeginDocument{% + \hypersetup{ + pdftitle = \hit@title, + pdfauthor = \hit@author, + }% + \hypersetup{ + pdfcreator={hitreport-v1.0}} + }% +} +% \end{macrocode} +% +% +% 浮动环境设置 +% 默认情况下, \LaTeX{} è¦æ±‚æ¯é¡µçš„æ–‡å—至少å æ® 20\%,å¦åˆ™è¯¥é¡µå°±åªå•ç‹¬æ”¾ç½®ä¸€ä¸ªæµ®åŠ¨çŽ¯å¢ƒ, +% 而这通常ä¸æ˜¯æˆ‘们想è¦çš„, 我们将这个è¦æ±‚é™ä½Žåˆ° 5\%. +% \begin{macrocode} +\renewcommand*{\textfraction}{0.05} +% \end{macrocode} +% 有时如果多个浮动环境连ç»æ”¾åœ¨ä¸€èµ·, \LaTeX{}ä¼šå°†å®ƒä»¬åˆ†åœ¨å‡ ä¸ªä¸åŒé¡µï¼Œå³ä½¿å®ƒä»¬å¯åœ¨åŒä¸€é¡µæ”¾ +% 得下. 我们å¯ä»¥é€šè¿‡ä¿®æ”¹ |\topfraction| å’Œ |\bottomfraction| 分别设置顶端和底端的浮动环境的最大比例. +% \begin{macrocode} +\renewcommand*{\topfraction}{0.9} +\renewcommand*{\bottomfraction}{0.8} +% \end{macrocode} +% 有时\LaTeX{}会把一个浮动环境å•ç‹¬æ”¾åœ¨ä¸€é¡µ, +% 我们è¦æ±‚这个环境至少è¦å æ® 85% æ‰èƒ½å•ç‹¬æ”¾åœ¨ä¸€é¡µ. +% 注æ„: |\floatpagefraction| 的数值必须å°äºŽ |\topfraction|. +% \begin{macrocode} +\renewcommand*{\floatpagefraction}{0.85} +% \end{macrocode} +% 关于图片 graphicx +% 如果图片没有指定åŽç¼€, ä¾æ¬¡æŒ‰ä¸‹åˆ—顺åºæœç´¢ +% \begin{macrocode} +\DeclareGraphicsExtensions{.pdf,.eps,.jpg,.png} +% \end{macrocode} +% 设置图表æœç´¢è·¯å¾„, å¯ä»¥ç»™å›¾è¡¨æ–‡ä»¶å¤¹å–如下åå— +% \begin{macrocode} +\graphicspath{{figures/}{figure/}{pictures/}{picture/}{pic/}{pics/}{image/}{images/}} +% \end{macrocode} +% å›¾è¡¨æ ‡é¢˜ +% \begin{macrocode} +\DeclareCaptionFont{song}{\songti} +\DeclareCaptionFont{minusfour}{\zihao{-4}} +\captionsetup[figure]{ + format=hang, %æ ‡é¢˜ä»Žç¬¬äºŒè¡Œå¼€å§‹éƒ½æœ‰ç¼©è¿›, 应该和 justification=raggedright çš„æ•ˆæžœä¸€æ ·. + labelsep=quad, %åˆ†éš”ç¬¦æ˜¯ä¸€ä¸ªç©ºæ ¼ + font={song,minusfour,bf}, %图的å—体, 宋体å°å›› + position=bottom %position=bottom, ä¸ä»£è¡¨æ ‡é¢˜æ”¾åœ¨ä¸‹é¢, æ ‡é¢˜ä»æ”¾åœ¨ä½ 放\captionçš„ä½ç½®. +} +\captionsetup[table]{% + format=hang, % æ ‡é¢˜ä»Žç¬¬äºŒè¡Œå¼€å§‹éƒ½æœ‰ç¼©è¿›, 应该和 justification=raggedright çš„æ•ˆæžœä¸€æ ·. + labelsep=quad, % åˆ†éš”ç¬¦æ˜¯ä¸€ä¸ªç©ºæ ¼ + font={song,minusfour,bf}, % 表的å—体, 宋体å°å›› + position=top % position=bottom, ä¸ä»£è¡¨æ ‡é¢˜æ”¾åœ¨ä¸‹é¢, æ ‡é¢˜ä»æ”¾åœ¨ä½ 放\captionçš„ä½ç½®. +} +% \end{macrocode} +% +% 列表环境设置 +% \begin{macrocode} +\setlist{% + topsep=0.3em, % 列表顶端的垂直空白 + partopsep=0pt, % 列表环境å‰é¢ç´§æŽ¥ç€ä¸€ä¸ªç©ºç™½è¡Œæ—¶å…¶é¡¶ç«¯çš„é¢å¤–垂直空白 + itemsep=0ex plus 0.1ex, % 列表项之间的é¢å¤–垂直空白 + parsep=0pt, % 列表项内的段è½ä¹‹é—´çš„垂直空白 + leftmargin=1.5em, % 环境的左边界和列表之间的水平è·ç¦» + rightmargin=0em, % 环境的å³è¾¹ç•Œå’Œåˆ—表之间的水平è·ç¦» + labelsep=0.5em, % 包å«æ ‡ç¾çš„ç›’å与列表项的第一行文本之间的间隔 + labelwidth=2em % 包å«æ ‡ç¾çš„ç›’åçš„æ£å¸¸å®½åº¦ï¼›è‹¥å®žé™…宽度更宽，则使用实际宽度。 +} +% \end{macrocode} +% +% \subsection{å°é¢ä¿¡æ¯} +% \label{sec:cover} +% +% +% 报告题目。 +% \begin{macrocode} +\hit@define@key{ + title = { + default = {æ ‡é¢˜}, + }, +% \end{macrocode} +% +% 报告å°æ ‡é¢˜ +% \begin{macrocode} + expand = { + default = {å°æ ‡é¢˜}, + }, +% \end{macrocode} +% +% 姓åã€å¦å·ã€æŒ‡å¯¼è€å¸ˆã€‚ +% \begin{macrocode} + author = { + default = {姓å}, + }, + student-id = { + name = student@id, + }, + supervisor = { + default = {导师姓å}, + }, +% \end{macrocode} +% +% 院系å称。 +% \begin{macrocode} + department = { + default = {计算å¦éƒ¨}, + }, +% \end{macrocode} +% +% 专业å称。 +% \begin{macrocode} + discipline = { + default = {计算机科å¦ä¸ŽæŠ€æœ¯}, + }, +% \end{macrocode} +% +% ç级åºå· +% \begin{macrocode} + classnum = { + default = {1803105} + }, +% \end{macrocode} +% +% 实验地点 +% \begin{macrocode} + lablocation = { + default = {æ ¼ç‰©207} + }, +% \end{macrocode} +% +% å¦æœŸ +% \begin{macrocode} + term = { + default = {2021春} + }, +% \end{macrocode} +% +% 报告æˆæ–‡æ—¥æœŸã€‚ +% \begin{macrocode} + date = { + default = {\the\year-\two@digits{\month}-\two@digits{\day}}, + } +} +% \end{macrocode} +% +% è¾“å‡ºæ—¥æœŸçš„ç»™å®šæ ¼å¼ï¼š\cs{hit@format@date}\marg{format}\marg{date}， +% å…¶ä¸æ ¼å¼ \meta{format} 接å—三个å‚数分别对应年ã€æœˆã€æ—¥ï¼Œ +% \meta{date} 是 ISO æ ¼å¼çš„日期（yyyy-mm-dd）。 +% \begin{macrocode} +\newcommand\hit@format@date[2]{% + \edef\hit@@date{#2}% + \def\hit@@process@date##1-##2-##3\@nil{% + #1{##1}{##2}{##3}% + }% + \expandafter\hit@@process@date\hit@@date\@nil +} +\newcommand\hit@date@zh@digit[3]{#1 å¹´ \number#2 月 \number#3 æ—¥} +\newcommand\hit@date@zh@digit@short[3]{#1 å¹´ \number#2 月} +\newcommand\hit@date@zh@short[3]{\zhdigits{#1}å¹´\zhnumber{#2}月} +\newcommand\hit@date@month[1]{% + \ifcase\number#1\or + January\or February\or March\or April\or May\or June\or + July\or August\or September\or October\or November\or December% + \fi +} +\newcommand\hit@date@en@short[3]{\hit@date@month{#2}, #1} +% \end{macrocode} +% +% +% 下划线命令 +% \begin{macrocode} +\newcommand\hit@underline[2][6em]{\hskip1pt\underline{\hb@xt@ #1{\hss#2\hss}}\hskip3pt} +\newcommand\hit@CJKunderline[2][6em]{\CJKunderline*{\hb@xt@ #1{\hss#2\hss}}} +% \end{macrocode} +% +% +% å°é¢è¡¨æ ¼ä¿¡æ¯ +% \begin{macrocode} +\newcommand\hit@titlepage@info{% + \large + \renewcommand{\arraystretch}{1} + \begin{tabular}{lp{3.5cm}<{\centering}lc} + \makebox[4em][s]{å¦\hspace{\fill}院}\hit@theorem@separator & {\hit@department} & \hspace{1em} \makebox[4em][s]{专\hspace{\fill}业}\hit@theorem@separator & {\hit@discipline} \\ \cline{2-2} \cline{4-4} + \makebox[4em][s]{ç\hspace{\fill}级}\hit@theorem@separator & {\hit@classnum} & \hspace{1em} \makebox[4em][s]{å¦\hspace{\fill}å·}\hit@theorem@separator & {\hit@student@id} \\ \cline{2-2} \cline{4-4} + \makebox[4em][s]{姓\hspace{\fill}å}\hit@theorem@separator & {\hit@author} &\hspace{1em} \makebox[4em][s]{实验地点}\hit@theorem@separator& {\hit@lablocation} \\ \cline{2-2} \cline{4-4} + \makebox[4em][s]{指导è€å¸ˆ}\hit@theorem@separator& {\hit@supervisor} &\hspace{1em} \makebox[4em][s]{å¦\hspace{\fill}期}\hit@theorem@separator & {\hit@term} \\ \cline{2-2} \cline{4-4} + \end{tabular} +} +% \end{macrocode} +% +% +% 论文æˆæ–‡æ‰“å°çš„日期，用三å·å®‹ä½“汉å—，å—è·å»¶ä¼¸ 0.5bp， +% 所以 \cs{CJKglue} 应该设为 1 bp。 +% \begin{macrocode} +\newcommand\hit@titlepage@date{% + \begingroup + \sanhao + \def\CJKglue{\hskip 1bp}% + \hit@format@date{\hit@date@zh@short}{\hit@date}\par + \endgroup +} +% \end{macrocode} +% +% 生æˆå°é¢ï¼Œä½¿ç”¨\cs{maketitle}命令 +% \begin{macrocode} +\renewcommand\maketitle{ + \cleardoublepage + \pagenumbering{Alph}% + \hit@maketitlepage + \clearpage +} +% \end{macrocode} +% +% +% æ ¹æ®æ ¡åŒºé€‰æ‹©æ ¡åŒºæ ¡å¾½åŠæ ¡å图片 +% \begin{macrocode} +\newcommand\hit@titlepage@fig{ + \ifhit@campus@harbin + \begin{center} + \begin{figure}[h] + \includegraphics[scale=0.5]{photo/hithrb.pdf} % æœ¬éƒ¨æ ¡å¾½å›¾ç‰‡ + \end{figure} + \end{center} + \else + \ifhit@campus@shenzhen + \begin{center} + \begin{figure}[h] + \includegraphics[scale=0.26]{photo/hitsz.pdf} % æ·±åœ³æ ¡åŒºæ ¡å¾½å›¾ç‰‡ + \end{figure} + \end{center} + \else + \ifhit@campus@weihai + \begin{center} + \begin{figure}[h] + \includegraphics[scale=0.26]{photo/hitwh.pdf} % æ ¡å¾½å›¾ç‰‡ + \end{figure} + \end{center} + \fi + \fi + \fi +} +% \end{macrocode} +% +% 定义å°é¢ +% \begin{macrocode} +\newcommand\hit@maketitlepage{% +\newgeometry{ + vmargin = 2.54cm, + hmargin = 3.17cm, +} + \newpage + \hit@titlepage@fig + \vspace{1.5cm} + \begingroup + \centering + \textbf{\huawenxingkai \fontsize{32}{0} \selectfont \hit@title}\\ + \endgroup + \vspace{2cm} + \begingroup + \centering + \textbf{\heiti \fontsize{20}{0} \selectfont \hit@expand}\\ + \endgroup + \vspace{2.5cm} + \parbox[h][10cm][t]{\textwidth}{\centering\hit@titlepage@info}\par + \begingroup + \centering + {\heiti \sihao\hit@format@date{\hit@date@zh@digit}{\hit@date}\par}% + \endgroup + \thispagestyle{empty} + \restoregeometry +} +% \end{macrocode} +% +% 定义附录 +% \begin{macrocode} +\renewcommand{\setthesection}{\appendixname\Alph{section}} +\renewcommand\appendix{\par +\setcounter{section}{0}% +\setcounter{subsection}{0}% +\gdef\thesection{\appendixname\@Alph\c@section}} +% \end{macrocode} +% +% \subsection{其它} +% \label{sec:other} +% +% 借用 \cls{ltxdoc} å’Œ \cls{l3doc} 里é¢çš„å‡ ä¸ªå‘½ä»¤æ–¹ä¾¿å†™æ–‡æ¡£ã€‚ +% \begin{macrocode} +\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}} +\DeclareRobustCommand\file{\nolinkurl} +\DeclareRobustCommand\env{\textsf} +\DeclareRobustCommand\pkg{\textsf} +\DeclareRobustCommand\cls{\textsf} +% \end{macrocode} +% +% \begin{macrocode} +\sloppy +%</cls> +% \end{macrocode} +% +% +% \iffalse +% \begin{macrocode} +%<*dtx-style> +\ProvidesPackage{dtx-style} +\RequirePackage{hypdoc} +\RequirePackage{ifthen} +\RequirePackage{fontspec}[2017/01/20] +\RequirePackage{amsmath} +\RequirePackage{unicode-math} +\RequirePackage[UTF8,scheme=chinese]{ctex} +\RequirePackage[ + top=25mm, bottom=25mm, + left=40mm, right=20mm, + headsep=3mm]{geometry} +\RequirePackage{hologo} +\RequirePackage{array,longtable,booktabs} +\RequirePackage{listings} +\RequirePackage{fancyhdr} +\RequirePackage{xcolor} +\RequirePackage{enumitem} +\RequirePackage{etoolbox} +\RequirePackage{metalogo} + +\unimathsetup{ + math-style=ISO, + bold-style=ISO, +} + +\DeclareRobustCommand\mathellipsis{\mathinner{\unicodecdots}} +\IfFontExistsTF{XITSMath-Regular.otf}{ + \setmathfont[ + Extension = .otf, + BoldFont = XITSMath-Bold, + StylisticSet = 8, + ]{XITSMath-Regular} + \setmathfont[range={cal,bfcal},StylisticSet=1]{XITSMath-Regular.otf} +}{ + \setmathfont[ + Extension = .otf, + BoldFont = *bold, + StylisticSet = 8, + ]{xits-math} + \setmathfont[range={cal,bfcal},StylisticSet=1]{xits-math.otf} +} + +\colorlet{hit@macro}{blue!60!black} +\colorlet{hit@env}{blue!70!black} +\colorlet{hit@option}{purple} +\patchcmd{\PrintMacroName}{\MacroFont}{\MacroFont\bfseries\color{hit@macro}}{}{} +\patchcmd{\PrintDescribeMacro}{\MacroFont}{\MacroFont\bfseries\color{hit@macro}}{}{} +\patchcmd{\PrintDescribeEnv}{\MacroFont}{\MacroFont\bfseries\color{hit@env}}{}{} +\patchcmd{\PrintEnvName}{\MacroFont}{\MacroFont\bfseries\color{hit@env}}{}{} + +\def\DescribeOption{% + \leavevmode\@bsphack\begingroup\MakePrivateLetters% + \Describe@Option} +\def\Describe@Option#1{\endgroup + \marginpar{\raggedleft\PrintDescribeOption{#1}}% + \hit@special@index{option}{#1}\@esphack\ignorespaces} +\def\PrintDescribeOption#1{\strut \MacroFont\bfseries\sffamily\color{hit@option} #1\ } +\def\hit@special@index#1#2{\@bsphack + \begingroup + \HD@target + \let\HDorg@encapchar\encapchar + \edef\encapchar usage{% + \HDorg@encapchar hdclindex{\the\c@HD@hypercount}{usage}% + }% + \index{#2\actualchar{\string\ttfamily\space#2} + (#1)\encapchar usage}% + \index{#1:\levelchar#2\actualchar + {\string\ttfamily\space#2}\encapchar usage}% + \endgroup + \@esphack} + +\lstdefinestyle{lstStyleBase}{% + basicstyle=\small\ttfamily, + aboveskip=\medskipamount, + belowskip=\medskipamount, + lineskip=0pt, + boxpos=c, + showlines=false, + extendedchars=true, + upquote=true, + tabsize=2, + showtabs=false, + showspaces=false, + showstringspaces=false, + numbers=none, + linewidth=\linewidth, + xleftmargin=4pt, + xrightmargin=0pt, + resetmargins=false, + breaklines=true, + breakatwhitespace=false, + breakindent=0pt, + breakautoindent=true, + columns=flexible, + keepspaces=true, + gobble=4, + framesep=3pt, + rulesep=1pt, + framerule=1pt, + backgroundcolor=\color{gray!5}, + stringstyle=\color{green!40!black!100}, + keywordstyle=\bfseries\color{blue!50!black}, + commentstyle=\slshape\color{black!60}} + +\lstdefinestyle{lstStyleShell}{% + style=lstStyleBase, + frame=l, + rulecolor=\color{purple}, + language=bash} + +\lstdefinestyle{lstStyleLaTeX}{% + style=lstStyleBase, + frame=l, + rulecolor=\color{violet}, + language=[LaTeX]TeX} + +\lstnewenvironment{latex}{\lstset{style=lstStyleLaTeX}}{} +\lstnewenvironment{shell}{\lstset{style=lstStyleShell}}{} + +\setlist{nosep} + +\DeclareDocumentCommand{\option}{m}{\textsf{#1}} +\DeclareDocumentCommand{\env}{m}{\texttt{#1}} +\DeclareDocumentCommand{\pkg}{s m}{% + \textsf{#2}\IfBooleanF#1{\hit@special@index{package}{#2}}} +\DeclareDocumentCommand{\cls}{s m}{% + \textsf{#2}\IfBooleanF#1{\hit@special@index{package}{#2}}} +\DeclareDocumentCommand{\file}{s m}{% + \nolinkurl{#2}\IfBooleanF#1{\hit@special@index{file}{#2}}} +\newcommand{\myentry}[1]{% + \marginpar{\raggedleft\color{purple}\bfseries\strut #1}} +\newcommand{\note}[2][Note]{{% + \color{magenta}{\bfseries #1}\emph{#2}}} + +\DeclareDocumentCommand{\githubuser}{m}{\href{https://github.com/#1}{@#1}} + +\def\thuthesis{\textsc{Thu}\-\textsc{Thesis}} +\def\hitreport{\textsc{Hit}\-\textsc{Report}} +\def\hithesis{\textsc{hi}\-\textsc{Thesis}} +%</dtx-style> +% \end{macrocode} +% \fi +% +% \Finale +% +\endinput +% \iffalse +% Local Variables: +% mode: doctex +% TeX-master: t +% End: +% \fi diff --git a/macros/latex/contrib/hitreport/hitreport.ins b/macros/latex/contrib/hitreport/hitreport.ins new file mode 100644 index 0000000000..a416f9cfbc --- /dev/null +++ b/macros/latex/contrib/hitreport/hitreport.ins @@ -0,0 +1,54 @@ +%% +%% Copyright (C) 2021 by Xiao Sun <demerzelsun@gmail.com> +%% +%% This file may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3c +%% of this license or (at your option) any later version. +%% The latest version of this license is in: +%% http://www.latex-project.org/lppl.txt +%% and version 1.3c or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. + +\input docstrip +\keepsilent + +\usedir{tex/latex/hitreport} + +\preamble + +This is a generated file. + +Copyright (C) 2021 by Xiao Sun <demerzelsun@gmail.com> + +This file may be distributed and/or modified under the +conditions of the LaTeX Project Public License, either version 1.3c +of this license or (at your option) any later version. +The latest version of this license is in: + http://www.latex-project.org/lppl.txt +and version 1.3c or later is part of all distributions of LaTeX +version 2005/12/01 or later. + +\endpreamble +\askforoverwritefalse +\generate{\file{\jobname.cls}{\from{\jobname.dtx}{cls}} + \file{dtx-style.sty}{\from{\jobname.dtx}{dtx-style}} + } + +\obeyspaces +\Msg{*************************************************************} +\Msg{* *} +\Msg{* To finish the installation you have to move the following *} +\Msg{* files into a directory searched by TeX: *} +\Msg{* *} +\Msg{* hitreport.cls *} +\Msg{* *} +\Msg{* To produce the documentation run the file hitreport.dtx *} +\Msg{* through LaTeX. *} +\Msg{* *} +\Msg{* Happy TeXing! *} +\Msg{* *} +\Msg{*************************************************************} + +\endbatchfile
\ No newline at end of file diff --git a/macros/latex/contrib/hitreport/hitreport.pdf b/macros/latex/contrib/hitreport/hitreport.pdf Binary files differnew file mode 100644 index 0000000000..2abe53c09f --- /dev/null +++ b/macros/latex/contrib/hitreport/hitreport.pdf diff --git a/macros/latex/contrib/hitreport/hitsetup.tex b/macros/latex/contrib/hitreport/hitsetup.tex new file mode 100644 index 0000000000..518c978e68 --- /dev/null +++ b/macros/latex/contrib/hitreport/hitsetup.tex @@ -0,0 +1,109 @@ +% !TeX root = ./hitreport-example.tex + +% 基本信æ¯é…ç½® + +\hitsetup{ + %****************************** + % 注æ„： + % 1. é…置里é¢ä¸è¦å‡ºçŽ°ç©ºè¡Œ + % 2. ä¸éœ€è¦çš„é…置信æ¯å¯ä»¥åˆ 除 + % 3. 建议先阅读文档ä¸æ‰€æœ‰å…³äºŽé€‰é¡¹çš„说明 + %****************************** + % + % æ ¡åŒºé€‰æ‹© + % å¯ä¾›é€‰æ‹©ä¸ºharbin, shenzhen, weihai，必须填写 + campus = {harbin}, + % + % æ ‡é¢˜ + % å¯ä½¿ç”¨â€œ\\â€å‘½ä»¤æ‰‹åŠ¨æŽ§åˆ¶æ¢è¡Œ + % + title = {哈尔滨工业大å¦æŠ¥å‘Š \LaTeX{} \\ 模æ¿ä½¿ç”¨ç¤ºä¾‹æ–‡æ¡£}, + % + % å‰¯æ ‡é¢˜ + % å¯ä½¿ç”¨â€œ\\â€å‘½ä»¤æ‰‹åŠ¨æŽ§åˆ¶æ¢è¡Œ + % + expand = {实验一}, + % + % 所在å¦é™¢ï¼ˆéƒ¨ï¼‰ + % 填写所属å¦é™¢ï¼ˆéƒ¨ï¼‰çš„å…¨å + % + department = {计算å¦éƒ¨}, + % + % 专业 + % 填写专业å称 + % + discipline = {计算机科å¦ä¸ŽæŠ€æœ¯}, + % + % 姓å + % + author = {å™éª}, + % + % å¦å· + % + student-id = {1180310840}, + % + % 指导教师 + % + supervisor = {XX}, + % + % 实验地点 + % 暂未区分课程报告å°é¢ä¸Žå®žéªŒæŠ¥å‘Šå°é¢ï¼Œè¯¾ç¨‹æŠ¥å‘Šå¯éšæ„填写 + % + lablocation = {æ ¼ç‰©207}, + % + % 报告å¦æœŸ + % + term = {2021春å£å¦æœŸ}, + % + % 日期 + % 使用 ISO æ ¼å¼ï¼›é»˜è®¤ä¸ºå½“å‰æ—¶é—´ + % + % date = {2019-07-07}, + % +} + +% 载入所需的å®åŒ… + +% å¯ä»¥ä½¿ç”¨ nomencl 生æˆç¬¦å·å’Œç¼©ç•¥è¯è¯´æ˜Ž +% \usepackage{nomencl} +% \makenomenclature + +% è¡¨æ ¼åŠ è„šæ³¨ +\usepackage{threeparttable} + +% è¡¨æ ¼ä¸æ”¯æŒè·¨è¡Œ +\usepackage{multirow} + +% å›ºå®šå®½åº¦çš„è¡¨æ ¼ã€‚ +% \usepackage{tabularx} + +% è·¨é¡µè¡¨æ ¼ +\usepackage{longtable} + +% é‡å’Œå•ä½ +\usepackage{siunitx} + +% 定ç†ç±»çŽ¯å¢ƒå®åŒ… +\usepackage{amsthm} +% 也å¯ä»¥ä½¿ç”¨ ntheorem +% \usepackage[amsmath,thmmarks,hyperref]{ntheorem} + +% å‚考文献使用 BibTeX + natbib å®åŒ… +% 顺åºç¼–ç 制 +%\usepackage[sort]{natbib} +%\bibliographystyle{thuthesis-numeric} + +% 著者-出版年制 +% \usepackage{natbib} + +% 声明 BibLaTeX çš„æ•°æ®åº“ +% \addbibresource{ref/refs.bib} + +% 定义所有的图片文件在 figures å目录下 +\graphicspath{{figures/}} + +% æ•°å¦å‘½ä»¤ +\newcommand\dif{\mathop{}\!\mathrm{d}} % å¾®åˆ†ç¬¦å· + +% hyperref å®åŒ…在最åŽè°ƒç”¨ +\usepackage{hyperref} diff --git a/macros/latex/contrib/hitreport/latexmkrc b/macros/latex/contrib/hitreport/latexmkrc new file mode 100644 index 0000000000..17e9557a5e --- /dev/null +++ b/macros/latex/contrib/hitreport/latexmkrc @@ -0,0 +1,18 @@ +# vim: set ft=perl: + +$pdf_mode = 5; + +$xelatex = "xelatex -shell-escape -file-line-error -halt-on-error -interaction=nonstopmode -no-pdf -synctex=1 %O %S"; +$xdvipdfmx = "xdvipdfmx -q -E -o %D %O %S"; + +$bibtex_use = 1.5; + +$clean_ext = "hd loe ptc run.xml synctex.gz thm xdv"; + +$makeindex = "makeindex -s gind.ist %O -o %D %S"; + +add_cus_dep('nlo', 'nls', 0, 'nlo2nls'); +sub nlo2nls { + system("makeindex -s nomencl.ist -o \"$_[0].nls\" \"$_[0].nlo\""); +} +push @generated_exts, 'nlo', 'nls'; diff --git a/macros/latex/contrib/hitreport/photo/hithrb.pdf b/macros/latex/contrib/hitreport/photo/hithrb.pdf Binary files differnew file mode 100644 index 0000000000..46d4fc2ece --- /dev/null +++ b/macros/latex/contrib/hitreport/photo/hithrb.pdf diff --git a/macros/latex/contrib/hitreport/photo/hitsz.pdf b/macros/latex/contrib/hitreport/photo/hitsz.pdf Binary files differnew file mode 100644 index 0000000000..acea1c82b0 --- /dev/null +++ b/macros/latex/contrib/hitreport/photo/hitsz.pdf diff --git a/macros/latex/contrib/hitreport/photo/hitwh.pdf b/macros/latex/contrib/hitreport/photo/hitwh.pdf Binary files differnew file mode 100644 index 0000000000..31d9993d8c --- /dev/null +++ b/macros/latex/contrib/hitreport/photo/hitwh.pdf diff --git a/macros/latex/contrib/hitreport/ref/appendix.bib b/macros/latex/contrib/hitreport/ref/appendix.bib new file mode 100644 index 0000000000..1e4cc0daef --- /dev/null +++ b/macros/latex/contrib/hitreport/ref/appendix.bib @@ -0,0 +1,14 @@ +@book{abrahams99tex, + author = {Paul W. Abrahams and Karl Berry and Kathryn A. Hargreaves}, + title = {{\TeX} for the Impatient}, + publisher = {Addison-Wesley}, + year = 1990, +} + +@incollection{salomon1995advanced, + author = {David Salomon}, + title = {The advanced {\TeX}book}, + address = {New York}, + publisher = {Springer}, + year = 1995, +} diff --git a/macros/latex/contrib/hitreport/ref/refs.bib b/macros/latex/contrib/hitreport/ref/refs.bib new file mode 100644 index 0000000000..4ca6bccded --- /dev/null +++ b/macros/latex/contrib/hitreport/ref/refs.bib @@ -0,0 +1,331 @@ +@article{zhangkun1994, + author = {å¼ æ˜† and 冯立群 and 余昌钰 and others}, + title = {机器人柔性手腕的çƒé¢é½¿è½®è®¾è®¡ç ”究}, + journal = {清åŽå¤§å¦å¦æŠ¥: 自然科å¦ç‰ˆ}, + volume = {34}, + number = {2}, + pages = {1--7}, + year = {1994}, + key = {zhang1 kun1}, +} + +@book{zhukezhen1973, + author = {竺å¯æ¡¢}, + title = {物ç†å¦è®º}, + address = {北京}, + publisher = {科å¦å‡ºç‰ˆç¤¾}, + year = {1973}, + pages = {56--60}, + key = {zhu2 ke3 zhen1}, +} + +@inproceedings{dupont1974bone, + author = {Dupont, B}, + title = {Bone marrow transplantation in severe combined immunodeficiency with an unrelated MLC compatible donor}, + editor = {White, H J and Smith, R}, + booktitle = {Proceedings of the third annual meeting of the International Society for Experimental Hematology}, + address = {Houston}, + publisher = {International Society for Experimental Hematology}, + year = {1974}, + pages = {44--46}, +} + +@mastersthesis{zhengkaiqing1987, + author = {郑开é’}, + title = {通讯系统模拟åŠè½¯ä»¶}, + address = {北京}, + school = {清åŽå¤§å¦æ— 线电系}, + year = {1987}, + key = {zheng4 kai1 qing1}, +} + +@patent{jiangxizhou1980, + author = {姜锡洲}, + title = {一ç§æ¸©çƒå¤–æ•·è¯åˆ¶å¤‡æ–¹æ¡ˆ: ä¸å›½, 88105607.3}, + date = {1980-07-26}, + key = {jiang1 xi1 zhou1}, +} + +@standard{jianduju1994, + author = {ä¸åŽäººæ°‘共和国国家技术监ç£å±€}, + title = {GB3100-3102. ä¸åŽäººæ°‘å…±å’Œå›½å›½å®¶æ ‡å‡†-é‡ä¸Žå•ä½}, + address = {北京}, + publisher = {ä¸å›½æ ‡å‡†å‡ºç‰ˆç¤¾}, + year = {1994}, + key = {zhong1 hua2 ren2 min2 gong4 he2 guo2}, +} + +@article{merkt1995rotational, + author = {Merkt, Fr{\'e}d{\'e}ric and Mackenzie, S R and Softley, Timothy P}, + title = {Rotational Autoionization Dynamics in High Rydberg States of Nitrogen}, + journal = {J Chem Phys}, + year = {1995}, + volume = {103}, + pages = {4509--4518}, +} + +@article{mellinger1996laser, + author = {Mellinger, A and Vidal, C R and Jungen, {Ch}}, + title = {Laser reduced fluorescence study of the carbon monoxide nd triplet Rydberg series - Experimental results and multichannel quantum defect analysis}, + journal = {J Chem Phys}, + year = {1996}, + volume = {104}, + pages = {8913--8921}, +} + +@article{bixon1996dynamics, + author = {Bixon, M and Jortner, Joshua}, + title = {The dynamics of predissociating high {Rydberg} states of {NO}}, + journal = {J Chem Phys}, + year = {1996}, + volume = {105}, + pages = {1363--1382}, +} + +@article{mahui1995, + author = {马辉 and æŽä¿ and 刘耀明 and others}, + title = {利用 {REMPI} æ–¹æ³•æµ‹é‡ {BaF} é«˜é‡Œå¾·å ¡ç³»åˆ—å…‰è°±}, + journal = {化å¦ç‰©ç†å¦æŠ¥}, + year = {1995}, + volume = {8}, + pages = {308--311}, + key = {ma3 hui1}, +} + +@article{carlson1981two, + author = {Carlson, N W and Taylor, A J and Jones, K M and Schawlow, A L}, + title = {Two-step polarization-labeling spectroscopy of excited states of {Na2}}, + journal = {Phys Rev A}, + year = {1981}, + volume = {24}, + pages = {822--834}, +} + +@article{taylor1983scanning, + author = {Taylor, A J and Jones, K M and Schawlow, A L}, + title = {Scanning pulsed-polarization spectrometer applied to {Na2}}, + journal = {J Opt Soc Am}, + year = {1983}, + volume = {73}, + pages = {994--998}, +} + +@article{taylor1981study, + author = {Taylor, A J and Jones, K M and Schawlow, A L}, + title = {A study of the excited {1$\Sigma$g+} states in {Na2}}, + journal = {Opt Commun}, + year = {1981}, + volume = {39}, + pages = {47--50}, +} + +@article{shimizu1983laser, + author = {Shimizu, Kazuko and Shimizu, Fujio}, + title = {Laser induced fluorescence spectra of the a {3$\Pi$u--X 1$\Sigma$g+} band of {Na2} by molecular beam}, + journal = {J Chem Phys}, + year = {1983}, + volume = {78}, + pages = {1126--1131}, +} + +@article{atkinson1982experimental, + author = {Atkinson, J B and Becker, J and Demtr{\"o}der, W}, + title = {Experimental observation of the a {3$\Pi$u} state of {Na2}}, + journal = {Chem Phys Lett}, + year = {1982}, + volume = {87}, + pages = {92--97}, +} + +@article{kusch1975perturbations, + author = {Kusch, P and Hessel, M M}, + title = {Perturbations in the A {1$\Sigma$u+} state of {Na2}}, + journal = {J Chem Phys}, + year = {1975}, + volume = {63}, + pages = {4087--4088}, +} + +@book{guangxi1993, + author = {广西壮æ—自治区林业厅}, + title = {广西自然ä¿æŠ¤åŒº}, + address = {北京}, + publisher = {ä¸å›½æž—业出版社}, + year = {1993}, + key = {guang3 xi1 zhuang4 zu2 zi4 zhi4 qu1}, +} + +@book{huosini1989guwu, + author = {éœæ–¯å°¼}, + title = {谷物科å¦ä¸Žå·¥è‰ºå¦åŽŸç†}, + translator = {æŽåº†é¾™}, + edition = {2}, + address = {北京}, + publisher = {ä¸å›½é£Ÿå“出版社}, + year = {1989}, + pages = {15--20}, + key = {huo4 si1 ni2}, +} + +@book{wangfuzhi1865songlun, + author = {王夫之}, + title = {宋论}, + edition = {刻本}, + address = {金陵}, + publisher = {曾æ°}, + year = {1865（清åŒæ²»å››å¹´ï¼‰}, + key = {wang2 fu1 zhi1}, +} + +@book{zhaoyaodong1998xinshidai, + author = {赵耀东}, + title = {新时代的工业工程师}, + address = {å°åŒ—}, + publisher = {天下文化出版社}, + year = {1998}, + urldate = {1998-09-26}, + url = {http://www.ie.nthu.edu.tw/info/ie.newie.htm}, + key = {zhao4 yao4 dong1}, +} + +@standard{biaozhunhua2002tushu, + author = {全国信æ¯ä¸Žæ–‡çŒ®å·¥ä½œæ ‡å‡†åŒ–æŠ€æœ¯å§”å‘˜ä¼šå‡ºç‰ˆç‰©æ ¼å¼åˆ†å§”员会}, + title = {GB/T 12450-2001 图书书å页}, + address = {北京}, + publisher = {ä¸å›½æ ‡å‡†å‡ºç‰ˆç¤¾}, + year = {2002}, + pages = {1}, + key = {quan2 guo2 xin4 xi1}, +} + +@book{chubanzhuanye2004, + author = {全国出版专业èŒä¸šèµ„æ ¼è€ƒè¯•åŠžå…¬å®¤}, + title = {全国出版专业èŒä¸šèµ„æ ¼è€ƒè¯•è¾…å¯¼æ•™æ: 出版专业ç†è®ºä¸Žå®žåŠ¡â€¢ä¸çº§}, + edition = {2014}, + address = {上海}, + publisher = {上海辞书出版社}, + year = {2004}, + pages = {299--307}, + key = {quan2 guo2 chu1 ban3 ye4}, +} + +@techreport{who1970factors, + author = {{World Health Organization}}, + title = {Factors Regulating the Immune Response: Report of {WHO Scientific Group}}, + address = {Geneva}, + publisher = {WHO}, + year = {1970}, +} + +@book{peebles2001probability, + author = {Peebles, Jr, Peyton Z.}, + title = {Probability, Random Variables, and Random Signal Principles}, + edition = {4}, + address = {New York}, + publisher = {McGraw Hill}, + year = {2001}, +} + +@incollection{baishunong1998zhiwu, + author = {白书农}, + title = {æ¤ç‰©å¼€èŠ±ç ”究}, + editor = {æŽæ‰¿æ£®}, + booktitle = {æ¤ç‰©ç§‘å¦è¿›å±•}, + address = {北京}, + publisher = {高ç‰æ•™è‚²å‡ºç‰ˆç¤¾}, + year = {1998}, + pages = {146--163}, + key = {bai2 shu1 nong2}, +} + +@incollection{weinstein1974pathogenic, + author = {Weinstein, L and Swertz, M N}, + title = {Pathogenic Properties of Invading Microorganism}, + editor = {Sodeman, Jr, William A and Sodeman, William A}, + booktitle = {Pathologic physiology: mechanisms of disease}, + address = {Philadelphia}, + publisher = {Saunders}, + year = {1974}, + pages = {745--772}, +} + +@inproceedings{hanjiren1985lun, + author = {韩å‰äºº}, + title = {论èŒå·¥æ•™è‚²çš„特点}, + editor = {ä¸å›½èŒå·¥æ•™è‚²ç ”究会}, + booktitle = {èŒå·¥æ•™è‚²ç ”究论文集}, + address = {北京}, + publisher = {人民教育出版社}, + year = {1985}, + pages = {90--99}, + key = {han2 ji2 ren2}, +} + +@periodical{dizhi1936dizhi, + author = {ä¸å›½åœ°è´¨å¦ä¼š}, + title = {地质评论}, + year = {1936}, + volume = {1}, + number = {1}, + address = {北京}, + publisher = {地质出版社}, + key = {zhong1 guo2 di4 zhi3 xue2 hui4}, +} + +@periodical{tushuguan1957tushuguanxue, + author = {ä¸å›½å›¾ä¹¦é¦†å¦ä¼š}, + title = {图书馆å¦é€šè®¯}, + year = {1957/1990}, + number = {1--4}, + address = {北京}, + publisher = {北京图书馆}, + key = {zhong1 guo2 tu2 shu1 guan3 xue2 hui4}, +} + +@periodical{aaas1883science, + author = {{American Association for the Advancement of Science}}, + title = {Science}, + year = {1883}, + volume = {1}, + number = {1}, + address = {Washington, D.C.}, + publisher = {American Association for the Advancement of Science}, +} + +@newspaper{fugang2000fengsha, + author = {傅刚 and 赵承 and æŽä½³è·¯}, + title = {大风沙过åŽçš„æ€è€ƒ}, + journal = {北京é’年报}, + date = {2000-04-12}, + number = {14}, + urldate = {2002-03-06}, + url = {http://www.bjyouth.com.cn/Bqb/20000412/B/4216%5ED0412B1401.htm}, + key = {fu4 gang1}, +} + +@online{xiaoyu2001chubanye, + author = {è§é’°}, + title = {出版业信æ¯åŒ–迈入快车é“}, + year = {2001}, + date = {2001-12-19}, + urldate = {2002-04-15}, + url = {http://www.creader.com/news/20011219/200112190019.htm}, + key = {xiao1 yu4}, +} + +@online{oclc2000about, + author = {{Online Computer Library Center, Inc}}, + title = {About {OCLC}: History of Cooperation}, + year = {2000}, + urldate = {2000-01-08}, + url = {http://www.oclc.org/about/cooperation.en.htm}, +} + +@software{scitor2000project, + author = {{Scitor Corporation}}, + title = {Project scheduler}, + address = {Sunnyvale, Calif.}, + publisher = {Scitor Corporation}, + year = {1983}, + medium = {DK}, +} diff --git a/macros/latex/contrib/parskip/changes.txt b/macros/latex/contrib/parskip/changes.txt index f8f1141e68..5233f581ed 100644 --- a/macros/latex/contrib/parskip/changes.txt +++ b/macros/latex/contrib/parskip/changes.txt @@ -1,3 +1,9 @@ +#### placed on CTAN as 2.0h #### + +2021-03-14 Frank Mittelbach <Frank.Mittelbach@latex-project.org> + + * parskip.dtx: correct doco to refer to new repository + #### placed on CTAN as 2.0g #### 2021-03-02 Frank Mittelbach <Frank.Mittelbach@latex-project.org> diff --git a/macros/latex/contrib/parskip/parskip-code.pdf b/macros/latex/contrib/parskip/parskip-code.pdf Binary files differindex 35f6d63c41..e6c3bbe148 100644 --- a/macros/latex/contrib/parskip/parskip-code.pdf +++ b/macros/latex/contrib/parskip/parskip-code.pdf diff --git a/macros/latex/contrib/parskip/parskip.dtx b/macros/latex/contrib/parskip/parskip.dtx index 09638ae207..bf193051d2 100644 --- a/macros/latex/contrib/parskip/parskip.dtx +++ b/macros/latex/contrib/parskip/parskip.dtx @@ -149,15 +149,15 @@ % The official production version is available from CTAN. % The latest (development) sources are maintained at GitHub at: % \begin{quote} -% \url{https://github.com/FrankMittelbach/fmitex/tree/parskip/parskip} +% \url{https://github.com/FrankMittelbach/fmitex-parskip} % \end{quote} % In case of problems with the package you can report them at % \begin{quote} -% \url{https://github.com/FrankMittelbach/fmitex/issues} +% \url{https://github.com/FrankMittelbach/fmitex-parskip/issues} % \end{quote} % Please provide a minimal test example that can be run and doesn't -% use packages not in a standard \LaTeX{} distribution (and as little -% as possible to show the issue). +% use packages not in a standard \LaTeX{} distribution (and only those +% that are needed to show the issue). % % \StopEventually{} % @@ -183,7 +183,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesPackage{parskip}[2021-03-02 v2.0g non-zero parskip adjustments] +\ProvidesPackage{parskip}[2021-03-14 v2.0h non-zero parskip adjustments] % \end{macrocode} % % diff --git a/macros/latex/contrib/parskip/parskip.pdf b/macros/latex/contrib/parskip/parskip.pdf Binary files differindex 49f937d927..3ac334e77f 100644 --- a/macros/latex/contrib/parskip/parskip.pdf +++ b/macros/latex/contrib/parskip/parskip.pdf diff --git a/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf b/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf Binary files differindex 941ccd943f..0238567ab0 100644 --- a/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf +++ b/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf diff --git a/macros/latex/contrib/profcollege/latex/PfC-EquationComposition1.tex b/macros/latex/contrib/profcollege/latex/PfC-EquationComposition2.tex index b513a6b116..38493f8996 100644 --- a/macros/latex/contrib/profcollege/latex/PfC-EquationComposition1.tex +++ b/macros/latex/contrib/profcollege/latex/PfC-EquationComposition2.tex @@ -8,7 +8,7 @@ \else%cas ax+b=d \xintifboolexpr{#2=0}{% \xintifboolexpr{#3=#5}{%b=d - L'équation $\num{#3}=\num{#5}$ a une infinité de solution.}% + L'équation $\num{#3}=\num{#5}$ a une infinité de solutions.}% {%b<>d L'équation $\num{#3}=\num{#5}$ n'a aucune solution.% }% @@ -47,7 +47,7 @@ }{} \ifboolKV[ClesEquation]{Fleches}{\stepcounter{Nbequa}}{\ifboolKV[ClesEquation]{FlecheDiv}{\stepcounter{Nbequa}}{}} \end{align*} - \ifboolKV[ClesEquation]{Solution}{L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}=\num{#5}$ a une unique solution : \opdiv*{\Coeffb}{\Coeffa}{solution}{resteequa}\opcmp{resteequa}{0}$\useKV[ClesEquation]{Lettre}=\displaystyle\ifopeq\opexport{solution}{\solution}\num{\solution}\else\ifboolKV[ClesEquation]{Entier}{\SSimplifie{\Coeffb}{\Coeffa}}{\frac{\num{\Coeffb}}{\num{\Coeffa}}}\fi$. + \ifboolKV[ClesEquation]{Solution}{L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}=\num{#5}$ a une unique solution : \opdiv*{\Coeffb}{\Coeffa}{solution}{resteequa}\opcmp{resteequa}{0}$\ifboolKV[ClesEquation]{LettreSol}{\useKV[ClesEquation]{Lettre}=}{}\displaystyle\ifopeq\opexport{solution}{\solution}\num{\solution}\else\ifboolKV[ClesEquation]{Entier}{\SSimplifie{\Coeffb}{\Coeffa}}{\frac{\num{\Coeffb}}{\num{\Coeffa}}}\fi$. }{} } } @@ -58,99 +58,99 @@ \useKVdefault[ClesEquation]% \setKV[ClesEquation]{#1}% \ifx\bla#3\bla%on inverse en faisant attention à la boucle #3<->#5 - \ifx\bla#5\bla% - %% paramètre oublié - \else - \EquaTroisComposition[#1]{#4}{#5}{#2}{}% - \fi + \ifx\bla#5\bla% + %% paramètre oublié + \else + \EquaTroisComposition[#1]{#4}{#5}{#2}{}% + \fi \else \xintifboolexpr{#2=0}{%b=cx \EquaBase[#1]{#4}{}{}{#3} }{% \xintifboolexpr{#4=0}{%ax+b=0 \EquaDeuxComposition[#1]{#2}{#3}{}{0} - }{%ax+b=cx - \xintifboolexpr{#2=#4}{% - \xintifboolexpr{#3=0}{%ax=ax - L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}$ a une infinité de solution.}% - {%ax+b=ax - L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}$ n'a aucune solution.% - }% - }{%% Cas délicat - \xintifboolexpr{#2>#4}{%ax+b=cx avec a>c - \ifboolKV[ClesEquation]{Decomposition}{\colorlet{Ccompo}{\useKV[ClesEquation]{CouleurCompo}}}{} - \begin{align*} - \tikzmark{A-\theNbequa}\mathcolor{Ccompo}{\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}&=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}\tikzmark{E-\theNbequa}\\ - \mathcolor{Ccompo}{\num{\fpeval{#2-#4}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#4>0}{+\num{#4}\useKV[ClesEquation]{Lettre}}{-\num{\fpeval{0-#4}}\useKV[ClesEquation]{Lettre}}}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}&=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}\\ - \tikzmark{B-\theNbequa}\xdef\Coeffa{\fpeval{#2-#4}}\xintifboolexpr{\Coeffa=1}{}{\num{\Coeffa}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}&=\mathcolor{Ccompo}{0}\tikzmark{F-\theNbequa}\\ - \xintifboolexpr{\Coeffa=1}{}{\num{\Coeffa}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}&=\mathcolor{Ccompo}{\num{\fpeval{0-#3}}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}}\tikzmark{F-\theNbequa}\\ - \tikzmark{C-\theNbequa}\xdef\Coeffb{\fpeval{0-#3}}\xintifboolexpr{\Coeffa=1}{}{\num{\Coeffa}}\useKV[ClesEquation]{Lettre}&=\num{\Coeffb}\tikzmark{G-\theNbequa}%\\ - \xintifboolexpr{\Coeffa=1}{}{\\} - \ifboolKV[ClesEquation]{Fleches}{% - \leftcomment{A-\theNbequa}{B-\theNbequa}{A-\theNbequa}{$\xintifboolexpr{#4>0}{-\num{#4}}{+\num{\fpeval{0-#4}}}\useKV[ClesEquation]{Lettre}$} - \rightcomment{E-\theNbequa}{F-\theNbequa}{E-\theNbequa}{$\xintifboolexpr{#4>0}{-\num{#4}}{+\num{\fpeval{0-#4}}}\useKV[ClesEquation]{Lettre}$} - \leftcomment{B-\theNbequa}{C-\theNbequa}{A-\theNbequa}{$\xintifboolexpr{#3>0}{-\num{#3}}{+\num{\fpeval{0-#3}}}$}% - \rightcomment{F-\theNbequa}{G-\theNbequa}{E-\theNbequa}{$\xintifboolexpr{#3>0}{-\num{#3}}{+\num{\fpeval{0-#3}}}$}% - }{} - \xintifboolexpr{\Coeffa=1}{}{%\ifnum\cmtd>1 - \tikzmark{D-\theNbequa}\useKV[ClesEquation]{Lettre}&=\frac{\num{\Coeffb}}{\num{\Coeffa}}\tikzmark{H-\theNbequa}%\\ - \ifboolKV[ClesEquation]{Fleches}{% - \leftcomment{C-\theNbequa}{D-\theNbequa}{A-\theNbequa}{$\div\xintifboolexpr{\Coeffa<0}{(\num{\Coeffa})}{\num{\Coeffa}}$}% - \rightcomment{G-\theNbequa}{H-\theNbequa}{E-\theNbequa}{$\div\xintifboolexpr{\Coeffa<0}{(\num{\Coeffa})}{\num{\Coeffa}}$}% - }{ - \ifboolKV[ClesEquation]{FlecheDiv}{% - \leftcomment{C-\theNbequa}{D-\theNbequa}{A-\theNbequa}{$\div\xintifboolexpr{\Coeffa<0}{(\num{\Coeffa})}{\num{\Coeffa}}$}% - \rightcomment{G-\theNbequa}{H-\theNbequa}{E-\theNbequa}{$\div\xintifboolexpr{\Coeffa<0}{(\num{\Coeffa})}{\num{\Coeffa}}$}% - }{} - } - \ifboolKV[ClesEquation]{Entier}{% - \SSimpliTest{\Coeffb}{\Coeffa}% - \ifboolKV[ClesEquation]{Simplification}{% - \ifthenelse{\boolean{Simplification}}{\\\useKV[ClesEquation]{Lettre}&=\SSimplifie{\Coeffb}{\Coeffa}}{}%\\ - }{} - }{} - } - \ifboolKV[ClesEquation]{Fleches}{\stepcounter{Nbequa}}{\ifboolKV[ClesEquation]{FlecheDiv}{\stepcounter{Nbequa}}{}} - \end{align*} - \ifboolKV[ClesEquation]{Solution}{L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}$ a une unique solution : \opdiv*{\Coeffb}{\Coeffa}{solution}{resteequa}\opcmp{resteequa}{0}$\useKV[ClesEquation]{Lettre}=\displaystyle\ifopeq\opexport{solution}{\solution}\num{\solution}\else\ifboolKV[ClesEquation]{Entier}{\SSimplifie{\Coeffb}{\Coeffa}}{\frac{\num{\Coeffb}}{\num{\Coeffa}}}\fi$.}{} - }{%ax+b=cx+d avec a<c % Autre cas délicat - \ifboolKV[ClesEquation]{Decomposition}{\colorlet{Ccompo}{\useKV[ClesEquation]{CouleurCompo}}}{} - \begin{align*}% - \tikzmark{A-\theNbequa}\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}&=\mathcolor{Ccompo}{\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}}\tikzmark{E-\theNbequa}\\ - \xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}&=\mathcolor{Ccompo}{\num{\fpeval{#4-#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#2>0}{+\num{#2}\useKV[ClesEquation]{Lettre}}{-\num{\fpeval{0-#2}}\useKV[ClesEquation]{Lettre}}}\\ - \tikzmark{B-\theNbequa}\xdef\Coeffb{#3}\xdef\Coeffa{\fpeval{#4-#2}}\xintifboolexpr{#3>0}{\num{#3}}{-\num{\fpeval{0-#3}}}&=\xintifboolexpr{\Coeffa=1}{}{\num{\Coeffa}}\useKV[ClesEquation]{Lettre}\tikzmark{F-\theNbequa} - \xintifboolexpr{\Coeffa=1}{}{\\} - \ifboolKV[ClesEquation]{Fleches}{% - \leftcomment{A-\theNbequa}{B-\theNbequa}{A-\theNbequa}{$\xintifboolexpr{#2>0}{-\num{#2}}{+\num{\fpeval{0-#2}}}\useKV[ClesEquation]{Lettre}$} - \rightcomment{E-\theNbequa}{F-\theNbequa}{E-\theNbequa}{$\xintifboolexpr{#2>0}{-\num{#2}}{+\num{\fpeval{0-#2}}}\useKV[ClesEquation]{Lettre}$} - }{} - \xintifboolexpr{\Coeffa=1}{}{%\ifnum\cmtd>1 - \tikzmark{D-\theNbequa}\frac{\num{\Coeffb}}{\num{\Coeffa}}&=\useKV[ClesEquation]{Lettre}\tikzmark{H-\theNbequa}%\\ - \ifboolKV[ClesEquation]{Fleches}{% - \leftcomment{B-\theNbequa}{D-\theNbequa}{A-\theNbequa}{$\div\xintifboolexpr{\Coeffa<0}{(\num{\Coeffa})}{\num{\Coeffa}}$}% - \rightcomment{F-\theNbequa}{H-\theNbequa}{E-\theNbequa}{$\div\xintifboolexpr{\Coeffa<0}{(\num{\Coeffa})}{\num{\Coeffa}}$}% - }{ - \ifboolKV[ClesEquation]{FlecheDiv}{% - \leftcomment{B-\theNbequa}{D-\theNbequa}{A-\theNbequa}{$\div\xintifboolexpr{\Coeffa<0}{(\num{\Coeffa})}{\num{\Coeffa}}$}% - \rightcomment{F-\theNbequa}{H-\theNbequa}{E-\theNbequa}{$\div\xintifboolexpr{\Coeffa<0}{(\num{\Coeffa})}{\num{\Coeffa}}$}% - }{} - } - \ifboolKV[ClesEquation]{Entier}{% - \SSimpliTest{\Coeffb}{\Coeffa}% - \ifboolKV[ClesEquation]{Simplification}{% - \ifthenelse{\boolean{Simplification}}{\\\SSimplifie{\Coeffb}{\Coeffa}&=\useKV[ClesEquation]{Lettre}}{}%\\ - }{} - }{} - } - \ifboolKV[ClesEquation]{Fleches}{\stepcounter{Nbequa}}{\ifboolKV[ClesEquation]{FlecheDiv}{\stepcounter{Nbequa}}{}} - \end{align*} - \ifboolKV[ClesEquation]{Solution}{L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}$ a une unique solution : \opdiv*{\Coeffb}{\Coeffa}{solution}{resteequa}\opcmp{resteequa}{0}$\useKV[ClesEquation]{Lettre}=\displaystyle\ifopeq\opexport{solution}{\solution}\num{\solution}\else\ifboolKV[ClesEquation]{Entier}{\SSimplifie{\Coeffb}{\Coeffa}}{\frac{\num{\Coeffb}}{\num{\Coeffa}}}\fi$.}{}% - }% - }% + }{%ax+b=cx + \xintifboolexpr{#2=#4}{% + \xintifboolexpr{#3=0}{%ax=ax + L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}$ a une infinité de solutions.}% + {%ax+b=ax + L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}$ n'a aucune solution.% + }% + }{%% Cas délicat + \xintifboolexpr{#2>#4}{%ax+b=cx avec a>c + \ifboolKV[ClesEquation]{Decomposition}{\colorlet{Ccompo}{\useKV[ClesEquation]{CouleurCompo}}}{} + \begin{align*} + \tikzmark{A-\theNbequa}\mathcolor{Ccompo}{\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}&=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}\tikzmark{E-\theNbequa}\\ + \mathcolor{Ccompo}{\num{\fpeval{#2-#4}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#4>0}{+\num{#4}\useKV[ClesEquation]{Lettre}}{-\num{\fpeval{0-#4}}\useKV[ClesEquation]{Lettre}}}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}&=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}\\ + \tikzmark{B-\theNbequa}\xdef\Coeffa{\fpeval{#2-#4}}\xintifboolexpr{\Coeffa=1}{}{\num{\Coeffa}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}&=\mathcolor{Ccompo}{0}\tikzmark{F-\theNbequa}\\ + \xintifboolexpr{\Coeffa=1}{}{\num{\Coeffa}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}&=\mathcolor{Ccompo}{\num{\fpeval{0-#3}}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}}\tikzmark{F-\theNbequa}\\ + \tikzmark{C-\theNbequa}\xdef\Coeffb{\fpeval{0-#3}}\xintifboolexpr{\Coeffa=1}{}{\num{\Coeffa}}\useKV[ClesEquation]{Lettre}&=\num{\Coeffb}\tikzmark{G-\theNbequa}%\\ + \xintifboolexpr{\Coeffa=1}{}{\\} + \ifboolKV[ClesEquation]{Fleches}{% + \leftcomment{A-\theNbequa}{B-\theNbequa}{A-\theNbequa}{$\xintifboolexpr{#4>0}{-\num{#4}}{+\num{\fpeval{0-#4}}}\useKV[ClesEquation]{Lettre}$} + \rightcomment{E-\theNbequa}{F-\theNbequa}{E-\theNbequa}{$\xintifboolexpr{#4>0}{-\num{#4}}{+\num{\fpeval{0-#4}}}\useKV[ClesEquation]{Lettre}$} + \leftcomment{B-\theNbequa}{C-\theNbequa}{A-\theNbequa}{$\xintifboolexpr{#3>0}{-\num{#3}}{+\num{\fpeval{0-#3}}}$}% + \rightcomment{F-\theNbequa}{G-\theNbequa}{E-\theNbequa}{$\xintifboolexpr{#3>0}{-\num{#3}}{+\num{\fpeval{0-#3}}}$}% + }{} + \xintifboolexpr{\Coeffa=1}{}{%\ifnum\cmtd>1 + \tikzmark{D-\theNbequa}\useKV[ClesEquation]{Lettre}&=\frac{\num{\Coeffb}}{\num{\Coeffa}}\tikzmark{H-\theNbequa}%\\ + \ifboolKV[ClesEquation]{Fleches}{% + \leftcomment{C-\theNbequa}{D-\theNbequa}{A-\theNbequa}{$\div\xintifboolexpr{\Coeffa<0}{(\num{\Coeffa})}{\num{\Coeffa}}$}% + \rightcomment{G-\theNbequa}{H-\theNbequa}{E-\theNbequa}{$\div\xintifboolexpr{\Coeffa<0}{(\num{\Coeffa})}{\num{\Coeffa}}$}% + }{ + \ifboolKV[ClesEquation]{FlecheDiv}{% + \leftcomment{C-\theNbequa}{D-\theNbequa}{A-\theNbequa}{$\div\xintifboolexpr{\Coeffa<0}{(\num{\Coeffa})}{\num{\Coeffa}}$}% + \rightcomment{G-\theNbequa}{H-\theNbequa}{E-\theNbequa}{$\div\xintifboolexpr{\Coeffa<0}{(\num{\Coeffa})}{\num{\Coeffa}}$}% + }{} + } + \ifboolKV[ClesEquation]{Entier}{% + \SSimpliTest{\Coeffb}{\Coeffa}% + \ifboolKV[ClesEquation]{Simplification}{% + \ifthenelse{\boolean{Simplification}}{\\\useKV[ClesEquation]{Lettre}&=\SSimplifie{\Coeffb}{\Coeffa}}{}%\\ + }{} + }{} + } + \ifboolKV[ClesEquation]{Fleches}{\stepcounter{Nbequa}}{\ifboolKV[ClesEquation]{FlecheDiv}{\stepcounter{Nbequa}}{}} + \end{align*} + \ifboolKV[ClesEquation]{Solution}{L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}$ a une unique solution : \opdiv*{\Coeffb}{\Coeffa}{solution}{resteequa}\opcmp{resteequa}{0}$\ifboolKV[ClesEquation]{LettreSol}{\useKV[ClesEquation]{Lettre}=}{}\displaystyle\ifopeq\opexport{solution}{\solution}\num{\solution}\else\ifboolKV[ClesEquation]{Entier}{\SSimplifie{\Coeffb}{\Coeffa}}{\frac{\num{\Coeffb}}{\num{\Coeffa}}}\fi$.}{} + }{%ax+b=cx+d avec a<c % Autre cas délicat + \ifboolKV[ClesEquation]{Decomposition}{\colorlet{Ccompo}{\useKV[ClesEquation]{CouleurCompo}}}{} + \begin{align*}% + \tikzmark{A-\theNbequa}\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}&=\mathcolor{Ccompo}{\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}}\tikzmark{E-\theNbequa}\\ + \xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}&=\mathcolor{Ccompo}{\num{\fpeval{#4-#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#2>0}{+\num{#2}\useKV[ClesEquation]{Lettre}}{-\num{\fpeval{0-#2}}\useKV[ClesEquation]{Lettre}}}\\ + \tikzmark{B-\theNbequa}\xdef\Coeffb{#3}\xdef\Coeffa{\fpeval{#4-#2}}\xintifboolexpr{#3>0}{\num{#3}}{-\num{\fpeval{0-#3}}}&=\xintifboolexpr{\Coeffa=1}{}{\num{\Coeffa}}\useKV[ClesEquation]{Lettre}\tikzmark{F-\theNbequa} + \xintifboolexpr{\Coeffa=1}{}{\\} + \ifboolKV[ClesEquation]{Fleches}{% + \leftcomment{A-\theNbequa}{B-\theNbequa}{A-\theNbequa}{$\xintifboolexpr{#2>0}{-\num{#2}}{+\num{\fpeval{0-#2}}}\useKV[ClesEquation]{Lettre}$} + \rightcomment{E-\theNbequa}{F-\theNbequa}{E-\theNbequa}{$\xintifboolexpr{#2>0}{-\num{#2}}{+\num{\fpeval{0-#2}}}\useKV[ClesEquation]{Lettre}$} + }{} + \xintifboolexpr{\Coeffa=1}{}{%\ifnum\cmtd>1 + \tikzmark{D-\theNbequa}\frac{\num{\Coeffb}}{\num{\Coeffa}}&=\useKV[ClesEquation]{Lettre}\tikzmark{H-\theNbequa}%\\ + \ifboolKV[ClesEquation]{Fleches}{% + \leftcomment{B-\theNbequa}{D-\theNbequa}{A-\theNbequa}{$\div\xintifboolexpr{\Coeffa<0}{(\num{\Coeffa})}{\num{\Coeffa}}$}% + \rightcomment{F-\theNbequa}{H-\theNbequa}{E-\theNbequa}{$\div\xintifboolexpr{\Coeffa<0}{(\num{\Coeffa})}{\num{\Coeffa}}$}% + }{ + \ifboolKV[ClesEquation]{FlecheDiv}{% + \leftcomment{B-\theNbequa}{D-\theNbequa}{A-\theNbequa}{$\div\xintifboolexpr{\Coeffa<0}{(\num{\Coeffa})}{\num{\Coeffa}}$}% + \rightcomment{F-\theNbequa}{H-\theNbequa}{E-\theNbequa}{$\div\xintifboolexpr{\Coeffa<0}{(\num{\Coeffa})}{\num{\Coeffa}}$}% + }{} + } + \ifboolKV[ClesEquation]{Entier}{% + \SSimpliTest{\Coeffb}{\Coeffa}% + \ifboolKV[ClesEquation]{Simplification}{% + \ifthenelse{\boolean{Simplification}}{\\\SSimplifie{\Coeffb}{\Coeffa}&=\useKV[ClesEquation]{Lettre}}{}%\\ + }{} + }{} + } + \ifboolKV[ClesEquation]{Fleches}{\stepcounter{Nbequa}}{\ifboolKV[ClesEquation]{FlecheDiv}{\stepcounter{Nbequa}}{}} + \end{align*} + \ifboolKV[ClesEquation]{Solution}{L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}$ a une unique solution : \opdiv*{\Coeffb}{\Coeffa}{solution}{resteequa}\opcmp{resteequa}{0}$\ifboolKV[ClesEquation]{LettreSol}{\useKV[ClesEquation]{Lettre}=}{}\displaystyle\ifopeq\opexport{solution}{\solution}\num{\solution}\else\ifboolKV[ClesEquation]{Entier}{\SSimplifie{\Coeffb}{\Coeffa}}{\frac{\num{\Coeffb}}{\num{\Coeffa}}}\fi$.}{}% }% }% - \fi + }% }% + \fi +}% \newcommand{\ResolEquationComposition}[5][]{% @@ -159,7 +159,7 @@ \xintifboolexpr{#2=0}{% \xintifboolexpr{#4=0}{% \xintifboolexpr{#3=#5}{%b=d - L'équation $\num{#3}=\num{#5}$ a une infinité de solution.}% + L'équation $\num{#3}=\num{#5}$ a une infinité de solutions.}% {%b<>d L'équation $\num{#3}=\num{#5}$ n'a aucune solution.% }% @@ -186,7 +186,7 @@ {%ax+b=cx+d -- ici \xintifboolexpr{#2=#4}{% \xintifboolexpr{#3=#5}{%b=d - L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#5>0}{+\num{#5}}{-\num{\fpeval{0-#5}}}$ a une infinité de solution.}% + L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#5>0}{+\num{#5}}{-\num{\fpeval{0-#5}}}$ a une infinité de solutions.}% {%b<>d L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#5>0}{+\num{#5}}{-\num{\fpeval{0-#5}}}$ n'a aucune solution.% }% @@ -227,7 +227,7 @@ } \ifboolKV[ClesEquation]{Fleches}{\stepcounter{Nbequa}}{\ifboolKV[ClesEquation]{FlecheDiv}{\stepcounter{Nbequa}}{}} \end{align*} - \ifboolKV[ClesEquation]{Solution}{L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#5>0}{+\num{#5}}{-\num{\fpeval{0-#5}}}$ a une unique solution : \opdiv*{\Coeffb}{\Coeffa}{solution}{resteequa}\opcmp{resteequa}{0}$\useKV[ClesEquation]{Lettre}=\displaystyle\ifopeq\opexport{solution}{\solution}\num{\solution}\else\ifboolKV[ClesEquation]{Entier}{\SSimplifie{\Coeffb}{\Coeffa}}{\frac{\num{\Coeffb}}{\num{\Coeffa}}}\fi$.% + \ifboolKV[ClesEquation]{Solution}{L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#5>0}{+\num{#5}}{-\num{\fpeval{0-#5}}}$ a une unique solution : \opdiv*{\Coeffb}{\Coeffa}{solution}{resteequa}\opcmp{resteequa}{0}$\ifboolKV[ClesEquation]{LettreSol}{\useKV[ClesEquation]{Lettre}=}{}\displaystyle\ifopeq\opexport{solution}{\solution}\num{\solution}\else\ifboolKV[ClesEquation]{Entier}{\SSimplifie{\Coeffb}{\Coeffa}}{\frac{\num{\Coeffb}}{\num{\Coeffa}}}\fi$.% }{} }{%ax+b=cx+d avec a<c % Autre cas délicat \ifboolKV[ClesEquation]{Decomposition}{\colorlet{Ccompo}{\useKV[ClesEquation]{CouleurCompo}}}{}% @@ -264,7 +264,7 @@ } \ifboolKV[ClesEquation]{Fleches}{\stepcounter{Nbequa}}{\ifboolKV[ClesEquation]{FlecheDiv}{\stepcounter{Nbequa}}{}} \end{align*} - \ifboolKV[ClesEquation]{Solution}{L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#5>0}{+\num{#5}}{-\num{\fpeval{0-#5}}}$ a une unique solution : \opdiv*{\Coeffb}{\Coeffa}{solution}{resteequa}\opcmp{resteequa}{0}$\useKV[ClesEquation]{Lettre}=\displaystyle\ifopeq\opexport{solution}{\solution}\num{\solution}\else\ifboolKV[ClesEquation]{Entier}{\SSimplifie{\Coeffb}{\Coeffa}}{\frac{\num{\Coeffb}}{\num{\Coeffa}}}\fi$.% + \ifboolKV[ClesEquation]{Solution}{L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#5>0}{+\num{#5}}{-\num{\fpeval{0-#5}}}$ a une unique solution : \opdiv*{\Coeffb}{\Coeffa}{solution}{resteequa}\opcmp{resteequa}{0}$\ifboolKV[ClesEquation]{LettreSol}{\useKV[ClesEquation]{Lettre}=}{}\displaystyle\ifopeq\opexport{solution}{\solution}\num{\solution}\else\ifboolKV[ClesEquation]{Entier}{\SSimplifie{\Coeffb}{\Coeffa}}{\frac{\num{\Coeffb}}{\num{\Coeffa}}}\fi$.% }{}% }% }% @@ -272,6 +272,4 @@ }% }% }% -}% - - +}%
\ No newline at end of file diff --git a/macros/latex/contrib/profcollege/latex/PfC-EquationSoustraction1.tex b/macros/latex/contrib/profcollege/latex/PfC-EquationSoustraction2.tex index 034aa7e2ed..f3ffd9453d 100644 --- a/macros/latex/contrib/profcollege/latex/PfC-EquationSoustraction1.tex +++ b/macros/latex/contrib/profcollege/latex/PfC-EquationSoustraction2.tex @@ -11,15 +11,15 @@ % si non, on est dans le cas ax=d \xintifboolexpr{#2=0}{% \xintifboolexpr{#5=0}{% - L'équation $0\useKV[ClesEquation]{ELettre}=0$ a une infinité de solution.}{L'équation $0\useKV[ClesEquation]{Lettre}=\num{#5}$ n'a aucune solution.}% + L'équation $0\useKV[ClesEquation]{ELettre}=0$ a une infinité de solutions.}{L'équation $0\useKV[ClesEquation]{Lettre}=\num{#5}$ n'a aucune solution.}% }{%\else \xintifboolexpr{#5=0}{L'équation $\num{#2}\useKV[ClesEquation]{Lettre}=0$ a une unique solution : $\useKV[ClesEquation]{Lettre}=0$.}{%\else \begin{align*}% \tikzmark{A-\theNbequa}\xintifboolexpr{#2=1}{\useKV[ClesEquation]{Lettre}}{\num{#2}\useKV[ClesEquation]{Lettre}}&=\num{#5}\tikzmark{C-\theNbequa}\\ \tikzmark{B-\theNbequa}\useKV[ClesEquation]{Lettre}&=\frac{\num{#5}}{\num{#2}}\tikzmark{D-\theNbequa}%\\ \ifboolKV[ClesEquation]{Fleches}{% - \leftcomment{A-\theNbequa}{B-\theNbequa}{A-\theNbequa}{$\div\xintifboolexpr{#2<0}{(\num{#2})}{\num{#2}}$}% - \rightcomment{C-\theNbequa}{D-\theNbequa}{D-\theNbequa}{$\div\xintifboolexpr{#2<0}{(\num{#2})}{\num{#2}}$}% + \leftcomment{A-\theNbequa}{B-\theNbequa}{A-\theNbequa}{$\div\xintifboolexpr{#2<0}{(\num{#2})}{\num{#2}}$}% + \rightcomment{C-\theNbequa}{D-\theNbequa}{D-\theNbequa}{$\div\xintifboolexpr{#2<0}{(\num{#2})}{\num{#2}}$}% }{% \ifboolKV[ClesEquation]{FlecheDiv}{% \Leftcomment{A-\theNbequa}{B-\theNbequa}{A-\theNbequa}{$\div\xintifboolexpr{#2<0}{(\num{#2})}{\num{#2}}$}% @@ -27,17 +27,17 @@ }{}% }%% \ifboolKV[ClesEquation]{Entier}{% - \SSimpliTest{#5}{#2}% - \ifboolKV[ClesEquation]{Simplification}{% - \ifthenelse{\boolean{Simplification}}{\\\useKV[ClesEquation]{Lettre}&=\SSimplifie{#5}{#2}}{}%\\ - }{} - }{} + \SSimpliTest{#5}{#2}% + \ifboolKV[ClesEquation]{Simplification}{% + \ifthenelse{\boolean{Simplification}}{\\\useKV[ClesEquation]{Lettre}&=\SSimplifie{#5}{#2}}{}%\\ + }{} + }{} \ifboolKV[ClesEquation]{Fleches}{% \stepcounter{Nbequa}}% {\ifboolKV[ClesEquation]{FlecheDiv}{\stepcounter{Nbequa}}{} } \end{align*} - \ifboolKV[ClesEquation]{Solution}{L'équation $\xintifboolexpr{#2=1}{\useKV[ClesEquation]{Lettre}=\num{#5}}{\num{#2}\useKV[ClesEquation]{Lettre}=\num{#5}}$ a une unique solution : $\displaystyle\useKV[ClesEquation]{Lettre}=\opdiv*{#5}{#2}{numequa}{resteequa}\opcmp{resteequa}{0}\ifopeq\opexport{numequa}{\numequa}\num{\numequa}\else\ifboolKV[ClesEquation]{Simplification}{\SSimplifie{#5}{#2}}{\frac{\num{#5}}{\num{#2}}}\fi$.% + \ifboolKV[ClesEquation]{Solution}{L'équation $\xintifboolexpr{#2=1}{\useKV[ClesEquation]{Lettre}=\num{#5}}{\num{#2}\useKV[ClesEquation]{Lettre}=\num{#5}}$ a une unique solution : $\displaystyle\ifboolKV[ClesEquation]{LettreSol}{\useKV[ClesEquation]{Lettre}=}{}\opdiv*{#5}{#2}{numequa}{resteequa}\opcmp{resteequa}{0}\ifopeq\opexport{numequa}{\numequa}\num{\numequa}\else\ifboolKV[ClesEquation]{Simplification}{\SSimplifie{#5}{#2}}{\frac{\num{#5}}{\num{#2}}}\fi$.% }{} } } @@ -52,7 +52,7 @@ \else%cas ax+b=d \xintifboolexpr{#2=0}{% \xintifboolexpr{#3=#5}{%b=d - L'équation $\num{#3}=\num{#5}$ a une infinité de solution.}% + L'équation $\num{#3}=\num{#5}$ a une infinité de solutions.}% {%b<>d L'équation $\num{#3}=\num{#5}$ n'a aucune solution.% }% @@ -65,7 +65,8 @@ \ifboolKV[ClesEquation]{Decomposition}{% \xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}\mathcolor{Cdecomp}{\xintifboolexpr{#3>0}{-\num{#3}}{+\num{\fpeval{0-#3}}}}&=\num{#5}\mathcolor{Cdecomp}{\xintifboolexpr{#3>0}{-\num{#3}}{+\num{\fpeval{0-#3}}}}\\ }{}% - \tikzmark{C-\theNbequa}\xdef\Coeffa{#2}\xdef\Coeffb{\fpeval{#5-#3}}\xintifboolexpr{\Coeffa=1}{}{\num{\Coeffa}}\useKV[ClesEquation]{Lettre}&=\num{\Coeffb}\tikzmark{G-\theNbequa}%\\ + \tikzmark{C-\theNbequa}\xdef\Coeffa{#2}\xdef\Coeffb{\fpeval{#5-#3}}\xintifboolexpr{\Coeffa=1}{}{\num{\Coeffa}}\useKV[ClesEquation]{Lettre}&=\num{\Coeffb}\tikzmark{G-\theNbequa} + \ifboolKV[ClesEquation]{Decomposition}{\\\xintifboolexpr{\Coeffa=1}{}{\frac{\num{\Coeffa}}{\mathcolor{Cdecomp}{\num{\Coeffa}}}\useKV[ClesEquation]{Lettre}&=\frac{\num{\Coeffb}}{\mathcolor{Cdecomp}{\num{\Coeffa}}}}}{} \xintifboolexpr{\Coeffa=1}{}{\\} \ifboolKV[ClesEquation]{Fleches}{% \leftcomment{A-\theNbequa}{C-\theNbequa}{A-\theNbequa}{$\xintifboolexpr{#3>0}{-\num{#3}}{+\num{\fpeval{0-#3}}}$}% @@ -92,7 +93,7 @@ }{} \ifboolKV[ClesEquation]{Fleches}{\stepcounter{Nbequa}}{\ifboolKV[ClesEquation]{FlecheDiv}{\stepcounter{Nbequa}}{}} \end{align*} - \ifboolKV[ClesEquation]{Solution}{L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}=\num{#5}$ a une unique solution : \opdiv*{\Coeffb}{\Coeffa}{solution}{resteequa}\opcmp{resteequa}{0}$\useKV[ClesEquation]{Lettre}=\displaystyle\ifopeq\opexport{solution}{\solution}\num{\solution}\else\ifboolKV[ClesEquation]{Entier}{\SSimplifie{\Coeffb}{\Coeffa}}{\frac{\num{\Coeffb}}{\num{\Coeffa}}}\fi$. + \ifboolKV[ClesEquation]{Solution}{L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}=\num{#5}$ a une unique solution : \opdiv*{\Coeffb}{\Coeffa}{solution}{resteequa}\opcmp{resteequa}{0}$\ifboolKV[ClesEquation]{LettreSol}{\useKV[ClesEquation]{Lettre}=}{}\displaystyle\ifopeq\opexport{solution}{\solution}\num{\solution}\else\ifboolKV[ClesEquation]{Entier}{\SSimplifie{\Coeffb}{\Coeffa}}{\frac{\num{\Coeffb}}{\num{\Coeffa}}}\fi$. }{} } } @@ -117,7 +118,7 @@ }{%ax+b=cx \xintifboolexpr{#2=#4}{% \xintifboolexpr{#3=0}{%ax=ax - L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}$ a une infinité de solution.}% + L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}$ a une infinité de solutions.}% {%ax+b=ax L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}$ n'a aucune solution.% }% @@ -132,7 +133,10 @@ \ifboolKV[ClesEquation]{Decomposition}{% \xintifboolexpr{\Coeffa=1}{}{\num{\Coeffa}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}\mathcolor{Cdecomp}{\xintifboolexpr{#3>0}{-\num{#3}}{+\num{\fpeval{0-#3}}}}&=0\mathcolor{Cdecomp}{\xintifboolexpr{#3>0}{-\num{#3}}{+\num{\fpeval{0-#3}}}}\tikzmark{F-\theNbequa}\\ }{}% - \tikzmark{C-\theNbequa}\xdef\Coeffb{\fpeval{0-#3}}\xintifboolexpr{\Coeffa=1}{}{\num{\Coeffa}}\useKV[ClesEquation]{Lettre}&=\num{\Coeffb}\tikzmark{G-\theNbequa}%\\ + \tikzmark{C-\theNbequa}\xdef\Coeffb{\fpeval{0-#3}}\xintifboolexpr{\Coeffa=1}{}{\num{\Coeffa}}\useKV[ClesEquation]{Lettre}&=\num{\Coeffb}\tikzmark{G-\theNbequa}%\\ + %eric + \ifboolKV[ClesEquation]{Decomposition}{\\\xintifboolexpr{\Coeffa=1}{}{\frac{\num{\Coeffa}}{\mathcolor{Cdecomp}{\num{\Coeffa}}}\useKV[ClesEquation]{Lettre}&=\frac{\num{\Coeffb}}{\mathcolor{Cdecomp}{\num{\Coeffa}}}}}{} + % eric \xintifboolexpr{\Coeffa=1}{}{\\} \ifboolKV[ClesEquation]{Fleches}{% \leftcomment{A-\theNbequa}{B-\theNbequa}{A-\theNbequa}{$\xintifboolexpr{#4>0}{-\num{#4}}{+\num{\fpeval{0-#4}}}\useKV[ClesEquation]{Lettre}$} @@ -160,7 +164,7 @@ } \ifboolKV[ClesEquation]{Fleches}{\stepcounter{Nbequa}}{\ifboolKV[ClesEquation]{FlecheDiv}{\stepcounter{Nbequa}}{}} \end{align*} - \ifboolKV[ClesEquation]{Solution}{L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}$ a une unique solution : \opdiv*{\Coeffb}{\Coeffa}{solution}{resteequa}\opcmp{resteequa}{0}$\useKV[ClesEquation]{Lettre}=\displaystyle\ifopeq\opexport{solution}{\solution}\num{\solution}\else\ifboolKV[ClesEquation]{Entier}{\SSimplifie{\Coeffb}{\Coeffa}}{\frac{\num{\Coeffb}}{\num{\Coeffa}}}\fi$.}{} + \ifboolKV[ClesEquation]{Solution}{L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}$ a une unique solution : \opdiv*{\Coeffb}{\Coeffa}{solution}{resteequa}\opcmp{resteequa}{0}$\ifboolKV[ClesEquation]{LettreSol}{\useKV[ClesEquation]{Lettre}=}{}\displaystyle\ifopeq\opexport{solution}{\solution}\num{\solution}\else\ifboolKV[ClesEquation]{Entier}{\SSimplifie{\Coeffb}{\Coeffa}}{\frac{\num{\Coeffb}}{\num{\Coeffa}}}\fi$.}{} }{%ax+b=cx+d avec a<c % Autre cas délicat \begin{align*}% \tikzmark{A-\theNbequa}\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}&=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}\tikzmark{E-\theNbequa}\\ @@ -173,6 +177,9 @@ \leftcomment{A-\theNbequa}{B-\theNbequa}{A-\theNbequa}{$\xintifboolexpr{#2>0}{-\num{#2}}{+\num{\fpeval{0-#2}}}\useKV[ClesEquation]{Lettre}$} \rightcomment{E-\theNbequa}{F-\theNbequa}{E-\theNbequa}{$\xintifboolexpr{#2>0}{-\num{#2}}{+\num{\fpeval{0-#2}}}\useKV[ClesEquation]{Lettre}$} }{} + % eric + \ifboolKV[ClesEquation]{Decomposition}{\\\xintifboolexpr{\Coeffa=1}{}{\frac{\num{\Coeffb}}{\mathcolor{Cdecomp}{\num{\Coeffa}}}&=\frac{\num{\Coeffa}}{\mathcolor{Cdecomp}{\num{\Coeffa}}}\useKV[ClesEquation]{Lettre}}}{} + % eric \xintifboolexpr{\Coeffa=1}{}{%\ifnum\cmtd>1 \tikzmark{D-\theNbequa}\frac{\num{\Coeffb}}{\num{\Coeffa}}&=\useKV[ClesEquation]{Lettre}\tikzmark{H-\theNbequa}%\\ \ifboolKV[ClesEquation]{Fleches}{% @@ -193,7 +200,7 @@ } \ifboolKV[ClesEquation]{Fleches}{\stepcounter{Nbequa}}{\ifboolKV[ClesEquation]{FlecheDiv}{\stepcounter{Nbequa}}{}} \end{align*} - \ifboolKV[ClesEquation]{Solution}{L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}$ a une unique solution : \opdiv*{\Coeffb}{\Coeffa}{solution}{resteequa}\opcmp{resteequa}{0}$\useKV[ClesEquation]{Lettre}=\displaystyle\ifopeq\opexport{solution}{\solution}\num{\solution}\else\ifboolKV[ClesEquation]{Entier}{\SSimplifie{\Coeffb}{\Coeffa}}{\frac{\num{\Coeffb}}{\num{\Coeffa}}}\fi$.}{}% + \ifboolKV[ClesEquation]{Solution}{L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}$ a une unique solution : \opdiv*{\Coeffb}{\Coeffa}{solution}{resteequa}\opcmp{resteequa}{0}$\ifboolKV[ClesEquation]{LettreSol}{\useKV[ClesEquation]{Lettre}=}{}\displaystyle\ifopeq\opexport{solution}{\solution}\num{\solution}\else\ifboolKV[ClesEquation]{Entier}{\SSimplifie{\Coeffb}{\Coeffa}}{\frac{\num{\Coeffb}}{\num{\Coeffa}}}\fi$.}{}% }% }% }% @@ -208,7 +215,7 @@ \xintifboolexpr{#2=0}{% \xintifboolexpr{#4=0}{% \xintifboolexpr{#3=#5}{%b=d - L'équation $\num{#3}=\num{#5}$ a une infinité de solution.}% + L'équation $\num{#3}=\num{#5}$ a une infinité de solutions.}% {%b<>d L'équation $\num{#3}=\num{#5}$ n'a aucune solution.% }% @@ -235,7 +242,7 @@ {%ax+b=cx+d -- ici \xintifboolexpr{#2=#4}{% \xintifboolexpr{#3=#5}{%b=d - L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#5>0}{+\num{#5}}{-\num{\fpeval{0-#5}}}$ a une infinité de solution.}% + L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#5>0}{+\num{#5}}{-\num{\fpeval{0-#5}}}$ a une infinité de solutions.}% {%b<>d L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#5>0}{+\num{#5}}{-\num{\fpeval{0-#5}}}$ n'a aucune solution.% }% @@ -252,6 +259,9 @@ \xintifboolexpr{\Coeffa=1}{}{\num{\Coeffa}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}\mathcolor{Cdecomp}{\xintifboolexpr{#3>0}{-\num{#3}}{+\num{\fpeval{0-#3}}}}&=\num{#5}\mathcolor{Cdecomp}{\xintifboolexpr{#3>0}{-\num{#3}}{+\num{\fpeval{0-#3}}}}\\ }{}% \tikzmark{C-\theNbequa}\xdef\Coeffb{\fpeval{#5-#3}}\xintifboolexpr{\Coeffa=1}{}{\num{\Coeffa}}\useKV[ClesEquation]{Lettre}&=\num{\Coeffb}\tikzmark{G-\theNbequa}%\\ + % eric + \ifboolKV[ClesEquation]{Decomposition}{\\\xintifboolexpr{\Coeffa=1}{}{\frac{\num{\Coeffa}}{\mathcolor{Cdecomp}{\num{\Coeffa}}}\useKV[ClesEquation]{Lettre}&=\frac{\num{\Coeffb}}{\mathcolor{Cdecomp}{\num{\Coeffa}}}}}{} + % eric \xintifboolexpr{\Coeffa=1}{}{\\} \ifboolKV[ClesEquation]{Fleches}{% \leftcomment{A-\theNbequa}{B-\theNbequa}{A-\theNbequa}{$\xintifboolexpr{#4>0}{-\num{#4}}{+\num{\fpeval{0-#4}}}\useKV[ClesEquation]{Lettre}$} @@ -279,7 +289,7 @@ } \ifboolKV[ClesEquation]{Fleches}{\stepcounter{Nbequa}}{\ifboolKV[ClesEquation]{FlecheDiv}{\stepcounter{Nbequa}}{}} \end{align*} - \ifboolKV[ClesEquation]{Solution}{L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#5>0}{+\num{#5}}{-\num{\fpeval{0-#5}}}$ a une unique solution : \opdiv*{\Coeffb}{\Coeffa}{solution}{resteequa}\opcmp{resteequa}{0}$\useKV[ClesEquation]{Lettre}=\displaystyle\ifopeq\opexport{solution}{\solution}\num{\solution}\else\ifboolKV[ClesEquation]{Entier}{\SSimplifie{\Coeffb}{\Coeffa}}{\frac{\num{\Coeffb}}{\num{\Coeffa}}}\fi$.% + \ifboolKV[ClesEquation]{Solution}{L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#5>0}{+\num{#5}}{-\num{\fpeval{0-#5}}}$ a une unique solution : \opdiv*{\Coeffb}{\Coeffa}{solution}{resteequa}\opcmp{resteequa}{0}$\ifboolKV[ClesEquation]{LettreSol}{\useKV[ClesEquation]{Lettre}=}{}\displaystyle\ifopeq\opexport{solution}{\solution}\num{\solution}\else\ifboolKV[ClesEquation]{Entier}{\SSimplifie{\Coeffb}{\Coeffa}}{\frac{\num{\Coeffb}}{\num{\Coeffa}}}\fi$.% }{} }{%ax+b=cx+d avec a<c % Autre cas délicat \begin{align*}% @@ -292,6 +302,9 @@ \num{#3}\mathcolor{Cdecomp}{\xintifboolexpr{#5>0}{-\num{#5}}{+\num{\fpeval{0-#5}}}}&=\xintifboolexpr{\Coeffa=1}{}{\num{\Coeffa}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#5>0}{+\num{#5}}{-\num{\fpeval{0-#5}}}\mathcolor{Cdecomp}{\xintifboolexpr{#5>0}{-\num{#5}}{+\num{\fpeval{0-#5}}}}\\ }{}% \tikzmark{C-\theNbequa}\xdef\Coeffb{\fpeval{#3-#5}}\num{\Coeffb}&=\xintifboolexpr{\Coeffa=1}{}{\num{\Coeffa}}\useKV[ClesEquation]{Lettre}\tikzmark{G-\theNbequa}%\\ + % eric + \ifboolKV[ClesEquation]{Decomposition}{\\\xintifboolexpr{\Coeffa=1}{}{\frac{\num{\Coeffb}}{\mathcolor{Cdecomp}{\num{\Coeffa}}}&=\frac{\num{\Coeffa}}{\mathcolor{Cdecomp}{\num{\Coeffa}}}\useKV[ClesEquation]{Lettre}}}{} + % eric \xintifboolexpr{\Coeffa=1}{}{\\} \ifboolKV[ClesEquation]{Fleches}{% \leftcomment{A-\theNbequa}{B-\theNbequa}{A-\theNbequa}{$\xintifboolexpr{#2>0}{-\num{#2}}{+\num{\fpeval{0-#2}}}\useKV[ClesEquation]{Lettre}$} @@ -319,7 +332,7 @@ } \ifboolKV[ClesEquation]{Fleches}{\stepcounter{Nbequa}}{\ifboolKV[ClesEquation]{FlecheDiv}{\stepcounter{Nbequa}}{}} \end{align*} - \ifboolKV[ClesEquation]{Solution}{L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#5>0}{+\num{#5}}{-\num{\fpeval{0-#5}}}$ a une unique solution : \opdiv*{\Coeffb}{\Coeffa}{solution}{resteequa}\opcmp{resteequa}{0}$\useKV[ClesEquation]{Lettre}=\displaystyle\ifopeq\opexport{solution}{\solution}\num{\solution}\else\ifboolKV[ClesEquation]{Entier}{\SSimplifie{\Coeffb}{\Coeffa}}{\frac{\num{\Coeffb}}{\num{\Coeffa}}}\fi$.% + \ifboolKV[ClesEquation]{Solution}{L'équation $\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}=\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#5>0}{+\num{#5}}{-\num{\fpeval{0-#5}}}$ a une unique solution : \opdiv*{\Coeffb}{\Coeffa}{solution}{resteequa}\opcmp{resteequa}{0}$\ifboolKV[ClesEquation]{LettreSol}{\useKV[ClesEquation]{Lettre}=}{}\displaystyle\ifopeq\opexport{solution}{\solution}\num{\solution}\else\ifboolKV[ClesEquation]{Entier}{\SSimplifie{\Coeffb}{\Coeffa}}{\frac{\num{\Coeffb}}{\num{\Coeffa}}}\fi$.% }{}% }% }% diff --git a/macros/latex/contrib/profcollege/latex/ProfCollege.sty b/macros/latex/contrib/profcollege/latex/ProfCollege.sty index 121428955b..215caf5503 100644 --- a/macros/latex/contrib/profcollege/latex/ProfCollege.sty +++ b/macros/latex/contrib/profcollege/latex/ProfCollege.sty @@ -1,65 +1,11 @@ % Author : Christophe Poulain % Licence : Released under the LaTeX Project Public License v1.3c % or later, see http://www.latex-project.org/lppl.txtf -%%%%%%% -% 90 : Reprise d'une partie de la doc. Quelques ajouts. -% 87-88 : amélioration \Thales. \Labyrinthe. -% 85 : passage à lua. -% 75 : plein de choses que j'ai oubliées :( -% 71 : Possibilité de choisir les fontes pour les figures MP -% 70 : Ajout de la commande \calculatrice. Coupure des calculs longs -% pour la moyenne et médiane. Egalités remarquables pour le -% développement. Tableau vide pour les stats. -% 67 : préparation au dépôt sur ctan.org -% 66 : Ajout de la commande \Ratio. -% 62 : Refonte des commandes !\Result! - Ajout d'une commande \Result -% dans SommeAngles. Rectification espace dans \Distri avec Reduction active. -% 61 : Simplication d'une fraction en version longue :) - Ajout -% d'options à la commande \lstinline!\Stat!. Ajout d'options à la -% commande \lstinline!\Thales!. -% 60 : Nouvelle présentation de la résolution d'une équation. Reprise -% et ajout d'une clé à la commande \SommeAngles. -% 59 : amélioration de la macro \Pythagore pour pouvoir enchaîner les -% calculs. Amélioration de la macro \Reperage pour améliorer -% la gestion de l'affichage sur les droites graduées. -% 58 : ajout d'un affichage des angles dans les diagrammes circulaires. -% 57 : ajout de la commande \Fraction. Ajout d'un VF dans la macro \QCM -% 56 : ajout de commandes "utiles" :) / Modification de \SommeAngles -% pour éviter les conflits. -% 55 : ajout d'une clé \Cle{Longue} dans la commande \Décomposition -% 54 : adaptations mineures :) à gmp -% 53 : ajout de la commande \QFlash -% 52 : ajout de la macro \QCM -% 51 : ajout de la macro \Relie -% 50 : Changement des clés. -% 37 : Reprise de la macro \Distri pour qu'elle accepte des valeurs -%décimales. -% 36 : Ajout d'un développement numérique. Reprise de la décomposition -% des nombres premiers (pour éviter conflit entre \newcount\c et la -% commande \c... Suppression de "spurious blank" -% 35 : Ajout d'une quatrième version de présentation de la résolution -% d'une équation - Nouvelle macro : Puissances. Ajout d'une option -% \EFacteurs pour les équations produit nul. Amélioration (rédaction) -% de \FonctionAffine - Ajout de la couleur de fond paramétrable dans -% les fleches PH et BH de \Propor -% 34 : Ajout de la commande \ResultatTrigo, \ResultatThalesx... Suppression de spurious blank. Corrections typographiques. Reprise de l'affichage de la moyenne dans la commande \Stat -% 33 : MAJ Distri : Problème d'espace en utilisant les nombres négatifs (1ere étape). -% 32 : MAJ Pythagore : Ajout de la clé PUnite - Possibilité de récupérer la valeur numérique obtenue par la macro Pythagore - Justification des textes dans les bulles. Ajout d'un FlecheCoefDebut dans \Propor. -% 31 : MAJ Pourcentage. Correction quelques bugs. Correction de \og spurious blank\fg. Oubli du RequirePackage{multido} :( -% 29 : MAJ Trigo (figure reprise pour utiliser \num de siunitx) -% 28 : Mise à jour de \Propor : flèches inversées \FlechesPH et \FlechesPB, homogénéité des flèches. Pourcentage. -% 27 : ajout du repérage -% 26 : ajout des schémas de proba + MAJ avec geometriesyr16 + MAJ Nombre premier. -% 25 : ajout des formules -% 24 : ajout d'une option pour les équations $X^2=a$ -% 23 : ajout d'une option pour les équations produit. -% 22 : ajout d'une option TColonnes dans la macro Tableaux -% 21 : Ajout d'une vérification dans la macro \ResolEquation - Correction de quelques bugs dans la résolution d'équation. -% 20: ajout d'une macro simpliste (car pas beaucoup d'utilité) sur les fonctions. -% 19 : Modification AAntécédent dans Affine + Amélioration Pythagore (Cas des triangles rectangles isocèles, dans le calcul de la longueur d'un côté) \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{ProfCollege}[2021/01/30 v0.90 Aide pour l'utilisation de LaTeX au collège] +\ProvidesPackage{ProfCollege}[2021/03/10 v0.95 Aide pour l'utilisation de LaTeX au collège] + +\RequirePackage{verbatim} \RequirePackage{mathtools}%Amélioration des rendus \RequirePackage{amssymb} @@ -77,6 +23,14 @@ \newcommand\speed[1]{\SI{#1}{\kmh}} \newcommand\Speed[1]{\SI[per-mode=symbol]{#1}{\kmh}} +\DeclareSIUnit{\are}{a} +\DeclareSIUnit{\annee}{an} +\DeclareSIUnit{\mois}{mois} +\DeclareSIUnit{\jour}{j} +\DeclareSIUnit{\quintal}{q} +\DeclareSIUnit{\octet}{o} +\DeclareSIUnit{\fahrenheit}{\degree F} + \RequirePackage[table,svgnames]{xcolor}%Gestion des couleurs \RequirePackage{xstring}%Gestion de chaines de caractères \RequirePackage{simplekv}%Gestion de paramètres sous forme de clés @@ -90,24 +44,24 @@ \if@shellescape \RequirePackage[shellescape,latex]{gmp}%inclusion de figures metapost "à la volée"% -\gmpoptions{everymp={prologues:=3; input PfC-LaTeX; input PfC-Svgnames; input PfC-Constantes; input PfC-Geometrie;}} +\gmpoptions{everymp={prologues:=3; input PfC-LaTeX; input PfC-Svgnames; input PfC-Constantes; input PfC-Geometrie; input PfC-Afficheur;}} \usempxclass{article} +\usempxpackage{ProfCollege} \usempxpackage[utf8]{inputenc} \usempxpackage[T1]{fontenc} \usempxpackage{fourier} \usempxpackage[french]{babel} \usempxpackage{pifont} -\usempxpackage[locale=FR]{siunitx} \else \RequirePackage[latex]{gmp}%inclusion de figures metapost "à la volée"% -\gmpoptions{everymp={prologues:=3; input PfC-LaTeX; input PfC-Svgnames; input PfC-Constantes; input PfC-Geometrie;}} +\gmpoptions{everymp={prologues:=3; input PfC-LaTeX; input PfC-Svgnames; input PfC-Constantes; input PfC-Geometrie; input PfC-Afficheur;}} \usempxclass{article} +\usempxpackage{ProfCollege} \usempxpackage[utf8]{inputenc} \usempxpackage[T1]{fontenc} \usempxpackage{fourier} \usempxpackage[french]{babel} \usempxpackage{pifont} -\usempxpackage[locale=FR]{siunitx} \fi \RequirePackage{xintexpr} @@ -138,17 +92,15 @@ \RequirePackage{stackengine} \RequirePackage[thicklines]{cancel} -%\ifpdftex -%\RequirePackage[babel=true,kerning=true]{microtype}%Pour gérer le souci du ; dans tikz avec pdftex... -%\fi +\RequirePackage{nicematrix}%pour le tableur % https://stackoverflow.com/questions/3391103/how-to-make-the-grayed-round-box-using-tiks \RequirePackage{environ} +% -%%% 80 \ifluatex \RequirePackage{luamplib} -\everymplib{input PfC-Svgnames; input PfC-Constantes; input PfC-Geometrie; beginfig(1);} +\everymplib{input PfC-Svgnames; input PfC-Constantes; input PfC-Geometrie; input PfC-Afficheur; beginfig(1);} \everyendmplib{endfig;} \fi @@ -180,9 +132,9 @@ \hfil\crcr #1\crcr}}\,} \catcode`\@=12 -%%%%%%%%%%%%%%%%%%%%% +%%% %% Commandes "utiles" -%%%%%%%%%%%%%%%%%%%%% +%%% %encadrer avec des "sommets arrondis" \newsavebox{\logobox} @@ -217,9 +169,28 @@ } } -%%%%%%%%%%%%%%%%% +\newcommand\MultiCol[2]{% + \setsepchar[*]{/}% + \readlist*\ListeNombreCol{#1}% + \setsepchar[*]{§}% + \readlist*\ListeContenuCol{#2}% + \xintFor* ##1 in {\xintSeq {1}{\ListeNombreCollen}}\do{% + \begin{minipage}{\ListeNombreCol[##1]\linewidth} + \ListeContenuCol[##1] + \end{minipage}% + \xintifboolexpr{##1<\ListeNombreCollen}{\hfill}{}% + }% +}% + +\newcommand\Demain{% + \advance\day by 1% + \today% + \advance\day by -1% +} + +%%% % Tables Addition-Multiplication -%%%%%%%%%%%%%%%%% +%%% \setKVdefault[Tables]{Addition=false,Multiplication=true,Seul=false,Debut=0,Fin=10,Couleur=white} % pour mémoire @@ -303,7 +274,6 @@ }% }% - \newcommand\Tables[2][]{% \useKVdefault[Tables]% \setKV[Tables]{#1}% @@ -322,15 +292,82 @@ }% }% -%%%%%%%%%%%%%% +%%% +% Rangement des nombres +%%% +\setKVdefault[ClesRgt]{Croissant,Decroissant=false,Strict,Fraction=false,Details=false} + +\DTLgnewdb{mtnumedb}% +\DTLgnewdb{mtnumeretourdb}% + +\newcommand\Rangement[2][]{% + \useKVdefault[ClesRgt]% + \setKV[ClesRgt]{#1}% + \ifboolKV[ClesRgt]{Fraction}{% + \setsepchar[*]{,*/}%\ignoreemptyitems% + \readlist*\ListeRgt{#2}% + % on cherche le dénominateur commun + \ppcm=1\relax + \foreachitem\x\in\ListeRgt{% + \PPCM{\fpeval{\ListeRgt[\xcnt,2]}}{\fpeval{\the\ppcm}}% + }% + % On crée la liste des rangements. + \DTLcleardb{mtnumedb}% + % on les trie pour les ranger par ordre croissant + \foreachitem\x\in\ListeRgt{% + \DTLnewrow{mtnumedb}% + \itemtomacro\ListeRgt[\xcnt,1]\y% + \DTLnewdbentry{mtnumedb}{Numeric}{\fpeval{\y*\the\ppcm/\ListeRgt[\xcnt,2]}}% + }% + % On trie + \ifboolKV[ClesRgt]{Decroissant}{% + % On trie la liste + \dtlsort{Numeric=descending}{mtnumedb}{\dtlicompare}% + \ifboolKV[ClesRgt]{Details}{\ensuremath{\DTLforeach{mtnumedb}{\numeroDonnee=Numeric}{\frac{\num{\numeroDonnee}}{\num{\the\ppcm}}\DTLiflastrow{}{\ifboolKV[ClesRgt]{Strict}{>}{\geqslant}}}}}{% + \ensuremath{\DTLforeach{mtnumedb}{\numeroDonnee=Numeric}{\Simplification{\numeroDonnee}{\ppcm}\DTLiflastrow{}{\ifboolKV[ClesRgt]{Strict}{>}{\geqslant}}}}% + } + }{% + % On trie la liste + \dtlsort{Numeric}{mtnumedb}{\dtlicompare}% + \ifboolKV[ClesRgt]{Details}{% + \ensuremath{\DTLforeach{mtnumedb}{\numeroDonnee=Numeric}{\frac{\num{\numeroDonnee}}{\num{\the\ppcm}}\DTLiflastrow{}{\ifboolKV[ClesRgt]{Strict}{<}{\leqslant}}}}% + }{% + \ensuremath{\DTLforeach{mtnumedb}{\numeroDonnee=Numeric}{\Simplification{\numeroDonnee}{\ppcm}\DTLiflastrow{}{\ifboolKV[ClesRgt]{Strict}{<}{\leqslant}}}}% + } + }% + }{% + \setsepchar{,}\ignoreemptyitems% + \readlist*\ListeRgt{#2}% + % on crée la base de données des valeurs + \DTLcleardb{mtdb}% + % on les trie pour les ranger par ordre croissant + \foreachitem\x\in\ListeRgt{% + \DTLnewrow{mtdb}% + \itemtomacro\ListeRgt[\xcnt]\y% + \DTLnewdbentry{mtdb}{Numeric}{\y}% + }% + % + \ifboolKV[ClesRgt]{Decroissant}{% + % On trie la liste + \dtlsort{Numeric=descending}{mtdb}{\dtlicompare}% + \ensuremath{\DTLforeach{mtdb}{\numeroDonnee=Numeric}{\num{\numeroDonnee}\DTLiflastrow{}{\ifboolKV[ClesRgt]{Strict}{>}{\geqslant}}}}% + }{% + % On trie la liste + \dtlsort{Numeric}{mtdb}{\dtlicompare}% + \ensuremath{\DTLforeach{mtdb}{\numeroDonnee=Numeric}{\num{\numeroDonnee}\DTLiflastrow{}{\ifboolKV[ClesRgt]{Strict}{<}{\leqslant}}}}% + }% + } +}% + +%%% % Labyrinthe -%%%%%%%%%%%%%% +%%% \setKVdefault[Labyrinthe]{Lignes=6,Colonnes=3,Longueur=4,Hauteur=2,Passages=false,EcartH=1,EcartV=1,CouleurF=gray!50,Texte=\color{black}} \newcommand\Labyrinthe[3][]{% \useKVdefault[Labyrinthe]% \setKV[Labyrinthe]{#1}% - \setsepchar[*]{,*/}%\ignoreemptyitems% + \setsepchar[*]{,*/}% \readlist*\ListeLaby{#2}% \ifboolKV[Labyrinthe]{Passages}{% \readlist*\ListeLabySol{#3}% @@ -393,21 +430,21 @@ définitions de {\ttfamily Colonnes} et {\ttfamily Lignes} !}}% } -%%%%%%%%%%%%%%% +%%% % Calculatrice -%%%%%%%%%%%%%%% +%%% %https://tex.stackexchange.com/questions/290321/mimicking-a-calculator-inputs-and-screen -\definecolor{lightorange}{rgb}{0.9,0.4,0} -\definecolor{lightestorange}{rgb}{1,0.8,0.5} -\definecolor{darkorange}{rgb}{0.2,0.1,0} - -\colorlet{blackened}{black!90!white} -\colorlet{blackish}{black!70!white} -\colorlet{greyish}{black!60!white} -\colorlet{whiteish}{white} -\colorlet{orangeish}{yellow!90!red} -\colorlet{greenish}{green!16!gray} -\colorlet{redish}{red!80!black} +\definecolor{lightorange}{rgb}{0.9,0.4,0}% +\definecolor{lightestorange}{rgb}{1,0.8,0.5}% +\definecolor{darkorange}{rgb}{0.2,0.1,0}% + +\colorlet{blackened}{black!90!white}% +\colorlet{blackish}{black!70!white}% +\colorlet{greyish}{black!60!white}% +\colorlet{whiteish}{white}% +\colorlet{orangeish}{yellow!90!red}% +\colorlet{greenish}{green!16!gray}% +\colorlet{redish}{red!80!black}% \tcbset{calbackground/.style={ enhanced, @@ -427,7 +464,7 @@ colbacklower=greenish, colframe=white, autoparskip, - }} + }}% \newtcbox{\KY}[1][]{ enhanced, @@ -444,7 +481,7 @@ fontupper=\footnotesize\sffamily, coltext=orangeish, before upper=\vrule width 0pt height 2ex depth 1ex\relax, -} +}% \newtcbox{\KYm}[1][]{ enhanced, @@ -462,7 +499,7 @@ coltext=orangeish, before upper=\vrule width 0pt height 2ex depth 1ex\relax$, after upper=$, -} +}% \newtcbox{\KN}{ enhanced, @@ -479,9 +516,7 @@ fontupper=\footnotesize\sffamily, coltext=whiteish, before upper=\vrule width 0pt height 2ex depth 1ex\relax, -} - -\parindent0pt +}% \newtcolorbox{calc}[1][]{% enhanced,bicolor, @@ -504,13 +539,13 @@ at (frame.north east) {#1};} } -\def\MPCalculatrice#1#2{ +\def\MPCalculatrice#1#2#3{ % #1 Calcul %2 réponse \ifluatex \mplibforcehmode \begin{mplibcode} input PfC-Calculatrice; - LCD(#1)(#2); + LCD(#1)(#2)(#3); \end{mplibcode} \else \begin{mpost}[mpsettings={input PfC-Calculatrice;}] @@ -519,7 +554,7 @@ \fi } -\setKVdefault[ClesCalculatrice]{Ecran=false} +\setKVdefault[ClesCalculatrice]{Ecran=false,NbLignes=0} \newcommand\Calculatrice[2][]{% \setstackgap{L}{0.775\baselineskip}% @@ -528,7 +563,7 @@ \ifboolKV[ClesCalculatrice]{Ecran}{% \setsepchar[*]{,*/}% \readlist\ListeCalc{#2}% - \MPCalculatrice{\ListeCalc[1,1]}{\ListeCalc[1,2]}% + \MPCalculatrice{\ListeCalc[1,1]}{\ListeCalc[1,2]}{\useKV[ClesCalculatrice]{NbLignes}}% }{% \setsepchar[*]{,*/}% \readlist\ListeCalc{#2}% @@ -538,34 +573,49 @@ \setstackgap{L}{\baselineskip}% }% - -%%%%%%%%%%%%%%%% -%%% Questions Flash -%%%%%%%%%%%%%%%% +%%% +% Questions Flash +%%% \tcbset{Expression/.style={colback=white,valign=center,left=0mm,right=0mm,top=1mm,bottom=1mm,colframe=white}}% \tcbset{ExpressionSerie1/.style={colback=\useKV[ClesFlash]{Couleur1},left=0mm,right=0mm,top=1mm,bottom=1mm}}% \tcbset{ExpressionSerie2/.style={colback=\useKV[ClesFlash]{Couleur2},left=0mm,right=0mm,top=1mm,bottom=1mm}}% \tcbset{ExpressionSerie3/.style={colback=\useKV[ClesFlash]{Couleur3},left=0mm,right=0mm,top=1mm,bottom=1mm}} \tcbset{ExpressionSerie4/.style={colback=\useKV[ClesFlash]{Couleur4},left=0mm,right=0mm,top=1mm,bottom=1mm}} -\tcbset{BoiteExpression/.style={enhanced,nobeforeafter,tcbox raise - base,colback=white,right=3.5mm,left=3.5mm,halign=center,colframe=black}} +\tcbset{BoiteExpression/.style={enhanced,nobeforeafter,tcbox raise base,colback=white,right=3.5mm,left=3.5mm,halign=center,colframe=black}} \newtcolorbox{CadreNombre}[1][]{% Expression,#1} -\setKVdefault[ClesFlash]{Hauteur=0.2\textheight,Simple=false,Intrus=false,Kahout=false,Daily=false,Expression=false,Mental=false,Mesure=false,Heure=false,Decimal=false,Operation=Multiplie,Numeration=false,Evaluation=false,Pause=false,Couleur1=blue!10,Couleur2=orange!10,Couleur3=green!10,Couleur4=yellow!10} +\setKVdefault[ClesFlash]{Hauteur=0.2\textheight,Simple=false,Intrus=false,Kahout=false,Daily=false,Expression=false,Mental=false,Mesure=false,Heure=false,Decimal=false,Operation=Multiplie,Numeration=false,Evaluation=false,Pause=false,Couleur1=blue!10,Couleur2=orange!10,Couleur3=green!10,Couleur4=yellow!10,Numerique=false,Seul=false} \newlength{\HauteurFlash} -\tikzset{ - arrow/.style={ - draw, - minimum height=1.25cm, - inner sep=0.25em, - shape=signal, - signal from=west, - signal to=east, - signal pointer angle=150, - } +\def\MPAfficheur#1#2#3{% + \ifluatex + \mplibforcehmode + \begin{mplibcode} + u:=0.5u; + draw Afficheur(#1 div10,0); + draw Afficheur(#1 mod10,0) shifted(u*(1,0)); + draw Afficheur(10,0) shifted(u*(2,0)); + draw Afficheur(#2 div10,0) shifted(u*(3,0)); + draw Afficheur(#2 mod10,0) shifted(u*(4,0)); + draw Afficheur(10,0) shifted(u*(5,0)); + draw Afficheur(#3 div10,0) shifted(u*(6,0)); + draw Afficheur(#3 mod10,0) shifted(u*(7,0)); + \end{mplibcode} + \else + \begin{mpost} + u:=0.5u; + draw Afficheur(#1 div10,0); + draw Afficheur(#1 mod10,0) shifted(u*(1,0)); + draw Afficheur(10,0) shifted(u*(2,0)); + draw Afficheur(#2 div10,0) shifted(u*(3,0)); + draw Afficheur(#2 mod10,0) shifted(u*(4,0)); + draw Afficheur(10,0) shifted(u*(5,0)); + draw Afficheur(#3 div10,0) shifted(u*(6,0)); + draw Afficheur(#3 mod10,0) shifted(u*(7,0)); + \end{mpost} + \fi } \def\MPHorloge#1#2#3{ @@ -683,7 +733,7 @@ \newcommand\QFHeure{% \begin{CadreNombre} - {\Large L'HEURE DU JOUR est : }\raisebox{-0.9cm}{\MPHorloge{\NbHeures}{\NbMinutes}{\NbSecondes}} + {\Large L'HEURE DU JOUR est : }\ifboolKV[ClesFlash]{Numerique}{\raisebox{-0.3cm}{\MPAfficheur{\NbHeures}{\NbMinutes}{\NbSecondes}}}{\raisebox{-0.9cm}{{\MPHorloge{\NbHeures}{\NbMinutes}{\NbSecondes}}}} \ifboolKV[ClesFlash]{Pause}{\pause}{} \begin{tcolorbox}[ExpressionSerie1] $\square$ \textbf{\ListeFlash[1,2] :} @@ -734,26 +784,37 @@ \end{CadreNombre} } +\tikzset{ + arrow/.style={ + draw, + minimum height=1.25cm, + inner sep=0.25em, + shape=signal, + signal from=west, + signal to=east, + signal pointer angle=150, + } +} + \newcommand\QFDaily{% - \begin{tikzpicture} - \begin{scope}[start chain=transition going right,node - distance=-\pgflinewidth] - \foreach \s in {1,...,\ListeFlashlen}{% - \xintifboolexpr{\s = 1}{% - \node[arrow,on chain] {\Huge\bfseries\ListeFlash[\s]}; - \ifboolKV[ClesFlash]{Pause}{\pause}{} + \begin{tikzpicture}% + \begin{scope}[start chain=transition going right,node distance=-\pgflinewidth]% + \foreach \s in {1,...,\ListeFlashlen}{% + \xintifboolexpr{\s = 1}{% + \node[arrow,on chain] {\Huge\bfseries\ListeFlash[\s]};% + \ifboolKV[ClesFlash]{Pause}{\pause}{}% + }{% + \xintifboolexpr{\s = \ListeFlashlen}{% + \node[arrow,on chain] {\Huge\bfseries?};% }{% - \xintifboolexpr{\s = \ListeFlashlen}{% - \node[arrow,on chain] {\Huge\bfseries?}; - }{% - \node[arrow,on chain] {\ListeFlash[\s]}; - \ifboolKV[ClesFlash]{Pause}{\pause}{} - } - } - } - \end{scope} - \end{tikzpicture} -} + \node[arrow,on chain] {\ListeFlash[\s]};% + \ifboolKV[ClesFlash]{Pause}{\pause}{}% + }% + }% + }% + \end{scope}% + \end{tikzpicture}% +}% \newcommand\QFDecimal{% \begin{CadreNombre} @@ -761,7 +822,7 @@ \tcbox[BoiteExpression]{\num{\ListeFlash[1,1]}} \ifboolKV[ClesFlash]{Pause}{\pause}{} \begin{tcolorbox}[ExpressionSerie1] - $\square$ \textbf{\'Ecriture en fraction décimale :} + $\square$ \textbf{\'Ecris-le en fraction décimale :} \tcbox[BoiteExpression]{$\dfrac{\phantom{1000000}}{\phantom{1000000}}$} \end{tcolorbox} \ifboolKV[ClesFlash]{Pause}{\pause}{} @@ -845,264 +906,296 @@ \end{CadreNombre} } +\newcommand\BoiteFlash[1]{% + \ifx\bla#1\bla% + \tcbox[BoiteExpression]{\phantom{10000000}}% + \else + \tcbox[BoiteExpression]{#1}% + \fi +} + +\newcommand\QFVide{% + \begin{CadreNombre} + {\ListeFlash[1]} + \xintFor* ##1 in {\xintSeq {1}{\ListeFlashlen-1}}\do{% + \ifboolKV[ClesFlash]{Pause}{\pause}{} + \begin{tcolorbox}[ExpressionSerie##1] + \ListeFlash[1+##1] + \end{tcolorbox} + } + \end{CadreNombre} +} + \newcommand\QFlash[2][]{% - \useKVdefault[ClesFlash] - \setKV[ClesFlash]{#1} - \setlength{\HauteurFlash}{\useKV[ClesFlash]{Hauteur}} - \colorlet{CouleurUn}{\useKV[ClesFlash]{Couleur1}} - \colorlet{CouleurDeux}{\useKV[ClesFlash]{Couleur2}} - \colorlet{CouleurTrois}{\useKV[ClesFlash]{Couleur3}} - \colorlet{CouleurQuatre}{\useKV[ClesFlash]{Couleur4}} + \useKVdefault[ClesFlash]% + \setKV[ClesFlash]{#1}% + \setlength{\HauteurFlash}{\useKV[ClesFlash]{Hauteur}}% + \colorlet{CouleurUn}{\useKV[ClesFlash]{Couleur1}}% + \colorlet{CouleurDeux}{\useKV[ClesFlash]{Couleur2}}% + \colorlet{CouleurTrois}{\useKV[ClesFlash]{Couleur3}}% + \colorlet{CouleurQuatre}{\useKV[ClesFlash]{Couleur4}}% \ifboolKV[ClesFlash]{Evaluation}{% - \ifboolKV[ClesFlash]{Numeration}{% - \setsepchar[*]{,*/}% + \ifboolKV[ClesFlash]{Seul}{% + \setsepchar[*]{/}% \readlist*\ListeFlash{#2}% - \QFNumeration% + \QFVide% }{% - \ifboolKV[ClesFlash]{Heure}{% + \ifboolKV[ClesFlash]{Numeration}{% \setsepchar[*]{,*/}% \readlist*\ListeFlash{#2}% - \StrMid{\ListeFlash[1,1]}{1}{2}[\NbHeures]% - \StrMid{\ListeFlash[1,1]}{3}{4}[\NbMinutes]% - \StrMid{\ListeFlash[1,1]}{5}{6}[\NbSecondes]% - \QFHeure% + \QFNumeration% }{% - \ifboolKV[ClesFlash]{Mesure}{% + \ifboolKV[ClesFlash]{Heure}{% \setsepchar[*]{,*/}% \readlist*\ListeFlash{#2}% - \QFMesure% + \StrMid{\ListeFlash[1,1]}{1}{2}[\NbHeures]% + \StrMid{\ListeFlash[1,1]}{3}{4}[\NbMinutes]% + \StrMid{\ListeFlash[1,1]}{5}{6}[\NbSecondes]% + \QFHeure% }{% - \ifboolKV[ClesFlash]{Daily}{% - \setsepchar[*]{/}% + \ifboolKV[ClesFlash]{Mesure}{% + \setsepchar[*]{,*/}% \readlist*\ListeFlash{#2}% - \QFDaily% + \QFMesure% }{% - \ifboolKV[ClesFlash]{Decimal}{% - \setsepchar[*]{,*/}% + \ifboolKV[ClesFlash]{Daily}{% + \setsepchar[*]{/}% \readlist*\ListeFlash{#2}% - \begin{frame} - \QFDecimal% - \end{frame} + \QFDaily% }{% - \ifboolKV[ClesFlash]{Mental}{% + \ifboolKV[ClesFlash]{Decimal}{% \setsepchar[*]{,*/}% \readlist*\ListeFlash{#2}% - \QFMental% + \QFDecimal% }{% - \ifboolKV[ClesFlash]{Expression}{% + \ifboolKV[ClesFlash]{Mental}{% \setsepchar[*]{,*/}% \readlist*\ListeFlash{#2}% - \QFExpression% + \QFMental% }{% - \setsepchar[*]{/}% - \readlist*\ListeFlash{#2}% - \ifboolKV[ClesFlash]{Simple}{% - \ListeFlash[1] - \begin{tcolorbox}[valign=center] - \ListeFlash[2] - \end{tcolorbox} + \ifboolKV[ClesFlash]{Expression}{% + \setsepchar[*]{,*/}% + \readlist*\ListeFlash{#2}% + \QFExpression% }{% - \setsepchar[*]{*/}% + \setsepchar[*]{/}% \readlist*\ListeFlash{#2}% - \ifboolKV[ClesFlash]{Kahout}{% - \setsepchar[*]{*/}% - \readlist*\ListeFlash{#2}% - \begin{tcolorbox}[halign=center,valign=center] - \ListeFlash[1,1] + \ifboolKV[ClesFlash]{Simple}{% + \ListeFlash[1] + \begin{tcolorbox}[valign=center] + \ListeFlash[2] \end{tcolorbox} - % \par - \begin{multicols}{4} - \begin{tcolorbox}[height=\HauteurFlash,colframe=CouleurUn!150,colback=CouleurUn,halign=center,valign=center] - \ListeFlash[1,2] - \end{tcolorbox} - % \hfill% - \begin{tcolorbox}[height=\HauteurFlash,colframe=CouleurDeux!150,colback=CouleurDeux,halign=center,valign=center] - \ListeFlash[1,3] - \end{tcolorbox} - % \hfill% - \begin{tcolorbox}[height=\HauteurFlash,colframe=CouleurTrois!150,colback=CouleurTrois,halign=center,valign=center] - \ListeFlash[1,4] - \end{tcolorbox} - % \hfill% - \begin{tcolorbox}[height=\HauteurFlash,colframe=CouleurQuatre!150,colback=CouleurQuatre,halign=center,valign=center] - \ListeFlash[1,5] - \end{tcolorbox} - \end{multicols} }{% \setsepchar[*]{*/}% \readlist*\ListeFlash{#2}% - \begin{tcolorbox}[halign=center,valign=center] - \ListeFlash[1,1] - \end{tcolorbox} - \begin{multicols}{4} - \begin{tcolorbox}[height=\HauteurFlash,colframe=CouleurUn!150,colback=white,boxrule=1mm,halign=center,valign=center] - \ListeFlash[1,2] - \end{tcolorbox} - \begin{tcolorbox}[height=\HauteurFlash,colframe=CouleurDeux!150,colback=white,boxrule=1mm,halign=center,valign=center] - \ListeFlash[1,3] - \end{tcolorbox} - \begin{tcolorbox}[height=\HauteurFlash,colframe=CouleurTrois!150,boxrule=1mm,colback=white,halign=center,valign=center] - \ListeFlash[1,4] + \ifboolKV[ClesFlash]{Kahout}{% + \setsepchar[*]{*/}% + \readlist*\ListeFlash{#2}% + \begin{tcolorbox}[halign=center,valign=center] + \ListeFlash[1,1] \end{tcolorbox} - \begin{tcolorbox}[height=\HauteurFlash,colframe=CouleurQuatre!150,colback=white,boxrule=1mm,halign=center,valign=center] - \ListeFlash[1,5] + % \par + \begin{multicols}{4} + \begin{tcolorbox}[height=\HauteurFlash,colframe=CouleurUn!150,colback=CouleurUn,halign=center,valign=center] + \ListeFlash[1,2] + \end{tcolorbox} + % \hfill% + \begin{tcolorbox}[height=\HauteurFlash,colframe=CouleurDeux!150,colback=CouleurDeux,halign=center,valign=center] + \ListeFlash[1,3] + \end{tcolorbox} + % \hfill% + \begin{tcolorbox}[height=\HauteurFlash,colframe=CouleurTrois!150,colback=CouleurTrois,halign=center,valign=center] + \ListeFlash[1,4] + \end{tcolorbox} + % \hfill% + \begin{tcolorbox}[height=\HauteurFlash,colframe=CouleurQuatre!150,colback=CouleurQuatre,halign=center,valign=center] + \ListeFlash[1,5] + \end{tcolorbox} + \end{multicols} + }{% + \setsepchar[*]{*/}% + \readlist*\ListeFlash{#2}% + \begin{tcolorbox}[halign=center,valign=center] + \ListeFlash[1,1] \end{tcolorbox} - \end{multicols} + \begin{multicols}{4} + \begin{tcolorbox}[height=\HauteurFlash,colframe=CouleurUn!150,colback=white,boxrule=1mm,halign=center,valign=center] + \ListeFlash[1,2] + \end{tcolorbox} + \begin{tcolorbox}[height=\HauteurFlash,colframe=CouleurDeux!150,colback=white,boxrule=1mm,halign=center,valign=center] + \ListeFlash[1,3] + \end{tcolorbox} + \begin{tcolorbox}[height=\HauteurFlash,colframe=CouleurTrois!150,boxrule=1mm,colback=white,halign=center,valign=center] + \ListeFlash[1,4] + \end{tcolorbox} + \begin{tcolorbox}[height=\HauteurFlash,colframe=CouleurQuatre!150,colback=white,boxrule=1mm,halign=center,valign=center] + \ListeFlash[1,5] + \end{tcolorbox} + \end{multicols} + }% }% }% }% }% - } + }% }% }% }% }% }{% - \ifboolKV[ClesFlash]{Numeration}{% - \setsepchar[*]{,*/}% + \ifboolKV[ClesFlash]{Seul}{% + \setsepchar[*]{/}% \readlist*\ListeFlash{#2}% \begin{frame} - \QFNumeration% + \QFVide% \end{frame} }{% - \ifboolKV[ClesFlash]{Heure}{% + \ifboolKV[ClesFlash]{Numeration}{% \setsepchar[*]{,*/}% \readlist*\ListeFlash{#2}% - \StrMid{\ListeFlash[1,1]}{1}{2}[\NbHeures]% - \StrMid{\ListeFlash[1,1]}{3}{4}[\NbMinutes]% - \StrMid{\ListeFlash[1,1]}{5}{6}[\NbSecondes]% \begin{frame} - \QFHeure% + \QFNumeration% \end{frame} }{% - \ifboolKV[ClesFlash]{Mesure}{% + \ifboolKV[ClesFlash]{Heure}{% \setsepchar[*]{,*/}% \readlist*\ListeFlash{#2}% + \StrMid{\ListeFlash[1,1]}{1}{2}[\NbHeures]% + \StrMid{\ListeFlash[1,1]}{3}{4}[\NbMinutes]% + \StrMid{\ListeFlash[1,1]}{5}{6}[\NbSecondes]% \begin{frame} - \QFMesure% + \QFHeure% \end{frame} }{% - \ifboolKV[ClesFlash]{Daily}{% - \setsepchar[*]{/}% + \ifboolKV[ClesFlash]{Mesure}{% + \setsepchar[*]{,*/}% \readlist*\ListeFlash{#2}% \begin{frame} - \QFDaily + \QFMesure% \end{frame} }{% - \ifboolKV[ClesFlash]{Decimal}{% - \setsepchar[*]{,*/}% + \ifboolKV[ClesFlash]{Daily}{% + \setsepchar[*]{/}% \readlist*\ListeFlash{#2}% \begin{frame} - \QFDecimal% + \QFDaily% \end{frame} }{% - \ifboolKV[ClesFlash]{Mental}{% + \ifboolKV[ClesFlash]{Decimal}{% \setsepchar[*]{,*/}% \readlist*\ListeFlash{#2}% \begin{frame} - \QFMental% + \QFDecimal% \end{frame} - }{ - \ifboolKV[ClesFlash]{Expression}{% + }{% + \ifboolKV[ClesFlash]{Mental}{% \setsepchar[*]{,*/}% \readlist*\ListeFlash{#2}% \begin{frame} - \QFExpression% + \QFMental% \end{frame} }{% - \setsepchar[*]{/}% - \readlist*\ListeFlash{#2}% - \ifboolKV[ClesFlash]{Simple}{% + \ifboolKV[ClesFlash]{Expression}{% + \setsepchar[*]{,*/}% + \readlist*\ListeFlash{#2}% \begin{frame} - \ListeFlash[1] - \begin{tcolorbox}[valign=center] - \ListeFlash[2] - \end{tcolorbox} + \QFExpression% \end{frame} }{% - \setsepchar[*]{,*/}% + \setsepchar[*]{/}% \readlist*\ListeFlash{#2}% - \ifboolKV[ClesFlash]{Kahout}{% - \setsepchar[*]{*/}% - \readlist*\ListeFlash{#2}% + \ifboolKV[ClesFlash]{Simple}{% \begin{frame} + \ListeFlash[1] \begin{tcolorbox}[valign=center] - \ListeFlash[1,1] + \ListeFlash[2] \end{tcolorbox} - \vfill - \ifboolKV[ClesFlash]{Pause}{\pause}{} - \begin{columns}[T] - \begin{column}{0.45\linewidth} - \begin{tcolorbox}[height=\HauteurFlash,colframe=CouleurUn!150,colback=CouleurUn,halign=center,valign=center] - \ListeFlash[1,2] - \end{tcolorbox} - \end{column} - \ifboolKV[ClesFlash]{Pause}{\pause}{} - \begin{column}{0.45\linewidth} - \begin{tcolorbox}[height=\HauteurFlash,colframe=CouleurDeux!150,colback=CouleurDeux,halign=center,valign=center] - \ListeFlash[1,3] - \end{tcolorbox} - \end{column} - \end{columns} - \bigskip - \ifboolKV[ClesFlash]{Pause}{\pause}{} - \begin{columns}[T] - \begin{column}{0.45\linewidth} - \begin{tcolorbox}[height=\HauteurFlash,colframe=CouleurTrois!150,colback=CouleurTrois,halign=center,valign=center] - \ListeFlash[1,4] - \end{tcolorbox} - \end{column} - \ifboolKV[ClesFlash]{Pause}{\pause}{} - \begin{column}{0.45\linewidth} - \begin{tcolorbox}[height=\HauteurFlash,colframe=CouleurQuatre!150,colback=CouleurQuatre,halign=center,valign=center] - \ListeFlash[1,5] - \end{tcolorbox} - \end{column} - \end{columns} \end{frame} }{% - \setsepchar[*]{*/}% + \setsepchar[*]{,*/}% \readlist*\ListeFlash{#2}% - \begin{frame} - \begin{tcolorbox}[valign=center] - \ListeFlash[1,1] - \end{tcolorbox} - \vfill - \ifboolKV[ClesFlash]{Pause}{\pause}{} - \begin{columns}[T] - \begin{column}{0.45\linewidth} - \begin{tcolorbox}[height=\HauteurFlash,colframe=CouleurUn!150,colback=white,boxrule=1mm,halign=center,valign=center] - \ListeFlash[1,2] - \end{tcolorbox} - \end{column} + \ifboolKV[ClesFlash]{Kahout}{% + \setsepchar[*]{*/}% + \readlist*\ListeFlash{#2}% + \begin{frame} + \begin{tcolorbox}[valign=center] + \ListeFlash[1,1] + \end{tcolorbox} + \vfill \ifboolKV[ClesFlash]{Pause}{\pause}{} - \begin{column}{0.45\linewidth} - \begin{tcolorbox}[height=\HauteurFlash,colframe=CouleurDeux!150,colback=white,boxrule=1mm,halign=center,valign=center] - \ListeFlash[1,3] - \end{tcolorbox} - \end{column} - \end{columns} - \bigskip - \ifboolKV[ClesFlash]{Pause}{\pause}{} - \begin{columns}[T] - \begin{column}{0.45\linewidth} - \begin{tcolorbox}[height=\HauteurFlash,colframe=CouleurTrois!150,boxrule=1mm,colback=white,halign=center,valign=center] - \ListeFlash[1,4] - \end{tcolorbox} - \end{column} + \begin{columns}[T] + \begin{column}{0.45\linewidth} + \begin{tcolorbox}[height=\HauteurFlash,colframe=CouleurUn!150,colback=CouleurUn,halign=center,valign=center] + \ListeFlash[1,2] + \end{tcolorbox} + \end{column} + \ifboolKV[ClesFlash]{Pause}{\pause}{} + \begin{column}{0.45\linewidth} + \begin{tcolorbox}[height=\HauteurFlash,colframe=CouleurDeux!150,colback=CouleurDeux,halign=center,valign=center] + \ListeFlash[1,3] + \end{tcolorbox} + \end{column} + \end{columns} + \bigskip \ifboolKV[ClesFlash]{Pause}{\pause}{} - \begin{column}{0.45\linewidth} - \begin{tcolorbox}[height=\HauteurFlash,colframe=CouleurQuatre!150,colback=white,boxrule=1mm,halign=center,valign=center] - \ListeFlash[1,5] - \end{tcolorbox} - \end{column} - \end{columns} - \end{frame} + \begin{columns}[T] + \begin{column}{0.45\linewidth} + \begin{tcolorbox}[height=\HauteurFlash,colframe=CouleurTrois!150,colback=CouleurTrois,halign=center,valign=center] + \ListeFlash[1,4] + \end{tcolorbox} + \end{column} + \ifboolKV[ClesFlash]{Pause}{\pause}{} + \begin{column}{0.45\linewidth} + \begin{tcolorbox}[height=\HauteurFlash,colframe=CouleurQuatre!150,colback=CouleurQuatre,halign=center,valign=center] + \ListeFlash[1,5] + \end{tcolorbox} + \end{column} + \end{columns} + \end{frame} + }{% + \setsepchar[*]{*/}% + \readlist*\ListeFlash{#2}% + \begin{frame} + \begin{tcolorbox}[valign=center] + \ListeFlash[1,1] + \end{tcolorbox} + \vfill + \ifboolKV[ClesFlash]{Pause}{\pause}{} + \begin{columns}[T] + \begin{column}{0.45\linewidth} + \begin{tcolorbox}[height=\HauteurFlash,colframe=CouleurUn!150,colback=white,boxrule=1mm,halign=center,valign=center] + \ListeFlash[1,2] + \end{tcolorbox} + \end{column} + \ifboolKV[ClesFlash]{Pause}{\pause}{} + \begin{column}{0.45\linewidth} + \begin{tcolorbox}[height=\HauteurFlash,colframe=CouleurDeux!150,colback=white,boxrule=1mm,halign=center,valign=center] + \ListeFlash[1,3] + \end{tcolorbox} + \end{column} + \end{columns} + \bigskip + \ifboolKV[ClesFlash]{Pause}{\pause}{} + \begin{columns}[T] + \begin{column}{0.45\linewidth} + \begin{tcolorbox}[height=\HauteurFlash,colframe=CouleurTrois!150,boxrule=1mm,colback=white,halign=center,valign=center] + \ListeFlash[1,4] + \end{tcolorbox} + \end{column} + \ifboolKV[ClesFlash]{Pause}{\pause}{} + \begin{column}{0.45\linewidth} + \begin{tcolorbox}[height=\HauteurFlash,colframe=CouleurQuatre!150,colback=white,boxrule=1mm,halign=center,valign=center] + \ListeFlash[1,5] + \end{tcolorbox} + \end{column} + \end{columns} + \end{frame} + }% }% }% }% }% - } + }% }% }% }% @@ -1110,12 +1203,209 @@ }% }% -%%%%%%%%%%%%% -%%% Fractions -%%%%%%%%%%%%% -\setKVdefault[ClesFraction]{Rayon=2cm,Disque,Regulier=false,Segment=false,Rectangle=false,Longueur=5cm,Largeur=2cm,Cotes=5,Couleur=green,Reponse=false,Multiple=1,Hachures=false,Epaisseur=1} +%%% +% Fractions +%%% +\setKVdefault[ClesFraction]{Rayon=2cm,Disque,Regulier=false,Segment=false,Rectangle=false,Longueur=5cm,Largeur=2cm,Cotes=5,Triangle=false,Parts=3,Couleur=green,Reponse=false,Multiple=1,Hachures=false,Epaisseur=1} + +\def\MPFractionTriangle#1#2#3#4#5{ + % #1 longueur du côté + % #2 partage sur le côté + % #3 num + % #4 déno (attention : = #2^2) + % #5 couleur + \ifluatex + \mplibforcehmode + \begin{mplibcode} + nbtriangle=0; + + vardef Ligne(expr longueur)= + for k=0 upto 2*(longueur-1): + nbtriangle:=nbtriangle+1; + if (k mod 2)=0: + M[nbtriangle]=(Tria shifted(0.5*k*(1/nbparts)*(B-A))) shifted((nbparts-longueur)*(1/nbparts)*(C-A)); + else: + M[nbtriangle]=(Trir shifted(0.5*(k-1)*(1/nbparts)*(B-A))) shifted((nbparts-longueur)*(1/nbparts)*(C-A)); + fi; + endfor; + enddef; + + pair A,B,C; + A=u*(0.5,0.5); + B-A=(#1,0); + C=rotation(B,A,60); + + nbparts:=#2; + + path M[]; + + path Tria,Trir; + Tria=polygone(A,(1/nbparts)[A,B],(1/nbparts)[A,C]); + Trir=symetrie(Tria,(1/nbparts)[A,B],(1/nbparts)[A,C]); + + for k=nbparts downto 1: + Ligne(k); + endfor; + + for k=1 upto #3: + fill M[k] withcolor #5; + endfor; + + for k=1 upto nbparts: + trace segment((k/nbparts)[A,B],(k/nbparts)[A,C]); + trace segment((k/nbparts)[B,A],(k/nbparts)[B,C]); + trace segment((k/nbparts)[C,A],(k/nbparts)[C,B]); + endfor; + \end{mplibcode} + \else + \begin{mpost} + nbtriangle=0; + + vardef Ligne(expr longueur)= + for k=0 upto 2*(longueur-1): + nbtriangle:=nbtriangle+1; + if (k mod 2)=0: + M[nbtriangle]=(Tria shifted(0.5*k*(1/nbparts)*(B-A))) shifted((nbparts-longueur)*(1/nbparts)*(C-A)); + else: + M[nbtriangle]=(Trir shifted(0.5*(k-1)*(1/nbparts)*(B-A))) shifted((nbparts-longueur)*(1/nbparts)*(C-A)); + fi; + endfor; + enddef; + + pair A,B,C; + A=u*(0.5,0.5); + B-A=(#1,0); + C=rotation(B,A,60); + + nbparts:=#2; -\def\MPFractionRegulier#1#2#3#4#5{ + path M[]; + + path Tria,Trir; + Tria=polygone(A,(1/nbparts)[A,B],(1/nbparts)[A,C]); + Trir=symetrie(Tria,(1/nbparts)[A,B],(1/nbparts)[A,C]); + + for k=nbparts downto 1: + Ligne(k); + endfor; + + for k=1 upto #3: + fill M[k] withcolor #5; + endfor; + + for k=1 upto nbparts: + trace segment((k/nbparts)[A,B],(k/nbparts)[A,C]); + trace segment((k/nbparts)[B,A],(k/nbparts)[B,C]); + trace segment((k/nbparts)[C,A],(k/nbparts)[C,B]); + endfor; + \end{mpost} + \fi + } + + \def\MPFractionTriangleH#1#2#3#4#5#6{ + % #1 longueur du côté + % #2 partage sur le côté + % #3 num + % #4 déno (attention : = #2^2) + % #5 couleur + % #6 épaisseur + \ifluatex + \mplibforcehmode + \begin{mplibcode} + nbtriangle=0; + + vardef Ligne(expr longueur)= + for k=0 upto 2*(longueur-1): + nbtriangle:=nbtriangle+1; + if (k mod 2)=0: + M[nbtriangle]=(Tria shifted(0.5*k*(1/nbparts)*(B-A))) shifted((nbparts-longueur)*(1/nbparts)*(C-A)); + else: + M[nbtriangle]=(Trir shifted(0.5*(k-1)*(1/nbparts)*(B-A))) shifted((nbparts-longueur)*(1/nbparts)*(C-A)); + fi; + endfor; + enddef; + + pair A,B,C; + A=u*(0.5,0.5); + B-A=(#1,0); + C=rotation(B,A,60); + + nbparts:=#2; + + path M[]; + + path Tria,Trir; + Tria=polygone(A,(1/nbparts)[A,B],(1/nbparts)[A,C]); + Trir=symetrie(Tria,(1/nbparts)[A,B],(1/nbparts)[A,C]); + + for k=nbparts downto 1: + Ligne(k); + endfor; + + diversite=floor(uniformdeviate(#2**2-#3-1)); + + for k=(1+diversite) upto (#3+diversite): + drawoptions(withpen pencircle scaled #6); + trace hachurage(M[k],90,0.2,0) withcolor #5; + endfor; + drawoptions(withpen pencircle scaled #6); + for k=1 upto nbparts: + trace segment((k/nbparts)[A,B],(k/nbparts)[A,C]); + trace segment((k/nbparts)[B,A],(k/nbparts)[B,C]); + trace segment((k/nbparts)[C,A],(k/nbparts)[C,B]); + endfor; + \end{mplibcode} + \else + \begin{mpost} + nbtriangle=0; + + vardef Ligne(expr longueur)= + for k=0 upto 2*(longueur-1): + nbtriangle:=nbtriangle+1; + if (k mod 2)=0: + M[nbtriangle]=(Tria shifted(0.5*k*(1/nbparts)*(B-A))) shifted((nbparts-longueur)*(1/nbparts)*(C-A)); + else: + M[nbtriangle]=(Trir shifted(0.5*(k-1)*(1/nbparts)*(B-A))) shifted((nbparts-longueur)*(1/nbparts)*(C-A)); + fi; + endfor; + enddef; + + pair A,B,C; + A=u*(0.5,0.5); + B-A=(#1,0); + C=rotation(B,A,60); + + nbparts:=#2; + + path M[]; + + path Tria,Trir; + Tria=polygone(A,(1/nbparts)[A,B],(1/nbparts)[A,C]); + Trir=symetrie(Tria,(1/nbparts)[A,B],(1/nbparts)[A,C]); + + for k=nbparts downto 1: + Ligne(k); + endfor; + + diversite=floor(uniformdeviate(#2**2-#3-1)); + + for k=(1+diversite) upto (#3+diversite): + drawoptions(withpen pencircle scaled #6); + trace hachurage(M[k],90,0.2,0) withcolor #5; + endfor; + drawoptions(withpen pencircle scaled #6); + + for k=1 upto nbparts: + trace segment((k/nbparts)[A,B],(k/nbparts)[A,C]); + trace segment((k/nbparts)[B,A],(k/nbparts)[B,C]); + trace segment((k/nbparts)[C,A],(k/nbparts)[C,B]); + endfor; + \end{mpost} + \fi + } + + +\def\MPFractionRegulier#1#2#3#4#5{% % #1 rayon, #2 nb côtés, #3 num, #4 deno, #5 couleur \ifluatex \mplibforcehmode @@ -1506,47 +1796,99 @@ \fi } +\def\MPFractionSegmentH#1#2#3#4#5{ + \ifluatex + \mplibforcehmode + \begin{mplibcode} + pair A,C,B[]; + A=(0,0); + C-A=(#1,0); + for k=0 upto #3: + B[k]=(k/#3)[A,C]; + endfor; + drawoptions(withpen pencircle scaled#5); + draw hachurage(polygone(B[0]+u*(0,-0.15),B[#2]+u*(0,-0.15),B[#2]+u*(0,0.15),B[0]+u*(0,0.15)),120,0.2,0) + withcolor #4; + drawoptions(withpen pencircle scaled#5); + draw segment(A,C); + marque_p:="tiretv"; + for k=0 upto #3: + pointe(B[k]); + endfor; + \end{mplibcode} + \else + \begin{mpost} + pair A,C,B[]; + A=(0,0); + C-A=(#1,0); + for k=0 upto #3: + B[k]=(k/#3)[A,C]; + endfor; + drawoptions(withpen pencircle scaled#5); + draw hachurage(polygone(B[0]+u*(0,-0.15),B[#2]+u*(0,-0.15),B[#2]+u*(0,0.15),B[0]+u*(0,0.15)),120,0.2,0) + withcolor #4; + drawoptions(withpen pencircle scaled#5); + draw segment(A,C); + marque_p:="tiretv"; + for k=0 upto #3: + pointe(B[k]); + endfor; + \end{mpost} + \fi +} + \newcommand\Fraction[2][]{% \useKVdefault[ClesFraction]% \setKV[ClesFraction]{#1}% \setsepchar[*]{/}% \readlist*\ListeFraction{#2}% - %\ListeFractionlen -- Le numérateur est \ListeFraction[1] et le - %dénominateur est \ListeFraction[2]. - \ifboolKV[ClesFraction]{Regulier}{% + \ifboolKV[ClesFraction]{Triangle}{% \ifboolKV[ClesFraction]{Reponse}{}{\setKV[ClesFraction]{Couleur=white}}% - \ifboolKV[ClesFraction]{Hachures}{% - \MPFractionRegulierH{\useKV[ClesFraction]{Rayon}}{\useKV[ClesFraction]{Cotes}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}{\useKV[ClesFraction]{Epaisseur}}% + \ifboolKV[ClesFraction]{Hachures}{% + \MPFractionTriangleH{\useKV[ClesFraction]{Longueur}}{\useKV[ClesFraction]{Parts}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}{\useKV[ClesFraction]{Epaisseur}}% }{% - \MPFractionRegulier{\useKV[ClesFraction]{Rayon}}{\useKV[ClesFraction]{Cotes}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}% + \MPFractionTriangle{\useKV[ClesFraction]{Longueur}}{\useKV[ClesFraction]{Parts}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}% } }{% - \ifboolKV[ClesFraction]{Segment}{% + \ifboolKV[ClesFraction]{Regulier}{% \ifboolKV[ClesFraction]{Reponse}{}{\setKV[ClesFraction]{Couleur=white}}% - \MPFractionSegment{\useKV[ClesFraction]{Longueur}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}% - }{ - \ifboolKV[ClesFraction]{Rectangle}{%rectangle + \ifboolKV[ClesFraction]{Hachures}{% + \MPFractionRegulierH{\useKV[ClesFraction]{Rayon}}{\useKV[ClesFraction]{Cotes}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}{\useKV[ClesFraction]{Epaisseur}}% + }{% + \MPFractionRegulier{\useKV[ClesFraction]{Rayon}}{\useKV[ClesFraction]{Cotes}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}% + } + }{% + \ifboolKV[ClesFraction]{Segment}{% \ifboolKV[ClesFraction]{Reponse}{}{\setKV[ClesFraction]{Couleur=white}}% \ifboolKV[ClesFraction]{Hachures}{% - \MPFractionRectangleH{\useKV[ClesFraction]{Longueur}}{\useKV[ClesFraction]{Largeur}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}{\useKV[ClesFraction]{Multiple}}{\useKV[ClesFraction]{Epaisseur}}% + \MPFractionSegmentH{\useKV[ClesFraction]{Longueur}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}{\useKV[ClesFraction]{Epaisseur}}% }{% - \MPFractionRectangle{\useKV[ClesFraction]{Longueur}}{\useKV[ClesFraction]{Largeur}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}{\useKV[ClesFraction]{Multiple}}% + \MPFractionSegment{\useKV[ClesFraction]{Longueur}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}% } - }{%disque - \ifboolKV[ClesFraction]{Reponse}{}{\setKV[ClesFraction]{Couleur=white}}% - \ifboolKV[ClesFraction]{Hachures}{% - \MPFractionDisqueH{\useKV[ClesFraction]{Rayon}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}{\useKV[ClesFraction]{Epaisseur}}% - }{% - \MPFractionDisque{\useKV[ClesFraction]{Rayon}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}% + }{ + \ifboolKV[ClesFraction]{Rectangle}{%rectangle + \ifboolKV[ClesFraction]{Reponse}{}{\setKV[ClesFraction]{Couleur=white}}% + \ifboolKV[ClesFraction]{Hachures}{% + \MPFractionRectangleH{\useKV[ClesFraction]{Longueur}}{\useKV[ClesFraction]{Largeur}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}{\useKV[ClesFraction]{Multiple}}{\useKV[ClesFraction]{Epaisseur}}% + }{% + \MPFractionRectangle{\useKV[ClesFraction]{Longueur}}{\useKV[ClesFraction]{Largeur}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}{\useKV[ClesFraction]{Multiple}}% + } + }{%disque + \ifboolKV[ClesFraction]{Reponse}{}{\setKV[ClesFraction]{Couleur=white}}% + \ifboolKV[ClesFraction]{Hachures}{% + \MPFractionDisqueH{\useKV[ClesFraction]{Rayon}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}{\useKV[ClesFraction]{Epaisseur}}% + }{% + \MPFractionDisque{\useKV[ClesFraction]{Rayon}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}% + }% }% }% }% }% }% -%%%%%%%%%%%%%%%% -%%% Réponses à relier -%%%%%%%%%%%%%%%% +%%% +% Réponses à relier +%%% \setKVdefault[ClesRelie]{Solution=false,LargeurG=5cm,LargeurD=2cm,Stretch=1.5,Ecart=2cm} \newcommand\Relie[2][]{% @@ -1603,63 +1945,86 @@ \setcounter{NbRelie}{0}% }% -%%%%%%%%%%%%%%%%%% -%% QCM -%%%%%%%%%%%%%%%%%% -\setKVdefault[ClesQCM]{Reponses=3,Solution=false,Stretch=1,Largeur=2cm,Couleur=gray!15,Titre=false,Nom=Réponse,Alph=false,VF=false,Depart=1,Alterne=false} +%%% +% QCM +%%% +\setKVdefault[ClesQCM]{Reponses=3,Solution=false,Stretch=1,Largeur=2cm,Couleur=gray!15,Titre=false,Nom=Réponse,NomV=Vrai,NomF=Faux,Alph=false,AlphT=false,VF=false,Depart=1,Alterne=false,Noms={A/B/C},Multiple=false} \newlength{\LargeurQCM} \newcounter{QuestionQCM} +\newcounter{TitreQCM} \newcommand\QCM[2][]{% \useKVdefault[ClesQCM]% \setKV[ClesQCM]{#1}% \setcounter{QuestionQCM}{\fpeval{\useKV[ClesQCM]{Depart}-1}}% + \setcounter{TitreQCM}{0} \setsepchar[*]{,*&}\ignoreemptyitems% \readlist*\ListeQCM{#2}% - \ifboolKV[ClesQCM]{VF}{% - \setKV[ClesQCM]{Reponses=2} + \ifboolKV[ClesQCM]{Multiple}{% \renewcommand{\arraystretch}{\useKV[ClesQCM]{Stretch}}% \setlength{\LargeurQCM}{\fpeval{(\linewidth-\useKV[ClesQCM]{Reponses}*(3*\tabcolsep+\useKV[ClesQCM]{Largeur}))}pt}% \xdef\NBcases{\fpeval{\useKV[ClesQCM]{Reponses}+1}}% + \xdef\ListeNom{\useKV[ClesQCM]{Noms}}% + \setsepchar[*]{/}% + \readlist*\ListeNomsMul{\ListeNom}% \begin{tabular}{|p{\LargeurQCM}|*{\useKV[ClesQCM]{Reponses}}{>{\centering\arraybackslash}p{\useKV[ClesQCM]{Largeur}}|}}% \cline{2-\NBcases}% - \multicolumn{1}{c|}{}&Vrai&Faux\\ - \hline% - \xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{% - \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{% - &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xintifboolexpr{##2=\ListeQCM[##1,2]}{$\boxtimes$}{$\square$}}{$\square$}% - }\\ - }% - \hline% - \end{tabular} - }{% - \renewcommand{\arraystretch}{\useKV[ClesQCM]{Stretch}}% - \setlength{\LargeurQCM}{\fpeval{(\linewidth-\useKV[ClesQCM]{Reponses}*(3*\tabcolsep+\useKV[ClesQCM]{Largeur}))}pt}% - \xdef\NBcases{\fpeval{\useKV[ClesQCM]{Reponses}+1}}% - \begin{tabular}{|p{\LargeurQCM}|*{\useKV[ClesQCM]{Reponses}}{>{\centering\arraybackslash}p{\useKV[ClesQCM]{Largeur}}|}}% - \ifboolKV[ClesQCM]{Titre}{\cline{2-\NBcases}% \multicolumn{1}{c|}{}\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{% - &\useKV[ClesQCM]{Nom} ##2}% + &\ListeNomsMul[##2]}% \\ - }{} \hline% \xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{% - \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{% - &\ifboolKV[ClesQCM]{Solution}{\xdef\NumeroReponse{\fpeval{\useKV[ClesQCM]{Reponses}+2}}\xintifboolexpr{##2=\ListeQCM[##1,\NumeroReponse]}{\cellcolor{\useKV[ClesQCM]{Couleur}}}{}}{}\ListeQCM[##1,##2+1]% + \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{% + &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xintifboolexpr{\ListeQCM[##1,\fpeval{##2+1}]=1}{$\boxtimes$}{$\square$}}{$\square$}% }\\ }% \hline% \end{tabular}% + }{% + \ifboolKV[ClesQCM]{VF}{% + \setKV[ClesQCM]{Reponses=2} + \renewcommand{\arraystretch}{\useKV[ClesQCM]{Stretch}}% + \setlength{\LargeurQCM}{\fpeval{(\linewidth-\useKV[ClesQCM]{Reponses}*(3*\tabcolsep+\useKV[ClesQCM]{Largeur}))}pt}% + \xdef\NBcases{\fpeval{\useKV[ClesQCM]{Reponses}+1}}% + \begin{tabular}{|p{\LargeurQCM}|*{\useKV[ClesQCM]{Reponses}}{>{\centering\arraybackslash}p{\useKV[ClesQCM]{Largeur}}|}}% + \cline{2-\NBcases}% + \multicolumn{1}{c|}{}&\useKV[ClesQCM]{NomV}&\useKV[ClesQCM]{NomF}\\ + \hline% + \xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{% + \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{% + &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xintifboolexpr{##2=\ListeQCM[##1,2]}{$\boxtimes$}{$\square$}}{$\square$}% + }\\ + }% + \hline% + \end{tabular} + }{% + \renewcommand{\arraystretch}{\useKV[ClesQCM]{Stretch}}% + \setlength{\LargeurQCM}{\fpeval{(\linewidth-\useKV[ClesQCM]{Reponses}*(3*\tabcolsep+\useKV[ClesQCM]{Largeur}))}pt}% + \xdef\NBcases{\fpeval{\useKV[ClesQCM]{Reponses}+1}}% + \begin{tabular}{|p{\LargeurQCM}|*{\useKV[ClesQCM]{Reponses}}{>{\centering\arraybackslash}p{\useKV[ClesQCM]{Largeur}}|}}% + \ifboolKV[ClesQCM]{Titre}{\cline{2-\NBcases}% + \multicolumn{1}{c|}{}\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{% + &\stepcounter{TitreQCM}\useKV[ClesQCM]{Nom} \ifboolKV[ClesQCM]{AlphT}{\Alph{TitreQCM}}{##2}}% + \\ + }{} + \hline% + \xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{% + \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{% + &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xdef\NumeroReponse{\fpeval{\useKV[ClesQCM]{Reponses}+2}}\xintifboolexpr{##2=\ListeQCM[##1,\NumeroReponse]}{\cellcolor{\useKV[ClesQCM]{Couleur}}}{}}{}\ListeQCM[##1,##2+1]% + }\\ + }% + \hline% + \end{tabular}% + }% }% } -%%%%%%%%%%%%%%%%%%%%% -%%%% Somme des angles -%%%%%%%%%%%%%%%%%%%%% +%%% +% Somme des angles +%%% -\setKVdefault[ClesSommeAngle]{Detail=true,Figure=false,Isocele=false}% +\setKVdefault[ClesSommeAngle]{Detail=true,Isocele=false,Figure=false,FigureSeule=false,Angle=0}% -% On définit la figure à utiliser -\def\MPFigureSommeAngle#1#2#3#4#5#6{ +\def\MPFigureSommeAngle#1#2#3#4#5#6#7{ % #1 Premier sommet % #2 Deuxième sommet % #3 Troisième sommet @@ -1679,11 +2044,9 @@ O - .5[A,B] = whatever * (B-A) rotated 90; O - .5[B,C] = whatever * (C-B) rotated 90; % On tourne pour éventuellement moins de lassitude :) - numeric Angle; - Angle=uniformdeviate(180);%Caractère aléatoire - A:=A rotatedabout(O,Angle); - B:=B rotatedabout(O,Angle); - C:=C rotatedabout(O,Angle); + A:=A rotatedabout(O,#7); + B:=B rotatedabout(O,#7); + C:=C rotatedabout(O,#7); % On définit le centre du cercle inscrit (I-C) rotated ((angle(A-C)-angle(B-C))/2) shifted C=whatever[A,C]; (I-B) rotated ((angle(C-B)-angle(A-B))/2) shifted B=whatever[B,C]; @@ -1715,16 +2078,13 @@ draw Codelongueur(A,B,A,C,2); marque_s:=marque_s*2; label(btex $\ang{#4}$ etex,B+0.95u*unitvector(I-B)); - % label(btex $\ang{#5}$ etex,C+0.95u*unitvector(I-C)); label(btex ? etex,A+0.95u*unitvector(I-A)); else: -% if (#4=180-#5-#4) or (#5=180-#5-#4): marque_s:=marque_s/2; draw Codelongueur(A,B,A,C,2); marque_s:=marque_s*2; label(btex $\ang{#4}$ etex,A+0.95u*unitvector(I-A)); label(btex ? etex,B+0.95u*unitvector(I-B)); - % label(btex $\ang{#5}$ etex,C+0.95u*unitvector(I-C)); fi; else: label(btex $\ang{#4}$ etex,B+0.95u*unitvector(I-B)); @@ -1747,11 +2107,9 @@ O - .5[A,B] = whatever * (B-A) rotated 90; O - .5[B,C] = whatever * (C-B) rotated 90; % On tourne pour éventuellement moins de lassitude :) - numeric Angle; - Angle=uniformdeviate(180);%Caractère aléatoire - A:=A rotatedabout(O,Angle); - B:=B rotatedabout(O,Angle); - C:=C rotatedabout(O,Angle); + A:=A rotatedabout(O,#7); + B:=B rotatedabout(O,#7); + C:=C rotatedabout(O,#7); % On définit le centre du cercle inscrit (I-C) rotated ((angle(A-C)-angle(B-C))/2) shifted C=whatever[A,C]; (I-B) rotated ((angle(C-B)-angle(A-B))/2) shifted B=whatever[B,C]; @@ -1783,16 +2141,13 @@ draw Codelongueur(A,B,A,C,2); marque_s:=marque_s*2; label(btex $\ang{#4}$ etex,B+0.95u*unitvector(I-B)); - % label(btex $\ang{#5}$ etex,C+0.95u*unitvector(I-C)); label(btex ? etex,A+0.95u*unitvector(I-A)); else: - %if (#4=180-#5-#4) or (#5=180-#5-#4): marque_s:=marque_s/2; draw Codelongueur(A,B,A,C,2); marque_s:=marque_s*2; label(btex $\ang{#4}$ etex,A+0.95u*unitvector(I-A)); label(btex ? etex,B+0.95u*unitvector(I-B)); - % label(btex $\ang{#5}$ etex,C+0.95u*unitvector(I-C)); fi; else: label(btex $\ang{#4}$ etex,B+0.95u*unitvector(I-B)); @@ -1863,33 +2218,45 @@ \StrMid{#2}{2}{2}[\NomB]% \StrMid{#2}{3}{3}[\NomC]% % Figure ou pas ? - \ifboolKV[ClesSommeAngle]{Figure}{% - \begin{multicols}{2}% - {\em La figure est donnée à titre indicatif.}% - \ifx#3\bla\bla% - \xdef\Intermed{\fpeval{0.5*(180-#4)}}% - \[\MPFigureSommeAngle{\NomA}{\NomB}{\NomC}{#4}{\Intermed}{0}\]% - \else% - \ifx#4\bla\bla% - \[\MPFigureSommeAngle{\NomA}{\NomB}{\NomC}{#3}{#3}{0}\]% - \else% - \[\MPFigureSommeAngle{\NomA}{\NomB}{\NomC}{#3}{#4}{1}\]% - \fi% - \fi% - \par\columnbreak\par% - % on rédige + \ifboolKV[ClesSommeAngle]{FigureSeule}{% + \ifx#3\bla\bla% + \xdef\Intermed{\fpeval{0.5*(180-#4)}}% + \MPFigureSommeAngle{\NomA}{\NomB}{\NomC}{#4}{\Intermed}{0}{\useKV[ClesSommeAngle]{Angle}}% + \else% + \ifx#4\bla\bla% + \MPFigureSommeAngle{\NomA}{\NomB}{\NomC}{#3}{#3}{0}{\useKV[ClesSommeAngle]{Angle}}% + \else% + \MPFigureSommeAngle{\NomA}{\NomB}{\NomC}{#3}{#4}{1}{\useKV[ClesSommeAngle]{Angle}}% + \fi% + \fi% + }{% + \ifboolKV[ClesSommeAngle]{Figure}{% + \begin{multicols}{2}% + {\em La figure est donnée à titre indicatif.}% + \ifx#3\bla\bla% + \xdef\Intermed{\fpeval{0.5*(180-#4)}}% + \[\MPFigureSommeAngle{\NomA}{\NomB}{\NomC}{#4}{\Intermed}{0}{\useKV[ClesSommeAngle]{Angle}}\]% + \else% + \ifx#4\bla\bla% + \[\MPFigureSommeAngle{\NomA}{\NomB}{\NomC}{#3}{#3}{0}{\useKV[ClesSommeAngle]{Angle}}\]% + \else% + \[\MPFigureSommeAngle{\NomA}{\NomB}{\NomC}{#3}{#4}{1}{\useKV[ClesSommeAngle]{Angle}}\]% + \fi% + \fi% + \par\columnbreak\par% + % on rédige + \RedactionSomme[#1]{#2}{#3}{#4}% + \end{multicols}% + }{% on rédige \RedactionSomme[#1]{#2}{#3}{#4}% - \end{multicols}% - }{% on rédige - \RedactionSomme[#1]{#2}{#3}{#4}% + }% }% }% -%%%%%%%%%%%%%%%% -%% Le théorème de Pythagore -%%%%%%%%%%%%%%%% -% On définit le trousseau de clés optionnelles -\setKVdefault[ClesPythagore]{Exact=false,AvantRacine=false,Racine=false,Entier=false,Egalite=false,Precision=2,Soustraction=false,Figure=false,Angle=0,Reciproque=false,ReciColonnes=false,Faible=false,Unite=cm,EnchaineA=false,EnchaineB=false,EnchaineC=false,ValeurA=0,ValeurB=0,ValeurC=0} +%%% +% Le théorème de Pythagore +%%% +\setKVdefault[ClesPythagore]{Exact=false,AvantRacine=false,Racine=false,Entier=false,Egalite=false,Precision=2,Soustraction=false,Figure=false,FigureSeule=false,Angle=0,Reciproque=false,ReciColonnes=false,Faible=false,Unite=cm,EnchaineA=false,EnchaineB=false,EnchaineC=false,ValeurA=0,ValeurB=0,ValeurC=0} % On définit les figures à utiliser \def\MPFigurePytha#1#2#3#4#5#6{% @@ -1926,19 +2293,20 @@ decalage=3mm; if #4<#5 : if ypart(B)>ypart(O) : - label(btex \num{#4} etex rotated angle(C-B),1/2[C,B]-decalage*(unitvector(A-B))); - label(btex \num{#5} etex rotated(angle(B-A)),1/2[A,B]-decalage*(unitvector(C-B))); - else: - label(btex \num{#4} etex rotated angle(B-C),1/2[C,B]-decalage*(unitvector(A-B))); - label(btex \num{#5} etex rotated(angle(A-B)),1/2[A,B]-decalage*(unitvector(C-B))); - fi + label(btex \num{#4} etex,1/2[C,B]-decalage*(unitvector(A-B))); + label(btex \num{#5} etex,1/2[A,B]-decalage*(unitvector(C-B))); + else: + label(btex \num{#4} etex,1/2[C,B]-decalage*(unitvector(A-B))); + label(btex \num{#5} etex,1/2[A,B]-decalage*(unitvector(C-B))); + fi else: if ypart(B)>ypart(O) : - label(btex \num{#4} etex rotated angle(C-A),1/2[C,A]-decalage*(unitvector(C-A) rotated 90)); - label(btex \num{#5} etex rotated(angle(C-B)),1/2[C,B]-decalage*(unitvector(C-B))); - else: - label(btex \num{#4} etex rotated angle(A-C),1/2[A,C]+decalage*(unitvector(A-C) rotated 90)); - label(btex \num{#5} etex rotated(angle(A-B)),1/2[A,B]-decalage*(unitvector(C-B))); + label(btex \num{#4} etex,1/2[C,A]-decalage*(unitvector(C-A) rotated 90)); + label(btex \num{#5} etex,1/2[C,B]+decalage*(unitvector(B-A))); + else: + label(btex \num{#4} etex,1/2[A,C]+decalage*(unitvector(A-C) + rotated 90)); + label(btex \num{#5} etex,1/2[A,B]-decalage*(unitvector(C-B))); fi; fi; label(btex #3 etex,1.2[O,A]); @@ -1971,20 +2339,20 @@ decalage=3mm; if #4<#5 : if ypart(B)>ypart(O) : - label(LATEX("\num{"&decimal(#4)&"}") rotated - angle(C-B),1/2[C,B]-decalage*(unitvector(A-B))); - label(LATEX("\num{"&decimal(#5)&"}") rotated(angle(B-A)),1/2[A,B]-decalage*(unitvector(C-B))); - else: - label(LATEX("\num{"&decimal(#4)&"}") rotated angle(B-C),1/2[C,B]-decalage*(unitvector(A-B))); - label(LATEX("\num{"&decimal(#5)&"}") rotated(angle(A-B)),1/2[A,B]-decalage*(unitvector(C-B))); - fi + label(btex \num{#4} etex,1/2[C,B]-decalage*(unitvector(A-B))); + label(btex \num{#5} etex,1/2[A,B]-decalage*(unitvector(C-B))); + else: + label(btex \num{#4} etex,1/2[C,B]-decalage*(unitvector(A-B))); + label(btex \num{#5} etex,1/2[A,B]-decalage*(unitvector(C-B))); + fi else: if ypart(B)>ypart(O) : - label(LATEX("\num{"&decimal(#4)&"}") rotated angle(C-A),1/2[C,A]-decalage*(unitvector(C-A) rotated 90)); - label(LATEX("\num{"&decimal(#5)&"}") rotated(angle(C-B)),1/2[C,B]-decalage*(unitvector(C-B))); - else: - label(LATEX("\num{"&decimal(#4)&"}") rotated angle(A-C),1/2[A,C]+decalage*(unitvector(A-C) rotated 90)); - label(LATEX("\num{"&decimal(#5)&"}") rotated(angle(A-B)),1/2[A,B]-decalage*(unitvector(C-B))); + label(btex \num{#4} etex,1/2[C,A]-decalage*(unitvector(C-A) rotated 90)); + label(btex \num{#5} etex,1/2[C,B]+decalage*(unitvector(B-A))); + else: + label(btex \num{#4} etex,1/2[A,C]+decalage*(unitvector(A-C) + rotated 90)); + label(btex \num{#5} etex,1/2[A,B]-decalage*(unitvector(C-B))); fi; fi; label(btex #3 etex,1.2[O,A]); @@ -2018,23 +2386,18 @@ A:=A rotatedabout(O,#7); B:=B rotatedabout(O,#7); C:=C rotatedabout(O,#7); - % On définit l'angle droit - % D-B=7*unitvector(C-B); - % F-B=7*unitvector(A-B); - % E-D=F-B; draw A{dir(angle(B-A)+5)}..B{dir(angle(B-A)+5)}; draw B{dir(angle(C-B)+5)}..C{dir(angle(C-B)+5)}; draw C{dir(angle(A-C)+5)}..A{dir(angle(A-C)+5)}; - % draw D--E--F; decalage=3mm; if ypart(B)>ypart(O) : - label(btex \num{#4} etex rotated angle(C-A),1/2[C,A]-decalage*(unitvector(C-A) rotated 90)); - label(btex \num{#5} etex rotated(angle(C-B)),1/2[C,B]-decalage*(unitvector(C-B))); - label(btex \num{#6} etex rotated(angle(B-A)),1/2[A,B]-decalage*(unitvector(C-B))); + label(btex \num{#4} etex,1/2[C,A]-decalage*(unitvector(C-A) rotated 90)); + label(btex \num{#5} etex,1/2[C,B]-decalage*(unitvector(C-B))); + label(btex \num{#6} etex,1/2[A,B]-decalage*(unitvector(C-B))); else: - label(btex \num{#4} etex rotated angle(A-C),1/2[A,C]+decalage*(unitvector(A-C) rotated 90)); - label(btex \num{#5} etex rotated(angle(A-B)),1/2[A,B]-decalage*(unitvector(C-B))); - label(btex \num{#6} etex rotated angle(C-B),1/2[C,B]-decalage*(unitvector(A-B))); + label(btex \num{#4} etex,1/2[A,C]+decalage*(unitvector(A-C) rotated 90)); + label(btex \num{#5} etex,1/2[A,B]-decalage*(unitvector(C-B))); + label(btex \num{#6} etex,1/2[C,B]-decalage*(unitvector(A-B))); fi; label(btex #1 etex,1.2[O,A]); label(btex #2 etex,1.2[O,B]); @@ -2055,14 +2418,9 @@ A:=A rotatedabout(O,#7); B:=B rotatedabout(O,#7); C:=C rotatedabout(O,#7); - % On définit l'angle droit - % D-B=7*unitvector(C-B); - % F-B=7*unitvector(A-B); - % E-D=F-B; draw A{dir(angle(B-A)+5)}..B{dir(angle(B-A)+5)}; draw B{dir(angle(C-B)+5)}..C{dir(angle(C-B)+5)}; draw C{dir(angle(A-C)+5)}..A{dir(angle(A-C)+5)}; - % draw D--E--F; decalage=3mm; if ypart(B)>ypart(O) : label(LATEX("\num{"&decimal(#4)&"}") rotated angle(C-A),1/2[C,A]-decalage*(unitvector(C-A) rotated 90)); @@ -2098,20 +2456,54 @@ \opcopy{#4}{A2}% \opcopy{#5}{A3}% % On trace une figure ou pas ? - \ifboolKV[ClesPythagore]{Figure}{%Utilisation obligatoire de l'option --shell-escape de la compilation - \begin{multicols}{2} - {\em La figure est donnée à titre indicatif.}% - \[\MPFigureReciPytha{\NomA}{\NomB}{\NomC}{#3}{#4}{#5}{\useKV[ClesPythagore]{Angle}}\]% - \par\columnbreak\par% - % on rédige + \ifboolKV[ClesPythagore]{FigureSeule}{% + \MPFigureReciPytha{\NomA}{\NomB}{\NomC}{#3}{#4}{#5}{\useKV[ClesPythagore]{Angle}}% + }{% + \ifboolKV[ClesPythagore]{Figure}{%Utilisation obligatoire de l'option --shell-escape de la compilation + \begin{multicols}{2} + {\em La figure est donnée à titre indicatif.}% + \[\MPFigureReciPytha{\NomA}{\NomB}{\NomC}{#3}{#4}{#5}{\useKV[ClesPythagore]{Angle}}\]% + \par\columnbreak\par% + % on rédige + Dans le triangle $#2$, $[\NomA\NomC]$ est le plus grand côté.% + \ifboolKV[ClesPythagore]{ReciColonnes}{% + \[ + \begin{array}{cccc|cccc} + &&\NomA\NomC^2&&&\NomA\NomB^2&+&\NomB\NomC^2\\ + &&\opexport{A1}{\Aun}\num{\Aun}^2&&&\opexport{A2}{\Adeux}\num{\Adeux}^2&+&\opexport{A3}{\Atrois}\num{\Atrois}^2\\ + &&\opmul*{A1}{A1}{a1}&&&\opmul*{A2}{A2}{a2}\opexport{a2}{\Adeux}\num{\Adeux}&+&\opmul*{A3}{A3}{a3}\opexport{a3}{\Atrois}\num{\Atrois}\\ + &&\opexport{a1}{\Aun}\num{\Aun}&&&\multicolumn{3}{c}{\opadd*{a2}{a3}{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}}\\ + \end{array} + \] + }{% + \[\left. + \begin{array}{l} + \NomA\NomC^2=\opexport{A1}{\Aun}\num{\Aun}^2=\opmul*{A1}{A1}{a1}\opexport{a1}{\Aun}\num{\Aun}\\ + \\ + \NomA\NomB^2+\NomB\NomC^2=\opexport{A2}{\Adeux}\num{\Adeux}^2+\opexport{A3}{\Atrois}\num{\Atrois}^2=\opmul*{A2}{A2}{a2}\opexport{a2}{\Adeux}\num{\Adeux}+\opmul*{A3}{A3}{a3}\opexport{a3}{\Atrois}\num{\Atrois}=\opadd*{a2}{a3}{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}\\ + \end{array} + \right\}\opcmp{a1}{a4}\ifopeq\NomA\NomC^2=\NomA\NomB^2+\NomB\NomC^2\fi\opcmp{a1}{a4}\ifopneq\NomA\NomC^2\not=\NomA\NomB^2+\NomB\NomC^2\fi + \] + } + \ifboolKV[ClesPythagore]{Egalite}{% + \opcmp{a1}{a4}\ifopeq Comme $\NomA\NomC^2=\NomA\NomB^2+\NomB\NomC^2$, alors l'égalité de Pythagore est vérifiée. Donc le triangle $#2$ est rectangle en $\NomB$.\fi% + \opcmp{a1}{a4}\ifopneq Comme $\NomA\NomC^2\not=\NomA\NomB^2+\NomB\NomC^2$, alors l'égalité de Pythagore n'est pas vérifiée. Donc le triangle $#2$ n'est pas rectangle.\fi% + }{% + \opcmp{a1}{a4}\ifopeq Comme $\NomA\NomC^2=\NomA\NomB^2+\NomB\NomC^2$, alors le triangle $#2$ est rectangle + en $\NomB$ d'après la réciproque du théorème de Pythagore.\fi% + \opcmp{a1}{a4}\ifopneq Comme $\NomA\NomC^2\not=\NomA\NomB^2+\NomB\NomC^2$, alors le + triangle $#2$ n'est pas rectangle\ifboolKV[ClesPythagore]{Faible}{.}{ d'après la contraposée du théorème de Pythagore.}\fi% + } + \end{multicols} + }{% Dans le triangle $#2$, $[\NomA\NomC]$ est le plus grand côté.% \ifboolKV[ClesPythagore]{ReciColonnes}{% \[ \begin{array}{cccc|cccc} - \NomA\NomC^2&&&&&\NomA\NomB^2&+&\NomB\NomC^2\\ - \opexport{A1}{\Aun}\num{\Aun}^2&&&&&\opexport{A2}{\Adeux}\num{\Adeux}^2&+&\opexport{A3}{\Atrois}\num{\Atrois}^2\\ - \opmul*{A1}{A1}{a1}&&&&&\opmul*{A2}{A2}{a2}\opexport{a2}{\Adeux}\num{\Adeux}&+&\opmul*{A3}{A3}{a3}\opexport{a3}{\Atrois}\num{\Atrois}\\ - \opexport{a1}{\Aun}\num{\Aun}&&&&&\multicolumn{3}{c}{\opadd*{a2}{a3}{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}}\\ + &&\NomA\NomC^2&&&\NomA\NomB^2&+&\NomB\NomC^2\\ + &&\opexport{A1}{\Aun}\num{\Aun}^2&&&\opexport{A2}{\Adeux}\num{\Adeux}^2&+&\opexport{A3}{\Atrois}\num{\Atrois}^2\\ + &&\opmul*{A1}{A1}{a1}&&&\opmul*{A2}{A2}{a2}\opexport{a2}{\Adeux}\num{\Adeux}&+&\opmul*{A3}{A3}{a3}\opexport{a3}{\Atrois}\num{\Atrois}\\ + &&\opexport{a1}{\Aun}\num{\Aun}&&&\multicolumn{3}{c}{\opadd*{a2}{a3}{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}}\\ \end{array} \] }{% @@ -2123,7 +2515,7 @@ \end{array} \right\}\opcmp{a1}{a4}\ifopeq\NomA\NomC^2=\NomA\NomB^2+\NomB\NomC^2\fi\opcmp{a1}{a4}\ifopneq\NomA\NomC^2\not=\NomA\NomB^2+\NomB\NomC^2\fi \] - } + }% \ifboolKV[ClesPythagore]{Egalite}{% \opcmp{a1}{a4}\ifopeq Comme $\NomA\NomC^2=\NomA\NomB^2+\NomB\NomC^2$, alors l'égalité de Pythagore est vérifiée. Donc le triangle $#2$ est rectangle en $\NomB$.\fi% \opcmp{a1}{a4}\ifopneq Comme $\NomA\NomC^2\not=\NomA\NomB^2+\NomB\NomC^2$, alors l'égalité de Pythagore n'est pas vérifiée. Donc le triangle $#2$ n'est pas rectangle.\fi% @@ -2132,39 +2524,9 @@ en $\NomB$ d'après la réciproque du théorème de Pythagore.\fi% \opcmp{a1}{a4}\ifopneq Comme $\NomA\NomC^2\not=\NomA\NomB^2+\NomB\NomC^2$, alors le triangle $#2$ n'est pas rectangle\ifboolKV[ClesPythagore]{Faible}{.}{ d'après la contraposée du théorème de Pythagore.}\fi% - } - \end{multicols} - }{% - Dans le triangle $#2$, $[\NomA\NomC]$ est le plus grand côté.% - \ifboolKV[ClesPythagore]{ReciColonnes}{% - \[ - \begin{array}{cccc|cccc} - \NomA\NomC^2&&&&&\NomA\NomB^2&+&\NomB\NomC^2\\ - \opexport{A1}{\Aun}\num{\Aun}^2&&&&&\opexport{A2}{\Adeux}\num{\Adeux}^2&+&\opexport{A3}{\Atrois}\num{\Atrois}^2\\ - \opmul*{A1}{A1}{a1}&&&&&\opmul*{A2}{A2}{a2}\opexport{a2}{\Adeux}\num{\Adeux}&+&\opmul*{A3}{A3}{a3}\opexport{a3}{\Atrois}\num{\Atrois}\\ - \opexport{a1}{\Aun}\num{\Aun}&&&&&\multicolumn{3}{c}{\opadd*{a2}{a3}{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}}\\ - \end{array} - \] - }{% - \[\left. - \begin{array}{l} - \NomA\NomC^2=\opexport{A1}{\Aun}\num{\Aun}^2=\opmul*{A1}{A1}{a1}\opexport{a1}{\Aun}\num{\Aun}\\ - \\ - \NomA\NomB^2+\NomB\NomC^2=\opexport{A2}{\Adeux}\num{\Adeux}^2+\opexport{A3}{\Atrois}\num{\Atrois}^2=\opmul*{A2}{A2}{a2}\opexport{a2}{\Adeux}\num{\Adeux}+\opmul*{A3}{A3}{a3}\opexport{a3}{\Atrois}\num{\Atrois}=\opadd*{a2}{a3}{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}\\ - \end{array} - \right\}\opcmp{a1}{a4}\ifopeq\NomA\NomC^2=\NomA\NomB^2+\NomB\NomC^2\fi\opcmp{a1}{a4}\ifopneq\NomA\NomC^2\not=\NomA\NomB^2+\NomB\NomC^2\fi - \] - } - \ifboolKV[ClesPythagore]{Egalite}{% - \opcmp{a1}{a4}\ifopeq Comme $\NomA\NomC^2=\NomA\NomB^2+\NomB\NomC^2$, alors l'égalité de Pythagore est vérifiée. Donc le triangle $#2$ est rectangle en $\NomB$.\fi% - \opcmp{a1}{a4}\ifopneq Comme $\NomA\NomC^2\not=\NomA\NomB^2+\NomB\NomC^2$, alors l'égalité de Pythagore n'est pas vérifiée. Donc le triangle $#2$ n'est pas rectangle.\fi% - }{% - \opcmp{a1}{a4}\ifopeq Comme $\NomA\NomC^2=\NomA\NomB^2+\NomB\NomC^2$, alors le triangle $#2$ est rectangle - en $\NomB$ d'après la réciproque du théorème de Pythagore.\fi% - \opcmp{a1}{a4}\ifopneq Comme $\NomA\NomC^2\not=\NomA\NomB^2+\NomB\NomC^2$, alors le - triangle $#2$ n'est pas rectangle\ifboolKV[ClesPythagore]{Faible}{.}{ d'après la contraposée du théorème de Pythagore.}\fi% - } - } + }% + }% + }% }{% % [xlop] paramètres de calcul \opcopy{#3}{A1}% @@ -2175,74 +2537,73 @@ \StrMid{#2}{2}{2}[\NomB]% \StrMid{#2}{3}{3}[\NomC]% % On trace une figure ou pas ? - \ifboolKV[ClesPythagore]{Figure}{%Utilisation obligatoire de l'option --shell-escape de la compilation - \begin{multicols}{2}% - {\em La figure est donnée à titre indicatif.}% - \[\MPFigurePytha{\NomA}{\NomB}{\NomC}{#3}{#4}{\useKV[ClesPythagore]{Angle}}\] - \par\columnbreak\par% + \ifboolKV[ClesPythagore]{FigureSeule}{% + \MPFigurePytha{\NomA}{\NomB}{\NomC}{#3}{#4}{\useKV[ClesPythagore]{Angle}} + }{% + \ifboolKV[ClesPythagore]{Figure}{%Utilisation obligatoire de l'option --shell-escape de la compilation + \begin{multicols}{2}% + {\em La figure est donnée à titre indicatif.}% + \[\MPFigurePytha{\NomA}{\NomB}{\NomC}{#3}{#4}{\useKV[ClesPythagore]{Angle}}\] + \par\columnbreak\par% + % On démarre la résolution + \ifboolKV[ClesPythagore]{Egalite}{Comme le triangle $#2$ est rectangle en $\NomB$, alors l'égalité de Pythagore est vérifiée :}{Dans le triangle $#2$ rectangle en $\NomB$, le th\'eor\`eme de Pythagore permet d'\'ecrire :% + }% + \xintifboolexpr{#3<#4 || #3=#4}{%\ifnum#3<#4% + \xdef\ResultatPytha{\fpeval{round(sqrt(#3^2+#4^2),\useKV[ClesPythagore]{Precision})}}% + \xdef\ResultatPytha{\fpeval{round(sqrt(#3^2+#4^2),\useKV[ClesPythagore]{Precision})}}% + \begin{align*} + \NomA\NomC^2&=\NomA\NomB^2+\NomB\NomC^2\\ + \NomA\NomC^2&=\ifboolKV[ClesPythagore]{EnchaineA}{\opcopy{\useKV[ClesPythagore]{ValeurA}}{a1}\opexport{a1}{\Aun}\num{\Aun}}{\opexport{A1}{\Aun}\num{\Aun}^2}+\ifboolKV[ClesPythagore]{EnchaineB}{\opcopy{\useKV[ClesPythagore]{ValeurB}}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}{\opexport{A2}{\Adeux}\num{\Adeux}^2}\\ + \NomA\NomC^2&=\ifboolKV[ClesPythagore]{EnchaineA}{\opexport{a1}{\Aun}\num{\Aun}}{\opmul*{A1}{A1}{a1}\opexport{a1}{\Aun}\num{\Aun}}+\ifboolKV[ClesPythagore]{EnchaineB}{\opexport{a2}{\Adeux}\num{\Adeux}}{\opmul*{A2}{A2}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}\\ + \NomA\NomC^2&=\opadd*{a1}{a2}{a3}\opexport{a3}{\Atrois}\num{\Atrois}%\\ + \ifboolKV[ClesPythagore]{AvantRacine}{}{% + \ifboolKV[ClesPythagore]{Entier}{}{\\\NomA\NomC&=\sqrt{\opexport{a3}{\Atrois}\num{\Atrois}}} + \ifboolKV[ClesPythagore]{Racine}{}{\\\ifboolKV[ClesPythagore]{Exact}{\NomA\NomC&=\opsqrt[maxdivstep=3]{a3}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}{\NomA\NomC&\approx\opsqrt[maxdivstep=5]{a3}{a4}\opround{a4}{pres}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}}%\\ + }% + \end{align*} + }{%\else% + \xdef\ResultatPytha{\fpeval{round(sqrt(#3^2-#4^2),\useKV[ClesPythagore]{Precision})}}% + \begin{align*} + \NomA\NomC^2&=\NomA\NomB^2+\NomB\NomC^2\\ + \ifboolKV[ClesPythagore]{EnchaineC}{\opcopy{\useKV[ClesPythagore]{ValeurC}}{a1}\opexport{a1}{\Aun}\num{\Aun}}{\opexport{A1}{\Aun}\num{\Aun}^2}&=\NomA\NomB^2+\ifboolKV[ClesPythagore]{EnchaineB}{\opcopy{\useKV[ClesPythagore]{ValeurB}}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}{\opexport{A2}{\Adeux}\num{\Adeux}^2}\\ + \ifboolKV[ClesPythagore]{EnchaineC}{\opcopy{\useKV[ClesPythagore]{ValeurC}}{a1}\opexport{a1}{\Aun}\num{\Aun}}{\opmul*{A1}{A1}{a1}\opexport{a1}{\Aun}\num{\Aun}}&=\NomA\NomB^2+\ifboolKV[ClesPythagore]{EnchaineB}{\opexport{a2}{\Adeux}\num{\Adeux}}{\opmul*{A2}{A2}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}\\ + \NomA\NomB^2&=\ifboolKV[ClesPythagore]{EnchaineC}{\opcopy{\useKV[ClesPythagore]{ValeurC}}{a1}\opexport{a1}{\Aun}\num{\Aun}}{\opmul*{A1}{A1}{a1}\opexport{a1}{\Aun}\num{\Aun}}-\ifboolKV[ClesPythagore]{EnchaineB}{\opexport{a2}{\Adeux}\num{\Adeux}}{\opmul*{A2}{A2}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}\\ + \NomA\NomB^2&=\opsub*{a1}{a2}{a3}\opexport{a3}{\Atrois}\num{\Atrois}%\\ + \ifboolKV[ClesPythagore]{AvantRacine}{}{% + \ifboolKV[ClesPythagore]{Entier}{}{\\\NomA\NomB&=\sqrt{\opexport{a3}{\Atrois}\num{\Atrois}}} + \ifboolKV[ClesPythagore]{Racine}{}{\\\ifboolKV[ClesPythagore]{Exact}{\NomA\NomB&=\opsqrt[maxdivstep=3]{a3}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}{\NomA\NomB&\approx\opsqrt[maxdivstep=5]{a3}{a4}\opround{a4}{pres}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}}%\\ + }% + \end{align*} + }%\fi% + \end{multicols} + }{% % On démarre la résolution \ifboolKV[ClesPythagore]{Egalite}{Comme le triangle $#2$ est rectangle en $\NomB$, alors l'égalité de Pythagore est vérifiée :}{Dans le triangle $#2$ rectangle en $\NomB$, le th\'eor\`eme de Pythagore permet d'\'ecrire :% }% \xintifboolexpr{#3<#4 || #3=#4}{%\ifnum#3<#4% \xdef\ResultatPytha{\fpeval{round(sqrt(#3^2+#4^2),\useKV[ClesPythagore]{Precision})}}% - \xdef\ResultatPytha{\fpeval{round(sqrt(#3^2+#4^2),\useKV[ClesPythagore]{Precision})}}% \begin{align*} \NomA\NomC^2&=\NomA\NomB^2+\NomB\NomC^2\\ \NomA\NomC^2&=\ifboolKV[ClesPythagore]{EnchaineA}{\opcopy{\useKV[ClesPythagore]{ValeurA}}{a1}\opexport{a1}{\Aun}\num{\Aun}}{\opexport{A1}{\Aun}\num{\Aun}^2}+\ifboolKV[ClesPythagore]{EnchaineB}{\opcopy{\useKV[ClesPythagore]{ValeurB}}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}{\opexport{A2}{\Adeux}\num{\Adeux}^2}\\ \NomA\NomC^2&=\ifboolKV[ClesPythagore]{EnchaineA}{\opexport{a1}{\Aun}\num{\Aun}}{\opmul*{A1}{A1}{a1}\opexport{a1}{\Aun}\num{\Aun}}+\ifboolKV[ClesPythagore]{EnchaineB}{\opexport{a2}{\Adeux}\num{\Adeux}}{\opmul*{A2}{A2}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}\\ \NomA\NomC^2&=\opadd*{a1}{a2}{a3}\opexport{a3}{\Atrois}\num{\Atrois}%\\ - \ifboolKV[ClesPythagore]{AvantRacine}{}{% - \\ - \ifboolKV[ClesPythagore]{Entier}{}{\NomA\NomC&=\sqrt{\opexport{a3}{\Atrois}\num{\Atrois}}\\} - \ifboolKV[ClesPythagore]{Racine}{}{\ifboolKV[ClesPythagore]{Exact}{\NomA\NomC&=\opsqrt[maxdivstep=3]{a3}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}{\NomA\NomC&\approx\opsqrt[maxdivstep=5]{a3}{a4}\opround{a4}{pres}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}}%\\ + \ifboolKV[ClesPythagore]{AvantRacine}{}{% + \ifboolKV[ClesPythagore]{Entier}{}{\\\NomA\NomC&=\sqrt{\opexport{a3}{\Atrois}\num{\Atrois}}} + \ifboolKV[ClesPythagore]{Racine}{}{\\\ifboolKV[ClesPythagore]{Exact}{\NomA\NomC&=\opsqrt[maxdivstep=3]{a3}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}{\NomA\NomC&\approx\opsqrt[maxdivstep=5]{a3}{a4}\opround{a4}{pres}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}}%\\ } \end{align*} - }{%\else% + }{%\else \xdef\ResultatPytha{\fpeval{round(sqrt(#3^2-#4^2),\useKV[ClesPythagore]{Precision})}}% - \begin{align*} - \NomA\NomC^2&=\NomA\NomB^2+\NomB\NomC^2\\ - \ifboolKV[ClesPythagore]{EnchaineC}{\opcopy{\useKV[ClesPythagore]{ValeurC}}{a1}\opexport{a1}{\Aun}\num{\Aun}}{\opexport{A1}{\Aun}\num{\Aun}^2}&=\NomA\NomB^2+\ifboolKV[ClesPythagore]{EnchaineB}{\opcopy{\useKV[ClesPythagore]{ValeurB}}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}{\opexport{A2}{\Adeux}\num{\Adeux}^2}\\ - \ifboolKV[ClesPythagore]{EnchaineC}{\opcopy{\useKV[ClesPythagore]{ValeurC}}{a1}\opexport{a1}{\Aun}\num{\Aun}}{\opmul*{A1}{A1}{a1}\opexport{a1}{\Aun}\num{\Aun}}&=\NomA\NomB^2+\ifboolKV[ClesPythagore]{EnchaineB}{\opexport{a2}{\Adeux}\num{\Adeux}}{\opmul*{A2}{A2}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}\\ - \NomA\NomB^2&=\ifboolKV[ClesPythagore]{EnchaineC}{\opcopy{\useKV[ClesPythagore]{ValeurC}}{a1}\opexport{a1}{\Aun}\num{\Aun}}{\opmul*{A1}{A1}{a1}\opexport{a1}{\Aun}\num{\Aun}}-\ifboolKV[ClesPythagore]{EnchaineB}{\opexport{a2}{\Adeux}\num{\Adeux}}{\opmul*{A2}{A2}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}\\ - \NomA\NomB^2&=\opsub*{a1}{a2}{a3}\opexport{a3}{\Atrois}\num{\Atrois}%\\ - \ifboolKV[ClesPythagore]{AvantRacine}{}{% - \\ - \ifboolKV[ClesPythagore]{Entier}{}{\NomA\NomB&=\sqrt{\opexport{a3}{\Atrois}\num{\Atrois}}\\} - \ifboolKV[ClesPythagore]{Racine}{}{\ifboolKV[ClesPythagore]{Exact}{\NomA\NomB&=\opsqrt[maxdivstep=3]{a3}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}{\NomA\NomB&\approx\opsqrt[maxdivstep=5]{a3}{a4}\opround{a4}{pres}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}}%\\ - } - \end{align*} - }%\fi% - \end{multicols} - }{% - % On démarre la résolution - \ifboolKV[ClesPythagore]{Egalite}{Comme le triangle $#2$ est rectangle en $\NomB$, alors l'égalité de Pythagore est vérifiée :}{Dans le triangle $#2$ rectangle en $\NomB$, le th\'eor\`eme de Pythagore permet d'\'ecrire :% - }% - \xintifboolexpr{#3<#4 || #3=#4}{%\ifnum#3<#4% - \xdef\ResultatPytha{\fpeval{round(sqrt(#3^2+#4^2),\useKV[ClesPythagore]{Precision})}}% - \begin{align*} - \NomA\NomC^2&=\NomA\NomB^2+\NomB\NomC^2\\ - \NomA\NomC^2&=\ifboolKV[ClesPythagore]{EnchaineA}{\opcopy{\useKV[ClesPythagore]{ValeurA}}{a1}\opexport{a1}{\Aun}\num{\Aun}}{\opexport{A1}{\Aun}\num{\Aun}^2}+\ifboolKV[ClesPythagore]{EnchaineB}{\opcopy{\useKV[ClesPythagore]{ValeurB}}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}{\opexport{A2}{\Adeux}\num{\Adeux}^2}\\ - \NomA\NomC^2&=\ifboolKV[ClesPythagore]{EnchaineA}{\opexport{a1}{\Aun}\num{\Aun}}{\opmul*{A1}{A1}{a1}\opexport{a1}{\Aun}\num{\Aun}}+\ifboolKV[ClesPythagore]{EnchaineB}{\opexport{a2}{\Adeux}\num{\Adeux}}{\opmul*{A2}{A2}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}\\ - \NomA\NomC^2&=\opadd*{a1}{a2}{a3}\opexport{a3}{\Atrois}\num{\Atrois}%\\ - \ifboolKV[ClesPythagore]{AvantRacine}{}{% - \\ - \ifboolKV[ClesPythagore]{Entier}{}{\NomA\NomC&=\sqrt{\opexport{a3}{\Atrois}\num{\Atrois}}\\} - \ifboolKV[ClesPythagore]{Racine}{}{\ifboolKV[ClesPythagore]{Exact}{\NomA\NomC&=\opsqrt[maxdivstep=3]{a3}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}{\NomA\NomC&\approx\opsqrt[maxdivstep=5]{a3}{a4}\opround{a4}{pres}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}}%\\ - } - \end{align*} - }{%\else - \xdef\ResultatPytha{\fpeval{round(sqrt(#3^2-#4^2),\useKV[ClesPythagore]{Precision})}}% - \ifboolKV[ClesPythagore]{Soustraction}{% - \begin{align*} + \ifboolKV[ClesPythagore]{Soustraction}{% + \begin{align*} \NomA\NomB^2&=\NomA\NomC^2-\NomB\NomC^2\\ \NomA\NomB^2&=\ifboolKV[ClesPythagore]{EnchaineC}{\opcopy{\useKV[ClesPythagore]{ValeurC}}{a1}\opexport{a1}{\Aun}\num{\Aun}}{\opexport{A1}{\Aun}\num{\Aun}^2}-\ifboolKV[ClesPythagore]{EnchaineB}{\opcopy{\useKV[ClesPythagore]{ValeurB}}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}{\opexport{A2}{\Adeux}\num{\Adeux}^2}\\ \NomA\NomB^2&=\ifboolKV[ClesPythagore]{EnchaineC}{\opcopy{\useKV[ClesPythagore]{ValeurC}}{a1}\opexport{a1}{\Aun}\num{\Aun}}{\opmul*{A1}{A1}{a1}\opexport{a1}{\Aun}\num{\Aun}}-\ifboolKV[ClesPythagore]{EnchaineB}{\opexport{a2}{\Adeux}\num{\Adeux}}{\opmul*{A2}{A2}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}\\ - \NomA\NomB^2&=\opsub*{a1}{a2}{a3}\opexport{a3}{\Atrois}\num{\Atrois}%\\ - \ifboolKV[ClesPythagore]{AvantRacine}{}{% - \\ - \ifboolKV[ClesPythagore]{Entier}{}{\NomA\NomB&=\sqrt{\opexport{a3}{\Atrois}\num{\Atrois}}\\} - \ifboolKV[ClesPythagore]{Racine}{}{\ifboolKV[ClesPythagore]{Exact}{\NomA\NomB&=\opsqrt[maxdivstep=3]{a3}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}{\NomA\NomB&\approx\opsqrt[maxdivstep=5]{a3}{a4}\opround{a4}{pres}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}}%\\ - } + \NomA\NomB^2&=\opsub*{a1}{a2}{a3}\opexport{a3}{\Atrois}\num{\Atrois}%\\ + \ifboolKV[ClesPythagore]{AvantRacine}{}{% + \ifboolKV[ClesPythagore]{Entier}{}{\\\NomA\NomB&=\sqrt{\opexport{a3}{\Atrois}\num{\Atrois}}} + \ifboolKV[ClesPythagore]{Racine}{}{\\\ifboolKV[ClesPythagore]{Exact}{\NomA\NomB&=\opsqrt[maxdivstep=3]{a3}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}{\NomA\NomB&\approx\opsqrt[maxdivstep=5]{a3}{a4}\opround{a4}{pres}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}}%\\ + } \end{align*} }{% \begin{align*} @@ -2252,20 +2613,20 @@ \NomA\NomB^2&=\ifboolKV[ClesPythagore]{EnchaineC}{\opcopy{\useKV[ClesPythagore]{ValeurC}}{a1}\opexport{a1}{\Aun}\num{\Aun}}{\opmul*{A1}{A1}{a1}\opexport{a1}{\Aun}\num{\Aun}}-\ifboolKV[ClesPythagore]{EnchaineB}{\opexport{a2}{\Adeux}\num{\Adeux}}{\opmul*{A2}{A2}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}\\ \NomA\NomB^2&=\opsub*{a1}{a2}{a3}\opexport{a3}{\Atrois}\num{\Atrois}%\\ \ifboolKV[ClesPythagore]{AvantRacine}{}{% - \\ - \ifboolKV[ClesPythagore]{Entier}{}{\NomA\NomB&=\sqrt{\opexport{a3}{\Atrois}\num{\Atrois}}\\} - \ifboolKV[ClesPythagore]{Racine}{}{\ifboolKV[ClesPythagore]{Exact}{\NomA\NomB&=\opsqrt[maxdivstep=3]{a3}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}{\NomA\NomB&\approx\opsqrt[maxdivstep=5]{a3}{a4}\opround{a4}{pres}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}}%\\ + \ifboolKV[ClesPythagore]{Entier}{}{\\\NomA\NomB&=\sqrt{\opexport{a3}{\Atrois}\num{\Atrois}}}% + \ifboolKV[ClesPythagore]{Racine}{}{\\\ifboolKV[ClesPythagore]{Exact}{\NomA\NomB&=\opsqrt[maxdivstep=3]{a3}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}{\NomA\NomB&\approx\opsqrt[maxdivstep=5]{a3}{a4}\opround{a4}{pres}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}}%\\ } \end{align*} }% - }%\fi% + }%\fi% + }% }% }% }% -%%%%%%%%%%%%%%%%% -%% Distributivité -%%%%%%%%%%%%%%%%% +%%% +% Distributivité +%%% % https://tex.stackexchange.com/questions/168972/draw-arrows-to-show-multiplication-pattern-distributive-property/169278?noredirect=1 \newcommand{\Tikzmark}[1]{% \tikz[remember picture,baseline,inner sep=0pt]{% @@ -2303,8 +2664,7 @@ % y a dans un "seul calcul". \setcounter{NbCalculDistri}{0} -\setKVdefault[ClesDistributivite]{Etape=1,Lettre=x,Fleches=false,AideMul=false,Reduction=false,AideAdda=false,AideAddb=false,CouleurAide=red,CouleurReduction=black,CouleurFH=blue,CouleurFB=red,Somme=false,Difference=false,RAZ=false,Oppose=false,All=false,NomExpression=A,Fin=4,Numerique=false,Remarquable=false,Echange=0}%,AideAdd=false - %inutile ? +\setKVdefault[ClesDistributivite]{Etape=1,Lettre=x,Fleches=false,AideMul=false,Reduction=false,AideAdda=false,AideAddb=false,CouleurAide=red,CouleurReduction=black,CouleurFH=blue,CouleurFB=red,Somme=false,Difference=false,RAZ=false,Oppose=false,All=false,NomExpression=A,Fin=4,Numerique=false,Remarquable=false,Echange=0}%,AideAdd=false:inutile ? \newcommand\Affichage[4][]{% \setKV[ClesDistributivite]{#1}%On lit les arguments optionnels @@ -2332,9 +2692,7 @@ \useKVdefault[ClesDistributivite]%obligatoire car la macro n'est pas dans un groupe. \setKV[ClesDistributivite]{#1}%On lit les arguments optionnels \ifboolKV[ClesDistributivite]{RAZ}{\xdef\SommeA{0}\xdef\SommeB{0}\xdef\SommeC{0}% - % 80 \setcounter{NbCalculDistri}{0}% - % fin 80 }{}% \colorlet{DCAide}{\useKV[ClesDistributivite]{CouleurAide}}% \colorlet{DCReduction}{\useKV[ClesDistributivite]{CouleurReduction}}% @@ -2343,193 +2701,183 @@ \xintifboolexpr{\useKV[ClesDistributivite]{Echange}>0}{% \DistriEchange[#1]{#2}{#3}{#4}{#5}% }{% - \ifboolKV[ClesDistributivite]{Remarquable}{% - \xintifboolexpr{\useKV[ClesDistributivite]{Etape}=1}{% - \ifx\bla#4\bla(\Affichage{0}{#2}{#3})^2\else(\Affichage{0}{#2}{#3})(\Affichage{0}{#4}{#5})\fi% - }{} - \xintifboolexpr{\useKV[ClesDistributivite]{Etape}=2}{\ifx\bla#4\bla\xintifboolexpr{#3>0}{\xintifboolexpr{#2=1}{}{(\num{#2}}\useKV[ClesDistributivite]{Lettre}\xintifboolexpr{#2=1}{}{)}^2+2\times\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesDistributivite]{Lettre}\times\num{#3}+\num{#3}^2}{\xintifboolexpr{#2=1}{}{(\num{#2}}\useKV[ClesDistributivite]{Lettre}\xintifboolexpr{#2=1}{}{)}^2-2\times\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesDistributivite]{Lettre}\times\num{\fpeval{0-#3}}+\num{\fpeval{0-#3}}^2}\else\xintifboolexpr{#2=1}{}{(\num{#2}}\useKV[ClesDistributivite]{Lettre}\xintifboolexpr{#2=1}{}{)}^2-\num{#3}^2\fi}{} - \xintifboolexpr{\useKV[ClesDistributivite]{Etape}=3}{% - %80 - \xintifboolexpr{\theNbCalculDistri>1}{\setcounter{NbCalculDistri}{0}}{}% - \stepcounter{NbCalculDistri}% - % fin 80 - \ifx\bla#4\bla% - \xdef\Multi{\fpeval{#2*#2}}% - \xdef\Multij{\fpeval{#2*#3}}% - \xdef\Multik{\fpeval{#3*#2}}% - \xdef\Multil{\fpeval{#3*#3}}% - %% ils sont redéfinis pour pouvoir envisager la somme de deux - %% expressions à développer - \xdef\Multim{\fpeval{#2*#3+#3*#2}}% - \ifboolKV[ClesDistributivite]{Oppose}{% - \xdef\Multi{\fpeval{-\Multi}}% - \xdef\Multim{\fpeval{-\Multim}}% - \xdef\Multil{\fpeval{-\Multil}}% - \xintifboolexpr{\Multi=0}{}{\xintifboolexpr{\Multi<0}{(}{}\Affichage{\Multi}{0}{0}\xintifboolexpr{\Multi<0}{)}{}}% - \xintifboolexpr{\Multim=0}{}{\xintifboolexpr{\Multim>0}{+}{+(}\Affichage{0}{\Multim}{0}\xintifboolexpr{\Multim<0}{)}{}}% - \xintifboolexpr{\Multil=0}{}{\xintifboolexpr{\Multil>0}{+}{+(}\Affichage{0}{0}{\Multil}\xintifboolexpr{\Multil<0}{)}{}}% - }{% - \Affichage{\Multi}{\Multim}{\Multil}% - } - \ifboolKV[ClesDistributivite]{Somme}{\xdef\SommeA{\fpeval{\SommeA+#2*#2}}\xdef\SommeB{\fpeval{\SommeB+#2*#3+#3*#2}}\xdef\SommeC{\fpeval{\SommeC+#3*#3}}}{}% - \ifboolKV[ClesDistributivite]{Difference}{\xdef\SommeA{\fpeval{\SommeA-#2*#2}}\xdef\SommeB{\fpeval{\SommeB-#2*#3-#3*#2}}\xdef\SommeC{\fpeval{\SommeC-#3*#3}}}{}% - \else% - \xdef\Multi{\fpeval{#2*#4}}% - \xdef\Multij{\fpeval{#2*#5}}% - \xdef\Multik{\fpeval{#3*#4}}% - \xdef\Multil{\fpeval{#3*#5}}% - %% ils sont redéfinis pour pouvoir envisager la somme de deux - %% expressions à développer - \xdef\Multim{\fpeval{#2*#5+#3*#4}}% - \ifboolKV[ClesDistributivite]{Oppose}{% - \xdef\Multi{\fpeval{-\Multi}}% - \xdef\Multim{\fpeval{-\Multim}}% - \xdef\Multil{\fpeval{-\Multil}}% - \xintifboolexpr{\Multi=0}{}{\xintifboolexpr{\Multi<0}{(}{}\Affichage{\Multi}{0}{0}\xintifboolexpr{\Multi<0}{)}{}}% - \xintifboolexpr{\Multim=0}{}{\xintifboolexpr{\Multim>0}{+}{+(}\Affichage{0}{\Multim}{0}\xintifboolexpr{\Multim<0}{)}{}}% - \xintifboolexpr{\Multil=0}{}{\xintifboolexpr{\Multil>0}{+}{+(}\Affichage{0}{0}{\Multil}\xintifboolexpr{\Multil<0}{)}{}}% - }{% - \Affichage{\Multi}{\Multim}{\Multil}% - } - \ifboolKV[ClesDistributivite]{Somme}{\xdef\SommeA{\fpeval{\SommeA+#2*#4}}\xdef\SommeB{\fpeval{\SommeB+#2*#5+#3*#4}}\xdef\SommeC{\fpeval{\SommeC+#3*#5}}}{}% - \ifboolKV[ClesDistributivite]{Difference}{\xdef\SommeA{\fpeval{\SommeA-#2*#4}}\xdef\SommeB{\fpeval{\SommeB-#2*#5-#3*#4}}\xdef\SommeC{\fpeval{\SommeC-#3*#5}}}{}% - \fi% - }{}% - }{% - \ifboolKV[ClesDistributivite]{Numerique}{% - \xintifboolexpr{\useKV[ClesDistributivite]{Etape}=0}{% - \num{\fpeval{#2+#3}}\times\num{\fpeval{#4+#5}}\multido{\i=2+1}{4}{=\Distri[Numerique,Etape=\i]{#2}{#3}{#4}{#5}}% - }{% - \xintifboolexpr{\useKV[ClesDistributivite]{Etape}=-1}{% - \Distri[Numerique,Etape=3]{#2}{#3}{#4}{#5}\multido{\i=2+-1}{2}{=\Distri[Numerique,Etape=\i]{#2}{#3}{#4}{#5}}=\num{\fpeval{(#2+#3)*(#4+#5)}}% + \ifboolKV[ClesDistributivite]{Remarquable}{% + \xintifboolexpr{\useKV[ClesDistributivite]{Etape}=1}{% + \ifx\bla#4\bla(\Affichage{0}{#2}{#3})^2\else(\Affichage{0}{#2}{#3})(\Affichage{0}{#4}{#5})\fi% + }{} + \xintifboolexpr{\useKV[ClesDistributivite]{Etape}=2}{\ifx\bla#4\bla\xintifboolexpr{#3>0}{\xintifboolexpr{#2=1}{}{(\num{#2}}\useKV[ClesDistributivite]{Lettre}\xintifboolexpr{#2=1}{}{)}^2+2\times\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesDistributivite]{Lettre}\times\num{#3}+\num{#3}^2}{\xintifboolexpr{#2=1}{}{(\num{#2}}\useKV[ClesDistributivite]{Lettre}\xintifboolexpr{#2=1}{}{)}^2-2\times\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesDistributivite]{Lettre}\times\num{\fpeval{0-#3}}+\num{\fpeval{0-#3}}^2}\else\xintifboolexpr{#2=1}{}{(\num{#2}}\useKV[ClesDistributivite]{Lettre}\xintifboolexpr{#2=1}{}{)}^2-\num{#3}^2\fi}{} + \xintifboolexpr{\useKV[ClesDistributivite]{Etape}=3}{% + \xintifboolexpr{\theNbCalculDistri>1}{\setcounter{NbCalculDistri}{0}}{}% + \stepcounter{NbCalculDistri}% + \ifx\bla#4\bla% + \xdef\Multi{\fpeval{#2*#2}}% + \xdef\Multij{\fpeval{#2*#3}}% + \xdef\Multik{\fpeval{#3*#2}}% + \xdef\Multil{\fpeval{#3*#3}}% + %% ils sont redéfinis pour pouvoir envisager la somme de deux + %% expressions à développer + \xdef\Multim{\fpeval{#2*#3+#3*#2}}% + \ifboolKV[ClesDistributivite]{Oppose}{% + \xdef\Multi{\fpeval{-\Multi}}% + \xdef\Multim{\fpeval{-\Multim}}% + \xdef\Multil{\fpeval{-\Multil}}% + \xintifboolexpr{\Multi=0}{}{\xintifboolexpr{\Multi<0}{(}{}\Affichage{\Multi}{0}{0}\xintifboolexpr{\Multi<0}{)}{}}% + \xintifboolexpr{\Multim=0}{}{\xintifboolexpr{\Multim>0}{+}{+(}\Affichage{0}{\Multim}{0}\xintifboolexpr{\Multim<0}{)}{}}% + \xintifboolexpr{\Multil=0}{}{\xintifboolexpr{\Multil>0}{+}{+(}\Affichage{0}{0}{\Multil}\xintifboolexpr{\Multil<0}{)}{}}% }{% - \xintifboolexpr{\useKV[ClesDistributivite]{Etape}=1}{\num{\fpeval{#2+#3}}\times\num{\fpeval{#4+#5}}}{}% - \xintifboolexpr{\useKV[ClesDistributivite]{Etape}=2}{\num{\fpeval{#2+#3}}\times(\num{#4}\xintifboolexpr{#5>0}{+}{-}\num{\fpeval{abs(#5)}})}{}% - \xintifboolexpr{\useKV[ClesDistributivite]{Etape}=3}{\num{#3}\times\num{#4}\xintifboolexpr{#5>0}{+}{-}\num{#3}\times\num{\fpeval{abs(#5)}}}{}% - \xintifboolexpr{\useKV[ClesDistributivite]{Etape}=4}{\num{\fpeval{#3*#4}}\xintifboolexpr{#5>0}{+}{-}\num{\fpeval{abs(#3*#5)}}}{}% - \xintifboolexpr{\useKV[ClesDistributivite]{Etape}=5}{\num{\fpeval{#3*#4+#3*#5}}}{}% - }% - }% + \Affichage{\Multi}{\Multim}{\Multil}% + } + \ifboolKV[ClesDistributivite]{Somme}{\xdef\SommeA{\fpeval{\SommeA+#2*#2}}\xdef\SommeB{\fpeval{\SommeB+#2*#3+#3*#2}}\xdef\SommeC{\fpeval{\SommeC+#3*#3}}}{}% + \ifboolKV[ClesDistributivite]{Difference}{\xdef\SommeA{\fpeval{\SommeA-#2*#2}}\xdef\SommeB{\fpeval{\SommeB-#2*#3-#3*#2}}\xdef\SommeC{\fpeval{\SommeC-#3*#3}}}{}% + \else% + \xdef\Multi{\fpeval{#2*#4}}% + \xdef\Multij{\fpeval{#2*#5}}% + \xdef\Multik{\fpeval{#3*#4}}% + \xdef\Multil{\fpeval{#3*#5}}% + %% ils sont redéfinis pour pouvoir envisager la somme de deux + %% expressions à développer + \xdef\Multim{\fpeval{#2*#5+#3*#4}}% + \ifboolKV[ClesDistributivite]{Oppose}{% + \xdef\Multi{\fpeval{-\Multi}}% + \xdef\Multim{\fpeval{-\Multim}}% + \xdef\Multil{\fpeval{-\Multil}}% + \xintifboolexpr{\Multi=0}{}{\xintifboolexpr{\Multi<0}{(}{}\Affichage{\Multi}{0}{0}\xintifboolexpr{\Multi<0}{)}{}}% + \xintifboolexpr{\Multim=0}{}{\xintifboolexpr{\Multim>0}{+}{+(}\Affichage{0}{\Multim}{0}\xintifboolexpr{\Multim<0}{)}{}}% + \xintifboolexpr{\Multil=0}{}{\xintifboolexpr{\Multil>0}{+}{+(}\Affichage{0}{0}{\Multil}\xintifboolexpr{\Multil<0}{)}{}}% + }{% + \Affichage{\Multi}{\Multim}{\Multil}% + } + \ifboolKV[ClesDistributivite]{Somme}{\xdef\SommeA{\fpeval{\SommeA+#2*#4}}\xdef\SommeB{\fpeval{\SommeB+#2*#5+#3*#4}}\xdef\SommeC{\fpeval{\SommeC+#3*#5}}}{}% + \ifboolKV[ClesDistributivite]{Difference}{\xdef\SommeA{\fpeval{\SommeA-#2*#4}}\xdef\SommeB{\fpeval{\SommeB-#2*#5-#3*#4}}\xdef\SommeC{\fpeval{\SommeC-#3*#5}}}{}% + \fi% + }{}% }{% - \ifboolKV[ClesDistributivite]{All}{% - \xdef\NomLettre{\useKV[ClesDistributivite]{NomExpression}}% - \xdef\NomFin{\useKV[ClesDistributivite]{Fin}}% - \xintFor* ##1 in {\xintSeq {1}{\useKV[ClesDistributivite]{Fin}-1}}\do - {\NomLettre&=\Distri[Etape=##1]{#2}{#3}{#4}{#5}\\}% - \NomLettre&=\Distri[Etape=\NomFin]{#2}{#3}{#4}{#5}% + \ifboolKV[ClesDistributivite]{Numerique}{% + \xintifboolexpr{\useKV[ClesDistributivite]{Etape}=0}{% + \num{\fpeval{#2+#3}}\times\num{\fpeval{#4+#5}}\multido{\i=2+1}{4}{=\Distri[Numerique,Etape=\i]{#2}{#3}{#4}{#5}}% + }{% + \xintifboolexpr{\useKV[ClesDistributivite]{Etape}=-1}{% + \Distri[Numerique,Etape=3]{#2}{#3}{#4}{#5}\multido{\i=2+-1}{2}{=\Distri[Numerique,Etape=\i]{#2}{#3}{#4}{#5}}=\num{\fpeval{(#2+#3)*(#4+#5)}}% + }{% + \xintifboolexpr{\useKV[ClesDistributivite]{Etape}=1}{\num{\fpeval{#2+#3}}\times\num{\fpeval{#4+#5}}}{}% + \xintifboolexpr{\useKV[ClesDistributivite]{Etape}=2}{\num{\fpeval{#2+#3}}\times(\num{#4}\xintifboolexpr{#5>0}{+}{-}\num{\fpeval{abs(#5)}})}{}% + \xintifboolexpr{\useKV[ClesDistributivite]{Etape}=3}{\num{#3}\times\num{#4}\xintifboolexpr{#5>0}{+}{-}\num{#3}\times\num{\fpeval{abs(#5)}}}{}% + \xintifboolexpr{\useKV[ClesDistributivite]{Etape}=4}{\num{\fpeval{#3*#4}}\xintifboolexpr{#5>0}{+}{-}\num{\fpeval{abs(#3*#5)}}}{}% + \xintifboolexpr{\useKV[ClesDistributivite]{Etape}=5}{\num{\fpeval{#3*#4+#3*#5}}}{}% + }% + }% }{% - % Etape 1 - \xintifboolexpr{\useKV[ClesDistributivite]{Etape}=1}{% - \xintifboolexpr{#2=0}{% - }{\xintifboolexpr{#3=0}{}{(}}\Tikzmark{\Affichage[#1]{0}{#2}{0}}% - \ifboolKV[ClesDistributivite]{AideAdda}{\mathcolor{DCAide}{+(}}{}% - \xintifboolexpr{#3>0}{\xintifboolexpr{#2=0}{}{+}}{\xintifboolexpr{#3<0}{-}{}}\Tikzmark{\Affichage[#1]{0}{0}{\fpeval{abs(#3)}}}% - \ifboolKV[ClesDistributivite]{AideAdda}{\mathcolor{DCAide}{)}}{}% - \xintifboolexpr{#2=0}{}{\xintifboolexpr{#3=0}{}{)}}% - % - \ifboolKV[ClesDistributivite]{AideMul}{\times}{}%on aide dans le cas double - \xdef\Multi{\fpeval{#4*#5}}%affichage auto si (a+b)xk - % - \xintifboolexpr{\Multi=0}{\times% - \xintifboolexpr{#4<0}{(}{\xintifboolexpr{#5<0}{(}{}}}{(}% - \Tikzmark{\Affichage[#1]{0}{#4}{0}}% - \ifboolKV[ClesDistributivite]{AideAddb}{\mathcolor{DCAide}{+(}}{}% - \xintifboolexpr{#5>0}{\xintifboolexpr{#4=0}{}{+}}{\xintifboolexpr{#5<0}{\xintifboolexpr{#4=0}{{-}}{-}}{}}\Tikzmark{\Affichage[#1]{0}{0}{\fpeval{abs(#5)}}}% - \ifboolKV[ClesDistributivite]{AideAddb}{\mathcolor{DCAide}{)}}{}% - \xintifboolexpr{\Multi=0}{% - \xintifboolexpr{#4<0}{)}{\xintifboolexpr{#5<0}{)}{}}}{)}% - \ifboolKV[ClesDistributivite]{Fleches}{% - \xdef\Multi{\fpeval{#2*#3*#4*#5}}% + \ifboolKV[ClesDistributivite]{All}{% + \xdef\NomLettre{\useKV[ClesDistributivite]{NomExpression}}% + \xdef\NomFin{\useKV[ClesDistributivite]{Fin}}% + \xintFor* ##1 in {\xintSeq {1}{\useKV[ClesDistributivite]{Fin}-1}}\do + {\NomLettre&=\Distri[Etape=##1]{#2}{#3}{#4}{#5}\\}% + \NomLettre&=\Distri[Etape=\NomFin]{#2}{#3}{#4}{#5}% + }{% + % Etape 1 + \xintifboolexpr{\useKV[ClesDistributivite]{Etape}=1}{% + \xintifboolexpr{#2=0}{% + }{\xintifboolexpr{#3=0}{}{(}}\Tikzmark{\Affichage[#1]{0}{#2}{0}}% + \ifboolKV[ClesDistributivite]{AideAdda}{\mathcolor{DCAide}{+(}}{}% + \xintifboolexpr{#3>0}{\xintifboolexpr{#2=0}{}{+}}{\xintifboolexpr{#3<0}{-}{}}\Tikzmark{\Affichage[#1]{0}{0}{\fpeval{abs(#3)}}}% + \ifboolKV[ClesDistributivite]{AideAdda}{\mathcolor{DCAide}{)}}{}% + \xintifboolexpr{#2=0}{}{\xintifboolexpr{#3=0}{}{)}}% + % + \ifboolKV[ClesDistributivite]{AideMul}{\times}{}%on aide dans le cas double + \xdef\Multi{\fpeval{#4*#5}}%affichage auto si (a+b)xk + % + \xintifboolexpr{\Multi=0}{\times% + \xintifboolexpr{#4<0}{(}{\xintifboolexpr{#5<0}{(}{}}}{(}% + \Tikzmark{\Affichage[#1]{0}{#4}{0}}% + \ifboolKV[ClesDistributivite]{AideAddb}{\mathcolor{DCAide}{+(}}{}% + \xintifboolexpr{#5>0}{\xintifboolexpr{#4=0}{}{+}}{\xintifboolexpr{#5<0}{\xintifboolexpr{#4=0}{{-}}{-}}{}}\Tikzmark{\Affichage[#1]{0}{0}{\fpeval{abs(#5)}}}% + \ifboolKV[ClesDistributivite]{AideAddb}{\mathcolor{DCAide}{)}}{}% \xintifboolexpr{\Multi=0}{% - \xdef\Multij{\fpeval{#2*#3}}%\relax - \xintifboolexpr{\Multij=0}{\xintifboolexpr{#2=0}{\DrawArrowSimple{1}}{\DrawArrowSimple{0}}}{\xintifboolexpr{#4=0}{\DrawArrowSimpleRenverse{3}}{\DrawArrowSimpleRenverse{2}}}% - }{% - \DrawArrow% + \xintifboolexpr{#4<0}{)}{\xintifboolexpr{#5<0}{)}{}}}{)}% + \ifboolKV[ClesDistributivite]{Fleches}{% + \xdef\Multi{\fpeval{#2*#3*#4*#5}}% + \xintifboolexpr{\Multi=0}{% + \xdef\Multij{\fpeval{#2*#3}}%\relax + \xintifboolexpr{\Multij=0}{\xintifboolexpr{#2=0}{\DrawArrowSimple{1}}{\DrawArrowSimple{0}}}{\xintifboolexpr{#4=0}{\DrawArrowSimpleRenverse{3}}{\DrawArrowSimpleRenverse{2}}}% + }{% + \DrawArrow% + }% + }{}\setcounter{NbDistri}{0}% + }{} + % Etape 2 + \xintifboolexpr{\useKV[ClesDistributivite]{Etape}=2}{% + \xdef\Multi{\fpeval{#2*#4}}% + \xintifboolexpr{\Multi=0}{}{% + \xintifboolexpr{#2<0}{(}{}\Affichage[#1]{0}{#2}{0}\xintifboolexpr{#2<0}{)}{}\times\xintifboolexpr{#4<0}{(}{}\Affichage[#1]{0}{#4}{0}\xintifboolexpr{#4<0}{)}{}% + } + \xdef\Multij{\fpeval{#2*#5}}% + \xintifboolexpr{\Multij=0}{}{% + \xintifboolexpr{\Multi=0}{}{+}% + \xintifboolexpr{#2<0}{(}{}\Affichage[#1]{0}{#2}{0}\xintifboolexpr{#2<0}{)}{}\times\xintifboolexpr{#5<0}{(}{}\Affichage[#1]{0}{0}{#5}\xintifboolexpr{#5<0}{)}{}% }% - }{}\setcounter{NbDistri}{0}% - }{} - % Etape 2 - \xintifboolexpr{\useKV[ClesDistributivite]{Etape}=2}{% - \xdef\Multi{\fpeval{#2*#4}}% - \xintifboolexpr{\Multi=0}{}{% - \xintifboolexpr{#2<0}{(}{}\Affichage[#1]{0}{#2}{0}\xintifboolexpr{#2<0}{)}{}\times\xintifboolexpr{#4<0}{(}{}\Affichage[#1]{0}{#4}{0}\xintifboolexpr{#4<0}{)}{}% - } - \xdef\Multij{\fpeval{#2*#5}}% - \xintifboolexpr{\Multij=0}{}{% - \xintifboolexpr{\Multi=0}{}{+}% - \xintifboolexpr{#2<0}{(}{}\Affichage[#1]{0}{#2}{0}\xintifboolexpr{#2<0}{)}{}\times\xintifboolexpr{#5<0}{(}{}\Affichage[#1]{0}{0}{#5}\xintifboolexpr{#5<0}{)}{}% - }% - \xdef\Multik{\fpeval{#3*#4}}% - \xintifboolexpr{\Multik=0}{}{% - \xintifboolexpr{\Multi=0}{}{+}% - \xintifboolexpr{#3<0}{(}{}\Affichage[#1]{0}{0}{#3}\xintifboolexpr{#3<0}{)}{}\times\xintifboolexpr{#4<0}{(}{}\Affichage[#1]{0}{#4}{0}\xintifboolexpr{#4<0}{)}{}% - }% - \xdef\Multil{\fpeval{#3*#5}}% - \xintifboolexpr{\Multil=0}{}{+% - \xintifboolexpr{#3<0}{(}{}\Affichage[#1]{0}{0}{#3}\xintifboolexpr{#3<0}{)}{}\times\xintifboolexpr{#5<0}{(}{}\Affichage[#1]{0}{0}{#5}\xintifboolexpr{#5<0}{)}{}% - }% - }{}% - % Etape 3 - \xintifboolexpr{\useKV[ClesDistributivite]{Etape}=3}{% - %80 - \stepcounter{NbCalculDistri}% - % fin 80 - \xdef\Multi{\fpeval{#2*#4}}% - \xdef\Multij{\fpeval{#2*#5}}% - \xdef\Multik{\fpeval{#3*#4}}% - \xdef\Multil{\fpeval{#3*#5}}% - %% ils sont redéfinis pour pouvoir envisager la somme de deux - %% expressions à développer - %80 - \xintifboolexpr{\theNbCalculDistri>1}{\xintifboolexpr{\Multi<0}{(\Affichage{\Multi}{0}{0})}{\Affichage{\Multi}{0}{0}}}{\Affichage{\Multi}{0}{0}}% - %fin 80 - \ifboolKV[ClesDistributivite]{Reduction}{\mathunderline{DCReduction}{% - \xintifboolexpr{\Multij=0}{}{\xintifboolexpr{\Multi=0}{}{{}+}\xintifboolexpr{\Multij<0}{(}{}\Affichage{0}{\Multij}{0}\xintifboolexpr{\Multij<0}{)}{}}% - \xintifboolexpr{\Multik=0}{}{\xintifboolexpr{\Multil=0}{\xintifboolexpr{#2=0}{}{+}}{+}\xintifboolexpr{\Multik<0}{(}{}\Affichage{0}{\Multik}{0}\xintifboolexpr{\Multik<0}{)}{}}% + \xdef\Multik{\fpeval{#3*#4}}% + \xintifboolexpr{\Multik=0}{}{% + \xintifboolexpr{\Multi=0}{}{+}% + \xintifboolexpr{#3<0}{(}{}\Affichage[#1]{0}{0}{#3}\xintifboolexpr{#3<0}{)}{}\times\xintifboolexpr{#4<0}{(}{}\Affichage[#1]{0}{#4}{0}\xintifboolexpr{#4<0}{)}{}% }% - }{% - \xintifboolexpr{\Multij=0}{}{\xintifboolexpr{\Multi=0}{}{+}\xintifboolexpr{\Multij<0}{(}{}\Affichage{0}{\Multij}{0}\xintifboolexpr{\Multij<0}{)}{}}% - \xintifboolexpr{\Multik=0}{}{\xintifboolexpr{\Multil=0}{\xintifboolexpr{#2=0}{}{+}}{+}\xintifboolexpr{\Multik<0}{(}{}\Affichage{0}{\Multik}{0}\xintifboolexpr{\Multik<0}{)}{}}% - }% - \xintifboolexpr{\Multil=0}{}{+}\xintifboolexpr{\Multil<0}{(}{}\Affichage{0}{0}{\Multil}\xintifboolexpr{\Multil<0}{)}{}% - }{}% - % Etape 4 - \xintifboolexpr{\useKV[ClesDistributivite]{Etape}=4}{% - \xdef\Multi{\fpeval{#2*#4}}% - \xdef\Multij{\fpeval{#2*#5}}% - \xdef\Multik{\fpeval{#3*#4}}% - \xdef\Multil{\fpeval{#3*#5}}% - %% ils sont redéfinis pour pouvoir envisager la somme de deux - %% expressions à développer - \xdef\Multim{\fpeval{#2*#5+#3*#4}}% - %80 - \xintifboolexpr{\theNbCalculDistri>1}{\setcounter{NbCalculDistri}{0}}{}% - \stepcounter{NbCalculDistri}% - %fin 80 - \ifboolKV[ClesDistributivite]{Oppose}{% - \xdef\Multi{\fpeval{-\Multi}}% - \xdef\Multim{\fpeval{-\Multim}}% - \xdef\Multil{\fpeval{-\Multil}}% - \xintifboolexpr{\Multi=0}{}{\xintifboolexpr{\Multi<0}{(}{}\Affichage{\Multi}{0}{0}\xintifboolexpr{\Multi<0}{)}{}}% - \xintifboolexpr{\Multim=0}{}{\xintifboolexpr{\Multim>0}{+}{+(}\Affichage{0}{\Multim}{0}\xintifboolexpr{\Multim<0}{)}{}}% - \xintifboolexpr{\Multil=0}{}{\xintifboolexpr{\Multil>0}{+}{+(}\Affichage{0}{0}{\Multil}\xintifboolexpr{\Multil<0}{)}{}}% - }{% - %80 + \xdef\Multil{\fpeval{#3*#5}}% + \xintifboolexpr{\Multil=0}{}{+% + \xintifboolexpr{#3<0}{(}{}\Affichage[#1]{0}{0}{#3}\xintifboolexpr{#3<0}{)}{}\times\xintifboolexpr{#5<0}{(}{}\Affichage[#1]{0}{0}{#5}\xintifboolexpr{#5<0}{)}{}% + }% + }{}% + % Etape 3 + \xintifboolexpr{\useKV[ClesDistributivite]{Etape}=3}{% + \stepcounter{NbCalculDistri}% + \xdef\Multi{\fpeval{#2*#4}}% + \xdef\Multij{\fpeval{#2*#5}}% + \xdef\Multik{\fpeval{#3*#4}}% + \xdef\Multil{\fpeval{#3*#5}}% + %% ils sont redéfinis pour pouvoir envisager la somme de deux + %% expressions à développer \xintifboolexpr{\theNbCalculDistri>1}{\xintifboolexpr{\Multi<0}{(\Affichage{\Multi}{0}{0})}{\Affichage{\Multi}{0}{0}}}{\Affichage{\Multi}{0}{0}}% - \xintifboolexpr{\Multim=0}{}{% - \xintifboolexpr{\Multim>0}{+\Affichage{0}{\Multim}{0}}{-\Affichage{0}{\fpeval{-\Multim}}{0}}% + \ifboolKV[ClesDistributivite]{Reduction}{\mathunderline{DCReduction}{% + \xintifboolexpr{\Multij=0}{}{\xintifboolexpr{\Multi=0}{}{{}+}\xintifboolexpr{\Multij<0}{(}{}\Affichage{0}{\Multij}{0}\xintifboolexpr{\Multij<0}{)}{}}% + \xintifboolexpr{\Multik=0}{}{\xintifboolexpr{\Multil=0}{\xintifboolexpr{#2=0}{}{+}}{+}\xintifboolexpr{\Multik<0}{(}{}\Affichage{0}{\Multik}{0}\xintifboolexpr{\Multik<0}{)}{}}% + }% + }{% + \xintifboolexpr{\Multij=0}{}{\xintifboolexpr{\Multi=0}{}{+}\xintifboolexpr{\Multij<0}{(}{}\Affichage{0}{\Multij}{0}\xintifboolexpr{\Multij<0}{)}{}}% + \xintifboolexpr{\Multik=0}{}{\xintifboolexpr{\Multil=0}{\xintifboolexpr{#2=0}{}{+}}{\xintifboolexpr{#2=0}{}{+}}\xintifboolexpr{\Multik<0}{(}{}\Affichage{0}{\Multik}{0}\xintifboolexpr{\Multik<0}{)}{}}% }% - \xintifboolexpr{\Multil=0}{}{\xintifboolexpr{\Multil<0}{-\Affichage{0}{0}{\fpeval{-\Multil}}}{+\Affichage{0}{0}{\Multil}}}%\Affichage{\Multi}{\Multim}{\Multil}% - % fin 80 - } - \ifboolKV[ClesDistributivite]{Somme}{\xdef\SommeA{\fpeval{\SommeA+#2*#4}}\xdef\SommeB{\fpeval{\SommeB+#2*#5+#3*#4}}\xdef\SommeC{\fpeval{\SommeC+#3*#5}}}{}% - \ifboolKV[ClesDistributivite]{Difference}{\xdef\SommeA{\fpeval{\SommeA-#2*#4}}\xdef\SommeB{\fpeval{\SommeB-#2*#5-#3*#4}}\xdef\SommeC{\fpeval{\SommeC-#3*#5}}}{}% - }{}% + \xintifboolexpr{\Multil=0}{}{+}\xintifboolexpr{\Multil<0}{(}{}\Affichage{0}{0}{\Multil}\xintifboolexpr{\Multil<0}{)}{}% + }{}% + % Etape 4 + \xintifboolexpr{\useKV[ClesDistributivite]{Etape}=4}{% + \xdef\Multi{\fpeval{#2*#4}}% + \xdef\Multij{\fpeval{#2*#5}}% + \xdef\Multik{\fpeval{#3*#4}}% + \xdef\Multil{\fpeval{#3*#5}}% + %% ils sont redéfinis pour pouvoir envisager la somme de deux + %% expressions à développer + \xdef\Multim{\fpeval{#2*#5+#3*#4}}% + \xintifboolexpr{\theNbCalculDistri>1}{\setcounter{NbCalculDistri}{0}}{}% + \stepcounter{NbCalculDistri}% + \ifboolKV[ClesDistributivite]{Oppose}{% + \xdef\Multi{\fpeval{-\Multi}}% + \xdef\Multim{\fpeval{-\Multim}}% + \xdef\Multil{\fpeval{-\Multil}}% + \xintifboolexpr{\Multi=0}{}{\xintifboolexpr{\Multi<0}{(}{}\Affichage{\Multi}{0}{0}\xintifboolexpr{\Multi<0}{)}{}}% + \xintifboolexpr{\Multim=0}{}{\xintifboolexpr{\Multim>0}{+}{+(}\Affichage{0}{\Multim}{0}\xintifboolexpr{\Multim<0}{)}{}}% + \xintifboolexpr{\Multil=0}{}{\xintifboolexpr{\Multil>0}{+}{+(}\Affichage{0}{0}{\Multil}\xintifboolexpr{\Multil<0}{)}{}}% + }{% + \xintifboolexpr{\theNbCalculDistri>1}{\xintifboolexpr{\Multi<0}{(\Affichage{\Multi}{0}{0})}{\Affichage{\Multi}{0}{0}}}{\Affichage{\Multi}{0}{0}}% + \xintifboolexpr{\Multim=0}{}{% + \xintifboolexpr{\Multim>0}{+\Affichage{0}{\Multim}{0}}{-\Affichage{0}{\fpeval{-\Multim}}{0}}% + }% + \xintifboolexpr{\Multil=0}{}{\xintifboolexpr{\Multil<0}{-\Affichage{0}{0}{\fpeval{-\Multil}}}{+\Affichage{0}{0}{\Multil}}}% + } + \ifboolKV[ClesDistributivite]{Somme}{\xdef\SommeA{\fpeval{\SommeA+#2*#4}}\xdef\SommeB{\fpeval{\SommeB+#2*#5+#3*#4}}\xdef\SommeC{\fpeval{\SommeC+#3*#5}}}{}% + \ifboolKV[ClesDistributivite]{Difference}{\xdef\SommeA{\fpeval{\SommeA-#2*#4}}\xdef\SommeB{\fpeval{\SommeB-#2*#5-#3*#4}}\xdef\SommeC{\fpeval{\SommeC-#3*#5}}}{}% + }{}% + }% }% }% }% }% - }% }% \newcommand{\Resultat}[1][]{% @@ -2560,9 +2908,7 @@ \useKVdefault[ClesDistributivite]%obligatoire car la macro n'est pas dans un groupe. \setKV[ClesDistributivite]{#1}%On lit les arguments optionnels \ifboolKV[ClesDistributivite]{RAZ}{\xdef\SommeA{0}\xdef\SommeB{0}\xdef\SommeC{0}% - % 80 \setcounter{NbCalculDistri}{0}% - % fin 80 }{}% \colorlet{DCAide}{\useKV[ClesDistributivite]{CouleurAide}}% \colorlet{DCReduction}{\useKV[ClesDistributivite]{CouleurReduction}}% @@ -2583,10 +2929,8 @@ \fi% }{} \xintifboolexpr{\useKV[ClesDistributivite]{Etape}=3}{% - % 80 \xintifboolexpr{\theNbCalculDistri>1}{\setcounter{NbCalculDistri}{0}}{}% \stepcounter{NbCalculDistri}% - % fin 80 \ifx\bla#4\bla% \xdef\Multi{\fpeval{#2*#2}}% \xdef\Multij{\fpeval{#2*#3}}% @@ -2776,9 +3120,7 @@ }{} % Etape 3 \xintifboolexpr{\useKV[ClesDistributivite]{Etape}=3}{% - % 80 \stepcounter{NbCalculDistri}% - % fin 80 \xdef\Multi{\fpeval{#2*#4}}% \xdef\Multij{\fpeval{#2*#5}}% \xdef\Multik{\fpeval{#3*#4}}% @@ -2786,9 +3128,7 @@ %% ils sont redéfinis pour pouvoir envisager la somme de deux %% expressions à développer \xintifboolexpr{\useKV[ClesDistributivite]{Echange}=1}{% - % 80 \xintifboolexpr{\theNbCalculDistri>1}{\xintifboolexpr{\Multi<0}{(\AffichageEchange{0}{\Multi}{0})}{\AffichageEchange{0}{\Multi}{0}}}{\AffichageEchange{0}{\Multi}{0}}% - %fin 80\AffichageEchange{0}{\Multi}{0}%pas de soulignement de réduction ici \xintifboolexpr{\Multij=0}{}{\xintifboolexpr{\Multi=0}{}{+}\xintifboolexpr{\Multij<0}{(}{}\AffichageEchange{\Multij}{0}{0}\xintifboolexpr{\Multij<0}{)}{}}% \xintifboolexpr{\Multik=0}{}{\xintifboolexpr{\Multil=0}{\xintifboolexpr{#2=0}{}{+}}{+}\xintifboolexpr{\Multik<0}{(}{}\AffichageEchange{0}{0}{\Multik}\xintifboolexpr{\Multik<0}{)}{}}% \xintifboolexpr{\Multil=0}{}{+}\xintifboolexpr{\Multil<0}{(}{}\AffichageEchange{0}{\Multil}{0}\xintifboolexpr{\Multil<0}{)}{}% @@ -2797,9 +3137,7 @@ \ifboolKV[ClesDistributivite]{Difference}{\xdef\SommeA{\fpeval{\SommeA-\Multik}}\xdef\SommeB{\fpeval{\SommeB-\Multim}}\xdef\SommeC{\fpeval{\SommeC-\Multij}}}{}% }{}% \xintifboolexpr{\useKV[ClesDistributivite]{Echange}=2}{% - % 80 \xintifboolexpr{\theNbCalculDistri>1}{\xintifboolexpr{\Multi<0}{(\AffichageEchange{0}{\Multi}{0})}{\AffichageEchange{0}{\Multi}{0}}}{\AffichageEchange{0}{\Multi}{0}}% - %fin 80\AffichageEchange{0}{\Multi}{0}%pas de soulignement de réduction ici \xintifboolexpr{\Multij=0}{}{\xintifboolexpr{\Multi=0}{}{+}\xintifboolexpr{\Multij<0}{(}{}\AffichageEchange{0}{0}{\Multij}\xintifboolexpr{\Multij<0}{)}{}}% \xintifboolexpr{\Multik=0}{}{\xintifboolexpr{\Multil=0}{\xintifboolexpr{#2=0}{}{+}}{+}\xintifboolexpr{\Multik<0}{(}{}\AffichageEchange{\Multik}{0}{0}\xintifboolexpr{\Multik<0}{)}{}}% \xintifboolexpr{\Multil=0}{}{+}\xintifboolexpr{\Multil<0}{(}{}\AffichageEchange{0}{\Multil}{0}\xintifboolexpr{\Multil<0}{)}{}% @@ -2808,9 +3146,7 @@ \ifboolKV[ClesDistributivite]{Difference}{\xdef\SommeA{\fpeval{\SommeA-\Multij}}\xdef\SommeB{\fpeval{\SommeB-\Multim}}\xdef\SommeC{\fpeval{\SommeC-\Multik}}}{}% }{}% \xintifboolexpr{\useKV[ClesDistributivite]{Echange}=3}{% - % 80 \xintifboolexpr{\theNbCalculDistri>1}{\xintifboolexpr{\Multi<0}{(\AffichageEchange{\Multi}{0}{0})}{\AffichageEchange{\Multi}{0}{0}}}{\AffichageEchange{\Multi}{0}{0}}% - %fin 80\AffichageEchange{\Multi}{0}{0}%pas de soulignement de réduction ici \xintifboolexpr{\Multij=0}{}{\xintifboolexpr{\Multi=0}{}{+}\xintifboolexpr{\Multij<0}{(}{}\AffichageEchange{0}{\Multij}{0}\xintifboolexpr{\Multij<0}{)}{}}% \xintifboolexpr{\Multik=0}{}{\xintifboolexpr{\Multil=0}{\xintifboolexpr{#2=0}{}{+}}{+}\xintifboolexpr{\Multik<0}{(}{}\AffichageEchange{0}{\Multik}{0}\xintifboolexpr{\Multik<0}{)}{}}% \xintifboolexpr{\Multil=0}{}{+}\xintifboolexpr{\Multil<0}{(}{}\AffichageEchange{0}{0}{\Multil}\xintifboolexpr{\Multil<0}{)}{}% @@ -2827,10 +3163,8 @@ \xdef\Multil{\fpeval{#3*#5}}% %% ils sont redéfinis pour pouvoir envisager la somme de deux %% expressions à développer - % 80 \xintifboolexpr{\theNbCalculDistri>1}{\setcounter{NbCalculDistri}{0}}{}% \stepcounter{NbCalculDistri}% - %fin 80 \xintifboolexpr{\useKV[ClesDistributivite]{Echange}=1}{% \xdef\Multim{\fpeval{#2*#4+#3*#5}}% \ifboolKV[ClesDistributivite]{Oppose}{% @@ -2841,13 +3175,11 @@ \xintifboolexpr{\Multimo=0}{}{\xintifboolexpr{\Multimo>0}{+}{+(}\Affichage{0}{\Multimo}{0}\xintifboolexpr{\Multimo<0}{)}{}}% \xintifboolexpr{\Multijo=0}{}{\xintifboolexpr{\Multijo>0}{+}{+(}\Affichage{0}{0}{\Multijo}\xintifboolexpr{\Multijo<0}{)}{}}% }{% - % 80 \xintifboolexpr{\theNbCalculDistri>1}{\xintifboolexpr{\Multik<0}{(\Affichage{\Multik}{0}{0})}{\Affichage{\Multik}{0}{0}}}{\Affichage{\Multik}{0}{0}}% \xintifboolexpr{\Multim=0}{}{% \xintifboolexpr{\Multim>0}{+\Affichage{0}{\Multim}{0}}{-\Affichage{0}{\fpeval{-\Multim}}{0}}% }% \xintifboolexpr{\Multij=0}{}{\xintifboolexpr{\Multij<0}{-\Affichage{0}{0}{\fpeval{-\Multij}}}{+\Affichage{0}{0}{\Multij}}}% - % fin 80 }% \ifboolKV[ClesDistributivite]{Somme}{\xdef\SommeA{\fpeval{\SommeA+\Multik}}\xdef\SommeB{\fpeval{\SommeB+\Multim}}\xdef\SommeC{\fpeval{\SommeC+\Multij}}}{}% \ifboolKV[ClesDistributivite]{Difference}{\xdef\SommeA{\fpeval{\SommeA-\Multik}}\xdef\SommeB{\fpeval{\SommeB-\Multim}}\xdef\SommeC{\fpeval{\SommeC-\Multij}}}{}% @@ -2862,13 +3194,11 @@ \xintifboolexpr{\Multimo=0}{}{\xintifboolexpr{\Multimo>0}{+}{+(}\Affichage{0}{\Multimo}{0}\xintifboolexpr{\Multimo<0}{)}{}}% \xintifboolexpr{\Multiko=0}{}{\xintifboolexpr{\Multiko>0}{+}{+(}\Affichage{0}{0}{\Multiko}\xintifboolexpr{\Multiko<0}{)}{}}% }{% - % 80 \xintifboolexpr{\theNbCalculDistri>1}{\xintifboolexpr{\Multij<0}{(\Affichage{\Multij}{0}{0})}{\Affichage{\Multij}{0}{0}}}{\Affichage{\Multij}{0}{0}}% \xintifboolexpr{\Multim=0}{}{% \xintifboolexpr{\Multim>0}{+\Affichage{0}{\Multim}{0}}{-\Affichage{0}{\fpeval{-\Multim}}{0}}% }% \xintifboolexpr{\Multik=0}{}{\xintifboolexpr{\Multik<0}{-\Affichage{0}{0}{\fpeval{-\Multik}}}{+\Affichage{0}{0}{\Multik}}}% - % fin 80\Affichage{\Multij}{\Multim}{\Multik}% }% \ifboolKV[ClesDistributivite]{Somme}{\xdef\SommeA{\fpeval{\SommeA+\Multij}}\xdef\SommeB{\fpeval{\SommeB+\Multim}}\xdef\SommeC{\fpeval{\SommeC+\Multik}}}{}% \ifboolKV[ClesDistributivite]{Difference}{\xdef\SommeA{\fpeval{\SommeA-\Multij}}\xdef\SommeB{\fpeval{\SommeB-\Multim}}\xdef\SommeC{\fpeval{\SommeC-\Multik}}}{}% @@ -2883,13 +3213,11 @@ \xintifboolexpr{\Multimo=0}{}{\xintifboolexpr{\Multimo>0}{+}{+(}\Affichage{0}{\Multimo}{0}\xintifboolexpr{\Multimo<0}{)}{}}% \xintifboolexpr{\Multio=0}{}{\xintifboolexpr{\Multio>0}{+}{+(}\Affichage{0}{0}{\Multio}\xintifboolexpr{\Multio<0}{)}{}}% }{% - % 80 \xintifboolexpr{\theNbCalculDistri>1}{\xintifboolexpr{\Multil<0}{(\Affichage{\Multil}{0}{0})}{\Affichage{\Multil}{0}{0}}}{\Affichage{\Multil}{0}{0}}% \xintifboolexpr{\Multim=0}{}{% \xintifboolexpr{\Multim>0}{+\Affichage{0}{\Multim}{0}}{-\Affichage{0}{\fpeval{-\Multim}}{0}}% }% \xintifboolexpr{\Multi=0}{}{\xintifboolexpr{\Multi<0}{-\Affichage{0}{0}{\fpeval{-\Multi}}}{+\Affichage{0}{0}{\Multi}}}% - % fin 80\Affichage{\Multil}{\Multim}{\Multi}% } \ifboolKV[ClesDistributivite]{Somme}{\xdef\SommeA{\fpeval{\SommeA+\Multil}}\xdef\SommeB{\fpeval{\SommeB+\Multim}}\xdef\SommeC{\fpeval{\SommeC+\Multi}}}{}% \ifboolKV[ClesDistributivite]{Difference}{\xdef\SommeA{\fpeval{\SommeA-\Multil}}\xdef\SommeB{\fpeval{\SommeB-\Multim}}\xdef\SommeC{\fpeval{\SommeC-\Multi}}}{}% @@ -2901,9 +3229,9 @@ }% }% -%%%%%%%%%%%%%%% -%Nombre Premier -%%%%%%%%%%%%%%% +%%% +% Nombre Premier +%%% \setKVdefault[ClesNombrePremier]{Tableau=false,TableauVertical=false,TableauVerticalVide=false,Exposant=false,Longue=false,All=false,Arbre=false,ArbreVide=false,ArbreComplet=false,Diviseurs=false,DiviseursT=false,Dot=\dotfill} \newcommand\Decomposition[2][]{% @@ -2930,7 +3258,7 @@ pair Ancre[]; numeric decalage; decalage=10mm; - + vardef PremierSimple(expr NB)= b:=2; depart:=NB; @@ -3393,7 +3721,6 @@ vardef Positions(expr Step)= \dnpvv=\numexpr\dnpvv+1\relax \cnpvv=\numexpr\anpvv/\bnpvv\relax \anpvv=\cnpvv\relax - %\num{\the\bnpvv}% \else% \bnpvv=\numexpr\bnpvv+1\relax% \fi% @@ -3419,7 +3746,6 @@ vardef Positions(expr Step)= \dnpmv=\numexpr\dnpmv+1\relax \cnpmv=\numexpr\anpmv/\bnpmv\relax \anpmv=\cnpmv\relax - %\num{\the\bnpmv} \else% \bnpmv=\numexpr\bnpmv+1\relax% \fi% @@ -3469,7 +3795,7 @@ vardef Positions(expr Step)= \anp=#1\relax% \bnp=2\relax% \premier=-1\relax% - % Pour déterminer le nombre d'étapes + % Pour déterminer le nombre d'étapes \whiledo{\anp > 1}{% \modulo{\the\anp}{\the\bnp} \ifnum\remainder=0\relax% @@ -3479,7 +3805,7 @@ vardef Positions(expr Step)= \else% \bnp=\numexpr\bnp+1\relax% \fi% - } + }% \ifnum\premier=0% Le nombre \num{#1} est un nombre premier.% \else% @@ -3536,22 +3862,21 @@ vardef Positions(expr Step)= \else% \ifnum\exposant>0\relax \num{\the\pileb}\ifnum\exposant>1 ^{\num{\the\exposant}}\fi\times% - %\pilea=\anp\relax \fi \bnp=\numexpr\bnp+1\relax% \pileb=\bnp\relax% - \exposant=0\relax + \exposant=0\relax% \fi% - } + }% \num{\the\pileb}\ifnum\exposant>1^{\num{\the\exposant}}\fi% - } -} + }% +}% \newcommand{\PremierLong}[1]{% %#1 : le nombre entier à tester \ensuremath{% \newcount\anpl\newcount\bnpl\newcount\cnpl% - \newcount\pilebl + \newcount\pilebl% \anpl=#1\relax% \bnpl=2\relax% \pilebl=2\relax% @@ -3564,7 +3889,7 @@ vardef Positions(expr Step)= \else% \bnpl=\numexpr\bnpl+1\relax% \pilebl=\bnpl\relax% - \fi% + \fi% } } } @@ -3635,9 +3960,9 @@ vardef Positions(expr Step)= }% } -%%%%%%%%%%%%%%%%%%% +%%% % Simplification -%%%%%%%%%%%%%%%%%%% +%%% \makeatletter%by christian Tellechea % Calcul du PGCD de #1 et #2 \newcount\cnt@a\newcount\cnt@b\newcount\pgcd @@ -3675,6 +4000,11 @@ vardef Positions(expr Step)= \numerateur=\valabsnum \denominateur=\valabsdeno \fi + \else + \ifnum\the\denominateur<0\relax + \numerateur=-\valabsnum + \denominateur=\valabsdeno + \fi \fi \ifnum\number#2=0\relax \text{\bfseries(???)} @@ -3718,6 +4048,17 @@ vardef Positions(expr Step)= \else \valabsdeno=\number#2 \fi + \ifnum\the\numerateur<0\relax + \ifnum\the\denominateur<0\relax + \numerateur=\valabsnum + \denominateur=\valabsdeno + \fi + \else + \ifnum\the\denominateur<0\relax + \numerateur=-\valabsnum + \denominateur=\valabsdeno + \fi + \fi \ifnum\number#2=0\relax \ensuremath{\text{\bfseries(???)}} \else @@ -3743,49 +4084,50 @@ vardef Positions(expr Step)= \fi } +\newcount\anpdc\newcount\bnpdc\newcount\cnpdc\newcount\dnpdc% +\newcount\DivCom \newcommand\DiviseurCommun[2]{% % #1 : le premier nombre entier - % #2 : le deuxième nombre entier - \newcount\anpdc\newcount\bnpdc\newcount\cnpdc% + % #2 : le deuxième nombre entier + % nombre 1 vaut #1 - Nombre 2 vaut #2 \anpdc=#1% \cnpdc=#2% \bnpdc=2\relax% - \whiledo{\bnpdc<\anpdc}{% - \modulo{\the\anpdc}{\the\bnpdc}{}% + \dnpdc=\numexpr#1+1\relax% + \DivCom=1\relax% + \whiledo{\bnpdc<\dnpdc}{% + \modulo{\the\anpdc}{\the\bnpdc}\relax \ifnum\remainder=0% - \modulo{\the\cnpdc}{\the\bnpdc}{} + \modulo{\the\cnpdc}{\the\bnpdc} \ifnum\remainder=0% - \xdef\DivCom{\the\bnpdc}% + \DivCom=\bnpdc% \bnpdc=\anpdc% \else% - \xdef\DivCom{1}% - \bnpdc=\numexpr\bnpdc+1% - \fi% + \DivCom=1% + \fi \else% - \xdef\DivCom{1}% - \bnpdc=\numexpr\bnpdc+1% + \DivCom=1% \fi + \bnpdc=\numexpr\bnpdc+1\relax% }% } \newcommand\LongueSimplification[2]{% - \DiviseurCommun{#1}{#2}% \xdef\NumerateurDiv{#1}% \xdef\DenominateurDiv{#2}% + \DiviseurCommun{#1}{#2}% \ensuremath{% - \whiledo{\DivCom > 1}{% - \xdef\DivComa{\DivCom}\xdef\MulComa{\fpeval{\NumerateurDiv/\DivComa}} - \xdef\DivComb{\DivCom}\xdef\MulComb{\fpeval{\DenominateurDiv/\DivComb}} - \frac{\num{\DivComa}\times\num{\MulComa}}{\num{\DivComb}\times\num{\MulComb}}=\frac{\num{\MulComa}}{\num{\MulComb}}% - \xdef\NumerateurDiv{\MulComa}% - \xdef\DenominateurDiv{\MulComb}% + \whiledo{\DivCom>1}{% + \frac{\num{\fpeval{\NumerateurDiv/\the\DivCom}}\times\num{\the\DivCom}}{\num{\fpeval{\DenominateurDiv/\the\DivCom}}\times\num{\the\DivCom}}=\frac{\num{\fpeval{\NumerateurDiv/\DivCom}}}{\num{\fpeval{\DenominateurDiv/\DivCom}}}% + \xdef\NumerateurDiv{\fpeval{\NumerateurDiv/\DivCom}}% + \xdef\DenominateurDiv{\fpeval{\DenominateurDiv/\DivCom}}% \DiviseurCommun{\NumerateurDiv}{\DenominateurDiv}% \xintifboolexpr{\DivCom>1}{=}{}% - } - } -} + }% + }% +}% -\setKVdefault[ClesSimplification]{Details=false,All=false,Longue=false,Fleches=false} +\setKVdefault[ClesSimplification]{Details=false,All=false,Longue=false,Fleches=false,Contraire=0} \newcounter{NbFrac}% \setcounter{NbFrac}{0}% @@ -3814,17 +4156,23 @@ vardef Positions(expr Step)= \draw[out=-45,in=-135,-stealth,transform canvas={yshift=-0.25em}] (pic cs:B-\theNbFrac) to node[midway,below]{\Listeb[1,2]}(pic cs:D-\theNbFrac);% \end{tikzpicture}% }{% - \ifboolKV[ClesSimplification]{Longue}{% - \LongueSimplification{#2}{#3}% + \xintifboolexpr{\useKV[ClesSimplification]{Contraire}>1}{% + \ensuremath{% + \frac{\num{#2}}{\num{#3}}=\frac{\num{#2}\times\num{\useKV[ClesSimplification]{Contraire}}}{\num{#3}\times\num{\useKV[ClesSimplification]{Contraire}}}=\frac{\num{\fpeval{\useKV[ClesSimplification]{Contraire}*#2}}}{\num{\fpeval{\useKV[ClesSimplification]{Contraire}*#3}}}% + }% }{% - \ifboolKV[ClesSimplification]{Details}{\SSimpli{#2}{#3}}{\ifboolKV[ClesSimplification]{All}{\ensuremath{\SSimpli{#2}{#3}=\SSimplifie{#2}{#3}}}{\SSimplifie{#2}{#3}}}% + \ifboolKV[ClesSimplification]{Longue}{% + \LongueSimplification{#2}{#3}% + }{% + \ifboolKV[ClesSimplification]{Details}{\SSimpli{#2}{#3}}{\ifboolKV[ClesSimplification]{All}{\ensuremath{\SSimpli{#2}{#3}=\SSimplifie{#2}{#3}}}{\SSimplifie{#2}{#3}}}% + }% }% }% }% -%%%%%%%%%%%%%%%%%%%%% -%%% Thales -%%%%%%%%%%%%%%%%%%%%% +%%% +% Thales +%%% \newcount\ppcm \newcommand\PPCM[2]{% @@ -3832,10 +4180,10 @@ vardef Positions(expr Step)= \ppcm=\numexpr#1*#2/\pgcd\relax } -\setKVdefault[ClesThales]{Calcul=true,Droites=false,Propor=false,Segment=false,Figure=false,Figurecroisee=false,Precision=2,Entier=false,Unite=cm,Reciproque=false,Produit=false,ChoixCalcul=0,Simplification,Redaction=false,Remediation=false} +\setKVdefault[ClesThales]{Calcul=true,Droites=false,Propor=false,Segment=false,Figure=false,FigureSeule=false,Figurecroisee=false,FigurecroiseeSeule=false,Angle=0,Precision=2,Entier=false,Unite=cm,Reciproque=false,Produit=false,ChoixCalcul=0,Simplification,Redaction=false,Remediation=false} %On définit la figure à utiliser -\def\MPFigThales#1#2#3#4#5{ +\def\MPFigThales#1#2#3#4#5#6{ % #1 Premier sommet % #2 Deuxième sommet % #3 Troisième sommet @@ -3855,15 +4203,10 @@ vardef Positions(expr Step)= O - .5[A,B] = whatever * (B-A) rotated 90; O - .5[B,C] = whatever * (C-B) rotated 90; % On tourne pour éventuellement moins de lassitude :) - numeric Angle; - Angle=uniformdeviate(180);%Caractère aléatoire - A:=A rotatedabout(O,Angle); - B:=B rotatedabout(O,Angle); - C:=C rotatedabout(O,Angle); - % On définit le centre du cercle inscrit - %(I-C) rotated ((angle(A-C)-angle(B-C))/2) shifted C=whatever[A,C]; - %(I-B) rotated ((angle(C-B)-angle(A-B))/2) shifted B=whatever[B,C]; - %on dessine à main levée :) + A:=A rotatedabout(O,#6); + B:=B rotatedabout(O,#6); + C:=C rotatedabout(O,#6); + % on dessine à main levée :) path cotes[]; cotes1=A{dir(angle(B-A)+5)}..B{dir(angle(B-A)+5)}; cotes2=B{dir(angle(C-B)+5)}..C{dir(angle(C-B)+5)}; @@ -3909,14 +4252,10 @@ vardef Positions(expr Step)= O - .5[A,B] = whatever * (B-A) rotated 90; O - .5[B,C] = whatever * (C-B) rotated 90; % On tourne pour éventuellement moins de lassitude :) - Angle=uniformdeviate(180);%Caractère aléatoire - A:=A rotatedabout(O,Angle); - B:=B rotatedabout(O,Angle); - C:=C rotatedabout(O,Angle); - % On définit le centre du cercle inscrit - %(I-C) rotated ((angle(A-C)-angle(B-C))/2) shifted C=whatever[A,C]; - %(I-B) rotated ((angle(C-B)-angle(A-B))/2) shifted B=whatever[B,C]; - %on dessine à main levée :) + A:=A rotatedabout(O,#6); + B:=B rotatedabout(O,#6); + C:=C rotatedabout(O,#6); + % on dessine à main levée :) path cotes[]; cotes1=A{dir(angle(B-A)+5)}..B{dir(angle(B-A)+5)}; cotes2=B{dir(angle(C-B)+5)}..C{dir(angle(C-B)+5)}; @@ -3953,7 +4292,7 @@ vardef Positions(expr Step)= } %On définit la figure à utiliser -\def\MPFigReciThales#1#2#3#4#5{ +\def\MPFigReciThales#1#2#3#4#5#6{ % #1 Premier sommet % #2 Deuxième sommet % #3 Troisième sommet @@ -3973,15 +4312,10 @@ vardef Positions(expr Step)= O - .5[A,B] = whatever * (B-A) rotated 90; O - .5[B,C] = whatever * (C-B) rotated 90; % On tourne pour éventuellement moins de lassitude :) - numeric Angle; - Angle=uniformdeviate(180);%Caractère aléatoire - A:=A rotatedabout(O,Angle); - B:=B rotatedabout(O,Angle); - C:=C rotatedabout(O,Angle); - % On définit le centre du cercle inscrit - %(I-C) rotated ((angle(A-C)-angle(B-C))/2) shifted C=whatever[A,C]; - %(I-B) rotated ((angle(C-B)-angle(A-B))/2) shifted B=whatever[B,C]; - %on dessine à main levée :) + A:=A rotatedabout(O,#6); + B:=B rotatedabout(O,#6); + C:=C rotatedabout(O,#6); + % on dessine à main levée :) path cotes[]; cotes1=A{dir(angle(B-A)+5)}..B{dir(angle(B-A)+5)}; cotes2=B{dir(angle(C-B)+5)}..C{dir(angle(C-B)+5)}; @@ -4015,14 +4349,10 @@ vardef Positions(expr Step)= O - .5[A,B] = whatever * (B-A) rotated 90; O - .5[B,C] = whatever * (C-B) rotated 90; % On tourne pour éventuellement moins de lassitude :) - Angle=uniformdeviate(180);%Caractère aléatoire - A:=A rotatedabout(O,Angle); - B:=B rotatedabout(O,Angle); - C:=C rotatedabout(O,Angle); - % On définit le centre du cercle inscrit - %(I-C) rotated ((angle(A-C)-angle(B-C))/2) shifted C=whatever[A,C]; - %(I-B) rotated ((angle(C-B)-angle(A-B))/2) shifted B=whatever[B,C]; - %on dessine à main levée :) + A:=A rotatedabout(O,#6); + B:=B rotatedabout(O,#6); + C:=C rotatedabout(O,#6); + % on dessine à main levée :) path cotes[]; cotes1=A{dir(angle(B-A)+5)}..B{dir(angle(B-A)+5)}; cotes2=B{dir(angle(C-B)+5)}..C{dir(angle(C-B)+5)}; @@ -4042,24 +4372,12 @@ vardef Positions(expr Step)= label(btex #5 etex,1.1[B,N]); fill (fullcircle scaled 0.75mm) shifted (cotes1 intersectionpoint cotes4); fill (fullcircle scaled 0.75mm) shifted (cotes3 intersectionpoint cotes4); -% pair I,J,K; -% I=1/2[M,N]; -% J=1/2[B,C]; -% K=1/2[I,J]; -% path cd; -% cd=(fullcircle scaled 6mm) shifted K; -% drawoptions(withcolor 0.75*white); -% drawarrow reverse((I{dir(210+angle(I-J))}..{dir(150+angle(I-J))}K) cutafter cd); -% drawarrow reverse((J{dir(210+angle(J-I))}..{dir(150+angle(J-I))}K) cutafter cd); -% draw cd; -% label(btex $//$ etex ,K); -% drawoptions(); \end{mpost} \fi } %On définit la deuxième figure à utiliser -\def\MPFigThalesCroisee#1#2#3#4#5{% +\def\MPFigThalesCroisee#1#2#3#4#5#6{% % #1 Premier sommet % #2 Deuxième sommet % #3 Troisième sommet @@ -4079,11 +4397,9 @@ vardef Positions(expr Step)= B=A rotatedabout(O,130); C=(A--2[A,B rotatedabout(A,45)]) intersectionpoint (B--2[B,A rotatedabout(B,-60)]); % On tourne pour éventuellement moins de lassitude :) - numeric Angle; - Angle=uniformdeviate(180);%Caractère aléatoire - A:=A rotatedabout(O,Angle); - B:=B rotatedabout(O,Angle); - C:=C rotatedabout(O,Angle); + A:=A rotatedabout(O,#6); + B:=B rotatedabout(O,#6); + C:=C rotatedabout(O,#6); % on dessine à main levée :) M=1.4[B,A]; N=1.4[C,A]; @@ -4102,7 +4418,6 @@ vardef Positions(expr Step)= (I-C) rotated ((angle(A-C)-angle(M-C))/2) shifted C=whatever[A,C]; (I-M) rotated ((angle(C-M)-angle(A-M))/2) shifted M=whatever[M,C]; %on labelise - %label(btex #1 etex,1.15[1/2[B,C],A]); label(btex #1 etex,I); label(btex #2 etex,1.2[M,B]); label(btex #3 etex,1.2[N,C]); @@ -4136,10 +4451,9 @@ vardef Positions(expr Step)= B=A rotatedabout(O,130); C=(A--2[A,B rotatedabout(A,45)]) intersectionpoint (B--2[B,A rotatedabout(B,-60)]); % On tourne pour éventuellement moins de lassitude :) - Angle=uniformdeviate(180);%Caractère aléatoire - A:=A rotatedabout(O,Angle); - B:=B rotatedabout(O,Angle); - C:=C rotatedabout(O,Angle); + A:=A rotatedabout(O,#6); + B:=B rotatedabout(O,#6); + C:=C rotatedabout(O,#6); % on dessine à main levée :) M=1.4[B,A]; N=1.4[C,A]; @@ -4158,7 +4472,6 @@ vardef Positions(expr Step)= (I-C) rotated ((angle(A-C)-angle(M-C))/2) shifted C=whatever[A,C]; (I-M) rotated ((angle(C-M)-angle(A-M))/2) shifted M=whatever[M,C]; %on labelise - %label(btex #1 etex,1.15[1/2[B,C],A]); label(btex #1 etex,I); label(btex #2 etex,1.2[M,B]); label(btex #3 etex,1.2[N,C]); @@ -4183,7 +4496,7 @@ vardef Positions(expr Step)= } %On définit la deuxième figure à utiliser -\def\MPFigReciThalesCroisee#1#2#3#4#5{% +\def\MPFigReciThalesCroisee#1#2#3#4#5#6{% % #1 Premier sommet % #2 Deuxième sommet % #3 Troisième sommet @@ -4203,11 +4516,9 @@ vardef Positions(expr Step)= B=A rotatedabout(O,130); C=(A--2[A,B rotatedabout(A,45)]) intersectionpoint (B--2[B,A rotatedabout(B,-60)]); % On tourne pour éventuellement moins de lassitude :) - numeric Angle; - Angle=uniformdeviate(180);%Caractère aléatoire - A:=A rotatedabout(O,Angle); - B:=B rotatedabout(O,Angle); - C:=C rotatedabout(O,Angle); + A:=A rotatedabout(O,#6); + B:=B rotatedabout(O,#6); + C:=C rotatedabout(O,#6); % on dessine à main levée :) M=1.4[B,A]; N=1.4[C,A]; @@ -4226,7 +4537,6 @@ vardef Positions(expr Step)= (I-C) rotated ((angle(A-C)-angle(M-C))/2) shifted C=whatever[A,C]; (I-M) rotated ((angle(C-M)-angle(A-M))/2) shifted M=whatever[M,C]; %on labelise - %label(btex #1 etex,1.15[1/2[B,C],A]); label(btex #1 etex,I); label(btex #2 etex,1.2[M,B]); label(btex #3 etex,1.2[N,C]); @@ -4250,10 +4560,9 @@ vardef Positions(expr Step)= B=A rotatedabout(O,130); C=(A--2[A,B rotatedabout(A,45)]) intersectionpoint (B--2[B,A rotatedabout(B,-60)]); % On tourne pour éventuellement moins de lassitude :) - Angle=uniformdeviate(180);%Caractère aléatoire - A:=A rotatedabout(O,Angle); - B:=B rotatedabout(O,Angle); - C:=C rotatedabout(O,Angle); + A:=A rotatedabout(O,#6); + B:=B rotatedabout(O,#6); + C:=C rotatedabout(O,#6); % on dessine à main levée :) M=1.4[B,A]; N=1.4[C,A]; @@ -4272,7 +4581,6 @@ vardef Positions(expr Step)= (I-C) rotated ((angle(A-C)-angle(M-C))/2) shifted C=whatever[A,C]; (I-M) rotated ((angle(C-M)-angle(A-M))/2) shifted M=whatever[M,C]; %on labelise - %label(btex #1 etex,1.15[1/2[B,C],A]); label(btex #1 etex,I); label(btex #2 etex,1.2[M,B]); label(btex #3 etex,1.2[N,C]); @@ -4291,7 +4599,7 @@ vardef Positions(expr Step)= \useKVdefault[ClesThales]% \setKV[ClesThales]{#1}% \ifboolKV[ClesThales]{Droites}{% - Les droites $(#3#5)$ et $(#4#6)$ sont sécantes en $#2$.% + Les droites \ifboolKV[ClesThales]{Remediation}{\pointilles[2cm]}{$(#3#5)$} et \ifboolKV[ClesThales]{Remediation}{\pointilles[2cm]}{$(#4#6)$} sont sécantes en \ifboolKV[ClesThales]{Remediation}{\pointilles[2cm]}{$#2$}.% }{% Dans le triangle \ifboolKV[ClesThales]{Remediation}{\pointilles[2cm]}{$#2#3#4$}, \ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{$#5$} est un point \ifboolKV[ClesThales]{Segment}{du segment}{de la droite} @@ -4869,23 +5177,31 @@ vardef Positions(expr Step)= \newcommand{\TThales}[8][]{% \setKV[ClesThales]{#1}% - \ifboolKV[ClesThales]{Figure}{% - \StrMid{#2}{1}{1}[\NomA]\StrMid{#2}{2}{2}[\NomB]\StrMid{#2}{3}{3}[\NomC]\StrMid{#2}{4}{4}[\NomM]\StrMid{#2}{5}{5}[\NomN]% - \begin{multicols}{2}% - {\em La figure est donnée à titre indicatif.}% - \[\MPFigThales\NomA\NomB\NomC\NomM\NomN\]% - \par\columnbreak\par% - \ifboolKV[ClesThales]{Entier}{\TThalesCalculsE[#1]{#2}{#3}{#4}{#5}{#6}{#7}{#8}}{\TThalesCalculsD[#1]{#2}{#3}{#4}{#5}{#6}{#7}{#8}}% - \end{multicols}% - }{\ifboolKV[ClesThales]{Figurecroisee}{% - \StrMid{#2}{1}{1}[\NomA]\StrMid{#2}{2}{2}[\NomB]\StrMid{#2}{3}{3}[\NomC]\StrMid{#2}{4}{4}[\NomM]\StrMid{#2}{5}{5}[\NomN]% - \begin{multicols}{2}% - {\em La figure est donnée à titre indicatif.}% - \[\MPFigThalesCroisee\NomA\NomB\NomC\NomM\NomN\]% - \par\columnbreak\par% - \ifboolKV[ClesThales]{Entier}{\TThalesCalculsE[#1]{#2}{#3}{#4}{#5}{#6}{#7}{#8}}{\TThalesCalculsD[#1]{#2}{#3}{#4}{#5}{#6}{#7}{#8}}% - \end{multicols}% - }{\ifboolKV[ClesThales]{Entier}{\TThalesCalculsE[#1]{#2}{#3}{#4}{#5}{#6}{#7}{#8}}{\TThalesCalculsD[#1]{#2}{#3}{#4}{#5}{#6}{#7}{#8}}}% + \StrMid{#2}{1}{1}[\NomA]\StrMid{#2}{2}{2}[\NomB]\StrMid{#2}{3}{3}[\NomC]\StrMid{#2}{4}{4}[\NomM]\StrMid{#2}{5}{5}[\NomN]% + \ifboolKV[ClesThales]{FigureSeule}{% + \MPFigThales{\NomA}{\NomB}{\NomC}{\NomM}{\NomN}{\useKV[ClesThales]{Angle}}% + }{\ifboolKV[ClesThales]{FigurecroiseeSeule}{% + \MPFigThalesCroisee{\NomA}{\NomB}{\NomC}{\NomM}{\NomN}{\useKV[ClesThales]{Angle}}% + }{% + \ifboolKV[ClesThales]{Figure}{% + \StrMid{#2}{1}{1}[\NomA]\StrMid{#2}{2}{2}[\NomB]\StrMid{#2}{3}{3}[\NomC]\StrMid{#2}{4}{4}[\NomM]\StrMid{#2}{5}{5}[\NomN]% + \begin{multicols}{2}% + {\em La figure est donnée à titre indicatif.}% + \[\MPFigThales{\NomA}{\NomB}{\NomC}{\NomM}{\NomN}{\useKV[ClesThales]{Angle}}\]% + \par\columnbreak\par% + \ifboolKV[ClesThales]{Entier}{\TThalesCalculsE[#1]{#2}{#3}{#4}{#5}{#6}{#7}{#8}}{\TThalesCalculsD[#1]{#2}{#3}{#4}{#5}{#6}{#7}{#8}}% + \end{multicols}% + }{\ifboolKV[ClesThales]{Figurecroisee}{% + \StrMid{#2}{1}{1}[\NomA]\StrMid{#2}{2}{2}[\NomB]\StrMid{#2}{3}{3}[\NomC]\StrMid{#2}{4}{4}[\NomM]\StrMid{#2}{5}{5}[\NomN]% + \begin{multicols}{2}% + {\em La figure est donnée à titre indicatif.}% + \[\MPFigThalesCroisee{\NomA}{\NomB}{\NomC}{\NomM}{\NomN}{\useKV[ClesThales]{Angle}}\]% + \par\columnbreak\par% + \ifboolKV[ClesThales]{Entier}{\TThalesCalculsE[#1]{#2}{#3}{#4}{#5}{#6}{#7}{#8}}{\TThalesCalculsD[#1]{#2}{#3}{#4}{#5}{#6}{#7}{#8}}% + \end{multicols}% + }{\ifboolKV[ClesThales]{Entier}{\TThalesCalculsE[#1]{#2}{#3}{#4}{#5}{#6}{#7}{#8}}{\TThalesCalculsD[#1]{#2}{#3}{#4}{#5}{#6}{#7}{#8}}}% + }% + }% }% }% %%%% @@ -4984,31 +5300,40 @@ vardef Positions(expr Step)= % #4 longueur AB % #5 longueur AF % #6 longueur AC - \ifboolKV[ClesThales]{Figure}{% + \ifboolKV[ClesThales]{FigureSeule}{% \StrMid{#2}{1}{1}[\NomA]\StrMid{#2}{2}{2}[\NomB]\StrMid{#2}{3}{3}[\NomC]\StrMid{#2}{4}{4}[\NomM]\StrMid{#2}{5}{5}[\NomN]% - \begin{multicols}{2} - {\em La figure est donnée à titre indicatif.} - \[\MPFigReciThales{\NomA}{\NomB}{\NomC}{\NomM}{\NomN}\] - \par\columnbreak\par - \ReciThales[#1]{\StrMid{#2}{1}{1}}{\StrMid{#2}{2}{2}}{\StrMid{#2}{3}{3}}{\StrMid{#2}{4}{4}}{\StrMid{#2}{5}{5}}\par - \ReciThalesCalculs[#1]{#2}{#3}{#4}{#5}{#6}{#7}{#8} - \end{multicols} - }{\ifboolKV[ClesThales]{Figurecroisee}{% - \StrMid{#2}{1}{1}[\NomA]\StrMid{#2}{2}{2}[\NomB]\StrMid{#2}{3}{3}[\NomC]\StrMid{#2}{4}{4}[\NomM]\StrMid{#2}{5}{5}[\NomN] - \begin{minipage}{0.4\linewidth} - {\em La figure est donnée à titre indicatif.} - \[\MPFigReciThalesCroisee{\NomA}{\NomB}{\NomC}{\NomM}{\NomN}\] - \end{minipage} - \hfill - \begin{minipage}{0.55\linewidth} - \ReciThales[#1]{\StrMid{#2}{1}{1}}{\StrMid{#2}{2}{2}}{\StrMid{#2}{3}{3}}{\StrMid{#2}{4}{4}}{\StrMid{#2}{5}{5}}\par - \ReciThalesCalculs[#1]{#2}{#3}{#4}{#5}{#6}{#7}{#8} - \end{minipage}\\% - }{\ReciThales[#1]{\StrMid{#2}{1}{1}}{\StrMid{#2}{2}{2}}{\StrMid{#2}{3}{3}}{\StrMid{#2}{4}{4}}{\StrMid{#2}{5}{5}}\par - \ReciThalesCalculs[#1]{#2}{#3}{#4}{#5}{#6}{#7}{#8} - } - } -} + \MPFigReciThales{\NomA}{\NomB}{\NomC}{\NomM}{\NomN}{\useKV[ClesThales]{Angle}}% + }{\ifboolKV[ClesThales]{FigurecroiseeSeule}{% + \StrMid{#2}{1}{1}[\NomA]\StrMid{#2}{2}{2}[\NomB]\StrMid{#2}{3}{3}[\NomC]\StrMid{#2}{4}{4}[\NomM]\StrMid{#2}{5}{5}[\NomN]% + \MPFigReciThalesCroisee{\NomA}{\NomB}{\NomC}{\NomM}{\NomN}{\useKV[ClesThales]{Angle}}% + }{% + \ifboolKV[ClesThales]{Figure}{% + \StrMid{#2}{1}{1}[\NomA]\StrMid{#2}{2}{2}[\NomB]\StrMid{#2}{3}{3}[\NomC]\StrMid{#2}{4}{4}[\NomM]\StrMid{#2}{5}{5}[\NomN]% + \begin{multicols}{2} + {\em La figure est donnée à titre indicatif.} + \[\MPFigReciThales{\NomA}{\NomB}{\NomC}{\NomM}{\NomN}{\useKV[ClesThales]{Angle}}\] + \par\columnbreak\par + \ReciThales[#1]{\StrMid{#2}{1}{1}}{\StrMid{#2}{2}{2}}{\StrMid{#2}{3}{3}}{\StrMid{#2}{4}{4}}{\StrMid{#2}{5}{5}}\par + \ReciThalesCalculs[#1]{#2}{#3}{#4}{#5}{#6}{#7}{#8} + \end{multicols} + }{\ifboolKV[ClesThales]{Figurecroisee}{% + \StrMid{#2}{1}{1}[\NomA]\StrMid{#2}{2}{2}[\NomB]\StrMid{#2}{3}{3}[\NomC]\StrMid{#2}{4}{4}[\NomM]\StrMid{#2}{5}{5}[\NomN] + \begin{minipage}{0.4\linewidth} + {\em La figure est donnée à titre indicatif.} + \[\MPFigReciThalesCroisee{\NomA}{\NomB}{\NomC}{\NomM}{\NomN}{\useKV[ClesThales]{Angle}}\] + \end{minipage} + \hfill + \begin{minipage}{0.55\linewidth} + \ReciThales[#1]{\StrMid{#2}{1}{1}}{\StrMid{#2}{2}{2}}{\StrMid{#2}{3}{3}}{\StrMid{#2}{4}{4}}{\StrMid{#2}{5}{5}}\par + \ReciThalesCalculs[#1]{#2}{#3}{#4}{#5}{#6}{#7}{#8}% + \end{minipage}\\% + }{\ReciThales[#1]{\StrMid{#2}{1}{1}}{\StrMid{#2}{2}{2}}{\StrMid{#2}{3}{3}}{\StrMid{#2}{4}{4}}{\StrMid{#2}{5}{5}}\par + \ReciThalesCalculs[#1]{#2}{#3}{#4}{#5}{#6}{#7}{#8}% + }% + }% + }% + }% +}% \newcommand{\Thales}[8][]{% \useKVdefault[ClesThales]% @@ -5016,18 +5341,48 @@ vardef Positions(expr Step)= \ifboolKV[ClesThales]{Reciproque}{% \ReciproqueThales[#1]{#2}{#3}{#4}{#5}{#6}{#7}{#8}% }{% - \ifboolKV[ClesThales]{Redaction}{% - \TTThales[#1]{\StrMid{#2}{1}{1}}{\StrMid{#2}{2}{2}}{\StrMid{#2}{3}{3}}{\StrMid{#2}{4}{4}}{\StrMid{#2}{5}{5}}% + \ifboolKV[ClesThales]{FigureSeule}{% + \StrMid{#2}{1}{1}[\NomA]\StrMid{#2}{2}{2}[\NomB]\StrMid{#2}{3}{3}[\NomC]\StrMid{#2}{4}{4}[\NomM]\StrMid{#2}{5}{5}[\NomN]% + \MPFigThales{\NomA}{\NomB}{\NomC}{\NomM}{\NomN}{\useKV[ClesThales]{Angle}}% }{% - \TThales[#1]{#2}{#3}{#4}{#5}{#6}{#7}{#8}% - } + \ifboolKV[ClesThales]{FigurecroiseeSeule}{% + \StrMid{#2}{1}{1}[\NomA]\StrMid{#2}{2}{2}[\NomB]\StrMid{#2}{3}{3}[\NomC]\StrMid{#2}{4}{4}[\NomM]\StrMid{#2}{5}{5}[\NomN]% + \MPFigThalesCroisee{\NomA}{\NomB}{\NomC}{\NomM}{\NomN}{\useKV[ClesThales]{Angle}}% + }{% + \ifboolKV[ClesThales]{Redaction}{% + \ifboolKV[ClesThales]{Figure}{% + \StrMid{#2}{1}{1}[\NomA]\StrMid{#2}{2}{2}[\NomB]\StrMid{#2}{3}{3}[\NomC]\StrMid{#2}{4}{4}[\NomM]\StrMid{#2}{5}{5}[\NomN]% + \begin{multicols}{2} + {\em La figure est donnée à titre indicatif.}% + \[\MPFigThales{\NomA}{\NomB}{\NomC}{\NomM}{\NomN}{\useKV[ClesThales]{Angle}}\]% + \par\columnbreak\par% + \TTThales[#1]{\StrMid{#2}{1}{1}}{\StrMid{#2}{2}{2}}{\StrMid{#2}{3}{3}}{\StrMid{#2}{4}{4}}{\StrMid{#2}{5}{5}}% + \end{multicols}% + }{% + \ifboolKV[ClesThales]{Figurecroisee}{% + \StrMid{#2}{1}{1}[\NomA]\StrMid{#2}{2}{2}[\NomB]\StrMid{#2}{3}{3}[\NomC]\StrMid{#2}{4}{4}[\NomM]\StrMid{#2}{5}{5}[\NomN]% + \begin{multicols}{2} + {\em La figure est donnée à titre indicatif.}% + \[\MPFigThalesCroisee{\NomA}{\NomB}{\NomC}{\NomM}{\NomN}{\useKV[ClesThales]{Angle}}\]% + \par\columnbreak\par% + \TTThales[#1]{\StrMid{#2}{1}{1}}{\StrMid{#2}{2}{2}}{\StrMid{#2}{3}{3}}{\StrMid{#2}{4}{4}}{\StrMid{#2}{5}{5}}% + \end{multicols} + }{% + \TTThales[#1]{\StrMid{#2}{1}{1}}{\StrMid{#2}{2}{2}}{\StrMid{#2}{3}{3}}{\StrMid{#2}{4}{4}}{\StrMid{#2}{5}{5}}% + } + } + }{% + \TThales[#1]{#2}{#3}{#4}{#5}{#6}{#7}{#8}% + }% + }% + }% }% }% -%%%%%%%%%%%%%%%% -%% Trigonométrie -%%%%%%%%%%%%%%%% -\def\MPFigTrigo#1#2#3#4#5#6#7{% +%%% +% Trigonométrie +%%% +\def\MPFigTrigo#1#2#3#4#5#6#7#8{% \ifluatex \mplibcodeinherit{enable} \mplibforcehmode @@ -5042,11 +5397,9 @@ vardef Positions(expr Step)= O - .5[A,B] = whatever * (B-A) rotated 90; O - .5[B,C] = whatever * (C-B) rotated 90; % On tourne pour éventuellement moins de lassitude :) - numeric Angle; - Angle=uniformdeviate(180);%Caractère aléatoire - A:=A rotatedabout(O,Angle); - B:=B rotatedabout(O,Angle); - C:=C rotatedabout(O,Angle); + A:=A rotatedabout(O,#8); + B:=B rotatedabout(O,#8); + C:=C rotatedabout(O,#8); % On définit le centre du cercle inscrit (I-C) rotated ((angle(A-C)-angle(B-C))/2) shifted C=whatever[A,C]; (I-B) rotated ((angle(C-B)-angle(A-B))/2) shifted B=whatever[B,C]; @@ -5065,8 +5418,6 @@ vardef Positions(expr Step)= picture MAngle; MAngle=image( draw (cc shifted A); - % draw (cc shifted B); - % draw (cc shifted C); ); draw MAngle; clip currentpicture to triangle; @@ -5084,15 +5435,15 @@ vardef Positions(expr Step)= else: if angle(1/2[A,C]-B)>0: if #6=0: - label(btex ? etex rotated angle(C-A),1.1[B,1/2[A,C]]); + label(btex ? etex,1.1[B,1/2[A,C]]); else: - label(btex \num{#6} etex rotated angle(C-A),1.1[B,1/2[A,C]]); + label(btex \num{#6} etex,1.1[B,1/2[A,C]]); fi; else: if #6=0: - label(btex ? etex rotated angle(A-C),1.1[B,1/2[A,C]]); + label(btex ? etex,1.1[B,1/2[A,C]]); else: - label(btex \num{#6} etex rotated angle(A-C),1.1[B,1/2[A,C]]); + label(btex \num{#6} etex,1.1[B,1/2[A,C]]); fi; fi; fi; @@ -5100,15 +5451,15 @@ vardef Positions(expr Step)= else: if angle(1/2[B,C]-A)>0: if #4=0: - label(btex ? etex rotated(angle(B-C)),1/2[B,C]-decalage*(unitvector(A-B))); + label(btex ? etex,1/2[B,C]-decalage*(unitvector(A-B))); else: - label(btex \num{#4} etex rotated(angle(B-C)),1/2[B,C]-decalage*(unitvector(A-B))); + label(btex \num{#4} etex,1/2[B,C]-decalage*(unitvector(A-B))); fi; else: if #4=0: - label(btex ? etex rotated(angle(C-B)),1/2[B,C]-decalage*(unitvector(A-B))); + label(btex ? etex,1/2[B,C]-decalage*(unitvector(A-B))); else: - label(btex \num{#4} etex rotated(angle(C-B)),1/2[B,C]-decalage*(unitvector(A-B))); + label(btex \num{#4} etex,1/2[B,C]-decalage*(unitvector(A-B))); fi; fi; fi; @@ -5116,15 +5467,15 @@ vardef Positions(expr Step)= else: if angle(1/2[A,B]-C)>0: if #5=0: - label(btex ? etex rotated angle(A-B),1/2[A,B]-decalage*(unitvector(C-B))); + label(btex ? etex,1/2[A,B]-decalage*(unitvector(C-B))); else: - label(btex \num{#5} etex rotated angle(A-B),1/2[A,B]-decalage*(unitvector(C-B))); + label(btex \num{#5} etex,1/2[A,B]-decalage*(unitvector(C-B))); fi; else: if #5=0: - label(btex ? etex rotated angle(B-A),1/2[A,B]-decalage*(unitvector(C-B))); + label(btex ? etex,1/2[A,B]-decalage*(unitvector(C-B))); else: - label(btex \num{#5} etex rotated angle(B-A),1/2[A,B]-decalage*(unitvector(C-B))); + label(btex \num{#5} etex,1/2[A,B]-decalage*(unitvector(C-B))); fi; fi; fi; @@ -5142,10 +5493,9 @@ vardef Positions(expr Step)= O - .5[A,B] = whatever * (B-A) rotated 90; O - .5[B,C] = whatever * (C-B) rotated 90; % On tourne pour éventuellement moins de lassitude :) - Angle=uniformdeviate(180);%Caractère aléatoire - A:=A rotatedabout(O,Angle); - B:=B rotatedabout(O,Angle); - C:=C rotatedabout(O,Angle); + A:=A rotatedabout(O,#8); + B:=B rotatedabout(O,#8); + C:=C rotatedabout(O,#8); % On définit le centre du cercle inscrit (I-C) rotated ((angle(A-C)-angle(B-C))/2) shifted C=whatever[A,C]; (I-B) rotated ((angle(C-B)-angle(A-B))/2) shifted B=whatever[B,C]; @@ -5231,7 +5581,7 @@ vardef Positions(expr Step)= \fi } -\def\MPFigTrigoAngle#1#2#3#4#5#6{% +\def\MPFigTrigoAngle#1#2#3#4#5#6#7{% % #1 A % #2 B % #3 C @@ -5252,12 +5602,10 @@ vardef Positions(expr Step)= O - .5[A,B] = whatever * (B-A) rotated 90; O - .5[B,C] = whatever * (C-B) rotated 90; % On tourne pour éventuellement moins de lassitude :) - numeric Anglelua; - Anglelua=uniformdeviate(180);%Caractère aléatoire - A:=A rotatedabout(O,Anglelua); - B:=B rotatedabout(O,Anglelua); - C:=C rotatedabout(O,Anglelua); - % On définit le centre du cercle inscrit + A:=A rotatedabout(O,#7); + B:=B rotatedabout(O,#7); + C:=C rotatedabout(O,#7); + % On définit le centre du cercle inscrit (I-C) rotated ((angle(A-C)-angle(B-C))/2) shifted C=whatever[A,C]; (I-B) rotated ((angle(C-B)-angle(A-B))/2) shifted B=whatever[B,C]; %on dessine à main levée :) @@ -5275,34 +5623,32 @@ vardef Positions(expr Step)= picture MAngle; MAngle=image( draw (cc shifted A); -% draw (cc shifted B); -% draw (cc shifted C); ); draw MAngle; clip currentpicture to triangle; draw A{dir(angle(B-A)+5)}..B{dir(angle(B-A)+5)}; draw B{dir(angle(C-B)+5)}..C{dir(angle(C-B)+5)}; draw C{dir(angle(A-C)+5)}..A{dir(angle(A-C)+5)}; - %on labelise + % on labelise label(btex #1 etex,1.15[O,A]); label(btex #2 etex,1.15[O,B]); label(btex #3 etex,1.15[O,C]); label(btex ? etex,A+0.95u*unitvector(I-A)); decalage:=3mm; if angle(1/2[A,C]-B)>0: - label(btex \num{#6} etex rotated angle(C-A),1.1[B,1/2[A,C]]); + label(btex \num{#6} etex,1.1[B,1/2[A,C]]); else: - label(btex \num{#6} etex rotated angle(A-C),1.1[B,1/2[A,C]]); + label(btex \num{#6} etex,1.1[B,1/2[A,C]]); fi; if angle(1/2[B,C]-A)>0: - label(btex \num{#4} etex rotated(angle(B-C)),1/2[B,C]-decalage*(unitvector(A-B))); + label(btex \num{#4} etex,1/2[B,C]-decalage*(unitvector(A-B))); else: - label(btex \num{#4} etex rotated(angle(C-B)),1/2[B,C]-decalage*(unitvector(A-B))); + label(btex \num{#4} etex,1/2[B,C]-decalage*(unitvector(A-B))); fi; if angle(1/2[A,B]-C)>0: - label(btex \num{#5} etex rotated angle(A-B),1/2[A,B]-decalage*(unitvector(C-B))); + label(btex \num{#5} etex,1/2[A,B]-decalage*(unitvector(C-B))); else: - label(btex \num{#5} etex rotated angle(B-A),1/2[A,B]-decalage*(unitvector(C-B))); + label(btex \num{#5} etex,1/2[A,B]-decalage*(unitvector(C-B))); fi; \end{mplibcode} \mplibcodeinherit{disable} @@ -5318,10 +5664,9 @@ vardef Positions(expr Step)= O - .5[A,B] = whatever * (B-A) rotated 90; O - .5[B,C] = whatever * (C-B) rotated 90; % On tourne pour éventuellement moins de lassitude :) - Angle=uniformdeviate(180);%Caractère aléatoire - A:=A rotatedabout(O,Angle); - B:=B rotatedabout(O,Angle); - C:=C rotatedabout(O,Angle); + A:=A rotatedabout(O,#7); + B:=B rotatedabout(O,#7); + C:=C rotatedabout(O,#7); % On définit le centre du cercle inscrit (I-C) rotated ((angle(A-C)-angle(B-C))/2) shifted C=whatever[A,C]; (I-B) rotated ((angle(C-B)-angle(A-B))/2) shifted B=whatever[B,C]; @@ -5340,8 +5685,6 @@ vardef Positions(expr Step)= picture MAngle; MAngle=image( draw (cc shifted A); -% draw (cc shifted B); -% draw (cc shifted C); ); draw MAngle; clip currentpicture to triangle; @@ -5355,25 +5698,25 @@ vardef Positions(expr Step)= label(btex ? etex,A+0.95u*unitvector(I-A)); decalage:=3mm; if angle(1/2[A,C]-B)>0: - label(btex \num{#6} etex rotated angle(C-A),1.1[B,1/2[A,C]]); + label(btex \num{#6} etex,1.1[B,1/2[A,C]]); else: - label(btex \num{#6} etex rotated angle(A-C),1.1[B,1/2[A,C]]); + label(btex \num{#6} etex,1.1[B,1/2[A,C]]); fi; if angle(1/2[B,C]-A)>0: - label(btex \num{#4} etex rotated(angle(B-C)),1/2[B,C]-decalage*(unitvector(A-B))); + label(btex \num{#4} etex,1/2[B,C]-decalage*(unitvector(A-B))); else: - label(btex \num{#4} etex rotated(angle(C-B)),1/2[B,C]-decalage*(unitvector(A-B))); + label(btex \num{#4} etex,1/2[B,C]-decalage*(unitvector(A-B))); fi; if angle(1/2[A,B]-C)>0: - label(btex \num{#5} etex rotated angle(A-B),1/2[A,B]-decalage*(unitvector(C-B))); + label(btex \num{#5} etex,1/2[A,B]-decalage*(unitvector(C-B))); else: - label(btex \num{#5} etex rotated angle(B-A),1/2[A,B]-decalage*(unitvector(C-B))); + label(btex \num{#5} etex,1/2[A,B]-decalage*(unitvector(C-B))); fi; \end{mpost} \fi } -\setKVdefault[ClesTrigo]{Angle=false,Propor=false,Figure=false,Precision=2,Unite=cm,Sinus=false,Cosinus=false,Tangente=false}% +\setKVdefault[ClesTrigo]{Angle=0,Propor=false,Figure=false,FigureSeule=false,Precision=2,Unite=cm,Sinus=false,Cosinus=false,Tangente=false}% \newcommand\TrigoCalculs[5][]{% \setKV[ClesTrigo]{#1}% @@ -5381,18 +5724,19 @@ vardef Positions(expr Step)= % #2 Nom du triangle ABC, rectangle en B, angle connu ou pas : BAC % #3 Longueur % #4 Longueur - %#5 angle + % #5 angle % On définit les points \StrMid{#2}{1}{1}[\NomA]% \StrMid{#2}{2}{2}[\NomB]% \StrMid{#2}{3}{3}[\NomC]% - Dans le triangle $\NomA\NomB\NomC$, rectangle en $\NomB$, on a : + Dans le triangle $\NomA\NomB\NomC$, rectangle en $\NomB$, on a :% \ifboolKV[ClesTrigo]{Cosinus}{% \ifx\bla#3\bla%on calcule le côté adjacent - \ifboolKV[ClesTrigo]{Propor}{% - \begin{align*} - \NomA\NomC\times\cos(\widehat{\NomB\NomA\NomC})&=\NomA\NomB\\ - \num{#4}\times\cos(\ang{#5})&=\NomA\NomB\\ + \xdef\ResultatTrigo{\fpeval{round(\fpeval{#4*cosd(#5)},\useKV[ClesTrigo]{Precision})}}% + \ifboolKV[ClesTrigo]{Propor}{% + \begin{align*} + \NomA\NomC\times\cos(\widehat{\NomB\NomA\NomC})&=\NomA\NomB\\ + \num{#4}\times\cos(\ang{#5})&=\NomA\NomB\\ \num{\fpeval{round(\fpeval{#4*cosd(#5)},\useKV[ClesTrigo]{Precision})}}~\text{\useKV[ClesTrigo]{Unite}}&\IfInteger{\fpeval{round(\fpeval{#4*cosd(#5)},2)}}{=}{\approx}\NomA\NomB% \end{align*}% }{% @@ -5400,12 +5744,12 @@ vardef Positions(expr Step)= \cos(\widehat{\NomB\NomA\NomC})&=\frac{\NomA\NomB}{\NomA\NomC}\\ \cos(\ang{#5})&=\frac{\NomA\NomB}{\num{#4}}\\ \num{#4}\times\cos(\ang{#5})&=\NomA\NomB\\ - \num{\fpeval{round(\fpeval{#4*cosd(#5)},\useKV[ClesTrigo]{Precision})}}~\text{\useKV[ClesTrigo]{Unite}}&\IfInteger{\fpeval{round(\fpeval{#4*cosd(#5)},2)}}{=}{\approx}\NomA\NomB% - \end{align*}% + \num{\fpeval{round(\fpeval{#4*cosd(#5)},\useKV[ClesTrigo]{Precision})}}~\text{\useKV[ClesTrigo]{Unite}}&\IfInteger{\fpeval{round(\fpeval{#4*cosd(#5)},2)}}{=}{\approx}\NomA\NomB + \end{align*} }% - \xdef\ResultatTrigo{\fpeval{round(\fpeval{#4*cosd(#5)},\useKV[ClesTrigo]{Precision})}}% - \else + \else% \ifx\bla#4\bla%on calcule l'hypothénuse + \xdef\ResultatTrigo{\fpeval{round(\fpeval{#3/cosd(#5)},\useKV[ClesTrigo]{Precision})}}% \ifboolKV[ClesTrigo]{Propor}{% \begin{align*} \NomA\NomC\times\cos(\widehat{\NomB\NomA\NomC})&=\NomA\NomB\\ @@ -5421,8 +5765,8 @@ vardef Positions(expr Step)= \NomA\NomC&\IfInteger{\fpeval{round(\fpeval{#3/cosd(#5)},2)}}{=}{\approx}\num{\fpeval{round(\fpeval{#3/cosd(#5)},\useKV[ClesTrigo]{Precision})}}~\text{\useKV[ClesTrigo]{Unite}}% \end{align*}% }% - \xdef\ResultatTrigo{\fpeval{round(\fpeval{#3/cosd(#5)},\useKV[ClesTrigo]{Precision})}}% \else%on calcule l'angle + \xdef\ResultatTrigo{\fpeval{round(\fpeval{acosd(#3/#4)})}}% \ifboolKV[ClesTrigo]{Propor}{% \begin{align*} \NomA\NomC\times\cos(\widehat{\NomB\NomA\NomC})&=\NomA\NomB\\ @@ -5437,12 +5781,12 @@ vardef Positions(expr Step)= \widehat{\NomB\NomA\NomC}&\IfInteger{\fpeval{round(\fpeval{acosd(#3/#4)},2)}}{=}{\approx}\ang{\fpeval{round(\fpeval{acosd(#3/#4)})}}% \end{align*}% }% - \xdef\ResultatTrigo{\fpeval{round(\fpeval{acosd(#3/#4)})}}% - \fi - \fi - }{} + \fi% + \fi% + }{}% \ifboolKV[ClesTrigo]{Sinus}{% \ifx\bla#3\bla%on calcule le côté opposé + \xdef\ResultatTrigo{\fpeval{round(\fpeval{#4*sind(#5)},\useKV[ClesTrigo]{Precision})}}% \ifboolKV[ClesTrigo]{Propor}{% \begin{align*} \NomA\NomC\times\sin(\widehat{\NomB\NomA\NomC})&=\NomB\NomC\\ @@ -5457,26 +5801,26 @@ vardef Positions(expr Step)= \num{\fpeval{round(\fpeval{#4*sind(#5)},\useKV[ClesTrigo]{Precision})}}~\text{\useKV[ClesTrigo]{Unite}}&\IfInteger{\fpeval{round(\fpeval{#4*sind(#5)},2)}}{=}{\approx}\NomB\NomC% \end{align*}% }% - \xdef\ResultatTrigo{\fpeval{round(\fpeval{#4*sind(#5)},\useKV[ClesTrigo]{Precision})}}% \else \ifx\bla#4\bla%on calcule l'hypothénuse + \xdef\ResultatTrigo{\fpeval{round(\fpeval{#3/sind(#5)},\useKV[ClesTrigo]{Precision})}}% \ifboolKV[ClesTrigo]{Propor}{% - \begin{align*} - \NomA\NomC\times\sin(\widehat{\NomB\NomA\NomC})&=\NomB\NomC\\ - \NomA\NomC\times\sin(\ang{#5})&=\num{#3}\\ - \NomA\NomC&=\frac{\num{#3}}{\sin(\ang{#5})}\\ - \NomA\NomC&\IfInteger{\fpeval{round(\fpeval{#3/sind(#5)},2)}}{=}{\approx}\num{\fpeval{round(\fpeval{#3/sind(#5)},\useKV[ClesTrigo]{Precision})}}~\text{\useKV[ClesTrigo]{Unite}}% - \end{align*}% - }{ - \begin{align*} - \sin(\widehat{\NomB\NomA\NomC})&=\frac{\NomB\NomC}{\NomA\NomC}\\ - \sin(\ang{#5})&=\frac{\num{#3}}{\NomA\NomC}\\ - \NomA\NomC&=\frac{\num{#3}}{\sin(\ang{#5})}\\ - \NomA\NomC&\IfInteger{\fpeval{round(\fpeval{#3/sind(#5)},2)}}{=}{\approx}\num{\fpeval{round(\fpeval{#3/sind(#5)},\useKV[ClesTrigo]{Precision})}}~\text{\useKV[ClesTrigo]{Unite}}% - \end{align*}% - }% - \xdef\ResultatTrigo{\fpeval{round(\fpeval{#3/sind(#5)},\useKV[ClesTrigo]{Precision})}}% - \else%on calcule l'angle + \begin{align*} + \NomA\NomC\times\sin(\widehat{\NomB\NomA\NomC})&=\NomB\NomC\\ + \NomA\NomC\times\sin(\ang{#5})&=\num{#3}\\ + \NomA\NomC&=\frac{\num{#3}}{\sin(\ang{#5})}\\ + \NomA\NomC&\IfInteger{\fpeval{round(\fpeval{#3/sind(#5)},2)}}{=}{\approx}\num{\fpeval{round(\fpeval{#3/sind(#5)},\useKV[ClesTrigo]{Precision})}}~\text{\useKV[ClesTrigo]{Unite}}% + \end{align*}% + }{% + \begin{align*} + \sin(\widehat{\NomB\NomA\NomC})&=\frac{\NomB\NomC}{\NomA\NomC}\\ + \sin(\ang{#5})&=\frac{\num{#3}}{\NomA\NomC}\\ + \NomA\NomC&=\frac{\num{#3}}{\sin(\ang{#5})}\\ + \NomA\NomC&\IfInteger{\fpeval{round(\fpeval{#3/sind(#5)},2)}}{=}{\approx}\num{\fpeval{round(\fpeval{#3/sind(#5)},\useKV[ClesTrigo]{Precision})}}~\text{\useKV[ClesTrigo]{Unite}}% + \end{align*}% + }% + \else%on calcule l'angle + \xdef\ResultatTrigo{\fpeval{round(\fpeval{asind(#3/#4)})}}% \ifboolKV[ClesTrigo]{Propor}{% \begin{align*} \NomA\NomC\times\sin(\widehat{\NomB\NomA\NomC})&=\NomB\NomC\\ @@ -5491,12 +5835,12 @@ vardef Positions(expr Step)= \widehat{\NomB\NomA\NomC}&\IfInteger{\fpeval{round(\fpeval{asind(#3/#4)},2)}}{=}{\approx}\ang{\fpeval{round(\fpeval{asind(#3/#4)})}}% \end{align*}% }% - \xdef\ResultatTrigo{\fpeval{round(\fpeval{asind(#3/#4)})}}% - \fi - \fi - }{} + \fi% + \fi% + }{}% \ifboolKV[ClesTrigo]{Tangente}{% \ifx\bla#3\bla%on calcule le côté opposé + \xdef\ResultatTrigo{\fpeval{round(\fpeval{#4*tand(#5)},\useKV[ClesTrigo]{Precision})}}% \ifboolKV[ClesTrigo]{Propor}{% \begin{align*} \NomA\NomB\times\tan(\widehat{\NomB\NomA\NomC})&=\NomB\NomC\\% @@ -5511,26 +5855,26 @@ vardef Positions(expr Step)= \num{\fpeval{round(\fpeval{#4*tand(#5)},\useKV[ClesTrigo]{Precision})}}~\text{\useKV[ClesTrigo]{Unite}}&\IfInteger{\fpeval{round(\fpeval{#4*tand(#5)},2)}}{=}{\approx}\NomB\NomC% \end{align*}% }% - \xdef\ResultatTrigo{\fpeval{round(\fpeval{#4*tand(#5)},\useKV[ClesTrigo]{Precision})}}% \else \ifx\bla#4\bla%on calcule l'adjacent + \xdef\ResultatTrigo{\fpeval{round(\fpeval{#3/tand(#5)},\useKV[ClesTrigo]{Precision})}}% \ifboolKV[ClesTrigo]{Propor}{% - \begin{align*} - \NomA\NomB\times\tan(\widehat{\NomB\NomA\NomC})&=\NomB\NomC\\ - \NomA\NomB\times\tan(\ang{#5})&=\num{#3}\\ - \NomA\NomB&=\frac{\num{#3}}{\tan(\ang{#5})}\\ - \NomA\NomB&\IfInteger{\fpeval{round(\fpeval{#3/tand(#5)},2)}}{=}{\approx}\num{\fpeval{round(\fpeval{#3/tand(#5)},\useKV[ClesTrigo]{Precision})}}~\text{\useKV[ClesTrigo]{Unite}}% - \end{align*}% - }{ - \begin{align*} - \tan(\widehat{\NomB\NomA\NomC})&=\frac{\NomB\NomC}{\NomA\NomB}\\ - \tan(\ang{#5})&=\frac{\num{#3}}{\NomA\NomB}\\ - \NomA\NomB&=\frac{\num{#3}}{\tan(\ang{#5})}\\ - \NomA\NomB&\IfInteger{\fpeval{round(\fpeval{#3/tand(#5)},2)}}{=}{\approx}\num{\fpeval{round(\fpeval{#3/tand(#5)},\useKV[ClesTrigo]{Precision})}}~\text{\useKV[ClesTrigo]{Unite}}% - \end{align*}% - }% - \xdef\ResultatTrigo{\fpeval{round(\fpeval{#3/tand(#5)},\useKV[ClesTrigo]{Precision})}}% + \begin{align*} + \NomA\NomB\times\tan(\widehat{\NomB\NomA\NomC})&=\NomB\NomC\\ + \NomA\NomB\times\tan(\ang{#5})&=\num{#3}\\ + \NomA\NomB&=\frac{\num{#3}}{\tan(\ang{#5})}\\ + \NomA\NomB&\IfInteger{\fpeval{round(\fpeval{#3/tand(#5)},2)}}{=}{\approx}\num{\fpeval{round(\fpeval{#3/tand(#5)},\useKV[ClesTrigo]{Precision})}}~\text{\useKV[ClesTrigo]{Unite}}% + \end{align*}% + }{% + \begin{align*} + \tan(\widehat{\NomB\NomA\NomC})&=\frac{\NomB\NomC}{\NomA\NomB}\\ + \tan(\ang{#5})&=\frac{\num{#3}}{\NomA\NomB}\\ + \NomA\NomB&=\frac{\num{#3}}{\tan(\ang{#5})}\\ + \NomA\NomB&\IfInteger{\fpeval{round(\fpeval{#3/tand(#5)},2)}}{=}{\approx}\num{\fpeval{round(\fpeval{#3/tand(#5)},\useKV[ClesTrigo]{Precision})}}~\text{\useKV[ClesTrigo]{Unite}}% + \end{align*}% + }% \else%on calcule l'angle + \xdef\ResultatTrigo{\fpeval{round(\fpeval{atand(#3/#4)})}}% \ifboolKV[ClesTrigo]{Propor}{% \begin{align*} \NomA\NomB\times\tan(\widehat{\NomB\NomA\NomC})&=\NomB\NomC\\ @@ -5538,18 +5882,17 @@ vardef Positions(expr Step)= \tan(\widehat{\NomB\NomA\NomC})&=\frac{\num{#3}}{\num{#4}}\\ \widehat{\NomB\NomA\NomC}&\IfInteger{\fpeval{round(\fpeval{atand(#3/#4)},2)}}{=}{\approx}\ang{\fpeval{round(\fpeval{atand(#3/#4)})}}% \end{align*}% - }{ + }{% \begin{align*} \tan(\widehat{\NomB\NomA\NomC})&=\frac{\NomB\NomC}{\NomA\NomB}\\ \tan(\widehat{\NomB\NomA\NomC})&=\frac{\num{#3}}{\num{#4}}\\ \widehat{\NomB\NomA\NomC}&\IfInteger{\fpeval{round(\fpeval{atand(#3/#4)},2)}}{=}{\approx}\ang{\fpeval{round(\fpeval{atand(#3/#4)})}}% \end{align*}% }% - \xdef\ResultatTrigo{\fpeval{round(\fpeval{atand(#3/#4)})}}% - \fi - \fi - }{} -} + \fi% + \fi% + }{}% +}% \newcommand\Trigo[5][]{% \useKVdefault[ClesTrigo]% @@ -5557,77 +5900,114 @@ vardef Positions(expr Step)= % #1 Clés % #2 Nom du triangle ABC, rectangle en B, angle connu ou pas : BAC % #3 Longueur - % #4 Longueur ou angle en fonction du calcul à faire. Si longueur, #3<#4 + % #4 Longueur + % #5 angle % On définit les points \StrMid{#2}{1}{1}[\NomA]% \StrMid{#2}{2}{2}[\NomB]% \StrMid{#2}{3}{3}[\NomC]% % On rédige - \ifboolKV[ClesTrigo]{Figure}{% - \begin{multicols}{2}% - {\em La figure est donnée à titre indicatif.}% - \ifboolKV[ClesTrigo]{Angle}{%figure pour calculer un angle + \ifboolKV[ClesTrigo]{FigureSeule}{% + \ifx#5\bla\bla% + \ifboolKV[ClesTrigo]{Cosinus}{% + \MPFigTrigoAngle{\NomA}{\NomB}{\NomC}{}{#3}{#4}{\useKV[ClesTrigo]{Angle}} + }{}% + \ifboolKV[ClesTrigo]{Sinus}{% + \MPFigTrigoAngle{\NomA}{\NomB}{\NomC}{#3}{}{#4}{\useKV[ClesTrigo]{Angle}} + }{}% + \ifboolKV[ClesTrigo]{Tangente}{% + \MPFigTrigoAngle{\NomA}{\NomB}{\NomC}{#3}{#4}{}{\useKV[ClesTrigo]{Angle}} + }{}% + \else%}{%figure pour calculer une longueur + \ifboolKV[ClesTrigo]{Cosinus}{% + \ifx#3\bla\bla%adjacent inconnu + \MPFigTrigo{\NomA}{\NomB}{\NomC}{-1}{0}{#4}{#5}{\useKV[ClesTrigo]{Angle}} + \else + \MPFigTrigo{\NomA}{\NomB}{\NomC}{-1}{#3}{0}{#5}{\useKV[ClesTrigo]{Angle}} + \fi + }{}% + \ifboolKV[ClesTrigo]{Sinus}{% + \ifx#3\bla\bla%adjacent inconnu + \MPFigTrigo{\NomA}{\NomB}{\NomC}{0}{-1}{#4}{#5}{\useKV[ClesTrigo]{Angle}} + \else + \MPFigTrigo{\NomA}{\NomB}{\NomC}{#3}{-1}{0}{#5}{\useKV[ClesTrigo]{Angle}} + \fi + }{}% + \ifboolKV[ClesTrigo]{Tangente}{% + \ifx#3\bla\bla%adjacent inconnu + \MPFigTrigo{\NomA}{\NomB}{\NomC}{0}{#4}{-1}{#5}{\useKV[ClesTrigo]{Angle}} + \else% + \MPFigTrigo{\NomA}{\NomB}{\NomC}{#3}{0}{-1}{#5}{\useKV[ClesTrigo]{Angle}} + \fi% + }{}% + \fi% + }{% + \ifboolKV[ClesTrigo]{Figure}{% + \begin{multicols}{2}% + {\em La figure est donnée à titre indicatif.}% + \ifx#5\bla\bla% \ifboolKV[ClesTrigo]{Cosinus}{% \begin{center} - \MPFigTrigoAngle{\NomA}{\NomB}{\NomC}{}{#3}{#4} + \MPFigTrigoAngle{\NomA}{\NomB}{\NomC}{}{#3}{#4}{\useKV[ClesTrigo]{Angle}} \end{center} }{}% \ifboolKV[ClesTrigo]{Sinus}{% \begin{center} - \MPFigTrigoAngle{\NomA}{\NomB}{\NomC}{#3}{}{#4} + \MPFigTrigoAngle{\NomA}{\NomB}{\NomC}{#3}{}{#4}{\useKV[ClesTrigo]{Angle}} \end{center} }{}% \ifboolKV[ClesTrigo]{Tangente}{% \begin{center} - \MPFigTrigoAngle{\NomA}{\NomB}{\NomC}{#3}{#4}{} + \MPFigTrigoAngle{\NomA}{\NomB}{\NomC}{#3}{#4}{}{\useKV[ClesTrigo]{Angle}} \end{center} }{}% - }{%figure pour calculer une longueur + \else%}{%figure pour calculer une longueur \ifboolKV[ClesTrigo]{Cosinus}{% \ifx#3\bla\bla%adjacent inconnu \begin{center} - \MPFigTrigo{\NomA}{\NomB}{\NomC}{-1}{0}{#4}{#5} + \MPFigTrigo{\NomA}{\NomB}{\NomC}{-1}{0}{#4}{#5}{\useKV[ClesTrigo]{Angle}} \end{center} \else \begin{center} - \MPFigTrigo{\NomA}{\NomB}{\NomC}{-1}{#3}{0}{#5} + \MPFigTrigo{\NomA}{\NomB}{\NomC}{-1}{#3}{0}{#5}{\useKV[ClesTrigo]{Angle}} \end{center} \fi }{}% \ifboolKV[ClesTrigo]{Sinus}{% \ifx#3\bla\bla%adjacent inconnu \begin{center} - \MPFigTrigo{\NomA}{\NomB}{\NomC}{0}{-1}{#4}{#5} + \MPFigTrigo{\NomA}{\NomB}{\NomC}{0}{-1}{#4}{#5}{\useKV[ClesTrigo]{Angle}} \end{center} \else \begin{center} - \MPFigTrigo{\NomA}{\NomB}{\NomC}{#3}{-1}{0}{#5} + \MPFigTrigo{\NomA}{\NomB}{\NomC}{#3}{-1}{0}{#5}{\useKV[ClesTrigo]{Angle}} \end{center} \fi }{}% \ifboolKV[ClesTrigo]{Tangente}{% \ifx#3\bla\bla%adjacent inconnu \begin{center} - \MPFigTrigo{\NomA}{\NomB}{\NomC}{0}{#4}{-1}{#5} + \MPFigTrigo{\NomA}{\NomB}{\NomC}{0}{#4}{-1}{#5}{\useKV[ClesTrigo]{Angle}} \end{center} \else% \begin{center} - \MPFigTrigo{\NomA}{\NomB}{\NomC}{#3}{0}{-1}{#5} + \MPFigTrigo{\NomA}{\NomB}{\NomC}{#3}{0}{-1}{#5}{\useKV[ClesTrigo]{Angle}} \end{center} \fi% }{}% - }% - \par\columnbreak\par - \TrigoCalculs{#2}{#3}{#4}{#5}% - \end{multicols} - }{% - \TrigoCalculs{#2}{#3}{#4}{#5}% + \fi% + \par\columnbreak\par + \TrigoCalculs[#1]{#2}{#3}{#4}{#5}% + \end{multicols} + }{% + \TrigoCalculs[#1]{#2}{#3}{#4}{#5}% + }% }% }% -%%%%%%%%%%%%%%% -%% Statistiques -%%%%%%%%%%%%%%% +%%% +% Statistiques +%%% \newcommand\NbDonnees{} \newcommand\SommeDonnees{}% \newcommand\EffectifTotal{}% @@ -5638,104 +6018,183 @@ vardef Positions(expr Step)= \newcommand\DonneeMin{}% \newcommand\EffectifMax{}% -\setKVdefault[ClesStat]{Tableau=false,Frequence=false,EffectifTotal=false,Etendue=false,Moyenne=false,SET=false,Mediane=false,Total=false,Concret=false,Unite={},Largeur=1cm,Precision=2,Donnee=Valeurs,Effectif=Effectif(s),Origine=0,Angle=false,SemiAngle=false,Qualitatif=false,TableauVide=false,Graphique=false,Batons=true,Unitex=0.5,Unitey=0.5,Rayon=3cm,AffichageAngle=false,Liste=false,ECC=false,Coupure=10,ColorTab=gray!15} +\setKVdefault[ClesStat]{ColVide=0,EffVide=false,% +FreqVide=false,AngVide=false,ECCVide=false,TotalVide=false,Sondage=false,% +Tableau=false,Stretch=1,Frequence=false,EffectifTotal=false,% +Etendue=false,Moyenne=false,SET=false,Mediane=false,Total=false,Concret=false,% +Unite={},Largeur=1cm,Precision=2,Donnee=Valeurs,Effectif=Effectif,Origine=0,Angle=false,SemiAngle=false,Qualitatif=false,TableauVide=false,Graphique=false,Batons=true,Unitex=0.5,Unitey=0.5,Rayon=3cm,AffichageAngle=false,Liste=false,ECC=false,Coupure=10,CouleurTab=gray!15,ListeCouleurs={white},Hachures=false,Inverse=false,AbscisseRotation=false} % La construction du tableau \def\addtotok#1#2{#1\expandafter{\the#1#2}} \newtoks\tabtoksa\newtoks\tabtoksb\newtoks\tabtoksc -\def\updatetoks#1/#2\nil{\addtotok\tabtoksa{&\num{#1}}\addtotok\tabtoksb{&\num{#2}}} -\def\buildtab{% +\def\updatetoks#1/#2\nil{\addtotok\tabtoksa{\ifboolKV[ClesStat]{Qualitatif}{}{&\num{#1}}}\addtotok\tabtoksb{&\num{#2}}} +\def\buildtab{% %%Tableau sans total \tabtoksa{\useKV[ClesStat]{Donnee}}\tabtoksb{\useKV[ClesStat]{Effectif}}% \foreachitem\compteur\in\ListeComplete{\expandafter\updatetoks\compteur\nil}% \[% - \begin{tabular}{|>{\columncolor{\useKV[ClesStat]{ColorTab}}}c|*{\number\numexpr\ListeCompletelen}{>{\centering\arraybackslash}p{\useKV[ClesStat]{Largeur}}|}}% + %\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{\ListeComplete[##1,2]}% + \renewcommand{\arraystretch}{\useKV[ClesStat]{Stretch}}% + \begin{tabular}{|>{\columncolor{\useKV[ClesStat]{CouleurTab}}}c|*{\number\numexpr\ListeCompletelen}{>{\centering\arraybackslash}p{\useKV[ClesStat]{Largeur}}|}}% \hline% - \rowcolor{\useKV[ClesStat]{ColorTab}}\the\tabtoksa\\\hline% - \the\tabtoksb\\\hline% - \ifboolKV[ClesStat]{Frequence}{Fréquence (\%)\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\CalculFrequence{##1}}}\\\hline}{}% - \ifboolKV[ClesStat]{Angle}{Angle (\si{\degree})\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\CalculAngle{##1}}}\\\hline}{}% - \ifboolKV[ClesStat]{SemiAngle}{Angle (\si{\degree})\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\CalculSemiAngle{##1}}\\\hline}{}% - \ifboolKV[ClesStat]{ECC}{E.C.C.\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\CalculECC{##1}}}\\\hline}{}% - \end{tabular} + \rowcolor{\useKV[ClesStat]{CouleurTab}}\the\tabtoksa\\\hline% + \ifnum\number\numexpr\useKV[ClesStat]{ColVide}<1% + \ifboolKV[ClesStat]{EffVide}{\useKV[ClesStat]{Effectif}\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&}}{\the\tabtoksb}\\\hline% + \ifboolKV[ClesStat]{Frequence}{Fréquence (\%)\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{FreqVide}{}{\CalculFrequence{##1}}}}\\\hline}{}% + \ifboolKV[ClesStat]{Angle}{Angle (\si{\degree})\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{AngVide}{}{\CalculAngle{##1}}}}\\\hline}{}% + \ifboolKV[ClesStat]{SemiAngle}{Angle (\si{\degree})\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{AngVide}{}{\CalculSemiAngle{##1}}}}\\\hline}{}% + \ifboolKV[ClesStat]{ECC}{E.C.C.\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{ECCVide}{}{\CalculECC{##1}}}}\\\hline}{}% + \end{tabular} + \else% + \ifnum\number\numexpr\useKV[ClesStat]{ColVide}>\ListeCompletelen% + \ifboolKV[ClesStat]{EffVide}{\useKV[ClesStat]{Effectif}\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&}}{\the\tabtoksb}\\\hline% + \ifboolKV[ClesStat]{Frequence}{Fréquence (\%)\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{FreqVide}{}{\CalculFrequence{##1}}}}\\\hline}{}% + \ifboolKV[ClesStat]{Angle}{Angle (\si{\degree})\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{AngVide}{}{\CalculAngle{##1}}}}\\\hline}{}% + \ifboolKV[ClesStat]{SemiAngle}{Angle (\si{\degree})\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{AngVide}{}{\CalculSemiAngle{##1}}}}\\\hline}{}% + \ifboolKV[ClesStat]{ECC}{E.C.C.\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{ECCVide}{}{\CalculECC{##1}}}}\\\hline}{}% + \end{tabular} + \else% + \ifnum\number\numexpr\useKV[ClesStat]{ColVide}=1% + \ifboolKV[ClesStat]{EffVide}{\useKV[ClesStat]{Effectif}\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&}}{\useKV[ClesStat]{Effectif}&\xintFor* ##1 in {\xintSeq {2}{\ListeCompletelen}}\do{&\ListeComplete[##1,2]}}\\\hline% + \ifboolKV[ClesStat]{Frequence}{Fréquence (\%)&\xintFor* ##1 in {\xintSeq {2}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{FreqVide}{}{\CalculFrequence{##1}}}}\\\hline}{}% + \ifboolKV[ClesStat]{Angle}{Angle (\si{\degree})&\xintFor* ##1 in {\xintSeq {2}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{AngVide}{}{\CalculAngle{##1}}}}\\\hline}{}% + \ifboolKV[ClesStat]{SemiAngle}{Angle (\si{\degree})&\xintFor* ##1 in {\xintSeq {2}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{AngVide}{}{\CalculSemiAngle{##1}}}}\\\hline}{}% + \ifboolKV[ClesStat]{ECC}{E.C.C.&\xintFor* ##1 in {\xintSeq {2}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{ECCVide}{}{\CalculECC{##1}}}}\\\hline}{}% + \end{tabular} + \else% + \ifnum\number\numexpr\useKV[ClesStat]{ColVide}=\ListeCompletelen% + \ifboolKV[ClesStat]{EffVide}{\useKV[ClesStat]{Effectif}\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&}}{\useKV[ClesStat]{Effectif}\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen-1}}\do{&\ListeComplete[##1,2]}}&\\\hline% + \ifboolKV[ClesStat]{Frequence}{Fréquence (\%)\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen-1}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{FreqVide}{}{\CalculFrequence{##1}}}}&\\\hline}{}% + \ifboolKV[ClesStat]{Angle}{Angle (\si{\degree})\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen-1}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{AngVide}{}{\CalculAngle{##1}}}}&\\\hline}{}% + \ifboolKV[ClesStat]{SemiAngle}{Angle (\si{\degree})\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen-1}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{AngVide}{}{\CalculSemiAngle{##1}}}}&\\\hline}{}% + \ifboolKV[ClesStat]{ECC}{E.C.C.\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen-1}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{ECCVide}{}{\CalculECC{##1}}}}&\\\hline}{}% + \end{tabular} + \else% + \ifboolKV[ClesStat]{EffVide}{\useKV[ClesStat]{Effectif}\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&}}{\useKV[ClesStat]{Effectif}\xintFor* ##1 in {\xintSeq {1}{\number\numexpr\useKV[ClesStat]{ColVide}-1}}\do{&\ListeComplete[##1,2]}&\xintFor* ##1 in {\xintSeq {\number\numexpr\useKV[ClesStat]{ColVide}+1}{\ListeCompletelen}}\do{&\ListeComplete[##1,2]}}\\\hline% + \ifboolKV[ClesStat]{Frequence}{Fréquence (\%)\xintFor* ##1 in {\xintSeq {1}{\number\numexpr\useKV[ClesStat]{ColVide}-1}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{FreqVide}{}{\CalculFrequence{##1}}}}&\xintFor* ##1 in {\xintSeq {\number\numexpr\useKV[ClesStat]{ColVide}+1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{FreqVide}{}{\CalculFrequence{##1}}}}\\\hline}{}% + \ifboolKV[ClesStat]{Angle}{Angle (\si{\degree})\xintFor* ##1 in {\xintSeq {1}{\number\numexpr\useKV[ClesStat]{ColVide}-1}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{AngVide}{}{\CalculAngle{##1}}}}&\xintFor* ##1 in {\xintSeq {\number\numexpr\useKV[ClesStat]{ColVide}+1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{FreqVide}{}{\CalculAngle{##1}}}}\\\hline}{}% + \ifboolKV[ClesStat]{SemiAngle}{Angle (\si{\degree})\xintFor* ##1 in {\xintSeq {1}{\number\numexpr\useKV[ClesStat]{ColVide}-1}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{AngVide}{}{\CalculSemiAngle{##1}}}}&\xintFor* ##1 in {\xintSeq {\number\numexpr\useKV[ClesStat]{ColVide}+1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{FreqVide}{}{\CalculSemiAngle{##1}}}}\\\hline}{}% + \ifboolKV[ClesStat]{ECC}{E.C.C.\xintFor* ##1 in {\xintSeq {1}{\number\numexpr\useKV[ClesStat]{ColVide}-1}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{ECCVide}{}{\CalculECC{##1}}}}&\xintFor* ##1 in {\xintSeq {\number\numexpr\useKV[ClesStat]{ColVide}+1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{ECCVide}{}{\CalculECC{##1}}}}\\\hline}{}% + \end{tabular} + \fi% + \fi% + \fi% + \fi% + \renewcommand{\arraystretch}{1}% \] } -\def\buildtabt{% +\def\buildtabt{% %%Tableau avec total \tabtoksa{\useKV[ClesStat]{Donnee}}\tabtoksb{\useKV[ClesStat]{Effectif}}% \foreachitem\compteur\in\ListeComplete{\expandafter\updatetoks\compteur\nil}% - \[% - \begin{tabular}{|>{\columncolor{\useKV[ClesStat]{ColorTab}}}c|*{\number\numexpr\ListeCompletelen+1}{>{\centering\arraybackslash}p{\useKV[ClesStat]{Largeur}}|}}% + \[% + \renewcommand{\arraystretch}{\useKV[ClesStat]{Stretch}}% + \begin{tabular}{|>{\columncolor{\useKV[ClesStat]{CouleurTab}}}c|*{\number\numexpr\ListeCompletelen+1}{>{\centering\arraybackslash}p{\useKV[ClesStat]{Largeur}}|}}% \hline% - \rowcolor{\useKV[ClesStat]{ColorTab}}\the\tabtoksa&Total\\\hline% - \the\tabtoksb&\ifboolKV[ClesStat]{TableauVide}{}{\num{\EffectifTotal}}% - \\\hline% - \ifboolKV[ClesStat]{Frequence}{Fréquence (\%)\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\CalculFrequence{##1}}}&\ifboolKV[ClesStat]{TableauVide}{}{100}\\\hline}{}% - \ifboolKV[ClesStat]{Angle}{Angle (\si{\degree})\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\CalculAngle{##1}}}&\ifboolKV[ClesStat]{TableauVide}{}{360}\\\hline}{}% - \ifboolKV[ClesStat]{SemiAngle}{Angle (\si{\degree})\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\CalculSemiAngle{##1}}}&\ifboolKV[ClesStat]{TableauVide}{}{180}\\\hline}{}% - \ifboolKV[ClesStat]{ECC}{E.C.C.\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\CalculECC{##1}}}&\ifboolKV[ClesStat]{TableauVide}{}{\num{\EffectifTotal}}\\\hline}{}% + \rowcolor{\useKV[ClesStat]{CouleurTab}}\the\tabtoksa&Total\\\hline% + \ifnum\number\numexpr\useKV[ClesStat]{ColVide}<1% + \ifboolKV[ClesStat]{EffVide}{\useKV[ClesStat]{Effectif}\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen+1}}\do{&}}{\the\tabtoksb&\ifboolKV[ClesStat]{TotalVide}{}{\num{\EffectifTotal}}}\\\hline% + \ifboolKV[ClesStat]{Frequence}{Fréquence (\%)\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{FreqVide}{}{\CalculFrequence{##1}}}}&\ifboolKV[ClesStat]{TotalVide}{}{\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{FreqVide}{}{100}}}\\\hline}{}% + \ifboolKV[ClesStat]{Angle}{Angle (\si{\degree})\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{AngVide}{}{\CalculAngle{##1}}}}&\ifboolKV[ClesStat]{TotalVide}{}{\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{AngVide}{}{360}}}\\\hline}{}% + \ifboolKV[ClesStat]{SemiAngle}{Angle (\si{\degree})\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{AngVide}{}{\CalculSemiAngle{##1}}}}&\ifboolKV[ClesStat]{TotalVide}{}{\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{AngVide}{}{180}}}\\\hline}{}% + \ifboolKV[ClesStat]{ECC}{E.C.C.\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{ECCVide}{}{\CalculECC{##1}}}}&\ifboolKV[ClesStat]{TotalVide}{}{\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{ECCVide}{}{\num{\EffectifTotal}}}}\\\hline}{}% \end{tabular} - \] -} - -\def\updatetoksq#1/#2\nil{\addtotok\tabtoksa{}\addtotok\tabtoksb{&\num{#2}}} -\def\buildtabq{% - \tabtoksa{\useKV[ClesStat]{Donnee}}\tabtoksb{\useKV[ClesStat]{Effectif}}% - \foreachitem\compteur\in\ListeComplete{\expandafter\updatetoksq\compteur\nil}% - \[% - \begin{tabular}{|>{\columncolor{\useKV[ClesStat]{ColorTab}}}c|*{\number\numexpr\ListeCompletelen}{>{\centering\arraybackslash}p{\useKV[ClesStat]{Largeur}}|}}% - \hline% - \rowcolor{\useKV[ClesStat]{ColorTab}}\the\tabtoksa\\\hline% - \the\tabtoksb\\\hline% - \ifboolKV[ClesStat]{Frequence}{Fréquence (\%)\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\CalculFrequence{##1}}}\\\hline}{}% - \ifboolKV[ClesStat]{Angle}{Angle (\si{\degree})\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\CalculAngle{##1}}}\\\hline}{}% - \ifboolKV[ClesStat]{SemiAngle}{Angle (\si{\degree})\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\CalculSemiAngle{##1}}}\\\hline}{}% - \ifboolKV[ClesStat]{ECC}{E.C.C.\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\CalculECC{##1}}}\\\hline}{}% + \else% + \ifnum\number\numexpr\useKV[ClesStat]{ColVide}>\ListeCompletelen% + \ifboolKV[ClesStat]{EffVide}{\useKV[ClesStat]{Effectif}\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen+1}}\do{&}}{\the\tabtoksb&\ifboolKV[ClesStat]{TotalVide}{}{\num{\EffectifTotal}}}\\\hline% + \ifboolKV[ClesStat]{Frequence}{Fréquence (\%)\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{FreqVide}{}{\CalculFrequence{##1}}}}&\ifboolKV[ClesStat]{TotalVide}{}{\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{FreqVide}{}{100}}}\\\hline}{}% + \ifboolKV[ClesStat]{Angle}{Angle (\si{\degree})\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{AngVide}{}{\CalculAngle{##1}}}}&\ifboolKV[ClesStat]{TotalVide}{}{\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{AngVide}{}{360}}}\\\hline}{}% + \ifboolKV[ClesStat]{SemiAngle}{Angle (\si{\degree})\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{AngVide}{}{\CalculSemiAngle{##1}}}}&\ifboolKV[ClesStat]{TotalVide}{}{\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{AngVide}{}{180}}}\\\hline}{}% + \ifboolKV[ClesStat]{ECC}{E.C.C.\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{ECCVide}{}{\CalculECC{##1}}}}&\ifboolKV[ClesStat]{TotalVide}{}{\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{ECCVide}{}{\num{\EffectifTotal}}}}\\\hline}{}% \end{tabular} - \] -} - -\def\buildtabqt{% - \tabtoksa{\useKV[ClesStat]{Donnee}}\tabtoksb{\useKV[ClesStat]{Effectif}}% - \foreachitem\compteur\in\ListeComplete{\expandafter\updatetoksq\compteur\nil}% - \[% - \begin{tabular}{|>{\columncolor{\useKV[ClesStat]{ColorTab}}}c|*{\number\numexpr\ListeCompletelen+1}{>{\centering\arraybackslash}p{\useKV[ClesStat]{Largeur}}|}}% - \hline% - \rowcolor{\useKV[ClesStat]{ColorTab}}\the\tabtoksa&Total\\\hline% - \the\tabtoksb&\num{\EffectifTotal}\\\hline% - \ifboolKV[ClesStat]{Frequence}{Fréquence (\%)\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\CalculFrequence{##1}}}&\ifboolKV[ClesStat]{TableauVide}{}{100}\\\hline}{}% - \ifboolKV[ClesStat]{Angle}{Angle (\si{\degree})\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\CalculAngle{##1}}}&\ifboolKV[ClesStat]{TableauVide}{}{360}\\\hline}{}% - \ifboolKV[ClesStat]{SemiAngle}{Angle (\si{\degree})\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\CalculSemiAngle{##1}}}&\ifboolKV[ClesStat]{TableauVide}{}{180}\\\hline}{}% - \ifboolKV[ClesStat]{ECC}{E.C.C.\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\CalculECC{##1}}}&\ifboolKV[ClesStat]{TableauVide}{}{\num{\EffectifTotal}}\\\hline}{}% + \else% + \ifnum\number\numexpr\useKV[ClesStat]{ColVide}=1% + \ifboolKV[ClesStat]{EffVide}{\useKV[ClesStat]{Effectif}\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen+1}}\do{&}}{\useKV[ClesStat]{Effectif}&\xintFor* ##1 in {\xintSeq {2}{\ListeCompletelen}}\do{&\ListeComplete[##1,2]}&\ifboolKV[ClesStat]{TotalVide}{}{\num{\EffectifTotal}}}\\\hline% + \ifboolKV[ClesStat]{Frequence}{Fréquence (\%)&\xintFor* ##1 in {\xintSeq {2}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{FreqVide}{}{\CalculFrequence{##1}}}}&\ifboolKV[ClesStat]{TotalVide}{}{\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{FreqVide}{}{100}}}\\\hline}{}% + \ifboolKV[ClesStat]{Angle}{Angle (\si{\degree})&\xintFor* ##1 in {\xintSeq {2}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{AngVide}{}{\CalculAngle{##1}}}}&\ifboolKV[ClesStat]{TotalVide}{}{\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{AngVide}{}{360}}}\\\hline}{}% + \ifboolKV[ClesStat]{SemiAngle}{Angle (\si{\degree})&\xintFor* ##1 in {\xintSeq {2}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{AngVide}{}{\CalculSemiAngle{##1}}}}&\ifboolKV[ClesStat]{TotalVide}{}{\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{AngVide}{}{180}}}\\\hline}{}% + \ifboolKV[ClesStat]{ECC}{E.C.C.&\xintFor* ##1 in {\xintSeq {2}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{ECCVide}{}{\CalculECC{##1}}}}&\ifboolKV[ClesStat]{TotalVide}{}{\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{ECCVide}{}{\num{\EffectifTotal}}}}\\\hline}{}% + \end{tabular} + \else% + \ifnum\number\numexpr\useKV[ClesStat]{ColVide}=\ListeCompletelen% + \ifboolKV[ClesStat]{EffVide}{\useKV[ClesStat]{Effectif}\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen+1}}\do{&}}{\useKV[ClesStat]{Effectif}\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen-1}}\do{&\ListeComplete[##1,2]}&&\ifboolKV[ClesStat]{TotalVide}{}{\num{\EffectifTotal}}}\\\hline% + \ifboolKV[ClesStat]{Frequence}{Fréquence (\%)\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen-1}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{FreqVide}{}{\CalculFrequence{##1}}}}&&\ifboolKV[ClesStat]{TotalVide}{}{\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{FreqVide}{}{100}}}\\\hline}{}% + \ifboolKV[ClesStat]{Angle}{Angle (\si{\degree})\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen-1}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{AngVide}{}{\CalculAngle{##1}}}}&&\ifboolKV[ClesStat]{TotalVide}{}{\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{AngVide}{}{360}}}\\\hline}{}% + \ifboolKV[ClesStat]{SemiAngle}{Angle (\si{\degree})\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen-1}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{AngVide}{}{\CalculSemiAngle{##1}}}}&&\ifboolKV[ClesStat]{TotalVide}{}{\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{AngVide}{}{180}}}\\\hline}{}% + \ifboolKV[ClesStat]{ECC}{E.C.C.\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen-1}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{ECCVide}{}{\CalculECC{##1}}}}&&\ifboolKV[ClesStat]{TotalVide}{}{\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{ECCVide}{}{\num{\EffectifTotal}}}}\\\hline}{}% + \end{tabular} + \else% + \ifboolKV[ClesStat]{EffVide}{\useKV[ClesStat]{Effectif}\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen+1}}\do{&}}{\useKV[ClesStat]{Effectif}\xintFor* ##1 in {\xintSeq {1}{\number\numexpr\useKV[ClesStat]{ColVide}-1}}\do{&\ListeComplete[##1,2]}&\xintFor* ##1 in {\xintSeq {\number\numexpr\useKV[ClesStat]{ColVide}+1}{\ListeCompletelen}}\do{&\ListeComplete[##1,2]}&\ifboolKV[ClesStat]{TotalVide}{}{\num{\EffectifTotal}}}\\\hline% + \ifboolKV[ClesStat]{Frequence}{Fréquence (\%)\xintFor* ##1 in {\xintSeq {1}{\number\numexpr\useKV[ClesStat]{ColVide}-1}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{FreqVide}{}{\CalculFrequence{##1}}}}&\xintFor* ##1 in {\xintSeq {\number\numexpr\useKV[ClesStat]{ColVide}+1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{FreqVide}{}{\CalculFrequence{##1}}}}&\ifboolKV[ClesStat]{TotalVide}{}{\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{FreqVide}{}{100}}}\\\hline}{}% + \ifboolKV[ClesStat]{Angle}{Angle (\si{\degree})\xintFor* ##1 in {\xintSeq {1}{\number\numexpr\useKV[ClesStat]{ColVide}-1}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{AngVide}{}{\CalculAngle{##1}}}}&\xintFor* ##1 in {\xintSeq {\number\numexpr\useKV[ClesStat]{ColVide}+1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{AngVide}{}{\CalculAngle{##1}}}}&\ifboolKV[ClesStat]{TotalVide}{}{\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{AngVide}{}{360}}}\\\hline}{}% + \ifboolKV[ClesStat]{SemiAngle}{Angle (\si{\degree})\xintFor* ##1 in {\xintSeq {1}{\number\numexpr\useKV[ClesStat]{ColVide}-1}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{AngVide}{}{\CalculSemiAngle{##1}}}}&\xintFor* ##1 in {\xintSeq {\number\numexpr\useKV[ClesStat]{ColVide}+1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{AngVide}{}{\CalculSemiAngle{##1}}}}&\ifboolKV[ClesStat]{TotalVide}{}{\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{AngVide}{}{180}}}\\\hline}{}% + \ifboolKV[ClesStat]{ECC}{E.C.C.\xintFor* ##1 in {\xintSeq {1}{\number\numexpr\useKV[ClesStat]{ColVide}-1}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{ECCVide}{}{\CalculECC{##1}}}}&\xintFor* ##1 in {\xintSeq {\number\numexpr\useKV[ClesStat]{ColVide}+1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{ECCVide}{}{\CalculECC{##1}}}}&\ifboolKV[ClesStat]{TotalVide}{}{\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{ECCVide}{}{\num{\EffectifTotal}}}}\\\hline}{}% \end{tabular} + \fi% + \fi% + \fi% + \fi% + \renewcommand{\arraystretch}{1}% \] } % Pour construire le diagramme en bâtons \def\Updatetoks#1/#2\nil{\addtotok\toklistepoint{(#1,#2),}} -\def\buildgraph{% - \newtoks\toklistepoint +\newcommand\buildgraph[1][]{% + \newtoks\toklistepoint \foreachitem\compteur\in\ListeComplete{\expandafter\Updatetoks\compteur\nil}% - \[\MPStat{\useKV[ClesStat]{Unitex}}{\useKV[ClesStat]{Unitey}}{\the\toklistepoint}{\useKV[ClesStat]{Donnee}}{\useKV[ClesStat]{Effectif}}{\useKV[ClesStat]{Origine}}\]% + \[\MPStat[#1]{\useKV[ClesStat]{Unitex}}{\useKV[ClesStat]{Unitey}}{\the\toklistepoint}{\useKV[ClesStat]{Donnee}}{\useKV[ClesStat]{Effectif}}{\useKV[ClesStat]{Origine}}{\useKV[ClesStat]{AbscisseRotation}}\]% }% % Pour construire le diagramme en bâtons qualitatif \def\Updatetoksq#1/#2\nil{\addtotok\toklistepointq{"#1",#2,}} -\def\buildgraphq{% +\newcommand\buildgraphq[1][]{% \newtoks\toklistepointq - \toklistepointq{} \foreachitem\compteur\in\ListeComplete{\expandafter\Updatetoksq\compteur\nil} - \[\MPStatQ{2*\useKV[ClesStat]{Unitex}}{0.5*\useKV[ClesStat]{Unitey}}{\the\toklistepointq}{\useKV[ClesStat]{Donnee}}{\useKV[ClesStat]{Effectif}}{\useKV[ClesStat]{Origine}}\] + \[\MPStatQ[#1]{2*\useKV[ClesStat]{Unitex}}{0.5*\useKV[ClesStat]{Unitey}}{\the\toklistepointq}{\useKV[ClesStat]{Donnee}}{\useKV[ClesStat]{Effectif}}{\useKV[ClesStat]{Origine}}{\useKV[ClesStat]{AbscisseRotation}}\] } + +\def\UpdateCoul#1\nil{\addtotok\toklistecouleur{#1,}}% + % Pour construire le diagramme circulaire qualitatif \def\buildgraphcq#1{% \newtoks\toklistepointq% \toklistepointq{}% + \newtoks\toklistecouleur% + \toklistecouleur{}% + % \foreachitem\compteur\in\ListeComplete{\expandafter\Updatetoksq\compteur\nil}% + \xdef\ListeAvantCouleurs{\useKV[ClesStat]{ListeCouleurs}}% + \readlist*\ListeCouleur{\ListeAvantCouleurs}% + \foreachitem\couleur\in\ListeCouleur{\expandafter\UpdateCoul\couleur\nil}% \ifboolKV[ClesStat]{AffichageAngle}{% - \[\MPStatCirculaireQ{\useKV[ClesStat]{Rayon}}{\the\toklistepointq}{#1}{1}\]% + \ifboolKV[ClesStat]{Hachures}{% + \ifboolKV[ClesStat]{Inverse}{% + \[\MPStatCirculaireQ{\useKV[ClesStat]{Rayon}}{\the\toklistepointq}{#1}{1}{\the\toklistecouleur}{1}{1}\]% + }{% + \[\MPStatCirculaireQ{\useKV[ClesStat]{Rayon}}{\the\toklistepointq}{#1}{1}{\the\toklistecouleur}{1}{0}\]% + }% + }{% + \ifboolKV[ClesStat]{Inverse}{% + \[\MPStatCirculaireQ{\useKV[ClesStat]{Rayon}}{\the\toklistepointq}{#1}{1}{\the\toklistecouleur}{0}{1}\]% + }{% + \[\MPStatCirculaireQ{\useKV[ClesStat]{Rayon}}{\the\toklistepointq}{#1}{1}{\the\toklistecouleur}{0}{0}\]% + }% + }% }{% - \[\MPStatCirculaireQ{\useKV[ClesStat]{Rayon}}{\the\toklistepointq}{#1}{0}\]% + \ifboolKV[ClesStat]{Hachures}{% + \ifboolKV[ClesStat]{Inverse}{% + \[\MPStatCirculaireQ{\useKV[ClesStat]{Rayon}}{\the\toklistepointq}{#1}{0}{\the\toklistecouleur}{1}{1}\]% + }{% + \[\MPStatCirculaireQ{\useKV[ClesStat]{Rayon}}{\the\toklistepointq}{#1}{0}{\the\toklistecouleur}{1}{0}\]% + }% + }{% + \ifboolKV[ClesStat]{Inverse}{% + \[\MPStatCirculaireQ{\useKV[ClesStat]{Rayon}}{\the\toklistepointq}{#1}{0}{\the\toklistecouleur}{0}{1}\]% + }{% + \[\MPStatCirculaireQ{\useKV[ClesStat]{Rayon}}{\the\toklistepointq}{#1}{0}{\the\toklistecouleur}{0}{0}\]% + }% + }% }% }% @@ -5767,92 +6226,103 @@ vardef Positions(expr Step)= \num{\TotalECC}% } -% la construction du graphique -\def\MPStat#1#2#3#4#5#6{% +% la construction du graphique en bâtons pour quantitatif +\newcommand\MPStat[8][]{% \ifluatex \mplibforcehmode \begin{mplibcode} maxx:=0; maxy:=0; - unitex:=#1*cm; - unitey:=#2*cm; + unitex:=#2*cm; + unitey:=#3*cm; pair A[],B[],P[]; n:=0; vardef toto(text t)= for p_=t: if pair p_: n:=n+1; - P[n]=((xpart(p_)-(#6))*unitex,ypart(p_)*unitey); + P[n]=((xpart(p_)-(#7))*unitex,ypart(p_)*unitey); if xpart(p_)>maxx: - maxx:=xpart(p_)-(#6); + maxx:=xpart(p_)-(#7); fi; if ypart(p_)>maxy: maxy:=ypart(p_); fi; - A[n]=unitex*(xpart(p_)-(#6),0); + A[n]=unitex*(xpart(p_)-(#7),0); B[n]=unitey*(0,ypart(p_)); + if (#8): + label.bot(TEX("\num{"&decimal(xpart(p_))&"}") rotated 90,A[n]); + else : label.bot(TEX("\num{"&decimal(xpart(p_))&"}"),A[n]); + fi; label.lft(TEX("\num{"&decimal(ypart(p_))&"}"),B[n]); fi; endfor; enddef; - toto(#3); + toto(#4); for k=1 upto n: draw A[k]--P[k] withpen pencircle scaled 2bp; draw B[k]--P[k] dashed evenly; endfor; drawarrow (0,0)--unitex*(maxx+1,0); drawarrow (0,0)--unitey*(0,maxy+1); - label.lrt(btex #4 etex,unitex*(maxx+1,0)); - label.urt(btex #5 etex,unitey*(0,maxy+1)); + label.lrt(btex #5 etex,unitex*(maxx+1,0)); + label.urt(btex #6 etex,unitey*(0,maxy+1)); \end{mplibcode} \else + \mpxcommands{% + \setKV[ClesStat]{#1}% + } \begin{mpost} maxx:=0; maxy:=0; - unitex:=#1*cm; - unitey:=#2*cm; + unitex:=#2*cm; + unitey:=#3*cm; pair A[],B[],P[]; n:=0; vardef toto(text t)= for p_=t: if pair p_: n:=n+1; - P[n]=((xpart(p_)-(#6))*unitex,ypart(p_)*unitey); + P[n]=((xpart(p_)-(#7))*unitex,ypart(p_)*unitey); if xpart(p_)>maxx: - maxx:=xpart(p_)-(#6); + maxx:=xpart(p_)-(#7); fi; if ypart(p_)>maxy: maxy:=ypart(p_); fi; - A[n]=unitex*(xpart(p_)-(#6),0); + A[n]=unitex*(xpart(p_)-(#7),0); B[n]=unitey*(0,ypart(p_)); + if (#8): + label.bot(LATEX("\num{"&decimal(xpart(p_))&"}") rotated 90,A[n]); + else : label.bot(LATEX("\num{"&decimal(xpart(p_))&"}"),A[n]); + fi; label.lft(LATEX("\num{"&decimal(ypart(p_))&"}"),B[n]); fi; endfor; enddef; - toto(#3); + toto(#4); for k=1 upto n: draw A[k]--P[k] withpen pencircle scaled 2bp; draw B[k]--P[k] dashed evenly; endfor; drawarrow (0,0)--unitex*(maxx+1,0); drawarrow (0,0)--unitey*(0,maxy+1); - label.lrt(btex #4 etex,unitex*(maxx+1,0)); - label.urt(btex #5 etex,unitey*(0,maxy+1)); + label.lrt(\btex \useKV[ClesStat]{Donnee} etex,unitex*(maxx+1,0)); + label.urt(\btex \useKV[ClesStat]{Effectif} etex,unitey*(0,maxy+1)); \end{mpost} \fi } -% la construction du graphique qualitatif -\def\MPStatQ#1#2#3#4#5#6{% +% la construction du graphique en bâtons pour qualitatif +\newcommand\MPStatQ[8][]{% \ifluatex \mplibforcehmode \begin{mplibcode} maxy:=0; - unitex:=#1*cm; - unitey:=#2*cm; + unitex:=#2*cm; + unitey:=#3*cm; pair A[],B[],P[]; n:=0; vardef toto(text t)= @@ -5867,25 +6337,32 @@ vardef Positions(expr Step)= n:=n+1; else: A[n]=unitex*(n+1,0); + if (#8): label.bot(TEX(p_) rotated 90,A[n]); + else : + label.bot(TEX(p_),A[n]); + fi; fi; endfor; enddef; - toto(#3); + toto(#4); for k=0 upto n-1: draw A[k]--P[k] withpen pencircle scaled 2bp; draw B[k]--P[k] dashed evenly; endfor; drawarrow (0,0)--unitex*(n+1,0); drawarrow (0,0)--unitey*(0,maxy+1); - label.lrt(btex #4 etex,unitex*(n+1,0)); - label.urt(btex #5 etex,unitey*(0,maxy+1)); + label.lrt(btex #5 etex,unitex*(n+1,0)); + label.urt(btex #6 etex,unitey*(0,maxy+1)); \end{mplibcode} \else + \mpxcommands{% + \setKV[ClesStat]{#1}% + } \begin{mpost} maxy:=0; - unitex:=#1*cm; - unitey:=#2*cm; + unitex:=#2*cm; + unitey:=#3*cm; pair A[],B[],P[]; n:=0; vardef toto(text t)= @@ -5900,25 +6377,29 @@ vardef Positions(expr Step)= n:=n+1; else: A[n]=unitex*(n+1,0); + if (#8): label.bot(LATEX(p_) rotated 90,A[n]); + else : + label.bot(LATEX(p_),A[n]); + fi; fi; endfor; enddef; - toto(#3); + toto(#4); for k=0 upto n-1: draw A[k]--P[k] withpen pencircle scaled 2bp; draw B[k]--P[k] dashed evenly; endfor; drawarrow (0,0)--unitex*(n+1,0); drawarrow (0,0)--unitey*(0,maxy+1); - label.lrt(btex #4 etex,unitex*(n+1,0)); - label.urt(btex #5 etex,unitey*(0,maxy+1)); + label.lrt(\btex \useKV[ClesStat]{Donnee} etex,unitex*(n+1,0)); + label.urt(\btex \useKV[ClesStat]{Effectif} etex,unitey*(0,maxy+1)); \end{mpost} \fi } % la construction du graphique qualitatif -\def\MPStatCirculaireQ#1#2#3#4{% +\def\MPStatCirculaireQ#1#2#3#4#5#6#7{% \ifluatex \mplibforcehmode \begin{mplibcode} @@ -5930,13 +6411,20 @@ vardef Positions(expr Step)= ang[0]:=0; path cc; cc=(fullcircle scaled (2*#1)); - if #3=360: - draw cc; + % on récupère les couleurs + color Col[]; + n:=0; + for p_=#5: + n:=n+1; + Col[n]=p_; + endfor; + if #7=0: + A[0]=point(0) of cc; else: - draw (subpath(0,length cc/2) of cc)--cycle; + A[0]=point(180) of cc; fi; - A[0]=point(0) of cc; vardef toto(text t)= + n:=0; for p_=t: if numeric p_: n:=n+1; @@ -5951,28 +6439,65 @@ vardef Positions(expr Step)= for p_=t: if numeric p_: n:=n+1; + if #7=0: A[n]=A[n-1] rotatedabout(O,p_*(#3/total[N])); - draw A[n-1]--O--A[n]; + else: + A[n]=A[n-1] rotatedabout(O,-p_*(#3/total[N])); + fi; + %hachure ou pas ? + if #6=0: + fill (O--if #7=0:arccercle(A[n-1],A[n],O) else: + arccercle(A[n],A[n-1],O) fi--cycle) withcolor if unknown Col[n]: white else:Col[n] fi; + else: + draw + hachurage((O--if #7=0:arccercle(A[n-1],A[n],O) + else:arccercle(A[n],A[n-1],O) fi--cycle),p_*(#3/total[N]) if + (n mod 2)=0: +90 else: -90 fi,0.25,if (n mod 2)=0 : 0 else: 1 fi) + if #4=1: withcolor 0.5white fi; + fi; + draw A[n-1]--O--A[n] if #6=1: withpen pencircle scaled2 fi; % Affichage des angles associés if #4=1: if round(p_*(#3/total[N]))>15: if (n mod 2)=0: - marque_a:=0.9*20 + marque_a:=3.1*20 else: - marque_a:=1.1*20/0.9 + marque_a:=3.1*20/0.9 + fi; + if #6=1: + if #7=0: + undraw + Codeangle(A[n-1],O,A[n],0,(((TEX("\ang{"&decimal(round(p_*(#3/total[N])))&"}"))))); + else: + undraw + Codeangle(A[n],O,A[n-1],0,(((TEX("\ang{"&decimal(round(p_*(#3/total[N])))&"}"))))); + fi; + fill cercles(w shifted(marque_ang*unitvector(w-O)),3mm) withcolor + blanc; + fi; + if #7=0: + draw + Codeangle(A[n-1],O,A[n],0,(((TEX("\ang{"&decimal(round(p_*(#3/total[N])))&"}"))))); + else: + draw + Codeangle(A[n],O,A[n-1],0,(((TEX("\ang{"&decimal(round(p_*(#3/total[N])))&"}"))))); fi; - draw Codeangle(A[n-1],O,A[n],0,(((TEX("\ang{"&decimal(round(p_*(#3/total[N])))&"}")) scaled 0.5))); fi; fi; % fi; endfor; + if #3=360: + draw cc if #6=1: withpen pencircle scaled2 fi; + else: + draw (subpath(0,length cc/2) of cc)--cycle if #6=1: withpen pencircle scaled2 fi;; + fi; n:=0; path cd[]; for p_=t: if string p_: n:=n+1; - C[n]=A[n-1] rotatedabout(O,(ang[n]-ang[n-1])/2); + C[n]=A[n-1] rotatedabout(O,if #7=1:-1* fi(ang[n]-ang[n-1])/2); draw 0.95[O,C[n]]--1.05[O,C[n]]; C[n]:=1.05[O,C[n]]; if (xpart(C[n])>xpart(O)) and (ypart(C[n])>ypart(O)): @@ -6002,7 +6527,7 @@ vardef Positions(expr Step)= toto(#2); \end{mplibcode} \else - \begin{mpost}[mpsettings={input PfC-Geometrie;}] + \begin{mpost}%[mpsettings={input PfC-Geometrie;}] pair A[],O,B[],C[],D[]; O=(0,0); n:=0; @@ -6011,13 +6536,20 @@ vardef Positions(expr Step)= ang[0]:=0; path cc; cc=(fullcircle scaled (2*#1)); - if #3=360: - draw cc; + % on récupère les couleurs + color Col[]; + n:=0; + for p_=#5: + n:=n+1; + Col[n]=p_; + endfor; + if #7=0: + A[0]=point(0) of cc; else: - draw (subpath(0,length cc/2) of cc)--cycle; + A[0]=point(180) of cc; fi; - A[0]=point(0) of cc; vardef toto(text t)= + n:=0; for p_=t: if numeric p_: n:=n+1; @@ -6032,28 +6564,65 @@ vardef Positions(expr Step)= for p_=t: if numeric p_: n:=n+1; + if #7=0: A[n]=A[n-1] rotatedabout(O,p_*(#3/total[N])); - draw A[n-1]--O--A[n]; + else: + A[n]=A[n-1] rotatedabout(O,-p_*(#3/total[N])); + fi; + %hachure ou pas ? + if #6=0: + fill (O--if #7=0:arccercle(A[n-1],A[n],O) else: + arccercle(A[n],A[n-1],O) fi--cycle) withcolor if unknown Col[n]: white else:Col[n] fi; + else: + draw + hachurage((O--if #7=0:arccercle(A[n-1],A[n],O) + else:arccercle(A[n],A[n-1],O) fi--cycle),p_*(#3/total[N]) if + (n mod 2)=0: +90 else: -90 fi,0.25,if (n mod 2)=0 : 0 else: 1 fi) + if #4=1: withcolor 0.5white fi; + fi; + draw A[n-1]--O--A[n] if #6=1: withpen pencircle scaled2 fi; % Affichage des angles associés if #4=1: if round(p_*(#3/total[N]))>15: if (n mod 2)=0: - marque_a:=0.9*20 + marque_a:=3.1*20 else: - marque_a:=1.1*20/0.9 + marque_a:=3.1*20/0.9 + fi; + if #6=1: + if #7=0: + undraw + Codeangle(A[n-1],O,A[n],0,(((LATEX("\ang{"&decimal(round(p_*(#3/total[N])))&"}"))))); + else: + undraw + Codeangle(A[n],O,A[n-1],0,(((LATEX("\ang{"&decimal(round(p_*(#3/total[N])))&"}"))))); + fi; + fill cercles(w shifted(marque_ang*unitvector(w-O)),3mm) withcolor + blanc; + fi; + if #7=0: + draw + Codeangle(A[n-1],O,A[n],0,(((LATEX("\ang{"&decimal(round(p_*(#3/total[N])))&"}"))))); + else: + draw + Codeangle(A[n],O,A[n-1],0,(((LATEX("\ang{"&decimal(round(p_*(#3/total[N])))&"}"))))); fi; - draw Codeangle(A[n-1],O,A[n],0,(((LATEX("\ang{"&decimal(round(p_*(#3/total[N])))&"}")) scaled 0.5))); fi; fi; % fi; endfor; + if #3=360: + draw cc if #6=1: withpen pencircle scaled2 fi; + else: + draw (subpath(0,length cc/2) of cc)--cycle if #6=1: withpen pencircle scaled2 fi;; + fi; n:=0; path cd[]; for p_=t: if string p_: n:=n+1; - C[n]=A[n-1] rotatedabout(O,(ang[n]-ang[n-1])/2); + C[n]=A[n-1] rotatedabout(O,if #7=1:-1* fi(ang[n]-ang[n-1])/2); draw 0.95[O,C[n]]--1.05[O,C[n]]; C[n]:=1.05[O,C[n]]; if (xpart(C[n])>xpart(O)) and (ypart(C[n])>ypart(O)): @@ -6089,8 +6658,16 @@ vardef Positions(expr Step)= \DTLgnewdb{mtdb}% \dtlexpandnewvalue% \newcount\nbdonnees% - - +% +\def\AjoutListEEaa#1\nil{\addtotok\tabtoksEEa{#1,}}% +\def\AjoutListEEab#1\nil{\addtotok\tabtoksEEa{#1/}}% +\def\AjoutListEEb#1\nil{\addtotok\tabtoksEEb{#1,}}% +\def\AjoutListEEx#1\nil{\addtotok\tabtoksEE{#1,}}% +\def\AjoutListEEy#1\nil{\addtotok\tabtoksEE{#1/}}% + +\DTLgnewdb{mtdbEE}% +\DTLgnewdb{mtdbEEqual}% +% \newcommand\Stat[2][]{% \useKVdefault[ClesStat]% \setKV[ClesStat]{#1}% @@ -6104,11 +6681,89 @@ vardef Positions(expr Step)= }% \readlist*\ListeComplete{\foo}% \setKV[ClesStat]{Qualitatif}% + }{ + \ifboolKV[ClesStat]{Sondage}{% + \setsepchar{,}\ignoreemptyitems% + \readlist*\Liste{#2}% + % "liste vide" + \newtoks\tabtoksEEa% + \tabtoksEEa{}% + % + % "liste vide" + \newtoks\tabtoksEEb% + \tabtoksEEb{}% + % + \readlist*\ListeSansDoublonsEE{999}% %% Pour ne pas avoir une liste vide + % + \newcount\cmptEE% + \newcount\PasNumEE% %% Permettra de savoir si ce sondage est qualitatif ou quantitatif + \PasNumEE=0\relax% + \DTLcleardb{mtdbEE}% + % on range les resultats du sondage par ordre croissant. + \foreachitem\x\in\Liste{% + \DTLnewrow{mtdbEE}% + \DTLnewdbentry{mtdbEE}{Numeric}{\x}% + }% + \dtlsort{Numeric}{mtdbEE}{\dtlicompare}% + \DTLforeach{mtdbEE}{\nba=Numeric}{% + \IfDecimal{\nba}{}{\PasNumEE=\numexpr\PasNumEE+1\relax}% + \cmptEE=0\relax% + \foreachitem\nbb\in\ListeSansDoublonsEE{% + \ifthenelse{\equal{\nba}{\nbb}}{\cmptEE=\numexpr\cmptEE+1\relax}{}% + }% + \ifthenelse{\equal{\the\cmptEE}{0}}{% + \expandafter\AjoutListEEb\nba\nil% + \xdef\listEEa{\the\tabtoksEEb}% + \ignoreemptyitems% + \setsepchar{,}% + \readlist*\ListeSansDoublonsEE\listEEa% %%% Enlève tous les élements + %%% identiques de Liste + }{}% + }% + \foreachitem\nba\in\ListeSansDoublonsEE{% + \cmptEE=0\relax% + \DTLforeach{mtdbEE}{\nbb=Numeric}{% + \ifthenelse{\equal{\nba}{\nbb}}{\cmptEE=\numexpr\cmptEE+1\relax}{}% + }% + \expandafter\AjoutListEEab\nba\nil% + \expandafter\AjoutListEEaa\the\cmptEE\nil% %%% Compte tous les élements + %%% identiques de Liste + }% + \xdef\listEEb{\the\tabtoksEEa} + \ignoreemptyitems% + \setsepchar[*]{,*/} + \readlist*\ListeComplete\listEEb% + % + \ifthenelse{\equal{\the\PasNumEE}{0}}{\setKV[ClesStat]{Quantitatif}}{\setKV[ClesStat]{Qualitatif}}% }{% + \ifboolKV[ClesStat]{Qualitatif}{% % % on lit la liste écrite sous la forme valeur/effectif \setsepchar[*]{,*/}\ignoreemptyitems% \readlist*\ListeComplete{#2}% - } + }{% Dans le qualitatif, on trie d'abord les valeurs. + \setsepchar[*]{,*/}\ignoreemptyitems% + \readlist*\ListeInitiale{#2}% +% "liste vide" + \newtoks\tabtoksEE% + \tabtoksEE{}% + \DTLcleardb{mtdbEEqual}% + \foreachitem\x\in\ListeInitiale{% + \DTLnewrow{mtdbEEqual}% + \itemtomacro\ListeInitiale[\xcnt,1]\x% + \DTLnewdbentry{mtdbEEqual}{Val}{\x}% + \itemtomacro\ListeInitiale[\xcnt,2]\y% + \DTLnewdbentry{mtdbEEqual}{Eff}{\y}% + }% + \dtlsort{Val}{mtdbEEqual}{\dtlicompare}% + \DTLforeach{mtdbEEqual}{\Val=Val,\Eff=Eff}{% + \expandafter\AjoutListEEy\Val\nil% + \expandafter\AjoutListEEx\Eff\nil% + } + \xdef\listEE{\the\tabtoksEE} + \ignoreemptyitems% + \setsepchar[*]{,*/} + \readlist*\ListeComplete\listEE% + }}} % on crée la base de données des valeurs dans le cas qualitatif \DTLcleardb{mtdb}% % on les trie pour la médiane dans le cas qualitatif % Touhami / Texnique.fr @@ -6134,14 +6789,20 @@ vardef Positions(expr Step)= % %% celui de la somme des données \foreachitem\don\in\ListeComplete{\xdef\SommeDonnees{\fpeval{\SommeDonnees+\ListeComplete[\doncnt,2]}}}% % %% celui de l'effectif total - \xdef\EffectifTotal{\SommeDonnees}% \ifboolKV[ClesStat]{EffectifTotal}{% - L'effectif total est \num{\ListeCompletelen}.\par - }{} + \ifboolKV[ClesStat]{Liste}{L'effectif total de la série est + \num{\ListeCompletelen}.\par}{ + \foreachitem\don\in\ListeComplete{\xdef\EffectifTotal{\fpeval{\EffectifTotal+\ListeComplete[\doncnt,2]}}}% + L'effectif total de la série est : \[\ListeComplete[1,2]\xintFor* ##1 in + {\xintSeq {2}{\ListeCompletelen}}\do{% + +\ListeComplete[##1,2]}=\num{\EffectifTotal}\]} + }{}% + \xdef\EffectifTotal{\SommeDonnees}% % %% celui de la moyenne - \xdef\Moyenne{\fpeval{\SommeDonnees/\ListeCompletelen}}% + \xdef\Moyenne{\fpeval{\SommeDonnees/\ListeCompletelen}}% \ifboolKV[ClesStat]{Moyenne}{% - La somme des données est :% + \ifboolKV[ClesStat]{Liste}{% + La somme des données de la série est :% \xintifboolexpr{\ListeCompletelen<\useKV[ClesStat]{Coupure}}{% \[ \num{\ListeComplete[1,2]}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}\xintFor* ##1 in {\xintSeq {2}{\ListeCompletelen}}\do{% @@ -6155,15 +6816,15 @@ vardef Positions(expr Step)= }=\num{\SommeDonnees}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}% \]% }% - \ifboolKV[ClesStat]{SET}{}{L'effectif total est \num{\ListeCompletelen}.\\}% - Donc la moyenne est égale à :% + \ifboolKV[ClesStat]{SET}{}{Le nombre de données de la série est \num{\ListeCompletelen}.\\}% + Donc la moyenne de la série est égale à :% \[\frac{\num{\SommeDonnees}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}}{\num{\ListeCompletelen}}%\IfInteger{\fpeval{round(\fpeval{\SommeDonnees/\ListeCompletelen},\useKV[ClesStat]{Precision})}}{=}{\approx} \opdiv*{\SommeDonnees}{\ListeCompletelen}{resultatmoy}{restemoy}% \opround{resultatmoy}{\useKV[ClesStat]{Precision}}{resultatmoy1}% \opcmp{resultatmoy}{resultatmoy1}\ifopeq=\else\approx\fi% \num{\fpeval{round(\fpeval{\SommeDonnees/\ListeCompletelen},\useKV[ClesStat]{Precision})}}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}.}{.}% \]% - }{}% + }{Pas de moyenne possible pour une série de données à caractère qualitatif.}}{}% % % %% celui de l'étendue \xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{% \xintifboolexpr{\ListeComplete[##1,2]>\DonneeMax}{% @@ -6175,11 +6836,12 @@ vardef Positions(expr Step)= }% \xdef\EffectifMax{\DonneeMax}% \xdef\Etendue{\fpeval{\DonneeMax-\DonneeMin}}% - \ifboolKV[ClesStat]{Etendue}{L'étendue est égale à $\num{\DonneeMax}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}-\num{\DonneeMin}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}=\num{\Etendue}$\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.}% - }{}% + \ifboolKV[ClesStat]{Etendue}{% + \ifboolKV[ClesStat]{Liste}{% + L'étendue de la série est égale à $\num{\DonneeMax}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}-\num{\DonneeMin}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}=\num{\Etendue}$\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.}% + }{Pas d'étendue possible pour une série de données à caractère qualitatif.}}{}% \ifboolKV[ClesStat]{Mediane}{% - %%%%%%%%%%%%%%%%%%%%%%%% - + \ifboolKV[ClesStat]{Liste}{% On range les données par ordre croissant :% \nbdonnees=0% \xintifboolexpr{\ListeCompletelen<\useKV[ClesStat]{Coupure}}{% @@ -6198,35 +6860,38 @@ vardef Positions(expr Step)= \newcount\meda% \ifodd\number\ListeCompletelen%odd impair \med=\fpeval{(\ListeCompletelen+1)/2}\relax% - L'effectif total est \num{\ListeCompletelen}. Or, $\num{\ListeCompletelen}=\num{\fpeval{\med-1}}+1+\num{\fpeval{\med-1}}$.\\ + L'effectif total de la série est \num{\ListeCompletelen}. Or, $\num{\ListeCompletelen}=\num{\fpeval{\med-1}}+1+\num{\fpeval{\med-1}}$.\\ \else% pair \med=\fpeval{\ListeCompletelen/2}\relax \meda=\numexpr\med+1\relax - L'effectif total est \num{\ListeCompletelen}. Or, $\num{\ListeCompletelen}=\num{\the\med}+\num{\the\med}$.\\ + L'effectif total de la série est \num{\ListeCompletelen}. Or, $\num{\ListeCompletelen}=\num{\the\med}+\num{\the\med}$.\\ \fi% \newcount\k% \k=0% \DTLforeach{mtdb}{\numeroDonnee=Numeric}{\k=\numexpr\k+1\relax% \ifnum\k=\med %La médiane vaut \numeroDonnee\fi \ifodd\number\ListeCompletelen% - La médiane est la \the\med\ieme{} donnée.\\Donc la médiane est \num{\numeroDonnee}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.}% + La médiane de la série est la \the\med\ieme{} donnée.\\Donc la médiane de la série est \num{\numeroDonnee}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.}% \else% La \the\med\ieme{} donnée est \num{\numeroDonnee}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.}\xdef\Mediane{\numeroDonnee} % \fi \fi \ifnum\k=\meda - La \the\meda\ieme{} donnée est \num{\numeroDonnee}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.} Donc la médiane est \xdef\Mediane{\fpeval{(\Mediane+\numeroDonnee)/2}}\num{\Mediane}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.} + La \the\meda\ieme{} donnée est \num{\numeroDonnee}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.} Donc la médiane de la série est \xdef\Mediane{\fpeval{(\Mediane+\numeroDonnee)/2}}\num{\Mediane}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.} \fi } %%%%%%%%%%%%%%%%%%%%%%%% - }{} - % construction du tableau - \ifboolKV[ClesStat]{Tableau}{\ifboolKV[ClesStat]{Total}{\buildtabqt}{\buildtabq}}{} - % Construction du graphique ?? + }{Pas de médiane possible pour une série de données à caractère qualitatif.}}{} + % Construction du tableau + \ifboolKV[ClesStat]{Tableau}{% + \ifboolKV[ClesStat]{Liste}{Pas de tableau possible avec la clé Liste.\\Utilisez plutôt la clé Sondage si vous voulez un tableau avec cette liste.}{% + \ifboolKV[ClesStat]{Total}{\buildtabt}{\buildtab}}}% + {}% + % Construction du graphique \ifboolKV[ClesStat]{Graphique}{% - \ifboolKV[ClesStat]{Angle}{\buildgraphcq{360}}{\ifboolKV[ClesStat]{SemiAngle}{\buildgraphcq{180}}{}} - \ifboolKV[ClesStat]{Batons}{\buildgraphq}{} - }{} + \ifboolKV[ClesStat]{Liste}{Pas de graphique possible avec la clé Liste.\\Utilisez plutôt la clé Sondage si vous voulez un graphique avec cette liste.}{% + \ifboolKV[ClesStat]{Angle}{\buildgraphcq{360}}{\ifboolKV[ClesStat]{SemiAngle}{\buildgraphcq{180}}{\buildgraphq[#1]}}% + }}{} }{%%%%%%%%%%%%%%%%%%%%%Début quantitatif % % on effectue les calculs % %% celui de la somme des données @@ -6247,12 +6912,12 @@ vardef Positions(expr Step)= % %% celui de la moyenne \xdef\Moyenne{\fpeval{\SommeDonnees/\EffectifTotal}}% \ifboolKV[ClesStat]{EffectifTotal}{% - L'effectif total est : \[\ListeComplete[1,2]\xintFor* ##1 in + L'effectif total de la série est : \[\ListeComplete[1,2]\xintFor* ##1 in {\xintSeq {2}{\ListeCompletelen}}\do{% +\ListeComplete[##1,2]}=\num{\EffectifTotal}\] }{}% \ifboolKV[ClesStat]{Moyenne}{% - La somme des données est :% + La somme des données de la série est :% \xintifboolexpr{\ListeCompletelen<\useKV[ClesStat]{Coupure}}{% \[ \ifnum\ListeComplete[1,2]=1\else\num{\ListeComplete[1,2]}\times\fi\num{\ListeComplete[1,1]}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}\xintFor* ##1 in {\xintSeq {2}{\ListeCompletelen}}\do{% @@ -6268,7 +6933,7 @@ vardef Positions(expr Step)= }=\num{\SommeDonnees}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{} \] } - \ifboolKV[ClesStat]{SET}{}{L'effectif total est :% + \ifboolKV[ClesStat]{SET}{}{L'effectif total de la série est :% \ifboolKV[ClesStat]{Liste}{ \num{\EffectifTotal}\\}{% \[\num{\ListeComplete[1,2]}\xintFor* ##1 in {\xintSeq {2}{\ListeCompletelen}}\do{% +\num{\ListeComplete[##1,2]} @@ -6276,7 +6941,7 @@ vardef Positions(expr Step)= \]% }% } - Donc la moyenne est égale à :% + Donc la moyenne de la série est égale à :% \[\frac{\num{\SommeDonnees}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}}{\num{\EffectifTotal}}% \opdiv*{\SommeDonnees}{\EffectifTotal}{resultatmoy}{restemoy}% \opround{resultatmoy}{\useKV[ClesStat]{Precision}}{resultatmoy1}% @@ -6287,7 +6952,7 @@ vardef Positions(expr Step)= }{}% % % Affichage des réponses. % %% pour l'étendue - \ifboolKV[ClesStat]{Etendue}{L'étendue est égale à $\num{\ListeComplete[\ListeCompletelen,1]}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}-\num{\ListeComplete[1,1]}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}=\num{\Etendue}$\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.}}{}% + \ifboolKV[ClesStat]{Etendue}{L'étendue de la série est égale à $\num{\ListeComplete[\ListeCompletelen,1]}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}-\num{\ListeComplete[1,1]}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}=\num{\Etendue}$\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.}}{}% % %% pour la médiane \ifboolKV[ClesStat]{Mediane}{% @@ -6295,11 +6960,11 @@ vardef Positions(expr Step)= \newcount\meda% \ifodd\number\EffectifTotal%odd impair \med=\fpeval{(\EffectifTotal+1)/2}\relax% - L'effectif total est \num{\EffectifTotal}. Or, $\num{\EffectifTotal}=\num{\fpeval{\med-1}}+1+\num{\fpeval{\med-1}}$. % + L'effectif total de la série est \num{\EffectifTotal}. Or, $\num{\EffectifTotal}=\num{\fpeval{\med-1}}+1+\num{\fpeval{\med-1}}$. % \else% pair \med=\fpeval{\EffectifTotal/2}\relax% \meda=\numexpr\med+1\relax% - L'effectif total est \num{\EffectifTotal}. Or, $\num{\EffectifTotal}=\num{\fpeval{\med}}+\num{\fpeval{\med}}$. % + L'effectif total de la série est \num{\EffectifTotal}. Or, $\num{\EffectifTotal}=\num{\fpeval{\med}}+\num{\fpeval{\med}}$. % \fi% \newcount\k% \k=0% @@ -6308,13 +6973,13 @@ vardef Positions(expr Step)= \k=\numexpr\k+1\relax% \ifnum\k=\med% \ifodd\number\EffectifTotal% - La médiane est la \the\med\ieme{} donnée. Donc la médiane est \num{\ListeComplete[##1,1]}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.}% + La médiane de la série est la \the\med\ieme{} donnée. Donc la médiane de la série est \num{\ListeComplete[##1,1]}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.}% \else% La \the\med\ieme{} donnée est \num{\ListeComplete[##1,1]}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}. }{. }\xdef\Mediane{\ListeComplete[##1,1]}% \fi% \fi% \ifnum\k=\meda% - La \the\meda\ieme{} valeur est \num{\ListeComplete[##1,1]}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.}\\Donc la médiane est \xdef\Mediane{\fpeval{(\Mediane+\ListeComplete[##1,1])/2}}\num{\Mediane}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.}% + La \the\meda\ieme{} valeur est \num{\ListeComplete[##1,1]}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.}\\Donc la médiane de la série est \xdef\Mediane{\fpeval{(\Mediane+\ListeComplete[##1,1])/2}}\num{\Mediane}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.}% \fi% }% }% @@ -6322,13 +6987,15 @@ vardef Positions(expr Step)= % Construction de tableau \ifboolKV[ClesStat]{Tableau}{\ifboolKV[ClesStat]{Total}{\buildtabt}{\buildtab}}{}% % Construction du graphique ?? - \ifboolKV[ClesStat]{Graphique}{\buildgraph}{}% + \ifboolKV[ClesStat]{Graphique}{% + \ifboolKV[ClesStat]{Angle}{\buildgraphcq{360}}{\ifboolKV[ClesStat]{SemiAngle}{\buildgraphcq{180}}{\buildgraph[#1]}} + }{}% }% }% -%%%%%%%%%%%%% -%%% Radar -%%%%%%%%%%%%% +%%% +% Radar +%%% \setKVdefault[ClesRadar]{Rayon=3cm,Reference=20,MoyenneClasse=false,Disciplines=false,Pas=5} \newtoks\toklisteradara%pour la moyenne de l'élève @@ -6359,12 +7026,17 @@ vardef Positions(expr Step)= p:=0; for p_=#2: p:=p+1; - if N[p]>180: - label(TEX(p_) - rotated(90+N[p]),1.15[O,pointarc(cc,N[p])]); - else: - label(TEX(p_) - rotated(-90+N[p]),1.15[O,pointarc(cc,N[p])]); + if (N[p]<90) or (N[p]=90): + label.urt(TEX(p_),1.025[O,pointarc(cc,N[p])]); + fi; + if ((N[p]>90) and (N[p]<180)) or (N[p]=180): + label.ulft(TEX(p_),1.025[O,pointarc(cc,N[p])]); + fi; + if (N[p]>180) and (N[p]<270): + label.llft(TEX(p_),1.025[O,pointarc(cc,N[p])]); + fi; + if (N[p]>270) or (N[p]=270): + label.lrt(TEX(p_),1.025[O,pointarc(cc,N[p])]); fi; endfor; % tracé des pas: @@ -6376,7 +7048,7 @@ vardef Positions(expr Step)= trace pointarc(cc,N[1]) for l=2 upto n: --pointarc(cc,N[l]) endfor --cycle; % etiquettage des pas - dotlabel.top(btex \tiny #4 etex rotated -90,pointarc(cc,0)); + dotlabel.urt(btex \tiny #4 etex,pointarc(cc,0)); dotlabel.urt(btex \tiny #3 etex,(1/pas)[O,pointarc(cc,0)]); % tracé des résultats élèves pair El[]; @@ -6414,12 +7086,17 @@ vardef Positions(expr Step)= p:=0; for p_=#2: p:=p+1; - if N[p]>180: - label(LATEX(p_) - rotated(90+N[p]),1.15[O,pointarc(cc,N[p])]); - else: - label(LATEX(p_) - rotated(-90+N[p]),1.15[O,pointarc(cc,N[p])]); + if (N[p]<90) or (N[p]=90): + label.urt(TEX(p_),1.025[O,pointarc(cc,N[p])]); + fi; + if ((N[p]>90) and (N[p]<180)) or (N[p]=180): + label.ulft(TEX(p_),1.025[O,pointarc(cc,N[p])]); + fi; + if (N[p]>180) and (N[p]<270): + label.llft(TEX(p_),1.025[O,pointarc(cc,N[p])]); + fi; + if (N[p]>270) or (N[p]=270): + label.lrt(TEX(p_),1.025[O,pointarc(cc,N[p])]); fi; endfor; % tracé des pas: @@ -6460,6 +7137,7 @@ vardef Positions(expr Step)= \useKVdefault[ClesRadar]% \setKV[ClesRadar]{#1}% \ignoreemptyitems% + \setsepchar[*]{,}% \readlist*\ListeRadar{#2}% \toklisteradara{}% \foreachitem\compteur\in\ListeRadar{\expandafter\UpdateRadara\compteur\nil}% @@ -6474,9 +7152,9 @@ vardef Positions(expr Step)= \MPRadar{\useKV[ClesRadar]{Rayon}}{\the\toklisteradarb}{\useKV[ClesRadar]{Pas}}{\useKV[ClesRadar]{Reference}}{\the\toklisteradara}{\the\toklisteradarc}% } -%%%%%%%%%%%% +%%% % Barres de niveaux -%%%%%%%%%%%% +%%% \setKVdefault[ClesBarre]{Niveau=false,LimiteI=25,LimiteF=50,LimiteS=75,TexteOrigine=0,TexteReference=100,CouleurGraduation=white,CouleurFond=gray!50,CouleurBarre=black,Graduation=false,Nom=Défaut,Pas=10,CouleurI=red,CouleurF=orange,CouleurS=yellow,CouleurM=green} \newlength{\barrewidth} @@ -6537,10 +7215,10 @@ vardef Positions(expr Step)= } } -%%%%%%%%%%%%%%% -%%% Equations -%%%%%%%%%%%%%%% -\setKVdefault[ClesEquation]{Ecart=0.5,Fleches=false,FlecheDiv=false,Laurent=false,Decomposition=false,Terme=false,Composition=false,Symbole=false,Entier=false,Lettre=x,Solution=false,Bloc=false,Simplification=false,CouleurTerme=black,CouleurCompo=black,CouleurSous=red,CouleurSymbole=orange,Verification=false,Nombre=0,Egalite=false,Produit=false,Facteurs=false,Carre=false,Pose=false,Equivalence=false} +%%% +% Equations +%%% +\setKVdefault[ClesEquation]{Ecart=0.5,Fleches=false,FlecheDiv=false,Laurent=false,Decomposition=false,Terme=false,Composition=false,Symbole=false,Entier=false,Lettre=x,Solution=false,LettreSol=true,Bloc=false,Simplification=false,CouleurTerme=black,CouleurCompo=black,CouleurSous=red,CouleurSymbole=orange,Verification=false,Nombre=0,Egalite=false,Produit=false,Facteurs=false,Carre=false,Exact=false,Pose=false,Equivalence=false} \newcommand\rightcomment[4]% {\begin{tikzpicture}[remember picture,overlay] @@ -6552,7 +7230,6 @@ vardef Positions(expr Step)= \end{tikzpicture}% } - \newcommand\leftcomment[4]% {\begin{tikzpicture}[remember picture,overlay] \draw[Cfleches,-stealth] @@ -6659,9 +7336,9 @@ vardef Positions(expr Step)= \definecolor{Cfleches}{RGB}{100,100,100}% -\input{PfC-EquationSoustraction1}% +\input{PfC-EquationSoustraction2}% \input{PfC-EquationTerme1}% -\input{PfC-EquationComposition1}% +\input{PfC-EquationComposition2}% \input{PfC-EquationPose1}% \input{PfC-EquationSymbole1}% \input{PfC-EquationLaurent1} @@ -6716,12 +7393,12 @@ vardef Positions(expr Step)= Comme \num{#2} est positif, alors l'équation $\useKV[ClesEquation]{Lettre}^2=\num{#2}$ a deux solutions :% \begin{align*} \useKV[ClesEquation]{Lettre}&=\sqrt{\num{#2}}&&\text{et}&\useKV[ClesEquation]{Lettre}&=-\sqrt{\num{#2}}%\\ - \ifboolKV[ClesEquation]{Entier}{\\% + \ifboolKV[ClesEquation]{Exact}{\\% \useKV[ClesEquation]{Lettre}&=\num{\fpeval{sqrt(#2)}}&&\text{et}&\useKV[ClesEquation]{Lettre}&=-\num{\fpeval{sqrt(#2)}}}{}% \end{align*} - } - } -} + }% + }% +}% \newcommand\ResolEquationProduit[5][]{% \setKV[ClesEquation]{#1}% @@ -6782,9 +7459,8 @@ vardef Positions(expr Step)= } \end{align*} }% - - \ifboolKV[ClesEquation]{Solution}{L'équation $\xintifboolexpr{#3=0}{\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}}{(\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}})}\xintifboolexpr{#5=0}{\times\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}}{(\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#5>0}{+\num{#5}}{-\num{\fpeval{0-#5}}})}=0$ a deux solutions : \opdiv*{\Coeffb}{\Coeffa}{solution}{resteequa}\opcmp{resteequa}{0}$\useKV[ClesEquation]{Lettre}=\displaystyle\ifopeq\opexport{solution}{\solution}\num{\solution}\else\ifboolKV[ClesEquation]{Entier}{\SSimplifie{\Coeffb}{\Coeffa}}{\frac{\num{\Coeffb}}{\num{\Coeffa}}}\fi$ et \opdiv*{\Coeffd}{\Coeffc}{solution}{resteequa}\opcmp{resteequa}{0}$\useKV[ClesEquation]{Lettre}=\displaystyle\ifopeq\opexport{solution}{\solution}\num{\solution}\else\ifboolKV[ClesEquation]{Entier}{\SSimplifie{\Coeffd}{\Coeffc}}{\frac{\num{\Coeffd}}{\num{\Coeffc}}}\fi$. - }{} + \ifboolKV[ClesEquation]{Solution}{L'équation $\xintifboolexpr{#3=0}{\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}}{(\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}})}\xintifboolexpr{#5=0}{\times\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}}{(\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#5>0}{+\num{#5}}{-\num{\fpeval{0-#5}}})}=0$ a deux solutions : \opdiv*{\Coeffb}{\Coeffa}{solution}{resteequa}\opcmp{resteequa}{0}$\ifboolKV[ClesEquation]{LettreSol}{\useKV[ClesEquation]{Lettre}=}{}\displaystyle\ifopeq\opexport{solution}{\solution}\num{\solution}\else\ifboolKV[ClesEquation]{Entier}{\SSimplifie{\Coeffb}{\Coeffa}}{\frac{\num{\Coeffb}}{\num{\Coeffa}}}\fi$ et \opdiv*{\Coeffd}{\Coeffc}{solution}{resteequa}\opcmp{resteequa}{0}$\ifboolKV[ClesEquation]{LettreSol}{\useKV[ClesEquation]{Lettre}=}{}\displaystyle\ifopeq\opexport{solution}{\solution}\num{\solution}\else\ifboolKV[ClesEquation]{Entier}{\SSimplifie{\Coeffd}{\Coeffc}}{\frac{\num{\Coeffd}}{\num{\Coeffc}}}\fi$. + }{}% } \newcommand\Verification[5][]{% @@ -6802,10 +7478,10 @@ vardef Positions(expr Step)= }{\xintifboolexpr{\Testa=\Testb}{Comme $\num{\Testa}=\num{\Testb}$, alors $\useKV[ClesEquation]{Lettre}=\num{\useKV[ClesEquation]{Nombre}}$ est bien }{Comme $\num{\Testa}\not=\num{\Testb}$, alors $\useKV[ClesEquation]{Lettre}=\num{\useKV[ClesEquation]{Nombre}}$ n'est pas }une solution de l'équation $\xintifboolexpr{#2=0}{\num{#3}}{\xintifboolexpr{#2=1}{}{\num{#2}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#3=0}{}{\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}}}=\xintifboolexpr{#4=0}{\num{#5}}{\xintifboolexpr{#4=1}{}{\num{#4}}\useKV[ClesEquation]{Lettre}\xintifboolexpr{#5=0}{}{\xintifboolexpr{#5>0}{+\num{#5}}{-\num{\fpeval{0-#5}}}}}$.} } -%%%%%%%%%%%%%%%%%%%% -%%% Proportionnalité -%%%%%%%%%%%%%%%%%%%% -\setKVdefault[ClesPropor]{GrandeurA=Grandeur A,GrandeurB=Grandeur B,Largeur=1cm,Math=false,Stretch=1,ColorFill=white,ColorTab=gray!15}%Tableau=false : +%%% +% Proportionnalité +%%% +\setKVdefault[ClesPropor]{GrandeurA=Grandeur A,GrandeurB=Grandeur B,Largeur=1cm,Math=false,Stretch=1,ColorFill=white,CouleurTab=gray!15}%Tableau=false : %inutile ? \def\Updatetoksmath#1/#2\nil{\addtotok\tabtoksa{}\addtotok\tabtoksb{}}% @@ -6819,7 +7495,7 @@ vardef Positions(expr Step)= }% \xdef\LongListe{\ListeValeurlen}% \renewcommand{\arraystretch}{\useKV[ClesPropor]{Stretch}}% - \begin{tabular}{|>{\columncolor{\useKV[ClesPropor]{ColorTab}}}c|*{\number\numexpr\ListeValeurlen}{>{\centering\arraybackslash}p{\useKV[ClesPropor]{Largeur}}|}}% + \begin{tabular}{|>{\columncolor{\useKV[ClesPropor]{CouleurTab}}}c|*{\number\numexpr\ListeValeurlen}{>{\centering\arraybackslash}p{\useKV[ClesPropor]{Largeur}}|}}% \multicolumn{1}{c}{\TikzPHD\setcounter{NbPropor}{1}}\xintFor* ##1 in {\xintSeq {1}{\ListeValeurlen}}\do{&\multicolumn{1}{c}{\TikzPH}}\\% \hhline{*{\number\numexpr\ListeValeurlen+1}{-}}% \the\tabtoksa\\% @@ -6839,9 +7515,15 @@ vardef Positions(expr Step)= }% \newcommand{\TikzPHD}{% - \setbox1=\hbox{\useKV[ClesPropor]{GrandeurA}} - \tikz[remember picture,overlay]{% - \coordinate[name=ProporHD,xshift=-0.5*\the\wd1,yshift=-\the\dp\strutbox*\arraystretch];}% + \setbox1=\hbox{\useKV[ClesPropor]{GrandeurA}}% + \setbox2=\hbox{\useKV[ClesPropor]{GrandeurB}}% + \xintifboolexpr{\wd1>\wd2}{% + \tikz[remember picture,overlay]{% + \coordinate[name=ProporHD,xshift=-0.5\wd1,yshift=-\the\dp\strutbox*\arraystretch];}% + }{% + \tikz[remember picture,overlay]{% + \coordinate[name=ProporHD,xshift=-0.5\wd2,yshift=-\the\dp\strutbox*\arraystretch];}% + } }% \newcommand{\TikzPB}{% @@ -6851,20 +7533,26 @@ vardef Positions(expr Step)= }% \newcommand{\TikzPBD}{% - \setbox1=\hbox{\useKV[ClesPropor]{GrandeurA}} - \tikz[remember picture, overlay]{% - \coordinate[name=ProporBD,xshift=-0.5*\the\wd1,yshift=\the\ht\strutbox*\arraystretch];}% + \setbox1=\hbox{\useKV[ClesPropor]{GrandeurA}}% + \setbox2=\hbox{\useKV[ClesPropor]{GrandeurB}}% + \xintifboolexpr{\wd1>\wd2}{% + \tikz[remember picture, overlay]{% + \coordinate[name=ProporBD,xshift=-0.5*\the\wd1,yshift=\the\ht\strutbox*\arraystretch];}% + }{% + \tikz[remember picture, overlay]{% + \coordinate[name=ProporBD,xshift=-0.5*\the\wd2,yshift=\the\ht\strutbox*\arraystretch];}% + } \stepcounter{NbPropor}% }% \newcommand\FlechesPH[3]{% \ifnum#1<#2\relax% \begin{tikzpicture}[remember picture,overlay]% - \draw[-stealth,out=50,in=130] (ProporH-#1) to node[inner sep=0pt, inner xsep=1pt,fill=\colorfill, pos=0.65, sloped]{#3}(ProporH-#2);% + \draw[-stealth,out=50,in=130] (ProporH-#1) to node[inner sep=0pt, inner xsep=1pt,fill=\colorfill, pos=0.5, sloped]{#3}(ProporH-#2);% \end{tikzpicture}% \else% \begin{tikzpicture}[remember picture,overlay]% - \draw[-stealth,out=130,in=50] (ProporH-#1) to node[inner sep=0pt, inner xsep=1pt,fill=\colorfill, pos=0.65, sloped]{#3}(ProporH-#2);% + \draw[-stealth,out=130,in=50] (ProporH-#1) to node[inner sep=0pt, inner xsep=1pt,fill=\colorfill, pos=0.5, sloped]{#3}(ProporH-#2);% \end{tikzpicture}% \fi% }% @@ -6872,11 +7560,11 @@ vardef Positions(expr Step)= \newcommand\FlechesPB[3]{% \ifnum\number#1<\number#2\relax% \begin{tikzpicture}[remember picture,overlay]% - \draw[-stealth,out=-50,in=-130] (ProporB-#1) to node[inner sep=0pt, inner xsep=1pt,fill=\colorfill, pos=0.65, sloped]{#3}(ProporB-#2);% + \draw[-stealth,out=-50,in=-130] (ProporB-#1) to node[inner sep=0pt, inner xsep=1pt,fill=\colorfill, pos=0.5, sloped]{#3}(ProporB-#2);% \end{tikzpicture}% \else% \begin{tikzpicture}[remember picture,overlay]% - \draw[-stealth,out=-130,in=-50] (ProporB-#1) to node[inner sep=0pt, inner xsep=1pt,fill=\colorfill, pos=0.65, sloped]{#3}(ProporB-#2);% + \draw[-stealth,out=-130,in=-50] (ProporB-#1) to node[inner sep=0pt, inner xsep=1pt,fill=\colorfill, pos=0.5, sloped]{#3}(ProporB-#2);% \end{tikzpicture}% \fi% } @@ -6902,14 +7590,13 @@ vardef Positions(expr Step)= \end{tikzpicture}% }% -\newcommand\FlecheCoefDebut[2][1.25\tabcolsep]{% +\newcommand\FlecheCoefDebut[2][\tabcolsep+\arrayrulewidth]{% \begin{tikzpicture}[remember picture, overlay]% \node[] (Noeud1) at ($(ProporHD)!0.1!(ProporBD)$) {};% \node[] (Noeud2) at ($(ProporHD)!0.9!(ProporBD)$) {};% \coordinate[left of=Noeud1,node distance=#1] (noeud1);% \coordinate[left of=Noeud2,node distance=#1] (noeud2);% \draw[-stealth,out=160,in=-160] (noeud2) to node[midway,left,inner sep=1pt]{#2}(noeud1);% - %\draw[red](ProporHD) to (ProporBD); \end{tikzpicture}% }% @@ -6945,26 +7632,26 @@ vardef Positions(expr Step)= \end{tikzpicture} } -%%%%%%%%%%% -%% Application : pourcentage -%%%%%%%%%%% -\setKVdefault[ClesPourcentage]{Appliquer,Calculer=false,Augmenter=false,Reduire=false,Fractionnaire=false,Decimal,Formule=false,Unite=g,Concret=false,GrandeurA=Grandeur A,GrandeurB=Total,MotReduction=diminution,AideTableau=false,ColorFill=white,ColorTab=gray!15} +%%% +% Application : pourcentage +%%% +\setKVdefault[ClesPourcentage]{Appliquer,Calculer=false,Augmenter=false,Reduire=false,Fractionnaire=false,Decimal,Formule=false,Unite=g,Concret=false,GrandeurA=Grandeur A,GrandeurB=Total,MotReduction=diminution,AideTableau=false,ColorFill=white,CouleurTab=gray!15} \newcommand\Pourcentage[3][]{% \useKVdefault[ClesPourcentage]% \setKV[ClesPourcentage]{#1}% \ifboolKV[ClesPourcentage]{Reduire}{% \ifboolKV[ClesPourcentage]{Formule}{% - Réduire une quantité de \num{#2}~\%, cela revient à multiplier cette quantitié par $1-\dfrac{\num{#2}}{100}$. Par conséquent, si on réduit \num{#3}\ifboolKV[ClesPourcentage]{Concret}{~\useKV[ClesPourcentage]{Unite}}{} de \num{#2}~\%, cela donne : + Réduire une quantité de \num{#2}~\%, cela revient à multiplier cette quantité par $1-\dfrac{\num{#2}}{100}$. Par conséquent, si on réduit \num{#3}\ifboolKV[ClesPourcentage]{Concret}{~\useKV[ClesPourcentage]{Unite}}{} de \num{#2}~\%, cela donne : \[\num{#3}\ifboolKV[ClesPourcentage]{Concret}{~\text{\useKV[ClesPourcentage]{Unite}}}{}\times\left(1-\frac{\num{#2}}{100}\right)=\num{#3}\ifboolKV[ClesPourcentage]{Concret}{~\text{\useKV[ClesPourcentage]{Unite}}}{}\times(1-\num{\fpeval{#2/100}})=\num{#3}\ifboolKV[ClesPourcentage]{Concret}{~\text{\useKV[ClesPourcentage]{Unite}}}{}\times\num{\fpeval{(1-#2/100)}}=\num{\fpeval{#3*(1-#2/100)}}\ifboolKV[ClesPourcentage]{Concret}{~\text{\useKV[ClesPourcentage]{Unite}}}{}\] }{% Calculons ce que représente la \useKV[ClesPourcentage]{MotReduction} de \num{#2}~\%. \ifboolKV[ClesPourcentage]{AideTableau}{% \xdef\NomA{\useKV[ClesPourcentage]{GrandeurA}}% \xdef\NomB{\useKV[ClesPourcentage]{GrandeurB}}% - \xdef\NomColorTab{\useKV[ClesPourcentage]{ColorTab}}% + \xdef\NomCouleurTab{\useKV[ClesPourcentage]{CouleurTab}}% \begin{center} - \Propor[GrandeurA=\NomA,GrandeurB=\NomB,ColorTab=\NomColorTab]{/#3,#2/100} + \Propor[GrandeurA=\NomA,GrandeurB=\NomB,CouleurTab=\NomCouleurTab]{/#3,#2/100} \end{center} \FlecheCoefInv{\tiny$\times\num{\fpeval{#2/100}}$}% On obtient une \useKV[ClesPourcentage]{MotReduction} de $\num{\fpeval{#2/100}}\times\num{#3}\ifboolKV[ClesPourcentage]{Concret}{~\text{\useKV[ClesPourcentage]{Unite}}}{}=\num{\fpeval{#3*#2/100}}$\ifboolKV[ClesPourcentage]{Concret}{~\useKV[ClesPourcentage]{Unite}}{}. Donc un total de $\num{#3}\ifboolKV[ClesPourcentage]{Concret}{~\text{\useKV[ClesPourcentage]{Unite}}}{}-\num{\fpeval{#3*#2/100}}\ifboolKV[ClesPourcentage]{Concret}{~\text{\useKV[ClesPourcentage]{Unite}}}{}=\num{\fpeval{#3*(1-#2/100)}}$\ifboolKV[ClesPourcentage]{Concret}{~\useKV[ClesPourcentage]{Unite}}{}.% @@ -6975,16 +7662,16 @@ vardef Positions(expr Step)= }{% \ifboolKV[ClesPourcentage]{Augmenter}{% \ifboolKV[ClesPourcentage]{Formule}{% - Augmenter de \num{#2}~\% une quantité, cela revient à multiplier cette quantitié par $1+\dfrac{\num{#2}}{100}$. Par conséquent, si on augmente \num{#3}\ifboolKV[ClesPourcentage]{Concret}{~\useKV[ClesPourcentage]{Unite}}{} de \num{#2}~\%, cela donne : + Augmenter de \num{#2}~\% une quantité, cela revient à multiplier cette quantité par $1+\dfrac{\num{#2}}{100}$. Par conséquent, si on augmente \num{#3}\ifboolKV[ClesPourcentage]{Concret}{~\useKV[ClesPourcentage]{Unite}}{} de \num{#2}~\%, cela donne : \[\num{#3}\ifboolKV[ClesPourcentage]{Concret}{~\text{\useKV[ClesPourcentage]{Unite}}}{}\times\left(1+\frac{\num{#2}}{100}\right)=\num{#3}\ifboolKV[ClesPourcentage]{Concret}{~\text{\useKV[ClesPourcentage]{Unite}}}{}\times(1+\num{\fpeval{#2/100}})=\num{#3}\ifboolKV[ClesPourcentage]{Concret}{~\text{\useKV[ClesPourcentage]{Unite}}}{}\times\num{\fpeval{(1+#2/100)}}=\num{\fpeval{#3*(1+#2/100)}}\ifboolKV[ClesPourcentage]{Concret}{~\text{\useKV[ClesPourcentage]{Unite}}}{}\] }{% Calculons ce que représente l'augmentation de \num{#2}~\%. % \ifboolKV[ClesPourcentage]{AideTableau}{% \xdef\NomA{\useKV[ClesPourcentage]{GrandeurA}}% \xdef\NomB{\useKV[ClesPourcentage]{GrandeurB}}% - \xdef\NomColorTab{\useKV[ClesPourcentage]{ColorTab}}% + \xdef\NomCouleurTab{\useKV[ClesPourcentage]{CouleurTab}}% \begin{center}% - \Propor[GrandeurA=\NomA,GrandeurB=\NomB,ColorTab=\NomColorTab]{/#3,#2/100}% + \Propor[GrandeurA=\NomA,GrandeurB=\NomB,CouleurTab=\NomCouleurTab]{/#3,#2/100}% \end{center}% \FlecheCoefInv{\tiny$\times\num{\fpeval{#2/100}}$}% On obtient une augmentation de $\num{\fpeval{#2/100}}\times\num{#3}\ifboolKV[ClesPourcentage]{Concret}{~\text{\useKV[ClesPourcentage]{Unite}}}{}=\num{\fpeval{#3*#2/100}}$\ifboolKV[ClesPourcentage]{Concret}{~\useKV[ClesPourcentage]{Unite}}{}.\\Donc un total de $\num{#3}\ifboolKV[ClesPourcentage]{Concret}{~\text{\useKV[ClesPourcentage]{Unite}}}{}+\num{\fpeval{#3*#2/100}}\ifboolKV[ClesPourcentage]{Concret}{~\text{\useKV[ClesPourcentage]{Unite}}}{}=\num{\fpeval{#3*(1+#2/100)}}$\ifboolKV[ClesPourcentage]{Concret}{~\useKV[ClesPourcentage]{Unite}}{}.% @@ -6996,8 +7683,8 @@ vardef Positions(expr Step)= \ifboolKV[ClesPourcentage]{Calculer}{% \xdef\NomA{\useKV[ClesPourcentage]{GrandeurA}}% \xdef\NomB{\useKV[ClesPourcentage]{GrandeurB}}% - \xdef\NomColorTab{\useKV[ClesPourcentage]{ColorTab}}% - \Propor[GrandeurA=\NomA,GrandeurB=\NomB,ColorTab=\NomColorTab]{#2/#3,/100}% + \xdef\NomCouleurTab{\useKV[ClesPourcentage]{CouleurTab}}% + \Propor[GrandeurA=\NomA,GrandeurB=\NomB,CouleurTab=\NomCouleurTab]{#2/#3,/100}% \xdef\colorfill{\useKV[ClesPourcentage]{ColorFill}}% \FlechesPB{2}{1}{\scriptsize$\times\num{\fpeval{#3/100}}$}% \FlechesPH{1}{2}{\scriptsize$\div\num{\fpeval{#3/100}}$}% @@ -7010,10 +7697,10 @@ vardef Positions(expr Step)= }% }% -%%%%%%%%%%%%% -%Lien : ratio -%%%%%%%%%%%%% -\setKVdefault[ClesRatio]{Figure=false,Longueur=5cm,TexteTotal=quantité,TextePart=part,Tableau=false,GrandeurA=Grandeur A,GrandeurB=Part(s),Largeur=1cm,Stretch=1,Nom=false,CouleurUn=gris,CouleurDeux=0.5gris+0.5blanc,CouleurTrois=white,ColorTab=gray!15} +%%% +% Lien : ratio +%%% +\setKVdefault[ClesRatio]{Figure=false,Longueur=5cm,TexteTotal=quantité,TextePart=part,Tableau=false,GrandeurA=Grandeur A,GrandeurB=Part(s),Largeur=1cm,Stretch=1,Nom=false,CouleurUn=gris,CouleurDeux=0.5gris+0.5blanc,CouleurTrois=white,CouleurTab=gray!15} \newcommand\MPTest[9][]{% % #2 : Longueur de la barre unité @@ -7098,12 +7785,11 @@ vardef Positions(expr Step)= fi; \end{mplibcode} \else - \usempxpackage{simplekv} \mpxcommands{% \setKVdefault[ClesRatio]{TexteTotal=quantité,TextePart=part} \setKV[ClesRatio]{#1} } - \begin{mpost}[mpsettings={input PfC-Geometrie;}] + \begin{mpost} vardef RatioTrois(expr long)(text t)=%longueur de la barre / quantité à partager / textepart :) / t le ratio pair A,B,C,D; A=u*(1,1); @@ -7189,7 +7875,7 @@ vardef Positions(expr Step)= \foreachitem\compteur\in\ListeRatio{\expandafter\updateratiotoks\compteur\nil}% \xdef\LongListe{\ListeRatiolen}% \renewcommand{\arraystretch}{\useKV[ClesRatio]{Stretch}}% - \begin{tabular}{|>{\columncolor{\useKV[ClesRatio]{ColorTab}}}c|*{\number\numexpr\ListeRatiolen}{>{\centering\arraybackslash}p{\useKV[ClesRatio]{Largeur}}|}l} + \begin{tabular}{|>{\columncolor{\useKV[ClesRatio]{CouleurTab}}}c|*{\number\numexpr\ListeRatiolen}{>{\centering\arraybackslash}p{\useKV[ClesRatio]{Largeur}}|}l} \ifboolKV[ClesRatio]{Nom}{% \hhline{~*{\number\numexpr\ListeRatiolen}{-}} \multicolumn{1}{c|}{}\the\tabtoksc\\ @@ -7245,7 +7931,7 @@ vardef Positions(expr Step)= \foreachitem\compteur\in\ListeRatio{\expandafter\UpdateRatio\compteur\nil}% \itemtomacro\ListeRatio[1]\NbUn \itemtomacro\ListeRatio[2]\NbDeux - \xintifboolexpr{\ListeRatiolen>2}{\itemtomacro\ListeRatio[3]\NbTrois}{\newcommand\NbTrois{}} + \xintifboolexpr{\ListeRatiolen>2}{\itemtomacro\ListeRatio[3]\NbTrois}{\xdef\NbTrois{}} \MPTest[#1]{\useKV[ClesRatio]{Longueur}}{\NbUn}{\NbDeux}{\NbTrois}{\the\toklisteratio}{\useKV[ClesRatio]{CouleurUn}}{\useKV[ClesRatio]{CouleurDeux}}{\useKV[ClesRatio]{CouleurTrois}}% }{% \ifboolKV[ClesRatio]{Tableau}{% @@ -7256,9 +7942,9 @@ vardef Positions(expr Step)= }% }% -%%%%%%%%%%%%%%% -%% Cartes Mentales -%%%%%%%%%%%%%%% +%%% +% Cartes Mentales +%%% \setKVdefault[ClesMentales]{Nom={Bulle}, Largeur=5cm, Ancre={0,0},Pointilles=false,CTrace=black,CFond=white,Epaisseur=1pt,Rayon=1}% \newenvironment{Mind}{\begin{tikzpicture}}{\end{tikzpicture}}% @@ -7282,9 +7968,9 @@ vardef Positions(expr Step)= } } -%%%%%%%%%%%% +%%% % Pptés des droites (6eme) -%%%%%%%%%%% +%%% \setKVdefault[ClesDroites]{Brouillon=false,CitePropriete=false,Num=1,Figure=false,Remediation=false} \newcommand\Redaction[4][]{% @@ -7320,7 +8006,7 @@ vardef Positions(expr Step)= Comme les droites $(\hbox to2em{\dotfill})$ et $(\hbox to2em{\dotfill})$ sont parallèles, alors la droite $(\hbox to2em{\dotfill})$ qui est perpendiculaire à $(\hbox to2em{\dotfill})$ est également perpendiculaire à la droite $(\hbox to2em{\dotfill})$. } } - }%%%%%%%%%%%%%%%%%%%%% + }% }{% \xintifboolexpr{\useKV[ClesDroites]{Num}=1}{% \ifboolKV[ClesDroites]{CitePropriete}{% @@ -7351,11 +8037,11 @@ vardef Positions(expr Step)= Donc les droites $(#2)$ et $(#3)$ sont perpendiculaires. }{% Comme les droites $(#2)$ et $(#4)$ sont parallèles, alors la droite $(#3)$ qui est perpendiculaire à $(#4)$ est également perpendiculaire à la droite $(#2)$. - } - } - } - } -} + }% + }% + }% + }% +}% \newcommand\Brouillon[4][]{% \setlength{\abovedisplayskip}{0pt} @@ -7417,10 +8103,10 @@ vardef Positions(expr Step)= \end{array} \right\}(#2)\perp(#3) \] - } - } - } -} + }% + }% + }% +}% \def\MPFigureDroite#1#2{% \ifluatex @@ -7626,11 +8312,10 @@ vardef Positions(expr Step)= }% }% -%%%%%%%%%%%%%%%%%%%% -%%% Fonction Affine -%%%%%%%%%%%%%%%%%%%% -\setKVdefault[ClesAffine]{Nom=f,Variable=x,Ligne=false,Image=false,Antecedent=false,Graphique=false,Retrouve=false,ProgCalcul=false,Unitex=1,Unitey=1,VoirCoef=false,ACoef=0,Redaction=false,Ecriture=false,Definition=false}%ACoefficient=false - %: inutile ? +%%% +% Fonction Affine +%%% +\setKVdefault[ClesAffine]{Nom=f,Variable=x,Ligne=false,Image=false,Antecedent=false,Graphique=false,Retrouve=false,ProgCalcul=false,Unitex=1,Unitey=1,VoirCoef=false,ACoef=0,Redaction=false,Ecriture=false,Definition=false}%ACoefficient=false%: inutile ? \newcommand\FonctionAffine[5][]{% % #1 nombre ou abscisse premier point @@ -7641,7 +8326,7 @@ vardef Positions(expr Step)= \setKV[ClesAffine]{#1}% \ifboolKV[ClesAffine]{Image}{% \ifboolKV[ClesAffine]{Ligne}{% - \ensuremath{\useKV[ClesAffine]{Nom}(\num{#2})=\num{#3}\times\xintifboolexpr{#2<0}{(\num{#2})}{\num{#2}}\xintifboolexpr{#4=0}{}{\xintifboolexpr{#4>0}{+\num{#4}}{\num{#4}}}=\num{\fpeval{#2*#3}}\xintifboolexpr{#4=0}{}{\xintifboolexpr{#4>0}{+\num{#4}}{\num{#4}}}\xintifboolexpr{#4=0}{}{=\num{\fpeval{#2*#3+#4}}}}% + \ensuremath{\useKV[ClesAffine]{Nom}(\num{#2})=\num{#3}\times\xintifboolexpr{#2<0}{(\num{#2})}{\num{#2}}\xintifboolexpr{#4=0}{}{\xintifboolexpr{#4>0}{+\num{#4}}{-\num{\fpeval{0-#4}}}}=\num{\fpeval{#2*#3}}\xintifboolexpr{#4=0}{}{\xintifboolexpr{#4>0}{+\num{#4}}{-\num{\fpeval{0-#4}}}}\xintifboolexpr{#4=0}{}{=\num{\fpeval{#2*#3+#4}}}}% }{% \ifboolKV[ClesAffine]{ProgCalcul}{% \begin{align*} @@ -7650,8 +8335,8 @@ vardef Positions(expr Step)= \end{align*} }{% \begin{align*} - \useKV[ClesAffine]{Nom}(\num{#2})&=\num{#3}\times\xintifboolexpr{#2<0}{(\num{#2})}{\num{#2}}\xintifboolexpr{#4=0}{}{\xintifboolexpr{#4>0}{+\num{#4}}{\num{#4}}}\\ - \useKV[ClesAffine]{Nom}(\num{#2})&=\num{\fpeval{#3*#2}}\xintifboolexpr{#4=0}{}{\xintifboolexpr{#4>0}{+\num{#4}}{\num{#4}}}%\\ + \useKV[ClesAffine]{Nom}(\num{#2})&=\num{#3}\times\xintifboolexpr{#2<0}{(\num{#2})}{\num{#2}}\xintifboolexpr{#4=0}{}{\xintifboolexpr{#4>0}{+\num{#4}}{-\num{\fpeval{0-#4}}}}\\ + \useKV[ClesAffine]{Nom}(\num{#2})&=\num{\fpeval{#3*#2}}\xintifboolexpr{#4=0}{}{\xintifboolexpr{#4>0}{+\num{#4}}{-\num{\fpeval{0-#4}}}}%\\ \xintifboolexpr{#4=0}{}{\\ \useKV[ClesAffine]{Nom}(\num{#2})&=\num{\fpeval{#3*#2+#4}}%\\ } @@ -7669,17 +8354,20 @@ vardef Positions(expr Step)= \useKV[ClesAffine]{Nom}&:\frac{\num{\fpeval{#2-#4}}}{\num{#3}}\stackrel{\div\xintifboolexpr{#3<0}{(\num{#3})}{\num{#3}}}{\longleftarrow}\num{\fpeval{#2-#4}}\xintifboolexpr{#4=0}{}{\xintifboolexpr{#4>0}{\stackrel{-\num{#4}}{\longleftarrow}}{\stackrel{+\num{\fpeval{0-#4}}}{\longleftarrow}}\num{#2}} \end{align*} }{% - On cherche l'antécédent de $\num{#2}$ par la fonction $\useKV[ClesAffine]{Nom}$, c'est-à -dire le nombre $\useKV[ClesAffine]{Variable}$ tel que $\useKV[ClesAffine]{Nom}(\useKV[ClesAffine]{Variable})=\num{#2}$. Or, la fonction $\useKV[ClesAffine]{Nom}$ est définie par : - \begin{align*} - \useKV[ClesAffine]{Nom}&:\useKV[ClesAffine]{Variable}\stackrel{\times\xintifboolexpr{#3<0}{(\num{#3})}{\num{#3}}}{\longrightarrow}\num{#3}\useKV[ClesAffine]{Variable}\xintifboolexpr{#4=0}{}{\xintifboolexpr{#4>0}{\stackrel{+\num{#4}}{\longrightarrow}}{\stackrel{\num{#4}}{\longrightarrow}}\num{#3}\useKV[ClesAffine]{Variable}\xintifboolexpr{#4=0}{}{\xintifboolexpr{#4>0}{+\num{#4}}{\num{#4}}}} - \end{align*} + On cherche l'antécédent de $\num{#2}$ par la fonction + $\useKV[ClesAffine]{Nom}$, c'est-à -dire le nombre + $\useKV[ClesAffine]{Variable}$ tel que + $\useKV[ClesAffine]{Nom}(\useKV[ClesAffine]{Variable})=\num{#2}$. Or, + la fonction $\useKV[ClesAffine]{Nom}$ est définie par : \[% + \useKV[ClesAffine]{Nom}(\useKV[ClesAffine]{Variable})=\xintifboolexpr{#3=0}{}{\num{#3}\useKV[ClesAffine]{Variable}}\xintifboolexpr{#3=0}{\num{#4}}{\xintifboolexpr{#4=0}{}{\xintifboolexpr{#4>0}{+\num{#4}}{-\num{\fpeval{0-#4}}}}} + \] Par conséquent, on a : \begin{align*} - \num{#3}\useKV[ClesAffine]{Variable}\xintifboolexpr{#4=0}{}{\xintifboolexpr{#4>0}{+\num{#4}}{\num{#4}}}&=\num{#2}\\ - \xintifboolexpr{#4=0}{\useKV[ClesAffine]{Variable}\uppercase{&}=\frac{\num{#2}}{\num{#3}} - }{\num{#3}\useKV[ClesAffine]{Variable}&=\num{\fpeval{#2-#4}}\\ - \useKV[ClesAffine]{Variable}&=\frac{\num{\fpeval{#2-#4}}}{\num{#3}} - } + \num{#3}\useKV[ClesAffine]{Variable}\xintifboolexpr{#4=0}{}{\xintifboolexpr{#4>0}{+\num{#4}}{-\num{\fpeval{0-#4}}}}&=\num{#2}\\ + \xintifboolexpr{#4=0}{\useKV[ClesAffine]{Variable}\uppercase{&}=\frac{\num{#2}}{\num{#3}}%\\ + }{\num{#3}\useKV[ClesAffine]{Variable}&=\num{\fpeval{#2-#4}}\\ + \useKV[ClesAffine]{Variable}&=\frac{\num{\fpeval{#2-#4}}}{\num{#3}}%\\ + } \end{align*} }% }{% @@ -7716,16 +8404,15 @@ vardef Positions(expr Step)= \ifboolKV[ClesAffine]{Redaction}{% \xintifboolexpr{#2=0}{Comme la fonction $\useKV[ClesAffine]{Nom}$ est une fonction constante, alors sa représentation graphique est une droite parallèle à l'axe des abscisses passant par le point de coordonnées $(0;\num{#3})$.}% - {\xintifboolexpr{#3=0}{Comme la fonction - $\useKV[ClesAffine]{Nom}$ est une fonction linéaire, alors sa représentation graphique est une droite passant par l'origine du repère.\\Je choisis $\useKV[ClesAffine]{Variable}=\num{#4}$. Son image est \xdef\NomFonctionA{\useKV[ClesAffine]{Nom}}\FonctionAffine[Nom=\NomFonctionA,Image,Ligne]{#4}{#2}{#3}{#5}. On place le point de coordonnées $(\num{#4};\num{\fpeval{#2*#4+#3}})$. + {\xintifboolexpr{#3=0}{Comme la fonction $\useKV[ClesAffine]{Nom}$ est une fonction linéaire, alors sa représentation graphique est une droite passant par l'origine du repère.\\Je choisis $\useKV[ClesAffine]{Variable}=\num{#4}$. Son image est \xdef\NomFonctionA{\useKV[ClesAffine]{Nom}}\FonctionAffine[Nom=\NomFonctionA,Image,Ligne]{#4}{#2}{#3}{#5}. On place le point de coordonnées $(\num{#4};\num{\fpeval{#2*#4+#3}})$. }{% - Comme $\useKV[ClesAffine]{Nom}$ est une fonction affine, alors sa représentation graphique est une droite.\\Je choisis $\useKV[ClesAffine]{Variable}=\num{#4}$. Son image est \xdef\NomFonction{\useKV[ClesAffine]{Nom}}\FonctionAffine[Nom=\NomFonction,Image,Ligne]{#4}{#2}{#3}{#5}. On place le point de coordonnées $(\num{#4};\num{\fpeval{#2*#4+#3}})$.\\Je choisis $\useKV[ClesAffine]{Variable}=\num{#5}$. Son image est \FonctionAffine[Nom=\NomFonction,Image,Ligne]{#5}{#2}{#3}{#4}. On place le point de coordonnées $(\num{#5};\num{\fpeval{#2*#5+#3}})$.% + Comme $\useKV[ClesAffine]{Nom}$ est une fonction affine, alors sa représentation graphique est une droite.\\Je choisis $\useKV[ClesAffine]{Variable}=\num{#4}$. Son image est \xdef\NomVariable{\useKV[ClesAffine]{Variable}}\xdef\NomFonction{\useKV[ClesAffine]{Nom}}\FonctionAffine[Nom=\NomFonction,Image,Ligne]{#4}{#2}{#3}{#5}. On place le point de coordonnées $(\num{#4};\num{\fpeval{#2*#4+#3}})$.\\Je choisis \setKV[ClesAffine]{Variable=\NomVariable}$\useKV[ClesAffine]{Variable}=\num{#5}$. Son image est \FonctionAffine[Nom=\NomFonction,Image,Ligne]{#5}{#2}{#3}{#4}. On place le point de coordonnées $(\num{#5};\num{\fpeval{#2*#5+#3}})$.% }% }% }% {}% - \ifboolKV[ClesAffine]{Ecriture}{\ensuremath{\useKV[ClesAffine]{Nom}(\useKV[ClesAffine]{Variable})=\xintifboolexpr{#2=0}{}{\num{#2}\useKV[ClesAffine]{Variable}}\xintifboolexpr{#2=0}{\num{#3}}{\xintifboolexpr{#3=0}{}{\xintifboolexpr{#3>0}{+\num{#3}}{\num{#3}}}}}}{}% - \ifboolKV[ClesAffine]{Definition}{\ensuremath{\useKV[ClesAffine]{Nom}:\useKV[ClesAffine]{Variable}\mapsto\xintifboolexpr{#2=0}{}{\num{#2}\useKV[ClesAffine]{Variable}}\xintifboolexpr{#2=0}{\num{#3}}{\xintifboolexpr{#3=0}{}{\xintifboolexpr{#3>0}{+\num{#3}}{\num{#3}}}}}}{}% + \ifboolKV[ClesAffine]{Ecriture}{\ensuremath{\useKV[ClesAffine]{Nom}(\useKV[ClesAffine]{Variable})=\xintifboolexpr{#2=0}{}{\num{#2}\useKV[ClesAffine]{Variable}}\xintifboolexpr{#2=0}{\num{#3}}{\xintifboolexpr{#3=0}{}{\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}}}}}{}% + \ifboolKV[ClesAffine]{Definition}{\ensuremath{\useKV[ClesAffine]{Nom}:\useKV[ClesAffine]{Variable}\mapsto\xintifboolexpr{#2=0}{}{\num{#2}\useKV[ClesAffine]{Variable}}\xintifboolexpr{#2=0}{\num{#3}}{\xintifboolexpr{#3=0}{}{\xintifboolexpr{#3>0}{+\num{#3}}{-\num{\fpeval{0-#3}}}}}}}{}% }% \def\MPFonctionAffine#1#2#3#4#5#6#7{% @@ -7987,30 +8674,228 @@ vardef Positions(expr Step)= } -%%%%%%%%%%%%%%% +%%% % Fonction -%%%%%%%%%%%%%%% -\setKVdefault[ClesFonction]{Nom=f,Variable=x,Calcul=x,Tableau=false,Largeur=5mm,Ecriture=false,Definition=false} +%%% +\setKVdefault[ClesFonction]{Nom=f,Variable=x,Calcul=x,Tableau=false,Largeur=5mm,Ecriture=false,Definition=false,Points=false,Tangentes=false,PasX=1,PasY=1,UniteX=1,UniteY=1,Prolonge=false} + +\newtoks\toklistePtsFn%pour la discipline + +\def\UpdatePtsFn#1/#2/#3/#4\nil{\addtotok\toklistePtsFn{#1,(#2,#3),#4,}}% +\def\UpdatePtsFN#1/#2/#3/#4\nil{\addtotok\toklistePtsFn{(#2,#3),}}% + +\def\MPCourbePoints#1#2#3#4#5#6{% + % #1 la liste des points + % #2: pas en x + % #3: pas en y + % #4: unité en x + % #5: unité en y + % #6 : prolongement avant et après les premier et dernier points ? + \ifluatex + \mplibforcehmode + \begin{mplibcode} + x.u:=#2; + y.u:=#3; + X.u:=#4; + Y.u:=#5; + numeric dirav[],dirap[]; + pair Fn[],Gn[]; + n=0; + for p_=#1: + Gn[n]=p_; + Fn[n]=cm*(X.u*xpart(p_),Y.u*ypart(p_)); + n:=n+1; + endfor; + N:=(n-1); + MinX=999; + MaxX=-999; + MinY=999; + MaxY=-999; + for k=0 upto N: + if xpart(Gn[k])<MinX: + MinX:=xpart(Gn[k]); + fi; + if xpart(Gn[k])>MaxX: + MaxX:=xpart(Gn[k]); + fi; + if ypart(Gn[k])<MinY: + MinY:=ypart(Gn[k]); + fi; + if ypart(Gn[k])>MaxY: + MaxY:=ypart(Gn[k]); + fi; + endfor; + if #6=0: + for k=MinY-1 step y.u until MaxY+1: + draw cm*((MinX-1)*X.u,k*Y.u)--cm*((MaxX+1)*X.u,k*Y.u) withcolor 0.75white; + endfor; + for k=MinX-1 step x.u until MaxX+1: + draw cm*(k*X.u,(MinY-1)*Y.u)--cm*(k*X.u,(MaxY+1)*Y.u) withcolor 0.75white; + endfor; + else: + for k=MinY-1 step y.u until MaxY+1: + draw cm*((MinX)*X.u,k*Y.u)--cm*((MaxX)*X.u,k*Y.u) withcolor 0.75white; + endfor; + for k=MinX step x.u until MaxX: + draw cm*(k*X.u,(MinY-1)*Y.u)--cm*(k*X.u,(MaxY+1)*Y.u) withcolor 0.75white; + endfor; + fi; + if #6=0: + for k=0 upto N: + fill cercles(Fn[k],0.5mm); + endfor; + else: + for k=1 upto N-1: + fill cercles(Fn[k],0.5mm); + endfor; + fi; + if #6=0: + drawarrow (0,(MinY-1)*Y.u*cm)--(0,(MaxY+1)*Y.u*cm); + drawarrow ((MinX-1)*X.u*cm,0)--((MaxX+1)*X.u*cm,0); + else: + drawarrow (0,(MinY-1)*Y.u*cm)--(0,(MaxY+1)*Y.u*cm); + drawarrow ((MinX)*X.u*cm,0)--((MaxX)*X.u*cm,0); + fi; + label.llft(btex O etex,(0,0)); + dotlabel.bot(btex 1 etex,cm*X.u*(1,0)); + dotlabel.lft(btex 1 etex,cm*Y.u*(0,1)); + draw Fn[0] + for k=1 upto N: + ..Fn[k] + endfor; + \end{mplibcode} + \fi +} + +\def\MPCourbe#1#2#3#4#5#6{% + \ifluatex + \mplibforcehmode + \begin{mplibcode} + x.u:=#2; + y.u:=#3; + X.u:=#4; + Y.u:=#5; + numeric dirav[],dirap[]; + pair Fn[],Gn[]; + n=0; + for p_=#1: + if (n mod 3)=0: + dirav[n div 3]=p_; + fi; + if (n mod 3)=1: + Gn[n div 3]=p_; + Fn[n div 3]=cm*(X.u*xpart(p_),Y.u*ypart(p_)); + fi; + if (n mod 3)=2: + dirap[n div 3]=p_; + fi; + n:=n+1; + endfor; + N:=(n-1) div 3; + MinX=999; + MaxX=-999; + MinY=999; + MaxY=-999; + for k=0 upto N: + if xpart(Gn[k])<MinX: + MinX:=xpart(Gn[k]); + fi; + if xpart(Gn[k])>MaxX: + MaxX:=xpart(Gn[k]); + fi; + if ypart(Gn[k])<MinY: + MinY:=ypart(Gn[k]); + fi; + if ypart(Gn[k])>MaxY: + MaxY:=ypart(Gn[k]); + fi; + endfor; + if #6=0: + for k=MinY-1 step y.u until MaxY+1: + draw cm*((MinX-1)*X.u,k*Y.u)--cm*((MaxX+1)*X.u,k*Y.u) withcolor 0.75white; + endfor; + for k=MinX-1 step x.u until MaxX+1: + draw cm*(k*X.u,(MinY-1)*Y.u)--cm*(k*X.u,(MaxY+1)*Y.u) withcolor 0.75white; + endfor; + else: + for k=MinY-1 step y.u until MaxY+1: + draw cm*((MinX)*X.u,k*Y.u)--cm*((MaxX)*X.u,k*Y.u) withcolor 0.75white; + endfor; + for k=MinX step x.u until MaxX: + draw cm*(k*X.u,(MinY-1)*Y.u)--cm*(k*X.u,(MaxY+1)*Y.u) withcolor 0.75white; + endfor; + fi; + if #6=0: + for k=0 upto N: + fill cercles(Fn[k],0.5mm); + endfor; + else: + for k=1 upto N-1: + fill cercles(Fn[k],0.5mm); + endfor; + fi; + if #6=0: + drawarrow (0,(MinY-1)*Y.u*cm)--(0,(MaxY+1)*Y.u*cm); + drawarrow ((MinX-1)*X.u*cm,0)--((MaxX+1)*X.u*cm,0); + else: + drawarrow (0,(MinY-1)*Y.u*cm)--(0,(MaxY+1)*Y.u*cm); + drawarrow ((MinX)*X.u*cm,0)--((MaxX)*X.u*cm,0); + fi; + label.llft(btex O etex,(0,0)); + dotlabel.bot(btex 1 etex,cm*X.u*(1,0)); + dotlabel.lft(btex 1 etex,cm*Y.u*(0,1)); + draw Fn[0]{dir dirap[0]} + for k=1 upto (N-1): + ..{dir dirav[k]}Fn[k]{dir dirap[k]} + endfor + ..{dir dirav[N]}Fn[N]; + \end{mplibcode} + \fi +} \newcommand{\Fonction}[2][]{% \useKVdefault[ClesFonction] \setKV[ClesFonction]{#1} - \ignoreemptyitems% - \readlist*\ListeFonction{#2} - \StrSubstitute{\useKV[ClesFonction]{Calcul}}{\useKV[ClesFonction]{Variable}}{\i}[\temp]% - - \StrSubstitute{\useKV[ClesFonction]{Calcul}}{**}{^}[\tempa]% - \StrSubstitute{\tempa}{*}{}[\tempab]% - \ifboolKV[ClesFonction]{Ecriture}{% - \ensuremath{\useKV[ClesFonction]{Nom}(\useKV[ClesFonction]{Variable})=\tempab} - }{}% - \ifboolKV[ClesFonction]{Definition}{% - \ensuremath{\useKV[ClesFonction]{Nom}:\useKV[ClesFonction]{Variable}\mapsto\tempab} - }{}% - \ifboolKV[ClesFonction]{Tableau}{% - \buildtabfonction% - }{} -} + \ifboolKV[ClesFonction]{Points}{% + \toklistePtsFn{}% + \setsepchar[*]{,*/}%\ignoreemptyitems% + \readlist*\ListePoints{#2}% + \ifboolKV[ClesFonction]{Tangentes}{% + \foreachitem\compteur\in\ListePoints{% + \expandafter\UpdatePtsFn\compteur\nil% + }% + \ifboolKV[ClesFonction]{Prolonge}{% + \MPCourbe{\the\toklistePtsFn}{\useKV[ClesFonction]{PasX}}{\useKV[ClesFonction]{PasY}}{\useKV[ClesFonction]{UniteX}}{\useKV[ClesFonction]{UniteY}}{1}% + }{% + \MPCourbe{\the\toklistePtsFn}{\useKV[ClesFonction]{PasX}}{\useKV[ClesFonction]{PasY}}{\useKV[ClesFonction]{UniteX}}{\useKV[ClesFonction]{UniteY}}{0}% + }% + }{% + \foreachitem\compteur\in\ListePoints{% + \expandafter\UpdatePtsFN\compteur\nil% + }% + \ifboolKV[ClesFonction]{Prolonge}{% + \MPCourbePoints{\the\toklistePtsFn}{\useKV[ClesFonction]{PasX}}{\useKV[ClesFonction]{PasY}}{\useKV[ClesFonction]{UniteX}}{\useKV[ClesFonction]{UniteY}}{1}% + }{% + \MPCourbePoints{\the\toklistePtsFn}{\useKV[ClesFonction]{PasX}}{\useKV[ClesFonction]{PasY}}{\useKV[ClesFonction]{UniteX}}{\useKV[ClesFonction]{UniteY}}{0}% + }% + }% + }{% + \ignoreemptyitems% + \readlist*\ListeFonction{#2} + \StrSubstitute{\useKV[ClesFonction]{Calcul}}{\useKV[ClesFonction]{Variable}}{\i}[\temp]% + \StrSubstitute{\useKV[ClesFonction]{Calcul}}{**}{^}[\tempa]% + \StrSubstitute{\tempa}{*}{}[\tempab]% + \ifboolKV[ClesFonction]{Ecriture}{% + \ensuremath{\useKV[ClesFonction]{Nom}(\useKV[ClesFonction]{Variable})=\tempab} + }{}% + \ifboolKV[ClesFonction]{Definition}{% + \ensuremath{\useKV[ClesFonction]{Nom}:\useKV[ClesFonction]{Variable}\mapsto\tempab} + }{}% + \ifboolKV[ClesFonction]{Tableau}{% + \buildtabfonction% + }{}% + }% +}% \def\buildtabfonction{%\\ \[% @@ -8018,16 +8903,16 @@ vardef Positions(expr Step)= \hline \useKV[ClesFonction]{Variable}\xintFor* ##1 in {\xintSeq {1}{\ListeFonctionlen}}\do{&\num{\ListeFonction[##1]}}\\ \hline - \useKV[ClesFonction]{Nom}(\useKV[ClesFonction]{Variable})\xintFor* ##1 in {\xintSeq {1}{\ListeFonctionlen}}\do{& \StrSubstitute{\useKV[ClesFonction]{Calcul}}{\useKV[ClesFonction]{Variable}}{\ListeFonction[##1]}[\tempab]\num{\fpeval{\tempab}}} + \useKV[ClesFonction]{Nom}(\useKV[ClesFonction]{Variable})\xintFor* ##1 in {\xintSeq {1}{\ListeFonctionlen}}\do{& \StrSubstitute{\useKV[ClesFonction]{Calcul}}{\useKV[ClesFonction]{Variable}}{(\ListeFonction[##1])}[\tempab]\num{\fpeval{\tempab}}} \\\hline \end{array} \] } -%%%%%%% -%% Formules -%%%%%% -\setKVdefault[ClesFormule]{Perimetre=false,Aire=false,Volume=false,Surface=carré,Solide=pavé droit,Figure=false,Angle=0,Ancre={(0,0)},Largeur=5cm} +%%% +% Formules +%%% +\setKVdefault[ClesFormule]{Perimetre=false,Aire=false,Volume=false,Surface=carré,Solide=pavé,Angle=0,Ancre={(0,0)},Largeur=5cm,Couleur=white} \def\MPFigureCarre{% \ifluatex @@ -8496,7 +9381,6 @@ vardef Positions(expr Step)= \mplibforcehmode \begin{mplibcode} drawoptions( dashed dashpattern(on1cm)); - % Figure(-10u,-10u,10u,10u); u:=0.5cm; z0=(-0.5,0)*u; z1=(2.5,0.5)*u; @@ -8788,7 +9672,6 @@ vardef Positions(expr Step)= \mplibforcehmode \begin{mplibcode} drawoptions( dashed dashpattern(on1cm)); - % Figure(-5u,-5u,5u,5u); pair A,B,C,H,I,J; A=u*(0.5,1); B-A=u*(1.4,0); @@ -8866,12 +9749,13 @@ vardef Positions(expr Step)= } \newcommand\Formule[1][]{% - \useKVdefault[ClesFormule] - \setKV[ClesFormule]{#1} - \setlength{\RoundedBoxWidth}{\useKV[ClesFormule]{Largeur}} + \useKVdefault[ClesFormule]% + \setKV[ClesFormule]{#1}% + \setlength{\RoundedBoxWidth}{\useKV[ClesFormule]{Largeur}}% + \xdef\ColorFill{\useKV[ClesFormule]{Couleur}}% \ifboolKV[ClesFormule]{Perimetre}{% \begin{tikzpicture}[remember picture, overlay] - \node[draw,dashed,rounded corners,rotate={\useKV[ClesFormule]{Angle}}] (test) at \useKV[ClesFormule]{Ancre} {\begin{minipage}{\RoundedBoxWidth}% + \node[draw,fill=\ColorFill,dashed,rounded corners,rotate={\useKV[ClesFormule]{Angle}}] (test) at \useKV[ClesFormule]{Ancre} {\begin{minipage}{\RoundedBoxWidth}% \IfStrEqCase{\useKV[ClesFormule]{Surface}}{% {carré}{\begin{center} \MPFigureCarre\par @@ -8883,7 +9767,7 @@ vardef Positions(expr Step)= Périmètre d'un polygone : \par$\text{Somme des côtés}$ \end{center} }% - {rectangle}{ + {rectangle}{% \begin{center} \MPFigureRectangle\par Périmètre d'un rectangle : \par$2\times(L+\ell)$ @@ -8907,7 +9791,7 @@ vardef Positions(expr Step)= Périmètre d'un cercle : \par$\pi\times\text{diamètre}$ \end{center} }% - {parallélogramme}{ + {parallélogramme}{% \begin{center} \MPFigureParallelogramme\par Périmètre d'un parallélogramme : \par Somme des côtés @@ -8917,7 +9801,7 @@ vardef Positions(expr Step)= \end{tikzpicture} }{\ifboolKV[ClesFormule]{Aire}{% \begin{tikzpicture}[remember picture, overlay] - \node[draw,dashed,rounded corners=2,rotate={\useKV[ClesFormule]{Angle}}] (test) at \useKV[ClesFormule]{Ancre} {\begin{minipage}{\RoundedBoxWidth}% + \node[draw,fill=\ColorFill,dashed,rounded corners=2,rotate={\useKV[ClesFormule]{Angle}}] (test) at \useKV[ClesFormule]{Ancre} {\begin{minipage}{\RoundedBoxWidth}% \IfStrEqCase{\useKV[ClesFormule]{Surface}}{% {carré}{\begin{center} \MPFigureCarre\par @@ -8963,7 +9847,7 @@ vardef Positions(expr Step)= \end{tikzpicture} }{%Volume \begin{tikzpicture}[remember picture, overlay] - \node[draw,dashed,rounded corners=2,rotate={\useKV[ClesFormule]{Angle}}] (test) at \useKV[ClesFormule]{Ancre} {\begin{minipage}{\RoundedBoxWidth}% + \node[draw,fill=\ColorFill,dashed,rounded corners=2,rotate={\useKV[ClesFormule]{Angle}}] (test) at \useKV[ClesFormule]{Ancre} {\begin{minipage}{\RoundedBoxWidth}% \IfStrEqCase{\useKV[ClesFormule]{Solide}}{% {boule}{\begin{center} \MPFigureSphere\par @@ -9012,10 +9896,10 @@ vardef Positions(expr Step)= } } -%%%%%%%%%% -%%% Proba -%%%%%%%%%% -\setKVdefault[ClesProba]{Echelle=false,Arbre=false,Branche=2,Angle=60,Rayon=0.25,LongueurEchelle=5,Affichage=0,Grille=0} +%%% +% Proba +%%% +\setKVdefault[ClesProba]{Echelle=false,Arbre=false,Branche=2,Angle=60,Rayon=0.25,LongueurEchelle=5,Affichage=0,Grille=1} \def\Updatetoksproba#1/#2\nil{\addtotok\toklistepointproba{"#1","\footnotesize #2",}} \def\Updatetoksprobaechelle#1/#2/#3\nil{\addtotok\toklistepointproba{#1,#2,"#3",}} @@ -9091,7 +9975,7 @@ vardef Positions(expr Step)= dotlabel.top("",C[k]); fi; if (#3>2): - label.bot(TEX("$\frac{"&decimal(num)&"}{"&decimal(deno)&"}$"),C[k]-u*(0,0.5));%Le \noexpand est nécessaire pour éviter un problème à la compilation, dû à l'expansion du \frac par gmp. + label.bot(TEX("$\frac{"&decimal(num)&"}{"&decimal(deno)&"}$"),C[k]-u*(0,0.5)); fi; k:=k+1; fi; @@ -9271,10 +10155,10 @@ vardef Positions(expr Step)= } } -%%%%%%%%%%%%%% -%%%Reperage -%%%%%%%%%%%%%% -\setKVdefault[ClesReperage]{Unitex=1,Pasx=1,Unitey=1,Pasy=1,Unitez=1,Pasz=1,DemiDroite=false,Droite=false,Plan=false,Trace=false,ListeSegment={},Espace=false,Sphere=false,AffichageNom=false,AffichageCoord=false,ValeurUnitex=1,ValeurUnitey=1,ValeurOrigine=0,EchelleEspace=50,CouleurCoord=black} +%%% +% Reperage +%%% +\setKVdefault[ClesReperage]{Unitex=1,Pasx=1,Unitey=1,Pasy=1,Unitez=1,Pasz=1,DemiDroite=false,Droite=false,Plan=false,Trace=false,ListeSegment={},Espace=false,Sphere=false,AffichageNom=false,AffichageGrad=false,AffichageAbs=0,AffichageCoord=false,LectureCoord=false,ValeurUnitex=1,ValeurUnitey=1,ValeurOrigine=0,NomOrigine=O,EchelleEspace=50,CouleurCoord=black} % ValeurOrigine permet de faire des morceaux de demi-droite graduée en passant par droite :) \def\Updatetoksdroite#1/#2\nil{\addtotok\toklistepointdroite{#1,"#2",}} @@ -9565,46 +10449,44 @@ vardef Positions(expr Step)= }% % Pour construire le repère du plan -\def\buildrepere{% +\def\buildreperenew{% \toklistepointrepere{}% \foreachitem\compteur\in\ListePointRepere{\expandafter\Updatetoksrepere\compteur\nil}% \ifboolKV[ClesReperage]{Trace}{% \[\MPPlanTrace{\useKV[ClesReperage]{Unitex}}{\useKV[ClesReperage]{Pasx}}{\useKV[ClesReperage]{Unitey}}{\useKV[ClesReperage]{Pasy}}{\the\toklistepointrepere}{2}{\useKV[ClesReperage]{ValeurUnitex}}{\useKV[ClesReperage]{ValeurUnitey}}{\useKV[ClesReperage]{ListeSegment}}\]% }{% - \ifboolKV[ClesReperage]{AffichageNom}{% - \ifboolKV[ClesReperage]{AffichageCoord}{% - \[\MPPlan{\useKV[ClesReperage]{Unitex}}{\useKV[ClesReperage]{Pasx}}{\useKV[ClesReperage]{Unitey}}{\useKV[ClesReperage]{Pasy}}{\the\toklistepointrepere}{3}{\useKV[ClesReperage]{ValeurUnitex}}{\useKV[ClesReperage]{ValeurUnitey}}\]% - }{% - \[\MPPlan{\useKV[ClesReperage]{Unitex}}{\useKV[ClesReperage]{Pasx}}{\useKV[ClesReperage]{Unitey}}{\useKV[ClesReperage]{Pasy}}{\the\toklistepointrepere}{2}{\useKV[ClesReperage]{ValeurUnitex}}{\useKV[ClesReperage]{ValeurUnitey}}\]% - } - }{% - \ifboolKV[ClesReperage]{AffichageCoord}{% - \[\MPPlan{\useKV[ClesReperage]{Unitex}}{\useKV[ClesReperage]{Pasx}}{\useKV[ClesReperage]{Unitey}}{\useKV[ClesReperage]{Pasy}}{\the\toklistepointrepere}{1}{\useKV[ClesReperage]{ValeurUnitex}}{\useKV[ClesReperage]{ValeurUnitey}}\]% - }{% - \[\MPPlan{\useKV[ClesReperage]{Unitex}}{\useKV[ClesReperage]{Pasx}}{\useKV[ClesReperage]{Unitey}}{\useKV[ClesReperage]{Pasy}}{\the\toklistepointrepere}{0}{\useKV[ClesReperage]{ValeurUnitex}}{\useKV[ClesReperage]{ValeurUnitey}}\]% - } - }% + \xdef\AfficheNom{0}\ifboolKV[ClesReperage]{AffichageNom}{\ifboolKV[ClesReperage]{LectureCoord}{\xdef\AfficheNom{3}}{\xdef\AfficheNom{2}}}{\ifboolKV[ClesReperage]{LectureCoord}{\xdef\AfficheNom{1}}{}}% + \xdef\AfficheGrad{0}\ifboolKV[ClesReperage]{AffichageGrad}{\xdef\AfficheGrad{1}}{}% + \xdef\AfficheCoord{\useKV[ClesReperage]{AffichageAbs}}% + \MPPlannew{(\useKV[ClesReperage]{Unitex},\useKV[ClesReperage]{Pasx})}{(\useKV[ClesReperage]{Unitey},\useKV[ClesReperage]{Pasy})}{\the\toklistepointrepere}{\AfficheNom}{\AfficheCoord}{\AfficheGrad}{(\useKV[ClesReperage]{ValeurUnitex},\useKV[ClesReperage]{ValeurUnitey})}% }% } -\def\MPPlan#1#2#3#4#5#6#7#8{% +\def\MPPlannew#1#2#3#4#5#6#7{% + %#1 : Unitex, pasx + %#2 : unitey, pasy + %#3 : liste de points + %#4 : Affichage nom + lecture graphique + %#5 : Affichage des (abscisses/ordonnées) + %#6 : Graduation complète ? + %#7 : (unitex,unitey) \ifluatex \begin{mplibcode} maxx:=-4000; - minx=4000; - unitex:=#1*cm; - pasx=#2; - unitpx:=unitex/pasx; - maxy:=-4000; - miny:=4000; - unitey:=#3*cm; - pasy:=#4; - unitpy:=unitey/pasy; - n:=1; - vardef toto(text t)= + minx=4000; + unitex:=(xpart(#1))*cm; + pasx=ypart(#1); + unitpx:=unitex/pasx; + maxy:=-4000; + miny:=4000; + unitey:=(xpart(#2))*cm; + pasy:=ypart(#2); + unitpy:=unitey/pasy; + n:=1; + vardef toto(text t)= for p_=t: if (n mod 3)=1: - if p_>maxx: + if p_>maxx: maxx:=p_; fi; if p_<minx: @@ -9623,22 +10505,22 @@ vardef Positions(expr Step)= endfor; maxx:=maxx+1; minx:=minx-1; - if maxx<(#2+1): - maxx:=#2+1; + if maxx<(ypart(#1)+1): + maxx:=ypart(#1)+1; fi; - if minx>(-#2-1): - minx:=-#2-1; + if minx>(-ypart(#1)-1): + minx:=-ypart(#1)-1; fi; maxy:=maxy+1; miny:=miny-1; - if maxy<(#4+1): - maxy:=#2+1; + if maxy<(ypart(#2)+1): + maxy:=ypart(#2)+1; fi; - if miny>(-#4-1): - miny:=-#4-1; + if miny>(-ypart(#2)-1): + miny:=-ypart(#2)-1; fi; enddef; - toto(#5); + toto(#3); Figure((minx-1)*unitpx,(miny-1)*unitpy,(maxx+1)*unitpx,(maxy+1)*unitpy); pair A,B,C,D,E; A=(0,0); @@ -9654,14 +10536,32 @@ vardef Positions(expr Step)= endfor; drawarrow (B+(-0.75*unitpx,0))--(C+(0.75*unitpx,0)); drawarrow (D+(0,-0.75*unitpy))--(E+(0,0.75*unitpy)); - dotlabel.bot(TEX("\footnotesize\num{"&decimal(#7)&"}"),(unitex,0)); - dotlabel.lft(TEX("\footnotesize\num{"&decimal(#8)&"}"),(0,unitey)); - label.llft(btex 0 etex,A); + % graduation complète ou pas ? + label.llft(btex \footnotesize 0 etex,A); + if #6>0: + for k=minx upto maxx: + if (xpart((k*unitex,0))>xpart(B+(-0.75*unitpx,0))) and (xpart((k*unitex,0))<xpart(C+(0.75*unitpx,0))): + if k<>0: + dotlabel.lrt(TEX("\footnotesize\num{"&decimal(k)&"}"),(k*unitex,0)); + fi; + fi; + endfor; + for k=miny upto maxy: + if (ypart((0,k*unitey))>ypart(D+(0,-0.75*unitpy))) and (ypart((0,k*unitey))<ypart(E+(0,0.75*unitpy))): + if k<>0: + dotlabel.ulft(TEX("\footnotesize\num{"&decimal(k)&"}"),(0,k*unitey)); + fi; + fi; + endfor; + else: + dotlabel.lrt(TEX("\footnotesize\num{"&decimal(xpart(#7))&"}"),(unitex,0)); + dotlabel.ulft(TEX("\footnotesize\num{"&decimal(ypart(#7))&"}"),(0,unitey)); + fi; % apparition du nom des points ou pas m_c:=m_c*3; marque_p:="croix"; vardef tata(text t)=%on place les points - if #6>0: + if #4>0: n:=1; k:=0;%pour retenir la coordonnée en x l:=0;%pour retenir la coordonnée en y @@ -9677,15 +10577,14 @@ vardef Positions(expr Step)= fi; fi; if (n mod 3)=0: - if #6>1: - message("p = "&p_); - % if p_<>"": + if #4>1: + if p_<>"": if (k>0) and (l>0): label.urt(TEX(p_),(k*unitpx,l*unitpy)); fi; - if (k=0) and (l>0): - label.urt(TEX(p_),(k*unitpx,l*unitpy)); - fi; + if (k=0) and (l>0): + label.urt(TEX(p_),(k*unitpx,l*unitpy)); + fi; if (k>0) and (l=0): label.urt(TEX(p_),(k*unitpx,l*unitpy)); fi; @@ -9705,35 +10604,92 @@ vardef Positions(expr Step)= label.lrt(TEX(p_),(k*unitpx,l*unitpy)); fi; pointe((k*unitpx,l*unitpy)); - % fi; fi; - if (#6=1) or (#6=3): + fi; + if (#4=1) or (#4=3): draw (0,l*unitpy)--(k*unitpx,l*unitpy)--(k*unitpx,0) dashed evenly; fi; fi; n:=n+1; endfor; fi; + if #5=2: + n:=1; + k:=0;%pour retenir la coordonnée en x + l:=0;%pour retenir la coordonnée en y + for p_=t: + if (n mod 3)=1: + if numeric p_: + k:=p_; + fi; + fi; + if (n mod 3)=2: + if numeric p_: + l:=p_; + fi; + fi; + if (n mod 3)=0: + if p_<>"": + if (k mod pasx)<>0: + label.lrt(TEX("\footnotesize$\frac{\num{"&decimal(k)&"}}{\num{"&decimal(pasx)&"}}$"),(k*unitpx,0)); + else: + label.lrt(TEX("\footnotesize\num{\fpeval{"&decimal(k)&"/"&decimal(pasx)&"}}"),(k*unitpx,0)); + fi; + if (l mod pasy)<>0: + label.ulft(TEX("\footnotesize$\frac{\num{"&decimal(l)&"}}{\num{"&decimal(pasy)&"}}$"),(0,l*unitpy)); + else: + label.ulft(TEX("\footnotesize\num{\fpeval{"&decimal(l)&"/"&decimal(pasy)&"}}"),(0,l*unitpy)); + fi; + pointe((k*unitpx,0),(0,l*unitpy)); + fi; + fi; + n:=n+1; + endfor; + elseif #5=1: + n:=1; + k:=0;%pour retenir la coordonnée en x + l:=0;%pour retenir la coordonnée en y + for p_=t: + if (n mod 3)=1: + if numeric p_: + k:=p_; + fi; + fi; + if (n mod 3)=2: + if numeric p_: + l:=p_; + fi; + fi; + if (n mod 3)=0: + if p_<>"": + label.lrt(TEX("\footnotesize\num{\fpeval{"&decimal(k)&"/"&decimal(pasx)&"}}"),(k*unitpx,0)); + label.ulft(TEX("\footnotesize\num{\fpeval{"&decimal(l)&"/"&decimal(pasy)&"}}"),(0,l*unitpy)); + pointe((k*unitpx,0),(0,l*unitpy)); + fi; + fi; + n:=n+1; + endfor; + fi; enddef; - tata(#5); + tata(#3); \end{mplibcode} \else - \begin{mpost}[mpsettings={input PfC-Geometrie;}] - maxx:=-4000; - minx=4000; - unitex:=#1*cm; - pasx=#2; - unitpx:=unitex/pasx; - maxy:=-4000; - miny:=4000; - unitey:=#3*cm; - pasy:=#4; - unitpy:=unitey/pasy; - n:=1; - vardef toto(text t)= + \begin{mpost} + maxx:=-4000; + minx=4000; + unitex:=(xpart(#1))*cm; + pasx=ypart(#1); + unitpx:=unitex/pasx; + maxy:=-4000; + miny:=4000; + unitey:=(xpart(#2))*cm; + pasy:=ypart(#2); + unitpy:=unitey/pasy; + n:=1; + vardef toto(text t)= for p_=t: if (n mod 3)=1: - if p_>maxx: + if p_>maxx: maxx:=p_; fi; if p_<minx: @@ -9752,22 +10708,22 @@ vardef Positions(expr Step)= endfor; maxx:=maxx+1; minx:=minx-1; - if maxx<(#2+1): - maxx:=#2+1; + if maxx<(ypart(#1)+1): + maxx:=ypart(#1)+1; fi; - if minx>(-#2-1): - minx:=-#2-1; + if minx>(-ypart(#1)-1): + minx:=-ypart(#1)-1; fi; maxy:=maxy+1; miny:=miny-1; - if maxy<(#4+1): - maxy:=#2+1; + if maxy<(ypart(#2)+1): + maxy:=ypart(#2)+1; fi; - if miny>(-#4-1): - miny:=-#4-1; + if miny>(-ypart(#2)-1): + miny:=-ypart(#2)-1; fi; enddef; - toto(#5); + toto(#3); Figure((minx-1)*unitpx,(miny-1)*unitpy,(maxx+1)*unitpx,(maxy+1)*unitpy); pair A,B,C,D,E; A=(0,0); @@ -9783,14 +10739,32 @@ vardef Positions(expr Step)= endfor; drawarrow (B+(-0.75*unitpx,0))--(C+(0.75*unitpx,0)); drawarrow (D+(0,-0.75*unitpy))--(E+(0,0.75*unitpy)); - dotlabel.bot(LATEX("\noexpand\footnotesize\num{"&decimal(#7)&"}"),(unitex,0)); - dotlabel.lft(LATEX("\noexpand\footnotesize\num{"&decimal(#8)&"}"),(0,unitey)); - label.llft(btex 0 etex,A); + % graduation complète ou pas ? + label.llft(btex \noexpand\footnotesize 0 etex,A); + if #6>0: + for k=minx upto maxx: + if (xpart((k*unitex,0))>xpart(B+(-0.75*unitpx,0))) and (xpart((k*unitex,0))<xpart(C+(0.75*unitpx,0))): + if k<>0: + dotlabel.lrt(LATEX("\noexpand\footnotesize\noexpand\num{"&decimal(k)&"}"),(k*unitex,0)); + fi; + fi; + endfor; + for k=miny upto maxy: + if (ypart((0,k*unitey))>ypart(D+(0,-0.75*unitpy))) and (ypart((0,k*unitey))<ypart(E+(0,0.75*unitpy))): + if k<>0: + dotlabel.ulft(LATEX("\noexpand\footnotesize\noexpand\num{"&decimal(k)&"}"),(0,k*unitey)); + fi; + fi; + endfor; + else: + dotlabel.lrt(LATEX("\noexpand\footnotesize\noexpand\num{"&decimal(xpart(#7))&"}"),(unitex,0)); + dotlabel.ulft(LATEX("\noexpand\footnotesize\noexpand\num{"&decimal(ypart(#7))&"}"),(0,unitey)); + fi; % apparition du nom des points ou pas m_c:=m_c*3; marque_p:="croix"; vardef tata(text t)=%on place les points - if #6>0: + if #4>0: n:=1; k:=0;%pour retenir la coordonnée en x l:=0;%pour retenir la coordonnée en y @@ -9806,7 +10780,8 @@ vardef Positions(expr Step)= fi; fi; if (n mod 3)=0: - if #6>1: + if #4>1: + if p_<>"": if (k>0) and (l>0): label.urt(LATEX(p_),(k*unitpx,l*unitpy)); fi; @@ -9833,15 +10808,73 @@ vardef Positions(expr Step)= fi; pointe((k*unitpx,l*unitpy)); fi; - if (#6=1) or (#6=3): + fi; + if (#4=1) or (#4=3): draw (0,l*unitpy)--(k*unitpx,l*unitpy)--(k*unitpx,0) dashed evenly; fi; fi; n:=n+1; endfor; fi; + if #5=2: + n:=1; + k:=0;%pour retenir la coordonnée en x + l:=0;%pour retenir la coordonnée en y + for p_=t: + if (n mod 3)=1: + if numeric p_: + k:=p_; + fi; + fi; + if (n mod 3)=2: + if numeric p_: + l:=p_; + fi; + fi; + if (n mod 3)=0: + if p_<>"": + if (k mod pasx)<>0: + label.lrt(LATEX("\noexpand\footnotesize$\noexpand\frac{\noexpand\num{"&decimal(k)&"}}{\noexpand\num{"&decimal(pasx)&"}}$"),(k*unitpx,0)); + else: + label.lrt(LATEX("\noexpand\footnotesize\noexpand\num{\noexpand\fpeval{"&decimal(k)&"/"&decimal(pasx)&"}}"),(k*unitpx,0)); + fi; + if (l mod pasy)<>0: + label.ulft(LATEX("\noexpand\footnotesize$\noexpand\frac{\noexpand\num{"&decimal(l)&"}}{\noexpand\num{"&decimal(pasy)&"}}$"),(0,l*unitpy)); + else: + label.ulft(LATEX("\noexpand\footnotesize\noexpand\num{\noexpand\fpeval{"&decimal(l)&"/"&decimal(pasy)&"}}"),(0,l*unitpy)); + fi; + pointe((k*unitpx,0),(0,l*unitpy)); + fi; + fi; + n:=n+1; + endfor; + elseif #5=1: + n:=1; + k:=0;%pour retenir la coordonnée en x + l:=0;%pour retenir la coordonnée en y + for p_=t: + if (n mod 3)=1: + if numeric p_: + k:=p_; + fi; + fi; + if (n mod 3)=2: + if numeric p_: + l:=p_; + fi; + fi; + if (n mod 3)=0: + if p_<>"": + label.lrt(LATEX("\noexpand\footnotesize\noexpand\num{\noexpand\fpeval{"&decimal(k)&"/"&decimal(pasx)&"}}"),(k*unitpx,0)); + label.ulft(LATEX("\noexpand\footnotesize\noexpand\num{\noexpand\fpeval{"&decimal(l)&"/"&decimal(pasy)&"}}"),(0,l*unitpy)); + pointe((k*unitpx,0),(0,l*unitpy)); + fi; + fi; + n:=n+1; + endfor; + fi; enddef; - tata(#5); + tata(#3); \end{mpost} \fi } @@ -10146,163 +11179,232 @@ vardef Positions(expr Step)= \fi } -% Pour construire la demi-droite graduée -\def\builddemidroite{% - \toklistepointdroite{}% - \foreachitem\compteur\in\ListePointDroite{\expandafter\Updatetoksdroite\compteur\nil}% - \ifboolKV[ClesReperage]{DemiDroite}{% - \ifboolKV[ClesReperage]{AffichageNom}{% - \[\MPDemiGraduee{\useKV[ClesReperage]{Unitex}}{\useKV[ClesReperage]{Pasx}}{\the\toklistepointdroite}{1}{\useKV[ClesReperage]{ValeurUnitex}}{\useKV[ClesReperage]{ValeurOrigine}}\]% - }{% - \[\MPDemiGraduee{\useKV[ClesReperage]{Unitex}}{\useKV[ClesReperage]{Pasx}}{\the\toklistepointdroite}{0}{\useKV[ClesReperage]{ValeurUnitex}}{\useKV[ClesReperage]{ValeurOrigine}}\]% - } - }{% - \ifboolKV[ClesReperage]{AffichageNom}{% - \[\MPDroiteGraduee{\useKV[ClesReperage]{Unitex}}{\useKV[ClesReperage]{Pasx}}{\the\toklistepointdroite}{1}{\useKV[ClesReperage]{ValeurUnitex}}{\useKV[ClesReperage]{ValeurOrigine}}\]% - }{% - \[\MPDroiteGraduee{\useKV[ClesReperage]{Unitex}}{\useKV[ClesReperage]{Pasx}}{\the\toklistepointdroite}{0}{\useKV[ClesReperage]{ValeurUnitex}}{\useKV[ClesReperage]{ValeurOrigine}}\]% - }% - }% -}% - -\def\MPDemiGraduee#1#2#3#4#5#6{% - % #1 : unite +\def\MPDEMIGraduee#1#2#3#4#5#6#7#8{% + % #1 : unite % #2 : pas % #3 : liste des points à placer en pas. pour gérer le cas des repérages fractionnaires % #4 : on affiche le nom des points ou pas % #5 : quelle est la valeur de la longueur unité ? % #6 : la valeur de l'unité (ne sert à rien ici, mais en prévision % de Droite) + % #7 : on affiche les abscisses ou pas : 0 non, 1 oui, 2 fraction + % #8 : on affiche tous les multiples de la graduation "principale" \ifluatex + \mplibforcehmode \begin{mplibcode} maxx:=0; - unitex:=#1*cm; - pasx:=#2; - unitp:=unitex/pasx;%unité de déplacement - vardef toto(text t)=%On détermine le nombre "d'unités" à placer - for p_=t: - if numeric p_: - if p_>maxx: - maxx:=p_; - fi; - fi; - endfor; - maxx:=maxx+1; - if maxx<(#2+1): - maxx:=#2+1; - fi; - enddef; - toto(#3); - Figure(-u,-u,(maxx+0.75)*unitp,u); - pair A,B; - A=(0,0); - B=unitp*(maxx,0); - drawarrow A--(B+(0.75*unitp,0)); - %marquage secondaire - marque_s:=marque_s/3; - for k=0 step 2 until (maxx): - draw marquesegment((k/maxx)[A,B],((k+1)/maxx)[A,B]); - endfor; - drawoptions(); - % marquage primaire - marque_s:=marque_s*3; - for k=0 step pasx until (maxx-1): - draw marquesegment((k/maxx)[A,B],((k+pasx)/maxx)[A,B]); - endfor; - % marquage des points - m_c:=m_c*3; - marque_p:="croix"; - labeloffset:=labeloffset*2; - dotlabel.bot(TEX("\footnotesize\num{"&decimal(#5)&"}"),unitex*(1,0)); - label.bot(TEX("\footnotesize\num{"&decimal(#6)&"}"),A); - vardef tata(text t)=%on place les points - if #4>0: - for p_=t: - if numeric p_: - label("",unitp*(p_,0)); - k:=p_; - fi; - if string p_: - if p_<>"": - label.top(TEX(p_),unitp*(k,0)); - pointe(unitp*(k,0)); - fi; - fi; - endfor; - fi; - enddef; - tata(#3); + unitex:=#1*cm; + pasx:=#2; + unitp:=unitex/pasx;%unité de déplacement + vardef toto(text t)=%On détermine le nombre "d'unités" à placer + for p_=t: + if numeric p_: + if p_>maxx: + maxx:=p_; + fi; + fi; + endfor; + maxx:=maxx+1; + if maxx<(#2+1): + maxx:=#2+1; + fi; + enddef; + toto(#3); + Figure(-u,-u,(maxx+0.75)*unitp,u); + pair A,B; + A=(0,0); + B=unitp*(maxx,0); + drawarrow A--(B+(0.75*unitp,0)); + % marquage secondaire + marque_s:=marque_s/3; + for k=0 step 2 until (maxx): + draw marquesegment((k/maxx)[A,B],((k+1)/maxx)[A,B]); + endfor; + drawoptions(); + % marquage primaire + marque_s:=marque_s*3; + for k=0 step pasx until (maxx-1): + draw marquesegment((k/maxx)[A,B],((k+pasx)/maxx)[A,B]); + endfor; + % marquage des points + m_c:=m_c*3; + marque_p:="croix"; + labeloffset:=labeloffset*2; + dotlabel.bot(TEX("\footnotesize\num{"&decimal(#5)&"}"),unitex*(1,0)); + label.bot(TEX("\footnotesize\num{"&decimal(#6)&"}"),A); + if #8>0: + for k=2 upto maxx: + dotlabel.bot(TEX("\footnotesize\num{\fpeval{"&decimal(#5)&"*"&decimal(k)&"}}"),unitex*(k,0)); + endfor; + fi; + vardef tata(text t)=%on place les points + if #4>0: + for p_=t: + if numeric p_: + k:=p_; + fi; + if string p_: + if p_<>"": + label.top(TEX(p_),unitp*(k,0)); + pointe(unitp*(k,0)); + fi; + fi; + endfor; + fi; + if #7=2: + for p_=t: + if numeric p_: + k:=p_; + fi; + if string p_: + if p_<>"": + if ((#5*k) mod pasx)<>0: + label.bot(TEX("\footnotesize$\frac{\num{\fpeval{"&decimal(#5)&"*"&decimal(k)&"}}}{\num{"&decimal(pasx)&"}}$"),unitp*(k,0)); + else: + label.bot(TEX("\footnotesize\num{\fpeval{"&decimal(#5)&"*"&decimal(k)&"/"&decimal(pasx)&"}}"),unitp*(k,0)); + fi; + pointe(unitp*(k,0)); + fi; + fi; + endfor; + elseif #7=1: + for p_=t: + if numeric p_: + k:=p_; + fi; + if string p_: + if p_<>"": + label.bot(TEX("\footnotesize\num{\fpeval{"&decimal(#5)&"*"&decimal(k)&"/"&decimal(pasx)&"}}"),unitp*(k,0)); + pointe(unitp*(k,0)); + fi; + fi; + endfor; + fi; + enddef; + tata(#3); \end{mplibcode} \else - \begin{mpost}[mpsettings={input PfC-Geometrie;}] - maxx:=0; - unitex:=#1*cm; - pasx:=#2; - unitp:=unitex/pasx;%unité de déplacement - vardef toto(text t)=%On détermine le nombre "d'unités" à placer - for p_=t: - if numeric p_: - if p_>maxx: - maxx:=p_; - fi; - fi; - endfor; - maxx:=maxx+1; - if maxx<(#2+1): - maxx:=#2+1; - fi; - enddef; - toto(#3); - Figure(-u,-u,(maxx+0.75)*unitp,u); - pair A,B; - A=(0,0); - B=unitp*(maxx,0); - drawarrow A--(B+(0.75*unitp,0)); - %marquage secondaire - marque_s:=marque_s/3; - for k=0 step 2 until (maxx): - draw marquesegment((k/maxx)[A,B],((k+1)/maxx)[A,B]); - endfor; - drawoptions(); - % marquage primaire - marque_s:=marque_s*3; - for k=0 step pasx until (maxx-1): - draw marquesegment((k/maxx)[A,B],((k+pasx)/maxx)[A,B]); - endfor; - % marquage des points - m_c:=m_c*3; - marque_p:="croix"; - labeloffset:=labeloffset*2; - dotlabel.bot(LATEX("\noexpand\footnotesize\num{"&decimal(#5)&"}"),unitex*(1,0)); - label.bot(LATEX("\noexpand\footnotesize\num{"&decimal(#6)&"}"),A); - vardef tata(text t)=%on place les points - if #4>0: - for p_=t: - if numeric p_: - label("",unitp*(p_,0)); - k:=p_; - fi; - if string p_: - label.top(LATEX(p_),unitp*(k,0)); - if p_<>"": - pointe(unitp*(k,0)); - fi; - fi; - endfor; - fi; - enddef; - tata(#3); -\end{mpost} -\fi + \begin{mpost} + maxx:=0; + unitex:=#1*cm; + pasx:=#2; + unitp:=unitex/pasx;%unité de déplacement + vardef toto(text t)=%On détermine le nombre "d'unités" à placer + for p_=t: + if numeric p_: + if p_>maxx: + maxx:=p_; + fi; + fi; + endfor; + maxx:=maxx+1; + if maxx<(#2+1): + maxx:=#2+1; + fi; + enddef; + toto(#3); + Figure(-u,-u,(maxx+0.75)*unitp,u); + pair A,B; + A=(0,0); + B=unitp*(maxx,0); + drawarrow A--(B+(0.75*unitp,0)); + % marquage secondaire + marque_s:=marque_s/3; + for k=0 step 2 until (maxx): + draw marquesegment((k/maxx)[A,B],((k+1)/maxx)[A,B]); + endfor; + drawoptions(); + % marquage primaire + marque_s:=marque_s*3; + for k=0 step pasx until (maxx-1): + draw marquesegment((k/maxx)[A,B],((k+pasx)/maxx)[A,B]); + endfor; + % marquage des points + m_c:=m_c*3; + marque_p:="croix"; + labeloffset:=labeloffset*2; + dotlabel.bot(LATEX("\noexpand\footnotesize\num{"&decimal(#5)&"}"),unitex*(1,0)); + label.bot(LATEX("\noexpand\footnotesize\num{"&decimal(#6)&"}"),A); + if #8>0: + for k=2 upto maxx: + dotlabel.bot(LATEX("\noexpand\footnotesize\noexpand\num{\noexpand\fpeval{"&decimal(#5)&"*"&decimal(k)&"}}"),unitex*(k,0)); + endfor; + fi; + vardef tata(text t)=%on place les points + if #4>0: + for p_=t: + if numeric p_: + k:=p_; + fi; + if string p_: + if p_<>"": + label.top(LATEX(p_),unitp*(k,0)); + pointe(unitp*(k,0)); + fi; + fi; + endfor; + fi; + if #7=2: + for p_=t: + if numeric p_: + k:=p_; + fi; + if string p_: + if p_<>"": + if ((#5*k) mod pasx)<>0: + label.bot(LATEX("\noexpand\footnotesize$\noexpand\frac{\noexpand\num{\noexpand\fpeval{"&decimal(#5)&"*"&decimal(k)&"}}}{\noexpand\num{"&decimal(pasx)&"}}$"),unitp*(k,0)); + else: + label.bot(LATEX("\noexpand\footnotesize\noexpand\num{\noexpand\fpeval{"&decimal(#5)&"*"&decimal(k)&"/"&decimal(pasx)&"}}"),unitp*(k,0)); + fi; + pointe(unitp*(k,0)); + fi; + fi; + endfor; + elseif #7=1: + for p_=t: + if numeric p_: + k:=p_; + fi; + if string p_: + if p_<>"": + label.bot(LATEX("\noexpand\footnotesize\noexpand\num{\noexpand\fpeval{"&decimal(#5)&"*"&decimal(k)&"/"&decimal(pasx)&"}}"),unitp*(k,0)); + pointe(unitp*(k,0)); + fi; + fi; + endfor; + fi; + enddef; + tata(#3); + \end{mpost} + \fi } -\def\MPDroiteGraduee#1#2#3#4#5#6{% - % #1 : unite - % #2 : pas - % #3 : liste des points à placer en pas. pour gérer le cas des repérages fractionnaires - % #4 : on affiche le nom des points ou pas - % #5 : quelle est la valeur de la longueur unité ? +% Pour construire les droite/demi-droite graduée +\def\builddemidroitenew{% + \toklistepointdroite{}% + \foreachitem\compteur\in\ListePointDroite{\expandafter\Updatetoksdroite\compteur\nil}% + \xdef\AffichageNom{0}\ifboolKV[ClesReperage]{AffichageNom}{\xdef\AffichageNom{1}}{} + \xdef\AffichageCoord{\useKV[ClesReperage]{AffichageAbs}} + \xdef\AffichageGrad{0}\ifboolKV[ClesReperage]{AffichageGrad}{\xdef\AffichageGrad{1}}{} + \ifboolKV[ClesReperage]{DemiDroite}{% + \[\MPDEMIGraduee{\useKV[ClesReperage]{Unitex}}{\useKV[ClesReperage]{Pasx}}{\the\toklistepointdroite}{\AffichageNom}{\useKV[ClesReperage]{ValeurUnitex}}{\useKV[ClesReperage]{ValeurOrigine}}{\AffichageCoord}{\AffichageGrad}\]% + }{% + \[\MPDROITEGraduee{\useKV[ClesReperage]{Unitex}}{\useKV[ClesReperage]{Pasx}}{\the\toklistepointdroite}{\AffichageNom}{\useKV[ClesReperage]{ValeurUnitex}}{\useKV[ClesReperage]{ValeurOrigine}}{\AffichageCoord}{\AffichageGrad}\]% + }% +}% + + +\def\MPDROITEGraduee#1#2#3#4#5#6#7#8{% + % #1 : unite + % #2 : pas + % #3 : liste des points à placer en pas. pour gérer le cas des repérages fractionnaires + % #4 : on affiche le nom des points ou pas + % #5 : quelle est la valeur de la longueur unité ? + % #6 : la valeur de l'unité + % #7 : on affiche les abscisses ou pas : 0 non, 1 oui, 2 fraction + % #8 : on affiche tous les multiples de la graduation "principale" \ifluatex + \mplibforcehmode \begin{mplibcode} maxx:=0; minx:=4000; @@ -10310,67 +11412,71 @@ vardef Positions(expr Step)= pasx:=#2; unitp:=unitex/pasx;%unité de déplacement vardef toto(text t)=%On détermine le nombre "d'unités" à placer - for p_=t: - if numeric p_: - if p_>maxx: - maxx:=p_; - fi; - if p_<minx: - minx:=p_; - fi; - fi; - endfor; - maxx:=maxx+1; - minx:=minx-1; - if maxx<(#2+1): - maxx:=#2+1; - fi; - if minx>(-#2-1): - minx:=-#2-1; - fi; + for p_=t: + if numeric p_: + if p_>maxx: + maxx:=p_; + fi; + if p_<minx: + minx:=p_; + fi; + fi; + endfor; + maxx:=maxx+(pasx div 2); + minx:=minx-(pasx div 2); + if maxx<(#2+1): + maxx:=#2+(pasx-1); + fi; + if minx>(-#2-1): + minx:=-#2-(pasx-1); + fi; enddef; toto(#3); - Figure((minx-1)*u,-u,(maxx+1)*unitp,u); + Figure((minx-1)*unitp,-u,(maxx+1)*unitp,u); pair A,B,C; A=(0,0); B=unitp*(maxx,0); C=unitp*(minx,0); drawarrow (C+unitp*(-0.75,0))--(B+unitp*(0.75,0)); + % marquage secondaire marque_s:=marque_s/3; labeloffset:=labeloffset*2; if ((maxx-minx) mod 2)=0: -% show maxx; show minx; for k=(minx+1) step 2 until (maxx-1): draw marquedemidroite(C,B); draw marquesegment((k/maxx)[A,B],((k+1)/maxx)[A,B]); endfor; else: - % show maxx; show minx; for k=(minx) step 2 until (maxx-1): draw marquesegment((k/maxx)[A,B],((k+1)/maxx)[A,B]); endfor; fi; - % marquage primaire%%%%%%%%%%%%%%%%%%%%%%%% - marque_s:=marque_s*3; - for k=0 step pasx until (maxx-pasx): - draw marquesegment((k/maxx)[A,B],((k+pasx)/maxx)[A,B]); - endfor; - for k=0 step -pasx until (minx+pasx): - draw marquesegment((k/maxx)[A,B],((k-pasx)/maxx)[A,B]); - endfor; + % marquage primaire + marque_s:=marque_s*3; + for k=0 step pasx until (maxx-pasx): + draw marquesegment((k/maxx)[A,B],((k+pasx)/maxx)[A,B]); + endfor; + for k=0 step -pasx until (minx+pasx): + draw marquesegment((k/maxx)[A,B],((k-pasx)/maxx)[A,B]); + endfor; + % marquage des points m_c:=m_c*3; marque_p:="croix"; - dotlabel.bot(TEX("\footnotesize\num{"&decimal(#5)&"}"),unitex*(1,0)); + labeloffset:=labeloffset*2; + label.bot(TEX("\footnotesize\num{"&decimal(#5)&"}"),unitex*(1,0)); label.bot(TEX("\footnotesize\num{"&decimal(#6)&"}"),A); - if #5=1: - label.top(TEX("I"),unitex*(1,0)); + if #8>0: + for k=2 upto maxx: + label.bot(TEX("\footnotesize\num{\fpeval{"&decimal(#6)&"+"&decimal(#5-(#6))&"*"&decimal(k)&"}}"),unitex*(k,0));%%% + endfor; + for k=minx upto -1: + label.bot(TEX("\footnotesize\num{\fpeval{"&decimal(#6)&"+"&decimal(#5-(#6))&"*"&decimal(k)&"}}"),unitex*(k,0));%%% + endfor; fi; - label.top(TEX("O"),A); vardef tata(text t)=%on place les points if #4>0: for p_=t: if numeric p_: - label("",unitp*(p_,0)); k:=p_; fi; if string p_: @@ -10381,83 +11487,145 @@ vardef Positions(expr Step)= fi; endfor; fi; + if #7=2: + for p_=t: + if numeric p_: + k:=p_; + fi; + if string p_: + if p_<>"": + if ((#5*k) mod pasx)<>0: + label.bot(TEX("\footnotesize$\frac{\num{\fpeval{"&decimal(#5)&"*"&decimal(k)&"}}}{\num{"&decimal(pasx)&"}}$"),unitp*(k,0)); + else: + label.bot(TEX("\footnotesize\num{\fpeval{"&decimal(#5)&"*"&decimal(k)&"/"&decimal(pasx)&"}}"),unitp*(k,0)); + fi; + pointe(unitp*(k-#6,0)); + fi; + fi; + endfor; + elseif #7=1: + for p_=t: + if numeric p_: + k:=p_; + fi; + if string p_: + if p_<>"": + label.bot(TEX("\footnotesize\num{\fpeval{"&decimal(#6)&"+"&decimal(#5-(#6))&"*"&decimal(k)&"/"&decimal(pasx)&"}}"),unitp*(k,0)); + pointe(unitp*(k,0)); + fi; + fi; + endfor; + fi; enddef; tata(#3); \end{mplibcode} \else - \begin{mpost}[mpsettings={input PfC-Geometrie;}] + \begin{mpost} maxx:=0; minx:=4000; unitex:=#1*cm; pasx:=#2; unitp:=unitex/pasx;%unité de déplacement vardef toto(text t)=%On détermine le nombre "d'unités" à placer - for p_=t: - if numeric p_: - if p_>maxx: - maxx:=p_; - fi; - if p_<minx: - minx:=p_; - fi; - fi; - endfor; - maxx:=maxx+1; - minx:=minx-1; - if maxx<(#2+1): - maxx:=#2+1; - fi; - if minx>(-#2-1): - minx:=-#2-1; - fi; + for p_=t: + if numeric p_: + if p_>maxx: + maxx:=p_; + fi; + if p_<minx: + minx:=p_; + fi; + fi; + endfor; + maxx:=maxx+(pasx div 2); + minx:=minx-(pasx div 2); + if maxx<(#2+1): + maxx:=#2+(pasx-1); + fi; + if minx>(-#2-1): + minx:=-#2-(pasx-1); + fi; enddef; toto(#3); - Figure((minx-1)*u,-u,(maxx+1)*unitp,u); + Figure((minx-1)*unitp,-u,(maxx+1)*unitp,u); pair A,B,C; A=(0,0); B=unitp*(maxx,0); C=unitp*(minx,0); drawarrow (C+unitp*(-0.75,0))--(B+unitp*(0.75,0)); + % marquage secondaire marque_s:=marque_s/3; labeloffset:=labeloffset*2; if ((maxx-minx) mod 2)=0: -% show maxx; show minx; for k=(minx+1) step 2 until (maxx-1): draw marquedemidroite(C,B); draw marquesegment((k/maxx)[A,B],((k+1)/maxx)[A,B]); endfor; else: - % show maxx; show minx; for k=(minx) step 2 until (maxx-1): draw marquesegment((k/maxx)[A,B],((k+1)/maxx)[A,B]); endfor; fi; - % marquage primaire%%%%%%%%%%%%%%%%%%%%%%%% - marque_s:=marque_s*3; - for k=0 step pasx until (maxx-pasx): - draw marquesegment((k/maxx)[A,B],((k+pasx)/maxx)[A,B]); - endfor; - for k=0 step -pasx until (minx+pasx): - draw marquesegment((k/maxx)[A,B],((k-pasx)/maxx)[A,B]); - endfor; + % marquage primaire + marque_s:=marque_s*3; + for k=0 step pasx until (maxx-pasx): + draw marquesegment((k/maxx)[A,B],((k+pasx)/maxx)[A,B]); + endfor; + for k=0 step -pasx until (minx+pasx): + draw marquesegment((k/maxx)[A,B],((k-pasx)/maxx)[A,B]); + endfor; + % marquage des points m_c:=m_c*3; marque_p:="croix"; - dotlabel.bot(LATEX("\noexpand\footnotesize\num{"&decimal(#5)&"}"),unitex*(1,0)); - label.bot(LATEX("\noexpand\footnotesize\num{"&decimal(#6)&"}"),A); - if #5=1: - label.top(LATEX("I"),unitex*(1,0)); + labeloffset:=labeloffset*2; + label.bot(LATEX("\noexpand\footnotesize\noexpand\num{"&decimal(#5)&"}"),unitex*(1,0)); + label.bot(LATEX("\noexpand\footnotesize\noexpand\num{"&decimal(#6)&"}"),A); + if #8>0: + for k=2 upto maxx: + label.bot(LATEX("\noexpand\footnotesize\noexpand\num{\noexpand\fpeval{"&decimal(#6)&"+"&decimal(#5-(#6))&"*"&decimal(k)&"}}"),unitex*(k,0));%%% + endfor; + for k=minx upto -1: + label.bot(LATEX("\noexpand\footnotesize\noexpand\num{\noexpand\fpeval{"&decimal(#6)&"+"&decimal(#5-(#6))&"*"&decimal(k)&"}}"),unitex*(k,0));%%% + endfor; fi; - label.top(LATEX("O"),A); vardef tata(text t)=%on place les points if #4>0: for p_=t: if numeric p_: - label("",unitp*(p_,0)); k:=p_; fi; if string p_: + if p_<>"": label.top(LATEX(p_),unitp*(k,0)); + pointe(unitp*(k,0)); + fi; + fi; + endfor; + fi; + if #7=2: + for p_=t: + if numeric p_: + k:=p_; + fi; + if string p_: + if p_<>"": + if ((#5*k) mod pasx)<>0: + label.bot(LATEX("\noexpand\footnotesize$\noexpand\frac{\noexpand\num{\noexpand\fpeval{"&decimal(#5)&"*"&decimal(k)&"}}}{\noexpand\num{"&decimal(pasx)&"}}$"),unitp*(k,0)); + else: + label.bot(LATEX("\noexpand\footnotesize\noexpand\num{\noexpand\fpeval{"&decimal(#5)&"*"&decimal(k)&"/"&decimal(pasx)&"}}"),unitp*(k,0)); + fi; + pointe(unitp*(k-#6,0)); + fi; + fi; + endfor; + elseif #7=1: + for p_=t: + if numeric p_: + k:=p_; + fi; + if string p_: if p_<>"": + label.bot(LATEX("\noexpand\footnotesize\noexpand\num{\noexpand\fpeval{"&decimal(#6)&"+"&decimal(#5-(#6))&"*"&decimal(k)&"/"&decimal(pasx)&"}}"),unitp*(k,0)); pointe(unitp*(k,0)); fi; fi; @@ -10468,7 +11636,7 @@ vardef Positions(expr Step)= \end{mpost} \fi } - + \newcommand\Reperage[2][]{% \useKVdefault[ClesReperage]% \setKV[ClesReperage]{#1}% @@ -10481,51 +11649,146 @@ vardef Positions(expr Step)= }{\ifboolKV[ClesReperage]{Plan}{% \setsepchar[*]{,*/}\ignoreemptyitems% \readlist*\ListePointRepere{#2}% - \buildrepere% - }{\ifboolKV[ClesReperage]{Droite}{% - \setsepchar[*]{,*/}\ignoreemptyitems% - \readlist*\ListePointDroite{#2}% - \builddemidroite% - }{% - \setsepchar[*]{,*/}\ignoreemptyitems% - \readlist*\ListePointDroite{#2}% - \builddemidroite% - }% + \buildreperenew% + }{% + \setsepchar[*]{,*/}\ignoreemptyitems% + \readlist*\ListePointDroite{#2}% + \builddemidroitenew% }% }% }% - -%%%%%%%% -%% Puissances -%%%%%% +%%% +% Puissances +%%% \newcommand\Puissances[2]{% - \ensuremath{ + \ensuremath{% \xintifboolexpr{#2=0}{1}{\xintifboolexpr{#2>0}{\xdef\total{\fpeval{#2-1}}#1\multido{\i=1+1}{\total}{\times#1}}{\xdef\total{\fpeval{-#2-1}}\frac{1}{#1\multido{\i=1+1}{\total}{\times#1}}}}% - } + }% } -%%%%%%%%% +%%% % Ecritures d'unités -%%%%%%%%%% -\setKVdefault[Unites]{m=false,km=false,hm=false,dam=false,dm=false,cm=true,mm=false,g=true,kg=false,hg=false,dag=false,dg=false,cg=false,mg=false,kmh=true,ms=false,kgm=false,gcm=true,L=true,kL=false,hL=false,daL=false,dL=false,cL=false,mL=false,l=true,kl=false,hl=false,dal=false,dl=false,cl=false,ml=false} +%%% +\setKVdefault[Unites]{m=false,km=false,hm=false,ha=false,dam=false,a=false,dm=false,cm=true,mm=false,um=false,nm=false,g=true,t=false,q=false,kg=false,hg=false,dag=false,dg=false,cg=false,mg=false,ug=false,ng=false,kmh=true,kms=false,ms=false,kgm=false,gcm=true,L=true,kL=false,hL=false,daL=false,dL=false,cL=false,mL=false,l=true,kl=false,hl=false,dal=false,dl=false,cl=false,ml=false,Go=true,Mo=false,ko=false,To=false,o=false,kWh=true,C=true,K=false,F=false} + +%D'apres https://tex.stackexchange.com/questions/38905/time-of-the-day-or-time-period-using-the-package-siunitx +\ExplSyntaxOn +\NewDocumentCommand \Temps { o > { \SplitArgument { 5 } { ; } } m } +{ + \group_begin: + \IfNoValueF {#1} + { \keys_set:nn { siunitx } {#1} } + \siunitx_hms_output:nnn #2 + \group_end: +} +\cs_new_protected:Npn \siunitx_hms_output:nnn #1#2#3#4#5#6 +{ + \IfNoValueF {#1} + { + \tl_if_blank:nF {#1} + { + \SI {#1} { \annee\xintifboolexpr{#1>1}{s}{} } + \IfNoValueF {#2} { ~ } + } + } + \IfNoValueF {#2} + { + \tl_if_blank:nF {#2} + { + \SI {#2} { \mois } + \IfNoValueF {#3} { ~ } + } + } + \IfNoValueF {#3} + { + \tl_if_blank:nF {#3} + { + \SI {#3} { \jour } + \IfNoValueF {#4} { ~ } + } + } + \IfNoValueF {#4} + { + \tl_if_blank:nF {#4} + { + \SI {#4} { \hour } + \IfNoValueF {#5} { ~ } + } + } + \IfNoValueF {#5} + { + \tl_if_blank:nF {#5} + { + \SI {#5} { \minute } + \IfNoValueF {#6} { ~ } + } + } + \IfNoValueF {#6} + { \tl_if_blank:nF {#6} { \SI {#6} { \second } } } +} +\ExplSyntaxOff + +\newcommand\Temp[2][]{% + \useKVdefault[Unites]% + \setKV[Unites]{#1}% + \ifboolKV[Unites]{F}{% + \SI{#2}{\fahrenheit}% + }{% + \ifboolKV[Unites]{K}{% + \SI{#2}{\kelvin}% + }{% + \SI{#2}{\celsius}% + }% + }% +}% + +\newcommand\Conso[2][]{% + \SI{#2}{\kWh}% +} + +\newcommand\Octet[2][]{% + \useKVdefault[Unites]% + \setKV[Unites]{#1}% + \ifboolKV[Unites]{o}{% + \SI{#2}{\octet}% + }{% + \ifboolKV[Unites]{ko}{% + \SI{#2}{\kilo\octet}% + }{\ifboolKV[Unites]{Mo}{% + \SI{#2}{\mega\octet}% + }{\ifboolKV[Unites]{To}{% + \SI{#2}{\tera\octet}% + }{% + \SI{#2}{\giga\octet}% + }% + }% + }% + }% +}% \newcommand\Lg[2][]{% \useKVdefault[Unites]% \setKV[Unites]{#1}% - \ifboolKV[Unites]{km}{% - \SI{#2}{\km}% - }{\ifboolKV[Unites]{hm}{% - \SI{#2}{\hecto\metre}% - }{\ifboolKV[Unites]{dam}{% - \SI{#2}{\deca\metre}% - }{\ifboolKV[Unites]{dm}{% - \SI{#2}{\dm}% - }{\ifboolKV[Unites]{m}{% - \SI{#2}{\m}% - }{\ifboolKV[Unites]{mm}{% - \SI{#2}{\mm}% - }{\SI{#2}{\cm}% + \ifboolKV[Unites]{nm}{% + \SI{#2}{\nm}% + }{\ifboolKV[Unites]{um}{% + \SI{#2}{\um}% + }{\ifboolKV[Unites]{km}{% + \SI{#2}{\km}% + }{\ifboolKV[Unites]{hm}{% + \SI{#2}{\hecto\metre}% + }{\ifboolKV[Unites]{dam}{% + \SI{#2}{\deca\metre}% + }{\ifboolKV[Unites]{dm}{% + \SI{#2}{\dm}% + }{\ifboolKV[Unites]{m}{% + \SI{#2}{\m}% + }{\ifboolKV[Unites]{mm}{% + \SI{#2}{\mm}% + }{\SI{#2}{\cm}% + }% + }% }% }% }% @@ -10537,19 +11800,32 @@ vardef Positions(expr Step)= \newcommand\Masse[2][]{% \useKVdefault[Unites]% \setKV[Unites]{#1}% - \ifboolKV[Unites]{kg}{% - \SI{#2}{\kg}% - }{\ifboolKV[Unites]{hg}{% - \SI{#2}{\hecto\gram}% - }{\ifboolKV[Unites]{dag}{% - \SI{#2}{\deca\gram}% - }{\ifboolKV[Unites]{dg}{% - \SI{#2}{\deci\gram}% - }{\ifboolKV[Unites]{cg}{% - \SI{#2}{\centi\gram}% - }{\ifboolKV[Unites]{mg}{% - \SI{#2}{\milli\gram}% - }{\SI{#2}{\gram}% + \ifboolKV[Unites]{ng}{% + \SI{#2}{\ng}% + }{\ifboolKV[Unites]{ug}{% + \SI{#2}{\ug}% + }{\ifboolKV[Unites]{t}{% + \SI{#2}{\tonne}% + }{\ifboolKV[Unites]{q}{% + \SI{#2}{\quintal}% + }{% + \ifboolKV[Unites]{kg}{% + \SI{#2}{\kg}% + }{\ifboolKV[Unites]{hg}{% + \SI{#2}{\hecto\gram}% + }{\ifboolKV[Unites]{dag}{% + \SI{#2}{\deca\gram}% + }{\ifboolKV[Unites]{dg}{% + \SI{#2}{\deci\gram}% + }{\ifboolKV[Unites]{cg}{% + \SI{#2}{\centi\gram}% + }{\ifboolKV[Unites]{mg}{% + \SI{#2}{\milli\gram}% + }{\SI{#2}{\gram}% + }% + }% + }% + }% }% }% }% @@ -10589,15 +11865,21 @@ vardef Positions(expr Step)= \SI{#2}{\square\km}% }{\ifboolKV[Unites]{hm}{% \SI{#2}{\square\hecto\metre}% - }{\ifboolKV[Unites]{dam}{% - \SI{#2}{\square\deca\metre}% - }{\ifboolKV[Unites]{dm}{% - \SI{#2}{\square\dm}% - }{\ifboolKV[Unites]{m}{% - \SI{#2}{\square\metre}% - }{\ifboolKV[Unites]{mm}{% - \SI{#2}{\square\mm}% - }{\SI{#2}{\square\cm}% + }{\ifboolKV[Unites]{ha}{% + \SI{#2}{\hectare}% + }{\ifboolKV[Unites]{dam}{% + \SI{#2}{\square\deca\metre}% + }{\ifboolKV[Unites]{a}{% + \SI{#2}{\are}% + }{\ifboolKV[Unites]{dm}{% + \SI{#2}{\square\dm}% + }{\ifboolKV[Unites]{m}{% + \SI{#2}{\square\metre}% + }{\ifboolKV[Unites]{mm}{% + \SI{#2}{\square\mm}% + }{\SI{#2}{\square\cm}% + }% + }% }% }% }% @@ -10636,7 +11918,11 @@ vardef Positions(expr Step)= \ifboolKV[Unites]{ms}{% \SI[per-mode=symbol]{#2}{\meter\per\second}% }{% - \SI[per-mode=symbol]{#2}{\kilo\meter\per\hour}% + \ifboolKV[Unites]{kms}{% + \SI[per-mode=symbol]{#2}{\kilo\meter\per\second}% + }{% + \SI[per-mode=symbol]{#2}{\kilo\meter\per\hour}% + }% }% }% @@ -10650,177 +11936,378 @@ vardef Positions(expr Step)= }% }% -%%%%%%%%% -%% Tableaux d'unités -%%%%%%%%% -\setKVdefault[ClesTableaux]{Entiers=false,Decimaux=false,Milliards=false,Millions=false,Milliers=true,Partie=false,CouleurG=gray!15,CouleurM=gray!15,Couleurm=gray!15,Couleuru=gray!15,Classes=false,Nombres=false,Metre=false,Carre=false,Cube=false,Litre=false,Gramme=false,Fleches=false,Colonnes=false,Prefixes=false} +%%% +% Tableaux d'unités +%%% +\setKVdefault[ClesTableaux]{Virgule=true,Entiers=false,Decimaux=false,Milliards=false,Millions=false,Micro=false,Nano=false,Partie=false,CouleurG=gray!15,CouleurM=gray!15,Couleurm=gray!15,Couleuru=gray!15,Classes=false,Nombres=false,Puissances=false,NbLignes=2,Metre=false,Are=false,Capacite=false,Carre=false,Cube=false,Litre=false,Gramme=false,Fleches=false,FlechesB=false,FlechesH=false,Colonnes=false,Prefixes=false} \newcommand\Tableau[1][]{% \useKVdefault[ClesTableaux]% \setKV[ClesTableaux]{#1}% + % + %%% Clé Prefixes + % \ifboolKV[ClesTableaux]{Prefixes}{% - \setlength{\tabcolsep}{0.01\tabcolsep} - \begin{center} - \begin{tabular}{|*{12}{>{\centering\arraybackslash}m{3.25em}|}>{\columncolor{gray!15},}{c}|*{12}{>{\centering\arraybackslash}m{3.25em}|}} + \setlength{\tabcolsep}{0.01\tabcolsep}% + \begin{center}% + % + %%% Definition du tableau + % + \begin{tabular}{|*{\ifboolKV[ClesTableaux]{Milliards}{12}{% + \ifboolKV[ClesTableaux]{Millions}{9}{6}% + }}{>{\centering\arraybackslash}m{3.25em}|}>{\columncolor{gray!15}}{c}|*{% + \ifboolKV[ClesTableaux]{Micro}{6}{% + \ifboolKV[ClesTableaux]{Nano}{9}{3}% + }}% + {>{\centering\arraybackslash}m{3.25em}|}}% + % + %%% Prise en compte de la clé Partie + % \ifboolKV[ClesTableaux]{Partie}{% - \multicolumn{12}{c}{\bfseries Partie entière} - &\multicolumn{1}{c}{\cellcolor{gray!15},}% - &\multicolumn{12}{c}{\bfseries Partie décimale}\\}{} + \multicolumn{% + \ifboolKV[ClesTableaux]{Milliards}{12}{% + \ifboolKV[ClesTableaux]{Millions}{9}{6}% + }}{c}{\bfseries Partie entière} + &\multicolumn{1}{c}{\cellcolor{gray!15}\ifboolKV[ClesTableaux]{Virgule}{,}{}}% + &\multicolumn{% + \ifboolKV[ClesTableaux]{Micro}{6}{% + \ifboolKV[ClesTableaux]{Nano}{9}{3}% + }}% + {c}{\bfseries Partie décimale}\\}{}% + % + %%% Prise en compte de la clé Classes + % \ifboolKV[ClesTableaux]{Classes}{% - \hline% - \multicolumn{3}{|c|}{\cellcolor{\useKV[ClesTableaux]{CouleurG}}Classe - des milliards}% - &\multicolumn{3}{c|}{\cellcolor{\useKV[ClesTableaux]{CouleurM}}Classe + \hline + \ifboolKV[ClesTableaux]{Milliards}{% + \cline{1-12}\multicolumn{3}{|c|}{\cellcolor{\useKV[ClesTableaux]{CouleurG}}Classe des milliards}% + &\multicolumn{3}{c|}{\cellcolor{\useKV[ClesTableaux]{CouleurM}}Classe des millions}% + &}{% + \ifboolKV[ClesTableaux]{Millions}{% + \cline{1-9}\multicolumn{3}{|c|}{\cellcolor{\useKV[ClesTableaux]{CouleurM}}Classe des millions}% - &\multicolumn{3}{c|}{\cellcolor{\useKV[ClesTableaux]{Couleurm}}Classe + &}{% + \cline{1-6}}}% + \ifboolKV[ClesTableaux]{Milliards}{% + \multicolumn{3}{c|}}{% + \ifboolKV[ClesTableaux]{Millions}{% + \multicolumn{3}{c|}}{\multicolumn{3}{|c|}}}% + {\cellcolor{\useKV[ClesTableaux]{Couleurm}}Classe des milliers}% &\multicolumn{3}{c|}{\cellcolor{\useKV[ClesTableaux]{Couleuru}}Classe des unités}% - &&&&&&&&&&&&&\\}{} - \hline - % + &\ifboolKV[ClesTableaux]{Virgule}{,}{}% + &\multicolumn{% + \ifboolKV[ClesTableaux]{Micro}{6}{% + \ifboolKV[ClesTableaux]{Nano}{9}{3}% + }}% + {c|}{}\\}{}% + % + %%% Valeurs par défaut + % + \hline% + \ifboolKV[ClesTableaux]{Milliards}{% &% &\fontsize{8.5}{8.5}\selectfont giga% &% &% &\fontsize{8.5}{8.5}\selectfont méga% &% + }{% + \ifboolKV[ClesTableaux]{Millions}{% + &% + &\fontsize{8.5}{8.5}\selectfont méga% + &% + }{% + }}% &% &\fontsize{8.5}{8.5}\selectfont kilo% &\fontsize{8.5}{8.5}\selectfont hecto% &\fontsize{8.5}{8.5}\selectfont déca% &\fontsize{8.5}{8.5}\selectfont unités% - &% + &\ifboolKV[ClesTableaux]{Virgule}{,}{}% &\fontsize{8.5}{8.5}\selectfont deci% &\fontsize{8.5}{8.5}\selectfont centi% - &\fontsize{8.5}{8.5}\selectfont milli% + &\fontsize{8.5}{8.5}\selectfont milli% + \ifboolKV[ClesTableaux]{Micro}{&% &% + &\fontsize{8.5}{8.5}\selectfont micro\\}{% + \ifboolKV[ClesTableaux]{Nano}{&% &% &\fontsize{8.5}{8.5}\selectfont micro% &% &% - &\fontsize{8.5}{8.5}\selectfont nano% + &\fontsize{8.5}{8.5}\selectfont nano\\}{\\}% + }% + % + %%% Prise en compte de la clé Nombres + % + \ifboolKV[ClesTableaux]{Nombres}{% + \ifboolKV[ClesTableaux]{Milliards}{% + \fontsize{4.5}{4.5}\selectfont\num{100000000000}% + &\fontsize{4.5}{4.5}\selectfont\num{10000000000}% + &\fontsize{4.5}{4.5}\selectfont\num{1000000000}% + &\fontsize{4.5}{4.5}\selectfont \num{100000000}% + &\fontsize{4.5}{4.5}\selectfont \num{10000000}% + &\fontsize{4.5}{4.5}\selectfont \num{1000000}% &% + }{} + \ifboolKV[ClesTableaux]{Millions}{% + \fontsize{4.5}{4.5}\selectfont \num{100000000}% + &\fontsize{4.5}{4.5}\selectfont \num{10000000}% + &\fontsize{4.5}{4.5}\selectfont \num{1000000}% &% - &\\ - \ifboolKV[ClesTableaux]{Nombres}{% + }{} + \fontsize{4.5}{4.5}\selectfont \num{100000}% + &\fontsize{4.5}{4.5}\selectfont \num{10000}% + &\fontsize{4.5}{4.5}\selectfont \num{1000}% + &\fontsize{4.5}{4.5}\selectfont \num{100}% + &\fontsize{4.5}{4.5}\selectfont \num{10}% + &\fontsize{4.5}{4.5}\selectfont \num{1}% + &\ifboolKV[ClesTableaux]{Virgule}{,}{}% + &\fontsize{4.5}{4.5}\selectfont \num{0,1} ou $\dfrac{\strut1}{\strut10}$% + &\fontsize{4.5}{4.5}\selectfont \num{0,01} ou $\dfrac{\strut1}{\strut100}$% + &\fontsize{4.5}{4.5}\selectfont \num{0,001} ou $\dfrac{\strut1}{\strut\num{1000}}$% + \ifboolKV[ClesTableaux]{Micro}{% + &\fontsize{4.5}{4.5}\selectfont \num{0,0001} ou $\dfrac{\strut1}{\strut\num{10000}}$% + &\fontsize{4.5}{4.5}\selectfont \num{0,00001} ou $\dfrac{\strut1}{\strut\num{100000}}$% + &\fontsize{4.5}{4.5}\selectfont \num{0,000001} ou $\dfrac{\strut1}{\strut\num{1000000}}$% + }{% + \ifboolKV[ClesTableaux]{Nano}{% + &\fontsize{4.5}{4.5}\selectfont \num{0,0001} ou $\dfrac{\strut1}{\strut\num{10000}}$% + &\fontsize{4.5}{4.5}\selectfont \num{0,00001} ou $\dfrac{\strut1}{\strut\num{100000}}$% + &\fontsize{4.5}{4.5}\selectfont \num{0,000001} ou $\dfrac{\strut1}{\strut\num{1000000}}$% + &\fontsize{4.5}{4.5}\selectfont \num{0,0000001} ou $\dfrac{\strut1}{\strut\num{10000000}}$% + &\fontsize{4.5}{4.5}\selectfont \num{0,00000001} ou $\dfrac{\strut1}{\strut\num{100000000}}$% + &\fontsize{4.5}{4.5}\selectfont \num{0,000000001} ou $\dfrac{\strut1}{\strut\num{1000000000}}$% + }{}% + }{}\\}{}% + % + %%% Prise en compte de la clé Puissances + % + \ifboolKV[ClesTableaux]{Puissances}{% + \ifboolKV[ClesTableaux]{Milliards}{% &% &\fontsize{4.5}{4.5}\selectfont $\times10^{9}$% &% &% &\fontsize{4.5}{4.5}\selectfont $\times10^{6}$% + & + }{% + \ifboolKV[ClesTableaux]{Millions}{% &% + &\fontsize{4.5}{4.5}\selectfont $\times10^{6}$% + & + }{% + }}% &% &\fontsize{4.5}{4.5}\selectfont $\times10^3$% &\fontsize{4.5}{4.5}\selectfont $\times\num{10}^2$% &\fontsize{4.5}{4.5}\selectfont $\times\num{10}^1$% &\fontsize{4.5}{4.5}\selectfont $\times\num{1}$% + &\ifboolKV[ClesTableaux]{Virgule}{,}{}% + &\fontsize{4.5}{4.5}\selectfont $\times\num{10}^{-1}$% + &\fontsize{4.5}{4.5}\selectfont $\times\num{10}^{-2}$% + &\fontsize{4.5}{4.5}\selectfont $\times\num{10}^{-3}$% + \ifboolKV[ClesTableaux]{Micro}{&% &% - &\fontsize{4.5}{4.5}\selectfont$\times\num{10}^{-1}$% - &\fontsize{4.5}{4.5}\selectfont$\times\num{10}^{-2}$% - &\fontsize{4.5}{4.5}\selectfont$\times\num{10}^{-3}$% - &% + &\fontsize{4.5}{4.5}\selectfont $\times\num{10}^{-6}$}{% + \ifboolKV[ClesTableaux]{Nano}{&% &% &\fontsize{4.5}{4.5}\selectfont $\times\num{10}^{-6}$% &% &% - &\fontsize{4.5}{4.5}\selectfont $\times\num{10}^{-9}$% - & - & - &\\ - }{} - \hline - &&&&&&&&&&&&&&&&&&&&&&&&\\ - &&&&&&&&&&&&&&&&&&&&&&&&\\ - \end{tabular} - \end{center} - \setlength{\tabcolsep}{100\tabcolsep} + &\fontsize{4.5}{4.5}\selectfont $\times\num{10}^{-9}$}{}% + }% + \\% + }{}% + % + %%% Lignes vierges + % + \hline% + \xintFor* ##1 in {\xintSeq{1}{\useKV[ClesTableaux]{NbLignes}}}\do{% + \ifboolKV[ClesTableaux]{Milliards}{% + &&&&&&% + }{% + \ifboolKV[ClesTableaux]{Millions}{% + &&&% + }{% + }}% + &&&&&&,&&&% + \ifboolKV[ClesTableaux]{Micro}{&&&}{% + \ifboolKV[ClesTableaux]{Nano}{&&&&&&}{}% + } + \\}% + \end{tabular}% + \end{center}% + \setlength{\tabcolsep}{100\tabcolsep}% }{}% + % + %%% Clé Entiers + % \ifboolKV[ClesTableaux]{Entiers}{% - \setlength{\tabcolsep}{0.01\tabcolsep} - \begin{center} - \begin{tabular}{|*{12}{>{\centering\arraybackslash}m{4.75em}|}} - \ifboolKV[ClesTableaux]{Classes}{\hline\multicolumn{3}{|c|}{\cellcolor{\useKV[ClesTableaux]{CouleurG}}Classe - des milliards}% - &\multicolumn{3}{c|}{\cellcolor{\useKV[ClesTableaux]{CouleurM}}Classe - des millions}% - &\multicolumn{3}{c|}{\cellcolor{\useKV[ClesTableaux]{Couleurm}}Classe + \setlength{\tabcolsep}{0.01\tabcolsep}% + \begin{center}% + % + %%% Definition du tableau + % + \begin{tabular}{|*{% + \ifboolKV[ClesTableaux]{Milliards}{12}{% + \ifboolKV[ClesTableaux]{Millions}{9}{6}% + }% + }{>{\centering\arraybackslash}m{4.75em}|}}% + \ifboolKV[ClesTableaux]{Classes}{% + \hline + \ifboolKV[ClesTableaux]{Milliards}{\multicolumn{3}{|c}{\cellcolor{\useKV[ClesTableaux]{CouleurG}}Classe des milliards}&\multicolumn{3}{|c}{\cellcolor{\useKV[ClesTableaux]{CouleurM}}Classe des millions}&}{} + \ifboolKV[ClesTableaux]{Millions}{\multicolumn{3}{|c}{\cellcolor{\useKV[ClesTableaux]{CouleurM}}Classe des millions}&}{} + \multicolumn{3}{|c|}{\cellcolor{\useKV[ClesTableaux]{Couleurm}}Classe des milliers}% &\multicolumn{3}{c|}{\cellcolor{\useKV[ClesTableaux]{Couleuru}}Classe des unités}\\}{} \hline + \ifboolKV[ClesTableaux]{Milliards}{% \fontsize{4.5}{4.5}\selectfont centaines de milliards% &\fontsize{4.5}{4.5}\selectfont dizaines de milliards% &\fontsize{4.5}{4.5}\selectfont unités de milliards% &\fontsize{4.5}{4.5}\selectfont centaines de millions% &\fontsize{4.5}{4.5}\selectfont dizaines de millions% &\fontsize{4.5}{4.5}\selectfont unités de millions% - &\fontsize{4.5}{4.5}\selectfont centaines de milliers% + & + }{} + \ifboolKV[ClesTableaux]{Millions}{% + \fontsize{4.5}{4.5}\selectfont centaines de millions% + &\fontsize{4.5}{4.5}\selectfont dizaines de millions% + &\fontsize{4.5}{4.5}\selectfont unités de millions% + & + }{} + \fontsize{4.5}{4.5}\selectfont centaines de milliers% &\fontsize{4.5}{4.5}\selectfont dizaines de milliers% &\fontsize{4.5}{4.5}\selectfont unités de milliers% &\fontsize{4.5}{4.5}\selectfont centaines% &\fontsize{4.5}{4.5}\selectfont dizaines% &\fontsize{4.5}{4.5}\selectfont unités\\% \ifboolKV[ClesTableaux]{Nombres}{% - \fontsize{4.5}{4.5}\selectfont \num{100000000000}% - &\fontsize{4.5}{4.5}\selectfont \num{10000000000}% - &\fontsize{4.5}{4.5}\selectfont \num{1000000000}% + \ifboolKV[ClesTableaux]{Milliards}{% + \fontsize{4.5}{4.5}\selectfont\num{100000000000}% + &\fontsize{4.5}{4.5}\selectfont\num{10000000000}% + &\fontsize{4.5}{4.5}\selectfont\num{1000000000}% &\fontsize{4.5}{4.5}\selectfont \num{100000000}% &\fontsize{4.5}{4.5}\selectfont \num{10000000}% &\fontsize{4.5}{4.5}\selectfont \num{1000000}% - &\fontsize{4.5}{4.5}\selectfont \num{100000}% + &% + }{} + \ifboolKV[ClesTableaux]{Millions}{% + \fontsize{4.5}{4.5}\selectfont \num{100000000}% + &\fontsize{4.5}{4.5}\selectfont \num{10000000}% + &\fontsize{4.5}{4.5}\selectfont \num{1000000}% + &% + }{} + \fontsize{4.5}{4.5}\selectfont \num{100000}% &\fontsize{4.5}{4.5}\selectfont \num{10000}% &\fontsize{4.5}{4.5}\selectfont \num{1000}% &\fontsize{4.5}{4.5}\selectfont \num{100}% &\fontsize{4.5}{4.5}\selectfont \num{10}% &\fontsize{4.5}{4.5}\selectfont \num{1}% \\ - }{} - \hline - &&&&&&&&&&&\\ - &&&&&&&&&&&\\ - \end{tabular} - \end{center} - \setlength{\tabcolsep}{100\tabcolsep} + }{} + % + %%% Prise en compte de la clé Puissances + % + \ifboolKV[ClesTableaux]{Puissances}{% + \ifboolKV[ClesTableaux]{Milliards}{% + &% + &\fontsize{4.5}{4.5}\selectfont $\times10^{9}$% + &% + &% + &\fontsize{4.5}{4.5}\selectfont $\times10^{6}$% + & + }{% + \ifboolKV[ClesTableaux]{Millions}{% + &% + &\fontsize{4.5}{4.5}\selectfont $\times10^{6}$% + & + }{% + }}% + &% + &\fontsize{4.5}{4.5}\selectfont $\times10^3$% + &\fontsize{4.5}{4.5}\selectfont $\times\num{10}^2$% + &\fontsize{4.5}{4.5}\selectfont $\times\num{10}^1$% + &\fontsize{4.5}{4.5}\selectfont $\times\num{1}$% + \\% + }{}% + % + %%% Lignes vierges + % + \hline% + \xintFor* ##1 in {\xintSeq{1}{\useKV[ClesTableaux]{NbLignes}}}\do{% + \ifboolKV[ClesTableaux]{Milliards}{% + &&&&&&}{}% + \ifboolKV[ClesTableaux]{Millions}{% + &&&}{} + &&&&&\\}% + \end{tabular}% + \end{center}% + \setlength{\tabcolsep}{100\tabcolsep}% }{}% + % + %%% Clé Decimaux + % \ifboolKV[ClesTableaux]{Decimaux}{% - \setlength{\tabcolsep}{0.01\tabcolsep} - \ifboolKV[ClesTableaux]{Milliards}{% - \newcolumntype{X}{|*{12}{>{\centering\arraybackslash}m{4.75em}|}>{\columncolor{gray!15},}{c}|*{3}{>{\centering\arraybackslash}m{4.75em}|}}% - }{\ifboolKV[ClesTableaux]{Millions}{% - \newcolumntype{X}{|*{9}{>{\centering\arraybackslash}m{4.75em}|}>{\columncolor{gray!15},}{c}|*{3}{>{\centering\arraybackslash}m{4.75em}|}}% - }{\newcolumntype{X}{|*{6}{>{\centering\arraybackslash}m{4.75em}|}>{\columncolor{gray!15},}{c}|*{3}{>{\centering\arraybackslash}m{4.75em}|}}% - } - } - \begin{center} - \begin{tabular}{X} + \setlength{\tabcolsep}{0.01\tabcolsep}% + \begin{center}% + % + %%% Definition du tableau + % + \begin{tabular}{|*{\ifboolKV[ClesTableaux]{Milliards}{12}{% + \ifboolKV[ClesTableaux]{Millions}{9}{6}% + }}{>{\centering\arraybackslash}m{4.75em}|}>{\columncolor{gray!15}}{c}|*{3}% + {>{\centering\arraybackslash}m{4.75em}|}}% + % + %%% Prise en compte de la clé Partie + % \ifboolKV[ClesTableaux]{Partie}{% - \ifboolKV[ClesTableaux]{Milliards}{\multicolumn{12}{c}{\bfseries Partie entière}}{\ifboolKV[ClesTableaux]{Millions}{\multicolumn{9}{c}{\bfseries Partie entière}}{\multicolumn{6}{c}{\bfseries Partie entière}}} - &\multicolumn{1}{c}{\cellcolor{gray!15},}% + \ifboolKV[ClesTableaux]{Milliards}{% + \multicolumn{12}{c}{\bfseries Partie entière}}{% + \ifboolKV[ClesTableaux]{Millions}{% + \multicolumn{9}{c}{\bfseries Partie entière}}{% + \multicolumn{6}{c}{\bfseries Partie entière}}}% + &\multicolumn{1}{c}{\cellcolor{gray!15}\ifboolKV[ClesTableaux]{Virgule}{,}{}}% &\multicolumn{3}{c}{\bfseries Partie décimale}\\}{} + % + %%% Prise en compte de la clé Classes + % \ifboolKV[ClesTableaux]{Classes}{% \hline% - \ifboolKV[ClesTableaux]{Milliards}{\multicolumn{3}{|c}{\cellcolor{\useKV[ClesTableaux]{CouleurG}}Classe des milliards}\uppercase{&}\multicolumn{3}{|c}{\cellcolor{\useKV[ClesTableaux]{CouleurM}}Classe des millions}\uppercase{&}}{} - \ifboolKV[ClesTableaux]{Millions}{\multicolumn{3}{|c}{\cellcolor{\useKV[ClesTableaux]{CouleurM}}Classe des millions}\uppercase{&}}{} - \multicolumn{3}{|c|}{\cellcolor{\useKV[ClesTableaux]{Couleurm}}Classe + \ifboolKV[ClesTableaux]{Milliards}{% + \multicolumn{3}{|c|}{\cellcolor{\useKV[ClesTableaux]{CouleurG}}Classe des milliards}&\multicolumn{3}{c|}{\cellcolor{\useKV[ClesTableaux]{CouleurM}}Classe des millions}&}{}% + \ifboolKV[ClesTableaux]{Millions}{% + \multicolumn{3}{|c|}{\cellcolor{\useKV[ClesTableaux]{CouleurM}}Classe des millions}&}{}% + \ifboolKV[ClesTableaux]{Milliards}{% + \multicolumn{3}{c|}}{% + \ifboolKV[ClesTableaux]{Millions}{% + \multicolumn{3}{c|}}{\multicolumn{3}{|c|}}}% + {\cellcolor{\useKV[ClesTableaux]{Couleurm}}Classe des milliers}% &\multicolumn{3}{c|}{\cellcolor{\useKV[ClesTableaux]{Couleuru}}Classe des unités}% - &&&&\\}{} + &\ifboolKV[ClesTableaux]{Virgule}{,}{}&\multicolumn{3}{c|}{}\\}{} + % + %%% Valeurs ci-dessous par défaut + % \hline \ifboolKV[ClesTableaux]{Milliards}{% \fontsize{4.5}{4.5}\selectfont centaines de milliards% - \uppercase{&}\fontsize{4.5}{4.5}\selectfont dizaines de milliards% - \uppercase{&}\fontsize{4.5}{4.5}\selectfont unités de milliards% - \uppercase{&}\fontsize{4.5}{4.5}\selectfont centaines de millions% - \uppercase{&}\fontsize{4.5}{4.5}\selectfont dizaines de millions% - \uppercase{&}\fontsize{4.5}{4.5}\selectfont unités de millions% - \uppercase{&} + &\fontsize{4.5}{4.5}\selectfont dizaines de milliards% + &\fontsize{4.5}{4.5}\selectfont unités de milliards% + &\fontsize{4.5}{4.5}\selectfont centaines de millions% + &\fontsize{4.5}{4.5}\selectfont dizaines de millions% + &\fontsize{4.5}{4.5}\selectfont unités de millions% + & }{} \ifboolKV[ClesTableaux]{Millions}{% \fontsize{4.5}{4.5}\selectfont centaines de millions% - \uppercase{&}\fontsize{4.5}{4.5}\selectfont dizaines de millions% - \uppercase{&}\fontsize{4.5}{4.5}\selectfont unités de millions% - \uppercase{&} + &\fontsize{4.5}{4.5}\selectfont dizaines de millions% + &\fontsize{4.5}{4.5}\selectfont unités de millions% + & }{} \fontsize{4.5}{4.5}\selectfont centaines de milliers% &\fontsize{4.5}{4.5}\selectfont dizaines de milliers% @@ -10828,53 +12315,84 @@ vardef Positions(expr Step)= &\fontsize{4.5}{4.5}\selectfont centaines% &\fontsize{4.5}{4.5}\selectfont dizaines% &\fontsize{4.5}{4.5}\selectfont unités% - &% + &\ifboolKV[ClesTableaux]{Virgule}{,}{}% &\fontsize{4.5}{4.5}\selectfont dixièmes% &\fontsize{4.5}{4.5}\selectfont centièmes% &\fontsize{4.5}{4.5}\selectfont millièmes\\ \ifboolKV[ClesTableaux]{Nombres}{% \ifboolKV[ClesTableaux]{Milliards}{% \fontsize{4.5}{4.5}\selectfont\num{100000000000}% - \uppercase{&}\fontsize{4.5}{4.5}\selectfont\num{10000000000}% - \uppercase{&}\fontsize{4.5}{4.5}\selectfont\num{1000000000}% - \uppercase{&}\fontsize{4.5}{4.5}\selectfont \num{100000000}% - \uppercase{&}\fontsize{4.5}{4.5}\selectfont \num{10000000}% - \uppercase{&}\fontsize{4.5}{4.5}\selectfont \num{1000000}% - \uppercase{&}% + &\fontsize{4.5}{4.5}\selectfont\num{10000000000}% + &\fontsize{4.5}{4.5}\selectfont\num{1000000000}% + &\fontsize{4.5}{4.5}\selectfont \num{100000000}% + &\fontsize{4.5}{4.5}\selectfont \num{10000000}% + &\fontsize{4.5}{4.5}\selectfont \num{1000000}% + &% }{} \ifboolKV[ClesTableaux]{Millions}{% \fontsize{4.5}{4.5}\selectfont \num{100000000}% - \uppercase{&}\fontsize{4.5}{4.5}\selectfont \num{10000000}% - \uppercase{&}\fontsize{4.5}{4.5}\selectfont \num{1000000}% - \uppercase{&}% - }{} + &\fontsize{4.5}{4.5}\selectfont \num{10000000}% + &\fontsize{4.5}{4.5}\selectfont \num{1000000}% + &% + }{} \fontsize{4.5}{4.5}\selectfont \num{100000}% &\fontsize{4.5}{4.5}\selectfont \num{10000}% &\fontsize{4.5}{4.5}\selectfont \num{1000}% &\fontsize{4.5}{4.5}\selectfont \num{100}% &\fontsize{4.5}{4.5}\selectfont \num{10}% &\fontsize{4.5}{4.5}\selectfont \num{1}% - &% + &\ifboolKV[ClesTableaux]{Virgule}{,}{}% &\fontsize{4.5}{4.5}\selectfont \num{0,1} ou $\dfrac{\strut1}{\strut10}$% &\fontsize{4.5}{4.5}\selectfont \num{0,01} ou $\dfrac{\strut1}{\strut100}$% &\fontsize{4.5}{4.5}\selectfont \num{0,001} ou $\dfrac{\strut1}{\strut\num{1000}}$% \\ + }{}% + % + %%% Prise en compte de la clé Puissances + % + \ifboolKV[ClesTableaux]{Puissances}{% + \ifboolKV[ClesTableaux]{Milliards}{% + &% + &\fontsize{4.5}{4.5}\selectfont $\times10^{9}$% + &% + &% + &\fontsize{4.5}{4.5}\selectfont $\times10^{6}$% + & + }{% + \ifboolKV[ClesTableaux]{Millions}{% + &% + &\fontsize{4.5}{4.5}\selectfont $\times10^{6}$% + & + }{% + }}% + &% + &\fontsize{4.5}{4.5}\selectfont $\times10^3$% + &\fontsize{4.5}{4.5}\selectfont $\times\num{10}^2$% + &\fontsize{4.5}{4.5}\selectfont $\times\num{10}^1$% + &\fontsize{4.5}{4.5}\selectfont $\times\num{1}$% + &\ifboolKV[ClesTableaux]{Virgule}{,}{}% + &\fontsize{4.5}{4.5}\selectfont $\times\num{10}^{-1}$% + &\fontsize{4.5}{4.5}\selectfont $\times\num{10}^{-2}$% + &\fontsize{4.5}{4.5}\selectfont $\times\num{10}^{-3}$% + \\% }{} - \hline - \ifboolKV[ClesTableaux]{Milliards}{% - \uppercase{&}\uppercase{&}\uppercase{&}\uppercase{&}\uppercase{&}\uppercase{&}}{} % - \ifboolKV[ClesTableaux]{Millions}{% - \uppercase{&}\uppercase{&}\uppercase{&}}{} - &&&&&&&&&\\ - \ifboolKV[ClesTableaux]{Milliards}{% - \uppercase{&}\uppercase{&}\uppercase{&}\uppercase{&}\uppercase{&}\uppercase{&}}{} % + \hline% + % + %%% Lignes vierges + % + \xintFor* ##1 in {\xintSeq{1}{\useKV[ClesTableaux]{NbLignes}}}\do{% + \ifboolKV[ClesTableaux]{Milliards}{% + &&&&&&}{}% \ifboolKV[ClesTableaux]{Millions}{% - \uppercase{&}\uppercase{&}\uppercase{&}}{} - &&&&&&&&&\\ + &&&}{} + &&&&&&,&&&\\} \end{tabular} - \end{center} - \setlength{\tabcolsep}{100\tabcolsep} - }{} + \end{center}% + \setlength{\tabcolsep}{100\tabcolsep}% + }{}% + % + %%% Prise en compte de la clé Metre + % \ifboolKV[ClesTableaux]{Metre}{% \[\renewcommand{\arraystretch}{1.15}% \begin{tabular}{|*{7}{p{7.5mm}|}}% @@ -10888,7 +12406,8 @@ vardef Positions(expr Step)= \hline \multicolumn{1}{|c|}{km}&\multicolumn{1}{c|}{hm}&\multicolumn{1}{c|}{dam}&\multicolumn{1}{c|}{m}&\multicolumn{1}{c|}{dm}&\multicolumn{1}{c|}{cm}&\multicolumn{1}{c|}{mm}\\ \hline - &&&&&&\\ + \xintFor* ##1 in {\xintSeq{1}{\useKV[ClesTableaux]{NbLignes}}}\do{% + &&&&&&\\} \multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (G1);}}% &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (F1);}}% &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (E1);}}% @@ -10896,33 +12415,25 @@ vardef Positions(expr Step)= &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (C1);}}% &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (B1);}}% &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (A1);}}\\% - \end{tabular} - \] - \ifboolKV[ClesTableaux]{Fleches}{% - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (A) to node[above, midway]{\small$\times\mbox{10}$}(B);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (B) to node[above, midway]{\small$\times\mbox{10}$}(C);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (C) to node[above, midway]{\small$\times\mbox{10}$}(D);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (D) to node[above, midway]{\small$\times\mbox{10}$}(E);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (E) to node[above, midway]{\small$\times\mbox{10}$}(F);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (F) to node[above, midway]{\small$\times\mbox{10}$}(G);} - % bas - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (A1) to node[below, midway]{\small$\div\mbox{10}$}(B1);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (B1) to node[below, midway]{\small$\div\mbox{10}$}(C1);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (C1) to node[below, midway]{\small$\div\mbox{10}$}(D1);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (D1) to node[below, midway]{\small$\div\mbox{10}$}(E1);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (E1) to node[below, midway]{\small$\div\mbox{10}$}(F1);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (F1) to node[below, midway]{\small$\div\mbox{10}$}(G1);} - }{} - } - {} + \end{tabular}% + \]% + \Conversion{10}% + }% + {}% + % + %%% Prise en compte de la clé Carre + % \ifboolKV[ClesTableaux]{Carre}{% \[\renewcommand{\arraystretch}{1.15}% \ifboolKV[ClesTableaux]{Colonnes}{% - \newcolumntype{X}{|*{7}{p{2.5mm}!{\color{gray!50}\vrule}p{2.5mm}|}}% + \newcolumntype{X}{|*{7}{>{\centering\arraybackslash}p{3.5mm}!{\color{gray!50}\vrule}>{\centering\arraybackslash}p{3.5mm}|}}% }{% - \newcolumntype{X}{|*{7}{p{2.5mm}p{2.5mm}|}} - } - \begin{tabular}{X} + \ifboolKV[ClesTableaux]{Are}{% + \newcolumntype{X}{|*{7}{>{\centering\arraybackslash}p{3.5mm}!{\color{gray!50}\vrule}>{\centering\arraybackslash}p{3.5mm}|}}% + }{ + \newcolumntype{X}{|*{7}{p{3.5mm}p{3.5mm}|}}% + }}% + \begin{tabular}{X}% \multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate (A);}}% &\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate (B);}}% &\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate (C);}}% @@ -10931,9 +12442,14 @@ vardef Positions(expr Step)= &\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate (F);}}% &\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate (G);}}\\% \hline - \multicolumn{2}{|c|}{km$^2$}&\multicolumn{2}{c|}{hm$^2$}&\multicolumn{2}{c|}{dam$^2$}&\multicolumn{2}{c|}{m$^2$}&\multicolumn{2}{c|}{dm$^2$}&\multicolumn{2}{c|}{cm$^2$}&\multicolumn{2}{c|}{mm$^2$}\\ - \hline - &&&&&&&&&&&&&\\ + \multicolumn{2}{|c|}{km$^2$}&\multicolumn{2}{c|}{hm$^2$}&\multicolumn{2}{c|}{dam$^2$}&\multicolumn{2}{c|}{m$^2$}&\multicolumn{2}{c|}{dm$^2$}&\multicolumn{2}{c|}{cm$^2$}&\multicolumn{2}{c|}{mm$^2$}\\% + \ifboolKV[ClesTableaux]{Are}{% + \cline{3-6} + \multicolumn{2}{|c|}{}&&{\scriptsize ha}&&{\scriptsize a}&\multicolumn{2}{c|}{}&\multicolumn{2}{c|}{}&\multicolumn{2}{c|}{}&\multicolumn{2}{c|}{}\\ + }{} + \hline + \xintFor* ##1 in {\xintSeq{1}{\useKV[ClesTableaux]{NbLignes}}}\do{% + &&&&&&&&&&&&&\\} \multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=0.6em] (G1);}}% &\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=0.6em] (F1);}}% &\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=0.6em] (E1);}}% @@ -10942,32 +12458,23 @@ vardef Positions(expr Step)= &\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=0.6em] (B1);}}% &\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=0.6em] (A1);}}\\% \end{tabular} - \] - \ifboolKV[ClesTableaux]{Fleches}{% - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (A) to node[above, midway]{\small$\times\mbox{100}$}(B);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (B) to node[above, midway]{\small$\times\mbox{100}$}(C);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (C) to node[above, midway]{\small$\times\mbox{100}$}(D);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (D) to node[above, midway]{\small$\times\mbox{100}$}(E);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (E) to node[above, midway]{\small$\times\mbox{100}$}(F);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (F) to node[above, midway]{\small$\times\mbox{100}$}(G);} - % bas - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (A1) to node[below, midway]{\small$\div\mbox{100}$}(B1);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (B1) to node[below, midway]{\small$\div\mbox{100}$}(C1);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (C1) to node[below, midway]{\small$\div\mbox{100}$}(D1);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (D1) to node[below, midway]{\small$\div\mbox{100}$}(E1);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (E1) to node[below, midway]{\small$\div\mbox{100}$}(F1);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (F1) to node[below, midway]{\small$\div\mbox{100}$}(G1);} - }{}% - }% - {}% + \]% + \Conversion{100}% + }{}% + % + %%% Prise en compte de la clé Cube + % \ifboolKV[ClesTableaux]{Cube}{% \setlength{\tabcolsep}{0.625\tabcolsep}% - \ifboolKV[ClesTableaux]{Colonnes}{% - \newcolumntype{X}{|*{7}{p{2.5mm}!{\color{gray!50}\vrule}p{2.5mm}!{\color{gray!50}\vrule}p{2.5mm}|}}% + \ifboolKV[ClesTableaux]{Colonnes}{% + \newcolumntype{X}{|*{7}{>{\centering\arraybackslash}p{3.5mm}!{\color{gray!50}\vrule}>{\centering\arraybackslash}p{3.5mm}!{\color{gray!50}\vrule}>{\centering\arraybackslash}p{3.5mm}|}}% }{% - \newcolumntype{X}{|*{7}{p{2.5mm}p{2.5mm}p{2.5mm}|}}% - } - \[\renewcommand{\arraystretch}{1.15} + \ifboolKV[ClesTableaux]{Capacite}{% + \newcolumntype{X}{|*{7}{>{\centering\arraybackslash}p{3.5mm}!{\color{gray!50}\vrule}>{\centering\arraybackslash}p{3.5mm}!{\color{gray!50}\vrule}>{\centering\arraybackslash}p{3.5mm}|}}% + }{% + \newcolumntype{X}{|*{7}{p{3.5mm}p{3.5mm}p{3.5mm}|}}% + }}% + \[\renewcommand{\arraystretch}{1.15}% \begin{tabular}{X} \multicolumn{3}{c}{\tikz[remember picture,overlay]{\coordinate (A);}}% &\multicolumn{3}{c}{\tikz[remember picture,overlay]{\coordinate (B);}}% @@ -10978,8 +12485,14 @@ vardef Positions(expr Step)= &\multicolumn{3}{c}{\tikz[remember picture,overlay]{\coordinate (G);}}\\% \hline \multicolumn{3}{|c|}{km$^3$}&\multicolumn{3}{c|}{hm$^3$}&\multicolumn{3}{c|}{dam$^3$}&\multicolumn{3}{c|}{m$^3$}&\multicolumn{3}{c|}{dm$^3$}&\multicolumn{3}{c|}{cm$^3$}&\multicolumn{3}{c|}{mm$^3$}\\ + \ifboolKV[ClesTableaux]{Capacite}{% + \cline{10-15} + \multicolumn{3}{|c|}{}&\multicolumn{3}{c|}{}&\multicolumn{3}{c|}{}&{\scriptsize hL}&{\scriptsize daL}&{\scriptsize L}&{\scriptsize dL}&{\scriptsize cL}&{\scriptsize mL}&\multicolumn{3}{c|}{}&\multicolumn{3}{c|}{}\\ + }{}% \hline + \xintFor* ##1 in {\xintSeq{1}{\useKV[ClesTableaux]{NbLignes}}}\do{% &&&&&&&&&&&&&&&&&&&&\\ + }% \multicolumn{3}{c}{\tikz[remember picture,overlay,yshift=\ht\strutbox]{\coordinate (G1);}}% &\multicolumn{3}{c}{\tikz[remember picture,overlay,yshift=\ht\strutbox]{\coordinate (F1);}}% &\multicolumn{3}{c}{\tikz[remember picture,overlay,yshift=\ht\strutbox]{\coordinate (E1);}}% @@ -10988,75 +12501,41 @@ vardef Positions(expr Step)= &\multicolumn{3}{c}{\tikz[remember picture,overlay,yshift=\ht\strutbox]{\coordinate (B1);}}% &\multicolumn{3}{c}{\tikz[remember picture,overlay,yshift=\ht\strutbox]{\coordinate (A1);}}\\% \end{tabular} - \] - \setlength{\tabcolsep}{1.6\tabcolsep} - \ifboolKV[ClesTableaux]{Fleches}{% - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] - (A) to node[above, midway]{$\times\mbox{\num{1000}}$}(B);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (B) to - node[above, midway]{$\times\mbox{\num{1000}}$}(C);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (C) to - node[above, midway]{$\times\mbox{\num{1000}}$}(D);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (D) to - node[above, midway]{$\times\mbox{\num{1000}}$}(E);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (E) to - node[above, midway]{$\times\mbox{\num{1000}}$}(F);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (F) to - node[above, midway]{$\times\mbox{\num{1000}}$}(G);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (A1) to - node[below, midway]{$\div\mbox{\num{1000}}$}(B1);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (B1) to - node[below, midway]{$\div\mbox{\num{1000}}$}(C1);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (C1) to - node[below, midway]{$\div\mbox{\num{1000}}$}(D1);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (D1) to - node[below, midway]{$\div\mbox{\num{1000}}$}(E1);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (E1) to - node[below, midway]{$\div\mbox{\num{1000}}$}(F1);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (F1) to - node[below, midway]{$\div\mbox{\num{1000}}$}(G1);} - }{} - } - {} + \]% + \setlength{\tabcolsep}{1.6\tabcolsep}% + \Conversion{1000}% + }{}% + % + %%% Prise en compte de la clé Litre + % \ifboolKV[ClesTableaux]{Litre}{% \[\renewcommand{\arraystretch}{1.15}% - \begin{tabular}{|*{7}{p{7.5mm}|}} + \begin{tabular}{|*{6}{p{7.5mm}|}} \multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate (A);}}% &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate (B);}}% &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate (C);}}% &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate (D);}}% &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate (E);}}% - &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate (F);}}% - &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate (G);}}\\% + &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate (F);}}\\% \hline - \multicolumn{1}{|c|}{kL}&\multicolumn{1}{c|}{hL}&\multicolumn{1}{c|}{daL}&\multicolumn{1}{c|}{L}&\multicolumn{1}{c|}{dL}&\multicolumn{1}{c|}{cL}&\multicolumn{1}{c|}{mL}\\ - \hline - &&&&&&\\ - \multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (G1);}}% - &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (F1);}} + \multicolumn{1}{|c|}{hL}&\multicolumn{1}{c|}{daL}&\multicolumn{1}{c|}{L}&\multicolumn{1}{c|}{dL}&\multicolumn{1}{c|}{cL}&\multicolumn{1}{c|}{mL}\\ + \hline + \xintFor* ##1 in {\xintSeq{1}{\useKV[ClesTableaux]{NbLignes}-1}}\do{% + &&&&&\\}% + &&&&&\\% + \multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (F1);}}% &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (E1);}}% &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (D1);}}% &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (C1);}}% &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (B1);}}% &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (A1);}}\\% \end{tabular} - \] - \ifboolKV[ClesTableaux]{Fleches}{% - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (A) to node[above, midway]{\small$\times\mbox{10}$}(B);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (B) to node[above, midway]{\small$\times\mbox{10}$}(C);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (C) to node[above, midway]{\small$\times\mbox{10}$}(D);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (D) to node[above, midway]{\small$\times\mbox{10}$}(E);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (E) to node[above, midway]{\small$\times\mbox{10}$}(F);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (F) to node[above, midway]{\small$\times\mbox{10}$}(G);} - % bas - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (A1) to node[below, midway]{\small$\div\mbox{10}$}(B1);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (B1) to node[below, midway]{\small$\div\mbox{10}$}(C1);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (C1) to node[below, midway]{\small$\div\mbox{10}$}(D1);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (D1) to node[below, midway]{\small$\div\mbox{10}$}(E1);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (E1) to node[below, midway]{\small$\div\mbox{10}$}(F1);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (F1) to node[below, midway]{\small$\div\mbox{10}$}(G1);} - }{}% + \]% + \Conversion{10}% }{}% + % + %%% Prise en compte de la clé Gramme + % \ifboolKV[ClesTableaux]{Gramme}{% \[\renewcommand{\arraystretch}{1.15}% \begin{tabular}{|*{7}{p{7.5mm}|}} @@ -11066,11 +12545,12 @@ vardef Positions(expr Step)= &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate (D);}}% &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate (E);}}% &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate (F);}}% - &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate (G);}} - \\% + &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate (G);}}\\% \hline \multicolumn{1}{|c|}{kg}&\multicolumn{1}{c|}{hg}&\multicolumn{1}{c|}{dag}&\multicolumn{1}{c|}{g}&\multicolumn{1}{c|}{dg}&\multicolumn{1}{c|}{cg}&\multicolumn{1}{c|}{mg}\\ \hline + \xintFor* ##1 in {\xintSeq{1}{\useKV[ClesTableaux]{NbLignes}-1}}\do{% + &&&&&&\\}% &&&&&&\\ \multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (G1);}}% &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (F1);}}% @@ -11080,21 +12560,483 @@ vardef Positions(expr Step)= &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (B1);}}% &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (A1);}}\\% \end{tabular} - \] - \ifboolKV[ClesTableaux]{Fleches}{% - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (A) to node[above, midway]{\small$\times\mbox{10}$}(B);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (B) to node[above, midway]{\small$\times\mbox{10}$}(C);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (C) to node[above, midway]{\small$\times\mbox{10}$}(D);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (D) to node[above, midway]{\small$\times\mbox{10}$}(E);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (E) to node[above, midway]{\small$\times\mbox{10}$}(F);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (F) to node[above, midway]{\small$\times\mbox{10}$}(G);} -% % bas - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (A1) to node[below, midway]{\small$\div\mbox{10}$}(B1);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (B1) to node[below, midway]{\small$\div\mbox{10}$}(C1);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (C1) to node[below, midway]{\small$\div\mbox{10}$}(D1);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (D1) to node[below, midway]{\small$\div\mbox{10}$}(E1);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (E1) to node[below, midway]{\small$\div\mbox{10}$}(F1);} - \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (F1) to node[below, midway]{\small$\div\mbox{10}$}(G1);} - }{}% + \]% + \Conversion{10}% + }{}% +}% + +\newcommand\Conversion[1]{% + \ifboolKV[ClesTableaux]{Fleches}{\setKV[ClesTableaux]{FlechesH,FlechesB}}{}% + \ifboolKV[ClesTableaux]{FlechesH}{% + \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (A) to node[above, midway]{\small$\times\num{#1}$}(B);}% + \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (B) to node[above, midway]{\small$\times\num{#1}$}(C);}% + \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (C) to node[above, midway]{\small$\times\num{#1}$}(D);}% + \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (D) to node[above, midway]{\small$\times\num{#1}$}(E);}% + \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (E) to node[above, midway]{\small$\times\num{#1}$}(F);}% + \ifboolKV[ClesTableaux]{Litre}{}{\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (F) to node[above, midway]{\small$\times\num{#1}$}(G);}% + }% }{}% + \ifboolKV[ClesTableaux]{FlechesB}{% + \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (A1) to node[below, midway]{\small$\div\num{#1}$}(B1);}% + \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (B1) to node[below, midway]{\small$\div\num{#1}$}(C1);}% + \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (C1) to node[below, midway]{\small$\div\num{#1}$}(D1);}% + \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (D1) to node[below, midway]{\small$\div\num{#1}$}(E1);}% + \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (E1) to node[below, midway]{\small$\div\num{#1}$}(F1);}% + \ifboolKV[ClesTableaux]{Litre}{}{\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (F1) to node[below, midway]{\small$\div\num{#1}$}(G1);}}% + }{}% +}% + +%%% +% Cards +%%% +\newtcolorbox{Mybox}[3]{% + enhanced, + nobeforeafter, + left=0pt,right=0pt,top=0pt, + text fill, + width=\largeurcarte, + height=\hauteurcarte, + arc=5pt, + overlay unbroken and first={% + \coordinate[yshift=-0.5\hauteurtitre] (A1) at (frame.north west); + \coordinate[yshift=-0.5\hauteurtitre] (B1) at (frame.north east); + \coordinate[yshift=-\hauteurtitre] (A) at (frame.north west); + \coordinate[yshift=-\hauteurtitre] (B) at (frame.north east); + \coordinate[xshift=1.5pt,yshift=8mm] (S1) at (frame.south west); + \coordinate[xshift=-1.5pt,yshift=8mm] (S2) at (frame.south east); + \coordinate[xshift=3mm+(\largeurtitre/2)] (A2) at (A1); + \coordinate[xshift=-3mm-(\largeurtitre/2)] (B2) at (B1); + \node[rounded corners, draw=black, rectangle,minimum height=1cm,text width=\largeurtitre,fill=TrameCouleur] (T1) at (A2){}; + \node[TexteCouleur] (T1a) at (T1){\Large #1}; + \node[yshift=-0.65cm] (T1b) at (T1){\tiny réponse précédente}; + \node[inner sep=0pt,rounded corners, rectangle, draw=black,minimum height=1cm,text width=\largeurtitre,fill=TrameCouleur] (T2) at (B2){}; + \node[inner sep=0pt,TexteCouleur] (T2a) at (T2){ + \begin{minipage}{\largeurtitre} + \begin{center} + #2 + \end{center} + \end{minipage} + }; + \node[yshift=-0.65cm] (T2b) at (T2){}; + \ifboolKV[Cards]{Titre}{\node[] at (T2b) {\tiny\useKV[Cards]{NomTitre}};}{}, + \node[rectangle,xshift=5mm,yshift=4.25mm,minimum width=2em,rounded corners,fill=TrameCouleur,draw=black] (R) at (frame.south west) {\color{black}\Large\bfseries #3}; + \draw[dashed] (S1) -- (S2); + }, + colback=white, + colbacktitle=TrameCouleur, +} + +\usetikzlibrary{backgrounds} + +\makeatletter +%https://tex.stackexchange.com/questions/347434/clip-background-image-inside-tcolorbox +\newtcolorbox{MyboxSimpleAv}[1]{% + enhanced, + nobeforeafter, + left=0pt,right=0pt,top=\hauteurtitre,bottom=0pt, + text fill, + width=\largeurcarte, + height=\hauteurcarte, + arc=5pt, + colback=white, + underlay={% + \ifboolKV[Cards]{BackgroundAv}{% + \begin{tcbclipinterior} + \node[anchor=center,opacity=1] + at (interior.center) {% + \includegraphics[% + height=\tcb@height, + width=\tcb@width, + ]{\useKV[Cards]{ImageAv}}}; + \end{tcbclipinterior}, + }{} + }, + overlay unbroken and first={% + \coordinate[yshift=-0.5\hauteurtitre] (A) at (frame.north); + \node[rounded corners, draw=black, rectangle,minimum height=1cm,text width=\largeurcarte-6mm,fill=TrameCouleur] (T1) at + (A){\begin{minipage}{\largeurcarte-6mm} + \begin{center} + #1 + \end{center} + \end{minipage}}; + \node[yshift=-0.5em-0.5\hauteurtitre] (B) at (A){}; + \ifboolKV[Cards]{Titre}{\node[fill=white] at (B) {\useKV[Cards]{NomTitre}};}{}, + } +} + +\newtcolorbox{MyboxSimpleAr}[1]{% + enhanced, + nobeforeafter, + left=0pt,right=0pt,top=\hauteurtitre,bottom=0pt, + text fill, + width=\largeurcarte, + height=\hauteurcarte, + arc=5pt, + colback=white, + underlay={% + \ifboolKV[Cards]{BackgroundAr}{% + \begin{tcbclipinterior} + \node[anchor=center,opacity=1] + at (interior.center) {% + \includegraphics[% + height=\tcb@height, + width=\tcb@width, + ]{\useKV[Cards]{ImageAr}}}; + \end{tcbclipinterior}, + }{} + }, + overlay unbroken and first={% + \coordinate[yshift=-0.5\hauteurtitre] (A) at (frame.north); + \node[rounded corners, draw=black, rectangle,minimum height=1cm,text width=\largeurcarte-6mm,fill=TrameCouleur] (T1) at + (A){\begin{minipage}{\largeurcarte-6mm} + \begin{center} + #1 + \end{center} + \end{minipage}}; + %\node[yshift=-1em] (B) at (A){}; + %\ifboolKV[Cards]{Titre}{\node[fill=white] at (B) {\useKV[Cards]{NomTitre}};}{}, + } +} +\makeatother + +\newlength{\largeurcards} +\newlength{\hauteurcards} +\newlength{\largeurcarte} +\newlength{\hauteurcarte} +\newlength{\hauteurtitre} +\newlength{\largeurtitre} + +\newlength{\margeh} +\newlength{\margev} + +\NewEnviron{Trame}{% + \begin{tikzpicture}[remember picture,overlay] + % quadrillages horizontal et vertical + \coordinate[yshift=-\margev] (A) at (current page.north west); + \coordinate[yshift=-\margev] (B) at (current page.north east); + \coordinate[yshift=-\hauteurcards] (A1) at (A); + \coordinate[yshift=-\hauteurcards] (B1) at (B); + \coordinate[yshift=-\hauteurcards] (A2) at (A1); + \coordinate[yshift=-\hauteurcards] (B2) at (B1); + \coordinate[yshift=-\hauteurcards] (A3) at (A2); + \coordinate[yshift=-\hauteurcards] (B3) at (B2); + \coordinate[yshift=-\hauteurcards] (A4) at (A3); + \coordinate[yshift=-\hauteurcards] (B4) at (B3); + \coordinate[xshift=\margeh] (C) at (current page.north west); + \coordinate[xshift=\margeh] (D) at (current page.south west); + \coordinate[xshift=\largeurcards] (C1) at (C); + \coordinate[xshift=\largeurcards] (D1) at (D); + \coordinate[xshift=\largeurcards] (C2) at (C1); + \coordinate[xshift=\largeurcards] (D2) at (D1); + \coordinate[xshift=\largeurcards] (C3) at (C2); + \coordinate[xshift=\largeurcards] (D3) at (D2); + \draw (A) -- (B); + \draw (A1) -- (B1); + \draw (A2) -- (B2); + \draw (A3) -- (B3); + \draw (A4) -- (B4); + \draw (C)--(D); + \draw (C1)--(D1); + \draw (C2)--(D2); + \draw (C3)--(D3); + % point pour placer les cartes + \coordinate[xshift=\margeh+0.5\largeurcards,yshift=-0.5\hauteurcards] (Carte1) at (A); + \coordinate[xshift=\largeurcards,yshift=0mm] (Carte2) at (Carte1); + \coordinate[xshift=2\largeurcards,yshift=0mm] (Carte3) at (Carte1); + \coordinate[xshift=0mm,yshift=-\hauteurcards] (Carte4) at (Carte1); + \coordinate[xshift=0mm,yshift=-\hauteurcards] (Carte5) at (Carte2); + \coordinate[xshift=0mm,yshift=-\hauteurcards] (Carte6) at (Carte3); + \coordinate[xshift=0mm,yshift=-\hauteurcards] (Carte7) at (Carte4); + \coordinate[xshift=0mm,yshift=-\hauteurcards] (Carte8) at (Carte5); + \coordinate[xshift=0mm,yshift=-\hauteurcards] (Carte9) at (Carte6); + \BODY + \end{tikzpicture} +} + +\setKVdefault[Cards]{Largeur=59,Hauteur=89,HauteurTheme=15,Marge=4,Landscape=false,Couleur=Cornsilk,Theme=Théorème\\de + Pythagore,ThemeSol=Solution,Trame=false,Titre=false,NomTitre=Jeu 1,Loop,BackgroundAv=false,BackgroundAr=false,ImageAv=4813762.jpg,ImageAr=4813762.jpg} + +\newcommand\Cartes[2][]{% + \useKVdefault[Cards]% + \setKV[Cards]{#1}% + \setsepchar[*]{§*/}% + \readlist*\ListeCards{#2}% + \ifboolKV[Cards]{Landscape}{% + \setlength{\hauteurcarte}{\fpeval{\useKV[Cards]{Largeur}-\useKV[Cards]{Marge}}mm}% + \setlength{\largeurcarte}{\fpeval{\useKV[Cards]{Hauteur}-\useKV[Cards]{Marge}}mm}% + \setlength{\largeurcards}{95mm}% + \setlength{\hauteurcards}{65mm}% + \setlength{\margeh}{(297mm-3\largeurcards)/2}% + \setlength{\margev}{(210mm-3\hauteurcards)/2}% + }{ + \setlength{\hauteurcarte}{\fpeval{\useKV[Cards]{Hauteur}-\useKV[Cards]{Marge}}mm}% + \setlength{\largeurcarte}{\fpeval{\useKV[Cards]{Largeur}-\useKV[Cards]{Marge}}mm}% + \setlength{\largeurcards}{65mm} + \setlength{\hauteurcards}{95mm} + \setlength{\margeh}{(210mm-3\largeurcards)/2} + \setlength{\margev}{(297mm-3\hauteurcards)/2} + } + \setlength{\hauteurtitre}{\fpeval{\useKV[Cards]{HauteurTheme}}mm}% + \setlength{\largeurtitre}{\fpeval{(\useKV[Cards]{Largeur}-\useKV[Cards]{Marge}-9)/2}mm}% + \colorlet{TexteCouleur}{black} + \colorlet{TrameCouleur}{\useKV[Cards]{Couleur}} + \ifboolKV[Cards]{Loop}{% + \ifboolKV[Cards]{Trame}{% + \clearpage% + \thispagestyle{empty}% + \begin{Trame} + \multido{\i=1+1}{9}{% + \node at (Carte\i) {% + \begin{Mybox}{\ListeCards[\i,1]}{\useKV[Cards]{Theme}}{\ListeCards[\i,2]}% + \ListeCards[\i,3]% + \end{Mybox}% + };% + }% + \end{Trame}% + \clearpage% + }{% + \begin{Mybox}{\ListeCards[1,1]}{\useKV[Cards]{Theme}}{\ListeCards[1,2]}% + \ListeCards[1,3]% + \end{Mybox}% + }% + }{% + \ifboolKV[Cards]{Trame}{% + \clearpage% + \thispagestyle{empty}% + \begin{Trame} + \multido{\i=1+1}{9}{% + \node[] at (Carte\i) {% + \begin{MyboxSimpleAv}{\useKV[Cards]{Theme}}% + \ListeCards[\i,1]% + \end{MyboxSimpleAv}% + };% + }% + \end{Trame}% + \clearpage% + \thispagestyle{empty}% + \begin{Trame} + \multido{\i=1+1}{3}{% + \node at (Carte\i) {% + \begin{MyboxSimpleAr}{\useKV[Cards]{ThemeSol}}% + \ListeCards[\fpeval{4-\i},2]% + \end{MyboxSimpleAr}% + };% + }% + \multido{\i=4+1}{3}{% + \node at (Carte\i) {% + \begin{MyboxSimpleAr}{\useKV[Cards]{ThemeSol}}% + \ListeCards[\fpeval{10-\i},2]% + \end{MyboxSimpleAr}% + };% + }% + \multido{\i=7+1}{3}{% + \node at (Carte\i) {% + \begin{MyboxSimpleAr}{\useKV[Cards]{ThemeSol}}% + \ListeCards[\fpeval{16-\i},2]% + \end{MyboxSimpleAr}% + };% + }% + \end{Trame}% + \clearpage% + }{% + \begin{MyboxSimpleAv}{\useKV[Cards]{Theme}}% + \ListeCards[1,1]% + \end{MyboxSimpleAv} + \begin{MyboxSimpleAr}{\useKV[Cards]{ThemeSol}}% + \ListeCards[1,2]% + \end{MyboxSimpleAr} + }% + }% +} + +\newcommand\SolutionCarte[2]{% + \begin{center} + \bfseries#1 + \end{center} + + #2 +} + +%%% +% Tableur +%%% +\setKVdefault[Tableur]{Colonnes=4,Largeur=3,Formule={},Cellule=A1,Ligne=0,Colonne=0,PasL=1,PasC=1} + +%Basé sur un code de Christian Télléchéa. +\makeatletter +\newcount\cntlin +\newcount\cntcol + +\newtoks\t@b +\long\def\ifremain@lines#1\\#2\@nil{% + \csname @\ifx\@empty#2\@empty second\else first\fi oftwo\endcsname} +\long\def\subst@eol#1\\#2\@nil{\addtot@b{#1\\\hline}% + \ifremain@lines#2\\\@nil{\addtot@b&\subst@eol#2\@nil}{\addtot@b{#2\CodeAfter\xintifboolexpr{\useKV[Tableur]{Ligne}=0 || \useKV[Tableur]{Colonne}=0}{}{\tikz\draw[line width=2pt](row-\fpeval{\useKV[Tableur]{Ligne}+1}-|col-\fpeval{\useKV[Tableur]{Colonne}+1}) rectangle (row-\fpeval{\useKV[Tableur]{Ligne}+1+\useKV[Tableur]{PasL}}-|col-\fpeval{\useKV[Tableur]{Colonne}+1+\useKV[Tableur]{PasC}});}\end{NiceTabular}}}} +\long\def\collectcp@body#1\end{\subst@eol#1\@nil\end} + +\newcommand\addtot@b[1]{\t@b\expandafter{\the\t@b#1}} +\newcommand\edftot@b[1]{\edef\temp@{#1}\expandafter\addtot@b\expandafter{\temp@}} + +\newlength\LongInter +\newlength\TotalInter + +\newenvironment{Tableur}[1][]{% + \useKVdefault[Tableur]% + \setKV[Tableur]{#1}% + \ttfamily% + \setlength{\LongInter}{\fpeval{(\useKV[Tableur]{Colonnes}-1)*\useKV[Tableur]{Largeur}-4}em+\fpeval{\useKV[Tableur]{Colonnes}*2-6}\tabcolsep+\fpeval{\useKV[Tableur]{Colonnes}-3}\arrayrulewidth} + \newcolumntype X{>{\centering\arraybackslash}p{\useKV[Tableur]{Largeur}em}}% + \begin{tabular}{|p{\useKV[Tableur]{Largeur}em}|p{1em}|p{5em}|p{\LongInter}|} + \cline{1-2}\cline{4-4}% + \useKV[Tableur]{Cellule}&\centering\arraybackslash\scriptsize$\blacktriangledown$&$f_x$\hfill$\sum$~\scriptsize$\blacktriangledown$\hfill$=$&\useKV[Tableur]{Formule}\hfill\scriptsize$\blacktriangledown$\\ + \cline{1-2}\cline{4-4}% + \end{tabular} + + \cntlin\z@ + \t@b{% + \begin{NiceTabular}{% + |>{% + \columncolor{gray!15} + \global\cntcol\z@\global\advance\cntlin\@ne + \centering\arraybackslash + \ifnum\cntlin>\@ne\number\numexpr\cntlin-1\relax\fi} + p{2em}|*{\useKV[Tableur]{Colonnes}}{X|}}% + \hline + \rowcolor{gray!15}}% + \loop + \ifnum\cntcol<\useKV[Tableur]{Colonnes} + \advance\cntcol\@ne + \addtot@b{&}% + \edftot@b{{\noexpand\@Alph\the\cntcol}}% + \repeat + \addtot@b{\\\hline&}% + \collectcp@body}{\the\t@b} +\makeatother + +%%% +% Domino +%%% +\newtcolorbox{MyDominoMini}[1][]{% + enhanced, + nobeforeafter, + left skip=0pt, + right skip=0pt, + left=0pt,right=0pt,top=0pt,bottom=0pt, + width=\textwidth/\ColonneDomino, + height=\textheight/\LigneDomino, + segmentation style={solid, line width=1.5pt}, + colback=\CouleurDomino, + center upper, + valign upper=center, + center lower, + valign lower=center, + arc=2pt, + #1 +} + +\newtcolorbox{MyDominoLogo}[1][]{% + enhanced, + nobeforeafter, + left skip=0pt, + right skip=0pt, + left=0pt,right=0pt,top=0pt,bottom=0pt, + width=\textwidth/\ColonneDomino, + height=\textheight/\LigneDomino, + valign=center, + halign=center, + arc=2pt, + colback=white, + #1 +} + +\NewEnviron{TrameDomino}{% + \setlength{\margev}{1cm} + \setlength{\margeh}{1cm} + \begin{tikzpicture}[remember picture,overlay] + % quadrillages horizontal et vertical + \coordinate[yshift=-\margev] (A0) at (current page.north west); + \coordinate[yshift=-\margev] (B0) at (current page.north east); + \foreach \i in {1,...,\useKV[Domino]{Lignes}}{% + \coordinate[yshift=-\i*\textheight/\LigneDomino] (A\i) at (A0); + \coordinate[yshift=-\i*\textheight/\LigneDomino] (B\i) at (B0); + } + \coordinate[xshift=\margeh] (C0) at (current page.north west); + \coordinate[xshift=\margeh] (D0) at (current page.south west); + \foreach \i in {1,...,\useKV[Domino]{Colonnes}}{ + \coordinate[xshift=\i*\textwidth/\ColonneDomino] (C\i) at (C0); + \coordinate[xshift=\i*\textwidth/\ColonneDomino] (D\i) at (D0); + } + \foreach \i in {0,...,\LigneDomino}{% + \draw (A\i) -- (B\i); + } + \foreach \i in {0,...,\ColonneDomino}{% + \draw (C\i) -- (D\i); + } + \draw[blue, line width=3pt] (A0)--(B0); + \draw[blue, line width=3pt] (A\LigneDomino)--(B\LigneDomino); + \draw[blue, line width=3pt] (C0)--(D0); + \draw[blue, line width=3pt] (C\ColonneDomino)--(D\ColonneDomino); + % point pour placer les cartes + \foreach \i in {0,...,\fpeval{\ColonneDomino-1}}{% + \foreach \j in {0,...,\fpeval{\LigneDomino-1}}{% + \coordinate[xshift=\margeh+(0.5\textwidth/\ColonneDomino)+\i*\textwidth/\ColonneDomino,yshift=-0.5\textheight/\LigneDomino-\j*\textheight/\LigneDomino] + (Domino\fpeval{\i+\ColonneDomino*\j+1}) at (A0); + } + } + \BODY + \end{tikzpicture} +} + +\setKVdefault[Domino]{Couleur=white,Trame,Ratio=0.5,Lignes=7,Colonnes=5,Superieur=false,Logo=false,Image=tiger.pdf} + +\newcommand\Dominos[2][]{% + \useKVdefault[Domino]% + \setKV[Domino]{#1}% + \setsepchar[*]{§*/}% + \readlist*\ListeDominos{#2}% + \xdef\CouleurDomino{\useKV[Domino]{Couleur}}% + \xdef\ratiodomino{\useKV[Domino]{Ratio}}% + \xdef\LigneDomino{\useKV[Domino]{Lignes}}% + \xdef\ColonneDomino{\useKV[Domino]{Colonnes}}% + \ifboolKV[Domino]{Trame}{% + \clearpage + \begin{TrameDomino} + \foreach\i in {1,...,\fpeval{\LigneDomino*\ColonneDomino}}{% + \node[] at (Domino\i){% + \ifboolKV[Domino]{Superieur}{% + \begin{MyDominoMini}[space=\ratiodomino]% + \ListeDominos[\i,1]\tcblower\ListeDominos[\i,2]% + \end{MyDominoMini}% + }{% + \begin{MyDominoMini}[sidebyside,sidebyside gap=4mm,righthand ratio=\ratiodomino]% + \ListeDominos[\i,1]\tcblower\ListeDominos[\i,2]% + \end{MyDominoMini}% + }% + }; + }% + \end{TrameDomino}% + \ifboolKV[Domino]{Logo}{% + \clearpage + \begin{TrameDomino} + \foreach\i in {1,...,\fpeval{\LigneDomino*\ColonneDomino}}{% + \node at (Domino\i){% + \begin{MyDominoLogo}% + \includegraphics[height=\tcbtextheight]{\useKV[Domino]{Image}} + \end{MyDominoLogo}% + }; + }% + \end{TrameDomino}% + }{}% + }{% + \ifboolKV[Domino]{Superieur}{% + \begin{MyDominoMini}[space=\ratiodomino]% + \ListeDominos[1,1]\tcblower\ListeDominos[1,2]% + \end{MyDominoMini}% + }{% + \begin{MyDominoMini}[sidebyside,sidebyside gap=4mm,righthand ratio=\ratiodomino]% + \ListeDominos[1,1]\tcblower% + \ListeDominos[1,2]% + \end{MyDominoMini}% + }% + }% }%
\ No newline at end of file diff --git a/macros/latex/contrib/profcollege/metapost/PfC-Afficheur.mp b/macros/latex/contrib/profcollege/metapost/PfC-Afficheur.mp new file mode 100644 index 0000000000..166cd22979 --- /dev/null +++ b/macros/latex/contrib/profcollege/metapost/PfC-Afficheur.mp @@ -0,0 +1,182 @@ +u:=1cm; + +vardef Afficheur(expr nb,creux)= + pair Aa[]; + Aa1=u*(-0.5,-1); + Aa2-Aa1=u*(1,0); + Aa4-Aa2=u*(0,2); + Aa3=1/2[Aa2,Aa4]; + Aa5-Aa4=Aa1-Aa2; + Aa6-Aa3=Aa1-Aa2; + pair Bb[]; + Bb1=Aa1 xscaled0.7 yscaled 0.85; + Bb2=Aa2 xscaled0.7 yscaled 0.85; + Bb4=Aa4 xscaled0.7 yscaled 0.85; + Bb5=Aa5 xscaled0.7 yscaled 0.85; + Bb3=1/2[Bb2,Bb4]; + Bb6=1/2[Bb1,Bb5]; + Bb7=1/2[Bb6,Bb3]+(0,4); + Bb8=1/2[Bb6,Bb3]-(0,6); + pair Cc[]; + Cc1=u*(0.4,-0.85)+(0,-1); + ecarth:=1.5; + ecartv:=0.05; + path ASegment[]; + ASegment[1]=1/10[Bb1,Bb2]--9/10[Bb1,Bb2]; + ASegment[2]=1/10[Bb2,Bb3]--9/10[Bb2,Bb3]; + ASegment[3]=1/10[Bb3,Bb4]--9/10[Bb3,Bb4]; + ASegment[4]=1/10[Bb4,Bb5]--9/10[Bb4,Bb5]; + ASegment[5]=1/10[Bb5,Bb6]--9/10[Bb5,Bb6]; + ASegment[6]=1/10[Bb6,Bb1]--9/10[Bb6,Bb1]; + ASegment[7]=1/10[Bb6,Bb3]--9/10[Bb6,Bb3]; + color fondsegment; + fondsegment=0.2[LightSteelBlue,white]; + save $; + picture $; + $=image( + fill Aa1--Aa2--Aa4--Aa5--cycle withcolor LightSteelBlue; + draw Aa1--Aa2--Aa4--Aa5--cycle withcolor LightSteelBlue; + if creux=0: + fill (unitsquare scaled 2) shifted Cc1 withcolor fondsegment; + else: + fill (unitsquare scaled 2) shifted Cc1 withcolor Crimson; + fi; + if nb=1: + drawoptions(withpen pensquare scaled2 withcolor Crimson); + draw ASegment[2]; + draw ASegment[3]; + drawoptions(withpen pensquare scaled2 withcolor fondsegment); + draw ASegment[1]; + draw ASegment[4]; + draw ASegment[5]; + draw ASegment[6]; + draw ASegment[7]; + drawoptions(); + fi; + if nb=2: + drawoptions(withpen pensquare scaled2 withcolor Crimson); + draw ASegment[1]; + draw ASegment[3]; + draw ASegment[4]; + draw ASegment[6]; + draw ASegment[7]; + drawoptions(withpen pensquare scaled2 withcolor fondsegment); + draw ASegment[2]; + draw ASegment[5]; + drawoptions(); + fi; + if nb=3: + drawoptions(withpen pensquare scaled2 withcolor Crimson); + draw ASegment[1]; + draw ASegment[2]; + draw ASegment[3]; + draw ASegment[4]; + draw ASegment[7]; + drawoptions(withpen pensquare scaled2 withcolor fondsegment); + draw ASegment[5]; + draw ASegment[6]; + drawoptions(); + fi; + if nb=4: + drawoptions(withpen pensquare scaled2 withcolor Crimson); + draw ASegment[2]; + draw ASegment[3]; + draw ASegment[5]; + draw ASegment[7]; + drawoptions(withpen pensquare scaled2 withcolor fondsegment); + draw ASegment[1]; + draw ASegment[4]; + draw ASegment[6]; + drawoptions(); + fi; + if nb=5: + drawoptions(withpen pensquare scaled2 withcolor Crimson); + draw ASegment[1]; + draw ASegment[2]; + draw ASegment[4]; + draw ASegment[5]; + draw ASegment[7]; + drawoptions(withpen pensquare scaled2 withcolor fondsegment); + draw ASegment[3]; + draw ASegment[6]; + drawoptions(); + fi; + if nb=6: + drawoptions(withpen pensquare scaled2 withcolor Crimson); + draw ASegment[1]; + draw ASegment[2]; + draw ASegment[4]; + draw ASegment[5]; + draw ASegment[6]; + draw ASegment[7]; + drawoptions(withpen pensquare scaled2 withcolor fondsegment); + draw ASegment[3]; + drawoptions(); + fi; + if nb=7: + drawoptions(withpen pensquare scaled2 withcolor Crimson); + draw ASegment[2]; + draw ASegment[3]; + draw ASegment[4]; + drawoptions(withpen pensquare scaled2 withcolor fondsegment); + draw ASegment[1]; + draw ASegment[5]; + draw ASegment[6]; + draw ASegment[7]; + drawoptions(); + fi; + if nb=8: + drawoptions(withpen pensquare scaled2 withcolor Crimson); + draw ASegment[1]; + draw ASegment[2]; + draw ASegment[3]; + draw ASegment[4]; + draw ASegment[5]; + draw ASegment[6]; + draw ASegment[7]; + drawoptions(); + fi; + if nb=9: + drawoptions(withpen pensquare scaled2 withcolor Crimson); + draw ASegment[1]; + draw ASegment[2]; + draw ASegment[3]; + draw ASegment[4]; + draw ASegment[5]; + draw ASegment[7]; + drawoptions(withpen pensquare scaled2 withcolor fondsegment); + draw ASegment[6]; + drawoptions(); + fi; + if nb=0: + drawoptions(withpen pensquare scaled2 withcolor Crimson); + draw ASegment[1]; + draw ASegment[2]; + draw ASegment[3]; + draw ASegment[4]; + draw ASegment[5]; + draw ASegment[6]; + drawoptions(withpen pensquare scaled2 withcolor fondsegment); + draw ASegment[7]; + drawoptions(); + fi; + if nb=10: + drawoptions(withpen pensquare scaled2 withcolor Crimson); + fill (unitsquare scaled 2) shifted Bb7 withcolor Crimson; + fill (unitsquare scaled 2) shifted Bb8 withcolor Crimson; + drawoptions(withpen pensquare scaled2 withcolor fondsegment); + draw ASegment[1]; + draw ASegment[2]; + draw ASegment[3]; + draw ASegment[4]; + draw ASegment[5]; + draw ASegment[6]; + draw ASegment[7]; + drawoptions(); + fi; + ); + $ +enddef; + +endinput; + diff --git a/macros/latex/contrib/profcollege/metapost/PfC-Calculatrice.mp b/macros/latex/contrib/profcollege/metapost/PfC-Calculatrice.mp index a6326e1925..92d4d3057d 100644 --- a/macros/latex/contrib/profcollege/metapost/PfC-Calculatrice.mp +++ b/macros/latex/contrib/profcollege/metapost/PfC-Calculatrice.mp @@ -1,6 +1,3 @@ -%Author : Christophe Poulain -%Licence : Released under the LaTeX Project Public License v1.3c -% or later, see http://www.latex-project.org/lppl.txtf prologues:=3; path carre[]; @@ -174,7 +171,7 @@ vardef Test(expr cptk,cptnt)= fi; enddef; -vardef LCD(text nt)(text rep)= +vardef LCD(text nt)(text rep)(expr NB)= decahoriz:=0; nblignes:=nblignes+1; path Ecran; @@ -185,6 +182,12 @@ vardef LCD(text nt)(text rep)= BlocAffichage; Test(k,nt); endfor; + for k=1 upto NB: + nblignes:=nblignes+1; + Ecran:=(u*(0,-1)--u*(120,-1)--u*(120,7)--u*(0,7)--cycle) shifted(u*(0,-8*(nblignes-1))); + fill Ecran withcolor if print=true:0.8white else:CouleurEcran fi; + draw Ecran withcolor if print=true:0.8white else:CouleurEcran fi; + endfor; nblignes:=nblignes+1; Ecran:=(u*(0,-1)--u*(120,-1)--u*(120,7)--u*(0,7)--cycle) shifted(u*(0,-8*(nblignes-1))); fill Ecran withcolor if print=true:0.8white else:CouleurEcran fi; diff --git a/macros/latex/contrib/profcollege/metapost/PfC-Constantes.mp b/macros/latex/contrib/profcollege/metapost/PfC-Constantes.mp index b97bd8a4c0..02895dcf8c 100644 --- a/macros/latex/contrib/profcollege/metapost/PfC-Constantes.mp +++ b/macros/latex/contrib/profcollege/metapost/PfC-Constantes.mp @@ -1,6 +1,3 @@ -%Author : Christophe Poulain -%Licence : Released under the LaTeX Project Public License v1.3c -% or later, see http://www.latex-project.org/lppl.txtf %Constantes u:=1cm; v:=(sqrt3)/2; diff --git a/macros/latex/contrib/profcollege/metapost/PfC-LaTeX.mp b/macros/latex/contrib/profcollege/metapost/PfC-LaTeX.mp index daa206a603..33d9848b63 100644 --- a/macros/latex/contrib/profcollege/metapost/PfC-LaTeX.mp +++ b/macros/latex/contrib/profcollege/metapost/PfC-LaTeX.mp @@ -1,16 +1,11 @@ -%Author : Christophe Poulain -%Licence : Released under the LaTeX Project Public License v1.3c -% or later, see http://www.latex-project.org/lppl.txtf vardef LATEX primary s = write "verbatimtex" to "mptextmp.mp"; write "%&latex" to "mptextmp.mp"; write "\documentclass[]{article}" to "mptextmp.mp"; + write "\usepackage{ProfCollege}" to "mptextmp.mp"; write "\usepackage[utf8]{inputenc}" to "mptextmp.mp"; write "\usepackage[T1]{fontenc}" to "mptextmp.mp"; write "\usepackage{fourier}" to "mptextmp.mp"; - write "\usepackage{mathtools,amssymb}" to "mptextmp.mp"; - write "\usepackage{siunitx}" to "mptextmp.mp"; - write "\sisetup{locale=FR,detect-all,output-decimal-marker={,},group-four-digits}" to "mptextmp.mp"; write "\usepackage[french]{babel}" to "mptextmp.mp"; write "\begin{document}" to "mptextmp.mp"; write "etex" to "mptextmp.mp"; diff --git a/macros/latex/contrib/profcollege/metapost/PfC-Svgnames.mp b/macros/latex/contrib/profcollege/metapost/PfC-Svgnames.mp index 3af1336dc3..3aa2cf2386 100644 --- a/macros/latex/contrib/profcollege/metapost/PfC-Svgnames.mp +++ b/macros/latex/contrib/profcollege/metapost/PfC-Svgnames.mp @@ -1,6 +1,3 @@ -%Author : Christophe Poulain -%Licence : Released under the LaTeX Project Public License v1.3c -% or later, see http://www.latex-project.org/lppl.txtf %D'après /usr/local/texlive/2020/texmf-dist/tex/latex/xcolor/svgnam.def color AliceBlue; AliceBlue = (.94,.972,1); color AntiqueWhite; AntiqueWhite = (.98,.92,.844); diff --git a/macros/luatex/latex/unitipa/README.txt b/macros/luatex/latex/unitipa/README.txt index b68d0b4fdb..2d9bc5ba02 100644 --- a/macros/luatex/latex/unitipa/README.txt +++ b/macros/luatex/latex/unitipa/README.txt @@ -1,10 +1,9 @@ -------------------------------------------------------------------------- Package: unitipa Author: Niranjan -Version: 0.1 (21 September, 2020) +Version: 0.2 (13 March, 2021) Description: TIPA typefaces with Unicode characters. Repository: https://gitlab.com/niranjanvikastambe/unitipa Bug tracker: https://gitlab.com/niranjanvikastambe/unitipa/-/issues License: The LaTeX Project Public License v1.3c or later. -------------------------------------------------------------------------- - diff --git a/macros/luatex/latex/unitipa/unitipa.dtx b/macros/luatex/latex/unitipa/unitipa.dtx index 4437f73253..e834a96c02 100644 --- a/macros/luatex/latex/unitipa/unitipa.dtx +++ b/macros/luatex/latex/unitipa/unitipa.dtx @@ -2,8 +2,9 @@ % % File: unitipa.dtx % --------------------------------------------------------------------------- -% Package: unitipa -% Author: Niranjan +% Package: unitipa +% Author: Niranjan +% Version: 0.2 (13 March, 2021) % Description: TIPA typefaces with Unicode characters. % Repository: https://gitlab.com/niranjanvikastambe/unitipa % Bug tracker: https://gitlab.com/niranjanvikastambe/unitipa/-/issues @@ -33,7 +34,7 @@ -------------------------------------------------------------------------- Package: unitipa Author: Niranjan -Version: 0.1 (21 September, 2020) +Version: 0.2 (13 March, 2021) Description: TIPA typefaces with Unicode characters. Repository: https://gitlab.com/niranjanvikastambe/unitipa Bug tracker: https://gitlab.com/niranjanvikastambe/unitipa/-/issues @@ -44,10 +45,10 @@ License: The LaTeX Project Public License v1.3c or later. \fi %</internal> %<*driver|package> -\def\unitipaPackageName{unitipa} -\def\unitipaPackageVersion{0.1} -\def\unitipaPackageDate{2020/21/09} -\def\unitipaPackageDescription{TIPA typefaces with Unicode characters.} +\def\unitipaname{unitipa} +\def\unitipaversion{0.2} +\def\unitipadate{2021/03/13} +\def\unitipadescription{TIPA typefaces with Unicode characters.} %</driver|package> %<*driver> \documentclass{l3doc} @@ -56,32 +57,41 @@ License: The LaTeX Project Public License v1.3c or later. \usepackage{unitipa} \usepackage{hyperref} \usepackage{xcolor} -\hypersetup{ -colorlinks, -linkcolor=red!60!black, -citecolor=green!60!black, -urlcolor=blue!60!black -} +\hypersetup{% +colorlinks,% +linkcolor=red!60!black,% +citecolor=green!60!black,% +urlcolor=blue!60!black% +}% \usepackage{fontawesome5} \begin{document} - \DocInput{\unitipaPackageName.dtx} + \DocInput{\unitipaname.dtx} \end{document} %</driver> % \fi -% \title{The \pkg{\unitipaPackageName} package} +% \title{The \pkg{\unitipaname} package} % \author{Niranjan} % \date^^A % {^^A -% Version \unitipaPackageVersion\ --- \unitipaPackageDate\\[1ex]^^A +% Version \unitipaversion\ --- \unitipadate\\[1ex]^^A % {\small\faIcon{link}\quad\url{https://ctan.org/pkg/unitipa}}\\^^A % {\small\faIcon{gitlab}\quad\url{https://gitlab.com/niranjanvikastambe/unitipa}}^^A % } % \maketitle - -% This package converts Unicode characters into TIPA commands, which gives us \pkg{tipa} typefaces, without actually learning the \pkg{tipa} commands in much details. This package needs Lua\LaTeX\ as the compiler for correctly typesetting the IPA diacritics. TIPA was designed to match with the Computer Modern design, no other IPA font matches with traditional \LaTeX\ font. This package is helpful for getting the beautiful \pkg{tipa} shapes with Unicode characters. This package assumes that the user knows how to type IPA Unicode. Following is the list of symbols that \textit{cannot} be used with the traditional \LaTeX\ font. Every other symbol in the IPA chart is present in the current \LaTeX\ font. +% +% This package converts Unicode characters into TIPA commands, which gives us +% \pkg{tipa} typefaces, without actually learning the \pkg{tipa} commands in +% much details. This package needs Lua\LaTeX\ as the compiler for correctly +% typesetting the IPA diacritics. TIPA was designed to match with the Computer +% Modern design, no other IPA font matches with traditional \LaTeX\ font. This +% package is helpful for getting the beautiful \pkg{tipa} shapes with Unicode +% characters. This package assumes that the user knows how to type IPA +% Unicode. Following is the list of symbols that \textit{cannot} be used with +% the traditional \LaTeX\ font. Every other symbol in the IPA chart is present +% in the current \LaTeX\ font. % \begin{description} % \item[Plosives] ʈ É– ÉŸ É¢ Ê” -% \item[Nasals] ɱ ɳ É´ +% \item[Nasals] ɱ ɳ ɲ\footnote{Added in v0.2} É´ % \item[Trills] Ê™ Ê€ % \item[Taps or flaps] â±± ɾ ɽ % \item[Fricatives] ɸ β θ ʃ Ê’ Ê‚ Ê É£ χ Ê Ê• ɦ @@ -94,6 +104,13 @@ urlcolor=blue!60!black % \item[Close-mid vowels] ɵ ɤ % \item[Open-mid vowels] É› Éœ Éž ÊŒ É” % \item[Near-open vowels] É É¶ É’ +% \item[Open vowels] É‘\footnote{Reported \textit{\&} added by Heller, Thomas in +% v0.2. +% +% Bug report - \url{https://gitlab.com/niranjanvikastambe/unitipa/-/issues/1} +% +% MR - \url{https://gitlab.com/niranjanvikastambe/unitipa/-/merge_requests/1} +% } % \item[Clicks] ʘ Ç€ ǃ Ç‚ Ç % \item[Voiced Implosives] É“ É— Ê„ É Ê› % \item[Ejective] ʼ @@ -107,10 +124,19 @@ urlcolor=blue!60!black % \begin{documentation} % \section{Package options} % \begin{function}{nodiacritics} -% If you are very sure that you don't need any IPA diacritics in your document, you can load the package with this option. If this option is loaded, package can be compiled with other compilers too, but no IPA diacritic will be printed. +% If you are very sure that you don't need any IPA diacritics in your document, +% you can load the package with this option. If this option is loaded, package +% can be compiled with other compilers too, but no IPA diacritic will be +% printed. % \end{function} % \begin{function}{ipafont} -% IPA character [â±±] is not available in \pkg{tipa}, but for the convenience of users, this character is coded with Doulos SIL as it seemed to me the closest match to \pkg{tipa} typeface. If you don't have this font, please install package \pkg{\href{https://ctan.org/pkg/doulossil}{doulossil}} or download the font from \href{https://software.sil.org/doulos/}{here}. If users want to change the font used for this character, they can simply add the font name as the value to this option. +% IPA character [â±±] is not available in \pkg{tipa}, but for the convenience of +% users, this character is coded with Doulos SIL as it seemed to me the closest +% match to \pkg{tipa} typeface. If you don't have this font, please install +% package \pkg{\href{https://ctan.org/pkg/doulossil}{doulossil}} or download the +% font from \href{https://software.sil.org/doulos/}{here}. If users want to +% change the font used for this character, they can simply add the font name as +% the value to this option. % \begin{syntax} % ipafont=\meta{font name} % \end{syntax} @@ -123,7 +149,7 @@ urlcolor=blue!60!black %<*package> % \end{macrocode} % \begin{macrocode} -\ProvidesPackage{unitipa}[2020/21/09 v0.1 +\ProvidesPackage{unitipa}[2021/03/13 v0.2 TIPA typefaces with unicode characters] \RequirePackage{tipa} % \end{macrocode} @@ -131,16 +157,17 @@ TIPA typefaces with unicode characters] % \begin{macrocode} \RequirePackage{graphicx} % \end{macrocode} -% Package \pkg{graphicx} is needed for printing [Éž] correctly. See line no.\ 295. +% Package \pkg{graphicx} is needed for printing [Éž] correctly. See line no.\ +% 295. % \begin{macrocode} \RequirePackage{newunicodechar} \RequirePackage{fontspec} \RequirePackage{pgfkeys} -\pgfkeys{ - unitipa/.is family, unitipa/.cd, - ipafont/.code={\setfontfamily{\ipa}{#1}}, - ipafont=DoulosSIL, -} +\pgfkeys{% + unitipa/.is family, unitipa/.cd,% + ipafont/.code={\setfontfamily{\ipa}{#1}},% + ipafont=DoulosSIL% +}% \DeclareTextFontCommand{\ipatext}{\ipa} \def\unitipa@ipafont#1{\pgfkeys{unitipa/.cd,#1}} \DeclareOption*{\expandafter\unitipa@ipafont\expandafter{\CurrentOption}} @@ -179,189 +206,194 @@ TIPA typefaces with unicode characters] s = unicode.utf8.gsub ( s , '(%a)̹', '\\textsubrhalfring{%1}' ) return s end -\end{luacode} -\directlua{luatexbase.add_to_callback("process_input_buffer", + \end{luacode} + \directlua{luatexbase.add_to_callback("process_input_buffer", morerounded, "morerounded")} -\begin{luacode} + \begin{luacode} function lessrounded ( s ) s = unicode.utf8.gsub ( s , '(%a)Ìœ', '\\textsublhalfring{%1}' ) return s end -\end{luacode} -\directlua{luatexbase.add_to_callback("process_input_buffer", + \end{luacode} + \directlua{luatexbase.add_to_callback("process_input_buffer", lessrounded, "lessrounded")} -\begin{luacode} + \begin{luacode} function advanced ( s ) s = unicode.utf8.gsub ( s , '(%a)ÌŸ', '\\textsubplus{%1}' ) return s end -\end{luacode} -\directlua{luatexbase.add_to_callback("process_input_buffer", + \end{luacode} + \directlua{luatexbase.add_to_callback("process_input_buffer", advanced, "advanced")} -\begin{luacode} + \begin{luacode} function retracted ( s ) s = unicode.utf8.gsub ( s , '(%a)Ì ', '\\textsubbar{%1}' ) return s end -\end{luacode} -\directlua{luatexbase.add_to_callback("process_input_buffer", + \end{luacode} + \directlua{luatexbase.add_to_callback("process_input_buffer", retracted, "retracted")} -\begin{luacode} + \begin{luacode} function midcentralized ( s ) s = unicode.utf8.gsub ( s , '(%a)̽', '\\textovercross{%1}' ) return s end -\end{luacode} -\directlua{luatexbase.add_to_callback("process_input_buffer", + \end{luacode} + \directlua{luatexbase.add_to_callback("process_input_buffer", midcentralized, "midcentralized")} -\begin{luacode} + \begin{luacode} function syllabic ( s ) s = unicode.utf8.gsub ( s , '(%a)Ì©', '\\textsyllabic{%1}' ) return s end -\end{luacode} -\directlua{luatexbase.add_to_callback("process_input_buffer", + \end{luacode} + \directlua{luatexbase.add_to_callback("process_input_buffer", syllabic, "syllabic")} -\begin{luacode} + \begin{luacode} function nonsyllabic ( s ) s = unicode.utf8.gsub ( s , '(%a)̯', '\\textsubarch{%1}' ) return s end -\end{luacode} -\directlua{luatexbase.add_to_callback("process_input_buffer", + \end{luacode} + \directlua{luatexbase.add_to_callback("process_input_buffer", nonsyllabic, "nonsyllabic")} -\begin{luacode} + \begin{luacode} function breathyvoiced ( s ) s = unicode.utf8.gsub ( s , '(%a)̤', '\\textsubumlaut{%1}' ) return s end -\end{luacode} -\directlua{luatexbase.add_to_callback("process_input_buffer", + \end{luacode} + \directlua{luatexbase.add_to_callback("process_input_buffer", breathyvoiced, "breathyvoiced")} -\begin{luacode} + \begin{luacode} function linguolabial ( s ) s = unicode.utf8.gsub ( s , '(%a)̼', '\\textseagull{%1}' ) return s end -\end{luacode} -\directlua{luatexbase.add_to_callback("process_input_buffer", + \end{luacode} + \directlua{luatexbase.add_to_callback("process_input_buffer", linguolabial, "linguolabial")} -\begin{luacode} + \begin{luacode} function velarized ( s ) s = unicode.utf8.gsub ( s , '(%a)Ì´', '\\textsuperimposetilde{%1}' ) return s end -\end{luacode} -\directlua{luatexbase.add_to_callback("process_input_buffer", + \end{luacode} + \directlua{luatexbase.add_to_callback("process_input_buffer", velarized, "velarized")} -\begin{luacode} + \begin{luacode} function raised ( s ) s = unicode.utf8.gsub ( s , '(%a)Ì', '\\textraising{%1}' ) return s end -\end{luacode} -\directlua{luatexbase.add_to_callback("process_input_buffer", + \end{luacode} + \directlua{luatexbase.add_to_callback("process_input_buffer", raised, "raised")} -\begin{luacode} + \begin{luacode} function lowered ( s ) s = unicode.utf8.gsub ( s , '(%a)Ìž', '\\textlowering{%1}' ) return s end -\end{luacode} -\directlua{luatexbase.add_to_callback("process_input_buffer", + \end{luacode} + \directlua{luatexbase.add_to_callback("process_input_buffer", lowered, "lowered")} -\begin{luacode} + \begin{luacode} function advancedtr ( s ) s = unicode.utf8.gsub ( s , '(%a)̘', '\\textadvancing{%1}' ) return s end -\end{luacode} -\directlua{luatexbase.add_to_callback("process_input_buffer", + \end{luacode} + \directlua{luatexbase.add_to_callback("process_input_buffer", advancedtr, "advancedtr")} -\begin{luacode} + \begin{luacode} function retractedtr ( s ) s = unicode.utf8.gsub ( s , '(%a)Ì™', '\\textretracting{%1}' ) return s end -\end{luacode} -\directlua{luatexbase.add_to_callback("process_input_buffer", + \end{luacode} + \directlua{luatexbase.add_to_callback("process_input_buffer", retractedtr, "retractedtr")} -\begin{luacode} + \begin{luacode} function dental ( s ) s = unicode.utf8.gsub ( s , '(%a)̪', '\\textsubbridge{%1}' ) return s end -\end{luacode} -\directlua{luatexbase.add_to_callback("process_input_buffer", + \end{luacode} + \directlua{luatexbase.add_to_callback("process_input_buffer", dental, "dental")} -\begin{luacode} + \begin{luacode} function apical ( s ) s = unicode.utf8.gsub ( s , '(%a)̺', '\\textinvsubbridge{%1}' ) return s end -\end{luacode} -\directlua{luatexbase.add_to_callback("process_input_buffer", + \end{luacode} + \directlua{luatexbase.add_to_callback("process_input_buffer", apical, "apical")} -\begin{luacode} + \begin{luacode} function laminal ( s ) s = unicode.utf8.gsub ( s , '(%a)Ì»', '\\textsubsquare{%1}' ) return s end -\end{luacode} -\directlua{luatexbase.add_to_callback("process_input_buffer", + \end{luacode} + \directlua{luatexbase.add_to_callback("process_input_buffer", laminal, "laminal")} -\begin{luacode} + \begin{luacode} function unaudible ( s ) s = unicode.utf8.gsub ( s , '(%a)Ìš', '%1\\textcorner' ) return s end -\end{luacode} -\directlua{luatexbase.add_to_callback("process_input_buffer", + \end{luacode} + \directlua{luatexbase.add_to_callback("process_input_buffer", unaudible, "unaudible")} %% Tie bars \begin{luacode} - function tiebarup ( s ) - s = unicode.utf8.gsub ( s , '(%a)Í¡(%a)', '\\texttoptiebar{%1%2}' ) - return s - end + function tiebarup ( s ) + s = unicode.utf8.gsub ( s , '(%a)Í¡(%a)', '\\texttoptiebar{%1%2}' ) + return s + end \end{luacode} \directlua{luatexbase.add_to_callback("process_input_buffer", - tiebarup, "tiebarup")} + tiebarup, "tiebarup")} \begin{luacode} - function tiebardown ( s ) - s = unicode.utf8.gsub ( s , '(%a)Íœ(%a)', '\\textbottomtiebar{%1%2}' ) - return s - end + function tiebardown ( s ) + s = unicode.utf8.gsub ( s , '(%a)Íœ(%a)', '\\textbottomtiebar{%1%2}' ) + return s + end \end{luacode} \directlua{luatexbase.add_to_callback("process_input_buffer", - tiebardown, "tiebardown")} + tiebardown, "tiebardown")} \begin{luacode} - function risefall ( s ) - s = unicode.utf8.gsub ( s , '(%a)á·ˆ', '\\textrisefall{%1}' ) - return s - end + function risefall ( s ) + s = unicode.utf8.gsub ( s , '(%a)á·ˆ', '\\textrisefall{%1}' ) + return s + end \end{luacode} \directlua{luatexbase.add_to_callback("process_input_buffer", - risefall, "risefall")} + risefall, "risefall")} \begin{luacode} - function rising ( s ) - s = unicode.utf8.gsub ( s , '(%a)á·„', '\\texthighrise{%1}' ) - return s - end + function rising ( s ) + s = unicode.utf8.gsub ( s , '(%a)á·„', '\\texthighrise{%1}' ) + return s + end \end{luacode} \directlua{luatexbase.add_to_callback("process_input_buffer", - rising, "rising")} + rising, "rising")} \begin{luacode} - function falling ( s ) - s = unicode.utf8.gsub ( s , '(%a)á·…', '\\textlowrise{%1}' ) - return s - end + function falling ( s ) + s = unicode.utf8.gsub ( s , '(%a)á·…', '\\textlowrise{%1}' ) + return s + end \end{luacode} \directlua{luatexbase.add_to_callback("process_input_buffer", - falling, "falling")} + falling, "falling")} \fi % \end{macrocode} -% Option \verb|nodiacritics| provided for using the package without Lua\LaTeX. Enabling this option won't print any diacritics. Help from Samcarter and Mico Loretan on different platforms\footnote{Samcarter's \href{https://topanswers.xyz/tex?q=1332\#a1577}{answer} on TopAnswer \& Mico Loretan's \href{https://tex.stackexchange.com/a/563447/174620}{answer} on TeX.SE.} gave a right direction to this code. +% Option \verb|nodiacritics| provided for using the package without +% Lua\LaTeX. Enabling this option won't print any diacritics. Help from +% Samcarter and Mico Loretan on different platforms\footnote{Samcarter's +% \href{https://topanswers.xyz/tex?q=1332\#a1577}{answer} on TopAnswer \& Mico +% Loretan's \href{https://tex.stackexchange.com/a/563447/174620}{answer} on +% TeX.SE.} gave a right direction to this code. % \begin{macrocode} %% Pulmonic Consonants %% Plosives @@ -373,6 +405,7 @@ TIPA typefaces with unicode characters] %% Nasals \newunicodechar{ɱ}{\textltailm} \newunicodechar{ɳ}{\textrtailn} +\newunicodechar{ɲ}{\textltailn} %% Added in v0.2 \newunicodechar{É´}{\textscn} %% Trills \newunicodechar{Ê™}{\textscb} @@ -434,6 +467,11 @@ TIPA typefaces with unicode characters] \newunicodechar{É}{\textturna} \newunicodechar{ɶ}{\textscoelig} \newunicodechar{É’}{\textturnscripta} +%% Open +%% Reported and added by Heller, Thomas on 2021/03/13 +%% Bug report - https://gitlab.com/niranjanvikastambe/unitipa/-/issues/1 +%% MR - https://gitlab.com/niranjanvikastambe/unitipa/-/merge_requests/1 +\newunicodechar{É‘}{\textscripta} %% Non-Pulmonic \newunicodechar{ʘ}{\textbullseye} \newunicodechar{Ç€}{\textpipe} @@ -478,4 +516,8 @@ TIPA typefaces with unicode characters] %</package> % \end{macrocode} % \end{implementation} +% \RecordChanges +% \changes{v0.1}{2020/09/21}{Initial version} +% \changes{v0.2}{2021/03/13}{Added characters `É‘' and `ɲ'} +% \PrintChanges % \Finale
\ No newline at end of file diff --git a/macros/luatex/latex/unitipa/unitipa.pdf b/macros/luatex/latex/unitipa/unitipa.pdf Binary files differindex d74cb5403a..c6b795dae1 100644 --- a/macros/luatex/latex/unitipa/unitipa.pdf +++ b/macros/luatex/latex/unitipa/unitipa.pdf diff --git a/support/latexindent/LatexIndent/Document.pm b/support/latexindent/LatexIndent/Document.pm index 027597b9ef..0b3ea9b254 100644 --- a/support/latexindent/LatexIndent/Document.pm +++ b/support/latexindent/LatexIndent/Document.pm @@ -23,6 +23,7 @@ use open ':std', ':encoding(UTF-8)'; # gain access to subroutines in the following modules use LatexIndent::Switches qw/storeSwitches %switches $is_m_switch_active $is_t_switch_active $is_tt_switch_active $is_r_switch_active $is_rr_switch_active $is_rv_switch_active/; use LatexIndent::LogFile qw/processSwitches $logger/; +use LatexIndent::Logger qw/@logFileLines/; use LatexIndent::Replacement qw/make_replacements/; use LatexIndent::GetYamlSettings qw/yaml_read_settings yaml_modify_line_breaks_settings yaml_get_indentation_settings_for_this_object yaml_poly_switch_get_every_or_custom_value yaml_get_indentation_information yaml_get_object_attribute_for_indentation_settings yaml_alignment_at_ampersand_settings yaml_get_textwrap_removeparagraphline_breaks %masterSettings yaml_get_columns/; use LatexIndent::FileExtension qw/file_extension_check/; @@ -151,12 +152,24 @@ sub output_indented_text{ } else { $logger->info("Not outputting to file; see -w and -o switches for more options."); } - + # put the final line in the logfile $logger->info("${$masterSettings{logFilePreferences}}{endLogFileWith}") if ${$masterSettings{logFilePreferences}}{endLogFileWith}; # github info line $logger->info("*Please direct all communication/issues to:\nhttps://github.com/cmhughes/latexindent.pl") if ${$masterSettings{logFilePreferences}}{showGitHubInfoFooter}; + + # open log file + my $logfileName = $switches{logFileName}||"indent.log"; + my $logfile; + open($logfile,">","${$self}{cruftDirectory}/$logfileName") or die "Can't open $logfileName"; + + foreach my $line (@{LatexIndent::Logger::logFileLines}){ + print $logfile $line,"\n"; + } + + # close log file + close($logfile); # output to screen, unless silent mode print ${$self}{body} unless $switches{silentMode}; diff --git a/support/latexindent/LatexIndent/FileExtension.pm b/support/latexindent/LatexIndent/FileExtension.pm index 716598de77..499ca9f65a 100644 --- a/support/latexindent/LatexIndent/FileExtension.pm +++ b/support/latexindent/LatexIndent/FileExtension.pm @@ -21,17 +21,14 @@ use PerlIO::encoding; use open ':std', ':encoding(UTF-8)'; use File::Basename; # to get the filename and directory path use Exporter qw/import/; -use Log::Log4perl qw(get_logger :levels); use LatexIndent::GetYamlSettings qw/%masterSettings/; use LatexIndent::Switches qw/%switches/; +use LatexIndent::LogFile qw/$logger/; our @EXPORT_OK = qw/file_extension_check/; sub file_extension_check{ my $self = shift; - # grab the logger object - my $logger = get_logger("Document"); - # grab the filename my $fileName = ${$self}{fileName}; diff --git a/support/latexindent/LatexIndent/GetYamlSettings.pm b/support/latexindent/LatexIndent/GetYamlSettings.pm index e46eccf380..4be1d3a97b 100644 --- a/support/latexindent/LatexIndent/GetYamlSettings.pm +++ b/support/latexindent/LatexIndent/GetYamlSettings.pm @@ -21,8 +21,8 @@ use YAML::Tiny; # interpret defaultSettings.yaml and other potent use File::Basename; # to get the filename and directory path use File::HomeDir; use Cwd; -use Log::Log4perl qw(get_logger :levels); use Exporter qw/import/; +use LatexIndent::LogFile qw/$logger/; our @EXPORT_OK = qw/yaml_read_settings yaml_modify_line_breaks_settings yaml_get_indentation_settings_for_this_object yaml_poly_switch_get_every_or_custom_value yaml_get_indentation_information yaml_get_object_attribute_for_indentation_settings yaml_alignment_at_ampersand_settings yaml_get_textwrap_removeparagraphline_breaks %masterSettings yaml_get_columns/; # Read in defaultSettings.YAML file @@ -56,7 +56,6 @@ sub yaml_read_settings{ $defaultSettings = YAML::Tiny->read( "$FindBin::RealBin/defaultSettings.yaml" ) if ( -e "$FindBin::RealBin/defaultSettings.yaml" ); # grab the logger object - my $logger = get_logger("Document"); $logger->info("*YAML settings read: defaultSettings.yaml\nReading defaultSettings.yaml from $FindBin::RealBin/defaultSettings.yaml"); # if latexindent.exe is invoked from TeXLive, then defaultSettings.yaml won't be in @@ -87,7 +86,7 @@ sub yaml_read_settings{ # if indentconfig.yaml doesn't exist, check for the hidden file, .indentconfig.yaml $indentconfig = "$homeDir/.indentconfig.yaml" if(! -e $indentconfig); - + # messages for indentconfig.yaml and/or .indentconfig.yaml if ( -e $indentconfig and !$switches{onlyDefault}) { # read the absolute paths from indentconfig.yaml @@ -126,7 +125,17 @@ sub yaml_read_settings{ $logger->info("Home directory is $homeDir (didn't find either indentconfig.yaml or .indentconfig.yaml)\nTo specify user settings you would put indentconfig.yaml here: $homeDir/indentconfig.yaml\nAlternatively, you can use the hidden file .indentconfig.yaml as: $homeDir/.indentconfig.yaml"); } } - + + # default value of readLocalSettings + # + # latexindent -l myfile.tex + # + # means that we wish to use localSettings.yaml + if(defined($switches{readLocalSettings}) and ($switches{readLocalSettings} eq '')){ + $logger->info('*-l switch used without filename, will search for the following files in turn:'); + $logger->info('localSettings.yaml,latexindent.yaml,.localSettings.yaml,.latexindent.yaml'); + $switches{readLocalSettings} = 'localSettings.yaml,latexindent.yaml,.localSettings.yaml,.latexindent.yaml'; + } # local settings can be called with a + symbol, for example # -l=+myfile.yaml @@ -149,12 +158,14 @@ sub yaml_read_settings{ $switches{readLocalSettings} =~ s/\h*$//g; $switches{readLocalSettings} =~ s/\h*,\h*/,/g; if($switches{readLocalSettings} =~ m/\+/){ - $logger->info("+ found in call for -l switch: will add localSettings.yaml"); + $logger->info("+ found in call for -l switch: will add localSettings.yaml,latexindent.yaml,.localSettings.yaml,.latexindent.yaml"); # + can be either at the beginning or the end, which determines if where the comma should go my $commaAtBeginning = ($switches{readLocalSettings} =~ m/^\h*\+/ ? q() : ","); my $commaAtEnd = ($switches{readLocalSettings} =~ m/^\h*\+/ ? "," : q()); - $switches{readLocalSettings} =~ s/\h*\+\h*/$commaAtBeginning."localSettings.yaml".$commaAtEnd/e; + $switches{readLocalSettings} =~ s/\h*\+\h*/$commaAtBeginning + ."localSettings.yaml,latexindent.yaml,.localSettings.yaml,.latexindent.yaml" + .$commaAtEnd/ex; $logger->info("New value of -l switch: $switches{readLocalSettings}"); } @@ -197,7 +208,15 @@ sub yaml_read_settings{ $logger->info("Adding $_ to YAML read paths"); push(@absPaths,"$_"); } elsif ( !(-e $_) ) { - $logger->warn("*yaml file not found: $_ not found. Proceeding without it."); + if ( ($_ =~ m/localSettings|latexindent/s + and !(-e 'localSettings.yaml') + and !(-e '.localSettings.yaml') + and !(-e 'latexindent.yaml') + and !(-e '.latexindent.yaml')) + or $_ !~ m/localSettings|latexindent/s + ){ + $logger->warn("*yaml file not found: $_ not found. Proceeding without it."); + } } } @@ -328,6 +347,10 @@ sub yaml_read_settings{ push(@yamlSettings,$switches{yaml}); } + foreach (@yamlSettings){ + $logger->info("YAML setting: ".$_); + } + # it is possible to specify, for example, # # -y=indentAfterHeadings:paragraph:indentAfterThisHeading:1;level:1 @@ -348,8 +371,18 @@ sub yaml_read_settings{ # increment the counter $settingsCounter++; + # need to be careful in splitting at ';' + # + # motivation as detailed in https://github.com/cmhughes/latexindent.pl/issues/243 + # + # latexindent.pl -m -y='modifyLineBreaks:oneSentencePerLine:manipulateSentences: 1, + # modifyLineBreaks:oneSentencePerLine:sentencesBeginWith:a-z: 1, + # fineTuning:modifyLineBreaks:betterFullStop: "(?:\.|;|:(?![a-z]))|(?:(?<!(?:(?:e\.g)|(?:i\.e)|(?:etc))))\.(?!(?:[a-z]|[A-Z]|\-|~|\,|[0-9]))"' myfile.tex + # + # in particular, the fineTuning part needs care in treating the argument between the quotes + # check for a match of the ; - if($_ =~ m/(?<!\\);/){ + if($_ !~ m/(?<!(?:\\))"/ and $_ =~ m/(?<!\\);/){ my (@subfield) = split(/(?<!\\);/,$_); # the content up to the first ; is called the 'root' @@ -403,8 +436,43 @@ sub yaml_read_settings{ # loop through each of the settings specified in the -y switch foreach(@yamlSettings){ - # split each value at semi-colon - my (@keysValues) = split(/(?<!(?:\\|\[)):(?!\])/,$_); + + my @keysValues; + + # as above, need to be careful in splitting at ':' + # + # motivation as detailed in https://github.com/cmhughes/latexindent.pl/issues/243 + # + # latexindent.pl -m -y='modifyLineBreaks:oneSentencePerLine:manipulateSentences: 1, + # modifyLineBreaks:oneSentencePerLine:sentencesBeginWith:a-z: 1, + # fineTuning:modifyLineBreaks:betterFullStop: "(?:\.|;|:(?![a-z]))|(?:(?<!(?:(?:e\.g)|(?:i\.e)|(?:etc))))\.(?!(?:[a-z]|[A-Z]|\-|~|\,|[0-9]))"' myfile.tex + # + # in particular, the fineTuning part needs care in treating the argument between the quotes + + if ($_ =~ m/(?<!(?:\\))"/){ + my (@splitAtQuote) = split(/(?<!(?:\\))"/,$_); + $logger->info("quote found in -y switch"); + $logger->info("key: ".$splitAtQuote[0]); + + # definition check + $splitAtQuote[1] = '' if not defined $splitAtQuote[1]; + + # then log the value + $logger->info("value: ".$splitAtQuote[1]); + + # split at : + (@keysValues) = split(/(?<!(?:\\|\[)):(?!\])/,$splitAtQuote[0]); + + # tabs need special attention + if ($splitAtQuote[1] =~ m/\\t/){ + $splitAtQuote[1] = '"'.$splitAtQuote[1].'"'; + } + push(@keysValues,$splitAtQuote[1]); + } + else { + # split each value at semi-colon + (@keysValues) = split(/(?<!(?:\\|\[)):(?!\])/,$_); + } # $value will always be the last element my $value = $keysValues[-1]; @@ -471,9 +539,6 @@ sub yaml_get_indentation_settings_for_this_object{ # create a name for previously found settings my $storageName = ${$self}{name}.${$self}{modifyLineBreaksYamlName}.(defined ${$self}{storageNameAppend}?${$self}{storageNameAppend}:q()); - # grab the logging object - my $logger = get_logger("Document"); - # check for storage of repeated objects if ($previouslyFoundSettings{$storageName}){ $logger->trace("*Using stored settings for $storageName") if($is_t_switch_active); @@ -573,9 +638,6 @@ sub yaml_alignment_at_ampersand_settings{ sub yaml_modify_line_breaks_settings{ my $self = shift; - # grab the logging object - my $logger = get_logger("Document"); - # details to the log file $logger->trace("*-m modifylinebreaks switch active") if $is_t_switch_active; $logger->trace("looking for polyswitch, textWrapOptions, removeParagraphLineBreaks, oneSentencePerLine settings for ${$self}{name} ") if $is_t_switch_active; @@ -601,9 +663,6 @@ sub yaml_modify_line_breaks_settings{ sub yaml_get_textwrap_removeparagraphline_breaks{ my $self = shift; - # grab the logging object - my $logger = get_logger("Document"); - # textWrap and removeParagraphLineBreaks settings foreach ("textWrapOptions","removeParagraphLineBreaks"){ @@ -789,9 +848,6 @@ sub yaml_poly_switch_get_every_or_custom_value{ my $toBeAssignedTo = $input{toBeAssignedTo}; my $toBeAssignedToAlias = $input{toBeAssignedToAlias}; - # grab the logging object - my $logger = get_logger("Document"); - # alias if(${$self}{aliases}{$toBeAssignedTo}){ $logger->trace("aliased $toBeAssignedTo using ${$self}{aliases}{$toBeAssignedTo}") if($is_t_switch_active); @@ -871,9 +927,6 @@ sub yaml_get_indentation_information{ # if the YamlName is not optionalArguments, mandatoryArguments, heading (possibly others) then assume we're looking for 'body' my $YamlName = $self->yaml_get_object_attribute_for_indentation_settings; - # grab the logging object - my $logger = get_logger("Document"); - my $indentationInformation; foreach my $indentationAbout ("noAdditionalIndent","indentRules"){ # check that the 'thing' is defined @@ -912,8 +965,8 @@ sub yaml_get_indentation_information{ if(${$masterSettings{$globalInformation}}{$YamlName}=~m/^\h*$/){ $logger->trace("$globalInformation specified for $YamlName (see $globalInformation)") if $is_t_switch_active; return ${$masterSettings{$globalInformation}}{$YamlName}; - } else { - $logger->trace("$globalInformation specified (${$masterSettings{$globalInformation}}{$YamlName}) for $YamlName, but it needs to only contain horizontal space -- I'm ignoring this one") if $is_t_switch_active; + } elsif (${$masterSettings{$globalInformation}}{$YamlName} ne '0') { + $logger->warn("$globalInformation specified (${$masterSettings{$globalInformation}}{$YamlName}) for $YamlName, but it needs to only contain horizontal space -- I'm ignoring this one"); } } } diff --git a/support/latexindent/LatexIndent/IfElseFi.pm b/support/latexindent/LatexIndent/IfElseFi.pm index 056b36d8c3..e7e363b04c 100644 --- a/support/latexindent/LatexIndent/IfElseFi.pm +++ b/support/latexindent/LatexIndent/IfElseFi.pm @@ -47,7 +47,7 @@ sub construct_ifelsefi_regexp{ ) # part of the tokens used for latexindent ( (?: - (?!\\if). + (?!\\$ifElseFiNameRegExp). )*? # body, which can't include another \if ) (\R*) # linebreaks after body diff --git a/support/latexindent/LatexIndent/Item.pm b/support/latexindent/LatexIndent/Item.pm index f9fbf8dd4b..16c6bd8b8d 100644 --- a/support/latexindent/LatexIndent/Item.pm +++ b/support/latexindent/LatexIndent/Item.pm @@ -45,14 +45,14 @@ sub construct_list_of_items{ $itemRegExp = qr/ ( - \\($listOfItems) + \\((?:$listOfItems)(?:\[[^]]*?\])?(?!\S)) \h* (\R*)? ) ( (?: # cluster-only (), don't capture (?! - (?:\\(?:$listOfItems)) # cluster-only (), don't capture + (?:\\(?:(?:$listOfItems)(?:\[[^]]*?\])?(?!\S))) # cluster-only (), don't capture ). # any character, but not \\$item )* ) diff --git a/support/latexindent/LatexIndent/LogFile.pm b/support/latexindent/LatexIndent/LogFile.pm index 205d72031e..8a35c3c2a2 100644 --- a/support/latexindent/LatexIndent/LogFile.pm +++ b/support/latexindent/LatexIndent/LogFile.pm @@ -19,20 +19,10 @@ use warnings; use FindBin; use File::Basename; # to get the filename and directory path use Exporter qw/import/; -use Log::Log4perl qw(get_logger :levels); -use Log::Log4perl::Appender::Screen; -use Log::Dispatch::File; -use LatexIndent::GetYamlSettings qw/%masterSettings/; use LatexIndent::Switches qw/%switches/; use LatexIndent::Version qw/$versionNumber $versionDate/; our @EXPORT_OK = qw/processSwitches $logger/; -our @logFileNotes; -our $logger = get_logger("Document"); - -# log file methods, using log4perl; references -# pattern layout: http://search.cpan.org/~mschilli/Log-Log4perl-1.32/lib/Log/Log4perl/Layout/PatternLayout.pm -# multiple appenders: https://stackoverflow.com/questions/8620347/perl-log4perl-printing-and-logging-at-the-same-time-in-a-line?rq=1 -# getting started: https://www.perl.com/pub/2002/09/11/log4perl.html +our $logger; sub processSwitches{ # -v switch is just to show the version number @@ -98,7 +88,7 @@ ENDQUOTE # if we've made it this far, the processing of switches and logging begins my $self = shift; - ($switches{trace}||$switches{ttrace}) ? $logger->level($TRACE): $logger->level($INFO); + $logger = LatexIndent::Logger->new(); # cruft directory ${$self}{cruftDirectory} = $switches{cruftDirectory}||(dirname ${$self}{fileName}); @@ -106,58 +96,6 @@ ENDQUOTE my $logfileName = ($switches{cruftDirectory} ? ${$self}{cruftDirectory}."/" : '').($switches{logFileName}||"indent.log"); - # layout of the logfile information, for example - # - # 2017/09/16 11:59:09 INFO: message - # 2017/09/16 12:23:53 INFO: LogFile.pm:156 LatexIndent::LogFile::processSwitches - message - # reference: https://stackoverflow.com/questions/46262844/log4perl-grouping-messages/46309392#46309392 - Log::Log4perl::Layout::PatternLayout::add_global_cspec( - 'A', sub { - if($_[1] =~ /^\*/){ - $_[1]=~s/^\*//; - if($_[1]=~m/\R/s){ - my $indentation = ' '.(' ' x length $_[3]); - $_[1] =~ s/\R/\n$indentation/gs; - } - return "$_[3]: ".$_[1]; - } else { - my $indentation = ' '.(' ' x length $_[3]); - $_[1] =~ s/\R/\n$indentation/gs if($_[1]=~m/\R/s); - return $indentation.$_[1]; - } - }); - - my $layout = Log::Log4perl::Layout::PatternLayout->new("%A%n"); - - # details for the Log4perl logging - my $appender = Log::Log4perl::Appender->new( - "Log::Dispatch::File", - filename => $logfileName, - mode => "write", - utf8 => 1, - ); - - # add the layout - $appender->layout($layout); - - # adjust the logger object - $logger->add_appender($appender); - - # appender object for output to screen - my $appender_screen = q(); - - # output to screen, if appropriate - if($switches{screenlog}){ - $appender_screen = Log::Log4perl::Appender->new( - "Log::Log4perl::Appender::Screen", - stderr => 1, - utf8 => 1, - ); - - $appender_screen->layout($layout); - $logger->add_appender($appender_screen); - } - # details of the script to log file $logger->info("*$FindBin::Script version $versionNumber, $versionDate, a script to indent .tex files"); $logger->info("$FindBin::Script lives here: $FindBin::RealBin/"); @@ -207,7 +145,7 @@ ENDQUOTE # output location of modules if($FindBin::Script eq 'latexindent.pl' or ($FindBin::Script eq 'latexindent.exe' and $switches{trace} )) { - my @listOfModules = ('FindBin', 'YAML::Tiny', 'File::Copy', 'File::Basename', 'Getopt::Long','File::HomeDir','Unicode::GCString','Log::Log4perl'); + my @listOfModules = ('FindBin', 'YAML::Tiny', 'File::Copy', 'File::Basename', 'Getopt::Long','File::HomeDir','Unicode::GCString'); $logger->info("*Perl modules are being loaded from the following directories:"); foreach my $moduleName (@listOfModules) { (my $file = $moduleName) =~ s|::|/|g; @@ -221,33 +159,6 @@ ENDQUOTE # read the YAML settings $self->yaml_read_settings; - # the user may have specified their own settings for the rest of the log file, - # for example: - # - # logFilePreferences: - # PatternLayout: - # default: "%p: %m{indent}%n" - # trace: "%p: %m{indent}%n" - # ttrace: "%d %p: %F{1}:%L %M - %m{indent}%n" - # - # e.g, default mode: - # 2017/09/16 11:59:09 INFO: message - # or trace mode: - # 2017/09/16 11:59:09 INFO: message - # or in trace mode: - # 2017/09/16 12:23:53 INFO: LogFile.pm:156 LatexIndent::LogFile::processSwitches - message - my $pattern = q(); - if($switches{ttrace}){ - $pattern = ${${$masterSettings{logFilePreferences}}{PatternLayout}}{ttrace}; - } elsif($switches{trace}){ - $pattern = ${${$masterSettings{logFilePreferences}}{PatternLayout}}{trace}; - } else { - $pattern = ${${$masterSettings{logFilePreferences}}{PatternLayout}}{default}; - } - $layout = Log::Log4perl::Layout::PatternLayout->new($pattern); - $appender->layout($layout); - - $appender_screen->layout($layout) if $switches{screenlog}; return; } diff --git a/support/latexindent/LatexIndent/Logger.pm b/support/latexindent/LatexIndent/Logger.pm new file mode 100644 index 0000000000..02bcd23dd7 --- /dev/null +++ b/support/latexindent/LatexIndent/Logger.pm @@ -0,0 +1,64 @@ +package LatexIndent::Logger; +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# See http://www.gnu.org/licenses/. +# +# Chris Hughes, 2017 +# +# For all communication, please visit: https://github.com/cmhughes/latexindent.pl + +use strict; +use warnings; +use Exporter; +use LatexIndent::Switches qw/%switches/; +our @ISA = "LatexIndent::Document"; # class inheritance, Programming Perl, pg 321 +our @EXPORT_OK = qw/@logFileLines/; +our @logFileLines; + +sub info{ + my $self = shift; + my $logfileline = shift; + if ($logfileline =~ m/^\*/s){ + $logfileline =~ s/^\*/INFO: /s; + $logfileline =~ s/^/ /mg; + $logfileline =~ s/^\h+INFO/INFO/s; + } else { + $logfileline =~ s/^/ /mg; + } + push(@logFileLines,$logfileline); + print $logfileline,"\n" if $switches{screenlog}; +} + +sub warn{ + my $self = shift; + my $logfileline = shift; + if ($logfileline =~ m/^\*/s){ + $logfileline =~ s/^\*/WARN: /s + } else { + $logfileline =~ s/^/ /mg; + } + push(@logFileLines,$logfileline); + print $logfileline,"\n" if $switches{screenlog}; +} + +sub trace{ + my $self = shift; + my $logfileline = shift; + if ($logfileline =~ m/^\*/s){ + $logfileline =~ s/^\*/TRACE: /s + } else { + $logfileline =~ s/^/ /mg; + } + push(@logFileLines,$logfileline); + print $logfileline,"\n" if $switches{screenlog}; +} + +1; diff --git a/support/latexindent/LatexIndent/Version.pm b/support/latexindent/LatexIndent/Version.pm index a5dd88c027..17c5ddd1fc 100644 --- a/support/latexindent/LatexIndent/Version.pm +++ b/support/latexindent/LatexIndent/Version.pm @@ -19,6 +19,6 @@ use warnings; use Exporter qw/import/; our @EXPORT_OK = qw/$versionNumber $versionDate/; -our $versionNumber = '3.8.3'; -our $versionDate = '2020-11-06'; +our $versionNumber = '3.9'; +our $versionDate = '2021-03-14'; 1 diff --git a/support/latexindent/README b/support/latexindent/README index 05a58a37fa..08dd864b2e 100644 --- a/support/latexindent/README +++ b/support/latexindent/README @@ -1,5 +1,5 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - latexindent.pl, version 3.8.3, 2020-11-06 + latexindent.pl, version 3.9, 2021-03-14 PERL script to indent code within environments, and align delimited environments in .tex files. diff --git a/support/latexindent/defaultSettings.yaml b/support/latexindent/defaultSettings.yaml index d4ed8f0c80..f12e0030a9 100644 --- a/support/latexindent/defaultSettings.yaml +++ b/support/latexindent/defaultSettings.yaml @@ -1,4 +1,4 @@ -# defaultSettings.yaml for latexindent.pl, version 3.8.3, 2020-11-06 +# defaultSettings.yaml for latexindent.pl, version 3.9, 2021-03-14 # a script that aims to # beautify .tex, .sty, .cls files # @@ -89,10 +89,6 @@ logFilePreferences: showDecorationFinishCodeBlockTrace: 0 endLogFileWith: '--------------' showGitHubInfoFooter: 1 - PatternLayout: - default: "%A%n" - trace: "%A%n" - ttrace: "%A%n" # verbatim environments specified # in this field will not be changed at all! @@ -357,6 +353,7 @@ commandCodeBlocks: - 'decoration' - '\+\+' - '\-\-' + - '\#\#\d' commandNameSpecial: - amalgamate: 1 @@ -617,7 +614,7 @@ fineTuning: environments: name: '[a-zA-Z@\*0-9_\\]+' ifElseFi: - name: '@?if[a-zA-Z@]*?' + name: '(?!@?if[a-zA-Z@]*?\{)@?if[a-zA-Z@]*?' commands: name: '[+a-zA-Z@\*0-9_\:]+?' keyEqualsValuesBracesBrackets: diff --git a/support/latexindent/documentation/appendices.tex b/support/latexindent/documentation/appendices.tex index e756fb9533..4036579e53 100644 --- a/support/latexindent/documentation/appendices.tex +++ b/support/latexindent/documentation/appendices.tex @@ -26,7 +26,6 @@ use File::HomeDir; use Getopt::Long; use Data::Dumper; use List::Util qw(max); -use Log::Log4perl qw(get_logger :levels); print "hello world"; exit; @@ -62,12 +61,19 @@ curl -L http://cpanmin.us | perl - App::cpanminus cpanm YAML::Tiny cpanm File::HomeDir cpanm Unicode::GCString -cpanm Log::Log4perl cpanm Log::Dispatch \end{commandshell} - For other distributions, the Ubuntu/Debian approach may work by visiting the software - center, or else by running, for example, + For other distributions, the Ubuntu/Debian approach may work as follows + \begin{commandshell} +sudo apt install perl +sudo cpan -i App::cpanminus +sudo cpanm YAML::Tiny +sudo cpanm File::HomeDir +sudo cpanm Unicode::GCString +sudo cpanm Log::Dispatch::File +\end{commandshell} + or else by running, for example, \begin{commandshell} sudo perl -MCPAN -e'install "File::HomeDir"' \end{commandshell} @@ -83,7 +89,6 @@ apk --no-cache add miniperl perl-utils # Installing incompatible latexindent perl dependencies via apk apk --no-cache add \ - perl-log-log4perl \ perl-log-dispatch \ perl-namespace-autoclean \ perl-specio \ @@ -113,7 +118,6 @@ brew install cpanm cpanm YAML::Tiny cpanm File::HomeDir cpanm Unicode::GCString -cpanm Log::Log4perl cpanm Log::Dispatch \end{commandshell} @@ -230,10 +234,12 @@ TRACE: Searching myenv for optional and mandatory arguments \section{Differences from Version 2.2 to 3.0}\label{app:differences} There are a few (small) changes to the interface when comparing Version 2.2 to Version 3.0. Explicitly, in previous versions you might have run, for example, + \index{switches!-o demonstration} \begin{commandshell} latexindent.pl -o myfile.tex outputfile.tex \end{commandshell} whereas in Version 3.0 you would run any of the following, for example, + \index{switches!-o demonstration} \begin{commandshell} latexindent.pl -o=outputfile.tex myfile.tex latexindent.pl -o outputfile.tex myfile.tex @@ -264,6 +270,7 @@ latexindent.pl myfile.tex -outputfile outputfile.tex would write YAML as in \cref{lst:noAdditionalIndentOld}; as of Version 3.0, you would write YAML as in \cref{lst:indentAfterThisHeadingNew1} or, if you're using \texttt{-m} switch, \cref{lst:indentAfterThisHeadingNew2}. + \index{specialBeginEnd!update to displaymath V3.0} \begin{minipage}{.45\textwidth} \cmhlistingsfromfile{demonstrations/noAddtionalIndentOld.yaml}[yaml-TCB]{\texttt{noAdditionalIndent} in Version 2.2}{lst:noAdditionalIndentOld} diff --git a/support/latexindent/documentation/cmhlistings.tex b/support/latexindent/documentation/cmhlistings.tex index 1f058616d6..5d44a59803 100644 --- a/support/latexindent/documentation/cmhlistings.tex +++ b/support/latexindent/documentation/cmhlistings.tex @@ -26,3 +26,8 @@ #1^^J .. endproof:example::^^J } +\newcommand{\cmhindex}[1]{ + +:index:@#1@ + +} diff --git a/support/latexindent/documentation/figure-schematic.png b/support/latexindent/documentation/figure-schematic.png Binary files differnew file mode 100644 index 0000000000..f56aa562c2 --- /dev/null +++ b/support/latexindent/documentation/figure-schematic.png diff --git a/support/latexindent/documentation/latexindent.pdf b/support/latexindent/documentation/latexindent.pdf Binary files differindex ec8fbfd269..c7e3178cc6 100644 --- a/support/latexindent/documentation/latexindent.pdf +++ b/support/latexindent/documentation/latexindent.pdf diff --git a/support/latexindent/documentation/latexindent.tex b/support/latexindent/documentation/latexindent.tex index 81a0060483..22aecf1b78 100644 --- a/support/latexindent/documentation/latexindent.tex +++ b/support/latexindent/documentation/latexindent.tex @@ -1,6 +1,7 @@ % arara: pdflatex: {shell: yes} +% arara: makeindex: {style: latexindent.ist} % arara: bibtex -% arara: pdflatex: {shell: yes} if changed (toFile('latexindent.aux')) +% arara: pdflatex: {shell: yes} if changed (toFile('latexindent.aux')) || changed (toFile('latexindent.ind')) % arara: pdflatex: {shell: yes} if changed (toFile('latexindent.aux')) % arara: pdflatex: {shell: yes} if changed (toFile('latexindent.aux')) \documentclass[10pt]{article} @@ -320,175 +321,175 @@ \lstdefinestyle{logFilePreferences}{ style=yaml-LST, - firstnumber=85,linerange={85-95}, + firstnumber=85,linerange={85-91}, numbers=left, } \lstdefinestyle{verbatimEnvironments}{ style=yaml-LST, - firstnumber=99,linerange={99-102}, + firstnumber=95,linerange={95-98}, numbers=left, } \lstdefinestyle{verbatimCommands}{ style=yaml-LST, - firstnumber=105,linerange={105-107}, + firstnumber=101,linerange={101-103}, numbers=left, } \lstdefinestyle{noIndentBlock}{ style=yaml-LST, - firstnumber=112,linerange={112-114}, + firstnumber=108,linerange={108-110}, numbers=left, } \lstdefinestyle{removeTrailingWhitespace}{ style=yaml-LST, - firstnumber=117,linerange={117-119}, + firstnumber=113,linerange={113-115}, numbers=left, } \lstdefinestyle{fileContentsEnvironments}{ style=yaml-LST, - firstnumber=123,linerange={123-125}, + firstnumber=119,linerange={119-121}, numbers=left, } \lstdefinestyle{lookForPreamble}{ style=yaml-LST, - firstnumber=131,linerange={131-135}, + firstnumber=127,linerange={127-131}, numbers=left, } \lstdefinestyle{lookForAlignDelims}{ style=yaml-LST, - firstnumber=148,linerange={148-164}, + firstnumber=144,linerange={144-160}, numbers=left, } \lstdefinestyle{indentAfterItems}{ style=yaml-LST, - firstnumber=221,linerange={221-225}, + firstnumber=217,linerange={217-221}, numbers=left, } \lstdefinestyle{itemNames}{ style=yaml-LST, - firstnumber=231,linerange={231-233}, + firstnumber=227,linerange={227-229}, numbers=left, } \lstdefinestyle{specialBeginEnd}{ style=yaml-LST, - firstnumber=237,linerange={237-250}, + firstnumber=233,linerange={233-246}, numbers=left, } \lstdefinestyle{indentAfterHeadings}{ style=yaml-LST, - firstnumber=260,linerange={260-269}, + firstnumber=256,linerange={256-265}, numbers=left, } \lstdefinestyle{noAdditionalIndentGlobalEnv}{ style=yaml-LST, - firstnumber=318,linerange={318-319}, + firstnumber=314,linerange={314-315}, numbers=left, } \lstdefinestyle{noAdditionalIndentGlobal}{ style=yaml-LST, - firstnumber=318,linerange={318-330}, + firstnumber=314,linerange={314-326}, numbers=left, } \lstdefinestyle{indentRulesGlobalEnv}{ style=yaml-LST, - firstnumber=334,linerange={334-335}, + firstnumber=330,linerange={330-331}, numbers=left, } \lstdefinestyle{indentRulesGlobal}{ style=yaml-LST, - firstnumber=334,linerange={334-346}, + firstnumber=330,linerange={330-342}, numbers=left, } \lstdefinestyle{commandCodeBlocks}{ style=yaml-LST, - firstnumber=349,linerange={349-363}, + firstnumber=345,linerange={345-360}, numbers=left, } \lstdefinestyle{modifylinebreaks}{ style=yaml-LST, - firstnumber=475,linerange={475-477}, + firstnumber=472,linerange={472-474}, numbers=left, } \lstdefinestyle{textWrapOptions}{ style=yaml-LST, - firstnumber=502,linerange={502-503}, + firstnumber=499,linerange={499-500}, numbers=left, } \lstdefinestyle{textWrapOptionsAll}{ style=yaml-LST, - firstnumber=502,linerange={502-518}, + firstnumber=499,linerange={499-515}, numbers=left, } \lstdefinestyle{removeParagraphLineBreaks}{ style=yaml-LST, - firstnumber=519,linerange={519-533}, + firstnumber=516,linerange={516-530}, numbers=left, } \lstdefinestyle{paragraphsStopAt}{ style=yaml-LST, - firstnumber=534,linerange={534-543}, + firstnumber=531,linerange={531-540}, numbers=left, } \lstdefinestyle{oneSentencePerLine}{ style=yaml-LST, - firstnumber=478,linerange={478-501}, + firstnumber=475,linerange={475-498}, numbers=left, } \lstdefinestyle{sentencesFollow}{ style=yaml-LST, - firstnumber=483,linerange={483-491}, + firstnumber=480,linerange={480-488}, numbers=left, } \lstdefinestyle{sentencesBeginWith}{ style=yaml-LST, - firstnumber=492,linerange={492-495}, + firstnumber=489,linerange={489-492}, numbers=left, } \lstdefinestyle{sentencesEndWith}{ style=yaml-LST, - firstnumber=496,linerange={496-501}, + firstnumber=493,linerange={493-498}, numbers=left, } \lstdefinestyle{modifylinebreaksEnv}{ style=yaml-LST, - firstnumber=544,linerange={544-553}, + firstnumber=541,linerange={541-550}, numbers=left, } \lstdefinestyle{replacements}{ style=yaml-LST, - firstnumber=605,linerange={605-613}, + firstnumber=602,linerange={602-610}, numbers=left, } \lstdefinestyle{fineTuning}{ style=yaml-LST, - firstnumber=616,linerange={616-637}, + firstnumber=613,linerange={613-634}, numbers=left, } @@ -661,7 +662,6 @@ {\titlerule*[0.5em]{$\cdot$}\contentspage} [] \AtBeginDocument{\addtocontents{lol}{\protect\begin{widepage}\protect\begin{multicols}{2}}} -\AtEndDocument{\addtocontents{lol}{\protect\end{multicols}\protect\end{widepage}}} % cleveref settings \crefname{table}{Table}{Tables} @@ -749,6 +749,7 @@ {\titlerule*[0.5em]{$\cdot$}\contentspage} \setcounter{secnumdepth}{5} +\makeindex \begin{document} \renewcommand*{\thefootnote}{\arabic{footnote}} \input{title.tex} @@ -780,4 +781,6 @@ \input{sec-conclusions-know-limitations} \input{references} \input{appendices} + \addtocontents{lol}{\protect\end{multicols}\protect\end{widepage}} + \printindex \end{document} diff --git a/support/latexindent/documentation/logo.png b/support/latexindent/documentation/logo.png Binary files differnew file mode 100644 index 0000000000..1aa80cc43d --- /dev/null +++ b/support/latexindent/documentation/logo.png diff --git a/support/latexindent/documentation/sec-conclusions-know-limitations.tex b/support/latexindent/documentation/sec-conclusions-know-limitations.tex index ddd4e6c8ad..a768d0ba6a 100644 --- a/support/latexindent/documentation/sec-conclusions-know-limitations.tex +++ b/support/latexindent/documentation/sec-conclusions-know-limitations.tex @@ -3,8 +3,8 @@ There are a number of known limitations of the script, and almost certainly quite a few that are \emph{unknown}! - The main limitation is to do with the alignment routine discussed on - \cpageref{yaml:lookforaligndelims}; for example, consider the file given in \cref{lst:matrix2}. + The main limitation is to do with the alignment routine discussed in + \cpageref{lst:aligndelims:advanced}; for example, consider the file given in \cref{lst:matrix2}. \cmhlistingsfromfile{demonstrations/matrix2.tex}{\texttt{matrix2.tex}}{lst:matrix2} diff --git a/support/latexindent/documentation/sec-default-user-local.tex b/support/latexindent/documentation/sec-default-user-local.tex index 2d0498749e..411461e3e5 100644 --- a/support/latexindent/documentation/sec-default-user-local.tex +++ b/support/latexindent/documentation/sec-default-user-local.tex @@ -31,6 +31,8 @@ latexindent.pl myfile finally \texttt{myfile.bib} in order\footnote{Throughout this manual, listings shown with line numbers represent code taken directly from \texttt{defaultSettings.yaml}.}. + \index{backup files!extension settings} + \yamltitle{backupExtension}*{extension name} If you call \texttt{latexindent.pl} with the \texttt{-w} switch (to overwrite @@ -45,11 +47,14 @@ latexindent.pl myfile \yamltitle{onlyOneBackUp}*{integer} \label{page:onlyonebackup} + \index{backup files!number of backup files} If you don't want a backup for every time that you call \texttt{latexindent.pl} (so you don't want \texttt{myfile.bak1}, \texttt{myfile.bak2}, etc) and you simply want \texttt{myfile.bak} (or whatever you chose \texttt{backupExtension} to be) then change \texttt{onlyOneBackUp} to \texttt{1}; the default value of \texttt{onlyOneBackUp} is \texttt{0}. + \index{backup files!maximum number of backup files} + \index{backup files!number of backup files} \yamltitle{maxNumberOfBackUps}*{integer} Some users may only want a finite number of backup files, say at most @@ -60,6 +65,7 @@ latexindent.pl myfile \texttt{0}. \yamltitle{cycleThroughBackUps}*{integer} + \index{backup files!cycle through} Some users may wish to cycle through backup files, by deleting the oldest backup file and keeping only the most recent; for example, with \texttt{maxNumberOfBackUps: 4}, and \texttt{cycleThroughBackUps} set to \texttt{1} then the \texttt{copy} @@ -97,17 +103,17 @@ copy myfile.bak4 to myfile.bak3 report the \texttt{GitHub} address of \texttt{latexindent.pl} to the log file if \texttt{showGitHubInfoFooter} is set to \texttt{1}. - \texttt{latexindent.pl}% - \announce{2018-01-13}{log file pattern layout for log file} uses the \texttt{log4perl} module \cite{log4perl} - to handle the creation of the logfile. You can specify the layout of the information - given in the logfile using any of the \texttt{Log Layouts} detailed at - \cite{log4perl}. + Note: \texttt{latexindent.pl} no longer uses the \texttt{log4perl} module to handle + the creation of the logfile.% + \announce*{2021-03-14}*{no longer using log4perl} \yamltitle{verbatimEnvironments}*{fields} A field that contains a list of environments that you would like left completely alone -- no indentation will be performed on environments that you have specified in this field, see \cref{lst:verbatimEnvironments}. + \index{verbatim!environments} + \index{verbatim!commands} \begin{cmhtcbraster}[raster column skip=.1\linewidth] \cmhlistingsfromfile[style=verbatimEnvironments]*{../defaultSettings.yaml}[width=.8\linewidth,before=\centering,yaml-TCB]{\texttt{verbatimEnvironments}}{lst:verbatimEnvironments} @@ -125,11 +131,10 @@ copy myfile.bak4 to myfile.bak3 \vref{sec:modifylinebreaks}). \yamltitle{noIndentBlock}*{fields} - If you have a block of code that you don't want \texttt{latexindent.pl} to touch (even if - it is \emph{not} a verbatim-like environment) then you can wrap it in an - environment from \texttt{noIndentBlock}; you can use any name you like for this, - provided you populate it as demonstrate in \cref{lst:noIndentBlock}. + \index{verbatim!noIndentBlock} it is \emph{not} a verbatim-like environment) then + you can wrap it in an environment from \texttt{noIndentBlock}; you can use any name you + like for this, provided you populate it as demonstrate in \cref{lst:noIndentBlock}. \cmhlistingsfromfile[style=noIndentBlock]*{../defaultSettings.yaml}[width=.4\linewidth,before=\centering,yaml-TCB]{\texttt{noIndentBlock}}{lst:noIndentBlock} @@ -211,6 +216,8 @@ postfoothook=\end{mdframed}, ... \end{cmhlistings} + \index{indentation!defaultIndent description} + \yamltitle{defaultIndent}*{horizontal space} This is the default indentation (\lstinline!\t! means a tab, and is the default value) used in the absence of other details for the command or environment we are working @@ -219,12 +226,13 @@ postfoothook=\end{mdframed}, If you're interested in experimenting with \texttt{latexindent.pl} then you can \emph{remove} all indentation by setting \texttt{defaultIndent: ""}. -\yamltitle{lookForAlignDelims}*{fields}\label{yaml:lookforaligndelims} +\yamltitle{lookForAlignDelims}*{fields} This contains a list of environments and/or commands that are operated upon in a special way by \texttt{latexindent.pl} (see \cref{lst:aligndelims:basic}). In fact, the fields in \texttt{lookForAlignDelims} can actually take two different forms: the \emph{basic} version is shown in \cref{lst:aligndelims:basic} and the \emph{advanced} version in \cref{lst:aligndelims:advanced}; we will discuss each in turn. + \index{delimiters!advanced settings of lookForAlignDelims} \begin{yaml}[numbers=none]{\texttt{lookForAlignDelims} (basic)}[width=.8\linewidth,before=\centering]{lst:aligndelims:basic} lookForAlignDelims: @@ -256,8 +264,14 @@ lookForAlignDelims: If, for example, you wish to remove the alignment of the \lstinline!\\! within a delimiter-aligned block, then the advanced form of \texttt{lookForAlignDelims} shown in \cref{lst:aligndelims:advanced} is for you. + \index{regular expressions!delimiterRegEx} + \index{regular expressions!ampersand alignment} + \index{delimiters!default settings of lookForAlignDelims} + \index{delimiters!ampersand \&} + \index{delimiters!advanced settings} + \index{delimiters!lookForAlignDelims} - \cmhlistingsfromfile*[style=lookForAlignDelims]*{../defaultSettings.yaml}[width=.8\linewidth,before=\centering,yaml-TCB]{\texttt{lookForAlignDelims} (advanced)}{lst:aligndelims:advanced} + \cmhlistingsfromfile[style=lookForAlignDelims]*{../defaultSettings.yaml}[width=.8\linewidth,before=\centering,yaml-TCB]{\texttt{lookForAlignDelims} (advanced)}{lst:aligndelims:advanced} Note that you can use a mixture of the basic and advanced form: in \cref{lst:aligndelims:advanced} \texttt{tabular} and \texttt{tabularx} are advanced @@ -289,14 +303,14 @@ lookForAlignDelims: spaces to be placed \emph{After} ampersands (default: 1); \item \announce{2018-01-13}{justification of cells in ampersand alignment}\texttt{justification}: optionally specifies the justification of each cell as either \emph{left} or \emph{right} (default: left); - \item \announce*{2020-03-21}{align final double back slash}{alignFinalDoubleBackSlash} optionally specifies if the + \item \announce{2020-03-21}{align final double back slash}{alignFinalDoubleBackSlash} optionally specifies if the \emph{final} double back slash should be used for alignment (default: 0); - \item \announce*{2020-03-21}{don't measure feature}{dontMeasure} optionally specifies if + \item \announce{2020-03-21}{don't measure feature}{dontMeasure} optionally specifies if user-specified cells, rows or the largest entries should \emph{not} be measured (default: 0); - \item \announce*{2020-03-21}{delimiter RegEx feature}{delimiterRegEx} optionally specifies the pattern + \item \announce{2020-03-21}{delimiter RegEx feature}{delimiterRegEx} optionally specifies the pattern matching to be used for the alignment delimeter (default: \lstinline3 '(?<!\\)(&)'3); - \item \announce*{2020-03-21}{delimiter justification}{delimiterJustification} optionally specifies the justification + \item \announce{2020-03-21}{delimiter justification}{delimiterJustification} optionally specifies the justification for the alignment delimeters (default: left); note that this feature is only useful if you have delimiters of different lengths in the same column, discussed in \cref{sec:delimiter-reg-ex}. @@ -338,6 +352,8 @@ lookForAlignDelims: \end{minipage}% On running the commands + \index{delimiters!spacing demonstration} + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl tabular2.tex latexindent.pl tabular2.tex -l tabular2.yaml @@ -395,9 +411,12 @@ latexindent.pl tabular2.tex -l tabular2.yaml,tabular8.yaml \end{itemize} We explore% - \announce*{2020-03-21}{alignFinalDoubleBackSlash demonstration} the + \announce{2020-03-21}{alignFinalDoubleBackSlash demonstration} the \texttt{alignFinalDoubleBackSlash} feature by using the file in \cref{lst:tabular4}. Upon running the following commands + \index{delimiters!double backslash demonstration} + \index{switches!-y demonstration} + \index{switches!-o demonstration} \begin{commandshell} latexindent.pl tabular4.tex -o=+-default latexindent.pl tabular4.tex -o=+-FDBS -y="lookForAlignDelims:tabular:alignFinalDoubleBackSlash:1" @@ -408,9 +427,9 @@ latexindent.pl tabular4.tex -o=+-FDBS -y="lookForAlignDelims:tabular:alignFinalD \begin{cmhtcbraster}[raster columns=3, raster left skip=-3.75cm, raster right skip=-2cm,] - \cmhlistingsfromfile*{demonstrations/tabular4.tex}{\texttt{tabular4.tex}}{lst:tabular4} - \cmhlistingsfromfile*{demonstrations/tabular4-default.tex}{\texttt{tabular4-default.tex}}{lst:tabular4-default} - \cmhlistingsfromfile*{demonstrations/tabular4-FDBS.tex}{\texttt{tabular4-FDBS.tex}}{lst:tabular4-FDBS} + \cmhlistingsfromfile{demonstrations/tabular4.tex}{\texttt{tabular4.tex}}{lst:tabular4} + \cmhlistingsfromfile{demonstrations/tabular4-default.tex}{\texttt{tabular4-default.tex}}{lst:tabular4-default} + \cmhlistingsfromfile{demonstrations/tabular4-FDBS.tex}{\texttt{tabular4-FDBS.tex}}{lst:tabular4-FDBS} \end{cmhtcbraster} We note that in: @@ -447,7 +466,7 @@ latexindent.pl matrix1.tex \lstinline!*! and \lstinline!\begin{tabular}!; note also that you may use any environment name that you have specified in \texttt{lookForAlignDelims}. - \begin{cmhtcbraster} + \begin{cmhtcbraster}[raster left skip=-1.5cm,] \cmhlistingsfromfile{demonstrations/align-block.tex}{\texttt{align-block.tex}}{lst:alignmentmarkup} \cmhlistingsfromfile{demonstrations/align-block-default.tex}{\texttt{align-block.tex} default output}{lst:alignmentmarkup-default} \end{cmhtcbraster} @@ -459,27 +478,29 @@ latexindent.pl matrix1.tex \subsection{lookForAlignDelims: the dontMeasure feature}\label{sec:dontMeasure} The% - \announce*{2020-03-21}{don't measure feature} \texttt{lookForAlignDelims} + \announce{2020-03-21}{don't measure feature} \texttt{lookForAlignDelims} field can, optionally, receive the \texttt{dontMeasure} option which can be specified in a few different ways. We will explore this feature in relation to the code given in \cref{lst:tabular-DM}; the default output is shown in \cref{lst:tabular-DM-default}. + \index{delimiters!dontMeasure feature} - \begin{cmhtcbraster} - \cmhlistingsfromfile*{demonstrations/tabular-DM.tex}{\texttt{tabular-DM.tex}}{lst:tabular-DM} - \cmhlistingsfromfile*{demonstrations/tabular-DM-default.tex}{\texttt{tabular-DM.tex} default output}{lst:tabular-DM-default} + \begin{cmhtcbraster}[raster left skip=-1.5cm,] + \cmhlistingsfromfile{demonstrations/tabular-DM.tex}{\texttt{tabular-DM.tex}}{lst:tabular-DM} + \cmhlistingsfromfile{demonstrations/tabular-DM-default.tex}{\texttt{tabular-DM.tex} default output}{lst:tabular-DM-default} \end{cmhtcbraster} The \texttt{dontMeasure} field can be specified as \texttt{largest}, and in which case, the largest element will not be measured; with reference to the YAML file given in \cref{lst:dontMeasure1}, we can run the command + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl tabular-DM.tex -l=dontMeasure1.yaml \end{commandshell} and receive the output given in \cref{lst:tabular-DM-mod1}. \begin{cmhtcbraster} - \cmhlistingsfromfile*{demonstrations/tabular-DM-mod1.tex}{\texttt{tabular-DM.tex} using \cref{lst:dontMeasure1}}{lst:tabular-DM-mod1} - \cmhlistingsfromfile*{demonstrations/dontMeasure1.yaml}[yaml-TCB]{\texttt{dontMeasure1.yaml}}{lst:dontMeasure1} + \cmhlistingsfromfile{demonstrations/tabular-DM-mod1.tex}{\texttt{tabular-DM.tex} using \cref{lst:dontMeasure1}}{lst:tabular-DM-mod1} + \cmhlistingsfromfile{demonstrations/dontMeasure1.yaml}[yaml-TCB]{\texttt{dontMeasure1.yaml}}{lst:dontMeasure1} \end{cmhtcbraster} We note that the \emph{largest} column entries have not contributed to the @@ -487,14 +508,16 @@ latexindent.pl tabular-DM.tex -l=dontMeasure1.yaml The \texttt{dontMeasure} field can also be specified in the form demonstrated in \cref{lst:dontMeasure2}. On running the following commands, + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl tabular-DM.tex -l=dontMeasure2.yaml \end{commandshell} we receive the output in \cref{lst:tabular-DM-mod2}. + \index{regular expressions!dontMeasure feature, cell} \begin{cmhtcbraster} - \cmhlistingsfromfile*{demonstrations/tabular-DM-mod2.tex}{\texttt{tabular-DM.tex} using \cref{lst:dontMeasure2} or \cref{lst:dontMeasure3}}{lst:tabular-DM-mod2} - \cmhlistingsfromfile*{demonstrations/dontMeasure2.yaml}[yaml-TCB]{\texttt{dontMeasure2.yaml}}{lst:dontMeasure2} + \cmhlistingsfromfile{demonstrations/tabular-DM-mod2.tex}{\texttt{tabular-DM.tex} using \cref{lst:dontMeasure2} or \cref{lst:dontMeasure3}}{lst:tabular-DM-mod2} + \cmhlistingsfromfile{demonstrations/dontMeasure2.yaml}[yaml-TCB]{\texttt{dontMeasure2.yaml}}{lst:dontMeasure2} \end{cmhtcbraster} We note that in \cref{lst:dontMeasure2} we have specified entries not to be measured, one @@ -502,18 +525,20 @@ latexindent.pl tabular-DM.tex -l=dontMeasure2.yaml The \texttt{dontMeasure} field can also be specified in the forms demonstrated in \cref{lst:dontMeasure3} and \cref{lst:dontMeasure4}. Upon running the commands + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl tabular-DM.tex -l=dontMeasure3.yaml latexindent.pl tabular-DM.tex -l=dontMeasure4.yaml \end{commandshell} we receive the output given in \cref{lst:tabular-DM-mod3} + \index{regular expressions!lowercase alph a-z} \begin{cmhtcbraster}[raster columns=3, raster left skip=-3.5cm, raster right skip=-2cm, raster column skip=.03\linewidth] - \cmhlistingsfromfile*{demonstrations/tabular-DM-mod3.tex}{\texttt{tabular-DM.tex} using \cref{lst:dontMeasure3} or \cref{lst:dontMeasure3}}{lst:tabular-DM-mod3} - \cmhlistingsfromfile*{demonstrations/dontMeasure3.yaml}[yaml-TCB]{\texttt{dontMeasure3.yaml}}{lst:dontMeasure3} - \cmhlistingsfromfile*{demonstrations/dontMeasure4.yaml}[yaml-TCB]{\texttt{dontMeasure4.yaml}}{lst:dontMeasure4} + \cmhlistingsfromfile{demonstrations/tabular-DM-mod3.tex}{\texttt{tabular-DM.tex} using \cref{lst:dontMeasure3} or \cref{lst:dontMeasure3}}{lst:tabular-DM-mod3} + \cmhlistingsfromfile{demonstrations/dontMeasure3.yaml}[yaml-TCB]{\texttt{dontMeasure3.yaml}}{lst:dontMeasure3} + \cmhlistingsfromfile{demonstrations/dontMeasure4.yaml}[yaml-TCB]{\texttt{dontMeasure4.yaml}}{lst:dontMeasure4} \end{cmhtcbraster} We note that in: \begin{itemize} @@ -532,34 +557,43 @@ latexindent.pl tabular-DM.tex -l=dontMeasure4.yaml We may also specify the \texttt{applyTo} field as \texttt{row}, a demonstration of which is given in \cref{lst:dontMeasure5}; upon running + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl tabular-DM.tex -l=dontMeasure5.yaml \end{commandshell} we receive the output in \cref{lst:tabular-DM-mod5}. \begin{cmhtcbraster} - \cmhlistingsfromfile*{demonstrations/tabular-DM-mod5.tex}{\texttt{tabular-DM.tex} using \cref{lst:dontMeasure5}}{lst:tabular-DM-mod5} - \cmhlistingsfromfile*{demonstrations/dontMeasure5.yaml}[yaml-TCB]{\texttt{dontMeasure5.yaml}}{lst:dontMeasure5} + \cmhlistingsfromfile{demonstrations/tabular-DM-mod5.tex}{\texttt{tabular-DM.tex} using \cref{lst:dontMeasure5}}{lst:tabular-DM-mod5} + \cmhlistingsfromfile{demonstrations/dontMeasure5.yaml}[yaml-TCB]{\texttt{dontMeasure5.yaml}}{lst:dontMeasure5} \end{cmhtcbraster} Finally, the \texttt{applyTo} field can be specified as \texttt{row}, together with a \texttt{regex} expression. For example, for the settings given in \cref{lst:dontMeasure6}, upon running + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl tabular-DM.tex -l=dontMeasure6.yaml \end{commandshell} we receive the output in \cref{lst:tabular-DM-mod6}. + \index{regular expressions!dontMeasure feature, row} + \index{regular expressions!lowercase alph a-z} \begin{cmhtcbraster} - \cmhlistingsfromfile*{demonstrations/tabular-DM-mod6.tex}{\texttt{tabular-DM.tex} using \cref{lst:dontMeasure6}}{lst:tabular-DM-mod6} - \cmhlistingsfromfile*{demonstrations/dontMeasure6.yaml}[yaml-TCB]{\texttt{dontMeasure6.yaml}}{lst:dontMeasure6} + \cmhlistingsfromfile{demonstrations/tabular-DM-mod6.tex}{\texttt{tabular-DM.tex} using \cref{lst:dontMeasure6}}{lst:tabular-DM-mod6} + \cmhlistingsfromfile{demonstrations/dontMeasure6.yaml}[yaml-TCB]{\texttt{dontMeasure6.yaml}}{lst:dontMeasure6} \end{cmhtcbraster} \subsection{lookForAlignDelims: the delimiterRegEx and delimiterJustification feature}\label{sec:delimiter-reg-ex} The delimiter alignment% - \announce*{2020-03-21}{delimiterRegEx feature} will, by + \announce{2020-03-21}{delimiterRegEx feature} will, by default, align code blocks at the ampersand character. The behaviour is controlled by the \texttt{delimiterRegEx} field within \texttt{lookForAlignDelims}; the default value is \lstinline3'(?<!\\)(&)'3, which can be read as: \emph{an ampersand, as long as it is not immediately preceeded by a backslash}. + \index{warning!capturing parenthesis for lookForAlignDelims} + \index{capturing parenthesis (regex)} + \index{regular expressions!capturing parenthesis} + \index{delimiters!delimiterRegEx} + \index{delimiters!delimiter justification (left or right)} \begin{warning} Important: note the `capturing' parenthesis in the \lstinline!(&)! which are necessary; if you @@ -571,21 +605,23 @@ latexindent.pl tabular-DM.tex -l=dontMeasure6.yaml \cref{lst:tabbing-default}. \begin{cmhtcbraster} - \cmhlistingsfromfile*{demonstrations/tabbing.tex}{\texttt{tabbing.tex}}{lst:tabbing} - \cmhlistingsfromfile*{demonstrations/tabbing-default.tex}{\texttt{tabbing.tex} default output}{lst:tabbing-default} + \cmhlistingsfromfile{demonstrations/tabbing.tex}{\texttt{tabbing.tex}}{lst:tabbing} + \cmhlistingsfromfile{demonstrations/tabbing-default.tex}{\texttt{tabbing.tex} default output}{lst:tabbing-default} \end{cmhtcbraster} Let's say that we wish to align the code at either the \lstinline!\=! or \lstinline!\>!. We employ the settings given in \cref{lst:delimiterRegEx1} and run the command + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl tabbing.tex -l=delimiterRegEx1.yaml \end{commandshell} to receive the output given in \cref{lst:tabbing-mod1}. + \index{regular expressions!delimiter regex at \textbackslash= or \textbackslash>} \begin{cmhtcbraster} - \cmhlistingsfromfile*{demonstrations/tabbing-mod1.tex}{\texttt{tabbing.tex} using \cref{lst:delimiterRegEx1}}{lst:tabbing-mod1} - \cmhlistingsfromfile*{demonstrations/delimiterRegEx1.yaml}[yaml-TCB]{\texttt{delimiterRegEx1.yaml}}{lst:delimiterRegEx1} + \cmhlistingsfromfile{demonstrations/tabbing-mod1.tex}{\texttt{tabbing.tex} using \cref{lst:delimiterRegEx1}}{lst:tabbing-mod1} + \cmhlistingsfromfile{demonstrations/delimiterRegEx1.yaml}[yaml-TCB]{\texttt{delimiterRegEx1.yaml}}{lst:delimiterRegEx1} \end{cmhtcbraster} We note that: \begin{itemize} @@ -597,14 +633,16 @@ latexindent.pl tabbing.tex -l=delimiterRegEx1.yaml \end{itemize} We can explore \texttt{delimiterRegEx} a little further using the settings in \cref{lst:delimiterRegEx2} and run the command + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl tabbing.tex -l=delimiterRegEx2.yaml \end{commandshell} to receive the output given in \cref{lst:tabbing-mod2}. + \index{regular expressions!delimiter regex at only \textbackslash>} \begin{cmhtcbraster} - \cmhlistingsfromfile*{demonstrations/tabbing-mod2.tex}{\texttt{tabbing.tex} using \cref{lst:delimiterRegEx2}}{lst:tabbing-mod2} - \cmhlistingsfromfile*{demonstrations/delimiterRegEx2.yaml}[yaml-TCB]{\texttt{delimiterRegEx2.yaml}}{lst:delimiterRegEx2} + \cmhlistingsfromfile{demonstrations/tabbing-mod2.tex}{\texttt{tabbing.tex} using \cref{lst:delimiterRegEx2}}{lst:tabbing-mod2} + \cmhlistingsfromfile{demonstrations/delimiterRegEx2.yaml}[yaml-TCB]{\texttt{delimiterRegEx2.yaml}}{lst:delimiterRegEx2} \end{cmhtcbraster} We note that only the \lstinline!\>! have been aligned. @@ -612,14 +650,15 @@ latexindent.pl tabbing.tex -l=delimiterRegEx2.yaml \texttt{delimiterRegEx}; regardless of the type of delimiter being used (ampersand or anything else), the fields from \vref{lst:aligndelims:advanced} remain the same; for example, using the settings in \cref{lst:delimiterRegEx3}, and running + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl tabbing.tex -l=delimiterRegEx3.yaml \end{commandshell} to receive the output given in \cref{lst:tabbing-mod3}. \begin{cmhtcbraster} - \cmhlistingsfromfile*{demonstrations/tabbing-mod3.tex}{\texttt{tabbing.tex} using \cref{lst:delimiterRegEx3}}{lst:tabbing-mod3} - \cmhlistingsfromfile*{demonstrations/delimiterRegEx3.yaml}[yaml-TCB]{\texttt{delimiterRegEx3.yaml}}{lst:delimiterRegEx3} + \cmhlistingsfromfile{demonstrations/tabbing-mod3.tex}{\texttt{tabbing.tex} using \cref{lst:delimiterRegEx3}}{lst:tabbing-mod3} + \cmhlistingsfromfile{demonstrations/delimiterRegEx3.yaml}[yaml-TCB]{\texttt{delimiterRegEx3.yaml}}{lst:delimiterRegEx3} \end{cmhtcbraster} It is possible that delimiters specified within \texttt{delimiterRegEx} can be of @@ -628,32 +667,38 @@ latexindent.pl tabbing.tex -l=delimiterRegEx3.yaml the delimiter to be either \lstinline!#! or \lstinline!\>!, \emph{which are different lengths}. Upon running the command + \index{switches!-l demonstration} + \index{switches!-o demonstration} \begin{commandshell} latexindent.pl tabbing1.tex -l=delimiterRegEx4.yaml -o=+-mod4 \end{commandshell} we receive the output in \cref{lst:tabbing1-mod4}. + \index{regular expressions!delimiter regex at \#} \begin{cmhtcbraster}[raster columns=3, raster left skip=-3.5cm, raster right skip=-2cm, raster column skip=.03\linewidth] - \cmhlistingsfromfile*{demonstrations/tabbing1.tex}{\texttt{tabbing1.tex}}{lst:tabbing1} - \cmhlistingsfromfile*{demonstrations/tabbing1-mod4.tex}{\texttt{tabbing1-mod4.tex}}{lst:tabbing1-mod4} - \cmhlistingsfromfile*{demonstrations/delimiterRegEx4.yaml}[yaml-TCB]{\texttt{delimiterRegEx4.yaml}}{lst:delimiterRegEx4} + \cmhlistingsfromfile{demonstrations/tabbing1.tex}{\texttt{tabbing1.tex}}{lst:tabbing1} + \cmhlistingsfromfile{demonstrations/tabbing1-mod4.tex}{\texttt{tabbing1-mod4.tex}}{lst:tabbing1-mod4} + \cmhlistingsfromfile{demonstrations/delimiterRegEx4.yaml}[yaml-TCB]{\texttt{delimiterRegEx4.yaml}}{lst:delimiterRegEx4} \end{cmhtcbraster} You can set the \emph{delimiter} justification as either \texttt{left} (default) or \texttt{right}, which will only have effect when delimiters in the same column have different lengths. Using the settings in \cref{lst:delimiterRegEx5} and running the command + \index{switches!-l demonstration} + \index{switches!-o demonstration} \begin{commandshell} latexindent.pl tabbing1.tex -l=delimiterRegEx5.yaml -o=+-mod5 \end{commandshell} gives the output in \cref{lst:tabbing1-mod5}. + \index{regular expressions!delimiter regex at \# or \textbackslash>} \begin{cmhtcbraster} - \cmhlistingsfromfile*{demonstrations/tabbing1-mod5.tex}{\texttt{tabbing1-mod5.tex}}{lst:tabbing1-mod5} - \cmhlistingsfromfile*{demonstrations/delimiterRegEx5.yaml}[yaml-TCB]{\texttt{delimiterRegEx5.yaml}}{lst:delimiterRegEx5} + \cmhlistingsfromfile{demonstrations/tabbing1-mod5.tex}{\texttt{tabbing1-mod5.tex}}{lst:tabbing1-mod5} + \cmhlistingsfromfile{demonstrations/delimiterRegEx5.yaml}[yaml-TCB]{\texttt{delimiterRegEx5.yaml}}{lst:delimiterRegEx5} \end{cmhtcbraster} Note that in \cref{lst:tabbing1-mod5} the second set of delimiters have been @@ -686,11 +731,13 @@ latexindent.pl tabbing1.tex -l=delimiterRegEx5.yaml -o=+-mod5 \cmhlistingsfromfile[style=itemNames]*{../defaultSettings.yaml}[width=.8\linewidth,before=\centering,yaml-TCB]{\texttt{itemNames}}{lst:itemNames} \yamltitle{specialBeginEnd}*{fields}\label{yaml:specialBeginEnd} - The fields specified% + The fields specified + \index{specialBeginEnd!introduction}% \announce{2017-08-21}*{specialBeginEnd} in \texttt{specialBeginEnd} are, in their default state, focused on math mode begin and end statements, but there is no requirement for this to be the case; \cref{lst:specialBeginEnd} shows the default settings of \texttt{specialBeginEnd}. + \index{specialBeginEnd!default settings} \cmhlistingsfromfile[style=specialBeginEnd]*{../defaultSettings.yaml}[width=.8\linewidth,before=\centering,yaml-TCB]{\texttt{specialBeginEnd}}{lst:specialBeginEnd} @@ -721,6 +768,7 @@ latexindent.pl tabbing1.tex -l=delimiterRegEx5.yaml -o=+-mod5 \cmhlistingsfromfile{demonstrations/specialLR.tex}{\texttt{specialLR.tex}}{lst:specialLRbefore} Now consider the YAML files shown in \cref{lst:specialsLeftRight-yaml,lst:specialBeforeCommand-yaml} + \index{specialBeginEnd!searching for special before commands} \begin{cmhtcbraster} \cmhlistingsfromfile[]*{demonstrations/specialsLeftRight.yaml}[width=.8\linewidth,before=\centering,yaml-TCB]{\texttt{specialsLeftRight.yaml}}{lst:specialsLeftRight-yaml} @@ -728,6 +776,7 @@ latexindent.pl tabbing1.tex -l=delimiterRegEx5.yaml -o=+-mod5 \end{cmhtcbraster} Upon running the following commands + \index{switches!-l demonstration} \begin{widepage} \begin{commandshell} latexindent.pl specialLR.tex -l=specialsLeftRight.yaml @@ -757,10 +806,13 @@ latexindent.pl specialLR.tex -l=specialsLeftRight.yaml,specialBeforeCommand.yaml \announce{2018-04-27}{update to specialBeginEnd} the \texttt{middle} field for anything that you specify in \texttt{specialBeginEnd}. For example, let's consider the \texttt{.tex} file in \cref{lst:special2}. + \index{specialBeginEnd!middle} + \index{specialBeginEnd!IfElsFi example} \cmhlistingsfromfile{demonstrations/special2.tex}{\texttt{special2.tex}}{lst:special2} Upon saving the YAML settings in \cref{lst:middle-yaml,lst:middle1-yaml} and running the commands + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl special2.tex -l=middle latexindent.pl special2.tex -l=middle1 @@ -793,13 +845,16 @@ latexindent.pl special2.tex -l=middle1 \announce{2018-08-13}{specialBeginEnd verbatim} specify fields in \texttt{specialBeginEnd} to be treated as verbatim code blocks by changing \texttt{lookForThis} to be \texttt{verbatim}. + \index{verbatim!specialBeginEnd} For example, beginning with the code in \cref{lst:special3-mod1} and the YAML in \cref{lst:special-verb1-yaml}, and running + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl special3.tex -l=special-verb1 \end{commandshell} then the output in \cref{lst:special3-mod1} is unchanged. + \index{specialBeginEnd!specifying as verbatim} \begin{cmhtcbraster} \cmhlistingsfromfile{demonstrations/special-verb1.yaml}[yaml-TCB]{\texttt{special-verb1.yaml}}{lst:special-verb1-yaml} @@ -809,32 +864,47 @@ latexindent.pl special3.tex -l=special-verb1 We can combine the \texttt{specialBeginEnd} with the \texttt{lookForAlignDelims} feature. We begin with the code in \cref{lst:special-align}. - \cmhlistingsfromfile*{demonstrations/special-align.tex}{\texttt{special-align.tex}}{lst:special-align} + \cmhlistingsfromfile{demonstrations/special-align.tex}{\texttt{special-align.tex}}{lst:special-align} Let's assume that our goal is to align the code at the \texttt{edge} and \texttt{node} text; we employ the code given in \cref{lst:edge-node1} and run the command + \index{switches!-l demonstration} + \index{switches!-o demonstration} \begin{commandshell} latexindent.pl special-align.tex -l edge-node1.yaml -o=+-mod1 \end{commandshell} to receive the output in \cref{lst:special-align-mod1}. + \index{specialBeginEnd!combined with lookForAlignDelims} + \index{specialBeginEnd!delimiterRegEx} + \index{specialBeginEnd!alignment at delimiter} + \index{specialBeginEnd!tikz example} + \index{regular expressions!delimiter alignment for edge or node} + \index{delimiters!within specialBeginEnd blocks} + \index{regular expressions!numeric 0-9} \begin{cmhtcbraster}[ raster left skip=-3.5cm,] - \cmhlistingsfromfile*{demonstrations/edge-node1.yaml}[yaml-TCB]{\texttt{edge-node1.yaml}}{lst:edge-node1} - \cmhlistingsfromfile*{demonstrations/special-align-mod1.tex}{\texttt{special-align.tex} using \cref{lst:edge-node1}}{lst:special-align-mod1} + \cmhlistingsfromfile{demonstrations/edge-node1.yaml}[yaml-TCB]{\texttt{edge-node1.yaml}}{lst:edge-node1} + \cmhlistingsfromfile{demonstrations/special-align-mod1.tex}{\texttt{special-align.tex} using \cref{lst:edge-node1}}{lst:special-align-mod1} \end{cmhtcbraster} The output in \cref{lst:special-align-mod1} is not quite ideal. We can tweak the settings within \cref{lst:edge-node1} in order to improve the output; in particular, we employ the code in \cref{lst:edge-node2} and run the command + \index{switches!-l demonstration} + \index{switches!-o demonstration} + \index{regular expressions!uppercase alph A-Z} \begin{commandshell} latexindent.pl special-align.tex -l edge-node2.yaml -o=+-mod2 \end{commandshell} to receive the output in \cref{lst:special-align-mod2}. + \index{specialBeginEnd!delimiterRegEx tweaked} + \index{regular expressions!at least one +} + \index{regular expressions!horizontal space \textbackslash{h}} \begin{cmhtcbraster}[ raster left skip=-3.5cm,] - \cmhlistingsfromfile*{demonstrations/edge-node2.yaml}[yaml-TCB]{\texttt{edge-node2.yaml}}{lst:edge-node2} - \cmhlistingsfromfile*{demonstrations/special-align-mod2.tex}{\texttt{special-align.tex} using \cref{lst:edge-node2}}{lst:special-align-mod2} + \cmhlistingsfromfile{demonstrations/edge-node2.yaml}[yaml-TCB]{\texttt{edge-node2.yaml}}{lst:edge-node2} + \cmhlistingsfromfile{demonstrations/special-align-mod2.tex}{\texttt{special-align.tex} using \cref{lst:edge-node2}}{lst:special-align-mod2} \end{cmhtcbraster} \yamltitle{indentAfterHeadings}*{fields} @@ -870,6 +940,7 @@ latexindent.pl special-align.tex -l edge-node2.yaml -o=+-mod2 \end{cmhtcbraster} If you run the command + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl headings1.tex -l=headings1.yaml \end{commandshell} @@ -886,12 +957,15 @@ latexindent.pl headings1.tex -l=headings1.yaml Now say that you modify the \texttt{YAML} from \cref{lst:headings1yaml} so that the \texttt{paragraph} \texttt{level} is \texttt{1}; after running + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl headings1.tex -l=headings1.yaml \end{commandshell} you should receive the code given in \cref{lst:headings1-mod2}; notice that the \texttt{paragraph} and \texttt{subsection} are at the same indentation level. + \index{indentation!maximum indetation} + \yamltitle{maximumIndentation}*{horizontal space} You can control the maximum indentation given to your file by% @@ -910,6 +984,7 @@ latexindent.pl headings1.tex -l=headings1.yaml Now say that, for example, you have the \texttt{max-indentation1.yaml} from \cref{lst:max-indentation1yaml} and that you run the following command: + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl mult-nested.tex -l=max-indentation1 \end{commandshell} @@ -930,6 +1005,10 @@ latexindent.pl mult-nested.tex -l=max-indentation1 \subsection{The code blocks known latexindent.pl}\label{subsubsec:code-blocks} As of Version 3.0, \texttt{latexindent.pl} processes documents using code blocks; each of these are shown in \cref{tab:code-blocks}. + \index{regular expressions!uppercase alph A-Z} + \index{regular expressions!lowercase alph a-z} + \index{regular expressions!numeric 0-9} + \index{regular expressions!horizontal space \textbackslash{h}} \begin{table}[!htp] \begin{widepage} diff --git a/support/latexindent/documentation/sec-fine-tuning.tex b/support/latexindent/documentation/sec-fine-tuning.tex index f026a17623..ccd04ffb47 100644 --- a/support/latexindent/documentation/sec-fine-tuning.tex +++ b/support/latexindent/documentation/sec-fine-tuning.tex @@ -7,6 +7,21 @@ This field is for those that would like to peek under the bonnet/hood and make some fine tuning to \texttt{latexindent.pl}'s operating. + \index{warning!fine tuning} + \index{regular expressions!fine tuning} + \index{regular expressions!environments} + \index{regular expressions!ifElseFi} + \index{regular expressions!commands} + \index{regular expressions!keyEqualsValuesBracesBrackets} + \index{regular expressions!NamedGroupingBracesBrackets} + \index{regular expressions!UnNamedGroupingBracesBrackets} + \index{regular expressions!arguments} + \index{regular expressions!modifyLineBreaks} + \index{regular expressions!lowercase alph a-z} + \index{regular expressions!uppercase alph A-Z} + \index{regular expressions!numeric 0-9} + \index{regular expressions!at least one +} + \index{regular expressions!horizontal space \textbackslash{h}} \begin{warning} Making changes to the fine tuning may have significant consequences for your indentation scheme, @@ -17,8 +32,8 @@ \cmhlistingsfromfile[style=fineTuning]*{../defaultSettings.yaml}[width=0.95\linewidth,before=\centering,yaml-TCB]{\texttt{fineTuning}}{lst:fineTuning} \end{widepage} - The fields given in \cref{lst:fineTuning} are all \emph{regular expressions}. This manual is - not intended to be a tutorial on regular expressions; you might like to read, for + The fields given in \cref{lst:fineTuning} are all \emph{regular expressions}. This manual + is not intended to be a tutorial on regular expressions; you might like to read, for example, \cite{masteringregexp} for a detailed covering of the topic. We make the following comments with reference to \cref{lst:fineTuning}: @@ -34,6 +49,7 @@ \item \lstinline!_! underscores \item \lstinline!\! backslashes \end{enumerate} + \index{regular expressions!at least one +} The \texttt{+} at the end means \emph{at least one} of the above characters. \item the \texttt{ifElseFi:name} field: @@ -99,10 +115,12 @@ latexindent.pl finetuning1.tex It's clear from \cref{lst:finetuning1-default} that the indentation scheme has not worked as expected. We can \emph{fine tune} the indentation scheme by employing the settings given in \cref{lst:fine-tuning1} and running the command + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl finetuning1.tex -l=fine-tuning1.yaml \end{commandshell} and the associated (desired) output is given in \cref{lst:finetuning1-mod1}. + \index{regular expressions!at least one +} \begin{cmhtcbraster}[raster column skip=.01\linewidth] \cmhlistingsfromfile{demonstrations/finetuning1-mod1.tex}{\texttt{finetuning1.tex} using \cref{lst:fine-tuning1}}{lst:finetuning1-mod1} @@ -121,13 +139,14 @@ latexindent.pl finetuning2.tex \begin{cmhtcbraster}[raster column skip=.01\linewidth, raster left skip=-3.75cm, raster right skip=0cm,] - \cmhlistingsfromfile*{demonstrations/finetuning2.tex}{\texttt{finetuning2.tex}}{lst:finetuning2} - \cmhlistingsfromfile*{demonstrations/finetuning2-default.tex}{\texttt{finetuning2.tex} default}{lst:finetuning2-default} + \cmhlistingsfromfile{demonstrations/finetuning2.tex}{\texttt{finetuning2.tex}}{lst:finetuning2} + \cmhlistingsfromfile{demonstrations/finetuning2-default.tex}{\texttt{finetuning2.tex} default}{lst:finetuning2-default} \end{cmhtcbraster} It's clear from \cref{lst:finetuning2-default} that the indentation scheme has not worked as expected. We can \emph{fine tune} the indentation scheme by employing the settings given in \cref{lst:fine-tuning2} and running the command + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl finetuning2.tex -l=fine-tuning2.yaml \end{commandshell} @@ -136,10 +155,22 @@ latexindent.pl finetuning2.tex -l=fine-tuning2.yaml \begin{cmhtcbraster}[raster column skip=.01\linewidth, raster left skip=-3.75cm, raster right skip=0cm,] - \cmhlistingsfromfile*{demonstrations/finetuning2-mod1.tex}{\texttt{finetuning2.tex} using \cref{lst:fine-tuning2}}{lst:finetuning2-mod1} - \cmhlistingsfromfile*[style=yaml-LST]*{demonstrations/fine-tuning2.yaml}[yaml-TCB]{\texttt{finetuning2.yaml}}{lst:fine-tuning2} + \cmhlistingsfromfile{demonstrations/finetuning2-mod1.tex}{\texttt{finetuning2.tex} using \cref{lst:fine-tuning2}}{lst:finetuning2-mod1} + \cmhlistingsfromfile[style=yaml-LST]*{demonstrations/fine-tuning2.yaml}[yaml-TCB]{\texttt{finetuning2.yaml}}{lst:fine-tuning2} \end{cmhtcbraster} In particular, note that the settings in \cref{lst:fine-tuning2} specify that \texttt{NamedGroupingBracesBrackets} and \texttt{UnNamedGroupingBracesBrackets} can follow \texttt{"} and that we allow \lstinline!---! between arguments. \end{example} + + \begin{example} + You can tweak the \texttt{fineTuning} using the \texttt{-y} switch, but to be sure to use quotes appropriately. + For example, starting with the code in \cref{lst:finetuning3} and running the following command + \begin{commandshell} +latexindent.pl -m -y='modifyLineBreaks:oneSentencePerLine:manipulateSentences: 1, modifyLineBreaks:oneSentencePerLine:sentencesBeginWith:a-z: 1, fineTuning:modifyLineBreaks:betterFullStop: "(?:\.|;|:(?![a-z]))|(?:(?<!(?:(?:e\.g)|(?:i\.e)|(?:etc))))\.(?!(?:[a-z]|[A-Z]|\-|~|\,|[0-9]))"' issue-243.tex -o=+-mod1 +\end{commandshell} + gives the output shown in \cref{lst:finetuning3-mod1}. + + \cmhlistingsfromfile*{demonstrations/finetuning3.tex}{\texttt{finetuning3.tex}}{lst:finetuning3} + \cmhlistingsfromfile*{demonstrations/finetuning3-mod1.tex}{\texttt{finetuning3.tex} using -y switch}{lst:finetuning3-mod1} + \end{example} diff --git a/support/latexindent/documentation/sec-how-to-use.tex b/support/latexindent/documentation/sec-how-to-use.tex index 86ee34a673..8c7d9b9556 100644 --- a/support/latexindent/documentation/sec-how-to-use.tex +++ b/support/latexindent/documentation/sec-how-to-use.tex @@ -34,6 +34,7 @@ will be written depending on which of the following options are used. \flagbox{-v, --version} + \index{switches!-v, --version definition and details} \announce{2017-06-25}{version} \begin{commandshell} latexindent.pl -v @@ -41,6 +42,7 @@ latexindent.pl -v This will output only the version number to the terminal. \flagbox{-h, --help} + \index{switches!-h, --help definition and details} \begin{commandshell} latexindent.pl -h @@ -57,6 +59,8 @@ latexindent.pl myfile.tex this command. \flagbox{-w, --overwrite} + \index{switches!-w, --overwrite definition and details} + \index{backup files!overwrite switch, -w} \begin{commandshell} latexindent.pl -w myfile.tex latexindent.pl --overwrite myfile.tex @@ -74,6 +78,7 @@ latexindent.pl myfile.tex --overwrite permissions of the backup file. \flagbox{-o=output.tex,--outputfile=output.tex} + \index{switches!-o, --output definition and details} \begin{commandshell} latexindent.pl -o=output.tex myfile.tex latexindent.pl myfile.tex -o=output.tex @@ -150,6 +155,7 @@ latexindent.pl myfile.tex -o=+out++.tex See \vref{app:differences} for details of how the interface has changed from Version 2.2 to Version 3.0 for this flag. \flagbox{-s, --silent} + \index{switches!-s, --silent definition and details} \begin{commandshell} latexindent.pl -s myfile.tex latexindent.pl myfile.tex -s @@ -158,6 +164,7 @@ latexindent.pl myfile.tex -s Silent mode: no output will be given to the terminal. \flagbox{-t, --trace} + \index{switches!-t, --trace definition and details} \begin{commandshell} latexindent.pl -t myfile.tex latexindent.pl myfile.tex -t @@ -171,6 +178,7 @@ latexindent.pl myfile.tex -t files, this does affect performance of the script. \flagbox{-tt, --ttrace} + \index{switches!-tt, --ttrace definition and details} \begin{commandshell} latexindent.pl -tt myfile.tex latexindent.pl myfile.tex -tt @@ -183,6 +191,7 @@ latexindent.pl myfile.tex -tt affected). \flagbox{-l, --local[=myyaml.yaml,other.yaml,...]} + \index{switches!-l, --local definition and details} \begin{commandshell} latexindent.pl -l myfile.tex latexindent.pl -l=myyaml.yaml myfile.tex @@ -196,9 +205,10 @@ latexindent.pl myfile.tex -l=first.yaml,second.yaml,third.yaml \texttt{latexindent.pl} will always load \texttt{defaultSettings.yaml} (rhymes with camel) and if it is called with the \texttt{-l} switch and it finds \texttt{localSettings.yaml} in the same directory as \texttt{myfile.tex}, then, if not - found, it looks for \texttt{localSettings.yaml} in the current working directory, then these - settings will be added to the indentation scheme. Information will be given in - \texttt{indent.log} on the success or failure of loading \texttt{localSettings.yaml}. + found, it looks for \texttt{localSettings.yaml} (and friends, see \vref{sec:localsettings}) in the current working directory, then these + \announce*{2021-03-14}*{-l switch: localSettings and friends} settings will be added to the indentation scheme. Information + will be given in \texttt{indent.log} on the success or failure of loading + \texttt{localSettings.yaml}. The \texttt{-l} flag can take an \emph{optional} parameter which details the name (or names separated by commas) of a YAML file(s) that resides in the @@ -247,6 +257,9 @@ latexindent.pl -l + myyaml.yaml myfile.tex latexindent.pl -l=localSettings,myyaml myfile.tex \end{commandshell} \flagbox{-y, --yaml=yaml settings} + \index{switches!-y, --yaml definition and details} + \index{indentation!default} + \index{indentation!defaultIndent using -y switch} \begin{commandshell} latexindent.pl myfile.tex -y="defaultIndent: ' '" latexindent.pl myfile.tex -y="defaultIndent: ' ',maximumIndentation:' '" @@ -266,6 +279,7 @@ latexindent.pl myfile.tex -y='modifyLineBreaks:environments:one:EndStartsOnOwnLi specified using the \texttt{-l} switch. This is discussed further in \vref{sec:loadorder}. \flagbox{-d, --onlydefault} + \index{switches!-d, --onlydefault definition and details} \begin{commandshell} latexindent.pl -d myfile.tex \end{commandshell} @@ -281,6 +295,7 @@ latexindent.pl -d myfile.tex \texttt{-y} switch. \flagbox{-c, --cruft=<directory>} + \index{switches!-c, --cruft definition and details} \begin{commandshell} latexindent.pl -c=/path/to/directory/ myfile.tex \end{commandshell} @@ -290,6 +305,7 @@ latexindent.pl -c=/path/to/directory/ myfile.tex directory. Note the use of a trailing forward slash. % this switch was made as a result of http://tex.stackexchange.com/questions/142652/output-latexindent-auxiliary-files-to-a-different-directory \flagbox{-g, --logfile=<name of log file>} + \index{switches!-g, --logfile definition and details} \begin{commandshell} latexindent.pl -g=other.log myfile.tex latexindent.pl -g other.log myfile.tex @@ -302,6 +318,7 @@ latexindent.pl myfile.tex -g other.log after the \texttt{-g} switch as demonstrated above. \flagbox{-sl, --screenlog} + \index{switches!-sl, --screenlog definition and details} \begin{commandshell} latexindent.pl -sl myfile.tex latexindent.pl -screenlog myfile.tex @@ -312,6 +329,7 @@ latexindent.pl -screenlog myfile.tex log file. \flagbox{-m, --modifylinebreaks} + \index{switches!-m, --modifylinebreaks definition and details} \begin{commandshell} latexindent.pl -m myfile.tex latexindent.pl -modifylinebreaks myfile.tex @@ -361,6 +379,7 @@ latexindent.pl to signify that your input has finished. Thanks to \cite{xu-cheng} for an update to this feature. \flagbox{-r, --replacement} + \index{switches!-r, --replacement definition and details} \begin{commandshell} latexindent.pl -r myfile.tex latexindent.pl -replacement myfile.tex @@ -370,8 +389,10 @@ latexindent.pl -replacement myfile.tex \texttt{latexindent.pl} with the \texttt{-r} switch to instruct it to perform replacements/substitutions on your file; full details and examples are given in \vref{sec:replacements}. + \index{verbatim!rv, replacementrespectverb switch} \flagbox{-rv, --replacementrespectverb} + \index{switches!-rv, --replacementrespectverb definition and details} \begin{commandshell} latexindent.pl -rv myfile.tex latexindent.pl -replacementrespectverb myfile.tex @@ -383,6 +404,7 @@ latexindent.pl -replacementrespectverb myfile.tex examples are given in \vref{sec:replacements}. \flagbox{-rr, --onlyreplacement} + \index{switches!-rr, --onlyreplacement definition and details} \begin{commandshell} latexindent.pl -rr myfile.tex latexindent.pl -onlyreplacement myfile.tex diff --git a/support/latexindent/documentation/sec-indent-config-and-settings.tex b/support/latexindent/documentation/sec-indent-config-and-settings.tex index cb551194c0..40216948a7 100644 --- a/support/latexindent/documentation/sec-indent-config-and-settings.tex +++ b/support/latexindent/documentation/sec-indent-config-and-settings.tex @@ -52,6 +52,7 @@ paths: the \texttt{tabbing} environment/command to the list of environments that contains alignment delimiters; you might also like to refer to the many YAML files detailed throughout the rest of this documentation. + \index{indentation!defaultIndent using YAML file} \begin{yaml}{\texttt{mysettings.yaml} (example)}{lst:mysettings} # Default value of indentation @@ -68,6 +69,7 @@ lookForAlignDelims: then you'll get a warning, otherwise you'll get confirmation that \texttt{latexindent.pl} has read your settings file \footnote{Windows users may find that they have to end \texttt{.yaml} files with a blank line}. + \index{warning!editing YAML files} \begin{warning} When editing \texttt{.yaml} files it is \emph{extremely} important @@ -79,15 +81,29 @@ lookForAlignDelims: will tell you so in \texttt{indent.log}. \end{warning} -\subsection{localSettings.yaml}\label{sec:localsettings} +\subsection{localSettings.yaml and friends}\label{sec:localsettings} The \texttt{-l} switch tells \texttt{latexindent.pl} to look for - \texttt{localSettings.yaml} in the \emph{same directory} as \texttt{myfile.tex}. For + \texttt{localSettings.yaml} and/or friends in the \emph{same directory} as + \texttt{myfile.tex}. For% + \announce*{2021-03-14}*{-l switch: localSettings and friends} example, if you use the following command + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl -l myfile.tex \end{commandshell} - then \texttt{latexindent.pl} will (assuming it exists) load \texttt{localSettings.yaml} from - the same directory as \texttt{myfile.tex}. + then \texttt{latexindent.pl} will search for and then, assuming they exist, load each of + the following files in the following order: + \begin{enumerate} + \item localSettings.yaml + \item latexindent.yaml + \item .localSettings.yaml + \item .latexindent.yaml + \end{enumerate} + These files will be assumed to be in the same directory as \texttt{myfile.tex}, or + otherwise in the current working directory. You do not need to have all of the above + files, usually just one will be sufficient. In what follows, whenever we refer to + \texttt{localSettings.yaml} it is assumed that it can mean any of the four named options + listed above. If you'd prefer to name your \texttt{localSettings.yaml} file something different, (say, \texttt{mysettings.yaml} as in \cref{lst:mysettings}) then you can call @@ -103,6 +119,7 @@ latexindent.pl -l=mysettings.yaml myfile.tex Your settings file can contain any switches that you'd like to change; a sample is shown in \cref{lst:localSettings}, and you'll find plenty of further examples throughout this manual. + \index{verbatim!verbatimEnvironments demonstration (-l switch)} \begin{yaml}{\texttt{localSettings.yaml} (example)}{lst:localSettings} # verbatim environments - environments specified @@ -123,17 +140,21 @@ verbatimEnvironments: \texttt{-y} switch to load your settings; for example, if you wished to specify the settings from \cref{lst:localSettings} using the \texttt{-y} switch, then you could use the following command: + \index{verbatim!verbatimEnvironments demonstration (-y switch)} \begin{commandshell} latexindent.pl -y="verbatimEnvironments:cmhenvironment:0;myenv:1" myfile.tex \end{commandshell} Note the use of \texttt{;} to specify another field within \texttt{verbatimEnvironments}. This is shorthand, and equivalent, to using the following command: + \index{switches!-y demonstration} \begin{commandshell} latexindent.pl -y="verbatimEnvironments:cmhenvironment:0,verbatimEnvironments:myenv:1" myfile.tex \end{commandshell} You may, of course, specify settings using the \texttt{-y} switch as well as, for example, settings loaded using the \texttt{-l} switch; for example, + \index{switches!-l demonstration} + \index{switches!-y demonstration} \begin{commandshell} latexindent.pl -l=mysettings.yaml -y="verbatimEnvironments:cmhenvironment:0;myenv:1" myfile.tex \end{commandshell} @@ -142,16 +163,18 @@ latexindent.pl -l=mysettings.yaml -y="verbatimEnvironments:cmhenvironment:0;myen \texttt{-l} switch. If you wish to specify any regex-based settings using the \texttt{-y} switch, - it is important not to use quotes surrounding the regex; for example, with reference to - the `one sentence per line' feature (\vref{sec:onesentenceperline}) and the listings within - \vref{lst:sentencesEndWith}, the following settings give the option to have sentences end - with a semicolon + \index{regular expressions!using -y switch} it is important not to use quotes surrounding the regex; for + example, with reference to the `one sentence per line' feature (\vref{sec:onesentenceperline}) + and the listings within \vref{lst:sentencesEndWith}, the following settings give the option + to have sentences end with a semicolon + \index{switches!-y demonstration} \begin{commandshell} latexindent.pl -m --yaml='modifyLineBreaks:oneSentencePerLine:sentencesEndWith:other:\;' \end{commandshell} \subsection{Settings load order}\label{sec:loadorder} \texttt{latexindent.pl} loads the settings files in the following order: + \index{switches!-l in relation to other settings} \begin{enumerate} \item \texttt{defaultSettings.yaml} is always loaded, and can not be renamed; \item \texttt{anyUserSettings.yaml} and any other arbitrarily-named files specified in diff --git a/support/latexindent/documentation/sec-introduction.tex b/support/latexindent/documentation/sec-introduction.tex index a6a2627309..887a096887 100644 --- a/support/latexindent/documentation/sec-introduction.tex +++ b/support/latexindent/documentation/sec-introduction.tex @@ -41,9 +41,11 @@ works as you expect it to; if it does not, please first of all make sure that you have the correct settings, and then feel free to let me know at \cite{latexindent-home} with a complete minimum working example as I would like to improve the code as much as possible. + \begin{warning} Before you try the script on anything important (like your thesis), test it out on the sample files in the \texttt{test-case} directory \cite{latexindent-home}. + \index{warning!be sure to test before use} \end{warning} \emph{If you have used any version 2.* of \texttt{latexindent.pl}, there @@ -130,6 +132,7 @@ perl latexindent-module-installer.pl \vref{sec:requiredmodules}. \subsection{A word about regular expressions} + \index{regular expressions!a word about} As you read this documentation, you may encounter the term \emph{regular expressions}. I've tried to write this documentation in such a way so as to allow you to engage with them or not, as you prefer. This documentation is not designed to be a guide to regular diff --git a/support/latexindent/documentation/sec-replacements.tex b/support/latexindent/documentation/sec-replacements.tex index aa575f269f..4362f34720 100644 --- a/support/latexindent/documentation/sec-replacements.tex +++ b/support/latexindent/documentation/sec-replacements.tex @@ -8,6 +8,7 @@ You can instruct \texttt{latexindent.pl} to perform replacements/substitutions on your \announce{2019-07-13}{replacement mode switches} file by using any of the \texttt{-r}, \texttt{-rv} or \texttt{-rr} switches: + \index{verbatim!rv, replacementrespectverb switch} \begin{itemize} \item the \texttt{-r} switch will perform indentation and replacements, not respecting verbatim code blocks; @@ -58,6 +59,7 @@ replace every instance of the text \texttt{latexindent.pl} with \texttt{pl.latexindent}. Beginning with the code in \cref{lst:replace1} and running the command + \index{switches!-r demonstration} \begin{commandshell} latexindent.pl -r replace1.tex \end{commandshell} @@ -71,6 +73,8 @@ latexindent.pl -r replace1.tex If we don't wish to perform this replacement, then we can tweak the default settings of \vref{lst:replacements} by changing \texttt{lookForThis} to 0; we perform this action in \cref{lst:replace1-yaml}, and run the command + \index{switches!-l demonstration} + \index{switches!-r demonstration} \begin{commandshell} latexindent.pl -r replace1.tex -l=replace1.yaml \end{commandshell} @@ -94,6 +98,7 @@ latexindent.pl -r replace1.tex -l=replace1.yaml \emph{this} with the string in \emph{that}. If you specify \texttt{this} and you do not specify \texttt{that}, then the \texttt{that} field will be assumed to be empty. + \index{regular expressions!replacement switch, -r} \item \emph{regex}-based replacements, which use the \texttt{substitution} field. \end{enumerate} We will demonstrate both in the examples that follow. @@ -113,6 +118,8 @@ latexindent.pl -r replace1.tex -l=replace1.yaml a few different ways. Using the YAML in \cref{lst:colsep-yaml}, and running the command + \index{switches!-l demonstration} + \index{switches!-r demonstration} \begin{commandshell} latexindent.pl -r colsep.tex -l=colsep.yaml \end{commandshell} @@ -127,10 +134,14 @@ latexindent.pl -r colsep.tex -l=colsep.yaml We can make the YAML in \cref{lst:colsep-yaml} more concise by exploring the \texttt{substitution} field. Using the settings in \cref{lst:colsep1} and running the command + \index{switches!-l demonstration} + \index{switches!-r demonstration} \begin{commandshell} latexindent.pl -r colsep.tex -l=colsep1.yaml \end{commandshell} then we achieve the output in \cref{lst:colsep-mod1}. + \index{regular expressions!substitution field, arraycolsep} + \index{regular expressions!at least one +} \begin{cmhtcbraster}[raster column skip=.01\linewidth, raster force size=false, raster column 1/.style={add to width=-.1\textwidth}] @@ -162,6 +173,8 @@ latexindent.pl -r colsep.tex -l=colsep1.yaml We'll keep working with the file in \vref{lst:colsep} for this example. Using the YAML in \cref{lst:multi-line}, and running the command + \index{switches!-l demonstration} + \index{switches!-r demonstration} \begin{commandshell} latexindent.pl -r colsep.tex -l=multi-line.yaml \end{commandshell} @@ -179,6 +192,8 @@ latexindent.pl -r colsep.tex -l=multi-line.yaml The default value is \texttt{before}. Using the YAML in \cref{lst:multi-line1}, and running the command + \index{switches!-l demonstration} + \index{switches!-r demonstration} \begin{commandshell} latexindent.pl -r colsep.tex -l=multi-line1.yaml \end{commandshell} @@ -192,6 +207,8 @@ latexindent.pl -r colsep.tex -l=multi-line1.yaml indentation, the string as written in \cref{lst:multi-line1} is no longer part of the file, and has therefore not been replaced. As a final note on this example, if you use the \texttt{-rr} switch, as follows, + \index{switches!-l demonstration} + \index{switches!-rr demonstration} \begin{commandshell} latexindent.pl -rr colsep.tex -l=multi-line1.yaml \end{commandshell} @@ -208,10 +225,13 @@ latexindent.pl -rr colsep.tex -l=multi-line1.yaml \cmhlistingsfromfile{demonstrations/displaymath.tex}{\texttt{displaymath.tex}}{lst:displaymath} We use the settings in \cref{lst:displaymath1} and run the command + \index{switches!-l demonstration} + \index{switches!-r demonstration} \begin{commandshell} latexindent.pl -r displaymath.tex -l=displaymath1.yaml \end{commandshell} to receive the output given in \cref{lst:displaymath-mod1}. + \index{regular expressions!substitution field, equation} \begin{cmhtcbraster}[raster left skip=-3.75cm, raster right skip=-2cm,] @@ -233,6 +253,9 @@ latexindent.pl -r displaymath.tex -l=displaymath1.yaml The features of the replacement switches can, of course, be combined with others from the toolkit of \texttt{latexindent.pl}. For example, we can combine the poly-switches of \vref{sec:poly-switches}, which we do in \cref{lst:equation}; upon running the command + \index{switches!-l demonstration} + \index{switches!-m demonstration} + \index{switches!-r demonstration} \begin{commandshell} latexindent.pl -r -m displaymath.tex -l=displaymath1.yaml,equation.yaml \end{commandshell} @@ -255,10 +278,14 @@ latexindent.pl -r -m displaymath.tex -l=displaymath1.yaml,equation.yaml Our goal is to make the spacing uniform between the phrases. To achieve this, we employ the settings in \cref{lst:hspace}, and run the command + \index{switches!-l demonstration} + \index{switches!-r demonstration} \begin{commandshell} latexindent.pl -r phrase.tex -l=hspace.yaml \end{commandshell} which gives the output in \cref{lst:phrase-mod1}. + \index{regular expressions!at least one +} + \index{regular expressions!horizontal space \textbackslash{h}} \begin{cmhtcbraster} \cmhlistingsfromfile{demonstrations/phrase-mod1.tex}{\texttt{phrase.tex} using \cref{lst:hspace}}{lst:phrase-mod1} @@ -275,10 +302,13 @@ latexindent.pl -r phrase.tex -l=hspace.yaml Our goal is to change each reference so that both the text and the reference are contained within one hyperlink. We achieve this by employing \cref{lst:reference} and running the command + \index{switches!-l demonstration} + \index{switches!-r demonstration} \begin{commandshell} latexindent.pl -r references.tex -l=reference.yaml \end{commandshell} which gives the output in \cref{lst:references-mod1}. + \index{regular expressions!horizontal space \textbackslash{h}} \cmhlistingsfromfile{demonstrations/references-mod1.tex}{\texttt{references.tex} using \cref{lst:reference}}{lst:references-mod1} @@ -298,6 +328,12 @@ latexindent.pl -r references.tex -l=reference.yaml \end{cmhtcbraster} Upon running the following commands, + \index{verbatim!comparison with -r and -rr switches} + \index{switches!-l demonstration} + \index{switches!-o demonstration} + \index{switches!-r demonstration} + \index{switches!-rv demonstration} + \index{switches!-rr demonstration} \begin{commandshell} latexindent.pl -r verb1.tex -l=verbatim1.yaml -o=+mod1 latexindent.pl -rv verb1.tex -l=verbatim1.yaml -o=+-rv-mod1 @@ -344,6 +380,8 @@ latexindent.pl -rr verb1.tex -l=verbatim1.yaml -o=+-rr-mod1 \end{cmhtcbraster} Upon running the following commands, + \index{switches!-l demonstration} + \index{switches!-r demonstration} \begin{commandshell} latexindent.pl -r amalg1.tex -l=amalg1-yaml latexindent.pl -r amalg1.tex -l=amalg1-yaml,amalg2-yaml diff --git a/support/latexindent/documentation/sec-the-m-switch.tex b/support/latexindent/documentation/sec-the-m-switch.tex index 03e09db259..c77ed24ec4 100644 --- a/support/latexindent/documentation/sec-the-m-switch.tex +++ b/support/latexindent/documentation/sec-the-m-switch.tex @@ -27,6 +27,7 @@ Having read the previous paragraph, it should sound reasonable that, if you call \texttt{latexindent.pl} using the \texttt{-m} switch, then you give it permission to modify line breaks in your file, but let's be clear: + \index{warning!the m switch} \begin{warning} If you call \texttt{latexindent.pl} with the \texttt{-m} switch, then you @@ -47,6 +48,7 @@ \texttt{0}, \texttt{latexindent.pl} will condense multiple blank lines into the number of blank lines illustrated by this switch. As an example, \cref{lst:mlb-bl} shows a sample file with blank lines; upon running + \index{switches!-m demonstration} \begin{commandshell} latexindent.pl myfile.tex -m \end{commandshell} @@ -72,6 +74,7 @@ latexindent.pl myfile.tex -m \texttt{latexindent.pl} will \emph{not} wrap text; if you change it to a value of \texttt{2} or more, then text will be wrapped after the character in the specified column. + \index{modifying linebreaks! by text wrapping, globally} \cmhlistingsfromfile[style=textWrapOptions]*{../defaultSettings.yaml}[MLB-TCB,width=.85\linewidth,before=\centering]{\texttt{textWrapOptions}}{lst:textWrapOptions} @@ -83,6 +86,9 @@ latexindent.pl myfile.tex -m Using the file \texttt{textwrap1.yaml} in \cref{lst:textwrap1-yaml}, and running the command + \index{switches!-l demonstration} + \index{switches!-m demonstration} + \index{switches!-o demonstration} \begin{commandshell} latexindent.pl -m textwrap1.tex -o textwrap1-mod1.tex -l textwrap1.yaml \end{commandshell} @@ -94,13 +100,17 @@ latexindent.pl -m textwrap1.tex -o textwrap1-mod1.tex -l textwrap1.yaml \end{cmhtcbraster} The text wrapping routine is performed \emph{after} verbatim environments - have been stored, so verbatim environments and verbatim commands are exempt from the - routine. For example, using the file in \cref{lst:textwrap2}, + \index{verbatim!in relation to textWrapOptions} have been stored, so verbatim environments and verbatim + commands are exempt from the routine. For example, using the file in + \cref{lst:textwrap2}, \begin{widepage} \cmhlistingsfromfile{demonstrations/textwrap2.tex}{\texttt{textwrap2.tex}}{lst:textwrap2} \end{widepage} and running the following command and continuing to use \texttt{textwrap1.yaml} from \cref{lst:textwrap1-yaml}, + \index{switches!-l demonstration} + \index{switches!-m demonstration} + \index{switches!-o demonstration} \begin{commandshell} latexindent.pl -m textwrap2.tex -o textwrap2-mod1.tex -l textwrap1.yaml \end{commandshell} @@ -116,6 +126,9 @@ latexindent.pl -m textwrap2.tex -o textwrap2-mod1.tex -l textwrap1.yaml \end{widepage} and running the following command and continuing to use \texttt{textwrap1.yaml} from \cref{lst:textwrap1-yaml}, + \index{switches!-l demonstration} + \index{switches!-m demonstration} + \index{switches!-o demonstration} \begin{commandshell} latexindent.pl -m textwrap3.tex -o textwrap3-mod1.tex -l textwrap1.yaml \end{commandshell} @@ -134,6 +147,9 @@ latexindent.pl -m textwrap3.tex -o textwrap3-mod1.tex -l textwrap1.yaml \cmhlistingsfromfile{demonstrations/textwrap4.tex}{\texttt{textwrap4.tex}}{lst:textwrap4} and using \texttt{textwrap2.yaml} from \cref{lst:textwrap2-yaml} with the following command + \index{switches!-l demonstration} + \index{switches!-m demonstration} + \index{switches!-o demonstration} \begin{commandshell} latexindent.pl -m textwrap4.tex -o textwrap4-mod2.tex -l textwrap2.yaml \end{commandshell} @@ -149,6 +165,9 @@ latexindent.pl -m textwrap4.tex -o textwrap4-mod2.tex -l textwrap2.yaml \announce{2019-09-07}{huge option for text wrap module}. This can be helpful if you would like to forbid the \texttt{Text::Wrap} routine from breaking words. For example, using the settings in \cref{lst:textwrap2A-yaml,lst:textwrap2B-yaml} and running the commands + \index{switches!-l demonstration} + \index{switches!-m demonstration} + \index{switches!-o demonstration} \begin{commandshell} latexindent.pl -m textwrap4.tex -o=+-mod2A -l textwrap2A.yaml latexindent.pl -m textwrap4.tex -o=+-mod2B -l textwrap2B.yaml @@ -163,12 +182,15 @@ latexindent.pl -m textwrap4.tex -o=+-mod2B -l textwrap2B.yaml \cmhlistingsfromfile{demonstrations/textwrap2B.yaml}[MLB-TCB]{\texttt{textwrap2B.yaml}}{lst:textwrap2B-yaml} \end{cmhtcbraster} - You can also specify the \texttt{tabstop} field% - \announce*{2020-11-06}{tabstop option for text wrap module} as - an integer value, which is passed to the text wrap module; see - \cite{textwrap} for details. Starting with the code in - \cref{lst:textwrap-ts} with settings in \cref{lst:tabstop}, and running the - command + You can also specify the \texttt{tabstop} + field% + \announce{2020-11-06}{tabstop option for text wrap module} as an integer + value, which is passed to the text wrap module; see \cite{textwrap} for + details. Starting with the code in \cref{lst:textwrap-ts} with settings in + \cref{lst:tabstop}, and running the command + \index{switches!-l demonstration} + \index{switches!-m demonstration} + \index{switches!-o demonstration} \begin{commandshell} latexindent.pl -m textwrap-ts.tex -o=+-mod1 -l tabstop.yaml \end{commandshell} @@ -177,9 +199,9 @@ latexindent.pl -m textwrap-ts.tex -o=+-mod1 -l tabstop.yaml raster left skip=-3.5cm, raster right skip=-2cm, raster column skip=.03\linewidth] - \cmhlistingsfromfile*[showtabs=true]*{demonstrations/textwrap-ts.tex}{\texttt{textwrap-ts.tex}}{lst:textwrap-ts} - \cmhlistingsfromfile*{demonstrations/tabstop.yaml}[MLB-TCB]{\texttt{tabstop.yaml}}{lst:tabstop} - \cmhlistingsfromfile*[showtabs=true]*{demonstrations/textwrap-ts-mod1.tex}{\texttt{textwrap-ts-mod1.tex}}{lst:textwrap-ts-mod1} + \cmhlistingsfromfile[showtabs=true]*{demonstrations/textwrap-ts.tex}{\texttt{textwrap-ts.tex}}{lst:textwrap-ts} + \cmhlistingsfromfile{demonstrations/tabstop.yaml}[MLB-TCB]{\texttt{tabstop.yaml}}{lst:tabstop} + \cmhlistingsfromfile[showtabs=true]*{demonstrations/textwrap-ts-mod1.tex}{\texttt{textwrap-ts-mod1.tex}}{lst:textwrap-ts-mod1} \end{cmhtcbraster} You can specify \texttt{break} and \texttt{unexpand} options in @@ -195,9 +217,11 @@ latexindent.pl -m textwrap-ts.tex -o=+-mod1 -l tabstop.yaml instruct \texttt{latexindent.pl} to apply \texttt{textWrap} on a per-code-block basis. Thanks to \cite{zoehneto} for their help in testing and shaping this feature. + \index{modifying linebreaks! by text wrapping, per-code-block} The full details of \texttt{textWrapOptions} are shown in \cref{lst:textWrapOptionsAll}. In particular, note the field \texttt{perCodeBlockBasis: 0}. + \index{specialBeginEnd!textWrapOptions} \cmhlistingsfromfile[style=textWrapOptionsAll]*{../defaultSettings.yaml}[MLB-TCB,width=.85\linewidth,before=\centering]{\texttt{textWrapOptions}}{lst:textWrapOptionsAll} @@ -245,6 +269,8 @@ latexindent.pl -m textwrap-ts.tex -o=+-mod1 -l tabstop.yaml \end{itemize} Upon running the following commands + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{commandshell} latexindent.pl -s textwrap5.tex -l=textwrap3.yaml -m latexindent.pl -s textwrap5.tex -l=textwrap4.yaml -m @@ -262,6 +288,8 @@ latexindent.pl -s textwrap5.tex -l=textwrap5.yaml -m \end{widepage} In particular, upon running + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{commandshell} latexindent.pl -s textwrap6.tex -l=textwrap5.yaml -m \end{commandshell} @@ -292,6 +320,8 @@ latexindent.pl -s textwrap6.tex -l=textwrap5.yaml -m \end{adjustwidth} Upon running the commands + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{commandshell} latexindent.pl -s textwrap6.tex -l=textwrap6.yaml -m latexindent.pl -s textwrap6.tex -l=textwrap7.yaml -m @@ -334,6 +364,8 @@ latexindent.pl -s textwrap6.tex -l=textwrap8.yaml -m \Cref{lst:textwrap9-yaml} and \cref{lst:textwrap10-yaml} are equivalent. Upon running the commands + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{commandshell} latexindent.pl -s textwrap6.tex -l=textwrap9.yaml -m latexindent.pl -s textwrap6.tex -l=textwrap11.yaml -m @@ -372,6 +404,7 @@ latexindent.pl -s textwrap6.tex -l=textwrap11.yaml -m \subsubsection{Summary of text wrapping} It is important to note the following: + \index{verbatim!within summary of text wrapping} \begin{itemize} \item Verbatim environments (\vref{lst:verbatimEnvironments}) and verbatim commands (\vref{lst:verbatimCommands}) will \emph{not} be affected by the text @@ -394,6 +427,11 @@ latexindent.pl -s textwrap6.tex -l=textwrap11.yaml -m it puts one sentence per line. Thank you to \cite{mlep} for helping to shape and test this feature. The behaviour of this part of the script is controlled by the switches detailed in \cref{lst:oneSentencePerLine}, all of which we discuss next. + \index{modifying linebreaks! by using one sentence per line} + \index{sentences!oneSentencePerLine} + \index{sentences!one sentence per line} + \index{regular expressions!lowercase alph a-z} + \index{regular expressions!uppercase alph A-Z} \cmhlistingsfromfile[style=oneSentencePerLine]*{../defaultSettings.yaml}[MLB-TCB,width=.85\linewidth,before=\centering]{\texttt{oneSentencePerLine}}{lst:oneSentencePerLine} @@ -408,12 +446,15 @@ latexindent.pl -s textwrap6.tex -l=textwrap11.yaml -m internal line breaks as \texttt{removeSentenceLineBreaks} is set to \texttt{1}. Setting this switch to \texttt{0} instructs \texttt{latexindent.pl} not to do so. + \index{sentences!removing sentence line breaks} For example, consider \texttt{multiple-sentences.tex} shown in \cref{lst:multiple-sentences}. \cmhlistingsfromfile{demonstrations/multiple-sentences.tex}{\texttt{multiple-sentences.tex}}{lst:multiple-sentences} If we use the YAML files in \cref{lst:manipulate-sentences-yaml,lst:keep-sen-line-breaks-yaml}, and run the commands + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{widepage} \begin{commandshell} latexindent.pl multiple-sentences -m -l=manipulate-sentences.yaml @@ -439,6 +480,9 @@ latexindent.pl multiple-sentences -m -l=keep-sen-line-breaks.yaml The remainder of the settings displayed in \vref{lst:oneSentencePerLine} instruct \texttt{latexindent.pl} on how to define a sentence. From the perspective of \texttt{latexindent.pl} a sentence must: + \index{sentences!follow} + \index{sentences!begin with} + \index{sentences!end with} \begin{itemize} \item \emph{follow} a certain character or set of characters (see \cref{lst:sentencesFollow}); by default, this is either \lstinline!\par!, a @@ -452,6 +496,8 @@ latexindent.pl multiple-sentences -m -l=keep-sen-line-breaks.yaml In each case, you can specify the \texttt{other} field to include any pattern that you would like; you can specify anything in this field using the language of regular expressions. + \index{regular expressions!lowercase alph a-z} + \index{regular expressions!uppercase alph A-Z} \begin{cmhtcbraster}[raster columns=3, raster left skip=-3.5cm, @@ -466,6 +512,9 @@ latexindent.pl multiple-sentences -m -l=keep-sen-line-breaks.yaml Let's explore a few of the switches in \texttt{sentencesFollow}; let's start with \vref{lst:multiple-sentences}, and use the YAML settings given in \cref{lst:sentences-follow1-yaml}. Using the command + \index{sentences!follow} + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{commandshell} latexindent.pl multiple-sentences -m -l=sentences-follow1.yaml \end{commandshell} @@ -486,6 +535,8 @@ latexindent.pl multiple-sentences -m -l=sentences-follow1.yaml \cmhlistingsfromfile{demonstrations/multiple-sentences1.tex}{\texttt{multiple-sentences1.tex}}{lst:multiple-sentences1} Upon running the following commands + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{widepage} \begin{commandshell} latexindent.pl multiple-sentences1 -m -l=manipulate-sentences.yaml @@ -514,10 +565,13 @@ latexindent.pl multiple-sentences1 -m -l=manipulate-sentences.yaml,sentences-fol sentences to begin with lower case letters (see \cref{lst:sentencesBeginWith}), and we can use the \texttt{other} field to define sentences to begin with other characters. + \index{sentences!begin with} \cmhlistingsfromfile{demonstrations/multiple-sentences2.tex}{\texttt{multiple-sentences2.tex}}{lst:multiple-sentences2} Upon running the following commands + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{widepage} \begin{commandshell} latexindent.pl multiple-sentences2 -m -l=manipulate-sentences.yaml @@ -526,6 +580,7 @@ latexindent.pl multiple-sentences2 -m -l=manipulate-sentences.yaml,sentences-beg \end{widepage} then we obtain the respective output given in \cref{lst:multiple-sentences2-mod1,lst:multiple-sentences2-mod2}. \cmhlistingsfromfile{demonstrations/multiple-sentences2-mod1.tex}{\texttt{multiple-sentences2.tex} using \vref{lst:manipulate-sentences-yaml}}{lst:multiple-sentences2-mod1} + \index{regular expressions!numeric 0-9} \begin{cmhtcbraster}[ raster force size=false, @@ -547,11 +602,15 @@ latexindent.pl multiple-sentences2 -m -l=manipulate-sentences.yaml,sentences-beg \vref{lst:multiple-sentences-mod1}. We can populate the \texttt{other} field with any character that we wish; for example, using the YAML specified in \cref{lst:sentences-end1-yaml} and the command + \index{sentences!end with} + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{commandshell} latexindent.pl multiple-sentences -m -l=sentences-end1.yaml latexindent.pl multiple-sentences -m -l=sentences-end2.yaml \end{commandshell} then we obtain the output in \cref{lst:multiple-sentences-mod4}. + \index{regular expressions!lowercase alph a-z} \begin{cmhtcbraster} \cmhlistingsfromfile{demonstrations/multiple-sentences-mod4.tex}{\texttt{multiple-sentences.tex} using \cref{lst:sentences-end1-yaml}}{lst:multiple-sentences-mod4} @@ -579,6 +638,8 @@ latexindent.pl multiple-sentences -m -l=sentences-end2.yaml \cmhlistingsfromfile{demonstrations/url.tex}{\texttt{url.tex}}{lst:url} Upon running the following commands + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{commandshell} latexindent.pl url -m -l=manipulate-sentences.yaml \end{commandshell} @@ -605,6 +666,8 @@ latexindent.pl url -m -l=manipulate-sentences.yaml The \texttt{basicFullStop} routine should probably be avoided in most situations, as it does not accommodate the specifications above. For example, using the following command + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{commandshell} latexindent.pl url -m -l=alt-full-stop1.yaml \end{commandshell} @@ -625,12 +688,14 @@ latexindent.pl url -m -l=alt-full-stop1.yaml \subsubsection{Features of the oneSentencePerLine routine} The sentence manipulation routine takes place \emph{after} verbatim - environments, preamble and trailing comments have been accounted for; this means that any - characters within these types of code blocks will not be part of the sentence - manipulation routine. + \index{verbatim!in relation to oneSentencePerLine} environments, preamble and trailing comments have been + accounted for; this means that any characters within these types of code blocks will not + be part of the sentence manipulation routine. For example, if we begin with the \texttt{.tex} file in \cref{lst:multiple-sentences3}, and run the command + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{commandshell} latexindent.pl multiple-sentences3 -m -l=manipulate-sentences.yaml \end{commandshell} @@ -640,6 +705,8 @@ latexindent.pl multiple-sentences3 -m -l=manipulate-sentences.yaml Furthermore, if sentences run across environments then, by default, the line breaks internal to the sentence will be removed. For example, if we use the \texttt{.tex} file in \cref{lst:multiple-sentences4} and run the commands + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{commandshell} latexindent.pl multiple-sentences4 -m -l=manipulate-sentences.yaml latexindent.pl multiple-sentences4 -m -l=keep-sen-line-breaks.yaml @@ -652,6 +719,8 @@ latexindent.pl multiple-sentences4 -m -l=keep-sen-line-breaks.yaml Once you've read \cref{sec:poly-switches}, you will know that you can accommodate the removal of internal sentence line breaks by using the YAML in \cref{lst:item-rules2-yaml} and the command + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{commandshell} latexindent.pl multiple-sentences4 -m -l=item-rules2.yaml \end{commandshell} @@ -666,12 +735,16 @@ latexindent.pl multiple-sentences4 -m -l=item-rules2.yaml The \texttt{oneSentencePerLine}% \announce{2018-08-13}{oneSentencePerline text wrap and indent} can be instructed to perform text wrapping and indentation upon sentences. + \index{sentences!text wrapping} + \index{sentences!indenting} Let's use the code in \cref{lst:multiple-sentences5}. \cmhlistingsfromfile{demonstrations/multiple-sentences5.tex}{\texttt{multiple-sentences5.tex}}{lst:multiple-sentences5} Referencing \cref{lst:sentence-wrap1-yaml}, and running the following command + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{commandshell} latexindent.pl multiple-sentences5 -m -l=sentence-wrap1.yaml \end{commandshell} @@ -704,6 +777,9 @@ latexindent.pl multiple-sentences5 -m -l=sentence-wrap1.yaml By default, \texttt{latexindent.pl} will find the full-stop within the first \texttt{item}, which means that, upon running the following commands + \index{switches!-l demonstration} + \index{switches!-m demonstration} + \index{switches!-y demonstration} \begin{commandshell} latexindent.pl multiple-sentences6 -m -l=sentence-wrap1.yaml latexindent.pl multiple-sentences6 -m -l=sentence-wrap1.yaml -y="modifyLineBreaks:oneSentencePerLine:sentenceIndent:''" @@ -724,10 +800,16 @@ latexindent.pl multiple-sentences6 -m -l=sentence-wrap1.yaml -y="modifyLineBreak not followed by \texttt{item} commands, and that the end of sentences contains \lstinline!\end{itemize}! as in \cref{lst:itemize-yaml} (if you intend to use this, ensure that you remove the line breaks from the \texttt{other} field). + \index{regular expressions!lowercase alph a-z} + \index{regular expressions!uppercase alph A-Z} + \index{regular expressions!numeric 0-9} + \index{regular expressions!horizontal space \textbackslash{h}} \cmhlistingsfromfile[style=yaml-LST]*{demonstrations/itemized.yaml}[MLB-TCB]{\texttt{itemize.yaml}}{lst:itemize-yaml} Upon running + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{commandshell} latexindent.pl multiple-sentences6 -m -l=sentence-wrap1.yaml,itemize.yaml \end{commandshell} @@ -747,6 +829,7 @@ latexindent.pl multiple-sentences6 -m -l=sentence-wrap1.yaml,itemize.yaml \yamltitle{removeParagraphLineBreaks}*{fields} This feature is considered complimentary to the \texttt{oneSentencePerLine} feature described in \vref{sec:onesentenceperline}. + \index{specialBeginEnd!removeParagraphLineBreaks} \cmhlistingsfromfile[style=removeParagraphLineBreaks]*{../defaultSettings.yaml}[MLB-TCB,width=.85\linewidth,before=\centering]{\texttt{removeParagraphLineBreaks}}{lst:removeParagraphLineBreaks} @@ -775,6 +858,9 @@ latexindent.pl multiple-sentences6 -m -l=sentence-wrap1.yaml,itemize.yaml \end{cmhtcbraster} Upon running the command + \index{switches!-l demonstration} + \index{switches!-m demonstration} + \index{switches!-o demonstration} \begin{commandshell} latexindent.pl -m shortlines.tex -o shortlines1.tex -l remove-para1.yaml \end{commandshell} @@ -786,6 +872,9 @@ latexindent.pl -m shortlines.tex -o shortlines1.tex -l remove-para1.yaml \cref{lst:shortlines} which has crept in to the output in \cref{lst:shortlines1}. This can be fixed using the YAML file in \vref{lst:removeTWS-before} and running, for example, + \index{switches!-l demonstration} + \index{switches!-m demonstration} + \index{switches!-o demonstration} \begin{commandshell} latexindent.pl -m shortlines.tex -o shortlines1-tws.tex -l remove-para1.yaml,removeTWS-before.yaml \end{commandshell} @@ -804,6 +893,9 @@ latexindent.pl -m shortlines.tex -o shortlines1-tws.tex -l remove-para1.yaml,rem \end{cmhtcbraster} Upon running the commands + \index{switches!-l demonstration} + \index{switches!-m demonstration} + \index{switches!-o demonstration} \begin{widepage} \begin{commandshell} latexindent.pl -m shortlines-mand.tex -o shortlines-mand1.tex -l remove-para1.yaml @@ -837,6 +929,9 @@ latexindent.pl -m shortlines-opt.tex -o shortlines-opt1.tex -l remove-para1.yaml \end{minipage} Upon running the commands + \index{switches!-l demonstration} + \index{switches!-m demonstration} + \index{switches!-o demonstration} \begin{widepage} \begin{commandshell} latexindent.pl -m shortlines-envs.tex -o shortlines-envs2.tex -l remove-para2.yaml @@ -864,6 +959,9 @@ latexindent.pl -m shortlines-envs.tex -o shortlines-envs3.tex -l remove-para3.ya \end{cmhtcbraster} Upon running the following command + \index{switches!-l demonstration} + \index{switches!-m demonstration} + \index{switches!-o demonstration} \begin{widepage} \begin{commandshell} latexindent.pl -m shortlines-md.tex -o shortlines-md4.tex -l remove-para4.yaml @@ -881,16 +979,18 @@ latexindent.pl -m shortlines-md.tex -o shortlines-md4.tex -l remove-para4.yaml \lstinline|\par| command to be the end of a paragraph; \announce{2017-05-27}{paragraphsStopAt} you can fine tune the behaviour of the routine further by using the \texttt{paragraphsStopAt} fields, shown in \cref{lst:paragraphsStopAt}. + \index{specialBeginEnd!paragraphsStopAt} + \index{verbatim!in relation to paragraphsStopAt} \cmhlistingsfromfile[style=paragraphsStopAt]*{../defaultSettings.yaml}[MLB-TCB,width=.85\linewidth,before=\centering]{\texttt{paragraphsStopAt}}{lst:paragraphsStopAt} The fields specified in \texttt{paragraphsStopAt} tell \texttt{latexindent.pl} to stop the current paragraph when it reaches a line that \emph{begins} with any of the code-block types specified as \texttt{1} in - \cref{lst:paragraphsStopAt}. By default, you'll see that the paragraph line break routine - will stop when it reaches an environment or verbatim code block at the beginning of a - line. It is \emph{not} possible to specify these fields on a per-name - basis. + \cref{lst:paragraphsStopAt}. By default, you'll see that the paragraph line break + routine will stop when it reaches an environment or verbatim code block at the beginning + of a line. It is \emph{not} possible to specify these fields on a + per-name basis. Let's use the \texttt{.tex} file in \cref{lst:sl-stop}; we will, in turn, consider the settings in \cref{lst:stop-command-yaml,lst:stop-comment-yaml}. @@ -906,6 +1006,9 @@ latexindent.pl -m shortlines-md.tex -o shortlines-md4.tex -l remove-para4.yaml \end{minipage} Upon using the settings from \vref{lst:remove-para4-yaml} and running the commands + \index{switches!-l demonstration} + \index{switches!-m demonstration} + \index{switches!-o demonstration} \begin{widepage} \begin{commandshell} latexindent.pl -m sl-stop.tex -o sl-stop4.tex -l remove-para4.yaml @@ -959,6 +1062,9 @@ latexindent.pl -m sl-stop.tex -o sl-stop4-comment.tex -l=remove-para4.yaml,stop- switch. Explicitly, using the settings in \cref{lst:textwrap12-yaml} and running the command + \index{switches!-l demonstration} + \index{switches!-m demonstration} + \index{switches!-o demonstration} \begin{commandshell} latexindent.pl -m textwrap7.tex -l=textwrap12.yaml -o=+-mod12 \end{commandshell} @@ -978,42 +1084,50 @@ latexindent.pl -m textwrap7.tex -l=textwrap12.yaml -o=+-mod12 Every other field in the \texttt{modifyLineBreaks} field uses poly-switches, and can take one of the following% \announce{2017-08-21}*{blank line poly-switch} integer values: + \index{modifying linebreaks! using poly-switches} + \index{poly-switches!definition} + \index{poly-switches!values} + \index{poly-switches!off by default: set to 0} \begin{description} \item[$-1$] \emph{remove mode}: line breaks before or after the - \emph{<part of thing>} can be removed (assuming that \texttt{preserveBlankLines} is - set to \texttt{0}); + \emph{<part of thing>} can be removed (assuming that \texttt{preserveBlankLines} is + set to \texttt{0}); \item[0] \emph{off mode}: line breaks will not be modified for the - \emph{<part of thing>} under consideration; + \emph{<part of thing>} under consideration; \item[1] \emph{add mode}: a line break will be added before or after the - \emph{<part of thing>} under consideration, assuming that - there is not already a line break before or after the \emph{<part of thing>}; + \emph{<part of thing>} under consideration, assuming that + there is not already a line break before or after the \emph{<part of thing>}; \item[2] \emph{comment then add mode}: a comment symbol will be added, followed by a line break - before or after the \emph{<part of thing>} under consideration, assuming that there - is not already a comment and line break before or after the \emph{<part of thing>}; + before or after the \emph{<part of thing>} under consideration, assuming that there + is not already a comment and line break before or after the \emph{<part of thing>}; \item[3] \emph{add then blank line mode}% - \announce{2017-08-21}{blank line poly-switch}: a line break will be added before or after the - \emph{<part of thing>} under consideration, assuming that - there is not already a line break before or after the \emph{<part of thing>}, - followed by a blank line; + \announce{2017-08-21}{blank line poly-switch}: a line break will be added before or after the + \emph{<part of thing>} under consideration, assuming that + there is not already a line break before or after the \emph{<part of thing>}, + followed by a blank line; \item[4] \emph{add blank line mode}% - \announce{2019-07-13}{blank line poly-switch}; a blank line will - be added before or after the \emph{<part of thing>} under consideration, even if the - \emph{<part of thing>} is already on its own line. + \announce{2019-07-13}{blank line poly-switch}; a blank line will + be added before or after the \emph{<part of thing>} under consideration, even if the + \emph{<part of thing>} is already on its own line. \end{description} In the above, \emph{<part of thing>} refers to either the - \emph{begin statement}, \emph{body} or \emph{end statement} - of the code blocks detailed in \vref{tab:code-blocks}. All poly-switches are - \emph{off} by default; \texttt{latexindent.pl} searches first of all - for per-name settings, and then followed by global per-thing settings. + \emph{begin statement}, \emph{body} or + \emph{end statement} of the code blocks detailed in \vref{tab:code-blocks}. + All poly-switches are \emph{off} by default; + \texttt{latexindent.pl} searches first of all for per-name settings, and then + followed by global per-thing settings. \subsection{modifyLineBreaks for environments}\label{sec:modifylinebreaks-environments} We start by viewing a snippet of \texttt{defaultSettings.yaml} in \cref{lst:environments-mlb}; note that it contains \emph{global} settings (immediately after the \texttt{environments} field) and that \emph{per-name} settings are also allowed -- in the case of - \cref{lst:environments-mlb}, settings for \texttt{equation*} have been specified - for demonstration. Note that all poly-switches are \emph{off} (set to 0) by - default. + \cref{lst:environments-mlb}, settings for \texttt{equation*} have been + specified for demonstration. Note that all poly-switches are \emph{off} (set to 0) + by default. + \index{poly-switches!default values} + \index{poly-switches!environment global example} + \index{poly-switches!environment per-code block example} \cmhlistingsfromfile[style=modifylinebreaksEnv]*{../defaultSettings.yaml}[width=.8\linewidth,before=\centering,MLB-TCB]{\texttt{environments}}{lst:environments-mlb} @@ -1021,6 +1135,7 @@ latexindent.pl -m textwrap7.tex -l=textwrap12.yaml -o=+-mod12 have annotated key parts of the file using $\BeginStartsOnOwnLine$, $\BodyStartsOnOwnLine$, $\EndStartsOnOwnLine$ and $\EndFinishesWithLineBreak$, these will be related to fields specified in \cref{lst:environments-mlb}. + \index{poly-switches!visualisation: $\BeginStartsOnOwnLine$, $\BodyStartsOnOwnLine$, $\EndStartsOnOwnLine$, $\EndFinishesWithLineBreak$} \begin{cmhlistings}[style=tcblatex,escapeinside={(*@}{@*)}]{\texttt{env-mlb1.tex}}{lst:env-mlb1-tex} before words(*@$\BeginStartsOnOwnLine$@*) \begin{myenv}(*@$\BodyStartsOnOwnLine$@*)body of myenv(*@$\EndStartsOnOwnLine$@*)\end{myenv}(*@$\EndFinishesWithLineBreak$@*) after words @@ -1030,6 +1145,8 @@ before words(*@$\BeginStartsOnOwnLine$@*) \begin{myenv}(*@$\BodyStartsOnOwnLine$ Let's explore \texttt{BeginStartsOnOwnLine} and \texttt{BodyStartsOnOwnLine} in \cref{lst:env-mlb1,lst:env-mlb2}, and in particular, let's allow each of them in turn to take a value of $1$. + \index{modifying linebreaks! at the \emph{beginning} of a code block} + \index{poly-switches!adding line breaks: set to 1} \begin{minipage}{.45\textwidth} \cmhlistingsfromfile[style=yaml-LST]*{demonstrations/env-mlb1.yaml}[MLB-TCB]{\texttt{env-mlb1.yaml}}{lst:env-mlb1} @@ -1040,6 +1157,8 @@ before words(*@$\BeginStartsOnOwnLine$@*) \begin{myenv}(*@$\BodyStartsOnOwnLine$ \end{minipage} After running the following commands, + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{commandshell} latexindent.pl -m env-mlb.tex -l env-mlb1.yaml latexindent.pl -m env-mlb.tex -l env-mlb2.yaml @@ -1071,6 +1190,7 @@ latexindent.pl -m env-mlb.tex -l env-mlb2.yaml \cref{lst:env-mlb1,lst:env-mlb2} so that they are $2$ and save them into \texttt{env-mlb3.yaml} and \texttt{env-mlb4.yaml} respectively (see \cref{lst:env-mlb3,lst:env-mlb4}). + \index{poly-switches!adding comments and then line breaks: set to 2} \begin{minipage}{.45\textwidth} \cmhlistingsfromfile[style=yaml-LST]*{demonstrations/env-mlb3.yaml}[MLB-TCB]{\texttt{env-mlb3.yaml}}{lst:env-mlb3} @@ -1097,10 +1217,11 @@ latexindent.pl -m env-mlb.tex -l env-mlb2.yaml horizontal space has been stripped before doing so. Let's% - \announce{2017-08-21}{demonstration of blank line poly-switch (3)} now change each of - the \texttt{1} values in \cref{lst:env-mlb1,lst:env-mlb2} so that they are - $3$ and save them into \texttt{env-mlb5.yaml} and + \announce{2017-08-21}{demonstration of blank line poly-switch (3)} now change each + of the \texttt{1} values in \cref{lst:env-mlb1,lst:env-mlb2} so that they + are $3$ and save them into \texttt{env-mlb5.yaml} and \texttt{env-mlb6.yaml} respectively (see \cref{lst:env-mlb5,lst:env-mlb6}). + \index{poly-switches!adding blank lines: set to 3} \begin{minipage}{.45\textwidth} \cmhlistingsfromfile[style=yaml-LST]*{demonstrations/env-mlb5.yaml}[MLB-TCB]{\texttt{env-mlb5.yaml}}{lst:env-mlb5} @@ -1130,6 +1251,7 @@ latexindent.pl -m env-mlb.tex -l env-mlb2.yaml of the \texttt{1} values in \cref{lst:env-mlb5,lst:env-mlb6} so that they are $4$ and save them into \texttt{env-beg4.yaml} and \texttt{env-body4.yaml} respectively (see \cref{lst:env-beg4,lst:env-body4}). + \index{poly-switches!adding blank lines (again"!): set to 4} \begin{minipage}{.45\textwidth} \cmhlistingsfromfile[style=yaml-LST]*{demonstrations/env-beg4.yaml}[MLB-TCB]{\texttt{env-beg4.yaml}}{lst:env-beg4} @@ -1145,6 +1267,8 @@ latexindent.pl -m env-mlb.tex -l env-mlb2.yaml \cmhlistingsfromfile{demonstrations/env-mlb1.tex}{\texttt{env-mlb1.tex}}{lst:env-mlb1-text} Upon running the commands + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{commandshell} latexindent.pl -m env-mlb1.tex -l env-beg4.yaml latexindent.pl -m env-mlb.1tex -l env-body4.yaml @@ -1170,6 +1294,8 @@ latexindent.pl -m env-mlb.1tex -l env-body4.yaml Let's explore \texttt{EndStartsOnOwnLine} and \texttt{EndFinishesWithLineBreak} in \cref{lst:env-mlb7,lst:env-mlb8}, and in particular, let's allow each of them in turn to take a value of $1$. + \index{modifying linebreaks! at the \emph{end} of a code block} + \index{poly-switches!adding line breaks: set to 1} \begin{minipage}{.49\textwidth} \cmhlistingsfromfile[style=yaml-LST]*{demonstrations/env-mlb7.yaml}[MLB-TCB]{\texttt{env-mlb7.yaml}}{lst:env-mlb7} @@ -1180,6 +1306,8 @@ latexindent.pl -m env-mlb.1tex -l env-body4.yaml \end{minipage} After running the following commands, + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{commandshell} latexindent.pl -m env-mlb.tex -l env-mlb7.yaml latexindent.pl -m env-mlb.tex -l env-mlb8.yaml @@ -1210,6 +1338,7 @@ latexindent.pl -m env-mlb.tex -l env-mlb8.yaml \cref{lst:env-mlb7,lst:env-mlb8} so that they are $2$ and save them into \texttt{env-mlb9.yaml} and \texttt{env-mlb10.yaml} respectively (see \cref{lst:env-mlb9,lst:env-mlb10}). + \index{poly-switches!adding comments and then line breaks: set to 2} \begin{minipage}{.49\textwidth} \cmhlistingsfromfile[style=yaml-LST]*{demonstrations/env-mlb9.yaml}[MLB-TCB]{\texttt{env-mlb9.yaml}}{lst:env-mlb9} @@ -1240,6 +1369,7 @@ latexindent.pl -m env-mlb.tex -l env-mlb8.yaml of the \texttt{1} values in \cref{lst:env-mlb7,lst:env-mlb8} so that they are $3$ and save them into \texttt{env-mlb11.yaml} and \texttt{env-mlb12.yaml} respectively (see \cref{lst:env-mlb11,lst:env-mlb12}). + \index{poly-switches!adding blank lines: set to 3} \begin{minipage}{.49\textwidth} \cmhlistingsfromfile[style=yaml-LST]*{demonstrations/env-mlb11.yaml}[MLB-TCB]{\texttt{env-mlb11.yaml}}{lst:env-mlb11} @@ -1269,6 +1399,7 @@ latexindent.pl -m env-mlb.tex -l env-mlb8.yaml of the \texttt{1} values in \cref{lst:env-mlb11,lst:env-mlb12} so that they are $4$ and save them into \texttt{env-end4.yaml} and \texttt{env-end-f4.yaml} respectively (see \cref{lst:env-end4,lst:env-end-f4}). + \index{poly-switches!adding blank lines (again"!): set to 4} \begin{minipage}{.45\textwidth} \cmhlistingsfromfile[style=yaml-LST]*{demonstrations/env-end4.yaml}[MLB-TCB]{\texttt{env-end4.yaml}}{lst:env-end4} @@ -1282,6 +1413,8 @@ latexindent.pl -m env-mlb.tex -l env-mlb8.yaml \vref{lst:env-mlb1-text}. Upon running the commands + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{commandshell} latexindent.pl -m env-mlb1.tex -l env-end4.yaml latexindent.pl -m env-mlb.1tex -l env-end-f4.yaml @@ -1351,6 +1484,7 @@ latexindent.pl -m env-mlb.1tex -l env-end-f4.yaml positions of the line break highlighters, $\BeginStartsOnOwnLine$, $\BodyStartsOnOwnLine$, $\EndStartsOnOwnLine$ and $\EndFinishesWithLineBreak$, together with the associated YAML files in \crefrange{lst:env-mlb13}{lst:env-mlb16}. + \index{poly-switches!removing line breaks: set to -1} \begin{minipage}{.45\linewidth} \begin{cmhlistings}[style=tcblatex,escapeinside={(*@}{@*)}]{\texttt{env-mlb4.tex}}{lst:mlb4} @@ -1373,6 +1507,8 @@ after words \end{minipage} After running the commands + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{commandshell} latexindent.pl -m env-mlb4.tex -l env-mlb13.yaml latexindent.pl -m env-mlb4.tex -l env-mlb14.yaml @@ -1413,6 +1549,8 @@ latexindent.pl -m env-mlb4.tex -l env-mlb16.yaml combine all of the YAML settings in \crefrange{lst:env-mlb13}{lst:env-mlb16} into one file; alternatively, you could tell \texttt{latexindent.pl} to load them all by using the following command, for example + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{widepage} \begin{commandshell} latexindent.pl -m env-mlb4.tex -l env-mlb13.yaml,env-mlb14.yaml,env-mlb15.yaml,env-mlb16.yaml @@ -1440,6 +1578,8 @@ after words \end{cmhtcbraster} The output from the following commands + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{widepage} \begin{commandshell} latexindent.pl -m env-mlb5.tex -l env-mlb13.yaml,env-mlb14.yaml,env-mlb15.yaml,env-mlb16.yaml @@ -1459,6 +1599,7 @@ latexindent.pl -m env-mlb5.tex -l env-mlb13.yaml,env-mlb14.yaml,env-mlb15.yaml,e \subsubsection{poly-switch line break removal and blank lines} Now let's consider the file in \cref{lst:mlb6}, which contains blank lines. + \index{poly-switches!blank lines} \begin{cmhtcbraster} \begin{cmhlistings}[style=tcblatex,escapeinside={(*@}{@*)}]{\texttt{env-mlb6.tex}}{lst:mlb6} @@ -1479,6 +1620,8 @@ after words \end{cmhtcbraster} Upon running the following commands + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{widepage} \begin{commandshell} latexindent.pl -m env-mlb6.tex -l env-mlb13.yaml,env-mlb14.yaml,env-mlb15.yaml,env-mlb16.yaml @@ -1510,6 +1653,8 @@ latexindent.pl -m env-mlb6.tex -l env-mlb13.yaml,env-mlb14.yaml,env-mlb15.yaml,e \cmhlistingsfromfile{demonstrations/env-mlb7.tex}{\texttt{env-mlb7.tex}}{lst:env-mlb7-tex} Upon running the following commands + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{commandshell} latexindent.pl -m env-mlb7.tex -l env-mlb12.yaml,env-mlb13.yaml latexindent.pl -m env-mlb7.tex -l env-mlb13.yaml,env-mlb14.yaml,UnpreserveBlankLines.yaml @@ -1538,6 +1683,9 @@ latexindent.pl -m env-mlb7.tex -l env-mlb13.yaml,env-mlb14.yaml,UnpreserveBlankL special code blocks (\vref{lst:specialafter}). Note that for these poly-switches to take effect, the name of the code block must necessarily be specified within \texttt{lookForAlignDelims} (\vref{lst:aligndelims:basic}); we will demonstrate this in what follows. + \index{delimiters!poly-switches for double back slash} + \index{modifying linebreaks! surrounding double back slash} + \index{poly-switches!for double back slash (delimiters)} Consider the code given in \cref{lst:dbs-demo}. \begin{cmhlistings}[style=tcblatex,escapeinside={(*@}{@*)}]{\texttt{tabular3.tex}}{lst:dbs-demo} @@ -1561,6 +1709,8 @@ latexindent.pl -m env-mlb7.tex -l env-mlb13.yaml,env-mlb14.yaml,UnpreserveBlankL \cref{lst:dbs-demo}, together with the YAML files given in \cref{lst:DBS1} and \cref{lst:DBS2} and running the following commands + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{commandshell} latexindent.pl -m tabular3.tex -l DBS1.yaml latexindent.pl -m tabular3.tex -l DBS2.yaml @@ -1582,11 +1732,11 @@ latexindent.pl -m tabular3.tex -l DBS2.yaml \begin{itemize} \item \cref{lst:DBS1} specifies \texttt{DBSStartsOnOwnLine} for \emph{every} environment (that is within \texttt{lookForAlignDelims}, - \vref{yaml:lookforaligndelims}); + \vref{lst:aligndelims:advanced}); the double back slashes from \cref{lst:dbs-demo} have been moved to their own line in \cref{lst:tabular3-DBS1}; \item \cref{lst:DBS2} specifies \texttt{DBSStartsOnOwnLine} on a - \emph{per-name} basis for \texttt{tabular} (that is within \texttt{lookForAlignDelims}, \vref{yaml:lookforaligndelims}); + \emph{per-name} basis for \texttt{tabular} (that is within \texttt{lookForAlignDelims}, \vref{lst:aligndelims:advanced}); the double back slashes from \cref{lst:dbs-demo} have been moved to their own line in \cref{lst:tabular3-DBS2}, having added comment symbols before moving them. \end{itemize} @@ -1596,6 +1746,9 @@ latexindent.pl -m tabular3.tex -l DBS2.yaml \cref{lst:dbs-demo}, together with the YAML files given in \cref{lst:DBS3} and \cref{lst:DBS4} and running the following commands + \index{poly-switches!for double back slash (delimiters)} + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{commandshell} latexindent.pl -m tabular3.tex -l DBS3.yaml latexindent.pl -m tabular3.tex -l DBS4.yaml @@ -1617,29 +1770,38 @@ latexindent.pl -m tabular3.tex -l DBS4.yaml \begin{itemize} \item \cref{lst:DBS3} specifies \texttt{DBSFinishesWithLineBreak} for \emph{every} environment (that is within \texttt{lookForAlignDelims}, - \vref{yaml:lookforaligndelims}); + \vref{lst:aligndelims:advanced}); the code following the double back slashes from \cref{lst:dbs-demo} has been moved to their own line in \cref{lst:tabular3-DBS3}; \item \cref{lst:DBS4} specifies \texttt{DBSFinishesWithLineBreak} on a - \emph{per-name} basis for \texttt{tabular} (that is within \texttt{lookForAlignDelims}, \vref{yaml:lookforaligndelims}); + \emph{per-name} basis for \texttt{tabular} (that is within \texttt{lookForAlignDelims}, \vref{lst:aligndelims:advanced}); the first double back slashes from \cref{lst:dbs-demo} have moved code following them to their own line in \cref{lst:tabular3-DBS4}, having added comment symbols before moving them; the final double back slashes have \emph{not} added a line break as they are at the end of the body within the code block. \end{itemize} -\subsubsection{Double back slash poly switches for specialBeginEnd} +\subsubsection{Double back slash poly-switches for specialBeginEnd} Let's explore the double back slash poly-switches for code blocks within \texttt{specialBeginEnd} code blocks (\vref{lst:specialBeginEnd}); we begin with the code within \cref{lst:special4}. + \index{specialBeginEnd!double backslash poly-switch demonstration} + \index{poly-switches!double backslash} + \index{poly-switches!for double back slash (delimiters)} + \index{specialBeginEnd!lookForAlignDelims} + \index{delimiters} + \index{linebreaks!summary of poly-switches} \cmhlistingsfromfile{demonstrations/special4.tex}{\texttt{special4.tex}}{lst:special4} Upon using the YAML settings in \cref{lst:DBS5}, and running the command + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{commandshell} latexindent.pl -m special4.tex -l DBS5.yaml \end{commandshell} then we receive the output given in \cref{lst:special4-DBS5}. + \index{delimiters!with specialBeginEnd and the -m switch} \begin{cmhtcbraster}[ raster force size=false, @@ -1660,14 +1822,17 @@ latexindent.pl -m special4.tex -l DBS5.yaml symbol, followed by a line break, as it is set to a value of 2. \end{itemize} -\subsubsection{Double back slash poly switches for optional and mandatory arguments} +\subsubsection{Double back slash poly-switches for optional and mandatory arguments} For clarity, we provide a demonstration of controlling the double back slash poly-switches for optional and mandatory arguments. We begin with the code in \cref{lst:mycommand2}. + \index{poly-switches!for double back slash (delimiters)} \cmhlistingsfromfile{demonstrations/mycommand2.tex}{\texttt{mycommand2.tex}}{lst:mycommand2} Upon using the YAML settings in \cref{lst:DBS6,lst:DBS7}, and running the command + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{commandshell} latexindent.pl -m mycommand2.tex -l DBS6.yaml latexindent.pl -m mycommand2.tex -l DBS7.yaml @@ -1694,12 +1859,15 @@ latexindent.pl -m mycommand2.tex -l DBS7.yaml The pattern matching for the double back slash will also, optionally, allow trailing square brackets that contain a measurement of vertical spacing, for example \lstinline!\\[3pt]!. + \index{poly-switches!for double back slash (delimiters)} For example, beginning with the code in \cref{lst:pmatrix3} \cmhlistingsfromfile{demonstrations/pmatrix3.tex}{\texttt{pmatrix3.tex}}{lst:pmatrix3} and running the following command, using \cref{lst:DBS3}, + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{commandshell} latexindent.pl -m pmatrix3.tex -l DBS3.yaml \end{commandshell} @@ -1723,6 +1891,9 @@ latexindent.pl -m pmatrix3.tex -l DBS3.yaml \announce{2019-05-05}*{verbatim poly-switch} However, there are two poly-switches available for \texttt{verbatim} code blocks: environments (\vref{lst:verbatimEnvironments}), commands (\vref{lst:verbatimCommands}) and \texttt{specialBeginEnd} (\vref{lst:special-verb1-yaml}). + \index{specialBeginEnd!poly-switch summary} + \index{verbatim!poly-switch summary} + \index{poly-switches!summary of all poly-switches} \clearpage \begin{longtable}{llll} diff --git a/support/latexindent/documentation/subsec-commands-and-their-options.tex b/support/latexindent/documentation/subsec-commands-and-their-options.tex index a1184bf3a5..d38d4e3f54 100644 --- a/support/latexindent/documentation/subsec-commands-and-their-options.tex +++ b/support/latexindent/documentation/subsec-commands-and-their-options.tex @@ -41,6 +41,7 @@ \texttt{noAdditionalIndentGlobal} as discussed on \cpageref{page:command:noAddGlobal}. Upon using the YAML settings in \cref{lst:noRoundParentheses}, and running the command + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl pstricks1.tex -l noRoundParentheses.yaml \end{commandshell} @@ -60,6 +61,7 @@ latexindent.pl pstricks1.tex -l noRoundParentheses.yaml \cref{lst:pstricks1-nrp}. Let's explore this using the YAML given in \cref{lst:defFunction} and run the command + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl pstricks1.tex -l defFunction.yaml \end{commandshell} @@ -110,6 +112,7 @@ latexindent.pl pstricks1.tex -l defFunction.yaml We can explore this further, for example using \cref{lst:draw} and running the command + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl tikz-node1.tex -l draw.yaml \end{commandshell} @@ -126,6 +129,7 @@ latexindent.pl tikz-node1.tex -l draw.yaml Let's compare this with the output from using the YAML settings in \cref{lst:no-strings}, and running the command + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl tikz-node1.tex -l no-strings.yaml \end{commandshell} @@ -183,6 +187,7 @@ latexindent.pl tikz-node1.tex -l no-strings.yaml Let's compare this with the output from using the YAML settings in \cref{lst:foreach}, and running the command + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl for-each.tex -l foreach.yaml \end{commandshell} @@ -239,6 +244,8 @@ latexindent.pl for-each.tex -l foreach.yaml The \texttt{amalgamate} field can be used for \texttt{commandNameSpecial}, just as for \texttt{stringsAllowedBetweenArguments}. The same condition holds as stated previously, which we state again here: + \index{warning!amalgamate field} + \begin{warning} It is important to note that the \texttt{amalgamate} field, if used, in either \texttt{commandNameSpecial} or \texttt{stringsAllowedBetweenArguments} must be in the first field, and specified using the syntax given in \cref{lst:amalgamate-demo1,lst:amalgamate-demo2,lst:amalgamate-demo3}. diff --git a/support/latexindent/documentation/subsec-conflicting-poly-switches.tex b/support/latexindent/documentation/subsec-conflicting-poly-switches.tex index 25ebe3efaa..a4b98981d2 100644 --- a/support/latexindent/documentation/subsec-conflicting-poly-switches.tex +++ b/support/latexindent/documentation/subsec-conflicting-poly-switches.tex @@ -3,6 +3,9 @@ It is very easy to have conflicting poly-switches; if we use the example from \vref{lst:mycommand1}, and consider the YAML settings given in \cref{lst:mycom-mlb4}. The output from running + \index{poly-switches!conflicting switches} + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{commandshell} latexindent.pl -m -l=mycom-mlb4.yaml mycommand1.tex \end{commandshell} @@ -27,6 +30,8 @@ latexindent.pl -m -l=mycom-mlb4.yaml mycommand1.tex We can explore this further by considering the YAML settings in \cref{lst:mycom-mlb5}; upon running the command + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{commandshell} latexindent.pl -m -l=mycom-mlb5.yaml mycommand1.tex \end{commandshell} @@ -62,11 +67,14 @@ latexindent.pl -m -l=mycom-mlb5.yaml mycommand1.tex Now let's consider an example when nested code blocks have conflicting poly-switches; we'll use the code in \cref{lst:nested-env}, noting that it contains nested environments. + \index{poly-switches!conflicting switches} \cmhlistingsfromfile{demonstrations/nested-env.tex}{\texttt{nested-env.tex}}{lst:nested-env} Let's use the YAML settings given in \cref{lst:nested-env-mlb1-yaml}, which upon running the command + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{commandshell} latexindent.pl -m -l=nested-env-mlb1.yaml nested-env.tex \end{commandshell} @@ -132,6 +140,8 @@ latexindent.pl -m -l=nested-env-mlb1.yaml nested-env.tex We can explore this further using the poly-switches in \cref{lst:nested-env-mlb2}; upon running the command + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{commandshell} latexindent.pl -m -l=nested-env-mlb2.yaml nested-env.tex \end{commandshell} diff --git a/support/latexindent/documentation/subsec-noAdditionalIndent-indentRules.tex b/support/latexindent/documentation/subsec-noAdditionalIndent-indentRules.tex index 53fd835392..4bb5d127e5 100644 --- a/support/latexindent/documentation/subsec-noAdditionalIndent-indentRules.tex +++ b/support/latexindent/documentation/subsec-noAdditionalIndent-indentRules.tex @@ -1,5 +1,10 @@ % arara: pdflatex: {shell: yes, files: [latexindent]} % arara: pdflatex: {shell: yes, files: [latexindent]} +\index{indentation!no additional indent} +\index{indentation!removing indentation per-code block} +\index{indentation!customising indentation per-code block} +\index{indentation!customising per-name} +\index{indentation!no additional indent global} \subsection{noAdditionalIndent and indentRules}\label{sec:noadd-indent-rules} \texttt{latexindent.pl} operates on files by looking for code blocks, as detailed in \vref{subsubsec:code-blocks}; diff --git a/support/latexindent/documentation/subsec-partnering-poly-switches.tex b/support/latexindent/documentation/subsec-partnering-poly-switches.tex index 03337669ef..4c0b7a8f05 100644 --- a/support/latexindent/documentation/subsec-partnering-poly-switches.tex +++ b/support/latexindent/documentation/subsec-partnering-poly-switches.tex @@ -4,6 +4,7 @@ involving the \emph{first} argument of a code block need to be accounted for using both \texttt{BodyStartsOnOwnLine} (or its equivalent, see \vref{tab:poly-switch-mapping}) and \texttt{LCuBStartsOnOwnLine} for mandatory arguments, and \texttt{LSqBStartsOnOwnLine} for optional arguments. + \index{poly-switches!conflicting partnering} Let's begin with the code in \cref{lst:mycommand1} and the YAML settings in \cref{lst:mycom-mlb1}; with reference to \vref{tab:poly-switch-mapping}, the key @@ -12,6 +13,8 @@ \cmhlistingsfromfile{demonstrations/mycommand1.tex}{\texttt{mycommand1.tex}}{lst:mycommand1} Upon running the command + \index{switches!-l demonstration} + \index{switches!-m demonstration} \begin{commandshell} latexindent.pl -m -l=mycom-mlb1.yaml mycommand1.tex \end{commandshell} diff --git a/support/latexindent/documentation/subsubsec-commands-with-arguments.tex b/support/latexindent/documentation/subsubsec-commands-with-arguments.tex index 84bff810a1..5531e7eace 100644 --- a/support/latexindent/documentation/subsubsec-commands-with-arguments.tex +++ b/support/latexindent/documentation/subsubsec-commands-with-arguments.tex @@ -23,6 +23,7 @@ \end{minipage} After running the following commands, + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl mycommand.tex -l mycommand-noAdd1.yaml latexindent.pl mycommand.tex -l mycommand-noAdd2.yaml @@ -55,6 +56,7 @@ latexindent.pl mycommand.tex -l mycommand-noAdd2.yaml \end{minipage} After running the following commands, + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl mycommand.tex -l mycommand-noAdd3.yaml latexindent.pl mycommand.tex -l mycommand-noAdd4.yaml @@ -85,6 +87,7 @@ latexindent.pl mycommand.tex -l mycommand-noAdd4.yaml \end{minipage} After running the following commands, + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl mycommand.tex -l mycommand-noAdd5.yaml latexindent.pl mycommand.tex -l mycommand-noAdd6.yaml diff --git a/support/latexindent/documentation/subsubsec-environments-and-their-arguments.tex b/support/latexindent/documentation/subsubsec-environments-and-their-arguments.tex index a37e3eb0ed..b151d2d767 100644 --- a/support/latexindent/documentation/subsubsec-environments-and-their-arguments.tex +++ b/support/latexindent/documentation/subsubsec-environments-and-their-arguments.tex @@ -18,6 +18,7 @@ \end{minipage} On applying either of the following commands, + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl myenv.tex -l myenv-noAdd1.yaml latexindent.pl myenv.tex -l myenv-noAdd2.yaml @@ -30,6 +31,7 @@ latexindent.pl myenv.tex -l myenv-noAdd2.yaml \cmhlistingsfromfile{demonstrations/myenvironment-simple-noAdd-body1.tex}{\texttt{myenv.tex} output (using either \cref{lst:myenv-noAdd1} or \cref{lst:myenv-noAdd2})}{lst:myenv-output} Upon changing the YAML files to those shown in \cref{lst:myenv-noAdd3,lst:myenv-noAdd4}, and running either + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl myenv.tex -l myenv-noAdd3.yaml latexindent.pl myenv.tex -l myenv-noAdd4.yaml @@ -52,6 +54,7 @@ latexindent.pl myenv.tex -l myenv-noAdd4.yaml \cmhlistingsfromfile{demonstrations/myenvironment-args.tex}{\texttt{myenv-args.tex}}{lst:myenv-args} Upon running + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl -l=myenv-noAdd1.yaml myenv-args.tex \end{commandshell} @@ -74,6 +77,7 @@ latexindent.pl -l=myenv-noAdd1.yaml myenv-args.tex \end{minipage} Upon running + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl myenv.tex -l myenv-noAdd5.yaml latexindent.pl myenv.tex -l myenv-noAdd6.yaml @@ -102,6 +106,7 @@ latexindent.pl myenv.tex -l myenv-noAdd6.yaml \end{cmhtcbraster} On applying either of the following commands, + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl myenv.tex -l myenv-rules1.yaml latexindent.pl myenv.tex -l myenv-rules2.yaml @@ -118,6 +123,7 @@ latexindent.pl myenv.tex -l myenv-rules2.yaml Returning to the example in \cref{lst:myenv-args} that contains optional and mandatory arguments. Upon using \cref{lst:myenv-rules1} as in + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl myenv-args.tex -l=myenv-rules1.yaml \end{commandshell} @@ -137,6 +143,7 @@ latexindent.pl myenv-args.tex -l=myenv-rules1.yaml \end{minipage} After running + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl myenv-args.tex -l myenv-rules3.yaml latexindent.pl myenv-args.tex -l myenv-rules4.yaml @@ -170,6 +177,7 @@ latexindent.pl myenv-args.tex -l myenv-rules4.yaml \texttt{noAdditionalIndentGlobal}, and in particular \emph{for the environments} key (see \cref{lst:noAdditionalIndentGlobal:environments}). Let's say that you change the value of \texttt{environments} to \texttt{1} in \cref{lst:noAdditionalIndentGlobal:environments}, and that you run + \index{switches!-l demonstration} \begin{widepage} \begin{commandshell} @@ -206,6 +214,7 @@ latexindent.pl myenv-args.tex -l myenv-rules1.yaml,env-noAdditionalGlobal.yaml \end{minipage} we may run the commands + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl myenv-args.tex -local opt-args-no-add-glob.yaml latexindent.pl myenv-args.tex -local mand-args-no-add-glob.yaml @@ -231,6 +240,7 @@ latexindent.pl myenv-args.tex -local mand-args-no-add-glob.yaml \texttt{indentRulesGlobal} as detailed in \cref{lst:indentRulesGlobal:environments}; if you change the \texttt{environments} field to anything involving horizontal space, say \lstinline!" "!, and then run the following commands + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl myenv-args.tex -l env-indentRules.yaml @@ -263,6 +273,7 @@ latexindent.pl myenv-args.tex -l myenv-rules1.yaml,env-indentRules.yaml \end{minipage} Upon running the following commands + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl myenv-args.tex -local opt-args-indent-rules-glob.yaml latexindent.pl myenv-args.tex -local mand-args-indent-rules-glob.yaml diff --git a/support/latexindent/documentation/subsubsec-environments-with-items.tex b/support/latexindent/documentation/subsubsec-environments-with-items.tex index 4cc53e654f..c615be110d 100644 --- a/support/latexindent/documentation/subsubsec-environments-with-items.tex +++ b/support/latexindent/documentation/subsubsec-environments-with-items.tex @@ -17,6 +17,7 @@ \end{cmhtcbraster} Upon running the following commands + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl items1.tex -local item-noAdd1.yaml latexindent.pl items1.tex -local item-rules1.yaml @@ -51,6 +52,7 @@ latexindent.pl items1.tex -local item-rules1.yaml \end{minipage} Upon running the following commands, + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl items1.tex -local items-noAdditionalGlobal.yaml latexindent.pl items1.tex -local items-indentRulesGlobal.yaml diff --git a/support/latexindent/documentation/subsubsec-headings.tex b/support/latexindent/documentation/subsubsec-headings.tex index 088ece973d..3cbe5996ea 100644 --- a/support/latexindent/documentation/subsubsec-headings.tex +++ b/support/latexindent/documentation/subsubsec-headings.tex @@ -7,6 +7,7 @@ \cmhlistingsfromfile{demonstrations/headings2.tex}{\texttt{headings2.tex}}{lst:headings2} On using the YAML file in \cref{lst:headings3yaml} by running the command + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl headings2.tex -l headings3.yaml \end{commandshell} @@ -20,6 +21,7 @@ latexindent.pl headings2.tex -l headings3.yaml \end{cmhtcbraster} If we specify \texttt{noAdditionalIndent} as in \cref{lst:headings4yaml} and run the command + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl headings2.tex -l headings4.yaml \end{commandshell} diff --git a/support/latexindent/documentation/subsubsec-ifelsefi.tex b/support/latexindent/documentation/subsubsec-ifelsefi.tex index c7171bc752..419fc0d53f 100644 --- a/support/latexindent/documentation/subsubsec-ifelsefi.tex +++ b/support/latexindent/documentation/subsubsec-ifelsefi.tex @@ -27,6 +27,7 @@ \end{minipage} After running the following commands, + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl ifelsefi1.tex -local ifnum-noAdd.yaml latexindent.pl ifelsefi1.tex -l ifnum-indent-rules.yaml @@ -56,6 +57,7 @@ latexindent.pl ifelsefi1.tex -l ifnum-indent-rules.yaml \end{minipage} Upon running the following commands + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl ifelsefi1.tex -local ifelsefi-noAdd-glob.yaml latexindent.pl ifelsefi1.tex -l ifelsefi-indent-rules-global.yaml diff --git a/support/latexindent/documentation/subsubsec-no-add-remaining-code-blocks.tex b/support/latexindent/documentation/subsubsec-no-add-remaining-code-blocks.tex index 7068c5a873..f72ac43d39 100644 --- a/support/latexindent/documentation/subsubsec-no-add-remaining-code-blocks.tex +++ b/support/latexindent/documentation/subsubsec-no-add-remaining-code-blocks.tex @@ -121,8 +121,11 @@ neither arguments nor items are sought. \subsubsection{Summary} + \index{indentation!summary} Having considered all of the different types of code blocks, the functions of the fields given in \cref{lst:noAdditionalIndentGlobal,lst:indentRulesGlobal} should now make sense. + \index{specialBeginEnd!noAdditionalIndentGlobal} + \index{specialBeginEnd!indentRulesGlobal} \begin{widepage} \begin{minipage}{.47\linewidth} diff --git a/support/latexindent/documentation/subsubsec-special.tex b/support/latexindent/documentation/subsubsec-special.tex index 378c4d1413..7a97446165 100644 --- a/support/latexindent/documentation/subsubsec-special.tex +++ b/support/latexindent/documentation/subsubsec-special.tex @@ -7,6 +7,8 @@ `scalar' form for these type of code blocks, although the `field' form would work, assuming that \texttt{body} was specified. Examples are shown in \cref{lst:displayMath-noAdd,lst:displayMath-indent-rules}. + \index{specialBeginEnd!noAdditionalIndent} + \index{specialBeginEnd!indentRules example} \begin{minipage}{.49\textwidth} \cmhlistingsfromfile[style=yaml-LST]*{demonstrations/displayMath-noAdd.yaml}[width=.9\linewidth,before=\centering,yaml-TCB]{\texttt{displayMath-noAdd.yaml}}{lst:displayMath-noAdd} @@ -17,6 +19,7 @@ \end{minipage} After running the following commands, + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl special1.tex -local displayMath-noAdd.yaml latexindent.pl special1.tex -l displayMath-indent-rules.yaml @@ -46,6 +49,7 @@ latexindent.pl special1.tex -l displayMath-indent-rules.yaml \end{minipage} Upon running the following commands + \index{switches!-l demonstration} \begin{commandshell} latexindent.pl special1.tex -local special-noAdd-glob.yaml latexindent.pl special1.tex -l special-indent-rules-global.yaml diff --git a/support/latexindent/documentation/title.tex b/support/latexindent/documentation/title.tex index 444213847f..724ebd1d20 100644 --- a/support/latexindent/documentation/title.tex +++ b/support/latexindent/documentation/title.tex @@ -8,7 +8,7 @@ sharp corners, enhanced, overlay={\node[anchor=north east,outer sep=2pt] at ([xshift=3cm,yshift=4mm]frame.north east) {\includegraphics[width=3cm]{logo}}; }] - \centering\ttfamily\bfseries latexindent.pl\\[1cm] Version 3.8.3 + \centering\ttfamily\bfseries latexindent.pl\\[1cm] Version 3.9 \end{tcolorbox} } \author{Chris Hughes \thanks{and contributors! diff --git a/support/latexindent/latexindent-module-installer.pl b/support/latexindent/latexindent-module-installer.pl index e45fdcbe73..786c37b641 100755 --- a/support/latexindent/latexindent-module-installer.pl +++ b/support/latexindent/latexindent-module-installer.pl @@ -20,7 +20,7 @@ use warnings; print ("============\nlatexindent.pl module installer\n============\n"); print ("Would you like to run the following commands?\n"); -my @modulesToInstall = ("cpanm YAML::Tiny","cpanm File::HomeDir","cpanm Unicode::GCString","cpanm Log::Log4perl","cpanm Log::Dispatch"); +my @modulesToInstall = ("cpanm YAML::Tiny","cpanm File::HomeDir","cpanm Unicode::GCString"); foreach (@modulesToInstall) { print $_,"\n"; } diff --git a/support/latexindent/latexindent.pl b/support/latexindent/latexindent.pl index f38d6c3fb5..77ae1fb829 100755 --- a/support/latexindent/latexindent.pl +++ b/support/latexindent/latexindent.pl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# latexindent.pl, version 3.8.3, 2020-11-06 +# latexindent.pl, version 3.9, 2021-03-14 # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -64,15 +64,6 @@ if($switches{readLocalSettings} and scalar(@ARGV) < 1) { $switches{readLocalSettings} = ''; } -# default value of readLocalSettings -# -# latexindent -l myfile.tex -# -# means that we wish to use localSettings.yaml -if(defined($switches{readLocalSettings}) and ($switches{readLocalSettings} eq '')){ - $switches{readLocalSettings} = 'localSettings.yaml'; -} - # allow STDIN as input, if a filename is not present unshift( @ARGV, '-' ) unless @ARGV; diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb index 92a27205e0..79911c603c 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/2020 -depend revision/58319 +depend revision/58339 name 00texlive.image category TLCore -revision 58302 +revision 58334 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 @@ -2340,7 +2340,6 @@ runfiles size=13854 tlpkg/tlpsrc/latex-notes-zh-cn.tlpsrc tlpkg/tlpsrc/latex-papersize.tlpsrc tlpkg/tlpsrc/latex-refsheet.tlpsrc - tlpkg/tlpsrc/latex-tds.tlpsrc tlpkg/tlpsrc/latex-tools-dev.tlpsrc tlpkg/tlpsrc/latex-uni8.tlpsrc tlpkg/tlpsrc/latex-veryshortguide.tlpsrc @@ -2855,6 +2854,7 @@ runfiles size=13854 tlpkg/tlpsrc/nimsticks.tlpsrc tlpkg/tlpsrc/njurepo.tlpsrc tlpkg/tlpsrc/nkarta.tlpsrc + tlpkg/tlpsrc/nl-interval.tlpsrc tlpkg/tlpsrc/nlctdoc.tlpsrc tlpkg/tlpsrc/nmbib.tlpsrc tlpkg/tlpsrc/nnext.tlpsrc @@ -4351,7 +4351,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd name 00texlive.installer category TLCore -revision 58271 +revision 58321 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 @@ -68482,7 +68482,7 @@ containerchecksum bd76efc0bdec2bca391cb687a379c53f08beb55bd3ec8d781743296999cb5e name collection-pictures category Collection -revision 58034 +revision 58334 shortdesc Graphics, pictures, diagrams relocated 1 longdesc Including TikZ, pict, etc., but MetaPost and PStricks are @@ -68574,6 +68574,7 @@ depend miniplot depend mkpic depend modiagram depend neuralnetwork +depend nl-interval depend numericplots depend pb-diagram depend penrose @@ -68695,8 +68696,8 @@ depend venndiagram depend visualpstricks depend xpicture depend xypic -containersize 1416 -containerchecksum 03ce3f24d999b8e397d1248ed112552d4df823c9fbc4c1a71abf7901564d5a32d3e82734f483f5207099742e8337edfd1c9645b7b7675d5f8a3c4853889f101c +containersize 1424 +containerchecksum 369968160b4ca2fd70909ad477e371a55b0d75a1f0e8c616824699037cbf9d48df28a2ce5f99a5edc672a36418e4aa4bbc1fc91e046d5bd8e84886eefc7121f5 name collection-plaingeneric category Collection @@ -97529,15 +97530,15 @@ catalogue-topics notes editorial name easybook category Package -revision 58307 +revision 58332 shortdesc Typeset Chinese books or notes relocated 1 longdesc Easybook is a minimalist style template based on the ctexbook longdesc book document class. -containersize 10096 -containerchecksum 2fb5f7c9d154f68008449af23f30776dc70e600f0035a3910e5eb8735633834eb188aaef3ad1a25eea26c78c206710da7fe11794732783b286a9d14f54cd9a39 -doccontainersize 512688 -doccontainerchecksum 97bcf131f0f89544b3b5c96096b1ced3679fbecea58f4198fedd35af0a4746f80a15ba3b0def71137d72d8feb55a3a3690a916c460ba937bad7027f1b07b82dc +containersize 10116 +containerchecksum 7a7c6c903372fe344fc66ebbd9bc1c2c05c8e6cebfceed22470703c2a89e6eb28d74006d23f846a283b59df8d6f38f3d5d0380d052f3fbc6ace82ec9d08c8337 +doccontainersize 515024 +doccontainerchecksum c5fa33e99b51436ed78e08bea105e75cccc7e081925e93078fd1d8c78ccb44d699e9fa10d9b6cb5439f38a3919a199c14fcab08f10ff14265ba0de9a1812aa1e docfiles size=145 RELOC/doc/latex/easybook/README.md details="Readme" RELOC/doc/latex/easybook/appendix.tex @@ -97556,7 +97557,7 @@ catalogue-contact-repository https://gitee.com/texl3/easybook catalogue-ctan /macros/latex/contrib/easybook catalogue-license cc-by-4 catalogue-topics book-pub class chinese expl3 -catalogue-version 1.23o +catalogue-version 1.23p name easyfig category Package @@ -151003,22 +151004,22 @@ catalogue-topics japanese font-cjk class std-conform name jlreq-deluxe category Package -revision 57363 +revision 58333 shortdesc Multi-weight Japanese font support for the jlreq class relocated 1 longdesc This package provides multi-weight Japanese font support for longdesc the jlreq class. -containersize 286924 -containerchecksum 6679d38da793fae7f65a8647a9de71c9ed634d3825c074726c5337fc2f4416e949cbaf8b52252d116512b2fab052a9ca4bbe944d03a256c9e6c2591bdf1dfa67 -doccontainersize 62796 -doccontainerchecksum 40553cd6ba7ebcc6ce389e7067f843e71c2f8cc5f9baed30e5aaec1989f54dce66df11eca8eb7cd6b4cc5b44c0470f60f6ca36d1e49fb16de85c0e4b292ea2d3 -docfiles size=19 +containersize 22512 +containerchecksum 4118e748dbe0bf5d1c2318167af7639c044984ca60d7261ad24ae86ccc5aa90e50c5408cf7b4a6e551d593ab5a560bce477e73878e8b41d4fb95988615e74e23 +doccontainersize 66024 +doccontainerchecksum 1255f2b395652120aa516fe8a0b5bab21035b2cb991360ae2bfb868e805250561a26860e65aa38e18810adfffb0caf53f35295b14ea7bfaecedbc71902cdceae +docfiles size=20 RELOC/doc/platex/jlreq-deluxe/LICENSE RELOC/doc/platex/jlreq-deluxe/README-ja.md details="Readme (Japanese)" RELOC/doc/platex/jlreq-deluxe/README.md details="Readme (English)" RELOC/doc/platex/jlreq-deluxe/jlreq-deluxe.pdf details="Package documentation" language="ja" RELOC/doc/platex/jlreq-deluxe/jlreq-deluxe.tex -runfiles size=95201 +runfiles size=1177 RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--expgothb-h.tfm RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--expgothb-v.tfm RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--expgothbn-h.tfm @@ -151075,6 +151076,20 @@ runfiles size=95201 RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--nmlminr-v.tfm RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--nmlminrn-h.tfm RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--nmlminrn-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--rubygothb-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--rubygothb-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--rubygotheb-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--rubygotheb-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--rubygothr-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--rubygothr-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--rubymgothr-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--rubymgothr-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--rubyminb-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--rubyminb-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--rubyminl-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--rubyminl-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--rubyminr-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--rubyminr-v.tfm RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--upexpgothb-h.tfm RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--upexpgothb-v.tfm RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--upexpgothbn-h.tfm @@ -151131,6 +151146,20 @@ runfiles size=95201 RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--upnmlminr-v.tfm RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--upnmlminrn-h.tfm RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--upnmlminrn-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--uprubygothb-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--uprubygothb-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--uprubygotheb-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--uprubygotheb-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--uprubygothr-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--uprubygothr-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--uprubymgothr-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--uprubymgothr-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--uprubyminb-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--uprubyminb-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--uprubyminl-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--uprubyminl-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--uprubyminr-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bjlreq--uprubyminr-v.tfm RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--expgothb-h.tfm RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--expgothb-v.tfm RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--expgothbn-h.tfm @@ -151187,6 +151216,20 @@ runfiles size=95201 RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--nmlminr-v.tfm RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--nmlminrn-h.tfm RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--nmlminrn-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--rubygothb-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--rubygothb-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--rubygotheb-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--rubygotheb-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--rubygothr-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--rubygothr-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--rubymgothr-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--rubymgothr-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--rubyminb-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--rubyminb-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--rubyminl-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--rubyminl-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--rubyminr-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--rubyminr-v.tfm RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--upexpgothb-h.tfm RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--upexpgothb-v.tfm RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--upexpgothbn-h.tfm @@ -151243,6 +151286,20 @@ runfiles size=95201 RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--upnmlminr-v.tfm RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--upnmlminrn-h.tfm RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--upnmlminrn-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--uprubygothb-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--uprubygothb-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--uprubygotheb-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--uprubygotheb-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--uprubygothr-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--uprubygothr-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--uprubymgothr-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--uprubymgothr-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--uprubyminb-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--uprubyminb-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--uprubyminl-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--uprubyminl-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--uprubyminr-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/bzjlreq--uprubyminr-v.tfm RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--expgothb-h.tfm RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--expgothb-v.tfm RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--expgothbn-h.tfm @@ -151299,6 +151356,20 @@ runfiles size=95201 RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--nmlminr-v.tfm RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--nmlminrn-h.tfm RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--nmlminrn-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--rubygothb-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--rubygothb-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--rubygotheb-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--rubygotheb-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--rubygothr-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--rubygothr-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--rubymgothr-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--rubymgothr-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--rubyminb-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--rubyminb-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--rubyminl-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--rubyminl-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--rubyminr-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--rubyminr-v.tfm RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--upexpgothb-h.tfm RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--upexpgothb-v.tfm RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--upexpgothbn-h.tfm @@ -151355,6 +151426,20 @@ runfiles size=95201 RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--upnmlminr-v.tfm RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--upnmlminrn-h.tfm RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--upnmlminrn-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--uprubygothb-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--uprubygothb-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--uprubygotheb-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--uprubygotheb-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--uprubygothr-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--uprubygothr-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--uprubymgothr-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--uprubymgothr-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--uprubyminb-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--uprubyminb-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--uprubyminl-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--uprubyminl-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--uprubyminr-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/jlreq--uprubyminr-v.tfm RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--expgothb-h.tfm RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--expgothb-v.tfm RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--expgothbn-h.tfm @@ -151411,6 +151496,20 @@ runfiles size=95201 RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--nmlminr-v.tfm RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--nmlminrn-h.tfm RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--nmlminrn-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--rubygothb-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--rubygothb-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--rubygotheb-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--rubygotheb-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--rubygothr-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--rubygothr-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--rubymgothr-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--rubymgothr-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--rubyminb-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--rubyminb-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--rubyminl-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--rubyminl-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--rubyminr-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--rubyminr-v.tfm RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--upexpgothb-h.tfm RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--upexpgothb-v.tfm RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--upexpgothbn-h.tfm @@ -151467,6 +151566,20 @@ runfiles size=95201 RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--upnmlminr-v.tfm RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--upnmlminrn-h.tfm RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--upnmlminrn-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--uprubygothb-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--uprubygothb-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--uprubygotheb-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--uprubygotheb-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--uprubygothr-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--uprubygothr-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--uprubymgothr-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--uprubymgothr-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--uprubyminb-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--uprubyminb-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--uprubyminl-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--uprubyminl-v.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--uprubyminr-h.tfm + RELOC/fonts/tfm/public/jlreq-deluxe/zjlreq--uprubyminr-v.tfm RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--expgothb-h.vf RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--expgothb-v.vf RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--expgothbn-h.vf @@ -151523,6 +151636,20 @@ runfiles size=95201 RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--nmlminr-v.vf RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--nmlminrn-h.vf RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--nmlminrn-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--rubygothb-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--rubygothb-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--rubygotheb-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--rubygotheb-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--rubygothr-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--rubygothr-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--rubymgothr-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--rubymgothr-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--rubyminb-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--rubyminb-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--rubyminl-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--rubyminl-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--rubyminr-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--rubyminr-v.vf RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--upexpgothb-h.vf RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--upexpgothb-v.vf RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--upexpgothbn-h.vf @@ -151579,6 +151706,20 @@ runfiles size=95201 RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--upnmlminr-v.vf RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--upnmlminrn-h.vf RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--upnmlminrn-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--uprubygothb-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--uprubygothb-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--uprubygotheb-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--uprubygotheb-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--uprubygothr-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--uprubygothr-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--uprubymgothr-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--uprubymgothr-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--uprubyminb-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--uprubyminb-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--uprubyminl-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--uprubyminl-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--uprubyminr-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/bjlreq--uprubyminr-v.vf RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--expgothb-h.vf RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--expgothb-v.vf RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--expgothbn-h.vf @@ -151635,6 +151776,20 @@ runfiles size=95201 RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--nmlminr-v.vf RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--nmlminrn-h.vf RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--nmlminrn-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--rubygothb-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--rubygothb-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--rubygotheb-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--rubygotheb-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--rubygothr-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--rubygothr-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--rubymgothr-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--rubymgothr-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--rubyminb-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--rubyminb-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--rubyminl-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--rubyminl-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--rubyminr-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--rubyminr-v.vf RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--upexpgothb-h.vf RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--upexpgothb-v.vf RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--upexpgothbn-h.vf @@ -151691,6 +151846,20 @@ runfiles size=95201 RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--upnmlminr-v.vf RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--upnmlminrn-h.vf RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--upnmlminrn-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--uprubygothb-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--uprubygothb-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--uprubygotheb-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--uprubygotheb-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--uprubygothr-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--uprubygothr-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--uprubymgothr-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--uprubymgothr-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--uprubyminb-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--uprubyminb-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--uprubyminl-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--uprubyminl-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--uprubyminr-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/bzjlreq--uprubyminr-v.vf RELOC/fonts/vf/public/jlreq-deluxe/jlreq--expgothb-h.vf RELOC/fonts/vf/public/jlreq-deluxe/jlreq--expgothb-v.vf RELOC/fonts/vf/public/jlreq-deluxe/jlreq--expgothbn-h.vf @@ -151747,6 +151916,20 @@ runfiles size=95201 RELOC/fonts/vf/public/jlreq-deluxe/jlreq--nmlminr-v.vf RELOC/fonts/vf/public/jlreq-deluxe/jlreq--nmlminrn-h.vf RELOC/fonts/vf/public/jlreq-deluxe/jlreq--nmlminrn-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/jlreq--rubygothb-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/jlreq--rubygothb-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/jlreq--rubygotheb-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/jlreq--rubygotheb-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/jlreq--rubygothr-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/jlreq--rubygothr-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/jlreq--rubymgothr-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/jlreq--rubymgothr-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/jlreq--rubyminb-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/jlreq--rubyminb-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/jlreq--rubyminl-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/jlreq--rubyminl-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/jlreq--rubyminr-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/jlreq--rubyminr-v.vf RELOC/fonts/vf/public/jlreq-deluxe/jlreq--upexpgothb-h.vf RELOC/fonts/vf/public/jlreq-deluxe/jlreq--upexpgothb-v.vf RELOC/fonts/vf/public/jlreq-deluxe/jlreq--upexpgothbn-h.vf @@ -151803,6 +151986,20 @@ runfiles size=95201 RELOC/fonts/vf/public/jlreq-deluxe/jlreq--upnmlminr-v.vf RELOC/fonts/vf/public/jlreq-deluxe/jlreq--upnmlminrn-h.vf RELOC/fonts/vf/public/jlreq-deluxe/jlreq--upnmlminrn-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/jlreq--uprubygothb-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/jlreq--uprubygothb-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/jlreq--uprubygotheb-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/jlreq--uprubygotheb-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/jlreq--uprubygothr-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/jlreq--uprubygothr-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/jlreq--uprubymgothr-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/jlreq--uprubymgothr-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/jlreq--uprubyminb-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/jlreq--uprubyminb-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/jlreq--uprubyminl-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/jlreq--uprubyminl-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/jlreq--uprubyminr-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/jlreq--uprubyminr-v.vf RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--expgothb-h.vf RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--expgothb-v.vf RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--expgothbn-h.vf @@ -151859,6 +152056,20 @@ runfiles size=95201 RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--nmlminr-v.vf RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--nmlminrn-h.vf RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--nmlminrn-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--rubygothb-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--rubygothb-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--rubygotheb-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--rubygotheb-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--rubygothr-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--rubygothr-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--rubymgothr-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--rubymgothr-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--rubyminb-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--rubyminb-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--rubyminl-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--rubyminl-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--rubyminr-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--rubyminr-v.vf RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--upexpgothb-h.vf RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--upexpgothb-v.vf RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--upexpgothbn-h.vf @@ -151915,13 +152126,27 @@ runfiles size=95201 RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--upnmlminr-v.vf RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--upnmlminrn-h.vf RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--upnmlminrn-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--uprubygothb-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--uprubygothb-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--uprubygotheb-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--uprubygotheb-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--uprubygothr-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--uprubygothr-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--uprubymgothr-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--uprubymgothr-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--uprubyminb-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--uprubyminb-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--uprubyminl-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--uprubyminl-v.vf + RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--uprubyminr-h.vf + RELOC/fonts/vf/public/jlreq-deluxe/zjlreq--uprubyminr-v.vf RELOC/tex/platex/jlreq-deluxe/jlreq-deluxe.sty catalogue-also jlreq catalogue-contact-repository https://github.com/h20y6m/jlreq-deluxe catalogue-ctan /language/japanese/jlreq-deluxe catalogue-license mit catalogue-topics font-cjk font-use japanese expl3 -catalogue-version 0.3.2 +catalogue-version 0.4.0 name jmb category Package @@ -163725,84 +163950,6 @@ catalogue-license lppl1.3c catalogue-topics tut-cheat catalogue-version 1.2 -name latex-tds -category Package -revision 55777 -shortdesc A structured copy of the LaTeX distribution -relocated 1 -longdesc This bundle provides a set of zip file modules containing -longdesc TDS-compliant trees for items of the LaTeX distribution (both -longdesc the base system and required packages), together with -longdesc 'user-friendly' documentation (PDF files with navigation -longdesc support using bookmarks and links). A further module (knuth) -longdesc performs the same service for Knuth's software distribution. -longdesc This bundle has been moved to the /obsolete branch of the -longdesc archive as of April 2020 because the LaTeX files are now very -longdesc much out of date. -containersize 644 -containerchecksum c519ca499399845e26a0ce86452b50283df3bceabc1e35186fa14253e682d6b8f9fbe7ba6857f478d765ee8a8c90fd5d4c717b8e31bb0e84df4d8f4f8cdbf53e -doccontainersize 84092 -doccontainerchecksum 5d1f3f4e0d9491f8272dfa7a675dce11b3b27230bba10373b63906468012fcd1da17d1793ca57e8ae4ad51ffffa2799c769e70befd84b12b20899bd4ac557741 -docfiles size=50 - RELOC/doc/latex/latex-tds/README details="Readme" - RELOC/doc/latex/latex-tds/README.html - RELOC/doc/latex/latex-tds/README.pdf -srccontainersize 128296 -srccontainerchecksum b99ef070ff70c055aaa13c12e04f1c26fbfda4b663ab98b03b053de76e4ffc80afcaabc7b53633e38a7ad67fa650ef9ede55fd1c924fcbff31c17cf5edfbd73a -srcfiles size=112 - RELOC/source/latex/latex-tds/README-docinfo.html - RELOC/source/latex/latex-tds/README.asciidoc - RELOC/source/latex/latex-tds/build.pl - RELOC/source/latex/latex-tds/lib/adjust_checksum.pl - RELOC/source/latex/latex-tds/lib/ziptimetree.pl - RELOC/source/latex/latex-tds/license/adjust_checksum/lppl.txt - RELOC/source/latex/latex-tds/license/latex-tds/lppl.txt - RELOC/source/latex/latex-tds/license/ziptimetree/lgpl.txt - RELOC/source/latex/latex-tds/patch/amsbooka.zip - RELOC/source/latex/latex-tds/patch/amsclass.dtx.diff - RELOC/source/latex/latex-tds/patch/amsfndoc.def.diff - RELOC/source/latex/latex-tds/patch/amsfndoc.tex.diff - RELOC/source/latex/latex-tds/patch/amsldoc.tex.diff - RELOC/source/latex/latex-tds/patch/changes.tex.diff - RELOC/source/latex/latex-tds/patch/encguide.tex.diff - RELOC/source/latex/latex-tds/patch/errorlog.tex.diff - RELOC/source/latex/latex-tds/patch/logmac.tex.diff - RELOC/source/latex/latex-tds/patch/source2e.tex.diff - RELOC/source/latex/latex-tds/patch/tlc2.err.diff - RELOC/source/latex/latex-tds/patch/trapman.tex.diff - RELOC/source/latex/latex-tds/patch/tripman.tex.diff - RELOC/source/latex/latex-tds/patch/utf8ienc.dtx.diff - RELOC/source/latex/latex-tds/patch/webman.tex.diff - RELOC/source/latex/latex-tds/tex/ams.drv - RELOC/source/latex/latex-tds/tex/doc_lppl.tex - RELOC/source/latex/latex-tds/tex/docstrip.cfg - RELOC/source/latex/latex-tds/tex/errata.all - RELOC/source/latex/latex-tds/tex/errata.cfg - RELOC/source/latex/latex-tds/tex/errata.drv - RELOC/source/latex/latex-tds/tex/errorlog.drv - RELOC/source/latex/latex-tds/tex/etex_man.drv - RELOC/source/latex/latex-tds/tex/fix-expl3-lua.ini - RELOC/source/latex/latex-tds/tex/hyperref.cfg - RELOC/source/latex/latex-tds/tex/knuth-outline.tex - RELOC/source/latex/latex-tds/tex/knuth.drv - RELOC/source/latex/latex-tds/tex/ltnews.cfg - RELOC/source/latex/latex-tds/tex/ltnews.tex - RELOC/source/latex/latex-tds/tex/ltugboat.cfg - RELOC/source/latex/latex-tds/tex/ltxcheck.drv - RELOC/source/latex/latex-tds/tex/ltxdoc.cfg - RELOC/source/latex/latex-tds/tex/ltxguide.cfg - RELOC/source/latex/latex-tds/tex/lualatex-tds.ini - RELOC/source/latex/latex-tds/tex/lualatex-tds2.ini - RELOC/source/latex/latex-tds/tex/manual.cfg - RELOC/source/latex/latex-tds/tex/pdflatex-tds.ini - RELOC/source/latex/latex-tds/tex/psnfss2e.drv - RELOC/source/latex/latex-tds/tex/tdsguide.cfg - RELOC/source/latex/latex-tds/tex/tools-overview.cls - RELOC/source/latex/latex-tds/tex/tools.tex -catalogue-ctan /obsolete/macros/latex/contrib/latex-tds -catalogue-license lppl1.3 -catalogue-topics obsolete - name latex-tools-dev category Package revision 57998 @@ -212507,6 +212654,29 @@ catalogue-license pd catalogue-topics font font-mf font-symbol catalogue-version 0.2 +name nl-interval +category Package +revision 58334 +shortdesc Represent intervals on the number line +relocated 1 +longdesc This package provides macros to simplify the process of +longdesc representing intervals on the number line. It depends on +longdesc tkz-fct, ifthen, and xparse. +containersize 1592 +containerchecksum af7a4a363f4fc78dce09df56883dba94b6ac71df3c1168f2c1a618ad4c2e65ce247ae90c0547b4f99ab17c0894a0e701c679b1d91557eeff635d9e6c623cc0fc +doccontainersize 63436 +doccontainerchecksum 7b47b4090314036633e9e66c2bd9ce5096f9926a677fe26f3143bcde875a0c0897aa445f53f612d449a3fe98f1f49c8aee345941ad0e00287e60992bb1e0ca35 +docfiles size=24 + RELOC/doc/latex/nl-interval/README.txt details="Readme" + RELOC/doc/latex/nl-interval/nl-interval.pdf details="Package documentation" + RELOC/doc/latex/nl-interval/nl-interval.tex +runfiles size=7 + RELOC/tex/latex/nl-interval/nl-interval.sty +catalogue-ctan /graphics/pgf/contrib/nl-interval +catalogue-license lppl1.3c +catalogue-topics maths pgf-tikz +catalogue-version 1.0 + name nlctdoc category Package revision 53768 @@ -296777,15 +296947,15 @@ docfiles size=591 name texlive-docindex category TLCore -revision 58288 +revision 58321 shortdesc top-level TeX Live doc.html, etc. longdesc These files are regenerated as needed, which is often, so we longdesc make them a separate package. See the tl-update-auto script for longdesc the process. containersize 388 -containerchecksum d245e9d1362aef76c4baab7f395ad68364fb61f874bb3827b58b95c60c40cfb469262c9bd6bdfe6e4158230f42adfb509f9b0a8e886645c1abc2725ae635eb05 +containerchecksum ae6525ba29b26a3a9a99df243da4d5a9f267fc12bb25963b6e739f39f57c1b086025f8c9e46073ca9a963ca412768a35a07fd280aa78f391ed7cdf0c559628ab doccontainersize 173616 -doccontainerchecksum 398af6d7deb0c842fc84f42b798072f6bb226b0626e8366bb0acef1c4534ec23bf9f8f0bf5f9ce885ddda379daf3b6fb7bb3ceb008cb5c315d7555a113da1128 +doccontainerchecksum df820511ef43cda0f93e3a3f7ddd79628b194d1512ed22cb3e0b2f124ad3428ba8054c6692a5061c07108a0b72560ddb2c1dd4c00f249ffa58de34b4c698b461 docfiles size=345 doc.html @@ -297007,7 +297177,7 @@ docfiles size=368 name texlive-scripts category TLCore -revision 58272 +revision 58321 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. @@ -297015,10 +297185,10 @@ depend texlive-scripts.ARCH depend texlive.infra execute addMap mathpple.map postaction shortcut type=menu name="TeX Live command-line" cmd=TEXDIR/tlpkg/installer/tl-cmd.bat -containersize 132316 -containerchecksum 3b0826554a65749e14a5229bc4bfb906556e586635863bdcbeb2e6fcb584ae083cddf1c68236424e52948ab19cf75f75d3e259036e9f2f0a376fd2b813f83de7 +containersize 132288 +containerchecksum 5f354656af964eb667603034018b2e8531b27feced57297f255ead096b29c3944340c5a007a1ee81395957ec5f7d876daa7f64acda561dbb8a81f8399a5f7e67 doccontainersize 218848 -doccontainerchecksum 885b5a4bf4614f4840a9ba0721746485601692d2fa5696b6ca10c0f126496f0c09f3ad4d2fcb7ff2c38982e9565cee1cb7edaa8b2b03c5844a2b85071fb1fa4b +doccontainerchecksum d84f6b2375f6b00ba87fdd181bcb445f7af9da0eb6e8af125bde88c20582492bf7f57cd92c6999729b0c8270a68b019ce64878d0886e1193e5a35904a1e01fbd docfiles size=141 texmf-dist/doc/man/man1/fmtutil-sys.1 texmf-dist/doc/man/man1/fmtutil-sys.man1.pdf diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 index 5441088f58..be0955c3f9 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 @@ -1 +1 @@ -e3432a4e0ac63977229dde7bbd4672f4 texlive.tlpdb +f5b8e4cb0c38631821b6054c8644fefe texlive.tlpdb diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 index 2ae456dd5b..58987f62be 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 @@ -1 +1 @@ -64b7b4f3a87378e1da97846f97d97de8770943549f07b84fd7855e9229d4e8975c8ab7c0b994716c3148c3c91e9b0adca33f1fdbd4ee1d36d9b3e6bea30a99f5 texlive.tlpdb +5b5e436810d8941de19029013963aa965ca229ec491464e2bef4512af37ebd64722c1108575e1173d63b8b6be52df0138aa8e0b69803cb8dea634c5dfa45bdaa texlive.tlpdb diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc index 4fee03462f..4b085f88d9 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc @@ -1,10 +1,10 @@ -----BEGIN PGP SIGNATURE----- -iQEcBAEBCgAGBQJgTBpvAAoJEEzhh34ZQ4xw0hMH/0EAzXbGa5GfiVVPGf/tiLJ/ -BiPbkGoaBkwfEBSpn3uf2mtAnfP++VqM/DauZG2wcq0l60faKBci6egdIfCW4Rtb -/F7pNO5GDcs5xb2QLlOtINhVEK8V03MPiCQi/lezg3755cNw2T3tsGKmxTpqlF5Y -vvqn5n0TqzuJbBD7v3KFZrPNraWjGDXv6bkHCeNk1E6Pu1BGU0O5IIsTsohEZFJw -plBaFfEOyOX5AIWpXKeBnQuEZcD/RpIIy54rgwvrdIX6L+70xnrHnLEoe7bpzKy3 -qp8A5B3OhSsLwCUKSQUIKhYw2Akr9MJ0vQ8WuSH2IJCN5oIZTiUnozMrE6l3bmg= -=YTHd +iQEcBAEBCgAGBQJgTWwSAAoJEEzhh34ZQ4xwTZYIAIaXVjIqVSR6ic6PA8Tw08vF +COijvDB4LxTpyuDxihJu3/srgD7Q5YfFj4f7vrOaOEcWhMp+E0+mZzok5Br6pr3g +lNhDVKSkbnadCZf6PEn17e+DwzD1oX25lUQTJotyU3kYtYgkBqsncZuk2RBd/ofB +iqwHhyFzHqk/MDxrEiXZbzVrIROf/wSJgboHcZFLfnlyd9IKqi2XiyfXVLisd+ot ++P7lrmhzvgrsXVVLoJpmws/a6LondU412VVIthLn/1kPt7ahhEOCJj6878W79Gzx +fRvpFB89hAqEfXv8PkrWE+lE4Z0rM9pFfApCn5kpXTOyKdob8aNBKr8xu6/sD2I= +=FQdi -----END PGP SIGNATURE----- diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz Binary files differindex 2489cf0c03..b270f07767 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz diff --git a/systems/win32/miktex/tm/packages/next/pr.ini b/systems/win32/miktex/tm/packages/next/pr.ini index 7a9730d62d..8661820a5b 100644 --- a/systems/win32/miktex/tm/packages/next/pr.ini +++ b/systems/win32/miktex/tm/packages/next/pr.ini @@ -1,13 +1,13 @@ [repository]
-date=1615670360
+date=1615756522
lastupd=miktex-arctrl-bin-2.9 miktex-arctrl-bin-x64-2.9 miktex-asymptote-bin-2.9 miktex-asymptote-bin-x64-2.9 miktex-autosp-bin-2.9 miktex-autosp-bin-x64-2.9 miktex-axohelp-bin-2.9 miktex-axohelp-bin-x64-2.9 miktex-bibarts-bin-2.9 miktex-bibarts-bin-x64-2.9 miktex-bibtex-bin-2.9 miktex-bibtex-bin-x64-2.9 miktex-bibtex8bit-bin-2.9 miktex-bibtex8bit-bin-x64-2.9 miktex-bzip2-bin-2.9 miktex-bzip2-bin-x64-2.9 miktex-cairo-bin-2.9 miktex-cairo-bin-x64-2.9 miktex-chktex-bin-2.9 miktex-chktex-bin-x64-2.9
-lstdigest=cb47ababfbfac9dbc3ad29b91b8ad449
+lstdigest=ecdd27a2e8cb276b1e683309955821f9
numpkg=4060
relstate=next
-version=7742
+version=7743
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: L10vYlSke9dB89rVQSymTzfKhtGqaGfMHNkLYlwgZQ/CpKGVCwgg6Md3qLetxQNXx2dlTr4lNenPBXXPDPNzOHqQGaz2E+J1dVKmSb6l1KUOKQi+Lj7StMktkllsZMmhF55zxHgl14DZRxKfYD9k/i7lDc4VBjoDwxtbwHe9FGH6m7FcEzQAjxAWWZe9h8+4hDI8tqT03YudA9bUq0AIClzLzkVlgfv4+/SBBrKvnMrVlWMCsG/fvXoYVbBwbdBHNXAAARbcdjet9glc6NSro5T7ziMz/pSM9Ps+AMv3/KWRy1CKa7j3iST1+tLhM8ihsmfywghDPfMIfrA6NBCWYg==
+;;;; signature/miktex: jhO8qbobjQ4nw5kXBvHX1NGyZzXOYCAsuIlkPrbZobtEh7fYB6KrdziI6wnRT73xsbSfvbh5YSHJQWGBVgPjBIY0Edf/vWMvLi766Jve3OW1KaO8ElSTzUtaCSGLiuU62bTvNa9rHvhcjS9MN3dszzSF/KfmzfnPwDyF5npK0mCLMUbKM7SfI+svEoDyFcnpnSTyEtPEVBiaIVsbt39KHkn14mQTVaWoYi8dXoVffUAx+a1izkqj2uue969C0N4aIkjhPU59yatq9cQTRES1tfaxj1ZO+F+UTZuaNnMWGoZR967iE1HBSY9uWojTwub9Aouh8vT6p4BU8raoOgILwQ==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini index f19b7d57ae..a9e1016498 100644 --- a/systems/win32/miktex/tm/packages/pr.ini +++ b/systems/win32/miktex/tm/packages/pr.ini @@ -1,13 +1,13 @@ [repository]
-date=1615669905
+date=1615756299
lastupd=miktex-arctrl-bin-2.9 miktex-arctrl-bin-x64-2.9 miktex-asymptote-bin-2.9 miktex-asymptote-bin-x64-2.9 miktex-autosp-bin-2.9 miktex-autosp-bin-x64-2.9 miktex-axohelp-bin-2.9 miktex-axohelp-bin-x64-2.9 miktex-bibarts-bin-2.9 miktex-bibarts-bin-x64-2.9 miktex-bibtex-bin-2.9 miktex-bibtex-bin-x64-2.9 miktex-bibtex8bit-bin-2.9 miktex-bibtex8bit-bin-x64-2.9 miktex-bzip2-bin-2.9 miktex-bzip2-bin-x64-2.9 miktex-cairo-bin-2.9 miktex-cairo-bin-x64-2.9 miktex-chktex-bin-2.9 miktex-chktex-bin-x64-2.9
-lstdigest=4d8d850051716ae100a218acfdd7ca92
+lstdigest=f4db0e6bd7ea688a1d30f848d88bca90
numpkg=4060
relstate=stable
-version=7742
+version=7743
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: lpk26+sLIbpojkvjDYgNABknLjmKYJ7UTxZhdwzRa9FzoentqPPZNrithy9L+FPPVovBNjU7G+IHeTOUQ7eZnJcezAVu+yXEgTN0e8LDjAM9Q5nxr3soUGYyAz15ys7g1ralAOEPlXCDNF8KTSpcGmj16cpWIWo6DqzTCf6xqZkAJpS7IY568u1WPCNDmUuQj9d0O9sL/7MJepHS+SUK5bzY5lh00ekHi32i/5u0T5DxRlm6GQ7450L/TT+aKt9PoF2cxk7yV6FDsD1ErB1uqbFs1UF82tLJNgIoQo4enZ389asHnpLJsuy3g/hR+iheXlIF0jgrkgtDhVl8zfzyxQ==
+;;;; signature/miktex: luGSZKjJYiULUXYXiKa/qO3k2Xu5O0xNPA5Bp/Y25UClKxYz1jN+yUs2Zf2aXZ7WLrVj9xD2/2rbrGP1twIE+p4OQmFv9I6Gnon+GMlhUsJqn5TUBHk7rhCwhTDKiT5ooIdHjN0bhLNltLH8zo2KxTCPoCd5Lc4farxxDf8wTLOKAMlg6CpQHxo7UqeiF24hs2m2D3RQWOZNr7oomCgHXWvVFo41f7RV1puIHU2UWjEZgYWAfXDaR3eEXNxeHvKlRDspwWx5ktfe48xg4B9gxICbAJjvbaetD5dMrLC8DEt0MvXrX3QS0yy7tTxCxUMJRF32cF14AB1CjHbu9OPCAw==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/systems/win32/w32tex/ChangeLog b/systems/win32/w32tex/ChangeLog index e4718dbcd9..02c3fc7b79 100644 --- a/systems/win32/w32tex/ChangeLog +++ b/systems/win32/w32tex/ChangeLog @@ -1,5 +1,39 @@ W32TeX (x86 & x64) ChangeLog +[2021/03/13] +(01) dvipdfm-w32.tar.xz + Remove -dDELAYSAFER in dvipdfmx.cfg for security. +(02) ltxpkgs.tar.xz + Update hvfloat and l3packages. +(03) luajittex-dev-w32.tar.xz + Update luajittex.dll and luajithbtex.dll. +(04) luajittex-exp-w32.tar.xz + Update luajittex.dll and luajithbtex.dll. +(05) luajittex-w32.tar.xz + Update luajittex.dll and luajithbtex.dll. +(06) luatex-dev-w32.tar.xz + Update luatex.dll and luahbtex.dll. +(07) luatex-exp-w32.tar.xz + Update luatex.dll and luahbtex.dll. +(08) luatex-w32.tar.xz + Update luatex.dll and luahbtex.dll. +(09) pstricks.tar.xz + Update pst-ode. +(10) web2c-lib.tar.xz + Update documents. +(11) win64/luajittex-dev-w64.tar.xz + Update luajittex.dll and luajithbtex.dll. +(12) win64/luajittex-exp-w64.tar.xz + Update luajittex.dll and luajithbtex.dll. +(13) win64/luajittex-w64.tar.xz + Update luajittex.dll and luajithbtex.dll. +(14) win64/luatex-dev-w64.tar.xz + Update luatex.dll and luahbtex.dll. +(15) win64/luatex-exp-w64.tar.xz + Update luatex.dll and luahbtex.dll. +(16) win64/luatex-w64.tar.xz + Update luatex.dll and luahbtex.dll. + [2021/03/12] (01) ltxpkgs.tar.xz Update newverbs. @@ -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: -2021-03-14-02-02 +2021-03-15-02-02 |
