diff options
| author | Norbert Preining <norbert@preining.info> | 2020-02-18 03:02:28 +0000 |
|---|---|---|
| committer | Norbert Preining <norbert@preining.info> | 2020-02-18 03:02:28 +0000 |
| commit | bb5325dae4202b519b7210a338651301e048998d (patch) | |
| tree | 4caa8d8c62275cb193df85d10f8f0e10bab587b3 | |
| parent | 67394fd2cfa6167f7e2316237629bec93851c1fb (diff) | |
CTAN sync 202002180302
216 files changed, 10537 insertions, 4738 deletions
diff --git a/FILES.byname b/FILES.byname index 96d09ce26e..39b1029c4a 100644 --- a/FILES.byname +++ b/FILES.byname @@ -4993,7 +4993,7 @@ 1990/10/02 | 812 | dviware/vutex/vaxvms.ins 1990/10/02 | 127576 | dviware/vutex/vutex.web 2014/04/13 | 4600576 | dviware/xdvi/22.87/xdvik-22.87.tar.gz -2020/02/16 | 164449 | FILES.last07days +2020/02/17 | 172338 | FILES.last07days 2018/06/27 | 99883 | fonts/academicons/academicons.pdf 2018/06/27 | 10779 | fonts/academicons/academicons.sty 2018/06/27 | 5774 | fonts/academicons/academicons.tex @@ -105693,228 +105693,236 @@ 2002/05/23 | 11813 | fonts/ps-type1/yfonts/yswab.afm 2002/05/23 | 44995 | fonts/ps-type1/yfonts/yswab.pfb 2006/11/13 | 156195 | fonts/ps-type1/yfonts.zip -2019/05/06 | 51250 | fonts/ptex-fontmaps/cmap/2004-H -2019/05/06 | 3031 | fonts/ptex-fontmaps/cmap/2004-V -2019/05/06 | 2115 | fonts/ptex-fontmaps/database/ptex-fontmaps-data.dat -2019/05/06 | 1217 | fonts/ptex-fontmaps/examples/otf-sample-04.tex -2019/05/06 | 1307 | fonts/ptex-fontmaps/examples/otf-sample.tex -2019/05/06 | 744 | fonts/ptex-fontmaps/examples/ptex-sample.tex -2019/05/06 | 776 | fonts/ptex-fontmaps/examples/series-compare.tex -2019/05/06 | 1455 | fonts/ptex-fontmaps/jis04cmap_exp/cmapdec.lua -2019/05/06 | 432598 | fonts/ptex-fontmaps/jis04cmap_exp/jis-h04-httk.pdf -2019/05/06 | 2382 | fonts/ptex-fontmaps/jis04cmap_exp/jis-h04-httk.tex -2019/05/06 | 70506 | fonts/ptex-fontmaps/jis04cmap_exp/jis-v04-vttk.pdf -2019/05/06 | 2463 | fonts/ptex-fontmaps/jis04cmap_exp/jis-v04-vttk.tex -2019/05/06 | 311904 | fonts/ptex-fontmaps/jis04cmap_exp/jisx0213-2004-8bit-std.txt -2019/05/06 | 146602 | fonts/ptex-fontmaps/jis04cmap_exp/JISX0213-2004-H -2019/05/06 | 3002 | fonts/ptex-fontmaps/jis04cmap_exp/JISX0213-2004-V -2019/05/06 | 21557 | fonts/ptex-fontmaps/jis04cmap_exp/mk_jis_to_aj16_cid.lua -2019/05/06 | 1630 | fonts/ptex-fontmaps/jis04cmap_exp/README -2019/05/06 | 406 | fonts/ptex-fontmaps/maps/adobe/otf-ko-adobe.map -2019/05/06 | 398 | fonts/ptex-fontmaps/maps/adobe/otf-sc-adobe.map -2019/05/06 | 402 | fonts/ptex-fontmaps/maps/adobe/otf-tc-adobe.map -2019/05/06 | 198 | fonts/ptex-fontmaps/maps/adobe/uptex-ko-adobe.map -2019/05/06 | 190 | fonts/ptex-fontmaps/maps/adobe/uptex-sc-adobe.map -2019/05/06 | 190 | fonts/ptex-fontmaps/maps/adobe/uptex-tc-adobe.map -2019/05/06 | 354 | fonts/ptex-fontmaps/maps/apple/otf-ko-apple.map -2019/05/06 | 162 | fonts/ptex-fontmaps/maps/apple/uptex-ko-apple.map -2019/05/06 | 506 | fonts/ptex-fontmaps/maps/arphic/otf-sc-arphic.map -2019/05/06 | 494 | fonts/ptex-fontmaps/maps/arphic/otf-tc-arphic.map -2019/05/06 | 234 | fonts/ptex-fontmaps/maps/arphic/uptex-sc-arphic.map -2019/05/06 | 226 | fonts/ptex-fontmaps/maps/arphic/uptex-tc-arphic.map -2019/05/06 | 462 | fonts/ptex-fontmaps/maps/baekmuk/otf-ko-baekmuk.map -2019/05/06 | 216 | fonts/ptex-fontmaps/maps/baekmuk/uptex-ko-baekmuk.map -2019/05/06 | 4661 | fonts/ptex-fontmaps/maps/bizud/otf-bizud.map -2019/05/06 | 2060 | fonts/ptex-fontmaps/maps/bizud/otf-up-bizud.map -2019/05/06 | 196 | fonts/ptex-fontmaps/maps/bizud/ptex-bizud.map -2019/05/06 | 645 | fonts/ptex-fontmaps/maps/bizud/uptex-bizud.map -2019/05/06 | 4411 | fonts/ptex-fontmaps/maps/canon/otf-canon.map -2019/05/06 | 1960 | fonts/ptex-fontmaps/maps/canon/otf-up-canon.map -2019/05/06 | 190 | fonts/ptex-fontmaps/maps/canon/ptex-canon.map -2019/05/06 | 630 | fonts/ptex-fontmaps/maps/canon/uptex-canon.map -2019/05/06 | 422 | fonts/ptex-fontmaps/maps/cjkunifonts/otf-sc-cjkunifonts.map -2019/05/06 | 426 | fonts/ptex-fontmaps/maps/cjkunifonts/otf-tc-cjkunifonts.map -2019/05/06 | 442 | fonts/ptex-fontmaps/maps/cjkunifonts-ttf/otf-sc-cjkunifonts-ttf.map -2019/05/06 | 446 | fonts/ptex-fontmaps/maps/cjkunifonts-ttf/otf-tc-cjkunifonts-ttf.map -2019/05/06 | 202 | fonts/ptex-fontmaps/maps/cjkunifonts-ttf/uptex-sc-cjkunifonts-ttf.map -2019/05/06 | 202 | fonts/ptex-fontmaps/maps/cjkunifonts-ttf/uptex-tc-cjkunifonts-ttf.map -2019/05/06 | 192 | fonts/ptex-fontmaps/maps/cjkunifonts/uptex-sc-cjkunifonts.map -2019/05/06 | 192 | fonts/ptex-fontmaps/maps/cjkunifonts/uptex-tc-cjkunifonts.map -2019/05/06 | 334 | fonts/ptex-fontmaps/maps/dynacomware/otf-tc-dynacomware.map -2019/05/06 | 146 | fonts/ptex-fontmaps/maps/dynacomware/uptex-tc-dynacomware.map -2019/05/06 | 382 | fonts/ptex-fontmaps/maps/fandol/otf-sc-fandol.map -2019/05/06 | 182 | fonts/ptex-fontmaps/maps/fandol/uptex-sc-fandol.map -2019/05/06 | 454 | fonts/ptex-fontmaps/maps/founder/otf-sc-founder.map -2019/05/06 | 208 | fonts/ptex-fontmaps/maps/founder/uptex-sc-founder.map -2019/05/06 | 3245 | fonts/ptex-fontmaps/maps/hiragino/otf-hiragino.map -2019/05/06 | 1344 | fonts/ptex-fontmaps/maps/hiragino/otf-up-hiragino.map -2019/05/06 | 3325 | fonts/ptex-fontmaps/maps/hiragino-pron/otf-hiragino-pron.map -2019/05/06 | 1372 | fonts/ptex-fontmaps/maps/hiragino-pron/otf-up-hiragino-pron.map -2019/05/06 | 124 | fonts/ptex-fontmaps/maps/hiragino-pron/ptex-hiragino-pron-04.map -2019/05/06 | 104 | fonts/ptex-fontmaps/maps/hiragino-pron/ptex-hiragino-pron.map -2019/05/06 | 447 | fonts/ptex-fontmaps/maps/hiragino-pron/uptex-hiragino-pron-04.map -2019/05/06 | 415 | fonts/ptex-fontmaps/maps/hiragino-pron/uptex-hiragino-pron.map -2019/05/06 | 120 | fonts/ptex-fontmaps/maps/hiragino/ptex-hiragino-04.map -2019/05/06 | 100 | fonts/ptex-fontmaps/maps/hiragino/ptex-hiragino.map -2019/05/06 | 437 | fonts/ptex-fontmaps/maps/hiragino/uptex-hiragino-04.map -2019/05/06 | 405 | fonts/ptex-fontmaps/maps/hiragino/uptex-hiragino.map -2019/05/06 | 3531 | fonts/ptex-fontmaps/maps/ipaex/otf-ipaex.map -2019/05/06 | 1608 | fonts/ptex-fontmaps/maps/ipaex/otf-up-ipaex.map -2019/05/06 | 138 | fonts/ptex-fontmaps/maps/ipaex/ptex-ipaex.map -2019/05/06 | 500 | fonts/ptex-fontmaps/maps/ipaex/uptex-ipaex.map -2019/05/06 | 3251 | fonts/ptex-fontmaps/maps/ipa/otf-ipa.map -2019/05/06 | 1496 | fonts/ptex-fontmaps/maps/ipa/otf-up-ipa.map -2019/05/06 | 122 | fonts/ptex-fontmaps/maps/ipa/ptex-ipa.map -2019/05/06 | 460 | fonts/ptex-fontmaps/maps/ipa/uptex-ipa.map -2019/05/06 | 2881 | fonts/ptex-fontmaps/maps/kozuka/otf-kozuka.map -2019/05/06 | 1376 | fonts/ptex-fontmaps/maps/kozuka/otf-up-kozuka.map -2019/05/06 | 2951 | fonts/ptex-fontmaps/maps/kozuka-pr6n/otf-kozuka-pr6n.map -2019/05/06 | 1404 | fonts/ptex-fontmaps/maps/kozuka-pr6n/otf-up-kozuka-pr6n.map -2019/05/06 | 134 | fonts/ptex-fontmaps/maps/kozuka-pr6n/ptex-kozuka-pr6n-04.map -2019/05/06 | 114 | fonts/ptex-fontmaps/maps/kozuka-pr6n/ptex-kozuka-pr6n.map -2019/05/06 | 472 | fonts/ptex-fontmaps/maps/kozuka-pr6n/uptex-kozuka-pr6n-04.map -2019/05/06 | 440 | fonts/ptex-fontmaps/maps/kozuka-pr6n/uptex-kozuka-pr6n.map -2019/05/06 | 3021 | fonts/ptex-fontmaps/maps/kozuka-pr6/otf-kozuka-pr6.map -2019/05/06 | 1432 | fonts/ptex-fontmaps/maps/kozuka-pr6/otf-up-kozuka-pr6.map -2019/05/06 | 138 | fonts/ptex-fontmaps/maps/kozuka-pr6/ptex-kozuka-pr6-04.map -2019/05/06 | 118 | fonts/ptex-fontmaps/maps/kozuka-pr6/ptex-kozuka-pr6.map -2019/05/06 | 482 | fonts/ptex-fontmaps/maps/kozuka-pr6/uptex-kozuka-pr6-04.map -2019/05/06 | 450 | fonts/ptex-fontmaps/maps/kozuka-pr6/uptex-kozuka-pr6.map -2019/05/06 | 130 | fonts/ptex-fontmaps/maps/kozuka/ptex-kozuka-04.map -2019/05/06 | 110 | fonts/ptex-fontmaps/maps/kozuka/ptex-kozuka.map -2019/05/06 | 462 | fonts/ptex-fontmaps/maps/kozuka/uptex-kozuka-04.map -2019/05/06 | 430 | fonts/ptex-fontmaps/maps/kozuka/uptex-kozuka.map -2019/05/06 | 4297 | fonts/ptex-fontmaps/maps/moga-mobo-ex/otf-moga-mobo-ex.map -2019/05/06 | 1920 | fonts/ptex-fontmaps/maps/moga-mobo-ex/otf-up-moga-mobo-ex.map -2019/05/06 | 202 | fonts/ptex-fontmaps/maps/moga-mobo-ex/ptex-moga-mobo-ex-04.map -2019/05/06 | 190 | fonts/ptex-fontmaps/maps/moga-mobo-ex/ptex-moga-mobo-ex.map -2019/05/06 | 642 | fonts/ptex-fontmaps/maps/moga-mobo-ex/uptex-moga-mobo-ex-04.map -2019/05/06 | 630 | fonts/ptex-fontmaps/maps/moga-mobo-ex/uptex-moga-mobo-ex.map -2019/05/06 | 4157 | fonts/ptex-fontmaps/maps/moga-mobo/otf-moga-mobo.map -2019/05/06 | 1864 | fonts/ptex-fontmaps/maps/moga-mobo/otf-up-moga-mobo.map -2019/05/06 | 194 | fonts/ptex-fontmaps/maps/moga-mobo/ptex-moga-mobo-04.map -2019/05/06 | 182 | fonts/ptex-fontmaps/maps/moga-mobo/ptex-moga-mobo.map -2019/05/06 | 622 | fonts/ptex-fontmaps/maps/moga-mobo/uptex-moga-mobo-04.map -2019/05/06 | 610 | fonts/ptex-fontmaps/maps/moga-mobo/uptex-moga-mobo.map -2019/05/06 | 5051 | fonts/ptex-fontmaps/maps/morisawa/otf-morisawa.map -2019/05/06 | 2244 | fonts/ptex-fontmaps/maps/morisawa/otf-up-morisawa.map -2019/05/06 | 5211 | fonts/ptex-fontmaps/maps/morisawa-pr6n/otf-morisawa-pr6n.map -2019/05/06 | 2308 | fonts/ptex-fontmaps/maps/morisawa-pr6n/otf-up-morisawa-pr6n.map -2019/05/06 | 258 | fonts/ptex-fontmaps/maps/morisawa-pr6n/ptex-morisawa-pr6n-04.map -2019/05/06 | 238 | fonts/ptex-fontmaps/maps/morisawa-pr6n/ptex-morisawa-pr6n.map -2019/05/06 | 782 | fonts/ptex-fontmaps/maps/morisawa-pr6n/uptex-morisawa-pr6n-04.map -2019/05/06 | 750 | fonts/ptex-fontmaps/maps/morisawa-pr6n/uptex-morisawa-pr6n.map -2019/05/06 | 250 | fonts/ptex-fontmaps/maps/morisawa/ptex-morisawa-04.map -2019/05/06 | 230 | fonts/ptex-fontmaps/maps/morisawa/ptex-morisawa.map -2019/05/06 | 762 | fonts/ptex-fontmaps/maps/morisawa/uptex-morisawa-04.map -2019/05/06 | 730 | fonts/ptex-fontmaps/maps/morisawa/uptex-morisawa.map -2019/05/06 | 2551 | fonts/ptex-fontmaps/maps/ms-osx/otf-ms-osx.map -2019/05/06 | 406 | fonts/ptex-fontmaps/maps/ms-osx/otf-sc-ms-osx.map -2019/05/06 | 1216 | fonts/ptex-fontmaps/maps/ms-osx/otf-up-ms-osx.map -2019/05/06 | 82 | fonts/ptex-fontmaps/maps/ms-osx/ptex-ms-osx.map -2019/05/06 | 360 | fonts/ptex-fontmaps/maps/ms-osx/uptex-ms-osx.map -2019/05/06 | 184 | fonts/ptex-fontmaps/maps/ms-osx/uptex-sc-ms-osx.map -2019/05/06 | 446 | fonts/ptex-fontmaps/maps/ms/otf-ko-ms.map -2019/05/06 | 3741 | fonts/ptex-fontmaps/maps/ms/otf-ms.map -2019/05/06 | 418 | fonts/ptex-fontmaps/maps/ms/otf-sc-ms.map -2019/05/06 | 494 | fonts/ptex-fontmaps/maps/ms/otf-tc-ms.map -2019/05/06 | 1692 | fonts/ptex-fontmaps/maps/ms/otf-up-ms.map -2019/05/06 | 150 | fonts/ptex-fontmaps/maps/ms/ptex-ms.map -2019/05/06 | 208 | fonts/ptex-fontmaps/maps/ms/uptex-ko-ms.map -2019/05/06 | 530 | fonts/ptex-fontmaps/maps/ms/uptex-ms.map -2019/05/06 | 190 | fonts/ptex-fontmaps/maps/ms/uptex-sc-ms.map -2019/05/06 | 226 | fonts/ptex-fontmaps/maps/ms/uptex-tc-ms.map -2019/05/06 | 506 | fonts/ptex-fontmaps/maps/ms-win10/otf-tc-ms-win10.map -2019/05/06 | 232 | fonts/ptex-fontmaps/maps/ms-win10/uptex-tc-ms-win10.map -2019/05/06 | 350 | fonts/ptex-fontmaps/maps/noEmbed/otf-ko-noEmbed.map -2019/05/06 | 2791 | fonts/ptex-fontmaps/maps/noEmbed/otf-noEmbed.map -2019/05/06 | 326 | fonts/ptex-fontmaps/maps/noEmbed/otf-sc-noEmbed.map -2019/05/06 | 310 | fonts/ptex-fontmaps/maps/noEmbed/otf-tc-noEmbed.map -2019/05/06 | 1340 | fonts/ptex-fontmaps/maps/noEmbed/otf-up-noEmbed.map -2019/05/06 | 110 | fonts/ptex-fontmaps/maps/noEmbed/ptex-noEmbed-04.map -2019/05/06 | 90 | fonts/ptex-fontmaps/maps/noEmbed/ptex-noEmbed.map -2019/05/06 | 170 | fonts/ptex-fontmaps/maps/noEmbed/uptex-ko-noEmbed.map -2019/05/06 | 412 | fonts/ptex-fontmaps/maps/noEmbed/uptex-noEmbed-04.map -2019/05/06 | 380 | fonts/ptex-fontmaps/maps/noEmbed/uptex-noEmbed.map -2019/05/06 | 154 | fonts/ptex-fontmaps/maps/noEmbed/uptex-sc-noEmbed.map -2019/05/06 | 144 | fonts/ptex-fontmaps/maps/noEmbed/uptex-tc-noEmbed.map -2019/05/06 | 540 | fonts/ptex-fontmaps/maps/noto-otc/otf-ko-noto-otc.map -2019/05/06 | 4313 | fonts/ptex-fontmaps/maps/noto-otc/otf-noto-otc.map -2019/05/06 | 516 | fonts/ptex-fontmaps/maps/noto-otc/otf-sc-noto-otc.map -2019/05/06 | 500 | fonts/ptex-fontmaps/maps/noto-otc/otf-tc-noto-otc.map -2019/05/06 | 2862 | fonts/ptex-fontmaps/maps/noto-otc/otf-up-noto-otc.map -2019/05/06 | 110 | fonts/ptex-fontmaps/maps/noto-otc/ptex-noto-otc-04.map -2019/05/06 | 90 | fonts/ptex-fontmaps/maps/noto-otc/ptex-noto-otc.map -2019/05/06 | 360 | fonts/ptex-fontmaps/maps/noto-otc/uptex-ko-noto-otc.map -2019/05/06 | 962 | fonts/ptex-fontmaps/maps/noto-otc/uptex-noto-otc-04.map -2019/05/06 | 930 | fonts/ptex-fontmaps/maps/noto-otc/uptex-noto-otc.map -2019/05/06 | 344 | fonts/ptex-fontmaps/maps/noto-otc/uptex-sc-noto-otc.map -2019/05/06 | 334 | fonts/ptex-fontmaps/maps/noto-otc/uptex-tc-noto-otc.map -2019/05/06 | 536 | fonts/ptex-fontmaps/maps/noto/otf-ko-noto.map -2019/05/06 | 4285 | fonts/ptex-fontmaps/maps/noto/otf-noto.map -2019/05/06 | 512 | fonts/ptex-fontmaps/maps/noto/otf-sc-noto.map -2019/05/06 | 496 | fonts/ptex-fontmaps/maps/noto/otf-tc-noto.map -2019/05/06 | 2834 | fonts/ptex-fontmaps/maps/noto/otf-up-noto.map -2019/05/06 | 110 | fonts/ptex-fontmaps/maps/noto/ptex-noto-04.map -2019/05/06 | 90 | fonts/ptex-fontmaps/maps/noto/ptex-noto.map -2019/05/06 | 356 | fonts/ptex-fontmaps/maps/noto/uptex-ko-noto.map -2019/05/06 | 952 | fonts/ptex-fontmaps/maps/noto/uptex-noto-04.map -2019/05/06 | 920 | fonts/ptex-fontmaps/maps/noto/uptex-noto.map -2019/05/06 | 340 | fonts/ptex-fontmaps/maps/noto/uptex-sc-noto.map -2019/05/06 | 330 | fonts/ptex-fontmaps/maps/noto/uptex-tc-noto.map -2019/05/06 | 414 | fonts/ptex-fontmaps/maps/solaris/otf-ko-solaris.map -2019/05/06 | 192 | fonts/ptex-fontmaps/maps/solaris/uptex-ko-solaris.map -2019/05/06 | 548 | fonts/ptex-fontmaps/maps/sourcehan-otc/otf-ko-sourcehan-otc.map -2019/05/06 | 524 | fonts/ptex-fontmaps/maps/sourcehan-otc/otf-sc-sourcehan-otc.map -2019/05/06 | 4369 | fonts/ptex-fontmaps/maps/sourcehan-otc/otf-sourcehan-otc.map -2019/05/06 | 508 | fonts/ptex-fontmaps/maps/sourcehan-otc/otf-tc-sourcehan-otc.map -2019/05/06 | 2918 | fonts/ptex-fontmaps/maps/sourcehan-otc/otf-up-sourcehan-otc.map -2019/05/06 | 110 | fonts/ptex-fontmaps/maps/sourcehan-otc/ptex-sourcehan-otc-04.map -2019/05/06 | 90 | fonts/ptex-fontmaps/maps/sourcehan-otc/ptex-sourcehan-otc.map -2019/05/06 | 368 | fonts/ptex-fontmaps/maps/sourcehan-otc/uptex-ko-sourcehan-otc.map -2019/05/06 | 352 | fonts/ptex-fontmaps/maps/sourcehan-otc/uptex-sc-sourcehan-otc.map -2019/05/06 | 982 | fonts/ptex-fontmaps/maps/sourcehan-otc/uptex-sourcehan-otc-04.map -2019/05/06 | 950 | fonts/ptex-fontmaps/maps/sourcehan-otc/uptex-sourcehan-otc.map -2019/05/06 | 342 | fonts/ptex-fontmaps/maps/sourcehan-otc/uptex-tc-sourcehan-otc.map -2019/05/06 | 540 | fonts/ptex-fontmaps/maps/sourcehan/otf-ko-sourcehan.map -2019/05/06 | 520 | fonts/ptex-fontmaps/maps/sourcehan/otf-sc-sourcehan.map -2019/05/06 | 4285 | fonts/ptex-fontmaps/maps/sourcehan/otf-sourcehan.map -2019/05/06 | 504 | fonts/ptex-fontmaps/maps/sourcehan/otf-tc-sourcehan.map -2019/05/06 | 2834 | fonts/ptex-fontmaps/maps/sourcehan/otf-up-sourcehan.map -2019/05/06 | 110 | fonts/ptex-fontmaps/maps/sourcehan/ptex-sourcehan-04.map -2019/05/06 | 90 | fonts/ptex-fontmaps/maps/sourcehan/ptex-sourcehan.map -2019/05/06 | 360 | fonts/ptex-fontmaps/maps/sourcehan/uptex-ko-sourcehan.map -2019/05/06 | 348 | fonts/ptex-fontmaps/maps/sourcehan/uptex-sc-sourcehan.map -2019/05/06 | 952 | fonts/ptex-fontmaps/maps/sourcehan/uptex-sourcehan-04.map -2019/05/06 | 920 | fonts/ptex-fontmaps/maps/sourcehan/uptex-sourcehan.map -2019/05/06 | 338 | fonts/ptex-fontmaps/maps/sourcehan/uptex-tc-sourcehan.map -2019/05/06 | 3661 | fonts/ptex-fontmaps/maps/ume/otf-ume.map -2019/05/06 | 1660 | fonts/ptex-fontmaps/maps/ume/otf-up-ume.map -2019/05/06 | 148 | fonts/ptex-fontmaps/maps/ume/ptex-ume.map -2019/05/06 | 525 | fonts/ptex-fontmaps/maps/ume/uptex-ume.map -2019/05/06 | 322 | fonts/ptex-fontmaps/maps/unfonts/otf-ko-unfonts.map -2019/05/06 | 146 | fonts/ptex-fontmaps/maps/unfonts/uptex-ko-unfonts.map -2019/05/06 | 1268 | fonts/ptex-fontmaps/maps/yu-osx/otf-up-yu-osx.map -2019/05/06 | 2611 | fonts/ptex-fontmaps/maps/yu-osx/otf-yu-osx.map -2019/05/06 | 112 | fonts/ptex-fontmaps/maps/yu-osx/ptex-yu-osx-04.map -2019/05/06 | 92 | fonts/ptex-fontmaps/maps/yu-osx/ptex-yu-osx.map -2019/05/06 | 417 | fonts/ptex-fontmaps/maps/yu-osx/uptex-yu-osx-04.map -2019/05/06 | 385 | fonts/ptex-fontmaps/maps/yu-osx/uptex-yu-osx.map -2019/05/06 | 1772 | fonts/ptex-fontmaps/maps/yu-win10/otf-up-yu-win10.map -2019/05/06 | 3941 | fonts/ptex-fontmaps/maps/yu-win10/otf-yu-win10.map -2019/05/06 | 162 | fonts/ptex-fontmaps/maps/yu-win10/ptex-yu-win10.map -2019/05/06 | 560 | fonts/ptex-fontmaps/maps/yu-win10/uptex-yu-win10.map -2019/05/06 | 1740 | fonts/ptex-fontmaps/maps/yu-win/otf-up-yu-win.map -2019/05/06 | 3861 | fonts/ptex-fontmaps/maps/yu-win/otf-yu-win.map -2019/05/06 | 160 | fonts/ptex-fontmaps/maps/yu-win/ptex-yu-win.map -2019/05/06 | 555 | fonts/ptex-fontmaps/maps/yu-win/uptex-yu-win.map -2019/05/06 | 10578 | fonts/ptex-fontmaps/README -2019/05/06 | 16386 | fonts/ptex-fontmaps/script/kanji-config-updmap.pl -2019/05/06 | 761 | fonts/ptex-fontmaps/script/kanji-config-updmap-sys.sh -2019/05/06 | 757 | fonts/ptex-fontmaps/script/kanji-config-updmap-user.sh -2019/05/06 | 19263 | fonts/ptex-fontmaps/script/kanji-fontmap-creator.pl -2019/05/06 | 7764 | fonts/ptex-fontmaps/script/updmap-otf.sh -2019/05/06 | 595389 | fonts/ptex-fontmaps.zip +2020/02/17 | 51250 | fonts/ptex-fontmaps/cmap/2004-H +2020/02/17 | 3031 | fonts/ptex-fontmaps/cmap/2004-V +2020/02/17 | 2204 | fonts/ptex-fontmaps/database/ptex-fontmaps-data.dat +2020/02/17 | 1217 | fonts/ptex-fontmaps/examples/otf-sample-04.tex +2020/02/17 | 1307 | fonts/ptex-fontmaps/examples/otf-sample.tex +2020/02/17 | 744 | fonts/ptex-fontmaps/examples/ptex-sample.tex +2020/02/17 | 776 | fonts/ptex-fontmaps/examples/series-compare.tex +2020/02/17 | 1455 | fonts/ptex-fontmaps/jis04cmap_exp/cmapdec.lua +2020/02/17 | 432598 | fonts/ptex-fontmaps/jis04cmap_exp/jis-h04-httk.pdf +2020/02/17 | 2382 | fonts/ptex-fontmaps/jis04cmap_exp/jis-h04-httk.tex +2020/02/17 | 70506 | fonts/ptex-fontmaps/jis04cmap_exp/jis-v04-vttk.pdf +2020/02/17 | 2463 | fonts/ptex-fontmaps/jis04cmap_exp/jis-v04-vttk.tex +2020/02/17 | 311904 | fonts/ptex-fontmaps/jis04cmap_exp/jisx0213-2004-8bit-std.txt +2020/02/17 | 146602 | fonts/ptex-fontmaps/jis04cmap_exp/JISX0213-2004-H +2020/02/17 | 3002 | fonts/ptex-fontmaps/jis04cmap_exp/JISX0213-2004-V +2020/02/17 | 21557 | fonts/ptex-fontmaps/jis04cmap_exp/mk_jis_to_aj16_cid.lua +2020/02/17 | 1630 | fonts/ptex-fontmaps/jis04cmap_exp/README +2020/02/17 | 175524 | fonts/ptex-fontmaps/kanji-config-updmap.pdf +2020/02/17 | 17567 | fonts/ptex-fontmaps/kanji-config-updmap.tex +2020/02/17 | 406 | fonts/ptex-fontmaps/maps/adobe/otf-ko-adobe.map +2020/02/17 | 398 | fonts/ptex-fontmaps/maps/adobe/otf-sc-adobe.map +2020/02/17 | 402 | fonts/ptex-fontmaps/maps/adobe/otf-tc-adobe.map +2020/02/17 | 198 | fonts/ptex-fontmaps/maps/adobe/uptex-ko-adobe.map +2020/02/17 | 190 | fonts/ptex-fontmaps/maps/adobe/uptex-sc-adobe.map +2020/02/17 | 190 | fonts/ptex-fontmaps/maps/adobe/uptex-tc-adobe.map +2020/02/17 | 354 | fonts/ptex-fontmaps/maps/apple/otf-ko-apple.map +2020/02/17 | 162 | fonts/ptex-fontmaps/maps/apple/uptex-ko-apple.map +2020/02/17 | 506 | fonts/ptex-fontmaps/maps/arphic/otf-sc-arphic.map +2020/02/17 | 494 | fonts/ptex-fontmaps/maps/arphic/otf-tc-arphic.map +2020/02/17 | 234 | fonts/ptex-fontmaps/maps/arphic/uptex-sc-arphic.map +2020/02/17 | 226 | fonts/ptex-fontmaps/maps/arphic/uptex-tc-arphic.map +2020/02/17 | 462 | fonts/ptex-fontmaps/maps/baekmuk/otf-ko-baekmuk.map +2020/02/17 | 216 | fonts/ptex-fontmaps/maps/baekmuk/uptex-ko-baekmuk.map +2020/02/17 | 4661 | fonts/ptex-fontmaps/maps/bizud/otf-bizud.map +2020/02/17 | 2060 | fonts/ptex-fontmaps/maps/bizud/otf-up-bizud.map +2020/02/17 | 196 | fonts/ptex-fontmaps/maps/bizud/ptex-bizud.map +2020/02/17 | 645 | fonts/ptex-fontmaps/maps/bizud/uptex-bizud.map +2020/02/17 | 4411 | fonts/ptex-fontmaps/maps/canon/otf-canon.map +2020/02/17 | 1960 | fonts/ptex-fontmaps/maps/canon/otf-up-canon.map +2020/02/17 | 190 | fonts/ptex-fontmaps/maps/canon/ptex-canon.map +2020/02/17 | 630 | fonts/ptex-fontmaps/maps/canon/uptex-canon.map +2020/02/17 | 422 | fonts/ptex-fontmaps/maps/cjkunifonts/otf-sc-cjkunifonts.map +2020/02/17 | 426 | fonts/ptex-fontmaps/maps/cjkunifonts/otf-tc-cjkunifonts.map +2020/02/17 | 442 | fonts/ptex-fontmaps/maps/cjkunifonts-ttf/otf-sc-cjkunifonts-ttf.map +2020/02/17 | 446 | fonts/ptex-fontmaps/maps/cjkunifonts-ttf/otf-tc-cjkunifonts-ttf.map +2020/02/17 | 202 | fonts/ptex-fontmaps/maps/cjkunifonts-ttf/uptex-sc-cjkunifonts-ttf.map +2020/02/17 | 202 | fonts/ptex-fontmaps/maps/cjkunifonts-ttf/uptex-tc-cjkunifonts-ttf.map +2020/02/17 | 192 | fonts/ptex-fontmaps/maps/cjkunifonts/uptex-sc-cjkunifonts.map +2020/02/17 | 192 | fonts/ptex-fontmaps/maps/cjkunifonts/uptex-tc-cjkunifonts.map +2020/02/17 | 334 | fonts/ptex-fontmaps/maps/dynacomware/otf-tc-dynacomware.map +2020/02/17 | 146 | fonts/ptex-fontmaps/maps/dynacomware/uptex-tc-dynacomware.map +2020/02/17 | 382 | fonts/ptex-fontmaps/maps/fandol/otf-sc-fandol.map +2020/02/17 | 182 | fonts/ptex-fontmaps/maps/fandol/uptex-sc-fandol.map +2020/02/17 | 454 | fonts/ptex-fontmaps/maps/founder/otf-sc-founder.map +2020/02/17 | 208 | fonts/ptex-fontmaps/maps/founder/uptex-sc-founder.map +2020/02/17 | 3351 | fonts/ptex-fontmaps/maps/haranoaji/otf-haranoaji.map +2020/02/17 | 1564 | fonts/ptex-fontmaps/maps/haranoaji/otf-up-haranoaji.map +2020/02/17 | 156 | fonts/ptex-fontmaps/maps/haranoaji/ptex-haranoaji-04.map +2020/02/17 | 136 | fonts/ptex-fontmaps/maps/haranoaji/ptex-haranoaji.map +2020/02/17 | 527 | fonts/ptex-fontmaps/maps/haranoaji/uptex-haranoaji-04.map +2020/02/17 | 495 | fonts/ptex-fontmaps/maps/haranoaji/uptex-haranoaji.map +2020/02/17 | 3245 | fonts/ptex-fontmaps/maps/hiragino/otf-hiragino.map +2020/02/17 | 1344 | fonts/ptex-fontmaps/maps/hiragino/otf-up-hiragino.map +2020/02/17 | 3325 | fonts/ptex-fontmaps/maps/hiragino-pron/otf-hiragino-pron.map +2020/02/17 | 1372 | fonts/ptex-fontmaps/maps/hiragino-pron/otf-up-hiragino-pron.map +2020/02/17 | 124 | fonts/ptex-fontmaps/maps/hiragino-pron/ptex-hiragino-pron-04.map +2020/02/17 | 104 | fonts/ptex-fontmaps/maps/hiragino-pron/ptex-hiragino-pron.map +2020/02/17 | 447 | fonts/ptex-fontmaps/maps/hiragino-pron/uptex-hiragino-pron-04.map +2020/02/17 | 415 | fonts/ptex-fontmaps/maps/hiragino-pron/uptex-hiragino-pron.map +2020/02/17 | 120 | fonts/ptex-fontmaps/maps/hiragino/ptex-hiragino-04.map +2020/02/17 | 100 | fonts/ptex-fontmaps/maps/hiragino/ptex-hiragino.map +2020/02/17 | 437 | fonts/ptex-fontmaps/maps/hiragino/uptex-hiragino-04.map +2020/02/17 | 405 | fonts/ptex-fontmaps/maps/hiragino/uptex-hiragino.map +2020/02/17 | 3531 | fonts/ptex-fontmaps/maps/ipaex/otf-ipaex.map +2020/02/17 | 1608 | fonts/ptex-fontmaps/maps/ipaex/otf-up-ipaex.map +2020/02/17 | 138 | fonts/ptex-fontmaps/maps/ipaex/ptex-ipaex.map +2020/02/17 | 500 | fonts/ptex-fontmaps/maps/ipaex/uptex-ipaex.map +2020/02/17 | 3251 | fonts/ptex-fontmaps/maps/ipa/otf-ipa.map +2020/02/17 | 1496 | fonts/ptex-fontmaps/maps/ipa/otf-up-ipa.map +2020/02/17 | 122 | fonts/ptex-fontmaps/maps/ipa/ptex-ipa.map +2020/02/17 | 460 | fonts/ptex-fontmaps/maps/ipa/uptex-ipa.map +2020/02/17 | 2881 | fonts/ptex-fontmaps/maps/kozuka/otf-kozuka.map +2020/02/17 | 1376 | fonts/ptex-fontmaps/maps/kozuka/otf-up-kozuka.map +2020/02/17 | 2951 | fonts/ptex-fontmaps/maps/kozuka-pr6n/otf-kozuka-pr6n.map +2020/02/17 | 1404 | fonts/ptex-fontmaps/maps/kozuka-pr6n/otf-up-kozuka-pr6n.map +2020/02/17 | 134 | fonts/ptex-fontmaps/maps/kozuka-pr6n/ptex-kozuka-pr6n-04.map +2020/02/17 | 114 | fonts/ptex-fontmaps/maps/kozuka-pr6n/ptex-kozuka-pr6n.map +2020/02/17 | 472 | fonts/ptex-fontmaps/maps/kozuka-pr6n/uptex-kozuka-pr6n-04.map +2020/02/17 | 440 | fonts/ptex-fontmaps/maps/kozuka-pr6n/uptex-kozuka-pr6n.map +2020/02/17 | 3021 | fonts/ptex-fontmaps/maps/kozuka-pr6/otf-kozuka-pr6.map +2020/02/17 | 1432 | fonts/ptex-fontmaps/maps/kozuka-pr6/otf-up-kozuka-pr6.map +2020/02/17 | 138 | fonts/ptex-fontmaps/maps/kozuka-pr6/ptex-kozuka-pr6-04.map +2020/02/17 | 118 | fonts/ptex-fontmaps/maps/kozuka-pr6/ptex-kozuka-pr6.map +2020/02/17 | 482 | fonts/ptex-fontmaps/maps/kozuka-pr6/uptex-kozuka-pr6-04.map +2020/02/17 | 450 | fonts/ptex-fontmaps/maps/kozuka-pr6/uptex-kozuka-pr6.map +2020/02/17 | 130 | fonts/ptex-fontmaps/maps/kozuka/ptex-kozuka-04.map +2020/02/17 | 110 | fonts/ptex-fontmaps/maps/kozuka/ptex-kozuka.map +2020/02/17 | 462 | fonts/ptex-fontmaps/maps/kozuka/uptex-kozuka-04.map +2020/02/17 | 430 | fonts/ptex-fontmaps/maps/kozuka/uptex-kozuka.map +2020/02/17 | 4297 | fonts/ptex-fontmaps/maps/moga-mobo-ex/otf-moga-mobo-ex.map +2020/02/17 | 1920 | fonts/ptex-fontmaps/maps/moga-mobo-ex/otf-up-moga-mobo-ex.map +2020/02/17 | 202 | fonts/ptex-fontmaps/maps/moga-mobo-ex/ptex-moga-mobo-ex-04.map +2020/02/17 | 190 | fonts/ptex-fontmaps/maps/moga-mobo-ex/ptex-moga-mobo-ex.map +2020/02/17 | 642 | fonts/ptex-fontmaps/maps/moga-mobo-ex/uptex-moga-mobo-ex-04.map +2020/02/17 | 630 | fonts/ptex-fontmaps/maps/moga-mobo-ex/uptex-moga-mobo-ex.map +2020/02/17 | 4157 | fonts/ptex-fontmaps/maps/moga-mobo/otf-moga-mobo.map +2020/02/17 | 1864 | fonts/ptex-fontmaps/maps/moga-mobo/otf-up-moga-mobo.map +2020/02/17 | 194 | fonts/ptex-fontmaps/maps/moga-mobo/ptex-moga-mobo-04.map +2020/02/17 | 182 | fonts/ptex-fontmaps/maps/moga-mobo/ptex-moga-mobo.map +2020/02/17 | 622 | fonts/ptex-fontmaps/maps/moga-mobo/uptex-moga-mobo-04.map +2020/02/17 | 610 | fonts/ptex-fontmaps/maps/moga-mobo/uptex-moga-mobo.map +2020/02/17 | 5051 | fonts/ptex-fontmaps/maps/morisawa/otf-morisawa.map +2020/02/17 | 2244 | fonts/ptex-fontmaps/maps/morisawa/otf-up-morisawa.map +2020/02/17 | 5211 | fonts/ptex-fontmaps/maps/morisawa-pr6n/otf-morisawa-pr6n.map +2020/02/17 | 2308 | fonts/ptex-fontmaps/maps/morisawa-pr6n/otf-up-morisawa-pr6n.map +2020/02/17 | 258 | fonts/ptex-fontmaps/maps/morisawa-pr6n/ptex-morisawa-pr6n-04.map +2020/02/17 | 238 | fonts/ptex-fontmaps/maps/morisawa-pr6n/ptex-morisawa-pr6n.map +2020/02/17 | 782 | fonts/ptex-fontmaps/maps/morisawa-pr6n/uptex-morisawa-pr6n-04.map +2020/02/17 | 750 | fonts/ptex-fontmaps/maps/morisawa-pr6n/uptex-morisawa-pr6n.map +2020/02/17 | 250 | fonts/ptex-fontmaps/maps/morisawa/ptex-morisawa-04.map +2020/02/17 | 230 | fonts/ptex-fontmaps/maps/morisawa/ptex-morisawa.map +2020/02/17 | 762 | fonts/ptex-fontmaps/maps/morisawa/uptex-morisawa-04.map +2020/02/17 | 730 | fonts/ptex-fontmaps/maps/morisawa/uptex-morisawa.map +2020/02/17 | 2551 | fonts/ptex-fontmaps/maps/ms-osx/otf-ms-osx.map +2020/02/17 | 406 | fonts/ptex-fontmaps/maps/ms-osx/otf-sc-ms-osx.map +2020/02/17 | 1216 | fonts/ptex-fontmaps/maps/ms-osx/otf-up-ms-osx.map +2020/02/17 | 82 | fonts/ptex-fontmaps/maps/ms-osx/ptex-ms-osx.map +2020/02/17 | 360 | fonts/ptex-fontmaps/maps/ms-osx/uptex-ms-osx.map +2020/02/17 | 184 | fonts/ptex-fontmaps/maps/ms-osx/uptex-sc-ms-osx.map +2020/02/17 | 446 | fonts/ptex-fontmaps/maps/ms/otf-ko-ms.map +2020/02/17 | 3741 | fonts/ptex-fontmaps/maps/ms/otf-ms.map +2020/02/17 | 418 | fonts/ptex-fontmaps/maps/ms/otf-sc-ms.map +2020/02/17 | 494 | fonts/ptex-fontmaps/maps/ms/otf-tc-ms.map +2020/02/17 | 1692 | fonts/ptex-fontmaps/maps/ms/otf-up-ms.map +2020/02/17 | 150 | fonts/ptex-fontmaps/maps/ms/ptex-ms.map +2020/02/17 | 208 | fonts/ptex-fontmaps/maps/ms/uptex-ko-ms.map +2020/02/17 | 530 | fonts/ptex-fontmaps/maps/ms/uptex-ms.map +2020/02/17 | 190 | fonts/ptex-fontmaps/maps/ms/uptex-sc-ms.map +2020/02/17 | 226 | fonts/ptex-fontmaps/maps/ms/uptex-tc-ms.map +2020/02/17 | 506 | fonts/ptex-fontmaps/maps/ms-win10/otf-tc-ms-win10.map +2020/02/17 | 232 | fonts/ptex-fontmaps/maps/ms-win10/uptex-tc-ms-win10.map +2020/02/17 | 350 | fonts/ptex-fontmaps/maps/noEmbed/otf-ko-noEmbed.map +2020/02/17 | 2791 | fonts/ptex-fontmaps/maps/noEmbed/otf-noEmbed.map +2020/02/17 | 326 | fonts/ptex-fontmaps/maps/noEmbed/otf-sc-noEmbed.map +2020/02/17 | 310 | fonts/ptex-fontmaps/maps/noEmbed/otf-tc-noEmbed.map +2020/02/17 | 1340 | fonts/ptex-fontmaps/maps/noEmbed/otf-up-noEmbed.map +2020/02/17 | 110 | fonts/ptex-fontmaps/maps/noEmbed/ptex-noEmbed-04.map +2020/02/17 | 90 | fonts/ptex-fontmaps/maps/noEmbed/ptex-noEmbed.map +2020/02/17 | 170 | fonts/ptex-fontmaps/maps/noEmbed/uptex-ko-noEmbed.map +2020/02/17 | 412 | fonts/ptex-fontmaps/maps/noEmbed/uptex-noEmbed-04.map +2020/02/17 | 380 | fonts/ptex-fontmaps/maps/noEmbed/uptex-noEmbed.map +2020/02/17 | 154 | fonts/ptex-fontmaps/maps/noEmbed/uptex-sc-noEmbed.map +2020/02/17 | 144 | fonts/ptex-fontmaps/maps/noEmbed/uptex-tc-noEmbed.map +2020/02/17 | 540 | fonts/ptex-fontmaps/maps/noto-otc/otf-ko-noto-otc.map +2020/02/17 | 4313 | fonts/ptex-fontmaps/maps/noto-otc/otf-noto-otc.map +2020/02/17 | 516 | fonts/ptex-fontmaps/maps/noto-otc/otf-sc-noto-otc.map +2020/02/17 | 500 | fonts/ptex-fontmaps/maps/noto-otc/otf-tc-noto-otc.map +2020/02/17 | 2862 | fonts/ptex-fontmaps/maps/noto-otc/otf-up-noto-otc.map +2020/02/17 | 110 | fonts/ptex-fontmaps/maps/noto-otc/ptex-noto-otc-04.map +2020/02/17 | 90 | fonts/ptex-fontmaps/maps/noto-otc/ptex-noto-otc.map +2020/02/17 | 360 | fonts/ptex-fontmaps/maps/noto-otc/uptex-ko-noto-otc.map +2020/02/17 | 962 | fonts/ptex-fontmaps/maps/noto-otc/uptex-noto-otc-04.map +2020/02/17 | 930 | fonts/ptex-fontmaps/maps/noto-otc/uptex-noto-otc.map +2020/02/17 | 344 | fonts/ptex-fontmaps/maps/noto-otc/uptex-sc-noto-otc.map +2020/02/17 | 334 | fonts/ptex-fontmaps/maps/noto-otc/uptex-tc-noto-otc.map +2020/02/17 | 536 | fonts/ptex-fontmaps/maps/noto/otf-ko-noto.map +2020/02/17 | 4285 | fonts/ptex-fontmaps/maps/noto/otf-noto.map +2020/02/17 | 512 | fonts/ptex-fontmaps/maps/noto/otf-sc-noto.map +2020/02/17 | 496 | fonts/ptex-fontmaps/maps/noto/otf-tc-noto.map +2020/02/17 | 2834 | fonts/ptex-fontmaps/maps/noto/otf-up-noto.map +2020/02/17 | 110 | fonts/ptex-fontmaps/maps/noto/ptex-noto-04.map +2020/02/17 | 90 | fonts/ptex-fontmaps/maps/noto/ptex-noto.map +2020/02/17 | 356 | fonts/ptex-fontmaps/maps/noto/uptex-ko-noto.map +2020/02/17 | 952 | fonts/ptex-fontmaps/maps/noto/uptex-noto-04.map +2020/02/17 | 920 | fonts/ptex-fontmaps/maps/noto/uptex-noto.map +2020/02/17 | 340 | fonts/ptex-fontmaps/maps/noto/uptex-sc-noto.map +2020/02/17 | 330 | fonts/ptex-fontmaps/maps/noto/uptex-tc-noto.map +2020/02/17 | 414 | fonts/ptex-fontmaps/maps/solaris/otf-ko-solaris.map +2020/02/17 | 192 | fonts/ptex-fontmaps/maps/solaris/uptex-ko-solaris.map +2020/02/17 | 548 | fonts/ptex-fontmaps/maps/sourcehan-otc/otf-ko-sourcehan-otc.map +2020/02/17 | 524 | fonts/ptex-fontmaps/maps/sourcehan-otc/otf-sc-sourcehan-otc.map +2020/02/17 | 4369 | fonts/ptex-fontmaps/maps/sourcehan-otc/otf-sourcehan-otc.map +2020/02/17 | 508 | fonts/ptex-fontmaps/maps/sourcehan-otc/otf-tc-sourcehan-otc.map +2020/02/17 | 2918 | fonts/ptex-fontmaps/maps/sourcehan-otc/otf-up-sourcehan-otc.map +2020/02/17 | 110 | fonts/ptex-fontmaps/maps/sourcehan-otc/ptex-sourcehan-otc-04.map +2020/02/17 | 90 | fonts/ptex-fontmaps/maps/sourcehan-otc/ptex-sourcehan-otc.map +2020/02/17 | 368 | fonts/ptex-fontmaps/maps/sourcehan-otc/uptex-ko-sourcehan-otc.map +2020/02/17 | 352 | fonts/ptex-fontmaps/maps/sourcehan-otc/uptex-sc-sourcehan-otc.map +2020/02/17 | 982 | fonts/ptex-fontmaps/maps/sourcehan-otc/uptex-sourcehan-otc-04.map +2020/02/17 | 950 | fonts/ptex-fontmaps/maps/sourcehan-otc/uptex-sourcehan-otc.map +2020/02/17 | 342 | fonts/ptex-fontmaps/maps/sourcehan-otc/uptex-tc-sourcehan-otc.map +2020/02/17 | 540 | fonts/ptex-fontmaps/maps/sourcehan/otf-ko-sourcehan.map +2020/02/17 | 520 | fonts/ptex-fontmaps/maps/sourcehan/otf-sc-sourcehan.map +2020/02/17 | 4285 | fonts/ptex-fontmaps/maps/sourcehan/otf-sourcehan.map +2020/02/17 | 504 | fonts/ptex-fontmaps/maps/sourcehan/otf-tc-sourcehan.map +2020/02/17 | 2834 | fonts/ptex-fontmaps/maps/sourcehan/otf-up-sourcehan.map +2020/02/17 | 110 | fonts/ptex-fontmaps/maps/sourcehan/ptex-sourcehan-04.map +2020/02/17 | 90 | fonts/ptex-fontmaps/maps/sourcehan/ptex-sourcehan.map +2020/02/17 | 360 | fonts/ptex-fontmaps/maps/sourcehan/uptex-ko-sourcehan.map +2020/02/17 | 348 | fonts/ptex-fontmaps/maps/sourcehan/uptex-sc-sourcehan.map +2020/02/17 | 952 | fonts/ptex-fontmaps/maps/sourcehan/uptex-sourcehan-04.map +2020/02/17 | 920 | fonts/ptex-fontmaps/maps/sourcehan/uptex-sourcehan.map +2020/02/17 | 338 | fonts/ptex-fontmaps/maps/sourcehan/uptex-tc-sourcehan.map +2020/02/17 | 3661 | fonts/ptex-fontmaps/maps/ume/otf-ume.map +2020/02/17 | 1660 | fonts/ptex-fontmaps/maps/ume/otf-up-ume.map +2020/02/17 | 148 | fonts/ptex-fontmaps/maps/ume/ptex-ume.map +2020/02/17 | 525 | fonts/ptex-fontmaps/maps/ume/uptex-ume.map +2020/02/17 | 322 | fonts/ptex-fontmaps/maps/unfonts/otf-ko-unfonts.map +2020/02/17 | 146 | fonts/ptex-fontmaps/maps/unfonts/uptex-ko-unfonts.map +2020/02/17 | 1268 | fonts/ptex-fontmaps/maps/yu-osx/otf-up-yu-osx.map +2020/02/17 | 2611 | fonts/ptex-fontmaps/maps/yu-osx/otf-yu-osx.map +2020/02/17 | 112 | fonts/ptex-fontmaps/maps/yu-osx/ptex-yu-osx-04.map +2020/02/17 | 92 | fonts/ptex-fontmaps/maps/yu-osx/ptex-yu-osx.map +2020/02/17 | 417 | fonts/ptex-fontmaps/maps/yu-osx/uptex-yu-osx-04.map +2020/02/17 | 385 | fonts/ptex-fontmaps/maps/yu-osx/uptex-yu-osx.map +2020/02/17 | 1772 | fonts/ptex-fontmaps/maps/yu-win10/otf-up-yu-win10.map +2020/02/17 | 3941 | fonts/ptex-fontmaps/maps/yu-win10/otf-yu-win10.map +2020/02/17 | 162 | fonts/ptex-fontmaps/maps/yu-win10/ptex-yu-win10.map +2020/02/17 | 560 | fonts/ptex-fontmaps/maps/yu-win10/uptex-yu-win10.map +2020/02/17 | 1740 | fonts/ptex-fontmaps/maps/yu-win/otf-up-yu-win.map +2020/02/17 | 3861 | fonts/ptex-fontmaps/maps/yu-win/otf-yu-win.map +2020/02/17 | 160 | fonts/ptex-fontmaps/maps/yu-win/ptex-yu-win.map +2020/02/17 | 555 | fonts/ptex-fontmaps/maps/yu-win/uptex-yu-win.map +2020/02/17 | 10882 | fonts/ptex-fontmaps/README +2020/02/17 | 17701 | fonts/ptex-fontmaps/script/kanji-config-updmap.pl +2020/02/17 | 761 | fonts/ptex-fontmaps/script/kanji-config-updmap-sys.sh +2020/02/17 | 757 | fonts/ptex-fontmaps/script/kanji-config-updmap-user.sh +2020/02/17 | 19263 | fonts/ptex-fontmaps/script/kanji-fontmap-creator.pl +2020/02/17 | 7764 | fonts/ptex-fontmaps/script/updmap-otf.sh +2020/02/17 | 777524 | fonts/ptex-fontmaps.zip 2018/02/28 | 641 | fonts/ptex-fonts/Changes_makejvf 2018/02/28 | 1460 | fonts/ptex-fonts/LICENSE 2018/02/28 | 6258 | fonts/ptex-fonts/README_makejvf @@ -126406,371 +126414,405 @@ 1994/02/25 | 18333 | graphics/bm2font/p2clib.c 1994/02/25 | 4402 | graphics/bm2font/README 2006/01/01 | 673751 | graphics/bm2font.zip -2019/10/15 | 1187 | graphics/circuit_macros/boxdims.sty -2019/10/15 | 11791 | graphics/circuit_macros/CHANGES -2019/10/15 | 456 | graphics/circuit_macros/Copying -2019/10/15 | 14340 | graphics/circuit_macros/darrow.m4 -2019/10/15 | 494 | graphics/circuit_macros/doc/AmpTable.m4 -2019/10/15 | 1211 | graphics/circuit_macros/doc/Antennas.m4 -2019/10/15 | 2296 | graphics/circuit_macros/doc/Audio.m4 -2019/10/15 | 131 | graphics/circuit_macros/doc/Axes.m4 -2019/10/15 | 614 | graphics/circuit_macros/doc/BigResistor.m4 -2019/10/15 | 1619 | graphics/circuit_macros/doc/Bip.m4 -2019/10/15 | 1074 | graphics/circuit_macros/doc/bistable.m4 -2019/10/15 | 1860 | graphics/circuit_macros/doc/bi_trans.m4 -2019/10/15 | 130 | graphics/circuit_macros/doc/bitrbody.m4 -2019/10/15 | 50 | graphics/circuit_macros/doc/bitr.m4 -2019/10/15 | 133412 | graphics/circuit_macros/doc/body.tex -2019/10/15 | 1953 | graphics/circuit_macros/doc/Buffer.m4 -2019/10/15 | 25460 | graphics/circuit_macros/doc/Capture.JPG -2019/10/15 | 2601 | graphics/circuit_macros/doc/CctTable.m4 -2019/10/15 | 4073 | graphics/circuit_macros/doc/Circuit_macros.bib -2019/10/15 | 911278 | graphics/circuit_macros/doc/Circuit_macros.pdf -2019/10/15 | 2640 | graphics/circuit_macros/doc/Circuit_macros.tex -2019/10/15 | 1857 | graphics/circuit_macros/doc/Composite.m4 -2019/10/15 | 1120 | graphics/circuit_macros/doc/ConfigA.m4 -2019/10/15 | 1257 | graphics/circuit_macros/doc/ConfigB.m4 -2019/10/15 | 1291 | graphics/circuit_macros/doc/ConfigC.m4 -2019/10/15 | 2161 | graphics/circuit_macros/doc/Conn.m4 -2019/10/15 | 1995 | graphics/circuit_macros/doc/Corners.m4 -2019/10/15 | 1329 | graphics/circuit_macros/doc/currents.m4 -2019/10/15 | 2389 | graphics/circuit_macros/doc/Dac.m4 -2019/10/15 | 1151 | graphics/circuit_macros/doc/Darlington.m4 -2019/10/15 | 74835 | graphics/circuit_macros/doc/defines.tex -2019/10/15 | 1485 | graphics/circuit_macros/doc/Demultiplexer.m4 -2019/10/15 | 1467 | graphics/circuit_macros/doc/Diodes.m4 -2019/10/15 | 483 | graphics/circuit_macros/doc/eboxdims.m4 -2019/10/15 | 980 | graphics/circuit_macros/doc/Emarrows.m4 -2019/10/15 | 1229 | graphics/circuit_macros/doc/fbfilter.m4 -2019/10/15 | 4489 | graphics/circuit_macros/doc/fet.m4 -2019/10/15 | 329 | graphics/circuit_macros/doc/FF.m4 -2019/10/15 | 1264 | graphics/circuit_macros/doc/FlipFlop.m4 -2019/10/15 | 960 | graphics/circuit_macros/doc/Flowdiag.m4 -2019/10/15 | 899 | graphics/circuit_macros/doc/Fuses.m4 -2019/10/15 | 707 | graphics/circuit_macros/doc/Grounds.m4 -2019/10/15 | 1020 | graphics/circuit_macros/doc/Headers.m4 -2019/10/15 | 2013 | graphics/circuit_macros/doc/HybridPi.m4 -2019/10/15 | 2361 | graphics/circuit_macros/doc/Jack.m4 -2019/10/15 | 2119 | graphics/circuit_macros/doc/Logic.m4 -2019/10/15 | 269 | graphics/circuit_macros/doc/Loop.m4 -2019/10/15 | 387 | graphics/circuit_macros/doc/lrarrows.m4 -2019/10/15 | 4318 | graphics/circuit_macros/doc/Makefile -2019/10/15 | 2102 | graphics/circuit_macros/doc/md.tex -2019/10/15 | 1575 | graphics/circuit_macros/doc/mplex.m4 -2019/10/15 | 1400 | graphics/circuit_macros/doc/Multiplexer.m4 -2019/10/15 | 499 | graphics/circuit_macros/doc/NLG.m4 -2019/10/15 | 1128 | graphics/circuit_macros/doc/NPDT.m4 -2019/10/15 | 1040 | graphics/circuit_macros/doc/Nport.m4 -2019/10/15 | 137 | graphics/circuit_macros/doc/oaxbody.m4 -2019/10/15 | 48 | graphics/circuit_macros/doc/oax.m4 -2019/10/15 | 782 | graphics/circuit_macros/doc/Oblique.m4 -2019/10/15 | 1433 | graphics/circuit_macros/doc/Opamp.m4 -2019/10/15 | 835 | graphics/circuit_macros/doc/Opto.m4 -2019/10/15 | 1624 | graphics/circuit_macros/doc/ParSeries.m4 -2019/10/15 | 1568 | graphics/circuit_macros/doc/Pconn.m4 -2019/10/15 | 801 | graphics/circuit_macros/doc/Potentiometers.m4 -2019/10/15 | 774 | graphics/circuit_macros/doc/quick.m4 -2019/10/15 | 2633 | graphics/circuit_macros/doc/Relay.m4 -2019/10/15 | 404 | graphics/circuit_macros/doc/Series.m4 -2019/10/15 | 1406 | graphics/circuit_macros/doc/ShiftR.m4 -2019/10/15 | 421 | graphics/circuit_macros/doc/Sinus.m4 -2019/10/15 | 2085 | graphics/circuit_macros/doc/Sources.m4 -2019/10/15 | 217 | graphics/circuit_macros/doc/stringdims.m4 -2019/10/15 | 3138 | graphics/circuit_macros/doc/Switches.m4 -2019/10/15 | 1464 | graphics/circuit_macros/doc/Taps.m4 -2019/10/15 | 11 | graphics/circuit_macros/doc/test.tex -2019/10/15 | 1022 | graphics/circuit_macros/doc/Tgate.m4 -2019/10/15 | 143 | graphics/circuit_macros/doc/Thermal.m4 -2019/10/15 | 3321 | graphics/circuit_macros/doc/thyristor.m4 -2019/10/15 | 535 | graphics/circuit_macros/doc/Tline.m4 -2019/10/15 | 165 | graphics/circuit_macros/doc/tranbody.m4 -2019/10/15 | 50 | graphics/circuit_macros/doc/tran.m4 -2019/10/15 | 2412 | graphics/circuit_macros/doc/tran.tex -2019/10/15 | 2097 | graphics/circuit_macros/doc/Ttree.m4 -2019/10/15 | 660 | graphics/circuit_macros/doc/ujt.m4 -2019/10/15 | 756 | graphics/circuit_macros/doc/Variable.m4 -2019/10/15 | 12 | graphics/circuit_macros/doc/Version.tex -2019/10/15 | 3346 | graphics/circuit_macros/doc/Windings.m4 -2019/10/15 | 449 | graphics/circuit_macros/doc/woodchips.m4 -2019/10/15 | 2912 | graphics/circuit_macros/doc/Workflow.m4 -2019/10/15 | 1526 | graphics/circuit_macros/doc/Xform.m4 -2019/10/15 | 17539 | graphics/circuit_macros/dpictools.pic -2019/10/15 | 1730 | graphics/circuit_macros/examples/ABlogix.m4 -2019/10/15 | 2402 | graphics/circuit_macros/examples/Adder.m4 -2019/10/15 | 4205 | graphics/circuit_macros/examples/Alogix.m4 -2019/10/15 | 1962 | graphics/circuit_macros/examples/Autologix.m4 -2019/10/15 | 4638 | graphics/circuit_macros/examples/Ball.m4 -2019/10/15 | 905 | graphics/circuit_macros/examples/birds.m4 -2019/10/15 | 1075 | graphics/circuit_macros/examples/bistable.m4 -2019/10/15 | 3175 | graphics/circuit_macros/examples/Blogix.m4 -2019/10/15 | 2542 | graphics/circuit_macros/examples/brace.m4 -2019/10/15 | 1024 | graphics/circuit_macros/examples/Btree.m4 -2019/10/15 | 3508 | graphics/circuit_macros/examples/Buttons.m4 -2019/10/15 | 991 | graphics/circuit_macros/examples/Byte.m4 -2019/10/15 | 6371 | graphics/circuit_macros/examples/CanLogic.m4 -2019/10/15 | 233 | graphics/circuit_macros/examples/Ccurve.m4 -2019/10/15 | 1039 | graphics/circuit_macros/examples/chaos.m4 -2019/10/15 | 8955 | graphics/circuit_macros/examples/Chuck.m4 -2019/10/15 | 482 | graphics/circuit_macros/examples/clock.m4 -2019/10/15 | 4288 | graphics/circuit_macros/examples/control.m4 -2019/10/15 | 551 | graphics/circuit_macros/examples/Counting.m4 -2019/10/15 | 1358 | graphics/circuit_macros/examples/Crossbar.m4 -2019/10/15 | 2516 | graphics/circuit_macros/examples/Crow.m4 -2019/10/15 | 1879 | graphics/circuit_macros/examples/Cruller.m4 -2019/10/15 | 2295 | graphics/circuit_macros/examples/csc.m4 -2019/10/15 | 6003 | graphics/circuit_macros/examples/CSlight.m4 -2019/10/15 | 5919 | graphics/circuit_macros/examples/Csource.m4 -2019/10/15 | 1864 | graphics/circuit_macros/examples/darrows.m4 -2019/10/15 | 460 | graphics/circuit_macros/examples/debug1.tex -2019/10/15 | 1939 | graphics/circuit_macros/examples/debug2.m4 -2019/10/15 | 655 | graphics/circuit_macros/examples/Decoder.m4 -2019/10/15 | 654 | graphics/circuit_macros/examples/diamond.m4 -2019/10/15 | 1966 | graphics/circuit_macros/examples/Drive.m4 -2019/10/15 | 2584 | graphics/circuit_macros/examples/Escher.m4 -2019/10/15 | 4305 | graphics/circuit_macros/examples/Euro.m4 -2019/10/15 | 2412 | graphics/circuit_macros/examples/ex00.m4 -2019/10/15 | 693 | graphics/circuit_macros/examples/ex01.m4 -2019/10/15 | 1078 | graphics/circuit_macros/examples/ex02.m4 -2019/10/15 | 673 | graphics/circuit_macros/examples/ex03.m4 -2019/10/15 | 1654 | graphics/circuit_macros/examples/ex04.m4 -2019/10/15 | 1608 | graphics/circuit_macros/examples/ex05.m4 -2019/10/15 | 2170 | graphics/circuit_macros/examples/ex06.m4 -2019/10/15 | 2029 | graphics/circuit_macros/examples/ex07.m4 -2019/10/15 | 2556 | graphics/circuit_macros/examples/ex08.m4 -2019/10/15 | 4312 | graphics/circuit_macros/examples/ex09.m4 -2019/10/15 | 1492 | graphics/circuit_macros/examples/ex10.m4 -2019/10/15 | 2361 | graphics/circuit_macros/examples/ex11.m4 -2019/10/15 | 3339 | graphics/circuit_macros/examples/ex12.m4 -2019/10/15 | 1003 | graphics/circuit_macros/examples/ex15.m4 -2019/10/15 | 1865 | graphics/circuit_macros/examples/ex16.m4 -2019/10/15 | 1126 | graphics/circuit_macros/examples/ex17.m4 -2019/10/15 | 855 | graphics/circuit_macros/examples/ex18.m4 -2019/10/15 | 2000 | graphics/circuit_macros/examples/ex21.m4 -2019/10/15 | 1144010 | graphics/circuit_macros/examples/examples.pdf -2019/10/15 | 1048 | graphics/circuit_macros/examples/examples.tex -2019/10/15 | 8372 | graphics/circuit_macros/examples/exp.m4 -2019/10/15 | 16246 | graphics/circuit_macros/examples/files.tex -2019/10/15 | 645 | graphics/circuit_macros/examples/Floor.m4 -2019/10/15 | 5552 | graphics/circuit_macros/examples/FlowchartDefs.m4 -2019/10/15 | 3911 | graphics/circuit_macros/examples/Flow.m4 -2019/10/15 | 2170 | graphics/circuit_macros/examples/GnuMakefile -2019/10/15 | 421 | graphics/circuit_macros/examples/GrayCode.m4 -2019/10/15 | 5478 | graphics/circuit_macros/examples/graysurf.m4 -2019/10/15 | 1458 | graphics/circuit_macros/examples/header.tex -2019/10/15 | 13112 | graphics/circuit_macros/examples/Heathkit.m4 -2019/10/15 | 2068 | graphics/circuit_macros/examples/I2L.m4 -2019/10/15 | 1668 | graphics/circuit_macros/examples/IC10107.m4 -2019/10/15 | 4841 | graphics/circuit_macros/examples/ics.m4 -2019/10/15 | 32 | graphics/circuit_macros/examples/Incl.eps.bb -2019/10/15 | 45323 | graphics/circuit_macros/examples/Incl.eps.gz -2019/10/15 | 741 | graphics/circuit_macros/examples/Incleps.m4 -2019/10/15 | 29772 | graphics/circuit_macros/examples/Incl.pdf -2019/10/15 | 709 | graphics/circuit_macros/examples/Inclpdf.m4 -2019/10/15 | 2696 | graphics/circuit_macros/examples/keyval.m4 -2019/10/15 | 489 | graphics/circuit_macros/examples/Koch.m4 -2019/10/15 | 7113 | graphics/circuit_macros/examples/lcct.m4 -2019/10/15 | 2304 | graphics/circuit_macros/examples/Loglog.m4 -2019/10/15 | 9015 | graphics/circuit_macros/examples/Makefile -2019/10/15 | 1381 | graphics/circuit_macros/examples/MC.m4 -2019/10/15 | 94471 | graphics/circuit_macros/examples/mf/cct.mf -2019/10/15 | 776 | graphics/circuit_macros/examples/mf/cct.tfm -2019/10/15 | 4615 | graphics/circuit_macros/examples/mf/font.m4 -2019/10/15 | 1529 | graphics/circuit_macros/examples/mf/Makefile -2019/10/15 | 1076 | graphics/circuit_macros/examples/mf/mftest -2019/10/15 | 3757 | graphics/circuit_macros/examples/Mixer.m4 -2019/10/15 | 18 | graphics/circuit_macros/examples/mode.tex -2019/10/15 | 2597 | graphics/circuit_macros/examples/MosfetElements.m4 -2019/10/15 | 1922 | graphics/circuit_macros/examples/MotorControl.m4 -2019/10/15 | 444 | graphics/circuit_macros/examples/mpost/examplesmpost.tex -2019/10/15 | 4199 | graphics/circuit_macros/examples/mpost/Makefile -2019/10/15 | 720 | graphics/circuit_macros/examples/mpost/mptest -2019/10/15 | 604 | graphics/circuit_macros/examples/mpost/README-mpost -2019/10/15 | 453 | graphics/circuit_macros/examples/mpost/tstmpost.tex -2019/10/15 | 2792 | graphics/circuit_macros/examples/OpAmpFilter.m4 -2019/10/15 | 2442 | graphics/circuit_macros/examples/Optoiso.m4 -2019/10/15 | 1852 | graphics/circuit_macros/examples/Orbits.m4 -2019/10/15 | 1375 | graphics/circuit_macros/examples/person.m4 -2019/10/15 | 720 | graphics/circuit_macros/examples/pgf/examplespgf.tex -2019/10/15 | 5036 | graphics/circuit_macros/examples/pgf/Makefile -2019/10/15 | 328 | graphics/circuit_macros/examples/pgf/README-pgf -2019/10/15 | 226 | graphics/circuit_macros/examples/pgf/tstpgf.tex -2019/10/15 | 2674 | graphics/circuit_macros/examples/Planes.m4 -2019/10/15 | 1174 | graphics/circuit_macros/examples/PPA.m4 -2019/10/15 | 750 | graphics/circuit_macros/examples/psfrag/examplespsfrag.tex -2019/10/15 | 4578 | graphics/circuit_macros/examples/psfrag/Makefile -2019/10/15 | 317 | graphics/circuit_macros/examples/psfrag/README-psfrag.txt -2019/10/15 | 406 | graphics/circuit_macros/examples/psfrag/tstpsfrag.tex -2019/10/15 | 4024 | graphics/circuit_macros/examples/PushPull.m4 -2019/10/15 | 2014 | graphics/circuit_macros/examples/pwrsupply.m4 -2019/10/15 | 918 | graphics/circuit_macros/examples/Quantum.m4 -2019/10/15 | 3545 | graphics/circuit_macros/examples/random.m4 -2019/10/15 | 2814 | graphics/circuit_macros/examples/README-examples -2019/10/15 | 6880 | graphics/circuit_macros/examples/Rectifiers.m4 -2019/10/15 | 3825 | graphics/circuit_macros/examples/recycle.m4 -2019/10/15 | 1443 | graphics/circuit_macros/examples/Resolver.m4 -2019/10/15 | 4569 | graphics/circuit_macros/examples/rose.m4 -2019/10/15 | 221 | graphics/circuit_macros/examples/rotate.tex -2019/10/15 | 1518 | graphics/circuit_macros/examples/rotatetext.m4 -2019/10/15 | 518 | graphics/circuit_macros/examples/Rotbox.m4 -2019/10/15 | 365 | graphics/circuit_macros/examples/rotellipse.m4 -2019/10/15 | 1778 | graphics/circuit_macros/examples/Schottky.m4 -2019/10/15 | 2761 | graphics/circuit_macros/examples/sfg.m4 -2019/10/15 | 4751 | graphics/circuit_macros/examples/Shaky.m4 -2019/10/15 | 7529 | graphics/circuit_macros/examples/shapes.m4 -2019/10/15 | 1307 | graphics/circuit_macros/examples/Sierpinski.m4 -2019/10/15 | 419 | graphics/circuit_macros/examples/Sixpole.m4 -2019/10/15 | 370 | graphics/circuit_macros/examples/snake.m4 -2019/10/15 | 1906 | graphics/circuit_macros/examples/SPM.m4 -2019/10/15 | 380 | graphics/circuit_macros/examples/SQUID.m4 -2019/10/15 | 947 | graphics/circuit_macros/examples/squiggle.m4 -2019/10/15 | 1955 | graphics/circuit_macros/examples/svg/ABlogixSVG.m4 -2019/10/15 | 2528 | graphics/circuit_macros/examples/svg/AdderSVG.m4 -2019/10/15 | 4337 | graphics/circuit_macros/examples/svg/AlogixSVG.m4 -2019/10/15 | 538 | graphics/circuit_macros/examples/svg/AmpTableSVG.m4 -2019/10/15 | 1090 | graphics/circuit_macros/examples/svg/AntennasSVG.m4 -2019/10/15 | 2350 | graphics/circuit_macros/examples/svg/AudioSVG.m4 -2019/10/15 | 1668 | graphics/circuit_macros/examples/svg/Banking.m4 -2019/10/15 | 1812 | graphics/circuit_macros/examples/svg/BipSVG.m4 -2019/10/15 | 1080 | graphics/circuit_macros/examples/svg/BtreeSVG.m4 -2019/10/15 | 3583 | graphics/circuit_macros/examples/svg/ButtonsSVG.m4 -2019/10/15 | 937 | graphics/circuit_macros/examples/svg/ByteSVG.m4 -2019/10/15 | 6413 | graphics/circuit_macros/examples/svg/CanLogicSVG.m4 -2019/10/15 | 2180 | graphics/circuit_macros/examples/svg/CctTableSVG.m4 -2019/10/15 | 2022 | graphics/circuit_macros/examples/svg/ConnSVG.m4 -2019/10/15 | 3206 | graphics/circuit_macros/examples/svg/controlSVG.m4 -2019/10/15 | 793 | graphics/circuit_macros/examples/svg/CountingSVG.m4 -2019/10/15 | 1387 | graphics/circuit_macros/examples/svg/CrossbarSVG.m4 -2019/10/15 | 2521 | graphics/circuit_macros/examples/svg/CrowSVG.m4 -2019/10/15 | 1882 | graphics/circuit_macros/examples/svg/CrullerSVG.m4 -2019/10/15 | 2324 | graphics/circuit_macros/examples/svg/cscSVG.m4 -2019/10/15 | 7418 | graphics/circuit_macros/examples/svg/CsourceSVG.m4 -2019/10/15 | 745 | graphics/circuit_macros/examples/svg/DecoderSVG.m4 -2019/10/15 | 1373 | graphics/circuit_macros/examples/svg/DemultiplexerSVG.m4 -2019/10/15 | 609 | graphics/circuit_macros/examples/svg/diamondSVG.m4 -2019/10/15 | 1429 | graphics/circuit_macros/examples/svg/DiodesSVG.m4 -2019/10/15 | 1966 | graphics/circuit_macros/examples/svg/DriveSVG.m4 -2019/10/15 | 1070 | graphics/circuit_macros/examples/svg/EmarrowsSVG.m4 -2019/10/15 | 2443 | graphics/circuit_macros/examples/svg/ex00SVG.m4 -2019/10/15 | 931 | graphics/circuit_macros/examples/svg/ex01SVG.m4 -2019/10/15 | 1071 | graphics/circuit_macros/examples/svg/ex02SVG.m4 -2019/10/15 | 855 | graphics/circuit_macros/examples/svg/ex03SVG.m4 -2019/10/15 | 1891 | graphics/circuit_macros/examples/svg/ex04SVG.m4 -2019/10/15 | 1807 | graphics/circuit_macros/examples/svg/ex05SVG.m4 -2019/10/15 | 2018 | graphics/circuit_macros/examples/svg/ex06SVG.m4 -2019/10/15 | 2559 | graphics/circuit_macros/examples/svg/ex08SVG.m4 -2019/10/15 | 4108 | graphics/circuit_macros/examples/svg/ex09SVG.m4 -2019/10/15 | 1699 | graphics/circuit_macros/examples/svg/ex10SVG.m4 -2019/10/15 | 2685 | graphics/circuit_macros/examples/svg/ex11SVG.m4 -2019/10/15 | 3522 | graphics/circuit_macros/examples/svg/ex12SVG.m4 -2019/10/15 | 970 | graphics/circuit_macros/examples/svg/ex15SVG.m4 -2019/10/15 | 1893 | graphics/circuit_macros/examples/svg/ex16SVG.m4 -2019/10/15 | 1204 | graphics/circuit_macros/examples/svg/ex17SVG.m4 -2019/10/15 | 1065 | graphics/circuit_macros/examples/svg/ex18SVG.m4 -2019/10/15 | 2177 | graphics/circuit_macros/examples/svg/ex21SVG.m4 -2019/10/15 | 12165 | graphics/circuit_macros/examples/svg/examplesSVG.htmx -2019/10/15 | 10589 | graphics/circuit_macros/examples/svg/expSVG.m4 -2019/10/15 | 3836 | graphics/circuit_macros/examples/svg/fetSVG.m4 -2019/10/15 | 9954 | graphics/circuit_macros/examples/svg/FlowSVG.m4 -2019/10/15 | 444 | graphics/circuit_macros/examples/svg/FontsSVG.m4 -2019/10/15 | 869 | graphics/circuit_macros/examples/svg/FusesSVG.m4 -2019/10/15 | 422 | graphics/circuit_macros/examples/svg/GrayCodeSVG.m4 -2019/10/15 | 5537 | graphics/circuit_macros/examples/svg/graysurfSVG.m4 -2019/10/15 | 699 | graphics/circuit_macros/examples/svg/GroundsSVG.m4 -2019/10/15 | 1149 | graphics/circuit_macros/examples/svg/HeadersSVG.m4 -2019/10/15 | 12711 | graphics/circuit_macros/examples/svg/HeathkitSVG.m4 -2019/10/15 | 2171 | graphics/circuit_macros/examples/svg/I2LSVG.m4 -2019/10/15 | 5015 | graphics/circuit_macros/examples/svg/icsSVG.m4 -2019/10/15 | 4003 | graphics/circuit_macros/examples/svg/InclepsSVG.m4 -2019/10/15 | 21384 | graphics/circuit_macros/examples/svg/Incl.jpg -2019/10/15 | 2051 | graphics/circuit_macros/examples/svg/JackSVG.m4 -2019/10/15 | 7203 | graphics/circuit_macros/examples/svg/lcctSVG.m4 -2019/10/15 | 6216 | graphics/circuit_macros/examples/svg/LgateSVG.m4 -2019/10/15 | 63 | graphics/circuit_macros/examples/svg/local_init.m4 -2019/10/15 | 1931 | graphics/circuit_macros/examples/svg/LogicSVG.m4 -2019/10/15 | 2241 | graphics/circuit_macros/examples/svg/LoglogSVG.m4 -2019/10/15 | 3267 | graphics/circuit_macros/examples/svg/Makefile -2019/10/15 | 1593 | graphics/circuit_macros/examples/svg/MCSVG.m4 -2019/10/15 | 3487 | graphics/circuit_macros/examples/svg/MixerSVG.m4 -2019/10/15 | 1953 | graphics/circuit_macros/examples/svg/MotorControlSVG.m4 -2019/10/15 | 1467 | graphics/circuit_macros/examples/svg/MultiplexerSVG.m4 -2019/10/15 | 532 | graphics/circuit_macros/examples/svg/NLGSVG.m4 -2019/10/15 | 1157 | graphics/circuit_macros/examples/svg/NPDTSVG.m4 -2019/10/15 | 748 | graphics/circuit_macros/examples/svg/Np.m4 -2019/10/15 | 1238 | graphics/circuit_macros/examples/svg/NportSVG.m4 -2019/10/15 | 1034 | graphics/circuit_macros/examples/svg/OpampSVG.m4 -2019/10/15 | 2551 | graphics/circuit_macros/examples/svg/OptoisoSVG.m4 -2019/10/15 | 10439 | graphics/circuit_macros/examples/svg/paletteSVG.m4 -2019/10/15 | 1599 | graphics/circuit_macros/examples/svg/PconnSVG.m4 -2019/10/15 | 3779 | graphics/circuit_macros/examples/svg/PushPullSVG.m4 -2019/10/15 | 862 | graphics/circuit_macros/examples/svg/pwrsupplySVG.m4 -2019/10/15 | 947 | graphics/circuit_macros/examples/svg/QuantumSVG.m4 -2019/10/15 | 839 | graphics/circuit_macros/examples/svg/quickSVG.m4 -2019/10/15 | 3573 | graphics/circuit_macros/examples/svg/randomSVG.m4 -2019/10/15 | 7435 | graphics/circuit_macros/examples/svg/RectifiersSVG.m4 -2019/10/15 | 3842 | graphics/circuit_macros/examples/svg/recycleSVG.m4 -2019/10/15 | 2615 | graphics/circuit_macros/examples/svg/RelaySVG.m4 -2019/10/15 | 4624 | graphics/circuit_macros/examples/svg/roseSVG.m4 -2019/10/15 | 545 | graphics/circuit_macros/examples/svg/RotboxSVG.m4 -2019/10/15 | 1837 | graphics/circuit_macros/examples/svg/SchottkySVG.m4 -2019/10/15 | 3290 | graphics/circuit_macros/examples/svg/sfgSVG.m4 -2019/10/15 | 7526 | graphics/circuit_macros/examples/svg/shapesSVG.m4 -2019/10/15 | 1388 | graphics/circuit_macros/examples/svg/ShiftRSVG.m4 -2019/10/15 | 1307 | graphics/circuit_macros/examples/svg/SierpinskiSVG.m4 -2019/10/15 | 419 | graphics/circuit_macros/examples/svg/SixpoleSVG.m4 -2019/10/15 | 1842 | graphics/circuit_macros/examples/svg/SourcesSVG.m4 -2019/10/15 | 417 | graphics/circuit_macros/examples/svg/SQUIDSVG.m4 -2019/10/15 | 1456 | graphics/circuit_macros/examples/svg/SVGconfig.m4 -2019/10/15 | 2883 | graphics/circuit_macros/examples/svg/SwitchesSVG.m4 -2019/10/15 | 1055 | graphics/circuit_macros/examples/svg/TgateSVG.m4 -2019/10/15 | 1444 | graphics/circuit_macros/examples/svg/ThreeSVG.m4 -2019/10/15 | 3310 | graphics/circuit_macros/examples/svg/thyristorSVG.m4 -2019/10/15 | 1616 | graphics/circuit_macros/examples/svg/TimerSVG.m4 -2019/10/15 | 8084 | graphics/circuit_macros/examples/svg/tstSVG.htmx -2019/10/15 | 1675 | graphics/circuit_macros/examples/svg/TTLnandSVG.m4 -2019/10/15 | 3091 | graphics/circuit_macros/examples/svg/TtreeSVG.m4 -2019/10/15 | 12478 | graphics/circuit_macros/examples/svg/TubediagsSVG.m4 -2019/10/15 | 682 | graphics/circuit_macros/examples/svg/ujtSVG.m4 -2019/10/15 | 888 | graphics/circuit_macros/examples/svg/VariableSVG.m4 -2019/10/15 | 2994 | graphics/circuit_macros/examples/svg/WindingsSVG.m4 -2019/10/15 | 3631 | graphics/circuit_macros/examples/svg/wormSVG.m4 -2019/10/15 | 1559 | graphics/circuit_macros/examples/svg/XformSVG.m4 -2019/10/15 | 1985 | graphics/circuit_macros/examples/svg/XORSVG.m4 -2019/10/15 | 354 | graphics/circuit_macros/examples/svg/xx.html -2019/10/15 | 591 | graphics/circuit_macros/examples/test.m4 -2019/10/15 | 451 | graphics/circuit_macros/examples/testpdf.tex -2019/10/15 | 1287 | graphics/circuit_macros/examples/Three.m4 -2019/10/15 | 417 | graphics/circuit_macros/examples/tikz.tex -2019/10/15 | 1528 | graphics/circuit_macros/examples/Timer.m4 -2019/10/15 | 254 | graphics/circuit_macros/examples/tst1.tex -2019/10/15 | 648 | graphics/circuit_macros/examples/tst.tex -2019/10/15 | 1558 | graphics/circuit_macros/examples/TTLnand.m4 -2019/10/15 | 2097 | graphics/circuit_macros/examples/Ttree.m4 -2019/10/15 | 9840 | graphics/circuit_macros/examples/tubedefs.m4 -2019/10/15 | 13108 | graphics/circuit_macros/examples/Tubediags.m4 -2019/10/15 | 442 | graphics/circuit_macros/examples/Wheat.m4 -2019/10/15 | 212 | graphics/circuit_macros/examples/windows.m4 -2019/10/15 | 2799 | graphics/circuit_macros/examples/worm.m4 -2019/10/15 | 337 | graphics/circuit_macros/examples/xfig/Makefile -2019/10/15 | 21204 | graphics/circuit_macros/examples/xfig/xfiglib.fig -2019/10/15 | 5969 | graphics/circuit_macros/examples/xfig/xfiglib.m4 -2019/10/15 | 1823 | graphics/circuit_macros/examples/XOR.m4 -2019/10/15 | 656 | graphics/circuit_macros/examples/Zcos.m4 -2019/10/15 | 1013 | graphics/circuit_macros/gpic.m4 -2019/10/15 | 11267 | graphics/circuit_macros/lib3D.m4 -2019/10/15 | 144132 | graphics/circuit_macros/libcct.m4 -2019/10/15 | 78238 | graphics/circuit_macros/libgen.m4 -2019/10/15 | 48098 | graphics/circuit_macros/liblog.m4 -2019/10/15 | 1639 | graphics/circuit_macros/Makefile -2019/10/15 | 1108 | graphics/circuit_macros/mfpic.m4 -2019/10/15 | 1634 | graphics/circuit_macros/mpost.m4 -2019/10/15 | 2079 | graphics/circuit_macros/pgf.m4 -2019/10/15 | 2828 | graphics/circuit_macros/postscript.m4 -2019/10/15 | 700 | graphics/circuit_macros/psfrag.m4 -2019/10/15 | 2093 | graphics/circuit_macros/pstricks.m4 -2019/10/15 | 20153 | graphics/circuit_macros/README -2019/10/15 | 6870 | graphics/circuit_macros/svg.m4 -2019/10/15 | 1023 | graphics/circuit_macros/xfig.m4 -2019/10/15 | 2585890 | graphics/circuit_macros.zip +2020/02/16 | 1185 | graphics/circuit_macros/boxdims.sty +2020/02/16 | 11927 | graphics/circuit_macros/CHANGES +2020/02/16 | 462 | graphics/circuit_macros/Copying +2020/02/16 | 14346 | graphics/circuit_macros/darrow.m4 +2020/02/16 | 494 | graphics/circuit_macros/doc/AmpTable.m4 +2020/02/16 | 1211 | graphics/circuit_macros/doc/Antennas.m4 +2020/02/16 | 2296 | graphics/circuit_macros/doc/Audio.m4 +2020/02/16 | 131 | graphics/circuit_macros/doc/Axes.m4 +2020/02/16 | 614 | graphics/circuit_macros/doc/BigResistor.m4 +2020/02/16 | 1619 | graphics/circuit_macros/doc/Bip.m4 +2020/02/16 | 1074 | graphics/circuit_macros/doc/bistable.m4 +2020/02/16 | 1860 | graphics/circuit_macros/doc/bi_trans.m4 +2020/02/16 | 130 | graphics/circuit_macros/doc/bitrbody.m4 +2020/02/16 | 50 | graphics/circuit_macros/doc/bitr.m4 +2020/02/16 | 133969 | graphics/circuit_macros/doc/body.tex +2020/02/16 | 1953 | graphics/circuit_macros/doc/Buffer.m4 +2020/02/16 | 25460 | graphics/circuit_macros/doc/Capture.JPG +2020/02/16 | 2670 | graphics/circuit_macros/doc/CctTable.m4 +2020/02/16 | 4073 | graphics/circuit_macros/doc/Circuit_macros.bib +2020/02/16 | 629598 | graphics/circuit_macros/doc/Circuit_macros.pdf +2020/02/16 | 2639 | graphics/circuit_macros/doc/Circuit_macros.tex +2020/02/16 | 1857 | graphics/circuit_macros/doc/Composite.m4 +2020/02/16 | 1120 | graphics/circuit_macros/doc/ConfigA.m4 +2020/02/16 | 1257 | graphics/circuit_macros/doc/ConfigB.m4 +2020/02/16 | 1291 | graphics/circuit_macros/doc/ConfigC.m4 +2020/02/16 | 2161 | graphics/circuit_macros/doc/Conn.m4 +2020/02/16 | 3326 | graphics/circuit_macros/doc/Contact.m4 +2020/02/16 | 1585 | graphics/circuit_macros/doc/Contacts.m4 +2020/02/16 | 1995 | graphics/circuit_macros/doc/Corners.m4 +2020/02/16 | 1329 | graphics/circuit_macros/doc/currents.m4 +2020/02/16 | 2389 | graphics/circuit_macros/doc/Dac.m4 +2020/02/16 | 1151 | graphics/circuit_macros/doc/Darlington.m4 +2020/02/16 | 76409 | graphics/circuit_macros/doc/defines.tex +2020/02/16 | 1485 | graphics/circuit_macros/doc/Demultiplexer.m4 +2020/02/16 | 1467 | graphics/circuit_macros/doc/Diodes.m4 +2020/02/16 | 483 | graphics/circuit_macros/doc/eboxdims.m4 +2020/02/16 | 980 | graphics/circuit_macros/doc/Emarrows.m4 +2020/02/16 | 1229 | graphics/circuit_macros/doc/fbfilter.m4 +2020/02/16 | 4489 | graphics/circuit_macros/doc/fet.m4 +2020/02/16 | 329 | graphics/circuit_macros/doc/FF.m4 +2020/02/16 | 1975 | graphics/circuit_macros/doc/FlipFlop.m4 +2020/02/16 | 960 | graphics/circuit_macros/doc/Flowdiag.m4 +2020/02/16 | 899 | graphics/circuit_macros/doc/Fuses.m4 +2020/02/16 | 707 | graphics/circuit_macros/doc/Grounds.m4 +2020/02/16 | 1020 | graphics/circuit_macros/doc/Headers.m4 +2020/02/16 | 2013 | graphics/circuit_macros/doc/HybridPi.m4 +2020/02/16 | 2362 | graphics/circuit_macros/doc/Jack.m4 +2020/02/16 | 2119 | graphics/circuit_macros/doc/Logic.m4 +2020/02/16 | 269 | graphics/circuit_macros/doc/Loop.m4 +2020/02/16 | 387 | graphics/circuit_macros/doc/lrarrows.m4 +2020/02/16 | 4354 | graphics/circuit_macros/doc/Makefile +2020/02/16 | 1575 | graphics/circuit_macros/doc/mplex.m4 +2020/02/16 | 1400 | graphics/circuit_macros/doc/Multiplexer.m4 +2020/02/16 | 499 | graphics/circuit_macros/doc/NLG.m4 +2020/02/16 | 1128 | graphics/circuit_macros/doc/NPDT.m4 +2020/02/16 | 1040 | graphics/circuit_macros/doc/Nport.m4 +2020/02/16 | 137 | graphics/circuit_macros/doc/oaxbody.m4 +2020/02/16 | 48 | graphics/circuit_macros/doc/oax.m4 +2020/02/16 | 782 | graphics/circuit_macros/doc/Oblique.m4 +2020/02/16 | 1433 | graphics/circuit_macros/doc/Opamp.m4 +2020/02/16 | 835 | graphics/circuit_macros/doc/Opto.m4 +2020/02/16 | 1624 | graphics/circuit_macros/doc/ParSeries.m4 +2020/02/16 | 1654 | graphics/circuit_macros/doc/Pconn.m4 +2020/02/16 | 801 | graphics/circuit_macros/doc/Potentiometers.m4 +2020/02/16 | 774 | graphics/circuit_macros/doc/quick.m4 +2020/02/16 | 1921 | graphics/circuit_macros/doc/relaycoil.m4 +2020/02/16 | 1259 | graphics/circuit_macros/doc/Relay.m4 +2020/02/16 | 404 | graphics/circuit_macros/doc/Series.m4 +2020/02/16 | 1406 | graphics/circuit_macros/doc/ShiftR.m4 +2020/02/16 | 421 | graphics/circuit_macros/doc/Sinus.m4 +2020/02/16 | 2085 | graphics/circuit_macros/doc/Sources.m4 +2020/02/16 | 217 | graphics/circuit_macros/doc/stringdims.m4 +2020/02/16 | 3608 | graphics/circuit_macros/doc/Switches.m4 +2020/02/16 | 1464 | graphics/circuit_macros/doc/Taps.m4 +2020/02/16 | 11 | graphics/circuit_macros/doc/test.tex +2020/02/16 | 1022 | graphics/circuit_macros/doc/Tgate.m4 +2020/02/16 | 144 | graphics/circuit_macros/doc/Thermal.m4 +2020/02/16 | 3321 | graphics/circuit_macros/doc/thyristor.m4 +2020/02/16 | 535 | graphics/circuit_macros/doc/Tline.m4 +2020/02/16 | 165 | graphics/circuit_macros/doc/tranbody.m4 +2020/02/16 | 2097 | graphics/circuit_macros/doc/Ttree.m4 +2020/02/16 | 660 | graphics/circuit_macros/doc/ujt.m4 +2020/02/16 | 756 | graphics/circuit_macros/doc/Variable.m4 +2020/02/16 | 12 | graphics/circuit_macros/doc/Version.tex +2020/02/16 | 3346 | graphics/circuit_macros/doc/Windings.m4 +2020/02/16 | 449 | graphics/circuit_macros/doc/woodchips.m4 +2020/02/16 | 2912 | graphics/circuit_macros/doc/Workflow.m4 +2020/02/16 | 1526 | graphics/circuit_macros/doc/Xform.m4 +2020/02/16 | 19238 | graphics/circuit_macros/dpictools.pic +2020/02/16 | 1730 | graphics/circuit_macros/examples/ABlogix.m4 +2020/02/16 | 2402 | graphics/circuit_macros/examples/Adder.m4 +2020/02/16 | 4205 | graphics/circuit_macros/examples/Alogix.m4 +2020/02/16 | 494 | graphics/circuit_macros/examples/AmpTable.m4 +2020/02/16 | 1211 | graphics/circuit_macros/examples/Antennas.m4 +2020/02/16 | 4909 | graphics/circuit_macros/examples/AntiqueClock.m4 +2020/02/16 | 2296 | graphics/circuit_macros/examples/Audio.m4 +2020/02/16 | 1962 | graphics/circuit_macros/examples/Autologix.m4 +2020/02/16 | 4638 | graphics/circuit_macros/examples/Ball.m4 +2020/02/16 | 1619 | graphics/circuit_macros/examples/Bip.m4 +2020/02/16 | 905 | graphics/circuit_macros/examples/birds.m4 +2020/02/16 | 1075 | graphics/circuit_macros/examples/bistable.m4 +2020/02/16 | 3175 | graphics/circuit_macros/examples/Blogix.m4 +2020/02/16 | 2542 | graphics/circuit_macros/examples/brace.m4 +2020/02/16 | 1024 | graphics/circuit_macros/examples/Btree.m4 +2020/02/16 | 3508 | graphics/circuit_macros/examples/Buttons.m4 +2020/02/16 | 991 | graphics/circuit_macros/examples/Byte.m4 +2020/02/16 | 6371 | graphics/circuit_macros/examples/CanLogic.m4 +2020/02/16 | 2670 | graphics/circuit_macros/examples/CctTable.m4 +2020/02/16 | 233 | graphics/circuit_macros/examples/Ccurve.m4 +2020/02/16 | 1039 | graphics/circuit_macros/examples/chaos.m4 +2020/02/16 | 8955 | graphics/circuit_macros/examples/Chuck.m4 +2020/02/16 | 482 | graphics/circuit_macros/examples/clock.m4 +2020/02/16 | 2161 | graphics/circuit_macros/examples/Conn.m4 +2020/02/16 | 3326 | graphics/circuit_macros/examples/Contact.m4 +2020/02/16 | 1585 | graphics/circuit_macros/examples/Contacts.m4 +2020/02/16 | 4288 | graphics/circuit_macros/examples/control.m4 +2020/02/16 | 551 | graphics/circuit_macros/examples/Counting.m4 +2020/02/16 | 1358 | graphics/circuit_macros/examples/Crossbar.m4 +2020/02/16 | 2520 | graphics/circuit_macros/examples/Crow.m4 +2020/02/16 | 1879 | graphics/circuit_macros/examples/Cruller.m4 +2020/02/16 | 2295 | graphics/circuit_macros/examples/csc.m4 +2020/02/16 | 6003 | graphics/circuit_macros/examples/CSlight.m4 +2020/02/16 | 5890 | graphics/circuit_macros/examples/Csource.m4 +2020/02/16 | 460 | graphics/circuit_macros/examples/debug1.tex +2020/02/16 | 1939 | graphics/circuit_macros/examples/debug2.m4 +2020/02/16 | 655 | graphics/circuit_macros/examples/Decoder.m4 +2020/02/16 | 1485 | graphics/circuit_macros/examples/Demultiplexer.m4 +2020/02/16 | 654 | graphics/circuit_macros/examples/diamond.m4 +2020/02/16 | 6854 | graphics/circuit_macros/examples/Dini.m4 +2020/02/16 | 1467 | graphics/circuit_macros/examples/Diodes.m4 +2020/02/16 | 1966 | graphics/circuit_macros/examples/Drive.m4 +2020/02/16 | 980 | graphics/circuit_macros/examples/Emarrows.m4 +2020/02/16 | 2584 | graphics/circuit_macros/examples/Escher.m4 +2020/02/16 | 4305 | graphics/circuit_macros/examples/Euro.m4 +2020/02/16 | 2412 | graphics/circuit_macros/examples/ex00.m4 +2020/02/16 | 697 | graphics/circuit_macros/examples/ex01.m4 +2020/02/16 | 1100 | graphics/circuit_macros/examples/ex02.m4 +2020/02/16 | 673 | graphics/circuit_macros/examples/ex03.m4 +2020/02/16 | 1654 | graphics/circuit_macros/examples/ex04.m4 +2020/02/16 | 1608 | graphics/circuit_macros/examples/ex05.m4 +2020/02/16 | 2170 | graphics/circuit_macros/examples/ex06.m4 +2020/02/16 | 2556 | graphics/circuit_macros/examples/ex08.m4 +2020/02/16 | 4312 | graphics/circuit_macros/examples/ex09.m4 +2020/02/16 | 1492 | graphics/circuit_macros/examples/ex10.m4 +2020/02/16 | 2361 | graphics/circuit_macros/examples/ex11.m4 +2020/02/16 | 3339 | graphics/circuit_macros/examples/ex12.m4 +2020/02/16 | 1003 | graphics/circuit_macros/examples/ex15.m4 +2020/02/16 | 1865 | graphics/circuit_macros/examples/ex16.m4 +2020/02/16 | 1126 | graphics/circuit_macros/examples/ex17.m4 +2020/02/16 | 865 | graphics/circuit_macros/examples/ex18.m4 +2020/02/16 | 2000 | graphics/circuit_macros/examples/ex21.m4 +2020/02/16 | 879975 | graphics/circuit_macros/examples/examples.pdf +2020/02/16 | 1890 | graphics/circuit_macros/examples/examples.tex +2020/02/16 | 8372 | graphics/circuit_macros/examples/exp.m4 +2020/02/16 | 4489 | graphics/circuit_macros/examples/fet.m4 +2020/02/16 | 16829 | graphics/circuit_macros/examples/files.tex +2020/02/16 | 645 | graphics/circuit_macros/examples/Floor.m4 +2020/02/16 | 5552 | graphics/circuit_macros/examples/FlowchartDefs.m4 +2020/02/16 | 3911 | graphics/circuit_macros/examples/Flow.m4 +2020/02/16 | 899 | graphics/circuit_macros/examples/Fuses.m4 +2020/02/16 | 421 | graphics/circuit_macros/examples/GrayCode.m4 +2020/02/16 | 5478 | graphics/circuit_macros/examples/graysurf.m4 +2020/02/16 | 707 | graphics/circuit_macros/examples/Grounds.m4 +2020/02/16 | 1020 | graphics/circuit_macros/examples/Headers.m4 +2020/02/16 | 1458 | graphics/circuit_macros/examples/header.tex +2020/02/16 | 13026 | graphics/circuit_macros/examples/Heathkit.m4 +2020/02/16 | 2068 | graphics/circuit_macros/examples/I2L.m4 +2020/02/16 | 1668 | graphics/circuit_macros/examples/IC10107.m4 +2020/02/16 | 4841 | graphics/circuit_macros/examples/ics.m4 +2020/02/16 | 32 | graphics/circuit_macros/examples/Incl.eps.bb +2020/02/16 | 45323 | graphics/circuit_macros/examples/Incl.eps.gz +2020/02/16 | 741 | graphics/circuit_macros/examples/Incleps.m4 +2020/02/16 | 29772 | graphics/circuit_macros/examples/Incl.pdf +2020/02/16 | 709 | graphics/circuit_macros/examples/Inclpdf.m4 +2020/02/16 | 2362 | graphics/circuit_macros/examples/Jack.m4 +2020/02/16 | 2696 | graphics/circuit_macros/examples/keyval.m4 +2020/02/16 | 489 | graphics/circuit_macros/examples/Koch.m4 +2020/02/16 | 7113 | graphics/circuit_macros/examples/lcct.m4 +2020/02/16 | 2119 | graphics/circuit_macros/examples/Logic.m4 +2020/02/16 | 2304 | graphics/circuit_macros/examples/Loglog.m4 +2020/02/16 | 8921 | graphics/circuit_macros/examples/Makefile +2020/02/16 | 1393 | graphics/circuit_macros/examples/MC.m4 +2020/02/16 | 94471 | graphics/circuit_macros/examples/mf/cct.mf +2020/02/16 | 776 | graphics/circuit_macros/examples/mf/cct.tfm +2020/02/16 | 4615 | graphics/circuit_macros/examples/mf/font.m4 +2020/02/16 | 1529 | graphics/circuit_macros/examples/mf/Makefile +2020/02/16 | 1076 | graphics/circuit_macros/examples/mf/mftest +2020/02/16 | 3785 | graphics/circuit_macros/examples/Mixer.m4 +2020/02/16 | 1922 | graphics/circuit_macros/examples/MotorControl.m4 +2020/02/16 | 444 | graphics/circuit_macros/examples/mpost/examplesmpost.tex +2020/02/16 | 4237 | graphics/circuit_macros/examples/mpost/Makefile +2020/02/16 | 720 | graphics/circuit_macros/examples/mpost/mptest +2020/02/16 | 604 | graphics/circuit_macros/examples/mpost/README-mpost +2020/02/16 | 453 | graphics/circuit_macros/examples/mpost/tstmpost.tex +2020/02/16 | 1400 | graphics/circuit_macros/examples/Multiplexer.m4 +2020/02/16 | 499 | graphics/circuit_macros/examples/NLG.m4 +2020/02/16 | 1128 | graphics/circuit_macros/examples/NPDT.m4 +2020/02/16 | 1040 | graphics/circuit_macros/examples/Nport.m4 +2020/02/16 | 20234 | graphics/circuit_macros/examples/odistmakefile +2020/02/16 | 2792 | graphics/circuit_macros/examples/OpAmpFilter.m4 +2020/02/16 | 1433 | graphics/circuit_macros/examples/Opamp.m4 +2020/02/16 | 2442 | graphics/circuit_macros/examples/Optoiso.m4 +2020/02/16 | 1852 | graphics/circuit_macros/examples/Orbits.m4 +2020/02/16 | 1654 | graphics/circuit_macros/examples/Pconn.m4 +2020/02/16 | 1375 | graphics/circuit_macros/examples/person.m4 +2020/02/16 | 2674 | graphics/circuit_macros/examples/Planes.m4 +2020/02/16 | 1174 | graphics/circuit_macros/examples/PPA.m4 +2020/02/16 | 750 | graphics/circuit_macros/examples/psfrag/examplespsfrag.tex +2020/02/16 | 4622 | graphics/circuit_macros/examples/psfrag/Makefile +2020/02/16 | 317 | graphics/circuit_macros/examples/psfrag/README-psfrag.txt +2020/02/16 | 406 | graphics/circuit_macros/examples/psfrag/tstpsfrag.tex +2020/02/16 | 3919 | graphics/circuit_macros/examples/PushPull.m4 +2020/02/16 | 2014 | graphics/circuit_macros/examples/pwrsupply.m4 +2020/02/16 | 918 | graphics/circuit_macros/examples/Quantum.m4 +2020/02/16 | 774 | graphics/circuit_macros/examples/quick.m4 +2020/02/16 | 3545 | graphics/circuit_macros/examples/random.m4 +2020/02/16 | 2814 | graphics/circuit_macros/examples/README-examples +2020/02/16 | 6880 | graphics/circuit_macros/examples/Rectifiers.m4 +2020/02/16 | 3825 | graphics/circuit_macros/examples/recycle.m4 +2020/02/16 | 1921 | graphics/circuit_macros/examples/relaycoil.m4 +2020/02/16 | 1259 | graphics/circuit_macros/examples/Relay.m4 +2020/02/16 | 1443 | graphics/circuit_macros/examples/Resolver.m4 +2020/02/16 | 4569 | graphics/circuit_macros/examples/rose.m4 +2020/02/16 | 221 | graphics/circuit_macros/examples/rotate.tex +2020/02/16 | 1525 | graphics/circuit_macros/examples/rotatetext.m4 +2020/02/16 | 518 | graphics/circuit_macros/examples/Rotbox.m4 +2020/02/16 | 365 | graphics/circuit_macros/examples/rotellipse.m4 +2020/02/16 | 1778 | graphics/circuit_macros/examples/Schottky.m4 +2020/02/16 | 2761 | graphics/circuit_macros/examples/sfg.m4 +2020/02/16 | 4751 | graphics/circuit_macros/examples/Shaky.m4 +2020/02/16 | 7529 | graphics/circuit_macros/examples/shapes.m4 +2020/02/16 | 1406 | graphics/circuit_macros/examples/ShiftR.m4 +2020/02/16 | 1331 | graphics/circuit_macros/examples/Sierpinski.m4 +2020/02/16 | 419 | graphics/circuit_macros/examples/Sixpole.m4 +2020/02/16 | 370 | graphics/circuit_macros/examples/snake.m4 +2020/02/16 | 2085 | graphics/circuit_macros/examples/Sources.m4 +2020/02/16 | 1906 | graphics/circuit_macros/examples/SPM.m4 +2020/02/16 | 380 | graphics/circuit_macros/examples/SQUID.m4 +2020/02/16 | 947 | graphics/circuit_macros/examples/squiggle.m4 +2020/02/16 | 1955 | graphics/circuit_macros/examples/svg/ABlogixSVG.m4 +2020/02/16 | 2528 | graphics/circuit_macros/examples/svg/AdderSVG.m4 +2020/02/16 | 4337 | graphics/circuit_macros/examples/svg/AlogixSVG.m4 +2020/02/16 | 538 | graphics/circuit_macros/examples/svg/AmpTableSVG.m4 +2020/02/16 | 1090 | graphics/circuit_macros/examples/svg/AntennasSVG.m4 +2020/02/16 | 5176 | graphics/circuit_macros/examples/svg/AntiqueClockSVG.m4 +2020/02/16 | 2350 | graphics/circuit_macros/examples/svg/AudioSVG.m4 +2020/02/16 | 1668 | graphics/circuit_macros/examples/svg/Banking.m4 +2020/02/16 | 1812 | graphics/circuit_macros/examples/svg/BipSVG.m4 +2020/02/16 | 1080 | graphics/circuit_macros/examples/svg/BtreeSVG.m4 +2020/02/16 | 3583 | graphics/circuit_macros/examples/svg/ButtonsSVG.m4 +2020/02/16 | 937 | graphics/circuit_macros/examples/svg/ByteSVG.m4 +2020/02/16 | 6413 | graphics/circuit_macros/examples/svg/CanLogicSVG.m4 +2020/02/16 | 2180 | graphics/circuit_macros/examples/svg/CctTableSVG.m4 +2020/02/16 | 2022 | graphics/circuit_macros/examples/svg/ConnSVG.m4 +2020/02/16 | 1737 | graphics/circuit_macros/examples/svg/ContactsSVG.m4 +2020/02/16 | 3646 | graphics/circuit_macros/examples/svg/ContactSVG.m4 +2020/02/16 | 3206 | graphics/circuit_macros/examples/svg/controlSVG.m4 +2020/02/16 | 793 | graphics/circuit_macros/examples/svg/CountingSVG.m4 +2020/02/16 | 1387 | graphics/circuit_macros/examples/svg/CrossbarSVG.m4 +2020/02/16 | 2525 | graphics/circuit_macros/examples/svg/CrowSVG.m4 +2020/02/16 | 1882 | graphics/circuit_macros/examples/svg/CrullerSVG.m4 +2020/02/16 | 2324 | graphics/circuit_macros/examples/svg/cscSVG.m4 +2020/02/16 | 7418 | graphics/circuit_macros/examples/svg/CsourceSVG.m4 +2020/02/16 | 745 | graphics/circuit_macros/examples/svg/DecoderSVG.m4 +2020/02/16 | 1373 | graphics/circuit_macros/examples/svg/DemultiplexerSVG.m4 +2020/02/16 | 609 | graphics/circuit_macros/examples/svg/diamondSVG.m4 +2020/02/16 | 6854 | graphics/circuit_macros/examples/svg/DiniSVG.m4 +2020/02/16 | 1429 | graphics/circuit_macros/examples/svg/DiodesSVG.m4 +2020/02/16 | 1966 | graphics/circuit_macros/examples/svg/DriveSVG.m4 +2020/02/16 | 1070 | graphics/circuit_macros/examples/svg/EmarrowsSVG.m4 +2020/02/16 | 2443 | graphics/circuit_macros/examples/svg/ex00SVG.m4 +2020/02/16 | 931 | graphics/circuit_macros/examples/svg/ex01SVG.m4 +2020/02/16 | 1093 | graphics/circuit_macros/examples/svg/ex02SVG.m4 +2020/02/16 | 855 | graphics/circuit_macros/examples/svg/ex03SVG.m4 +2020/02/16 | 1891 | graphics/circuit_macros/examples/svg/ex04SVG.m4 +2020/02/16 | 1807 | graphics/circuit_macros/examples/svg/ex05SVG.m4 +2020/02/16 | 2018 | graphics/circuit_macros/examples/svg/ex06SVG.m4 +2020/02/16 | 2559 | graphics/circuit_macros/examples/svg/ex08SVG.m4 +2020/02/16 | 4108 | graphics/circuit_macros/examples/svg/ex09SVG.m4 +2020/02/16 | 1699 | graphics/circuit_macros/examples/svg/ex10SVG.m4 +2020/02/16 | 2685 | graphics/circuit_macros/examples/svg/ex11SVG.m4 +2020/02/16 | 3522 | graphics/circuit_macros/examples/svg/ex12SVG.m4 +2020/02/16 | 970 | graphics/circuit_macros/examples/svg/ex15SVG.m4 +2020/02/16 | 1893 | graphics/circuit_macros/examples/svg/ex16SVG.m4 +2020/02/16 | 1204 | graphics/circuit_macros/examples/svg/ex17SVG.m4 +2020/02/16 | 1065 | graphics/circuit_macros/examples/svg/ex18SVG.m4 +2020/02/16 | 2177 | graphics/circuit_macros/examples/svg/ex21SVG.m4 +2020/02/16 | 12306 | graphics/circuit_macros/examples/svg/examplesSVG.htmx +2020/02/16 | 10589 | graphics/circuit_macros/examples/svg/expSVG.m4 +2020/02/16 | 3836 | graphics/circuit_macros/examples/svg/fetSVG.m4 +2020/02/16 | 9954 | graphics/circuit_macros/examples/svg/FlowSVG.m4 +2020/02/16 | 444 | graphics/circuit_macros/examples/svg/FontsSVG.m4 +2020/02/16 | 869 | graphics/circuit_macros/examples/svg/FusesSVG.m4 +2020/02/16 | 422 | graphics/circuit_macros/examples/svg/GrayCodeSVG.m4 +2020/02/16 | 5537 | graphics/circuit_macros/examples/svg/graysurfSVG.m4 +2020/02/16 | 699 | graphics/circuit_macros/examples/svg/GroundsSVG.m4 +2020/02/16 | 1149 | graphics/circuit_macros/examples/svg/HeadersSVG.m4 +2020/02/16 | 12711 | graphics/circuit_macros/examples/svg/HeathkitSVG.m4 +2020/02/16 | 2171 | graphics/circuit_macros/examples/svg/I2LSVG.m4 +2020/02/16 | 5015 | graphics/circuit_macros/examples/svg/icsSVG.m4 +2020/02/16 | 4003 | graphics/circuit_macros/examples/svg/InclepsSVG.m4 +2020/02/16 | 21384 | graphics/circuit_macros/examples/svg/Incl.jpg +2020/02/16 | 2051 | graphics/circuit_macros/examples/svg/JackSVG.m4 +2020/02/16 | 7203 | graphics/circuit_macros/examples/svg/lcctSVG.m4 +2020/02/16 | 6216 | graphics/circuit_macros/examples/svg/LgateSVG.m4 +2020/02/16 | 63 | graphics/circuit_macros/examples/svg/local_init.m4 +2020/02/16 | 1931 | graphics/circuit_macros/examples/svg/LogicSVG.m4 +2020/02/16 | 2241 | graphics/circuit_macros/examples/svg/LoglogSVG.m4 +2020/02/16 | 3932 | graphics/circuit_macros/examples/svg/Makefile +2020/02/16 | 1593 | graphics/circuit_macros/examples/svg/MCSVG.m4 +2020/02/16 | 3487 | graphics/circuit_macros/examples/svg/MixerSVG.m4 +2020/02/16 | 1953 | graphics/circuit_macros/examples/svg/MotorControlSVG.m4 +2020/02/16 | 1467 | graphics/circuit_macros/examples/svg/MultiplexerSVG.m4 +2020/02/16 | 532 | graphics/circuit_macros/examples/svg/NLGSVG.m4 +2020/02/16 | 1157 | graphics/circuit_macros/examples/svg/NPDTSVG.m4 +2020/02/16 | 748 | graphics/circuit_macros/examples/svg/Np.m4 +2020/02/16 | 1238 | graphics/circuit_macros/examples/svg/NportSVG.m4 +2020/02/16 | 1034 | graphics/circuit_macros/examples/svg/OpampSVG.m4 +2020/02/16 | 2551 | graphics/circuit_macros/examples/svg/OptoisoSVG.m4 +2020/02/16 | 10439 | graphics/circuit_macros/examples/svg/paletteSVG.m4 +2020/02/16 | 1669 | graphics/circuit_macros/examples/svg/PconnSVG.m4 +2020/02/16 | 3779 | graphics/circuit_macros/examples/svg/PushPullSVG.m4 +2020/02/16 | 862 | graphics/circuit_macros/examples/svg/pwrsupplySVG.m4 +2020/02/16 | 947 | graphics/circuit_macros/examples/svg/QuantumSVG.m4 +2020/02/16 | 839 | graphics/circuit_macros/examples/svg/quickSVG.m4 +2020/02/16 | 3573 | graphics/circuit_macros/examples/svg/randomSVG.m4 +2020/02/16 | 7435 | graphics/circuit_macros/examples/svg/RectifiersSVG.m4 +2020/02/16 | 3842 | graphics/circuit_macros/examples/svg/recycleSVG.m4 +2020/02/16 | 2069 | graphics/circuit_macros/examples/svg/relaycoilSVG.m4 +2020/02/16 | 1431 | graphics/circuit_macros/examples/svg/RelaySVG.m4 +2020/02/16 | 4624 | graphics/circuit_macros/examples/svg/roseSVG.m4 +2020/02/16 | 545 | graphics/circuit_macros/examples/svg/RotboxSVG.m4 +2020/02/16 | 1837 | graphics/circuit_macros/examples/svg/SchottkySVG.m4 +2020/02/16 | 3290 | graphics/circuit_macros/examples/svg/sfgSVG.m4 +2020/02/16 | 7526 | graphics/circuit_macros/examples/svg/shapesSVG.m4 +2020/02/16 | 1437 | graphics/circuit_macros/examples/svg/ShiftRSVG.m4 +2020/02/16 | 1331 | graphics/circuit_macros/examples/svg/SierpinskiSVG.m4 +2020/02/16 | 419 | graphics/circuit_macros/examples/svg/SixpoleSVG.m4 +2020/02/16 | 1842 | graphics/circuit_macros/examples/svg/SourcesSVG.m4 +2020/02/16 | 417 | graphics/circuit_macros/examples/svg/SQUIDSVG.m4 +2020/02/16 | 1456 | graphics/circuit_macros/examples/svg/SVGconfig.m4 +2020/02/16 | 3964 | graphics/circuit_macros/examples/svg/SwitchesSVG.m4 +2020/02/16 | 1055 | graphics/circuit_macros/examples/svg/TgateSVG.m4 +2020/02/16 | 1444 | graphics/circuit_macros/examples/svg/ThreeSVG.m4 +2020/02/16 | 3310 | graphics/circuit_macros/examples/svg/thyristorSVG.m4 +2020/02/16 | 1616 | graphics/circuit_macros/examples/svg/TimerSVG.m4 +2020/02/16 | 8094 | graphics/circuit_macros/examples/svg/tstSVG.htmx +2020/02/16 | 1675 | graphics/circuit_macros/examples/svg/TTLnandSVG.m4 +2020/02/16 | 3091 | graphics/circuit_macros/examples/svg/TtreeSVG.m4 +2020/02/16 | 12478 | graphics/circuit_macros/examples/svg/TubediagsSVG.m4 +2020/02/16 | 682 | graphics/circuit_macros/examples/svg/ujtSVG.m4 +2020/02/16 | 888 | graphics/circuit_macros/examples/svg/VariableSVG.m4 +2020/02/16 | 2994 | graphics/circuit_macros/examples/svg/WindingsSVG.m4 +2020/02/16 | 3631 | graphics/circuit_macros/examples/svg/wormSVG.m4 +2020/02/16 | 1559 | graphics/circuit_macros/examples/svg/XformSVG.m4 +2020/02/16 | 1985 | graphics/circuit_macros/examples/svg/XORSVG.m4 +2020/02/16 | 3608 | graphics/circuit_macros/examples/Switches.m4 +2020/02/16 | 591 | graphics/circuit_macros/examples/test.m4 +2020/02/16 | 416 | graphics/circuit_macros/examples/testpdf.tex +2020/02/16 | 1022 | graphics/circuit_macros/examples/Tgate.m4 +2020/02/16 | 1287 | graphics/circuit_macros/examples/Three.m4 +2020/02/16 | 3321 | graphics/circuit_macros/examples/thyristor.m4 +2020/02/16 | 382 | graphics/circuit_macros/examples/tikz.tex +2020/02/16 | 1546 | graphics/circuit_macros/examples/Timer.m4 +2020/02/16 | 219 | graphics/circuit_macros/examples/tst1.tex +2020/02/16 | 613 | graphics/circuit_macros/examples/tst.tex +2020/02/16 | 1558 | graphics/circuit_macros/examples/TTLnand.m4 +2020/02/16 | 2097 | graphics/circuit_macros/examples/Ttree.m4 +2020/02/16 | 9840 | graphics/circuit_macros/examples/tubedefs.m4 +2020/02/16 | 13256 | graphics/circuit_macros/examples/Tubediags.m4 +2020/02/16 | 660 | graphics/circuit_macros/examples/ujt.m4 +2020/02/16 | 756 | graphics/circuit_macros/examples/Variable.m4 +2020/02/16 | 442 | graphics/circuit_macros/examples/Wheat.m4 +2020/02/16 | 3346 | graphics/circuit_macros/examples/Windings.m4 +2020/02/16 | 281 | graphics/circuit_macros/examples/windows.m4 +2020/02/16 | 2799 | graphics/circuit_macros/examples/worm.m4 +2020/02/16 | 337 | graphics/circuit_macros/examples/xfig/Makefile +2020/02/16 | 21204 | graphics/circuit_macros/examples/xfig/xfiglib.fig +2020/02/16 | 5969 | graphics/circuit_macros/examples/xfig/xfiglib.m4 +2020/02/16 | 1526 | graphics/circuit_macros/examples/Xform.m4 +2020/02/16 | 1823 | graphics/circuit_macros/examples/XOR.m4 +2020/02/16 | 656 | graphics/circuit_macros/examples/Zcos.m4 +2020/02/16 | 1019 | graphics/circuit_macros/gpic.m4 +2020/02/16 | 11273 | graphics/circuit_macros/lib3D.m4 +2020/02/16 | 154504 | graphics/circuit_macros/libcct.m4 +2020/02/16 | 78304 | graphics/circuit_macros/libgen.m4 +2020/02/16 | 48452 | graphics/circuit_macros/liblog.m4 +2020/02/16 | 19176 | graphics/circuit_macros/Licence.txt +2020/02/16 | 1639 | graphics/circuit_macros/Makefile +2020/02/16 | 1114 | graphics/circuit_macros/mfpic.m4 +2020/02/16 | 1640 | graphics/circuit_macros/mpost.m4 +2020/02/16 | 2085 | graphics/circuit_macros/pgf.m4 +2020/02/16 | 2834 | graphics/circuit_macros/postscript.m4 +2020/02/16 | 706 | graphics/circuit_macros/psfrag.m4 +2020/02/16 | 2099 | graphics/circuit_macros/pstricks.m4 +2020/02/16 | 20277 | graphics/circuit_macros/README +2020/02/16 | 8309 | graphics/circuit_macros/svg.m4 +2020/02/16 | 1029 | graphics/circuit_macros/xfig.m4 +2020/02/17 | 1990264 | graphics/circuit_macros.zip 2018/09/22 | 49163 | graphics/coloremoji/coloremoji.sty 2018/09/22 | 15169 | graphics/coloremoji/emoji_images/hires/1F004.pdf 2018/09/22 | 24318 | graphics/coloremoji/emoji_images/hires/1F0CF.pdf @@ -161145,7 +161187,7 @@ 2019/11/29 | 509662 | install/macros/latex/contrib/kvoptions.tds.zip 2019/12/15 | 385518 | install/macros/latex/contrib/kvsetkeys.tds.zip 2020/02/03 | 785185 | install/macros/latex/contrib/l3backend.tds.zip -2020/02/03 | 785221 | install/macros/latex/contrib/l3build.tds.zip +2020/02/17 | 788432 | install/macros/latex/contrib/l3build.tds.zip 2020/01/13 | 4940260 | install/macros/latex/contrib/l3experimental.tds.zip 2020/02/14 | 11698994 | install/macros/latex/contrib/l3kernel.tds.zip 2020/02/14 | 2132045 | install/macros/latex/contrib/l3packages.tds.zip @@ -187632,172 +187674,173 @@ 2013/04/03 | 3218 | macros/latex/contrib/ghab/ghab.sty 2013/04/03 | 883 | macros/latex/contrib/ghab/README 2013/04/04 | 29183 | macros/latex/contrib/ghab.zip -2020/01/16 | 780361 | macros/latex/contrib/ghsystem/ghsystem_en.pdf -2020/01/16 | 17982 | macros/latex/contrib/ghsystem/ghsystem_en.tex -2020/01/16 | 26108 | macros/latex/contrib/ghsystem/ghsystem.sty -2020/01/16 | 29821 | macros/latex/contrib/ghsystem/language/ghsystem_english.def -2020/01/16 | 34803 | macros/latex/contrib/ghsystem/language/ghsystem_french.def -2020/01/16 | 31123 | macros/latex/contrib/ghsystem/language/ghsystem_german.def -2020/01/16 | 32258 | macros/latex/contrib/ghsystem/language/ghsystem_italian.def -2020/01/16 | 17753 | macros/latex/contrib/ghsystem/language/ghsystem_langtemplate.def -2020/01/16 | 33318 | macros/latex/contrib/ghsystem/language/ghsystem_spanish.def -2020/01/16 | 129487 | macros/latex/contrib/ghsystem/pictures/ghsystem_acid-8.eps -2020/01/16 | 42790 | macros/latex/contrib/ghsystem/pictures/ghsystem_acid-8.jpg -2020/01/16 | 9729 | macros/latex/contrib/ghsystem/pictures/ghsystem_acid-8.pdf -2020/01/16 | 9668 | macros/latex/contrib/ghsystem/pictures/ghsystem_acid-8.png -2020/01/16 | 118 | macros/latex/contrib/ghsystem/pictures/ghsystem_acid-8.tex -2020/01/16 | 107294 | macros/latex/contrib/ghsystem/pictures/ghsystem_acid.eps -2020/01/16 | 37848 | macros/latex/contrib/ghsystem/pictures/ghsystem_acid.jpg -2020/01/16 | 8999 | macros/latex/contrib/ghsystem/pictures/ghsystem_acid.pdf -2020/01/16 | 37706 | macros/latex/contrib/ghsystem/pictures/ghsystem_acid.png -2020/01/16 | 116 | macros/latex/contrib/ghsystem/pictures/ghsystem_acid.tex -2020/01/16 | 103665 | macros/latex/contrib/ghsystem/pictures/ghsystem_aqpol.eps -2020/01/16 | 36154 | macros/latex/contrib/ghsystem/pictures/ghsystem_aqpol.jpg -2020/01/16 | 8580 | macros/latex/contrib/ghsystem/pictures/ghsystem_aqpol.pdf -2020/01/16 | 8339 | macros/latex/contrib/ghsystem/pictures/ghsystem_aqpol.png -2020/01/16 | 117 | macros/latex/contrib/ghsystem/pictures/ghsystem_aqpol.tex -2020/01/16 | 91865 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle-2-black.eps -2020/01/16 | 37718 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle-2-black.jpg -2020/01/16 | 5227 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle-2-black.pdf -2020/01/16 | 5056 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle-2-black.png -2020/01/16 | 126 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle-2-black.tex -2020/01/16 | 105750 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle-2-white.eps -2020/01/16 | 39232 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle-2-white.jpg -2020/01/16 | 5237 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle-2-white.pdf -2020/01/16 | 5057 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle-2-white.png -2020/01/16 | 126 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle-2-white.tex -2020/01/16 | 83299 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle.eps -2020/01/16 | 28215 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle.jpg -2020/01/16 | 5285 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle.pdf -2020/01/16 | 5028 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle.png -2020/01/16 | 118 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle.tex -2020/01/16 | 87535 | macros/latex/contrib/ghsystem/pictures/ghsystem_exclam.eps -2020/01/16 | 27186 | macros/latex/contrib/ghsystem/pictures/ghsystem_exclam.jpg -2020/01/16 | 5805 | macros/latex/contrib/ghsystem/pictures/ghsystem_exclam.pdf -2020/01/16 | 5716 | macros/latex/contrib/ghsystem/pictures/ghsystem_exclam.png -2020/01/16 | 118 | macros/latex/contrib/ghsystem/pictures/ghsystem_exclam.tex -2020/01/16 | 145546 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-1.eps -2020/01/16 | 53511 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-1.jpg -2020/01/16 | 11035 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-1.pdf -2020/01/16 | 10889 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-1.png -2020/01/16 | 120 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-1.tex -2020/01/16 | 146344 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-2.eps -2020/01/16 | 53802 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-2.jpg -2020/01/16 | 11061 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-2.pdf -2020/01/16 | 10919 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-2.png -2020/01/16 | 120 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-2.tex -2020/01/16 | 146302 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-3.eps -2020/01/16 | 54910 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-3.jpg -2020/01/16 | 11175 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-3.pdf -2020/01/16 | 11014 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-3.png -2020/01/16 | 120 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-3.tex -2020/01/16 | 111949 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-4.eps -2020/01/16 | 40172 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-4.jpg -2020/01/16 | 5694 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-4.pdf -2020/01/16 | 5443 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-4.png -2020/01/16 | 120 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-4.tex -2020/01/16 | 114274 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-5.eps -2020/01/16 | 42072 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-5.jpg -2020/01/16 | 6468 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-5.pdf -2020/01/16 | 6323 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-5.png -2020/01/16 | 120 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-5.tex -2020/01/16 | 118144 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-6.eps -2020/01/16 | 39304 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-6.jpg -2020/01/16 | 6646 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-6.pdf -2020/01/16 | 6486 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-6.png -2020/01/16 | 120 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-6.tex -2020/01/16 | 123037 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos.eps -2020/01/16 | 43610 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos.jpg -2020/01/16 | 11156 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos.pdf -2020/01/16 | 10980 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos.png -2020/01/16 | 118 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos.tex -2020/01/16 | 121328 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-2-black.eps -2020/01/16 | 43545 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-2-black.jpg -2020/01/16 | 7529 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-2-black.pdf -2020/01/16 | 7277 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-2-black.png -2020/01/16 | 125 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-2-black.tex -2020/01/16 | 119030 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-2-white.eps -2020/01/16 | 44957 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-2-white.jpg -2020/01/16 | 7558 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-2-white.pdf -2020/01/16 | 7347 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-2-white.png -2020/01/16 | 125 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-2-white.tex -2020/01/16 | 117611 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-3-black.eps -2020/01/16 | 43516 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-3-black.jpg -2020/01/16 | 7556 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-3-black.pdf -2020/01/16 | 7327 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-3-black.png -2020/01/16 | 125 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-3-black.tex -2020/01/16 | 118949 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-3-white.eps -2020/01/16 | 45199 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-3-white.jpg -2020/01/16 | 7638 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-3-white.pdf -2020/01/16 | 7429 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-3-white.png -2020/01/16 | 125 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-3-white.tex -2020/01/16 | 174407 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-1.eps -2020/01/16 | 55062 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-1.jpg -2020/01/16 | 13598 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-1.pdf -2020/01/16 | 13487 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-1.png -2020/01/16 | 121 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-1.tex -2020/01/16 | 124843 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-2.eps -2020/01/16 | 47016 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-2.jpg -2020/01/16 | 7998 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-2.pdf -2020/01/16 | 7876 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-2.png -2020/01/16 | 121 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-2.tex -2020/01/16 | 100387 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-3-black.eps -2020/01/16 | 45242 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-3-black.jpg -2020/01/16 | 7315 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-3-black.pdf -2020/01/16 | 7143 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-3-black.png -2020/01/16 | 127 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-3-black.tex -2020/01/16 | 118558 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-3-white.eps -2020/01/16 | 47110 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-3-white.jpg -2020/01/16 | 7317 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-3-white.pdf -2020/01/16 | 7159 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-3-white.png -2020/01/16 | 127 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-3-white.tex -2020/01/16 | 110449 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-5-2-black.eps -2020/01/16 | 45437 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-5-2-black.jpg -2020/01/16 | 8142 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-5-2-black.pdf -2020/01/16 | 7973 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-5-2-black.png -2020/01/16 | 127 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-5-2-black.tex -2020/01/16 | 110455 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-5-2-white.eps -2020/01/16 | 47054 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-5-2-white.jpg -2020/01/16 | 8133 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-5-2-white.pdf -2020/01/16 | 7956 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-5-2-white.png -2020/01/16 | 127 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-5-2-white.tex -2020/01/16 | 102072 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame.eps -2020/01/16 | 33643 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame.jpg -2020/01/16 | 94298 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-O-5-1.eps -2020/01/16 | 45394 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-O-5-1.jpg -2020/01/16 | 7530 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-O-5-1.pdf -2020/01/16 | 7319 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-O-5-1.png -2020/01/16 | 123 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-O-5-1.tex -2020/01/16 | 105701 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-O.eps -2020/01/16 | 34707 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-O.jpg -2020/01/16 | 9051 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-O.pdf -2020/01/16 | 8862 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-O.png -2020/01/16 | 119 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-O.tex -2020/01/16 | 8418 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame.pdf -2020/01/16 | 8223 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame.png -2020/01/16 | 117 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame.tex -2020/01/16 | 110140 | macros/latex/contrib/ghsystem/pictures/ghsystem_health.eps -2020/01/16 | 38998 | macros/latex/contrib/ghsystem/pictures/ghsystem_health.jpg -2020/01/16 | 9541 | macros/latex/contrib/ghsystem/pictures/ghsystem_health.pdf -2020/01/16 | 9431 | macros/latex/contrib/ghsystem/pictures/ghsystem_health.png -2020/01/16 | 118 | macros/latex/contrib/ghsystem/pictures/ghsystem_health.tex -2020/01/16 | 137228 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull-2.eps -2020/01/16 | 46125 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull-2.jpg -2020/01/16 | 9710 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull-2.pdf -2020/01/16 | 9631 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull-2.png -2020/01/16 | 119 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull-2.tex -2020/01/16 | 138197 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull-6.eps -2020/01/16 | 46507 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull-6.jpg -2020/01/16 | 9869 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull-6.pdf -2020/01/16 | 9820 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull-6.png -2020/01/16 | 119 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull-6.tex -2020/01/16 | 120639 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull.eps -2020/01/16 | 45843 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull.jpg -2020/01/16 | 10765 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull.pdf -2020/01/16 | 10514 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull.png -2020/01/16 | 117 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull.tex -2020/01/16 | 1623 | macros/latex/contrib/ghsystem/README -2020/01/16 | 3007077 | macros/latex/contrib/ghsystem.zip +2020/02/17 | 7446 | macros/latex/contrib/ghsystem/ghsystem-manual.cls +2020/02/17 | 782510 | macros/latex/contrib/ghsystem/ghsystem-manual.pdf +2020/02/17 | 16935 | macros/latex/contrib/ghsystem/ghsystem-manual.tex +2020/02/17 | 26176 | macros/latex/contrib/ghsystem/ghsystem.sty +2020/02/17 | 29843 | macros/latex/contrib/ghsystem/language/ghsystem_english.def +2020/02/17 | 35054 | macros/latex/contrib/ghsystem/language/ghsystem_french.def +2020/02/17 | 31145 | macros/latex/contrib/ghsystem/language/ghsystem_german.def +2020/02/17 | 32280 | macros/latex/contrib/ghsystem/language/ghsystem_italian.def +2020/02/17 | 17775 | macros/latex/contrib/ghsystem/language/ghsystem_langtemplate.def +2020/02/17 | 33340 | macros/latex/contrib/ghsystem/language/ghsystem_spanish.def +2020/02/17 | 129487 | macros/latex/contrib/ghsystem/pictures/ghsystem_acid-8.eps +2020/02/17 | 42790 | macros/latex/contrib/ghsystem/pictures/ghsystem_acid-8.jpg +2020/02/17 | 9729 | macros/latex/contrib/ghsystem/pictures/ghsystem_acid-8.pdf +2020/02/17 | 9668 | macros/latex/contrib/ghsystem/pictures/ghsystem_acid-8.png +2020/02/17 | 118 | macros/latex/contrib/ghsystem/pictures/ghsystem_acid-8.tex +2020/02/17 | 107294 | macros/latex/contrib/ghsystem/pictures/ghsystem_acid.eps +2020/02/17 | 37848 | macros/latex/contrib/ghsystem/pictures/ghsystem_acid.jpg +2020/02/17 | 8999 | macros/latex/contrib/ghsystem/pictures/ghsystem_acid.pdf +2020/02/17 | 37706 | macros/latex/contrib/ghsystem/pictures/ghsystem_acid.png +2020/02/17 | 116 | macros/latex/contrib/ghsystem/pictures/ghsystem_acid.tex +2020/02/17 | 103665 | macros/latex/contrib/ghsystem/pictures/ghsystem_aqpol.eps +2020/02/17 | 36154 | macros/latex/contrib/ghsystem/pictures/ghsystem_aqpol.jpg +2020/02/17 | 8580 | macros/latex/contrib/ghsystem/pictures/ghsystem_aqpol.pdf +2020/02/17 | 8339 | macros/latex/contrib/ghsystem/pictures/ghsystem_aqpol.png +2020/02/17 | 117 | macros/latex/contrib/ghsystem/pictures/ghsystem_aqpol.tex +2020/02/17 | 91865 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle-2-black.eps +2020/02/17 | 37718 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle-2-black.jpg +2020/02/17 | 5227 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle-2-black.pdf +2020/02/17 | 5056 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle-2-black.png +2020/02/17 | 126 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle-2-black.tex +2020/02/17 | 105750 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle-2-white.eps +2020/02/17 | 39232 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle-2-white.jpg +2020/02/17 | 5237 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle-2-white.pdf +2020/02/17 | 5057 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle-2-white.png +2020/02/17 | 126 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle-2-white.tex +2020/02/17 | 83299 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle.eps +2020/02/17 | 28215 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle.jpg +2020/02/17 | 5285 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle.pdf +2020/02/17 | 5028 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle.png +2020/02/17 | 118 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle.tex +2020/02/17 | 87535 | macros/latex/contrib/ghsystem/pictures/ghsystem_exclam.eps +2020/02/17 | 27186 | macros/latex/contrib/ghsystem/pictures/ghsystem_exclam.jpg +2020/02/17 | 5805 | macros/latex/contrib/ghsystem/pictures/ghsystem_exclam.pdf +2020/02/17 | 5716 | macros/latex/contrib/ghsystem/pictures/ghsystem_exclam.png +2020/02/17 | 118 | macros/latex/contrib/ghsystem/pictures/ghsystem_exclam.tex +2020/02/17 | 145546 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-1.eps +2020/02/17 | 53511 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-1.jpg +2020/02/17 | 11035 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-1.pdf +2020/02/17 | 10889 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-1.png +2020/02/17 | 120 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-1.tex +2020/02/17 | 146344 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-2.eps +2020/02/17 | 53802 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-2.jpg +2020/02/17 | 11061 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-2.pdf +2020/02/17 | 10919 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-2.png +2020/02/17 | 120 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-2.tex +2020/02/17 | 146302 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-3.eps +2020/02/17 | 54910 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-3.jpg +2020/02/17 | 11175 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-3.pdf +2020/02/17 | 11014 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-3.png +2020/02/17 | 120 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-3.tex +2020/02/17 | 111949 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-4.eps +2020/02/17 | 40172 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-4.jpg +2020/02/17 | 5694 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-4.pdf +2020/02/17 | 5443 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-4.png +2020/02/17 | 120 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-4.tex +2020/02/17 | 114274 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-5.eps +2020/02/17 | 42072 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-5.jpg +2020/02/17 | 6468 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-5.pdf +2020/02/17 | 6323 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-5.png +2020/02/17 | 120 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-5.tex +2020/02/17 | 118144 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-6.eps +2020/02/17 | 39304 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-6.jpg +2020/02/17 | 6646 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-6.pdf +2020/02/17 | 6486 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-6.png +2020/02/17 | 120 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-6.tex +2020/02/17 | 123037 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos.eps +2020/02/17 | 43610 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos.jpg +2020/02/17 | 11156 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos.pdf +2020/02/17 | 10980 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos.png +2020/02/17 | 118 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos.tex +2020/02/17 | 121328 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-2-black.eps +2020/02/17 | 43545 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-2-black.jpg +2020/02/17 | 7529 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-2-black.pdf +2020/02/17 | 7277 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-2-black.png +2020/02/17 | 125 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-2-black.tex +2020/02/17 | 119030 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-2-white.eps +2020/02/17 | 44957 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-2-white.jpg +2020/02/17 | 7558 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-2-white.pdf +2020/02/17 | 7347 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-2-white.png +2020/02/17 | 125 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-2-white.tex +2020/02/17 | 117611 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-3-black.eps +2020/02/17 | 43516 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-3-black.jpg +2020/02/17 | 7556 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-3-black.pdf +2020/02/17 | 7327 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-3-black.png +2020/02/17 | 125 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-3-black.tex +2020/02/17 | 118949 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-3-white.eps +2020/02/17 | 45199 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-3-white.jpg +2020/02/17 | 7638 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-3-white.pdf +2020/02/17 | 7429 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-3-white.png +2020/02/17 | 125 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-3-white.tex +2020/02/17 | 174407 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-1.eps +2020/02/17 | 55062 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-1.jpg +2020/02/17 | 13598 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-1.pdf +2020/02/17 | 13487 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-1.png +2020/02/17 | 121 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-1.tex +2020/02/17 | 124843 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-2.eps +2020/02/17 | 47016 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-2.jpg +2020/02/17 | 7998 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-2.pdf +2020/02/17 | 7876 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-2.png +2020/02/17 | 121 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-2.tex +2020/02/17 | 100387 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-3-black.eps +2020/02/17 | 45242 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-3-black.jpg +2020/02/17 | 7315 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-3-black.pdf +2020/02/17 | 7143 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-3-black.png +2020/02/17 | 127 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-3-black.tex +2020/02/17 | 118558 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-3-white.eps +2020/02/17 | 47110 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-3-white.jpg +2020/02/17 | 7317 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-3-white.pdf +2020/02/17 | 7159 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-3-white.png +2020/02/17 | 127 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-3-white.tex +2020/02/17 | 110449 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-5-2-black.eps +2020/02/17 | 45437 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-5-2-black.jpg +2020/02/17 | 8142 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-5-2-black.pdf +2020/02/17 | 7973 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-5-2-black.png +2020/02/17 | 127 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-5-2-black.tex +2020/02/17 | 110455 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-5-2-white.eps +2020/02/17 | 47054 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-5-2-white.jpg +2020/02/17 | 8133 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-5-2-white.pdf +2020/02/17 | 7956 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-5-2-white.png +2020/02/17 | 127 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-5-2-white.tex +2020/02/17 | 102072 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame.eps +2020/02/17 | 33643 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame.jpg +2020/02/17 | 94298 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-O-5-1.eps +2020/02/17 | 45394 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-O-5-1.jpg +2020/02/17 | 7530 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-O-5-1.pdf +2020/02/17 | 7319 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-O-5-1.png +2020/02/17 | 123 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-O-5-1.tex +2020/02/17 | 105701 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-O.eps +2020/02/17 | 34707 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-O.jpg +2020/02/17 | 9051 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-O.pdf +2020/02/17 | 8862 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-O.png +2020/02/17 | 119 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-O.tex +2020/02/17 | 8418 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame.pdf +2020/02/17 | 8223 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame.png +2020/02/17 | 117 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame.tex +2020/02/17 | 110140 | macros/latex/contrib/ghsystem/pictures/ghsystem_health.eps +2020/02/17 | 38998 | macros/latex/contrib/ghsystem/pictures/ghsystem_health.jpg +2020/02/17 | 9541 | macros/latex/contrib/ghsystem/pictures/ghsystem_health.pdf +2020/02/17 | 9431 | macros/latex/contrib/ghsystem/pictures/ghsystem_health.png +2020/02/17 | 118 | macros/latex/contrib/ghsystem/pictures/ghsystem_health.tex +2020/02/17 | 137228 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull-2.eps +2020/02/17 | 46125 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull-2.jpg +2020/02/17 | 9710 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull-2.pdf +2020/02/17 | 9631 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull-2.png +2020/02/17 | 119 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull-2.tex +2020/02/17 | 138197 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull-6.eps +2020/02/17 | 46507 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull-6.jpg +2020/02/17 | 9869 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull-6.pdf +2020/02/17 | 9820 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull-6.png +2020/02/17 | 119 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull-6.tex +2020/02/17 | 120639 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull.eps +2020/02/17 | 45843 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull.jpg +2020/02/17 | 10765 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull.pdf +2020/02/17 | 10514 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull.png +2020/02/17 | 117 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull.tex +2020/02/17 | 1652 | macros/latex/contrib/ghsystem/README +2020/02/17 | 3011432 | macros/latex/contrib/ghsystem.zip 2011/09/05 | 13395 | macros/latex/contrib/gincltex/gincltex.dtx 2011/09/05 | 1741 | macros/latex/contrib/gincltex/gincltex.ins 2011/09/05 | 168041 | macros/latex/contrib/gincltex/gincltex.pdf @@ -190782,31 +190825,31 @@ 2020/02/03 | 47981 | macros/latex/contrib/l3backend/l3backend-pdf.dtx 2020/02/03 | 550 | macros/latex/contrib/l3backend/README.md 2020/02/04 | 760971 | macros/latex/contrib/l3backend.zip -2020/02/03 | 11626 | macros/latex/contrib/l3build/CHANGELOG.md -2020/02/03 | 2339 | macros/latex/contrib/l3build/CONTRIBUTING.md -2020/02/03 | 1817 | macros/latex/contrib/l3build/l3build.1 -2020/02/03 | 7438 | macros/latex/contrib/l3build/l3build-arguments.lua -2020/02/03 | 3239 | macros/latex/contrib/l3build/l3build-aux.lua -2020/02/03 | 33662 | macros/latex/contrib/l3build/l3build-check.lua -2020/02/03 | 1495 | macros/latex/contrib/l3build/l3build-clean.lua -2020/02/03 | 4472 | macros/latex/contrib/l3build/l3build-ctan.lua -2020/02/03 | 104647 | macros/latex/contrib/l3build/l3build.dtx -2020/02/03 | 11748 | macros/latex/contrib/l3build/l3build-file-functions.lua -2020/02/03 | 2191 | macros/latex/contrib/l3build/l3build-help.lua -2020/02/03 | 1537 | macros/latex/contrib/l3build/l3build.ins -2020/02/03 | 8915 | macros/latex/contrib/l3build/l3build-install.lua -2020/02/03 | 5392 | macros/latex/contrib/l3build/l3build.lua -2020/02/03 | 7205 | macros/latex/contrib/l3build/l3build-manifest.lua -2020/02/03 | 11024 | macros/latex/contrib/l3build/l3build-manifest-setup.lua -2020/02/03 | 703656 | macros/latex/contrib/l3build/l3build.pdf -2020/02/03 | 4303 | macros/latex/contrib/l3build/l3build-stdmain.lua -2020/02/03 | 2305 | macros/latex/contrib/l3build/l3build-tagging.lua -2020/02/03 | 6789 | macros/latex/contrib/l3build/l3build-typesetting.lua -2020/02/03 | 3106 | macros/latex/contrib/l3build/l3build-unpack.lua -2020/02/03 | 11707 | macros/latex/contrib/l3build/l3build-upload.lua -2020/02/03 | 6790 | macros/latex/contrib/l3build/l3build-variables.lua -2020/02/03 | 1024 | macros/latex/contrib/l3build/README.md -2020/02/04 | 781273 | macros/latex/contrib/l3build.zip +2020/02/17 | 11945 | macros/latex/contrib/l3build/CHANGELOG.md +2020/02/17 | 2339 | macros/latex/contrib/l3build/CONTRIBUTING.md +2020/02/17 | 1817 | macros/latex/contrib/l3build/l3build.1 +2020/02/17 | 7599 | macros/latex/contrib/l3build/l3build-arguments.lua +2020/02/17 | 3244 | macros/latex/contrib/l3build/l3build-aux.lua +2020/02/17 | 33832 | macros/latex/contrib/l3build/l3build-check.lua +2020/02/17 | 1495 | macros/latex/contrib/l3build/l3build-clean.lua +2020/02/17 | 4479 | macros/latex/contrib/l3build/l3build-ctan.lua +2020/02/17 | 105983 | macros/latex/contrib/l3build/l3build.dtx +2020/02/17 | 11748 | macros/latex/contrib/l3build/l3build-file-functions.lua +2020/02/17 | 2480 | macros/latex/contrib/l3build/l3build-help.lua +2020/02/17 | 1537 | macros/latex/contrib/l3build/l3build.ins +2020/02/17 | 8915 | macros/latex/contrib/l3build/l3build-install.lua +2020/02/17 | 5392 | macros/latex/contrib/l3build/l3build.lua +2020/02/17 | 7205 | macros/latex/contrib/l3build/l3build-manifest.lua +2020/02/17 | 11024 | macros/latex/contrib/l3build/l3build-manifest-setup.lua +2020/02/17 | 706057 | macros/latex/contrib/l3build/l3build.pdf +2020/02/17 | 4308 | macros/latex/contrib/l3build/l3build-stdmain.lua +2020/02/17 | 2310 | macros/latex/contrib/l3build/l3build-tagging.lua +2020/02/17 | 7045 | macros/latex/contrib/l3build/l3build-typesetting.lua +2020/02/17 | 3111 | macros/latex/contrib/l3build/l3build-unpack.lua +2020/02/17 | 11712 | macros/latex/contrib/l3build/l3build-upload.lua +2020/02/17 | 6881 | macros/latex/contrib/l3build/l3build-variables.lua +2020/02/17 | 1024 | macros/latex/contrib/l3build/README.md +2020/02/17 | 784484 | macros/latex/contrib/l3build.zip 2020/01/13 | 3714 | macros/latex/contrib/l3experimental/CHANGELOG.md 2020/01/13 | 17815 | macros/latex/contrib/l3experimental/l3benchmark.dtx 2020/01/13 | 1564 | macros/latex/contrib/l3experimental/l3benchmark.ins @@ -207943,15 +207986,15 @@ 2010/12/14 | 1803 | macros/luatex/latex/luatextra/News 2010/11/11 | 1007 | macros/luatex/latex/luatextra/README 2010/12/14 | 319194 | macros/luatex/latex/luatextra.zip -2017/10/01 | 8348 | macros/luatex/latex/luatodonotes/inspect.lua -2017/10/01 | 81923 | macros/luatex/latex/luatodonotes/luatodonotes.dtx -2017/10/01 | 3095 | macros/luatex/latex/luatodonotes/luatodonotes.ins -2017/10/01 | 85932 | macros/luatex/latex/luatodonotes/luatodonotes.lua -2017/10/01 | 212809 | macros/luatex/latex/luatodonotes/luatodonotes.pdf -2017/10/01 | 4139 | macros/luatex/latex/luatodonotes/path_line.lua -2017/10/01 | 2024 | macros/luatex/latex/luatodonotes/path_point.lua -2017/10/01 | 1114 | macros/luatex/latex/luatodonotes/README.md -2017/10/01 | 251474 | macros/luatex/latex/luatodonotes.zip +2020/02/16 | 8348 | macros/luatex/latex/luatodonotes/inspect.lua +2020/02/16 | 84144 | macros/luatex/latex/luatodonotes/luatodonotes.dtx +2020/02/16 | 3095 | macros/luatex/latex/luatodonotes/luatodonotes.ins +2020/02/16 | 87301 | macros/luatex/latex/luatodonotes/luatodonotes.lua +2020/02/16 | 215081 | macros/luatex/latex/luatodonotes/luatodonotes.pdf +2020/02/16 | 4139 | macros/luatex/latex/luatodonotes/path_line.lua +2020/02/16 | 2024 | macros/luatex/latex/luatodonotes/path_point.lua +2020/02/16 | 1114 | macros/luatex/latex/luatodonotes/README.md +2020/02/17 | 254567 | macros/luatex/latex/luatodonotes.zip 2018/12/02 | 292770 | macros/luatex/latex/makecookbook/makecookbook-doc.pdf 2018/12/02 | 120782 | macros/luatex/latex/makecookbook/makecookbook-doc.tex 2018/12/02 | 638 | macros/luatex/latex/makecookbook/mycookbook/cb-idxstyle.ist @@ -251472,9 +251515,9 @@ 2019/02/28 | 344 | systems/texlive/tlnet/archive/arara.x86_64-linuxmusl.tar.xz 2019/02/28 | 336 | systems/texlive/tlnet/archive/arara.x86_64-linux.tar.xz 2019/02/28 | 340 | systems/texlive/tlnet/archive/arara.x86_64-solaris.tar.xz -2019/12/04 | 948944 | systems/texlive/tlnet/archive/archaeologie.doc.r53011.tar.xz -2019/12/04 | 72704 | systems/texlive/tlnet/archive/archaeologie.r53011.tar.xz -2019/12/04 | 134268 | systems/texlive/tlnet/archive/archaeologie.source.r53011.tar.xz +2020/02/17 | 903636 | systems/texlive/tlnet/archive/archaeologie.doc.r53813.tar.xz +2020/02/17 | 72684 | systems/texlive/tlnet/archive/archaeologie.r53813.tar.xz +2020/02/17 | 134276 | systems/texlive/tlnet/archive/archaeologie.source.r53813.tar.xz 2019/02/28 | 2944788 | systems/texlive/tlnet/archive/archaic.doc.tar.xz 2019/02/28 | 134456 | systems/texlive/tlnet/archive/archaic.source.tar.xz 2019/02/28 | 372708 | systems/texlive/tlnet/archive/archaic.tar.xz @@ -252488,9 +252531,9 @@ 2019/02/28 | 3100 | systems/texlive/tlnet/archive/breakurl.tar.xz 2019/02/28 | 169444 | systems/texlive/tlnet/archive/bredzenie.doc.tar.xz 2019/02/28 | 49840 | systems/texlive/tlnet/archive/bredzenie.tar.xz -2019/10/16 | 1047960 | systems/texlive/tlnet/archive/breqn.doc.tar.xz -2019/10/16 | 80048 | systems/texlive/tlnet/archive/breqn.source.tar.xz -2019/10/16 | 24432 | systems/texlive/tlnet/archive/breqn.tar.xz +2020/02/17 | 1059680 | systems/texlive/tlnet/archive/breqn.doc.r53814.tar.xz +2020/02/17 | 24276 | systems/texlive/tlnet/archive/breqn.r53814.tar.xz +2020/02/17 | 79868 | systems/texlive/tlnet/archive/breqn.source.r53814.tar.xz 2019/02/28 | 60588 | systems/texlive/tlnet/archive/br-lex.doc.tar.xz 2019/02/28 | 2296 | systems/texlive/tlnet/archive/br-lex.tar.xz 2019/02/28 | 61592 | systems/texlive/tlnet/archive/bropd.doc.tar.xz @@ -252553,9 +252596,9 @@ 2019/02/28 | 2808 | systems/texlive/tlnet/archive/bxjaprnind.tar.xz 2019/10/24 | 2068 | systems/texlive/tlnet/archive/bxjatoucs.doc.tar.xz 2019/10/24 | 25604 | systems/texlive/tlnet/archive/bxjatoucs.tar.xz -2020/02/06 | 1790400 | systems/texlive/tlnet/archive/bxjscls.doc.r53684.tar.xz -2020/02/06 | 31388 | systems/texlive/tlnet/archive/bxjscls.r53684.tar.xz -2020/02/06 | 78872 | systems/texlive/tlnet/archive/bxjscls.source.r53684.tar.xz +2020/02/17 | 1825324 | systems/texlive/tlnet/archive/bxjscls.doc.r53812.tar.xz +2020/02/17 | 31412 | systems/texlive/tlnet/archive/bxjscls.r53812.tar.xz +2020/02/17 | 78928 | systems/texlive/tlnet/archive/bxjscls.source.r53812.tar.xz 2019/02/28 | 2376 | systems/texlive/tlnet/archive/bxnewfont.doc.tar.xz 2019/02/28 | 4760 | systems/texlive/tlnet/archive/bxnewfont.tar.xz 2019/02/28 | 2112 | systems/texlive/tlnet/archive/bxorigcapt.doc.tar.xz @@ -253142,10 +253185,10 @@ 2019/10/02 | 824 | systems/texlive/tlnet/archive/collection-langenglish.tar.xz 2019/02/28 | 692 | systems/texlive/tlnet/archive/collection-langeuropean.tar.xz 2019/06/06 | 540 | systems/texlive/tlnet/archive/collection-langfrench.tar.xz -2020/01/03 | 640 | systems/texlive/tlnet/archive/collection-langgerman.r53300.tar.xz +2020/02/17 | 652 | systems/texlive/tlnet/archive/collection-langgerman.r53815.tar.xz 2019/02/28 | 428 | systems/texlive/tlnet/archive/collection-langgreek.tar.xz 2020/01/03 | 420 | systems/texlive/tlnet/archive/collection-langitalian.r53306.tar.xz -2019/10/24 | 600 | systems/texlive/tlnet/archive/collection-langjapanese.tar.xz +2020/02/17 | 616 | systems/texlive/tlnet/archive/collection-langjapanese.r53811.tar.xz 2020/01/24 | 396 | systems/texlive/tlnet/archive/collection-langkorean.r53506.tar.xz 2019/10/31 | 776 | systems/texlive/tlnet/archive/collection-langother.tar.xz 2019/02/28 | 412 | systems/texlive/tlnet/archive/collection-langpolish.tar.xz @@ -255950,6 +255993,10 @@ 2019/02/28 | 28420 | systems/texlive/tlnet/archive/HA-prosper.tar.xz 2019/02/28 | 216528 | systems/texlive/tlnet/archive/har2nat.doc.tar.xz 2019/02/28 | 1136 | systems/texlive/tlnet/archive/har2nat.tar.xz +2020/02/17 | 3048 | systems/texlive/tlnet/archive/haranoaji.doc.r53810.tar.xz +2020/02/17 | 3052 | systems/texlive/tlnet/archive/haranoaji-extra.doc.r53811.tar.xz +2020/02/17 | 25950260 | systems/texlive/tlnet/archive/haranoaji-extra.r53811.tar.xz +2020/02/17 | 26211208 | systems/texlive/tlnet/archive/haranoaji.r53810.tar.xz 2019/02/28 | 120084 | systems/texlive/tlnet/archive/hardwrap.doc.tar.xz 2019/02/28 | 11108 | systems/texlive/tlnet/archive/hardwrap.source.tar.xz 2019/02/28 | 2732 | systems/texlive/tlnet/archive/hardwrap.tar.xz @@ -256616,13 +256663,13 @@ 2020/01/27 | 42024 | systems/texlive/tlnet/archive/kpathsea.amd64-freebsd.r53577.tar.xz 2020/01/27 | 37784 | systems/texlive/tlnet/archive/kpathsea.amd64-netbsd.r53577.tar.xz 2020/01/27 | 32208 | systems/texlive/tlnet/archive/kpathsea.armhf-linux.r53577.tar.xz -2020/01/27 | 968120 | systems/texlive/tlnet/archive/kpathsea.doc.r53569.tar.xz +2020/02/17 | 968124 | systems/texlive/tlnet/archive/kpathsea.doc.r53807.tar.xz 2020/01/27 | 47004 | systems/texlive/tlnet/archive/kpathsea.i386-cygwin.r53577.tar.xz 2020/01/27 | 36204 | systems/texlive/tlnet/archive/kpathsea.i386-freebsd.r53577.tar.xz 2020/01/27 | 42180 | systems/texlive/tlnet/archive/kpathsea.i386-linux.r53577.tar.xz 2020/01/27 | 34676 | systems/texlive/tlnet/archive/kpathsea.i386-netbsd.r53577.tar.xz 2020/01/27 | 40908 | systems/texlive/tlnet/archive/kpathsea.i386-solaris.r53577.tar.xz -2020/01/27 | 32164 | systems/texlive/tlnet/archive/kpathsea.r53569.tar.xz +2020/02/17 | 32296 | systems/texlive/tlnet/archive/kpathsea.r53807.tar.xz 2020/01/27 | 486420 | systems/texlive/tlnet/archive/kpathsea.win32.r53577.tar.xz 2020/01/27 | 45288 | systems/texlive/tlnet/archive/kpathsea.x86_64-cygwin.r53577.tar.xz 2020/01/27 | 39300 | systems/texlive/tlnet/archive/kpathsea.x86_64-darwinlegacy.r53577.tar.xz @@ -258647,8 +258694,8 @@ 2020/01/27 | 4528316 | systems/texlive/tlnet/archive/newtx.r53549.tar.xz 2019/02/28 | 332220 | systems/texlive/tlnet/archive/newtxsf.doc.tar.xz 2019/02/28 | 105228 | systems/texlive/tlnet/archive/newtxsf.tar.xz -2019/02/28 | 80548 | systems/texlive/tlnet/archive/newtxtt.doc.tar.xz -2019/02/28 | 116900 | systems/texlive/tlnet/archive/newtxtt.tar.xz +2020/02/17 | 171356 | systems/texlive/tlnet/archive/newtxtt.doc.r53809.tar.xz +2020/02/17 | 116976 | systems/texlive/tlnet/archive/newtxtt.r53809.tar.xz 2019/02/28 | 389624 | systems/texlive/tlnet/archive/newunicodechar.doc.tar.xz 2019/02/28 | 6964 | systems/texlive/tlnet/archive/newunicodechar.source.tar.xz 2019/02/28 | 2116 | systems/texlive/tlnet/archive/newunicodechar.tar.xz @@ -258875,8 +258922,24 @@ 2019/02/28 | 4016 | systems/texlive/tlnet/archive/oplotsymbl.tar.xz 2019/02/28 | 37400 | systems/texlive/tlnet/archive/opteng.doc.tar.xz 2019/02/28 | 5824 | systems/texlive/tlnet/archive/opteng.tar.xz -2020/02/13 | 1290232 | systems/texlive/tlnet/archive/optex.doc.r53764.tar.xz -2020/02/13 | 67540 | systems/texlive/tlnet/archive/optex.r53764.tar.xz +2020/02/16 | 320 | systems/texlive/tlnet/archive/optex.aarch64-linux.r53804.tar.xz +2020/02/16 | 320 | systems/texlive/tlnet/archive/optex.amd64-freebsd.r53804.tar.xz +2020/02/16 | 316 | systems/texlive/tlnet/archive/optex.amd64-netbsd.r53804.tar.xz +2020/02/16 | 316 | systems/texlive/tlnet/archive/optex.armhf-linux.r53804.tar.xz +2020/02/16 | 1290232 | systems/texlive/tlnet/archive/optex.doc.r53804.tar.xz +2020/02/16 | 320 | systems/texlive/tlnet/archive/optex.i386-cygwin.r53804.tar.xz +2020/02/16 | 316 | systems/texlive/tlnet/archive/optex.i386-freebsd.r53804.tar.xz +2020/02/16 | 316 | systems/texlive/tlnet/archive/optex.i386-linux.r53804.tar.xz +2020/02/16 | 316 | systems/texlive/tlnet/archive/optex.i386-netbsd.r53804.tar.xz +2020/02/16 | 316 | systems/texlive/tlnet/archive/optex.i386-solaris.r53804.tar.xz +2020/02/16 | 67588 | systems/texlive/tlnet/archive/optex.r53804.tar.xz +2020/02/17 | 864 | systems/texlive/tlnet/archive/optex.win32.r53816.tar.xz +2020/02/16 | 324 | systems/texlive/tlnet/archive/optex.x86_64-cygwin.r53804.tar.xz +2020/02/16 | 324 | systems/texlive/tlnet/archive/optex.x86_64-darwinlegacy.r53804.tar.xz +2020/02/16 | 320 | systems/texlive/tlnet/archive/optex.x86_64-darwin.r53804.tar.xz +2020/02/16 | 320 | systems/texlive/tlnet/archive/optex.x86_64-linuxmusl.r53804.tar.xz +2020/02/16 | 320 | systems/texlive/tlnet/archive/optex.x86_64-linux.r53804.tar.xz +2020/02/16 | 316 | systems/texlive/tlnet/archive/optex.x86_64-solaris.r53804.tar.xz 2019/05/03 | 256448 | systems/texlive/tlnet/archive/optidef.doc.tar.xz 2019/05/03 | 4948 | systems/texlive/tlnet/archive/optidef.tar.xz 2019/02/28 | 295236 | systems/texlive/tlnet/archive/optional.doc.tar.xz @@ -260598,6 +260661,8 @@ 2020/01/06 | 1730408 | systems/texlive/tlnet/archive/scholax.r53330.tar.xz 2019/02/28 | 4411800 | systems/texlive/tlnet/archive/schule.doc.tar.xz 2019/02/28 | 1960980 | systems/texlive/tlnet/archive/schule.tar.xz +2020/02/17 | 189272 | systems/texlive/tlnet/archive/schulmathematik.doc.r53815.tar.xz +2020/02/17 | 9932 | systems/texlive/tlnet/archive/schulmathematik.r53815.tar.xz 2019/02/28 | 720152 | systems/texlive/tlnet/archive/schulschriften.doc.tar.xz 2019/02/28 | 48980 | systems/texlive/tlnet/archive/schulschriften.tar.xz 2020/01/03 | 190900 | systems/texlive/tlnet/archive/schwalbe-chess.doc.r53305.tar.xz @@ -261631,7 +261696,7 @@ 2019/04/06 | 276 | systems/texlive/tlnet/archive/texlive-it.tar.xz 2019/08/31 | 1502868 | systems/texlive/tlnet/archive/texlive-ja.doc.tar.xz 2019/08/31 | 276 | systems/texlive/tlnet/archive/texlive-ja.tar.xz -2020/02/09 | 139868 | systems/texlive/tlnet/archive/texlive-msg-translations.r53715.tar.xz +2020/02/17 | 139888 | systems/texlive/tlnet/archive/texlive-msg-translations.r53808.tar.xz 2019/02/28 | 344 | systems/texlive/tlnet/archive/texliveonfly.aarch64-linux.tar.xz 2019/02/28 | 344 | systems/texlive/tlnet/archive/texliveonfly.amd64-freebsd.tar.xz 2019/02/28 | 344 | systems/texlive/tlnet/archive/texliveonfly.amd64-netbsd.tar.xz @@ -261658,7 +261723,7 @@ 2020/01/27 | 584 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.r53555.tar.xz 2020/01/27 | 584 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.r53555.tar.xz 2020/01/27 | 588 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.r53555.tar.xz -2020/01/31 | 207788 | systems/texlive/tlnet/archive/texlive-scripts.doc.r53602.tar.xz +2020/02/16 | 207788 | systems/texlive/tlnet/archive/texlive-scripts.doc.r53801.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 @@ -261682,7 +261747,7 @@ 2020/01/27 | 580 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r53555.tar.xz 2020/01/27 | 580 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r53555.tar.xz 2020/01/27 | 584 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r53555.tar.xz -2020/01/31 | 131956 | systems/texlive/tlnet/archive/texlive-scripts.r53602.tar.xz +2020/02/16 | 131976 | systems/texlive/tlnet/archive/texlive-scripts.r53801.tar.xz 2020/01/27 | 36024 | systems/texlive/tlnet/archive/texlive-scripts.win32.r53555.tar.xz 2020/01/27 | 584 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r53555.tar.xz 2020/01/27 | 596 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-darwinlegacy.r53555.tar.xz @@ -262124,13 +262189,13 @@ 2019/07/06 | 344 | systems/texlive/tlnet/archive/tlshell.amd64-freebsd.tar.xz 2019/07/06 | 340 | systems/texlive/tlnet/archive/tlshell.amd64-netbsd.tar.xz 2019/07/06 | 340 | systems/texlive/tlnet/archive/tlshell.armhf-linux.tar.xz -2020/02/08 | 440 | systems/texlive/tlnet/archive/tlshell.doc.r53707.tar.xz +2020/02/16 | 440 | systems/texlive/tlnet/archive/tlshell.doc.r53801.tar.xz 2019/07/06 | 340 | systems/texlive/tlnet/archive/tlshell.i386-cygwin.tar.xz 2019/07/06 | 340 | systems/texlive/tlnet/archive/tlshell.i386-freebsd.tar.xz 2019/07/06 | 340 | systems/texlive/tlnet/archive/tlshell.i386-linux.tar.xz 2019/07/06 | 340 | systems/texlive/tlnet/archive/tlshell.i386-netbsd.tar.xz 2019/07/06 | 340 | systems/texlive/tlnet/archive/tlshell.i386-solaris.tar.xz -2020/02/08 | 25392 | systems/texlive/tlnet/archive/tlshell.r53707.tar.xz +2020/02/16 | 25508 | systems/texlive/tlnet/archive/tlshell.r53801.tar.xz 2019/10/07 | 3934704 | systems/texlive/tlnet/archive/tlshell.win32.tar.xz 2019/07/06 | 340 | systems/texlive/tlnet/archive/tlshell.x86_64-cygwin.tar.xz 2019/07/06 | 348 | systems/texlive/tlnet/archive/tlshell.x86_64-darwinlegacy.tar.xz @@ -263289,16 +263354,16 @@ 2020/01/24 | 138180 | systems/texlive/tlnet/archive/zxjatype.doc.r53500.tar.xz 2020/01/24 | 8760 | systems/texlive/tlnet/archive/zxjatype.r53500.tar.xz 2020/01/17 | 107147 | systems/texlive/tlnet/install-tl -2020/02/16 | 3948926 | systems/texlive/tlnet/install-tl-unx.tar.gz -2020/02/16 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 -2020/02/16 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc +2020/02/17 | 3949332 | systems/texlive/tlnet/install-tl-unx.tar.gz +2020/02/17 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2020/02/17 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc 2019/05/09 | 4543 | systems/texlive/tlnet/install-tl-windows.bat -2020/02/16 | 18699205 | systems/texlive/tlnet/install-tl-windows.exe -2020/02/16 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 -2020/02/16 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc -2020/02/16 | 22541272 | systems/texlive/tlnet/install-tl.zip -2020/02/16 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 -2020/02/16 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc +2020/02/17 | 18694329 | systems/texlive/tlnet/install-tl-windows.exe +2020/02/17 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 +2020/02/17 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc +2020/02/17 | 22541706 | systems/texlive/tlnet/install-tl.zip +2020/02/17 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 +2020/02/17 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc 2019/04/29 | 1221 | systems/texlive/tlnet/README.md 2019/03/13 | 5351 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg 2016/04/12 | 600 | systems/texlive/tlnet/tlpkg/gpg/random_seed @@ -263314,7 +263379,7 @@ 2020/01/17 | 43304 | systems/texlive/tlnet/tlpkg/installer/install-menu-perltk.pl 2020/01/17 | 33253 | systems/texlive/tlnet/tlpkg/installer/install-menu-text.pl 2018/09/27 | 19281 | systems/texlive/tlnet/tlpkg/installer/install-menu-wizard.pl -2019/10/11 | 65014 | systems/texlive/tlnet/tlpkg/installer/install-tl-gui.tcl +2020/02/16 | 65046 | systems/texlive/tlnet/tlpkg/installer/install-tl-gui.tcl 2008/07/04 | 4805 | systems/texlive/tlnet/tlpkg/installer/install-tl.html 2017/04/13 | 240640 | systems/texlive/tlnet/tlpkg/installer/tar.exe 2018/04/29 | 7927 | systems/texlive/tlnet/tlpkg/installer/texdirsel.pl @@ -263349,16 +263414,16 @@ 2019/03/02 | 188472 | systems/texlive/tlnet/tlpkg/installer/xz/xz.x86_64-solaris 2019/12/22 | 9915 | systems/texlive/tlnet/tlpkg/TeXLive/TeXCatalogue.pm 2017/06/04 | 21326 | systems/texlive/tlnet/tlpkg/TeXLive/TLConfFile.pm -2019/12/10 | 11104 | systems/texlive/tlnet/tlpkg/TeXLive/TLConfig.pm +2020/02/16 | 11112 | systems/texlive/tlnet/tlpkg/TeXLive/TLConfig.pm 2019/09/23 | 18176 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm 2016/10/11 | 4618 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm 2017/11/14 | 27560 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm -2020/02/16 | 16118873 | systems/texlive/tlnet/tlpkg/texlive.tlpdb -2020/02/16 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2020/02/17 | 16129129 | systems/texlive/tlnet/tlpkg/texlive.tlpdb +2020/02/17 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 2020/02/07 | 87503 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm -2020/02/16 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 -2020/02/16 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc -2020/02/16 | 2165528 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +2020/02/17 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +2020/02/17 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +2020/02/17 | 2170332 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz 2019/12/22 | 58727 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm 2020/01/17 | 40906 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm 2018/08/31 | 14972 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm @@ -265011,27 +265076,27 @@ 2018/11/08 | 6297510 | systems/texlive/tlnet/tlpkg/tltcl/tclkit.exe 2019/10/06 | 1769 | systems/texlive/tlnet/tlpkg/tltcl/tclkit.exe.manifest 2018/11/30 | 1310 | systems/texlive/tlnet/tlpkg/tltcl/tlmgr.gif -2019/10/11 | 19752 | systems/texlive/tlnet/tlpkg/tltcl/tltcl.tcl -2020/02/08 | 86642 | systems/texlive/tlnet/tlpkg/translations/cs.po -2020/02/08 | 94505 | systems/texlive/tlnet/tlpkg/translations/de.po -2020/02/08 | 85674 | systems/texlive/tlnet/tlpkg/translations/es.po -2020/02/08 | 99020 | systems/texlive/tlnet/tlpkg/translations/fr.po -2020/02/08 | 92795 | systems/texlive/tlnet/tlpkg/translations/it.po -2020/02/08 | 77974 | systems/texlive/tlnet/tlpkg/translations/ja.po -2020/02/08 | 58343 | systems/texlive/tlnet/tlpkg/translations/messages.pot -2020/02/08 | 74380 | systems/texlive/tlnet/tlpkg/translations/nl.po -2020/02/08 | 72323 | systems/texlive/tlnet/tlpkg/translations/pl.po -2020/02/08 | 88051 | systems/texlive/tlnet/tlpkg/translations/pt_BR.po +2020/02/16 | 20268 | systems/texlive/tlnet/tlpkg/tltcl/tltcl.tcl +2020/02/16 | 86642 | systems/texlive/tlnet/tlpkg/translations/cs.po +2020/02/16 | 94505 | systems/texlive/tlnet/tlpkg/translations/de.po +2020/02/16 | 85674 | systems/texlive/tlnet/tlpkg/translations/es.po +2020/02/16 | 99020 | systems/texlive/tlnet/tlpkg/translations/fr.po +2020/02/16 | 92795 | systems/texlive/tlnet/tlpkg/translations/it.po +2020/02/16 | 77974 | systems/texlive/tlnet/tlpkg/translations/ja.po +2020/02/16 | 58343 | systems/texlive/tlnet/tlpkg/translations/messages.pot +2020/02/16 | 74380 | systems/texlive/tlnet/tlpkg/translations/nl.po +2020/02/16 | 72323 | systems/texlive/tlnet/tlpkg/translations/pl.po +2020/02/16 | 88051 | systems/texlive/tlnet/tlpkg/translations/pt_BR.po 2019/03/25 | 430 | systems/texlive/tlnet/tlpkg/translations/README -2020/02/08 | 110941 | systems/texlive/tlnet/tlpkg/translations/ru.po -2020/02/08 | 93838 | systems/texlive/tlnet/tlpkg/translations/sk.po -2020/02/08 | 74973 | systems/texlive/tlnet/tlpkg/translations/sl.po -2020/02/08 | 109592 | systems/texlive/tlnet/tlpkg/translations/sr.po +2020/02/16 | 110941 | systems/texlive/tlnet/tlpkg/translations/ru.po +2020/02/16 | 93838 | systems/texlive/tlnet/tlpkg/translations/sk.po +2020/02/16 | 74973 | systems/texlive/tlnet/tlpkg/translations/sl.po +2020/02/16 | 109592 | systems/texlive/tlnet/tlpkg/translations/sr.po 2019/03/28 | 847 | systems/texlive/tlnet/tlpkg/translations/translators -2020/02/08 | 86709 | systems/texlive/tlnet/tlpkg/translations/uk.po -2020/02/08 | 95234 | systems/texlive/tlnet/tlpkg/translations/vi.po -2020/02/08 | 72459 | systems/texlive/tlnet/tlpkg/translations/zh_CN.po -2020/02/08 | 63018 | systems/texlive/tlnet/tlpkg/translations/zh_TW.po +2020/02/16 | 86709 | systems/texlive/tlnet/tlpkg/translations/uk.po +2020/02/16 | 95234 | systems/texlive/tlnet/tlpkg/translations/vi.po +2020/02/16 | 72459 | systems/texlive/tlnet/tlpkg/translations/zh_CN.po +2020/02/16 | 63018 | systems/texlive/tlnet/tlpkg/translations/zh_TW.po 2020/01/28 | 2443863 | systems/texlive/tlnet/update-tlmgr-r53576.exe 2020/01/28 | 154 | systems/texlive/tlnet/update-tlmgr-r53576.exe.sha512 2020/01/28 | 455 | systems/texlive/tlnet/update-tlmgr-r53576.exe.sha512.asc @@ -265679,7 +265744,7 @@ 2012/03/21 | 618786 | systems/win32/miktex/tm/packages/arabtex.tar.lzma 2015/09/08 | 525679 | systems/win32/miktex/tm/packages/arabxetex.tar.lzma 2019/09/17 | 6290987 | systems/win32/miktex/tm/packages/arara.tar.lzma -2019/12/04 | 1157153 | systems/win32/miktex/tm/packages/archaeologie.tar.lzma +2020/02/17 | 1112220 | systems/win32/miktex/tm/packages/archaeologie.tar.lzma 2015/06/03 | 2562730 | systems/win32/miktex/tm/packages/archaic.tar.lzma 2004/05/16 | 6164 | systems/win32/miktex/tm/packages/arcs.cab 2006/06/03 | 1519817 | systems/win32/miktex/tm/packages/arev.cab @@ -266020,7 +266085,7 @@ 2010/02/22 | 149124 | systems/win32/miktex/tm/packages/breakcites.tar.lzma 2013/04/15 | 120674 | systems/win32/miktex/tm/packages/breakurl.tar.lzma 2017/05/19 | 219528 | systems/win32/miktex/tm/packages/bredzenie.tar.lzma -2019/10/17 | 1153903 | systems/win32/miktex/tm/packages/breqn.tar.lzma +2020/02/17 | 1165552 | systems/win32/miktex/tm/packages/breqn.tar.lzma 2017/08/02 | 63254 | systems/win32/miktex/tm/packages/br-lex.tar.lzma 2014/10/21 | 67224 | systems/win32/miktex/tm/packages/bropd.tar.lzma 2004/11/28 | 64319 | systems/win32/miktex/tm/packages/brushscr.cab @@ -266043,7 +266108,7 @@ 2019/02/04 | 96012 | systems/win32/miktex/tm/packages/bxjaholiday.tar.lzma 2017/03/07 | 28657 | systems/win32/miktex/tm/packages/bxjalipsum.tar.lzma 2017/06/01 | 436153 | systems/win32/miktex/tm/packages/bxjaprnind.tar.lzma -2020/02/05 | 1902810 | systems/win32/miktex/tm/packages/bxjscls.tar.lzma +2020/02/17 | 1936948 | systems/win32/miktex/tm/packages/bxjscls.tar.lzma 2017/05/03 | 6734 | systems/win32/miktex/tm/packages/bxnewfont.tar.lzma 2018/09/08 | 4426 | systems/win32/miktex/tm/packages/bxorigcapt.tar.lzma 2019/10/07 | 7249 | systems/win32/miktex/tm/packages/bxpapersize.tar.lzma @@ -266768,7 +266833,7 @@ 2020/02/04 | 281488 | 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 -2020/02/16 | 524627 | systems/win32/miktex/tm/packages/files.csv.lzma +2020/02/17 | 524554 | 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 @@ -267061,6 +267126,8 @@ 2012/01/10 | 52557 | systems/win32/miktex/tm/packages/happy4th.tar.lzma 2005/09/15 | 278342 | systems/win32/miktex/tm/packages/ha-prosper.cab 2005/12/29 | 1366 | systems/win32/miktex/tm/packages/har2nat.cab +2020/02/17 | 25885404 | systems/win32/miktex/tm/packages/haranoaji-extra.tar.lzma +2020/02/17 | 26141541 | systems/win32/miktex/tm/packages/haranoaji.tar.lzma 2011/02/15 | 134243 | systems/win32/miktex/tm/packages/hardwrap.tar.lzma 2007/05/12 | 6681 | systems/win32/miktex/tm/packages/harmony.tar.bz2 2012/05/29 | 52924 | systems/win32/miktex/tm/packages/harnon-cv.tar.lzma @@ -267531,7 +267598,7 @@ 2016/06/21 | 176793 | systems/win32/miktex/tm/packages/luatex85.tar.lzma 2015/10/06 | 276167 | systems/win32/miktex/tm/packages/luatexbase.tar.lzma 2020/02/10 | 3359459 | systems/win32/miktex/tm/packages/luatexja.tar.lzma -2019/12/03 | 323255 | systems/win32/miktex/tm/packages/luatexko.tar.lzma +2020/02/17 | 356767 | systems/win32/miktex/tm/packages/luatexko.tar.lzma 2010/12/23 | 322873 | systems/win32/miktex/tm/packages/luatextra.tar.lzma 2017/10/03 | 253167 | systems/win32/miktex/tm/packages/luatodonotes.tar.lzma 2019/01/08 | 296813 | systems/win32/miktex/tm/packages/lua-visual-debug.tar.lzma @@ -267899,9 +267966,9 @@ 2018/01/12 | 157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma 2020/02/14 | 38792 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma 2020/02/14 | 42900 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma -2020/02/16 | 196723 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma -2020/02/16 | 1174584 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma -2020/02/16 | 1096625 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma +2020/02/17 | 196816 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma +2020/02/17 | 1175226 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma +2020/02/17 | 1095666 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma 2020/02/14 | 13041 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma 2020/02/14 | 14036 | 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 @@ -268048,188 +268115,188 @@ 2007/12/30 | 204631 | systems/win32/miktex/tm/packages/newspaper.tar.lzma 2018/06/08 | 440019 | systems/win32/miktex/tm/packages/newtxsf.tar.lzma 2020/01/27 | 5363606 | systems/win32/miktex/tm/packages/newtx.tar.lzma -2017/05/23 | 196873 | systems/win32/miktex/tm/packages/newtxtt.tar.lzma +2020/02/17 | 288246 | systems/win32/miktex/tm/packages/newtxtt.tar.lzma 2018/04/09 | 400132 | systems/win32/miktex/tm/packages/newunicodechar.tar.lzma 2011/09/19 | 101312 | systems/win32/miktex/tm/packages/newvbtm.tar.lzma 2019/09/11 | 231430 | systems/win32/miktex/tm/packages/newverbs.tar.lzma -2020/02/16 | 524965 | systems/win32/miktex/tm/packages/next/files.csv.lzma -2020/02/16 | 29245 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma -2020/02/16 | 33365 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma -2020/02/16 | 935863 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma -2020/02/16 | 1043545 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma -2020/02/16 | 28495 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma -2020/02/16 | 30742 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma -2020/02/16 | 29283 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma -2020/02/16 | 34869 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma -2020/02/16 | 49684 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma -2020/02/16 | 57127 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma -2020/02/16 | 84722 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma -2020/02/16 | 94283 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma -2020/02/16 | 60292 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma -2020/02/16 | 67237 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma -2020/02/16 | 26653 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma -2020/02/16 | 30234 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma -2020/02/16 | 328776 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma -2020/02/16 | 391587 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma -2020/02/16 | 32181 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma -2020/02/16 | 36398 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma -2020/02/16 | 49304 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma -2020/02/16 | 53969 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma -2020/02/16 | 4812 | systems/win32/miktex/tm/packages/next/miktex-config-2.9.tar.lzma -2020/02/16 | 199144 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma -2020/02/16 | 215280 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma -2020/02/16 | 169440 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma -2020/02/16 | 184203 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma -2020/02/16 | 52120 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma -2020/02/16 | 58862 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma -2020/02/16 | 20688 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma -2020/02/16 | 22934 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma -2020/02/16 | 450288 | systems/win32/miktex/tm/packages/next/miktex-doc-2.9.tar.lzma -2020/02/16 | 40950 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma -2020/02/16 | 45817 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma -2020/02/16 | 272360 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma -2020/02/16 | 309681 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma -2020/02/16 | 40692 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma -2020/02/16 | 44929 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma -2020/02/16 | 115488 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma -2020/02/16 | 130324 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma -2020/02/16 | 1249564 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma -2020/02/16 | 1381484 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma -2020/02/16 | 33529 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma -2020/02/16 | 38843 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma -2020/02/16 | 43430 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma -2020/02/16 | 47982 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma -2020/02/16 | 45465 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma -2020/02/16 | 50537 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma -2020/02/16 | 56736 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma -2020/02/16 | 61675 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma -2020/02/16 | 133127 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma -2020/02/16 | 152084 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma -2020/02/16 | 69636 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma -2020/02/16 | 72641 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma -2020/02/16 | 68639 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma -2020/02/16 | 77463 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma -2020/02/16 | 246462 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma -2020/02/16 | 281549 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma -2020/02/16 | 25306 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma -2020/02/16 | 28743 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma -2020/02/16 | 100620 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma -2020/02/16 | 116766 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma -2020/02/16 | 63277 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma -2020/02/16 | 72572 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma -2020/02/16 | 94007 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma -2020/02/16 | 110868 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma -2020/02/16 | 57731 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma -2020/02/16 | 64419 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma -2020/02/16 | 457124 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma -2020/02/16 | 544258 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma -2020/02/16 | 137214 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma -2020/02/16 | 149877 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma -2020/02/16 | 92882 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma -2020/02/16 | 108954 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma -2020/02/16 | 15894 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma -2020/02/16 | 17681 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma -2020/02/16 | 27781 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma -2020/02/16 | 29676 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma -2020/02/16 | 615428 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma -2020/02/16 | 669505 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma -2020/02/16 | 498553 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma -2020/02/16 | 560983 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma -2020/02/16 | 539503 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma -2020/02/16 | 576248 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma -2020/02/16 | 93432 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma -2020/02/16 | 102365 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma -2020/02/16 | 1697677 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma -2020/02/16 | 1938204 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma -2020/02/16 | 67263 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma -2020/02/16 | 73627 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma -2020/02/16 | 26928 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma -2020/02/16 | 31253 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma -2020/02/16 | 7502 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma -2020/02/16 | 8465 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma -2020/02/16 | 167839 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma -2020/02/16 | 182743 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma -2020/02/16 | 247670 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma -2020/02/16 | 281238 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma -2020/02/16 | 87150 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma -2020/02/16 | 92019 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma -2020/02/16 | 77982 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma -2020/02/16 | 86623 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma -2020/02/16 | 164888 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma -2020/02/16 | 185531 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma -2020/02/16 | 148966 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma -2020/02/16 | 168844 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma -2020/02/16 | 194912 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma -2020/02/16 | 177528 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma -2020/02/16 | 80370 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma -2020/02/16 | 91204 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma -2020/02/16 | 30994 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma -2020/02/16 | 34846 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma -2020/02/16 | 56418 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma -2020/02/16 | 62914 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma -2020/02/16 | 41847 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma -2020/02/16 | 45751 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma -2020/02/16 | 45590 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma -2020/02/16 | 52144 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma -2020/02/16 | 354459 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-2.9.tar.lzma -2020/02/16 | 387565 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-x64-2.9.tar.lzma -2020/02/16 | 321848 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma -2020/02/16 | 356122 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma -2020/02/16 | 186773 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma -2020/02/16 | 193832 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma -2020/02/16 | 201993 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma -2020/02/16 | 237661 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma -2020/02/16 | 78006 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma -2020/02/16 | 87135 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma -2020/02/16 | 932526 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma -2020/02/16 | 1043329 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma -2020/02/16 | 19799 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma -2020/02/16 | 23380 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma -2020/02/16 | 31153 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma -2020/02/16 | 36615 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma -2020/02/16 | 63183 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma -2020/02/16 | 71725 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma -2020/02/16 | 42591 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma -2020/02/16 | 50745 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma -2020/02/16 | 1102207 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma -2020/02/16 | 1229003 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma -2020/02/16 | 41840 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma -2020/02/16 | 50865 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma -2020/02/16 | 53386 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-2.9.tar.lzma -2020/02/16 | 59430 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64-2.9.tar.lzma -2020/02/16 | 26768 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma -2020/02/16 | 29120 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma -2020/02/16 | 16039 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma -2020/02/16 | 17755 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma -2020/02/16 | 63051 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma -2020/02/16 | 69185 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma -2020/02/16 | 147166 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma -2020/02/16 | 161144 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma -2020/02/16 | 74408 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma -2020/02/16 | 84413 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma -2020/02/16 | 91312 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma -2020/02/16 | 96210 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma -2020/02/16 | 2457578 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma -2020/02/16 | 2581041 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma -2020/02/16 | 54880 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma -2020/02/16 | 61310 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma -2020/02/16 | 26507 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma -2020/02/16 | 32362 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma -2020/02/16 | 61606 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma -2020/02/16 | 65019 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma -2020/02/16 | 247152 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma -2020/02/16 | 276822 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma -2020/02/16 | 533703 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma -2020/02/16 | 563262 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma -2020/02/16 | 38797 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma -2020/02/16 | 42955 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma -2020/02/16 | 196659 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma -2020/02/16 | 1175116 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma -2020/02/16 | 1094773 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma -2020/02/16 | 13068 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma -2020/02/16 | 14057 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma +2020/02/17 | 525043 | systems/win32/miktex/tm/packages/next/files.csv.lzma +2020/02/17 | 29245 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma +2020/02/17 | 33365 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma +2020/02/17 | 935864 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma +2020/02/17 | 1043545 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma +2020/02/17 | 28493 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma +2020/02/17 | 30742 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma +2020/02/17 | 29284 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma +2020/02/17 | 34870 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma +2020/02/17 | 49684 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma +2020/02/17 | 57127 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma +2020/02/17 | 84721 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma +2020/02/17 | 94281 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma +2020/02/17 | 60293 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma +2020/02/17 | 67237 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma +2020/02/17 | 26652 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma +2020/02/17 | 30234 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma +2020/02/17 | 328775 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma +2020/02/17 | 391589 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma +2020/02/17 | 32183 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma +2020/02/17 | 36398 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma +2020/02/17 | 49305 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma +2020/02/17 | 53969 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma +2020/02/17 | 4812 | systems/win32/miktex/tm/packages/next/miktex-config-2.9.tar.lzma +2020/02/17 | 199144 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma +2020/02/17 | 215281 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma +2020/02/17 | 169439 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma +2020/02/17 | 184202 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma +2020/02/17 | 52121 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma +2020/02/17 | 58862 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma +2020/02/17 | 20688 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma +2020/02/17 | 22935 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma +2020/02/17 | 450288 | systems/win32/miktex/tm/packages/next/miktex-doc-2.9.tar.lzma +2020/02/17 | 40948 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma +2020/02/17 | 45818 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma +2020/02/17 | 272360 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma +2020/02/17 | 309681 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma +2020/02/17 | 40692 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma +2020/02/17 | 44929 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma +2020/02/17 | 115488 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma +2020/02/17 | 130324 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma +2020/02/17 | 1249565 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma +2020/02/17 | 1381486 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma +2020/02/17 | 33530 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma +2020/02/17 | 38843 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma +2020/02/17 | 43430 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma +2020/02/17 | 47982 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma +2020/02/17 | 45466 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma +2020/02/17 | 50538 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma +2020/02/17 | 56734 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma +2020/02/17 | 61674 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma +2020/02/17 | 133124 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma +2020/02/17 | 152086 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma +2020/02/17 | 69636 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma +2020/02/17 | 72641 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma +2020/02/17 | 68640 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma +2020/02/17 | 77462 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma +2020/02/17 | 246460 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma +2020/02/17 | 281551 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma +2020/02/17 | 25306 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma +2020/02/17 | 28743 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma +2020/02/17 | 100619 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma +2020/02/17 | 116767 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma +2020/02/17 | 63277 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma +2020/02/17 | 72571 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma +2020/02/17 | 94008 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma +2020/02/17 | 110869 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma +2020/02/17 | 57731 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma +2020/02/17 | 64419 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma +2020/02/17 | 457122 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma +2020/02/17 | 544258 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma +2020/02/17 | 137215 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma +2020/02/17 | 149878 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma +2020/02/17 | 92882 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma +2020/02/17 | 108955 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma +2020/02/17 | 15895 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma +2020/02/17 | 17681 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma +2020/02/17 | 27781 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma +2020/02/17 | 29678 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma +2020/02/17 | 615429 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma +2020/02/17 | 669505 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma +2020/02/17 | 498553 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma +2020/02/17 | 560984 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma +2020/02/17 | 539504 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma +2020/02/17 | 576249 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma +2020/02/17 | 93432 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma +2020/02/17 | 102367 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma +2020/02/17 | 1697677 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma +2020/02/17 | 1938200 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma +2020/02/17 | 67264 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma +2020/02/17 | 73627 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma +2020/02/17 | 26927 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma +2020/02/17 | 31253 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma +2020/02/17 | 7503 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma +2020/02/17 | 8467 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma +2020/02/17 | 167838 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma +2020/02/17 | 182743 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma +2020/02/17 | 247670 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma +2020/02/17 | 281239 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma +2020/02/17 | 87149 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma +2020/02/17 | 92020 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma +2020/02/17 | 77984 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma +2020/02/17 | 86623 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma +2020/02/17 | 164888 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma +2020/02/17 | 185530 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma +2020/02/17 | 148965 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma +2020/02/17 | 168844 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma +2020/02/17 | 194912 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma +2020/02/17 | 177529 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma +2020/02/17 | 80371 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma +2020/02/17 | 91203 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma +2020/02/17 | 30996 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma +2020/02/17 | 34847 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma +2020/02/17 | 56419 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma +2020/02/17 | 62914 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma +2020/02/17 | 41846 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma +2020/02/17 | 45751 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma +2020/02/17 | 45589 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma +2020/02/17 | 52145 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma +2020/02/17 | 354459 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-2.9.tar.lzma +2020/02/17 | 387565 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-x64-2.9.tar.lzma +2020/02/17 | 321848 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma +2020/02/17 | 356123 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma +2020/02/17 | 186774 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma +2020/02/17 | 193834 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma +2020/02/17 | 201993 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma +2020/02/17 | 237662 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma +2020/02/17 | 78007 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma +2020/02/17 | 87136 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma +2020/02/17 | 932528 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma +2020/02/17 | 1043328 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma +2020/02/17 | 19800 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma +2020/02/17 | 23381 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma +2020/02/17 | 31152 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma +2020/02/17 | 36617 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma +2020/02/17 | 63183 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma +2020/02/17 | 71727 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma +2020/02/17 | 42590 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma +2020/02/17 | 50744 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma +2020/02/17 | 1102206 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma +2020/02/17 | 1229001 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma +2020/02/17 | 41838 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma +2020/02/17 | 50865 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma +2020/02/17 | 53385 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-2.9.tar.lzma +2020/02/17 | 59431 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64-2.9.tar.lzma +2020/02/17 | 26767 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma +2020/02/17 | 29119 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma +2020/02/17 | 16039 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma +2020/02/17 | 17755 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma +2020/02/17 | 63051 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma +2020/02/17 | 69185 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma +2020/02/17 | 147166 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma +2020/02/17 | 161145 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma +2020/02/17 | 74408 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma +2020/02/17 | 84412 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma +2020/02/17 | 91311 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma +2020/02/17 | 96210 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma +2020/02/17 | 2457579 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma +2020/02/17 | 2581041 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma +2020/02/17 | 54880 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma +2020/02/17 | 61310 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma +2020/02/17 | 26508 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma +2020/02/17 | 32362 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma +2020/02/17 | 61607 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma +2020/02/17 | 65019 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma +2020/02/17 | 247152 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma +2020/02/17 | 276821 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma +2020/02/17 | 533703 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma +2020/02/17 | 563260 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma +2020/02/17 | 38797 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma +2020/02/17 | 42955 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma +2020/02/17 | 196798 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma +2020/02/17 | 1175634 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma +2020/02/17 | 1097746 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma +2020/02/17 | 13067 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma +2020/02/17 | 14057 | 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 -2020/02/16 | 652 | systems/win32/miktex/tm/packages/next/pr.ini +2020/02/17 | 652 | 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 @@ -268542,7 +268609,7 @@ 2008/11/07 | 35981 | systems/win32/miktex/tm/packages/prettyref.tar.lzma 2017/07/26 | 201385 | systems/win32/miktex/tm/packages/preview.tar.lzma 2019/06/20 | 375963 | systems/win32/miktex/tm/packages/prftree.tar.lzma -2020/02/16 | 600 | systems/win32/miktex/tm/packages/pr.ini +2020/02/17 | 465 | 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 @@ -268851,6 +268918,7 @@ 2016/02/02 | 534624 | systems/win32/miktex/tm/packages/schemata.tar.lzma 2020/01/08 | 1946552 | systems/win32/miktex/tm/packages/scholax.tar.lzma 2018/08/24 | 8995560 | systems/win32/miktex/tm/packages/schule.tar.lzma +2020/02/17 | 199619 | systems/win32/miktex/tm/packages/schulmathematik.tar.lzma 2014/12/22 | 761084 | systems/win32/miktex/tm/packages/schulschriften.tar.lzma 2020/01/03 | 213046 | systems/win32/miktex/tm/packages/schwalbe-chess.tar.lzma 2004/05/07 | 2764 | systems/win32/miktex/tm/packages/scientificpaper.cab @@ -269535,7 +269603,7 @@ 2014/06/23 | 13295 | systems/win32/miktex/tm/packages/xetex-devanagari.tar.lzma 2008/06/21 | 2664 | systems/win32/miktex/tm/packages/xetexfontinfo.tar.lzma 2014/09/08 | 45644 | systems/win32/miktex/tm/packages/xetex-itrans.tar.lzma -2019/12/03 | 293696 | systems/win32/miktex/tm/packages/xetexko.tar.lzma +2020/02/17 | 294139 | systems/win32/miktex/tm/packages/xetexko.tar.lzma 2010/02/22 | 1496 | systems/win32/miktex/tm/packages/xetex-pstricks.tar.lzma 2019/12/13 | 158451 | systems/win32/miktex/tm/packages/xetexref.tar.lzma 2016/11/05 | 55120 | systems/win32/miktex/tm/packages/xetex.tar.lzma @@ -269667,7 +269735,7 @@ 2020/02/14 | 4947632 | systems/win32/w32tex/aleph-w32.tar.xz 2020/02/02 | 64233068 | systems/win32/w32tex/biblatex-biber.tar.xz 2016/12/13 | 65971452 | systems/win32/w32tex/cbfonts.tar.xz -2020/02/15 | 589840 | systems/win32/w32tex/ChangeLog +2020/02/16 | 590069 | 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 @@ -269690,7 +269758,7 @@ 2020/02/14 | 40905952 | systems/win32/w32tex/latex-dev.tar.xz 2020/02/13 | 30271176 | systems/win32/w32tex/latex.tar.xz 2020/01/20 | 996420 | systems/win32/w32tex/lcdf-typetools-w32.tar.xz -2020/02/06 | 391676380 | systems/win32/w32tex/ltxpkgdocs.tar.xz +2020/02/16 | 392821024 | systems/win32/w32tex/ltxpkgdocs.tar.xz 2020/02/15 | 34314664 | systems/win32/w32tex/ltxpkgs.tar.xz 2020/01/26 | 3915192 | systems/win32/w32tex/luajittex-dev-w32.tar.xz 2020/02/12 | 3896332 | systems/win32/w32tex/luajittex-exp-w32.tar.xz @@ -269705,7 +269773,7 @@ 2020/01/20 | 524280 | systems/win32/w32tex/mftrace-w32.tar.xz 2018/07/14 | 6364952 | systems/win32/w32tex/minitoc.tar.xz 2020/01/19 | 882832 | systems/win32/w32tex/m-tx.tar.xz -2020/01/27 | 8245268 | systems/win32/w32tex/newtxpx-boondoxfonts.tar.xz +2020/02/16 | 8102240 | systems/win32/w32tex/newtxpx-boondoxfonts.tar.xz 2020/02/13 | 1233524 | systems/win32/w32tex/omegaj-w32.tar.xz 2019/09/08 | 357888 | systems/win32/w32tex/otfbeta.tar.xz 2020/02/14 | 20436288 | systems/win32/w32tex/pdftex-w32.tar.xz @@ -269717,7 +269785,7 @@ 2020/02/12 | 284720720 | systems/win32/w32tex/pstricks.tar.xz 2020/01/20 | 517548 | systems/win32/w32tex/psutils-w32.tar.xz 2020/02/14 | 6347964 | systems/win32/w32tex/ptex-ng-w32.tar.xz -2020/02/14 | 10322572 | systems/win32/w32tex/ptex-w32.tar.xz +2020/02/16 | 10297168 | systems/win32/w32tex/ptex-w32.tar.xz 2020/01/27 | 1760916 | systems/win32/w32tex/qpdf-w32.tar.xz 2019/04/15 | 499188 | systems/win32/w32tex/sam2p-w32.tar.xz 2020/01/24 | 24929772 | systems/win32/w32tex/t1fonts.tar.xz @@ -269729,7 +269797,7 @@ 2020/01/19 | 97168 | systems/win32/w32tex/tiff2png-w32.tar.xz 2013/04/08 | 308444 | systems/win32/w32tex/timesnew.tar.xz 2020/01/01 | 2022 | systems/win32/w32tex/TLW64/00README.TLW64 -2020/02/12 | 93910973 | systems/win32/w32tex/TLW64/tl-win64.zip +2020/02/16 | 93911104 | systems/win32/w32tex/TLW64/tl-win64.zip 2020/01/20 | 818648 | systems/win32/w32tex/ttf2pk-w32.tar.xz 2020/01/20 | 830576 | systems/win32/w32tex/ttf2pt1-w32.tar.xz 2017/10/13 | 1773368 | systems/win32/w32tex/tuftelatex.tar.xz @@ -269774,7 +269842,7 @@ 2020/01/20 | 789804 | systems/win32/w32tex/win64/pstoedit-w64.tar.xz 2020/01/20 | 385896 | systems/win32/w32tex/win64/psutils-w64.tar.xz 2020/02/14 | 1680880 | systems/win32/w32tex/win64/ptex-ng-w64.tar.xz -2020/02/10 | 1872444 | systems/win32/w32tex/win64/ptex-w64.tar.xz +2020/02/16 | 1872168 | systems/win32/w32tex/win64/ptex-w64.tar.xz 2020/01/18 | 40736 | systems/win32/w32tex/win64/t1utils-w64.tar.xz 2020/01/20 | 419528 | systems/win32/w32tex/win64/tex4htk-w64.tar.xz 2020/01/18 | 96788 | systems/win32/w32tex/win64/tiff2png-w64.tar.xz @@ -269881,7 +269949,7 @@ 2004/06/04 | 404 | tds/tds.sed 2004/06/23 | 65418 | tds/tds.tex 2019/05/29 | 304264 | tds.zip -2020/02/17 | 186 | timestamp +2020/02/18 | 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 f67db258b7..462e68ca04 100644 --- a/FILES.byname.gz +++ b/FILES.byname.gz diff --git a/FILES.last07days b/FILES.last07days index 990071ab80..54bfbf3243 100644 --- a/FILES.last07days +++ b/FILES.last07days @@ -1,294 +1,1205 @@ +2020/02/17 | 9932 | systems/texlive/tlnet/archive/schulmathematik.r53815.tar.xz +2020/02/17 | 9869 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull-6.pdf +2020/02/17 | 982 | fonts/ptex-fontmaps/maps/sourcehan-otc/uptex-sourcehan-otc-04.map +2020/02/17 | 9820 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull-6.png +2020/02/17 | 9729 | macros/latex/contrib/ghsystem/pictures/ghsystem_acid-8.pdf +2020/02/17 | 9710 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull-2.pdf +2020/02/17 | 968124 | systems/texlive/tlnet/archive/kpathsea.doc.r53807.tar.xz +2020/02/17 | 9668 | macros/latex/contrib/ghsystem/pictures/ghsystem_acid-8.png +2020/02/17 | 9631 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull-2.png +2020/02/17 | 962 | fonts/ptex-fontmaps/maps/noto-otc/uptex-noto-otc-04.map +2020/02/17 | 96210 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma +2020/02/17 | 9541 | macros/latex/contrib/ghsystem/pictures/ghsystem_health.pdf +2020/02/17 | 952 | fonts/ptex-fontmaps/maps/sourcehan/uptex-sourcehan-04.map +2020/02/17 | 952 | fonts/ptex-fontmaps/maps/noto/uptex-noto-04.map +2020/02/17 | 950 | fonts/ptex-fontmaps/maps/sourcehan-otc/uptex-sourcehan-otc.map +2020/02/17 | 9431 | macros/latex/contrib/ghsystem/pictures/ghsystem_health.png +2020/02/17 | 94298 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-O-5-1.eps +2020/02/17 | 94281 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma +2020/02/17 | 94008 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma +2020/02/17 | 935864 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma +2020/02/17 | 93432 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma +2020/02/17 | 932528 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma +2020/02/17 | 930 | fonts/ptex-fontmaps/maps/noto-otc/uptex-noto-otc.map +2020/02/17 | 92 | fonts/ptex-fontmaps/maps/yu-osx/ptex-yu-osx.map +2020/02/17 | 92882 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma +2020/02/17 | 920 | fonts/ptex-fontmaps/maps/sourcehan/uptex-sourcehan.map +2020/02/17 | 920 | fonts/ptex-fontmaps/maps/noto/uptex-noto.map +2020/02/17 | 92020 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma +2020/02/17 | 91865 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle-2-black.eps +2020/02/17 | 91311 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma +2020/02/17 | 91203 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma +2020/02/17 | 90 | fonts/ptex-fontmaps/maps/sourcehan/ptex-sourcehan.map +2020/02/17 | 90 | fonts/ptex-fontmaps/maps/sourcehan-otc/ptex-sourcehan-otc.map +2020/02/17 | 90 | fonts/ptex-fontmaps/maps/noto/ptex-noto.map +2020/02/17 | 90 | fonts/ptex-fontmaps/maps/noto-otc/ptex-noto-otc.map +2020/02/17 | 90 | fonts/ptex-fontmaps/maps/noEmbed/ptex-noEmbed.map +2020/02/17 | 9051 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-O.pdf +2020/02/17 | 903636 | systems/texlive/tlnet/archive/archaeologie.doc.r53813.tar.xz +2020/02/17 | 8999 | macros/latex/contrib/ghsystem/pictures/ghsystem_acid.pdf +2020/02/17 | 8915 | macros/latex/contrib/l3build/l3build-install.lua +2020/02/17 | 8862 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-O.png +2020/02/17 | 87535 | macros/latex/contrib/ghsystem/pictures/ghsystem_exclam.eps +2020/02/17 | 87149 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma +2020/02/17 | 87136 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma +2020/02/17 | 86623 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma +2020/02/17 | 864 | systems/texlive/tlnet/archive/optex.win32.r53816.tar.xz +2020/02/17 | 8580 | macros/latex/contrib/ghsystem/pictures/ghsystem_aqpol.pdf +2020/02/17 | 84721 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma +2020/02/17 | 8467 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma +2020/02/17 | 84412 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma +2020/02/17 | 8418 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame.pdf +2020/02/17 | 8339 | macros/latex/contrib/ghsystem/pictures/ghsystem_aqpol.png +2020/02/17 | 83299 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle.eps +2020/02/17 | 82 | fonts/ptex-fontmaps/maps/ms-osx/ptex-ms-osx.map +2020/02/17 | 8223 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame.png +2020/02/17 | 8142 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-5-2-black.pdf +2020/02/17 | 8133 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-5-2-white.pdf +2020/02/17 | 80371 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma +2020/02/17 | 7998 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-2.pdf +2020/02/17 | 79868 | systems/texlive/tlnet/archive/breqn.source.r53814.tar.xz +2020/02/17 | 7973 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-5-2-black.png +2020/02/17 | 7956 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-5-2-white.png +2020/02/17 | 78928 | systems/texlive/tlnet/archive/bxjscls.source.r53812.tar.xz +2020/02/17 | 788432 | install/macros/latex/contrib/l3build.tds.zip +2020/02/17 | 7876 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-2.png +2020/02/17 | 784484 | macros/latex/contrib/l3build.zip +2020/02/17 | 782 | fonts/ptex-fontmaps/maps/morisawa-pr6n/uptex-morisawa-pr6n-04.map +2020/02/17 | 782510 | macros/latex/contrib/ghsystem/ghsystem-manual.pdf +2020/02/17 | 78007 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma +2020/02/17 | 77984 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma +2020/02/17 | 777524 | fonts/ptex-fontmaps.zip +2020/02/17 | 776 | fonts/ptex-fontmaps/examples/series-compare.tex +2020/02/17 | 7764 | fonts/ptex-fontmaps/script/updmap-otf.sh +2020/02/17 | 77462 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma +2020/02/17 | 7638 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-3-white.pdf +2020/02/17 | 762 | fonts/ptex-fontmaps/maps/morisawa/uptex-morisawa-04.map +2020/02/17 | 761 | fonts/ptex-fontmaps/script/kanji-config-updmap-sys.sh +2020/02/17 | 7599 | macros/latex/contrib/l3build/l3build-arguments.lua +2020/02/17 | 757 | fonts/ptex-fontmaps/script/kanji-config-updmap-user.sh +2020/02/17 | 7558 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-2-white.pdf +2020/02/17 | 7556 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-3-black.pdf +2020/02/17 | 7530 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-O-5-1.pdf +2020/02/17 | 7529 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-2-black.pdf +2020/02/17 | 750 | fonts/ptex-fontmaps/maps/morisawa-pr6n/uptex-morisawa-pr6n.map +2020/02/17 | 7503 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma +2020/02/17 | 744 | fonts/ptex-fontmaps/examples/ptex-sample.tex +2020/02/17 | 7446 | macros/latex/contrib/ghsystem/ghsystem-manual.cls +2020/02/17 | 74408 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma +2020/02/17 | 7429 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-3-white.png +2020/02/17 | 73627 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma +2020/02/17 | 7347 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-2-white.png +2020/02/17 | 7327 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-3-black.png +2020/02/17 | 7319 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-O-5-1.png +2020/02/17 | 7317 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-3-white.pdf +2020/02/17 | 7315 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-3-black.pdf +2020/02/17 | 730 | fonts/ptex-fontmaps/maps/morisawa/uptex-morisawa.map +2020/02/17 | 7277 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-2-black.png +2020/02/17 | 72684 | systems/texlive/tlnet/archive/archaeologie.r53813.tar.xz +2020/02/17 | 72641 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma +2020/02/17 | 72571 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma +2020/02/17 | 7205 | macros/latex/contrib/l3build/l3build-manifest.lua +2020/02/17 | 71727 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma +2020/02/17 | 7159 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-3-white.png +2020/02/17 | 7143 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-3-black.png +2020/02/17 | 706057 | macros/latex/contrib/l3build/l3build.pdf +2020/02/17 | 70506 | fonts/ptex-fontmaps/jis04cmap_exp/jis-v04-vttk.pdf +2020/02/17 | 7045 | macros/latex/contrib/l3build/l3build-typesetting.lua +2020/02/17 | 69636 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma +2020/02/17 | 69185 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma +2020/02/17 | 6881 | macros/latex/contrib/l3build/l3build-variables.lua +2020/02/17 | 68640 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma +2020/02/17 | 67264 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma +2020/02/17 | 67237 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma +2020/02/17 | 669505 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma +2020/02/17 | 6646 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-6.pdf +2020/02/17 | 652 | systems/win32/miktex/tm/packages/next/pr.ini +2020/02/17 | 652 | systems/texlive/tlnet/archive/collection-langgerman.r53815.tar.xz +2020/02/17 | 65019 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma +2020/02/17 | 6486 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-6.png +2020/02/17 | 6468 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-5.pdf +2020/02/17 | 645 | fonts/ptex-fontmaps/maps/bizud/uptex-bizud.map +2020/02/17 | 64419 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma +2020/02/17 | 642 | fonts/ptex-fontmaps/maps/moga-mobo-ex/uptex-moga-mobo-ex-04.map +2020/02/17 | 63277 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma +2020/02/17 | 6323 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-5.png +2020/02/17 | 63183 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma +2020/02/17 | 630 | fonts/ptex-fontmaps/maps/moga-mobo-ex/uptex-moga-mobo-ex.map +2020/02/17 | 630 | fonts/ptex-fontmaps/maps/canon/uptex-canon.map +2020/02/17 | 63051 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma +2020/02/17 | 62914 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma +2020/02/17 | 622 | fonts/ptex-fontmaps/maps/moga-mobo/uptex-moga-mobo-04.map +2020/02/17 | 616 | systems/texlive/tlnet/archive/collection-langjapanese.r53811.tar.xz +2020/02/17 | 61674 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma +2020/02/17 | 61607 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma +2020/02/17 | 615429 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma +2020/02/17 | 61310 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma +2020/02/17 | 610 | fonts/ptex-fontmaps/maps/moga-mobo/uptex-moga-mobo.map +2020/02/17 | 60293 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma +2020/02/17 | 59431 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64-2.9.tar.lzma +2020/02/17 | 58862 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma +2020/02/17 | 5805 | macros/latex/contrib/ghsystem/pictures/ghsystem_exclam.pdf +2020/02/17 | 57731 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma +2020/02/17 | 576249 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma +2020/02/17 | 5716 | macros/latex/contrib/ghsystem/pictures/ghsystem_exclam.png +2020/02/17 | 57127 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma +2020/02/17 | 5694 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-4.pdf +2020/02/17 | 56734 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma +2020/02/17 | 56419 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma +2020/02/17 | 563260 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma +2020/02/17 | 560 | fonts/ptex-fontmaps/maps/yu-win10/uptex-yu-win10.map +2020/02/17 | 560984 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma +2020/02/17 | 555 | fonts/ptex-fontmaps/maps/yu-win/uptex-yu-win.map +2020/02/17 | 55062 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-1.jpg +2020/02/17 | 54910 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-3.jpg +2020/02/17 | 548 | fonts/ptex-fontmaps/maps/sourcehan-otc/otf-ko-sourcehan-otc.map +2020/02/17 | 54880 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma +2020/02/17 | 5443 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-4.png +2020/02/17 | 544258 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma +2020/02/17 | 540 | fonts/ptex-fontmaps/maps/sourcehan/otf-ko-sourcehan.map +2020/02/17 | 540 | fonts/ptex-fontmaps/maps/noto-otc/otf-ko-noto-otc.map +2020/02/17 | 53969 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma +2020/02/17 | 539504 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma +2020/02/17 | 5392 | macros/latex/contrib/l3build/l3build.lua +2020/02/17 | 53802 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-2.jpg +2020/02/17 | 536 | fonts/ptex-fontmaps/maps/noto/otf-ko-noto.map +2020/02/17 | 53511 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-1.jpg +2020/02/17 | 53385 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-2.9.tar.lzma +2020/02/17 | 533703 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma +2020/02/17 | 530 | fonts/ptex-fontmaps/maps/ms/uptex-ms.map +2020/02/17 | 5285 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle.pdf +2020/02/17 | 527 | fonts/ptex-fontmaps/maps/haranoaji/uptex-haranoaji-04.map +2020/02/17 | 525 | fonts/ptex-fontmaps/maps/ume/uptex-ume.map +2020/02/17 | 525043 | systems/win32/miktex/tm/packages/next/files.csv.lzma +2020/02/17 | 524 | fonts/ptex-fontmaps/maps/sourcehan-otc/otf-sc-sourcehan-otc.map +2020/02/17 | 524554 | systems/win32/miktex/tm/packages/files.csv.lzma +2020/02/17 | 5237 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle-2-white.pdf +2020/02/17 | 5227 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle-2-black.pdf +2020/02/17 | 52145 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma +2020/02/17 | 52121 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma +2020/02/17 | 5211 | fonts/ptex-fontmaps/maps/morisawa-pr6n/otf-morisawa-pr6n.map +2020/02/17 | 520 | fonts/ptex-fontmaps/maps/sourcehan/otf-sc-sourcehan.map +2020/02/17 | 516 | fonts/ptex-fontmaps/maps/noto-otc/otf-sc-noto-otc.map +2020/02/17 | 512 | fonts/ptex-fontmaps/maps/noto/otf-sc-noto.map +2020/02/17 | 51250 | fonts/ptex-fontmaps/cmap/2004-H +2020/02/17 | 508 | fonts/ptex-fontmaps/maps/sourcehan-otc/otf-tc-sourcehan-otc.map +2020/02/17 | 50865 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma +2020/02/17 | 50744 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma +2020/02/17 | 506 | fonts/ptex-fontmaps/maps/ms-win10/otf-tc-ms-win10.map +2020/02/17 | 506 | fonts/ptex-fontmaps/maps/arphic/otf-sc-arphic.map +2020/02/17 | 5057 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle-2-white.png +2020/02/17 | 5056 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle-2-black.png +2020/02/17 | 50538 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma +2020/02/17 | 5051 | fonts/ptex-fontmaps/maps/morisawa/otf-morisawa.map +2020/02/17 | 504 | fonts/ptex-fontmaps/maps/sourcehan/otf-tc-sourcehan.map +2020/02/17 | 5028 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle.png +2020/02/17 | 500 | fonts/ptex-fontmaps/maps/noto-otc/otf-tc-noto-otc.map +2020/02/17 | 500 | fonts/ptex-fontmaps/maps/ipaex/uptex-ipaex.map +2020/02/17 | 498553 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma +2020/02/17 | 496 | fonts/ptex-fontmaps/maps/noto/otf-tc-noto.map +2020/02/17 | 49684 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma +2020/02/17 | 495 | fonts/ptex-fontmaps/maps/haranoaji/uptex-haranoaji.map +2020/02/17 | 494 | fonts/ptex-fontmaps/maps/ms/otf-tc-ms.map +2020/02/17 | 494 | fonts/ptex-fontmaps/maps/arphic/otf-tc-arphic.map +2020/02/17 | 49305 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma +2020/02/17 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2020/02/17 | 482 | fonts/ptex-fontmaps/maps/kozuka-pr6/uptex-kozuka-pr6-04.map +2020/02/17 | 4812 | systems/win32/miktex/tm/packages/next/miktex-config-2.9.tar.lzma +2020/02/17 | 47982 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma +2020/02/17 | 472 | fonts/ptex-fontmaps/maps/kozuka-pr6n/uptex-kozuka-pr6n-04.map +2020/02/17 | 47110 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-3-white.jpg +2020/02/17 | 47054 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-5-2-white.jpg +2020/02/17 | 47016 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-2.jpg +2020/02/17 | 4661 | fonts/ptex-fontmaps/maps/bizud/otf-bizud.map +2020/02/17 | 465 | systems/win32/miktex/tm/packages/pr.ini +2020/02/17 | 46507 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull-6.jpg +2020/02/17 | 462 | fonts/ptex-fontmaps/maps/kozuka/uptex-kozuka-04.map +2020/02/17 | 462 | fonts/ptex-fontmaps/maps/baekmuk/otf-ko-baekmuk.map +2020/02/17 | 46125 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull-2.jpg +2020/02/17 | 460 | fonts/ptex-fontmaps/maps/ipa/uptex-ipa.map +2020/02/17 | 45843 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull.jpg +2020/02/17 | 45818 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma +2020/02/17 | 45751 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma +2020/02/17 | 457122 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma +2020/02/17 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +2020/02/17 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc +2020/02/17 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc +2020/02/17 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc +2020/02/17 | 45589 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma +2020/02/17 | 454 | fonts/ptex-fontmaps/maps/founder/otf-sc-founder.map +2020/02/17 | 45466 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma +2020/02/17 | 45437 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-5-2-black.jpg +2020/02/17 | 45394 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-O-5-1.jpg +2020/02/17 | 45242 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-3-black.jpg +2020/02/17 | 45199 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-3-white.jpg +2020/02/17 | 450 | fonts/ptex-fontmaps/maps/kozuka-pr6/uptex-kozuka-pr6.map +2020/02/17 | 450288 | systems/win32/miktex/tm/packages/next/miktex-doc-2.9.tar.lzma +2020/02/17 | 44957 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-2-white.jpg +2020/02/17 | 44929 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma +2020/02/17 | 447 | fonts/ptex-fontmaps/maps/hiragino-pron/uptex-hiragino-pron-04.map +2020/02/17 | 4479 | macros/latex/contrib/l3build/l3build-ctan.lua +2020/02/17 | 446 | fonts/ptex-fontmaps/maps/ms/otf-ko-ms.map +2020/02/17 | 446 | fonts/ptex-fontmaps/maps/cjkunifonts-ttf/otf-tc-cjkunifonts-ttf.map +2020/02/17 | 442 | fonts/ptex-fontmaps/maps/cjkunifonts-ttf/otf-sc-cjkunifonts-ttf.map +2020/02/17 | 4411 | fonts/ptex-fontmaps/maps/canon/otf-canon.map +2020/02/17 | 440 | fonts/ptex-fontmaps/maps/kozuka-pr6n/uptex-kozuka-pr6n.map +2020/02/17 | 437 | fonts/ptex-fontmaps/maps/hiragino/uptex-hiragino-04.map +2020/02/17 | 4369 | fonts/ptex-fontmaps/maps/sourcehan-otc/otf-sourcehan-otc.map +2020/02/17 | 43610 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos.jpg +2020/02/17 | 43545 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-2-black.jpg +2020/02/17 | 43516 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-3-black.jpg +2020/02/17 | 43430 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma +2020/02/17 | 432598 | fonts/ptex-fontmaps/jis04cmap_exp/jis-h04-httk.pdf +2020/02/17 | 4313 | fonts/ptex-fontmaps/maps/noto-otc/otf-noto-otc.map +2020/02/17 | 430 | fonts/ptex-fontmaps/maps/kozuka/uptex-kozuka.map +2020/02/17 | 4308 | macros/latex/contrib/l3build/l3build-stdmain.lua +2020/02/17 | 4297 | fonts/ptex-fontmaps/maps/moga-mobo-ex/otf-moga-mobo-ex.map +2020/02/17 | 42955 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma +2020/02/17 | 4285 | fonts/ptex-fontmaps/maps/sourcehan/otf-sourcehan.map +2020/02/17 | 4285 | fonts/ptex-fontmaps/maps/noto/otf-noto.map +2020/02/17 | 42790 | macros/latex/contrib/ghsystem/pictures/ghsystem_acid-8.jpg +2020/02/17 | 426 | fonts/ptex-fontmaps/maps/cjkunifonts/otf-tc-cjkunifonts.map +2020/02/17 | 42590 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma +2020/02/17 | 422 | fonts/ptex-fontmaps/maps/cjkunifonts/otf-sc-cjkunifonts.map +2020/02/17 | 42072 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-5.jpg +2020/02/17 | 418 | fonts/ptex-fontmaps/maps/ms/otf-sc-ms.map +2020/02/17 | 41846 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma +2020/02/17 | 41838 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma +2020/02/17 | 417 | fonts/ptex-fontmaps/maps/yu-osx/uptex-yu-osx-04.map +2020/02/17 | 415 | fonts/ptex-fontmaps/maps/hiragino-pron/uptex-hiragino-pron.map +2020/02/17 | 4157 | fonts/ptex-fontmaps/maps/moga-mobo/otf-moga-mobo.map +2020/02/17 | 414 | fonts/ptex-fontmaps/maps/solaris/otf-ko-solaris.map +2020/02/17 | 412 | fonts/ptex-fontmaps/maps/noEmbed/uptex-noEmbed-04.map +2020/02/17 | 40948 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma +2020/02/17 | 406 | fonts/ptex-fontmaps/maps/ms-osx/otf-sc-ms-osx.map +2020/02/17 | 406 | fonts/ptex-fontmaps/maps/adobe/otf-ko-adobe.map +2020/02/17 | 40692 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma +2020/02/17 | 405 | fonts/ptex-fontmaps/maps/hiragino/uptex-hiragino.map +2020/02/17 | 402 | fonts/ptex-fontmaps/maps/adobe/otf-tc-adobe.map +2020/02/17 | 40172 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-4.jpg +2020/02/17 | 398 | fonts/ptex-fontmaps/maps/adobe/otf-sc-adobe.map +2020/02/17 | 3949332 | systems/texlive/tlnet/install-tl-unx.tar.gz +2020/02/17 | 3941 | fonts/ptex-fontmaps/maps/yu-win10/otf-yu-win10.map +2020/02/17 | 39304 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-6.jpg +2020/02/17 | 39232 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle-2-white.jpg +2020/02/17 | 391589 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma +2020/02/17 | 38998 | macros/latex/contrib/ghsystem/pictures/ghsystem_health.jpg +2020/02/17 | 38843 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma +2020/02/17 | 38797 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma +2020/02/17 | 387565 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-x64-2.9.tar.lzma +2020/02/17 | 3861 | fonts/ptex-fontmaps/maps/yu-win/otf-yu-win.map +2020/02/17 | 385 | fonts/ptex-fontmaps/maps/yu-osx/uptex-yu-osx.map +2020/02/17 | 382 | fonts/ptex-fontmaps/maps/fandol/otf-sc-fandol.map +2020/02/17 | 380 | fonts/ptex-fontmaps/maps/noEmbed/uptex-noEmbed.map +2020/02/17 | 37848 | macros/latex/contrib/ghsystem/pictures/ghsystem_acid.jpg +2020/02/17 | 37718 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle-2-black.jpg +2020/02/17 | 37706 | macros/latex/contrib/ghsystem/pictures/ghsystem_acid.png +2020/02/17 | 3741 | fonts/ptex-fontmaps/maps/ms/otf-ms.map +2020/02/17 | 368 | fonts/ptex-fontmaps/maps/sourcehan-otc/uptex-ko-sourcehan-otc.map +2020/02/17 | 3661 | fonts/ptex-fontmaps/maps/ume/otf-ume.map +2020/02/17 | 36617 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma +2020/02/17 | 36398 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma +2020/02/17 | 36154 | macros/latex/contrib/ghsystem/pictures/ghsystem_aqpol.jpg +2020/02/17 | 360 | fonts/ptex-fontmaps/maps/sourcehan/uptex-ko-sourcehan.map +2020/02/17 | 360 | fonts/ptex-fontmaps/maps/noto-otc/uptex-ko-noto-otc.map +2020/02/17 | 360 | fonts/ptex-fontmaps/maps/ms-osx/uptex-ms-osx.map +2020/02/17 | 356 | fonts/ptex-fontmaps/maps/noto/uptex-ko-noto.map +2020/02/17 | 356767 | systems/win32/miktex/tm/packages/luatexko.tar.lzma +2020/02/17 | 356123 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma +2020/02/17 | 354 | fonts/ptex-fontmaps/maps/apple/otf-ko-apple.map +2020/02/17 | 354459 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-2.9.tar.lzma +2020/02/17 | 3531 | fonts/ptex-fontmaps/maps/ipaex/otf-ipaex.map +2020/02/17 | 352 | fonts/ptex-fontmaps/maps/sourcehan-otc/uptex-sc-sourcehan-otc.map +2020/02/17 | 350 | fonts/ptex-fontmaps/maps/noEmbed/otf-ko-noEmbed.map +2020/02/17 | 35054 | macros/latex/contrib/ghsystem/language/ghsystem_french.def +2020/02/17 | 348 | fonts/ptex-fontmaps/maps/sourcehan/uptex-sc-sourcehan.map +2020/02/17 | 34870 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma +2020/02/17 | 34847 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma +2020/02/17 | 34707 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-O.jpg +2020/02/17 | 344 | fonts/ptex-fontmaps/maps/noto-otc/uptex-sc-noto-otc.map +2020/02/17 | 342 | fonts/ptex-fontmaps/maps/sourcehan-otc/uptex-tc-sourcehan-otc.map +2020/02/17 | 340 | fonts/ptex-fontmaps/maps/noto/uptex-sc-noto.map +2020/02/17 | 338 | fonts/ptex-fontmaps/maps/sourcehan/uptex-tc-sourcehan.map +2020/02/17 | 33832 | macros/latex/contrib/l3build/l3build-check.lua +2020/02/17 | 33643 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame.jpg +2020/02/17 | 33530 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma +2020/02/17 | 3351 | fonts/ptex-fontmaps/maps/haranoaji/otf-haranoaji.map +2020/02/17 | 334 | fonts/ptex-fontmaps/maps/noto-otc/uptex-tc-noto-otc.map +2020/02/17 | 334 | fonts/ptex-fontmaps/maps/dynacomware/otf-tc-dynacomware.map +2020/02/17 | 33365 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma +2020/02/17 | 33340 | macros/latex/contrib/ghsystem/language/ghsystem_spanish.def +2020/02/17 | 3325 | fonts/ptex-fontmaps/maps/hiragino-pron/otf-hiragino-pron.map +2020/02/17 | 330 | fonts/ptex-fontmaps/maps/noto/uptex-tc-noto.map +2020/02/17 | 328775 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma +2020/02/17 | 326 | fonts/ptex-fontmaps/maps/noEmbed/otf-sc-noEmbed.map +2020/02/17 | 3251 | fonts/ptex-fontmaps/maps/ipa/otf-ipa.map +2020/02/17 | 3245 | fonts/ptex-fontmaps/maps/hiragino/otf-hiragino.map +2020/02/17 | 3244 | macros/latex/contrib/l3build/l3build-aux.lua +2020/02/17 | 32362 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma +2020/02/17 | 322 | fonts/ptex-fontmaps/maps/unfonts/otf-ko-unfonts.map +2020/02/17 | 32296 | systems/texlive/tlnet/archive/kpathsea.r53807.tar.xz +2020/02/17 | 32280 | macros/latex/contrib/ghsystem/language/ghsystem_italian.def +2020/02/17 | 321848 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma +2020/02/17 | 32183 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma +2020/02/17 | 31412 | systems/texlive/tlnet/archive/bxjscls.r53812.tar.xz +2020/02/17 | 31253 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma +2020/02/17 | 311904 | fonts/ptex-fontmaps/jis04cmap_exp/jisx0213-2004-8bit-std.txt +2020/02/17 | 31152 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma +2020/02/17 | 31145 | macros/latex/contrib/ghsystem/language/ghsystem_german.def +2020/02/17 | 3111 | macros/latex/contrib/l3build/l3build-unpack.lua +2020/02/17 | 310 | fonts/ptex-fontmaps/maps/noEmbed/otf-tc-noEmbed.map +2020/02/17 | 30996 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma +2020/02/17 | 309681 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma +2020/02/17 | 30742 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma +2020/02/17 | 3052 | systems/texlive/tlnet/archive/haranoaji-extra.doc.r53811.tar.xz +2020/02/17 | 3048 | systems/texlive/tlnet/archive/haranoaji.doc.r53810.tar.xz +2020/02/17 | 3031 | fonts/ptex-fontmaps/cmap/2004-V +2020/02/17 | 30234 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma +2020/02/17 | 3021 | fonts/ptex-fontmaps/maps/kozuka-pr6/otf-kozuka-pr6.map +2020/02/17 | 3011432 | macros/latex/contrib/ghsystem.zip +2020/02/17 | 3002 | fonts/ptex-fontmaps/jis04cmap_exp/JISX0213-2004-V +2020/02/17 | 29843 | macros/latex/contrib/ghsystem/language/ghsystem_english.def +2020/02/17 | 29678 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma +2020/02/17 | 2951 | fonts/ptex-fontmaps/maps/kozuka-pr6n/otf-kozuka-pr6n.map +2020/02/17 | 294139 | systems/win32/miktex/tm/packages/xetexko.tar.lzma +2020/02/17 | 29284 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma +2020/02/17 | 29245 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma +2020/02/17 | 2918 | fonts/ptex-fontmaps/maps/sourcehan-otc/otf-up-sourcehan-otc.map +2020/02/17 | 29119 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma +2020/02/17 | 288246 | systems/win32/miktex/tm/packages/newtxtt.tar.lzma +2020/02/17 | 2881 | fonts/ptex-fontmaps/maps/kozuka/otf-kozuka.map +2020/02/17 | 28743 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma +2020/02/17 | 2862 | fonts/ptex-fontmaps/maps/noto-otc/otf-up-noto-otc.map +2020/02/17 | 28493 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma +2020/02/17 | 2834 | fonts/ptex-fontmaps/maps/sourcehan/otf-up-sourcehan.map +2020/02/17 | 2834 | fonts/ptex-fontmaps/maps/noto/otf-up-noto.map +2020/02/17 | 28215 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle.jpg +2020/02/17 | 281551 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma +2020/02/17 | 281239 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma +2020/02/17 | 2791 | fonts/ptex-fontmaps/maps/noEmbed/otf-noEmbed.map +2020/02/17 | 27781 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma +2020/02/17 | 276821 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma +2020/02/17 | 272360 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma +2020/02/17 | 27186 | macros/latex/contrib/ghsystem/pictures/ghsystem_exclam.jpg +2020/02/17 | 26927 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma +2020/02/17 | 26767 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma +2020/02/17 | 26652 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma +2020/02/17 | 26508 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma +2020/02/17 | 26211208 | systems/texlive/tlnet/archive/haranoaji.r53810.tar.xz +2020/02/17 | 26176 | macros/latex/contrib/ghsystem/ghsystem.sty +2020/02/17 | 26141541 | systems/win32/miktex/tm/packages/haranoaji.tar.lzma +2020/02/17 | 2611 | fonts/ptex-fontmaps/maps/yu-osx/otf-yu-osx.map +2020/02/17 | 25950260 | systems/texlive/tlnet/archive/haranoaji-extra.r53811.tar.xz +2020/02/17 | 258 | fonts/ptex-fontmaps/maps/morisawa-pr6n/ptex-morisawa-pr6n-04.map +2020/02/17 | 25885404 | systems/win32/miktex/tm/packages/haranoaji-extra.tar.lzma +2020/02/17 | 2581041 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma +2020/02/17 | 2551 | fonts/ptex-fontmaps/maps/ms-osx/otf-ms-osx.map +2020/02/17 | 254567 | macros/luatex/latex/luatodonotes.zip +2020/02/17 | 25306 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma +2020/02/17 | 250 | fonts/ptex-fontmaps/maps/morisawa/ptex-morisawa-04.map +2020/02/17 | 2480 | macros/latex/contrib/l3build/l3build-help.lua +2020/02/17 | 247670 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma +2020/02/17 | 247152 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma +2020/02/17 | 246460 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma +2020/02/17 | 2463 | fonts/ptex-fontmaps/jis04cmap_exp/jis-v04-vttk.tex +2020/02/17 | 2457579 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma +2020/02/17 | 24276 | systems/texlive/tlnet/archive/breqn.r53814.tar.xz +2020/02/17 | 238 | fonts/ptex-fontmaps/maps/morisawa-pr6n/ptex-morisawa-pr6n.map +2020/02/17 | 2382 | fonts/ptex-fontmaps/jis04cmap_exp/jis-h04-httk.tex +2020/02/17 | 237662 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma +2020/02/17 | 234 | fonts/ptex-fontmaps/maps/arphic/uptex-sc-arphic.map +2020/02/17 | 2339 | macros/latex/contrib/l3build/CONTRIBUTING.md +2020/02/17 | 23381 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma +2020/02/17 | 232 | fonts/ptex-fontmaps/maps/ms-win10/uptex-tc-ms-win10.map +2020/02/17 | 2310 | macros/latex/contrib/l3build/l3build-tagging.lua +2020/02/17 | 230 | fonts/ptex-fontmaps/maps/morisawa/ptex-morisawa.map +2020/02/17 | 2308 | fonts/ptex-fontmaps/maps/morisawa-pr6n/otf-up-morisawa-pr6n.map +2020/02/17 | 22935 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma +2020/02/17 | 226 | fonts/ptex-fontmaps/maps/ms/uptex-tc-ms.map +2020/02/17 | 226 | fonts/ptex-fontmaps/maps/arphic/uptex-tc-arphic.map +2020/02/17 | 22541706 | systems/texlive/tlnet/install-tl.zip +2020/02/17 | 2244 | fonts/ptex-fontmaps/maps/morisawa/otf-up-morisawa.map +2020/02/17 | 2204 | fonts/ptex-fontmaps/database/ptex-fontmaps-data.dat +2020/02/17 | 2170332 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +2020/02/17 | 216 | fonts/ptex-fontmaps/maps/baekmuk/uptex-ko-baekmuk.map +2020/02/17 | 21557 | fonts/ptex-fontmaps/jis04cmap_exp/mk_jis_to_aj16_cid.lua +2020/02/17 | 215281 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma +2020/02/17 | 208 | fonts/ptex-fontmaps/maps/ms/uptex-ko-ms.map +2020/02/17 | 208 | fonts/ptex-fontmaps/maps/founder/uptex-sc-founder.map +2020/02/17 | 20688 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma +2020/02/17 | 2060 | fonts/ptex-fontmaps/maps/bizud/otf-up-bizud.map +2020/02/17 | 202 | fonts/ptex-fontmaps/maps/moga-mobo-ex/ptex-moga-mobo-ex-04.map +2020/02/17 | 202 | fonts/ptex-fontmaps/maps/cjkunifonts-ttf/uptex-tc-cjkunifonts-ttf.map +2020/02/17 | 202 | fonts/ptex-fontmaps/maps/cjkunifonts-ttf/uptex-sc-cjkunifonts-ttf.map +2020/02/17 | 201993 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma +2020/02/17 | 199619 | systems/win32/miktex/tm/packages/schulmathematik.tar.lzma +2020/02/17 | 199144 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma +2020/02/17 | 1990264 | graphics/circuit_macros.zip +2020/02/17 | 198 | fonts/ptex-fontmaps/maps/adobe/uptex-ko-adobe.map +2020/02/17 | 19800 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma +2020/02/17 | 196 | fonts/ptex-fontmaps/maps/bizud/ptex-bizud.map +2020/02/17 | 196816 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma +2020/02/17 | 196798 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma +2020/02/17 | 1960 | fonts/ptex-fontmaps/maps/canon/otf-up-canon.map +2020/02/17 | 194 | fonts/ptex-fontmaps/maps/moga-mobo/ptex-moga-mobo-04.map +2020/02/17 | 194912 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma +2020/02/17 | 193834 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma +2020/02/17 | 1938200 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma +2020/02/17 | 1936948 | systems/win32/miktex/tm/packages/bxjscls.tar.lzma +2020/02/17 | 192 | fonts/ptex-fontmaps/maps/solaris/uptex-ko-solaris.map +2020/02/17 | 192 | fonts/ptex-fontmaps/maps/cjkunifonts/uptex-tc-cjkunifonts.map +2020/02/17 | 192 | fonts/ptex-fontmaps/maps/cjkunifonts/uptex-sc-cjkunifonts.map +2020/02/17 | 19263 | fonts/ptex-fontmaps/script/kanji-fontmap-creator.pl +2020/02/17 | 1920 | fonts/ptex-fontmaps/maps/moga-mobo-ex/otf-up-moga-mobo-ex.map +2020/02/17 | 190 | fonts/ptex-fontmaps/maps/ms/uptex-sc-ms.map +2020/02/17 | 190 | fonts/ptex-fontmaps/maps/moga-mobo-ex/ptex-moga-mobo-ex.map +2020/02/17 | 190 | fonts/ptex-fontmaps/maps/canon/ptex-canon.map +2020/02/17 | 190 | fonts/ptex-fontmaps/maps/adobe/uptex-tc-adobe.map +2020/02/17 | 190 | fonts/ptex-fontmaps/maps/adobe/uptex-sc-adobe.map +2020/02/17 | 189272 | systems/texlive/tlnet/archive/schulmathematik.doc.r53815.tar.xz +2020/02/17 | 18694329 | systems/texlive/tlnet/install-tl-windows.exe +2020/02/17 | 186774 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma +2020/02/17 | 1864 | fonts/ptex-fontmaps/maps/moga-mobo/otf-up-moga-mobo.map +2020/02/17 | 185530 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma +2020/02/17 | 184 | fonts/ptex-fontmaps/maps/ms-osx/uptex-sc-ms-osx.map +2020/02/17 | 184202 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma +2020/02/17 | 182 | fonts/ptex-fontmaps/maps/moga-mobo/ptex-moga-mobo.map +2020/02/17 | 182 | fonts/ptex-fontmaps/maps/fandol/uptex-sc-fandol.map +2020/02/17 | 182743 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma +2020/02/17 | 1825324 | systems/texlive/tlnet/archive/bxjscls.doc.r53812.tar.xz +2020/02/17 | 1817 | macros/latex/contrib/l3build/l3build.1 +2020/02/17 | 17775 | macros/latex/contrib/ghsystem/language/ghsystem_langtemplate.def +2020/02/17 | 17755 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma +2020/02/17 | 177529 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma +2020/02/17 | 1772 | fonts/ptex-fontmaps/maps/yu-win10/otf-up-yu-win10.map +2020/02/17 | 17701 | fonts/ptex-fontmaps/script/kanji-config-updmap.pl +2020/02/17 | 17681 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma +2020/02/17 | 17567 | fonts/ptex-fontmaps/kanji-config-updmap.tex +2020/02/17 | 175524 | fonts/ptex-fontmaps/kanji-config-updmap.pdf +2020/02/17 | 174407 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-1.eps +2020/02/17 | 1740 | fonts/ptex-fontmaps/maps/yu-win/otf-up-yu-win.map +2020/02/17 | 171356 | systems/texlive/tlnet/archive/newtxtt.doc.r53809.tar.xz +2020/02/17 | 170 | fonts/ptex-fontmaps/maps/noEmbed/uptex-ko-noEmbed.map +2020/02/17 | 1697677 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma +2020/02/17 | 169439 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma +2020/02/17 | 16935 | macros/latex/contrib/ghsystem/ghsystem-manual.tex +2020/02/17 | 1692 | fonts/ptex-fontmaps/maps/ms/otf-up-ms.map +2020/02/17 | 168844 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma +2020/02/17 | 167838 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma +2020/02/17 | 1660 | fonts/ptex-fontmaps/maps/ume/otf-up-ume.map +2020/02/17 | 1652 | macros/latex/contrib/ghsystem/README +2020/02/17 | 164888 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma +2020/02/17 | 1630 | fonts/ptex-fontmaps/jis04cmap_exp/README +2020/02/17 | 162 | fonts/ptex-fontmaps/maps/yu-win10/ptex-yu-win10.map +2020/02/17 | 162 | fonts/ptex-fontmaps/maps/apple/uptex-ko-apple.map +2020/02/17 | 16129129 | systems/texlive/tlnet/tlpkg/texlive.tlpdb +2020/02/17 | 161145 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma +2020/02/17 | 160 | fonts/ptex-fontmaps/maps/yu-win/ptex-yu-win.map +2020/02/17 | 1608 | fonts/ptex-fontmaps/maps/ipaex/otf-up-ipaex.map +2020/02/17 | 16039 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma +2020/02/17 | 15895 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma +2020/02/17 | 156 | fonts/ptex-fontmaps/maps/haranoaji/ptex-haranoaji-04.map +2020/02/17 | 1564 | fonts/ptex-fontmaps/maps/haranoaji/otf-up-haranoaji.map +2020/02/17 | 154 | fonts/ptex-fontmaps/maps/noEmbed/uptex-sc-noEmbed.map +2020/02/17 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 +2020/02/17 | 1537 | macros/latex/contrib/l3build/l3build.ins +2020/02/17 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2020/02/17 | 152086 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma +2020/02/17 | 150 | fonts/ptex-fontmaps/maps/ms/ptex-ms.map +2020/02/17 | 149878 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma +2020/02/17 | 1496 | fonts/ptex-fontmaps/maps/ipa/otf-up-ipa.map +2020/02/17 | 1495 | macros/latex/contrib/l3build/l3build-clean.lua +2020/02/17 | 148 | fonts/ptex-fontmaps/maps/ume/ptex-ume.map +2020/02/17 | 148965 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma +2020/02/17 | 147166 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma +2020/02/17 | 146 | fonts/ptex-fontmaps/maps/unfonts/uptex-ko-unfonts.map +2020/02/17 | 146 | fonts/ptex-fontmaps/maps/dynacomware/uptex-tc-dynacomware.map +2020/02/17 | 146602 | fonts/ptex-fontmaps/jis04cmap_exp/JISX0213-2004-H +2020/02/17 | 146344 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-2.eps +2020/02/17 | 146302 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-3.eps +2020/02/17 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 +2020/02/17 | 1455 | fonts/ptex-fontmaps/jis04cmap_exp/cmapdec.lua +2020/02/17 | 145546 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-1.eps +2020/02/17 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +2020/02/17 | 144 | fonts/ptex-fontmaps/maps/noEmbed/uptex-tc-noEmbed.map +2020/02/17 | 1432 | fonts/ptex-fontmaps/maps/kozuka-pr6/otf-up-kozuka-pr6.map +2020/02/17 | 14057 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma +2020/02/17 | 1404 | fonts/ptex-fontmaps/maps/kozuka-pr6n/otf-up-kozuka-pr6n.map +2020/02/17 | 139888 | systems/texlive/tlnet/archive/texlive-msg-translations.r53808.tar.xz +2020/02/17 | 138 | fonts/ptex-fontmaps/maps/kozuka-pr6/ptex-kozuka-pr6-04.map +2020/02/17 | 138 | fonts/ptex-fontmaps/maps/ipaex/ptex-ipaex.map +2020/02/17 | 138197 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull-6.eps +2020/02/17 | 1381486 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma +2020/02/17 | 1376 | fonts/ptex-fontmaps/maps/kozuka/otf-up-kozuka.map +2020/02/17 | 1372 | fonts/ptex-fontmaps/maps/hiragino-pron/otf-up-hiragino-pron.map +2020/02/17 | 137228 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull-2.eps +2020/02/17 | 137215 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma +2020/02/17 | 136 | fonts/ptex-fontmaps/maps/haranoaji/ptex-haranoaji.map +2020/02/17 | 13598 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-1.pdf +2020/02/17 | 134 | fonts/ptex-fontmaps/maps/kozuka-pr6n/ptex-kozuka-pr6n-04.map +2020/02/17 | 13487 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-1.png +2020/02/17 | 1344 | fonts/ptex-fontmaps/maps/hiragino/otf-up-hiragino.map +2020/02/17 | 134276 | systems/texlive/tlnet/archive/archaeologie.source.r53813.tar.xz +2020/02/17 | 1340 | fonts/ptex-fontmaps/maps/noEmbed/otf-up-noEmbed.map +2020/02/17 | 133124 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma +2020/02/17 | 130 | fonts/ptex-fontmaps/maps/kozuka/ptex-kozuka-04.map +2020/02/17 | 1307 | fonts/ptex-fontmaps/examples/otf-sample.tex +2020/02/17 | 13067 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma +2020/02/17 | 130324 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma +2020/02/17 | 129487 | macros/latex/contrib/ghsystem/pictures/ghsystem_acid-8.eps +2020/02/17 | 127 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-5-2-white.tex +2020/02/17 | 127 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-5-2-black.tex +2020/02/17 | 127 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-3-white.tex +2020/02/17 | 127 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-3-black.tex +2020/02/17 | 126 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle-2-white.tex +2020/02/17 | 126 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle-2-black.tex +2020/02/17 | 1268 | fonts/ptex-fontmaps/maps/yu-osx/otf-up-yu-osx.map +2020/02/17 | 125 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-3-white.tex +2020/02/17 | 125 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-3-black.tex +2020/02/17 | 125 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-2-white.tex +2020/02/17 | 125 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-2-black.tex +2020/02/17 | 124 | fonts/ptex-fontmaps/maps/hiragino-pron/ptex-hiragino-pron-04.map +2020/02/17 | 1249565 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma +2020/02/17 | 124843 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-2.eps +2020/02/17 | 123 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-O-5-1.tex +2020/02/17 | 123037 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos.eps +2020/02/17 | 122 | fonts/ptex-fontmaps/maps/ipa/ptex-ipa.map +2020/02/17 | 1229001 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma +2020/02/17 | 121 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-2.tex +2020/02/17 | 121 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-1.tex +2020/02/17 | 1217 | fonts/ptex-fontmaps/examples/otf-sample-04.tex +2020/02/17 | 1216 | fonts/ptex-fontmaps/maps/ms-osx/otf-up-ms-osx.map +2020/02/17 | 121328 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-2-black.eps +2020/02/17 | 120 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-6.tex +2020/02/17 | 120 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-5.tex +2020/02/17 | 120 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-4.tex +2020/02/17 | 120 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-3.tex +2020/02/17 | 120 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-2.tex +2020/02/17 | 120 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-1.tex +2020/02/17 | 120 | fonts/ptex-fontmaps/maps/hiragino/ptex-hiragino-04.map +2020/02/17 | 120639 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull.eps +2020/02/17 | 119 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull-6.tex +2020/02/17 | 119 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull-2.tex +2020/02/17 | 119 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-O.tex +2020/02/17 | 11945 | macros/latex/contrib/l3build/CHANGELOG.md +2020/02/17 | 119030 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-2-white.eps +2020/02/17 | 118 | macros/latex/contrib/ghsystem/pictures/ghsystem_health.tex +2020/02/17 | 118 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos.tex +2020/02/17 | 118 | macros/latex/contrib/ghsystem/pictures/ghsystem_exclam.tex +2020/02/17 | 118 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle.tex +2020/02/17 | 118 | macros/latex/contrib/ghsystem/pictures/ghsystem_acid-8.tex +2020/02/17 | 118 | fonts/ptex-fontmaps/maps/kozuka-pr6/ptex-kozuka-pr6.map +2020/02/17 | 118949 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-3-white.eps +2020/02/17 | 118558 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-3-white.eps +2020/02/17 | 118144 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-6.eps +2020/02/17 | 117 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull.tex +2020/02/17 | 117 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame.tex +2020/02/17 | 117 | macros/latex/contrib/ghsystem/pictures/ghsystem_aqpol.tex +2020/02/17 | 117611 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-3-black.eps +2020/02/17 | 1175634 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma +2020/02/17 | 1175226 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma +2020/02/17 | 11748 | macros/latex/contrib/l3build/l3build-file-functions.lua +2020/02/17 | 11712 | macros/latex/contrib/l3build/l3build-upload.lua +2020/02/17 | 116 | macros/latex/contrib/ghsystem/pictures/ghsystem_acid.tex +2020/02/17 | 116976 | systems/texlive/tlnet/archive/newtxtt.r53809.tar.xz +2020/02/17 | 116767 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma +2020/02/17 | 1165552 | systems/win32/miktex/tm/packages/breqn.tar.lzma +2020/02/17 | 115488 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma +2020/02/17 | 114 | fonts/ptex-fontmaps/maps/kozuka-pr6n/ptex-kozuka-pr6n.map +2020/02/17 | 114274 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-5.eps +2020/02/17 | 112 | fonts/ptex-fontmaps/maps/yu-osx/ptex-yu-osx-04.map +2020/02/17 | 111949 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-4.eps +2020/02/17 | 11175 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-3.pdf +2020/02/17 | 11156 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos.pdf +2020/02/17 | 1112220 | systems/win32/miktex/tm/packages/archaeologie.tar.lzma +2020/02/17 | 110 | fonts/ptex-fontmaps/maps/sourcehan/ptex-sourcehan-04.map +2020/02/17 | 110 | fonts/ptex-fontmaps/maps/sourcehan-otc/ptex-sourcehan-otc-04.map +2020/02/17 | 110 | fonts/ptex-fontmaps/maps/noto/ptex-noto-04.map +2020/02/17 | 110 | fonts/ptex-fontmaps/maps/noto-otc/ptex-noto-otc-04.map +2020/02/17 | 110 | fonts/ptex-fontmaps/maps/noEmbed/ptex-noEmbed-04.map +2020/02/17 | 110 | fonts/ptex-fontmaps/maps/kozuka/ptex-kozuka.map +2020/02/17 | 110869 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma +2020/02/17 | 11061 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-2.pdf +2020/02/17 | 110455 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-5-2-white.eps +2020/02/17 | 110449 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-5-2-black.eps +2020/02/17 | 11035 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-1.pdf +2020/02/17 | 11024 | macros/latex/contrib/l3build/l3build-manifest-setup.lua +2020/02/17 | 1102206 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma +2020/02/17 | 11014 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-3.png +2020/02/17 | 110140 | macros/latex/contrib/ghsystem/pictures/ghsystem_health.eps +2020/02/17 | 10980 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos.png +2020/02/17 | 1097746 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma +2020/02/17 | 1095666 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma +2020/02/17 | 10919 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-2.png +2020/02/17 | 108955 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma +2020/02/17 | 10889 | macros/latex/contrib/ghsystem/pictures/ghsystem_explos-1.png +2020/02/17 | 10882 | fonts/ptex-fontmaps/README +2020/02/17 | 10765 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull.pdf +2020/02/17 | 107294 | macros/latex/contrib/ghsystem/pictures/ghsystem_acid.eps +2020/02/17 | 105983 | macros/latex/contrib/l3build/l3build.dtx +2020/02/17 | 1059680 | systems/texlive/tlnet/archive/breqn.doc.r53814.tar.xz +2020/02/17 | 105750 | macros/latex/contrib/ghsystem/pictures/ghsystem_bottle-2-white.eps +2020/02/17 | 105701 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-O.eps +2020/02/17 | 10514 | macros/latex/contrib/ghsystem/pictures/ghsystem_skull.png +2020/02/17 | 104 | fonts/ptex-fontmaps/maps/hiragino-pron/ptex-hiragino-pron.map +2020/02/17 | 1043545 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma +2020/02/17 | 1043328 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma +2020/02/17 | 103665 | macros/latex/contrib/ghsystem/pictures/ghsystem_aqpol.eps +2020/02/17 | 1024 | macros/latex/contrib/l3build/README.md +2020/02/17 | 102367 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma +2020/02/17 | 102072 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame.eps +2020/02/17 | 100 | fonts/ptex-fontmaps/maps/hiragino/ptex-hiragino.map +2020/02/17 | 100619 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma +2020/02/17 | 100387 | macros/latex/contrib/ghsystem/pictures/ghsystem_flame-4-3-black.eps 2020/02/16 | 995608 | systems/win32/miktex/tm/packages/euclideangeometry.tar.lzma +2020/02/16 | 9954 | graphics/circuit_macros/examples/svg/FlowSVG.m4 +2020/02/16 | 991 | graphics/circuit_macros/examples/Byte.m4 +2020/02/16 | 99020 | systems/texlive/tlnet/tlpkg/translations/fr.po 2020/02/16 | 98923 | macros/xetex/generic/xetexko/xetexko-space.sty +2020/02/16 | 9840 | graphics/circuit_macros/examples/tubedefs.m4 +2020/02/16 | 980 | graphics/circuit_macros/examples/Emarrows.m4 +2020/02/16 | 980 | graphics/circuit_macros/doc/Emarrows.m4 2020/02/16 | 973148 | systems/texlive/tlnet/archive/euclideangeometry.doc.r53794.tar.xz -2020/02/16 | 96210 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma -2020/02/16 | 94283 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma -2020/02/16 | 94007 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma -2020/02/16 | 935863 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma -2020/02/16 | 93432 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma -2020/02/16 | 932526 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma -2020/02/16 | 92882 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma -2020/02/16 | 92019 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma -2020/02/16 | 91312 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma -2020/02/16 | 91204 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma -2020/02/16 | 87150 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma -2020/02/16 | 87135 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma -2020/02/16 | 86623 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma -2020/02/16 | 84722 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma -2020/02/16 | 8465 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma -2020/02/16 | 84413 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma +2020/02/16 | 970 | graphics/circuit_macros/examples/svg/ex15SVG.m4 +2020/02/16 | 960 | graphics/circuit_macros/doc/Flowdiag.m4 +2020/02/16 | 95234 | systems/texlive/tlnet/tlpkg/translations/vi.po +2020/02/16 | 947 | graphics/circuit_macros/examples/svg/QuantumSVG.m4 +2020/02/16 | 947 | graphics/circuit_macros/examples/squiggle.m4 +2020/02/16 | 94505 | systems/texlive/tlnet/tlpkg/translations/de.po +2020/02/16 | 94471 | graphics/circuit_macros/examples/mf/cct.mf +2020/02/16 | 93911104 | systems/win32/w32tex/TLW64/tl-win64.zip +2020/02/16 | 93838 | systems/texlive/tlnet/tlpkg/translations/sk.po +2020/02/16 | 937 | graphics/circuit_macros/examples/svg/ByteSVG.m4 +2020/02/16 | 931 | graphics/circuit_macros/examples/svg/ex01SVG.m4 +2020/02/16 | 92795 | systems/texlive/tlnet/tlpkg/translations/it.po +2020/02/16 | 918 | graphics/circuit_macros/examples/Quantum.m4 +2020/02/16 | 905 | graphics/circuit_macros/examples/birds.m4 +2020/02/16 | 899 | graphics/circuit_macros/examples/Fuses.m4 +2020/02/16 | 899 | graphics/circuit_macros/doc/Fuses.m4 +2020/02/16 | 8955 | graphics/circuit_macros/examples/Chuck.m4 +2020/02/16 | 8921 | graphics/circuit_macros/examples/Makefile +2020/02/16 | 888 | graphics/circuit_macros/examples/svg/VariableSVG.m4 +2020/02/16 | 88051 | systems/texlive/tlnet/tlpkg/translations/pt_BR.po +2020/02/16 | 879975 | graphics/circuit_macros/examples/examples.pdf +2020/02/16 | 87301 | macros/luatex/latex/luatodonotes/luatodonotes.lua +2020/02/16 | 869 | graphics/circuit_macros/examples/svg/FusesSVG.m4 +2020/02/16 | 86709 | systems/texlive/tlnet/tlpkg/translations/uk.po +2020/02/16 | 86642 | systems/texlive/tlnet/tlpkg/translations/cs.po +2020/02/16 | 865 | graphics/circuit_macros/examples/ex18.m4 +2020/02/16 | 862 | graphics/circuit_macros/examples/svg/pwrsupplySVG.m4 +2020/02/16 | 85674 | systems/texlive/tlnet/tlpkg/translations/es.po +2020/02/16 | 855 | graphics/circuit_macros/examples/svg/ex03SVG.m4 2020/02/16 | 843975 | systems/win32/miktex/tm/packages/sdaps.tar.lzma +2020/02/16 | 84144 | macros/luatex/latex/luatodonotes/luatodonotes.dtx +2020/02/16 | 839 | graphics/circuit_macros/examples/svg/quickSVG.m4 +2020/02/16 | 8372 | graphics/circuit_macros/examples/exp.m4 2020/02/16 | 836 | macros/latex/contrib/schulmathematik/README +2020/02/16 | 835 | graphics/circuit_macros/doc/Opto.m4 +2020/02/16 | 8348 | macros/luatex/latex/luatodonotes/inspect.lua +2020/02/16 | 8309 | graphics/circuit_macros/svg.m4 2020/02/16 | 814 | macros/latex/contrib/breqn/CHANGES.md -2020/02/16 | 80370 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma +2020/02/16 | 8102240 | systems/win32/w32tex/newtxpx-boondoxfonts.tar.xz +2020/02/16 | 8094 | graphics/circuit_macros/examples/svg/tstSVG.htmx +2020/02/16 | 801 | graphics/circuit_macros/doc/Potentiometers.m4 +2020/02/16 | 793 | graphics/circuit_macros/examples/svg/CountingSVG.m4 2020/02/16 | 785616 | systems/texlive/tlnet/archive/sdaps.doc.r53795.tar.xz -2020/02/16 | 78006 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma -2020/02/16 | 77982 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma +2020/02/16 | 78304 | graphics/circuit_macros/libgen.m4 +2020/02/16 | 782 | graphics/circuit_macros/doc/Oblique.m4 +2020/02/16 | 77974 | systems/texlive/tlnet/tlpkg/translations/ja.po +2020/02/16 | 776 | graphics/circuit_macros/examples/mf/cct.tfm 2020/02/16 | 7768 | macros/xetex/generic/xetexko/xetexko-josa.sty -2020/02/16 | 77463 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma -2020/02/16 | 7502 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma -2020/02/16 | 74408 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma -2020/02/16 | 73627 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma -2020/02/16 | 72641 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma -2020/02/16 | 72572 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma -2020/02/16 | 71725 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma -2020/02/16 | 69636 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma -2020/02/16 | 69185 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma +2020/02/16 | 774 | graphics/circuit_macros/examples/quick.m4 +2020/02/16 | 774 | graphics/circuit_macros/doc/quick.m4 +2020/02/16 | 76409 | graphics/circuit_macros/doc/defines.tex +2020/02/16 | 756 | graphics/circuit_macros/examples/Variable.m4 +2020/02/16 | 756 | graphics/circuit_macros/doc/Variable.m4 +2020/02/16 | 7529 | graphics/circuit_macros/examples/shapes.m4 +2020/02/16 | 7526 | graphics/circuit_macros/examples/svg/shapesSVG.m4 +2020/02/16 | 750 | graphics/circuit_macros/examples/psfrag/examplespsfrag.tex +2020/02/16 | 74973 | systems/texlive/tlnet/tlpkg/translations/sl.po +2020/02/16 | 748 | graphics/circuit_macros/examples/svg/Np.m4 +2020/02/16 | 745 | graphics/circuit_macros/examples/svg/DecoderSVG.m4 +2020/02/16 | 74380 | systems/texlive/tlnet/tlpkg/translations/nl.po +2020/02/16 | 7435 | graphics/circuit_macros/examples/svg/RectifiersSVG.m4 +2020/02/16 | 741 | graphics/circuit_macros/examples/Incleps.m4 +2020/02/16 | 7418 | graphics/circuit_macros/examples/svg/CsourceSVG.m4 +2020/02/16 | 72459 | systems/texlive/tlnet/tlpkg/translations/zh_CN.po +2020/02/16 | 72323 | systems/texlive/tlnet/tlpkg/translations/pl.po +2020/02/16 | 720 | graphics/circuit_macros/examples/mpost/mptest +2020/02/16 | 7203 | graphics/circuit_macros/examples/svg/lcctSVG.m4 +2020/02/16 | 7113 | graphics/circuit_macros/examples/lcct.m4 +2020/02/16 | 709 | graphics/circuit_macros/examples/Inclpdf.m4 +2020/02/16 | 707 | graphics/circuit_macros/examples/Grounds.m4 +2020/02/16 | 707 | graphics/circuit_macros/doc/Grounds.m4 +2020/02/16 | 706 | graphics/circuit_macros/psfrag.m4 +2020/02/16 | 699 | graphics/circuit_macros/examples/svg/GroundsSVG.m4 +2020/02/16 | 697 | graphics/circuit_macros/examples/ex01.m4 2020/02/16 | 6918196 | fonts/haranoaji/HaranoAjiMincho-Bold.otf +2020/02/16 | 6880 | graphics/circuit_macros/examples/Rectifiers.m4 2020/02/16 | 6869 | macros/luatex/generic/luatexko/ChangeLog -2020/02/16 | 68639 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma +2020/02/16 | 6854 | graphics/circuit_macros/examples/svg/DiniSVG.m4 +2020/02/16 | 6854 | graphics/circuit_macros/examples/Dini.m4 2020/02/16 | 6853212 | fonts/haranoaji-extra/HaranoAjiMincho-Heavy.otf +2020/02/16 | 682 | graphics/circuit_macros/examples/svg/ujtSVG.m4 +2020/02/16 | 67588 | systems/texlive/tlnet/archive/optex.r53804.tar.xz 2020/02/16 | 6755 | macros/latex/contrib/schulmathematik/schulma-mdlprf.cls 2020/02/16 | 6755864 | fonts/haranoaji-extra/HaranoAjiMincho-SemiBold.otf +2020/02/16 | 673 | graphics/circuit_macros/examples/ex03.m4 2020/02/16 | 67288 | systems/win32/miktex/tm/packages/miktex-bibtex-bin-x64-2.9.tar.lzma -2020/02/16 | 67263 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma -2020/02/16 | 67237 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma 2020/02/16 | 6718092 | fonts/haranoaji-extra/HaranoAjiMincho-Medium.otf -2020/02/16 | 669505 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma 2020/02/16 | 6642776 | fonts/haranoaji/HaranoAjiMincho-Regular.otf 2020/02/16 | 661796 | macros/latex/contrib/breqn/breqn.pdf +2020/02/16 | 660 | graphics/circuit_macros/examples/ujt.m4 +2020/02/16 | 660 | graphics/circuit_macros/doc/ujt.m4 +2020/02/16 | 656 | graphics/circuit_macros/examples/Zcos.m4 2020/02/16 | 6561816 | fonts/haranoaji/HaranoAjiMincho-Light.otf -2020/02/16 | 652 | systems/win32/miktex/tm/packages/next/pr.ini +2020/02/16 | 655 | graphics/circuit_macros/examples/Decoder.m4 +2020/02/16 | 654 | graphics/circuit_macros/examples/diamond.m4 2020/02/16 | 65173 | macros/luatex/generic/luatexko/luatexko.lua -2020/02/16 | 65019 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma -2020/02/16 | 64419 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma +2020/02/16 | 65046 | systems/texlive/tlnet/tlpkg/installer/install-tl-gui.tcl +2020/02/16 | 645 | graphics/circuit_macros/examples/Floor.m4 +2020/02/16 | 6413 | graphics/circuit_macros/examples/svg/CanLogicSVG.m4 +2020/02/16 | 63 | graphics/circuit_macros/examples/svg/local_init.m4 2020/02/16 | 63771 | macros/latex/contrib/breqn/flexisym.dtx -2020/02/16 | 63277 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma -2020/02/16 | 63183 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma -2020/02/16 | 63051 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma -2020/02/16 | 62914 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma -2020/02/16 | 61675 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma -2020/02/16 | 61606 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma +2020/02/16 | 6371 | graphics/circuit_macros/examples/CanLogic.m4 +2020/02/16 | 63018 | systems/texlive/tlnet/tlpkg/translations/zh_TW.po +2020/02/16 | 629598 | graphics/circuit_macros/doc/Circuit_macros.pdf +2020/02/16 | 6216 | graphics/circuit_macros/examples/svg/LgateSVG.m4 2020/02/16 | 6159064 | fonts/haranoaji-extra/HaranoAjiMincho-ExtraLight.otf -2020/02/16 | 615428 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma -2020/02/16 | 61310 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma +2020/02/16 | 614 | graphics/circuit_macros/doc/BigResistor.m4 +2020/02/16 | 613 | graphics/circuit_macros/examples/tst.tex +2020/02/16 | 609 | graphics/circuit_macros/examples/svg/diamondSVG.m4 2020/02/16 | 6057 | macros/latex/contrib/schulmathematik/schulma-praes.cls -2020/02/16 | 60292 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma +2020/02/16 | 604 | graphics/circuit_macros/examples/mpost/README-mpost 2020/02/16 | 60228 | systems/win32/miktex/tm/packages/miktex-bibtex-bin-2.9.tar.lzma -2020/02/16 | 600 | systems/win32/miktex/tm/packages/pr.ini -2020/02/16 | 59430 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64-2.9.tar.lzma -2020/02/16 | 58862 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma -2020/02/16 | 57731 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma -2020/02/16 | 576248 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma +2020/02/16 | 6003 | graphics/circuit_macros/examples/CSlight.m4 +2020/02/16 | 5969 | graphics/circuit_macros/examples/xfig/xfiglib.m4 +2020/02/16 | 591 | graphics/circuit_macros/examples/test.m4 +2020/02/16 | 590069 | systems/win32/w32tex/ChangeLog +2020/02/16 | 5890 | graphics/circuit_macros/examples/Csource.m4 +2020/02/16 | 58343 | systems/texlive/tlnet/tlpkg/translations/messages.pot 2020/02/16 | 5721 | macros/latex/contrib/schulmathematik/schulma-ab.cls -2020/02/16 | 57127 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma -2020/02/16 | 56736 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma 2020/02/16 | 5656 | macros/xetex/generic/xetexko/ChangeLog -2020/02/16 | 56418 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma -2020/02/16 | 563262 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma -2020/02/16 | 560983 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma +2020/02/16 | 5552 | graphics/circuit_macros/examples/FlowchartDefs.m4 2020/02/16 | 5547508 | fonts/haranoaji/HaranoAjiGothic-Heavy.otf -2020/02/16 | 54880 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma -2020/02/16 | 544258 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma -2020/02/16 | 53969 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma -2020/02/16 | 539503 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma -2020/02/16 | 53386 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-2.9.tar.lzma -2020/02/16 | 533703 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma +2020/02/16 | 5537 | graphics/circuit_macros/examples/svg/graysurfSVG.m4 +2020/02/16 | 551 | graphics/circuit_macros/examples/Counting.m4 +2020/02/16 | 5478 | graphics/circuit_macros/examples/graysurf.m4 +2020/02/16 | 545 | graphics/circuit_macros/examples/svg/RotboxSVG.m4 +2020/02/16 | 538 | graphics/circuit_macros/examples/svg/AmpTableSVG.m4 +2020/02/16 | 535 | graphics/circuit_macros/doc/Tline.m4 +2020/02/16 | 532 | graphics/circuit_macros/examples/svg/NLGSVG.m4 2020/02/16 | 5314528 | fonts/haranoaji/HaranoAjiGothic-Bold.otf -2020/02/16 | 524965 | systems/win32/miktex/tm/packages/next/files.csv.lzma -2020/02/16 | 524627 | systems/win32/miktex/tm/packages/files.csv.lzma -2020/02/16 | 52144 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma -2020/02/16 | 52120 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma +2020/02/16 | 518 | graphics/circuit_macros/examples/Rotbox.m4 2020/02/16 | 5189360 | fonts/haranoaji/HaranoAjiGothic-Medium.otf +2020/02/16 | 5176 | graphics/circuit_macros/examples/svg/AntiqueClockSVG.m4 2020/02/16 | 5169740 | fonts/haranoaji/HaranoAjiGothic-Regular.otf 2020/02/16 | 5159144 | fonts/haranoaji-extra/HaranoAjiGothic-Normal.otf 2020/02/16 | 51436 | macros/latex/contrib/schulmathematik/schulmathematik.tex 2020/02/16 | 5135192 | fonts/haranoaji-extra/HaranoAjiGothic-Light.otf -2020/02/16 | 50865 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma -2020/02/16 | 50745 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma -2020/02/16 | 50537 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma +2020/02/16 | 50 | graphics/circuit_macros/doc/bitr.m4 +2020/02/16 | 5015 | graphics/circuit_macros/examples/svg/icsSVG.m4 2020/02/16 | 5004 | macros/xetex/generic/xetexko/xetexko-vertical.sty 2020/02/16 | 499 | systems/win32/miktex/source/miktex-2.9.7300.tar.xz.asc -2020/02/16 | 498553 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma -2020/02/16 | 49684 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma -2020/02/16 | 49304 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma +2020/02/16 | 499 | graphics/circuit_macros/examples/NLG.m4 +2020/02/16 | 499 | graphics/circuit_macros/doc/NLG.m4 +2020/02/16 | 494 | graphics/circuit_macros/examples/AmpTable.m4 +2020/02/16 | 494 | graphics/circuit_macros/doc/AmpTable.m4 2020/02/16 | 4924 | systems/texlive/tlnet/archive/zxjafont.r53793.tar.xz -2020/02/16 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2020/02/16 | 4909 | graphics/circuit_macros/examples/AntiqueClock.m4 +2020/02/16 | 48 | graphics/circuit_macros/doc/oax.m4 +2020/02/16 | 489 | graphics/circuit_macros/examples/Koch.m4 2020/02/16 | 4888860 | fonts/haranoaji-extra/HaranoAjiGothic-ExtraLight.otf -2020/02/16 | 4812 | systems/win32/miktex/tm/packages/next/miktex-config-2.9.tar.lzma -2020/02/16 | 47982 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma +2020/02/16 | 48452 | graphics/circuit_macros/liblog.m4 +2020/02/16 | 4841 | graphics/circuit_macros/examples/ics.m4 +2020/02/16 | 483 | graphics/circuit_macros/doc/eboxdims.m4 +2020/02/16 | 482 | graphics/circuit_macros/examples/clock.m4 +2020/02/16 | 4751 | graphics/circuit_macros/examples/Shaky.m4 +2020/02/16 | 4638 | graphics/circuit_macros/examples/Ball.m4 +2020/02/16 | 462 | graphics/circuit_macros/Copying +2020/02/16 | 4624 | graphics/circuit_macros/examples/svg/roseSVG.m4 +2020/02/16 | 4622 | graphics/circuit_macros/examples/psfrag/Makefile +2020/02/16 | 4615 | graphics/circuit_macros/examples/mf/font.m4 +2020/02/16 | 460 | graphics/circuit_macros/examples/debug1.tex 2020/02/16 | 4584 | systems/texlive/tlnet/archive/euclideangeometry.r53794.tar.xz -2020/02/16 | 45817 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma 2020/02/16 | 45799 | systems/win32/miktex/tm/packages/miktex-dvicopy-bin-x64-2.9.tar.lzma -2020/02/16 | 45751 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma -2020/02/16 | 457124 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma -2020/02/16 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc -2020/02/16 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc -2020/02/16 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc -2020/02/16 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc -2020/02/16 | 45590 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma -2020/02/16 | 45465 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma -2020/02/16 | 450288 | systems/win32/miktex/tm/packages/next/miktex-doc-2.9.tar.lzma -2020/02/16 | 44929 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma +2020/02/16 | 4569 | graphics/circuit_macros/examples/rose.m4 +2020/02/16 | 453 | graphics/circuit_macros/examples/mpost/tstmpost.tex +2020/02/16 | 45323 | graphics/circuit_macros/examples/Incl.eps.gz +2020/02/16 | 449 | graphics/circuit_macros/doc/woodchips.m4 +2020/02/16 | 4489 | graphics/circuit_macros/examples/fet.m4 +2020/02/16 | 4489 | graphics/circuit_macros/doc/fet.m4 +2020/02/16 | 444 | graphics/circuit_macros/examples/svg/FontsSVG.m4 +2020/02/16 | 444 | graphics/circuit_macros/examples/mpost/examplesmpost.tex +2020/02/16 | 442 | graphics/circuit_macros/examples/Wheat.m4 2020/02/16 | 442016 | systems/texlive/tlnet/archive/newpx.doc.r53792.tar.xz 2020/02/16 | 4415 | macros/latex/contrib/schulmathematik/schulma-physik.sty -2020/02/16 | 43430 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma +2020/02/16 | 440 | systems/texlive/tlnet/archive/tlshell.doc.r53801.tar.xz +2020/02/16 | 4354 | graphics/circuit_macros/doc/Makefile +2020/02/16 | 4337 | graphics/circuit_macros/examples/svg/AlogixSVG.m4 +2020/02/16 | 4312 | graphics/circuit_macros/examples/ex09.m4 +2020/02/16 | 4305 | graphics/circuit_macros/examples/Euro.m4 2020/02/16 | 4301 | fonts/haranoaji/LICENSE 2020/02/16 | 4301 | fonts/haranoaji-extra/LICENSE -2020/02/16 | 42955 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma +2020/02/16 | 4288 | graphics/circuit_macros/examples/control.m4 2020/02/16 | 427730 | fonts/newtxtt.zip -2020/02/16 | 42591 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma -2020/02/16 | 41847 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma -2020/02/16 | 41840 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma +2020/02/16 | 4237 | graphics/circuit_macros/examples/mpost/Makefile +2020/02/16 | 422 | graphics/circuit_macros/examples/svg/GrayCodeSVG.m4 +2020/02/16 | 421 | graphics/circuit_macros/examples/GrayCode.m4 +2020/02/16 | 421 | graphics/circuit_macros/doc/Sinus.m4 +2020/02/16 | 4205 | graphics/circuit_macros/examples/Alogix.m4 +2020/02/16 | 419 | graphics/circuit_macros/examples/svg/SixpoleSVG.m4 +2020/02/16 | 419 | graphics/circuit_macros/examples/Sixpole.m4 +2020/02/16 | 417 | graphics/circuit_macros/examples/svg/SQUIDSVG.m4 +2020/02/16 | 416 | graphics/circuit_macros/examples/testpdf.tex +2020/02/16 | 4139 | macros/luatex/latex/luatodonotes/path_line.lua +2020/02/16 | 4108 | graphics/circuit_macros/examples/svg/ex09SVG.m4 2020/02/16 | 40963 | systems/win32/miktex/tm/packages/miktex-dvicopy-bin-2.9.tar.lzma -2020/02/16 | 40950 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma -2020/02/16 | 40692 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma +2020/02/16 | 4073 | graphics/circuit_macros/doc/Circuit_macros.bib +2020/02/16 | 406 | graphics/circuit_macros/examples/psfrag/tstpsfrag.tex +2020/02/16 | 404 | graphics/circuit_macros/doc/Series.m4 2020/02/16 | 4049 | macros/xetex/generic/xetexko/xetexko-hanging.sty +2020/02/16 | 4003 | graphics/circuit_macros/examples/svg/InclepsSVG.m4 +2020/02/16 | 3964 | graphics/circuit_macros/examples/svg/SwitchesSVG.m4 2020/02/16 | 39492 | macros/xetex/generic/xetexko/hanjaexa_hangul.tab -2020/02/16 | 3948926 | systems/texlive/tlnet/install-tl-unx.tar.gz -2020/02/16 | 391587 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma +2020/02/16 | 3932 | graphics/circuit_macros/examples/svg/Makefile +2020/02/16 | 392821024 | systems/win32/w32tex/ltxpkgdocs.tar.xz +2020/02/16 | 3919 | graphics/circuit_macros/examples/PushPull.m4 +2020/02/16 | 3911 | graphics/circuit_macros/examples/Flow.m4 2020/02/16 | 388 | systems/texlive/tlnet/archive/texlive-docindex.r53788.tar.xz -2020/02/16 | 38843 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma -2020/02/16 | 38797 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma -2020/02/16 | 387565 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-x64-2.9.tar.lzma +2020/02/16 | 387 | graphics/circuit_macros/doc/lrarrows.m4 +2020/02/16 | 3842 | graphics/circuit_macros/examples/svg/recycleSVG.m4 +2020/02/16 | 3836 | graphics/circuit_macros/examples/svg/fetSVG.m4 +2020/02/16 | 382 | graphics/circuit_macros/examples/tikz.tex +2020/02/16 | 3825 | graphics/circuit_macros/examples/recycle.m4 +2020/02/16 | 380 | graphics/circuit_macros/examples/SQUID.m4 +2020/02/16 | 3785 | graphics/circuit_macros/examples/Mixer.m4 2020/02/16 | 3783 | macros/luatex/generic/luatexko/luatexko-uhc2utf8.lua +2020/02/16 | 3779 | graphics/circuit_macros/examples/svg/PushPullSVG.m4 2020/02/16 | 3720 | macros/luatex/generic/luatexko/README -2020/02/16 | 36615 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma +2020/02/16 | 370 | graphics/circuit_macros/examples/snake.m4 +2020/02/16 | 365 | graphics/circuit_macros/examples/rotellipse.m4 2020/02/16 | 3651 | macros/xetex/generic/xetexko/xetexko.sty -2020/02/16 | 36398 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma +2020/02/16 | 3646 | graphics/circuit_macros/examples/svg/ContactSVG.m4 +2020/02/16 | 3631 | graphics/circuit_macros/examples/svg/wormSVG.m4 +2020/02/16 | 3608 | graphics/circuit_macros/examples/Switches.m4 +2020/02/16 | 3608 | graphics/circuit_macros/doc/Switches.m4 2020/02/16 | 360042 | macros/luatex/generic/luatexko.zip -2020/02/16 | 356122 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma -2020/02/16 | 354459 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-2.9.tar.lzma +2020/02/16 | 3583 | graphics/circuit_macros/examples/svg/ButtonsSVG.m4 +2020/02/16 | 3573 | graphics/circuit_macros/examples/svg/randomSVG.m4 +2020/02/16 | 3545 | graphics/circuit_macros/examples/random.m4 +2020/02/16 | 3522 | graphics/circuit_macros/examples/svg/ex12SVG.m4 2020/02/16 | 3510 | macros/xetex/generic/xetexko/README -2020/02/16 | 34869 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma -2020/02/16 | 34846 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma -2020/02/16 | 33529 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma -2020/02/16 | 33365 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma -2020/02/16 | 328776 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma +2020/02/16 | 3508 | graphics/circuit_macros/examples/Buttons.m4 +2020/02/16 | 3487 | graphics/circuit_macros/examples/svg/MixerSVG.m4 +2020/02/16 | 337 | graphics/circuit_macros/examples/xfig/Makefile +2020/02/16 | 3346 | graphics/circuit_macros/examples/Windings.m4 +2020/02/16 | 3346 | graphics/circuit_macros/doc/Windings.m4 +2020/02/16 | 3339 | graphics/circuit_macros/examples/ex12.m4 +2020/02/16 | 3326 | graphics/circuit_macros/examples/Contact.m4 +2020/02/16 | 3326 | graphics/circuit_macros/doc/Contact.m4 +2020/02/16 | 3321 | graphics/circuit_macros/examples/thyristor.m4 +2020/02/16 | 3321 | graphics/circuit_macros/doc/thyristor.m4 +2020/02/16 | 3310 | graphics/circuit_macros/examples/svg/thyristorSVG.m4 +2020/02/16 | 32 | graphics/circuit_macros/examples/Incl.eps.bb +2020/02/16 | 329 | graphics/circuit_macros/doc/FF.m4 +2020/02/16 | 3290 | graphics/circuit_macros/examples/svg/sfgSVG.m4 2020/02/16 | 32563263 | fonts/haranoaji-extra.zip 2020/02/16 | 32504139 | fonts/haranoaji.zip +2020/02/16 | 324 | systems/texlive/tlnet/archive/optex.x86_64-darwinlegacy.r53804.tar.xz +2020/02/16 | 324 | systems/texlive/tlnet/archive/optex.x86_64-cygwin.r53804.tar.xz 2020/02/16 | 324254 | macros/luatex/generic/luatexko/luatexko-doc.pdf -2020/02/16 | 32362 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma -2020/02/16 | 321848 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma -2020/02/16 | 32181 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma 2020/02/16 | 3217 | fonts/haranoaji/README 2020/02/16 | 3217 | fonts/haranoaji-extra/README -2020/02/16 | 31253 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma +2020/02/16 | 320 | systems/texlive/tlnet/archive/optex.x86_64-linux.r53804.tar.xz +2020/02/16 | 320 | systems/texlive/tlnet/archive/optex.x86_64-linuxmusl.r53804.tar.xz +2020/02/16 | 320 | systems/texlive/tlnet/archive/optex.x86_64-darwin.r53804.tar.xz +2020/02/16 | 320 | systems/texlive/tlnet/archive/optex.i386-cygwin.r53804.tar.xz +2020/02/16 | 320 | systems/texlive/tlnet/archive/optex.amd64-freebsd.r53804.tar.xz +2020/02/16 | 320 | systems/texlive/tlnet/archive/optex.aarch64-linux.r53804.tar.xz +2020/02/16 | 3206 | graphics/circuit_macros/examples/svg/controlSVG.m4 +2020/02/16 | 317 | graphics/circuit_macros/examples/psfrag/README-psfrag.txt +2020/02/16 | 3175 | graphics/circuit_macros/examples/Blogix.m4 +2020/02/16 | 316 | systems/texlive/tlnet/archive/optex.x86_64-solaris.r53804.tar.xz +2020/02/16 | 316 | systems/texlive/tlnet/archive/optex.i386-solaris.r53804.tar.xz +2020/02/16 | 316 | systems/texlive/tlnet/archive/optex.i386-netbsd.r53804.tar.xz +2020/02/16 | 316 | systems/texlive/tlnet/archive/optex.i386-linux.r53804.tar.xz +2020/02/16 | 316 | systems/texlive/tlnet/archive/optex.i386-freebsd.r53804.tar.xz +2020/02/16 | 316 | systems/texlive/tlnet/archive/optex.armhf-linux.r53804.tar.xz +2020/02/16 | 316 | systems/texlive/tlnet/archive/optex.amd64-netbsd.r53804.tar.xz 2020/02/16 | 31248 | macros/luatex/generic/luatexko/luatexko-doc.tex -2020/02/16 | 31153 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma 2020/02/16 | 309950 | macros/xetex/generic/xetexko.zip -2020/02/16 | 30994 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma -2020/02/16 | 309681 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma -2020/02/16 | 30742 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma +2020/02/16 | 3095 | macros/luatex/latex/luatodonotes/luatodonotes.ins +2020/02/16 | 3091 | graphics/circuit_macros/examples/svg/TtreeSVG.m4 2020/02/16 | 30593 | macros/luatex/generic/luatexko/luatexko.sty -2020/02/16 | 30234 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma -2020/02/16 | 29676 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma +2020/02/16 | 2994 | graphics/circuit_macros/examples/svg/WindingsSVG.m4 +2020/02/16 | 29772 | graphics/circuit_macros/examples/Incl.pdf 2020/02/16 | 29352 | systems/texlive/tlnet/archive/sdaps.source.r53795.tar.xz -2020/02/16 | 29283 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma -2020/02/16 | 29245 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma -2020/02/16 | 29120 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma +2020/02/16 | 2912 | graphics/circuit_macros/doc/Workflow.m4 2020/02/16 | 28748 | macros/xetex/generic/xetexko/xetexko-doc.tex -2020/02/16 | 28743 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma 2020/02/16 | 286251 | macros/latex/contrib/breqn/flexisym.pdf -2020/02/16 | 28495 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma -2020/02/16 | 281549 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma -2020/02/16 | 281238 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma -2020/02/16 | 27781 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma -2020/02/16 | 276822 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma -2020/02/16 | 272360 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma -2020/02/16 | 26928 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma -2020/02/16 | 26768 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma +2020/02/16 | 2834 | graphics/circuit_macros/postscript.m4 +2020/02/16 | 281 | graphics/circuit_macros/examples/windows.m4 +2020/02/16 | 2814 | graphics/circuit_macros/examples/README-examples +2020/02/16 | 2799 | graphics/circuit_macros/examples/worm.m4 +2020/02/16 | 2792 | graphics/circuit_macros/examples/OpAmpFilter.m4 +2020/02/16 | 2761 | graphics/circuit_macros/examples/sfg.m4 +2020/02/16 | 269 | graphics/circuit_macros/doc/Loop.m4 +2020/02/16 | 2696 | graphics/circuit_macros/examples/keyval.m4 +2020/02/16 | 2685 | graphics/circuit_macros/examples/svg/ex11SVG.m4 +2020/02/16 | 2674 | graphics/circuit_macros/examples/Planes.m4 +2020/02/16 | 2670 | graphics/circuit_macros/examples/CctTable.m4 +2020/02/16 | 2670 | graphics/circuit_macros/doc/CctTable.m4 2020/02/16 | 26696 | systems/texlive/tlnet/archive/sdaps.r53795.tar.xz -2020/02/16 | 26653 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma -2020/02/16 | 26507 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma +2020/02/16 | 2639 | graphics/circuit_macros/doc/Circuit_macros.tex 2020/02/16 | 26396312 | systems/win32/miktex/source/miktex-2.9.7300.tar.xz -2020/02/16 | 2581041 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma -2020/02/16 | 25306 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma -2020/02/16 | 247670 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma +2020/02/16 | 2584 | graphics/circuit_macros/examples/Escher.m4 +2020/02/16 | 2559 | graphics/circuit_macros/examples/svg/ex08SVG.m4 +2020/02/16 | 2556 | graphics/circuit_macros/examples/ex08.m4 +2020/02/16 | 2551 | graphics/circuit_macros/examples/svg/OptoisoSVG.m4 +2020/02/16 | 25508 | systems/texlive/tlnet/archive/tlshell.r53801.tar.xz +2020/02/16 | 25460 | graphics/circuit_macros/doc/Capture.JPG +2020/02/16 | 2542 | graphics/circuit_macros/examples/brace.m4 +2020/02/16 | 2528 | graphics/circuit_macros/examples/svg/AdderSVG.m4 +2020/02/16 | 2525 | graphics/circuit_macros/examples/svg/CrowSVG.m4 +2020/02/16 | 2520 | graphics/circuit_macros/examples/Crow.m4 2020/02/16 | 247650 | macros/latex/contrib/breqn/breqn.dtx -2020/02/16 | 247152 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma -2020/02/16 | 246462 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma -2020/02/16 | 2457578 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma +2020/02/16 | 2443 | graphics/circuit_macros/examples/svg/ex00SVG.m4 +2020/02/16 | 2442 | graphics/circuit_macros/examples/Optoiso.m4 2020/02/16 | 244252936 | systems/win32/miktex/setup/windows-x64/basic-miktex-2.9.7351-x64.exe -2020/02/16 | 237661 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma +2020/02/16 | 2412 | graphics/circuit_macros/examples/ex00.m4 +2020/02/16 | 2402 | graphics/circuit_macros/examples/Adder.m4 +2020/02/16 | 2389 | graphics/circuit_macros/doc/Dac.m4 +2020/02/16 | 2362 | graphics/circuit_macros/examples/Jack.m4 +2020/02/16 | 2362 | graphics/circuit_macros/doc/Jack.m4 +2020/02/16 | 2361 | graphics/circuit_macros/examples/ex11.m4 2020/02/16 | 235621640 | systems/win32/miktex/setup/windows-x86/basic-miktex-2.9.7351.exe -2020/02/16 | 23380 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma +2020/02/16 | 2350 | graphics/circuit_macros/examples/svg/AudioSVG.m4 +2020/02/16 | 233 | graphics/circuit_macros/examples/Ccurve.m4 +2020/02/16 | 2324 | graphics/circuit_macros/examples/svg/cscSVG.m4 +2020/02/16 | 2304 | graphics/circuit_macros/examples/Loglog.m4 2020/02/16 | 2302 | macros/latex/contrib/schulmathematik/schulma-komp.cls -2020/02/16 | 22934 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma +2020/02/16 | 2296 | graphics/circuit_macros/examples/Audio.m4 +2020/02/16 | 2296 | graphics/circuit_macros/doc/Audio.m4 +2020/02/16 | 2295 | graphics/circuit_macros/examples/csc.m4 2020/02/16 | 2278 | macros/latex/contrib/schulmathematik/schulma.sty 2020/02/16 | 227251 | macros/xetex/generic/xetexko/xetexko-doc.pdf -2020/02/16 | 22541272 | systems/texlive/tlnet/install-tl.zip +2020/02/16 | 2241 | graphics/circuit_macros/examples/svg/LoglogSVG.m4 +2020/02/16 | 221 | graphics/circuit_macros/examples/rotate.tex +2020/02/16 | 219 | graphics/circuit_macros/examples/tst1.tex 2020/02/16 | 2190 | macros/latex/contrib/breqn/breqnbundle.ins -2020/02/16 | 2165528 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz -2020/02/16 | 215280 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma -2020/02/16 | 20688 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma +2020/02/16 | 2180 | graphics/circuit_macros/examples/svg/CctTableSVG.m4 +2020/02/16 | 217 | graphics/circuit_macros/doc/stringdims.m4 +2020/02/16 | 2177 | graphics/circuit_macros/examples/svg/ex21SVG.m4 +2020/02/16 | 2171 | graphics/circuit_macros/examples/svg/I2LSVG.m4 +2020/02/16 | 2170 | graphics/circuit_macros/examples/ex06.m4 +2020/02/16 | 2161 | graphics/circuit_macros/examples/Conn.m4 +2020/02/16 | 2161 | graphics/circuit_macros/doc/Conn.m4 +2020/02/16 | 215081 | macros/luatex/latex/luatodonotes/luatodonotes.pdf +2020/02/16 | 21384 | graphics/circuit_macros/examples/svg/Incl.jpg +2020/02/16 | 21204 | graphics/circuit_macros/examples/xfig/xfiglib.fig +2020/02/16 | 2119 | graphics/circuit_macros/examples/Logic.m4 +2020/02/16 | 2119 | graphics/circuit_macros/doc/Logic.m4 +2020/02/16 | 2099 | graphics/circuit_macros/pstricks.m4 +2020/02/16 | 2097 | graphics/circuit_macros/examples/Ttree.m4 +2020/02/16 | 2097 | graphics/circuit_macros/doc/Ttree.m4 +2020/02/16 | 2085 | graphics/circuit_macros/pgf.m4 +2020/02/16 | 2085 | graphics/circuit_macros/examples/Sources.m4 +2020/02/16 | 2085 | graphics/circuit_macros/doc/Sources.m4 +2020/02/16 | 207788 | systems/texlive/tlnet/archive/texlive-scripts.doc.r53801.tar.xz +2020/02/16 | 2069 | graphics/circuit_macros/examples/svg/relaycoilSVG.m4 +2020/02/16 | 2068 | graphics/circuit_macros/examples/I2L.m4 +2020/02/16 | 2051 | graphics/circuit_macros/examples/svg/JackSVG.m4 2020/02/16 | 203157 | macros/latex/contrib/schulmathematik.zip +2020/02/16 | 20277 | graphics/circuit_macros/README +2020/02/16 | 20268 | systems/texlive/tlnet/tlpkg/tltcl/tltcl.tcl +2020/02/16 | 2024 | macros/luatex/latex/luatodonotes/path_point.lua 2020/02/16 | 20243 | macros/xetex/generic/xetexko/xetexko-font.sty -2020/02/16 | 201993 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma +2020/02/16 | 20234 | graphics/circuit_macros/examples/odistmakefile +2020/02/16 | 2022 | graphics/circuit_macros/examples/svg/ConnSVG.m4 +2020/02/16 | 2018 | graphics/circuit_macros/examples/svg/ex06SVG.m4 +2020/02/16 | 2014 | graphics/circuit_macros/examples/pwrsupply.m4 2020/02/16 | 2014952 | systems/win32/miktex/tm/packages/newpx.tar.lzma -2020/02/16 | 199144 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma +2020/02/16 | 2013 | graphics/circuit_macros/doc/HybridPi.m4 +2020/02/16 | 2000 | graphics/circuit_macros/examples/ex21.m4 +2020/02/16 | 1995 | graphics/circuit_macros/doc/Corners.m4 2020/02/16 | 1986744 | language/japanese/BX/bxjscls.zip -2020/02/16 | 19799 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma -2020/02/16 | 196723 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma -2020/02/16 | 196659 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma +2020/02/16 | 1985 | graphics/circuit_macros/examples/svg/XORSVG.m4 +2020/02/16 | 1975 | graphics/circuit_macros/doc/FlipFlop.m4 +2020/02/16 | 1966 | graphics/circuit_macros/examples/svg/DriveSVG.m4 +2020/02/16 | 1966 | graphics/circuit_macros/examples/Drive.m4 2020/02/16 | 1963969 | systems/win32/miktex/tm/packages/miktex-luatex-bin-x64-2.9.tar.lzma -2020/02/16 | 194912 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma -2020/02/16 | 193832 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma -2020/02/16 | 1938204 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma -2020/02/16 | 18699205 | systems/texlive/tlnet/install-tl-windows.exe -2020/02/16 | 186773 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma -2020/02/16 | 185531 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma +2020/02/16 | 1962 | graphics/circuit_macros/examples/Autologix.m4 +2020/02/16 | 1955 | graphics/circuit_macros/examples/svg/ABlogixSVG.m4 +2020/02/16 | 1953 | graphics/circuit_macros/examples/svg/MotorControlSVG.m4 +2020/02/16 | 1953 | graphics/circuit_macros/doc/Buffer.m4 +2020/02/16 | 1939 | graphics/circuit_macros/examples/debug2.m4 +2020/02/16 | 1931 | graphics/circuit_macros/examples/svg/LogicSVG.m4 +2020/02/16 | 19238 | graphics/circuit_macros/dpictools.pic +2020/02/16 | 1922 | graphics/circuit_macros/examples/MotorControl.m4 +2020/02/16 | 1921 | graphics/circuit_macros/examples/relaycoil.m4 +2020/02/16 | 1921 | graphics/circuit_macros/doc/relaycoil.m4 +2020/02/16 | 19176 | graphics/circuit_macros/Licence.txt +2020/02/16 | 1906 | graphics/circuit_macros/examples/SPM.m4 +2020/02/16 | 1893 | graphics/circuit_macros/examples/svg/ex16SVG.m4 +2020/02/16 | 1891 | graphics/circuit_macros/examples/svg/ex04SVG.m4 +2020/02/16 | 1890 | graphics/circuit_macros/examples/examples.tex +2020/02/16 | 1882 | graphics/circuit_macros/examples/svg/CrullerSVG.m4 +2020/02/16 | 1879 | graphics/circuit_macros/examples/Cruller.m4 +2020/02/16 | 1872168 | systems/win32/w32tex/win64/ptex-w64.tar.xz +2020/02/16 | 1865 | graphics/circuit_macros/examples/ex16.m4 +2020/02/16 | 1860 | graphics/circuit_macros/doc/bi_trans.m4 +2020/02/16 | 1857 | graphics/circuit_macros/doc/Composite.m4 2020/02/16 | 185385 | macros/latex/contrib/breqn/mathstyle.pdf -2020/02/16 | 184203 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma -2020/02/16 | 182743 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma +2020/02/16 | 1852 | graphics/circuit_macros/examples/Orbits.m4 +2020/02/16 | 1842 | graphics/circuit_macros/examples/svg/SourcesSVG.m4 +2020/02/16 | 1837 | graphics/circuit_macros/examples/svg/SchottkySVG.m4 +2020/02/16 | 1823 | graphics/circuit_macros/examples/XOR.m4 2020/02/16 | 1812 | macros/xetex/generic/xetexko/hanjacom_hangul.tab +2020/02/16 | 1812 | graphics/circuit_macros/examples/svg/BipSVG.m4 +2020/02/16 | 1807 | graphics/circuit_macros/examples/svg/ex05SVG.m4 2020/02/16 | 180669 | macros/latex/contrib/schulmathematik/schulmathematik.pdf -2020/02/16 | 17755 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma -2020/02/16 | 177528 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma +2020/02/16 | 1778 | graphics/circuit_macros/examples/Schottky.m4 2020/02/16 | 17744 | systems/texlive/tlnet/archive/euclideangeometry.source.r53794.tar.xz -2020/02/16 | 17681 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma -2020/02/16 | 1697677 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma -2020/02/16 | 169440 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma +2020/02/16 | 1737 | graphics/circuit_macros/examples/svg/ContactsSVG.m4 +2020/02/16 | 1730 | graphics/circuit_macros/examples/ABlogix.m4 +2020/02/16 | 1699 | graphics/circuit_macros/examples/svg/ex10SVG.m4 2020/02/16 | 1690337 | systems/win32/miktex/tm/packages/miktex-luatex-bin-2.9.tar.lzma -2020/02/16 | 168844 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma -2020/02/16 | 167839 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma +2020/02/16 | 16829 | graphics/circuit_macros/examples/files.tex +2020/02/16 | 1675 | graphics/circuit_macros/examples/svg/TTLnandSVG.m4 +2020/02/16 | 1669 | graphics/circuit_macros/examples/svg/PconnSVG.m4 +2020/02/16 | 1668 | graphics/circuit_macros/examples/svg/Banking.m4 +2020/02/16 | 1668 | graphics/circuit_macros/examples/IC10107.m4 +2020/02/16 | 165 | graphics/circuit_macros/doc/tranbody.m4 2020/02/16 | 165744 | systems/texlive/tlnet/archive/zxjafont.doc.r53793.tar.xz -2020/02/16 | 164888 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma +2020/02/16 | 1654 | graphics/circuit_macros/examples/Pconn.m4 +2020/02/16 | 1654 | graphics/circuit_macros/examples/ex04.m4 +2020/02/16 | 1654 | graphics/circuit_macros/doc/Pconn.m4 2020/02/16 | 16457 | macros/luatex/generic/luatexko/luatexko-normalize.lua -2020/02/16 | 16118873 | systems/texlive/tlnet/tlpkg/texlive.tlpdb -2020/02/16 | 161144 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma -2020/02/16 | 16039 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma -2020/02/16 | 15894 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma +2020/02/16 | 1640 | graphics/circuit_macros/mpost.m4 +2020/02/16 | 1639 | graphics/circuit_macros/Makefile +2020/02/16 | 1624 | graphics/circuit_macros/doc/ParSeries.m4 +2020/02/16 | 1619 | graphics/circuit_macros/examples/Bip.m4 +2020/02/16 | 1619 | graphics/circuit_macros/doc/Bip.m4 +2020/02/16 | 1616 | graphics/circuit_macros/examples/svg/TimerSVG.m4 +2020/02/16 | 1608 | graphics/circuit_macros/examples/ex05.m4 +2020/02/16 | 1593 | graphics/circuit_macros/examples/svg/MCSVG.m4 2020/02/16 | 158748 | systems/texlive/tlnet/archive/texlive-docindex.doc.r53788.tar.xz +2020/02/16 | 1585 | graphics/circuit_macros/examples/Contacts.m4 +2020/02/16 | 1585 | graphics/circuit_macros/doc/Contacts.m4 +2020/02/16 | 1575 | graphics/circuit_macros/doc/mplex.m4 2020/02/16 | 1575025 | systems/win32/miktex/tm/packages/hitszthesis.tar.lzma 2020/02/16 | 1571388 | systems/texlive/tlnet/archive/newpx.r53792.tar.xz -2020/02/16 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 -2020/02/16 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2020/02/16 | 1559 | graphics/circuit_macros/examples/svg/XformSVG.m4 +2020/02/16 | 1558 | graphics/circuit_macros/examples/TTLnand.m4 +2020/02/16 | 1546 | graphics/circuit_macros/examples/Timer.m4 +2020/02/16 | 154504 | graphics/circuit_macros/libcct.m4 +2020/02/16 | 1529 | graphics/circuit_macros/examples/mf/Makefile +2020/02/16 | 1526 | graphics/circuit_macros/examples/Xform.m4 +2020/02/16 | 1526 | graphics/circuit_macros/doc/Xform.m4 +2020/02/16 | 1525 | graphics/circuit_macros/examples/rotatetext.m4 2020/02/16 | 15253 | macros/latex/contrib/breqn/mathstyle.dtx -2020/02/16 | 152084 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma -2020/02/16 | 149877 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma -2020/02/16 | 148966 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma -2020/02/16 | 147166 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma -2020/02/16 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 -2020/02/16 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 -2020/02/16 | 14057 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma -2020/02/16 | 1381484 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma -2020/02/16 | 137214 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma +2020/02/16 | 1492 | graphics/circuit_macros/examples/ex10.m4 +2020/02/16 | 1485 | graphics/circuit_macros/examples/Demultiplexer.m4 +2020/02/16 | 1485 | graphics/circuit_macros/doc/Demultiplexer.m4 +2020/02/16 | 1467 | graphics/circuit_macros/examples/svg/MultiplexerSVG.m4 +2020/02/16 | 1467 | graphics/circuit_macros/examples/Diodes.m4 +2020/02/16 | 1467 | graphics/circuit_macros/doc/Diodes.m4 +2020/02/16 | 1464 | graphics/circuit_macros/doc/Taps.m4 +2020/02/16 | 1458 | graphics/circuit_macros/examples/header.tex +2020/02/16 | 1456 | graphics/circuit_macros/examples/svg/SVGconfig.m4 +2020/02/16 | 144 | graphics/circuit_macros/doc/Thermal.m4 +2020/02/16 | 1444 | graphics/circuit_macros/examples/svg/ThreeSVG.m4 +2020/02/16 | 1443 | graphics/circuit_macros/examples/Resolver.m4 +2020/02/16 | 1437 | graphics/circuit_macros/examples/svg/ShiftRSVG.m4 +2020/02/16 | 14346 | graphics/circuit_macros/darrow.m4 +2020/02/16 | 1433 | graphics/circuit_macros/examples/Opamp.m4 +2020/02/16 | 1433 | graphics/circuit_macros/doc/Opamp.m4 +2020/02/16 | 1431 | graphics/circuit_macros/examples/svg/RelaySVG.m4 +2020/02/16 | 1429 | graphics/circuit_macros/examples/svg/DiodesSVG.m4 +2020/02/16 | 1406 | graphics/circuit_macros/examples/ShiftR.m4 +2020/02/16 | 1406 | graphics/circuit_macros/doc/ShiftR.m4 +2020/02/16 | 1400 | graphics/circuit_macros/examples/Multiplexer.m4 +2020/02/16 | 1400 | graphics/circuit_macros/doc/Multiplexer.m4 +2020/02/16 | 1393 | graphics/circuit_macros/examples/MC.m4 +2020/02/16 | 1387 | graphics/circuit_macros/examples/svg/CrossbarSVG.m4 +2020/02/16 | 137 | graphics/circuit_macros/doc/oaxbody.m4 +2020/02/16 | 1375 | graphics/circuit_macros/examples/person.m4 +2020/02/16 | 1373 | graphics/circuit_macros/examples/svg/DemultiplexerSVG.m4 2020/02/16 | 1364 | macros/latex/contrib/breqn/README.md -2020/02/16 | 133127 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma -2020/02/16 | 13068 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma -2020/02/16 | 130324 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma +2020/02/16 | 1358 | graphics/circuit_macros/examples/Crossbar.m4 +2020/02/16 | 133969 | graphics/circuit_macros/doc/body.tex +2020/02/16 | 1331 | graphics/circuit_macros/examples/svg/SierpinskiSVG.m4 +2020/02/16 | 1331 | graphics/circuit_macros/examples/Sierpinski.m4 +2020/02/16 | 1329 | graphics/circuit_macros/doc/currents.m4 +2020/02/16 | 13256 | graphics/circuit_macros/examples/Tubediags.m4 +2020/02/16 | 131 | graphics/circuit_macros/doc/Axes.m4 +2020/02/16 | 131976 | systems/texlive/tlnet/archive/texlive-scripts.r53801.tar.xz +2020/02/16 | 130 | graphics/circuit_macros/doc/bitrbody.m4 +2020/02/16 | 13026 | graphics/circuit_macros/examples/Heathkit.m4 +2020/02/16 | 12 | graphics/circuit_macros/doc/Version.tex +2020/02/16 | 1291 | graphics/circuit_macros/doc/ConfigC.m4 +2020/02/16 | 1290232 | systems/texlive/tlnet/archive/optex.doc.r53804.tar.xz +2020/02/16 | 1287 | graphics/circuit_macros/examples/Three.m4 2020/02/16 | 12788 | macros/latex/contrib/schulmathematik/schulma-klausur.cls +2020/02/16 | 12711 | graphics/circuit_macros/examples/svg/HeathkitSVG.m4 +2020/02/16 | 1259 | graphics/circuit_macros/examples/Relay.m4 +2020/02/16 | 1259 | graphics/circuit_macros/doc/Relay.m4 +2020/02/16 | 1257 | graphics/circuit_macros/doc/ConfigB.m4 2020/02/16 | 125412 | macros/xetex/generic/xetexko/hanja_hangul.tab 2020/02/16 | 1253905 | install/macros/latex/contrib/breqn.tds.zip -2020/02/16 | 1249564 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma -2020/02/16 | 1229003 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma +2020/02/16 | 12478 | graphics/circuit_macros/examples/svg/TubediagsSVG.m4 +2020/02/16 | 1238 | graphics/circuit_macros/examples/svg/NportSVG.m4 +2020/02/16 | 12306 | graphics/circuit_macros/examples/svg/examplesSVG.htmx +2020/02/16 | 1229 | graphics/circuit_macros/doc/fbfilter.m4 2020/02/16 | 1215569 | macros/latex/contrib/breqn.zip -2020/02/16 | 1175116 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma -2020/02/16 | 1174584 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma -2020/02/16 | 116766 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma +2020/02/16 | 1211 | graphics/circuit_macros/examples/Antennas.m4 +2020/02/16 | 1211 | graphics/circuit_macros/doc/Antennas.m4 +2020/02/16 | 1204 | graphics/circuit_macros/examples/svg/ex17SVG.m4 +2020/02/16 | 11 | graphics/circuit_macros/doc/test.tex +2020/02/16 | 11927 | graphics/circuit_macros/CHANGES +2020/02/16 | 1185 | graphics/circuit_macros/boxdims.sty +2020/02/16 | 1174 | graphics/circuit_macros/examples/PPA.m4 +2020/02/16 | 1157 | graphics/circuit_macros/examples/svg/NPDTSVG.m4 2020/02/16 | 11556 | macros/latex/contrib/schulmathematik/schulma-gutachten.cls -2020/02/16 | 115488 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma -2020/02/16 | 110868 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma +2020/02/16 | 1151 | graphics/circuit_macros/doc/Darlington.m4 +2020/02/16 | 1149 | graphics/circuit_macros/examples/svg/HeadersSVG.m4 +2020/02/16 | 1128 | graphics/circuit_macros/examples/NPDT.m4 +2020/02/16 | 1128 | graphics/circuit_macros/doc/NPDT.m4 +2020/02/16 | 11273 | graphics/circuit_macros/lib3D.m4 +2020/02/16 | 1126 | graphics/circuit_macros/examples/ex17.m4 +2020/02/16 | 1120 | graphics/circuit_macros/doc/ConfigA.m4 +2020/02/16 | 1114 | macros/luatex/latex/luatodonotes/README.md +2020/02/16 | 1114 | graphics/circuit_macros/mfpic.m4 +2020/02/16 | 11112 | systems/texlive/tlnet/tlpkg/TeXLive/TLConfig.pm +2020/02/16 | 110941 | systems/texlive/tlnet/tlpkg/translations/ru.po 2020/02/16 | 1106637 | macros/latex/contrib/biblatex-contrib/archaeologie.zip -2020/02/16 | 1102207 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma -2020/02/16 | 1096625 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma -2020/02/16 | 1094773 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma -2020/02/16 | 108954 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma -2020/02/16 | 1043545 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma -2020/02/16 | 1043329 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma -2020/02/16 | 102365 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma -2020/02/16 | 100620 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma +2020/02/16 | 1100 | graphics/circuit_macros/examples/ex02.m4 +2020/02/16 | 109592 | systems/texlive/tlnet/tlpkg/translations/sr.po +2020/02/16 | 1093 | graphics/circuit_macros/examples/svg/ex02SVG.m4 +2020/02/16 | 1090 | graphics/circuit_macros/examples/svg/AntennasSVG.m4 +2020/02/16 | 1080 | graphics/circuit_macros/examples/svg/BtreeSVG.m4 +2020/02/16 | 1076 | graphics/circuit_macros/examples/mf/mftest +2020/02/16 | 1075 | graphics/circuit_macros/examples/bistable.m4 +2020/02/16 | 1074 | graphics/circuit_macros/doc/bistable.m4 +2020/02/16 | 1070 | graphics/circuit_macros/examples/svg/EmarrowsSVG.m4 +2020/02/16 | 1065 | graphics/circuit_macros/examples/svg/ex18SVG.m4 +2020/02/16 | 10589 | graphics/circuit_macros/examples/svg/expSVG.m4 +2020/02/16 | 1055 | graphics/circuit_macros/examples/svg/TgateSVG.m4 +2020/02/16 | 10439 | graphics/circuit_macros/examples/svg/paletteSVG.m4 +2020/02/16 | 1040 | graphics/circuit_macros/examples/Nport.m4 +2020/02/16 | 1040 | graphics/circuit_macros/doc/Nport.m4 +2020/02/16 | 1039 | graphics/circuit_macros/examples/chaos.m4 +2020/02/16 | 1034 | graphics/circuit_macros/examples/svg/OpampSVG.m4 +2020/02/16 | 1029 | graphics/circuit_macros/xfig.m4 +2020/02/16 | 10297168 | systems/win32/w32tex/ptex-w32.tar.xz +2020/02/16 | 1024 | graphics/circuit_macros/examples/Btree.m4 +2020/02/16 | 1022 | graphics/circuit_macros/examples/Tgate.m4 +2020/02/16 | 1022 | graphics/circuit_macros/doc/Tgate.m4 +2020/02/16 | 1020 | graphics/circuit_macros/examples/Headers.m4 +2020/02/16 | 1020 | graphics/circuit_macros/doc/Headers.m4 +2020/02/16 | 1019 | graphics/circuit_macros/gpic.m4 +2020/02/16 | 1003 | graphics/circuit_macros/examples/ex15.m4 2020/02/15 | 9937192 | systems/texlive/tlnet/archive/l3kernel.doc.r53781.tar.xz 2020/02/15 | 99063264 | systems/win32/w32tex/web2c-lib.tar.xz 2020/02/15 | 9900 | fonts/newpx/tfm/zpl-BoldItalic-lf-sc-t1.tfm @@ -413,7 +1324,6 @@ 2020/02/15 | 6052 | systems/texlive/tlnet/archive/collection-latexextra.r53779.tar.xz 2020/02/15 | 5982332 | systems/texlive/tlnet/archive/glossaries.doc.r53777.tar.xz 2020/02/15 | 59440 | systems/win32/miktex/tm/packages/miktex-tdsutil-bin-x64-2.9.tar.lzma -2020/02/15 | 589840 | systems/win32/w32tex/ChangeLog 2020/02/15 | 58793 | systems/win32/miktex/tm/packages/miktex-cweb-bin-x64-2.9.tar.lzma 2020/02/15 | 57718 | systems/win32/miktex/tm/packages/miktex-gsf2pk-bin-2.9.tar.lzma 2020/02/15 | 57623 | support/texlive/texlive-dummy/EnterpriseLinux-8/texlive-dummy-2020-4.el8.src.rpm @@ -1131,7 +2041,6 @@ 2020/02/14 | 105090 | macros/latex/contrib/l3kernel/l3news05.pdf 2020/02/14 | 1048222 | macros/latex/contrib/glossaries/glossaries.dtx 2020/02/14 | 1046084 | macros/latex/contrib/fewerfloatpages.zip -2020/02/14 | 10322572 | systems/win32/w32tex/ptex-w32.tar.xz 2020/02/14 | 102415 | systems/win32/miktex/tm/packages/miktex-lua53-bin-x64-2.9.tar.lzma 2020/02/14 | 101591 | macros/latex/contrib/l3kernel/l3keys.dtx 2020/02/14 | 10083 | macros/latex/contrib/glossaries/samples/samplexdy.tex @@ -1226,7 +2135,6 @@ 2020/02/13 | 67719 | macros/latex/contrib/glossaries-extra/samples/sample-nested.pdf 2020/02/13 | 6764 | macros/latex-dev/base/slides.ins 2020/02/13 | 6764 | macros/latex/base/slides.ins -2020/02/13 | 67540 | systems/texlive/tlnet/archive/optex.r53764.tar.xz 2020/02/13 | 67333 | macros/latex-dev/base/ltfsstrc.dtx 2020/02/13 | 67313 | macros/latex/base/ltfsstrc.dtx 2020/02/13 | 6715 | macros/latex-dev/base/latexsym.dtx @@ -1755,7 +2663,6 @@ 2020/02/13 | 12946 | macros/latex-dev/base/manual.err 2020/02/13 | 12946 | macros/latex/base/manual.err 2020/02/13 | 129172 | macros/latex/base/ltnews07.pdf -2020/02/13 | 1290232 | systems/texlive/tlnet/archive/optex.doc.r53764.tar.xz 2020/02/13 | 128768 | macros/latex-dev/base/ltnews04.pdf 2020/02/13 | 12715 | macros/latex-dev/required/tools/dcolumn.dtx 2020/02/13 | 1269 | macros/latex/contrib/glossaries-extra/samples/sample-acronym-desc.tex @@ -1810,7 +2717,6 @@ 2020/02/13 | 10053 | macros/latex/base/webcomp.err 2020/02/12 | 992103 | support/bib2gls/texparserlib.jar 2020/02/12 | 9614 | support/bib2gls/convertgls2bib.1 -2020/02/12 | 93910973 | systems/win32/w32tex/TLW64/tl-win64.zip 2020/02/12 | 930888 | support/bib2gls/src/bib2gls.tex 2020/02/12 | 913 | support/bib2gls/examples/sample-textsymbols2.tex 2020/02/12 | 89404 | support/bib2gls/examples/sample-constants.pdf @@ -1986,252 +2892,3 @@ 2020/02/11 | 1111704 | macros/latex/contrib/suftesi/suftesi.pdf 2020/02/11 | 1091594 | macros/latex/contrib/dashundergaps.zip 2020/02/11 | 107 | macros/latex/contrib/dashundergaps/dashundergaps-code.tex -2020/02/10 | 9249 | macros/latex/contrib/tuda-ci/README.md -2020/02/10 | 9000 | macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty -2020/02/10 | 8884 | macros/luatex/optex/f-lmfonts.opm -2020/02/10 | 872 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/bend_train.tikz -2020/02/10 | 848542 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf -2020/02/10 | 84340 | systems/texlive/tlnet/archive/luatexja.source.r53739.tar.xz -2020/02/10 | 822684 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf -2020/02/10 | 815860 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf -2020/02/10 | 810988 | systems/win32/w32tex/win64/aleph-w64.tar.xz -2020/02/10 | 7935 | macros/luatex/optex/f-heros.opm -2020/02/10 | 78020 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-examples/station_chamstadt.pdf -2020/02/10 | 771 | macros/luatex/optex/f-xcharter.opm -2020/02/10 | 7624 | macros/luatex/optex/luatex-ini.opm -2020/02/10 | 758 | graphics/pgf/contrib/tikz-trackschematic/tikzlibrarytrackschematic.code.tex -2020/02/10 | 7553 | macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty -2020/02/10 | 731 | macros/luatex/optex/f-baskerville.opm -2020/02/10 | 731 | macros/luatex/optex/f-adventor.opm -2020/02/10 | 729 | macros/luatex/optex/csplain-params.opm -2020/02/10 | 72610 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-examples/station_berg.pdf -2020/02/10 | 725020 | systems/texlive/tlnet/archive/nimbus15.doc.r53742.tar.xz -2020/02/10 | 721 | macros/luatex/optex/f-pagella.opm -2020/02/10 | 718 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/hectometer.tikz -2020/02/10 | 7186 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex -2020/02/10 | 717 | macros/luatex/optex/f-schola.opm -2020/02/10 | 714 | macros/luatex/optex/f-cursor.opm -2020/02/10 | 712 | macros/luatex/optex/f-termes.opm -2020/02/10 | 707 | macros/luatex/optex/f-bonum.opm -2020/02/10 | 6639 | macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo -2020/02/10 | 6594 | macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo -2020/02/10 | 655 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/level_crossing_double.tikz -2020/02/10 | 655 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/level_crossing_double_full_closure.tikz -2020/02/10 | 646 | macros/luatex/optex/f-gfsbodoni.opm -2020/02/10 | 638 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/train_berth.tikz -2020/02/10 | 6341477 | macros/latex/contrib/tuda-ci.zip -2020/02/10 | 6261 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-examples/station_chamstadt.tex -2020/02/10 | 6251680 | systems/win32/w32tex/win64/pdftex-w64.tar.xz -2020/02/10 | 619 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/platform_middle.tikz -2020/02/10 | 618685 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdf -2020/02/10 | 616 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/bridge_track_beneath.tikz -2020/02/10 | 611 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/track_distance.tikz -2020/02/10 | 6036 | macros/latex/contrib/tuda-ci/tex/tudabeamer.cls -2020/02/10 | 592 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/train_berth_shape_special.tikz -2020/02/10 | 588992 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf -2020/02/10 | 587268 | systems/win32/w32tex/win64/jtex-w64.tar.xz -2020/02/10 | 586724 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdf -2020/02/10 | 5817 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex -2020/02/10 | 574094 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf -2020/02/10 | 569 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/transmitter_bidirectional.tikz -2020/02/10 | 567646 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdf -2020/02/10 | 565 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/combined_signal_forward.tikz -2020/02/10 | 5618 | macros/latex/contrib/tuda-ci/tex/tudarules.sty -2020/02/10 | 5606 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex -2020/02/10 | 559 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/transmitter_backward.tikz -2020/02/10 | 558960 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdf -2020/02/10 | 557 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/transmitter_forward.tikz -2020/02/10 | 550366 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdf -2020/02/10 | 54826 | macros/latex/contrib/elegantbook/elegantbook-cn.tex -2020/02/10 | 543 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/distant_speed_signal_backward.tikz -2020/02/10 | 542 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/distant_speed_signal_forward.tikz -2020/02/10 | 541 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/transmitter.tikz -2020/02/10 | 537 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/double-slip_turnout_right.tikz -2020/02/10 | 537614 | systems/win32/miktex/tm/packages/accessibility.tar.lzma -2020/02/10 | 536 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/double-slip_turnout_left.tikz -2020/02/10 | 534 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/route_signal_backward.tikz -2020/02/10 | 533 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_right_backward_manually.tikz -2020/02/10 | 531 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_right_forward_manually.tikz -2020/02/10 | 531 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_left_backward_manually.tikz -2020/02/10 | 529 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_left_forward_manually.tikz -2020/02/10 | 528 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/diamond_crossing_right.tikz -2020/02/10 | 527 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/diamond_crossing_left.tikz -2020/02/10 | 52455 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic.tex -2020/02/10 | 5238 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-examples/station_berg.tex -2020/02/10 | 520 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_with_fouling_right_backward.tikz -2020/02/10 | 520 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_right_backward_moving_points.tikz -2020/02/10 | 519 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_right_backward_right_position.tikz -2020/02/10 | 518 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_with_fouling_right_forward.tikz -2020/02/10 | 518 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_with_fouling_left_backward.tikz -2020/02/10 | 518 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_right_forward_moving_points.tikz -2020/02/10 | 518 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_right_backward_left_position.tikz -2020/02/10 | 518 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_left_backward_moving_points.tikz -2020/02/10 | 517 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_right_forward_right_position.tikz -2020/02/10 | 517 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_left_backward_right_position.tikz -2020/02/10 | 516 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_with_fouling_left_forward.tikz -2020/02/10 | 516 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_right_forward_left_position.tikz -2020/02/10 | 516 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_left_forward_moving_points.tikz -2020/02/10 | 516 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_left_backward_left_position.tikz -2020/02/10 | 51672 | systems/texlive/tlnet/archive/acmart.source.r53734.tar.xz -2020/02/10 | 515 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_left_forward_right_position.tikz -2020/02/10 | 514 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_left_forward_left_position.tikz -2020/02/10 | 514 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/speed_signal_backward.tikz -2020/02/10 | 513 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/speed_signal_forward.tikz -2020/02/10 | 5119 | macros/luatex/optex/parameters.opm -2020/02/10 | 510 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/route.tikz -2020/02/10 | 506 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_right_backward.tikz -2020/02/10 | 504 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_right_forward.tikz -2020/02/10 | 504 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_left_backward.tikz -2020/02/10 | 502 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_left_forward.tikz -2020/02/10 | 499 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/track_number.tikz -2020/02/10 | 497 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/main_line.tikz -2020/02/10 | 495 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/transmitter_right_with_signal.tikz -2020/02/10 | 49432 | systems/texlive/tlnet/archive/step.doc.r53731.tar.xz -2020/02/10 | 4879 | macros/luatex/optex/fams-ini.opm -2020/02/10 | 485 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/train_berth_shape_bidirectional.tikz -2020/02/10 | 485 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/bridge.tikz -2020/02/10 | 483 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/derailer_right_backward.tikz -2020/02/10 | 482 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/derailer_right_forward.tikz -2020/02/10 | 482 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/derailer_left_backward.tikz -2020/02/10 | 4825 | macros/latex/contrib/tuda-ci/tex/tudacolors.sty -2020/02/10 | 481 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/train_drive_automatic.tikz -2020/02/10 | 481 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/derailer_left_forward.tikz -2020/02/10 | 480 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/parked_vehicle.tikz -2020/02/10 | 479 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/train_berth_shape.tikz -2020/02/10 | 478 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/train_drive_human.tikz -2020/02/10 | 476 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/shunt_signal_backward_locked.tikz -2020/02/10 | 475 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/shunt_signal_forward_locked.tikz -2020/02/10 | 475 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/route_clearing_point_backward.tikz -2020/02/10 | 475 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/end_of_movement_authority_backward.tikz -2020/02/10 | 475 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/clearing_point.tikz -2020/02/10 | 475 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/block_clearing_point_backward.tikz -2020/02/10 | 474 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/train_shunting_backward.tikz -2020/02/10 | 474 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/route_clearing_point_forward.tikz -2020/02/10 | 474 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/end_of_movement_authority_forward.tikz -2020/02/10 | 474 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/block_clearing_point_forward.tikz -2020/02/10 | 473 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/train_shunting_forward.tikz -2020/02/10 | 473 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/train_moving_backward.tikz -2020/02/10 | 473 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/parked_vehicles_with_label.tikz -2020/02/10 | 473 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/distant_signal_backward.tikz -2020/02/10 | 472 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/train_moving_forward.tikz -2020/02/10 | 472 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/distant_signal_forward.tikz -2020/02/10 | 471 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/train_moving_slow_backward.tikz -2020/02/10 | 471 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/train_moving_fast_backward.tikz -2020/02/10 | 470 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/train_moving_slow_forward.tikz -2020/02/10 | 470 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/train_moving_fast_forward.tikz -2020/02/10 | 470 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/route_signal_forward.tikz -2020/02/10 | 470 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/loop_transmitter.tikz -2020/02/10 | 470 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/braking_point_backward.tikz -2020/02/10 | 470 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/block_signal_backward.tikz -2020/02/10 | 469 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/transmitter_right_bidirectional.tikz -2020/02/10 | 469 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/train_berth_sign_backward.tikz -2020/02/10 | 469 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/shunt_signal_backward.tikz -2020/02/10 | 469 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/danger_point_backward.tikz -2020/02/10 | 469 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/braking_point_forward.tikz -2020/02/10 | 469 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/block_signal_forward.tikz -2020/02/10 | 468 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/train_ghost_direction_backward.tikz -2020/02/10 | 468 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/train_berth_sign_forward.tikz -2020/02/10 | 468 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/shunt_signal_forward.tikz -2020/02/10 | 468 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/shunt_limit_backward.tikz -2020/02/10 | 468 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/parked_vehicles.tikz -2020/02/10 | 468 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/danger_point_forward.tikz -2020/02/10 | 467 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/train_ghost_direction_forward.tikz -2020/02/10 | 467 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/shunt_limit_forward.tikz -2020/02/10 | 465 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/train_shunt_mode_backward.tikz -2020/02/10 | 465 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/level_crossing_single.tikz -2020/02/10 | 464 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/train_shunt_mode_forward.tikz -2020/02/10 | 463 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/transmitter_right_forward.tikz -2020/02/10 | 4632 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaLetter.tex -2020/02/10 | 462 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/train_direction_backward.tikz -2020/02/10 | 461 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/train_direction_forward.tikz -2020/02/10 | 460 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/platform_right.tikz -2020/02/10 | 458 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/view_point_backward.tikz -2020/02/10 | 458 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/platform_left.tikz -2020/02/10 | 457 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/view_point_forward.tikz -2020/02/10 | 456 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/transmitter_right.tikz -2020/02/10 | 452162 | systems/win32/miktex/tm/packages/leiletter.tar.lzma -2020/02/10 | 447 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/hump.tikz -2020/02/10 | 444 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/friction_bufferstop_backward.tikz -2020/02/10 | 4441 | macros/latex/contrib/tuda-ci/tex/tudacolors.def -2020/02/10 | 443 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/friction_bufferstop_forward.tikz -2020/02/10 | 432 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/bufferstop_backward.tikz -2020/02/10 | 4328 | macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty -2020/02/10 | 431 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/bufferstop_forward.tikz -2020/02/10 | 424 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/track_closure.tikz -2020/02/10 | 40986 | macros/latex/contrib/elegantbook/elegantbook-en.tex -2020/02/10 | 407 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/secondary_track.tikz -2020/02/10 | 404 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/messure_line.tikz -2020/02/10 | 4048 | systems/texlive/tlnet/archive/brandeis-dissertation.source.r53735.tar.xz -2020/02/10 | 402 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/main_track.tikz -2020/02/10 | 3946 | macros/luatex/optex/hyphen-lan.opm -2020/02/10 | 3891 | macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty -2020/02/10 | 3815924 | systems/texlive/tlnet/archive/nimbus15.r53742.tar.xz -2020/02/10 | 3803 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-documentation.sty -2020/02/10 | 3782780 | systems/texlive/tlnet/archive/acmart.doc.r53734.tar.xz -2020/02/10 | 375 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/interlocking.tikz -2020/02/10 | 3706223 | macros/latex/contrib/elegantbook.zip -2020/02/10 | 36836 | systems/texlive/tlnet/archive/acmart.r53734.tar.xz -2020/02/10 | 36624 | macros/latex/contrib/tuda-ci/tex/tudapub.cls -2020/02/10 | 3622 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco -2020/02/10 | 342871 | macros/latex/contrib/fei.zip -2020/02/10 | 3379988 | systems/win32/w32tex/win64/web2c-w64.tar.xz -2020/02/10 | 3359459 | systems/win32/miktex/tm/packages/luatexja.tar.lzma -2020/02/10 | 3348 | systems/texlive/tlnet/archive/brandeis-thesis.source.r53736.tar.xz -2020/02/10 | 3269 | macros/latex/contrib/tuda-ci/tex/tudafonts.sty -2020/02/10 | 3093596 | systems/texlive/tlnet/archive/luatexja.doc.r53739.tar.xz -2020/02/10 | 30711 | graphics/pgf/contrib/tikz-trackschematic/tikzlibrarytrackschematic.trafficcontrol.code.tex -2020/02/10 | 2966552 | systems/win32/w32tex/platex.tar.xz -2020/02/10 | 2931 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaAnnouncement.tex -2020/02/10 | 29221 | macros/latex/contrib/elegantbook/elegantbook.cls -2020/02/10 | 2888 | systems/texlive/tlnet/archive/diagbox.r53737.tar.xz -2020/02/10 | 2785 | graphics/pgf/contrib/tikz-trackschematic/README.md -2020/02/10 | 25868 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets.tex -2020/02/10 | 2399 | macros/luatex/optex/f-libertine.opm -2020/02/10 | 23811 | graphics/pgf/contrib/tikz-trackschematic/tikzlibrarytrackschematic.topology.code.tex -2020/02/10 | 23243 | macros/latex/contrib/tuda-ci/tex/tudathesis.cfg -2020/02/10 | 227100 | systems/texlive/tlnet/archive/diagbox.doc.r53737.tar.xz -2020/02/10 | 2244 | macros/luatex/optex/fonts-catalog.opm -2020/02/10 | 2240 | systems/texlive/tlnet/archive/pxufont.doc.r53733.tar.xz -2020/02/10 | 2238 | macros/luatex/optex/f-libertine-s.opm -2020/02/10 | 2227 | macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty -2020/02/10 | 22268 | macros/latex/contrib/tuda-ci/tex/tudaexercise.cls -2020/02/10 | 22177 | graphics/pgf/contrib/tikz-trackschematic/tikzlibrarytrackschematic.vehicles.code.tex -2020/02/10 | 2175 | macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty -2020/02/10 | 2097 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex -2020/02/10 | 206717 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic.pdf -2020/02/10 | 20052 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex -2020/02/10 | 19631 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex -2020/02/10 | 1884 | systems/texlive/tlnet/archive/brandeis-dissertation.r53735.tar.xz -2020/02/10 | 1872444 | systems/win32/w32tex/win64/ptex-w64.tar.xz -2020/02/10 | 181520 | systems/texlive/tlnet/archive/luatexja.r53739.tar.xz -2020/02/10 | 1799760 | systems/win32/w32tex/win64/uptex-w64.tar.xz -2020/02/10 | 17900 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex -2020/02/10 | 1766339 | systems/win32/miktex/tm/packages/platex.tar.lzma -2020/02/10 | 17310192 | systems/win32/w32tex/luatexja.tar.xz -2020/02/10 | 171323 | systems/win32/miktex/tm/packages/brandeis-dissertation.tar.lzma -2020/02/10 | 17015 | macros/latex/contrib/tuda-ci/tex/tudasciposter.cls -2020/02/10 | 16818 | macros/latex/contrib/tuda-ci/tex/tudaposter.cls -2020/02/10 | 1678 | macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo -2020/02/10 | 1676 | macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo -2020/02/10 | 1674 | macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo -2020/02/10 | 1673 | macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo -2020/02/10 | 1672 | macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo -2020/02/10 | 1668 | macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo -2020/02/10 | 165316 | systems/texlive/tlnet/archive/brandeis-dissertation.doc.r53735.tar.xz -2020/02/10 | 1621 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib -2020/02/10 | 1616059 | systems/win32/miktex/tm/packages/step.tar.lzma -2020/02/10 | 1588 | systems/texlive/tlnet/archive/brandeis-thesis.r53736.tar.xz -2020/02/10 | 15829 | graphics/pgf/contrib/tikz-trackschematic/tikzlibrarytrackschematic.constructions.code.tex -2020/02/10 | 1558908 | systems/texlive/tlnet/archive/step.r53731.tar.xz -2020/02/10 | 149835 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets.pdf -2020/02/10 | 1472 | systems/texlive/tlnet/archive/collection-publishers.r53736.tar.xz -2020/02/10 | 14509 | macros/latex/contrib/tuda-ci/tex/tudaletter.cls -2020/02/10 | 1432024 | macros/latex/contrib/elegantbook/elegantbook-cn.pdf -2020/02/10 | 143128 | systems/texlive/tlnet/archive/brandeis-thesis.doc.r53736.tar.xz -2020/02/10 | 1276731 | macros/latex/contrib/elegantbook/elegantbook-en.pdf -2020/02/10 | 126608 | systems/texlive/tlnet/archive/pxufont.r53733.tar.xz -2020/02/10 | 1175 | macros/luatex/optex/f-technika.opm -2020/02/10 | 11140 | systems/texlive/tlnet/archive/diagbox.source.r53737.tar.xz -2020/02/10 | 1057 | macros/luatex/optex/f-antt.opm -2020/02/10 | 10474 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex -2020/02/10 | 10411 | graphics/pgf/contrib/tikz-trackschematic/tikzlibrarytrackschematic.messures.code.tex diff --git a/fonts/ptex-fontmaps/README b/fonts/ptex-fontmaps/README index 88a585329e..e1ff4123a2 100644 --- a/fonts/ptex-fontmaps/README +++ b/fonts/ptex-fontmaps/README @@ -1,7 +1,7 @@ ptex-fontmaps ============= -Current release: 20190506.0 +Current release: 20200217.0 The files contained in this package contains font maps for dvipdfmx to make various Japanese/Chinese/Korean fonts available for (u)ptex and @@ -51,7 +51,7 @@ map files for dvipdfmx. You have to obtain the fonts separately. For following list of maps, the respective fonts are shipped in TeX Live and are available for free: -* Japanese: ipa, ipaex +* Japanese: haranoaji, ipa, ipaex * Simplified Chinese: arphic, fandol * Traditional Chinese: arphic * Korean: baekmuk, unfonts @@ -233,6 +233,15 @@ O morisawa-pr6n - see above A-OTF-MidashiGoPr6N-MB31.otf A-OTF-RyuminPr6N-Light.otf +P haranoaji - Harano Aji Fonts from https://github.com/trueroad/HaranoAjiFonts + HaranoAjiMincho-Light.otf + HaranoAjiMincho-Regular.otf + HaranoAjiMincho-Bold.otf + HaranoAjiGothic-Regular.otf + HaranoAjiGothic-Medium.otf + HaranoAjiGothic-Bold.otf + HaranoAjiGothic-Heavy.otf + Simplified Chinese ================== @@ -344,7 +353,7 @@ The (deprecated) file updmap-otf.sh and the (in perl rewritten version) kanji-config-updmap.pl are licensed under the following terms: Copyright 2004-2006 by KOBAYASHI Taizo Copyright 2011-2016 by PREINING Norbert - Copyright 2016- by Japanese TeX Development Community + Copyright 2016-2020 by Japanese TeX Development Community Licensed under the GPL version 3 or any later version, see the file for details. diff --git a/fonts/ptex-fontmaps/database/ptex-fontmaps-data.dat b/fonts/ptex-fontmaps/database/ptex-fontmaps-data.dat index 3464085d01..1a25ed22d1 100644 --- a/fonts/ptex-fontmaps/database/ptex-fontmaps-data.dat +++ b/fonts/ptex-fontmaps/database/ptex-fontmaps-data.dat @@ -1,24 +1,26 @@ # ptex-fontmaps-data.dat +# With '*', no -04 map available JA(10): morisawa-pr6n: A-OTF-RyuminPr6N-Light.otf JA(20): morisawa: A-OTF-RyuminPro-Light.otf JA(30): hiragino-pron: HiraMinProN-W3.otf JA(40): hiragino: HiraMinPro-W3.otf JA(50): kozuka-pr6n: KozMinPr6N-Regular.otf -JA(60): kozuka-pr6: KozMinProVI-Regular.otf -JA(70): kozuka: KozMinPro-Regular.otf -JA(80): bizud: BIZ-UDMinchoM.ttc +JA(55): kozuka-pr6: KozMinProVI-Regular.otf +JA(60): kozuka: KozMinPro-Regular.otf +JA(70): haranoaji: HaranoAjiMincho-Regular.otf +JA*(80): bizud: BIZ-UDMinchoM.ttc JA(90): yu-osx: YuMin-Medium.otf -JA(95): yu-win10: YuGothB.ttc -JA(96): yu-win: yugothib.ttf -JA(100): ms: msgothic.ttc -JA(105): ms-osx: MS-Gothic.ttf +JA*(95): yu-win10: YuGothB.ttc +JA*(96): yu-win: yugothib.ttf +JA*(100): ms: msgothic.ttc +JA*(105): ms-osx: MS-Gothic.ttf JA(110): moga-mobo-ex: mogam.ttc JA(120): moga-mobo: mogam.ttc -JA(130): ipaex: ipaexm.ttf -JA(140): ipa: ipam.ttf -JA(150): ume: ume-tmo3.ttf -JA(160): canon: FGCCHMW3.TTC +JA*(130): ipaex: ipaexm.ttf +JA*(140): ipa: ipam.ttf +JA*(150): ume: ume-tmo3.ttf +JA*(160): canon: FGCCHMW3.TTC JA-AI0: sourcehan-otc: SourceHanSerif-Regular.ttc JA-AI0: sourcehan: SourceHanSerif-Regular.otf JA-AI0: noto-otc: NotoSerifCJK-Regular.ttc diff --git a/fonts/ptex-fontmaps/kanji-config-updmap.pdf b/fonts/ptex-fontmaps/kanji-config-updmap.pdf Binary files differnew file mode 100644 index 0000000000..5cefbb76ce --- /dev/null +++ b/fonts/ptex-fontmaps/kanji-config-updmap.pdf diff --git a/fonts/ptex-fontmaps/kanji-config-updmap.tex b/fonts/ptex-fontmaps/kanji-config-updmap.tex new file mode 100644 index 0000000000..4b05e69e33 --- /dev/null +++ b/fonts/ptex-fontmaps/kanji-config-updmap.tex @@ -0,0 +1,407 @@ +\documentclass{jlreq} +\usepackage{array} +\usepackage{multicol} +\usepackage{ascmac} +\usepackage{url} + +\makeatletter +%%%%% +% +% ptex-fontmaps-data.dat などを読み込んでリストを出力するマクロ +% -- \unless, \readline を使っているので e-TeX 必須 +% +% prepare +\newread\xx@myread +% +% main routine +\def\loaddata#1{% + \def\xx@日本語list{}\def\xx@簡体中国語list{}% + \def\xx@繁体中国語list{}\def\xx@韓国語list{}% + % read database + \openin\xx@myread=#1\relax + \@whilesw\unless\ifeof\xx@myread\fi{% + \readline\xx@myread to \xx@dataline + % first: strip trailing LF + \expandafter\xx@striplf\xx@dataline\@nil + \ifx\xx@dataline\@empty\else + % second: strip comments starting from '#' + \expandafter\expandafter\expandafter\xx@stripcomment + \expandafter\xx@dataline\xx@number\@nil + \ifx\xx@dataline\@empty\else + % now, only effective database lines + \expandafter\xx@parseline\xx@dataline\@nil + \fi + \fi + }% + \closein\xx@myread + % output result + \@for\xx@lang:={日本語,簡体中国語,繁体中国語,韓国語}\do{% + \expandafter\let\expandafter\xx@langlist\csname xx@\xx@lang list\endcsname + \ifx\xx@langlist\@empty\else + \begin{itembox}[l]{\xx@lang} + \begin{multicols}{2} + \begin{itemize} + \@for\xx@item:=\xx@langlist\do{\item \command{\xx@item}}% + \end{itemize} + \end{multicols} + \end{itembox} + \fi} +}% +% +% sub +\begingroup + \catcode`\^^M=12 \gdef\xx@lf{^^M}% + \catcode`\#=12 \gdef\xx@number{#}% +\endgroup +\expandafter\def\expandafter\xx@striplf + \expandafter#\expandafter1\xx@lf\@nil{\def\xx@dataline{#1}} +\expandafter\def\expandafter\xx@stripcomment + \expandafter#\expandafter1\xx@number#2\@nil{\def\xx@dataline{#1}} +\def\xx@parseline#1: #2: #3\@nil{\xx@parselang#1\@nil{#2}} +% +% subsub +\begingroup + \escapechar-1 + \xdef\xx@JA{\string\JA}\xdef\xx@SC{\string\SC} + \xdef\xx@TC{\string\TC}\xdef\xx@KO{\string\KO} + \xdef\xx@AI{-\string\AI0} +\endgroup +\def\xx@parselang#1#2#3\@nil#4{% + \def\xx@tempa{#1#2}\def\xx@tempb{#3}% + \edef\xx@tempc{#4 \ifx\xx@tempb\xx@AI<AI0>\else#3\fi}% + \ifx\xx@tempa\xx@JA \xx@addtolist\xx@日本語list\xx@tempc \else + \ifx\xx@tempa\xx@SC \xx@addtolist\xx@簡体中国語list\xx@tempc \else + \ifx\xx@tempa\xx@TC \xx@addtolist\xx@繁体中国語list\xx@tempc \else + \ifx\xx@tempa\xx@KO \xx@addtolist\xx@韓国語list\xx@tempc \else + \@latex@error{Unknown language `\xx@tempa' in database}\@ehc + \fi\fi\fi\fi} +\def\xx@addtolist#1#2{% + % #1: name of the list, #2: item + \ifx#1\@empty + \edef#1{#2}% + \else + \edef#1{#1,#2}% + \fi} +% +%%%%% +% +% ptex-fontmaps の README を読み込んでそのまま出力する +% -- \unless, \readline を使っているので e-TeX 必須 +% +% main routine +\def\loadprint#1{% + \openin\xx@myread=#1\relax + \@whilesw\unless\ifeof\xx@myread\fi{% + \readline\xx@myread to \xx@dataline + % first: strip trailing LF + \expandafter\xx@striplf\xx@dataline\@nil + % empty line and indent should be kept + \leavevmode\null\xx@dataline\par + }% + \closein\xx@myread +} +%%%%% +\makeatother + +%% misc +\def\file#1{\texttt{#1}} +\def\command#1{\texttt{#1}} +\def\option#1{\texttt{-{}-#1}} +\def\codechar#1{\ensuremath{\langle\mbox{\texttt{#1}}\rangle}} +\def\TL{\TeX\ Live} +\def\pTeX{p\kern-.15em\TeX} +\def\upTeX{u\pTeX} + +\title{\command{kanji-config-updmap} --- 日本語フォント設定ツール} +\author{日本語\TeX 開発コミュニティ} + +\begin{document} +\maketitle + +\TL に収録されている\file{ptex-fontmaps}パッケージには， +\command{kanji-config-updmap}というコマンドが付属しています。 +このコマンドは，\pTeX や\upTeX で生成したDVIを扱う下記のドライバが埋め込む +日本語・中国語・韓国語フォントの設定を統一的に指定したり， +確認したりできます。 +\begin{itemize} + \item dvipdfmx（PDFへの埋め込みフォント） + \item dvips（PostScriptで指定するフォント名） + %\item pxdvi（画面表示に使うフォント）\footnote{この機能はオプションです。} +\end{itemize} + +\section{はじめに：システム用(\command{-sys})とユーザ用(\command{-user})} + +\command{kanji-config-updmap}には2種類のコマンド名があります。 +\begin{itemize} + \item \command{kanji-config-updmap-sys}: 全ユーザ向けのシステム共通設定 + \item \command{kanji-config-updmap-user}: 現在のユーザ用の設定 +\end{itemize} +これは他の「\command{-sys}」と「\command{-user}」の区別のあるコマンドにも +言えることですが，特に理由のない限り，\emph{常に}「\command{-sys}」付きの +コマンド\command{kanji-config-updmap-sys}を使用することをお勧めします。 +これは以下の理由によります。 +\begin{itemize} + \item 現在のユーザ用の設定は，システム共通設定より優先する。 + \item \TL のアップデート時は，システム共通設定は更新されるが， + 現在のユーザ用の設定は更新されない。 + \item 結果的に，\emph{たった一度でも}「\command{-user}」付きのコマンドを + 実行した環境では，\TL のアップデート時に設定更新が反映されない + という事故が起こる。 +\end{itemize} +より詳細には，\url{http://tug.org/texlive/scripts-sys-user.html}を参照してください。 + +なお，「管理者権限がなくて \command{-sys} 付きのコマンドを実行できない」などの +理由がある場合は，\command{kanji-config-updmap-user}を使用してください。 +この場合は，\command{tlmgr}で\TL をアップデートすることもない（できない） +でしょうから，上に述べたような不都合は起きないでしょう。 + +以下では \command{-sys} の方で説明します。 +また，Windowsでは\command{sudo}（Unixで管理者権限に昇格するコマンド）を +つける必要はありませんので省いて読んでください。 + + +\clearpage + + +\section{現在の埋め込み設定を確認する} + +現在の日本語フォントの埋め込み設定を確認するには +\begin{verbatim} + $ sudo kanji-config-updmap-sys --ja status +\end{verbatim} +を実行します（オプション \option{ja} は省略可能です）。 + +同様に，現在の簡体中国語・繁体中国語・韓国語フォントの埋め込み設定はそれぞれ +\begin{verbatim} + $ sudo kanji-config-updmap-sys --sc status + $ sudo kanji-config-updmap-sys --tc status + $ sudo kanji-config-updmap-sys --ko status +\end{verbatim} +で確認できます（オプション \option{sc}, \option{tc}, \option{ko} は省略不可）。 + +実行例を下に示します。 +\begin{verbatim} + $ sudo kanji-config-updmap-sys --ja status + CURRENT family for ja: ipaex (variant: <empty>) + Standby family : haranoaji + Standby family : ipa + Standby family : ms + Standby family : yu-win10 +\end{verbatim} +この場合，現在設定されているプリセットは\command{ipaex}であり， +他に4種類のプリセットが利用可能であることを示します。 +\command{CURRENT family}の末尾の表示されている +\command{variant}は \command{<empty>} か \command{-04} のいずれかで， +\textbf{JIS90字形とJIS2004字形の両方がサポートされるプリセットでJIS2004字形が +選択されている場合}のみ \command{-04} となります +（第\ref{jis2004}節を参照）。 +% kanji-config-updmap 20200217.0 で status に variant も表示するようにした + +なお，\TL を公式インストーラでフルインストールした場合は，デフォルトで +表\ref{tldefault}の設定が適用された状態になっています。 +それぞれの値が実際にどのフォントに対応しているかは，\file{ptex-fontmaps}の +\file{README}を参照してください。 +例えば，日本語フォントのデフォルト値\command{ipaex}は +IPAex明朝・IPAexゴシックに対応しています。 +\begin{table}[h] + \centering + \caption{\TL の埋め込みフォントのデフォルト値}\label{tldefault} + \begin{tabular}{m{12zw}m{8zw}} + \hline + 変数名（言語） & デフォルト値 \\ \hline + \command{jaEmbed}（日本語） & \command{ipaex} \\ + \command{scEmbed}（簡体中国語） & \command{arphic} \\ + \command{tcEmbed}（繁体中国語） & \command{arphic} \\ + \command{koEmbed}（韓国語） & \command{baekmuk} \\ \hline +\end{tabular} +\end{table} + + +\clearpage + + +\section{日本語フォントの埋め込み設定を変更する} + +日本語フォントの埋め込み設定を変更するには +\begin{verbatim} + $ sudo kanji-config-updmap-sys --ja <family> +\end{verbatim} +を実行します（ここでもオプション \option{ja} は省略可能です）。 + +同様に，現在の簡体中国語・繁体中国語・韓国語フォントの埋め込み設定はそれぞれ +\begin{verbatim} + $ sudo kanji-config-updmap-sys --sc <family> + $ sudo kanji-config-updmap-sys --tc <family> + $ sudo kanji-config-updmap-sys --ko <family> +\end{verbatim} +で変更できます（オプション \option{sc}, \option{tc}, \option{ko} は省略不可）。 + +なお，オプションの書式は \option{ja <family>} と \option{ja=<family>} のように， +イコール(\command{=})を付けても付けなくても同じ意味になります。 + +\subsection{利用可能なプリセット一覧} + +利用可能な \command{<family>} は以下のとおりです。 +実際に対応するフォントは，先ほどと同様に +\file{ptex-fontmaps}の\file{README}を参照してください。 +このリストで，各値の末尾に付いている \command{(番号)} は，次節で説明する +\command{auto}による自動選択の優先順位を表します。 +番号の前の \command{*} については，第\ref{jis2004}節で後述します。 +また \command{<AI0>} と付いているものは，Adobe-Identity0の +フォントであることを示し，いくつかの制約事項があります（第\ref{ai0}節）。 +\loaddata{database/ptex-fontmaps-data.dat} + +さらに，TLContribリポジトリから\file{ptex-fontmaps-macos}パッケージを +インストールすると，以下も追加で利用できます。 +\loaddata{database/ptex-fontmaps-macos-data.dat} + +複数の言語のフォント埋め込み設定を同時に変更することもできます。例えば +\begin{verbatim} + $ sudo kanji-config-updmap-sys --ja yu-win10 --sc fandol +\end{verbatim} +とすると，日本語フォントを\command{yu-win10}に， +簡体中国語フォントを\command{fandol}に変更します。 + +設定変更時には，その設定で使われるであろう代表的なフォントファイルが +\emph{実在するかどうかを予めチェック}します（もし実在しなければ， +第\ref{special-preset}節で後述する\command{auto}にフォールバックします）。 +オプション \option{force} を付けると，実在するかどうかにかかわらず +強制的にそのプリセットを設定します（バージョン20190506.0の新機能）。 + +\subsection{日本語フォントのJIS2004字形の使用}\label{jis2004} + +一部のプリセットでは，JIS90字形とJIS2004字形の両方をサポートしています。 +先ほどのリストで番号の前に \command{*} が\emph{付いていない}プリセットが該当し， +現在すべてのOpenTypeフォントと一部のTrueTypeフォントが含まれます。 +これらのプリセットでは，\textbf{デフォルトではJIS90字形が使われます}が， +オプション \option{jis2004} を指定するとJIS2004字形を使用する設定になります。例えば +\begin{verbatim} + $ sudo kanji-config-updmap-sys haranoaji +\end{verbatim} +ではJIS90字形の「原ノ味フォント」が使われますが， +\begin{verbatim} + $ sudo kanji-config-updmap-sys --jis2004 haranoaji +\end{verbatim} +ではJIS2004字形の「原ノ味フォント」が使われます。 + +一方 \command{*} が\emph{付いている}プリセットでは， +JIS90字形とJIS2004字形の\textbf{どちらが出力されるかはフォント次第}です。 +このようなプリセットでは，オプション \option{jis2004} が指定されても +\begin{verbatim} + WARNING: No -04 map available, option --jis2004 ignored! +\end{verbatim} +と警告して無視します。 +% 以前はオプションを無視せず -04 のマップファイルを使おうとして， +% 結果的に kanjix.map からマッピングが消えていたが， +% kanji-config-updmap 20200217.0 で --jis2004 を無視する仕様にした +例えば +\begin{verbatim} + $ sudo kanji-config-updmap-sys ipaex +\end{verbatim} +で使われる「IPAexフォント」はJIS2004字形でデザインされています。 + +\subsection{特殊なプリセット}\label{special-preset} + +\emph{フォントを埋め込まない}場合は引数を\command{nofont}とします。 +例えば +\begin{verbatim} + $ sudo kanji-config-updmap-sys nofont +\end{verbatim} +とすれば，日本語フォントが埋め込まれません。 + +また，引数に\command{auto}を指定すると，上記のリストの中から \command{(番号)} が +なるべく小さな\emph{実在するフォント}を自動的に選択します。 +ただし，現在設定されている（\command{nofont}以外の）プリセットが +実在していて利用可能な場合は，現在の設定を維持します。 +例えば +\begin{verbatim} + $ sudo kanji-config-updmap-sys auto +\end{verbatim} +では日本語フォントが\command{morisawa-pr6n}→\command{morisawa}→…の順に +探され，最初に見つかったフォントを埋め込むように自動で設定されることになります。 +\begin{verbatim} + $ sudo kanji-config-updmap-sys --ja auto --sc auto --tc auto --ko auto +\end{verbatim} +とすれば，4つの言語全てが同様に自動設定されます。 + +\subsection{カスタムプリセットの利用} + +[TODO] 作業中。 +マップファイルを用意すれば\command{kanji-config-updmap}で設定可能。 + + +\clearpage + + +\section{特記事項} + +まず，一般的な注意点を挙げておきます。 +\begin{itemize} + \item 特定の文字が出力されるかどうかは，実際に使われるフォントに依ります。 + フォントに収録されていない文字は出力されませんし， + JIS90字形かJIS2004字形のどちらか一方しか用意されていないフォントもあります。 + \item 複数のウェイトが利用可能かどうかは，プリセットに依ります。 + 例えば，\command{ipaex}が利用するIPAexフォントは明朝とゴシック + 各1ウェイトのみ配布されており，細字の明朝や太字のゴシックは利用できません。 +\end{itemize} + +その他，いくつかのプリセットには注意点があります。 + +\subsection{Adobe-Identity0 (AI0)なフォントの制約事項}\label{ai0} + +\command{sourcehan}や\command{noto}などを埋め込む設定の注意点です。 + +[TODO] 作業中。 + +\begin{itemize} + \item \upTeX~+~dvipdfmx専用です。他の経路（\pTeX~+~dvipdfmx， + \pTeX~+~dvips，\upTeX~+~dvips）はサポートできないため， + \emph{フォントを埋め込まない}設定にフォールバックします。 + \item \upTeX~+~dvipdfmxの経路でも，Adobe-Japan1などの従来のマッピングに + 依存する文字出力機能もサポートされません。具体的には以下の機能が該当し， + これらの文字も\emph{フォントを埋め込まない}設定にフォールバックします。 + \begin{itemize} + \item \file{otf}パッケージが提供する \verb+\CID+ や + \file{ajmacros}（\verb+\aj...+命令など）の大半の命令 + \item \file{otf}パッケージ使用時のクオート記号， + つまり\codechar{“}\codechar{”}\codechar{‘}\codechar{’}の4文字 + \end{itemize} +\end{itemize} + +\subsection{その他} + +その他，既知の注意点です。 +\file{ptex-fontmaps}はあくまで\pTeX や\upTeX が提供する共通のJFM（\file{ptex-fonts}， +\file{uptex-fonts}に収録）から参照される実フォントを切り替えるだけであり， +個別のフォントに対する対処は行っていません。 + +\begin{itemize} + \item \command{yu}, \command{yu-win10}はWindowsに付属する + TrueType形式の游フォントを埋め込みますが， + クオート記号\codechar{“}\codechar{”}\codechar{‘}\codechar{’}が + 全角幅より狭くデザインされているため，出力が異常になります。\\ + 参考： \url{https://oku.edu.mie-u.ac.jp/tex/mod/forum/discuss.php?d=2017} +\end{itemize} + + +%\section{内部処理} + +%\command{kanji-config-updmap-sys}は内部で\command{updmap-sys}を呼び出し， +%\command{kanji-config-updmap-user}は内部で\command{updmap-user}を呼び出す。 + + +\clearpage +\appendix + + +\section{\file{ptex-fontmaps}の\file{README}} + +% \readline が和文文字をバイト列に変換しない e-pTeX 190908 以降が必要 +% https://github.com/texjporg/tex-jp-build/issues/88 +\ifnum\epTeXversion<190908\relax + \errhelp{Update e-pTeX.}\errmessage{e-pTeX 190908 required} +\else + {\frenchspacing\ttfamily\footnotesize\loadprint{README}} +\fi + +\end{document} diff --git a/fonts/ptex-fontmaps/maps/haranoaji/otf-haranoaji.map b/fonts/ptex-fontmaps/maps/haranoaji/otf-haranoaji.map new file mode 100644 index 0000000000..421504045c --- /dev/null +++ b/fonts/ptex-fontmaps/maps/haranoaji/otf-haranoaji.map @@ -0,0 +1,80 @@ + +% TEXT, 90JIS +hminl-h H HaranoAjiMincho-Light.otf +hminl-v V HaranoAjiMincho-Light.otf +hminr-h H HaranoAjiMincho-Regular.otf +hminr-v V HaranoAjiMincho-Regular.otf +hminb-h H HaranoAjiMincho-Bold.otf +hminb-v V HaranoAjiMincho-Bold.otf +hgothr-h H HaranoAjiGothic-Regular.otf +hgothr-v V HaranoAjiGothic-Regular.otf +hgothb-h H HaranoAjiGothic-Bold.otf +hgothb-v V HaranoAjiGothic-Bold.otf +hgotheb-h H HaranoAjiGothic-Heavy.otf +hgotheb-v V HaranoAjiGothic-Heavy.otf +hmgothr-h H HaranoAjiGothic-Medium.otf +hmgothr-v V HaranoAjiGothic-Medium.otf + +% TEXT, JIS04 +hminln-h H HaranoAjiMincho-Light.otf +hminln-v V HaranoAjiMincho-Light.otf +hminrn-h H HaranoAjiMincho-Regular.otf +hminrn-v V HaranoAjiMincho-Regular.otf +hminbn-h H HaranoAjiMincho-Bold.otf +hminbn-v V HaranoAjiMincho-Bold.otf +hgothrn-h H HaranoAjiGothic-Regular.otf +hgothrn-v V HaranoAjiGothic-Regular.otf +hgothbn-h H HaranoAjiGothic-Bold.otf +hgothbn-v V HaranoAjiGothic-Bold.otf +hgothebn-h H HaranoAjiGothic-Heavy.otf +hgothebn-v V HaranoAjiGothic-Heavy.otf +hmgothrn-h H HaranoAjiGothic-Medium.otf +hmgothrn-v V HaranoAjiGothic-Medium.otf + +% CID +otf-cjml-h Identity-H HaranoAjiMincho-Light.otf +otf-cjml-v Identity-V HaranoAjiMincho-Light.otf +otf-cjmr-h Identity-H HaranoAjiMincho-Regular.otf +otf-cjmr-v Identity-V HaranoAjiMincho-Regular.otf +otf-cjmb-h Identity-H HaranoAjiMincho-Bold.otf +otf-cjmb-v Identity-V HaranoAjiMincho-Bold.otf +otf-cjgr-h Identity-H HaranoAjiGothic-Regular.otf +otf-cjgr-v Identity-V HaranoAjiGothic-Regular.otf +otf-cjgb-h Identity-H HaranoAjiGothic-Bold.otf +otf-cjgb-v Identity-V HaranoAjiGothic-Bold.otf +otf-cjge-h Identity-H HaranoAjiGothic-Heavy.otf +otf-cjge-v Identity-V HaranoAjiGothic-Heavy.otf +otf-cjmgr-h Identity-H HaranoAjiGothic-Medium.otf +otf-cjmgr-v Identity-V HaranoAjiGothic-Medium.otf + +% Unicode 90JIS +otf-ujml-h UniJIS-UTF16-H HaranoAjiMincho-Light.otf +otf-ujml-v UniJIS-UTF16-V HaranoAjiMincho-Light.otf +otf-ujmr-h UniJIS-UTF16-H HaranoAjiMincho-Regular.otf +otf-ujmr-v UniJIS-UTF16-V HaranoAjiMincho-Regular.otf +otf-ujmb-h UniJIS-UTF16-H HaranoAjiMincho-Bold.otf +otf-ujmb-v UniJIS-UTF16-V HaranoAjiMincho-Bold.otf +otf-ujgr-h UniJIS-UTF16-H HaranoAjiGothic-Regular.otf +otf-ujgr-v UniJIS-UTF16-V HaranoAjiGothic-Regular.otf +otf-ujgb-h UniJIS-UTF16-H HaranoAjiGothic-Bold.otf +otf-ujgb-v UniJIS-UTF16-V HaranoAjiGothic-Bold.otf +otf-ujge-h UniJIS-UTF16-H HaranoAjiGothic-Heavy.otf +otf-ujge-v UniJIS-UTF16-V HaranoAjiGothic-Heavy.otf +otf-ujmgr-h UniJIS-UTF16-H HaranoAjiGothic-Medium.otf +otf-ujmgr-v UniJIS-UTF16-V HaranoAjiGothic-Medium.otf + +% Unicode JIS04 +otf-ujmln-h UniJIS2004-UTF16-H HaranoAjiMincho-Light.otf +otf-ujmln-v UniJIS2004-UTF16-V HaranoAjiMincho-Light.otf +otf-ujmrn-h UniJIS2004-UTF16-H HaranoAjiMincho-Regular.otf +otf-ujmrn-v UniJIS2004-UTF16-V HaranoAjiMincho-Regular.otf +otf-ujmbn-h UniJIS2004-UTF16-H HaranoAjiMincho-Bold.otf +otf-ujmbn-v UniJIS2004-UTF16-V HaranoAjiMincho-Bold.otf +otf-ujgrn-h UniJIS2004-UTF16-H HaranoAjiGothic-Regular.otf +otf-ujgrn-v UniJIS2004-UTF16-V HaranoAjiGothic-Regular.otf +otf-ujgbn-h UniJIS2004-UTF16-H HaranoAjiGothic-Bold.otf +otf-ujgbn-v UniJIS2004-UTF16-V HaranoAjiGothic-Bold.otf +otf-ujgen-h UniJIS2004-UTF16-H HaranoAjiGothic-Heavy.otf +otf-ujgen-v UniJIS2004-UTF16-V HaranoAjiGothic-Heavy.otf +otf-ujmgrn-h UniJIS2004-UTF16-H HaranoAjiGothic-Medium.otf +otf-ujmgrn-v UniJIS2004-UTF16-V HaranoAjiGothic-Medium.otf diff --git a/fonts/ptex-fontmaps/maps/haranoaji/otf-up-haranoaji.map b/fonts/ptex-fontmaps/maps/haranoaji/otf-up-haranoaji.map new file mode 100644 index 0000000000..4da649a5ad --- /dev/null +++ b/fonts/ptex-fontmaps/maps/haranoaji/otf-up-haranoaji.map @@ -0,0 +1,32 @@ + +% TEXT, 90JIS +uphminl-h UniJIS-UTF16-H HaranoAjiMincho-Light.otf +uphminl-v UniJIS-UTF16-V HaranoAjiMincho-Light.otf +uphminr-h UniJIS-UTF16-H HaranoAjiMincho-Regular.otf +uphminr-v UniJIS-UTF16-V HaranoAjiMincho-Regular.otf +uphminb-h UniJIS-UTF16-H HaranoAjiMincho-Bold.otf +uphminb-v UniJIS-UTF16-V HaranoAjiMincho-Bold.otf +uphgothr-h UniJIS-UTF16-H HaranoAjiGothic-Regular.otf +uphgothr-v UniJIS-UTF16-V HaranoAjiGothic-Regular.otf +uphgothb-h UniJIS-UTF16-H HaranoAjiGothic-Bold.otf +uphgothb-v UniJIS-UTF16-V HaranoAjiGothic-Bold.otf +uphgotheb-h UniJIS-UTF16-H HaranoAjiGothic-Heavy.otf +uphgotheb-v UniJIS-UTF16-V HaranoAjiGothic-Heavy.otf +uphmgothr-h UniJIS-UTF16-H HaranoAjiGothic-Medium.otf +uphmgothr-v UniJIS-UTF16-V HaranoAjiGothic-Medium.otf + +% TEXT, JIS04 +uphminln-h UniJIS2004-UTF16-H HaranoAjiMincho-Light.otf +uphminln-v UniJIS2004-UTF16-V HaranoAjiMincho-Light.otf +uphminrn-h UniJIS2004-UTF16-H HaranoAjiMincho-Regular.otf +uphminrn-v UniJIS2004-UTF16-V HaranoAjiMincho-Regular.otf +uphminbn-h UniJIS2004-UTF16-H HaranoAjiMincho-Bold.otf +uphminbn-v UniJIS2004-UTF16-V HaranoAjiMincho-Bold.otf +uphgothrn-h UniJIS2004-UTF16-H HaranoAjiGothic-Regular.otf +uphgothrn-v UniJIS2004-UTF16-V HaranoAjiGothic-Regular.otf +uphgothbn-h UniJIS2004-UTF16-H HaranoAjiGothic-Bold.otf +uphgothbn-v UniJIS2004-UTF16-V HaranoAjiGothic-Bold.otf +uphgothebn-h UniJIS2004-UTF16-H HaranoAjiGothic-Heavy.otf +uphgothebn-v UniJIS2004-UTF16-V HaranoAjiGothic-Heavy.otf +uphmgothrn-h UniJIS2004-UTF16-H HaranoAjiGothic-Medium.otf +uphmgothrn-v UniJIS2004-UTF16-V HaranoAjiGothic-Medium.otf diff --git a/fonts/ptex-fontmaps/maps/haranoaji/ptex-haranoaji-04.map b/fonts/ptex-fontmaps/maps/haranoaji/ptex-haranoaji-04.map new file mode 100644 index 0000000000..6ed525350c --- /dev/null +++ b/fonts/ptex-fontmaps/maps/haranoaji/ptex-haranoaji-04.map @@ -0,0 +1,4 @@ +rml 2004-H HaranoAjiMincho-Regular.otf +rmlv 2004-V HaranoAjiMincho-Regular.otf +gbm 2004-H HaranoAjiGothic-Medium.otf +gbmv 2004-V HaranoAjiGothic-Medium.otf diff --git a/fonts/ptex-fontmaps/maps/haranoaji/ptex-haranoaji.map b/fonts/ptex-fontmaps/maps/haranoaji/ptex-haranoaji.map new file mode 100644 index 0000000000..dc3118041b --- /dev/null +++ b/fonts/ptex-fontmaps/maps/haranoaji/ptex-haranoaji.map @@ -0,0 +1,4 @@ +rml H HaranoAjiMincho-Regular.otf +rmlv V HaranoAjiMincho-Regular.otf +gbm H HaranoAjiGothic-Medium.otf +gbmv V HaranoAjiGothic-Medium.otf diff --git a/fonts/ptex-fontmaps/maps/haranoaji/uptex-haranoaji-04.map b/fonts/ptex-fontmaps/maps/haranoaji/uptex-haranoaji-04.map new file mode 100644 index 0000000000..c233396ef2 --- /dev/null +++ b/fonts/ptex-fontmaps/maps/haranoaji/uptex-haranoaji-04.map @@ -0,0 +1,10 @@ +urml UniJIS2004-UTF16-H HaranoAjiMincho-Regular.otf +urmlv UniJIS2004-UTF16-V HaranoAjiMincho-Regular.otf +ugbm UniJIS2004-UTF16-H HaranoAjiGothic-Medium.otf +ugbmv UniJIS2004-UTF16-V HaranoAjiGothic-Medium.otf +uprml-h UniJIS2004-UTF16-H HaranoAjiMincho-Regular.otf +uprml-v UniJIS2004-UTF16-V HaranoAjiMincho-Regular.otf +upgbm-h UniJIS2004-UTF16-H HaranoAjiGothic-Medium.otf +upgbm-v UniJIS2004-UTF16-V HaranoAjiGothic-Medium.otf +uprml-hq UniJIS-UCS2-H HaranoAjiMincho-Regular.otf +upgbm-hq UniJIS-UCS2-H HaranoAjiGothic-Medium.otf diff --git a/fonts/ptex-fontmaps/maps/haranoaji/uptex-haranoaji.map b/fonts/ptex-fontmaps/maps/haranoaji/uptex-haranoaji.map new file mode 100644 index 0000000000..9c487af511 --- /dev/null +++ b/fonts/ptex-fontmaps/maps/haranoaji/uptex-haranoaji.map @@ -0,0 +1,10 @@ +urml UniJIS-UTF16-H HaranoAjiMincho-Regular.otf +urmlv UniJIS-UTF16-V HaranoAjiMincho-Regular.otf +ugbm UniJIS-UTF16-H HaranoAjiGothic-Medium.otf +ugbmv UniJIS-UTF16-V HaranoAjiGothic-Medium.otf +uprml-h UniJIS-UTF16-H HaranoAjiMincho-Regular.otf +uprml-v UniJIS-UTF16-V HaranoAjiMincho-Regular.otf +upgbm-h UniJIS-UTF16-H HaranoAjiGothic-Medium.otf +upgbm-v UniJIS-UTF16-V HaranoAjiGothic-Medium.otf +uprml-hq UniJIS-UCS2-H HaranoAjiMincho-Regular.otf +upgbm-hq UniJIS-UCS2-H HaranoAjiGothic-Medium.otf diff --git a/fonts/ptex-fontmaps/maps/yu-win/otf-up-yu-win.map b/fonts/ptex-fontmaps/maps/yu-win/otf-up-yu-win.map index 10b1c6a4c9..72c3d8021b 100644 --- a/fonts/ptex-fontmaps/maps/yu-win/otf-up-yu-win.map +++ b/fonts/ptex-fontmaps/maps/yu-win/otf-up-yu-win.map @@ -4,8 +4,8 @@ uphminl-h UniJIS-UTF16-H yuminl.ttf %!PS YuMincho-Light uphminl-v UniJIS-UTF16-V yuminl.ttf %!PS YuMincho-Light uphminr-h UniJIS-UTF16-H yumin.ttf %!PS YuMincho-Regular uphminr-v UniJIS-UTF16-V yumin.ttf %!PS YuMincho-Regular -uphminb-h UniJIS-UTF16-H yumindb.ttf %!PS YuMincho-DemiBold -uphminb-v UniJIS-UTF16-V yumindb.ttf %!PS YuMincho-DemiBold +uphminb-h UniJIS-UTF16-H yumindb.ttf %!PS YuMincho-Demibold +uphminb-v UniJIS-UTF16-V yumindb.ttf %!PS YuMincho-Demibold uphgothr-h UniJIS-UTF16-H yugothic.ttf %!PS YuGothic-Regular uphgothr-v UniJIS-UTF16-V yugothic.ttf %!PS YuGothic-Regular uphgothb-h UniJIS-UTF16-H yugothib.ttf %!PS YuGothic-Bold @@ -20,8 +20,8 @@ uphminln-h UniJIS2004-UTF16-H yuminl.ttf %!PS YuMincho-Light uphminln-v UniJIS2004-UTF16-V yuminl.ttf %!PS YuMincho-Light uphminrn-h UniJIS2004-UTF16-H yumin.ttf %!PS YuMincho-Regular uphminrn-v UniJIS2004-UTF16-V yumin.ttf %!PS YuMincho-Regular -uphminbn-h UniJIS2004-UTF16-H yumindb.ttf %!PS YuMincho-DemiBold -uphminbn-v UniJIS2004-UTF16-V yumindb.ttf %!PS YuMincho-DemiBold +uphminbn-h UniJIS2004-UTF16-H yumindb.ttf %!PS YuMincho-Demibold +uphminbn-v UniJIS2004-UTF16-V yumindb.ttf %!PS YuMincho-Demibold uphgothrn-h UniJIS2004-UTF16-H yugothic.ttf %!PS YuGothic-Regular uphgothrn-v UniJIS2004-UTF16-V yugothic.ttf %!PS YuGothic-Regular uphgothbn-h UniJIS2004-UTF16-H yugothib.ttf %!PS YuGothic-Bold diff --git a/fonts/ptex-fontmaps/maps/yu-win/otf-yu-win.map b/fonts/ptex-fontmaps/maps/yu-win/otf-yu-win.map index 8bf00f2f0e..68269381ad 100644 --- a/fonts/ptex-fontmaps/maps/yu-win/otf-yu-win.map +++ b/fonts/ptex-fontmaps/maps/yu-win/otf-yu-win.map @@ -4,8 +4,8 @@ hminl-h H yuminl.ttf %!PS YuMincho-Light hminl-v V yuminl.ttf %!PS YuMincho-Light hminr-h H yumin.ttf %!PS YuMincho-Regular hminr-v V yumin.ttf %!PS YuMincho-Regular -hminb-h H yumindb.ttf %!PS YuMincho-DemiBold -hminb-v V yumindb.ttf %!PS YuMincho-DemiBold +hminb-h H yumindb.ttf %!PS YuMincho-Demibold +hminb-v V yumindb.ttf %!PS YuMincho-Demibold hgothr-h H yugothic.ttf %!PS YuGothic-Regular hgothr-v V yugothic.ttf %!PS YuGothic-Regular hgothb-h H yugothib.ttf %!PS YuGothic-Bold @@ -20,8 +20,8 @@ hminln-h H yuminl.ttf %!PS YuMincho-Light hminln-v V yuminl.ttf %!PS YuMincho-Light hminrn-h H yumin.ttf %!PS YuMincho-Regular hminrn-v V yumin.ttf %!PS YuMincho-Regular -hminbn-h H yumindb.ttf %!PS YuMincho-DemiBold -hminbn-v V yumindb.ttf %!PS YuMincho-DemiBold +hminbn-h H yumindb.ttf %!PS YuMincho-Demibold +hminbn-v V yumindb.ttf %!PS YuMincho-Demibold hgothrn-h H yugothic.ttf %!PS YuGothic-Regular hgothrn-v V yugothic.ttf %!PS YuGothic-Regular hgothbn-h H yugothib.ttf %!PS YuGothic-Bold @@ -36,8 +36,8 @@ otf-cjml-h Identity-H yuminl.ttf/AJ16 %!PS YuMincho-Light otf-cjml-v Identity-V yuminl.ttf/AJ16 %!PS YuMincho-Light otf-cjmr-h Identity-H yumin.ttf/AJ16 %!PS YuMincho-Regular otf-cjmr-v Identity-V yumin.ttf/AJ16 %!PS YuMincho-Regular -otf-cjmb-h Identity-H yumindb.ttf/AJ16 %!PS YuMincho-DemiBold -otf-cjmb-v Identity-V yumindb.ttf/AJ16 %!PS YuMincho-DemiBold +otf-cjmb-h Identity-H yumindb.ttf/AJ16 %!PS YuMincho-Demibold +otf-cjmb-v Identity-V yumindb.ttf/AJ16 %!PS YuMincho-Demibold otf-cjgr-h Identity-H yugothic.ttf/AJ16 %!PS YuGothic-Regular otf-cjgr-v Identity-V yugothic.ttf/AJ16 %!PS YuGothic-Regular otf-cjgb-h Identity-H yugothib.ttf/AJ16 %!PS YuGothic-Bold @@ -52,8 +52,8 @@ otf-ujml-h UniJIS-UTF16-H yuminl.ttf %!PS YuMincho-Light otf-ujml-v UniJIS-UTF16-V yuminl.ttf %!PS YuMincho-Light otf-ujmr-h UniJIS-UTF16-H yumin.ttf %!PS YuMincho-Regular otf-ujmr-v UniJIS-UTF16-V yumin.ttf %!PS YuMincho-Regular -otf-ujmb-h UniJIS-UTF16-H yumindb.ttf %!PS YuMincho-DemiBold -otf-ujmb-v UniJIS-UTF16-V yumindb.ttf %!PS YuMincho-DemiBold +otf-ujmb-h UniJIS-UTF16-H yumindb.ttf %!PS YuMincho-Demibold +otf-ujmb-v UniJIS-UTF16-V yumindb.ttf %!PS YuMincho-Demibold otf-ujgr-h UniJIS-UTF16-H yugothic.ttf %!PS YuGothic-Regular otf-ujgr-v UniJIS-UTF16-V yugothic.ttf %!PS YuGothic-Regular otf-ujgb-h UniJIS-UTF16-H yugothib.ttf %!PS YuGothic-Bold @@ -68,8 +68,8 @@ otf-ujmln-h UniJIS2004-UTF16-H yuminl.ttf %!PS YuMincho-Light otf-ujmln-v UniJIS2004-UTF16-V yuminl.ttf %!PS YuMincho-Light otf-ujmrn-h UniJIS2004-UTF16-H yumin.ttf %!PS YuMincho-Regular otf-ujmrn-v UniJIS2004-UTF16-V yumin.ttf %!PS YuMincho-Regular -otf-ujmbn-h UniJIS2004-UTF16-H yumindb.ttf %!PS YuMincho-DemiBold -otf-ujmbn-v UniJIS2004-UTF16-V yumindb.ttf %!PS YuMincho-DemiBold +otf-ujmbn-h UniJIS2004-UTF16-H yumindb.ttf %!PS YuMincho-Demibold +otf-ujmbn-v UniJIS2004-UTF16-V yumindb.ttf %!PS YuMincho-Demibold otf-ujgrn-h UniJIS2004-UTF16-H yugothic.ttf %!PS YuGothic-Regular otf-ujgrn-v UniJIS2004-UTF16-V yugothic.ttf %!PS YuGothic-Regular otf-ujgbn-h UniJIS2004-UTF16-H yugothib.ttf %!PS YuGothic-Bold diff --git a/fonts/ptex-fontmaps/maps/yu-win10/otf-up-yu-win10.map b/fonts/ptex-fontmaps/maps/yu-win10/otf-up-yu-win10.map index 2d1bf333ab..17e07ee4cf 100644 --- a/fonts/ptex-fontmaps/maps/yu-win10/otf-up-yu-win10.map +++ b/fonts/ptex-fontmaps/maps/yu-win10/otf-up-yu-win10.map @@ -4,8 +4,8 @@ uphminl-h UniJIS-UTF16-H yuminl.ttf %!PS YuMincho-Light uphminl-v UniJIS-UTF16-V yuminl.ttf %!PS YuMincho-Light uphminr-h UniJIS-UTF16-H yumin.ttf %!PS YuMincho-Regular uphminr-v UniJIS-UTF16-V yumin.ttf %!PS YuMincho-Regular -uphminb-h UniJIS-UTF16-H yumindb.ttf %!PS YuMincho-DemiBold -uphminb-v UniJIS-UTF16-V yumindb.ttf %!PS YuMincho-DemiBold +uphminb-h UniJIS-UTF16-H yumindb.ttf %!PS YuMincho-Demibold +uphminb-v UniJIS-UTF16-V yumindb.ttf %!PS YuMincho-Demibold uphgothr-h UniJIS-UTF16-H :0:YuGothR.ttc %!PS YuGothic-Regular uphgothr-v UniJIS-UTF16-V :0:YuGothR.ttc %!PS YuGothic-Regular uphgothb-h UniJIS-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold @@ -20,8 +20,8 @@ uphminln-h UniJIS2004-UTF16-H yuminl.ttf %!PS YuMincho-Light uphminln-v UniJIS2004-UTF16-V yuminl.ttf %!PS YuMincho-Light uphminrn-h UniJIS2004-UTF16-H yumin.ttf %!PS YuMincho-Regular uphminrn-v UniJIS2004-UTF16-V yumin.ttf %!PS YuMincho-Regular -uphminbn-h UniJIS2004-UTF16-H yumindb.ttf %!PS YuMincho-DemiBold -uphminbn-v UniJIS2004-UTF16-V yumindb.ttf %!PS YuMincho-DemiBold +uphminbn-h UniJIS2004-UTF16-H yumindb.ttf %!PS YuMincho-Demibold +uphminbn-v UniJIS2004-UTF16-V yumindb.ttf %!PS YuMincho-Demibold uphgothrn-h UniJIS2004-UTF16-H :0:YuGothR.ttc %!PS YuGothic-Regular uphgothrn-v UniJIS2004-UTF16-V :0:YuGothR.ttc %!PS YuGothic-Regular uphgothbn-h UniJIS2004-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold diff --git a/fonts/ptex-fontmaps/maps/yu-win10/otf-yu-win10.map b/fonts/ptex-fontmaps/maps/yu-win10/otf-yu-win10.map index 0d4f3ab7d4..122add8162 100644 --- a/fonts/ptex-fontmaps/maps/yu-win10/otf-yu-win10.map +++ b/fonts/ptex-fontmaps/maps/yu-win10/otf-yu-win10.map @@ -4,8 +4,8 @@ hminl-h H yuminl.ttf %!PS YuMincho-Light hminl-v V yuminl.ttf %!PS YuMincho-Light hminr-h H yumin.ttf %!PS YuMincho-Regular hminr-v V yumin.ttf %!PS YuMincho-Regular -hminb-h H yumindb.ttf %!PS YuMincho-DemiBold -hminb-v V yumindb.ttf %!PS YuMincho-DemiBold +hminb-h H yumindb.ttf %!PS YuMincho-Demibold +hminb-v V yumindb.ttf %!PS YuMincho-Demibold hgothr-h H :0:YuGothR.ttc %!PS YuGothic-Regular hgothr-v V :0:YuGothR.ttc %!PS YuGothic-Regular hgothb-h H :0:YuGothB.ttc %!PS YuGothic-Bold @@ -20,8 +20,8 @@ hminln-h H yuminl.ttf %!PS YuMincho-Light hminln-v V yuminl.ttf %!PS YuMincho-Light hminrn-h H yumin.ttf %!PS YuMincho-Regular hminrn-v V yumin.ttf %!PS YuMincho-Regular -hminbn-h H yumindb.ttf %!PS YuMincho-DemiBold -hminbn-v V yumindb.ttf %!PS YuMincho-DemiBold +hminbn-h H yumindb.ttf %!PS YuMincho-Demibold +hminbn-v V yumindb.ttf %!PS YuMincho-Demibold hgothrn-h H :0:YuGothR.ttc %!PS YuGothic-Regular hgothrn-v V :0:YuGothR.ttc %!PS YuGothic-Regular hgothbn-h H :0:YuGothB.ttc %!PS YuGothic-Bold @@ -36,8 +36,8 @@ otf-cjml-h Identity-H yuminl.ttf/AJ16 %!PS YuMincho-Light otf-cjml-v Identity-V yuminl.ttf/AJ16 %!PS YuMincho-Light otf-cjmr-h Identity-H yumin.ttf/AJ16 %!PS YuMincho-Regular otf-cjmr-v Identity-V yumin.ttf/AJ16 %!PS YuMincho-Regular -otf-cjmb-h Identity-H yumindb.ttf/AJ16 %!PS YuMincho-DemiBold -otf-cjmb-v Identity-V yumindb.ttf/AJ16 %!PS YuMincho-DemiBold +otf-cjmb-h Identity-H yumindb.ttf/AJ16 %!PS YuMincho-Demibold +otf-cjmb-v Identity-V yumindb.ttf/AJ16 %!PS YuMincho-Demibold otf-cjgr-h Identity-H :0:YuGothR.ttc/AJ16 %!PS YuGothic-Regular otf-cjgr-v Identity-V :0:YuGothR.ttc/AJ16 %!PS YuGothic-Regular otf-cjgb-h Identity-H :0:YuGothB.ttc/AJ16 %!PS YuGothic-Bold @@ -52,8 +52,8 @@ otf-ujml-h UniJIS-UTF16-H yuminl.ttf %!PS YuMincho-Light otf-ujml-v UniJIS-UTF16-V yuminl.ttf %!PS YuMincho-Light otf-ujmr-h UniJIS-UTF16-H yumin.ttf %!PS YuMincho-Regular otf-ujmr-v UniJIS-UTF16-V yumin.ttf %!PS YuMincho-Regular -otf-ujmb-h UniJIS-UTF16-H yumindb.ttf %!PS YuMincho-DemiBold -otf-ujmb-v UniJIS-UTF16-V yumindb.ttf %!PS YuMincho-DemiBold +otf-ujmb-h UniJIS-UTF16-H yumindb.ttf %!PS YuMincho-Demibold +otf-ujmb-v UniJIS-UTF16-V yumindb.ttf %!PS YuMincho-Demibold otf-ujgr-h UniJIS-UTF16-H :0:YuGothR.ttc %!PS YuGothic-Regular otf-ujgr-v UniJIS-UTF16-V :0:YuGothR.ttc %!PS YuGothic-Regular otf-ujgb-h UniJIS-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold @@ -68,8 +68,8 @@ otf-ujmln-h UniJIS2004-UTF16-H yuminl.ttf %!PS YuMincho-Light otf-ujmln-v UniJIS2004-UTF16-V yuminl.ttf %!PS YuMincho-Light otf-ujmrn-h UniJIS2004-UTF16-H yumin.ttf %!PS YuMincho-Regular otf-ujmrn-v UniJIS2004-UTF16-V yumin.ttf %!PS YuMincho-Regular -otf-ujmbn-h UniJIS2004-UTF16-H yumindb.ttf %!PS YuMincho-DemiBold -otf-ujmbn-v UniJIS2004-UTF16-V yumindb.ttf %!PS YuMincho-DemiBold +otf-ujmbn-h UniJIS2004-UTF16-H yumindb.ttf %!PS YuMincho-Demibold +otf-ujmbn-v UniJIS2004-UTF16-V yumindb.ttf %!PS YuMincho-Demibold otf-ujgrn-h UniJIS2004-UTF16-H :0:YuGothR.ttc %!PS YuGothic-Regular otf-ujgrn-v UniJIS2004-UTF16-V :0:YuGothR.ttc %!PS YuGothic-Regular otf-ujgbn-h UniJIS2004-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold diff --git a/fonts/ptex-fontmaps/script/kanji-config-updmap.pl b/fonts/ptex-fontmaps/script/kanji-config-updmap.pl index 230b0a9a02..541c4329a7 100755 --- a/fonts/ptex-fontmaps/script/kanji-config-updmap.pl +++ b/fonts/ptex-fontmaps/script/kanji-config-updmap.pl @@ -1,6 +1,6 @@ #!/usr/bin/env perl # kanji-config-updmap: setup Japanese font embedding -# Version 20190506.0 +# Version 20200217.0 # # formerly known as updmap-setup-kanji # @@ -22,7 +22,7 @@ use Getopt::Long qw(:config no_autoabbrev ignore_case_always); use strict; my $prg = "kanji-config-updmap"; -my $version = '20190506.0'; +my $version = '20200217.0'; my $updmap_real = "updmap"; my $updmap = $updmap_real; @@ -255,6 +255,12 @@ sub ReadDatabase { next if ($l =~ m/^\s*$/); # skip empty line next if ($l =~ m/^\s*#/); # skip comment line $l =~ s/\s*#.*$//; # skip comment after '#' + if ($l =~ m/^JA\*\((\d+)\):\s*(.*):\s*(.*)$/) { # no -04 map + $representatives{'ja'}{$2}{'priority'} = $1; + $representatives{'ja'}{$2}{'file'} = $3; + $representatives{'ja'}{$2}{'nojis04'} = 1; + next; + } if ($l =~ m/^JA\((\d+)\):\s*(.*):\s*(.*)$/) { $representatives{'ja'}{$2}{'priority'} = $1; $representatives{'ja'}{$2}{'file'} = $3; @@ -275,6 +281,13 @@ sub ReadDatabase { $representatives{'ko'}{$2}{'file'} = $3; next; } + if ($l =~ m/^JA-AI0\*:\s*(.*):\s*(.*)$/) { # no -04 map + $representatives{'ja'}{$1}{'priority'} = 9999; # lowest + $representatives{'ja'}{$1}{'file'} = $2; + $representatives{'ja'}{$1}{'nojis04'} = 1; + $ai0flags{'ja'}{$1} = 1; + next; + } if ($l =~ m/^JA-AI0:\s*(.*):\s*(.*)$/) { $representatives{'ja'}{$1}{'priority'} = 9999; # lowest $representatives{'ja'}{$1}{'file'} = $2; @@ -311,10 +324,11 @@ sub ReadDatabase { sub kpse_miscfont { my ($file) = @_; - chomp(my $foo = `kpsewhich -format=miscfont $file`); - # for GitHub repository diretory structure + my $foo = ''; + # first, prioritize GitHub repository diretory structure + $foo = "database/$file" if (-f "database/$file"); if ($foo eq "") { - $foo = "database/$file" if (-f "database/$file"); + chomp($foo = `kpsewhich -format=miscfont $file`); } return $foo; } @@ -366,17 +380,32 @@ sub gen_mapfile { sub GetStatus { my $opt_mode = shift; - my $val = `$updmap_real --quiet --showoption ${opt_mode}Embed`; - my $STATUS; + my $val; + my $STATUS = ""; + my $VARIANT = ""; + + # fetch jaEmbed/scEmbed/tcEmbed/koEmbed + $val = `$updmap_real --quiet --showoption ${opt_mode}Embed`; if ($val =~ m/^${opt_mode}Embed=([^()\s]*)(\s+\()?/) { $STATUS = $1; } else { die "Cannot find status of current ${opt_mode}Embed setting via updmap --showoption!\n"; } + # fetch jaVariant + if ($opt_mode eq "ja") { + $val = `$updmap_real --quiet --showoption ${opt_mode}Variant`; + if ($val =~ m/^${opt_mode}Variant=([^()\s]*)(\s+\()?/) { + $VARIANT = $1; # should be '' or '-04' + } else { + die "Cannot find status of current ${opt_mode}Variant setting via updmap --showoption!\n"; + } + } - my $testmap = gen_mapfile($opt_mode, $STATUS); + my $testmap = gen_mapfile($opt_mode, "$STATUS$VARIANT"); + $VARIANT = "<empty>" if ($VARIANT eq ""); # for printing if (check_mapfile($testmap)) { print "CURRENT family for $opt_mode: $STATUS"; + print " (variant: $VARIANT)" if ($opt_mode eq "ja"); print " (AI0)" if ($ai0flags{$opt_mode}{$STATUS}); print "\n"; } else { @@ -410,10 +439,16 @@ sub SetupMapFile { print " (AI0)" if ($ai0flags{$opt_mode}{$rep}); print " for $opt_mode\n"; system("$updmap --quiet --nomkmap --nohash --setoption ${opt_mode}Embed $rep"); - if ($opt_jis) { - system("$updmap --quiet --nomkmap --nohash --setoption jaVariant -04"); - } else { - system("$updmap --quiet --nomkmap --nohash --setoption jaVariant \"\""); + if ($opt_mode eq "ja") { + if ($opt_jis && $representatives{'ja'}{$rep}{'nojis04'}) { + print STDERR "WARNING: No -04 map available, option --jis2004 ignored!\n"; + $opt_jis = 0; + } + if ($opt_jis) { + system("$updmap --quiet --nomkmap --nohash --setoption jaVariant -04"); + } else { + system("$updmap --quiet --nomkmap --nohash --setoption jaVariant \"\""); + } } } else { die "NOT EXIST $MAPFILE\n"; diff --git a/fonts/ptex-fontmaps/script/kanji-fontmap-creator.pl b/fonts/ptex-fontmaps/script/kanji-fontmap-creator.pl index dd8e72970d..0189360e23 100644 --- a/fonts/ptex-fontmaps/script/kanji-fontmap-creator.pl +++ b/fonts/ptex-fontmaps/script/kanji-fontmap-creator.pl @@ -2,7 +2,7 @@ # # kanji-fontmap-creator # (c) 2012-2014 Norbert Preining -# Version: 20190506.0 +# Version: 20200217.0 # Licenced under the GPLv2 or any higher version # # gui to create map files for (kanji-config-)updmap @@ -41,7 +41,7 @@ my $opt_help = 0; my $opt_version = 0; my $prg = "kanji-fontmap-creator"; -my $version = "20190506.0"; +my $version = "20200217.0"; # # global vars configuring operation diff --git a/graphics/circuit_macros/CHANGES b/graphics/circuit_macros/CHANGES index 55dd822d35..8713597bf9 100644 --- a/graphics/circuit_macros/CHANGES +++ b/graphics/circuit_macros/CHANGES @@ -1,6 +1,8 @@ CHANGES - (The stable CTAN version will be nn.n; intermediate versions nn.n.n): +Version 9.2: New options for macros contact, dswitch, FlipFlop, + FlipFlopX. New macros pvcell, contacts, relaycoil. Modified cbreaker + and relay. New file Licence.txt. Change from siunits to siunitx.sty. Version 9.1: Corrected two examples; added others including vacuum tubes. Tweaked dashline. Removed an extraneous log file and extraneous code from libgen.m4. New pic macros for operations on complex numbers. New diff --git a/graphics/circuit_macros/Copying b/graphics/circuit_macros/Copying index 72d57ff5b7..4359dd7830 100644 --- a/graphics/circuit_macros/Copying +++ b/graphics/circuit_macros/Copying @@ -1,6 +1,6 @@ -* Circuit_macros Version 9.1, copyright (c) 2019 J. D. Aplevich under * -* the LaTeX Project Public License. The files of this distribution may * -* be redistributed or modified provided that this copyright notice is * -* included and provided that modifications are clearly marked to * -* distinguish them from this distribution. There is no warranty * -* whatsoever for these files. * +* Circuit_macros Version 9.2, copyright (c) 2020 J. D. Aplevich under * +* the LaTeX Project Public Licence in file Licence.txt. The files of * +* this distribution may be redistributed or modified provided that this * +* copyright notice is included and provided that modifications are clearly * +* marked to distinguish them from this distribution. There is no warranty * +* whatsoever for these files. * diff --git a/graphics/circuit_macros/Licence.txt b/graphics/circuit_macros/Licence.txt new file mode 100644 index 0000000000..890d8766be --- /dev/null +++ b/graphics/circuit_macros/Licence.txt @@ -0,0 +1,417 @@ +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/graphics/circuit_macros/README b/graphics/circuit_macros/README index 40768bb81a..3d31e4eb61 100644 --- a/graphics/circuit_macros/README +++ b/graphics/circuit_macros/README @@ -1,10 +1,10 @@ -* Circuit_macros Version 9.1, copyright (c) 2019 J. D. Aplevich under * -* the LaTeX Project Public License. The files of this distribution may * -* be redistributed or modified provided that this copyright notice is * -* included and provided that modifications are clearly marked to * -* distinguish them from this distribution. There is no warranty * -* whatsoever for these files. * +* Circuit_macros Version 9.2, copyright (c) 2020 J. D. Aplevich under * +* the LaTeX Project Public Licence in file Licence.txt. The files of * +* this distribution may be redistributed or modified provided that this * +* copyright notice is included and provided that modifications are clearly * +* marked to distinguish them from this distribution. There is no warranty * +* whatsoever for these files. * This is a set of macros for drawing high-quality line diagrams to include in LaTeX, web, or similar documents, with support for SVG @@ -26,6 +26,9 @@ recursion. Arbitrary text for formatting by LaTeX can be included. Free interpreters for m4 and pic are readily available. +Sources are available as a git repository at + https://gitlab.com/aplevich/Circuit_macros + REQUIRED SOFTWARE: Preferred setup: GNU m4, dpic (see below), LaTeX, PSTricks, dvips @@ -56,7 +59,8 @@ USAGE or pstricks graphics for LaTeX; see below for integration with other tools and production of other formats. You probably should try out the basic usage before integrating the macros with sophisticated - system-dependent tools. + system-dependent tools. When developing your own diagrams, refer to + the macro descriptions in the List of Macros section of Circuit_macros.pdf. Suppose that a source file, cct.m4 say, has been created and the top two lines are @@ -114,7 +118,7 @@ USAGE INSTALLATION: 1. Decide where you will be installing the .m4 library files. In - principle, they can go anywhere, for example, $HOME/Circuit_macros, + principle, they can go anywhere; for example, $HOME/Circuit_macros, c:\localtexmf\Circuit_macros, /usr/local/share/Circuit_macros, or ~/texmf/tex/latex/Circuit_macros. Copy the files from the top-level directory of the distribution to the installation @@ -186,10 +190,14 @@ TESTING: The .m4 files in the examples directory can serve as models for your diagrams but keep in mind that some of them contain details that allow - the source to be used with a variety of postprocessors. Sticking to - one postprocessor such as tikz or PStricks allows for the simplest - source. You might also wish to browse some of the files that are not - used for examples.ps. + the source to be used with a variety of postprocessors. Sticking to one + postprocessor such as tikz or PStricks allows for the simplest source. + You might also wish to browse some of the included files that are not + used to make examples.ps. + + A few of the sources in the examples directory are copies of files + from the doc directory. They are duplicated to provide flexibility + of directory structure and independency of sources. No "make" facility? You have to test by hand (but see below for diagram production software). Copy a test file as above into @@ -246,6 +254,9 @@ DPIC: http://ece.uwaterloo.ca/~aplevich/dpic/ and a git repository containing complete source is at https://gitlab.com/aplevich/dpic + The source can be found in a number of repositories but many contain + older versions, see https://repology.org/project/dpic/badges + The best advice is to obtain the newest version. The dpic distribution includes a manual dpic-doc.pdf containing a summary of the pic language and descriptions of features unique to dpic. @@ -257,7 +268,7 @@ EXAMPLES AND INTEGRATION WITH OTHER TOOLS: Read the manual Circuit_macros.pdf and view or print the file examples.ps in the examples directory. There are a few other source - files in the examples directory that are not shown in examples.ps. + files in the examples directory that are not shown in examples.pdf. For the possibly unstable development version of these macros, try http://ece.uwaterloo.ca/~aplevich/Circuit_macros/ @@ -270,41 +281,35 @@ EXAMPLES AND INTEGRATION WITH OTHER TOOLS: beginning so archived instructions on the net may be slightly more complicated than currently necessary. However, a number of people have developed tools that simplify workflow for their circumstances, - which are beyond the scope of this distribution. The following may - be of interest: - - Fabrice Salvaire provides a brief introduction at - https://www.fabrice-salvaire.fr/en/blog/electronic-circuit-diagrams/ + which are beyond the scope of this distribution. A set of examples and hints intended for his colleagues has been produced by Alan Robert Clark at http://ytdp.ee.wits.ac.za/cct.html - A KDE interface created by Matteo Agostinelli can be found at - http://wwwu.uni-klu.ac.at/magostin/cirkuit.html - A git repository of a newer version of cirkuit by Andrew G. for Linux is at - https://github.com/ag-ckt/cirkuit/tree/V0.5.0 + A Python-based GUI called PyCirkuit is at + https://pypi.org/project/pycirkuit/ and + https://github.com/orestesmas/pycirkuit. + For an introduction, look at the FOSDEM video by Orestes Mas: + https://ftp.osuosl.org/pub/fosdem/2020/H.2215/pycirkuit.webm - The GUI front end PyCirkuit at https://pypi.org/project/pycirkuit/ - and https://github.com/orestesmas/pycirkuit - is Python-based and inspired by cirkuit. + A KDE interface created by Matteo Agostinelli can be found at + http://wwwu.uni-klu.ac.at/magostin/cirkuit.html. A git repository + of a newer version of cirkuit by Andrew G. for Linux is at + https://github.com/ag-ckt/cirkuit/tree/V0.5.0. Because of changes + in library dependencies, there is uncertainty about installation + possibilities. A wiki offering examples and tips is at http://swwiki.e-dschungel.de/circuit_macros It is in German but Google translate works well on the page. + Variations: + See eschpic on Github for IEC-style electrical drawings. + Mac users: A previewer app for Mac OS X written by Collin J. Delker is available at http://www.collindelker.com/wp/2013/04/circuit_macros_previewer/ - For more examples in the context of a textbook, have a look at - Aplevich, J.D., "The Essentials of Linear State-Space Systems," New - York: John Wiley & Sons Inc., 2000. In Canada, look at Andrews, - G.C., Aplevich, J.D., Fraser, and R.A., MacGregor, C.G., - "Introduction to Professional Engineering in Canada," (fifth edition) - Toronto: Pearson Education Canada, Inc., 2018. Some samples from these - books can be found at - http://ece.uwaterloo.ca/~aplevich/ - For an example of the use of dpic in a wiki (thanks to Jason Grout), see http://jasongrout.org/software/dokuwiki/format-plugin @@ -329,9 +334,6 @@ EXAMPLES AND INTEGRATION WITH OTHER TOOLS: Stevens illustrated his books on Unix and TCP/IP using pic macros. Some of the sources found there need minor tuning to work under dpic. -TikZ-PGF: Check the Makefile in the examples/pgf directory as described - in the README file, and type "make" or "make examples.pdf". - MetaPost examples: Go to the examples/mpost directory. Check the Makefile as described in the README file, type "make", and stand well back. diff --git a/graphics/circuit_macros/boxdims.sty b/graphics/circuit_macros/boxdims.sty index 22b76d73fd..f648da7981 100644 --- a/graphics/circuit_macros/boxdims.sty +++ b/graphics/circuit_macros/boxdims.sty @@ -1,5 +1,5 @@ % -% boxdims.sty, for use with m4 preprocessors. Last modified 30 Apr 2004. +% boxdims.sty, for use with Circuit_macros. Last modified 30 Apr 2004. % % \boxdims{arg1}{arg2} expands to arg2, but writes into file \jobname.dim % the m4 definitions for macros arg1_h, arg1_w, arg1_d, the height, width diff --git a/graphics/circuit_macros/darrow.m4 b/graphics/circuit_macros/darrow.m4 index 9f762bfec9..590760c081 100644 --- a/graphics/circuit_macros/darrow.m4 +++ b/graphics/circuit_macros/darrow.m4 @@ -1,12 +1,12 @@ divert(-1) darrow.m4 Macros for double lines and arrows -* Circuit_macros Version 9.1, copyright (c) 2019 J. D. Aplevich under * -* the LaTeX Project Public License. The files of this distribution may * -* be redistributed or modified provided that this copyright notice is * -* included and provided that modifications are clearly marked to * -* distinguish them from this distribution. There is no warranty * -* whatsoever for these files. * +* Circuit_macros Version 9.2, copyright (c) 2020 J. D. Aplevich under * +* the LaTeX Project Public Licence in file Licence.txt. The files of * +* this distribution may be redistributed or modified provided that this * +* copyright notice is included and provided that modifications are clearly * +* marked to distinguish them from this distribution. There is no warranty * +* whatsoever for these files. * `Notes: these macros have been reworked (Jan 2013) so that dlthick is the diff --git a/graphics/circuit_macros/doc/CctTable.m4 b/graphics/circuit_macros/doc/CctTable.m4 index 40b5849d66..f7e47d0758 100644 --- a/graphics/circuit_macros/doc/CctTable.m4 +++ b/graphics/circuit_macros/doc/CctTable.m4 @@ -83,5 +83,8 @@ vm = 0.28 move right_ hm {reed(,,,fill_(0.9),CR) ; move ; "`{\tt reed(,{,},fill\_(0.9),CR)}'" ljust} } + move down 0.25; right_ +{ {pvcell ; move;"`{\tt pvcell}'" ljust} +} .PE diff --git a/graphics/circuit_macros/doc/Circuit_macros.pdf b/graphics/circuit_macros/doc/Circuit_macros.pdf Binary files differindex e0a03e9510..302f862d93 100644 --- a/graphics/circuit_macros/doc/Circuit_macros.pdf +++ b/graphics/circuit_macros/doc/Circuit_macros.pdf diff --git a/graphics/circuit_macros/doc/Circuit_macros.tex b/graphics/circuit_macros/doc/Circuit_macros.tex index 36f9bdf694..49e6570970 100644 --- a/graphics/circuit_macros/doc/Circuit_macros.tex +++ b/graphics/circuit_macros/doc/Circuit_macros.tex @@ -14,7 +14,7 @@ \usepackage[T1]{fontenc} \usepackage{lmodern} %\usepackage{textcomp} -%\usepackage{microtype} +\usepackage{microtype} %\DisableLigatures{encoding=T1,family=tt*} % \addtolength{\textwidth}{3cm} diff --git a/graphics/circuit_macros/doc/Contact.m4 b/graphics/circuit_macros/doc/Contact.m4 new file mode 100644 index 0000000000..26f8d5a982 --- /dev/null +++ b/graphics/circuit_macros/doc/Contact.m4 @@ -0,0 +1,98 @@ +.PS +# Contact +cct_init + +movw = 0.45 +{ + contact + {S:`"\tt contact"' at last [].s+(0,-0.15) + "\sl P" rjust at last [].P.w + "\sl O" ljust at last [].O + "\sl C" ljust at last [].C } + move right_ movw; contact(R) + {`"\tt (R)"' at (last [].s,S) + "\sl P" rjust at last [].P.w + "\sl O" ljust at last [].O + "\sl C" ljust at last [].C } + move right_ movw; contact(O); {`"\tt (O)"' at (last [],S)} + move right_ movw; contact(C); {`"\tt (C)"' at (last [],S)} + + move right_ movw; contact(P) + {S: `"\tt (P)"' at last [].s+(0,-0.15) + "\sl P" rjust at last [].P.w + "\sl O" ljust at last [].O + "\sl C" ljust at last [].C } + move right_ movw; contact(PR) + {S: `"\tt (PR)"' at last [].s+(0,-0.15) + "\sl P" rjust at last [].P.w + "\sl O" ljust at last [].O + "\sl C" ljust at last [].C } + move right_ movw; contact(PO); {`"\tt (PO)"' at (last [],S)} + {"\sl O" ljust at last [].O + "\sl C" ljust at last [].C } + move right_ movw; contact(PC); {`"\tt (PC)"' at (last [],S)} +} + +move down 0.75; right_ ; { + contact(I); {`S: "\tt (I)"' at last [].s+(0,-12bp__) + "\sl P" rjust at last [].P.w + "\sl O" ljust at last [].O.e + "\sl C" ljust at last [].C.e } + move right_ movw; contact(RI) + {`"\tt (RI)"' at (last [],S) + "\sl P" rjust at last [].P.w + "\sl O" ljust at last [].O.e + "\sl C" ljust at last [].C.e } + move right_ movw; contact(OI); {`"\tt (OI)"' at (last [],S)} + move right_ movw; contact(CI); {`"\tt (CI)"' at (last [],S)} + + move right_ movw; contact(PI); {`"\tt (PI)"' at (last [],S) } + {"\sl O" ljust at last [].O.e + "\sl C" ljust at last [].C.e } + move right_ movw; contact(PIO); {`"\tt (PIO)"' at (last [],S) } + move right_ movw; contact(PIC); {`"\tt (PIC)"' at (last [],S) } +} + +movewid = movw + move down 0.65; right_; { + K: contact(T) + {S: `"\tt (T)"' at last [].s+(0,-0.15) + thinlines_ + spline <- right 0.09 then up 0.05 right 0.05 from K.C; "$\;\;$\sl C" + spline <- right 0.09 then down 0.05 right 0.05 from K.O; "$\;\;$\sl O" + thicklines_ } + move; K: contact(RT) + {`"\tt (RT)"' at (last [],S) + thinlines_ + spline <- right 0.09 then up 0.05 right 0.05 from K.O; "$\;\;$\sl O" + spline <- right 0.09 then down 0.05 right 0.05 from K.C; "$\;\;$\sl C" + thicklines_ } + move; contact(OT); {S: `"\tt (OT)"' at (last [],S) } + move; contact(CT); {S: `"\tt (CT)"' at (last [],S) } + move; contact(PT); {S: `"\tt (PT)"' at (last [],S) } + move; contact(PTO); {S: `"\tt (PTO)"' at (last [],S) } + move; contact(PTC); {S: `"\tt (PTC)"' at (last [],S) } +} + + move down 0.65; right_; { + K: contact(U) + {S: `"\tt (U)"' at last [].s+(0,-0.15) + thinlines_ + spline <- right 0.09 then up 0.05 right 0.05 from K.C; "$\;\;$\sl C" + spline <- right 0.09 then down 0.05 right 0.05 from K.O; "$\;\;$\sl O" + thicklines_ } + move; K: contact(RU) + {`"\tt (RU)"' at (last [],S) + thinlines_ + spline <- right 0.09 then up 0.05 right 0.05 from K.O; "$\;\;$\sl O" + spline <- right 0.09 then down 0.05 right 0.05 from K.C; "$\;\;$\sl C" + thicklines_ } + move; K: contact(OU); {S: `"\tt (OU)"' at (last [],S) + "\sl O" ljust at K.O.e } + move; K: contact(CU); {S: `"\tt (CU)"' at (last [],S) + "\sl C" ljust at K.C.e } + move; contact(PU); {S: `"\tt (PU)"' at (last [],S) } + move; contact(PUO); {S: `"\tt (PUO)"' at (last [],S) } + move; contact(PUC); {S: `"\tt (PUC)"' at (last [],S) } +} +.PE diff --git a/graphics/circuit_macros/doc/Contacts.m4 b/graphics/circuit_macros/doc/Contacts.m4 new file mode 100644 index 0000000000..9e006218e3 --- /dev/null +++ b/graphics/circuit_macros/doc/Contacts.m4 @@ -0,0 +1,46 @@ +.PS +# Contacts.m4 +cct_init + + space = 0.75 + KS:contacts(2) + {`"\tt contacts(2)"' at KS.s +(0,-12bp__) + for_(1,2,1, + `"\sl P`'m4x" rjust at last [].P`'m4x-(dotrad_,0) + "\sl O`'m4x" ljust at last [].O`'m4x+(dotrad_,0) + "\sl C`'m4x" ljust at last [].C`'m4x+(dotrad_,0) ') } + + KS:contacts(2,I) with .sw at last [].se+(space,0) + {`"\tt (2,I)"' at KS.s +(0,-12bp__) + for_(1,2,1, + `"\sl P`'m4x" rjust at last [].P`'m4x-(dotrad_,0) + "\sl O`'m4x" ljust at last [].O`'m4x+(dotrad_,0) + "\sl C`'m4x" ljust at last [].C`'m4x+(dotrad_,0) ') } + + KS:contacts(2,IO) with .sw at last [].se+(space,0) + {`"\tt (2,IO)"' at KS.s +(0,-12bp__) + for_(1,2,1, + `"\sl P`'m4x" rjust at last [].P`'m4x-(dotrad_,0) + "\sl O`'m4x" ljust at last [].O`'m4x+(dotrad_,0) ') } + + KS:contacts(2,PICD) with .sw at last [].se+(space,0) + {`"\tt (2,PICD)"' at KS.s +(0,-12bp__) + for_(1,2,1, + `"\sl P`'m4x" rjust at last [].P`'m4x-(dotrad_,0) + "\sl O`'m4x" ljust at last [].O`'m4x+(dotrad_,0) + "\sl C`'m4x" ljust at last [].C`'m4x+(dotrad_,0) ') } + + KS:contacts(2,PTCD) with .sw at last [].se+(space,0) + {`"\tt (2,PTCD)"' at KS.s +(0,-12bp__) + for_(1,2,1, + `"\sl P`'m4x" rjust at last [].P`'m4x-(dotrad_,0) + "\sl O`'m4x" ljust at last [].O`'m4x+(dotrad_,0) + "\sl C`'m4x" ljust at last [].C`'m4x+(dotrad_,0) ') } + + KS:contacts(2,PUCD) with .sw at last [].se+(space,0) + {`"\tt (2,PUCD)"' at KS.s +(0,-12bp__) + for_(1,2,1, + `"\sl P`'m4x" rjust at last [].P`'m4x-(dotrad_,0) + "\sl O`'m4x" ljust at last [].O`'m4x+(dotrad_,0) + "\sl C`'m4x" ljust at last [].C`'m4x+(dotrad_,0) ') } +.PE diff --git a/graphics/circuit_macros/doc/FlipFlop.m4 b/graphics/circuit_macros/doc/FlipFlop.m4 index c04ca6ba89..a4fca85284 100644 --- a/graphics/circuit_macros/doc/FlipFlop.m4 +++ b/graphics/circuit_macros/doc/FlipFlop.m4 @@ -1,20 +1,24 @@ .PS # `FlipFlop.m4' log_init -iflatex(`textoffset = 1bp__; ifpsfrag(,`latexcommand({\sf)') ') +iflatex(`ifpsfrag(,`latexcommand({\sf)') ') s_init(Flipflop) sinclude(Circuit_macros.dim) + +[ right_ { Q1: FlipFlop(D,Q1) s_box(``\tt FlipFlop(D,Q1)'') at last [].Chip.s below h1 = L_unit*20 w1 = L_unit*12 FlipFlop(T,Q2,ht h1 wid w1 fill_(0.9)) with .w at last [].e+(0.25,0) - s_box(``\tt FlipFlop(T,Q2,ht h1 wid w1 fill\_(0.9))'') \ + s_box(``\shortstack{\tt FlipFlop(T,Q2,\\ + \tt\quad ht h1 wid w1 fill\_(0.9))}'') \ at (last [].Chip,2nd last [].Chip.s)+(0,-0.25) - FlipFlop(RS) with .w at last [].e+(0.25,0) - s_box(``\tt FlipFlop(RS)'') at last [].Chip.s below - FlipFlop(JK) with .w at last [].e+(0.25,0) + FlipFlop(RS,,,Chip.wid/8) with .w at last [].e+(0.5,0) + s_box(``\shortstack[l]{\tt FlipFlop(RS,{,},\\ + \tt\quad Chip.wid/8)}'') at last [].sw below ljust + FlipFlop(JK) with .w at last [].e+(0.5,0) s_box(``\tt FlipFlop(JK)'') with .n at last [].PinPR.end } move down 1.5; right_ @@ -28,5 +32,29 @@ right_ s_box(``\shortstack[l]{\tt FlipFlopX(,{,} \\ \tt\quad:J;E:CK;:K,N:CLR,:Q;)}'') at last [].Chip.s below } +] + +if 0 then { +[ +# Redrawn from +# https://tex.stackexchange.com/questions/521724/how-could-i-write-this-in-a-more-exportable-way + + for_(0,4,1,` + Q: FlipFlopX(ifelse(m4x,0,`fill_(0.95)'),, + :Q:PinQ; :lg_bartxt(Q):PinNQ, + :CLR:PinCLR, + :J:PinJ; E::PinCK; :K:PinK, + :PRST:PinPRST, + 0) with .PinCK at Here + ifelse(m4x,0, + `S: source(right_ sourcerad_*2 at Q.Chip,U) + line from S.start to Q.PinCK') + T: Q.PinQ-(Q.Chip.wid/2,0) + arrow from Q.PinQ to T then up Q.Chip.ht/2; { "$Q_`'m4x$" above } + ifelse(m4x,4,,`arrow from T to (T,Q.PinCK) then left Q.Chip.wid/2') + ') +] with .nw at last [].sw+(0,-0.5) +} + iflatex(ifpsfrag(,`latexcommand(})')) .PE diff --git a/graphics/circuit_macros/doc/Jack.m4 b/graphics/circuit_macros/doc/Jack.m4 index 3c56061e67..b9a005d279 100644 --- a/graphics/circuit_macros/doc/Jack.m4 +++ b/graphics/circuit_macros/doc/Jack.m4 @@ -73,6 +73,6 @@ L: [ right_ `"\tt ..(L,RLS)"' below at (J3,last "") `"\tt ..(L,RLBLMLMS)"' below at (J4,last "") `"\tt ..(,RSBSMLB)"' below at (J5,last "") -] with .nw at P.sw + (0,0.1) +] with .nw at P.sw #+ (0,0.1) .PE diff --git a/graphics/circuit_macros/doc/Makefile b/graphics/circuit_macros/doc/Makefile index a934e20bba..463f3c0ec1 100644 --- a/graphics/circuit_macros/doc/Makefile +++ b/graphics/circuit_macros/doc/Makefile @@ -8,14 +8,14 @@ PICTEX = \ AmpTable.tex Antennas.tex Audio.tex Axes.tex \ Buffer.tex BigResistor.tex Bip.tex \ CctTable.tex Composite.tex ConfigA.tex ConfigB.tex ConfigC.tex Conn.tex \ - Corners.tex \ + Corners.tex Contact.tex Contacts.tex \ Dac.tex Darlington.tex Demultiplexer.tex Diodes.tex \ Emarrows.tex FF.tex FlipFlop.tex \ Flowdiag.tex Fuses.tex Grounds.tex \ Headers.tex HybridPi.tex Jack.tex \ Logic.tex Loop.tex Multiplexer.tex NPDT.tex NLG.tex Nport.tex \ Oblique.tex Opamp.tex Opto.tex \ - ParSeries.tex Pconn.tex Potentiometers.tex Relay.tex \ + ParSeries.tex Pconn.tex Potentiometers.tex Relay.tex relaycoil.tex \ Series.tex ShiftR.tex Sinus.tex Sources.tex Switches.tex \ Taps.tex Tgate.tex Thermal.tex Tline.tex Ttree.tex \ Variable.tex Xform.tex Windings.tex Workflow.tex \ @@ -64,13 +64,14 @@ M4LIBS = $(MODE).m4 $(M4) $(M4LIBS) $(DOC).dim $*.m4 > $*.pic ($(PRE) $(PIC) $*.pic $(POST)) > $*.tex -CMpdf: +$(DOC).pdf: touch mode.tex -if grep -q tikz mode.tex ; then true ; else \ make clean ; printf "\\usepackage{tikz}\n" > mode.tex ; fi make MODE=pgf PIC="dpic -g" LATEX=pdflatex SFX=pdf \ POST="; printf '\\\\vspace*{-0.5\\\\baselineskip}\\n'" \ $(DOC).pdf + optpdf $(DOC).pdf chmod 644 $(DOC).pdf $(DOC).ps: @@ -134,9 +135,8 @@ ex08.m4: ../examples/ex08.m4 clobber: clean rm -f *.dvi Circuit_macros.pdf -# rm -f Circuit_macros.pdf clean: rm -f *.bbl *.log *.aux *.blg *.toc citations *.verb ex08.m4 - rm -f *.pic $(PICTEX) heading.tex *.dim *.uu Circuit_macros.ps Circuit_macros.dvi - rm -f mode.tex Circuit_macros.out *.upa *.upb *.brf + rm -f *.pic $(PICTEX) heading.tex *.dim *.uu Circuit_macros.ps + rm -f mode.tex Circuit_macros.out *.upa *.upb *.brf Circuit_macros.dvi diff --git a/graphics/circuit_macros/doc/Pconn.m4 b/graphics/circuit_macros/doc/Pconn.m4 index 946ec0fda6..fbda5cc2e7 100644 --- a/graphics/circuit_macros/doc/Pconn.m4 +++ b/graphics/circuit_macros/doc/Pconn.m4 @@ -24,8 +24,6 @@ P1: [ C3: pconnex(,ACF) with .w at last [].e+(0.2,0) `"\tt (,ACF)"' at last [].s below - C4: pconnex(,P) with .w at last [].e+(0.2,0) - `"\tt (,P)"' at (C4,last "") below C5: pconnex(U,D) with .w at last [].e+(0.2,0) `"\tt (U,D)"' at last [].s below C6: pconnex(U,DF) with .w at last [].e+(0.2,0) @@ -37,7 +35,11 @@ P1: [ ] P2: [ - C9: pconnex(,G) + C4: pconnex(,P) + `"\tt (,P)"' at last [].s below + C11: pconnex(,PF) with .w at last [].e+(0.2,0) + `"\tt (,PF)"' at (C11,last "") below + C9: pconnex(,G) with .w at last [].e+(0.2,0) `"\tt (,G)"' at last [].s below C91: pconnex(,GF) with .w at last [].e+(0.2,0) `"\tt (,GF)"' at last [].s below diff --git a/graphics/circuit_macros/doc/Relay.m4 b/graphics/circuit_macros/doc/Relay.m4 index ee52fa4994..20c51ebb6a 100644 --- a/graphics/circuit_macros/doc/Relay.m4 +++ b/graphics/circuit_macros/doc/Relay.m4 @@ -1,84 +1,44 @@ .PS -# Relay.m4 +# Relay cct_init -movw = 0.85 -{contact - {`"\tt contact"' at last [].s+(0,-0.2) - "\sl P" rjust at last [].P.w - "\sl O" ljust at last [].O - "\sl C" ljust at last [].C } - move right_ movw; contact(R,) - {`"\tt contact(,R)"' at last [].s+(0,-0.2) - "\sl P" rjust at last [].P.w - "\sl O" ljust at last [].O - "\sl C" ljust at last [].C } - move right_ movw; contact(P) - {`"\tt contact(P)"' at last [].s+(0,-0.2) - "\sl P" rjust at last [].P.w - "\sl O" ljust at last [].O - "\sl C" ljust at last [].C } - move right_ movw; contact(O,); {`"\tt contact(O,)"' at last [].s+(0,-0.2)} - move right_ movw; contact(C,); {`"\tt contact(C,)"' at last [].s+(0,-0.2)} -#move right_ movw; reed; {`"\tt reed"' at last [].s+(0,-0.2)} -} -move down 0.8 -right_ -{contact(I) - {`"\tt contact(I)"' at last [].s+(0,-0.2) - "\sl P" rjust at last [].P.w - "\sl O" ljust at last [].O.e - "\sl C" ljust at last [].C.e } - move right_ movw; contact(RI) - {`"\tt contact(RI)"' at last [].s+(0,-0.2) - "\sl P" rjust at last [].P.w - "\sl O" ljust at last [].O.e - "\sl C" ljust at last [].C.e } - move right_ movw; contact(PI) - {`"\tt contact(PI)"' at last [].s+(0,-0.2) - "\sl P" rjust at last [].P.w - "\sl O" ljust at last [].O.e - "\sl C" ljust at last [].C.e } - move right_ movw; contact(OI); {`"\tt contact(OI)"' at last [].s+(0,-0.2)} - move right_ movw; contact(CI); {`"\tt contact(CI)"' at last [].s+(0,-0.2)} -#move right_ movw; reed(,,,fill_(0.9),CR); -# {`"\shortstack[l]{\tt reed(\\\tt$\;\;$,{,},fill\_(0.9),CR)}"' \ -# at last [].s+(0,-0.2)} -} -move down 1.2 -right_ -{ -relay +skip = 1.1 + +R1:relay {"\sl V1" wid 0.16 rjust at last [].V1 "\sl V2" ljust at last [].V2 - "\sl P1" rjust at last [].P1.w + "\sl P1" rjust at last [].P1-(dotrad_,0) "\sl O1" ljust at last [].O1 "\sl C1" ljust at last [].C1 } -`"\tt relay"' at last [].s+(0,-0.2) -relay(2) with .sw at last [].sw+(1.2,0) + S: `"\tt relay"' at last [].s+(0,-0.2) + +R5:relay(2,CTh) with .sw at last [].sw+(skip,0) + { for_(1,2,1,` + "\sl P`'m4x" rjust at last [].P`'m4x-(dotrad_,0) + "\sl C`'m4x" ljust at last [].C`'m4x ') } + `"\tt (2,CTh)"' at (last [],S) + +R4:relay(2,O) with .sw at last [].sw+(skip,0) + {for_(1,2,1,` + "\sl P1" rjust at last [].P1-(dotrad_,0) + "\sl O`'m4x" ljust at last [].O`'m4x ')} + `"\tt (2,O)"' at (last [],S) + +R3:relay(2,PIAX) with .sw at last [].sw+(skip,0) {"\sl V1" rjust at last [].V1 - "\sl V2" ljust at last [].V2 - "\sl P1" rjust at last [].P1.w - "\sl O1" ljust at last [].O1 - "\sl C1" ljust below at last [].C1 - "\sl P2" rjust at last [].P2.w - "\sl O2" ljust at last [].O2 - "\sl C2" ljust at last [].C2 } -`"\tt relay(2)"' at last [].s+(0,-0.2) -relay(2,RPI) with .sw at last [].sw+(1.2,0) + "\sl V2" rjust at last [].V2 + for_(1,2,1, + `"\sl P`'m4x" rjust at last [].P`'m4x-(dotrad_,0) + "\sl O`'m4x" ljust at last [].O`'m4x+(dotrad_,0) + "\sl C`'m4x" ljust at last [].C`'m4x+(dotrad_,-2pt__) ') } + `"\tt (2,PIAX)"' at (last [],S) + +R2:relay(2,R) with .sw at last [].sw+(skip,0) {"\sl V1" rjust at last [].V1 "\sl V2" ljust at last [].V2 - "\sl P1" rjust at last [].P1.w - "\sl O1" ljust at last [].O1 - "\sl C1" ljust at last [].C1+(0,2pt__) - "\sl P2" rjust at last [].P2.w - "\sl O2" ljust at last [].O2+(0,-2pt__) - "\sl C2" ljust at last [].C2 } -`"\tt relay(2,RIP)"' at last [].s+(0,-0.2) -relay(2,O) with .sw at last [].sw+(1.2,0) -`"\tt relay(2,O)"' at last [].s+(0,-0.2) -relay(2,CT) with .sw at last [].sw+(1.2,0) -`"\tt relay(2,CT)"' at last [].s+(0,-0.2) -} - + for_(1,2,1, + `"\sl P`'m4x" rjust at last [].P`'m4x-(dotrad_,0) + "\sl O`'m4x" ljust at last [].O`'m4x + "\sl C`'m4x" ljust at last [].C`'m4x ') } + `"\tt relay(2,R)"' at (last [],S) .PE diff --git a/graphics/circuit_macros/doc/Switches.m4 b/graphics/circuit_macros/doc/Switches.m4 index 03218d4ab5..d8262be92d 100644 --- a/graphics/circuit_macros/doc/Switches.m4 +++ b/graphics/circuit_macros/doc/Switches.m4 @@ -1,99 +1,117 @@ .PS # Switches.m4 cct_init + movewid = 0.25 -moveht = moveht*1.25 +# Row 1 right_; { - lswitch; rlabel(,`\hbox{\tt `lswitch'}') + lswitch; {S:"\tt ls{}witch" at last [].s+(0,-10bp__)} move right_ - lswitch(,,O); rlabel(,`\hbox{\tt (,{,}O)}') + lswitch(,,O); {"\tt (,,O)" at (last [],S)} move right_ - lswitch(,,C); rlabel(,`\hbox{\tt (,{,}C)}') + lswitch(,,C); {"\tt (,,C)" at (last [],S)} move right_ - lswitch(,,DA); rlabel(,`\hbox{\tt (,{,}DA)}') + lswitch(,,DA); {"\tt (,,DA)" at (last [],S)} move right_ - lswitch(,,DO); rlabel(,`\hbox{\tt (,{,}DO)}') + lswitch(,,dDO); {"\tt (,,dDO)" at (last [],S)} move right_ - lswitch(,,DC); rlabel(,`\hbox{\tt (,{,}DC)}') + lswitch(,,uDC); {"\tt (,,uDC)" at (last [],S)} } +# Row 2 move down; right_; { - lswitch(,,K); rlabel(,`\hbox{\tt (,{,}K)}') + lswitch(,,K); {S:"\tt (,,K)" at last [].s+(0,-10bp__)} move right_ - lswitch(,,KD); rlabel(,`\hbox{\tt (,{,}KD)}') + lswitch(,,KD); {"\tt (,,KD)" at (last [],S)} move right_ - lswitch(,,KOD); rlabel(,`\hbox{\tt (,{,}KOD)}') + lswitch(,,KOD); {"\tt (,,KOD)" at (last [],S)} move right_ - lswitch(,,KCD); rlabel(,`\hbox{\tt (,{,}KCD)}') + lswitch(,,KCD); {"\tt (,,KCD)" at (last [],S)} move right_ - bswitch; rlabel(,`\hbox{\tt `bswitch'}') + bswitch; {"\tt `bswitch'" at (last [],S)} move right_ - bswitch(,,C); rlabel(,`\hbox{\tt (,{,}C)}') + bswitch(,,C); {"\tt (,,C)" at (last [],S)} } +# Row 3 move down; right_; { - S: dswitch(,,) - ifgpic(`{[line invis] at S.c+(0,-0.2)}') - rlabel(,`\hbox{\tt \shortstack{`dswitch'=\\`switch'(,{,},D)}}') - thinlines_ - { spline <- from 0.25 along_(S) up 0.1 then up 0.05 left 0.1 - "\tt W" rjust - spline <- from S.c+(0,m4sc*2) up 0.1 then up 0.05 left 0.1 - "\tt B" rjust } - thicklines_ - move right_ - S: dswitch(,,WdBK); rlabel(,`\hbox{\tt (,{,}WdBK)}') - thinlines_ - { spline <- from tr_xy(0,-2) up 0.1 then up 0.10 left 0.1 - "\tt dB" rjust - spline <- from tr_xy(4,-2) right 0.1 then right 0.05 up 0.15 - "\tt K" above } - thicklines_ - move right_ - dswitch(,,WBuD); rlabel(,`\hbox{\tt (,{,}WBuD)}') - move right_ - dswitch(,,WdBKF); rlabel(,`\hbox{\tt (,{,}WdBKF)}') - move right_ - dswitch(,,WBL); rlabel(,`\hbox{\tt (,{,}WBL)}') - move right_ - dswitch(,,WdBKL); rlabel(,`\hbox{\tt (,{,}WdBKL)}') + D: dswitch(,,); {S: "\tt ds{}witch(,{},)" at last [].s+(0,-10bp__)} + thinlines_ + { spline <- from 0.25 along_(D) up 0.1 then up 0.05 left 0.1 + {"\tt W" rjust} + spline <- from D.c+(0,m4sc*2) up 0.1 then up 0.05 left 0.1 + {"\tt B" rjust }} + thicklines_ + move right_ + D: dswitch(,,WdBK); {"\tt (,,WdBK)" at (last [],S)+(0,-4bp__)} + thinlines_ + { spline <- from tr_xy(0,-2) up 0.1 then up 0.10 left 0.1 + {"\tt dB" rjust} + spline <- from tr_xy(4,-2) right 0.1 then right 0.05 up 0.15 + {"\tt K" above }} + thicklines_ + move right_ + dswitch(,,WBmdDK); {"\tt (,,WBmdDK)" at (last [],S)} + move right_ + dswitch(,,WBKTr); {"\tt (,,WBKTr)" at (last [],S)} + move right_ + dswitch(,,WdBL); {"\tt (,,WdBL)" at (last [],S+(0,-4bp__))} + move right_ + dswitch(,,WBCo); {"\tt (,,WBCo)" at (last [],S)} } +# Row 4 move down; right_; { - dswitch(,,WBT); rlabel(,`\hbox{\tt (,{,}WBT)}') + dswitch(,,WBKCo); {S: "\tt (,,WBKCo)" at last [].s+(0,-10bp__)} move right_ - dswitch(,,WdBKC); rlabel(,`\hbox{\tt (,{,}WdBKC)}') + dswitch(,,WBCb); {"\tt (,,WBCb)" at (last [],S)} move right_ - dswitch(,,WBM); rlabel(,`\hbox{\tt (,{,}WBM)}') + dswitch(,,WBDI); {"\tt (,,WBDI)" at (last [],S)} move right_ - dswitch(,,WBCO); rlabel(,`\hbox{\tt (,{,}WBCO)}') + dswitch(,,WBSd); {"\tt (,,WBSd)" at (last [],S)} move right_ - dswitch(,,WBMP); rlabel(,`\hbox{\tt (,{,}WBMP)}') + dswitch(,,WBFDI); {"\tt (,,WBFDI)" at (last [],S)} move right_ - dswitch(,,WBoKCP); rlabel(,`\hbox{\tt (,{,}WBoKCP)}') + dswitch(,,WBFSd); {"\tt (,,WBFSd)" at (last [],S)} } - move down; right_; { - dswitch(,,WBCY); rlabel(,`\hbox{\tt (,{,}WBCY)}') +# Row 5 + move down moveht*5/4; right_; { + dswitch(,,WBTh); {S: "\tt (,,WBTh)" at last [].s+(0,-10bp__)} + move right_ + dswitch(,,WBKC); {"\tt (,,WBKC)" at (last [],S)} + move right_ + dswitch(,,WBM); {"\tt (,,WBM)" at (last [],S)} + move right_ + dswitch(,,WBCO); {"\tt (,,WBCO)" at (last [],S)} + move right_ + dswitch(,,WBMP); {"\tt (,,WBMP)" at (last [],S)} + move right_ + dswitch(,,WBoKCP); {"\tt (,,WBoKCP)" at (last [],S)} + } +# Row 6 + move down moveht*5/4; right_; { + dswitch(,,WBCY); {S: "\tt (,,WBCY)" at last [].s+(0,-10bp__)} move right_ - dswitch(,,WBCZ); rlabel(,`\hbox{\tt (,{,}WBCZ)}') + dswitch(,,WBCZ); {"\tt (,,WBCZ)" at (last [],S)} move right_ - dswitch(,,WBCE); rlabel(,`\hbox{\tt (,{,}WBCE)}') + dswitch(,,WBCE); {"\tt (,,WBCE)" at (last [],S)} move right_ - dswitch(,,WBRH); rlabel(,`\hbox{\tt (,{,}WBRH)}') + dswitch(,,WBRH); {"\tt (,,WBRH)" at (last [],S)} move right_ - dswitch(,,WBRdH); rlabel(,`\hbox{\tt (,{,}WBRdH)}') + dswitch(,,WBRdH); {"\tt (,,WBRdH)" at (last [],S)} move right_ - dswitch(,,WBRHH); rlabel(,`\hbox{\tt (,{,}WBRHH)}') + dswitch(,,WBRHH); {"\tt (,,WBRHH)" at (last [],S)} } +# Row 7 move down; right_; { - dswitch(,,WBMMR); rlabel(,`\hbox{\tt (,{,}WBMMR)}') + dswitch(,,WBMMR); {S: "\tt (,,WBMMR)" at last [].s+(0,-10bp__)} move right_ - dswitch(,,WBMM); rlabel(,`\hbox{\tt (,{,}WBMM)}') + dswitch(,,WBMM); {"\tt (,,WBMM)" at (last [],S)} move right_ - dswitch(,,WBMR); rlabel(,`\hbox{\tt (,{,}WBMR)}') + dswitch(,,WBMR); {"\tt (,,WBMR)" at (last [],S)} move right_ - dswitch(,,WBEL); rlabel(,`\hbox{\tt (,{,}WBEL)}') + dswitch(,,WBEL); {"\tt (,,WBEL)" at (last [],S)} move right_ - dswitch(,,WBLE); rlabel(,`\hbox{\tt (,{,}WBLE)}') + dswitch(,,WBLE); {"\tt (,,WBLE)" at (last [],S)} move right_ - dswitch(,,WdBoKEL); rlabel(,`\hbox{\tt (,{,}WdBoKEL)}') + dswitch(,,WBoKEL); {"\tt (,,WBoKEL)" at (last [],S)} } .PE diff --git a/graphics/circuit_macros/doc/Thermal.m4 b/graphics/circuit_macros/doc/Thermal.m4 index 6feffc3680..68cdd7a0c0 100644 --- a/graphics/circuit_macros/doc/Thermal.m4 +++ b/graphics/circuit_macros/doc/Thermal.m4 @@ -2,7 +2,7 @@ # Thermal.m4 cct_init define(`thermalsw', - `dswitch(`$1',`$2',WDdBT) + `dswitch(`$1',`$2',WDdBTh) circle rad distance(M4T,last line.c) at last line.c') thermalsw .PE diff --git a/graphics/circuit_macros/doc/Version.tex b/graphics/circuit_macros/doc/Version.tex index f10e710006..4bb8dbffa5 100644 --- a/graphics/circuit_macros/doc/Version.tex +++ b/graphics/circuit_macros/doc/Version.tex @@ -1 +1 @@ -Version 9.1 +Version 9.2 diff --git a/graphics/circuit_macros/doc/body.tex b/graphics/circuit_macros/doc/body.tex index 91c8fbe3ec..38aff51f3b 100644 --- a/graphics/circuit_macros/doc/body.tex +++ b/graphics/circuit_macros/doc/body.tex @@ -82,9 +82,8 @@ combinations of them for particular drawings. \xection{Using the macros\label{Using:}} This section describes the basic process of adding circuit diagrams to \latex documents to produce postscript or pdf files. On some operating -systems, project management software with graphical interfaces can be used -to automate the process, -but the steps can also be performed by a script, +systems, project management software with graphical interfaces can +automate the process, but the steps can also be performed by a script, makefile, or by hand for simple documents as described in~\SR{Quickstart:}. The diagram source file is preprocessed as illustrated in @@ -836,9 +835,10 @@ The two-terminal elements are shown in \FRS{CctTable} to~\REF{Diodes} and \FRS{Fuses} to~\REF{Switches}. Several elements are included more than once to illustrate some of their arguments, which are listed in \SR{defines}. +\enlargethispage{\baselineskip} \begin{figure}[h!] \input CctTable - \ifpdf\vspace*{-0.5\baselineskip}\fi% + \ifpdf\vspace*{-\baselineskip}\fi% \caption{Basic two-terminal elements, showing some variations.} \label{CctTable} \end{figure} @@ -1446,18 +1446,6 @@ A {\tt D1} puts phase dots at the {\sl P1, S1} end, {\tt D2} at the and centre-tap points.} \label{Xform} \end{figure} -\iffalse -A transformer with four connections is illustrated -in \FR{tran}. -\begin{figure}[hbt] - \parbox{4in}{\small \verbatiminput{tranbody.m4}}% - \quad\raise-0.2in\hbox{\input tran }% - \vspace{-\baselineskip} - \caption{Showing the - {\tt transformer(\linespec,L|R,np,A,ns)} macro.} - \label{tran} - \end{figure} -\fi %\enlargethispage{\baselineskip} \FR{Audio} shows some audio devices, defined in {\tt []} blocks, @@ -1479,7 +1467,6 @@ Thus, {\tt S: speaker(U) with .In2 at Here} \noindent -%\enlargethispage{\baselineskip} places an upward-facing speaker with input {\sl In2} at the current location. @@ -1536,63 +1523,79 @@ define(`nullor',`nport(`$1' The above example and the related gyrator macro are illustrated in \FR{NLG}. + \ifpdf\vspace*{\baselineskip}\fi% \begin{figure}[h!t] \input NLG - \ifpdf\vspace*{-1.5\baselineskip}\fi% \caption{The {\tt nullor} example and the {\tt gyrator} macro are customizations of the {\tt nport} macro.} \label{NLG} \end{figure} -A basic winding macro for magnetic-circuit sketches and similar figures -is shown in \FR{Windings}. +The double-throw switches shown in \FR{NPDT} are drawn in the +current drawing direction like the two-terminal elements, but are +composite elements that must be placed accordingly. \begin{figure}[h!t] - \vspace*{-\baselineskip}% -% \ifpdf\vspace*{-2\baselineskip}\else \vspace{-\baselineskip}\fi - \input Windings - \ifpdf\vspace*{-\baselineskip}\else\vspace*{-1ex}\fi - \caption{The {\tt winding(L|R, diam, pitch, turns, core wid, core color)} - macro draws a coil with axis along the current drawing direction. - Terminals {\tt T1} and {\tt T2} are defined. - Setting the first argument to {\tt R} draws a right-hand winding.} - \label{Windings} + \ifpdf\vspace*{-0.5\baselineskip}\fi% + \input NPDT + \ifpdf\vspace*{-0.5\baselineskip}\fi% + \caption{Multipole double-throw switches drawn by + {\tt NPDT({\sl npoles}, [R])}.} + \label{NPDT} \end{figure} -For simplicity, the complete spline -is first drawn and then blanked in appropriate places using the background -(core) color (\verb!lightgray! for example, default \verb!white!). -\FR{Relay} shows the macro {\tt contact({\sl chars})}, +\FR{Contact} shows the macro {\tt contact({\sl chars})}, which contains predefined locations {\sl P, C, O} for the armature and normally closed and normally open terminals. An {\tt I} in the first argument draws open circles for contacts. -The macro {\tt relay({\sl poles, chars})} -defines coil terminals {\sl V1, V2} and contact -terminals {\sl P$_i$, C$_i$, O$_i$.} -\begin{figure}[ht] +\begin{figure}[h!t] \ifpdf\vspace*{-\baselineskip}\else\vspace*{-0.5\baselineskip}\fi% - \input Relay + \input Contact \vspace{-1ex} \caption{The {\tt contact({\sl chars})} - and {\tt relay({\sl poles, chars})} - macros (default direction right).} - \label{Relay} + macro (default drawing direction right) + can be used alone, in a set of ganged contacts, or in relays.} + \label{Contact} \end{figure} -The double-throw switches shown in \FR{NPDT} are drawn in the -current drawing direction like the two-terminal elements, but are -composite elements that must be placed accordingly. +The {\tt contacts({\sl poles, chars})} macro in \FR{Contacts} +draws multiple contacts. \begin{figure}[h!t] - \ifpdf\vspace*{-0.5\baselineskip}\fi% - \input NPDT - \ifpdf\vspace*{-0.5\baselineskip}\fi% - \caption{Multipole double-throw switches drawn by - {\tt NPDT({\sl npoles}, [R])}.} - \label{NPDT} + \ifpdf\vspace*{-\baselineskip}\else\vspace*{-0.5\baselineskip}\fi% + \input Contacts + \vspace{-1ex} + \caption{The {\tt contacts({\sl poles, chars})} + macro (drawing direction right).} + \label{Contacts} + \end{figure} + +For drawing relays, the macro + {\tt relaycoil({\sl chars, wid, ht,} {\tt U|D|L|R|}{\sl degrees})} +shown in \FR{relaycoil} provides a choice of connection points and +actuator types. +\begin{figure}[h!t] + \ifpdf\vspace*{-\baselineskip}\else\vspace*{-0.5\baselineskip}\fi% + \input relaycoil + \vspace{-1ex} + \caption{The {\tt relaycoil} macro.} + \label{relaycoil} + \end{figure} + +The {\tt relay({\sl poles, chars})} macro in \FR{Relay} +defines coil terminals {\sl V1, V2} and contact +terminals {\sl P$_i$, C$_i$, O$_i$.} +\begin{figure}[h!t] + \ifpdf\vspace*{-\baselineskip}\else\vspace*{-0.5\baselineskip}\fi% + \input Relay + \vspace{-1ex} + \caption{The {\tt relay({\sl poles, chars})} + macro (drawing direction right).} + \label{Relay} \end{figure} The {\tt jack} and {\tt plug} macros and their defined points are illustrated in \FR{Jack}. + The first argument of both macros establishes the drawing direction. \begin{figure}[h!t] \input Jack \vspace{-1ex} @@ -1601,21 +1604,11 @@ The {\tt jack} and {\tt plug} macros and their defined points are and their defined points.} \label{Jack} \end{figure} - The first argument of both macros - establishes the drawing direction. The second argument is a string of - characters defining drawn components. + The second argument is a string of characters defining drawn components. An {\tt R} in the string specifies a right orientation with respect to the drawing direction. The two principal terminals of the jack are included by putting \hbox{{\tt L} {\tt S}} -% -% This is a kludge to put a blank line on the bottom -\phantom{or both into the string with associated make ({\tt M}) -or break ({\tt B}) points. Thus, {\tt LMB} within the third}\hfill\break -\phantom{or both into the string with associated make ({\tt M}) -or break ({\tt B}) points. Thus, {\tt LMB} within the third}\hfill\break -% -% or both into the string with associated make ({\tt M}) or break ({\tt B}) points. Thus, {\tt LMB} within the third argument draws the {\tt L} contact with @@ -1623,10 +1616,26 @@ or break ({\tt B}) points. Thus, {\tt LMB} within the third}\hfill\break or {\tt S[M|B]} substrings add auxiliary contacts with specified make or break points. -%\pagebreak +A basic winding macro for magnetic-circuit sketches and similar figures +is shown in \FR{Windings}. +For simplicity, the complete spline +is first drawn and then blanked in appropriate places using the background +(core) color (\verb!lightgray! for example, default \verb!white!). +\begin{figure}[h!t] + \vspace*{-\baselineskip}% +% \ifpdf\vspace*{-2\baselineskip}\else \vspace{-\baselineskip}\fi + \input Windings + \ifpdf\vspace*{-\baselineskip}\else\vspace*{-1ex}\fi + \caption{The {\tt winding(L|R, diam, pitch, turns, core wid, core color)} + macro draws a coil with axis along the current drawing direction. + Terminals {\tt T1} and {\tt T2} are defined. + Setting the first argument to {\tt R} draws a right-hand winding.} + \label{Windings} + \end{figure} + A macro for drawing headers is in \FR{Headers}, and some experimental connectors are shown in \FR{Conn} and \FR{Pconn}. -The {\tt tstrip} macro allows {\sl key}{\tt =}{\sl value}{\tt ;} arguments +The {\tt tstrip} macro allows ``{\sl key}{\tt =}{\sl value}{\tt ;}'' arguments \begin{figure}[h!t] \ifpdf\vspace*{-0.5\baselineskip}\fi% \input Headers @@ -1655,21 +1664,23 @@ for width and height. \label{Pconn} \end{figure} +\pagebreak \subsection{Semiconductors\label{Semiconductors:}}% \FR{Bip} shows the variants of bipolar transistor macro {\tt bi\_tr(\linespec,L|R,P,E)} which contains predefined internal locations {\sl E}, {\sl B}, {\sl C}. -The first argument defines the distance and direction -from {\sl E} to {\sl C,} with location determined by the enclosing -block as for other elements, and the base placed -\begin{figure}[h!b] +The first argument defines the distance and direction from {\sl E} +\begin{figure}[h!t] \ifpdf\vspace*{-0.5\baselineskip}\fi% \input Bip \ifpdf\vspace*{-0.5\baselineskip}\fi% - \caption{Bipolar transistor variants (current direction upward).} + \caption{Variants of bipolar transistor {\tt bi\_tr(\linespec,L|R,P,E)} + (current direction upward).} \label{Bip} \end{figure} +to {\sl C,} with location determined by the enclosing +block as for other elements, and the base placed to the left or right of the current drawing direction according to the second argument. Setting the third argument to {\tt P} creates a PNP device instead of NPN, and setting the @@ -1708,6 +1719,7 @@ specified as shown in \FR{bitrans}. \label{bitrans} \end{figure} +\pagebreak A UJT macro with predefined internal locations {\sl B1,} {\sl B2,} and {\sl E} is shown in \FR{ujt}, and a thyristor macro with predefined internal locations @@ -1748,6 +1760,19 @@ draws the element from position {\sl A} to position {\sl B} with label Some FETs with predefined internal locations {\sl S,} {\sl D,} and {\sl G} are also included, with similar arguments to those of {\tt bi\_tr,} as shown in \FR{fet}. +\begin{figure}[h!t] + \ifpdf\vspace*{-\baselineskip}\fi% + \input fet + \ifpdf\vspace*{-\baselineskip}\fi% + \caption{JFET, insulated-gate enhancement and depletion MOSFETs, + and simplified versions. + These macros are wrappers that invoke the {\tt mosfet} + macro as shown in the middle and bottom rows. + The two lower-right examples show custom devices, the first + defined by omitting the substrate connection, and the second + defined using a wrapper macro.} + \label{fet} + \end{figure} In all cases the first argument is a linespec, and entering {\tt R} as the second argument orients the {\sl G} terminal to the right of the @@ -1765,21 +1790,8 @@ The obsolete letter {\tt L} is equivalent to {\tt dM} and has been kept temporarily for compatibility. This system allows considerable freedom in choosing or customizing components, as illustrated in \FR{fet}. -\begin{figure}[h!t] - \ifpdf\vspace*{-\baselineskip}\fi% - \input fet - \ifpdf\vspace*{-\baselineskip}\fi% - \caption{JFET, insulated-gate enhancement and depletion MOSFETs, - and simplified versions. - These macros are wrappers that invoke the {\tt mosfet} - macro as shown in the middle and bottom rows. - The two lower-right examples show custom devices, the first - defined by omitting the substrate connection, and the second - defined using a wrapper macro.} - \label{fet} - \end{figure} -\pagebreak +%\pagebreak The number of possible semiconductor symbols is very large, so these macros must be regarded as prototypes. Often an element is a minor modification of existing elements. For example, @@ -1904,7 +1916,7 @@ By default, $N=2$ except for macros {\tt NOT\_gate} and {\tt BUFFER\_gate}, which have one input {\tt In1} unless they are given a first argument, which is treated as the line specification of a two-terminal element. -\begin{figure}[h!t] +\begin{figure}[h!] \input Logic \caption{Basic logic gates. The input and output locations of a three-input NOR gate are shown. Inputs are negated by @@ -1932,7 +1944,6 @@ regardless of gate orientation, as in \FR{FF}. \end{figure} Beyond a default number (6) of inputs, the gates are given wings as in \FR{exVIII}. -\pagebreak Negated inputs or outputs are marked by circles drawn using the \verb|NOT_circle| macro. The name marks the point at the outer edge of the circle and the circle itself has the same name prefixed by~{\tt N\_}. @@ -1986,7 +1997,7 @@ but requires internal locations of the block to be referenced using \label{Buffer} \end{figure} -\pagebreak +%\pagebreak A good strategy for drawing complex logic circuits might be summarized as follows: \begin{itemize}\itemsep=0pt @@ -2027,16 +2038,19 @@ the very similar demultiplexer. \end{figure} \FR{FlipFlops} shows -the macro {\tt FlipFlop(D|T|RS|JK, {\sl label, boxspec})}, which is a +the macro {\tt FlipFlop(D|T|RS|JK, {\sl label, boxspec, pinlength})}, +which is a wrapper for the more general macro {\tt FlipFlopX(}{\sl boxspec, label, -leftpins, toppins, rightpins, bottompins}{\tt )}. +leftpins, toppins, rightpins, bottompins, pinlength}{\tt )}. \begin{figure}[h!t] \input FlipFlop \caption{The {\tt FlipFlop} and {\tt FlipFlopX} macros, with variations.} \label{FlipFlops} \end{figure} +The first argument modifies the box (labelled Chip) default specification. Each of arguments 3 to 6 is null or a string of {\sl pinspecs} separated -by semicolons ({\tt;}). {\sl Pinspecs} are either empty (null) or of the form +by semicolons ({\tt;}). +A {\sl pinspec} is either empty (null) or of the form {\tt[}{\sl pinopts}{\tt]:[}{\sl label}{\tt[:}{\sl Picname}{\tt]]}. The first colon draws the pin. Pins are placed top to bottom or left to right along the box edges with @@ -2045,10 +2059,12 @@ by default; eg {\tt W1, W2, ..., N1, N2, ..., E1, ..., S1, ...} ; however, if {\tt:}{\sl Picname} is present in a {\sl pinspec} then {\sl Picname} replaces the default name. A {\sl pinspec} label is text placed at the pin base. Semicolons are -not allowed in labels; use eg \verb|\char59{}| instead, and to put a bar over +not allowed in labels; use e.g., \verb|\char59{}| instead. To put a bar over a label, use {\tt lg\_bartxt(}{\sl label}{\tt)}. The {\sl pinopts} are {\tt [L|M|I|O][N][E]} as for the \verb|lg_pin| macro. +Option argument 7 is the pin length in drawing units. +\pagebreak Customized gates can be defined simply. For example, the following code defines the custom flipflops in \FR{ShiftR}. \begin{figure}[h!t] @@ -2070,7 +2086,7 @@ illustrated in \FR{Dac}. The figure shows the default and predefined internal locations, the number of which can be specified as macro arguments. \begin{figure}[h!t] - \ifpdf\vspace*{-\baselineskip}\fi% +% \ifpdf\vspace*{-\baselineskip}\fi% \input Dac \ifpdf\vspace*{-\baselineskip}\fi% \caption{The {\tt dac({\sl width,height},nIn,nN,nOut,nS)} @@ -2081,7 +2097,6 @@ of which can be specified as macro arguments. In addition to the logic gates described here, some experimental IC chip diagrams are included with the distributed example files. -\pagebreak \xection{Element and diagram scaling\label{Scaling:}} There are several issues related to scale changes. You may wish to use @@ -2220,6 +2235,7 @@ to defer macro expansion. Macro arguments are referenced inside a macro by number; thus {\tt \$1} refers to the first argument. A few examples will be given. +\pagebreak %\enlargethispage{\baselineskip} %\noindent\hbox{}\\ {\bf Example 1:} %\par\noindent {\bf Example 1:} @@ -2227,9 +2243,9 @@ A few examples will be given. Custom two-terminal elements can often be defined by writing a wrapper for an existing element. For example, an enclosed thermal switch can be defined as shown in \FR{Thermal}. -\begin{figure}[h!] +\begin{figure}[h!t] \parbox{4.2in}{\tt define(`thermalsw',\hfill\break - \hbox{}\space`dswitch(`\$1',`\$2',WDdBT)\hfill\break + \hbox{}\space`dswitch(`\$1',`\$2',WDdBTh)\hfill\break \hbox{}\space\space circle rad distance(M4T,last line.c) at last line.c ') }% \hfill\raise-0.15in\hbox{\input Thermal } @@ -2252,6 +2268,7 @@ a subcircuit that is replicated several times to generate \FR{Tline}. \label{Tline} \end{figure} +\pagebreak \Example{3} %\par\noindent {\bf Example 3:} Composite elements containing several basic elements may be diff --git a/graphics/circuit_macros/doc/defines.tex b/graphics/circuit_macros/doc/defines.tex index 6b8f615fe2..8e21bba0ec 100644 --- a/graphics/circuit_macros/doc/defines.tex +++ b/graphics/circuit_macros/doc/defines.tex @@ -287,9 +287,9 @@ C,P: {\tt dimen\_}$/4$, E,K: {\tt dimen\_}$/5$) arg5 = wid (defaults F: {\sl height}*0.3, C,P: {\sl height}*0.4, E,K: {\sl height}) \seesect{Twoterminal:}} -\macrodef{cbreaker}{cbreaker}{(\linespec,L|R,D|T|TS)} +\macrodef{cbreaker}{cbreaker}{(\linespec,L|R,D|Th|TS)} {cct} - {circuit breaker to left or right, {\tt D}=with dots; {\tt T}=thermal; + {circuit breaker to left or right, {\tt D}=with dots; {\tt Th}=thermal; {\tt TS}=squared thermal\seesect{Twoterminal:}} \macrodef{ccoax}{ccoax}{(at {\sl location}, M|F, {\sl diameter})} {cct} @@ -318,9 +318,26 @@ {\tt R}=reversed polarity\seesect{Twoterminal:}} \macrodef{contact}{contact}{({\sl chars})} {cct} - {single-pole contact: {\tt P}= three position, {\tt O}= normally open, - {\tt C}= normally closed, {\tt I}= circle contacts, {\tt R}= right - orientation + {single-pole contact: + {\tt O}= normally open, + {\tt C}= normally closed (default), + {\tt I}= open circle contacts, + {\tt P}= three position, + {\tt R}= right orientation, + {\tt T}= T contacts, + {\tt U}= U contacts + \seesect{Composite:}} +\macrodef{contacts}{contacts}{({\sl count, chars})} + {cct} + {multiple ganged single-pole contacts: + {\tt P}= three position, + {\tt O}= normally open, + {\tt C}= normally closed, + {\tt D}= dashed ganging line over contact armatures + {\tt I}= open circle contacts, + {\tt R}= right orientation, + {\tt T}= T contacts, + {\tt U}= U contact lines parallel to drawing direction \seesect{Composite:}} \macrodef{contline}{contline}{({\sl line})} {gen} @@ -526,7 +543,7 @@ B|CR|D|G|L|LE[R]|P[R]|S|Sh|T|V|v|w|Z|chars,% label},{\sl label},{\sl chars})} {cct} {general triple label; {\sl chars:} - X displacement is from the centre of the last + $x$ (drawing direction) displacement is from the centre of the last line rather than the centre of the last {\tt [ ]}; L,R,A,B align labels ljust, rjust, above, or below (absolute) respectively \seesect{Labels:}} @@ -591,29 +608,30 @@ B|CR|D|G|L|LE[R]|P[R]|S|Sh|T|V|v|w|Z|chars,% {cct} {SPST switch left or right, W=baseline, B=contact blade, dB=contact blade to the right of drawing direction, - K=vertical closing contact line, + Bm = mirror contact blade, + Bo = contact blade more widely open, + Cb = circuit-breaker function, + Co = contactor function, C = external operating mechanism, D = circle at contact and hinge, (dD = hinge only, uD = contact only) E = emergency button, - EL = early close - (or late open), + EL = early close (or late open), LE = late close (or early open), F = fused, H = time delay closing, uH = time delay opening, - HH = time delay - opening and closing, - K = vertical closing contact, + HH = time delay opening and closing, + K=vertical closing contact line, L = limit, M = maintained (latched), MM = momentary contact on make, MR = momentary contact on release, - MMR = momentary contact - on make and release, + MMR = momentary contact on make and release, O = hand operation button, P = pushbutton, - T = thermal control linkage, + Th = thermal control linkage, + Tr = tripping, Y = pull switch, Z = turn switch \seesect{Twoterminal:}} @@ -696,7 +714,8 @@ B|CR|D|G|L|LE[R]|P[R]|S|Sh|T|V|v|w|Z|chars,% \macrodef{fitcurve}{fitcurve}{(V,n,[e.g. dotted],m (default 0))} {gen} {Draw a spline through positions V[m], $ldots$ V[n]: Works only with dpic.} -\macrodef{FlipFlop}{FlipFlop}{(D|T|RS|JK,{\sl label},{\sl boxspec})} +\macrodef{FlipFlop}{FlipFlop}{(D|T|RS|JK,{\sl label},{\sl boxspec},% + {\sl pinlength})} {log} {flip-flops, {\sl boxspec}=e.g.\ ht x wid y \seesect{Logicgates:}} @@ -715,10 +734,12 @@ B|CR|D|G|L|LE[R]|P[R]|S|Sh|T|V|v|w|Z|chars,% in future}. Similar to {\tt FlipFlop6}.} \macrodef{FlipFlopX}{FlipFlopX}{({\sl boxspec, label, leftpins, toppins, - rightpins, bottompins})} + rightpins, bottompins, pinlength})} {log} - {General flipflop. Each of args 3 to 6 is null or a string of {\sl pinspecs} - separated by semicolons ({\tt;}). {\sl Pinspecs} are either empty + {General flipflop. + Arg 1 modifies the box (labelled Chip) default specification. + Each of args 3 to 6 is null or a string of {\sl pinspecs} + separated by semicolons ({\tt;}). A {\sl Pinspec} is either empty or of the form {\tt[}{\sl pinopts}{\tt]:[}{\sl label}{\tt[:}{\sl Picname}{\tt]]}. The first colon draws the pin. @@ -729,12 +750,13 @@ B|CR|D|G|L|LE[R]|P[R]|S|Sh|T|V|v|w|Z|chars,% replaces the default name. A {\sl pinspec} label is text placed at the pin base. Semicolons are not allowed in labels; use, e.g., {\tt \char92{}char59\char123\char125} - instead, - and to put a bar over a label, use {\tt lg\_bartxt(}{\sl label}{\tt)}. + instead. + To put a bar over a label, use {\tt lg\_bartxt(}{\sl label}{\tt)}. The {\sl pinopts} are {\tt[N|L|M][E]}; {\tt N}=pin with not circle; {\tt L}=active low out; {\tt M}=active low in; - {\tt E}=edge trigger \seesect{Logicgates:}} + {\tt E}=edge trigger \seesect{Logicgates:}. Optional arg 7 is the length + of pins} \macrodef{for\_}{for_}{({\sl start},{\sl end},{\sl increment},`{\sl actions}')} {gen} {integer for loop with index variable {\tt m4x} \seesect{Looping:}} @@ -1259,6 +1281,9 @@ nw,nn,ne,ns,pin lgth,style, other commands})} \macrodef{pc\_\_}{pc__}{} {gen} {absolute points} +\macrodef{pvcell}{pvcell}{({\sl linespec, width, height})} + {cct} + {PV cell} \macrodef{px\_\_}{px__}{} {gen} {absolute SVG screen pixels} @@ -1338,15 +1363,37 @@ nw,nn,ne,ns,pin lgth,style, other commands})} {\tt R}=right orientation; {\tt C}=closed contact; e.g., {\tt reed(,,dimen\_/5,shaded "lightgreen"} \seesect{Composite:}} +\macrodef{relay}{relay}{({\sl number of poles, chars})} {cct} {relay: n poles (default 1), {\sl chars:} {\tt O}=normally open, {\tt C}=normally closed, {\tt P}=three position, default double throw, {\tt L}=drawn left (default), - {\tt R}=drawn right, {\tt T}=thermal. + {\tt R}=drawn right, {\tt Th}=thermal. Argument 3={\tt [L|R]} is deprecated but works for backward compatibility \seesect{Composite:}} -\macrodef{resetdir\_)}{resetdir_)}{} +\macrodef{relaycoil}{relaycoil}{({\sl chars, wid, ht,} R|L|U|D|{\sl degrees})} + {cct} + {chars: + {\tt X}=or default: external lines from A2 and B2; + {\tt AX}=external lines at positions A1,A3; + {\tt BX}=external lines at positions B1,B3; + {\tt NX}=no lines at positions A1,A2,A3,B1,B2,B3; + {\tt SO}=slow operating; + {\tt SOR}=slow operating and release; + {\tt SR}=slow release; + {\tt HS}=hight speed; + {\tt HS}=hight speed; + {\tt NAC}=unaffected by AC current; + {\tt AC AC}=current; + {\tt ML}=mechanically latched; + {\tt PO}=polarized; + {\tt RM}=remanent; + {\tt RH}=remanent; + {\tt TH}=thermal; + {\tt EL}=electronic + \seesect{Composite:}} +\macrodef{resetdir\_}{resetdir_)}{} {gen} {resets direction set by {\tt setdir\_}} \macrodef{resetrgb}{resetrgb}{} diff --git a/graphics/circuit_macros/doc/md.tex b/graphics/circuit_macros/doc/md.tex deleted file mode 100644 index 7d195339e1..0000000000 --- a/graphics/circuit_macros/doc/md.tex +++ /dev/null @@ -1,59 +0,0 @@ -% -\newdimen{\leftwid}\setlength{\leftwid}{2in} -\newdimen{\libwid}\setlength{\libwid}{0.5in} -\newdimen\rightwid -\setlength{\rightwid}{\textwidth} -\addtolength{\rightwid}{-\leftwid} -\addtolength{\rightwid}{-\libwid} -% -\newbox\Defbox -%\iffalse% original macrodef: -%\newcommand{\macrodef}[3]{\setbox\Defbox=\hbox{\tt #1}% -% \ifdim\wd\Defbox>\textwidth% -% \setbox\Defbox=\hbox{\parbox{\textwidth}{\tt #1}}\fi -% \ifdim\wd\Defbox>\leftwid% -% \box\Defbox\hfill\break\hspace*{\leftwid}% -% \else\hbox to \leftwid{\box\Defbox\hfill}\fi% -% \hbox to \libwid{#2\hfill}\parbox[t]{\rightwid}% -% {\raggedright #3}\vspace{\parsep}\\} -%\fi - -\newcommand{\macx}[2]{% - \phantomsection\pdfbookmark[subsection]{#1}{#2}#1} - -\newcommand{\macrodef}[5]{\begin{samepage}% -\phantomsection\pdfbookmark[subsection]{#1}{#2}% -\setbox\Defbox=\hbox{\tt #1#3}% - \ifdim\wd\Defbox>\textwidth% - \setbox\Defbox=\hbox{\parbox{\textwidth}{\tt #1#3}}\fi - \ifdim\wd\Defbox>\leftwid% - \box\Defbox\hfill\break\hspace*{\leftwid}% - \else\hbox to \leftwid{\box\Defbox\hfill}\fi% - \hbox to \libwid{#4\hfill}\parbox[t]{\rightwid}% - {\raggedright #5}\end{samepage}\vspace{\parsep}\\} - -\newcommand{\seesect}[1]{ (see \SR{#1})} - - -\vspace{\abovedisplayskip} -\noindent -\macrodef{Along\_}{Along_}{({\sl LinearObj,distance,}[R])} - {gen} - {Distance arg2 (default all the way) along a linear object - from {\tt .start} to {\tt .end} - (from {\tt .end} to {\tt .start} if arg3={\tt R}) } -\macrodef{AND\_gate}{AND_gate}{({\sl n},N)} - {log} - {basic `and' gate, 2 or {\sl n\/} inputs; {\tt N}=negated input. - Otherwise, arg1 can be a sequence of letters {\tt P|N} - to define normal or negated inputs - \seesect{Logicgates:}} -\macrodef{AND\_gen}{AND_gen}{($n$,{\sl chars},[{\sl wid},[{\sl ht}]])} - {log} - {general AND gate: $n$=number of inputs $(0\leq n\leq 16)$; - {\sl chars:} - B=base and straight sides; A=Arc; - [N]NE,[N]SE,[N]I,[N]N,[N]S=inputs or circles; - [N]O=output; C=center. - Otherwise, arg1 can be a sequence of letters {\tt P|N} - to define normal or negated inputs.} diff --git a/graphics/circuit_macros/doc/relaycoil.m4 b/graphics/circuit_macros/doc/relaycoil.m4 new file mode 100644 index 0000000000..b3273794cd --- /dev/null +++ b/graphics/circuit_macros/doc/relaycoil.m4 @@ -0,0 +1,40 @@ +.PS +# relaycoil.m4 +cct_init + + spc = dimen_/3 +{ relaycoil; S: "\tt re{}laycoil" at last [].s+(0,-20bp__) + { "\sl V1" wid 10bp__ at last [].V1 rjust + "\sl V2" at last [].V2 ljust } + K: relaycoil(NX) with .nw at last [].ne+(spc*4,0); "\tt (NX)" at (last [],S) + { thinlines_ + spline <- from K.A1 left 7bp__ then up 4bp__ left 4bp__; "\sl A1" rjust + arrow <- from K.A2 left 10bp__; "\sl A2" rjust + spline <- from K.A3 left 7bp__ then down 4bp__ left 4bp__; "\sl A3" rjust + spline <- from K.B1 right 7bp__ then up 4bp__ right 4bp__; "\sl B1" ljust + arrow <- from K.B2 right 10bp__; "\sl B2" ljust + spline <- from K.B3 right 7bp__ then down 4bp__ right 4bp__; "\sl B3" ljust + thicklines_ + } + relaycoil(AXSR) with .nw at last [].ne+(spc*5,0); "\tt (AXSR)" at (last [],S) + { "\sl V1" at last [].V1 rjust; "\sl V2" at last [].V2 rjust } + relaycoil(BXSR) with .nw at last [].ne+(spc*2,0); "\tt (BXSR)" at (last [],S) + { "\sl V1" at last [].V1 ljust; "\sl V2" at last [].V2 ljust } + relaycoil(SR) with .nw at last [].ne+(spc*4,0); "\tt (SR)" at (last [],S) + relaycoil(SO) with .nw at last [].ne+(spc,0); "\tt (SO)" at (last [],S) + relaycoil(SOR) with .nw at last [].ne+(spc,0); "\tt (SOR)" at (last [],S) + } +{ + move down_ 3/4; right_ + relaycoil(HS); S: "\tt (HS)" at last [].s+(0,-12bp__) + relaycoil(NAC) with .nw at last [].ne+(spc,0); "\tt (NAC)" at (last [],S) + relaycoil(AC) with .nw at last [].ne+(spc,0); "\tt (AC)" at (last [],S) + relaycoil(ML) with .nw at last [].ne+(spc,0); "\tt (ML)" at (last [],S) + relaycoil(PO) with .nw at last [].ne+(spc,0); "\tt (PO)" at (last [],S) + relaycoil(RM) with .nw at last [].ne+(spc,0); "\tt (RM)" at (last [],S) + relaycoil(RH) with .nw at last [].ne+(spc,0); "\tt (RH)" at (last [],S) + relaycoil(TH) with .nw at last [].ne+(spc,0); "\tt (TH)" at (last [],S) + relaycoil(EL) with .nw at last [].ne+(spc,0); "\tt (EL)" at (last [],S) + } + +.PE diff --git a/graphics/circuit_macros/doc/tran.m4 b/graphics/circuit_macros/doc/tran.m4 deleted file mode 100644 index 3314be47e0..0000000000 --- a/graphics/circuit_macros/doc/tran.m4 +++ /dev/null @@ -1,5 +0,0 @@ -.PS -# `tran.m4' -cct_init -include(tranbody.m4) -.PE diff --git a/graphics/circuit_macros/doc/tran.tex b/graphics/circuit_macros/doc/tran.tex deleted file mode 100644 index a894de26d5..0000000000 --- a/graphics/circuit_macros/doc/tran.tex +++ /dev/null @@ -1,76 +0,0 @@ -% tran.m4 -\begin{tikzpicture}[scale=2.54] -% dpic version 2014.03.24 option -g for TikZ and PGF 1.01 -\ifx\dpiclw\undefined\newdimen\dpiclw\fi -\global\def\dpicdraw{\draw[line width=\dpiclw]} -\global\def\dpicstop{;} -\dpiclw=0.8bp -\dpiclw=0.8bp -\dpicdraw (0,0) - --(0.2,0)\dpicstop -\dpicdraw (0.2,0.333333) - --(0.2,0.291667)\dpicstop -\dpicdraw (0.2,0.291667) - --(0.194444,0.291667)\dpicstop -\dpicdraw (0.2,0.291667) - ..controls (0.217259,0.291667) and (0.23125,0.277676) - ..(0.23125,0.260417) - ..controls (0.23125,0.243158) and (0.217259,0.229167) - ..(0.2,0.229167)\dpicstop -\dpicdraw (0.2,0.229167) - --(0.194444,0.229167)\dpicstop -\dpicdraw (0.2,0.229167) - ..controls (0.217259,0.229167) and (0.23125,0.215176) - ..(0.23125,0.197917) - ..controls (0.23125,0.180658) and (0.217259,0.166667) - ..(0.2,0.166667)\dpicstop -\dpicdraw (0.2,0.166667) - --(0.194444,0.166667)\dpicstop -\dpicdraw (0.2,0.166667) - ..controls (0.241667,0.166667) and (0.241667,0.104167) - ..(0.2,0.104167)\dpicstop -\dpicdraw (0.2,0.104167) - --(0.194444,0.104167)\dpicstop -\dpicdraw (0.2,0.104167) - ..controls (0.241667,0.104167) and (0.241667,0.041667) - ..(0.2,0.041667)\dpicstop -\dpicdraw (0.2,0.041667) - --(0.194444,0.041667)\dpicstop -\dpicdraw (0.2,0.041667) - --(0.2,-0)\dpicstop -\dpicdraw (0.272917,0.291667) - --(0.272917,0.041667)\dpicstop -\dpicdraw (0.335417,0.291667) - --(0.335417,0.041667)\dpicstop -\dpicdraw (0.408333,0.072917) - --(0.408333,0.072917)\dpicstop -\dpicdraw (0.408333,0.072917) - --(0.413889,0.072917)\dpicstop -\dpicdraw (0.408333,0.072917) - ..controls (0.366667,0.072917) and (0.366667,0.135417) - ..(0.408333,0.135417)\dpicstop -\dpicdraw (0.408333,0.135417) - --(0.413889,0.135417)\dpicstop -\dpicdraw (0.408333,0.135417) - ..controls (0.391074,0.135417) and (0.377083,0.149408) - ..(0.377083,0.166667) - ..controls (0.377083,0.183926) and (0.391074,0.197917) - ..(0.408333,0.197917)\dpicstop -\dpicdraw (0.408333,0.197917) - --(0.413889,0.197917)\dpicstop -\dpicdraw (0.408333,0.197917) - ..controls (0.366667,0.197917) and (0.366667,0.260417) - ..(0.408333,0.260417)\dpicstop -\dpicdraw (0.408333,0.260417) - --(0.413889,0.260417)\dpicstop -\dpicdraw (0.408333,0.260417) - --(0.408333,0.260417)\dpicstop -\dpicdraw (0.2,0.333333) - --(0,0.333333)\dpicstop -\dpicdraw (0.408333,0.260417) - --(0.608333,0.260417) - --(0.608333,0.360417)\dpicstop -\dpicdraw (0.408333,0.072917) - --(0.608333,0.072917) - --(0.608333,-0.027083)\dpicstop -\end{tikzpicture} diff --git a/graphics/circuit_macros/dpictools.pic b/graphics/circuit_macros/dpictools.pic index 40d621943e..ead69e973e 100644 --- a/graphics/circuit_macros/dpictools.pic +++ b/graphics/circuit_macros/dpictools.pic @@ -3,12 +3,12 @@ # m4 macro NeedDpicTools or the pic statement copy "HOMELIB_/dpictools.pic" # when HOMELIB_ is defined or, generically, copy "<path>dpictools.pic" -# Circuit_macros Version 9.1, copyright (c) 2019 J. D. Aplevich under # -# the LaTeX Project Public License. The files of this distribution may # -# be redistributed or modified provided that this copyright notice is # -# included and provided that modifications are clearly marked to # -# distinguish them from this distribution. There is no warranty # -# whatsoever for these files. # +# Circuit_macros Version 9.2, copyright (c) 2020 J. D. Aplevich under # +# the LaTeX Project Public Licence in file Licence.txt. The files of # +# this distribution may be redistributed or modified provided that this # +# copyright notice is included and provided that modifications are clearly # +# marked to distinguish them from this distribution. There is no warranty # +# whatsoever for these files. # # findroot(function,left bound,right bound,tolerance,var name) # Solve function(x)=0 by the method of bisection @@ -61,11 +61,56 @@ define loop {ld__+=1 define array { for i_array=2 to $+ do { exec sprintf("$1[%g] = $%g",i_array-1,i_array); }} +# array2(var,expr1,expr2,...) +# var[expr1,1]=expr2; var[expr1,2]=expr3,... +define array2 { for i_array=3 to $+ do { + exec sprintf("$1[%g,%g]=$%g",$2,i_array-2,i_array);}} + # posarray(Var,position1,position2,...) # Var[1]:position1; Var[2]:Position2,... define posarray { for i_array=2 to $+ do { exec sprintf("$1[%g] : $%g",i_array-1,i_array); }} +# posarray2(Var,expr,position1,position2,...) +# Var[expr,1]:position1; Var[expr,2]:Position2,... +define posarray2 { for i_array=3 to $+ do { + exec sprintf("$1[%g,%g] : $%g",$2,i_array-2,i_array); }} + +# Operations on 3-d vectors (could be generalized +# except for cross): +# $3 = $1 + $2 +define sum3 { + $3[1]=$1[1]+$2[1] + $3[2]=$1[2]+$2[2] + $3[3]=$1[3]+$2[3]} + +# $3 = $1 - $2 +define diff3 { + $3[1]=$1[1]-$2[1] + $3[2]=$1[2]-$2[2] + $3[3]=$1[3]-$2[3]} + +# $3 = $1 X $2 +define cross3 { + $3[1]=$1[2]*$2[3]-$1[3]*$2[2] + $3[2]=$1[3]*$2[1]-$1[1]*$2[3] + $3[3]=$1[1]*$2[2]-$1[2]*$2[1]} + +# $1 . $2 +define dot3 {($1[1]*$2[1]+$1[2]*$2[2]+$1[3]*$2[3])} + +# |$1| +define length3 { sqrt($1[1]^2+$1[2]^2+$1[3]^2) } + +# Expand a vector +define vec3 {$1[1],$1[2],$1[3]} + +# $2 = $1 +define copy3 { + $2[1] = $1[1] + $2[2] = $1[2] + $2[3] = $1[3] } + # slantbox(wid,ht,xslant,yslant,attributes) define slantbox { [ if "$1"=="" then { w = boxwid } else { w = $1 } @@ -367,15 +412,24 @@ define prval { print sprintf("$1=%g",$1) } define prval2 { print sprintf("$1=%g, $2=%g",$1,$2) } define prval3 { print sprintf("$1=%g, $2=%g, $3=%g",$1,$2,$3) } -# prow(array name,lo,hi) -# print array[lo:hi] as a row -# eg array(x,6,4,5); prow(x,1,3) +# prow(array name,rowno,lo,hi) +# print array[rowno,lo:hi] as a row +# rowno can be omitted, e.g., +# array(x,6,4,5); prow(x,1,3) define prow { - sh "echo -n \"print \\"\" > $1_xxx" - for i=$2 to $3-1 do { sh sprintf("echo -n \"%g \" >> $1_xxx",$1[i]) } - sh sprintf("echo \"%g\\"\" >> $1_xxx",$1[$3]) - copy "$1_xxx" - sh "rm $1_xxx" + sh "echo -n \"print \\"\" > $1_prow" + if ($+ < 4) || ("$2"=="") then { + for i_prow=$2 to $3-1 do { + sh sprintf("echo -n \"%g \" >> $1_prow", $1[i_prow]) } + sh sprintf("echo \"%g\\"\" >> $1_prow", $1[$3]) + } \ + else { + for i_prow=$2 to $3-1 do { + sh sprintf("echo -n \"%g \" >> $1_prow", $1[($4,i_prow)]) } + sh sprintf("echo \"%g\\"\" >> $1_prow", $1[($4,$3)]) + } + copy "$1_prow" + sh "rm $1_prow" } define rnd {int($1+sign($1)/2)} # round function diff --git a/graphics/circuit_macros/examples/AmpTable.m4 b/graphics/circuit_macros/examples/AmpTable.m4 new file mode 100644 index 0000000000..c94f682cbc --- /dev/null +++ b/graphics/circuit_macros/examples/AmpTable.m4 @@ -0,0 +1,22 @@ +.PS +# `Amptable.m4' +cct_init +movewid = 2pt__ +{ + {amp ; move ; "{\tt `amp'}" ljust} + move down 0.4; right_ + {amp(,0.3) ; move ; "{\tt `amp'(,0.3)}" ljust} + } + move right_ 2.0 +{ {delay ; move ; "{\tt `delay'}" ljust} + move down 0.4; right_ + {delay(,0.2) ; move ; "{\tt `delay'(,0.2)}" ljust} + } + + move right_ 2.0 +{ {integrator ; move ; "{\tt `integrator'}" ljust} + move down 0.5; right_ + {integrator(,0.3) ; move ; "{\tt `integrator'(,0.3)}" wid 82pt__ ljust} + } + +.PE diff --git a/graphics/circuit_macros/examples/Antennas.m4 b/graphics/circuit_macros/examples/Antennas.m4 new file mode 100644 index 0000000000..6053cd2e3f --- /dev/null +++ b/graphics/circuit_macros/examples/Antennas.m4 @@ -0,0 +1,40 @@ +.PS +# `Antennas.m4' +cct_init +s_init(Antennas) +sinclude(Circuit_macros.dim) + + define(`elen_',elen_*0.9) + B: Here + A: antenna + s_box(T) below at A.T + s_box(`\tt an`'tenna') at A.n above + A: antenna(at A.T+(elen_,0),T) + s_box(T) below at A.T + s_box(`\tt (,T)') at A.n above + A: antenna(at A.T+(elen_,0),,L) + s_box(T1) below rjust at A.T1 + s_box(T2) below ljust at A.T2 + s_box(`\tt (,{,}L)') at A.n above + A: antenna(at A.T+(elen_,0),T,L) + s_box(T1) below rjust at A.T1 + s_box(T2) below ljust at A.T2 + s_box(`\tt (,T,L)') at A.n above + A: antenna(at A.T+(elen_,0),,T) + s_box(T) below at A.T + s_box(`\tt (,{,}T)') at A.n above + A: antenna(at A.T+(elen_,0),,S) + s_box(T1) below rjust at A.T1 + s_box(T2) below ljust at A.T2 + s_box(`\tt (,{,}S)') at A.n above + A: antenna(at A.T+(elen_,0),,D) + s_box(T1) below rjust at A.T1 + s_box(T2) below ljust at A.T2 + s_box(`\tt (,{,}D)') at A.n above + A: antenna(at A.T+(elen_,0),,P) + s_box(T) below at A.T + s_box(`\tt (,{,}P)') at A.n above + A: antenna(at A.T+(elen_,0),,F) + s_box(T) below at A.T + s_box(`\tt (,{,}F)') at A.n above +.PE diff --git a/graphics/circuit_macros/examples/AntiqueClock.m4 b/graphics/circuit_macros/examples/AntiqueClock.m4 new file mode 100644 index 0000000000..566fb4c814 --- /dev/null +++ b/graphics/circuit_macros/examples/AntiqueClock.m4 @@ -0,0 +1,142 @@ +.PS +# AntiqueClock.m4 +gen_init +NeedDpicTools +iflatex(command "{\sf") + +# https://tex.stackexchange.com/questions/236923/generate-analog-clock-with-numbered-face-add-seconds-roman-numerals + +# `hms2deg(hr,min,sec) hr:min:sec to degrees +# blank arg1: degrees for minute hand +# blank arg1 and arg2: degrees for second hand' +define(`hms2deg',`ifelse(`$1',, + `ifelse(`$2',, + `(90-pmod(ifelse(`$3',,0,`$3'),60)/60*360)', + `(90-(pmod(`$2',60)/60 + pmod(ifelse(`$3',,0,`$3'),60)/60/60)*360)')', + `(90-(pmod(`$1',12) + pmod(ifelse(`$2',,0,`$2'),60)/60 + dnl + pmod(ifelse(`$3',,0,`$3'),60)/3600)/12*360)')') + +# `SecondHand(length,hr,min,sec)' +define(`SecondHand',`[ shsf = (`$1')/3.2 + C: Here + { L: rpoint_(to (Rect_(`$1',hms2deg(,,`$4')))) } + line thick 8*shsf to rvec_(`$1',0) + ]') + +# `AntiqueMinuteHand(length,hr,min,sec)' +define(`AntiqueMinuteHand',`[ mhsf = (`$1')/2.84 + L: rpoint_(to (Rect_(`$1',hms2deg(,`$3',`$4')))) + C: circle fill_(0) diam 0.47*mhsf at L.start + move to C + spline from rvec_(0,0.047*mhsf) \ + to rvec_(1.65*mhsf,0.11*mhsf) \ + then to rvec_(`$1',0.018*mhsf) \ + then to rvec_(`$1',-0.018*mhsf) \ + then to rvec_(1.65*mhsf,-0.11*mhsf) \ + then to rvec_(0,-0.047*mhsf) \ + shaded rgbstring(0,0,0) + ]') + +# `AntiqueHourHand(length,hr,min,sec)' +define(`AntiqueHourHand',`[ hhsf = (`$1')/2.2 + L: rpoint_(to (Rect_(`$1',hms2deg(`$2',`$3',`$4')))) + C: circle fill_(0) diam 0.6*hhsf at L.start + move to C + v = 0.25*hhsf + { line to rvec_(1.1*hhsf,0) thick 0.15/(1bp__)*hhsf } + { C1: circle rad v at rvec_(1.25*hhsf,0) fill_(0) } + d = `$1'-1.25*hhsf + q = 1bp__*hhsf + r1 = (d^2 + q^2 - v^2)/(v-q)/2 + h = r1+v + shade(0, + arc ccw from C1+vec_(d/h*v,(r1+q)/h*v) to \ + C1+vec_(d,q) rad r1 with .c at C1+vec_(d,r1+q) + arc ccw from C1+vec_(d,-q) to C1+vec_(d/h*v,-(r1+q)/h*v) rad r1 \ + with .c at C1+vec_(d,-r1-q)) + ]') + +define(`AntiqueClock',`[ # h,m,s,diam +# Clock size parameters: + hour = ifelse(`$1',,3,`$1') + minute = ifelse(`$2',,41,`$2') + second = ifelse(`$3',,51,`$3') + # outer radius + ifelse(`$4',,`skale=0.5; r1=2',`r1=(`$4')/2; skale=r1/4') + r2 = r1-0.5*skale + r3 = r2-0.14*skale + r4 = r3 - 0.35*skale + r5 = r4 - 0.17*skale + r6 = r5 - 0.63*skale + r7 = r6 - 0.17*skale + shadelinethick = 1.0 + +C: circle thick 0.2 rad r1 + +define shadeline { + s = 1-($`'1)*2 + v = r*s + h = sqrt(r^2-v^2) + t = 1-abs(s) + line from (vrot_(-h,v,cost,sint)) to (vrot_(h,v,cost,sint)) \ + thick shadelinethick outlined rgbstring(t,t,t) + } + + r = r1 # Bezel outer + nlines = int(2*r/(shadelinethick pt__)*1.1) + cost = cosd(10); sint = sind(10); + ShadeObject(shadeline,nlines, 0, 0,0,0, 0.5, 1,1,1, 1, 0,0,0 ) at C + + r = r2 # Bezel inner + nlines = int(2*r/(shadelinethick pt__)*1.1) + cost = cosd(-10); sint = sind(-10); + ShadeObject(shadeline,nlines, 0, 0,0,0, 0.25, 0.8,0.8,0.8, 0.5, 1,1,1, + 0.75, 0.8,0.8,0.8, 1, 0,0,0 ) at C + +# Clock face +Face: circle thick 0 fill_(1) rad r3 at C + circle rad r4 at C + circle rad r5 at C + circle rad r6 at C + circle rad r7 at C + +# Text rotation for PSTricks or TikZ + define(`rottext', + `ifpstricks(`\rput[c]{%g}(0,0)')ifpgf(`\pgftext[rotate=%g]')') +# Outer numbers + command sprintf("\font\outerfont=cmss12 at %4.2fin",r3-r4) + for mn = -15 to 15 by 5 do { sprintf("rottext{\outerfont %g}",\ + -mn/60*360,pmod(mn,60)) at C+(Rect_((r3+r4)/2,90-mn/60*360)) } + for mn = 20 to 40 by 5 do { sprintf("rottext{\outerfont %g}",\ + 180-mn/60*360,mn) at C+(Rect_((r3+r4)/2,90-mn/60*360)) } +# Outer tics + for mn = 1 to 60 do { t = 90-mn/60*360 + line from C+(Rect_(r5,t)) to C+(Rect_(r4,t)) } + +# Inner numbers + command sprintf("\font\innerfont=cmss12 at %4.2fin",r5-r6) + Loopover_(`mx',`t = (m4Lx-4)/12*360; + sprintf("rottext{\scalebox{0.7}[1.0]{\innerfont mx}}",-t) \ + at C+(Rect_((r5+r6)/2,90-t))', IX,X,XI,XII,I,II,III) + Loopover_(`mx',`t = (m4Lx+3)/12*360; + sprintf("rottext{\scalebox{0.7}[1.0]{\innerfont mx}}",-t+180) \ + at C+(Rect_((r5+r6)/2,90-t))', IV,V,VI,VII,VIII) + +# Inner tics + for mn = 5 to 60 by 5 do { t = 90-mn/60*360 + line from C+(Rect_(r7,t)) to C+(Rect_(r6,t)) } + +# Hands + AntiqueHourHand(r6,hour,minute,second) with .C at C + AntiqueMinuteHand(r5,hour,minute,second) with .C at C + SecondHand((r3+r4)/2,hour,minute,second) with .C at C + +# Center + dot(at C,0.1/4*r1,1) + ]') + + Clock1: AntiqueClock(,,,3) +# Clock2: AntiqueClock(4,50,07,2) at Clock1.e+(1.5,0) + +iflatex(command "}%") +.PE diff --git a/graphics/circuit_macros/examples/Audio.m4 b/graphics/circuit_macros/examples/Audio.m4 new file mode 100644 index 0000000000..722a2434d8 --- /dev/null +++ b/graphics/circuit_macros/examples/Audio.m4 @@ -0,0 +1,94 @@ +.PS +# `Audio.m4' +cct_init + +define(`In123',` +thinlines_ + arrow <- from `$1'.In1 up 0.05 left 0.15 + "{\sl In1}sp_" rjust above + arrow <- left 0.15 from `$1'.In2 + "{\sl In2}sp_" wid 0.2 rjust + arrow <- from `$1'.In3 down 0.05 left 0.15 + "{\sl In3}sp_" rjust below +thicklines_ ') + +L:[ + [ + S: speaker + `"\tt speaker"' at S.s+(0,-0.2) #below + In123(S) + thinlines_ + arrow <- from S.In4 left 0.05 up 0.15 + "{\sl In4}" above rjust + arrow <- from S.In5 right 0.05 up 0.15 + "{\sl In5}" above + arrow <- from S.In6 left 0.05 down 0.15 + "{\sl In6}" below rjust + arrow <- from S.In7 right 0.05 down 0.15 + "{\sl In7}" below + spline <- from S.Box.e+(0,0.05) right 0.27 up 0.10 \ + then right 0.1 up 0.2 + "\sl Box" above + thicklines_ + ] +[ + H: speaker(,,H) + `"\tt speaker(,{,}H)"' at H.s+(0,-0.30) #below + ] with .sw at last [].se+(0.25,-0.1) + ] +[ + B: bell + `"\tt bell"' at B.s+(0,-0.2) #below + In123(B) + thinlines_ + arrow <- from B.Box.n+(-0.1,0) up 0.15 left 0.1 ; "\sl Box" above + arrow <- from B.Circle.n up 0.15 ; "\sl Circle" above + thicklines_ + ] with .w at last [].e+(0.0,0.5) +[ + M: microphone + `"\tt microphone"' at M.s+(0,-0.2) #below + In123(M) + thinlines_ + arrow <- from M.Circle.n up 0.15 ; "\sl Circle" above + thicklines_ + ] with .sw at last [].se+(0.4,0) +[ + Z: buzzer + `"\tt buzzer"' at Z.s+(0,-0.2) #below + In123(Z) + thinlines_ + arrow <- from Z.Box.n up 0.15 ; "\sl Box" above + thicklines_ + ] with .sw at last [].se+(0.4,0) +R:[ + Z: buzzer(,,C) + `"\tt buzzer(,{,}C)"' at Z.s+(0,-0.2) #below + In123(Z) + thinlines_ + spline <- from 0.8<Z.Face.s,Z.Face.n> right 2*arrowht up 0.5*arrowht \ + then up 0.15 right 0.05 + "\sl Face" above + thicklines_ + ] with .sw at last [].se+(0.4,0) +[[ + E: earphone + `"\tt earphone"' at E.s+(0,-0.2) #below + In123(E) + thinlines_ + arrow <- from E.Box.n up 0.15 left 0.15 ; "\sl Box" above + thicklines_ + ] + [ + E: earphone(,,C) + `"\tt earphone(,{,}C)"' at E.s+(0,-0.2) #below + thinlines_ + arrow <- from E.L up 0.15 left 0.15; "\sl L" rjust + arrow <- from E.R up 0.15 right 0.15; "\sl R" ljust + "\sl N" at E.N above + "\sl C" at E.C + thicklines_ + ] with .sw at last [].se+(0.6,0) +] with .n at (0.6 between L and R, R.s)+(0,0.1-ifdpic(0.2,0.25)) + +.PE diff --git a/graphics/circuit_macros/examples/Bip.m4 b/graphics/circuit_macros/examples/Bip.m4 new file mode 100644 index 0000000000..121517d16d --- /dev/null +++ b/graphics/circuit_macros/examples/Bip.m4 @@ -0,0 +1,60 @@ +.PS +# `Bip.m4' +cct_init + + up_ +Q1: bi_tr(up_ dimen_) + thinlines_ + showbox_(,dotted) + thicklines_ + "\hbox{\sl E}" at Q1.E-(0,0.05) below + "\hbox{\sl B}sp_" at Q1.B rjust + "\hbox{\sl C}" at Q1.C above + "`{\tt bi\_tr(up\_ dimen\_)}'" wid 1.2 at Q1.s + (0,-0.35) below + +Q2: bi_tr(,R) with .E at Q1.E+(0.25,0) + thinlines_ + showbox_(,dotted) + thicklines_ + "\hbox{\sl E}" at Q2.E-(0,0.05) below + "sp_\hbox{\sl B}" at Q2.B ljust + "\hbox{\sl C}" at Q2.C above + "`{\tt bi\_tr(,R)}'" at Q2.s + (0,-0.2) below + +Q3: bi_tr(,,P) with .C at Q2.C+(1.15,0) + thinlines_ + showbox_(,dotted) + thicklines_ + "\hbox{\sl E}" at Q3.E-(0,0.05) below + "\hbox{\sl B}sp_" at Q3.B rjust + "\hbox{\sl C}" at Q3.C above + "`{\tt bi\_tr(,{,}P)}'" at Q3.s + (0,-0.35) below + +Q4: bi_tr(,,,E) with .C at Q3.C+(0.9,0) + thinlines_ + showbox_(,dotted) + thicklines_ + "\hbox{\sl E}" at Q4.E-(0,0.05) below + "\hbox{\sl B}sp_" at Q4.B rjust + "\hbox{\sl C}" at Q4.C above + "`{\tt bi\_tr(,{,},E)}'" at (Q4.s,Q4.E) + (0,-0.2) below + +Q5: igbt(,,) with .E at Q4.E+(0.65,0) + thinlines_ + showbox_(,dotted) + thicklines_ + "\hbox{\sl E}" at Q5.E-(0,0.05) below + "\hbox{\sl G}sp_" at Q5.G rjust + "\hbox{\sl C}" at Q5.C above + "`{\tt igbt}'" at Q5.s + (0,-0.35) below + +Q6: igbt(,,LD) with .E at Q5.E+(0.55,0) + thinlines_ + showbox_(,dotted) + thicklines_ + "\hbox{\sl E}" at Q6.E-(0,0.05) below + "\hbox{\sl G}sp_" at Q6.G rjust + "\hbox{\sl C}" at Q6.C above + "`{\tt igbt(,{,}LD)}'" at (Q6.s,Q6.E) + (0,-0.2) below + +.PE diff --git a/graphics/circuit_macros/examples/Btree.m4 b/graphics/circuit_macros/examples/Btree.m4 index ebe0986433..d17a192cc4 100644 --- a/graphics/circuit_macros/examples/Btree.m4 +++ b/graphics/circuit_macros/examples/Btree.m4 @@ -2,7 +2,7 @@ # Btree.m4 # One way to draw a binary tree using pic macros gen_init -circlerad = 0.35 +circlerad = 0.30 define n { [C: circle fill_(0.9) $1 if "$2" != "" then { diff --git a/graphics/circuit_macros/examples/CctTable.m4 b/graphics/circuit_macros/examples/CctTable.m4 new file mode 100644 index 0000000000..f7e47d0758 --- /dev/null +++ b/graphics/circuit_macros/examples/CctTable.m4 @@ -0,0 +1,90 @@ +.PS +# `CctTable.m4' +cct_init + +movewid = 2 pt__ +hm = 2.05 +vm = 0.28 +{ {resistor ; move ;"`{\tt resistor}'" ljust} + move right_ hm + {resistor(,,Q) ; move ;"`\tt resistor(,{,}Q) '" ljust} + move right_ hm + {resistor(,,E) ; move + "`\shortstack[l]{\tt resistor(,{,}E)\\ {\tt $\equiv$ ebox}}'" ljust} +} + move down vm; right_ +{ {resistor(,,ES) ; move ;"`\tt resistor(,{,}ES) '" ljust} + move right_ hm + {resistor(,,H) ; move ;"`\tt resistor(,{,}H) '" ljust} + move right_ hm + {ebox(,,,0.5) ; move ;"`{\tt ebox(,{,},0.5)}'" ljust} +} + move down vm; right_ +{ {resistor(,,V) ; move ;"`{\tt resistor(,{,}V)}'" ljust} + move right_ hm + {move down_ 0.05; right_ + thermocouple ; move;"`{\tt thermocouple}'" ljust; move up_ 0.05} + move right_ hm + {ebox(,0.5,0.3) ; move ;"`{\tt ebox(,0.5,0.3)}'" ljust} +} + move down vm; right_ +{ {inductor ; move ;"`{\tt inductor}'" ljust} + move right_ hm + {inductor(,W); move ;"`{\tt inductor(,W)}'" ljust} + move right_ hm + {inductor(,L); move ;"`{\tt inductor(,L)}'" ljust} +} + move down vm; right_ +{ {inductor(,,,M) ; move ;"`{\tt inductor(,{,},M)}'" ljust} + move right_ hm + {inductor(,W,6,P); move ;"`{\tt inductor(,W,6,P)}'" ljust} + move right_ hm + {move right_ 0.2; ttmotor(,G) ; move ;"`{\tt ttmotor(,G)}'" ljust} +} + move down vm; right_ +{ {capacitor ; move ;"`{\tt capacitor}'" ljust} + move right_ hm + {capacitor(,C); move ;"`{\tt capacitor(,C)}'" ljust} + move right_ hm + {capacitor(,C+); move ;"`{\tt capacitor(,C+)}'" ljust} +} + move down vm; right_ +{ {capacitor(,P); move ;"`{\tt capacitor(,P)}'" ljust} + move right_ hm + {capacitor(,E); move ;"`{\tt capacitor(,E)}'" ljust} + move right_ hm + {capacitor(,K); move ;"`{\tt capacitor(,K)}'" ljust} +} + move down 0.25; right_ +{ {capacitor(,M); move ;"`{\tt capacitor(,M)}'" ljust} + move right_ hm + {capacitor(,N); move ;"`{\tt capacitor(,N)}'" ljust} + move right_ hm + {xtal ; move ;"`{\tt xtal}'" ljust} +} + move down 0.25; right_ +{ {memristor ; move;"`{\tt memristor}'" ljust} + move right_ hm + {heater; move;"`{\tt heater}'" ljust} + move right_ hm + {tline ; move;"`{\tt tline}'" ljust} +} + move down 0.25; right_ +{ {move up_ 0.05; right_; gap ; move ;"`{\tt gap}'" ljust} + move right_ hm + {gap(,,A) ; move ;"`{\tt gap(,{,}A)}'" ljust} + move right_ hm + {arrowline ; move;"`{\tt arrowline}'" ljust} +} + move down 0.25; right_ +{ {lamp ; move;"`{\tt lamp}'" ljust} + move right_ hm + {reed ; move ;"`{\tt reed}'" ljust} + move right_ hm + {reed(,,,fill_(0.9),CR) ; move ; "`{\tt reed(,{,},fill\_(0.9),CR)}'" ljust} +} + move down 0.25; right_ +{ {pvcell ; move;"`{\tt pvcell}'" ljust} +} + +.PE diff --git a/graphics/circuit_macros/examples/Conn.m4 b/graphics/circuit_macros/examples/Conn.m4 new file mode 100644 index 0000000000..7253d2b313 --- /dev/null +++ b/graphics/circuit_macros/examples/Conn.m4 @@ -0,0 +1,69 @@ +.PS +# `Conn.m4' +cct_init + +T:[ + ifelse(ifmpost(T)`'ifpostscript(T),,`command "{\sf"') + S1: tstrip(U) + thinlines_ + arrow <- left 0.15 from S1.L1; "L1" rjust + arrow <- left 0.15 from S1.L4; "L4" wid 0.2 rjust + "$\vdots$" at (0.5 between last "" and 2nd last "")+(-0.15,0.02) + arrow <- right 0.25 from S1.R1; "R1" ljust + arrow <- right 0.25 from S1.R4; "R4" ljust + "$\vdots$" at (0.5 between last "" and 2nd last "")+(0.15,0.02) + arrow <- right 0.15 up 0.10 from S1.T1; "T1" ljust + arrow <- right 0.15 up 0.10 from S1.T4; "T4" ht 11 pt__ ljust + "$\vdots$" at (0.5 between last "" and 2nd last "")+(0.15,0.02) + thicklines_ + CS1: "`\tt tstrip(U)'" at S1.s+(0,-0.15) + S2: tstrip(R,5,DO;wid=1.0;ht=0.25) with .sw at S1.se+(0.7,0.15) + thinlines_ + arrow <- up 0.2 right 0.1 from S2.T1; "T1" above + arrow <- up 0.2 right 0.1 from S2.T5; "T5" above + "$\cdots$" at 0.5 between last "" and 2nd last "" above + CS2: `"\tt tstrip(R,5,"' ht 0.1 ljust \ + `"\tt $\;\;$DO;wid=1.0;ht=0.25)"' ljust at S2.sw+(-0.1,-0.2) + ifelse(ifmpost(T)`'ifpostscript(T),,`command "}"') +] + +C: [ + C1: ccoax + `"\tt ccoax\vphantom{(}"' ht 11 pt__ at C1.s below + thinlines_ + arrow <- up 0.1 right 0.1 from C1.C.ne; "C" ljust + arrow <- down 0.05 right 0.1 from C1.S.e; "S" wid 0.1 ht 11pt__ ljust + thicklines_ + C2: ccoax(at C1+(0,0.3),F) + `"\tt ccoax(,F)"' ht 11 pt__ wid 0.65 at C2.ne ljust + ] with .C1.sw at T.S2.se+(0.5,0.0) + +Y: [ + tconn(,O) + {`"\tt tconn(,O)"' at last line.c+(0,-0.2) wid 43 pt__ } + move to Here+(0.3,0) + P1: tconn(,>) + {`"\tt (,>)"' at last line.c+(0,-0.2)} + move to P1.end+(0.3,0) + tconn(,>>) + {`"\tt (,>>)"' at last line.c+(0,-0.2)} + move to P1.start+(0,linewid) + P3: tconn(,<) + {`"\tt tconn(,<)"' at last line.c+(0,-0.2)} + move to P3.end+(0.3,0) + tconn(,<<) + {`"\tt (,<<)"' at last line.c+(0,-0.2)} + +] with .sw at (C.e.x-0.4,T.s.y) + +B: [ + tbox(V_2) + `"\tt tbox(V\_2)"' at last [].sw below ljust + [ left_; + tbox(V_1,,,<>) ] with .nw at last [].sw+(0,-0.25) + `"\tt tbox(V\_1,{,},<>)"' at last [].sw below ljust +# `"\tt left\_"' at last [].sw +(0,-0.2) ljust `"\tt tbox(V\_1)"' ljust +] with .nw at Y.ne+(0.2,0) + + +.PE diff --git a/graphics/circuit_macros/examples/Contact.m4 b/graphics/circuit_macros/examples/Contact.m4 new file mode 100644 index 0000000000..26f8d5a982 --- /dev/null +++ b/graphics/circuit_macros/examples/Contact.m4 @@ -0,0 +1,98 @@ +.PS +# Contact +cct_init + +movw = 0.45 +{ + contact + {S:`"\tt contact"' at last [].s+(0,-0.15) + "\sl P" rjust at last [].P.w + "\sl O" ljust at last [].O + "\sl C" ljust at last [].C } + move right_ movw; contact(R) + {`"\tt (R)"' at (last [].s,S) + "\sl P" rjust at last [].P.w + "\sl O" ljust at last [].O + "\sl C" ljust at last [].C } + move right_ movw; contact(O); {`"\tt (O)"' at (last [],S)} + move right_ movw; contact(C); {`"\tt (C)"' at (last [],S)} + + move right_ movw; contact(P) + {S: `"\tt (P)"' at last [].s+(0,-0.15) + "\sl P" rjust at last [].P.w + "\sl O" ljust at last [].O + "\sl C" ljust at last [].C } + move right_ movw; contact(PR) + {S: `"\tt (PR)"' at last [].s+(0,-0.15) + "\sl P" rjust at last [].P.w + "\sl O" ljust at last [].O + "\sl C" ljust at last [].C } + move right_ movw; contact(PO); {`"\tt (PO)"' at (last [],S)} + {"\sl O" ljust at last [].O + "\sl C" ljust at last [].C } + move right_ movw; contact(PC); {`"\tt (PC)"' at (last [],S)} +} + +move down 0.75; right_ ; { + contact(I); {`S: "\tt (I)"' at last [].s+(0,-12bp__) + "\sl P" rjust at last [].P.w + "\sl O" ljust at last [].O.e + "\sl C" ljust at last [].C.e } + move right_ movw; contact(RI) + {`"\tt (RI)"' at (last [],S) + "\sl P" rjust at last [].P.w + "\sl O" ljust at last [].O.e + "\sl C" ljust at last [].C.e } + move right_ movw; contact(OI); {`"\tt (OI)"' at (last [],S)} + move right_ movw; contact(CI); {`"\tt (CI)"' at (last [],S)} + + move right_ movw; contact(PI); {`"\tt (PI)"' at (last [],S) } + {"\sl O" ljust at last [].O.e + "\sl C" ljust at last [].C.e } + move right_ movw; contact(PIO); {`"\tt (PIO)"' at (last [],S) } + move right_ movw; contact(PIC); {`"\tt (PIC)"' at (last [],S) } +} + +movewid = movw + move down 0.65; right_; { + K: contact(T) + {S: `"\tt (T)"' at last [].s+(0,-0.15) + thinlines_ + spline <- right 0.09 then up 0.05 right 0.05 from K.C; "$\;\;$\sl C" + spline <- right 0.09 then down 0.05 right 0.05 from K.O; "$\;\;$\sl O" + thicklines_ } + move; K: contact(RT) + {`"\tt (RT)"' at (last [],S) + thinlines_ + spline <- right 0.09 then up 0.05 right 0.05 from K.O; "$\;\;$\sl O" + spline <- right 0.09 then down 0.05 right 0.05 from K.C; "$\;\;$\sl C" + thicklines_ } + move; contact(OT); {S: `"\tt (OT)"' at (last [],S) } + move; contact(CT); {S: `"\tt (CT)"' at (last [],S) } + move; contact(PT); {S: `"\tt (PT)"' at (last [],S) } + move; contact(PTO); {S: `"\tt (PTO)"' at (last [],S) } + move; contact(PTC); {S: `"\tt (PTC)"' at (last [],S) } +} + + move down 0.65; right_; { + K: contact(U) + {S: `"\tt (U)"' at last [].s+(0,-0.15) + thinlines_ + spline <- right 0.09 then up 0.05 right 0.05 from K.C; "$\;\;$\sl C" + spline <- right 0.09 then down 0.05 right 0.05 from K.O; "$\;\;$\sl O" + thicklines_ } + move; K: contact(RU) + {`"\tt (RU)"' at (last [],S) + thinlines_ + spline <- right 0.09 then up 0.05 right 0.05 from K.O; "$\;\;$\sl O" + spline <- right 0.09 then down 0.05 right 0.05 from K.C; "$\;\;$\sl C" + thicklines_ } + move; K: contact(OU); {S: `"\tt (OU)"' at (last [],S) + "\sl O" ljust at K.O.e } + move; K: contact(CU); {S: `"\tt (CU)"' at (last [],S) + "\sl C" ljust at K.C.e } + move; contact(PU); {S: `"\tt (PU)"' at (last [],S) } + move; contact(PUO); {S: `"\tt (PUO)"' at (last [],S) } + move; contact(PUC); {S: `"\tt (PUC)"' at (last [],S) } +} +.PE diff --git a/graphics/circuit_macros/examples/Contacts.m4 b/graphics/circuit_macros/examples/Contacts.m4 new file mode 100644 index 0000000000..9e006218e3 --- /dev/null +++ b/graphics/circuit_macros/examples/Contacts.m4 @@ -0,0 +1,46 @@ +.PS +# Contacts.m4 +cct_init + + space = 0.75 + KS:contacts(2) + {`"\tt contacts(2)"' at KS.s +(0,-12bp__) + for_(1,2,1, + `"\sl P`'m4x" rjust at last [].P`'m4x-(dotrad_,0) + "\sl O`'m4x" ljust at last [].O`'m4x+(dotrad_,0) + "\sl C`'m4x" ljust at last [].C`'m4x+(dotrad_,0) ') } + + KS:contacts(2,I) with .sw at last [].se+(space,0) + {`"\tt (2,I)"' at KS.s +(0,-12bp__) + for_(1,2,1, + `"\sl P`'m4x" rjust at last [].P`'m4x-(dotrad_,0) + "\sl O`'m4x" ljust at last [].O`'m4x+(dotrad_,0) + "\sl C`'m4x" ljust at last [].C`'m4x+(dotrad_,0) ') } + + KS:contacts(2,IO) with .sw at last [].se+(space,0) + {`"\tt (2,IO)"' at KS.s +(0,-12bp__) + for_(1,2,1, + `"\sl P`'m4x" rjust at last [].P`'m4x-(dotrad_,0) + "\sl O`'m4x" ljust at last [].O`'m4x+(dotrad_,0) ') } + + KS:contacts(2,PICD) with .sw at last [].se+(space,0) + {`"\tt (2,PICD)"' at KS.s +(0,-12bp__) + for_(1,2,1, + `"\sl P`'m4x" rjust at last [].P`'m4x-(dotrad_,0) + "\sl O`'m4x" ljust at last [].O`'m4x+(dotrad_,0) + "\sl C`'m4x" ljust at last [].C`'m4x+(dotrad_,0) ') } + + KS:contacts(2,PTCD) with .sw at last [].se+(space,0) + {`"\tt (2,PTCD)"' at KS.s +(0,-12bp__) + for_(1,2,1, + `"\sl P`'m4x" rjust at last [].P`'m4x-(dotrad_,0) + "\sl O`'m4x" ljust at last [].O`'m4x+(dotrad_,0) + "\sl C`'m4x" ljust at last [].C`'m4x+(dotrad_,0) ') } + + KS:contacts(2,PUCD) with .sw at last [].se+(space,0) + {`"\tt (2,PUCD)"' at KS.s +(0,-12bp__) + for_(1,2,1, + `"\sl P`'m4x" rjust at last [].P`'m4x-(dotrad_,0) + "\sl O`'m4x" ljust at last [].O`'m4x+(dotrad_,0) + "\sl C`'m4x" ljust at last [].C`'m4x+(dotrad_,0) ') } +.PE diff --git a/graphics/circuit_macros/examples/Crow.m4 b/graphics/circuit_macros/examples/Crow.m4 index 61e2a3ce50..91434c0c01 100644 --- a/graphics/circuit_macros/examples/Crow.m4 +++ b/graphics/circuit_macros/examples/Crow.m4 @@ -33,22 +33,22 @@ define(`boxtext',`s_box(\parbox{%gpt}{\sf `$1'},int(last box.wid/(1pt__))) \ boxwid = boxwid*1.15 boxsep = boxwid/2 - custombox(Class,ht boxht*2.2, + custombox(Class,ht boxht*1.7, `classkey\\ class\_type\\ class\_desc') custombox(Product,ht Class.ht with .nw at Class.ne+(boxsep,0), `classkey\\ prodkey\\ prod\_name\\ pkg\_type') - custombox(Sales,ht boxht*3.3 with .nw at Product.ne+(boxsep*2,15pt__), + custombox(Sales,ht boxht*2.75 with .nw at Product.ne+(boxsep*2,13pt__), `perkey\\ classkey\\ prodkey\\ storekey\\ promokey\\ quantity\\ dollars') custombox(Period,ht Sales.ht with .nw at Sales.ne+(boxsep*2,0), `perkey\\ date\\ day\\ week\\ month\\ qtr\\ year') - custombox(Market,ht Sales.ht with .nw at Class.sw+(0,-boxsep*2), + custombox(Market,ht Sales.ht with .nw at Class.sw+(0,-boxsep*3/2), `perkey\\ date\\ day\\ week\\ month\\ qtr\\ year') - custombox(Store,ht boxht*3.6 with .sw at (Product.w,Market.s), + custombox(Store,ht boxht*3.2 with .sw at (Product.w,Market.s), `storekey\\ mktkey\\ store\_type\\ store\_name\\ street\\ city\\ state\\ zip') custombox(Promotion,ht Market.ht with .sw at (Period.w,Market.s), @@ -61,7 +61,7 @@ define(`boxtext',`s_box(\parbox{%gpt}{\sf `$1'},int(last box.wid/(1pt__))) \ T: last line.c+(0,-crow_wd*2.5) move to Period.nw+(0,-10pt__); crowline(to (Sales.e,Here),,1.75*crow_wd) -Q: (last line.c,0.4 between Sales.se and Sales.ne) +Q: (last line.c,0.35 between Sales.se and Sales.ne) move to Market.ne+(0,-10pt__); crowline(to (Store.w,Here)) move to Store.ne+(0,-10pt__); line to (T,Here) then to T diff --git a/graphics/circuit_macros/examples/Csource.m4 b/graphics/circuit_macros/examples/Csource.m4 index 1441cfcb17..f2902525c0 100644 --- a/graphics/circuit_macros/examples/Csource.m4 +++ b/graphics/circuit_macros/examples/Csource.m4 @@ -31,7 +31,7 @@ define(`ppair',`[define(`m4lr',ifelse(`$1',,ljust,rjust)) line from J.D to S then to Q.C ]') R2: resistor(down_ dimen_) - llabel(,"$R_2$" ljust "\unit{150}{}") + llabel(,"$R_2$" ljust "\num{150}") dot Q13: bi_tr(down_ dimen_,,P,E) with .E at Here rlabel(,"$Q_{13}$" rjust "2N4236") @@ -41,7 +41,7 @@ define(`ppair',`[define(`m4lr',ifelse(`$1',,ljust,rjust)) dot(at Q14.E) { line left_ dimen_*1.3 then up_ dimen_ R1: potentiometer(up_ dimen_) with .Start at Here - rlabel(,"$R_1$" ljust "\unit{20}{\kilo}") + rlabel(,"$R_1$" ljust "\SI{20}{\kilo{}}") { ground(at R1.T1) } line from R1.End to (R1.End,Q13.E) then to Q13.E } { dot(at Q13.C+(0,-elen_)) @@ -50,7 +50,7 @@ define(`ppair',`[define(`m4lr',ifelse(`$1',,ljust,rjust)) V1: gap(down_ dimen_,1); rlabel(+,V_1,-) line down_ dimen_/4 chop dotrad_ chop 0; ground(,T) } R3: resistor(down_ dimen_) - llabel(,"$R_3$" ljust "\unit{150}{}") + llabel(,"$R_3$" ljust "\num{150}") dot(at Q13.C+(0,-2*elen_)) line right_ dimen_/2 A1: opamp with .In2 at Here; "A$_1$" at A1.C @@ -58,17 +58,17 @@ define(`ppair',`[define(`m4lr',ifelse(`$1',,ljust,rjust)) line left_ dimen_/4 from A1.In1 then up_ dimen_/2 then right dimen_ dot { resistor(up_ elen_) - llabel(,"$R_{14}$" rjust "\unit{19}{\kilo}") + llabel(,"$R_{14}$" rjust "\SI{19}{\kilo{}}") line to (Here,Q13.E) then to Q13.E } line to (A1.Out,Here) dot { line to A1.Out dot resistor(down_ to (Here,Q14.E)) - llabel(,"$R_{13}$" ljust "\unit{91}{\kilo}") + llabel(,"$R_{13}$" ljust "\SI{91}{\kilo{}}") line to Q14.E } R6: resistor(right_ dimen_) - clabel(,"$R_6$" "\vphantom{x}" "\unit{15}{\kilo}") + clabel(,"$R_6$" "\vphantom{x}" "\SI{15}{\kilo{}}") dot line to (Here,A1.In1) then right_ dimen_/4 A2: opamp with .In1 at Here; "A$_2$" at A2.C @@ -101,39 +101,39 @@ define(`ppair',`[define(`m4lr',ifelse(`$1',,ljust,rjust)) line to Q13.B line from DP3.G to (T,DP3.G) then to (T,DP4.G) then to DP4.G R11: resistor(down_ dimen_ from DP4.S) - rlabel(,"$R_{11}$" rjust "\unit{20}{}") + rlabel(,"$R_{11}$" rjust "\num{20}") D5: diode(up_ from DP3.S to (DP3.S,A2),Z) llabel(,"$D_5$" rjust "1N4729$_{\strut}$") line to R11.end C4: capacitor(right_ dimen_*1.3 from DP3.S,C) - llabel(,C_4); rlabel(,\unit{0.68}{\micro\farad}) + llabel(,C_4); rlabel(,\SI{0.68}{\micro\farad}) C3: capacitor(right_ dimen_*1.3 from DP4.S,C) - llabel(,C_3); rlabel(,\unit{0.68}{\micro\farad}) + llabel(,C_3); rlabel(,\SI{0.68}{\micro\farad}) dot dot(at (Here,R6)) C2: reversed(`capacitor',left_ dimen_*1.3,C) - rlabel(,C_2); llabel(,\unit{0.1}{\micro\farad}) + rlabel(,C_2); llabel(,\SI{0.1}{\micro\farad}) line to R6.end R5: resistor(up_ from R6.end to (R6.end,Q13.B)) - rlabel(,"$R_5$" ljust "\unit{100}{\kilo}") + rlabel(,"$R_5$" ljust "\SI{100}{\kilo{}}") dot(at R5.top-(0,dimen_/2)) line left_ dimen_/2 capacitor(down_ dimen_,C) - rlabel(,"$C_1$" rjust "\unit{1}{\micro\farad}") + rlabel(,"$C_1$" rjust "\SI{1}{\micro\farad}") ground(,T) line from DP4.E to (DP4.E,R2.bottom) resistor(up_ to (Here,R2.top)) - rlabel(,"$R_9$" ljust "\unit{910}{}") + rlabel(,"$R_9$" ljust "\num{910}") dot resistor(down_ from DP3.E to (DP3.E,R3.bottom)) - llabel(,"$R_{10}$" ljust "\unit{910}{}") + llabel(,"$R_{10}$" ljust "\num{910}") dot line from R5.top to (R5,Q13.E) resistor(right_ elen_) - clabel(,"$R_4$" "\vphantom{x}" "\unit{100}{\kilo}") + clabel(,"$R_4$" "\vphantom{x}" "\SI{100}{\kilo{}}") line to (C4.end,Here) then to C4.end DP5: npair(L,11,10) with .E at (C4.end,DP1.E)+(elen_*0.8,0) @@ -149,7 +149,7 @@ define(`ppair',`[define(`m4lr',ifelse(`$1',,ljust,rjust)) dot(,,1) `"$+E_{CC}$"' ljust at last [].e resistor(down_ from DP6.S to (DP6.S,C2)) - rlabel(,"$R_{12}$" rjust "\unit{20}{}") + rlabel(,"$R_{12}$" rjust "\num{20}") dot { line to C2.e } line to D6.end @@ -162,7 +162,7 @@ define(`ppair',`[define(`m4lr',ifelse(`$1',,ljust,rjust)) dot(at (Vr,T)) resistor(left_ to (DP6.E,Here)) - clabel("$R_{15}$" "" "\unit{200}{}" ljust) + clabel("$R_{15}$" "" "\num{200}" ljust) line to (DP1.E,Here) dot diff --git a/graphics/circuit_macros/examples/Demultiplexer.m4 b/graphics/circuit_macros/examples/Demultiplexer.m4 new file mode 100644 index 0000000000..210b643441 --- /dev/null +++ b/graphics/circuit_macros/examples/Demultiplexer.m4 @@ -0,0 +1,44 @@ +.PS +# `Demultiplexer.m4' +log_init + + ifmpost(`command "verbatimtex {\sf etex"', + `ifpostscript(, + `command "{\sf"')') + + right_ + + Demux(4,DM1) + `"\tt Demux(4,DM1)"' at last [].s below + `"\sl Out0"' at last [].Out0.end +(6bp__,6bp__) + `"\sl Out3"' at last [].Out3.end +(6bp__,-6bp__) + `"\sl In"' at last [].In.end rjust wid 11bp__ + `"\sl Sel"' at last [].Sel.end ljust above + left_; Demux(4,,LOE) with .c at last [].c+(1.2,0) + `"\tt left\_; Demux(4,{,}LOE)"' at last [].s + (0,-20bp__) ht 10bp__ + `"\sl Sel"' at last [].Sel.end rjust + `"\sl Out0"' at last [].Out0.end +(-6bp__,6bp__) + `"\sl OE"' at last [].OE.end ljust + `"\sl In"' at last [].In.end+(0,5bp__) ljust + right_; Demux(4,,NOEBN2) with .c at last [].c+(1.2,0) + `"\tt (4,{,}NOEBN2)"' at last [].s below + `"\sl Sel0"' at last [].Sel0.end rjust + `"\sl Sel1"' at last [].Sel1.end ljust + `"\sl Out0"' at last [].Out0.end +(5bp__,6bp__) + `"\sl Out3"' at last [].Out3.end +(5bp__,6bp__) + `"\sl NOE"' at last [].NOE.end rjust + `"\sl In"' at last [].In.end above + down_; Demux(8,,L3,,28*L_unit) with .c at last [].c+(1.8,0) + `"\tt down\_; Demux(8,{,}L3,{,}28*L\_unit)"' at last [].s+(0,-15bp__) \ + ht 10bp__ wid 170bp__ + `"\sl Sel0"' at last [].Sel0.end rjust + `"\sl Sel2"' at last [].Sel2.end rjust below + `"\sl Out0"' at last [].Out0.end rjust + `"\sl Out7"' at last [].Out7.end ljust + `"\sl In"' at last [].In.end rjust + +ifmpost(`command "verbatimtex } etex"', +`ifpostscript(, +`command "}"')') + +.PE diff --git a/graphics/circuit_macros/examples/Dini.m4 b/graphics/circuit_macros/examples/Dini.m4 new file mode 100644 index 0000000000..5631a4822f --- /dev/null +++ b/graphics/circuit_macros/examples/Dini.m4 @@ -0,0 +1,193 @@ +.PS +# Dini.m4 +# This diagram can be produced using, e.g. +# m4 pdf.m4 Dini.m4 | dpic -d > Dini.pdf + +threeD_init +NeedDpicTools +scale = 1.5 +[ + viewazimuth = 0 # View angles in degrees + viewelevation = 20 + setview(viewazimuth,viewelevation,0) + + a = 1.5 + b = 0.25 + +define(`Dini', +`a*cos(`$1')*sin(`$2'),dnl + a*sin(`$1')*sin(`$2'),dnl + (a*(cos(`$2')+loge(tan((`$2')/2))) + b*(`$1'))') + + umin = 0; umax = 4*pi_ + vmin = 0.2; vmax = 2.0 + ugrid = 80; vgrid = 20 + + ur = umax-umin + vr = vmax-vmin +`define cu {umin+($1)/ugrid*ur}' +`define cv {vmin+($1)/vgrid*vr}' + +# Generate points and sort + n = -1 + for iu=0 to ugrid do { + for iv=0 to vgrid do { + n +=1 + ciu[n] = cu(iu) + civ[n] = cv(iv) + d[n] = dot3D(View3D,Dini(ciu[n],civ[n])) + ix[n] = n + } + } + dpquicksort(d,0,n,ix) + +# Draw the facets + linethick = 0.4 + du = ur/ugrid/2 + dv = vr/vgrid/2 + for i=0 to n do { + NE: project(Dini(ciu[ix[i]]+du,civ[ix[i]]+dv)) + SE: project(Dini(ciu[ix[i]]+du,civ[ix[i]]-dv)) + SW: project(Dini(ciu[ix[i]]-du,civ[ix[i]]-dv)) + NW: project(Dini(ciu[ix[i]]-du,civ[ix[i]]+dv)) + f = (-cos(ciu[ix[i]])+1)/2 + g = ( sin(ciu[ix[i]])+1)/2 + line from NE to SE then to SW then to NW then to NE \ + outlined rgbstring(f,g,0) shaded rgbstring(f,g,0) +# outlined rgbstring(0,0.5,0) shaded rgbstring(f,g,0) + } +] +# Icosahedron.m4 +[ +#threeD_init +#NeedDpicTools + # Computing facets is complicated, so list them. + # 60 vertices: +define(`m4x',-1) + array2(v,m4inx,0, 0, 1.021) + array2(v,m4inx,0.4035482, 0, 0.9378643) + array2(v,m4inx,-0.2274644, 0.3333333, 0.9378643) + array2(v,m4inx,-0.1471226, -0.375774, 0.9378643) + array2(v,m4inx,0.579632, 0.3333333, 0.7715933) + array2(v,m4inx,0.5058321, -0.375774, 0.8033483) + array2(v,m4inx,-0.6020514, 0.2908927, 0.7715933) + array2(v,m4inx,-0.05138057, 0.6666667, 0.7715933) + array2(v,m4inx,0.1654988, -0.6080151, 0.8033483) + array2(v,m4inx,-0.5217096, -0.4182147, 0.7715933) + array2(v,m4inx,0.8579998, 0.2908927, 0.4708062) + array2(v,m4inx,0.3521676, 0.6666667, 0.6884578) + array2(v,m4inx,0.7841999, -0.4182147, 0.5025612) + array2(v,m4inx,-0.657475, 0.5979962, 0.5025612) + array2(v,m4inx,-0.749174, -0.08488134, 0.6884578) + array2(v,m4inx,-0.3171418, 0.8302373, 0.5025612) + array2(v,m4inx,0.1035333, -0.8826969, 0.5025612) + array2(v,m4inx,-0.5836751, -0.6928964, 0.4708062) + array2(v,m4inx,0.8025761, 0.5979962, 0.2017741) + array2(v,m4inx,0.9602837, -0.08488134, 0.3362902) + array2(v,m4inx,0.4899547, 0.8302373, 0.3362902) + array2(v,m4inx,0.7222343, -0.6928964, 0.2017741) + array2(v,m4inx,-0.8600213, 0.5293258, 0.1503935) + array2(v,m4inx,-0.9517203, -0.1535518, 0.3362902) + array2(v,m4inx,-0.1793548, 0.993808, 0.1503935) + array2(v,m4inx,0.381901, -0.9251375, 0.2017741) + array2(v,m4inx,-0.2710537, -0.9251375, 0.3362902) + array2(v,m4inx,-0.8494363, -0.5293258, 0.2017741) + array2(v,m4inx,0.8494363, 0.5293258, -0.2017741) + array2(v,m4inx,1.007144, -0.1535518, -0.06725804) + array2(v,m4inx,0.2241935, 0.993808, 0.06725804) + array2(v,m4inx,0.8600213, -0.5293258, -0.1503935) + array2(v,m4inx,-0.7222343, 0.6928964, -0.2017741) + array2(v,m4inx,-1.007144, 0.1535518, 0.06725804) + array2(v,m4inx,-0.381901, 0.9251375, -0.2017741) + array2(v,m4inx,0.1793548, -0.993808, -0.1503935) + array2(v,m4inx,-0.2241935, -0.993808, -0.06725804) + array2(v,m4inx,-0.8025761, -0.5979962, -0.2017741) + array2(v,m4inx,0.5836751, 0.6928964, -0.4708062) + array2(v,m4inx,0.9517203, 0.1535518, -0.3362902) + array2(v,m4inx,0.2710537, 0.9251375, -0.3362902) + array2(v,m4inx,0.657475, -0.5979962, -0.5025612) + array2(v,m4inx,-0.7841999, 0.4182147, -0.5025612) + array2(v,m4inx,-0.9602837, 0.08488134, -0.3362902) + array2(v,m4inx,-0.1035333, 0.8826969, -0.5025612) + array2(v,m4inx,0.3171418, -0.8302373, -0.5025612) + array2(v,m4inx,-0.4899547, -0.8302373, -0.3362902) + array2(v,m4inx,-0.8579998, -0.2908927, -0.4708062) + array2(v,m4inx,0.5217096, 0.4182147, -0.7715933) + array2(v,m4inx,0.749174, 0.08488134, -0.6884578) + array2(v,m4inx,0.6020514, -0.2908927, -0.7715933) + array2(v,m4inx,-0.5058321, 0.375774, -0.8033483) + array2(v,m4inx,-0.1654988, 0.6080151, -0.8033483) + array2(v,m4inx,0.05138057, -0.6666667, -0.7715933) + array2(v,m4inx,-0.3521676, -0.6666667, -0.6884578) + array2(v,m4inx,-0.579632, -0.3333333, -0.7715933) + array2(v,m4inx,0.1471226, 0.375774, -0.9378643) + array2(v,m4inx,0.2274644, -0.3333333, -0.9378643) + array2(v,m4inx,-0.4035482, 0, -0.9378643) + array2(v,m4inx,0, 0, -1.021) + + # 12 pentagons +undefine(`m4x') +array2(p,m4inx,0,3,8,5,1) +array2(p,m4inx,2,7,15,13,6) +array2(p,m4inx,4,10,18,20,11) +array2(p,m4inx,9,14,23,27,17) +array2(p,m4inx,12,21,31,29,19) +array2(p,m4inx,16,26,36,35,25) +array2(p,m4inx,22,32,42,43,33) +array2(p,m4inx,24,30,40,44,34) +array2(p,m4inx,28,39,49,48,38) +array2(p,m4inx,37,47,55,54,46) +array2(p,m4inx,41,45,53,57,50) +array2(p,m4inx,51,52,56,59,58) + + # 20 hexagons +undefine(`m4x') +array2(h,m4inx,0,1,4,11,7,2) +array2(h,m4inx,0,2,6,14,9,3) +array2(h,m4inx,1,5,12,19,10,4) +array2(h,m4inx,3,9,17,26,16,8) +array2(h,m4inx,5,8,16,25,21,12) +array2(h,m4inx,6,13,22,33,23,14) +array2(h,m4inx,7,11,20,30,24,15) +array2(h,m4inx,10,19,29,39,28,18) +array2(h,m4inx,13,15,24,34,32,22) +array2(h,m4inx,17,27,37,46,36,26) +array2(h,m4inx,18,28,38,40,30,20) +array2(h,m4inx,21,25,35,45,41,31) +array2(h,m4inx,23,33,43,47,37,27) +array2(h,m4inx,29,31,41,50,49,39) +array2(h,m4inx,32,34,44,52,51,42) +array2(h,m4inx,35,36,46,54,53,45) +array2(h,m4inx,38,48,56,52,44,40) +array2(h,m4inx,42,51,58,55,47,43) +array2(h,m4inx,48,49,50,57,59,56) +array2(h,m4inx,53,54,55,58,59,57) + + viewazimuth = -10 # View angles in degrees + viewelevation = 40 + setview(viewazimuth,viewelevation,0) + + n = 0 # Find and draw the visible hexagons + for i=1 to 20 do { # The normal is the line to the center + for_(1,3,1,`a[m4x] = (v[h[i,1],m4x] + v[h[i,4],m4x])/2') + if dot3D(View3D,a[1],a[2],a[3]) >= 0 then { n +=1; ih[n] = i } + } + for i=1 to n do { + for j=1 to 6 do { x[j]=h[ih[i],j] } + line from project((v[x[1],1]),(v[x[1],2]),(v[x[1],3]))\ + for_(2,6,1,`to project((v[x[m4x],1]),(v[x[m4x],2]),(v[x[m4x],3]))\')\ + to project((v[x[1],1]),(v[x[1],2]),(v[x[1],3])) thick 0.2 fill_(0.95) + } + m = 0 + for i=1 to 12 do { # Visible pentagons + for_(1,3,1,`a[m4x] = 0; for j=1 to 5 do { a[m4x] += v[p[i,j],m4x] }') + if dot3D(View3D,a[1]/5,a[2]/5,a[3]/5) >= 0 then { m +=1; ip[m] = i } + } + for i=1 to m do { + for j=1 to 5 do { x[j]=p[ip[i],j] } + line from project((v[x[1],1]),(v[x[1],2]),(v[x[1],3])) \ + for_(2,5,1,`to project((v[x[m4x],1]),(v[x[m4x],2]),(v[x[m4x],3]))\')\ + to project((v[x[1],1]),(v[x[1],2]),(v[x[1],3])) thick 0.2 fill_(0) + } +] scaled 2.5 with .sw at last [].se+(1,0) +.PE diff --git a/graphics/circuit_macros/examples/Diodes.m4 b/graphics/circuit_macros/examples/Diodes.m4 new file mode 100644 index 0000000000..360d8e9d9e --- /dev/null +++ b/graphics/circuit_macros/examples/Diodes.m4 @@ -0,0 +1,48 @@ +.PS +# `Diodes.m4' +cct_init +movewid = 2pt__ +{ {diode ; move ; "`{\tt diode}'" ljust} + move down 0.2; right_ + {diode(,S) ; move ; "`{\tt diode(,S)}'" ljust} + move down 0.2; right_ + {diode(,V) ; move ; "`{\tt diode(,V)}'" ljust} + move down 0.2; right_ + {diode(,v) ; move ; "`{\tt diode(,v)}'" ljust} + move down 0.2; right_ + {diode(,w) ; move ; "`{\tt diode(,w)}'" ljust} + move down 0.2; right_ + {diode(,B) ; move ; "`{\tt diode(,B)}'" ljust} + move down 0.2; right_ + {diode(,G) ; move ; "`{\tt diode(,G)}'" ljust} + } + + move right_ 2.0 +{ {diode(,K) ; move ; "`{\tt diode(,K)}'" ljust} + move down 0.2; right_ + {diode(,ZK) ; move ; "`{\tt diode(,ZK)}'" ljust} + move down 0.2; right_ + {diode(,CR) ; move ; "`{\tt diode(,CR)}'" ljust} + move down 0.2; right_ + {diode(,L) ; move ; "`{\tt diode(,L)}'" ljust} + move down 0.2; right_ + {diode(,F) ; move ; "`{\tt diode(,F)}'" ljust} + move down 0.2; right_ + {diode(,Sh) ; move ; "`{\tt diode(,Sh)}'" ljust} + move down 0.2; right_ + {diode(,D) ; move ; "`{\tt diode(,D)}'" ljust} + } + + move right_ 2.0 +{ {diode(,Z,RE) ; move ; "`{\tt diode(,Z,RE)}'" ljust} + move down 0.25; right_ + {diode(,T) ; move ; "`{\tt diode(,T)}'" ljust} + move down 0.30; right_ + {diode(,P) ; move ; "`{\tt diode(,P)}'" ljust} + move down 0.30; right_ + {diode(,LE) ; move ; "`{\tt diode(,LE)}'" ljust} + move down 0.15; right_ + {diode(,LER) ; move ; "`{\tt diode(,LER)}'" ljust} + } + +.PE diff --git a/graphics/circuit_macros/examples/Emarrows.m4 b/graphics/circuit_macros/examples/Emarrows.m4 new file mode 100644 index 0000000000..c4b2131902 --- /dev/null +++ b/graphics/circuit_macros/examples/Emarrows.m4 @@ -0,0 +1,30 @@ +.PS +# `Emarrows.m4' +cct_init + hskip = 0.6 +[ + { em_arrows(N) + box dotted wid last [].wid ht last [].ht at last [].c + thinlines_ + arrow <- left 0.15 from last [].Head; "\sl Head" wid 0.31 rjust + arrow <- down 0.12 from last [].Tail; "\sl Tail" below + "\sl A1" rjust below at last [].A1.c + "\sl A2" ljust above at last [].A2.c + thicklines_ + move down 0.25 from last [].s + move up 0.2 from last [].n + "\tt em\_arrows(N)" at last [].s+(0,-0.20) below } + { em_arrows(ND,45) with .sw at last [].se+(hskip*1.5,0) + "\tt em\_arrows(ND,45)" at last [].s below } + { em_arrows(I) with .sw at last [].se+(hskip,0) + "\tt $\ldots$(I)" at last [].s below } + { em_arrows(ID) with .sw at last [].se+(hskip,0) + "\tt $\ldots$(ID)" at last [].s below } + { em_arrows(E) with .sw at last [].se+(hskip,0) + "\tt $\ldots$(E)" at last [].s below } + { em_arrows(ED) with .sw at last [].se+(hskip,0) + "\tt $\ldots$(ED)" at last [].s below } + ] +#showbox_ + +.PE diff --git a/graphics/circuit_macros/examples/Fuses.m4 b/graphics/circuit_macros/examples/Fuses.m4 new file mode 100644 index 0000000000..b308e5aadb --- /dev/null +++ b/graphics/circuit_macros/examples/Fuses.m4 @@ -0,0 +1,32 @@ +.PS +# `Fuses.m4' +cct_init + +movewid = 0.25 + + {fuse ; {"`{\tt fuse}'" at last line.c+(0,-0.2)} + move + fuse(,D) ; {"`{\tt fuse(,D)}'" at last line.c+(0,-0.2)} + move + fuse(,B) ; {"`{\tt fuse(,B)}'" at last line.c+(0,-0.2)} + move + fuse(,C) ; {"`{\tt fuse(,C)}'" at last line.c+(0,-0.2)} + move + fuse(,S) ; {"`{\tt fuse(,S)}'" at last line.c+(0,-0.2)} + move + fuse(,HB) ; {"`{\tt fuse(,HB)}'" at last line.c+(0,-0.2)} + } + move down; right_ + fuse(,HC,0.5,0.3) ; {"`{\tt (,HC,0.5,0.3)}'" at last line.c+(0,-0.25)} + move + cbreaker; {"`{\tt cbreaker}'" at last line.c+(0,-0.25)} + move + cbreaker(,R); {"`{\tt cbreaker(,R)}'" at last line.c+(0,-0.25)} + move + cbreaker(,{,}D); {"`{\tt $\ldots$(,{,}D)}'" at last line.c+(0,-0.25)} + move + cbreaker(,{,}T); {"`{\tt $\ldots$(,{,}T)}'" at last line.c+(0,-0.25)} + move + cbreaker(,{,}TS); {"`{\tt $\ldots$(,{,}TS)}'" at last line.c+(0,-0.25)} + +.PE diff --git a/graphics/circuit_macros/examples/GnuMakefile b/graphics/circuit_macros/examples/GnuMakefile deleted file mode 100644 index 4b7d99c453..0000000000 --- a/graphics/circuit_macros/examples/GnuMakefile +++ /dev/null @@ -1,119 +0,0 @@ -# Makefile for Circuit macros (based on Version 8.5.1) -# Use GNU make. - -SRC = $(wildcard *.m4) -TARGET = $(SRC:%.m4=%.$(MODE)) - -CMLIBDIR = /usr/local/share/Circuit_macros -CMLIBDIR = $$(HOME)/lib -CMLIBS = liblog.m4 -CMLIBS = libgen.m4 - -DPIC = dpic -GPIC = pic -M4 = m4 -I $(CMLIBDIR) - -# select one of tex, eps, pdf, svg, mp or fig -MODE = tex - -# select one of pstricks, pgf, mfpic, latex or tpic -# (for .tex output) -TEXMODE = pgf -TEXMODE = pstricks - -# select one of raw or psfrag -# (for .eps output) -EPSMODE = raw - - - -# ---- DO NOT CHANGE THE FOLLOWING LINES ---- -PIC = $(DPIC) - -# for .tex -TPIC = $(PIC) -ifeq ($(TEXMODE),pstricks) - TPICOPT = -P - TCMDRIVER = $(TEXMODE).m4 -else ifeq ($(TEXMODE),pgf) - TPICOPT = -g - TCMDRIVER = $(TEXMODE).m4 -else ifeq ($(TEXMODE),mfpic) - TPICOPT = -m - TCMDRIVER = $(TEXMODE).m4 -else ifeq ($(TEXMODE),latex) - TPICOPT = -e - TCMDRIVER = -else ifeq ($(TEXMODE),tpic) - TPIC = $(GPIC) - TPICOPT = -t - TCMDRIVER = gpic.m4 -else - TERROR = TRUE -endif - -# for .eps -ifeq ($(EPSMODE),raw) - EPICOPT = -r - ECMDRIVER = postscript.m4 -else ifeq ($(EPSMODE),psfrag) - EPICOPT = -f - ECMDRIVER = $(EPSMODE).m4 -else - EERROR = TRUE -endif - - -.SUFFIXES: .m4 .tex .eps .pdf .svg .mp .fig - -.m4.tex: -ifeq ($(TERROR),TRUE) - @echo "Invalid TEXMODE:" $(TEXMODE) - @exit 1 \ -else - $(M4) $(CMLIBS) $(TCMDRIVER) $< > $*.pic - $(TPIC) $(TPICOPT) $*.pic > $*.tex -endif - -.m4.eps: -ifeq ($(EERROR),TRUE) - echo "Invalid EPSMODE:" $(EPSMODE) - @exit 1 \ -else - $(M4) $(CMLIBS) $(ECMDRIVER) $< > $*.pic - $(PIC) $(EPICOPT) $*.pic > $*.eps -endif - -.m4.pdf: - $(M4) $(CMLIBS) $< > $*.pic - $(PIC) -d $*.pic > $*.pdf -.m4.svg: - $(M4) $(CMLIBS) svg.m4 $< > $*.pic - $(PIC) -v $*.pic > $*.svg -.m4.mp: - $(M4) $(CMLIBS) mpost.m4 $< > $*.pic - $(PIC) -s $*.pic > $*.mp -.m4.fig: - $(M4) $(CMLIBS) xfig.m4 $< > $*.pic - $(PIC) -x $*.pic > $*.fig - --include GNUmakefile.local - -all: $(TARGET) - -clean: - rm -f *~ - rm -f $(SRC:%.m4=%.pic) - -distclean: clean - -# use carefully!!! -dodistclean: distclean - rm -f $(SRC:%.m4=%.tex) - rm -f $(SRC:%.m4=%.eps) - rm -f $(SRC:%.m4=%.pdf) - rm -f $(SRC:%.m4=%.svg) - rm -f $(SRC:%.m4=%.mp) - rm -f $(SRC:%.m4=%.fig) - --include GNUmakefile.localdep diff --git a/graphics/circuit_macros/examples/Grounds.m4 b/graphics/circuit_macros/examples/Grounds.m4 new file mode 100644 index 0000000000..13b4730b80 --- /dev/null +++ b/graphics/circuit_macros/examples/Grounds.m4 @@ -0,0 +1,39 @@ +.PS +# `Grounds.m4' +cct_init + +sep = 0.65 +Ground: ground + move right sep +GT: ground(,T) + move right sep +GF: ground(,,F) + move right sep +GE: ground(,,E) + move right sep + +B: Here+(0,-0.5) ; { + "{\tt `ground'}" wid 32bp__ at (Ground,B) + "{\tt `ground'(,T)}" at (GT,B)+(0,7bp__) + "{\tt (,{,}F)}" at (GF,B) + "{\tt (,{,}E)}" at (GE,B)} + + +GS: ground(,,S) + move right sep +GS90: [ground(,,S,90) ] with .n at Here + move right sep from GS90.n +GQ: ground(,,Q) + move right sep +GL: ground(,,L) + move right sep +GP: ground(,,P) + +C: Here+(0,-0.5) + "{\tt (,{,}S)}" at (GS,C) + "{\tt (,{,}S,90)}" at (GS90,C) + "{\tt (,{,}Q)}" at (GQ,C) + "{\tt (,{,}L)}" at (GL,C) + "{\tt (,{,}P)}" at (GP,C) + +.PE diff --git a/graphics/circuit_macros/examples/Headers.m4 b/graphics/circuit_macros/examples/Headers.m4 new file mode 100644 index 0000000000..a4e1abce3b --- /dev/null +++ b/graphics/circuit_macros/examples/Headers.m4 @@ -0,0 +1,37 @@ +.PS +# Headers.m4 +log_init + + Header + {"\sl P1" at last [].P1 rjust + `"\tt Header"' at last [].s+(0,-10pt__) + "\sl P2" at last [].P2 rjust} + + Header(2,3,8mm__,10mm__) with .nw at last [].ne+(0.75,-0.05) + {"\sl P1" at last [].P1 rjust + `"\tt Header(2,3,8mm\_\_,10mm\_\_)"' at last [].s+(0,-10pt__) + "\sl P2" at last [].P2 ljust + "\sl P5" at last [].P5 rjust + "\sl P6" at last [].P6 ljust} + + left_ + Header(2,4,,,fill_(0.9)) with .sw at last [].se+(0.75,0) + {"\sl P1" at last [].P1 rjust_ + `"\tt left\_; Header(2,4,{,},fill\_(0.9))"' at last [].s+(0,-20pt__) + "\sl P8" at last [].P8 ljust_} + + down_ + Header(2,8) with .nw at last [].ne+(0.75,0) + {"\sl P1" at last [].P1 ljust + "\sl P2" at last [].P2 ljust + `"\tt down\_; Header(2,8)" ' at last [].s+(0,-10pt__) + "\sl P15" at last [].P15 rjust + "\sl P16" at last [].P16 rjust} + {thinlines_ + arrow <- right 0.15 from last [].PinP1.e + `"\sl PinP1"' ljust + arrow <- right 0.15 from last [].PinP2.e + `"\sl PinP2"' ljust + thicklines_ } + +.PE diff --git a/graphics/circuit_macros/examples/Heathkit.m4 b/graphics/circuit_macros/examples/Heathkit.m4 index 5cf7ca38d2..8d3ec5ad00 100644 --- a/graphics/circuit_macros/examples/Heathkit.m4 +++ b/graphics/circuit_macros/examples/Heathkit.m4 @@ -67,7 +67,7 @@ define Pad { P`$1': box fill_(1) "$1" } GRN2: line from P3.e to L2.end "GRN" above spline <-> from GRN2.end+(-g,0) up 2.5*g right 0.5*g then up 5*g left g \ then up 2.5*g right 0.5*g - box invis fill_(1) wid 3*g ht g "\unit{6}{\hbox{VAC}}" at L2.c-(2*g,0) + box invis fill_(1) wid 3*g ht g "\SI{6}{VAC}" at L2.c-(2*g,0) Pad(4) at P3-(0,3*g) line right_ 3*g from P4.e "BRN" above arrow down_ 2*g ht arrowht*2/3 @@ -96,7 +96,7 @@ define(`socket',`[ line right_ g; PL: dot line from BLKYEL.end right g then to Here+(0,-g) fuse(down_ 3*g,D) - rlabel(,"\unit{3}{\ampere} FUSE" rjust "SLOW BLOW") + rlabel(,"\SI{3}{\ampere} FUSE" rjust "SLOW BLOW") line to (Here.x,int(Here.y/g)*g-g); dot Sckt1: socket at Here+(5*g,0) line from Sckt1.w to (PL,Sckt1); A: dot; "A" rjust @@ -117,7 +117,7 @@ define(`plug',`[ w = dimen_*2/3; q = 0.25*w line from T2 to (T2,F.c)-(0,2*g) ]') PP: plug with .F.c at Sckt3+(0,-8*g) - "\unit{120}{\hbox{VAC}}" ljust "\unit{50/60}{\hertz}" ljust at PP.e + "\SI{120}{VAC}" ljust "\SI{50/60}{\hertz}" ljust at PP.e define(`pwrswitch',`[ right; circlerad = 1.75*g/2 C1: circle "1" @@ -154,7 +154,7 @@ define(`pwrswitch',`[ right; circlerad = 1.75*g/2 Pad(22) at Board.sw+(0,3*g) R514: resistor(right_ 8*g from P22.e); llabel(,"R514") - rlabel(,"\unit{680}{\kilo}") + rlabel(,"\SI{680}{\kilo{}}") dot; { ground } line to (P23,Here) then to P23.n @@ -168,7 +168,7 @@ define(`pwrswitch',`[ right; circlerad = 1.75*g/2 diode(from BE left_ d1h down_ d1h); llabel(,,"D509") BS: dot diode(left_ d1h up_ d1h); llabel(D507) - capacitor(down_ from BN to BS,C); llabel("C507",,\unit{.22}{}) + capacitor(down_ from BN to BS,C); llabel("C507",,\num{.22}) line from BE to P24.n line from BN to P2.w line from BS to P1.w @@ -192,17 +192,17 @@ define(`hbi_tr',`[ linewid = linewid*4/4.16 # Interior circuits line from P6.w left 2*g; ground line from P5.w left 4*g; dot - { C504: capacitor(down_ 4*g,C); llabel("C504",,\unit{.22}{}); ground(,T) } + { C504: capacitor(down_ 4*g,C); llabel("C504",,\num{.22}); ground(,T) } D504: diode(left_ 5*g); rlabel(,"D504"); dot { C505: capacitor(down_ to (Here,C504.end),C+L) - rlabel("C505",\unit{100}{},\unit{75}{\volt}); ground(,T) } + rlabel("C505",\num{100},\SI{75}{\volt}); ground(,T) } line right_ to (Here,P7); dot { D503: reversed(`diode',to (D504.start,Here)); llabel(,"D503") line to P7.w } d3 = lin_leng(L3) spline <-> from C504.start+(g/2,0) \ up d3/4 right g/4 then up d3*2/4 left g/2 then up d3/4 right g/4 - box invis fill_(1) ht g wid 4*g "\unit{100}{\hbox{VAC}}" \ + box invis fill_(1) ht g wid 4*g "\SI{100}{VAC}" \ at last spline.c+(-g,0) down_ @@ -211,11 +211,11 @@ define(`hbi_tr',`[ linewid = linewid*4/4.16 line from Q503.B.s to (Q503.B.x,Q503.E.y-4*g) R513: resistor(down_ 5*g); llabel(,"R513" ljust "1500"); ground(,T) line from P19.e to (BW-(2*g,0),P19) then up Q503.E.y-P19.y+2*g - R511: resistor(right_ 5*g); llabel(,"R511"); rlabel(,\unit{470}{}); + R511: resistor(right_ 5*g); llabel(,"R511"); rlabel(,\num{470}); line to (Q503.E,Here) then to Q503.E.n line from P20.e to (BW,P20) then up R513.end.y-P20.y resistor(up_ lin_leng(R513)) - rlabel(,"R512" ljust "5600" ljust "\unit{1}{\watt}") + rlabel(,"R512" ljust "5600" ljust "\SI{1}{\watt}") line to (Here,Q503.B) then to Q503.B.w "Q503" "S2091 HI TEMP" "CONTROL" at Q503.E+(1.5*g,4*g) D505: reversed(`diode',right_ from Q503.E.e to (C504,Q503.E)); llabel(,"D505") @@ -226,23 +226,23 @@ define(`hbi_tr',`[ linewid = linewid*4/4.16 { Pad(8) at (Here,Board.n) } { line to P8.s } R505: resistor(down_ to (Here,P6)) - llabel(,"R505" ljust "\unit{12}{\kilo}"); dot + llabel(,"R505" ljust "\SI{12}{\kilo{}}"); dot { C503: capacitor(down_ to (Here,C505.end),C+L) - rlabel(,"C503" rjust "100" rjust "\unit{70}{\volt}") + rlabel(,"C503" rjust "100" rjust "\SI{70}{\volt}") ground(,T) } right_ Q502: hbi_tr(,R) with .B at (R511.start,Here) line from Q502.C.e to R505.start line from Q502.B.e to R505.end R504: resistor(down_ from Q502.B.s to (Q502.B,C505.end)) - rlabel(,"R504" rjust "\unit{51}{\kilo}"); ground(,T) + rlabel(,"R504" rjust "\SI{51}{\kilo{}}"); ground(,T) "Q502" "TA7311" "REGULATOR" "CONTROL" at Q502.C+(-1*g,3.5*g) Pad(9) at (Q502.E,Board.n) line from Q502.E.n to P9.s Pad(10) at (Q502.B-(9*g,0),Board.n) R502: resistor(left_ from Q502.E.w to (P10,Q502.E)) - rlabel(,"R502"); llabel(,\unit{150}{}); dot + rlabel(,"R502"); llabel(,\num{150}); dot Pad(11) at (Board.w,Q502.E) Pad(14) at P11+(0,2.5*g) @@ -275,41 +275,41 @@ define(`hbi_tr',`[ linewid = linewid*4/4.16 { line to P10.s } { resistor(down_ 5*g) llabel(, - "R510" ljust "225" ljust "\unit{10}{\watt}" ljust "\unit{5}{\hbox{\%}}") + "R510" ljust "225" ljust "\SI{10}{\watt}" ljust "\SI{5}{\hbox{\%}}") line to Q504.C.n } R503:resistor(left_ 10*g); rlabel(,"R503") - { "290" "\unit{10}{\watt} \unit{5}{\hbox{\%}}" at last [].s+(0,-1.3*g) } + { "290" "\SI{10}{\watt} \SI{5}{\hbox{\%}}" at last [].s+(0,-1.3*g) } dot line to (Here,Q504.B) - resistor(right_ to Q504.B.w); llabel(,"R507"); rlabel(,\unit{100}{}) + resistor(right_ to Q504.B.w); llabel(,"R507"); rlabel(,\num{100}) line from P15.e to R503.end # "Q504" "40409" "REGULATOR" at Q504.C+(3.5*g,3*g) "Q504" "40409" "REGULATOR" at Q504.n+(-2*g,3*g) resistor(left_ from R502.end to (R503.end,P11)); rlabel(,"R501") - {"390" "\unit{5}{\watt} \unit{5}{\hbox{\%}}" at last [].s+(0,-1.3*g)} + {"390" "\SI{5}{\watt} \SI{5}{\hbox{\%}}" at last [].s+(0,-1.3*g)} line to P11.e resistor(right_ from P16.e to (R514.end,P16)); llabel(,"R506") - rlabel(,\unit{82}{}) + rlabel(,\num{82}) line down P16.y-P17.y; dot dot(at (R514.end,P11)) C501: capacitor(down_ 6*g,C+); llabel("C501") - {"100" ljust "\unit{30}{\volt}" ljust at last [].s+(0,-g) below } + {"100" ljust "\SI{30}{\volt}" ljust at last [].s+(0,-g) below } ground(,T) dot(at (Here.x+4*g,P11.y)) ZD501: reversed(`diode',down_ lin_leng(C501),Z); llabel("ZD501"); ground(,T) dot(at (R514.end,P15)) C502: capacitor(down_ 6*g,C+); llabel("C502") - {"100" ljust "\unit{30}{\volt}" ljust at last [].s+(0,-g) below } + {"100" ljust "\SI{30}{\volt}" ljust at last [].s+(0,-g) below } ground(,T) dot(at (Here.x+4*g,P15.y)) ZD502: reversed(`diode',down_ lin_leng(C502),Z); llabel("ZD502"); ground(,T) line from (C502,P17) to (C502,R508.start+(0,g)) C506: capacitor(down_ to (Here,R508.end),C+); llabel("C506") - {"100" ljust "\unit{30}{\volt}" ljust at last [].s+(0,-g) below } + {"100" ljust "\SI{30}{\volt}" ljust at last [].s+(0,-g) below } ground(,T) # Left-side boxes @@ -326,27 +326,27 @@ define(`hbi_tr',`[ linewid = linewid*4/4.16 line left 3*g from P17.w "RED" above line left 3*g from P18.w "WHT-" "RED" above box with .e at (Here,0.5 between P17 and P18) \ - "\shortstack[l]{\unit{12.7}{\volt} SOURCE\\ TO MULTIPLEX}" + "\shortstack[l]{\SI{12.7}{\volt} SOURCE\\ TO MULTIPLEX}" line left 3*g from P16.w "WHT" above box with .se at Here+(0,-g) \ - "\shortstack[l]{\unit{12}{\volt} SOURCE\\ TO FM TUNER\\ SOURCE SWITCH}" + "\shortstack[l]{\SI{12}{\volt} SOURCE\\ TO FM TUNER\\ SOURCE SWITCH}" line left 3*g from P15.w "ORG" above box ht 3*g with .e at Here \ - "\shortstack[l]{\unit{15}{\volt} SOURCE\\ TO FM TUNER}" + "\shortstack[l]{\SI{15}{\volt} SOURCE\\ TO FM TUNER}" line left 3*g from P13.w "BLU" above line left 3*g from P12.w " WHT-" "RED" line left 3*g from P11.w "RED" above box ht 6*g with .e at (Here,P12) \ - "\shortstack[l]{\unit{27}{\volt} SOURCE\\ TO CONTROL\\ PREAMP AND\\ PWR\ + "\shortstack[l]{\SI{27}{\volt} SOURCE\\ TO CONTROL\\ PREAMP AND\\ PWR\ AMPLIFIER}" line left 3*g from P14.w { "WHT-" "GRY-" "GRN" at last line.c+(0,2*g) } box with .se at Here+(0,-g) \ - "\shortstack[l]{\unit{50}{\volt} SOURCE\\ TO PHONO\\ PREAMP}" + "\shortstack[l]{\SI{50}{\volt} SOURCE\\ TO PHONO\\ PREAMP}" iflatex(`ifpsfrag(,`latexcommand(})')') diff --git a/graphics/circuit_macros/examples/Jack.m4 b/graphics/circuit_macros/examples/Jack.m4 new file mode 100644 index 0000000000..b9a005d279 --- /dev/null +++ b/graphics/circuit_macros/examples/Jack.m4 @@ -0,0 +1,78 @@ +.PS +# `Jack.m4' +cct_init + +P: [ + P1: plug + "\sl A" wid 0.1 at P1.A rjust + "\sl B" at P1.B rjust + "\sl TB" at P1.TB ljust above + "\sl TA" at P1.TA ljust below + P2: plug(,R) with .B at P1.A+(0.85,0) + "\sl A" wid 0.1 at P2.A rjust + "\sl B" at P2.B rjust +# P3: plug(L) with .A at P2.A+(1,0) +# "\sl A" wid 0.1 at P3.A ljust +# "\sl B" at P3.B ljust + P4: plug(,3) with .A at P2.B+(0.85,0) + "\sl A" at P4.A rjust + "\sl B" at P4.B rjust + "\sl C" at P4.C rjust + P5: plug(L,3R) with .A at P4.A+(1,0) + "\sl A" wid 0.1 at P5.A ljust + "\sl B" at P5.B ljust + "\sl C" at P5.C ljust + `"\tt plug"' below at P1.s+(0,-0.1) + `"\tt plug(,R)"' below at P2.s+(0,-0.1) +# `"\tt plug(L)"' below at P3.s+(0,-0.1) + `"\tt plug(,3)"' below at P4.s+(-0.1,-0.1) + `"\tt plug(L,3R)"' below at P5.s+(0.1,-0.1) +] + +L: [ right_ + J1: jack + thinlines_ + "\sl L" wid 0.1 rjust at J1.L + arrow <- right 0.1 from J1.F; "\sl F" ljust + arrow <- down 0.1 from J1.G then left 0.1 ; "\sl G" rjust + thicklines_ + J2:[K2: jack(,LMBS) #with .F at J1.F+(1.2,0) + thinlines_ + "\sl L" rjust at K2.L + arrow <- from K2.LM left 0.25; "\sl LM" wid 0.18 rjust + arrow <- from K2.LB left 0.25; "\sl LB" rjust + "\sl S" rjust at K2.S + thicklines_ ] with .K2.F at J1.F+(1.2,0) + J3: jack(L,RLS) with .F at J2.K2.F+(0.4,0) + thinlines_ + "\sl L" ljust at J3.L + "\sl S" ljust at J3.S + thicklines_ + J4: jack(L,RLBLMLMS) with .F at J3.F+(1.1,0) + thinlines_ + "\sl L1" ljust at J4.L1 + arrow <- right 0.3 from J4.LM1; "\sl LM1" ljust + "\sl L2" ljust at J4.L2 + arrow <- right 0.3 from J4.LM2; "\sl LM2" wid 0.2 ht 11pt__ ljust + "\sl S" ljust at J4.S + "\sl L" ljust at J4.L + arrow <- right 0.2 from J4.LB ; "\sl LB" ljust + right_ + J5: jack(,RSBSMLB) with .F at J4.F+(1.95,0) + thinlines_ + "\sl L" rjust at J5.L + "\sl S" rjust at J5.S + "\sl S1" rjust at J5.S1 + arrow <- left 0.3 from J5.SM1; "\sl SM1" rjust + spline 0.5 <- left 0.25 then left 0.1 down 0.05 from J5.LB; "\sl LB" rjust + spline 0.5 <- left 0.25 then left 0.1 up 0.05 from J5.SB; "\sl SB" rjust + thicklines_ + + `"\tt jack"' ht 0.15 below at J1.s+(0,-0.15) + `"\tt jack(,LMBS)"' below at (J2,last "") + `"\tt ..(L,RLS)"' below at (J3,last "") + `"\tt ..(L,RLBLMLMS)"' below at (J4,last "") + `"\tt ..(,RSBSMLB)"' below at (J5,last "") +] with .nw at P.sw #+ (0,0.1) + +.PE diff --git a/graphics/circuit_macros/examples/Logic.m4 b/graphics/circuit_macros/examples/Logic.m4 new file mode 100644 index 0000000000..d42e02768e --- /dev/null +++ b/graphics/circuit_macros/examples/Logic.m4 @@ -0,0 +1,62 @@ +.PS +# Logic.m4 +cct_init +ifdef(`AND_gate',,`include(liblog.m4)') +xgap = 0.6 +[ dmov = 0.4 +{ {AND_gate ; "{\tt AND\_gate}" ljust at last [].w + (xgap,0)} + move down dmov; right_ + {OR_gate ; "{\tt OR\_gate}" ljust at last [].w + (xgap,0)} + move down dmov; right_ + {BUFFER_gate ; "{\tt BUFFER\_gate}" ljust at last [].w + (xgap,0)} + move down dmov; right_ + {XOR_gate ; "{\tt XOR\_gate}" ljust at last [].w + (xgap,0)} + } + + move right_ 140pt__ +{ { NAND_gate; "{\tt NAND\_gate}" ljust at last [].w + (xgap,0) } + move down dmov; right_ + { Gate: NOR_gate(3) + "{\tt NOR\_gate(3)}" ljust at last [].w + (xgap,0) + thinlines_ + spline <- from Gate.Out right arrowht*2.0 \ + then up 0.15 then right 0.05 + "{\tt Out}" ljust + spline <- from Gate.N_Out down arrowht*2.0 \ + then right 0.1+arrowht*1.5+NOT_rad down 0.15-arrowht*2.0 + "{\tt N\_Out}" ljust + for_(1,3,1, + `arrow <- left 0.2 down 0.05 from Gate.In`'m4x + "{\tt In`'m4x\/}" rjust at Here+(0,(2-m4x)*0.02)') + } + thicklines_ + move down dmov; right_ + { NOT_gate ; "{\tt NOT\_gate}" ljust at last [].w + (xgap,0) } + move down dmov; right_ + {Gate: NXOR_gate(NPN); "{\tt NXOR\_gate(NPN)}" ljust at last [].w + (xgap,0) + for_(1,3,1, + `arrow <- left 0.2 up 0.05 from Gate.In`'m4x + "{\tt In`'m4x\/}" rjust at Here+(0,(2-m4x)*0.02)') + } +} + move right_ 140pt__ +{ {NAND_gate(,B) ; "{\tt NAND\_gate(,B)}" ljust at last [].w + (xgap,0)} + { line invis right 1.6 from last [].se then down 1} + move down dmov; right_ + move left N_diam*L_unit; right_ + {NOR_gate(3,NB) ; "{\tt NOR\_gate(3,NB)}" ljust at (last "",last []) } + move down dmov; right_ + {BOX_gate(PN,N,,,=1) + "{\tt BOX\_gate(PN,N,{,},=1)}" ljust at (last "",last []) + line left 0.15 from last [].In1 + line left 0.15-NOT_rad*2 from last [].In2 + line right 0.15 from last [].Out } + move down dmov; move right_ N_diam*L_unit + {BOX_gate(PP,N,,,=) + "{\tt BOX\_gate(PP,N,{,},=)}" ljust at (last "",last []) + line left 0.15 from last [].In1 + line left 0.15 from last [].In2 + line right 0.15 from last [].Out } +} +] +.PE diff --git a/graphics/circuit_macros/examples/MC.m4 b/graphics/circuit_macros/examples/MC.m4 index 8c8872b9c9..6e4eb88ea0 100644 --- a/graphics/circuit_macros/examples/MC.m4 +++ b/graphics/circuit_macros/examples/MC.m4 @@ -11,7 +11,7 @@ cct_init source(right_ dimen_,AC); llabel(,,sprintf("$v_{\char%g}$",96+i)) resistor(right_ dimen_ from Here-(backup/2,0)); if i==1 then { llabel(,R_i)} inductor(right_ dimen_ from Here-(backup,0),W); if i==1 then { llabel(,L_i)} - line right_ i*dh; b_current(sprintf("$i_{\char%g}$",96+i)); dot + line right_ i*dh; b_current(sprintf("\strut$i_{\char%g}$",96+i)); dot { line down (3-i)*dv; capacitor(down_ dimen_) if i==1 then { rlabel(,C_i) } if i==2 then { dot(ifgpic(at last line.end)) } \ @@ -26,7 +26,7 @@ cct_init if i==2 then { dot } else { line down (2-i)*dv } }} line from E right dh then down E.y-Here.y - arrow right dimen_/2 ; { sprintf("$i_{\char%g}\quad$",64+i) above } + arrow right dimen_/2 ; { sprintf("\strut$i_{\char%g}\quad$",64+i) above } resistor(right_ dimen_ from Here-(arrowht/2,0)); if i==1 then {llabel(,R_o)} inductor(right_ dimen_ from Here-(backup,0),W); if i==1 then {llabel(,L_o)} source(right_ dimen_,AC); llabel(sprintf("$v_{\char%g}$",64+i)) diff --git a/graphics/circuit_macros/examples/Makefile b/graphics/circuit_macros/examples/Makefile index e0404f8aee..92968df523 100644 --- a/graphics/circuit_macros/examples/Makefile +++ b/graphics/circuit_macros/examples/Makefile @@ -27,13 +27,14 @@ LIBDIR = .. # The dpic processor: PIC = dpic -p -PIC = dpic -p #PIC = $$HOME/dpic/bu*/p2c/ftp/dpic -p #PIC = /cygdrive/d/Dwight/dpic/p2c/Windows/dpic -p #PIC = dpic -1 -p #PIC = $$HOME/dpic/build/test/dpic -p +#PIC = $$HOME/dpic/dev/p2c/ftp/dpic -p #PIC = $$HOME/tmp/dpic -p #PIC = $$HOME/dpic/bison/dpic -p +#PIC = $$HOME/dpic/bdev/dpic -p CONFIGFILE = pstricks.m4 @@ -58,41 +59,33 @@ M4 = m4 DOC = examples PICS = \ - Adder.tex Alogix.tex ABlogix.tex AmpTable.tex Antennas.tex Audio.tex \ - Bip.tex Btree.tex Byte.tex Buttons.tex \ - CanLogic.tex CctTable.tex Conn.tex Counting.tex Crossbar.tex Crow.tex \ - Csource.tex \ - Decoder.tex Demultiplexer.tex Diodes.tex Drive.tex \ - Emarrows.tex Flow.tex Fuses.tex GrayCode.tex Grounds.tex \ - Headers.tex Heathkit.tex \ - I2L.tex Incleps.tex Jack.tex \ - Logic.tex Loglog.tex MC.tex Mixer.tex MotorControl.tex Multiplexer.tex \ - NLG.tex NPDT.tex Nport.tex \ - Opamp.tex Optoiso.tex Pconn.tex PushPull.tex \ - Quantum.tex Rectifiers.tex Relay.tex Rotbox.tex \ - Schottky.tex ShiftR.tex Sierpinski.tex Sixpole.tex Sources.tex SQUID.tex \ - Switches.tex \ - TTLnand.tex Tgate.tex Three.tex Timer.tex Ttree.tex Tubediags.tex \ - Variable.tex Windings.tex Xform.tex \ - control.tex csc.tex diamond.tex \ - ex00.tex ex01.tex ex02.tex ex03.tex ex04.tex ex05.tex ex06.tex \ - ex08.tex ex09.tex ex10.tex ex11.tex ex12.tex ex15.tex \ - ex16.tex ex17.tex ex18.tex ex21.tex exp.tex fet.tex \ - graysurf.tex lcct.tex pwrsupply.tex quick.tex \ - random.tex recycle.tex rose.tex \ - sfg.tex shapes.tex thyristor.tex ujt.tex worm.tex XOR.tex - -# From the doc directory: -MANFIGS = AmpTable Antennas Audio Bip CctTable Conn Demultiplexer Diodes \ - Emarrows Fuses \ - Grounds Headers Jack Logic Multiplexer NLG NPDT Nport Opamp Pconn \ - Relay ShiftR Sources Switches \ - Tgate Variable Windings Xform fet quick thyristor ujt + ABlogix.tex Adder.tex Alogix.tex AmpTable.tex Antennas.tex \ + AntiqueClock.tex Audio.tex Bip.tex Btree.tex Buttons.tex Byte.tex \ + CanLogic.tex CctTable.tex Conn.tex Contacts.tex Contact.tex control.tex \ + Counting.tex Crossbar.tex Crow.tex csc.tex Csource.tex Decoder.tex \ + Demultiplexer.tex diamond.tex Dini.tex Diodes.tex Drive.tex Emarrows.tex \ + ex00.tex ex01.tex ex02.tex ex03.tex ex04.tex ex05.tex ex06.tex ex08.tex \ + ex09.tex ex10.tex ex11.tex ex12.tex ex15.tex ex16.tex ex17.tex ex18.tex \ + ex21.tex exp.tex fet.tex Flow.tex Fuses.tex GrayCode.tex graysurf.tex \ + Grounds.tex Headers.tex Heathkit.tex I2L.tex Incleps.tex Jack.tex \ + lcct.tex Logic.tex Loglog.tex MC.tex Mixer.tex MotorControl.tex \ + Multiplexer.tex NLG.tex NPDT.tex Nport.tex Opamp.tex Optoiso.tex \ + Pconn.tex PushPull.tex pwrsupply.tex Quantum.tex quick.tex random.tex \ + Rectifiers.tex recycle.tex relaycoil.tex Relay.tex rose.tex Rotbox.tex \ + Schottky.tex sfg.tex shapes.tex ShiftR.tex Sierpinski.tex Sixpole.tex \ + Sources.tex SQUID.tex Switches.tex \ + Tgate.tex Three.tex thyristor.tex Timer.tex \ + TTLnand.tex Ttree.tex Tubediags.tex ujt.tex Variable.tex Windings.tex \ + worm.tex Xform.tex XOR.tex # Files that have to be processed twice: -BOXDIMS = ex09 Crow Incleps Loglog Opamp random Ttree Windings +BOXDIMS = ex09.tex Crow.tex Incleps.tex Loglog.tex Opamp.tex random.tex \ + Ttree.tex Windings.tex +BOXPICS = ex09.pic Crow.pic Incleps.pic Loglog.pic Opamp.pic random.pic \ + Ttree.pic Windings.pic DVIPSOPTS = -Ppdf -G0 -t letter +DVIPSOPTS = -G0 -t letter M4LIBS = $(CONFIGFILE) $(CUSTOM) DIMFILE = $(DOC).dim BS = tr '|' '\134' @@ -106,8 +99,10 @@ BS = tr '|' '\134' chmod 644 $*.ps .m4.tex: @if test -n "$(DIMFILE)" ; then touch $(DIMFILE) ; fi ; touch F_$*.dim - $(M4) $(M4LIBS) $(DIMFILE) F_$*.dim $*.m4 | sed -e '/^ *$$/d' > $*.pic - $(PIC) $*.pic > $*.tex + $(M4) $(M4LIBS) $(DIMFILE) F_$*.dim $*.m4 | sed -e '/^ *$$/d' \ + | $(PIC) > $*.tex +# $(M4) $(M4LIBS) $(DIMFILE) F_$*.dim $*.m4 | sed -e '/^ *$$/d' > $*.pic +# $(PIC) $*.pic > $*.tex # grep Production dpic.log >> newp.txt .m4.pic: @if test -n "$(DIMFILE)" ; then touch $(DIMFILE) ; fi @@ -132,7 +127,8 @@ BS = tr '|' '\134' latex F_$* .m4.eps: make $*.dvi - dvips -Ppdf F_$* -T128cm,28cm -o $*.ps + dvips F_$* -T128cm,28cm -o $*.ps +# dvips -Ppdf F_$* -T128cm,28cm -o $*.ps # Recent changes to PSTricks(?) have clashed with the use of TeXtoEPS # so use ps2epsi ps2epsi $*.ps $*.epsi @@ -177,16 +173,16 @@ BS = tr '|' '\134' $(DOC).pdf: clean pdfmode $(DOC).frp touch $(DOC).dim - for file in $(BOXDIMS) ; do \ - rm -f $$file.tex $$file.pic ; \ - make PIC="$(PIC) -g" CONFIGFILE=pgf.m4 DIMFILE=$(DOC).dim $${file}.tex ; \ - done + rm -f $(BOXDIMS) $(BOXPICS) + make PIC="dpic -g" CONFIGFILE=pgf.m4 DIMFILE=$(DOC).dim pics pdflatex $(DOC) - for file in $(BOXDIMS) ; do \ - rm -f $$file.tex $$file.pic ; \ - make PIC="$(PIC) -g" CONFIGFILE=pgf.m4 DIMFILE=$(DOC).dim $${file}.tex ; \ - done + rm -f $(BOXDIMS) $(BOXPICS) + make PIC="dpic -g" CONFIGFILE=pgf.m4 DIMFILE=$(DOC).dim pics pdflatex $(DOC) + optpdf $(DOC).pdf + +pics: $(PICS) + touch pics $(DOC).ps: psmode $(DOC).dvi @@ -196,30 +192,24 @@ psmode: pdfmode: printf "|usepackage{tikz}\n" | $(BS) > mode.tex -doclinks: - -for nm in $(MANFIGS) ; do cp $(LIBDIR)/doc/$$nm.m4 . ; done - touch doclinks - $(DOC).dvi: $(DOC).frs touch $(DOC).dim - for file in $(BOXDIMS) ; do \ - rm -f $$file.tex $$file.pic ; \ - make PIC="$(PIC)" DIMFILE=$(DOC).dim $${file}.tex ; done + for file in $(BOXDIMS) ; do rm -f $$file.tex $$file.pic ; done + make PIC="$(PIC)" CONFIGFILE=pstricks.m4 DIMFILE=$(DOC).dim pics latex $(DOC) - for file in $(BOXDIMS) ; do \ - rm -f $$file.tex $$file.pic ; \ - make PIC="$(PIC)" DIMFILE=$(DOC).dim $${file}.tex ; done + for file in $(BOXDIMS) ; do rm -f $$file.tex $$file.pic ; done + make PIC="$(PIC)" CONFIGFILE=pstricks.m4 DIMFILE=$(DOC).dim pics latex $(DOC) -$(DOC).frs: doclinks $(DOC).tex files.tex header.tex psmode - make $(PICS) +$(DOC).frs: $(DOC).tex files.tex header.tex psmode + make PIC="dpic -p" CONFIGFILE=pstricks.m4 DIMFILE=$(DOC).dim pics cp $(LIBDIR)/doc/Version.tex . latex $(DOC) - touch $(DOC).frs rm -f $(DOC).dvi + touch $(DOC).frs -$(DOC).frp: doclinks $(DOC).tex files.tex header.tex pdfmode - make CONFIGFILE=pgf.m4 PIC="$(PIC) -g" $(PICS) +$(DOC).frp: $(DOC).tex files.tex header.tex pdfmode + make PIC="dpic -g" CONFIGFILE=pgf.m4 DIMFILE=$(DOC).dim pics cp $(LIBDIR)/doc/Version.tex . pdflatex $(DOC) rm -f $(DOC).pdf @@ -247,7 +237,8 @@ clobber: clean rm -f *.ps -@for dir in mf mpost pdflatex xfig psfrag pgf svg dev test; \ do (if test -d $$dir ; then cd $$dir; make clobber; fi) ; done - rm -f *.warn quick.m4 + rm -f *.warn + rm -f examples.pdf rm -rf index.html html basenames *.png* dist zips htmlfiles svgfiles rm -rf $(TMP)/Cir* $(ECETMP)/Cir* $(ECEDIR) if test -f Incl.pdf ; then \ @@ -259,13 +250,12 @@ clobber: clean clean: @printf "\n examples clean:\n" - rm -f core examples.pdf boxdims.tar.gz + rm -f core boxdims.tar.gz pics rm -f *.dvi *.aux *.log *.toc *.blg *.eps *.tif *.epsi eps *-mfpic* rm -f fig*.tex $(PICS) *.roff *.int *.pic gpic.m4 test.tex xxx* *.fig rm -f *.dim *.bak *.frs *.frp $(RPICS) rotate.ps tst.ps *.bbl *-pics.ps rm -f *.tfm *[0-9]pk *.png *.1 *.gif - rm -f F_* Version.tex doclinks *stackdump *.ico quick.m4 - for nm in $(MANFIGS) ; do rm -f $$nm.* ; done + rm -f F_* Version.tex *stackdump *.ico rm -rf distfile distfile.tar.gz mode.tex @printf "\n" @if test -f distmakefile ; then make -f distmakefile clean ; fi diff --git a/graphics/circuit_macros/examples/Mixer.m4 b/graphics/circuit_macros/examples/Mixer.m4 index 32920a89cf..13291261c8 100644 --- a/graphics/circuit_macros/examples/Mixer.m4 +++ b/graphics/circuit_macros/examples/Mixer.m4 @@ -29,10 +29,10 @@ RF: dot(,,1); "sftxt(RF)" at RF.w rjust line from T1.L3.end left_ del; corner; ground(,,F) line down_ del/2 from T1.L1.start then right_ del - reversed(`capacitor',right_ dimen_,C); llabel(,\unit{0.1}{\micro\farad}) + reversed(`capacitor',right_ dimen_,C); llabel(,\SI{0.1}{\micro{}}\hbox{\sf F}) BT: dot(at Here) line up_ del/2 from T1.L2.end then right del - reversed(`capacitor',right_ dimen_,C); llabel(,\unit{0.1}{\micro\farad}) + reversed(`capacitor',right_ dimen_,C); llabel(,\SI{0.1}{\micro{}}\hbox{\sf F}) t = dimen_*7/8 line to (BT.x+4*t,Here.y) TT: dot @@ -55,46 +55,46 @@ Q2: mosfet(,,dMESDQuB,E) at (Q1,T2.s-(0,elen_-del)) line right_ del from T1.T then down_ T1.T.y-BT.y+del corner; left_ capacitor(to (T1.L3.end-(del,0),Here),C) - rlabel(,\unit{0.1}{\micro\farad}\hskip20pt) + rlabel(,\SI{0.1}{\micro{}}\hbox{\sf F}\hskip20pt) LOD: dot { line to (RF,Here); dot(,,1) move left_ 4bp__; "sftxt(local)" rjust "sftxt(oscillator)" rjust move left 40bp__ } line from T2.T left_ to (Q1.S,T2.T) T2T: dot - { capacitor(down_ to (Here,BT),C); rlabel(,\unit{0.1}{\micro\farad}) + { capacitor(down_ to (Here,BT),C); rlabel(,\SI{0.1}{\micro{}}\hbox{\sf F}) ground(,T,F) } { line from T2.L3.start right_ del; corner; ground(,,F) } Vt: dot(at (0.5 between BT and TT,Q1.Env.nw),,1) { "sftxt($+$V$_{\hbox{\scriptsize CC}}$)" at last [].e ljust } line to (Here,T2T) chop dotrad_ chop 0; dot { line to (Here,BT); Cv: capacitor(down_ 3/2*dimen_,C) - llabel(\unit{10}{\micro\farad}); G: dot; ground(,,F) } + llabel(\SI{10}{\micro{}}\hbox{\sf F}); G: dot; ground(,,F) } for s=-1 to 1 by 2 do {{ line right s*t; corner resistor(down_ to (Here,BT)) - if s<0 then { llabel(,\unit{5}{\kilo\ohm}) } \ - else { rlabel(,\unit{5}{\kilo\ohm}) + if s<0 then { llabel(,\SI{5}{\kilo\ohm}) } \ + else { rlabel(,\SI{5}{\kilo\ohm}) { dot(at last line.start); line to (TT,Here) resistor(right_ to (T2T,Here)) - llabel(,\unit{10}{\ohm}) } } + llabel(,\SI{10}{\ohm}) } } P: potentiometer(down_ Cv.len,,0.5,s*t ) with .Start at Here - if s<0 then { "sftxt(\unit{1}{\kilo\ohm})" at P. 1st [].ne ljust } \ - else { "sftxt(\unit{1}{\kilo\ohm})" at P. 1st [].sw rjust } + if s<0 then { "sftxt(1\`,'\si{\kilo\ohm})" at P. 1st [].ne ljust } \ + else { "sftxt(1\`,'\si{\kilo\ohm})" at P. 1st [].sw rjust } dot(at P.End) dot(at P.T1) { L: inductor(up_ to (Here,BT),L); - if s<0 then { "sftxt(\unit{100}{\micro\henry})" at last [].sw rjust } \ + if s<0 then { "sftxt(100\`,'\si{\micro{}}H)" at last [].sw rjust } \ else { line to TT - "sftxt(\unit{100}{\micro\henry})" \ + "sftxt(100\`,'\si{\micro{}}H)" \ at last [].ne ljust below } } capacitor(down_ to (Here,G),C) - if s<0 then { rlabel(,\unit{0.1}{\micro\farad}) } \ - else { llabel(,\unit{0.1}{\micro\farad}) } + if s<0 then { rlabel(,\SI{0.1}{\micro{}}\hbox{\sf F}) } \ + else { llabel(,\SI{0.1}{\micro{}}\hbox{\sf F}) } dot }} - resistor(down_ from LOD to (LOD,G)); llabel(,\unit{51}{\ohm}); corner + resistor(down_ from LOD to (LOD,G)); llabel(,\SI{51}{\ohm}); corner line to (Q2.S,Here) then to Q2.S ', diff --git a/graphics/circuit_macros/examples/MosfetElements.m4 b/graphics/circuit_macros/examples/MosfetElements.m4 deleted file mode 100644 index b8786e20e8..0000000000 --- a/graphics/circuit_macros/examples/MosfetElements.m4 +++ /dev/null @@ -1,78 +0,0 @@ -.PS -# MosfetElements.m4 -cct_init -s_init(MosfetElements) - - linewid = linewid*1.5 - linethick = 1.5 - -define(`mfgrid', - `tr_xy_init(,m4_U,m4R)define(`m4R',) - ltt = linethick; linethick = 0.4 - m4gdim = ifelse(`$1',,4,`($1)') - iflatex(`latexcommand(\color{lightgray})') - for x=-m4gdim to m4gdim do { - line color "lightgray" from tr_xy(x,0) to tr_xy(x,2*m4gdim) - if pmod(x,2)==0 then { sprintf("{\tiny %g}",x) at last line.start below }} - for y=0 to 2*m4gdim do { - line color "lightgray" from tr_xy(-m4gdim,y) to tr_xy(m4gdim,y) - if pmod(y,2)==0 then { sprintf("{\tiny %g}",y) at last line.start rjust }} - linethick = ltt - iflatex(`latexcommand(\color{black})') - Grid: box invis wid 2*m4gdim*m4_xyU ht 2*m4gdim*m4_xyU \ - with .sw at tr_xy(-m4gdim,0) -') -define(`gridnext',`with .Grid.w at last [].Grid.e + (m4_xyU*2,0)') -define(`gridbelow',`with .Grid.nw at `$1'.Grid.sw+(0,-linewid/2)') -define(`Gmosfet',`mfgrid; Q: mosfet(,,`$1') with .S at Grid.sw + (2*m4_xyU,0)') - -R1: [ Gmosfet(B); "B" at Q.Bl ljust ] - [ Gmosfet(D); "D" at Q.Dl ljust ] gridnext - [ Gmosfet(E); "E" at Q.Channel below ] gridnext - [ Gmosfet(F); "F" at Q.Channel below ] gridnext - [ Gmosfet(G); "G" at Q.Gl ljust ] gridnext - [ Gmosfet(H); "H" at Q.Hl ljust ] gridnext - [ Gmosfet(L); "L" at Q.Ll ] gridnext - [ Gmosfet(M); "M" at Q.Glh below ] gridnext - -R2:[ Gmosfet(uM); "uM" at Q.Gl ] gridbelow(R1) - [ Gmosfet(dM); "dM" at Q.Gl ] gridnext - [ Gmosfet(Pz); "Pz" at Grid.s ] gridnext - [ Gmosfet(Q); "Q" at Q.Ql above ] gridnext - [ Gmosfet(R); "R" at Q.Rl below ] gridnext - [ Gmosfet(S); "S" at Q.Sl ljust ] gridnext - [ Gmosfet(dT); "dT" at Q.Tl below ] gridnext - [ Gmosfet(X); "X" at Q.Xh above ] gridnext - -R3:[ Gmosfet(uM1) - "uM1" at Grid.s above - "G0" at Q.G0 above - "G1" at Q.G1 above ] gridbelow(R2) - [ Gmosfet(dM1) - "G0" at Q.G0 above - "G1" at Q.G1 above - "dM1" at Grid.s above ] gridnext - -# [ Q: mosfet -# {"S" at Q.S rjust} -# {"D" at Q.D ljust} -# {"G" at Q.G rjust} -# s_box(``mosfet'') at Q.s below] -# -# [ Q: mosfet(,,DSELuBQ) -# s_box(``mosfet(,,DSELuBQ)'') at Q.s below] with .n at last [].s + (0,-0.2) -# -# [ Q: mosfet(,,DSEMuBQ) -# s_box(``mosfet(,,DSEMuBQ)'') at Q.s below] with .n at last [].s + (0,-0.2) -# -# [ Q: mosfet(,,DSEdMuBQ) -# s_box(``mosfet(,,DSEdMuBQ)'') at Q.s below] with .n at last [].s + (0,-0.2) -# -# [ Q: mosfet(right dimen_,,DSELuBQN) -# {"S" at Q.S rjust} -# {"D" at Q.D ljust} -# {"G" at Q.G rjust} -# s_box(``mosfet(right dimen\_,,DSELuBQN)'') at Q.s below] \ -# with .n at last [].s + (0,-0.2) - -.PE diff --git a/graphics/circuit_macros/examples/Multiplexer.m4 b/graphics/circuit_macros/examples/Multiplexer.m4 new file mode 100644 index 0000000000..f4b72154a4 --- /dev/null +++ b/graphics/circuit_macros/examples/Multiplexer.m4 @@ -0,0 +1,43 @@ +.PS +# `Multiplexer.m4' +log_init + + ifmpost(`command "verbatimtex {\sf etex"', + `ifpostscript(, + `command "{\sf"')') + + right_ + + Mux(4,M1) + `"\tt Mux(4,M1)"' at last [].s below + `"\sl In0"' at last [].In0.end rjust wid 14bp__ + `"\sl In1"' at last [].In1.end rjust + `"\sl In2"' at last [].In2.end rjust + `"\sl In3"' at last [].In3.end rjust + `"\sl Out"' at last [].Out.end above + `"\sl Sel"' at last [].Sel.end ljust above + left_; Mux(4,,LNOE) with .c at last [].c+(0.9,0) + `"\tt left\_; Mux(4,{,}LNOE)"' at last [].s +(0,-20bp__) ht 10bp__ + `"\sl In0"' at last [].In0.end above + `"\sl NOE"' at last [].NOE.end +(4bp__,0) below + `"\sl Out"' at last [].Out.end below + `"\sl Sel"' at last [].Sel.end rjust below + right_; Mux(4,,OEBN2) with .c at last [].c+(1.4,0) + `"\tt Mux(4,{,}OEBN2)"' at last [].s below + `"\sl Sel0"' at last [].Sel0.end rjust + `"\sl Sel1"' at last [].Sel1.end ljust + `"\sl In0"' at last [].In0.end rjust + `"\sl In3"' at last [].In3.end rjust + `"\sl OE"' at last [].OE.end rjust + down_; Mux(8,,L3,,28*L_unit) with .c at last [].c+(1.7,0) + `"\tt down\_; Mux(8,{,}L3,{,}28*L\_unit)"' at last [].s below + `"\sl Sel0"' at last [].Sel0.end rjust + `"\sl Sel2"' at last [].Sel2.end rjust below + `"\sl In0"' at last [].In0.end rjust + `"\sl In7"' at last [].In7.end ljust wid 14bp__ + +ifmpost(`command "verbatimtex } etex"', +`ifpostscript(, +`command "}"')') + +.PE diff --git a/graphics/circuit_macros/examples/NLG.m4 b/graphics/circuit_macros/examples/NLG.m4 new file mode 100644 index 0000000000..2b9a39f86e --- /dev/null +++ b/graphics/circuit_macros/examples/NLG.m4 @@ -0,0 +1,19 @@ +.PS +# NLG.m4 +cct_init + + define(`nullor',`nport(`$1' + {`"${}0$"' at Box.w ljust + `"$\infty$"' at Box.e rjust},shift($@))') + +N: nullor +`"\tt nullor"' at last [].s+(0,-3pt__) below +G: gyrator with .sw at N.se+(0.5,0) +`"\tt gyrator"' at G.s+(0,-3pt__) below +I: gyrator(invis,,0,N) with .w at G.e+(0.5,0) +`"\tt gyrator(invis,{,}0,N)"' at I.s +V: gyrator(invis wid boxht,,0,NV) with .w at I.e+(1,0) +`"\tt gyrator(invis wid boxht,{,}0,NV)"' at V.s+(0,-3pt__) below + + move right 0.9 +.PE diff --git a/graphics/circuit_macros/examples/NPDT.m4 b/graphics/circuit_macros/examples/NPDT.m4 new file mode 100644 index 0000000000..17f4ef26b1 --- /dev/null +++ b/graphics/circuit_macros/examples/NPDT.m4 @@ -0,0 +1,35 @@ +.PS +# `NPDT.m4' +cct_init + linewid = linewid*1.2 + movewid = 1.0 + + NPDT + { `"\sl R" at last [].R.s below + "\sl T" at last [].T.s below + "\sl L" at last [].L.s below' } + { `"\tt NPDT"' at last [].s +(0,-0.22) } + up_; NPDT with .L at last[].R+(0.75,0) + { `"\sl R"' wid 8pt__ at last [].R.e ljust + "\sl T" at last [].T.e ljust + "\sl L" at last [].L.e ljust } + { `"\tt up\_; NPDT\strut"' at last [].s +(0.1,-0.15) } + right_ + NPDT(2) with .L1 at last [].L+(0.75,0) + { for_(1,2,1, + `"\sl R`'m4x" at last [].R`'m4x.e ljust + "\sl L`'m4x" wid 11pt__ at last [].L`'m4x.w rjust') } + { `"\tt NPDT(2)\strut"' at last [].s +(0,-0.15) } + move + NPDT(3,R) with .L3 at last [].R1+(0.75,0) + { for_(1,3,1, + `"\sl R`'m4x" at last [].R`'m4x.e ljust + "\sl L`'m4x" wid 11pt__ at last [].L`'m4x.w rjust') } + { `"\tt NPDT(3,R)\strut"' at last [].s below } + left_; NPDT(2,R) with .R1 at last [].R3+(0.75,0) + { for_(1,2,1, + `"\sl R`'m4x" at last [].R`'m4x.w rjust + "\sl L`'m4x" wid 11pt__ at last [].L`'m4x.e ljust') } + { `"\tt left\_; NPDT(2,R)\strut"' at last [].s +(0,-0.15) } + +.PE diff --git a/graphics/circuit_macros/examples/Nport.m4 b/graphics/circuit_macros/examples/Nport.m4 new file mode 100644 index 0000000000..37dbffeacc --- /dev/null +++ b/graphics/circuit_macros/examples/Nport.m4 @@ -0,0 +1,43 @@ +.PS +# `Nport.m4' +cct_init +textoffset = 5bp__ + +Twoport: nport + + "\sl W1a" above rjust at Twoport.W1a + "\sl W1b" below rjust at Twoport.W1b wid 0.25 + "\sl E1a" above ljust at Twoport.E1a + "\sl E1b" below ljust at Twoport.E1b + +Nport: nport(wid 2.0 ht 1 fill_(0.9) "n-port",1,2,3,4) \ + with .Box.w at Twoport.Box.e+(1.0,0) + + "\sl W1a" rjust at Nport.W1a + "\sl W1b" rjust at Nport.W1b + + "\sl E1a" ljust at Nport.E1a + "\sl E3b" ljust at Nport.E3b + + "\sl N1a" above at Nport.N1a + "\sl N1b$\;\;$" above at Nport.N1b + "\sl $\;\;$N2a" above at Nport.N2a + "\sl N2b" above at Nport.N2b + + "\sl S1a" below at Nport.S1a + "\sl S4b" below at Nport.S4b + + "$\cdots$" at 0.5<Nport.S1a,Nport.S4b>+(0,-0.10) + "$\vdots$" at 0.5<Nport.E1a,Nport.E3b>+(0.15,0.05) + +Nterm: nterm with .Box.w at Nport.Box.e+(1.0,0) + "\sl W1" rjust at Nterm.W1 + "\sl E1" ljust at Nterm.E1 + "\sl S1" below at Nterm.S1 + + `"\tt nport"' at Twoport.s+(0,-0.3) + `"\tt nport(wid 2.0 ht 1 fill\_(0.9) \"n-port\",1,2,3,4)"' \ + at Nport.s+(0,-0.25) + `"\tt nterm"' at Nterm.s+(0,-0.3) + +.PE diff --git a/graphics/circuit_macros/examples/Opamp.m4 b/graphics/circuit_macros/examples/Opamp.m4 new file mode 100644 index 0000000000..5bdb8ac208 --- /dev/null +++ b/graphics/circuit_macros/examples/Opamp.m4 @@ -0,0 +1,45 @@ +.PS +# Opamp.m4 +sinclude(FOpamp.dim) +sinclude(Circuit_macros.dim) +s_init(Opamp) +cct_init + + A: opamp + thinlines_ + s_box(`\tt opam{}p') at A.s-(0,0.35) + s_box(\tt Out) below at A.Out + spline <- from A.In1 left 0.1 then up 0.1 left 0.1 + s_box(\tt In1) rjust above + spline <- from A.In2 left 0.1 then down 0.1 left 0.1 + s_box(\tt In2) rjust below + arrow <- up 0.1 right 0.1 from A.N + s_box(\tt N) ljust above + arrow <- up 0.1 right 0.1 from A.E1 + s_box(\tt E1) ljust above + arrow <- up 0.1 right 0.1 from A.E + s_box(\tt E) ljust above + arrow <- down 0.1 right 0.1 from A.E2 + s_box(\tt E2) ljust below + arrow <- down 0.1 right 0.1 from A.S + s_box(\tt S) ljust below + arrow <- left 0.2 from A.W + s_box(\tt W) rjust + thicklines_ + Point_(15) + B: opamp(,,,,PR) with .sw at A.se+(0.65,0) + thinlines_ + s_box(`\tt Point\_(15); opam{}p(,{,},{,}PR)') at B.s-(0,0.20) + spline <- right arrowht up arrowht from B.V1 then right 0.1 + s_box(\tt V1) ljust + spline <- right arrowht down arrowht from B.V2 then right 0.1 + s_box(\tt V2) ljust + thicklines_ + Point_(90) + C: opamp with .sw at B.se+(1.05,0) + s_box(`\tt Point\_(90); opam{}p') at C.s-(0,0.35) + right_ + D: opamp(,,,,T) with .sw at C.se+(0.65,0) + s_box(`\tt opam{}p(,{,},{,}T)') at D.s-(0,0.20) + +.PE diff --git a/graphics/circuit_macros/examples/Pconn.m4 b/graphics/circuit_macros/examples/Pconn.m4 new file mode 100644 index 0000000000..fbda5cc2e7 --- /dev/null +++ b/graphics/circuit_macros/examples/Pconn.m4 @@ -0,0 +1,52 @@ +.PS +# `Pconn.m4' +cct_init + +P1: [ + C1: pconnex(,A) + thinlines_ + arrow <- left 0.2 from C1.H.w; `"\sl H"' rjust + thicklines_ + `"\tt pconnex(,A)"' at last [].s below + C2: pconnex(,AF) with .w at C1.e+(0.3,0) + thinlines_ + arrow <- right 0.2 up 0.1 from C2.H.e; `"\sl H"' ljust + N: box invis wid (C2.w.x-C1.e.x)/2 ht C1.N.ht \ + with .n at 0.5 between C1.ne and C2.nw "\sl N" + arrow from N.w to C1.N.e + arrow from N.e to C2.N.w + G: box invis wid N.wid ht N.ht with .n at (N,C1.N.s) "\sl G" + arrow from G.w to C1.G.e + arrow from G.e to C2.G.w + `"\tt (,AF)"' at last [].s below + C03: pconnex(,AC) with .w at C2.e+(0.2,0) + `"\tt (,AC)"' at last [].s below + C3: pconnex(,ACF) with .w at last [].e+(0.2,0) + `"\tt (,ACF)"' at last [].s below + + C5: pconnex(U,D) with .w at last [].e+(0.2,0) + `"\tt (U,D)"' at last [].s below + C6: pconnex(U,DF) with .w at last [].e+(0.2,0) + `"\tt (U,DF)"' at last [].s below + C7: pconnex(U,J) with .w at last [].e+(0.2,0) + `"\tt (U,J)"' at last [].s below + C8: pconnex(U,JF) with .w at last [].e+(0.2,0) + `"\tt (U,JF)"' at last [].s below + ] + +P2: [ + C4: pconnex(,P) + `"\tt (,P)"' at last [].s below + C11: pconnex(,PF) with .w at last [].e+(0.2,0) + `"\tt (,PF)"' at (C11,last "") below + C9: pconnex(,G) with .w at last [].e+(0.2,0) + `"\tt (,G)"' at last [].s below + C91: pconnex(,GF) with .w at last [].e+(0.2,0) + `"\tt (,GF)"' at last [].s below + C92: pconnex(L,GF) with .w at last [].e+(0.2,0) + `"\tt (L,GF)"' at last [].s below + C10: pconnex(,GC) with .w at last [].e + (0.2,0) + `"\tt (,GC)"' ht 11pt__ at last [].s below +] with .nw at P1.C1.sw + (0,-0.25) + +.PE diff --git a/graphics/circuit_macros/examples/PushPull.m4 b/graphics/circuit_macros/examples/PushPull.m4 index f071103307..24669faf29 100644 --- a/graphics/circuit_macros/examples/PushPull.m4 +++ b/graphics/circuit_macros/examples/PushPull.m4 @@ -30,38 +30,38 @@ define(`Xform21', { "3N200" at last [].n above } line from T1.L1.start to (T1.L1.start,Q2.G0) then to Q2.G0 - resistor(right_ dimen_ from T1.T); llabel(,\unit{330}{\ohm}); Tx:dot + resistor(right_ dimen_ from T1.T); llabel(,\SI{330}{\Omega}); Tx:dot { line right_ del*3/2; corner; ground(,,F) } dot(at (Tx,Q1.G0)) - capacitor(down_ to Tx,C); llabel(\unit{5.6}{\pico\farad}) + capacitor(down_ to Tx,C); llabel(\SI{5.6}{pF}) dot(at (Tx,Q2.G0)) - capacitor(up_ to Tx,C); rlabel(\unit{5.6}{\pico\farad}) + capacitor(up_ to Tx,C); rlabel(\SI{5.6}{pF}) for_(1,2,1, `dot(at Q`'m4x.S+(dimen_+del/2,0)) { resistor(down_ dimen_); G1:Here; { "$120$" at last [].nw rjust } - rlabel(,\ohm); dot; ground(,,F) } + rlabel(,\Omega\;); dot; ground(,,F) } line from Q`'m4x.S to (Here.x+dimen_*3/4,Q`'m4x.S.y); corner - capacitor(down_ to (Here,G1),C); rlabel(\raisebox{2pt}{1000},{\pico\farad}); + capacitor(down_ to (Here,G1),C); rlabel(\raisebox{2pt}{\num{1000}},\si{pF}); corner line left_ 2*dimen_*3/4; corner TG: dot(at (Here,Q`'m4x.S)) - capacitor(down_ to (Here,G1),C); rlabel(,,\unit{0.01}{\micro\farad}) + capacitor(down_ to (Here,G1),C); rlabel(,,\SI{0.01}{\micro F}) ') R: dot(at (Here.x+dimen_*2,(Q1.D.y+Q2.D.y)/2)) - dot(at (R,Q1.D)); capacitor(down_ to R,C); llabel(\unit{20}{\pico\farad}) - dot(at (R,Q2.D)); capacitor(up_ to R,C); llabel(\unit{20}{\pico\farad}) + dot(at (R,Q1.D)); capacitor(down_ to R,C); llabel(\SI{20}{pF}) + dot(at (R,Q2.D)); capacitor(up_ to R,C); llabel(\SI{20}{pF}) line right_ del*3/2 from R then down_ R.y-(Q1.S.y-dimen_); ground(,,F) Vc: dot(at (R+(dimen_,0),Q1.ne),,1); { "$+V_{\hbox{c}}$" rjust at Vc.w } dot(at (Vc,R)) - inductor(right_ dimen_,); llabel(,\unit{1}{\micro\henry}) + inductor(right_ dimen_,); llabel(,\SI{1}{\micro\henry}) down_ T2: Xform21 with .T at Here arrow from T2.L2 to T2.L3 chop -dimen_/4 line right_ del from T2.L3.start; corner - capacitor(down_ dimen_,C); llabel(\unit{1000}{\pico\farad}); ground(,T,F) + capacitor(down_ dimen_,C); llabel(\SI{1000}{pF}); ground(,T,F) line right_ 2*del from T2.L3.end Out: dot(,,1); { "IF" wid 12bp__ at Out.n above }; move right_ 0.3 @@ -70,38 +70,38 @@ define(`Xform21', line from Vc to (Vc,Q2.S) chop dotrad_/2 chop 0; dot { line right_ del*2; corner - capacitor(down_ dimen_,C); llabel(,,\unit{1000}{\pico\farad}); ground(,,F) } - reversed(`inductor',down_ dimen_,); rlabel(,\unit{1}{\micro\henry}) + capacitor(down_ dimen_,C); llabel(,,\SI{1000}{pF}); ground(,,F) } + reversed(`inductor',down_ dimen_,); rlabel(,\SI{1}{\micro\henry}) line down_ dimen_/2 TL: dot(at (Q1.G1.x-del/2,Here.y)) up_ Q3: bi_tr(,R,,E) with .C at (TG.x,TL.y-dimen_*2/3) - resistor(right_ from TL to (Q3.C,TL)); llabel(,\unit{82}{\kilo\ohm}) + resistor(right_ from TL to (Q3.C,TL)); llabel(,\SI{82}{\kilo\Omega}) line to (Vc,Here); dot - resistor(down_ to (Here,Q3.B)); rlabel(,\unit{8.2}{\kilo\ohm}); dot + resistor(down_ to (Here,Q3.B)); rlabel(,\SI{8.2}{\kilo\Omega}); dot dot(at Q3.B+(del,0)) line up_ (TL.y+Q3.C.y)/2 - Here.y+del/4 then left_ Here.x-TL.x - reversed(`capacitor',left_ dimen_,C); llabel(,\unit{1500}{\pico\farad}) + reversed(`capacitor',left_ dimen_,C); llabel(,\SI{1500}{pF}) Osc: dot(,,1); { "Osc" above at Osc.n } line from Q3.B to (Vc,Q3.B) line from Q3.C to (Q3.C,TL); dot dot(at Q3.C+(0,del/2)) - capacitor(left_ to (TL,Here),C); llabel(,\unit{1500}{\pico\farad}); dot + capacitor(left_ to (TL,Here),C); llabel(,\SI{1500}{pF}); dot line down_ del/2 from Q3.E; dot - { resistor(down_ dimen_*3/4); rlabel(,\unit{820}{\ohm}) + { resistor(down_ dimen_*3/4); rlabel(,\SI{820}{\Omega}) G: Here; ground(,T,F) } line right_ dimen_; corner - capacitor(down_ to (Here,G),C); llabel(,\unit{1000}{\pico\farad}) + capacitor(down_ to (Here,G),C); llabel(,\SI{1000}{pF}) ground(,T,F) ground(at (TL,G),T,F) - resistor(up_ dimen_); llabel(,\unit{12}{\kilo\ohm}) + resistor(up_ dimen_); llabel(,\SI{12}{\kilo\Omega}) line to (Here,Q1.G1) then to Q1.G1 line from Q2.G1 to (TL,Q2.G1); dot ground(at (Vc,G),T,F) - resistor(up_ dimen_); rlabel(,\unit{5.6}{\kilo\ohm}); line to (Here,Q3.B) + resistor(up_ dimen_); rlabel(,\SI{5.6}{\kilo\Omega}); line to (Here,Q3.B) iflatex(`ifpsfrag(,`latexcommand(})')') .PE diff --git a/graphics/circuit_macros/examples/Relay.m4 b/graphics/circuit_macros/examples/Relay.m4 new file mode 100644 index 0000000000..20c51ebb6a --- /dev/null +++ b/graphics/circuit_macros/examples/Relay.m4 @@ -0,0 +1,44 @@ +.PS +# Relay +cct_init + +skip = 1.1 + +R1:relay + {"\sl V1" wid 0.16 rjust at last [].V1 + "\sl V2" ljust at last [].V2 + "\sl P1" rjust at last [].P1-(dotrad_,0) + "\sl O1" ljust at last [].O1 + "\sl C1" ljust at last [].C1 } + S: `"\tt relay"' at last [].s+(0,-0.2) + +R5:relay(2,CTh) with .sw at last [].sw+(skip,0) + { for_(1,2,1,` + "\sl P`'m4x" rjust at last [].P`'m4x-(dotrad_,0) + "\sl C`'m4x" ljust at last [].C`'m4x ') } + `"\tt (2,CTh)"' at (last [],S) + +R4:relay(2,O) with .sw at last [].sw+(skip,0) + {for_(1,2,1,` + "\sl P1" rjust at last [].P1-(dotrad_,0) + "\sl O`'m4x" ljust at last [].O`'m4x ')} + `"\tt (2,O)"' at (last [],S) + +R3:relay(2,PIAX) with .sw at last [].sw+(skip,0) + {"\sl V1" rjust at last [].V1 + "\sl V2" rjust at last [].V2 + for_(1,2,1, + `"\sl P`'m4x" rjust at last [].P`'m4x-(dotrad_,0) + "\sl O`'m4x" ljust at last [].O`'m4x+(dotrad_,0) + "\sl C`'m4x" ljust at last [].C`'m4x+(dotrad_,-2pt__) ') } + `"\tt (2,PIAX)"' at (last [],S) + +R2:relay(2,R) with .sw at last [].sw+(skip,0) + {"\sl V1" rjust at last [].V1 + "\sl V2" ljust at last [].V2 + for_(1,2,1, + `"\sl P`'m4x" rjust at last [].P`'m4x-(dotrad_,0) + "\sl O`'m4x" ljust at last [].O`'m4x + "\sl C`'m4x" ljust at last [].C`'m4x ') } + `"\tt relay(2,R)"' at (last [],S) +.PE diff --git a/graphics/circuit_macros/examples/Schottky.m4 b/graphics/circuit_macros/examples/Schottky.m4 index 8cd98061e9..dea7da2b1a 100644 --- a/graphics/circuit_macros/examples/Schottky.m4 +++ b/graphics/circuit_macros/examples/Schottky.m4 @@ -8,7 +8,7 @@ E1: dot; line up_ tic Q1: bi_trans(,,dEBCBUS) with .E at Here; line left tic from Q1.B; B1: Here - resistor(up_ rlen from Q1.C); llabel(,\unit{3}{\kilo}) + resistor(up_ rlen from Q1.C); llabel(,\SI{3}{\kilo{}}) B2: dot; line right_ tic Q2: bi_trans(up_ dimen_,,dEBCBUS) with .B at Here line from Q2.E to (Q2.E,E1); dot @@ -16,7 +16,7 @@ Gnd: "GND" ljust at Here+(dimen_/2,0) dot(at Q2.C) { line to (Gnd,Here); "Y" ljust } line to (Q1.C,Here); dot - resistor(up_ rlen); llabel(,\unit{4}{\kilo}); B4: dot; line right_ tic; up_ + resistor(up_ rlen); llabel(,\SI{4}{\kilo{}}); B4: dot; line right_ tic; up_ Q4: bi_tr with .B at Here line from Q4.E to Q2.C line up_ tic from B4 @@ -26,17 +26,17 @@ Q5: bi_trans(,,dEBCBUS) with .E at Here; line left_ tic from Q5.B; B5: dot resistor(up_ rlen); llabel(,iflatex(120,"120")); dot Vcc: "Vcc" ljust at (Gnd,Here) dot(at (B5,Vcc)) - resistor(to (Here,Q5.C)); llabel(,\unit{8}{\kilo}) + resistor(to (Here,Q5.C)); llabel(,\SI{8}{\kilo{}}) diode(from (B4,Q2.C) to (B5,Q2.C),Z) line to (Here,Q5.C) diode(from B4 to (Here,B4),Z); dot line left_ tic; up_ Q3: bi_trans(,,dEBCBUS) with .C at Here; line left_ tic from Q3.B; B3: Here line from Q3.E to (Q3.E,B2); dot - dot(at (B1,Here)); resistor(down_ to (Here,Q1.C)); rlabel(,\unit{1.5}{\kilo}); line to B1 - resistor(down_ from B3 to (B3,B2)); rlabel(,\unit{12}{\kilo}); line to B2 + dot(at (B1,Here)); resistor(down_ to (Here,Q1.C)); rlabel(,\SI{1.5}{\kilo{}}); line to B1 + resistor(down_ from B3 to (B3,B2)); rlabel(,\SI{12}{\kilo{}}); line to B2 line from Vcc to (B3,Vcc); resistor(down_ to (Here,Q5.C)) - rlabel(,\unit{20}{\kilo}) + rlabel(,\SI{20}{\kilo{}}) line to B3 ground(at (Q3.C,Gnd),,F); dot diff --git a/graphics/circuit_macros/examples/ShiftR.m4 b/graphics/circuit_macros/examples/ShiftR.m4 new file mode 100644 index 0000000000..e7bf1f0c5c --- /dev/null +++ b/graphics/circuit_macros/examples/ShiftR.m4 @@ -0,0 +1,49 @@ +.PS +# ShiftR.m4 +log_init + + iflatex(`textoffset = 1bp__; ifpsfrag(,`latexcommand({\sf)') ') + +define(`lg_plen',3) + +define(`customFF',`FlipFlopX(wid 10*L_unit ht FF_ht*L_unit,, + :S;NE:CK;:R, N:PR, :Q;;ifelse(`$1',1,:lg_bartxt(Q)), N:CLR) ') + + F0: customFF(1) + + BUFFER_gate(,N) with .Out at F0.W1.end + line left 2*L_unit from last [].In1 + T: dot + reversed(`NOT_gate',left 10*L_unit) + Serial: "\scriptsize\shortstack[r]{SERIAL\\ INPUT}" rjust + line from T to (T,F0.W3) then to F0.W3.end + + NCLR: NOT_gate(right T.x-Serial.x from (Serial,F0.S1.end),N) + "$\overline{\hbox{\scriptsize CLEAR}}$" at NCLR.start rjust + + CLK: NOT_gate(right T.x-Serial.x from NCLR.start+(0,-BUF_ht*3/2*L_unit)) + "\scriptsize CLOCK" at CLK.start rjust + +for_(1,4,1,` + F`'m4x: customFF(eval(m4x!=4)) with .W3.end at F`'eval(m4x-1).E3.end + ') + + "\scriptsize OUTPUT" at F4.E1.end ljust + line from NCLR.end to F4.S1.end + + down_ +for_(0,4,1,` + line from F`'m4x.W2.end down F0.W2.y-CLK.y + ifelse(eval(m4x!=4),1,`dot',`line to CLK.end') + N`'m4x: NAND_gate with .Out at F`'m4x.N1.end + line up 2*L_unit from N`'m4x.In2 + { line up 6*L_unit from N`'m4x.In1 + "\scriptsize PR`'eval(4-m4x)" rjust } + ifelse(eval(m4x!=4),1, + `dot; dot(at F`'m4x.S1.end)', + `line to (Serial,Here) + "\scriptsize\shortstack[r]{PRESET\\ ENABLE}" wid 0.4 rjust ') + ') + + iflatex(ifpsfrag(,`latexcommand(})')) +.PE diff --git a/graphics/circuit_macros/examples/Sierpinski.m4 b/graphics/circuit_macros/examples/Sierpinski.m4 index 7fbf13bf15..08d7fab111 100644 --- a/graphics/circuit_macros/examples/Sierpinski.m4 +++ b/graphics/circuit_macros/examples/Sierpinski.m4 @@ -13,7 +13,7 @@ gen_init } } - r = 4 + r = 3 linethick = 0.2 #linethick = 1/2 /(1pt__) lw = linethick pt__ /2 @@ -35,20 +35,20 @@ gen_init define CayleyGraph { if $3 > 0 then { { line to Here+(cosd($2),sind($2))*($1) - exec sprintf("CayleyGraph(%g,%g,%g);",0.5*($1),$2,$3-1); } + exec sprintf("CayleyGraph(%g,%g,%g);", ($1)/2, $2, $3-1); } { line to Here+(cosd($2+90),sind($2+90))*($1) - exec sprintf("CayleyGraph(%g,%g,%g);",0.5*($1),$2+90,$3-1); } + exec sprintf("CayleyGraph(%g,%g,%g);", ($1)/2, $2+90, $3-1); } { line to Here+(cosd($2-90),sind($2-90))*($1) - exec sprintf("CayleyGraph(%g,%g,%g);",0.5*($1),$2-90,$3-1); } + exec sprintf("CayleyGraph(%g,%g,%g);", ($1)/2, $2-90, $3-1); } } } size = 2 depth = 6 for t=0 to 270 by 90 do { - line from (0,0) to (cosd(t),sind(t)); + line from (0,0) to (cosd(t),sind(t))*size/2; { exec sprintf("CayleyGraph(%g,%g,%g);",size/4,t,depth); } } - ] with .sw at last [].se+(-0.25,0) + ] scaled 3/4 with .sw at last [].se+(-0.25,0) .PE diff --git a/graphics/circuit_macros/examples/Sources.m4 b/graphics/circuit_macros/examples/Sources.m4 new file mode 100644 index 0000000000..a70cea1113 --- /dev/null +++ b/graphics/circuit_macros/examples/Sources.m4 @@ -0,0 +1,56 @@ +.PS +# `Sources.m4' +cct_init +divert(-1) + +divert(0)dnl + +iflatex(`ifpsfrag(,`latexcommand({\sf)') ') + +movewid = 2pt__ +moveht = 0.275 +define(`NL',`; move down $1; right_') +{ + {source ; move ; "`source'" ljust} NL + {source(,I) ; move ; "`source(,I)'" ljust} NL + {source(,i) ; move ; "`source(,i)'" ljust} NL + {source(,V) ; move ; "`source(,V)'" ljust} NL + {source(,v) ; move ; "`source(,v)'" ljust} NL + {source(,SC) ; move ; "`source(,SC)'" ljust} NL + {source(,AC); move ; "`source(,AC)'" ljust} NL + {source(,X) ; move ; "`source(,X)'" ljust} NL + {source(,F) ; move ; "`source(,F)'" ljust} NL + {source(,G) ; move ; "`source(,G)'" ljust} NL + {source(,Q) ; move ; "`source(,Q)'" ljust} +} + move right_ 2.0 +{ + {source(,,0.4) ; move ; "`source(,{,}0.4)'" ljust} NL(0.35) + {source(,P) ; move ; "`source(,P)'" ljust} NL + {source(,U) ; move ; "`source(,U)'" ljust} NL + {source(,H) ; move ; "`source(,H)'" ljust} NL + {source(,R) ; move ; "`source(,R)'" ljust} NL + {source(,S) ; move ; "`source(,S)'" ljust} NL + {source(,SCr) ; move ; "`source(,SCr)'" ljust} NL + {source(,T) ; move ; "`source(,T)'" ljust} NL + {source(,L) ; move ; "`source(,L)'" ljust} NL + {source(,B) ; move ; "`source(,B)'" ljust} NL(moveht*0.8) + {nullator ; move ; "`nullator'" ljust} NL(moveht*0.6) + {norator ; move ; "`norator'" ljust} +} + move right_ 2.0 + {source(,N) ; move ; "`source(,N)'" ljust} NL + {source(,"\rm mA");move; "`source(,\"mA\")'" ljust} NL(0.31) +# {source(,"mA");move; "`source(,'" ljust \ +# "`\enskip \"mA\")'" ljust} NL(0.31) + {consource ; move ; "`consource'" ljust} NL(0.32) + {consource(,I) ; move ; "`consource(,I)'" ljust} NL(0.32) + {consource(,i) ; move ; "`consource(,i)'" ljust} NL(0.32) + {source(,SE) ; move ; "`source(,SE)'" ljust} NL + {consource(,V) ; move ; "`consource(,V)'" ljust} NL(0.32) + {consource(,v) ; move ; "`consource(,v)'" ljust} NL(0.3) + {battery ; move ; "`battery'" ljust} NL + {battery(,3,R) ; move ; "`battery(,3,R)'" ljust} + +iflatex(`ifpsfrag(,`latexcommand(})')') +.PE diff --git a/graphics/circuit_macros/examples/Switches.m4 b/graphics/circuit_macros/examples/Switches.m4 new file mode 100644 index 0000000000..d8262be92d --- /dev/null +++ b/graphics/circuit_macros/examples/Switches.m4 @@ -0,0 +1,117 @@ +.PS +# Switches.m4 +cct_init + +movewid = 0.25 +# Row 1 + right_; { + lswitch; {S:"\tt ls{}witch" at last [].s+(0,-10bp__)} + move right_ + lswitch(,,O); {"\tt (,,O)" at (last [],S)} + move right_ + lswitch(,,C); {"\tt (,,C)" at (last [],S)} + move right_ + lswitch(,,DA); {"\tt (,,DA)" at (last [],S)} + move right_ + lswitch(,,dDO); {"\tt (,,dDO)" at (last [],S)} + move right_ + lswitch(,,uDC); {"\tt (,,uDC)" at (last [],S)} + } +# Row 2 + move down; right_; { + lswitch(,,K); {S:"\tt (,,K)" at last [].s+(0,-10bp__)} + move right_ + lswitch(,,KD); {"\tt (,,KD)" at (last [],S)} + move right_ + lswitch(,,KOD); {"\tt (,,KOD)" at (last [],S)} + move right_ + lswitch(,,KCD); {"\tt (,,KCD)" at (last [],S)} + move right_ + bswitch; {"\tt `bswitch'" at (last [],S)} + move right_ + bswitch(,,C); {"\tt (,,C)" at (last [],S)} + } +# Row 3 + move down; right_; { + D: dswitch(,,); {S: "\tt ds{}witch(,{},)" at last [].s+(0,-10bp__)} + thinlines_ + { spline <- from 0.25 along_(D) up 0.1 then up 0.05 left 0.1 + {"\tt W" rjust} + spline <- from D.c+(0,m4sc*2) up 0.1 then up 0.05 left 0.1 + {"\tt B" rjust }} + thicklines_ + move right_ + D: dswitch(,,WdBK); {"\tt (,,WdBK)" at (last [],S)+(0,-4bp__)} + thinlines_ + { spline <- from tr_xy(0,-2) up 0.1 then up 0.10 left 0.1 + {"\tt dB" rjust} + spline <- from tr_xy(4,-2) right 0.1 then right 0.05 up 0.15 + {"\tt K" above }} + thicklines_ + move right_ + dswitch(,,WBmdDK); {"\tt (,,WBmdDK)" at (last [],S)} + move right_ + dswitch(,,WBKTr); {"\tt (,,WBKTr)" at (last [],S)} + move right_ + dswitch(,,WdBL); {"\tt (,,WdBL)" at (last [],S+(0,-4bp__))} + move right_ + dswitch(,,WBCo); {"\tt (,,WBCo)" at (last [],S)} + } +# Row 4 + move down; right_; { + dswitch(,,WBKCo); {S: "\tt (,,WBKCo)" at last [].s+(0,-10bp__)} + move right_ + dswitch(,,WBCb); {"\tt (,,WBCb)" at (last [],S)} + move right_ + dswitch(,,WBDI); {"\tt (,,WBDI)" at (last [],S)} + move right_ + dswitch(,,WBSd); {"\tt (,,WBSd)" at (last [],S)} + move right_ + dswitch(,,WBFDI); {"\tt (,,WBFDI)" at (last [],S)} + move right_ + dswitch(,,WBFSd); {"\tt (,,WBFSd)" at (last [],S)} + } +# Row 5 + move down moveht*5/4; right_; { + dswitch(,,WBTh); {S: "\tt (,,WBTh)" at last [].s+(0,-10bp__)} + move right_ + dswitch(,,WBKC); {"\tt (,,WBKC)" at (last [],S)} + move right_ + dswitch(,,WBM); {"\tt (,,WBM)" at (last [],S)} + move right_ + dswitch(,,WBCO); {"\tt (,,WBCO)" at (last [],S)} + move right_ + dswitch(,,WBMP); {"\tt (,,WBMP)" at (last [],S)} + move right_ + dswitch(,,WBoKCP); {"\tt (,,WBoKCP)" at (last [],S)} + } +# Row 6 + move down moveht*5/4; right_; { + dswitch(,,WBCY); {S: "\tt (,,WBCY)" at last [].s+(0,-10bp__)} + move right_ + dswitch(,,WBCZ); {"\tt (,,WBCZ)" at (last [],S)} + move right_ + dswitch(,,WBCE); {"\tt (,,WBCE)" at (last [],S)} + move right_ + dswitch(,,WBRH); {"\tt (,,WBRH)" at (last [],S)} + move right_ + dswitch(,,WBRdH); {"\tt (,,WBRdH)" at (last [],S)} + move right_ + dswitch(,,WBRHH); {"\tt (,,WBRHH)" at (last [],S)} + } +# Row 7 + move down; right_; { + dswitch(,,WBMMR); {S: "\tt (,,WBMMR)" at last [].s+(0,-10bp__)} + move right_ + dswitch(,,WBMM); {"\tt (,,WBMM)" at (last [],S)} + move right_ + dswitch(,,WBMR); {"\tt (,,WBMR)" at (last [],S)} + move right_ + dswitch(,,WBEL); {"\tt (,,WBEL)" at (last [],S)} + move right_ + dswitch(,,WBLE); {"\tt (,,WBLE)" at (last [],S)} + move right_ + dswitch(,,WBoKEL); {"\tt (,,WBoKEL)" at (last [],S)} + } + +.PE diff --git a/graphics/circuit_macros/examples/Tgate.m4 b/graphics/circuit_macros/examples/Tgate.m4 new file mode 100644 index 0000000000..ff42cecb8d --- /dev/null +++ b/graphics/circuit_macros/examples/Tgate.m4 @@ -0,0 +1,50 @@ +.PS +# Tgate.m4 +cct_init +right_ + +[ { Q: tgate + "$A$" at Q.A rjust + "$B$" at Q.B ljust + "$G$" at Q.G ljust below + "$Gb$" at Q.Gb ljust above + `"\tt tgate"' at Q.A-(0.25,0) rjust + } + + move down_ linewid; right_ + { Q: tgate(,L) + "$A$" at Q.A rjust + "$B$" at Q.B ljust + "$G$" at Q.G ljust above + "$Gb$" at Q.Gb ljust below + `"\tt tgate(,L)"' wid 0.65 at Q.A-(0.25,0) rjust + } + ] + +[ { Q: tgate(,B) + "$A$" at Q.A rjust + "$B$" at Q.B ljust + "$G$" at Q.G ljust + `"\tt tgate(,B)"' at Q.G-(0,10bp__) below + } + ] with .Q.A at last [].Q.B+(0.5,linewid/2) + +[ { Q: ptrans + "$A$" at Q.A rjust + "$B$" at Q.B ljust + "$G$" at Q.G rjust below + "$Gb$" at Q.Gb rjust + `"\tt ptrans"' at Q.B+(0.25,0) ljust + } + + move down_ linewid; right_ + { Q: ptrans(,L) + "$A$" at Q.A rjust + "$B$" at Q.B ljust + "$G$" at Q.G ljust above + "$Gb$" at Q.Gb ljust below + `"\tt ptrans(,L)"' at Q.B+(0.25,0) ljust + } + ] with .Q.Gb at (last [].e.x+elen_/2+0.5,1st [].Q.Gb.y) + +.PE diff --git a/graphics/circuit_macros/examples/Timer.m4 b/graphics/circuit_macros/examples/Timer.m4 index 65fe897847..a5db32c800 100644 --- a/graphics/circuit_macros/examples/Timer.m4 +++ b/graphics/circuit_macros/examples/Timer.m4 @@ -16,15 +16,15 @@ define(`ic555',`[Chip: box ht boxwid wid boxwid "555" define(`elen_',`linewid') Vs: dot down_ - variable(`resistor(,E); llabel(,1`\,'\hbox{M})') - resistor(,E); llabel(,100`\,'\hbox{k}) - capacitor(,E); llabel(220`\,'\mu) + variable(`resistor(,E); llabel(,\SI{1}{M})') + resistor(,E); llabel(,\SI{100}{\kilo{}}) + capacitor(,E); llabel(\SI{220}{\micro{}}) Zero: dot dot(at Vs+(elen_*4/3,0)) - resistor(,E); llabel(,33`\,'\hbox{k}) + resistor(,E); llabel(,\SI{33}{\kilo{}}) line to (Here,Zero) chop 0 chop elen_ -C2: capacitor; llabel(0.1`\,'\mu) +C2: capacitor; llabel(\SI{0.1}{\micro{}}) dot IC1: ic555 with .P7 at C2.start + (elen_,0) @@ -40,11 +40,11 @@ R: dot B: buzzer(,,C) with .In3 at Here line from B.In1 to (R,B.In1) reversed(`diode',to (Here,Vs),LE); "red" at last line.c+(elen_/2,0) - resistor(down_ elen_ from R,E); llabel(,470) + resistor(down_ elen_ from R,E); llabel(,\num{470}) diode(to (Here,Zero),LE); {"green" at last line.c+(elen_*2/3,0)} line to Zero chop 0 chop -elen_ line up_ (Vs.y-Here.y)/3 - battery(up_ (Vs.y-Here.y)/3); rlabel(,,9`\,'\hbox{V}) + battery(up_ (Vs.y-Here.y)/3); rlabel(,,\SI{9}{V}) switch(to (Here,Vs),,D) line to (R,Vs) diff --git a/graphics/circuit_macros/examples/Tubediags.m4 b/graphics/circuit_macros/examples/Tubediags.m4 index f597ca1ae2..e07336e4e3 100644 --- a/graphics/circuit_macros/examples/Tubediags.m4 +++ b/graphics/circuit_macros/examples/Tubediags.m4 @@ -24,7 +24,7 @@ Pot1: potentiometer(down_ dimen_*2,5) with .Start at Here line from Pot1.End left_ dimen_ battery(up_ to Ld,2) Tg: dot(at Pot1.T1) - source(right_ dimen_ from Pot1.T1,"\scriptsize $\mu$A") + source(right_ dimen_ from Pot1.T1,"\scriptsize \si{\mu A}") line right_ dimen_/3 Tr: triode with .G1.w at Here line from Tr.K1.sw to (Tr.K1.sw,Pot1.End); dot @@ -49,18 +49,6 @@ T: Here # Circuit of 25 W amplifier (adapted from F. Langford-Smith, "Radiotron # Designer's Handbook," fourth edition, Harrison, NJ, Radio Corporation # of America, 1952) -command " -\newcommand{\Amp}{\hbox{$\,$A}} -\newcommand{\Henry}{\hbox{$\,$H}} -\newcommand{\Volt}{\hbox{$\,$V}} -\newcommand{\Watt}{\hbox{$\,$W}} -\newcommand{\mA}{\hbox{$\,$mA}} -\renewcommand{\kilo}{\hbox{$\,$k}} -\renewcommand{\mega}{\hbox{$\,$M}} -\renewcommand{\micro}{\hbox{$\,\mu$}} -\renewcommand{\nano}{\hbox{$\,$n}} -\renewcommand{\pico}{\hbox{$\,$p}} -" define(`OutputXformer',`[ pushdef(`dimen_',dimen_*1.5) S1: inductor(up_ dimen_*.4,L,3,M) @@ -95,7 +83,7 @@ define(`PowerXformer',`[ pushdef(`dimen_',dimen_*1.5) [ Toprail: Here #{"Toprail"} - resistor(down_ dimen_); rlabel(,100\kilo) + resistor(down_ dimen_); rlabel(,\SI{100}{\kilo{}}) V1P: dot #{"V1P" rjust} line down_ dimen_*3/4 @@ -109,17 +97,17 @@ Rail1: dot RP: Here arrow <- right from (Here,Rail1) to Rail1 dot(at last arrow) - resistor(up_ 2nd last arrow.y-Here.y); llabel(,22\kilo); dot + resistor(up_ 2nd last arrow.y-Here.y); llabel(,\SI{22}{\kilo{}}); dot { move left_ dimen_ }; "Pickup" at RP below - capacitor(right_ dimen_ from V1P,C,R); llabel(,0.05\micro) - resistor(down_ dimen_); rlabel(,470\kilo) + capacitor(right_ dimen_ from V1P,C,R); llabel(,\SI{0.05}{\micro{}}) + resistor(down_ dimen_); rlabel(,\SI{470}{\kilo{}}) V1o: dot #{ "V1o" at V1o rjust } - resistor(down_ (Here.y-Rail1.y)/2); rlabel(,22\kilo) + resistor(down_ (Here.y-Rail1.y)/2); rlabel(,\SI{22}{\kilo{}}) dot - { capacitor(down_ Here.y-Rail1.y,C); rlabel(,0.01\micro); dot } + { capacitor(down_ Here.y-Rail1.y,C); rlabel(,\SI{0.01}{\micro{}}); dot } line right_ dimen_/2 -R47: resistor(down_ to (Here,Rail1)); llabel(,,4.7\mega) +R47: resistor(down_ to (Here,Rail1)); llabel(,,\SI{4.7}{\mega{}}) line to Rail1 Pot1: potentiometer(down_ dimen_,,0.5,dimen_*2/3) \ @@ -130,64 +118,64 @@ Pot1: potentiometer(down_ dimen_,,0.5,dimen_*2/3) \ Rail2: dot ground V2: triode(,E) with .G1.w at Pot1.T1; "6SL7" at V2.ne above - resistor(from Rail2 right_ V2.K1.e.x-Rail2.x); rlabel(,22\kilo); dot - { capacitor(right_ dimen_,C,R); rlabel(,2\nano) + resistor(from Rail2 right_ V2.K1.e.x-Rail2.x); rlabel(,\SI{22}{\kilo{}}); dot + { capacitor(right_ dimen_,C,R); rlabel(,\SI{2}{\nano{}}) V2k: dot } #{ "V2k" at V2k above } { line down_ to (Here,Rail1) - variable(`resistor(right_ dimen_); rlabel(,1\mega);') + variable(`resistor(right_ dimen_); rlabel(,\SI{1}{\mega{}});') line up_ to V2k } line to V2.K1.se line from Toprail to (R47,Toprail); dot - { capacitor(down_ dimen_,C); rlabel(10\micro); ground(,T) } - R51k: resistor(right_ dimen_); rlabel(,51\kilo); dot - { capacitor(down_ dimen_,C); llabel(10\micro); ground(,T) } + { capacitor(down_ dimen_,C); rlabel(\SI{10}{\micro{}}); ground(,T) } + R51k: resistor(right_ dimen_); rlabel(,\SI{51}{\kilo{}}); dot + { capacitor(down_ dimen_,C); llabel(\SI{10}{\micro{}}); ground(,T) } dot(at (V2.P1.c,Here)) - resistor(down_ dimen_); llabel(,100\kilo) + resistor(down_ dimen_); llabel(,\SI{100}{\kilo{}}) V2p: dot line to V2.P1 V3: triode(,W) with .G1.w at (V2k+(dimen_,0),V2.G1) "$\;$6SL7" at V3.n below ljust - resistor(from V3.K1.sw to (V3.K1.sw,Rail1)); llabel(,1.5\kilo); dot; ground + resistor(from V3.K1.sw to (V3.K1.sw,Rail1)); llabel(,\SI{1.5}{\kilo{}}); dot; ground line left_ dimen_/2 resistor(up_ to (Here,V3.G1)); llabel(2.2); rlabel(\hbox{M}); dot { line to V3.G1.w } - line to (Here,V2p); capacitor(left_ to V2p,C,R); rlabel(,3\nano) + line to (Here,V2p); capacitor(left_ to V2p,C,R); rlabel(,\SI{3}{\nano{}}) dot(at (V3.P1.c,Toprail)); { line to R51k.end } - resistor(down_ dimen_); llabel(,51\kilo) + resistor(down_ dimen_); llabel(,\SI{51}{\kilo{}}) V3p: dot #{"V3p"} line down_ (Here.y-V3.n.y)/2 V3q: dot; { line to V3.P1.c } - capacitor(left_ dimen_*2/3,C); rlabel(,0.1\micro) + capacitor(left_ dimen_*2/3,C); rlabel(,\SI{0.1}{\micro{}}) line to (V2k,Here) - resistor(down_ to V2k); rlabel(0.1); llabel(\mega) + resistor(down_ to V2k); rlabel(0.1); llabel(\si{\mega{}}) #{"V2k" at V2k} V4: triode(,E) with .G1.w at (V3.G1.e+(dimen_*2,0),V3.G1) "6SL7" at V4.n above rjust - resistor(from V4.K1.se to (V4.K1.se,Rail1)); rlabel(,,1.5\kilo) + resistor(from V4.K1.se to (V4.K1.se,Rail1)); rlabel(,,\SI{1.5}{\kilo{}}) V4k: dot #{"V4k"} line left dimen_*3/4 V4k1: dot - { resistor(up_ V4.G1.y-Here.y); llabel(,,2.2\mega) + { resistor(up_ V4.G1.y-Here.y); llabel(,,\SI{2.2}{\mega{}}) V4G: dot } line from V3p right_ dimen_ - variable(`resistor(down_ to (Here,V4.G1)); llabel(100\kilo)') + variable(`resistor(down_ to (Here,V4.G1)); llabel(\SI{100}{\kilo{}})') V3o: dot - capacitor(right_ to V4G,C); llabel(,3\nano) + capacitor(right_ to V4G,C); llabel(,\SI{3}{\nano{}}) line to V4.G1.w - resistor(left_ from V4k1 to (V3o,V4k)); rlabel(,51\kilo); dot + resistor(left_ from V4k1 to (V3o,V4k)); rlabel(,\SI{51}{\kilo{}}); dot ground - capacitor(down_ from V3o to Here,C); llabel(,,500\pico) + capacitor(down_ from V3o to Here,C); llabel(,,\SI{500}{\pico{}}) line from V4.P1.c to (V4.P1.c,V3p); - resistor(up_ dimen_); llabel(,51\kilo); dot - resistor(left_ to (V3p,Here)); llabel(,10\kilo) + resistor(up_ dimen_); llabel(,\SI{51}{\kilo{}}); dot + resistor(left_ to (V3p,Here)); llabel(,\SI{10}{\kilo{}}) V5: triode(,N) with .G1.w at V4.G1.e+(2.25*dimen_,0) "6SL7" at V5.n above rjust @@ -196,26 +184,26 @@ V6: triode(,SR) with .G1.w at V5.G1.w-(0,dimen_*2.5) V4p: dot(at (V4.P1.c,V3p)) #{"V4p"} - line right_ dimen_*2/3; capacitor(right_ dimen_,C); llabel(,3\pico) + line right_ dimen_*2/3; capacitor(right_ dimen_,C); llabel(,\SI{3}{\pico{}}) line down_ to (Here,V5.G1) V5G: dot; { line to V5.G1.w } #{"V5G"} - resistor(down_ dimen_); rlabel(,2.2); llabel(,\mega); dot - resistor(right_ to (V5.K1.sw,Here)); llabel(,1\kilo) + resistor(down_ dimen_); rlabel(,\num{2.2}); llabel(,\si{\mega{}}); dot + resistor(right_ to (V5.K1.sw,Here)); llabel(,\SI{1}{\kilo{}}) V5K: dot #{"V5K"} line to V5.K1.sw line from V4k down_ V4k.y-V6.G1.y then right_ V5G.x-V4k.x - dimen_ - capacitor(right_ dimen_,C); rlabel(,3\pico) + capacitor(right_ dimen_,C); rlabel(,\SI{3}{\pico{}}) V6G: dot; { line to V6.G1.w } #{"V6G"} - resistor(up_ dimen_); llabel(,2.2); rlabel(,\mega); dot - resistor(right_ to (V6.K1.nw,Here)); llabel(,1\kilo) + resistor(up_ dimen_); llabel(,2.2); rlabel(,\si{\mega{}}); dot + resistor(right_ to (V6.K1.nw,Here)); llabel(,\SI{1}{\kilo{}}) V6K: dot #{"V6K"} line to V6.K1.nw - resistor(left_ dimen_*2/3 from (V6G,V6K)); rlabel(,1\kilo) dot; ground - line to (Here,V5K); resistor(right_ dimen_*2/3); llabel(,1\kilo) + resistor(left_ dimen_*2/3 from (V6G,V6K));rlabel(,\SI{1}{\kilo{}}) dot; ground + line to (Here,V5K); resistor(right_ dimen_*2/3); llabel(,\SI{1}{\kilo{}}) PV: dot(at (V4.e.x+dimen_/5,Toprail.y)) #{"PV"} @@ -223,15 +211,15 @@ PV: dot(at (V4.e.x+dimen_/5,Toprail.y)) Rail2: dot #{"Rail2" below} line from PV to (PV,Rail2); corner - { resistor(right_ to Rail2); llabel(,220\kilo) } + { resistor(right_ to Rail2); llabel(,\SI{220}{\kilo{}}) } move up_ dimen_*2/3; dot; line left_ dimen_/2 V6sw: dot #{"V6sw"} - capacitor(down_ dimen_*2/3,C); rlabel(,10\micro); ground(,T) + capacitor(down_ dimen_*2/3,C); rlabel(,\SI{10}{\micro{}}); ground(,T) V5P: dot(at (V6.P1.c,V4p)); { line to V5.P1.c } #{"V5P"} - resistor(to (Here,Toprail)); rlabel(,220\kilo) + resistor(to (Here,Toprail)); rlabel(,\SI{220}{\kilo{}}) line to (V4p,Here) V7: V_6L6G at (V3,Rail2+(0,-2*dimen_)); "6L6G" at V7.n above ljust @@ -248,21 +236,22 @@ L910: line from V9G to (V9G,V10.G2); dot line left_ dimen_/2 from V7.G1.w V7G: dot #{"V7G"} - resistor(down_ to 0.5 between Here and (Here,V10.G1)); rlabel(,220\kilo) + resistor(down_ to 0.5 between Here and (Here,V10.G1)) + rlabel(,\SI{220}{\kilo{}}) V7T: dot #{"V7T"} { line left_ dimen_/3; corner; ground } line from V8.G1.w to (V7G,V8.G1); dot - resistor(up_ to V7T); llabel(,220\kilo) + resistor(up_ to V7T); llabel(,\SI{220}{\kilo{}}) line from V9.K1.sw to V10.K1.nw line from V7.K1.sw to V8.K1.nw V7K: dot(at last line.c+(0,dimen_/8)) #{"V7K"} line left_ dimen_*2; dot - { capacitor(down_ dimen_/2,C); llabel(,50\micro); ground(,T) } + { capacitor(down_ dimen_/2,C); llabel(,\SI{50}{\micro{}}); ground(,T) } PP: potentiometer(left_ dimen_,,0.5,dimen_/2) with .Start at Here - rlabel(,50\ 10\Watt) + rlabel(,50\ \SI{10}{W}) corner(,at PP.T1); line left_ dimen_ then up_ dimen_/4 round(,tubethick) line thick tubethick up tubeplatelen/3 left tubeplatelen*2/9 @@ -294,16 +283,16 @@ V10P: dot line from V7.P1.c up_ V9P.y-V7.P1.y then to V9P resistor(right_ to (V5.e+(dimen_/4,0),Here)) - rlabel(,\shortstack{100\kilo\\2\Watt}) + rlabel(,\shortstack{\SI{100}{\kilo{}}\\ \SI{2}{W}}) Rt1: Here line to (Here,V6.e)+(0,dimen_/6); resistor(up_ dimen_) - llabel(,\shortstack{100\kilo\\2\Watt}) + llabel(,\shortstack{\SI{100}{\kilo{}}\\ \SI{2}{W}}) line to (Here,V5K) then to V5K line from V8.P1.c down_ V8.P1.y-V10P.y then to V10P resistor(right_ to (V6.e+(dimen_/2,0),Here)) - llabel(,\shortstack{100\kilo\\2\Watt}) + llabel(,\shortstack{\SI{100}{\kilo{}}\\ \SI{2}{W}}) resistor(up_ dimen_*3/2) - llabel(,\shortstack{100\kilo\\2\Watt}) + llabel(,\shortstack{\SI{100}{\kilo{}}\\ \SI{2}{W}}) line to (Here,V6K) then to V6K line from V9T to (V9.e+(dimen_*3/4,0),V9T) @@ -313,27 +302,27 @@ Xout: OutputXformer with .PT at Here line from Xout.PT left_ dimen_/4 XT: dot - resistor(from V6sw left_ dimen_); rlabel(,10\kilo) + resistor(from V6sw left_ dimen_); rlabel(,\SI{10}{\kilo{}}) XP: dot { line down_ dimen_; continue to (XT,Here) then to XT } - capacitor(right_ dimen_*5/4 from V5P,C); llabel(,0.1\micro) + capacitor(right_ dimen_*5/4 from V5P,C); llabel(,\SI{0.1}{\micro{}}) corner; line to (Here,Rail2)-(0,dimen_/2) continue to (V7nw,Here) then to V7nw line from V8sw down_ dimen_*5/8 continue to (Rail2,Here) then to (Rail2,V9.n) - capacitor(up_ dimen_/2,C,R); rlabel(,0.1\micro) + capacitor(up_ dimen_/2,C,R); rlabel(,\SI{0.1}{\micro{}}) line to Rail2 line from XP left_ dimen_*2; dot { dot(at Here+(dimen_,0)) { "290 V" at last [].n above } R100: resistor(down_ dimen_*2/3) - llabel(,\shortstack{100\kilo\\2\Watt}); dot; ground } - { capacitor(down_ dimen_*2/3,C); llabel(,40\micro); dot } - reversed(`inductor',left_ dimen_,L,,M); rlabel(,4\Henry\; 300\mA) + llabel(,\shortstack{\SI{100}{\kilo{}}\\ \SI{2}{W}}); dot; ground } + { capacitor(down_ dimen_*2/3,C); llabel(,\SI{40}{\micro{}}); dot } + reversed(`inductor',left_ dimen_,L,,M); rlabel(,\SI{4}{H}\; \SI{300}{\mA}) Filt: dot - { capacitor(down_ dimen_*2/3,C); llabel(,40\micro) + { capacitor(down_ dimen_*2/3,C); llabel(,\SI{40}{\micro{}}) line to R100.end } Pwr: [ @@ -363,8 +352,8 @@ PO: dot line right_ dimen_/8 then up last [].y - Here.y then to last [].w arrow from PXform.S3.start right_ dimen_ arrow from PXform.S3.end right_ dimen_ - "5\Volt" at PXform.S2 + (dimen_*3/4,0) - "6.3\Volt" at 0.5 between last arrow.end and 2nd last arrow.end ljust + "\SI{5}{V}" at PXform.S2 + (dimen_*3/4,0) + "\SI{6.3}{V}" at 0.5 between last arrow.end and 2nd last arrow.end ljust ] with .nw at (RP,Filt)+(0,dimen_/4) line from Pwr.PXform.S2.start to Pwr.PO + (dimen_*3/4,0); corner resistor(up_ to (Here,Filt)); rlabel(,\shortstack{V\\\hbox{adj}}); corner diff --git a/graphics/circuit_macros/examples/Variable.m4 b/graphics/circuit_macros/examples/Variable.m4 new file mode 100644 index 0000000000..6fac01e164 --- /dev/null +++ b/graphics/circuit_macros/examples/Variable.m4 @@ -0,0 +1,28 @@ +.PS +# `Variable.m4' +cct_init + +define(`elen_',dimen_); down_ +[ { variable(`capacitor') }; move right + { variable(`resistor',uN) }; move right + { variable(`capacitor(,C)') }; move right + { variable(`inductor') }; move right + { variable(`inductor(,W)') } + ] +[ + skp = 0.4 + hskip = linewid*0.5 + cskip = hskip +Orig: Here + { move right cskip+elen_+hskip + line invis right_ elen_ "\tt C"; move right_ hskip + line invis right_ elen_ "\tt S" } + Loopover_(`char', + `move down skp ifelse(char,A,*0.5) + { line invis right_ cskip "\tt char" + variable(`capacitor(,C)',char); move right_ hskip + variable(`capacitor(,C)',char`'C); move right_ hskip + variable(`capacitor(,C)',char`'S) }', + A,P,L,N) + ] with .w at last [].e+(0.4,0) +.PE diff --git a/graphics/circuit_macros/examples/Windings.m4 b/graphics/circuit_macros/examples/Windings.m4 new file mode 100644 index 0000000000..0c1ff4b87b --- /dev/null +++ b/graphics/circuit_macros/examples/Windings.m4 @@ -0,0 +1,113 @@ +.PS +cct_init +# Windings.m4 + ifelse(xtract(m4postprocessor,pstricks,pgf,mpost,pdf,postscript,svg),, + `print " + `pstricks, pgf, mpost, pdf, postscript, or svg required for Windings.m4'" + "`pstricks, pgf, mpost, pdf, postscript, or svg required for Windings.m4'"', +` + s_init(Windings) + ifdef(`Windings_1',,`sinclude(FWindings.dim)') + sinclude(Circuit_macros.dim) + ifdef(`Windings_1',,`sinclude(tst.dim)') + +define(`vlight',`rgbstring(0.9,0.9,0.9)') +define(`lightgray',`rgbstring(0.7,0.7,0.7)') + +[ W: winding ] + s_box(\tt w{}inding) at last [].s below + +[ winding(R) ] with .n at last "".s+(0,-0.1) + s_box(\tt w{}inding(R)) at last [].s below + +[ sk = 0.75 + d = 1.5*sk + p = 0.4*sk + w = 1*sk + +W: winding(L,d,p,4,w,vlight) + +thinlines_ + dimension_(from W.nw+(p/4,0) right p,0.1,s_box(\tt pitch\strut) above,W) + dimension_(from W.sw to W.nw,0.2,s_box(\tt diam),H) + dimension_(from W.e+(-p/2,-w/2) up w,-0.3,,s_ht) + s_box(\tt\hfill core wid) at W.e ljust + arrow <- up d-w+0.1 left d/10 from W.ne+(-p/2,-(d-w)) + s_box(\tt core color) at Here+(-0.2,0) ljust above +thicklines_ +] with .sw at last [].se+(0.25,0) + "\tt T1" at last [].W.T1 below + "\tt T2" at last [].W.T2 below + +[ +#`winding(L|R, diam, pitch, nturns, core wid, core color )' +boxwid = 0.3 +boxht = 0.4 + down_ +B1: box + winding(,boxwid*1.3,boxht/5,3,boxwid) at B1 + "Left pins" "cw" at B1.s+(0,-0.15) + for_(1,2,1,`"\sl\small T`'m4x" at last [].T`'m4x rjust') +B2: box at B1.e + (0.5,0) + winding(R,boxwid*1.3,boxht/5,3,boxwid) at B2 + "Left pins" "ccw" at B2.s+(0,-0.15) + for_(1,2,1,`"\sl\small T`'m4x" at last [].T`'m4x rjust') + up_ +B3: box at B1.s + (0,-0.55) + winding(,boxwid*1.3,boxht/5,3,boxwid) at B3 + "Right pins" "cw" at B3.s+(0,-0.15) + for_(1,2,1,`"\sl\small T`'m4x" at last [].T`'m4x ljust') +B4: box at (B2,B3) + winding(R,boxwid*1.3,boxht/5,3,boxwid) at B4 + "Right pins" "ccw" at B4.s+(0,-0.15) + for_(1,2,1,`"\sl\small T`'m4x" at last [].T`'m4x ljust') +] with .sw at last [].se+(0.1,0) + +[ + Q: box invis ht 1 wid 5/4 + g = Q.wid/12 + ironwid = Q.wid/4.5 + + line thick ironwid/(1bp__)+linethick from Q.n+(g/2-linethick/2 bp__,0) \ + to Q.ne then to Q.se then to Q.sw then to Q.nw \ + then to Q.n+(-g/2+linethick/2 bp__,0) + ifmpost(`rgbdraw(0.7,0.7,0.7,') + line thick ironwid/(1bp__)-linethick outlined lightgray \ + from Q.n+(g/2+linethick/2 bp__,0) \ + to Q.ne then to Q.se then to Q.sw then to Q.nw \ + then to Q.n+(-g/2-linethick/2 bp__,0) + ifmpost(`)') + +thinlines_ + dimension_(from Q.n+(-g/2,-ironwid/2) right g,-ironwid/4, + "$g$" below,1,2pt__) +thicklines_ + + down_ + P: winding(R,ironwid*5/4,ironwid/2,4,ironwid,lightgray) at Q.w + line left ironwid*2/3 from P.T1 + arrow right to P.T1 "$i_1$" above + line left ironwid*2/3 from P.T2 + gap(up_ to 2nd last line.end) + llabel(-,s_box($v_1$),+) + "$N_1$" at P.e ljust + + up_ + S: winding(L,ironwid*5/4,ironwid/2,4,ironwid,lightgray) at Q.e + line right ironwid*2/3 from S.T2 + arrow left to S.T2 "$i_2$" above + line right ironwid*2/3 from S.T1 + gap(up_ to 2nd last line.end) + rlabel(-,s_box($v_2$),+) + "$N_2$" at S.w rjust + + box dashed rad ironwid/4 wid Q.wid ht Q.ht at Q + arrow right arrowht from 0.5 between Q.n and Q.ne + "$\phi$" ljust at Here+(0,5pt__) + + move up ironwid/2 from Q.n + move down ironwid/2 from Q.s +] with .sw at last [].se+(0.15,0) + +') +.PE diff --git a/graphics/circuit_macros/examples/Xform.m4 b/graphics/circuit_macros/examples/Xform.m4 new file mode 100644 index 0000000000..697d87fafa --- /dev/null +++ b/graphics/circuit_macros/examples/Xform.m4 @@ -0,0 +1,39 @@ +.PS +# `Xform.m4' +cct_init + +divert(-1) +define(`trlabels', + `{ thinlines_ + ifelse(`$1',R, + `arrow from `$3'.P1 <- right 0.12 up 0.072 chop 1pt__ ; "\sl P1" ljust + arrow from `$3'.P2 <- right 0.12 down 0.072 chop 1pt__ ; "\sl P2" ljust + arrow from `$3'.TP <- right 0.12 chop 1pt__ ; "\sl TP" wid 0.2 ljust + arrow from `$3'.S1 <- left 0.12 up 0.072 chop 1pt__ ; "\sl S1" rjust + arrow from `$3'.S2 <- left 0.12 down 0.072 chop 1pt__ ; "\sl S2" rjust + arrow from `$3'.TS <- left 0.12 chop 1pt__ ; "\sl TS" rjust + ',` + arrow from `$3'.P1 <- left 0.12 up 0.072 chop 1pt__ ; "\sl P1" rjust + arrow from `$3'.P2 <- left 0.12 down 0.072 chop 1pt__ ; "\sl P2" rjust + arrow from `$3'.TP <- left 0.12 chop 1pt__ ; "\sl TP" wid 0.2 rjust + arrow from `$3'.S1 <- right 0.12 up 0.072 chop 1pt__ ; "\sl S1" ljust + arrow from `$3'.S2 <- right 0.12 down 0.072 chop 1pt__ ; "\sl S2" ljust + arrow from `$3'.TS <- right 0.12 chop 1pt__ ; "\sl TS" ljust + ') + `"'\tt `$2'`"' at `$3'.s+(0,-(`$4')) + thicklines_ } ') +divert(0)dnl + + down_ + T1: transformer + trlabels(,`transformer',T1,0.3) + T2: transformer(down_ 0.6,,2,P,8) with .w at T1.e+(1,0) + trlabels(,`...(down\_ 0.6,,2,P,8)',T2,0.3) + T3: transformer(,,8,WD12,4) with .w at T2.e+(1,0) + trlabels(,`...(,,8,WD12,4)',T3,0.21) + T4: transformer(,,9,AL) with .sw at T3.se+(1,0) + trlabels(,`...(,,9,AL)',T4,0.3) + T5: transformer(,R,8,AW) with .sw at T4.se+(1,0) + trlabels(R,`...(,R,8,AW)',T5,0.3) + +.PE diff --git a/graphics/circuit_macros/examples/darrows.m4 b/graphics/circuit_macros/examples/darrows.m4 deleted file mode 100644 index 07c5bfaf22..0000000000 --- a/graphics/circuit_macros/examples/darrows.m4 +++ /dev/null @@ -1,61 +0,0 @@ -.PS -# darrows.m4 -darrow_init - -[ -line thick 0.4 outlined "lightgray" down_ 6 -line thick 0.4 outlined "lightgray" down_ 6 from last line.start+(1,0) -move to 1st line.start -right_ - -linethick = 5 -define(`dlthick',0.25) -linewid = 1 - - { darrow() } -move down 0.4; right_; { darrow(,t) } -move down 0.4; right_; { darrow(,,t) } -move down 0.4; right_; { darrow(,t,t) } -move down 0.4; right_; { darrow(,,,,,,|-) } -move down 0.4; right_; { darrow(,,,,,,!-) } -move down 0.4; right_; { darrow(,,,,,,<-) } -move down 0.4; right_; { darrow(,t,,,,,<-) } -move down 0.4; right_; { darrow(,,t,,,,<-) } -move down 0.4; right_; { darrow(,t,t,,,,<-) } -move down 0.4; right_; { darrow(,,,,,,<-|) } -move down 0.4; right_; { darrow(,,,,,,<-!) } -move down 0.4; right_; { darrow(,,,,,,<->) } -move down 0.4; right_; { darrow(,t,,,,,<->) } -move down 0.4; right_; { darrow(,,t,,,,<->) } -move down 0.4; right_; { darrow(,t,t,,,,<->) } -] - -[ -line thick 0.4 outlined "lightgray" down_ 6 -line thick 0.4 outlined "lightgray" down_ 6 from last line.start+(1,0) -move to 1st line.start -right_ - -linethick = 5 -define(`dlthick',0.25) -linewid = 1 - - { Darrow() } -move down 0.4; right_; { Darrow(,S) } -move down 0.4; right_; { Darrow(,E) } -move down 0.4; right_; { Darrow(,S;E) } -move down 0.4; right_; { Darrow(,ends=|-) } -move down 0.4; right_; { Darrow(,ends=!-) } -move down 0.4; right_; { Darrow(,ends=<-) } -move down 0.4; right_; { Darrow(,S;ends=<-) } -move down 0.4; right_; { Darrow(,E;ends=<-) } -move down 0.4; right_; { Darrow(,S;E;ends=<-) } -move down 0.4; right_; { Darrow(,ends=<-|) } -move down 0.4; right_; { Darrow(,ends=<-!) } -move down 0.4; right_; { Darrow(,ends=<->) } -move down 0.4; right_; { Darrow(,S;ends=<->) } -move down 0.4; right_; { Darrow(,E;ends=<->) } -move down 0.4; right_; { Darrow(,S;E;ends=<->) } -] with .nw at last [].ne+(0.5,0) - -.PE diff --git a/graphics/circuit_macros/examples/ex01.m4 b/graphics/circuit_macros/examples/ex01.m4 index c72185cb00..a5bcef47ab 100644 --- a/graphics/circuit_macros/examples/ex01.m4 +++ b/graphics/circuit_macros/examples/ex01.m4 @@ -11,7 +11,7 @@ cct_init resistor; llabel(,47\`,'\Omega,); b_current(i_R\strut,above rjust) line right_ elen_/2 then down_ del - parallel_(`inductor(,W); llabel(,L,); b_current(i_L)', + parallel_(`inductor(,W); llabel(,L,); b_current(\>`'i_L)', `capacitor(,C); rlabel(+,v_C,-); llabel(,,\;C)') line to (Here,Vin.start) then to Vin.start diff --git a/graphics/circuit_macros/examples/ex02.m4 b/graphics/circuit_macros/examples/ex02.m4 index 2e5c2a6cb5..2265c1e317 100644 --- a/graphics/circuit_macros/examples/ex02.m4 +++ b/graphics/circuit_macros/examples/ex02.m4 @@ -1,6 +1,7 @@ .PS # ex02.m4 cct_init +linewid = linewid*4/5 [ [ diff --git a/graphics/circuit_macros/examples/ex07.m4 b/graphics/circuit_macros/examples/ex07.m4 deleted file mode 100644 index 56dfa7c198..0000000000 --- a/graphics/circuit_macros/examples/ex07.m4 +++ /dev/null @@ -1,69 +0,0 @@ -.PS -# ex07.m4 -gen_init -Barrel: box invis ht 0.4 wid 1.5 - up -Face: arc rad 2.6 from Barrel.e+(2.4,-1.7/2) to Barrel.e+(2.4,1.7/2) - - eps = 0.03 - arc ccw rad 2.6 from Face.start-(eps,0) to Face.end-(eps,0) \ - with .c at Face.c-(eps,0) - line from Barrel.nw to Barrel.ne then to Face.end - line from Barrel.sw to Barrel.se then to Face.start - arc cw from Barrel.sw to Barrel.nw rad Barrel.ht*1.2 - -Cathode: Barrel.w+(0.3,0) -Term: Barrel.w+(-0.25,0) - dcath = 0.13 - dan = 0.12 - - line from Cathode up dcath/2 left dcath/2 then to Term.x,Cathode.y+dcath/2 - dot - line from Cathode down dcath/2 left dcath/2 then to Term.x,Cathode.y-dcath/2 - dot - - hole = 0.06 -Hole: line invis up hole from Cathode+(0.5,-hole/2) - line from Hole.end up dan-hole/2 then to Term.x,Cathode.y+dan; dot - line from Hole.start down dan-hole/2 then to Term.x,Cathode.y-dan; dot - - platewid = 0.25 - platesep = 0.15 -Plates: box invis wid platewid ht platesep at Barrel.e+(-platewid/2,0) - line right platewid from Plates.nw - line right platewid from Plates.sw - line up 0.3 from Plates.n - line down 0.3 from Plates.s - -linethick_(1.4) -psset_(linecolor=gray) - - move to Cathode+(0.03,0) -Spot: 0.9<Face.start,Face.end> - arcto(Plates.c,Spot,(Plates.c.x-Cathode.x)*0.90) - line to Spot chop 0 chop -0.02 - -psset_(linecolor=black) -thinlines_ - - arrow <- from Cathode+(0.2,0.06) up 0.5 left 0.3 - "{\sl electron}" above "{\sl gun}" above - - arrow <- from Plates.nw+(0,0.06) up 0.5 left 0.3 - "{\sl deflection}" above "{\sl plates}" above - - arrow <- from 0.5<Plates.e,Spot>+(0,0.06) up 0.5 left 0.3 - "{\sl electron beam}" at Here+(-0.3,0) above - - spline <- from 1.015<Plates.e,Spot> right 0.1 up 0.1 then up 0.1 \ - then up 0.1 left 0.1 - "{\sl spot of light}sp_" rjust - - "{\sl vacuum}sp_" at 0.5<Face.start,Face.end>+(-0.4,0) rjust - - arrow <- from Face.start+(0.1,0.5) left 0.6*1.4 down 0.3*1.4 - "{\sl phosphor coating}sp_" rjust - - arrow <- from 0.2<Barrel.se,Face.start> left 0.6 down 0.3 - "{\sl glass enclosure (tube)}sp_" rjust -.PE diff --git a/graphics/circuit_macros/examples/ex18.m4 b/graphics/circuit_macros/examples/ex18.m4 index 201e8fee62..58fd24331a 100644 --- a/graphics/circuit_macros/examples/ex18.m4 +++ b/graphics/circuit_macros/examples/ex18.m4 @@ -27,7 +27,7 @@ define(`dimen_',dimen_*1.25) B: battery(up_ dimen_*2/3); rlabel(,V^o) move down dimen_/4 resistor(up_ dimen_); rlabel(,R,) - inductor(right_ elen_); b_current(i); rlabel(,L) + inductor(right_ elen_); b_current(i\mathstrut); rlabel(,L) { capacitor(down_ to (Here,B.start)); rlabel(,C); llabel(+,v,-) } line right_ dimen_ diode(down_ to (Here,B.start),T); b_current(h(v)) diff --git a/graphics/circuit_macros/examples/examples.pdf b/graphics/circuit_macros/examples/examples.pdf Binary files differindex fc47a4f9f9..2f31b4f030 100644 --- a/graphics/circuit_macros/examples/examples.pdf +++ b/graphics/circuit_macros/examples/examples.pdf diff --git a/graphics/circuit_macros/examples/examples.tex b/graphics/circuit_macros/examples/examples.tex index 6ab8d80315..0e483fa094 100644 --- a/graphics/circuit_macros/examples/examples.tex +++ b/graphics/circuit_macros/examples/examples.tex @@ -8,7 +8,7 @@ \usepackage{graphicx} \usepackage{boxdims} \usepackage{upgreek} -\usepackage[amssymb,Gray,thinqspace,textstyle]{SIunits} +\usepackage{siunitx} \usepackage{amssymb} \input header @@ -25,10 +25,56 @@ using m4 circuit macros and others, and gpic or dpic. In some cases there are other or better m4 or pic constructs for producing the same drawings, but the source-file names are shown for reference. - Most of the examples can be processed using either dpic~-p or gpic~-t, - but the possibility of other postprocessing has meant that sometimes - the source is slightly more complicated than it would be if only - one workflow had been assumed. The most simplicity and elegance is - achieved by sticking to one pic interpreter and one postprocessor. + Most of the examples can be processed using either dpic~-p, dpic~-g, + or gpic~-t, but the possibility of other postprocessing has meant that + sometimes the source is slightly more complicated than it would be if + only one workflow had been assumed. The most simplicity and elegance + is achieved by sticking to one pic interpreter and one postprocessor. + + A few of these examples are also found in the manual + Circuit\_macros.pdf. There are other examples in the examples directory + that are not included in this document. To process {\sl file}.m4, type, for + example, "make {\sl file}.pdf." + +% The tables of elements attempt to illustrate each macro option +% at least once but the number of option combinations is huge so these +% examples are not exhaustive. + + A few of the examples following the circuits test some of the boundaries + of what macros and the pic language can do. \input files +\endinput + +Other examples currently: +Ball.m4 +birds.m4 +Blogix.m4 +brace.m4 +Ccurve.m4 +chaos.m4 +Chuck.m4 +clock.m4 +Cruller.m4 +debug2.m4 +Escher.m4 +Euro.m4 +Floor.m4 +IC10107.m4 +keyval.m4 +Koch.m4 +OpAmpFilter.m4 +Orbits.m4 +person.m4 +Planes.m4 +PPA.m4 +Resolver.m4 +rotatetext.m4 +rotellipse.m4 +Shaky.m4 +snake.m4 +SPM.m4 +squiggle.m4 +Wheat.m4 +Zcos.m4 + diff --git a/graphics/circuit_macros/examples/fet.m4 b/graphics/circuit_macros/examples/fet.m4 new file mode 100644 index 0000000000..08498ef83d --- /dev/null +++ b/graphics/circuit_macros/examples/fet.m4 @@ -0,0 +1,170 @@ +.PS +# `fet.m4' +cct_init + +dwn = 0.9 +dwn = 1.0 +rgt = 0.9 +textht = 0.1 + +dnl `IRF4905(linespec,R)' +define(`IRF4905', + `[ ifelse(`$1',,,`eleminit_(`$1')') + Q: mosfet(,`$2',dMdPzEDSQdB,) ifelse(`$1',,` + S: Q.tr_xy(-4,-2); line from Q.tr_xy(-2,-2) to S + D: Q.tr_xy( 4,-2); line from Q.tr_xy(2,-2) to D', + `with .Diode.c at last line.c + S: last line.start; D: last line.end; line from S to D ') + G: Q.G + circle rad 5*dimen_/10 at Q.tr_xy(0,1) ]') + +define(`rmove',0.75) +define(`dir_',`right_') + +Orig: Here +dir_ + { move left 0.2 } + {J: j_fet(right_ dimen_,,,E) + "{\tt j\_fet(right\_ dimen\_,{,},E)}" wid 1.75 \ + with .nw at last [].sw+(0.0,-0.25) + "$G$" at last [].G rjust above + "$S$" at last [].S rjust + "$D$" at last [].D ljust + } + + move right_ 0.9; dir_ + {j_fet(,,P,) + "{\tt j\_fet(,{,}P,)}" at last [].s+(0,-0.05) below + "$G$" at last [].G rjust + "$S$" at last [].S rjust + "$D$" at last [].D ljust + } + + move right_ 0.9; dir_ + {e_fet(,R,,) + "{\tt e\_fet(,R,{,})}" at last [].s+(0,-0.05) below + "$G$" at last [].G rjust + "$S$" at last [].S rjust + "$D$" at last [].D ljust + } + + {move down_ dwn; dir_ + e_fet(,,P) + "{\tt e\_fet(,{,}P)}" at last [].s+(0.1,-0.2) below} + + move right_ 0.9; dir_ + {d_fet(,,,) + "{\tt d\_fet(,{,},)}" at last [].s+(0,-0.05) below} + + {move down_ dwn; dir_ + d_fet(,,P) + "{\tt d\_fet(,{,}P)}" at last [].s+(0,-0.05) below} + + move right_ 0.9; dir_ + {e_fet(,,,S) + "{\tt e\_fet(,{,},S)}" at last [].s+(0,-0.05) below} + + {move down_ dwn; dir_ + e_fet(,,P,S) + "{\tt e\_fet(,{,}P,S)}" at last [].s+(0,-0.2) below} + + move right_ 0.9; dir_ + {d_fet(,,,S) + "{\tt d\_fet(,{,},S)}" at last [].s+(0,-0.2) below} + + {move down_ dwn; dir_ + d_fet(,,P,S) + "{\tt d\_fet(,{,}P,S)}" at last [].s+(0,-0.05) below} + + move right_ 0.9; dir_ + {c_fet(,,,) + "{\tt `c\_fet'(,{,},)}" at last [].s+(0,-0.05) below} + + {move down_ dwn; dir_ + c_fet(,,P) + "{\tt `c\_fet'(,{,}P)}" at last [].s+(0,-0.2) below} + +move down 1; right_ + [ + linewid = linewid*1.2 + + Q1: mosfet(,,dGSDF,) + {"\tt `mosfet'(,{,}dGSDF,)" wid 1.25 \ + with .nw at last [].sw+(-0.2,-0.05) + thinlines_ + arrow <- down .05 left .15 from (Q1.G.x,Q1.G.y-0.05) + "\tt dG" rjust + arrow <- down .10 left .30 from Q1.Channel.start+(.15,0) + "\tt F" rjust + arrow <- down .05 left .15 from (Q1.S.x,Q1.S.y+0.05) + "\tt S" rjust + arrow <- down .05 right .15 from (Q1.D.x,Q1.D.y+0.05) + "\tt D" ljust + thicklines_ } + + move right_ rmove + Q2: mosfet(,,uHSDF,) + {"\tt `$\ldots$'(,{,}uHSDF,)" at last [].s+(0,-0.15) below + thinlines_ + arrow <- down .05 left .15 from (Q2.G.x,Q2.G.y-0.05) + "\tt uH" rjust + thicklines_ } + + move right_ rmove + Q3: mosfet(,,dMEDSQuB,) + {"\tt `$\ldots$'(,{,}dMEDSQuB,)" at last [].s+(0,-0.05) below + thinlines_ + arrow <- down .05 left .15 from (Q3.G.x,Q3.G.y-0.05) + "\tt dM" rjust + arrow <- down .13 left .30 from Q3.Channel.start+(.12,0) + "\tt E" rjust + arrow <- down .05 left .10 from Q3.S+(.06,0) + "\tt Q" rjust + arrow <- down .08 right .24 from (Q3.B.x,Q3.B.y+0.175) + "\tt uB" ljust + thicklines_ } + + move right_ rmove + Q4: mosfet(,,uMEDSuB) + {`"{\tt $\ldots$(,{,}uMEDSuB)}"' at last [].s+(0,-0.15) below + "$G$" at last [].G rjust + "$S$" at last [].S rjust + "$D$" at last [].D ljust + "$B$" at last [].B below + } + + move right_ rmove + Q5: mosfet(,,ZSDFdT,) + {"\tt `$\ldots$'(,{,}ZSDFdT,)" at last [].s+(0,-0.05) below + thinlines_ + arrow <- down .08 left .08 from (Q5.S.x,Q5.S.y+0.12) + "\tt Z" rjust + arrow from last arrow.end to Q5.Channel.c+(0.05,0) + arrow from last arrow.start to (Q5.D.x,Q5.D.y+.05) + arrow <- down .08 right .24 from (Q5.G.x,Q5.G.y-0.02) + "\tt dT" ljust + thicklines_ } + + move right_ rmove + up_ + Q6: IRF4905 with .c at Here + {`"\tt IRF4905"' at Q6.s+(0,-0.15) below + "$G$" at Q6.G rjust + "$D$" at Q6.D ljust above + "$S$" at Q6.S ljust below + } + ] with .nw at J.sw+(0,-1.35) #Orig+(-0.26,-1.2) + + right_ + M1: mosfet(,,dBSDFQM1,E) with .nw at J.nw+(0,-dwn) + "$G0$" at M1.G0 above rjust + "$G1$" at M1.G1 above ljust + {"\tt `mosfet'(,{,}dBSDFQM1,E)" wid 1.45 \ + with .nw at last [].sw+(0,-0.23) } + M2: mosfet(,,dBSDFQuM1) with .nw at M1.ne+(0.5,0) + "$G0$" at M2.G0 above ljust + "$G1$" at M2.G1 above rjust + {"\tt ...(,{,}dBSDFQuM1)" wid 1.25 \ + with .n at last [].s+(0,-0.05) } + +.PE diff --git a/graphics/circuit_macros/examples/files.tex b/graphics/circuit_macros/examples/files.tex index 1912e9e249..3f14c21bdb 100644 --- a/graphics/circuit_macros/examples/files.tex +++ b/graphics/circuit_macros/examples/files.tex @@ -49,6 +49,12 @@ } \bfig{ + \centerline{\getpic{Grounds}} + \caption{Ground symbols + \src{Grounds.m4}.} + } + +\bfig{ \centerline{\getpic{Switches}} \caption{The switch macros; {\tt switch(,,,L|B|D)} is a wrapper for {\tt lswitch}, {\tt bswitch}, and {\tt dswitch} @@ -56,12 +62,6 @@ } \bfig{ - \centerline{\getpic{Grounds}} - \caption{Ground symbols - \src{Grounds.m4}.} - } - -\bfig{ \centerline{\getpic{Antennas}} \caption{Antenna symbols \src{Antennas.m4}.} @@ -92,8 +92,26 @@ } \bfig{ + \centerline{\getpic{Contact}} + \caption{A non-exhaustive sampling of {\tt contact} macro variations + \src{Contact.m4}.} + } + +\bfig{ + \centerline{\getpic{Contacts}} + \caption{The {\tt contacts} macro + \src{Contacts.m4}.} + } + +\bfig{ + \centerline{\getpic{relaycoil}} + \caption{The {\tt relaycoil} macro + \src{relaycoil.m4}.} + } + +\bfig{ \centerline{\getpic{Relay}} - \caption{The {\tt contact} and {\tt relay} macros + \caption{Some variants of the {\tt relay} macro \src{Relay.m4}.} } @@ -179,6 +197,12 @@ } \bfig{ + \centerline{\getpic{ex02}} + \caption{Elements at obtuse angles + \src{ex02.m4}.} + } + +\bfig{ {\small\centerline{\getpic{Optoiso}} } \caption{Optical isolator: a circuit with right or left orientation \src{Optoiso.m4}.} @@ -324,12 +348,6 @@ } \bfig{ - \centerline{\getpic{ex02}} - \caption{Elements at obtuse angles - \src{ex02.m4}.} - } - -\bfig{ \centerline{\getpic{Rectifiers}} \caption{Rectifier circuits and waveforms \src{Rectifiers.m4}.} @@ -461,6 +479,12 @@ } \bfig{ + \centerline{\getpic{control}} + \caption{Control-system block diagrams that do not require m4 + \src{control.m4}.} + } + +\bfig{ \centerline{\getpic{GrayCode}} \caption{Gray code 10-bit encoder disk pattern \src{GrayCode.m4}.} @@ -487,24 +511,9 @@ } \bfig{ - \centerline{\getpic{exp}} - \caption{Test of {\tt project} and other {\tt lib3D} - macros, showing the projection of a solid onto - the $y_1,z_1$ plane by sighting along the $x_1$ axis. - \src{exp.m4}.} - } - -\bfig{ - \centerline{\getpic{graysurf}} - \caption{Plotting surfaces using gray scales. A sort algorithm - determines plotting order - \src{graysurf.m4}.} - } - -\bfig{ - \centerline{\getpic{shapes}} - \caption{Basic shapes - \src{shapes.m4}.} + \centerline{\getpic{ex06}} + \caption{Crosshatching by {\tt for} loops + \src{ex06.m4}.} } \bfig{ @@ -532,18 +541,6 @@ } \bfig{ - \centerline{\getpic{control}} - \caption{Control-system block diagrams that do not require m4 - \src{control.m4}.} - } - -\bfig{ - \centerline{\getpic{ex06}} - \caption{Crosshatching by {\tt for} loops - \src{ex06.m4}.} - } - -\bfig{ \centerline{\getpic{Loglog}} \caption{A graph drawn using the pic language \src{Loglog.m4}.} @@ -556,6 +553,33 @@ } \bfig{ + \centerline{\getpic{exp}} + \caption{Test of {\tt project} and other {\tt lib3D} + macros, showing the projection of a solid onto + the $y_1,z_1$ plane by sighting along the $x_1$ axis. + \src{exp.m4}.} + } + +\bfig{ + \centerline{\getpic{graysurf}} + \caption{Plotting surfaces using gray scales. A sort algorithm + determines plotting order + \src{graysurf.m4}.} + } + +\bfig{ + \centerline{\getpic{shapes}} + \caption{Basic shapes + \src{shapes.m4}.} + } + +\bfig{ + \centerline{\getpic{AntiqueClock}} + \caption{An antique clock face + \src{AntiqueClock.m4}.} + } + +\bfig{ \centerline{\getpic{csc}} \caption{Conestoga Sailing Club (illustrating the filling of arbitrary shapes) @@ -594,6 +618,12 @@ } \bfig{ + \centerline{\getpic{Dini}} + \caption{Dini surface and an icosahedron + \src{Dini.m4}.} + } + +\bfig{ \centerline{\getpic{Sierpinski}} \caption{The Sierpinski triangle and a Cayley graph: tests of pic macro recursion diff --git a/graphics/circuit_macros/examples/mf/cct.mf b/graphics/circuit_macros/examples/mf/cct.mf index c3b66a5133..789ec556e1 100644 --- a/graphics/circuit_macros/examples/mf/cct.mf +++ b/graphics/circuit_macros/examples/mf/cct.mf @@ -1,5 +1,5 @@ % cct.mf, generated by Mfpic, v1.10 2012/12/03, -% from TeX source "font" on 2019/10/15 at 16:40 +% from TeX source "font" on 2020/02/16 at 21:34 numeric mfpicversion; mfpicversion := 110; if unknown mode: mode := localfont; fi if unknown mag: mag := 1000/1000; fi diff --git a/graphics/circuit_macros/examples/mode.tex b/graphics/circuit_macros/examples/mode.tex deleted file mode 100644 index f9aeb85384..0000000000 --- a/graphics/circuit_macros/examples/mode.tex +++ /dev/null @@ -1 +0,0 @@ -\usepackage{tikz} diff --git a/graphics/circuit_macros/examples/mpost/Makefile b/graphics/circuit_macros/examples/mpost/Makefile index 441d1d3ce2..3373e88305 100644 --- a/graphics/circuit_macros/examples/mpost/Makefile +++ b/graphics/circuit_macros/examples/mpost/Makefile @@ -20,15 +20,16 @@ MKDIM=printf '=boxdimfile{$(DIMFILE)}\n' DOC = examplesmpost FIGS = Adder.1 Alogix.1 ABlogix.1 Antennas.1 AmpTable.1 Audio.1 \ + AntiqueClock.1 \ Bip.1 Btree.1 Byte.1 Buttons.1 \ Counting.1 Crossbar.1 Crow.1 Csource.1 CanLogic.1 CctTable.1 Conn.1 \ - Decoder.1 Demultiplexer.1 Diodes.1 Drive.1 \ + Decoder.1 Demultiplexer.1 Dini.1 Diodes.1 Drive.1 \ Emarrows.1 Flow.1 Fuses.1 \ GrayCode.1 Grounds.1 Headers.1 Heathkit.1 I2L.1 Inclpdf.1 Jack.1 \ Logic.1 Loglog.1 MC.1 Mixer.1 MotorControl.1 Multiplexer.1 \ NLG.1 NPDT.1 Nport.1 \ Opamp.1 Optoiso.1 Pconn.1 PushPull.1 Quantum.1 \ - Rectifiers.1 Relay.1 Rotbox.1 \ + Rectifiers.1 Relay.1 relaycoil.1 Rotbox.1 \ Schottky.1 Sierpinski.1 ShiftR.1 Sixpole.1 Sources.1 SQUID.1 Switches.1 \ Tgate.1 Three.1 Timer.1 TTLnand.1 Ttree.1 Tubediags.1 \ Variable.1 Windings.1 Xform.1 \ diff --git a/graphics/circuit_macros/examples/odistmakefile b/graphics/circuit_macros/examples/odistmakefile new file mode 100644 index 0000000000..f6e26d9d37 --- /dev/null +++ b/graphics/circuit_macros/examples/odistmakefile @@ -0,0 +1,548 @@ +# Examples distmakefile. +# +# CTAN dist files: make -f distmakefile dist zips +# The CTAN file is tmp/Circuit_macros/Circuit_macrosN.N.tar.gz +# or +# make -f distmakefile distece +# The ECE file is ~/tmp/CMdistfiles.tar.gz +# Change the version number in doc/Version.tex + +# Circuit_macro directory, change this if necessary: +LIBDIR = $$HOME/lib +LIBDIR=/cygdrive/D/Dwight/lib +# LIBDIR = .. + +# The dpic processor: +PIC = dpic -p + +CONFIGFILE = pstricks.m4 + +# Uncomment for gpic. Use gpic or pic as applicable on your machine: +# PIC = gpic -t +# PIC = pic -t +# CONFIGFILE = gpic.m4 + +######################################################################### + +# M4 = m4 -B32000 +# M4 = m4 -I $(LIBDIR) +# Environment variable M4PATH has been set to the installation directory: +M4 = m4 + +######################################################################### + +THISFILE = distmakefile + +DOC = examples +PICS = \ + Adder.tex Alogix.tex ABlogix.tex AmpTable.tex Antennas.tex Audio.tex \ + Bip.tex Btree.tex Byte.tex Buttons.tex \ + CanLogic.tex CctTable.tex Conn.tex Counting.tex Crossbar.tex Crow.tex \ + Csource.tex \ + Decoder.tex Demultiplexer.tex Dini.tex Diodes.tex Drive.tex \ + Emarrows.tex Flow.tex Fuses.tex Grounds.tex \ + Headers.tex Heathkit.tex \ + I2L.tex Incleps.tex Jack.tex \ + Logic.tex Loglog.tex MC.tex Mixer.tex MotorControl.tex Multiplexer.tex \ + NLG.tex NPDT.tex Nport.tex \ + Opamp.tex Optoiso.tex \ + Pconn.tex PushPull.tex Quantum.tex \ + Rectifiers.tex Relay.tex Rotbox.tex \ + Schottky.tex ShiftR.tex Sierpinski.tex Sixpole.tex Sources.tex SQUID.tex \ + Switches.tex \ + TTLnand.tex Tgate.tex Three.tex Timer.tex Ttree.tex Tubediags.tex \ + Variable.tex Windings.tex Xform.tex \ + control.tex csc.tex diamond.tex \ + ex00.tex ex01.tex ex02.tex ex03.tex ex04.tex ex05.tex ex06.tex \ + ex08.tex ex09.tex ex10.tex ex11.tex ex12.tex ex15.tex \ + ex16.tex ex17.tex ex18.tex ex21.tex exp.tex fet.tex \ + graysurf.tex lcct.tex pwrsupply.tex quick.tex recycle.tex rose.tex \ + sfg.tex shapes.tex thyristor.tex ujt.tex worm.tex XOR.tex + +PICS = `make -f Makefile echopics` + +MANFIGS = AmpTable Antennas Audio Bip CctTable Conn Contact Contacts \ + Demultiplexer Diodes \ + Emarrows Fuses Grounds Headers Jack Logic Multiplexer NLG NPDT Nport Opamp \ + Pconn Relay ShiftR Sources Switches Tgate Variable Windings Xform fet quick \ + thyristor ujt + +# Files that have to be processed twice: +BOXDIMS = ex09 Crow Incleps Loglog Opamp Windings + +M4LIBS = $(CONFIGFILE) + +# Convert options +EPSOPTS = -trim +TIFOPTS = -trim +SVGOPTS = -trim +GIFOPTS = -trim +PNGOPTS = -trim -density 400 -scale 25% -quality 92 -alpha Remove + +DVIPSOPTS = -Ppdf -G0 -t ledger + +DIMFILE = $(DOC).dim +LTX = latex --shell-escape --quiet +BS = tr '|' '\134' + +.SUFFIXES: .ps .dvi .tex .m4 .pic .eps .png .pdf .svg .tif .gif +.dvi.ps: + dvips $(DVIPSOPTS) $* -o $*.ps + chmod 644 $*.ps +.m4.tex: + @if test -n "$(DIMFILE)" ; then touch $(DIMFILE) ; fi ; touch F_$*.dim + $(M4) $(M4LIBS) $(DIMFILE) F_$*.dim $*.m4 | sed -e '/^ *$$/d' > $*.pic + $(PIC) $*.pic > $*.tex +.m4.pic: + @if test -n "$(DIMFILE)" ; then touch $(DIMFILE) ; fi + $(M4) $(M4LIBS) $(DIMFILE) $*.m4 > $*.pic +.m4.dvi: + make -f $(THISFILE) $*.tex + printf "|documentclass[11pt]{article}\n\ +|usepackage{times,pstricks,boxdims,graphicx,pst-grad,pst-slpe}\n\ +|usepackage[amssymb,Gray,thinqspace,textstyle]{SIunits}\n\ +|setlength{|textwidth}{28cm}|addtolength{|textheight}{28cm}\n\ +|setlength{|oddsidemargin}{0pt}|setlength{|evensidemargin}{0pt}\n\ +|setlength{|hoffset}{-1cm}\n\ +|newbox|graph\n\ +|pagestyle{empty}|thispagestyle{empty}\n\ +|begin{document}\n\ +|noindent|input{"$*".tex}\n\ +|end{document}\n" | $(BS) > F_$*.tex + latex --quiet F_$* + touch F_$*.dim $(DIMFILE) ; rm -f $*.tex $*.pic ; make -f $(THISFILE) $*.tex + latex --quiet F_$* + touch F_$*.dim $(DIMFILE) ; rm -f $*.tex $*.pic ; make -f $(THISFILE) $*.tex + latex --quiet F_$* +.m4.eps: + make -f $(THISFILE) $*.dvi + dvips -Ppdf F_$* -T128cm,28cm -o $*.ps +# Recent changes to PSTricks(?) have clashed with the use of TeXtoEPS +# so use ps2epsi + ps2epsi $*.ps $*.epsi + ( sed -e '/%%Pages:/d' -e '/BeginPreview/,$$d' -e '/%%HiResBoundingBox/d' \ + $*.epsi | tr '\015' '\012' ; sed -e '1,/EndPreview/d' $*.epsi ) | awk \ + '/^%%BoundingBox/{print $$1" "$$2" "$$3" "$$4+10" "$$5+15; next}; {print}' \ + >$*.eps +.m4.ps: + make -f $(THISFILE) $*.tex && mv $*.tex test.tex; latex --quiet tst + rm -f test.tex $*.pic + if test -f tst.dim ; then cp tst.dim F_$*.dim ; fi + make -f $(THISFILE) $*.tex && mv $*.tex test.tex; latex --quiet tst + dvips $(DVIPSOPTS) tst -o $*.ps + chmod 644 $*.ps +.m4.svg: + make -f $(THISFILE) $*.ps + convert $(SVGOPTS) $*.ps $*.svg +.m4.png: + make -f $(THISFILE) $*.ps +# make -f $(THISFILE) $*.eps +# convert $(PNGOPTS) $*.eps $*.png + convert $(PNGOPTS) $*.ps $*.png + @if test -f $*.png.0 ; then mv $*.png.0 $*.png ; fi +.m4.gif: + make -f $(THISFILE) $*.ps + convert $(GIFOPTS) $*.ps $*.gif +.m4.tif: + make -f $(THISFILE) $*.ps + convert $(TIFOPTS) $*.ps $*.tif + @if test -f $*.tif.0 ; then mv $*.tif.0 $*.tif ; fi +.m4.pdf: + touch F_$*.dim + $(M4) pgf.m4 F_$*.dim $*.m4 > $*.pic + dpic -g $*.pic > test.tex + sed -e '/^\\usepackage.*graphicx/s/^.*$$/\\usepackage{tikz}/' \ + -e '/pstricks/d' tst.tex > F_$*.tex + pdflatex --quiet F_$* + $(M4) pgf.m4 F_$*.dim $*.m4 > $*.pic + dpic -g $*.pic > test.tex + pdflatex --quiet F_$* + mv F_$*.pdf $*.pdf + +######################################################################### +default: + @printf "\n === making default\n" + @printf "\n\n\nUSAGE: make -f $(THISFILE) distece\n\n\n" + +$(DOC).ps: $(DOC).dvi + +doclinks: + @printf "\n === making doclinks\n" + -for nm in $(MANFIGS) ; do cp $(LIBDIR)/doc/$$nm.m4 . ; done + touch doclinks + +$(DOC).dvi: $(DOC).frs + @printf "\n === making $(DOC).dvi\n" + touch $(DOC).dim + for file in $(BOXDIMS) ; do \ + rm -f $$file.tex $$file.pic ; \ + make -f $(THISFILE) PIC="$(PIC)" DIMFILE=$(DOC).dim $${file}.tex ; done + latex --quiet $(DOC) + for file in $(BOXDIMS) ; do \ + rm -f $$file.tex $$file.pic ; \ + make -f $(THISFILE) PIC="$(PIC)" DIMFILE=$(DOC).dim $${file}.tex ; done + latex --quiet $(DOC) + +$(DOC).frs: $(DOC).tex files.tex header.tex + @printf "\n === making $(DOC).frs\n" + printf "|usepackage{pstricks,pst-grad}\n" | $(BS) > mode.tex + make -f $(THISFILE) $(PICS) + cp $(LIBDIR)/doc/Version.tex . + latex --quiet $(DOC) + touch $(DOC).frs + rm -f $(DOC).dvi + +tst: + make -f $(THISFILE) test.tex; latex --quiet tst; rm -f test.tex test.pic + make -f $(THISFILE) DIMFILE=tst.dim test.tex; latex --quiet tst + dvips $(DVIPSOPTS) tst -o tst.ps + +tst1: test.tex tst.tex + latex --quiet tst + dvips $(DVIPSOPTS) tst -o tst.ps + +gtst: + touch test.m4; make -f $(THISFILE) PIC="gpic -t" CONFIGFILE="" tst + +gtst1: + touch test.m4; make -f $(THISFILE) PIC="gpic -t" CONFIGFILE="" tst1 + +# Distribution files +NAME=Circuit_macros +TMP=/tmp + +# Makes test.m4, examples.pdf, Circuit_macros.pdf, +# Copying, examples/mf/cct.tfm examples/xfig +dist: + @printf "\n === making lib/examples/dist\n" + (cd .. ; make clobber ) + touch test.m4; cp test.m4 $(TMP)/test`date +%Y.%m.%d.%H:%M:%S` + find . -name test.m4 -exec rm -f {} \; + make -f $(THISFILE) test.m4 + (cd $(LIBDIR)/doc; make ) + make -f Makefile examples.pdf + ( cd $(LIBDIR); mv doc/Circuit_macros.pdf . ; \ + mv examples/examples.pdf . ; \ + make clobber; chmod 644 Circuit_macros.pdf examples.pdf; \ + cp -p Circuit_macros.pdf examples.pdf $(TMP) ; \ + mv Circuit_macros.pdf doc; mv examples.pdf examples ) +# touch reducedfiles +# make -f $(THISFILE) reducedfiles +# while test -f reducedfiles ; do sleep 1; done + make -f $(THISFILE) Copying + @printf "\n === making lib/examples/mf/cct.tfm\n" + (cd mf; make; chmod 644 cct.tfm; make clean) + @printf "\n === making lib/examples/xfig\n" + (cd xfig; make; make clean) + (cd $(LIBDIR)/doc; make clean ) + -dir=`pwd` ; if [ "`basename $$dir`" = "examples" ] ; then \ + rm -f $(LIBDIR)/examples.tar.gz ; fi + +EXCHANGE="`find C:/Program*\\(x86\\)/Adobe -name Acrobat.exe -print`" + +reducedfiles: + @printf "\n === making reducedfiles\n" + -( cd $(LIBDIR)/doc ; \ + printf "\n\n save Circuit_macros.pdf as reduced size pdf\n\n" ; \ + pwd | sed -e 's%/cygdrive/\(.\)%\1:%' -e 's%/%\\\\%g' \ + -e 's%^%$(EXCHANGE) %' -e 's%$$%\\\\Circuit_macros.pdf%' | sh ) && \ + ( printf "\n\n save examples.pdf as reduced size pdf\n\n" ; \ + pwd | sed -e 's%/cygdrive/\(.\)%\1:%' -e 's%/%\\\\%g' \ + -e 's%^%$(EXCHANGE) %' -e 's%$$%/examples.pdf%' | sh ) && \ + +$(TMP)/$(NAME): + if test -d $(TMP)/$(NAME); then rm -rf $(TMP)/$(NAME); \ + mkdir -p $(TMP)/$(NAME) ; fi + +COPIED = boxdims.sty CHANGES Copying darrow.m4 doc examples gpic.m4 \ + lib3D.m4 libcct.m4 libgen.m4 liblog.m4 Licence.txt \ + Makefile mfpic.m4 mpost.m4 pgf.m4 postscript.m4 psfrag.m4 pstricks.m4 \ + README svg.m4 xfig.m4 dpictools.pic + +REMOVED = examples/test examples/dev examples/pdflatex examples/xfig/info \ + examples/htmlsource examples/html examples/dist examples/zips \ + examples/SCP examples/distmakefile examples/boxdims \ + m4s \ + doc/expl-m4.pdf + +zipdir: $(TMP)/$(NAME) + @printf "\n === making lib/examples/zips\n" + Version=`sed -e 's/Version //' $(LIBDIR)/doc/Version.tex` ; \ + PCVersion=`echo $$Version | sed -e 's/\./_/g'` ; \ + rm -rf $(TMP)/$(NAME)$$Version ; mkdir $(TMP)/$(NAME)$$Version; \ + (cd $(LIBDIR); cp -r $(COPIED) $(TMP)/$(NAME)$$Version ); \ + (cd $(TMP)/$(NAME)$$Version ; rm -rf $(REMOVED) ) ; \ + (cd $(TMP)/$(NAME)$$Version ; find . -type f -exec chmod 644 {} \; ) ; \ + (cd $(TMP)/$(NAME)$$Version ; find . -type f -empty -exec rm {} \; ) ; \ + (cd $(TMP)/$(NAME)$$Version ; find . -type d -exec chmod 755 {} \; ) ; \ + (cd $(TMP)/$(NAME)$$Version ; chmod +x examples/mf/mftest ) ; \ + (cd $(TMP)/$(NAME)$$Version ; chmod +x examples/mpost/mptest ) ; \ + (cd $(LIBDIR)/doc; make clobber ) + touch zipdir + +zips: zipdir + Version=`sed -e 's/Version //' $(LIBDIR)/doc/Version.tex` ; \ + ( cd $(TMP); \ + tar cf - $(NAME)$$Version | gzip > $(NAME)$$Version.tar.gz ; \ + (cd $(NAME)$$Version; zip -r $(NAME) * ) ; \ + mv $(NAME)$$Version/$(NAME).zip $(NAME)$$PCVersion.zip ; \ + printf "\n$(TMP)/$(NAME)$$Version and\n" ; \ + printf "$(TMP)/$(NAME)$$Version.tar.gz created\n"; \ + printf "\n$(TMP)/$(NAME)$$PCVersion.zip created\n" ) +# touch zips + +test.m4: + @printf "\n === making test.m4\n" + printf \ +".PS\n\ +# Test.m4\n\ +cct_init\n\ +# Use this file to do a quick test of diagrams you are developing.\n\ +# Enter the drawing commands here and (if you have a \"make\" utility) type\n\ +# make tst\n\ +# Otherwise, to process a file called filename.m4, type one of\n\ +# make filename.ps\n\ +# make filename.eps\n\ +# make filename.pdf\n\ +# make filename.gif (requires ImageMagick convert)\n\ +# make filename.png (requires ImageMagick convert)\n\ +# make filename.tif (requires ImageMagick convert)\n\ +# To perform tests in a new folder, copy the Makefile, this file,\n\ +# and tst.tex (or your own equivalent) to that folder.\n\ +.PE\n" > test.m4 + +# For the git repository +GITDIR=$${HOME}/dpic/git/Circuit_macros +gitsync: dist zipdir + cd $(GITDIR) && rsync -a -v $(TMP)/Cir*[0-9]/* . + cp -p htmlsource/.gitignore $(GITDIR) + +distfile: + @printf "\n === making distfile\n" + rm -f dist zips htmlfiles + make -f $(THISFILE) dist zips htmlfiles + rm -rf distfile distfile.tar.gz; mkdir distfile + Version=`sed -e 's/Version //' $(LIBDIR)/doc/Version.tex` ; \ + cp -p $(TMP)/$(NAME)$$Version.tar.gz \ + $(TMP)/$(NAME)$$Version/README $(TMP)/$(NAME)$$Version/CHANGES \ + distfile ;\ + PCVersion=`echo $$Version | sed -e 's/\./_/g'` ; \ + cp -p $(TMP)/$(NAME)$$PCVersion.zip distfile ;\ + mkdir distfile/html + cp -rp html/* distfile/html + (cd distfile/html; mv index.html .. ; rm -f access.log *.pl ) +# tarlib distfile + +EPSFILES=${PICS:%.tex=%.eps} +# Make an encapsulated Postscript file for each example (requires pstricks) +eps: + @printf "\n === making eps\n" + make -f $(THISFILE) ${PICS:%.tex=%.eps} + +Copying: $(LIBDIR)/doc/Version.tex + @printf "\n === making Copying\n" + sed -e \ + "s%Version *[0-9.]*,%`cat $(LIBDIR)/doc/Version.tex`,%" $(LIBDIR)/Copying \ + > xxx + sed -e "s%opyright (c) [^ ][^ ]* J%opyright (c) `date '+%Y'` J%" xxx \ + > $(LIBDIR)/Copying ; rm -f xxx +# for file in `find $(LIBDIR) -name Copying -print` ; do \ +# if test ! "$$file" = "$(LIBDIR)/Copying" ; then \ +# cp $(LIBDIR)/Copying $$file; fi ; done + (cd $(LIBDIR) ; for file in `grep -l 'Version [0-9][\.0-9]*,' *` ; do \ + if test ! \( "$$file" = "Copying" -o "$$file" = "CHANGES" \) ; then \ + ( sed -e '/opyright (c)/,$$d' $$file ; cat Copying ; echo "" ; \ + sed -e '1,/opyright (c)/d' $$file | sed -e '1,/^ *$$/d' ) > xxx ; \ + sed -e "s%Version *[0-9.]*:%`cat doc/Version.tex`:%" xxx \ + > $$file ; rm -f xxx ; fi ; done ; ) + (cd $(LIBDIR) ; \ + ( sed -e '/opyright (c)/,$$d' dpictools.pic ; \ + sed -e 's/^ *\*/\#/' -e 's/\* *$$/\#/' Copying ; echo "" ; \ + sed -e '1,/opyright (c)/d' dpictools.pic | sed -e '1,/^ *$$/d' ) > xxx ;\ + sed -e "s%Version *[0-9.]*:%`cat doc/Version.tex`:%" xxx \ + > dpictools.pic ; rm xxx ) + +htmlfiles: html svgfiles pngs html/examples.html html/index.html \ + Circuit_macros.ico html/Optosample.png + @printf "\n === making lib/examples/htmlfiles\n" + mv Circuit_macros.ico html + if test -f examples.pdf ; \ + then printf "\n\n examples.pdf found\n" ; \ + else printf "\n\n examples.pdf not found\n" ; fi + if test -f doc/Circuit_macros.pdf ; \ + then printf "\n\n doc/Circuit_macros.pdf found\n" ; \ + cp doc/Circuit_macros.pdf html ; \ + else printf "\n\n doc/Circuit_macros.pdf not found\n" ; \ + cp $(TMP)/Circuit_macros.pdf $(LIBDIR)/doc ; fi + cp examples.pdf html + (cd html; chmod 644 *.svg *.txt *.html *.pdf ) + touch htmlfiles + +html: + @printf "\n === making html\n" + if test ! -d html ; then mkdir html ; fi + ( cd htmlsource; cp -p $(PERLFILE).pl .htaccess ../html ) + +svgfiles: html + @printf "\n === making svgfiles\n" + ( cd svg; make ) + for file in `ls svg/*SVG.m4` ; \ + do cp $$file html/`basename $$file .m4`.txt ; done + cp -p svg/examplesSVG.html svg/*.svg svg/*.jpg html + touch svgfiles + +Circuit_macros.ico: html htmlsource/favicon.m4 + @printf "\n === making Circuit_macros.ico\n" + cp htmlsource/favicon.m4 . + make -f $(THISFILE) favicon.eps + convert -density 105 favicon.eps Circuit_macros.ico + rm -f favicon.* + +html/index.html: htmlsource/index.htmx html + @printf "\n === making index.html\n" + Version=`sed -e 's/Version //' $(LIBDIR)/doc/Version.tex` ; \ + PCVersion=`echo $$Version | sed -e 's/\./_/g'` ; \ + sed -e 's/XXX/'$$Version'/' \ + -e 's/PCVersion/'$$PCVersion'/' \ + htmlsource/index.htmx > html/index.html + +html/Optosample.png: html htmlsource/Optosample.m4 + @printf "\n === making Optosample.png\n" + cp htmlsource/Optosample.m4 . + make -f $(THISFILE) Optosample.eps + convert Optosample.eps Optosample.png + mv Optosample.png html/Optosample.png + rm -f Optosample.* + +TR = tr '^@' '\012`' +html/examples.html: html htmlsource/examples.htmx files.tex + @printf "\n === making examples.html\n" + Version=`sed -e 's/Version //' $(LIBDIR)/doc/Version.tex` ; \ + sed -e 's/Version XXX/Version '$$Version'/' htmlsource/examples.htmx \ + > html/examples.html + cat files.tex | sed -e '/bfig[\{]/d' -e '/^ *[\}][\}]* *$$/d' \ + -e '/src[\{]/d' -e '/\\if/d' -e '/\\fi/d' -e '/includegraphics/d' \ + -e '/\%ignore\%/d' -e '/^\%/d' -e '/\\end[\{]/d' -e '/^\%/d' \ + -e '/getpic/s/\\getpic[\{]\([^\}]*\)[\}][\}]*/ <\1> /g' \ + -e '/<[^-]/s/^[^<]*<//' -e '/<[^-]/s/>[^<]*</> /g' -e '/[^-]>/s/>.*$$/>/' \ + -e 's/\([^ -][^ -]*\)>/IS_"\1.png" A_"\1 diagram">B_"\1.txt" T_\1.m4Y/'\ + -e 's/IS_/<P><IMG SRC=/' -e 's/A_/ALT=/' -e 's/B_/<BR>^<A HREF=/' \ + -e 's/T_/TARGET="_blank"><P>/' -e 's/4Y/4<\/A>:/' \ + -e 's/^.*caption[\{]//' -e '/^ *$$/s/^ */<HR>/' \ + -e 's/\\hbox//g' \ + | sed \ + -e '/<P>/!s/{\\tt \([^}]*\)}/<tt>\1<\/tt>/g' \ + -e '/<P>/!s/{\\texttt \([^}]*\)}/<tt>\1<\/tt>/g' \ + -e '/<P>/!s/{\\bf \([^}]*\)}/<tt>\1<\/tt>/g' \ + -e '/<P>/!s/{\\em \([^}]*\)}/<em>\1<\/em>/g' \ + -e '/<P>/!s/{\\it \([^}]*\)}/<em>\1<\/em>/g' \ + -e '/<P>/!s/{\\sl \([^}]*\)}/<em>\1<\/em>/g' \ + -e '/<P>/!s%\([^\\]\)_\(.\)%\1<sub>\2</sub>%g' \ + -e '/<P>/!s%\([^\\]\)\^\(.\)%\1<sup>\2</sup>%g' \ + -e 's%``%"%g' -e "s%''%\"%g" -e 's/\~/ /g' \ + -e 's%\\%%g' -e 's/\$$//g' \ + | sed -e 's/HREF=Inclpdf.m4/HREF=Inclpdf.txt/' | $(TR) \ + >> html/examples.html + cat htmlsource/endexamples.htmx >> html/examples.html + +BACKGROUND = blight + +pngs: basenames + @printf "\n === making pngs\n" + cp htmlsource/$(BACKGROUND).m4 . + -for nm in `cat basenames` ; do \ + echo "make -f $(THISFILE) $$nm.png ; mv $$nm.png html/$$nm.png" ;\ + make -f $(THISFILE) $$nm.png ; mv $$nm.png html/$$nm.png ;\ + ls -l html/$$nm.png ; \ + done + make -f $(THISFILE) $(BACKGROUND).png + mv $(BACKGROUND).png html/$(BACKGROUND).png + rm -f $(BACKGROUND).tex + -for nm in `cat basenames` ; do\ + cp $$nm.m4 html/$$nm.txt ; done + cp Inclpdf.m4 html/Inclpdf.txt + echo "" > html/Inclpdf.m4 + cat Inclpdf.m4 >> html/Inclpdf.m4 + chmod 644 html/Inclpdf.m4 + +gifs: basenames + @printf "\n === making gifs\n" + -for nm in `cat basenames` ; do \ + make -f $(THISFILE) $$nm.gif ; mv $$nm.gif html/$$nm.gif ;\ + done + make -f $(THISFILE) $(BACKGROUND).gif + mv $(BACKGROUND).gif html/$(BACKGROUND).gif + rm -f $(BACKGROUND).tex + -for nm in `cat basenames` ; do\ + cp $$nm.m4 html/$$nm.txt ; done + cp Inclpdf.m4 html/Inclpdf.txt + echo "" > html/Inclpdf.m4 + cat Inclpdf.m4 >> html/Inclpdf.m4 + chmod 644 html/Inclpdf.m4 + +basenames: files.tex + @printf "\n === making basenames\n" + grep '\\getpic' files.tex | sed -e '/Inclpdf/d' \ + -e 's%\\getpic[\{]\([^\}]*\)[\}]% <\1> %g' \ + -e 's/^[^<]*<//' -e 's/>[^<]*</ /g' -e 's/>.*$$//' \ + | sort | uniq > basenames + +# To make but not distribute everything: make dist zips htmlfiles + +ECETMP = /cygdrive/d/Dwight/tmp +ECENAM = CMdistfiles +ECEDIR = $(ECETMP)/$(NAME) +PERLFILE = Circuit_macros_access_log + +# (cd lib/examples; make -f distmakefile distece 2>&1)2>&1 > typescript +distece: + @printf "\n === making lib/examples/distece\n" + (cd ..; find . -type f -exec chmod 644 {} \; ) + rm -f dist zips htmlfiles + make -f $(THISFILE) dist zips htmlfiles + rm -rf $(ECEDIR)* ; mkdir $(ECEDIR) + Version=`sed -e 's/Version //' $(LIBDIR)/doc/Version.tex` ; \ + PCVersion=`echo $$Version | sed -e 's/\./_/g'` ; \ + cp -p $(TMP)/$(NAME)$$Version.tar.gz \ + $(TMP)/$(NAME)$$PCVersion.zip \ + $(TMP)/$(NAME)$$Version/README $(TMP)/$(NAME)$$Version/CHANGES \ + $(TMP)/$(NAME)$$Version/doc/Circuit_macros.pdf \ + $(ECEDIR) + rm -rf $(ECEDIR)/html ; mkdir $(ECEDIR)/html + cp -rp html/* $(ECEDIR)/html + mv $(ECEDIR)/html/index.html $(ECEDIR)/index.html + (cd $(ECETMP); tarlib $(NAME); mv $(NAME).tar.gz $(ECENAM).tar.gz ) + echo ""; echo ""; ls -l $(ECETMP)/$(ECENAM).tar.gz + +testall: + (cd mf; make) + (cd mpost; make) +# (cd pgf; make) + (cd psfrag; make) + (cd svg; make) + (cd xfig; make) + +clobber: clean + rm -f *.ps + -@for dir in mf mpost pdflatex xfig psfrag pgf svg dev test; \ + do (if test -d $$dir ; then cd $$dir; make clobber; fi) ; done + rm -f *.warn + rm -rf index.html html basenames *.png* dist zips htmlfiles svgfiles + rm -rf $(TMP)/Cir* $(ECETMP)/Cir* $(ECEDIR) + if test -f Incl.pdf ; then \ + mv Incl.pdf Incl.pdx; rm -f *.pdf; mv Incl.pdx Incl.pdf ; fi + for file in `ls *.tex` ; do \ + nm=`echo $$file | sed -e "s/\(.*\)\.tex/\1/"` ; \ + if test -s $$nm.m4 ; then rm -f $$nm.pic $$nm.tex ; fi ; done + +clean: + @printf "\nclean:\n" + find .. -name \*stackdump -exec rm {} \; + rm -f core snapshots *.ico *favicon* $(BACKGROUND).* zipdir + rm -f *.dvi *.aux *.log *.toc *.blg *.eps *.epsi eps *-mfpic* + rm -f fig*.tex $(PICS) *.roff *.int *.pic gpic.m4 test.tex xxx* *.fig + rm -f *.dim *.bak *.frs $(RPICS) rotate.ps tst.ps *.bbl *-pics.ps *.gif + rm -f *.tfm *[0-9]pk *.png *.1 + rm -f F_*.tex Version.tex doclinks *stackdump *.ico + rm -rf distfile distfile.tar.gz + @printf "\n" diff --git a/graphics/circuit_macros/examples/pgf/Makefile b/graphics/circuit_macros/examples/pgf/Makefile deleted file mode 100644 index 96a5e9face..0000000000 --- a/graphics/circuit_macros/examples/pgf/Makefile +++ /dev/null @@ -1,163 +0,0 @@ -# Makefile for the pgf subdirectory - -# Type "make" to produce the examplespgf.pdf file -# Type "make examplespgf.ps" for postscript output -# Type "make tst" to process the file test.m4 and produce tstpgf.ps -# Type "make tst.pdf" to process the file test.m4 and produce tstpgf.pdf - -# Where the .m4 libraries are installed. Change if necessary: -LIBDIR = $$HOME/lib - -#--------------------------------------------- - -# The .m4 circuit_macro libraries used for the examples: -M4MACROS = pgf.m4 -M4 = m4 -I $(LIBDIR) - -#--------------------------------------------- -DOC = examplespgf - -FIGS = Adder.tex Alogix.tex ABlogix.tex Antennas.tex Audio.tex AmpTable.tex \ - Bip.tex Btree.tex Byte.tex Buttons.tex \ - CanLogic.tex CctTable.tex Conn.tex Counting.tex Crossbar.tex Crow.tex \ - Csource.tex \ - Decoder.tex Demultiplexer.tex Diodes.tex Drive.tex \ - Emarrows.tex Flow.tex Fuses.tex \ - GrayCode.tex Grounds.tex Headers.tex Heathkit.tex Jack.tex \ - I2L.tex Incleps.tex \ - Logic.tex Loglog.tex MC.tex Mixer.tex MotorControl.tex Multiplexer.tex \ - NLG.tex NPDT.tex Nport.tex \ - Opamp.tex Optoiso.tex Pconn.tex PushPull.tex Quantum.tex \ - Rectifiers.tex Relay.tex Rotbox.tex \ - Schottky.tex Sierpinski.tex ShiftR.tex Sixpole.tex Sources.tex SQUID.tex \ - Switches.tex \ - Tgate.tex Three.tex Timer.tex TTLnand.tex Ttree.tex Tubediags.tex \ - Windings.tex Variable.tex Xform.tex \ - control.tex csc.tex diamond.tex \ - ex00.tex ex01.tex ex02.tex ex03.tex ex04.tex \ - ex05.tex ex06.tex ex08.tex ex09.tex ex10.tex ex11.tex ex12.tex \ - ex15.tex ex16.tex ex17.tex ex18.tex ex21.tex exp.tex \ - fet.tex graysurf.tex lcct.tex pwrsupply.tex quick.tex \ - random.tex recycle.tex rose.tex sfg.tex shapes.tex \ - thyristor.tex ujt.tex worm.tex XOR.tex - -# Files using boxdims macros: -BOXDIMS = ex09 Crow Incleps Loglog TTLnand Opamp Ttree Windings - -# It is advisable to do `make clean' between test examples. -#--------------------------------------------- - -DPIC = dpic -# DPIC = $$HOME/dpic/test/dpic - -LATEX = latex --quiet -PDFLATEX = pdflatex --quiet - -TR = | tr '=' '\134' - -.SUFFIXES: .tex .m4 .eps .ps .dim .pdf -.tex.ps: - $(LATEX) $* - dvips -Ppdf $* -.m4.tex: - $(M4) $(M4MACROS) $*.m4 | $(DPIC) -g > $*.tex -# $(M4) $(M4MACROS) $*.m4 > $*.pic -# $(DPIC) -g $*.pic > $*.tex -.m4.pdf: - $(M4) $(M4MACROS) $*.m4 | $(DPIC) -g > test.tex - $(PDFLATEX) tstpgf - mv tstpgf.pdf $*.pdf -.m4.dim: - printf '\\documentclass[11pt]{article}\n' > F$*.tex - printf '\usepackage{times,boxdims,tikz}\n' >> F$*.tex - printf '\usepackage[amssymb,Gray,thinqspace,textstyle]{SIunits}\n' >>F$*.tex - printf '\\begin{document}\\input '$* >> F$*.tex - printf '\n\\end{document}\n' >> F$*.tex - make $*.tex - touch F$*.dim - $(M4) $(M4MACROS) F$*.dim $*.m4 | $(DPIC) -g > $*.tex; $(LATEX) F$* - $(M4) $(M4MACROS) F$*.dim $*.m4 | $(DPIC) -g > $*.tex; $(LATEX) F$* - - -$(DOC).pdf: Incl.pdf $(DOC).tex - -if test "$(DOC)"="examplespgf" ; then make exlinks ; fi - -if test -n "$(BOXDIMS)" ; then \ - for box in $(BOXDIMS) ; do touch F$$box.dim; make $$box.dim ; done; fi - make $(FIGS) - $(PDFLATEX) $(DOC) - -EXL = exlinks -$(DOC).ps: $(DOC).dvi - dvips -Ppdf $(DOC) - -$(DOC).dvi: Incl.eps.gz $(DOC).tex - -if test "$(DOC)"="examplespgf" ; then make exlinks ; fi - make dims $(FIGS) - $(LATEX) $(DOC) - -dims: - -if test -n "$(BOXDIMS)" ; then \ - for box in $(BOXDIMS) ; do touch F$$box.dim; make $$box.dim ; done; fi - touch dims - -Incl.eps.gz: ../Incl.eps.gz ../Incl.eps.bb - cp ../Incl.eps.gz . - cp ../Incl.eps.bb . - -Incl.pdf: ../Incl.pdf - cp ../Incl.pdf . - -figs: $(EXL) $(FIGS) - -exlinks: Incl.eps.gz - @echo "" - @echo 'Ignore "cannot create ... exists" warnings.' - -@if test ! -f ex11.m4 ; then \ - ls ../*.m4 | sed -e 's/^/ln -s /' -e '/test.m4/d' -e '/quick.m4/d' | sh;\ - ls ../../doc/*.m4 ../*.gz | sed -e 's/^/ln -s /' | sh;\ - fi - touch $(EXL) - -clobber: clean - rm -f $(DOC).ps test.m4 *.pdf - -tstpgf.ps: tst -tst: test.m4 - touch tstpgf.dim - $(M4) pgf.m4 tstpgf.dim test.m4 \ - > test.pic - $(DPIC) -g test.pic > test.tex - $(LATEX) tstpgf - $(M4) pgf.m4 tstpgf.dim test.m4 \ - > test.pic - $(DPIC) -g test.pic > test.tex - $(LATEX) tstpgf - dvips tstpgf - -tst.pdf: test.m4 - touch tstpgf.dim - $(M4) pgf.m4 tstpgf.dim test.m4 \ - > test.pic - $(DPIC) -g test.pic > test.tex - $(PDFLATEX) tstpgf - $(M4) pgf.m4 tstpgf.dim test.m4 \ - > test.pic - $(DPIC) -g test.pic > test.tex - $(PDFLATEX) tstpgf - -test.tex: test.m4 - touch tstpgf.dim - $(M4) pgf.m4 tstpgf.dim test.m4 > test.pic - $(DPIC) -g test.pic > test.tex - -clean: - rm -f stamp-* $(FIGS) *.dvi *.bb *.gz tstpgf.ps tstpgf.pdf - rm -f *.out *.pfg Incl.* *.pic - -if /usr/bin/test -f exlinks ; then \ - ls -l *.m4 | grep '\->' | \ - sed -e 's/^.* \([^ ][^ ]*\) ->.*$$/rm -f \1/' | sh; fi - rm -f *.log *.ps *.aux *.mp *.[0-9] *.[0-9][0-9] *.mpx *.eps *.dim - rm -f core log mpxerr* *links figs.* *.dim dims Ftest.* setdim.tex - rm -f man[0-9]*.pic man[0-9]*.m4 figs.m4 test.1 test.mp test.pic test.tex - -if test -n "$(BOXDIMS)" ; then for box in $(BOXDIMS) ; do \ - rm -f F$$box.tex $$box.tex ; done; fi diff --git a/graphics/circuit_macros/examples/pgf/README-pgf b/graphics/circuit_macros/examples/pgf/README-pgf deleted file mode 100644 index cddf8f2ef8..0000000000 --- a/graphics/circuit_macros/examples/pgf/README-pgf +++ /dev/null @@ -1,9 +0,0 @@ - -To test a single diagram, copy it into test.m4 -and type 'make tst'. The file is processed through -m4 and dpic -g to make test.tex which is then -included by tstpgf.tex. - -To produce examplespgf.pdf using tikz-pgf and pdflatex, type "make" -To produce examplespgf.ps using tikz-pgf, latex, and dvips, - type "make examplespgf.ps". diff --git a/graphics/circuit_macros/examples/pgf/examplespgf.tex b/graphics/circuit_macros/examples/pgf/examplespgf.tex deleted file mode 100644 index 5ceb9cece2..0000000000 --- a/graphics/circuit_macros/examples/pgf/examplespgf.tex +++ /dev/null @@ -1,28 +0,0 @@ -% pgf examples.tex - -\documentclass[11pt]{article} -\usepackage{times,boxdims,tikz} -\usepackage[amssymb,Gray,thinqspace,textstyle]{SIunits} -\usepackage{rotating} - -\input ../header - -\global\pgftrue -\addtolength{\textheight}{6ex} - -\begin{document} - \hfill - {\large\bf Examples: - \input{../../doc/Version.tex} - } - \hfill\break - - In this directory the source files are processed with m4, dpic -g, - and TikZ PGF. - This is a collection of diagrams the author has had occasion to - produce using m4 circuit macros and others, and gpic or dpic. The - source-file names are shown for reference. There may be other or - better m4 or pic constructs for producing the same drawings in some - cases. - -\input ../files.tex diff --git a/graphics/circuit_macros/examples/pgf/tstpgf.tex b/graphics/circuit_macros/examples/pgf/tstpgf.tex deleted file mode 100644 index c5c560908c..0000000000 --- a/graphics/circuit_macros/examples/pgf/tstpgf.tex +++ /dev/null @@ -1,9 +0,0 @@ -\documentclass{article} -\usepackage{times,boxdims,tikz} -\usepackage{rotating} -\pagestyle{empty} -\begin{document} -\thispagestyle{empty} -%\centerline{\input test.tex} -\centerline{\boxdims{tpgf}{\input{test.tex}}} -\end{document} diff --git a/graphics/circuit_macros/examples/psfrag/Makefile b/graphics/circuit_macros/examples/psfrag/Makefile index 881a9a6d8b..83eb573f8e 100644 --- a/graphics/circuit_macros/examples/psfrag/Makefile +++ b/graphics/circuit_macros/examples/psfrag/Makefile @@ -21,9 +21,10 @@ M4 = m4 DOC = examplespsfrag FIGS = Adder.eps Alogix.eps ABlogix.eps Antennas.eps Audio.eps AmpTable.eps \ + AntiqueClock.eps \ Bip.eps Btree.eps Byte.eps Buttons.eps \ CanLogic.eps CctTable.eps Conn.eps Counting.eps Crossbar.eps Crow.eps \ - Decoder.eps Demultiplexer.eps Diodes.eps Drive.eps \ + Decoder.eps Demultiplexer.eps Dini.eps Diodes.eps Drive.eps \ Csource.eps \ Emarrows.eps Flow.eps Fuses.eps \ GrayCode.eps Grounds.eps Headers.eps Heathkit.eps Jack.eps \ @@ -41,8 +42,8 @@ FIGS = Adder.eps Alogix.eps ABlogix.eps Antennas.eps Audio.eps AmpTable.eps \ ex05.eps ex06.eps ex08.eps ex09.eps ex10.eps ex11.eps ex12.eps \ ex15.eps ex16.eps ex17.eps ex18.eps ex21.eps exp.eps \ fet.eps graysurf.eps lcct.eps pwrsupply.eps quick.eps \ - random.eps recycle.eps rose.eps sfg.eps shapes.eps thyristor.eps \ - ujt.eps worm.eps + random.eps recycle.eps relaycoil.eps rose.eps sfg.eps shapes.eps \ + thyristor.eps ujt.eps worm.eps LOCALFIGS = ex21 diff --git a/graphics/circuit_macros/examples/quick.m4 b/graphics/circuit_macros/examples/quick.m4 new file mode 100644 index 0000000000..7de2399601 --- /dev/null +++ b/graphics/circuit_macros/examples/quick.m4 @@ -0,0 +1,16 @@ +.PS # Pic input begins with .PS +cct_init # Read in macro definitions and set defaults +elen = 0.75 # Variables are allowed; default units are inches +Origin: Here # Position names are capitalized + source(up_ elen); llabel(-,v_s,+) + resistor(right_ elen); rlabel(,R,) + dot + { # Save the current position and direction + capacitor(down_ to (Here,Origin)) #(Here,Origin) = (Here.x,Origin.y) + rlabel(+,v,-); llabel(,C,) + dot + } # Restore position and direction + line right_ elen*2/3 + inductor(down_ Here.y-Origin.y); rlabel(,L,); b_current(i) + line to Origin +.PE # Pic input ends diff --git a/graphics/circuit_macros/examples/relaycoil.m4 b/graphics/circuit_macros/examples/relaycoil.m4 new file mode 100644 index 0000000000..b3273794cd --- /dev/null +++ b/graphics/circuit_macros/examples/relaycoil.m4 @@ -0,0 +1,40 @@ +.PS +# relaycoil.m4 +cct_init + + spc = dimen_/3 +{ relaycoil; S: "\tt re{}laycoil" at last [].s+(0,-20bp__) + { "\sl V1" wid 10bp__ at last [].V1 rjust + "\sl V2" at last [].V2 ljust } + K: relaycoil(NX) with .nw at last [].ne+(spc*4,0); "\tt (NX)" at (last [],S) + { thinlines_ + spline <- from K.A1 left 7bp__ then up 4bp__ left 4bp__; "\sl A1" rjust + arrow <- from K.A2 left 10bp__; "\sl A2" rjust + spline <- from K.A3 left 7bp__ then down 4bp__ left 4bp__; "\sl A3" rjust + spline <- from K.B1 right 7bp__ then up 4bp__ right 4bp__; "\sl B1" ljust + arrow <- from K.B2 right 10bp__; "\sl B2" ljust + spline <- from K.B3 right 7bp__ then down 4bp__ right 4bp__; "\sl B3" ljust + thicklines_ + } + relaycoil(AXSR) with .nw at last [].ne+(spc*5,0); "\tt (AXSR)" at (last [],S) + { "\sl V1" at last [].V1 rjust; "\sl V2" at last [].V2 rjust } + relaycoil(BXSR) with .nw at last [].ne+(spc*2,0); "\tt (BXSR)" at (last [],S) + { "\sl V1" at last [].V1 ljust; "\sl V2" at last [].V2 ljust } + relaycoil(SR) with .nw at last [].ne+(spc*4,0); "\tt (SR)" at (last [],S) + relaycoil(SO) with .nw at last [].ne+(spc,0); "\tt (SO)" at (last [],S) + relaycoil(SOR) with .nw at last [].ne+(spc,0); "\tt (SOR)" at (last [],S) + } +{ + move down_ 3/4; right_ + relaycoil(HS); S: "\tt (HS)" at last [].s+(0,-12bp__) + relaycoil(NAC) with .nw at last [].ne+(spc,0); "\tt (NAC)" at (last [],S) + relaycoil(AC) with .nw at last [].ne+(spc,0); "\tt (AC)" at (last [],S) + relaycoil(ML) with .nw at last [].ne+(spc,0); "\tt (ML)" at (last [],S) + relaycoil(PO) with .nw at last [].ne+(spc,0); "\tt (PO)" at (last [],S) + relaycoil(RM) with .nw at last [].ne+(spc,0); "\tt (RM)" at (last [],S) + relaycoil(RH) with .nw at last [].ne+(spc,0); "\tt (RH)" at (last [],S) + relaycoil(TH) with .nw at last [].ne+(spc,0); "\tt (TH)" at (last [],S) + relaycoil(EL) with .nw at last [].ne+(spc,0); "\tt (EL)" at (last [],S) + } + +.PE diff --git a/graphics/circuit_macros/examples/rotatetext.m4 b/graphics/circuit_macros/examples/rotatetext.m4 index 2aec6abdf8..9aa2dbea01 100644 --- a/graphics/circuit_macros/examples/rotatetext.m4 +++ b/graphics/circuit_macros/examples/rotatetext.m4 @@ -1,7 +1,7 @@ .PS # rotatetext.m4 -# This is a test of the \rput function to write a string around the -# periphery of a circle of radius r, accounting for inter-letter kerns +# This is a test of the pstricks \rput function to write a string around +# the periphery of a circle of radius r, accounting for inter-letter kerns {\Huge gen_init twopi = twopi_ diff --git a/graphics/circuit_macros/examples/svg/AntiqueClockSVG.m4 b/graphics/circuit_macros/examples/svg/AntiqueClockSVG.m4 new file mode 100644 index 0000000000..0848a53cbe --- /dev/null +++ b/graphics/circuit_macros/examples/svg/AntiqueClockSVG.m4 @@ -0,0 +1,158 @@ +.PS +# AntiqueClockSVG.m4 +gen_init(svg_font(font-family="sans-serif" font-stretch="condensed")) + +# https://tex.stackexchange.com/questions/236923/generate-analog-clock-with-numbered-face-add-seconds-roman-numerals + +# `Initialize rotated text. Any unrotated text must +# appear after the rotated text.' +svgrot_init(AntiqueClockSVG) + +# `hms2deg(hr,min,sec) hr:min:sec to degrees +# blank arg1: degrees for minute hand +# blank arg1 and arg2: degrees for second hand' +define(`hms2deg',`ifelse(`$1',, + `ifelse(`$2',, + `(90-pmod(ifelse(`$3',,0,`$3'),60)/60*360)', + `(90-(pmod(`$2',60)/60 + pmod(ifelse(`$3',,0,`$3'),60)/60/60)*360)')', + `(90-(pmod(`$1',12) + pmod(ifelse(`$2',,0,`$2'),60)/60 + dnl + pmod(ifelse(`$3',,0,`$3'),60)/3600)/12*360)')') + +# `SecondHand(length,hr,min,sec)' +define(`SecondHand',`[ shsf = (`$1')/3.2 + C: Here + { L: rpoint_(to (Rect_(`$1',hms2deg(,,`$4')))) } + line thick 8*shsf to rvec_(`$1',0) + ]') + +# `AntiqueMinuteHand(length,hr,min,sec)' +define(`AntiqueMinuteHand',`[ mhsf = (`$1')/2.84 + L: rpoint_(to (Rect_(`$1',hms2deg(,`$3',`$4')))) + C: circle fill_(0) diam 0.47*mhsf at L.start + move to C + spline from rvec_(0,0.047*mhsf) \ + to rvec_(1.65*mhsf,0.11*mhsf) \ + then to rvec_(`$1',0.018*mhsf) \ + then to rvec_(`$1',-0.018*mhsf) \ + then to rvec_(1.65*mhsf,-0.11*mhsf) \ + then to rvec_(0,-0.047*mhsf) \ + shaded rgbstring(0,0,0) + ]') + +# `AntiqueHourHand(length,hr,min,sec)' +define(`AntiqueHourHand',`[ hhsf = (`$1')/2.2 + L: rpoint_(to (Rect_(`$1',hms2deg(`$2',`$3',`$4')))) + C: circle fill_(0) diam 0.6*hhsf at L.start + move to C + v = 0.25*hhsf + { line to rvec_(1.1*hhsf,0) thick 0.15/(1bp__)*hhsf } + C1: rvec_(1.25*hhsf,0) + d = `$1'-1.25*hhsf + q = 1bp__*hhsf + r1 = (d^2 + q^2 - v^2)/(v-q)/2 + tang = atan2((r1+q),d) + for i=0 to 3 do { + X[i]: C1+vec_(rect_(v, pi_+i/3*( tang-pi_))) + Y[i]: C1+vec_(rect_(v,-pi_+i/3*(-tang+pi_))) + } + n = 3 + for i=1 to 4 do { aa = -pi_+tang + i/4*(pi_/2-tang) + XX: (d,r1+q)+(rect_(r1,aa)) + n+=1; + X[n]: C1+vec_(XX.x, XX.y) + Y[n]: C1+vec_(XX.x,-XX.y) + } + m = n + for i= 0 to m do { n+=1; X[n]: Y[m-i] } + fitcurve(X,n,shaded rgbstring(0,0,0)) + ]') + +define(`AntiqueClock',`[ # h,m,s,diam +# Clock size parameters: + hour = ifelse(`$1',,3,`$1') + minute = ifelse(`$2',,41,`$2') + second = ifelse(`$3',,51,`$3') + # outer radius + ifelse(`$4',,`skale=0.5; r1=2',`r1=(`$4')/2; skale=r1/4') + r2 = r1-0.5*skale + r3 = r2-0.14*skale + r4 = r3 - 0.35*skale + r5 = r4 - 0.17*skale + r6 = r5 - 0.63*skale + r7 = r6 - 0.17*skale + shadelinethick = 1.0 + +C: circle thick 0.2 rad r1 + +define shadeline { + s = 1-($`'1)*2 + v = r*s + h = sqrt(r^2-v^2) + t = 1-abs(s) + line from (vrot_(-h,v,cost,sint)) to (vrot_(h,v,cost,sint)) \ + thick shadelinethick outlined rgbstring(t,t,t) + } + + r = r1 # Bezel outer + nlines = int(2*r/(shadelinethick pt__)*1.1) + cost = cosd(10); sint = sind(10); + ShadeObject(shadeline,nlines, 0, 0,0,0, 0.5, 1,1,1, 1, 0,0,0 ) at C + + r = r2 # Bezel inner + nlines = int(2*r/(shadelinethick pt__)*1.1) + cost = cosd(-10); sint = sind(-10); + ShadeObject(shadeline,nlines, 0, 0,0,0, 0.25, 0.8,0.8,0.8, 0.5, 1,1,1, + 0.75, 0.8,0.8,0.8, 1, 0,0,0 ) at C + +# Clock face +Face: circle thick 0 fill_(1) rad r3 at C + circle rad r4 at C + circle rad r5 at C + circle rad r6 at C + circle rad r7 at C +# Ad hoc shift of rotated SVG text + define adj { (-cosd($`'1)*textht*0.5*sign(180-($`'1)),\ + (0.25+0.25*cosd(2*($`'1)))*textht) } +# Outer numbers + textht = (r3-r4)*0.6 + for mn = -15 to 15 by 5 do { t = 90-mn/60*360 + R:(Rect_((r3+r4)/2,t)) + svg_rot(mn/60*360,sprintf("%g",pmod(mn,60)) at C+R+adj(t)) + } + for mn = 20 to 40 by 5 do { t = 450-mn/60*360 + R: (Rect_((r3+r4)/2,t)) + svg_rot(-180+mn/60*360, sprintf("%g",pmod(mn,60)) at C+R+adj(t)) + } +# Outer tics + for mn = 1 to 60 do { t = 90-mn/60*360 + line from C+(Rect_(r5,t)) to C+(Rect_(r4,t)) } + +# Inner numbers + textht = (r5-r6)*0.6 + Loopover_(`mx',`tt = 90-(m4Lx-4)/12*360 + R: (Rect_((r5+r6)/2,tt)) + svg_rot(90-tt, "mx" at C+R+adj(tt)) ', + IX,X,XI,XII,I,II,III) + Loopover_(`mx',`tt = 360-m4Lx*30 + R: (Rect_((r5+r6)/2,tt)) + svg_rot(270-tt, "mx" at C+R+adj(tt)) ', + IV,V,VI,VII,VIII) + +# Inner tics + for mn = 5 to 60 by 5 do { t = 90-mn/60*360 + line from C+(Rect_(r7,t)) to C+(Rect_(r6,t)) } + +# Hands + AntiqueHourHand(r6,hour,minute,second) with .C at C + AntiqueMinuteHand(r5,hour,minute,second) with .C at C + SecondHand((r3+r4)/2,hour,minute,second) with .C at C + +# Center + dot(at C,0.1/4*r1,1) + ]') + + Clock1: AntiqueClock(,,,3.5) +# Clock2: AntiqueClock(4,48,07,2) at Clock1.e+(1.5,0) + + command "</g>" # end font +.PE diff --git a/graphics/circuit_macros/examples/svg/BtreeSVG.m4 b/graphics/circuit_macros/examples/svg/BtreeSVG.m4 index df0a2726b2..312249605e 100644 --- a/graphics/circuit_macros/examples/svg/BtreeSVG.m4 +++ b/graphics/circuit_macros/examples/svg/BtreeSVG.m4 @@ -2,7 +2,7 @@ # Btree.m4 # One way to draw a binary tree using pic macros gen_init(svg_font(sans-serif,11bp__)) -circlerad = 0.35 +circlerad = 0.30 define n { [C: circle fill_(0.9) $1 if "$2" != "" then { diff --git a/graphics/circuit_macros/examples/svg/ContactSVG.m4 b/graphics/circuit_macros/examples/svg/ContactSVG.m4 new file mode 100644 index 0000000000..057f702731 --- /dev/null +++ b/graphics/circuit_macros/examples/svg/ContactSVG.m4 @@ -0,0 +1,101 @@ +.PS +# ContactSVG +cct_init +svg_font(sans-serif,11bp__) + +movw = 0.45 +{ + contact + {S:"svg_tt(`contact')" at last [].s+(0,-0.15) + "svg_it(`P')" rjust at last [].P.w + "svg_it(`O')" ljust at last [].O + "svg_it(`C')" ljust at last [].C } + move right_ movw; contact(R) + {"svg_tt(`(R)')" at (last [].s,S) + "svg_it(`P')" rjust at last [].P.w + "svg_it(`O')" ljust at last [].O + "svg_it(`C')" ljust at last [].C } + move right_ movw; contact(O); {"svg_tt(`(O)')" at (last [],S)} + move right_ movw; contact(C); {"svg_tt(`(C)')" at (last [],S)} + + move right_ movw; contact(P) + {S: "svg_tt(`(P)')" at last [].s+(0,-0.15) + "svg_it(`P')" rjust at last [].P.w + "svg_it(`O')" ljust at last [].O + "svg_it(`C')" ljust at last [].C } + move right_ movw; contact(PR) + {S: "svg_tt(`(PR)')" at last [].s+(0,-0.15) + "svg_it(`P')" rjust at last [].P.w + "svg_it(`O')" ljust at last [].O + "svg_it(`C')" ljust at last [].C } + move right_ movw; contact(PO); {"svg_tt(`(PO)')" at (last [],S)} + {"svg_it(`O')" ljust at last [].O + "svg_it(`C')" ljust at last [].C } + move right_ movw; contact(PC); {"svg_tt(`(PC)')" at (last [],S)} +} + +move down 0.75; right_ ; { + contact(I); {S: "svg_tt(`(I)')" at last [].s+(0,-12bp__) + "svg_it(`P')" rjust at last [].P.w + "svg_it(`O')" ljust at last [].O.e + "svg_it(`C')" ljust at last [].C.e } + move right_ movw; contact(RI) + {"svg_tt(`(RI)')" at (last [],S) + "svg_it(`P')" rjust at last [].P.w + "svg_it(`O')" ljust at last [].O.e + "svg_it(`C')" ljust at last [].C.e } + move right_ movw; contact(OI); {"svg_tt(`(OI)')" at (last [],S)} + move right_ movw; contact(CI); {"svg_tt(`(CI)')" at (last [],S)} + + move right_ movw; contact(PI); {"svg_tt(`(PI)')" at (last [],S) } + {"svg_it(`O')" ljust at last [].O.e + "svg_it(`C')" ljust at last [].C.e } + move right_ movw; contact(PIO); {"svg_tt(`(PIO)')" at (last [],S) } + move right_ movw; contact(PIC); {"svg_tt(`(PIC)')" at (last [],S) } +} + +movewid = movw + move down 0.65; right_; { + K: contact(T) + {S: "svg_tt(`(T)')" at last [].s+(0,-0.15) + thinlines_ + spline <- right 0.09 then up 0.05 right 0.05 from K.C; "svg_it(`C')" + spline <- right 0.09 then down 0.05 right 0.05 from K.O; "svg_it(`O')" + thicklines_ } + move; K: contact(RT) + {"svg_tt(`(RT)')" at (last [],S) + thinlines_ + spline <- right 0.09 then up 0.05 right 0.05 from K.O; "svg_it(`O')" + spline <- right 0.09 then down 0.05 right 0.05 from K.C; "svg_it(`C')" + thicklines_ } + move; contact(OT); {S: "svg_tt(`(OT)')" at (last [],S) } + move; contact(CT); {S: "svg_tt(`(CT)')" at (last [],S) } + move; contact(PT); {S: "svg_tt(`(PT)')" at (last [],S) } + move; contact(PTO); {S: "svg_tt(`(PTO)')" at (last [],S) } + move; contact(PTC); {S: "svg_tt(`(PTC)')" at (last [],S) } +} + + move down 0.65; right_; { + K: contact(U) + {S: "svg_tt(`(U)')" at last [].s+(0,-0.15) + thinlines_ + spline <- right 0.09 then up 0.05 right 0.05 from K.C; "svg_it(`C')" + spline <- right 0.09 then down 0.05 right 0.05 from K.O; "svg_it(`O')" + thicklines_ } + move; K: contact(RU) + {"svg_tt(`(RU)')" at (last [],S) + thinlines_ + spline <- right 0.09 then up 0.05 right 0.05 from K.O; "svg_it(`O')" + spline <- right 0.09 then down 0.05 right 0.05 from K.C; "svg_it(`C')" + thicklines_ } + move; K: contact(OU); {S: "svg_tt(`(OU)')" at (last [],S) + "svg_it(`O')" ljust at K.O.e } + move; K: contact(CU); {S: "svg_tt(`(CU)')" at (last [],S) + "svg_it(`C')" ljust at K.C.e } + move; contact(PU); {S: "svg_tt(`(PU)')" at (last [],S) } + move; contact(PUO); {S: "svg_tt(`(PUO)')" at (last [],S) } + move; contact(PUC); {S: "svg_tt(`(PUC)')" at (last [],S) } +} + + command "</g>" # end font +.PE diff --git a/graphics/circuit_macros/examples/svg/ContactsSVG.m4 b/graphics/circuit_macros/examples/svg/ContactsSVG.m4 new file mode 100644 index 0000000000..556ae04a61 --- /dev/null +++ b/graphics/circuit_macros/examples/svg/ContactsSVG.m4 @@ -0,0 +1,49 @@ +.PS +# ContactsSVG.m4 +cct_init +svg_font(sans-serif,10bp__) + + space = 0.75 + KS:contacts(2) + {"svg_tt(`contacts(2)')" wid 1 at KS.s +(0,-12bp__) + for_(1,2,1, + `"svg_it(P`'m4x)" rjust at last [].P`'m4x-(dotrad_,0) + "svg_it(O`'m4x)" ljust at last [].O`'m4x+(dotrad_,0) + "svg_it(C`'m4x)" ljust at last [].C`'m4x+(dotrad_,0) ') } + + KS:contacts(2,I) with .sw at last [].se+(space,0) + {"svg_tt(`(2,I)')" at KS.s +(0,-12bp__) + for_(1,2,1, + `"svg_it(P`'m4x)" rjust at last [].P`'m4x-(dotrad_,0) + "svg_it(O`'m4x)" ljust at last [].O`'m4x+(dotrad_,0) + "svg_it(C`'m4x)" ljust at last [].C`'m4x+(dotrad_,0) ') } + + KS:contacts(2,IO) with .sw at last [].se+(space,0) + {"svg_tt(`(2,IO)')" at KS.s +(0,-12bp__) + for_(1,2,1, + `"svg_it(P`'m4x)" rjust at last [].P`'m4x-(dotrad_,0) + "svg_it(O`'m4x)" ljust at last [].O`'m4x+(dotrad_,0) ') } + + KS:contacts(2,PICD) with .sw at last [].se+(space,0) + {"svg_tt(`(2,PICD)')" at KS.s +(0,-12bp__) + for_(1,2,1, + `"svg_it(P`'m4x)" rjust at last [].P`'m4x-(dotrad_,0) + "svg_it(O`'m4x)" ljust at last [].O`'m4x+(dotrad_,0) + "svg_it(C`'m4x)" ljust at last [].C`'m4x+(dotrad_,0) ') } + + KS:contacts(2,PTCD) with .sw at last [].se+(space,0) + {"svg_tt(`(2,PTCD)')" at KS.s +(0,-12bp__) + for_(1,2,1, + `"svg_it(P`'m4x)" rjust at last [].P`'m4x-(dotrad_,0) + "svg_it(O`'m4x)" ljust at last [].O`'m4x+(dotrad_,0) + "svg_it(C`'m4x)" ljust at last [].C`'m4x+(dotrad_,0) ') } + + KS:contacts(2,PUCD) with .sw at last [].se+(space,0) + {"svg_tt(`(2,PUCD)')" at KS.s +(0,-12bp__) + for_(1,2,1, + `"svg_it(P`'m4x)" rjust at last [].P`'m4x-(dotrad_,0) + "svg_it(O`'m4x)" ljust at last [].O`'m4x+(dotrad_,0) + "svg_it(C`'m4x)" ljust at last [].C`'m4x+(dotrad_,0) ') } + + command "</g>" # end font +.PE diff --git a/graphics/circuit_macros/examples/svg/CrowSVG.m4 b/graphics/circuit_macros/examples/svg/CrowSVG.m4 index 6be0938947..3fe2e8ff72 100644 --- a/graphics/circuit_macros/examples/svg/CrowSVG.m4 +++ b/graphics/circuit_macros/examples/svg/CrowSVG.m4 @@ -33,22 +33,22 @@ define boxtext { boxwid = boxwid*1.15 boxsep = boxwid/2 - custombox(Class,ht boxht*2.2, + custombox(Class,ht boxht*1.7, `classkey, class_type, class_desc') custombox(Product,ht Class.ht with .nw at Class.ne+(boxsep,0), `classkey, prodkey, prod_name, pkg_type') - custombox(Sales,ht boxht*3.3 with .nw at Product.ne+(boxsep*2,15pt__), + custombox(Sales,ht boxht*2.75 with .nw at Product.ne+(boxsep*2,13pt__), `perkey, classkey, prodkey, storekey, promokey, quantity, dollars') custombox(Period,ht Sales.ht with .nw at Sales.ne+(boxsep*2,0), `perkey, date, day, week, month, qtr, year') - custombox(Market,ht Sales.ht with .nw at Class.sw+(0,-boxsep*2), + custombox(Market,ht Sales.ht with .nw at Class.sw+(0,-boxsep*3/2), `perkey, date, day, week, month, qtr, year') - custombox(Store,ht boxht*3.6 with .sw at (Product.w,Market.s), + custombox(Store,ht boxht*3.2 with .sw at (Product.w,Market.s), `storekey, mktkey, store_type, store_name, street, city, state, zip') custombox(Promotion,ht Market.ht with .sw at (Period.w,Market.s), @@ -61,7 +61,7 @@ define boxtext { T: last line.c+(0,-crow_wd*2.5) move to Period.nw+(0,-10pt__); crowline(to (Sales.e,Here),,1.75*crow_wd) -Q: (last line.c,0.4 between Sales.se and Sales.ne) +Q: (last line.c,0.35 between Sales.se and Sales.ne) move to Market.ne+(0,-10pt__); crowline(to (Store.w,Here)) move to Store.ne+(0,-10pt__); line to (T,Here) then to T diff --git a/graphics/circuit_macros/examples/svg/DiniSVG.m4 b/graphics/circuit_macros/examples/svg/DiniSVG.m4 new file mode 100644 index 0000000000..5631a4822f --- /dev/null +++ b/graphics/circuit_macros/examples/svg/DiniSVG.m4 @@ -0,0 +1,193 @@ +.PS +# Dini.m4 +# This diagram can be produced using, e.g. +# m4 pdf.m4 Dini.m4 | dpic -d > Dini.pdf + +threeD_init +NeedDpicTools +scale = 1.5 +[ + viewazimuth = 0 # View angles in degrees + viewelevation = 20 + setview(viewazimuth,viewelevation,0) + + a = 1.5 + b = 0.25 + +define(`Dini', +`a*cos(`$1')*sin(`$2'),dnl + a*sin(`$1')*sin(`$2'),dnl + (a*(cos(`$2')+loge(tan((`$2')/2))) + b*(`$1'))') + + umin = 0; umax = 4*pi_ + vmin = 0.2; vmax = 2.0 + ugrid = 80; vgrid = 20 + + ur = umax-umin + vr = vmax-vmin +`define cu {umin+($1)/ugrid*ur}' +`define cv {vmin+($1)/vgrid*vr}' + +# Generate points and sort + n = -1 + for iu=0 to ugrid do { + for iv=0 to vgrid do { + n +=1 + ciu[n] = cu(iu) + civ[n] = cv(iv) + d[n] = dot3D(View3D,Dini(ciu[n],civ[n])) + ix[n] = n + } + } + dpquicksort(d,0,n,ix) + +# Draw the facets + linethick = 0.4 + du = ur/ugrid/2 + dv = vr/vgrid/2 + for i=0 to n do { + NE: project(Dini(ciu[ix[i]]+du,civ[ix[i]]+dv)) + SE: project(Dini(ciu[ix[i]]+du,civ[ix[i]]-dv)) + SW: project(Dini(ciu[ix[i]]-du,civ[ix[i]]-dv)) + NW: project(Dini(ciu[ix[i]]-du,civ[ix[i]]+dv)) + f = (-cos(ciu[ix[i]])+1)/2 + g = ( sin(ciu[ix[i]])+1)/2 + line from NE to SE then to SW then to NW then to NE \ + outlined rgbstring(f,g,0) shaded rgbstring(f,g,0) +# outlined rgbstring(0,0.5,0) shaded rgbstring(f,g,0) + } +] +# Icosahedron.m4 +[ +#threeD_init +#NeedDpicTools + # Computing facets is complicated, so list them. + # 60 vertices: +define(`m4x',-1) + array2(v,m4inx,0, 0, 1.021) + array2(v,m4inx,0.4035482, 0, 0.9378643) + array2(v,m4inx,-0.2274644, 0.3333333, 0.9378643) + array2(v,m4inx,-0.1471226, -0.375774, 0.9378643) + array2(v,m4inx,0.579632, 0.3333333, 0.7715933) + array2(v,m4inx,0.5058321, -0.375774, 0.8033483) + array2(v,m4inx,-0.6020514, 0.2908927, 0.7715933) + array2(v,m4inx,-0.05138057, 0.6666667, 0.7715933) + array2(v,m4inx,0.1654988, -0.6080151, 0.8033483) + array2(v,m4inx,-0.5217096, -0.4182147, 0.7715933) + array2(v,m4inx,0.8579998, 0.2908927, 0.4708062) + array2(v,m4inx,0.3521676, 0.6666667, 0.6884578) + array2(v,m4inx,0.7841999, -0.4182147, 0.5025612) + array2(v,m4inx,-0.657475, 0.5979962, 0.5025612) + array2(v,m4inx,-0.749174, -0.08488134, 0.6884578) + array2(v,m4inx,-0.3171418, 0.8302373, 0.5025612) + array2(v,m4inx,0.1035333, -0.8826969, 0.5025612) + array2(v,m4inx,-0.5836751, -0.6928964, 0.4708062) + array2(v,m4inx,0.8025761, 0.5979962, 0.2017741) + array2(v,m4inx,0.9602837, -0.08488134, 0.3362902) + array2(v,m4inx,0.4899547, 0.8302373, 0.3362902) + array2(v,m4inx,0.7222343, -0.6928964, 0.2017741) + array2(v,m4inx,-0.8600213, 0.5293258, 0.1503935) + array2(v,m4inx,-0.9517203, -0.1535518, 0.3362902) + array2(v,m4inx,-0.1793548, 0.993808, 0.1503935) + array2(v,m4inx,0.381901, -0.9251375, 0.2017741) + array2(v,m4inx,-0.2710537, -0.9251375, 0.3362902) + array2(v,m4inx,-0.8494363, -0.5293258, 0.2017741) + array2(v,m4inx,0.8494363, 0.5293258, -0.2017741) + array2(v,m4inx,1.007144, -0.1535518, -0.06725804) + array2(v,m4inx,0.2241935, 0.993808, 0.06725804) + array2(v,m4inx,0.8600213, -0.5293258, -0.1503935) + array2(v,m4inx,-0.7222343, 0.6928964, -0.2017741) + array2(v,m4inx,-1.007144, 0.1535518, 0.06725804) + array2(v,m4inx,-0.381901, 0.9251375, -0.2017741) + array2(v,m4inx,0.1793548, -0.993808, -0.1503935) + array2(v,m4inx,-0.2241935, -0.993808, -0.06725804) + array2(v,m4inx,-0.8025761, -0.5979962, -0.2017741) + array2(v,m4inx,0.5836751, 0.6928964, -0.4708062) + array2(v,m4inx,0.9517203, 0.1535518, -0.3362902) + array2(v,m4inx,0.2710537, 0.9251375, -0.3362902) + array2(v,m4inx,0.657475, -0.5979962, -0.5025612) + array2(v,m4inx,-0.7841999, 0.4182147, -0.5025612) + array2(v,m4inx,-0.9602837, 0.08488134, -0.3362902) + array2(v,m4inx,-0.1035333, 0.8826969, -0.5025612) + array2(v,m4inx,0.3171418, -0.8302373, -0.5025612) + array2(v,m4inx,-0.4899547, -0.8302373, -0.3362902) + array2(v,m4inx,-0.8579998, -0.2908927, -0.4708062) + array2(v,m4inx,0.5217096, 0.4182147, -0.7715933) + array2(v,m4inx,0.749174, 0.08488134, -0.6884578) + array2(v,m4inx,0.6020514, -0.2908927, -0.7715933) + array2(v,m4inx,-0.5058321, 0.375774, -0.8033483) + array2(v,m4inx,-0.1654988, 0.6080151, -0.8033483) + array2(v,m4inx,0.05138057, -0.6666667, -0.7715933) + array2(v,m4inx,-0.3521676, -0.6666667, -0.6884578) + array2(v,m4inx,-0.579632, -0.3333333, -0.7715933) + array2(v,m4inx,0.1471226, 0.375774, -0.9378643) + array2(v,m4inx,0.2274644, -0.3333333, -0.9378643) + array2(v,m4inx,-0.4035482, 0, -0.9378643) + array2(v,m4inx,0, 0, -1.021) + + # 12 pentagons +undefine(`m4x') +array2(p,m4inx,0,3,8,5,1) +array2(p,m4inx,2,7,15,13,6) +array2(p,m4inx,4,10,18,20,11) +array2(p,m4inx,9,14,23,27,17) +array2(p,m4inx,12,21,31,29,19) +array2(p,m4inx,16,26,36,35,25) +array2(p,m4inx,22,32,42,43,33) +array2(p,m4inx,24,30,40,44,34) +array2(p,m4inx,28,39,49,48,38) +array2(p,m4inx,37,47,55,54,46) +array2(p,m4inx,41,45,53,57,50) +array2(p,m4inx,51,52,56,59,58) + + # 20 hexagons +undefine(`m4x') +array2(h,m4inx,0,1,4,11,7,2) +array2(h,m4inx,0,2,6,14,9,3) +array2(h,m4inx,1,5,12,19,10,4) +array2(h,m4inx,3,9,17,26,16,8) +array2(h,m4inx,5,8,16,25,21,12) +array2(h,m4inx,6,13,22,33,23,14) +array2(h,m4inx,7,11,20,30,24,15) +array2(h,m4inx,10,19,29,39,28,18) +array2(h,m4inx,13,15,24,34,32,22) +array2(h,m4inx,17,27,37,46,36,26) +array2(h,m4inx,18,28,38,40,30,20) +array2(h,m4inx,21,25,35,45,41,31) +array2(h,m4inx,23,33,43,47,37,27) +array2(h,m4inx,29,31,41,50,49,39) +array2(h,m4inx,32,34,44,52,51,42) +array2(h,m4inx,35,36,46,54,53,45) +array2(h,m4inx,38,48,56,52,44,40) +array2(h,m4inx,42,51,58,55,47,43) +array2(h,m4inx,48,49,50,57,59,56) +array2(h,m4inx,53,54,55,58,59,57) + + viewazimuth = -10 # View angles in degrees + viewelevation = 40 + setview(viewazimuth,viewelevation,0) + + n = 0 # Find and draw the visible hexagons + for i=1 to 20 do { # The normal is the line to the center + for_(1,3,1,`a[m4x] = (v[h[i,1],m4x] + v[h[i,4],m4x])/2') + if dot3D(View3D,a[1],a[2],a[3]) >= 0 then { n +=1; ih[n] = i } + } + for i=1 to n do { + for j=1 to 6 do { x[j]=h[ih[i],j] } + line from project((v[x[1],1]),(v[x[1],2]),(v[x[1],3]))\ + for_(2,6,1,`to project((v[x[m4x],1]),(v[x[m4x],2]),(v[x[m4x],3]))\')\ + to project((v[x[1],1]),(v[x[1],2]),(v[x[1],3])) thick 0.2 fill_(0.95) + } + m = 0 + for i=1 to 12 do { # Visible pentagons + for_(1,3,1,`a[m4x] = 0; for j=1 to 5 do { a[m4x] += v[p[i,j],m4x] }') + if dot3D(View3D,a[1]/5,a[2]/5,a[3]/5) >= 0 then { m +=1; ip[m] = i } + } + for i=1 to m do { + for j=1 to 5 do { x[j]=p[ip[i],j] } + line from project((v[x[1],1]),(v[x[1],2]),(v[x[1],3])) \ + for_(2,5,1,`to project((v[x[m4x],1]),(v[x[m4x],2]),(v[x[m4x],3]))\')\ + to project((v[x[1],1]),(v[x[1],2]),(v[x[1],3])) thick 0.2 fill_(0) + } +] scaled 2.5 with .sw at last [].se+(1,0) +.PE diff --git a/graphics/circuit_macros/examples/svg/Makefile b/graphics/circuit_macros/examples/svg/Makefile index 4d604dac40..5ee232a5ea 100644 --- a/graphics/circuit_macros/examples/svg/Makefile +++ b/graphics/circuit_macros/examples/svg/Makefile @@ -7,6 +7,7 @@ M4LIBS = svg.m4 SVGconfig.m4 DPIC = dpic #DPIC = $$HOME/dpic/bu*/p2c/ftp/dpic #DPIC = $$HOME/dpic/bu*/test/dpic +#DPIC = $$HOME/dpic/dev/p2c/ftp/dpic #DPIC = ../../../dpic/bison/dpic .SUFFIXES: .pic .svg .m4 @@ -20,11 +21,11 @@ DPIC = dpic CCTSVG = \ AdderSVG.svg AlogixSVG.svg ABlogixSVG.svg AmpTableSVG.svg AntennasSVG.svg \ - AudioSVG.svg \ + AntiqueClockSVG.svg \ AudioSVG.svg \ BipSVG.svg BtreeSVG.svg ByteSVG.svg ButtonsSVG.svg \ - CanLogicSVG.svg CctTableSVG.svg ConnSVG.svg CountingSVG.svg CrossbarSVG.svg \ - CrowSVG.svg CrullerSVG.svg CsourceSVG.svg \ - DecoderSVG.svg DemultiplexerSVG.svg DiodesSVG.svg DriveSVG.svg \ + CanLogicSVG.svg CctTableSVG.svg ConnSVG.svg ContactSVG.svg ContactsSVG.svg \ + CountingSVG.svg CrossbarSVG.svg CrowSVG.svg CrullerSVG.svg CsourceSVG.svg \ + DecoderSVG.svg DemultiplexerSVG.svg DiniSVG.svg DiodesSVG.svg DriveSVG.svg \ EmarrowsSVG.svg \ FlowSVG.svg FontsSVG.svg FusesSVG.svg GrayCodeSVG.svg GroundsSVG.svg \ HeadersSVG.svg HeathkitSVG.svg InclepsSVG.svg I2LSVG.svg JackSVG.svg \ @@ -42,8 +43,8 @@ CCTSVG = \ ex08SVG.svg ex09SVG.svg ex10SVG.svg ex11SVG.svg ex12SVG.svg \ ex15SVG.svg ex16SVG.svg ex17SVG.svg ex18SVG.svg ex21SVG.svg \ expSVG.svg fetSVG.svg graysurfSVG.svg lcctSVG.svg \ - pwrsupplySVG.svg quickSVG.svg randomSVG.svg recycleSVG.svg roseSVG.svg \ - sfgSVG.svg shapesSVG.svg paletteSVG.svg \ + pwrsupplySVG.svg quickSVG.svg randomSVG.svg recycleSVG.svg relaycoilSVG.svg \ + roseSVG.svg sfgSVG.svg shapesSVG.svg paletteSVG.svg \ thyristorSVG.svg ujtSVG.svg wormSVG.svg XORSVG.svg Np.svg examplesSVG.html: examplesSVG.htmx @@ -54,7 +55,9 @@ examplesSVG.html: examplesSVG.htmx SED = sed -e '/^\%/d' TEST = test -tst: $(TEST).pic +tst: + if test -f test.pic; then printf "\n\nUsage: make clean tst\n\n"; exit 1; fi + m4 $(M4LIBS) test.m4 | $(SED) > test.pic $(DPIC) -v $(TEST).pic > $(TEST).svg m4 $(M4LIBS) $(TEST).m4 | $(SED) > $(TEST).pic $(DPIC) -v $(TEST).pic > $(TEST).svg @@ -63,6 +66,7 @@ tst: $(TEST).pic make tstSVG.html test.pic: + if test -f test.pic ; then echo "Usage: make clean tst" ; fi m4 $(M4LIBS) test.m4 | $(SED) > test.pic tstSVG.html: tstSVG.htmx $(TEST).svg @@ -74,6 +78,13 @@ tstSVG.html: tstSVG.htmx $(TEST).svg xst: Incleps.png +AntiqueClockSVG.svg: + m4 $(M4LIBS) AntiqueClockSVG.m4 | sed -e '/^\%/d' > AntiqueClockSVG.pic + $(DPIC) -v AntiqueClockSVG.pic > AntiqueClockSVG.svg + m4 $(M4LIBS) AntiqueClockSVG.m4 | sed -e '/^\%/d' > AntiqueClockSVG.pic + $(DPIC) -v AntiqueClockSVG.pic > AntiqueClockSVG.svg + grep '<\!-- width' AntiqueClockSVG.svg | sed -e 's%<\!-- *%%' -e 's% *-->%%' > AntiqueClockSVG.siz + InclepsSVG.svg: InclepsSVG.m4 m4 $(M4LIBS) $*.m4 | sed -e '/^\%/d' > $*.pic $(DPIC) -v $*.pic > $*.svg diff --git a/graphics/circuit_macros/examples/svg/PconnSVG.m4 b/graphics/circuit_macros/examples/svg/PconnSVG.m4 index 066d397ca2..348a619317 100644 --- a/graphics/circuit_macros/examples/svg/PconnSVG.m4 +++ b/graphics/circuit_macros/examples/svg/PconnSVG.m4 @@ -24,8 +24,6 @@ P1: [ C3: pconnex(,ACF) with .w at last [].e+(0.2,0) `"(,ACF)"' at last [].s below - C4: pconnex(,P) with .w at last [].e+(0.2,0) - `"(,P)"' at (C4,last "") below C5: pconnex(U,D) with .w at last [].e+(0.2,0) `"(U,D)"' at last [].s below C6: pconnex(U,DF) with .w at last [].e+(0.2,0) @@ -37,7 +35,11 @@ P1: [ ] P2: [ - C9: pconnex(,G) + C4: pconnex(,P) + `"(,P)"' at last [].s below + C11: pconnex(,PF) with .w at last [].e+(0.2,0) + `"(,PF)"' at C11.s below + C9: pconnex(,G) with .w at C11.e+(0.2,0) `"(,G)"' at last [].s below C91: pconnex(,GF) with .w at last [].e+(0.2,0) `"(,GF)"' at last [].s below diff --git a/graphics/circuit_macros/examples/svg/RelaySVG.m4 b/graphics/circuit_macros/examples/svg/RelaySVG.m4 index df633176b0..f4b8152a50 100644 --- a/graphics/circuit_macros/examples/svg/RelaySVG.m4 +++ b/graphics/circuit_macros/examples/svg/RelaySVG.m4 @@ -1,80 +1,47 @@ .PS -# `Relay.m4' -cct_init(svg_font(sans-serif,11bp__)) - -{contact - {`"contact"' wid 0.8 at last [].s+(0,-0.2) - "svg_it(P)" rjust at last [].P.w - "svg_it(O)" ljust at last [].O - "svg_it(C)" ljust at last [].C } - move right_ 1.0; contact(R,) - {`"contact(,R)"' at last [].s+(0,-0.2) - "svg_it(P)" rjust at last [].P.w - "svg_it(O)" ljust at last [].O - "svg_it(C)" ljust at last [].C } - move right_ 1.0; contact(P) - {`"contact(P)"' at last [].s+(0,-0.2) - "svg_it(P)" rjust at last [].P.w - "svg_it(O)" ljust at last [].O - "svg_it(C)" ljust at last [].C } - move right_ 1.0; contact(O,); {`"contact(O,)"' at last [].s+(0,-0.2)} - move right_ 1.0; contact(C,); {`"contact(C,)"' at last [].s+(0,-0.2)} -} -move down 0.8 -right_ -{contact(I) - {`"contact(I)"' at last [].s+(0,-0.2) - "svg_it(P)" rjust at last [].P.w - "svg_it(O)" ljust at last [].O.e - "svg_it(C)" ljust at last [].C.e } - move right_ 1.0; contact(RI) - {`"contact(RI)"' at last [].s+(0,-0.2) - "svg_it(P)" rjust at last [].P.w - "svg_it(O)" ljust at last [].O.e - "svg_it(C)" ljust at last [].C.e } - move right_ 1.0; contact(PI) - {`"contact(PI)"' at last [].s+(0,-0.2) - "svg_it(P)" rjust at last [].P.w - "svg_it(O)" ljust at last [].O.e - "svg_it(C)" ljust at last [].C.e } - move right_ 1.0; contact(OI); {`"contact(OI)"' at last [].s+(0,-0.2)} - move right_ 1.0; contact(CI); {`"contact(CI)"' at last [].s+(0,-0.2) wid 1} -} -move down 1.3 -right_ -{ -relay - {"svg_it(V1)" rjust at last [].V1 +# RelaySVG +cct_init +svg_font(sans-serif,10bp__) + +skip = 1.1 + +R1:relay + {"svg_it(V1)" wid 0.16 rjust at last [].V1 "svg_it(V2)" ljust at last [].V2 - "svg_it(P1)" rjust at last [].P1.w + "svg_it(P1)" rjust at last [].P1-(dotrad_,0) "svg_it(O1)" ljust at last [].O1 "svg_it(C1)" ljust at last [].C1 } -`"relay"' at last [].s+(0,-0.2) -relay(2) with .sw at last [].sw+(1.2,0) + S: "svg_tt(`relay')" at last [].s+(0,-0.2) + +R5:relay(2,CTh) with .sw at last [].sw+(skip,0) + { for_(1,2,1,` + "svg_it(P`'m4x)" rjust at last [].P`'m4x-(dotrad_,0) + "svg_it(C`'m4x)" ljust at last [].C`'m4x ') } + "svg_tt((2,CTh))" at (last [],S) + +R4:relay(2,O) with .sw at last [].sw+(skip,0) + {for_(1,2,1,` + "svg_it(P1)" rjust at last [].P1-(dotrad_,0) + "svg_it(O`'m4x)" ljust at last [].O`'m4x ')} + "svg_tt((2,O))" at (last [],S) + +R3:relay(2,PIAX) with .sw at last [].sw+(skip,0) {"svg_it(V1)" rjust at last [].V1 - "svg_it(V2)" ljust at last [].V2 - "svg_it(P1)" rjust at last [].P1.w - "svg_it(O1)" ljust at last [].O1 - "svg_it(C1)" ljust below at last [].C1 - "svg_it(P2)" rjust at last [].P2.w - "svg_it(O2)" ljust at last [].O2 - "svg_it(C2)" ljust at last [].C2 } -`"relay(2)"' at last [].s+(0,-0.2) -relay(2,RPI) with .sw at last [].sw+(1.2,0) + "svg_it(V2)" rjust at last [].V2 + for_(1,2,1,` + "svg_it(P`'m4x)" rjust at last [].P`'m4x-(dotrad_,0) + "svg_it(O`'m4x)" ljust at last [].O`'m4x+(dotrad_,0) + "svg_it(C`'m4x)" ljust at last [].C`'m4x+(dotrad_,-2pt__) ') } + "svg_tt((2,PIAX))" at (last [],S) + +R2:relay(2,R) with .sw at last [].sw+(skip,0) {"svg_it(V1)" rjust at last [].V1 - "svg_it(V2)" ljust at last [].V2 - "svg_it(P1)" rjust at last [].P1.w - "svg_it(O1)" wid 0.2 ljust at last [].O1.e - "svg_it(C1)" wid 0.2 ljust at last [].C1.e+(0,2pt__) - "svg_it(P2)" rjust at last [].P2.w - "svg_it(O2)" wid 0.2 ljust at last [].O2.e+(0,-2pt__) - "svg_it(C2)" wid 0.2 ljust at last [].C2.e } -`"relay(2,RIP)"' at last [].s+(0,-0.2) -relay(2,O) with .sw at last [].sw+(1.2,0) -`"relay(2,O)"' at last [].s+(0,-0.2) -relay(2,CT) with .sw at last [].sw+(1.2,0) -`"relay(2,CT)"' at last [].s+(0,-0.2) -} + "svg_it(V2)" wid 0.2 ljust at last [].V2 + for_(1,2,1,` + "svg_it(P`'m4x)" rjust at last [].P`'m4x-(dotrad_,0) + "svg_it(O`'m4x)" ljust at last [].O`'m4x + "svg_it(C`'m4x)" ljust at last [].C`'m4x ') } + "svg_tt(`relay(2,R)')" at (last [],S) - command "</g>" # end font + command "</g>)" # end font .PE diff --git a/graphics/circuit_macros/examples/svg/ShiftRSVG.m4 b/graphics/circuit_macros/examples/svg/ShiftRSVG.m4 index 9c8aa65a1c..022f4ced9f 100644 --- a/graphics/circuit_macros/examples/svg/ShiftRSVG.m4 +++ b/graphics/circuit_macros/examples/svg/ShiftRSVG.m4 @@ -1,13 +1,14 @@ .PS # ShiftR.m4 log_init(svg_font(sans-serif,11*0.9bp__)) +textoffset = textht/6 define(`lg_plen',3) -define(`customFF', - `FlipFlopX(wid 10*L_unit ht FF_ht*L_unit,, - : S;NE:CK;: R, N:PR, :Q;;ifelse(`$1',1,:Q), N:CLR, - ifelse(`$1',1,line right 5bp__ at 2nd last ""+(-7bp__,4bp__)))') +define(`customFF',`FlipFlopX(wid 10*L_unit ht FF_ht*L_unit,, + :S;NE:CK;:R, N:PR, :Q;;ifelse(`$1',1,:Q), N:CLR,, + ifelse(`$1',1, + line right textht with .end at 2nd last ""+(-textoffset,0.4*textht)))') F0: customFF(1) @@ -21,7 +22,7 @@ define(`customFF', NCLR: NOT_gate(right T.x-Serial.x from (Serial,F0.S1.end),N) "CLEAR" at NCLR.start rjust - line left textht*2.3 from last ""+(-0.3,0.6)*textht + line left textht*5 from last ""+(-textoffset,0.8*textht) CLK: NOT_gate(right T.x-Serial.x from NCLR.start+(0,-BUF_ht*3/2*L_unit)) "CLOCK" at CLK.start rjust diff --git a/graphics/circuit_macros/examples/svg/SierpinskiSVG.m4 b/graphics/circuit_macros/examples/svg/SierpinskiSVG.m4 index 7fbf13bf15..08d7fab111 100644 --- a/graphics/circuit_macros/examples/svg/SierpinskiSVG.m4 +++ b/graphics/circuit_macros/examples/svg/SierpinskiSVG.m4 @@ -13,7 +13,7 @@ gen_init } } - r = 4 + r = 3 linethick = 0.2 #linethick = 1/2 /(1pt__) lw = linethick pt__ /2 @@ -35,20 +35,20 @@ gen_init define CayleyGraph { if $3 > 0 then { { line to Here+(cosd($2),sind($2))*($1) - exec sprintf("CayleyGraph(%g,%g,%g);",0.5*($1),$2,$3-1); } + exec sprintf("CayleyGraph(%g,%g,%g);", ($1)/2, $2, $3-1); } { line to Here+(cosd($2+90),sind($2+90))*($1) - exec sprintf("CayleyGraph(%g,%g,%g);",0.5*($1),$2+90,$3-1); } + exec sprintf("CayleyGraph(%g,%g,%g);", ($1)/2, $2+90, $3-1); } { line to Here+(cosd($2-90),sind($2-90))*($1) - exec sprintf("CayleyGraph(%g,%g,%g);",0.5*($1),$2-90,$3-1); } + exec sprintf("CayleyGraph(%g,%g,%g);", ($1)/2, $2-90, $3-1); } } } size = 2 depth = 6 for t=0 to 270 by 90 do { - line from (0,0) to (cosd(t),sind(t)); + line from (0,0) to (cosd(t),sind(t))*size/2; { exec sprintf("CayleyGraph(%g,%g,%g);",size/4,t,depth); } } - ] with .sw at last [].se+(-0.25,0) + ] scaled 3/4 with .sw at last [].se+(-0.25,0) .PE diff --git a/graphics/circuit_macros/examples/svg/SwitchesSVG.m4 b/graphics/circuit_macros/examples/svg/SwitchesSVG.m4 index 8808e5be27..04fc2f52c5 100644 --- a/graphics/circuit_macros/examples/svg/SwitchesSVG.m4 +++ b/graphics/circuit_macros/examples/svg/SwitchesSVG.m4 @@ -4,100 +4,116 @@ cct_init(svg_font(sans-serif,11bp__,2bp__)) textoffset = 3bp__ movewid = 0.25 -moveht = moveht*1.25 +# Row 1 right_; { - lswitch; rlabel(,"``lswitch''") + lswitch; {S:"svg_tt(`lswitch')" at last [].s+(0,-10bp__)} move right_ - lswitch(,,O); rlabel(,"`(,,O)'") + lswitch(,,O); {"svg_tt(`(,,O)')" at (last [],S)} move right_ - lswitch(,,C); rlabel(,"`(,,C)'") + lswitch(,,C); {"svg_tt(`(,,C)')" at (last [],S)} move right_ - lswitch(,,DA); rlabel(,"`(,,DA)'") + lswitch(,,DA); {"svg_tt(`(,,DA)')" at (last [],S)} move right_ - lswitch(,,DO); rlabel(,"`(,,DO)'") + lswitch(,,dDO); {"svg_tt(`(,,dDO)')" at (last [],S)} move right_ - lswitch(,,DC); rlabel(,"`(,,DC)'") + lswitch(,,uDC); {"svg_tt(`(,,uDC)')" at (last [],S)} } +# Row 2 move down; right_; { - lswitch(,,K); rlabel(,"`(,,K)'") + lswitch(,,K); {S:"svg_tt(`(,,K)')" at last [].s+(0,-10bp__)} move right_ - lswitch(,,KD); rlabel(,"`(,,KD)'") + lswitch(,,KD); {"svg_tt(`(,,KD)')" at (last [],S)} move right_ - lswitch(,,KOD); rlabel(,"`(,,KOD)'") + lswitch(,,KOD); {"svg_tt(`(,,KOD)')" at (last [],S)} move right_ - lswitch(,,KCD); rlabel(,"`(,,KCD)'") + lswitch(,,KCD); {"svg_tt(`(,,KCD)')" at (last [],S)} move right_ - bswitch; rlabel(,"``bswitch''") + bswitch; {"svg_tt(``bswitch'')" at (last [],S)} move right_ - bswitch(,,C); rlabel(,"`(,,C)'") + bswitch(,,C); {"svg_tt(`(,,C)')" at (last [],S)} } +# Row 3 move down; right_; { - S: dswitch(,,) - ifgpic(`{[line invis] at S.c+(0,-0.2)}') - rlabel(,"``dswitch=''") - { "`switch(,,,D)'" at last [].s + (0,-0.23) } - thinlines_ - { spline <- from 0.25 along_(S) up 0.1 then up 0.05 left 0.1 - "W" wid 8bp__ at Here+(-5bp__,0) - spline <- from S.c+(0,m4sc*2) up 0.1 then up 0.05 left 0.1 - "B" wid 5bp__ at Here+(-5bp__,0) } - thicklines_ - move right_ - S: dswitch(,,WdBK); rlabel(,"`(,,WdBK)'") - thinlines_ - { spline <- from tr_xy(0,-2) up 0.1 then up 0.10 left 0.1 - "dB" rjust - spline <- from tr_xy(4,-2) right 0.1 then right 0.05 up 0.15 - "K" above } - thicklines_ - move right_ - dswitch(,,WBuD); rlabel(,"`(,,WBuD)'") - move right_ - dswitch(,,WdBKF); rlabel(,"`(,,WdBKF)'") - move right_ - dswitch(,,WBL); rlabel(,"`(,,WBL)'") - move right_ - dswitch(,,WdBKL); rlabel(,"`(,,WdBKL)'") + D: dswitch(,,); {S: "svg_tt(`dswitch(,,)')" at last [].s+(0,-10bp__)} + thinlines_ + { spline <- from 0.25 along_(D) up 0.1 then up 0.05 left 0.1 + {"svg_tt(`W')" rjust} + spline <- from D.c+(0,m4sc*2) up 0.1 then up 0.05 left 0.1 + {"svg_tt(`B')" rjust }} + thicklines_ + move right_ + D: dswitch(,,WdBK); {"svg_tt(`(,,WdBK)')" at (last [],S)+(0,-4bp__)} + thinlines_ + { spline <- from tr_xy(0,-2) up 0.1 then up 0.10 left 0.1 + {"svg_tt(`dB')" rjust} + spline <- from tr_xy(4,-2) right 0.1 then right 0.05 up 0.15 + {"svg_tt(`K')" above }} + thicklines_ + move right_ + dswitch(,,WBmdDK); {"svg_tt(`(,,WBmdDK)')" at (last [],S)} + move right_ + dswitch(,,WBKTr); {"svg_tt(`(,,WBKTr)')" at (last [],S)} + move right_ + dswitch(,,WdBL); {"svg_tt(`(,,WdBL)')" at (last [],S+(0,-4bp__))} + move right_ + dswitch(,,WBCo); {"svg_tt(`(,,WBCo)')" at (last [],S)} } +# Row 4 move down; right_; { - dswitch(,,WBT); rlabel(,"`(,,WBT)'") + dswitch(,,WBKCo); {S: "svg_tt(`(,,WBKCo)')" at last [].s+(0,-10bp__)} move right_ - dswitch(,,WdBKC); rlabel(,"`(,,WdBKC)'") + dswitch(,,WBCb); {"svg_tt(`(,,WBCb)')" at (last [],S)} move right_ - dswitch(,,WBM); rlabel(,"`(,,WBM)'") + dswitch(,,WBDI); {"svg_tt(`(,,WBDI)')" at (last [],S)} move right_ - dswitch(,,WBCO); rlabel(,"`(,,WBCO)'") + dswitch(,,WBSd); {"svg_tt(`(,,WBSd)')" at (last [],S)} move right_ - dswitch(,,WBMP); rlabel(,"`(,,WBMP)'") + dswitch(,,WBFDI); {"svg_tt(`(,,WBFDI)')" at (last [],S)} move right_ - dswitch(,,WBoKCP); rlabel(,"`(,,WBoKCP)'") + dswitch(,,WBFSd); {"svg_tt(`(,,WBFSd)')" at (last [],S)} } - move down; right_; { - dswitch(,,WBCY); rlabel(,"`(,,WBCY)'") +# Row 5 + move down moveht*5/4; right_; { + dswitch(,,WBTh); {S: "svg_tt(`(,,WBTh)')" at last [].s+(0,-10bp__)} + move right_ + dswitch(,,WBKC); {"svg_tt(`(,,WBKC)')" at (last [],S)} + move right_ + dswitch(,,WBM); {"svg_tt(`(,,WBM)')" at (last [],S)} + move right_ + dswitch(,,WBCO); {"svg_tt(`(,,WBCO)')" at (last [],S)} + move right_ + dswitch(,,WBMP); {"svg_tt(`(,,WBMP)')" at (last [],S)} + move right_ + dswitch(,,WBoKCP); {"svg_tt(`(,,WBoKCP)')" at (last [],S)} + } +# Row 6 + move down moveht*5/4; right_; { + dswitch(,,WBCY); {S: "svg_tt(`(,,WBCY)')" at last [].s+(0,-10bp__)} move right_ - dswitch(,,WBCZ); rlabel(,"`(,,WBCZ)'") + dswitch(,,WBCZ); {"svg_tt(`(,,WBCZ)')" at (last [],S)} move right_ - dswitch(,,WBCE); rlabel(,"`(,,WBCE)'") + dswitch(,,WBCE); {"svg_tt(`(,,WBCE)')" at (last [],S)} move right_ - dswitch(,,WBRH); rlabel(,"`(,,WBRH)'") + dswitch(,,WBRH); {"svg_tt(`(,,WBRH)')" at (last [],S)} move right_ - dswitch(,,WBRdH); rlabel(,"`(,,WBRdH)'") + dswitch(,,WBRdH); {"svg_tt(`(,,WBRdH)')" at (last [],S)} move right_ - dswitch(,,WBRHH); rlabel(,"`(,,WBRHH)'") + dswitch(,,WBRHH); {"svg_tt(`(,,WBRHH)')" at (last [],S)} } +# Row 7 move down; right_; { - dswitch(,,WBMMR); rlabel(,"`(,,WBMMR)'") + dswitch(,,WBMMR); {S: "svg_tt(`(,,WBMMR)')" at last [].s+(0,-10bp__)} move right_ - dswitch(,,WBMM); rlabel(,"`(,,WBMM)'") + dswitch(,,WBMM); {"svg_tt(`(,,WBMM)')" at (last [],S)} move right_ - dswitch(,,WBMR); rlabel(,"`(,,WBMR)'") + dswitch(,,WBMR); {"svg_tt(`(,,WBMR)')" at (last [],S)} move right_ - dswitch(,,WBEL); rlabel(,"`(,,WBEL)'") + dswitch(,,WBEL); {"svg_tt(`(,,WBEL)')" at (last [],S)} move right_ - dswitch(,,WBLE); rlabel(,"`(,,WBLE)'") + dswitch(,,WBLE); {"svg_tt(`(,,WBLE)')" at (last [],S)} move right_ - dswitch(,,WdBKEL); rlabel(,"`(,,WdBKEL)'") + dswitch(,,WBoKEL); {"svg_tt(`(,,WBoKEL)')" at (last [],S)} } - command "</g>" # end font + command "</g>')" # end font .PE diff --git a/graphics/circuit_macros/examples/svg/ex02SVG.m4 b/graphics/circuit_macros/examples/svg/ex02SVG.m4 index 9ec72d8e2a..ad2f7324fb 100644 --- a/graphics/circuit_macros/examples/svg/ex02SVG.m4 +++ b/graphics/circuit_macros/examples/svg/ex02SVG.m4 @@ -1,6 +1,7 @@ .PS # ex02.m4 cct_init +linewid = linewid*4/5 [ [ for angle = 0 to 315 by 45 do { Point_(angle) diff --git a/graphics/circuit_macros/examples/svg/examplesSVG.htmx b/graphics/circuit_macros/examples/svg/examplesSVG.htmx index d4f45ecdef..91bc93f48e 100644 --- a/graphics/circuit_macros/examples/svg/examplesSVG.htmx +++ b/graphics/circuit_macros/examples/svg/examplesSVG.htmx @@ -84,9 +84,10 @@ There are a number of other issues: giving reasonable dimensions in pixels but this has to be insterted into the <embed or <object line. A makefile does it easily but otherwise this could be tedious. - <li> The font face is not specified by default in these diagrams but is - inherited from the enclosing document. The default appearance of labels can - differ according to the browser. + <li> The default font face is not specified in all of these diagrams but is + inherited from the enclosing document, so the appearance of labels can + differ depend on the browser. Some of these diagrams set the font at + the beginning of the diagram source. <li> The <svg tag may require modification from the default used for this test. Dpic might be modified to allow the generation of custom headers but that has not yet been done. @@ -116,8 +117,8 @@ There are a number of other issues: m4tt`'svg_font(font-family="Times")</g><br> m4tt`'svg_font(font-family="Times" font-style="italic")</g><br> m4tt`'svg_font(style="font-family:Times; font-style:italic")</g> - <li>m4tt svg_tspan(</g>text attributes`'m4tt)</g>; - e.g. m4tt`'svg_tspan(font-style="italic" font-size="75%")</g> + <li>m4tt svg_tspan(</g>text attributes, text`'m4tt)</g>; + e.g. m4tt`'svg_tspan(font-style="italic" font-size="75%",XYZ)</g> <li>m4tt svg_it(</g>text`'m4tt)</g>: for italics <li>m4tt svg_tt(</g>text`'m4tt)</g>: for monospace (courier) <li>m4tt svg_norm(</g>text`'m4tt)</g>: for normal text @@ -267,8 +268,11 @@ cfig(AntennasSVG) cfig(AudioSVG) cfig(OpampSVG) cfig(XformSVG) -cfig(RelaySVG) cfig(NPDTSVG) +cfig(ContactSVG) +cfig(ContactsSVG) +cfig(relaycoilSVG) +cfig(RelaySVG) cfig(JackSVG) cfig(ConnSVG) cfig(PconnSVG) @@ -281,7 +285,7 @@ cfig(TgateSVG) cfig(NportSVG) cfig(NLGSVG) cfig(WindingsSVG) -cfig(ex01SVG) +cfig(ex01.m4) cfig(TimerSVG) cfig(OptoisoSVG) cfig(MixerSVG) @@ -294,6 +298,7 @@ cfig(MCSVG) cfig(ex10SVG) cfig(ThreeSVG) cfig(ex17SVG) +cfig(ex02SVG) cfig(ex12SVG) cfig(pwrsupplySVG) cfig(TTLnandSVG) @@ -306,7 +311,6 @@ cfig(DriveSVG) cfig(ex16SVG) cfig(ex03SVG) cfig(MotorControlSVG) -cfig(ex02SVG) cfig(RectifiersSVG) cfig(HeathkitSVG) cfig(lcctSVG) @@ -324,27 +328,27 @@ cfig(CanLogicSVG) cfig(AlogixSVG) cfig(ABlogixSVG) cfig(XORSVG) -cfig(paletteSVG) cfig(ex00SVG) +cfig(controlSVG) cfig(GrayCodeSVG) cfig(CrossbarSVG) cfig(ByteSVG) cfig(RotboxSVG) +cfig(ex06SVG) +cfig(ex09SVG) +cfig(ex05SVG) +cfig(LoglogSVG) cfig(randomSVG) cfig(expSVG) cfig(graysurfSVG) -cfig(CrullerSVG) cfig(shapesSVG) -cfig(ex09SVG) -cfig(ex05SVG) -cfig(controlSVG) -cfig(ex06SVG) -cfig(LoglogSVG) +cfig(AntiqueClockSVG) cfig(cscSVG) cfig(roseSVG) cfig(diamondSVG) cfig(wormSVG) cfig(ButtonsSVG) +cfig(DiniSVG) cfig(SierpinskiSVG) cfig(recycleSVG) cfig(ex15SVG) diff --git a/graphics/circuit_macros/examples/svg/relaycoilSVG.m4 b/graphics/circuit_macros/examples/svg/relaycoilSVG.m4 new file mode 100644 index 0000000000..fc2bc2738f --- /dev/null +++ b/graphics/circuit_macros/examples/svg/relaycoilSVG.m4 @@ -0,0 +1,47 @@ +.PS +# relaycoil.m4 +cct_init + + spc = dimen_/3 +{ relaycoil; S: "svg_tt(`relaycoil')" at last [].s+(0,-20bp__) + { "svg_it(V1)" wid 15bp__ at last [].V1 rjust + "svg_it(V2)" at last [].V2 ljust } + K: relaycoil(NX) with .nw at last [].ne+(spc*4,0); "svg_tt((NX))" \ + at (last [],S) + { thinlines_ + spline <- from K.A1 left 7bp__ then up 4bp__ left 4bp__ + "svg_it(A1)" rjust + arrow <- from K.A2 left 10bp__; "svg_it(A2)" rjust + spline <- from K.A3 left 7bp__ then down 4bp__ left 4bp__ + "svg_it(A3)" rjust + spline <- from K.B1 right 7bp__ then up 4bp__ right 4bp__ + "svg_it(B1)" ljust + arrow <- from K.B2 right 10bp__; "svg_it(B2)" ljust + spline <- from K.B3 right 7bp__ then down 4bp__ right 4bp__ + "svg_it(B3)" ljust + thicklines_ + } + relaycoil(AXSR) with .nw at last [].ne+(spc*5,0); "svg_tt((AXSR))" \ + at (last [],S) + { "svg_it(V1)" at last [].V1 rjust; "svg_it(V2)" at last [].V2 rjust } + relaycoil(BXSR) with .nw at last [].ne+(spc*2,0); "svg_tt((BXSR))" \ + at (last [],S) + { "svg_it(V1)" at last [].V1 ljust; "svg_it(V2)" at last [].V2 ljust } + relaycoil(SR) with .nw at last [].ne+(spc*4,0); "svg_tt((SR))" at (last [],S) + relaycoil(SO) with .nw at last [].ne+(spc,0); "svg_tt((SO))" at (last [],S) + relaycoil(SOR) with .nw at last [].ne+(spc,0); "svg_tt((SOR))" at (last [],S) + } +{ + move down_ 3/4; right_ + relaycoil(HS); S: "svg_tt((HS))" at last [].s+(0,-12bp__) + relaycoil(NAC) with .nw at last [].ne+(spc,0); "svg_tt((NAC))" at (last [],S) + relaycoil(AC) with .nw at last [].ne+(spc,0); "svg_tt((AC))" at (last [],S) + relaycoil(ML) with .nw at last [].ne+(spc,0); "svg_tt((ML))" at (last [],S) + relaycoil(PO) with .nw at last [].ne+(spc,0); "svg_tt((PO))" at (last [],S) + relaycoil(RM) with .nw at last [].ne+(spc,0); "svg_tt((RM))" at (last [],S) + relaycoil(RH) with .nw at last [].ne+(spc,0); "svg_tt((RH))" at (last [],S) + relaycoil(TH) with .nw at last [].ne+(spc,0); "svg_tt((TH))" at (last [],S) + relaycoil(EL) with .nw at last [].ne+(spc,0); "svg_tt((EL))" at (last [],S) + } + +.PE diff --git a/graphics/circuit_macros/examples/svg/tstSVG.htmx b/graphics/circuit_macros/examples/svg/tstSVG.htmx index 1dd990c82a..f15d09b7c7 100644 --- a/graphics/circuit_macros/examples/svg/tstSVG.htmx +++ b/graphics/circuit_macros/examples/svg/tstSVG.htmx @@ -70,8 +70,8 @@ more basic. m4tt`'svg_font(font-family="Times")</g><br> m4tt`'svg_font(font-family="Times" font-style="italic")</g><br> m4tt`'svg_font(style="font-family:Times; font-style:italic")</g> - <li>m4tt svg_tspan(</g>text attributes`'m4tt)</g>; - e.g. m4tt`'svg_tspan(font-style="italic" font-size="75%")</g> + <li>m4tt svg_tspan(</g>text attributes, text`'m4tt)</g>; + e.g. m4tt`'svg_tspan(font-style="italic" font-size="75%",XYZ)</g> <li>m4tt svg_it(</g>text`'m4tt)</g>: for italics <li>m4tt svg_tt(</g>text`'m4tt)</g>: for monospace (courier) <li>m4tt svg_norm(</g>text`'m4tt)</g>: for normal text diff --git a/graphics/circuit_macros/examples/svg/xx.html b/graphics/circuit_macros/examples/svg/xx.html deleted file mode 100644 index 6b4881d450..0000000000 --- a/graphics/circuit_macros/examples/svg/xx.html +++ /dev/null @@ -1,11 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg" version="1.1"> -<g> - <text x = "10" y = "25" font-size = "20"> - <tspan x = "10" y = "60"> - T<tspan dy="10">i+2</tspan> - <tspan dy="-10">= T</tspan><tspan dy="10">i</tspan> - <tspan dy="-10">+ T</tspan><tspan dy="10">i+1</tspan> - </tspan> - </text> - </g> -</svg> diff --git a/graphics/circuit_macros/examples/testpdf.tex b/graphics/circuit_macros/examples/testpdf.tex index 823b297b34..7ff3664707 100644 --- a/graphics/circuit_macros/examples/testpdf.tex +++ b/graphics/circuit_macros/examples/testpdf.tex @@ -6,7 +6,7 @@ % \documentclass[11pt]{article} \usepackage{ps4pdf} -\usepackage[amssymb,Gray,thinqspace,textstyle]{SIunits} +\usepackage{siunitx} \PSforPDF{ \usepackage{pstricks} } \pagestyle{empty} \thispagestyle{empty} diff --git a/graphics/circuit_macros/examples/thyristor.m4 b/graphics/circuit_macros/examples/thyristor.m4 new file mode 100644 index 0000000000..ecc6448bf3 --- /dev/null +++ b/graphics/circuit_macros/examples/thyristor.m4 @@ -0,0 +1,118 @@ +.PS +# `thyristor.m4' +cct_init + +define labels { { + "\sl $1" ht 11 pt__ $2 at last[].$1 + "\sl $3" $4 at last[].$3 + "\sl $5" $6 at last[].$5 + "\tt $7" ht 11 pt__ $9 at (last[].s+(0,$8)) } } + +down_ +Row1: [ + {thyristor + labels(A,above,K,below,G,ljust,`thyristor',-0.25,wid 0.75) } + + move right 0.50 ; down_ + {thyristor(,B) + labels(T1,above,T2,below,G,below ljust,`...(,B)',-0.35) } + + move right 0.50 ; down_ + {thyristor(down_ dimen_*0.8,BRK) + labels(T1,above,T2,below,G,below rjust,`...(,BRK)',-0.22) } + + move right 0.60 ; down_ + {thyristor(,BE) + labels(T1,above,T2,below,G,below ljust,`...(,BE)',-0.35) } + + move right 0.50 ; down_ + {thyristor(,A) at (Here,last []) + labels(A,above,K,below,G,ljust,`...(,A)',-0.35) } + + move right 0.50 ; down_ + {thyristor(,F) at (Here,last []) + labels(A,above,K,below,G,ljust,`...(,F)',-0.22) } + + move right 0.65 ; down_ + {thyristor(,BRE) + labels(T1,above,T2,below,G,below rjust,`...(,BRE)',-0.35) } + + move right 0.75 ; down_ + {thyristor(,UARE) at (Here,last []) + labels(A,above,K,below,G,rjust below,`...(,UARE)',-0.22) } + + move right 0.50 ; down_ + {thyristor(,AV,G: G+(0.1,0.1)) at (Here,last []) + thinlines_ + spline -> from last[].G left 0.05 then left 0.05 down 0.1 + thicklines_ + labels(A,above,K,below,G,ljust,`...(,AV)',-0.35) } + + move right 0.50 ; down_ + {thyristor(,IEC) + labels(A,above ljust,K,below ljust,G,ljust,`...(,IEC)',-0.22) } + ] +Row2: [ + down_ + {thyristor(,UAH) + labels(A,rjust above,K,rjust below,G,ljust,`...(,UAH)',-0.35,wid 0.65) } + + move right 0.55 ; down_ + {thyristor(,N) at (Here,last []) + labels(A,above,K,below,Ga,rjust,`...(,N)',-0.22) } + + move right 0.55 ; down_ + {thyristor(,UANRE) at (Here,last []) + labels(A,above,K,below,Ga,ljust above,`...(,UANRE)',-0.35) } + move right 0.55 ; down_ + {thyristor(,SCR) at (Here,last []) + labels(A,above,K,below rjust,G,below ljust,`...(,SCR)',-0.22) } + + move right 0.55 ; down_ + {thyristor(,SCRE) at (Here,last []) + labels(A,above,K,below,G,ljust below,`...(SCRE)',-0.35) } + + move right 0.65 ; down_ + {thyristor(,SCRRE) at (Here,last []) + labels(A,above,K,below,G,rjust below,`...(SCRRE)',-0.22) } + + move right 0.55 ; down_ + {thyristor(,SCS) at (Here,last []) + labels(A,above,K,below,G,ljust,`...(SCS)',-0.35) } + { "\sl Ga" rjust above at last[].Ga } + + move right 0.55 ; down_ + {thyristor(,SCSE) at (Here,last []) + labels(A,above,K,below,G,ljust below,`...(SCSE)',-0.22) } + { "\sl Ga" rjust above at last[].Ga } + + move right 0.65 ; down_ + {thyristor(,SUSE) at (Here,last []) + labels(A,above,K,below,G,rjust,`...(SUSE)',-0.35) } + + move right 0.65 ; down_ + {thyristor(,SBSE) at (Here,last []) + labels(T1,above,T2,below,G,rjust,`...(SBSE)',-0.22) } + + ] with .nw at Row1.sw + (0,-0.20) + +Twoterms: [ right_ + { scr(,,Q) ; `"\tt scr(,{,}Q)"' at last [].e ljust} + { "\sl Q.G" at Q.G above } + + move down 0.4; right_ + { scs(,,Q2) ; `"\tt scs(,{,}Q2)"' at last [].e ljust } + { "\sl Q2.G" at Q2.G above } + { "\sl Q2.Ga" at Q2.Ga below } + ] with .nw at Row2.sw+(0,-0.2) + + [ right_ + { sus(,RE,Q3) ; `"\tt sus(,RE,Q3)"' at last [].e ljust} + { "\sl Q3.G" at Q3.G above } + + move right_ 1.2 from last line.end + { sbs(,E,Q4) ; `"\tt sbs(,E,Q4)"' at last [].e ljust} + { "\sl Q4.G" at Q4.G below } + ] with .w at last [].e+(1.0,0) + +.PE diff --git a/graphics/circuit_macros/examples/tikz.tex b/graphics/circuit_macros/examples/tikz.tex index df8ae91f82..fc3f4c17dc 100644 --- a/graphics/circuit_macros/examples/tikz.tex +++ b/graphics/circuit_macros/examples/tikz.tex @@ -1,6 +1,6 @@ \documentclass[11pt]{article} \usepackage{tikz} -\usepackage[amssymb,Gray,thinqspace,textstyle]{SIunits} +\usepackage{siunitx} \usepackage[T1]{fontenc} \usepackage{boxdims} \addtolength{\textwidth}{2cm} diff --git a/graphics/circuit_macros/examples/tst.tex b/graphics/circuit_macros/examples/tst.tex index 46992a001f..c4549a1631 100644 --- a/graphics/circuit_macros/examples/tst.tex +++ b/graphics/circuit_macros/examples/tst.tex @@ -4,7 +4,7 @@ \usepackage{pstricks,pst-slpe,pst-grad} \usepackage{boxdims} \usepackage{upgreek} -\usepackage[amssymb,Gray,thinqspace,textstyle]{SIunits} +\usepackage{siunitx} \usepackage{amssymb} % %\addtolength{\textwidth}{2cm} diff --git a/graphics/circuit_macros/examples/tst1.tex b/graphics/circuit_macros/examples/tst1.tex index 95363d1d9c..393c675149 100644 --- a/graphics/circuit_macros/examples/tst1.tex +++ b/graphics/circuit_macros/examples/tst1.tex @@ -1,7 +1,7 @@ %\documentclass{article} \documentclass[11pt]{article} \usepackage{graphicx} -\usepackage[amssymb,Gray,thinqspace,textstyle]{SIunits} +\usepackage{siunitx} \usepackage{boxdims} \pagestyle{empty} diff --git a/graphics/circuit_macros/examples/ujt.m4 b/graphics/circuit_macros/examples/ujt.m4 new file mode 100644 index 0000000000..aa4e708462 --- /dev/null +++ b/graphics/circuit_macros/examples/ujt.m4 @@ -0,0 +1,28 @@ +.PS +# `ujt.m4' +cct_init +dwn = 1.0 +dsep = 0.15 + +define(`demo_ujt',`Q: ujt(`$1',`$2',`$3',`$4') + "\sl B1" ifelse(`$5',,below,ljust) at last [].B1 + "{\sl E}sp_" at 1.5 between last [].Bulk.c and last [].E + "\sl B2" ifelse(`$5',,above,ljust) at last [].B2 + ') + +[demo_ujt(up_ dimen_,,,E,A) +`"{\tt ujt(up\_ dimen\_,{,},E)}"' wid 1.45 ht 0.1 at Q.s+(0,-0.15) ] + +[demo_ujt(,,P,) +`"{\tt ujt(,{,}P,)}"' at Q.s+(0.1,-dsep) below ] \ +with .Q.w at last [].Q.e+(0.85,0) + +[demo_ujt(,R,,) +`"{\tt ujt(,R,{,})}"' at Q.s+(0,-dsep) below] \ +with .Q.w at last [].Q.e+(0.8,0) + +[demo_ujt(,R,P,) +`"{\tt ujt(,R,P,)}"' at Q.s+(0,-dsep) below] \ +with .Q.w at last [].Q.e+(0.8,0) + +.PE diff --git a/graphics/circuit_macros/examples/windows.m4 b/graphics/circuit_macros/examples/windows.m4 index da6b9e0e51..1b2a904af0 100644 --- a/graphics/circuit_macros/examples/windows.m4 +++ b/graphics/circuit_macros/examples/windows.m4 @@ -1,6 +1,7 @@ divert(-1) +# This file is used if the CUSTOM= function is turned on in Makefile -# Change the absolute Windwos path to your installation directory: +# Change the absolute Windows path to your installation directory: define(`NeedDpicTools',`if "dpictools" != "1" then { copy "D:\Dwight\lib\dpictools.pic" } define(`dfitcurve__') ') diff --git a/graphics/circuit_macros/examples/xfig/xfiglib.fig b/graphics/circuit_macros/examples/xfig/xfiglib.fig index d567d99933..386844bc5c 100644 --- a/graphics/circuit_macros/examples/xfig/xfiglib.fig +++ b/graphics/circuit_macros/examples/xfig/xfiglib.fig @@ -6,7 +6,7 @@ Letter 100.00 Single -2 -# dpic version 2019.12.31 option -x for Fig 3.2 +# dpic version 2020.03.01 option -x for Fig 3.2 1200 2 6 0 0 3975 5025 6 0 0 3975 5025 diff --git a/graphics/circuit_macros/gpic.m4 b/graphics/circuit_macros/gpic.m4 index 3b8a60e40e..9a5c596dce 100644 --- a/graphics/circuit_macros/gpic.m4 +++ b/graphics/circuit_macros/gpic.m4 @@ -1,12 +1,12 @@ divert(-1) gpic.m4 Initialization for gpic. -* Circuit_macros Version 9.1, copyright (c) 2019 J. D. Aplevich under * -* the LaTeX Project Public License. The files of this distribution may * -* be redistributed or modified provided that this copyright notice is * -* included and provided that modifications are clearly marked to * -* distinguish them from this distribution. There is no warranty * -* whatsoever for these files. * +* Circuit_macros Version 9.2, copyright (c) 2020 J. D. Aplevich under * +* the LaTeX Project Public Licence in file Licence.txt. The files of * +* this distribution may be redistributed or modified provided that this * +* copyright notice is included and provided that modifications are clearly * +* marked to distinguish them from this distribution. There is no warranty * +* whatsoever for these files. * define(`m4picprocessor',gpic) define(`m4postprocessor',tpic) diff --git a/graphics/circuit_macros/lib3D.m4 b/graphics/circuit_macros/lib3D.m4 index 90bb05d2d1..53d2004b43 100644 --- a/graphics/circuit_macros/lib3D.m4 +++ b/graphics/circuit_macros/lib3D.m4 @@ -3,12 +3,12 @@ lib3D.m4 Macros for rotation, projection, and other operations on argument triples representing 3D vectors. -* Circuit_macros Version 9.1, copyright (c) 2019 J. D. Aplevich under * -* the LaTeX Project Public License. The files of this distribution may * -* be redistributed or modified provided that this copyright notice is * -* included and provided that modifications are clearly marked to * -* distinguish them from this distribution. There is no warranty * -* whatsoever for these files. * +* Circuit_macros Version 9.2, copyright (c) 2020 J. D. Aplevich under * +* the LaTeX Project Public Licence in file Licence.txt. The files of * +* this distribution may be redistributed or modified provided that this * +* copyright notice is included and provided that modifications are clearly * +* marked to distinguish them from this distribution. There is no warranty * +* whatsoever for these files. * define(`lib3D_') ifdef(`libgen_',,`include(libgen.m4)divert(-1)') diff --git a/graphics/circuit_macros/libcct.m4 b/graphics/circuit_macros/libcct.m4 index f8a98a84c0..b213af9e91 100644 --- a/graphics/circuit_macros/libcct.m4 +++ b/graphics/circuit_macros/libcct.m4 @@ -1,12 +1,12 @@ divert(-1) libcct.m4 -* Circuit_macros Version 9.1, copyright (c) 2019 J. D. Aplevich under * -* the LaTeX Project Public License. The files of this distribution may * -* be redistributed or modified provided that this copyright notice is * -* included and provided that modifications are clearly marked to * -* distinguish them from this distribution. There is no warranty * -* whatsoever for these files. * +* Circuit_macros Version 9.2, copyright (c) 2020 J. D. Aplevich under * +* the LaTeX Project Public Licence in file Licence.txt. The files of * +* this distribution may be redistributed or modified provided that this * +* copyright notice is included and provided that modifications are clearly * +* marked to distinguish them from this distribution. There is no warranty * +* whatsoever for these files. * define(`libcct_') ifdef(`libgen_',,`include(libgen.m4)divert(-1)') @@ -826,6 +826,16 @@ define(`memristor',`eleminit_(`$1') line to rvec_(max(0,rp_len/2-m4wd/2),0) } line invis to rvec_(rp_len,0)') + `pvcell( linespec, wid, ht )' +define(`pvcell',`eleminit_(`$1') + define(`m4wd',ifelse(`$2',,`dimen_/2',`($2)'))dnl + define(`m4ht',ifelse(`$3',,`dimen_/5',`($3)'))dnl + { line to rvec_(max(0,rp_len/2-m4wd/2),0) + {[lbox(m4wd,m4ht)] at rvec_(m4wd/2,0)} + {line from rvec_(0,-m4ht/2) to rvec_(m4wd/3,0) then to rvec_(0,m4ht/2)} + move to rvec_(m4wd,0); line to rvec_(max(0,rp_len/2-m4wd/2),0) } + line invis to rvec_(rp_len,0)') + `heater( linespec, nparts, wid, ht )' define(`heater',`eleminit_(`$1') define(`m4hn',ifelse(`$2',,4,`$2'))dnl @@ -874,9 +884,9 @@ eleminit_(`$1') { [ circle rad dimen_/5 ] at rvec_(rp_len/2,m4ng`'dimen_/3.2) } line invis to rvec_(rp_len,0) ') - `cbreaker( linespec, L|R, D|T|TS ) + `cbreaker( linespec, L|R, D|Th|TS ) circuit breaker to left or right of linespec, - D=with dots; T=thermal; TS=squared thermal' + D=with dots; Th=thermal; TS=squared thermal' define(`cbreaker',`ifinstr(`$3',T, `tbreaker($@)', `mbreaker($@)')') @@ -934,6 +944,7 @@ define(`gap',`eleminit_(`$1') line with midpoint arrowhead e.g. arrowline(up 1 dotted); llabel(,I_2)' define(`arrowline',`line ifelse(`$1',,`to rvec_(elen_,0)',`$1') + { eleminit_(from last line.start to last line.end) } { arrow from last line.start to last line.end \ chop lin_leng(last line)/2-arrowht/2 [box invis ht_ arrowwid wid_ arrowht] at last line.c }') @@ -1055,8 +1066,11 @@ define(`antenna',`[ T: Here `switch( linespec,L|R,[O|C][D],L|B|D ) Wrapper for bswitch, lswitch, dswitch R=right orientation (default L=left) - if arg4=blank or L: arg3 = [O|C][D][K][A] - D=dotted points; K=closed switch; + if arg4=blank or L: + arg3 = [O|C][D][K][A] + D = circle at contact and hinge (dD = hinge + only, uD = contact only) + K=closed switch; A=arrowhead on switch blade; O=opening arrow; C=closing arrow if arg4=B (button switch): arg3 = O|C @@ -1096,8 +1110,10 @@ define(`bswitch',`eleminit_(`$1') dnl `lswitch( linespec,L|R,chars ) knife switch R=right orientation (default L=left) - chars=[O|C][D][K][A] - D=dotted points; K=closed switch; + chars=[O|C][[ud]D][K][A] + D = circle at contact and hinge (dD = hinge + only, uD = contact only) + K=closed switch; A=arrowhead on switch blade; O=opening arrow; C=closing arrow' define(`lswitch',`eleminit_(`$1') dnl @@ -1112,7 +1128,6 @@ define(`lswitch',`eleminit_(`$1') dnl line from rvec_(dimen_/3,0) to rvec_(dimen_/3,ifelse(`$2',R,-)dotrad_)}', `{ifinstr(`$3',A,arrow m4c_l,line) \ to rvec_(dimen_/4,ifelse(`$2',R,-)dimen_/4)}') - sc_draw(`dna_',D,`dot(,,1) define(`m4d',1)') sc_draw(`dna_',C,`{ arc <- m4c_l ifelse(`$2',R,,`c')cw \ from rvec_(Rect_(dimen_/4,ifelse(`$2',R,,-)m4k))\ to rvec_(Rect_(dimen_/4,ifelse(`$2',R,-)60)) \ @@ -1121,14 +1136,17 @@ define(`lswitch',`eleminit_(`$1') dnl from rvec_(Rect_(dimen_/4,ifelse(`$2',R,,-)10))\ to rvec_(Rect_(dimen_/4,ifelse(`$2',R,-)75)) \ with .c at rvec_(Rect_(-dimen_/4,ifelse(`$2',R,-)(75-10)/2)) }') } - { line from rvec_(rp_len/2+dimen_/6,0) \ - to rvec_(rp_len,0) - ifelse(m4d,-1,,`dot(at last line.start,,1)') } + {{line from rvec_(rp_len/2+dimen_/6,0) \ + to rvec_(rp_len,0) } + sc_draw(`dna_',D, + `ifelse(m4a,u,,`dot(at rvec_(rp_len/2-dimen_/6,0),,1)') + ifelse(m4a,d,,`dot(at last line.start,,1)')') } { [box invis ht_ dimen_/4+m4cs wid_ dimen_/3] \ with .c at rvec_(rp_len/2,ifelse(`$2',R,-)(m4v-(m4cs))/2)} arrowht = m4t1 ; arrowwid = m4t2; ifelse(`$4',,,`{`$4'}') line to rvec_(rp_len,0) invis ') + `dswitch(linespec,R,W[ud]B[K] chars) Comprehensive IEEE-IEC single-pole switch: arg2=R: orient to the right of drawing dir @@ -1136,14 +1154,17 @@ define(`lswitch',`eleminit_(`$1') dnl blank means WB by default W=baseline B=contact blade + Bm= mirror blade Bo=contact blade more widely open dB=contact blade to the right of direction K=vertical closing contact line use WdBK for a normally-closed switch - + Cb = circuit breaker function (IEC S00219) + Co = contactor function (IEC S00218) C = external operating mechanism D = circle at contact and hinge (dD = hinge only, uD = contact only) + DI = Disconnector; isolator (IEC S00288) E = emergency button EL = early close (or late open) LE = late close (or early open) @@ -1160,7 +1181,9 @@ define(`lswitch',`eleminit_(`$1') dnl O = hand operation button P = pushbutton R = time-delay operating arm - T = thermal control linkage + Sd = Switch-disconnector + Th = thermal control linkage + Tr = tripping Y = pull switch Z = turn switch' define(`dswitch',`eleminit_(`$1') @@ -1171,6 +1194,13 @@ define(`m4R',`ifelse(`$2',R,-)')define(`m4sc',`dimen_/24')dnl { line to tr_xy(-4,0) line from tr_xy(4,0) \ to 2nd last line.end + sc_draw(`dna_',Bm, + `define(`m4c',ifelse(m4a,d,-))dnl + M4B: line from tr_xy(-4,0) \ + to tr_xy(5.0,m4c`'4.5) + line invis from M4B.start to M4B.end chop 0 chop -m4_xyU*5/4 + m4fshade(0,circle rad m4_xyU*5/4 at last line .end) + M4Q: 2 between M4_xyO and M4B.c') sc_draw(`dna_',Bo, `define(`m4c',ifelse(m4a,d,-))dnl M4B: line from tr_xy(-4,0) \ @@ -1179,8 +1209,17 @@ define(`m4R',`ifelse(`$2',R,-)')define(`m4sc',`dimen_/24')dnl sc_draw(`dna_',B, `define(`m4c',ifelse(m4a,d,-))dnl M4B: line from tr_xy(-4,0) \ - to tr_xy(5.5,m4c`'4) + to tr_xy(5.0,m4c`'4.5) M4Q: 2 between M4_xyO and M4B.c') + sc_draw(`dna_',Cb, + `line from tr_xy(2,-2) to tr_xy(6, 2) + line from tr_xy(2, 2) to tr_xy(6,-2) + M4Q: tr_xy(0,-2) ') + sc_draw(`dna_',Co,`ifelse(m4R,-, + `M4Arc: arc ifelse(m4c,-,,c)cw from tr_xy(4,0) \ + to tr_xy(8,0) with .c at tr_xy(6,0)', + `M4Arc: arc ifelse(m4c,-,c)cw from tr_xy(4,0) \ + to tr_xy(8,0) with .c at tr_xy(6,0)') ') sc_draw(`dna_',MMR, `line from tr_xy(6,1.16) \ to tr_xy(4,0) \ @@ -1193,6 +1232,9 @@ define(`m4R',`ifelse(`$2',R,-)')define(`m4sc',`dimen_/24')dnl `line from tr_xy(5,0) \ to tr_xy(4,0) \ then to tr_xy(6,-1.16)') + sc_draw(`dna_',DI, + `line from tr_xy(4,2) to tr_xy(4,-2) + M4Q: tr_xy(0,-2) ') sc_draw(`dna_',D, `ifelse(m4a,u,,`dot(at tr_xy(-4,0),,1)') ifelse(m4a,d,,`dot(at tr_xy(4,0),,1)')') @@ -1208,7 +1250,7 @@ define(`m4R',`ifelse(`$2',R,-)')define(`m4sc',`dimen_/24')dnl `line from tr_xy(4,0) \ to tr_xy(4,m4c`'5)') sc_draw(`dna_',F, - `M4dT: 3/16 along_(M4B); M4dQ: 11/16 along_(M4B) + `M4dT: 1/8 along_(M4B); M4dQ: 5/8 along_(M4B) line from M4dT to M4dT + ta_xy(neg_(m4c)1/2,1) \ then to M4dQ + ta_xy(neg_(m4c)1/2,1) \ then to M4dQ + ta_xy(m4c`'1/2,-1) \ @@ -1219,7 +1261,12 @@ define(`m4R',`ifelse(`$2',R,-)')define(`m4sc',`dimen_/24')dnl line from 5/16 along_(M4B) \ to M4dT + ta_xy(neg_(m4e)1,ifelse(m4c,m4e,,-)2) \ then to M4dT') - sc_draw(`dna_',T, + sc_draw(`dna_',Sd, + `dot(at tr_xy(4,0),m4_xyU*3/2,1) + line from tr_xy(4,2)+vec_(m4_xyU*3/2,0) \ + to tr_xy(4,-2)+vec_(m4_xyU*3/2,0) + M4Q: tr_xy(0,-2) ') + sc_draw(`dna_',Th, `define(`m4t',ifelse(m4a,d,-))dnl M4T: M4B.c+ta_xy(0,m4t`'12) line from M4B.c to M4B.c+ta_xy(0,m4t`'4.5) \ @@ -1227,6 +1274,13 @@ define(`m4R',`ifelse(`$2',R,-)')define(`m4sc',`dimen_/24')dnl then to M4B.c+ta_xy(3,m4t`'7.5) \ then to M4B.c+ta_xy(0,m4t`'7.5) \ then to M4T ') + sc_draw(`dna_',Tr, + `m4angtmp = rp_ang; point_(lin_ang(M4B)) + M4dT1: 0.4 along_(M4B); M4dT2: 0.65 along_(M4B) + m4dTr = distance(M4dT1,M4dT2) + move to M4dT1+vec_(0,m4c`'m4dTr/2) + m4fshade(0,lbox(m4dTr,m4dTr)) + point_(m4angtmp) ') sc_draw(`dna_',M, `define(`m4t',ifelse(m4a,d,-))dnl M4T: M4B.c+ta_xy(0,m4t`'12) @@ -2238,29 +2292,31 @@ define(`m4label',`dnl `{m4lstring(`$3',"sp_`'iflatex(`$ `$3'$',`$3')`'sp_") \ at last [].e_ $5 ljust_ $6};')dnl ') - `Labels for oblique or aligned elements - dlabel(long,lateral,label,label,label,chars) - long, lateral: dispacement with respect to - drawing direction + `dlabel(long,lateral,label,label,label,chars) + Labels for oblique or aligned elements + long, lateral: dispacement from center + with respect to drawing direction chars: X displacement is from the centre of the last line rather than the centre of the last [] L,R,A,B align labels ljust, rjust, above, or below (absolute) respectively' define(`dlabel',`ifsvg(`changecom(,)')dnl + define(`m4long_',`ifelse(`$1',,`dimen_',`($1)')')dnl + define(`m4lat_',`ifelse(`$2',,`10bp__',`($2)')')dnl ifelse(`$3',,, `{m4lstring(`$3',"iflatex(`$ `$3'$',` $3')") \ - at last ifinstr(`$6',X,line,[]).c+vec_(-(`$1'),`$2') \ + at last ifinstr(`$6',X,line,[]).c+vec_(-m4long_,m4lat_) \ ifinstr(`$6',L,ljust,`$6',R,rjust) dnl ifinstr(`$6',A,above,`$6',B,below) };') dnl ifelse(`$4',,, `{m4lstring(`$4',"iflatex(`$ `$4'$',` $4')") \ - at last ifinstr(`$6',X,line,[]).c+vec_(0,`$2') \ + at last ifinstr(`$6',X,line,[]).c+vec_(0,m4lat_) \ ifinstr(`$6',L,ljust,`$6',R,rjust) dnl ifinstr(`$6',A,above,`$6',B,below) };') dnl ifelse(`$5',,, `{m4lstring(`$5',"iflatex(`$ `$5'$',` $5')") \ - at last ifinstr(`$6',X,line,[]).c+vec_(`$1',`$2') \ + at last ifinstr(`$6',X,line,[]).c+vec_(m4long_,m4lat_) \ ifinstr(`$6',L,ljust,`$6',R,rjust) dnl ifinstr(`$6',A,above,`$6',B,below) };') ifsvg(`changecom(`#',)')') @@ -2462,48 +2518,264 @@ define(`m4xR',ifinstr(`$2',R,R))define(`m4SR',ifelse(m4xR,R,-))dnl DL: line dashed to rvec_(0,m4SR`'(m4np-3/4)*dimen_/2)') `$3']') - `relay(npoles,chars,[L|R]) + + `relay(npoles,chars) arg1: Number of poles (max 10) chars: + any of the relaycoil options and: O = normally open C = normally closed - P = three position - neither = double-throw (default) - L = drawn left (default) - R = drawn right - T = thermal - arg3: deprecated, kept for compatibility + P = three-position + none of above = double-throw (default) L = drawn left (default) - R = drawn right ' -define(`relay',`[ define(`m4n',`ifinstr(`$2',R,-,`$3',R,-,0+)') -V1: Here - L1: line to rvec_(dimen_/5,0) - Box: lbox(dimen_/5,dimen_/2) - ifinstr(`$2',T,`{move to rvec_(-dimen_/10,0) - line from rvec_(-dimen_/20,dimen_/6) \ - to rvec_(-dimen_/20,dimen_/20) \ + R = drawn to right of drawing direction + Th = thermal ' +define(`relay',`[ define(`m4pm',`ifinstr(`$2',R,-)')dnl + Coil: relaycoil(`$2') define(`m4rel',rcdna_) + V1: Coil.V1 + V2: Coil.V2 + sc_draw(m4rel,Th, + `{move to Coil #rvec_(-dimen_/8,0) + line from rvec_(-dimen_/20,dimen_/6) \ + to rvec_(-dimen_/20,dimen_/20) \ then to rvec_(dimen_/20,dimen_/20) \ - then to rvec_(dimen_/20,-dimen_/20) \ + then to rvec_(dimen_/20,-dimen_/20) \ then to rvec_(-dimen_/20,-dimen_/20) \ - then to rvec_(-dimen_/20,-dimen_/6)}') - L2: line to rvec_(ifinstr(`$2',P,,2*)dimen_/5,0) -V2: Here - move to V2+vec_(0,m4n (dimen_/4+dimen_/5)) - m4_contacts(1,ifelse(`$1',,1,`$1'), - ifinstr(`$2',O,O,`$2',C,C)`'ifinstr(`$2',P,P)`'ifinstr(`$2',I,I), - ifinstr(`$3',R,R,`$2',R,R)) - ifelse(`$1',,,`ifelse(eval(`$1'>1),1,`DL: line dashed \ - from P1+vec_(dimen_*0.261,-(m4n dimen_/10)) \ - to P`'ifelse(`$1',,1,`$1')+vec_(dimen_*0.261,m4n dimen_/10)')') - `$4'] ') -define(`m4_contacts',`contact(`$3',`$4') with .O at Here - define(`m4v',`ifelse(`$1',,1,`$1')')dnl - P`$1': circle invis rad dotrad_ at last [].P - ifelse(`$3',O,,C`$1': last [].C) - ifelse(`$3',C,,O`$1': last [].O) - ifelse(m4v,`$2',, - `move to last[].C+(0,m4n dimen_/5) - ifelse(eval(m4v<11),1,`m4_contacts(incr(m4v),`$2',`$3',`$4')')')') + then to rvec_(-dimen_/20,-dimen_/6)}') + Cs: contacts(ifelse(`$1',,1,`$1'),D`'m4rel) with .O1 at Coil.B2 + \ + vec_(ifinstr(m4rel,P,-dimen_/5,0)+dimen_/4,m4pm`'(dimen_/4+dimen_/5)) + for_(1,ifelse(`$1',,1,`$1'),1, + `P`'m4x: Cs.P`'m4x + C`'m4x: Cs.C`'m4x + O`'m4x: Cs.O`'m4x') + `$3'] ') + + `contacts(npoles,chars) + chars: + P= three position + O|C= normally open, normally closed (default) + R= right orientation (default left) + I= open circles for contacts + T= T contacts + U= U contacts + D= dashed line across armatures' + `e.g. contacts(1,5,O)' +define(`contacts',`[ + define(`m4np',`ifelse(`$1',,1,`$1')')dnl + ifelse(eval(m4np>10),1,`define(`m4np',10)')dnl + for_(1,m4np,1, + `K`'m4x: contact(`$2') with .O at Here + P`'m4x: circle invis rad dotrad_ at last [].P + C`'m4x: last [].C + O`'m4x: last [].O + ifelse(m4x,m4np,,`move to last[].C+vec_(0,m4pm dimen_/4)')') + ifelse(eval(m4np>1),1,`ifinstr(`$2',D, + `DL: line dashed from K1.A.c to K`'m4np.A.c chop -dimen_/10')') + `$3'] ') + + `contact(chars [,R]) Relay contact switch + Arg 2 deprecated, kept for compatibility + chars: + O|C= normally open, normally closed (default) + I= open circles for contacts + P= three position + R= right orientation (default left) + T= T contacts + U = line contact' +define(`contact',`[ dnl + define(`m4pm',`ifelse(ifinstr(`$1',R,R,`$2',R,R),R,-)')dnl + define(`m4dr',`dotrad_')define(`m4TL',dimen_/12)dnl + P: dot(,m4dr,1) + T: P+vec_(dimen_/2-dimen_/12,0) + ifinstr(`$1',P,`ifinstr( + `$1',I, + `{C: dot(at T+vec_(0,m4pm`'(dimen_/8+m4dr*2+lthick/2)),m4dr,1)} + {O: dot(at T-vec_(0,m4pm`'(dimen_/8+m4dr*2+lthick/2)),m4dr,1)} + A: line from P to ifinstr( + `$1',O,`(LCtangent(P,O,dotrad_+lthick/2)) chop m4dr chop -m4dr', + `$1',C,`(LCtangent(P,C,dotrad_+lthick/2,R)) chop m4dr chop -m4dr', + `P+vec_(dimen_/2,0) chop m4dr chop 0')', + `$1',U, + `{C: T+vec_(m4TL*2,m4pm`'(dimen_/6)) + line from C to C-vec_(2*m4TL,0)} + {O: T+vec_(m4TL*2,m4pm`'(-dimen_/6)) + line from O to O-vec_(2*m4TL,0)} + A: line from P to ifinstr( + `$1',O,`O-vec_(2*m4TL-dimen_/27,0) chop m4dr chop -m4dr', + `$1',C,`C-vec_(2*m4TL-dimen_/27,0) chop m4dr chop -m4dr', + `P+vec_(dimen_/2,0) chop m4dr chop 0')', + `$1',T, + `{CC: T+vec_(0,m4pm`'(dimen_/8+m4TL*2/3)) + C: line from CC+vec_(0,-m4TL) to CC+vec_(0,m4TL) } + {OO: T-vec_(0,m4pm`'(dimen_/8+m4TL*2/3)) + O: line from OO+vec_(0,-m4TL) to OO+vec_(0,m4TL) } + A: line from P to ifinstr( + `$1',O,`1/6 between O.end and O.start chop m4dr chop -m4dr', + `$1',C,`1/6 between C.start and C.end chop m4dr chop -m4dr', + `P+vec_(dimen_/2,0) chop m4dr chop 0')', + `{AC: arrow m4c_l <- ht dimen_/6 wid dimen_/6 \ + from T+vec_(0,m4pm`'dimen_/8) to T+vec_(0,m4pm`'dimen_*3/8) \ + then to T+vec_(dimen_/5,m4pm`'dimen_*3/8) + C: Here} + {AO: arrow m4c_l <- ht dimen_/6 wid dimen_/6 \ + from T-vec_(0,m4pm`'dimen_/8) to T+vec_(0,-(m4pm`'dimen_*3/8)) \ + then to T+vec_(dimen_/5,-(m4pm`'dimen_*3/8)) + O: Here} + A: line from P to ifinstr( + `$1',O,`AO.start chop m4dr chop -m4dr', + `$1',C,`AC.start chop m4dr chop -m4dr', + `P+vec_(dimen_/2,0) chop m4dr chop 0')') ', # end of P + `A: line from P to P+vec_(dimen_/2,0) chop m4dr chop 0 + define(`m4CO', + `ifinstr(`$1',C,`ifinstr(`$1',O,O)C',`ifinstr(`$1',O,O,OC)')')dnl + ifinstr(m4CO,C, + `move to T + ifinstr( + `$1',I, + `{ C: dot(at rvec_(0,m4pm`'(m4dr+lthick/2)),m4dr,1) } + ifinstr(m4CO,O,,`O: Here')', + `$1',U, + `{C: T+vec_(m4TL*2,m4pm`'(dimen_/6)) + line from C to C-vec_(2*m4TL,0)} + ifinstr(m4CO,O,,`O: Here')', + `$1',T, + `CC: rvec_(0,m4pm`'(m4TL*2/3)) + { C: line from CC+vec_(0,-m4TL) to CC+(0,m4TL) } + ifinstr(m4CO,O,,`O: T') ', + `{AC: arrow m4c_l <- ht dimen_/6 wid dimen_/6 \ + to rvec_(0,m4pm`'dimen_/4) \ + then to rvec_(dimen_/5,m4pm`'dimen_/4) + C: Here } + O:rvec_(dimen_/5,0)') ') + ifinstr(m4CO,O, + `move to T+vec_(0,-(m4pm`'dimen_/8)) + ifinstr( + `$1',I, + `{O: dot(at rvec_(0,m4pm`'(-m4dr*2)),m4dr,1) } + ifinstr(m4CO,C,,`C: T ')', + `$1',U, + `{O: T+vec_(m4TL*2,m4pm`'(-dimen_/6)) + line from O to O-vec_(2*m4TL,0)} + ifinstr(m4CO,C,,`C: T ')', + `$1',T, + `{ OO: (rvec_(0,m4pm`'(-m4TL*2/3))) + O: line from OO+vec_(0,-m4TL) to OO+vec_(0,m4TL)} + ifinstr(m4CO,C,,`C: T ')', + `{AO: arrow m4c_l <- ht dimen_/6 wid dimen_/6 \ + to rvec_(0,-(m4pm`'dimen_/4)) \ + then to rvec_(dimen_/5,-(m4pm`'dimen_/4)) + O: Here } + ifinstr(m4CO,C,,`C: T+vec_(dimen_/5,0)') ') ') + ') + `$3'] ') + + + `relaycoil( chars, wid, ht, U|D|L|R|degrees ) + chars: + X or default: external lines from A2 and B2 + AX external lines at positions A1,A3 + BX external lines at positions B1,B3 + NX no lines at positions A1,A2,A3,B1,B2,B3 + SO slow operating + SOR slow operating and release + SR slow release + HS hight speed + HS hight speed + NAC unaffected by AC current + AC AC current + ML mechanically latched + PO polarized + RM remanent + RH remanent + TH thermal + EL electronic' +define(`relaycoil',`[ ifelse(`$4',,,`setdir_(`$4')') + define(`m4wd',ifelse(`$2',,`dimen_/4',`($2)'))dnl + define(`m4ht',ifelse(`$3',,`dimen_/2',`($3)'))dnl + define(`m4LL',`ifinstr(`$4',NX,0,dimen_/3)')dnl + define(`rcdna_',ifinstr(`$1',AX,,`$1',BX,,`$1',X,,X)`$1')dnl + { lbox( m4wd, m4ht ) } + { A1: rvec_(0,m4ht/4) + A2: Here; V1: A2 + A3: rvec_(0,-m4ht/4) } + { B1: rvec_(m4wd,m4ht/4) + B2: rvec_(m4wd,0); V2: B2 + B3: rvec_(m4wd,-m4ht/4) } + sc_draw(`rcdna_',AX, + `{ line from A1 to A1+vec_(-dimen_/3,0); V1: Here + line from A3 to A3+vec_(-dimen_/3,0); V2: Here }') + sc_draw(`rcdna_',BX, + `{ line from B1 to B1+vec_( dimen_/3,0); V1: Here + line from B3 to B3+vec_( dimen_/3,0); V2: Here }') + sc_draw(`rcdna_',NX) + sc_draw(`rcdna_',X, + `{ line to rvec_(-dimen_/3,0); V1: Here + move to B2; line to rvec_(dimen_/3,0); V2: Here }') + sc_draw(`rcdna_',SOR, + `{ move to rvec_(0,-(m4ht*5/8)); {lbox(m4wd,m4ht/4)} + {line from rvec_(0,-m4ht/8) to rvec_(m4wd, m4ht/8)} + {line from rvec_(0, m4ht/8) to rvec_(m4wd,-m4ht/8)} + {move to rvec_(0,-(m4ht)*3/8); m4fshade(0,lbox(m4wd,m4ht/4))} + {move to rvec_(0,-(m4ht)/8) + {line to rvec_(0,-m4ht/8)} + {line from rvec_(m4wd,0) to rvec_(m4wd,-m4ht/8)}} }') + sc_draw(`rcdna_',SO, + `{ move to rvec_(0,-(m4ht*5/8)); m4fshade(0,lbox(m4wd,m4ht/4)) }') + sc_draw(`rcdna_',SR, + `{ move to rvec_(0,-(m4ht*5/8)); {lbox(m4wd,m4ht/4)} + {line from rvec_(0,-m4ht/8) to rvec_(m4wd, m4ht/8)} + {line from rvec_(0, m4ht/8) to rvec_(m4wd,-m4ht/8)} }') + sc_draw(`rcdna_',HS, + `{ move to rvec_(0,-(m4ht*5/8)); lbox(m4wd,m4ht/4) } + { move to rvec_(m4wd/2,-(m4ht/2)); line to rvec_(0,-m4ht/4)} ') + sc_draw(`rcdna_',NAC, + `{ m4fshade(0,lbox(m4wd/4,m4ht)) } + { move to rvec_(m4wd*3/4,0); m4fshade(0,lbox(m4wd/4,m4ht)) } ') + sc_draw(`rcdna_',AC, + `{ move to rvec_(0,-(m4ht*3/4)); { lbox(m4wd,m4ht/2) } + move to rvec_(m4wd/2,0) + ifgpic( + `arc rad m4wd/3 cw from Here-(m4wd*2/3,0) \ + to Here with .c at Here-(m4wd/3,0) + arc rad m4wd/3 ccw from Here to Here+(m4wd*2/3,0) with .c \ + at Here+(m4wd/3,0)', + ` sinusoid(m4wd/3,twopi_/(m4wd*2/3),pi_/2,-m4wd/3,m4wd/3) \ + with .Origin at Here ') }') + sc_draw(`rcdna_',ML, + `{ move to rvec_(0,-(m4ht*11/16)); { lbox(m4wd,m4ht*3/8) } + line from rvec_(0,m4ht*3/16) to rvec_(m4wd/2,-m4ht*3/16) \ + then to rvec_(m4wd,m4ht*3/16) } ') + sc_draw(`rcdna_',PO, + `{ move to rvec_(0,-(m4ht*5/8)); { lbox(m4wd,m4ht/4) } + m4fshade(0, line to rvec_(0,m4ht/8) \ + then to rvec_(m4wd,m4ht/8) \ + then to rvec_(m4wd,-m4ht/8) \ + then to rvec_(m4wd*3/4,-m4ht/8) \ + then to rvec_(m4wd*3/4,0) \ + then to rvec_(m4wd/4,0) \ + then to rvec_(m4wd/4,-m4ht/8) \ + then to rvec_(0,-m4ht/8) \ + then to Here) } ') + sc_draw(`rcdna_',RM, + `{ move to rvec_(0,-(m4ht*5/8)); { lbox(m4wd,m4ht/4) } + line from rvec_(0,m4ht/8) to rvec_(m4wd,-m4ht/8) }') + sc_draw(`rcdna_',RH, + `{ move to rvec_(0,-(m4ht*11/16)); { lbox(m4wd,m4ht*3/8) } + line from rvec_(m4wd/4,m4ht/8) \ + to rvec_(m4wd/4,m4ht/32) \ + to rvec_(m4wd*3/4,-m4ht/32) \ + to rvec_(m4wd*3/4,-m4ht/8) }') + sc_draw(`rcdna_',TH, + `{ line to rvec_(m4wd/4,0) then to rvec_(m4wd/4,m4ht/4) \ + then to rvec_(m4wd*3/4,m4ht/4) \ + then to rvec_(m4wd*3/4,0) \ + then to rvec_(m4wd,0) }') + sc_draw(`rcdna_',EL, + `{ { line from rvec_(m4wd/4,0) to rvec_(m4wd*3/4,0) } + { line from rvec_(m4wd*3/8,0) to rvec_(m4wd*3/16,m4ht*3/16) } + { line from rvec_(m4wd*5/8,0) to rvec_(m4wd*13/16,m4ht*3/16) } + { line from rvec_(m4wd/2,0) to rvec_(m4wd/2,-m4ht/4) } }') + `$5'] ') `reed(linespec,wid,ht,box attributes,[R][C]) Enclosed two-terminal reed contact; @@ -2523,35 +2795,6 @@ define(`reed',`eleminit_(`$1') {[box invis ht_ m4ht wid_ m4wd] at rvec_(rp_len/2,0)} line to rvec_(rp_len,0) invis ') - `contact(chars [,R]) Relay contact switch - Arg 2 deprecated, kept for compatibility - chars: - P|O|C= three position, normally open, - normally closed - R= right orientation (default left) - I= open circles for contacts' -define(`contact',`[define(`m4n',`ifelse(ifinstr(`$1',R,R,`$2',R,R),R,-,0+)')dnl - define(`m4dr',`dotrad_')dnl - P: dot(,m4dr,1); line to rvec_(dimen_/2,0) chop m4dr chop 0 - T: P+vec_(dimen_/2-dimen_/12,0) - O: circle invis rad dotrad_ at T+vec_(dimen_/5,-(m4n dotrad_)) - C: circle invis rad dotrad_ at T+vec_(dimen_/5,m4n dotrad_) - ifinstr(`$1',O,,`move to T ifinstr(`$1',P,`+vec_(0,m4n`'dimen_/8)') - ifinstr(`$1',I, - `C: dot(at rvec_(0,m4n`'(m4dr`'ifinstr(`$1',P,*2)+lthick/2)),m4dr,1)', - `arrow m4c_l <- ht dimen_/6 wid dimen_/6 \ - to rvec_(0,m4n`'dimen_/4) \ - then to rvec_(dimen_/5,m4n`'dimen_/4) - C: Here')') - ifinstr(`$1',C,,`move to T+vec_(0,-(m4n`'dimen_/8)) - ifinstr(`$1',I, - `O: dot(at rvec_(0,m4n`'(-m4dr*2)),m4dr,1)', - `arrow m4c_l <- ht dimen_/6 wid dimen_/6 \ - to rvec_(0,-(m4n`'dimen_/4)) \ - then to rvec_(dimen_/5,-(m4n`'dimen_/4)) - O: Here')'); `$3'] ') - - `ccoax(at location,M|F,diameter)' define(`ccoax',`[define(`m4cd',ifelse(`$3',,`dimen_*0.4',`$3'))dnl S: circle diam m4cd diff --git a/graphics/circuit_macros/libgen.m4 b/graphics/circuit_macros/libgen.m4 index f65fc2f74f..29a7e0811e 100644 --- a/graphics/circuit_macros/libgen.m4 +++ b/graphics/circuit_macros/libgen.m4 @@ -2,12 +2,12 @@ divert(-1) libgen.m4 Base macros for dpic and gpic diagrams -* Circuit_macros Version 9.1, copyright (c) 2019 J. D. Aplevich under * -* the LaTeX Project Public License. The files of this distribution may * -* be redistributed or modified provided that this copyright notice is * -* included and provided that modifications are clearly marked to * -* distinguish them from this distribution. There is no warranty * -* whatsoever for these files. * +* Circuit_macros Version 9.2, copyright (c) 2020 J. D. Aplevich under * +* the LaTeX Project Public Licence in file Licence.txt. The files of * +* this distribution may be redistributed or modified provided that this * +* copyright notice is included and provided that modifications are clearly * +* marked to distinguish them from this distribution. There is no warranty * +* whatsoever for these files. * ========================================================================== @@ -181,7 +181,7 @@ define(`SIdefaults', define(`latexcommand',`command "ifmpost(verbatimtex) `$1' ifmpost(etex)"') define(`m4announceprocessor',`dnl Do not change the format of the next line: -`#' `$1' Version 9.1: ifelse(m4picprocessor,gpic,`Gpic', +`#' `$1' Version 9.2: ifelse(m4picprocessor,gpic,`Gpic', m4postprocessor,pstricks,`PSTricks', m4postprocessor,pgf,`TikZ PGF', m4postprocessor,mfpic,`Mfpic', @@ -981,6 +981,7 @@ define(`ellipsearc',`[ C: (0,0) fitcurve(P,n,`$7') ]') Small space for string justification +#efine(`sp_',`ifgpic(`\hbox{$\:$}')iflatex(`\hbox{$\;$}')') define(`sp_',`ifgpic(`\hbox{$\:$}')') `Select arg 1 if it begins with " or sprintf, diff --git a/graphics/circuit_macros/liblog.m4 b/graphics/circuit_macros/liblog.m4 index 0e8d4a5022..495ab2ad2b 100644 --- a/graphics/circuit_macros/liblog.m4 +++ b/graphics/circuit_macros/liblog.m4 @@ -1,12 +1,12 @@ divert(-1) liblog.m4 Logic gates -* Circuit_macros Version 9.1, copyright (c) 2019 J. D. Aplevich under * -* the LaTeX Project Public License. The files of this distribution may * -* be redistributed or modified provided that this copyright notice is * -* included and provided that modifications are clearly marked to * -* distinguish them from this distribution. There is no warranty * -* whatsoever for these files. * +* Circuit_macros Version 9.2, copyright (c) 2020 J. D. Aplevich under * +* the LaTeX Project Public Licence in file Licence.txt. The files of * +* this distribution may be redistributed or modified provided that this * +* copyright notice is included and provided that modifications are clearly * +* marked to distinguish them from this distribution. There is no warranty * +* whatsoever for these files. * define(`liblog_') @@ -29,7 +29,7 @@ ifdef(`libcct_',,`include(libcct.m4)divert(-1)') inserted into a macro will display the macro name and current arguments =========================================================================' - `Size parameter for logic and grid mesh' + `Nonzero parameter for logic size and grid mesh' define(`L_unit',`(linewid/10)') `Dimensions in L_units, also for external use:' @@ -993,26 +993,29 @@ ifdef(`m4LI', ############################ - `FlipFlop( D|T|RS|JK, label, boxspec )' + `FlipFlop( D|T|RS|JK, label, boxspec, pinlength )' define(`FlipFlop',`ifelse( `$1',D, `FlipFlopX(`$3',`$2', - : D:PinD;E:CK:PinCK, , :Q:PinQ;:lg_bartxt(Q):PinNQ,, `$4')', + : D:PinD;E:CK:PinCK, , :Q:PinQ;:lg_bartxt(Q):PinNQ,,`$4',`$5')', `$1',T, `FlipFlopX(`$3',`$2', - : T:PinT;E:CK:PinCK, , :Q:PinQ;:lg_bartxt(Q):PinNQ,, `$4')', + : T:PinT;E:CK:PinCK, , :Q:PinQ;:lg_bartxt(Q):PinNQ,,`$4',`$5')', `$1',RS, `FlipFlopX(`$3',`$2', - : R:PinR;: S:PinS, , :Q:PinQ;:lg_bartxt(Q):PinNQ,, `$4')', + : R:PinR;: S:PinS, , :Q:PinQ;:lg_bartxt(Q):PinNQ,,`$4',`$5')', `$1',SR, `FlipFlopX(`$3',`$2', - : S:PinS;: R:PinR, , :Q:PinQ;:lg_bartxt(Q):PinNQ,, `$4')', + : S:PinS;: R:PinR, , :Q:PinQ;:lg_bartxt(Q):PinNQ,,`$4',`$5')', `$1',JK, `FlipFlopX(`$3',`$2', : J:PinJ;NE:CK:PinCK;: K:PinK, N:CLR:PinCLR, - :Q:PinQ;:lg_bartxt(Q):PinNQ, N:PR:PinPR, `$4')', -`FlipFlopX(`$3',`$2', ::Pin;, , :Q:PinQ;:lg_bartxt(Q):PinNQ, ,`$4')')') + :Q:PinQ;:lg_bartxt(Q):PinNQ, N:PR:PinPR,`$4',`$5')', +`FlipFlopX(`$3',`$2', ::Pin;, , :Q:PinQ;:lg_bartxt(Q):PinNQ,,`$4',`$5')')') `FlipFlopX( boxspec, center label, - leftpins, toppins, rightpins, bottompins) - General flipflop. Each of args 3 to 6 is null or - a string of pinspecs separated by semicolons (;). - Pinspecs are either empty (null) or of the form + leftpins, toppins, rightpins, bottompins, + pinlength) + General flipflop. Arg1 modifies the + box (labelled Chip) default specification. + Each of args 3 to 6 is null or a string of + pinspecs separated by semicolons (;). + A pinspec is either empty (null) or of the form [pinopts]:[label[:Picname]]. The first colon (:) draws the pin. Pins are placed top to bottom or left to right along the box edges with null @@ -1022,16 +1025,18 @@ define(`FlipFlop',`ifelse( :Picname is present in a pinspec then Picname replaces the default name. A pinspec label is text placed at the pin base. Semicolons are not - allowed in labels; use eg \char59{} instead, - and to put a bar over a label, use - lg_bartxt(label). The pinopts are [L|M|I|O][N][E] - L=active low out; M=active low in; - I=inward arrow; O=outward arrow; - N=pin with not circle; E=edge trigger' + allowed in labels; use eg \char59{} instead. + To put a bar over a label, use lg_bartxt(label). + The pinopts are [L|M|I|O][N][E] + L=active low out; M=active low in; + I=inward arrow; O=outward arrow; + N=pin with not circle; E=edge trigger + Optional arg7 is the length of pins' define(`FlipFlopX',`[ - Chip: box ifelse(`$1',,`wid_ FF_wid*L_unit ht_ FF_ht*L_unit',`$1') + Chip: box wid_ FF_wid*L_unit ht_ FF_ht*L_unit `$1' dnl Center label ifelse(`$2',,,"ifsvg(`svg_small($2,75)',`\scriptsize $2')" at Chip.c) + ifelse(`$7',,,`pushdef(`lg_plen',(`$7')/L_unit)')dnl ifelse(`$3',,, `m4_ffside(`(m4x-0.5)/m4_pc between Chip.nw_ and Chip.sw_',`$3',W,w)') ifelse(`$4',,, @@ -1040,7 +1045,8 @@ dnl Center label `m4_ffside(`(m4x-0.5)/m4_pc between Chip.ne_ and Chip.se_',`$5',E,e)') ifelse(`$6',,, `m4_ffside(`(m4x-0.5)/m4_pc between Chip.sw_ and Chip.se_',`$6',S,s)') - `$7' ]') + ifelse(`$7',,,`popdef(`lg_plen')')dnl + `$8' ]') dnl `Stack, count, and draw the pins on the given side' define(`m4_ffside', `stacksplit_(`m4pr',`$2',;)define(`m4_pc',0)dnl diff --git a/graphics/circuit_macros/mfpic.m4 b/graphics/circuit_macros/mfpic.m4 index c513899628..2b38512d43 100644 --- a/graphics/circuit_macros/mfpic.m4 +++ b/graphics/circuit_macros/mfpic.m4 @@ -1,12 +1,12 @@ divert(-1) mfpic.m4 Initialization for mfpic. -* Circuit_macros Version 9.1, copyright (c) 2019 J. D. Aplevich under * -* the LaTeX Project Public License. The files of this distribution may * -* be redistributed or modified provided that this copyright notice is * -* included and provided that modifications are clearly marked to * -* distinguish them from this distribution. There is no warranty * -* whatsoever for these files. * +* Circuit_macros Version 9.2, copyright (c) 2020 J. D. Aplevich under * +* the LaTeX Project Public Licence in file Licence.txt. The files of * +* this distribution may be redistributed or modified provided that this * +* copyright notice is included and provided that modifications are clearly * +* marked to distinguish them from this distribution. There is no warranty * +* whatsoever for these files. * define(`m4picprocessor',dpic) define(`m4postprocessor',mfpic) diff --git a/graphics/circuit_macros/mpost.m4 b/graphics/circuit_macros/mpost.m4 index 1377038ea7..b2ce311049 100644 --- a/graphics/circuit_macros/mpost.m4 +++ b/graphics/circuit_macros/mpost.m4 @@ -1,12 +1,12 @@ divert(-1) mpost.m4 Initialization for metapost. -* Circuit_macros Version 9.1, copyright (c) 2019 J. D. Aplevich under * -* the LaTeX Project Public License. The files of this distribution may * -* be redistributed or modified provided that this copyright notice is * -* included and provided that modifications are clearly marked to * -* distinguish them from this distribution. There is no warranty * -* whatsoever for these files. * +* Circuit_macros Version 9.2, copyright (c) 2020 J. D. Aplevich under * +* the LaTeX Project Public Licence in file Licence.txt. The files of * +* this distribution may be redistributed or modified provided that this * +* copyright notice is included and provided that modifications are clearly * +* marked to distinguish them from this distribution. There is no warranty * +* whatsoever for these files. * define(`m4picprocessor',dpic) define(`m4postprocessor',mpost) diff --git a/graphics/circuit_macros/pgf.m4 b/graphics/circuit_macros/pgf.m4 index 0d3d83db0f..9117f8f537 100644 --- a/graphics/circuit_macros/pgf.m4 +++ b/graphics/circuit_macros/pgf.m4 @@ -1,12 +1,12 @@ divert(-1) pgf.m4 Initialization for Tikz-pgf. -* Circuit_macros Version 9.1, copyright (c) 2019 J. D. Aplevich under * -* the LaTeX Project Public License. The files of this distribution may * -* be redistributed or modified provided that this copyright notice is * -* included and provided that modifications are clearly marked to * -* distinguish them from this distribution. There is no warranty * -* whatsoever for these files. * +* Circuit_macros Version 9.2, copyright (c) 2020 J. D. Aplevich under * +* the LaTeX Project Public Licence in file Licence.txt. The files of * +* this distribution may be redistributed or modified provided that this * +* copyright notice is included and provided that modifications are clearly * +* marked to distinguish them from this distribution. There is no warranty * +* whatsoever for these files. * define(`m4picprocessor',dpic) define(`m4postprocessor',pgf) diff --git a/graphics/circuit_macros/postscript.m4 b/graphics/circuit_macros/postscript.m4 index 912170bb9a..a59d78e177 100644 --- a/graphics/circuit_macros/postscript.m4 +++ b/graphics/circuit_macros/postscript.m4 @@ -1,12 +1,12 @@ divert(-1) postscript.m4 Initialization for Postscript output. -* Circuit_macros Version 9.1, copyright (c) 2019 J. D. Aplevich under * -* the LaTeX Project Public License. The files of this distribution may * -* be redistributed or modified provided that this copyright notice is * -* included and provided that modifications are clearly marked to * -* distinguish them from this distribution. There is no warranty * -* whatsoever for these files. * +* Circuit_macros Version 9.2, copyright (c) 2020 J. D. Aplevich under * +* the LaTeX Project Public Licence in file Licence.txt. The files of * +* this distribution may be redistributed or modified provided that this * +* copyright notice is included and provided that modifications are clearly * +* marked to distinguish them from this distribution. There is no warranty * +* whatsoever for these files. * define(`m4picprocessor',dpic) define(`m4postprocessor',postscript) diff --git a/graphics/circuit_macros/psfrag.m4 b/graphics/circuit_macros/psfrag.m4 index c1e6dace50..999723386d 100644 --- a/graphics/circuit_macros/psfrag.m4 +++ b/graphics/circuit_macros/psfrag.m4 @@ -2,12 +2,12 @@ divert(-1) psfrag.m4 Initialization for dpic -f processing: Postscript with psfrag strings -* Circuit_macros Version 9.1, copyright (c) 2019 J. D. Aplevich under * -* the LaTeX Project Public License. The files of this distribution may * -* be redistributed or modified provided that this copyright notice is * -* included and provided that modifications are clearly marked to * -* distinguish them from this distribution. There is no warranty * -* whatsoever for these files. * +* Circuit_macros Version 9.2, copyright (c) 2020 J. D. Aplevich under * +* the LaTeX Project Public Licence in file Licence.txt. The files of * +* this distribution may be redistributed or modified provided that this * +* copyright notice is included and provided that modifications are clearly * +* marked to distinguish them from this distribution. There is no warranty * +* whatsoever for these files. * define(`psfrag_') ifelse(m4postprocessor,postscript,,`include(postscript.m4)divert(-1)') diff --git a/graphics/circuit_macros/pstricks.m4 b/graphics/circuit_macros/pstricks.m4 index d2fdebcbe0..8d20667140 100644 --- a/graphics/circuit_macros/pstricks.m4 +++ b/graphics/circuit_macros/pstricks.m4 @@ -1,12 +1,12 @@ divert(-1) pstricks.m4 Initialization for PSTricks. -* Circuit_macros Version 9.1, copyright (c) 2019 J. D. Aplevich under * -* the LaTeX Project Public License. The files of this distribution may * -* be redistributed or modified provided that this copyright notice is * -* included and provided that modifications are clearly marked to * -* distinguish them from this distribution. There is no warranty * -* whatsoever for these files. * +* Circuit_macros Version 9.2, copyright (c) 2020 J. D. Aplevich under * +* the LaTeX Project Public Licence in file Licence.txt. The files of * +* this distribution may be redistributed or modified provided that this * +* copyright notice is included and provided that modifications are clearly * +* marked to distinguish them from this distribution. There is no warranty * +* whatsoever for these files. * define(`m4picprocessor',dpic) define(`m4postprocessor',pstricks) diff --git a/graphics/circuit_macros/svg.m4 b/graphics/circuit_macros/svg.m4 index cd04defbf6..e270060393 100644 --- a/graphics/circuit_macros/svg.m4 +++ b/graphics/circuit_macros/svg.m4 @@ -1,12 +1,12 @@ divert(-1) svg.m4 Initialization for SVG output. -* Circuit_macros Version 9.1, copyright (c) 2019 J. D. Aplevich under * -* the LaTeX Project Public License. The files of this distribution may * -* be redistributed or modified provided that this copyright notice is * -* included and provided that modifications are clearly marked to * -* distinguish them from this distribution. There is no warranty * -* whatsoever for these files. * +* Circuit_macros Version 9.2, copyright (c) 2020 J. D. Aplevich under * +* the LaTeX Project Public Licence in file Licence.txt. The files of * +* this distribution may be redistributed or modified provided that this * +* copyright notice is included and provided that modifications are clearly * +* marked to distinguish them from this distribution. There is no warranty * +* whatsoever for these files. * define(`m4picprocessor',dpic) define(`m4postprocessor',svg) @@ -155,6 +155,38 @@ define(`svgLinkString',`"<a xlink:href=\"`$1'\"dnl stroke=\"rgb(0,0,255)\">dnl `$2' dnl </a>"') + +# svgrot_init(filename) +# filename is the basename of the output +# produced by dpic -v filename.pic > filename.svg +define(`svgrot_init',`NeedDpicTools + define(`_file_',ifelse(`$1',,patsubst(__file__,.m4),`$1')) + syscmd(touch _file_.svg _file_.cor; cp _file_.svg _file_.tmp) + sh "grep \"^ x=.*\/text>\" _file_.tmp | sed -e dnl + \"s/x=\\"\([0-9.]*\)\\" y=\\"\([0-9.]*\)\\".*/\1 \2/\" > _file_.cor" + svgrot_k = 0; svg_rotz = 0 + define svg_rotcoords { svgrot_k += 1 + if "$`'1" != "" then { x[svgrot_k] = $`'1; y[svgrot_k] = $`'2; svg_rotz = 1 } + } + copythru(svg_rotcoords, _file_.cor) + sh "rm -f _file_.tmp _file_.cor" + svg_rotk = 0 + + ifdef(`svg_rot_',,` +# `svg_rot(deg clockwise rotation,text or object) +# Requires svgrot_init(filename) +# Rotation of svg text is a can of worms because +# the final coordinates of the text are required; +# this forward reference has to be extracted from +# the output file and the source processed twice.' + define svg_rot { if svg_rotz then { svg_rotk += 1; command \ + sprintf("<g transform=\"rotate(%g %g %g)\">",$`'1,x[svg_rotk],y[svg_rotk]) }\ + else { command sprintf("<g transform=\"rotate(%g)\">",$`'1) } +$`'2 + command "</g>" } + define(`svg_rot_') ') + ') + # ---------------------------------------------------------------------------# define(`thinlines_',`linethick = 0.4 diff --git a/graphics/circuit_macros/xfig.m4 b/graphics/circuit_macros/xfig.m4 index f8757b5e18..5cc6df1728 100644 --- a/graphics/circuit_macros/xfig.m4 +++ b/graphics/circuit_macros/xfig.m4 @@ -1,12 +1,12 @@ divert(-1) xfig.m4 Initialization for xfig. -* Circuit_macros Version 9.1, copyright (c) 2019 J. D. Aplevich under * -* the LaTeX Project Public License. The files of this distribution may * -* be redistributed or modified provided that this copyright notice is * -* included and provided that modifications are clearly marked to * -* distinguish them from this distribution. There is no warranty * -* whatsoever for these files. * +* Circuit_macros Version 9.2, copyright (c) 2020 J. D. Aplevich under * +* the LaTeX Project Public Licence in file Licence.txt. The files of * +* this distribution may be redistributed or modified provided that this * +* copyright notice is included and provided that modifications are clearly * +* marked to distinguish them from this distribution. There is no warranty * +* whatsoever for these files. * define(`m4picprocessor',dpic) define(`m4postprocessor',xfig) diff --git a/macros/latex/contrib/ghsystem/README b/macros/latex/contrib/ghsystem/README index 6117fa22c4..d1dcf7617b 100644 --- a/macros/latex/contrib/ghsystem/README +++ b/macros/latex/contrib/ghsystem/README @@ -1,5 +1,5 @@ -------------------------------------------------------------------------- -the GHSYSTEM package v4.8b 2020/01/16 +the GHSYSTEM package v4.8c 2020/02/17 globally harmonized system @@ -34,7 +34,7 @@ language-definition files: - ghsystem_italian.def - ghsystem_langtemplate.def documentation and README: - - ghsystem_en.tex, ghsystem_en.pdf, + - ghsystem-manual.tex, ghsystem-manual.cls, ghsystem-manual.pdf, - README -------------------------------------------------------------------------- If you have any ideas, questions, suggestions or bugs to report, please diff --git a/macros/latex/contrib/ghsystem/ghsystem-manual.cls b/macros/latex/contrib/ghsystem/ghsystem-manual.cls new file mode 100644 index 0000000000..1a47c50a13 --- /dev/null +++ b/macros/latex/contrib/ghsystem/ghsystem-manual.cls @@ -0,0 +1,272 @@ +% -------------------------------------------------------------------------- +% the GHSYSTEM package +% +% globally harmonised system +% +% -------------------------------------------------------------------------- +% Clemens Niederberger +% -------------------------------------------------------------------------- +% https://github.org/cgnieder/ghsystem/ +% contact@mychemistry.eu +% -------------------------------------------------------------------------- +% If you have any ideas, questions, suggestions or bugs to report, please +% feel free to contact me. +% -------------------------------------------------------------------------- +% Copyright 2011--2020 Clemens Niederberger +% +% 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 Clemens Niederberger. +% -------------------------------------------------------------------------- +\ProvidesClass{ghsystem-manual}[2020/02/17] + +\LoadClass[load-preamble,add-index]{cnltx-doc} +\RequirePackage{imakeidx} +\RequirePackage[utf8]{inputenc} + +\RequirePackage{ghsystem,chemmacros} + +\setcnltx{ + package = {ghsystem}, + info = \acl*{ghs} , + url = https://github.com/cgnieder/ghsystem/ , + authors = Clemens Niederberger , + email = contact@mychemistry.eu , + abstract = {% + \centering + \includegraphics{chemmacros-logo.pdf} + \par + } , + add-cmds = { + chemsetup, + ghs, ghslistall, ghspic, ghssetup + } , + index-setup = { noclearpage , level = \addsec } +} + +\RequirePackage{booktabs} + +\def\libertine@figurestyle{LF} +\RequirePackage{amsmath} +\undef\lvert \undef\lVert +\undef\rvert \undef\rVert +\RequirePackage[libertine]{newtxmath} +\def\libertine@figurestyle{OsF} + +\RequirePackage[biblatex]{embrac} +\ChangeEmph{[}[,.02em]{]}[.055em,-.08em] +\ChangeEmph{(}[-.01em,.04em]{)}[.04em,-.05em] + +\RequirePackage[accsupp]{acro} +\acsetup{ + long-format = \scshape , + short-format = \scshape +} + +\chemsetup{ + greek = newtx , + formula = chemformula , + chemformula/format = \libertineLF +} + +\ghssetup{ + language = {german,english} +} + +\sisetup{ + detect-mode=false, + mode=text, + text-rm=\libertineLF +} + +\RequirePackage{fontawesome} +\RequirePackage{datetime2} +\DTMsetup{useregional=numeric,datesep=/} +\newrobustcmd*\ghsystem@add@version[2]{% + \csdef{ghsystem@ver@#2}{% + \DTMdate{#1}% + \csgdef{ghsystem@ver@#2used}{}% + \csdef{ghsystem@ver@#2}{\DTMdate{#1}}% + }% +} + +\newrobustcmd*\ghsystem@date[1]{% + \ifcsdef{ghsystem@ver@#1used}{}{ (\csuse{ghsystem@ver@#1})}} +\newrobustcmd*\ghsystem@ifnew[1]{\ifcsstring{c_ghsystem_version_tl}{#1}} +\newrobustcmd*\ghsystem@NEW{\faStarO\ New} + +\renewrobustcmd*\sinceversion[1]{% + \ghsystem@ifnew{#1}% + {\cnltx@version@note{\textcolor{red}{\ghsystem@NEW}}}% + {\cnltx@version@note{\GetTranslation{cnltx-introduced}~#1\ghsystem@date{#1}}}% +} +\renewrobustcmd*\changedversion[1]{% + \cnltx@version@note{\GetTranslation{cnltx-changed}~#1\ghsystem@date{#1}}% +} + +\newnote*\sincechanged[2]{% + \GetTranslation{cnltx-introduced}~#1\ghsystem@date{#1}, + changed with version~#2\ghsystem@date{#2}\ghsystem@ifnew{#2}{ \ghsystem@NEW}{}% +} + +\RenewDocumentEnvironment{commands}{} + {% + \cnltx@set@catcode_{12}% + \let\command\cnltx@command + \cnltxlist + } + {\endcnltxlist} + +\RequirePackage{tcolorbox,xsimverb} +\tcbuselibrary{skins,breakable} +\tcbset{enhanced,enhanced jigsaw} + +\newtcolorbox{bewareofthedog}{ + colback = white , + colframe = red , + underlay={% + \path[draw=none] + (interior.south west) + rectangle node[red]{\Huge\bfseries !} + ([xshift=-4mm]interior.north west); + }% +} + +\newtcolorbox{cnltxcode}[1][]{ + boxrule = 1pt , + colback = cnltxbg , + colframe = cnltx , + arc = 5pt , + beforeafter skip = .5\baselineskip ,% + #1% +} + +\newcommand*\ghsystem@readoptions[1]{% + \catcode`\^^M=13 + \ghsystem@read@options{#1}% +} + +\begingroup +\catcode`\^^M=13 +\gdef\ghsystem@read@options#1#2^^M{% + \endgroup + \ifblank{#2}{}{\ghsystem@read@options@#2}% + #1% + \XSIMfilewritestart*{\jobname.tmp}% +}% +\endgroup +\def\ghsystem@read@options@[#1]{\pgfqkeys{/cnltx}{#1}} + +\RenewDocumentEnvironment{sourcecode}{} + {% + \begingroup + \ghsystem@readoptions{% + \setlength\cnltx@sidebysidewidth + {\dimexpr .45\columnwidth -\lst@xleftmargin -\lst@xrightmargin\relax}% + \expanded{% + \noexpand\lstset{ + style=cnltx, + \ifboolexpe{ bool {cnltx@sidebyside} and not bool {cnltx@codeonly} } + {linewidth=\cnltx@sidebysidewidth,}{}% + \expandonce\cnltx@local@listings@options + }% + }% + \XSIMgobblechars{2}% + }% + } + {% + \XSIMfilewritestop + \cnltxcode[breakable]% + \lstinputlisting[style=cnltx]{\jobname.tmp}% + \endcnltxcode + } + +\RenewDocumentEnvironment{example}{} + {% + \begingroup + \ghsystem@readoptions{% + \setlength\cnltx@sidebysidewidth + {\dimexpr .45\columnwidth -\lst@xleftmargin -\lst@xrightmargin\relax}% + \expanded{% + \noexpand\lstset{ + style=cnltx, + \ifboolexpe{ bool {cnltx@sidebyside} and not bool {cnltx@codeonly} } + {linewidth=\cnltx@sidebysidewidth,}{}% + \expandonce\cnltx@local@listings@options + }% + }% + \XSIMgobblechars{2}% + }% + } + {% + \XSIMfilewritestop + \ifbool{cnltx@sidebyside} + {% + \cnltxcode + \noindent + \minipage[c]{\cnltx@sidebysidewidth}% + \cnltx@pre@source@hook + \lstinputlisting[style=cnltx] {\jobname.tmp}% + \cnltx@after@source@hook + \endminipage\hfill + \minipage[c]{\cnltx@sidebysidewidth}% + \cnltx@pre@example@hook + \input {\jobname.tmp}% + \cnltx@after@example@hook + \endminipage + } + {% + \cnltxcode[breakable]% + \cnltx@pre@source@hook + \lstinputlisting{\jobname.tmp}% + \cnltx@after@source@hook + \tcblower + \cnltx@pre@example@hook + \input {\jobname.tmp}% + \cnltx@after@example@hook + }% + \endcnltxcode + } + +\RequirePackage[ + backend=biber, + style=cnltx, + sortlocale=en_US, + indexing=cite]{biblatex} +\RequirePackage{csquotes,varioref} +\defbibheading{bibliography}{\section{References}} + +\RequirePackage[biblatex]{embrac}[2012/06/29] +\ChangeEmph{[}[,.02em]{]}[.055em,-.08em] +\ChangeEmph{(}[-.01em,.04em]{)}[.04em,-.05em] + +\ghsystem@add@version{2012-01-28}{3.0} +\ghsystem@add@version{2012/01/30}{3.0a} +\ghsystem@add@version{2012/02/05}{3.0c} +\ghsystem@add@version{2012/05/13}{3.3a} +\ghsystem@add@version{2012/05/18}{3.3b} +\ghsystem@add@version{2012/05/18}{3.3c} +\ghsystem@add@version{2012/07/24}{3.3d} +\ghsystem@add@version{2013/02/19}{3.5a} +\ghsystem@add@version{2013/07/06}{4.0} +\ghsystem@add@version{2013/12/13}{4.0a} +\ghsystem@add@version{2014/01/09}{4.2e} +\ghsystem@add@version{2014/04/08}{4.5} +\ghsystem@add@version{2014/04/13}{4.5a} +\ghsystem@add@version{2014/06/30}{4.5b} +\ghsystem@add@version{2014/08/08}{4.6} +\ghsystem@add@version{2016/01/15}{4.7} +\ghsystem@add@version{2016/07/16}{4.8} +\ghsystem@add@version{2019/09/30}{4.8a} +\ghsystem@add@version{2020/01/16}{4.8b} +\ghsystem@add@version{2020/02/17}{4.8c} + +\endinput diff --git a/macros/latex/contrib/ghsystem/ghsystem_en.pdf b/macros/latex/contrib/ghsystem/ghsystem-manual.pdf Binary files differindex dccf33b05d..c6d566d6c9 100644 --- a/macros/latex/contrib/ghsystem/ghsystem_en.pdf +++ b/macros/latex/contrib/ghsystem/ghsystem-manual.pdf diff --git a/macros/latex/contrib/ghsystem/ghsystem_en.tex b/macros/latex/contrib/ghsystem/ghsystem-manual.tex index 1267fb29e3..230deda95b 100644 --- a/macros/latex/contrib/ghsystem/ghsystem_en.tex +++ b/macros/latex/contrib/ghsystem/ghsystem-manual.tex @@ -30,43 +30,8 @@ % % The Current Maintainer of this work is Clemens Niederberger. % -------------------------------------------------------------------------- -\documentclass[load-preamble+]{cnltx-doc} -\usepackage[utf8]{inputenc} -% \usepackage[greek=newtx]{chemmacros} -\usepackage{ghsystem} -\setcnltx{ - package = {ghsystem}, - info = \acl*{ghs} , - url = https://github.com/cgnieder/ghsystem/ , - authors = Clemens Niederberger , - email = contact@mychemistry.eu , - abstract = {% - \centering - \includegraphics{chemmacros-logo.pdf} - \par - } , - add-cmds = { - chemsetup, - ghs, ghslistall, ghspic, ghssetup - } , - index-setup = noclearpage -} - -\usepackage{booktabs} - -\expandafter\def\csname libertine@figurestyle\endcsname{LF} -\usepackage[libertine]{newtxmath} -\expandafter\def\csname libertine@figurestyle\endcsname{OsF} +\documentclass{ghsystem-manual} -\usepackage[biblatex]{embrac} -\ChangeEmph{[}[,.02em]{]}[.055em,-.08em] -\ChangeEmph{(}[-.01em,.04em]{)}[.04em,-.05em] - -\usepackage[accsupp]{acro} -\acsetup{ - long-format = \scshape , - short-format = \scshape -} \DeclareAcronym{ghs}{ short = ghs , long = Globally Harmonized System of Classification and Labelling of @@ -99,27 +64,11 @@ accsupp = PDF } -\chemsetup{ - greek = newtx , - formula = chemformula , - chemformula/format = \libertineLF -} - -\ghssetup{ - language = {german,english} -} - -\sisetup{ - detect-mode=false, - mode=text, - text-rm=\libertineLF -} - -\usepackage{filecontents} \defbibheading{bibliography}{\addsec{References}} +\addbibresource{cnltx.bib} \addbibresource{\jobname.bib} -\begin{filecontents*}{\jobname.bib} +\begin{filecontents*}[overwrite]{\jobname.bib} @misc{eu:ghsystem_regulation, author = {{The European Parliament and The Council of the European Union}}, title = {Regulation (EC) No 1272/2008 of the European Parliament and of @@ -491,4 +440,6 @@ The code below shows how table~\ref{tab:ghs-hp-statements} was created: \ghslistall[fill-in,table-rules=booktabs] +\printbibliography + \end{document} diff --git a/macros/latex/contrib/ghsystem/ghsystem.sty b/macros/latex/contrib/ghsystem/ghsystem.sty index dfc4d1eacd..62f97b8282 100644 --- a/macros/latex/contrib/ghsystem/ghsystem.sty +++ b/macros/latex/contrib/ghsystem/ghsystem.sty @@ -29,8 +29,8 @@ \RequirePackage{ expl3, xparse, chemmacros } \ExplSyntaxOn -\tl_const:Nn \c_ghsystem_version_tl {4.8b} -\tl_const:Nn \c_ghsystem_date_tl {2020/01/16} +\tl_const:Nn \c_ghsystem_version_tl {4.8c} +\tl_const:Nn \c_ghsystem_date_tl {2020/02/17} \tl_const:Nn \c_ghsystem_info_tl {globally~ harmonised~ system} \ProvidesExplPackage @@ -525,7 +525,7 @@ \caption [ \l_ghsystem_table_caption_short_tl ] { \l_ghsystem_table_caption_tl - \exp_args:No \label { \l__ghsystem_table_label_tl } + \exp_args:NV \label \l__ghsystem_table_label_tl } \\ \l__ghsystem_table_top_head_rule_tl \textbf { \l_ghsystem_identifier_tl } & @@ -714,3 +714,4 @@ VERSION HISTORY 2019/09/30 - version 4.8a - add \l_ghsystem_table_next_page_tl to the template and the French translations 2020/01/16 - version 4.8b - adapt to renaming of case changing functions +2020/02/17 - version 4.8c - resolve bug with French and Lua- or XeLaTeX diff --git a/macros/latex/contrib/ghsystem/language/ghsystem_english.def b/macros/latex/contrib/ghsystem/language/ghsystem_english.def index 67b579371c..1d6e18d7d0 100644 --- a/macros/latex/contrib/ghsystem/language/ghsystem_english.def +++ b/macros/latex/contrib/ghsystem/language/ghsystem_english.def @@ -26,7 +26,7 @@ % - The Current Maintainer of this work is Clemens Niederberger. % -------------------------------------------------------------------------- % ENGLISH DEFINITIONS -\ghsystemlanguagefile{english}{2016/01/16} +\ghsystemlanguagefile {english} {2020/02/17} % table head and foot: \tl_set:Nn \l_ghsystem_identifier_tl { Identifier } @@ -61,7 +61,9 @@ % <or state all organs affected, if known> \cs_set:Npn \ghsystem_organs: { - \bool_if:nT { \l_ghsystem_fill_in_bool && !\l_ghsystem_organs_bool } + \bool_lazy_and:nnT + { \l_ghsystem_fill_in_bool } + { !\l_ghsystem_organs_bool } { \c_space_tl \ghsystem_filler:n { or~ state~ all~ organs~ affected,~ if~ known } diff --git a/macros/latex/contrib/ghsystem/language/ghsystem_french.def b/macros/latex/contrib/ghsystem/language/ghsystem_french.def index 417df28349..0901369fd3 100644 --- a/macros/latex/contrib/ghsystem/language/ghsystem_french.def +++ b/macros/latex/contrib/ghsystem/language/ghsystem_french.def @@ -29,7 +29,7 @@ % - Aurélien. Many thanks! % FRENCH DEFINITIONS -\ghsystemlanguagefile{french}{2019/09/30} +\ghsystemlanguagefile {french} {2020/02/17} % table head: \tl_set:Nn \l_ghsystem_identifier_tl { num\'ero } @@ -37,13 +37,20 @@ \tl_set:Nn \l_ghsystem_table_caption_tl { Toutes~ les~ phrases~ H,~ EUH~ et~ P } \tl_set:Nn \l_ghsystem_table_next_page_tl { suite~ sur~ la~ prochaine~ page } -\group_begin: -\char_set_catcode_active:N \^^@ -\char_set_lccode:nn { `^^@ } { `: } -\tex_lowercase:D - { - \group_end: - \tl_const:Nn \c_ghsystem_french_colon_tl { ^^@ } +% with pdflatex babel sets the colon active: +\bool_lazy_or:nnTF + { \sys_if_engine_luatex_p: } + { \sys_if_engine_xetex_p: } + { \tl_const:Nn \c_ghsystem_french_colon_tl { \c_colon_str } } + { + \group_begin: + \char_set_catcode_active:N \^^~ + \char_set_lccode:nn { `^^~ } { `: } + \tex_lowercase:D + { + \group_end: + \tl_const:Nn \c_ghsystem_french_colon_tl { ^^~ } + } } % fill-in functions: @@ -76,7 +83,9 @@ % <or state all organs affected, if known> \cs_set:Npn \ghsystem_organs: { - \bool_if:nT { \l_ghsystem_fill_in_bool && !\l_ghsystem_organs_bool } + \bool_lazy_and:nnT + { \l_ghsystem_fill_in_bool } + { !\l_ghsystem_organs_bool } { \c_space_tl \ghsystem_filler:n diff --git a/macros/latex/contrib/ghsystem/language/ghsystem_german.def b/macros/latex/contrib/ghsystem/language/ghsystem_german.def index f7f706996d..481830eab4 100644 --- a/macros/latex/contrib/ghsystem/language/ghsystem_german.def +++ b/macros/latex/contrib/ghsystem/language/ghsystem_german.def @@ -26,7 +26,7 @@ % - The Current Maintainer of this work is Clemens Niederberger. % -------------------------------------------------------------------------- % GERMAN DEFINITIONS -\ghsystemlanguagefile{german}{2016/01/16} +\ghsystemlanguagefile {german} {2016/01/16} % table head and foot: \tl_set:Nn \l_ghsystem_identifier_tl { Nummer } @@ -62,7 +62,9 @@ % <or state all organs affected, if known> \cs_set:Npn \ghsystem_organs: { - \bool_if:nT { \l_ghsystem_fill_in_bool && !\l_ghsystem_organs_bool } + \bool_lazy_and:nnT + { \l_ghsystem_fill_in_bool } + { !\l_ghsystem_organs_bool } { \c_space_tl \ghsystem_filler:n diff --git a/macros/latex/contrib/ghsystem/language/ghsystem_italian.def b/macros/latex/contrib/ghsystem/language/ghsystem_italian.def index 9d97ca043c..6e89094ff3 100644 --- a/macros/latex/contrib/ghsystem/language/ghsystem_italian.def +++ b/macros/latex/contrib/ghsystem/language/ghsystem_italian.def @@ -28,7 +28,7 @@ % - the Italian translation was kindly provided by Jonas Rivetti. Many thanks! % ITALIAN DEFINITIONS -\ghsystemlanguagefile{italian}{2016/01/16} +\ghsystemlanguagefile {italian} {2020/02/17} % table head and foot: \tl_set:Nn \l_ghsystem_identifier_tl { Numero } @@ -66,7 +66,9 @@ % <or state all organs affected, if known> \cs_set:Npn \ghsystem_organs: { - \bool_if:nT { \l_ghsystem_fill_in_bool && !\l_ghsystem_organs_bool } + \bool_lazy_and:nnT + { \l_ghsystem_fill_in_bool } + { !\l_ghsystem_organs_bool } { \c_space_tl \ghsystem_filler:n diff --git a/macros/latex/contrib/ghsystem/language/ghsystem_langtemplate.def b/macros/latex/contrib/ghsystem/language/ghsystem_langtemplate.def index 52a6a21011..75f19cae5c 100644 --- a/macros/latex/contrib/ghsystem/language/ghsystem_langtemplate.def +++ b/macros/latex/contrib/ghsystem/language/ghsystem_langtemplate.def @@ -70,7 +70,7 @@ % ----------------------------------------------------------------------------- % % <LANGUAGE> DEFINITIONS -\ghsystemlanguagefile{language}{date} +\ghsystemlanguagefile {language} {date} % table head: \tl_set:Nn \l_ghsystem_identifier_tl { ... } @@ -100,7 +100,9 @@ % <or state all organs affected, if known> \cs_set:Npn \ghsystem_organs: { - \bool_if:nT { \l_ghsystem_fill_in_bool && !\l_ghsystem_organs_bool } + \bool_lazy_and:nnT + { \l_ghsystem_fill_in_bool } + { !\l_ghsystem_organs_bool } { \c_space_tl \ghsystem_filler:n { ... } } diff --git a/macros/latex/contrib/ghsystem/language/ghsystem_spanish.def b/macros/latex/contrib/ghsystem/language/ghsystem_spanish.def index ecbf46fa17..5b6a203884 100644 --- a/macros/latex/contrib/ghsystem/language/ghsystem_spanish.def +++ b/macros/latex/contrib/ghsystem/language/ghsystem_spanish.def @@ -29,7 +29,7 @@ % - Galván. Many thanks! % SPANISH DEFINITIONS -\ghsystemlanguagefile{spanish}{2016/01/16} +\ghsystemlanguagefile {spanish} {2020/02/17} % table head: \tl_set:Nn \l_ghsystem_identifier_tl { Identificador } @@ -67,7 +67,9 @@ % <or state all organs affected, if known> \cs_set:Npn \ghsystem_organs: { - \bool_if:nT { \l_ghsystem_fill_in_bool && !\l_ghsystem_organs_bool } + \bool_lazy_and:nnT + { \l_ghsystem_fill_in_bool } + { !\l_ghsystem_organs_bool } { \c_space_tl \ghsystem_filler:n diff --git a/macros/latex/contrib/l3build/CHANGELOG.md b/macros/latex/contrib/l3build/CHANGELOG.md index 1c54b0044e..8b1ddb26ee 100644 --- a/macros/latex/contrib/l3build/CHANGELOG.md +++ b/macros/latex/contrib/l3build/CHANGELOG.md @@ -7,6 +7,19 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2020-02-17] + +### Added +- Variable `textfiledir` +- Table `specialtypesetting` and support data + +### Changed +- Documentation improvements + +### Fixed +- When `checkruns` > 1 and `recordstatus=true`, testing code would crash + (issue #90) + ## [2020-02-03] ### Changed @@ -413,7 +426,8 @@ this project uses date-based 'snapshot' version identifiers. - Rationalise short option names: removed `-d`, `-E`, `-r` - Target `cmdcheck`: specific to LaTeX3 kernel work -[Unreleased]: https://github.com/latex3/l3build/compare/2020-02-03...HEAD +[Unreleased]: https://github.com/latex3/l3build/compare/2020-02-17...HEAD +[2020-02-17]: https://github.com/latex3/l3build/compare/2020-02-03...2020-02-17 [2020-02-03]: https://github.com/latex3/l3build/compare/2020-01-14...2020-02-03 [2020-01-14]: https://github.com/latex3/l3build/compare/2019-11-27...2020-01-14 [2019-11-27]: https://github.com/latex3/l3build/compare/2019-11-01...2019-11-27 diff --git a/macros/latex/contrib/l3build/README.md b/macros/latex/contrib/l3build/README.md index 4ff2f712d0..80c039a813 100644 --- a/macros/latex/contrib/l3build/README.md +++ b/macros/latex/contrib/l3build/README.md @@ -1,7 +1,7 @@ l3build: a testing and building system for LaTeX3 ================================================= -Release 2020-02-03 +Release 2020-02-17 Overview -------- diff --git a/macros/latex/contrib/l3build/l3build-arguments.lua b/macros/latex/contrib/l3build/l3build-arguments.lua index cbf68c6254..aa2f086d61 100644 --- a/macros/latex/contrib/l3build/l3build-arguments.lua +++ b/macros/latex/contrib/l3build/l3build-arguments.lua @@ -1,6 +1,6 @@ --[[ -File l3build-arguments.lua Copyright (C) 2018 The LaTeX3 Project +File l3build-arguments.lua Copyright (C) 2018-2020 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this @@ -108,6 +108,7 @@ option_list = }, help = { + desc = "Print this message and exit", short = "h", type = "boolean" }, @@ -147,6 +148,11 @@ option_list = { desc = "Location of user texmf tree", type = "string" + }, + version = + { + desc = "Print version information and exit", + type = "boolean" } } diff --git a/macros/latex/contrib/l3build/l3build-aux.lua b/macros/latex/contrib/l3build/l3build-aux.lua index 2146d9a142..8fa4b0cd82 100644 --- a/macros/latex/contrib/l3build/l3build-aux.lua +++ b/macros/latex/contrib/l3build/l3build-aux.lua @@ -1,6 +1,6 @@ --[[ -File l3build-aux.lua Copyright (C) 2018 The LaTeX3 Project +File l3build-aux.lua Copyright (C) 2018-2020 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this diff --git a/macros/latex/contrib/l3build/l3build-check.lua b/macros/latex/contrib/l3build/l3build-check.lua index 8bafe0591c..17e6321787 100644 --- a/macros/latex/contrib/l3build/l3build-check.lua +++ b/macros/latex/contrib/l3build/l3build-check.lua @@ -1,6 +1,6 @@ --[[ -File l3build-check.lua Copyright (C) 2018,2019 The LaTeX3 Project +File l3build-check.lua Copyright (C) 2018-2020 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this @@ -292,9 +292,14 @@ local function normalize_log(content,engine,errlevels) if recordstatus then new_content = new_content .. '***************' .. os_newline for i = 1, checkruns do - new_content = new_content .. - 'Compilation ' .. i .. ' of test file completed with exit status ' .. - errlevels[i] .. os_newline + if (errlevels[i]==nil) then + new_content = new_content .. + 'Compilation ' .. i .. ' of test file skipped ' .. os_newline + else + new_content = new_content .. + 'Compilation ' .. i .. ' of test file completed with exit status ' .. + errlevels[i] .. os_newline + end end end return new_content diff --git a/macros/latex/contrib/l3build/l3build-ctan.lua b/macros/latex/contrib/l3build/l3build-ctan.lua index 09b10e0eca..df1daf9728 100644 --- a/macros/latex/contrib/l3build/l3build-ctan.lua +++ b/macros/latex/contrib/l3build/l3build-ctan.lua @@ -1,6 +1,6 @@ --[[ -File l3build-ctan.lua Copyright (C) 2018 The LaTeX3 Project +File l3build-ctan.lua Copyright (C) 2018-2020 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this @@ -54,7 +54,7 @@ function copyctan() end copyfiles(sourcefiles,sourcefiledir) for _,file in pairs(textfiles) do - cp(file, currentdir, ctandir .. "/" .. ctanpkg) + cp(file, textfiledir, ctandir .. "/" .. ctanpkg) end end @@ -127,7 +127,7 @@ function ctan() end if errorlevel == 0 then for _,i in ipairs(textfiles) do - for _,j in pairs({unpackdir, currentdir}) do + for _,j in pairs({unpackdir, textfiledir}) do cp(i, j, ctandir .. "/" .. ctanpkg) cp(i, j, tdsdir .. "/doc/" .. tdsroot .. "/" .. bundle) end diff --git a/macros/latex/contrib/l3build/l3build-help.lua b/macros/latex/contrib/l3build/l3build-help.lua index 8c3877595f..055fc1a918 100644 --- a/macros/latex/contrib/l3build/l3build-help.lua +++ b/macros/latex/contrib/l3build/l3build-help.lua @@ -1,6 +1,6 @@ --[[ -File l3build-help.lua Copyright (C) 2018 The LaTeX3 Project +File l3build-help.lua Copyright (C) 2018,2020 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this @@ -31,7 +31,8 @@ function version() print( "\n" .. "l3build: A testing and building system for LaTeX\n\n" .. - "Release " .. release_date + "Release " .. release_date .. "\n" .. + "Copyright (C) 2014-2020 The LaTeX3 Project" ) end @@ -53,12 +54,12 @@ function help() end local scriptname = "l3build" - if not match(arg[0], "l3build(%.lua)$") then + if not (match(arg[0], "l3build%.lua$") or match(arg[0],"l3build$")) then scriptname = arg[0] end - print("usage: " .. scriptname .. " <command> [<options>] [<names>]") + print("usage: " .. scriptname .. " <target> [<options>] [<names>]") print("") - print("Valid commands are:") + print("Valid targets are:") local longest,t = setup_list(target_list) for _,k in ipairs(t) do local target = target_list[k] @@ -82,5 +83,9 @@ function help() end end print("") - print("See l3build.pdf for further details.") + print("Full manual available via 'texdoc l3build'.") + print("") + print("Repository : https://github.com/latex3/l3build") + print("Bug tracker : https://github.com/latex3/l3build/issues") + print("Copyright (C) 2014-2020 The LaTeX3 Project") end diff --git a/macros/latex/contrib/l3build/l3build-manifest-setup.lua b/macros/latex/contrib/l3build/l3build-manifest-setup.lua index fb46eb1d36..26bf1ca008 100644 --- a/macros/latex/contrib/l3build/l3build-manifest-setup.lua +++ b/macros/latex/contrib/l3build/l3build-manifest-setup.lua @@ -1,6 +1,6 @@ --[[ -File l3build-manifest-setup.lua Copyright (C) 2017-2018 The LaTeX3 Project +File l3build-manifest-setup.lua Copyright (C) 2018,2020 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this diff --git a/macros/latex/contrib/l3build/l3build-manifest.lua b/macros/latex/contrib/l3build/l3build-manifest.lua index 3b899d55fd..dc5138952c 100644 --- a/macros/latex/contrib/l3build/l3build-manifest.lua +++ b/macros/latex/contrib/l3build/l3build-manifest.lua @@ -1,6 +1,6 @@ --[[ -File l3build-manifest.lua Copyright (C) 2017-2018 The LaTeX3 Project +File l3build-manifest.lua Copyright (C) 2018,2020 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this diff --git a/macros/latex/contrib/l3build/l3build-stdmain.lua b/macros/latex/contrib/l3build/l3build-stdmain.lua index 9123349ee0..10303b71f7 100644 --- a/macros/latex/contrib/l3build/l3build-stdmain.lua +++ b/macros/latex/contrib/l3build/l3build-stdmain.lua @@ -1,6 +1,6 @@ --[[ -File l3build-stdmain.lua Copyright (C) 2018 The LaTeX3 Project +File l3build-stdmain.lua Copyright (C) 2018-2020 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this diff --git a/macros/latex/contrib/l3build/l3build-tagging.lua b/macros/latex/contrib/l3build/l3build-tagging.lua index 2c0c1641a4..a00180b34c 100644 --- a/macros/latex/contrib/l3build/l3build-tagging.lua +++ b/macros/latex/contrib/l3build/l3build-tagging.lua @@ -1,6 +1,6 @@ --[[ -File l3build-tagging.lua Copyright (C) 2018 The LaTeX3 Project +File l3build-tagging.lua Copyright (C) 2018-2020 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this diff --git a/macros/latex/contrib/l3build/l3build-typesetting.lua b/macros/latex/contrib/l3build/l3build-typesetting.lua index fe6a6a58dc..b76edd913b 100644 --- a/macros/latex/contrib/l3build/l3build-typesetting.lua +++ b/macros/latex/contrib/l3build/l3build-typesetting.lua @@ -127,9 +127,10 @@ function makeindex(name,dir,inext,outext,logext,style) return 0 end -function tex(file,dir) +function tex(file,dir,cmd) local dir = dir or "." - return runcmd(typesetexe .. " " .. typesetopts .. " \"" .. typesetcmds + local cmd = cmd or typesetexe .. typesetopts + return runcmd(cmd .. " \"" .. typesetcmds .. "\\input " .. file .. "\"", dir,{"TEXINPUTS","LUAINPUTS"}) end @@ -138,7 +139,13 @@ local function typesetpdf(file,dir) local dir = dir or "." local name = jobname(file) print("Typesetting " .. name) - local errorlevel = typeset(file,dir) + local fn = typeset + local cmd = typesetexe .. " " .. typesetopts + if specialtypesetting and specialtypesetting[file] then + fn = specialtypesetting[file].func or fn + cmd = specialtypesetting[file].cmd or cmd + end + local errorlevel = fn(file,dir,cmd) if errorlevel ~= 0 then print(" ! Compilation failed") return errorlevel @@ -148,9 +155,9 @@ local function typesetpdf(file,dir) return cp(pdfname,dir,docfiledir) end -typeset = typeset or function(file,dir) +typeset = typeset or function(file,dir,exe) dir = dir or "." - local errorlevel = tex(file,dir) + local errorlevel = tex(file,dir,exe) if errorlevel ~= 0 then return errorlevel end @@ -163,7 +170,7 @@ typeset = typeset or function(file,dir) errorlevel = makeindex(name,dir,".glo",".gls",".glg",glossarystyle) + makeindex(name,dir,".idx",".ind",".ilg",indexstyle) + - tex(file,dir) + tex(file,dir,exe) if errorlevel ~= 0 then break end end return errorlevel diff --git a/macros/latex/contrib/l3build/l3build-unpack.lua b/macros/latex/contrib/l3build/l3build-unpack.lua index 89bbfaa17f..47aaca7ca7 100644 --- a/macros/latex/contrib/l3build/l3build-unpack.lua +++ b/macros/latex/contrib/l3build/l3build-unpack.lua @@ -1,6 +1,6 @@ --[[ -File l3build-unpack.lua Copyright (C) 2018 The LaTeX3 Project +File l3build-unpack.lua Copyright (C) 2018-2020 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this diff --git a/macros/latex/contrib/l3build/l3build-upload.lua b/macros/latex/contrib/l3build/l3build-upload.lua index 257cce61a3..fc25d5d6ac 100644 --- a/macros/latex/contrib/l3build/l3build-upload.lua +++ b/macros/latex/contrib/l3build/l3build-upload.lua @@ -1,6 +1,6 @@ --[[ -File l3build-upload.lua Copyright (C) 2018 The LaTeX3 Project +File l3build-upload.lua Copyright (C) 2018-2020 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this diff --git a/macros/latex/contrib/l3build/l3build-variables.lua b/macros/latex/contrib/l3build/l3build-variables.lua index 06cfdd34af..e69eb5aff1 100644 --- a/macros/latex/contrib/l3build/l3build-variables.lua +++ b/macros/latex/contrib/l3build/l3build-variables.lua @@ -1,6 +1,6 @@ --[[ -File l3build-variables.lua Copyright (C) 2018,2019 The LaTeX3 Project +File l3build-variables.lua Copyright (C) 2018-2020 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,6 +43,7 @@ maindir = maindir or currentdir -- Substructure for file locations docfiledir = docfiledir or currentdir sourcefiledir = sourcefiledir or currentdir +textfiledir = textfiledir or currentdir supportdir = supportdir or maindir .. "/support" testfiledir = testfiledir or currentdir .. "/testfiles" testsuppdir = testsuppdir or testfiledir .. "/support" @@ -151,6 +152,7 @@ end -- Additional settings to fine-tune typesetting glossarystyle = glossarystyle or "gglo.ist" indexstyle = indexstyle or "gind.ist" +specialtypesetting = specialtypesetting or { } -- Supporting binaries and options biberexe = biberexe or "biber" diff --git a/macros/latex/contrib/l3build/l3build.1 b/macros/latex/contrib/l3build/l3build.1 index e40861b50d..f771558386 100644 --- a/macros/latex/contrib/l3build/l3build.1 +++ b/macros/latex/contrib/l3build/l3build.1 @@ -1,4 +1,4 @@ -.TH l3build 1 "2020-02-03" +.TH l3build 1 "2020-02-17" .SH NAME l3build \- Checking and building packages .SH SYNOPSIS diff --git a/macros/latex/contrib/l3build/l3build.dtx b/macros/latex/contrib/l3build/l3build.dtx index b2a981434f..f00774cada 100644 --- a/macros/latex/contrib/l3build/l3build.dtx +++ b/macros/latex/contrib/l3build/l3build.dtx @@ -64,6 +64,7 @@ \luavarset{testfiledir}{"./testfiles"} {Directory containing test files} \luavarset{testsuppdir}{testfiledir .. "/support"}{Directory containing test-specific support files} \luavarset{texmfdir}{maindir .. "/texmf"}{Directory containing support files in tree form} +\luavarset{textfiledir}{"."} {Directory containing plain text files} \luavarseparator \luavarset{builddir} {maindir .. "/build"} {Directory for building and testing} \luavarset{distribdir}{builddir .. "/distrib"}{Directory for generating distribution structure} @@ -137,6 +138,7 @@ \luavarseparator \luavarset{glossarystyle}{"gglo.ist"}{MakeIndex style file for glossary/changes creation} \luavarset{indexstyle} {"gind.ist"}{MakeIndex style for index creation} +\luavarset{specialtypesetting}{\meta{table}} {Non-standard typesetting combinations} \luavarseparator \luavarset{forcecheckepoch}{"true"} {Force epoch when running tests} \luavarset{forcedocepoch} {"false"} {Force epoch when typesetting} @@ -231,7 +233,7 @@ % }^^A % } % -% \date{Released 2020-02-03} +% \date{Released 2020-02-17} % % \maketitle % \tableofcontents @@ -310,13 +312,22 @@ % For a module, this build folder can be in the main directory of the package itself, but for a bundle it should be common for the bundle itself and for all modules within that bundle. % A |build/| folder can be safety deleted; all material within is re-generated for each command of the \pkg{l3build} system. % -% \subsection{Main build commands} +% \subsection{The \texttt{build.lua} file} +% +% The \texttt{build.lua} file used to control \pkg{l3build} is a simple Lua file +% which is read during execution. In the current release of \pkg{l3build}, +% \texttt{build.lua} is read automatically and can access all of the global +% functions provided by the script. Thus it may contain a simple list of +% variable settings \emph{or} additionally custom code to change the build +% process. A number of example scripts are given in Section~\ref{sec:examples}. +% +% \subsection{Main build targets} % % In the working directory of a bundle or module, \pkg{l3build} is run by executing % \begin{center} -% \texttt{l3build \meta{command} [\meta{option(s)}]} +% \texttt{l3build \meta{targets} [\meta{option(s)}]} % \end{center} -% where \texttt{\meta{command}} can be one of the following: +% where \texttt{\meta{targets}} can be one of the following: % \begin{itemize}[noitemsep]\ttfamily % \item check % \item check \meta{name(s)} @@ -333,9 +344,9 @@ % \item upload % \item upload \meta{tag} % \end{itemize} -% These commands are described below. +% These targets are described below. % -% As well as these commands, the system recognises the options +% As well as these targets, the system recognises the options % \begin{itemize} % \item |--config| (|-c|) Configuration(s) to use for testing % \item |--date| Date to use when tagging data @@ -510,7 +521,7 @@ % % \begin{buildcmd}{install} % Copies all package files (defined by \var{installfiles}) into the user's home \texttt{texmf} tree in the form of the \TeX\ Directory Structure. -% The location of the user tree can be adjusted using the |--texmfhome| swtich: +% The location of the user tree can be adjusted using the |--texmfhome| switch: % the standard setting is the location set as |TEXMFHOME|. % \end{buildcmd} % @@ -584,15 +595,6 @@ % See Section~\ref{sec:upload} for full details on this feature. % \end{buildcmd} % -% \subsection{The \texttt{build.lua} file} -% -% The \texttt{build.lua} file used to control \pkg{l3build} is a simple Lua file -% which is read during execution. In the current release of \pkg{l3build}, -% \texttt{build.lua} is read automatically and can access all of the global -% functions provided by the script. Thus it may contain a simple list of -% variable settings \emph{or} additionally custom code to change the build -% process. A number of example scripts are given in Section~\ref{sec:examples}. -% % \subsection{Example build scripts} % \label{sec:examples} % @@ -649,10 +651,13 @@ % \label{fig:module} % \end{figure} % +% A collection of full examples (source files in various layouts) are available +% at \url{https://github.com/latex3/l3build/tree/master/examples}. +% % \subsection{Backwards compatibility} % % Earlier releases of \pkg{l3build} required that the last line of -% \texttt{build.lua} ran the main script, \emph{i.e.}~ that \texttt{build.lua} +% \texttt{build.lua} ran the main script, \emph{i.e.}~that \texttt{build.lua} % was what the user called rather than \texttt{l3build.lua}. To allow scripts % to support both forms \emph{for the transition}, a simple test may be % included as showing in Figure~\ref{fig:build-compat}. @@ -770,7 +775,8 @@ % A variety of source layouts are supported. In general, a \enquote{flat} % layout with all source files \enquote{here} is most convenient. However, % \pkg{l3build} supports placement of both code and documentation source -% files in other locations using the \var{sourcefiledir} and \var{docfiledir} +% files in other locations using the \var{sourcefiledir}, \var{docfiledir} +% and \var{textfiledir} % variables. For pre-built trees, the glob syntax \texttt{**/*.\meta{ext}} may % be useful in these cases: this enables recursive searching in the appropriate % tree locations. With the standard settings, this structure will be removed @@ -778,6 +784,11 @@ % used to control this behavior. The \var{flattentds} setting controls % the same concept for TDS creation. % +% Notice that text files are treated separately from documentation files when +% splitting trees: this is to allow for the common case where files such +% as |README| and |LICENSE| are at the top level even when other documentation +% files are in a sub-directory. +% % A series of example layouts and matching |build.lua| files are available from % \url{https://github.com/latex3/l3build/tree/master/examples}. % @@ -924,8 +935,6 @@ % \item % \cs{TESTEXP} surrounds its contents with \cs{TYPE} and formatting to match \cs{TEST}; this can be used as a shorthand to test expandable commands. % \item -% TODO: would a \cs{TESTFEXP} command (based on \cs{romannumeral} expansion) be useful as well? -% \item % \cs{BEGINTEST}\marg{title} \dots \cs{ENDTEST} is an environment form of % \cs{TEST}, allowing verbatim material, \emph{etc.} to appear. % \item @@ -1263,7 +1272,7 @@ % tree, one might use the set up shown in Figure~\ref{fig:tds}. % \begin{figure} % \begin{lstlisting}[frame=single,language={[5.2]Lua},gobble = 6] -% tdslocations = +% tdslocations = % { % "tex/generic/mypkg/*.generic.tex" , % "tex/plain/mypkg/*.plain.tex" , @@ -1355,7 +1364,8 @@ % copying files to the typesetting location but before the main typesetting % run. This may be used for example to script a very large number of % demonstrations using a single source (see the \pkg{beamer} package -% for an example of this). +% for an example of this). Note that this hook is intended for use files +% \emph{not} listed in \var{typesetfiles} or \var{typesetdemofiles}. % % \begin{figure}[!b] % \begin{lstlisting}[frame=single,language={[5.2]Lua},gobble = 6] @@ -1391,6 +1401,22 @@ % to be executed once all standard set up is complete but before any typesetting % is run. % +% \subsection{Non-standard typesetting} +% +% To allow non-standard typesetting combinations, for example per-file +% choice of engines, the table \var{specialtypesetting} may be used. +% This is a table with one entry per file. Each entry is itself a table, +% and these contain a list of engines and settings for |cmd| and |func|. +% For example, to choose to use \LuaTeX{} for one file when \var{typesetexe} +% is |pdftex| +% \begin{verbatim} +% specialtypesetting.foo = {cmd = "luatex -interaction=nonstopmode"} +% \end{verbatim} +% or to select an entirely different typesetting function +% \begin{verbatim} +% specialtypesetting.foo = {func = typeset_foo} +% \end{verbatim} +% % \subsection{Automated upload to CTAN} % \label{sec:upload} % @@ -1790,7 +1816,7 @@ % \end{syntax} % Runs Biber on the \meta{name} (\emph{i.e.}~a jobname lacking any % extension) inside the \meta{dir}. If there is no |.bcf| file then -% no action is taken with a return value of $0$. +% no action is taken with a return value of $0$. % \end{function} % % \begin{function}{bibtex()} @@ -1799,7 +1825,7 @@ % \end{syntax} % Runs Bib\TeX{} on the \meta{name} (\emph{i.e.}~a jobname lacking any % extension) inside the \meta{dir}. If there are no |\citation| lines in -% the |.aux| file then no action is taken with a return value of $0$. +% the |.aux| file then no action is taken with a return value of $0$. % \end{function} % % \begin{function}{makeindex()} @@ -1813,9 +1839,10 @@ % % \begin{function}{tex()} % \begin{syntax} -% |tex(|\meta{file},\meta{dir}|)| +% |tex(|\meta{file},\meta{dir},\meta{cmd}|)| % \end{syntax} -% Runs \luavar{typesetexe} on the \meta{name} inside the \meta{dir}. +% Runs \meta{cmd} (by default \luavar{typesetexe} \luavar{typesetopts}) on the +% \meta{name} inside the \meta{dir}. % \end{function} % % \begin{function}{runcmd()} diff --git a/macros/latex/contrib/l3build/l3build.lua b/macros/latex/contrib/l3build/l3build.lua index 2c244c1ea5..03521ce612 100755 --- a/macros/latex/contrib/l3build/l3build.lua +++ b/macros/latex/contrib/l3build/l3build.lua @@ -25,7 +25,7 @@ for those people who are interested. --]] -- Version information -release_date = "2020-02-03" +release_date = "2020-02-17" -- File operations are aided by the LuaFileSystem module local lfs = require("lfs") diff --git a/macros/latex/contrib/l3build/l3build.pdf b/macros/latex/contrib/l3build/l3build.pdf Binary files differindex 271bfb6beb..2eaeda6f10 100644 --- a/macros/latex/contrib/l3build/l3build.pdf +++ b/macros/latex/contrib/l3build/l3build.pdf diff --git a/macros/luatex/latex/luatodonotes/luatodonotes.dtx b/macros/luatex/latex/luatodonotes/luatodonotes.dtx index 2351cfbf6c..1d634a6fc8 100644 --- a/macros/luatex/latex/luatodonotes/luatodonotes.dtx +++ b/macros/luatex/latex/luatodonotes/luatodonotes.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 2014-2017 by Fabian Lipp <fabian.lipp@gmx.de> +% Copyright (C) 2014-2020 by Fabian Lipp <fabian.lipp@gmx.de> % based on the todonotes package % by Henrik Skov Midtiby <henrikmidtiby@gmail.com> % ------------------------------------------------------------ @@ -24,7 +24,7 @@ %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01] %<package>\ProvidesPackage{luatodonotes} %<*package> - [2017/09/30 v0.4 luatodonotes source and documentation.] + [2020/02/16 v0.5 luatodonotes source and documentation.] %</package> % %<*driver> @@ -32,7 +32,7 @@ \usepackage{wrapfig} \PassOptionsToPackage{colorlinks, urlcolor=blue}{hyperref} \usepackage{hypdoc} % this package loads hyperref among others -\usepackage[colorinlistoftodos, shadow]{luatodonotes}[2017/09/30] +\usepackage[colorinlistoftodos, shadow]{luatodonotes}[2020/02/16] \usepackage{fontspec} \usepackage{amsmath} \usepackage{setspace} @@ -51,7 +51,7 @@ %</driver> % \fi % -% \CheckSum{906} +% \CheckSum{951} % % \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 @@ -742,7 +742,7 @@ % l.250 \directlua{require("luatodonotes")} % \end{verbatim} % This means that the file |luatodonotes.lua| cannot be found by Lua\TeX. -% It depends on the version of your \TeX{} installation. in which directories +% It depends on the version of your \TeX{} installation in which directories % Lua\TeX{} is looking for Lua source files. % You can query these paths with the following command: % \begin{verbatim} @@ -933,6 +933,12 @@ % placed in \texttt{\textbackslash caption}, e.g.)} % \changes{0.3}{2015/11/30}{Remove two variables from Lua global namespace} % \changes{0.3}{2015/12/02}{Less console output unless debug option is set} +% \changes{0.5}{2020/01/19}{Fixed bugs when using \texttt{poLeadersAvoidLines} +% as positioning algorithm in newer LuaTeX versions because some APIs have +% changed} +% \changes{0.5}{2020/01/20}{Bugfix: The line position calculation didn't use +% the current page height, which caused an offset on these positions in +% documents not using a4paper} % \end{environment} % % \subsection{Dependencies and definitions} @@ -1316,6 +1322,11 @@ % \changes{0.3}{2015/12/01}{Introduce package option \texttt{additionalMargin}} % \changes{0.4}{2016/04/01}{Fixed problems of the \texttt{additionalMargin} % option with certain documentclasses} +% \changes{0.5}{2017/11/21}{Make \texttt{additionalMargin} compatible with +% \texttt{\textbackslash newgeometry}} +% \changes{0.5}{2020/01/19}{Adapt to new LuaTeX versions, which provide command +% \texttt{\textbackslash pagewidth} instead of +% \texttt{\textbackslash pdfpagewidth} (but stay backwards compatible)} % \begin{macrocode} \newif{\if@todonotes@additionalMarginEnabled} \@todonotes@additionalMarginEnabledfalse @@ -1363,20 +1374,34 @@ \fi % \end{macrocode} % If the option |additionalMargin| is given, we enlarge the margins for the notes. -% We simply increase the page size by the doubled value of |additionalMargin| -% and move the contents to the right using |\hoffset|. % \begin{macrocode} \if@todonotes@additionalMarginEnabled \newlength{\@todonotes@modpaperwidth} \AfterEndPreamble{% - \setlength{\@todonotes@modpaperwidth}{\paperwidth}% - \addtolength{\@todonotes@modpaperwidth}{\@todonotes@additionalMargin}% - \addtolength{\@todonotes@modpaperwidth}{\@todonotes@additionalMargin}% - \pdfpagewidth=\@todonotes@modpaperwidth% - \addtolength{\hoffset}{\@todonotes@additionalMargin}% + \@todonotes@setAdditionalMargin% +% \end{macrocode} +% Additionally, if the |geometry| package is loaded we hook into +% |\Gm@changelayout| to repeat this computation whenever |\newgeometry| is +% called. +% \begin{macrocode} + \ifdefined\Gm@changelayout + \g@addto@macro{\Gm@changelayout}{\@todonotes@setAdditionalMargin} + \fi }% \fi% % \end{macrocode} +% We simply increase the page size by the doubled value of |additionalMargin| +% and move the contents to the right using |\hoffset|. +% \begin{macrocode} +\newcommand{\@todonotes@setAdditionalMargin}{ + \setlength{\@todonotes@modpaperwidth}{\paperwidth}% + \addtolength{\@todonotes@modpaperwidth}{\@todonotes@additionalMargin}% + \addtolength{\@todonotes@modpaperwidth}{\@todonotes@additionalMargin}% + \ifdefined\pdfpagewidth\else\let\pdfpagewidth\pagewidth\fi + \pdfpagewidth=\@todonotes@modpaperwidth% + \addtolength{\hoffset}{\@todonotes@additionalMargin}% +} +% \end{macrocode} % \subsection{Initialisation of our Lua code} % In this part we define some of the variables used by Lua depending on the % package options and do some other initialisation tasks. @@ -1456,6 +1481,7 @@ % We need this workaround because we cannot insert |\pdflastypos| directly into % the tokenlist in the Lua callback \texttt{callbackOutputLinePositions()}. % \begin{macrocode} +\ifdefined\pdflastypos\else\let\pdflastypos\lastypos\fi \def\@todonotes@pdflastypos{\the\pdflastypos} % \end{macrocode} % The following commands are written to the temporary \texttt{lpo}-file. @@ -1493,6 +1519,18 @@ {\AtBeginShipoutUpperLeft} \fi % \end{macrocode} +% Define commands that are used for every tikzpicture to disable +% externalization. +% We only call the |\tikzexternaldisable| command if it is defined (i.e., the +% externalization library for TikZ is loaded). +% Externalization is reenabled after the end of the group (if it was enabled +% before). +% \changes{0.5}{2018/04/08}{Disable TikZ externalization for our tikzpictures} +% \begin{macrocode} +\newcommand{\@todonotes@before@tikzpict}{\begingroup% + \ifdefined\tikzexternaldisable\tikzexternaldisable\fi} +\newcommand{\@todonotes@after@tikzpict}{\endgroup} +% \end{macrocode} % Initialise the script when all Lua variables are set according to the package % options. % \begin{macrocode} @@ -1532,6 +1570,7 @@ {@todonotes@\arabic{@todonotes@numberoftodonotes}% @\arabic{@todonotes@numberofLinesInArea} }% \hspace*{\todonotes@textmark@shift}{\smash{% + \@todonotes@before@tikzpict% \begin{tikzpicture}[overlay,remember picture, deco/.style={}]% \setlength\todonotes@textmark@linebelow% @@ -1560,7 +1599,8 @@ -- (\@todonotes@nodeNamePrefix areaSE) } -- cycle; - \end{tikzpicture}% + \end{tikzpicture}% + \@todonotes@after@tikzpict% }}% }% % \end{macrocode} @@ -1828,10 +1868,12 @@ % Mark the end of the highlighted area with a Tikz coordinate. % The begin is marked by |\@todocommon|. % \begin{macrocode} + \@todonotes@before@tikzpict% \begin{tikzpicture}[remember picture, overlay]% \node [coordinate] (@todonotes@\arabic{@todonotes@numberoftodonotes} % inTextEnd) {};% \end{tikzpicture}% + \@todonotes@after@tikzpict% \zref@label{@todonotes@\arabic{@todonotes@numberoftodonotes}@end}% }% % \end{macrocode} @@ -1846,10 +1888,12 @@ % First is the current location in the document stored, this enables % us later to connect this point with the inserted todonote. % \begin{macrocode} + \@todonotes@before@tikzpict% \begin{tikzpicture}[remember picture, overlay]% \node [coordinate] (@todonotes@\arabic{@todonotes@numberoftodonotes} % inText) {};% \end{tikzpicture}% + \@todonotes@after@tikzpict% % \end{macrocode} % Update the dimensions to be accessed by Lua. % \begin{macrocode} @@ -1937,7 +1981,9 @@ % Define helper function |drawInlineNote|. % \begin{macrocode} \newcommand{\@todonotes@drawInlineNote}{% - {\par\noindent\begin{tikzpicture}[remember picture]% + {\par\noindent% + \@todonotes@before@tikzpict% + \begin{tikzpicture}[remember picture]% \draw node[@todonotes@inlinenote,font=\@todonotes@sizecommand]{% \if@todonotes@authorgiven% {\noindent \@todonotes@sizecommand % @@ -1945,7 +1991,9 @@ \else% {\noindent \@todonotes@sizecommand \@todonotes@text}% \fi};% - \end{tikzpicture}\par}% + \end{tikzpicture}% + \@todonotes@after@tikzpict% + \par}% }% % \end{macrocode} % \end{macro} @@ -1957,6 +2005,7 @@ \addcontentsline{tdo}{todo}{\@todonotes@MissingFigureText: #2}% \par \noindent +\@todonotes@before@tikzpict% \begin{tikzpicture} \draw[fill=\@todonotes@currentfigcolor, draw = black!40, line width=2pt] (-2, -2.5) rectangle +(\@todonotes@currentfigwidth, \@todonotes@currentfigheight); @@ -1967,6 +2016,7 @@ \draw (0, 0.3) node {\@todonotes@MissingFigureUp}; \draw (0, -0.3) node {\@todonotes@MissingFigureDown}; \end{tikzpicture}\hfill +\@todonotes@after@tikzpict% }% Ending \missingfigure command \fi% Ending \@todonotes@ifdisabled % \end{macrocode} @@ -2054,6 +2104,7 @@ % \begin{macrocode} \raisebox{\voffset}{% \hspace{-\hoffset}% + \@todonotes@before@tikzpict% \begin{tikzpicture}[remember picture,overlay] % \end{macrocode} % Reads the absolute coordinates of every note on the page and writes them to @@ -2065,6 +2116,7 @@ % \begin{macrocode} \directlua{luatodonotes.printNotes()} \end{tikzpicture}% + \@todonotes@after@tikzpict% }% % \end{macrocode} % Delete the drawn notes from the Lua lists and prepare for the next page. diff --git a/macros/luatex/latex/luatodonotes/luatodonotes.ins b/macros/luatex/latex/luatodonotes/luatodonotes.ins index 1fc75094df..bfaeb98a7e 100644 --- a/macros/luatex/latex/luatodonotes/luatodonotes.ins +++ b/macros/luatex/latex/luatodonotes/luatodonotes.ins @@ -1,5 +1,5 @@ %% -%% Copyright (C) 2014-2015 by Fabian Lipp <fabian.lipp@gmx.de> +%% Copyright (C) 2014-2020 by Fabian Lipp <fabian.lipp@gmx.de> %% based on the todonotes package by %% Henrik Skov Midtiby <henrikmidtiby@gmail.com> %% @@ -23,7 +23,7 @@ This is a generated file. -Copyright (C) 2014-2015 by Fabian Lipp <fabian.lipp@gmx.de> +Copyright (C) 2014-2020 by Fabian Lipp <fabian.lipp@gmx.de> based on the todonotes package by Henrik Skov Midtiby <henrikmidtiby@gmail.com> diff --git a/macros/luatex/latex/luatodonotes/luatodonotes.lua b/macros/luatex/latex/luatodonotes/luatodonotes.lua index 5ef9b8f03b..1926597ab9 100644 --- a/macros/luatex/latex/luatodonotes/luatodonotes.lua +++ b/macros/luatex/latex/luatodonotes/luatodonotes.lua @@ -1,5 +1,5 @@ -- --- Copyright (C) 2014-2015 by Fabian Lipp <fabian.lipp@gmx.de> +-- Copyright (C) 2014-2020 by Fabian Lipp <fabian.lipp@gmx.de> -- ------------------------------------------------------------ -- -- This file may be distributed and/or modified under the @@ -374,8 +374,7 @@ function luatodonotes.linePositionsNextPage() end function luatodonotes.linePositionsAddLine(ycoord, lineheight, linedepth) - local baseline = ycoord - tex.pageheight - linePositionsCurPage[#linePositionsCurPage + 1] = {baseline, baseline + lineheight, baseline - linedepth} + linePositionsCurPage[#linePositionsCurPage + 1] = {ycoord, lineheight, linedepth} end @@ -741,7 +740,7 @@ function luatodonotes.callbackOutputLinePositions(head) end if foundGlyph then - local w = node.new("whatsit", "write") -- 8/1 + local w = node.new("whatsit", "write") w.stream = lpoFileStream local tokenlist = { {12, 92, 0}, -- \ @@ -770,19 +769,31 @@ function luatodonotes.callbackOutputLinePositions(head) {12, 110, 0}, -- n {12, 123, 0} -- { } - t = token.create("@todonotes@pdflastypos") - tokenlist[#tokenlist + 1] = t - tokenlist[#tokenlist + 1] = {12, 125, 0} - tokenlist[#tokenlist + 1] = {12, 123, 0} + local t = token.create("@todonotes@pdflastypos") + -- the token handling changed with newer LuaTeX versions + if tex.luatexversion > 81 then + tokenlist[#tokenlist + 1] = {0, t.tok} + else + tokenlist[#tokenlist + 1] = t + end + tokenlist[#tokenlist + 1] = {12, 125, 0} -- } + tokenlist[#tokenlist + 1] = {12, 123, 0} -- { appendStrToTokenlist(tokenlist, tostring(head.height)) - tokenlist[#tokenlist + 1] = {12, 125, 0} - tokenlist[#tokenlist + 1] = {12, 123, 0} + tokenlist[#tokenlist + 1] = {12, 125, 0} -- } + tokenlist[#tokenlist + 1] = {12, 123, 0} -- { appendStrToTokenlist(tokenlist, tostring(head.depth)) - tokenlist[#tokenlist + 1] = {12, 125, 0} + tokenlist[#tokenlist + 1] = {12, 125, 0} -- } w.data = tokenlist head.head = node.insert_before(head.head,head.head,w) - local w = node.new("whatsit", "pdf_save_pos") -- 8/23 + -- the name of the whatsit node changed with newer LuaTeX versions + local whatsitName + if tex.luatexversion > 80 then + whatsitName = "save_pos" + else + whatsitName = "pdf_save_pos" + end + local w = node.new("whatsit", whatsitName) head.head = node.insert_before(head.head,head.head,w) end end @@ -1742,7 +1753,18 @@ end local function posPoLeaders(notes, rightSide, avoidLines) local linePositionsCurPage if avoidLines then - linePositionsCurPage = linePositions[currentPage] or {} + linePositionsCurPage = {} + -- use the current pageheight to convert coordinates: + -- savepos yields coordinates relativ to lower left corner of page, + -- while our tikzpicture is anchored at the upper left corner + for k, v in pairs(linePositions[currentPage] or {}) do + local baseline = v[1] - tex.pageheight + linePositionsCurPage[k] = {baseline, baseline + v[2], baseline - v[3]} + if todonotesDebug then + print("linePositionsAddLine, add: " .. v[1] .. ", pageheight: " .. tex.pageheight .. + ", result: " .. baseline) + end + end end -- number of slots on the whole page @@ -1759,11 +1781,16 @@ local function posPoLeaders(notes, rightSide, avoidLines) -- sort notes by inputY table.sort(notes, compareNoteIndInputYDesc) - -- draw slots + -- draw slots and line positions if todonotesDebug then for i = 1,totalNumSlots+1 do local pos = area.top - (i-1) * rasterHeight - tex.print("\\draw[blue,dashed] (0," .. pos .. "sp) -- +(21cm,0);") + tex.print("\\draw[blue,dashed] (0," .. pos .. "sp) -- +(21cm,0);") + end + for ind, v in pairs(linePositionsCurPage) do + local pos = v[1] + tex.print("\\draw[red,dashed] (0," .. pos .. "sp) -- +(21cm,0);") + tex.print("\\node[red] at (1cm," .. pos .. "sp) {" .. ind .. "};") end end @@ -1870,7 +1897,7 @@ local function posPoLeaders(notes, rightSide, avoidLines) if avoidLines then leaderArmR = labelTopR - noteInnerSep - r:getHeight() / 2 -- east anchor - -- find first line (from the top) which lower bound is below leaderArmR + -- find first line (from the top) whose lower bound is below leaderArmR local lineBelowInd for ind, v in pairs(linePositionsCurPage) do if v[3] <= leaderArmR then diff --git a/macros/luatex/latex/luatodonotes/luatodonotes.pdf b/macros/luatex/latex/luatodonotes/luatodonotes.pdf Binary files differindex 3235a373c2..81bc887aa6 100644 --- a/macros/luatex/latex/luatodonotes/luatodonotes.pdf +++ b/macros/luatex/latex/luatodonotes/luatodonotes.pdf diff --git a/systems/texlive/tlnet/tlpkg/TeXLive/TLConfig.pm b/systems/texlive/tlnet/tlpkg/TeXLive/TLConfig.pm index e27f70b6e0..6572f00bb3 100644 --- a/systems/texlive/tlnet/tlpkg/TeXLive/TLConfig.pm +++ b/systems/texlive/tlnet/tlpkg/TeXLive/TLConfig.pm @@ -1,12 +1,12 @@ -# $Id: TLConfig.pm 53076 2019-12-10 06:20:44Z preining $ +# $Id: TLConfig.pm 53803 2020-02-16 17:17:22Z karl $ # TeXLive::TLConfig.pm - module exporting configuration values -# Copyright 2007-2019 Norbert Preining +# Copyright 2007-2020 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. package TeXLive::TLConfig; -my $svnrev = '$Revision: 53076 $'; +my $svnrev = '$Revision: 53803 $'; my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown"; sub module_revision { return $_modulerevision; } @@ -190,7 +190,7 @@ our %TLPDBOptions = ( "Directory for backups" ], "create_formats" => [ "b", 1, "formats", - "Create formats on installation" ], + "Generate formats at installation or update" ], "desktop_integration" => [ "b", 1, "desktop_integration", "Create Start menu shortcuts (w32)" ], diff --git a/systems/texlive/tlnet/tlpkg/installer/install-tl-gui.tcl b/systems/texlive/tlnet/tlpkg/installer/install-tl-gui.tcl index 4234f18312..cd9001ea83 100755 --- a/systems/texlive/tlnet/tlpkg/installer/install-tl-gui.tcl +++ b/systems/texlive/tlnet/tlpkg/installer/install-tl-gui.tcl @@ -1,6 +1,6 @@ #!/usr/bin/env wish -# Copyright 2018, 2019 Siep Kroonenberg +# Copyright 2018-2020 Siep Kroonenberg # This file is licensed under the GNU General Public License version 2 # or any later version. @@ -1177,6 +1177,7 @@ if {$::tcl_platform(platform) ne "windows"} { ### symlinks into standard directories ### # 'file writable' is only a check of unix permissions + # use proc dir_writable instead proc dest_ok {d} { if {$d eq ""} {return 0} set its 1 @@ -1184,7 +1185,7 @@ if {$::tcl_platform(platform) ne "windows"} { if [file exists $d] { if {! [file isdirectory $d]} { return 0 - } elseif {! [file writable $d]} { + } elseif {! [dir_writable $d]} { return 0 } else { return 1 diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb index 01e7d46534..98a5adcb33 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/2019 -depend revision/53796 +depend revision/53817 name 00texlive.image category TLCore -revision 53795 +revision 53815 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 @@ -1909,6 +1909,8 @@ runfiles size=4994 tlpkg/tlpsrc/hanoi.tlpsrc tlpkg/tlpsrc/happy4th.tlpsrc tlpkg/tlpsrc/har2nat.tlpsrc + tlpkg/tlpsrc/haranoaji-extra.tlpsrc + tlpkg/tlpsrc/haranoaji.tlpsrc tlpkg/tlpsrc/hardwrap.tlpsrc tlpkg/tlpsrc/harmony.tlpsrc tlpkg/tlpsrc/harnon-cv.tlpsrc @@ -3321,6 +3323,7 @@ runfiles size=4994 tlpkg/tlpsrc/scheme-tetex.tlpsrc tlpkg/tlpsrc/scholax.tlpsrc tlpkg/tlpsrc/schule.tlpsrc + tlpkg/tlpsrc/schulmathematik.tlpsrc tlpkg/tlpsrc/schulschriften.tlpsrc tlpkg/tlpsrc/schwalbe-chess.tlpsrc tlpkg/tlpsrc/scientific-thesis-cover.tlpsrc @@ -4156,7 +4159,7 @@ depend opt_w32_multi_user:1 name 00texlive.installer category TLCore -revision 53497 +revision 53801 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 @@ -19314,22 +19317,22 @@ binfiles arch=x86_64-solaris size=1 name archaeologie category Package -revision 53011 +revision 53813 shortdesc A citation-style which covers rules of the German Archaeological Institute relocated 1 longdesc This citation-style covers the citation and bibliography rules longdesc of the German Archaeological Institute (DAI). Various options longdesc are available to change and adjust the outcome according to longdesc one's own preferences. -containersize 72704 -containerchecksum d4da1a75a9f0ab7845e9b1d5d88d34a27c866d8682d49c4cb502350a8d0ff61029eb17d9dac85fd52bb546f9212ee4f68cdf05bc020bbb176894c00b1f1ce997 -doccontainersize 948944 -doccontainerchecksum 72fa90e5a8cbaec21173f4682ffa27899a274b32a9f1baba7e734950c87f4919b3b19db0a37ec996998f5b1ae350f43156cfebd89cc85129964cf7d6b56d7c82 -docfiles size=263 +containersize 72684 +containerchecksum 3bb26b77a812a285d5a6fffe4906efaef3a972a6078e6150531f756d39f1287af8746a776cdaec58ec1d3973da740c20f0352c322858f2631772532588d429e6 +doccontainersize 903636 +doccontainerchecksum fd3bf3deb244ee05b4ce1eb9ca81ae0c7268447a974e87d41e1cb29468129f7366702d271b1fdda2f5e3ac561a2cea82525877b2f5b077ca80f9bd6158a17608 +docfiles size=251 RELOC/doc/latex/archaeologie/README.md details="Readme" RELOC/doc/latex/archaeologie/archaeologie.pdf details="Package documentation" -srccontainersize 134268 -srccontainerchecksum 07798de918b4e28159526652bb9d4d6515600ecc6f2f6a2c4edc7011cc113370e5ffe3d0b5be515c3d3dfe4cca410c317288997b846a5420cf7b0f9920344683 +srccontainersize 134276 +srccontainerchecksum 2f91bb17dcc8b650a379fb1c39ab1b52361b01eb5fa8e77bcc53344c777c32ed5471472540359f9a6ba1053628f823e1e12838ca08e9ae8df0359a13948057f2 srcfiles size=189 RELOC/source/latex/archaeologie/Makefile RELOC/source/latex/archaeologie/archaeologie.dtx @@ -19356,7 +19359,7 @@ catalogue-contact-repository https://github.com/LukasCBossert/biblatex-archaeolo catalogue-ctan /macros/latex/contrib/biblatex-contrib/archaeologie catalogue-license lppl1.3 catalogue-topics humanities biblatex -catalogue-version 2.4.3 +catalogue-version 2.4.4 name archaic category Package @@ -40160,7 +40163,7 @@ catalogue-version 1.0 name breqn category Package -revision 52397 +revision 53814 shortdesc Automatic line breaking of displayed equations relocated 1 longdesc The package provides solutions to a number of common @@ -40177,18 +40180,18 @@ longdesc formulae are processed; the code must be watched carefully, longdesc keeping an eye on possible glitches. The bundle also contains longdesc the flexisym and mathstyle packages, which are both designated longdesc as support for breqn. -containersize 24432 -containerchecksum 0b0c40a54bebca784f8057c4f3b0595777bff39c016d6c3c97ea8b4e3d2b357045eb65ae8e24a98fc1777ea523bc372ec164ebe3b92e749704f156af0733148f -doccontainersize 1047960 -doccontainerchecksum fd38471bc060a853d853326870aaed0770ad8d7826168a9539ffbc074debe7d054f351f9ee34380ffd78aaefd55f1fa5aa16fa7da823d4d7b981296c67d435a3 -docfiles size=276 +containersize 24276 +containerchecksum f3970f1d35d123c5568e12e8436ee899f24e653b56aa6109c3369aedfe0c40ab2adf17588ff0394314375844ce7133cb5994b3c9b627bca1a5aaa7bc7726d7a2 +doccontainersize 1059680 +doccontainerchecksum 992b9acbdc7af8c17778fed023cb7b98109eef19270b079ba7185437bdf1533044e262ea45914b217d9fbd6f23d51bde6a6a40c577422efa8445f5ba652fd935 +docfiles size=280 RELOC/doc/latex/breqn/CHANGES.md RELOC/doc/latex/breqn/README.md details="Readme" RELOC/doc/latex/breqn/breqn.pdf details="Package documentation" RELOC/doc/latex/breqn/flexisym.pdf RELOC/doc/latex/breqn/mathstyle.pdf -srccontainersize 80048 -srccontainerchecksum 16c62790776452a5aba32f48389299fa9b6c9193bc12168f75057ade14761e09902adb95436e064e0d84729e6421781f05943cea9ea914d2b23b7f179bc7fba3 +srccontainersize 79868 +srccontainerchecksum 4a1f198de92995a61515f054b7150fe79696646e1ee7628a92db27b029aaa5c961b609ee5cc69043e652a6acc9774d730a3d9c353ff1efcb1a726d87c1aacbe8 srcfiles size=82 RELOC/source/latex/breqn/breqn.dtx RELOC/source/latex/breqn/breqnbundle.ins @@ -40207,7 +40210,7 @@ catalogue-contact-repository https://github.com/wspr/breqn catalogue-ctan /macros/latex/contrib/breqn catalogue-license lppl1.3 catalogue-topics maths -catalogue-version 0.98f +catalogue-version 0.98h name bropd category Package @@ -40982,7 +40985,7 @@ catalogue-version 0.2 name bxjscls category Package -revision 53684 +revision 53812 shortdesc Japanese document class collection for all major engines relocated 1 longdesc This package provides an extended version of the Japanese @@ -40991,19 +40994,19 @@ longdesc original version supports only pLaTeX and upLaTeX, the extended longdesc version also supports pdfLaTeX, XeLaTeX and LuaLaTeX, with the longdesc aid of suitable packages that provide capability of Japanese longdesc typesetting. -containersize 31388 -containerchecksum 0bbc4f6acd1e2848bc483bd8c2c18237754542a34e1b603133e4adf01d1ac3177c0afb30cf6a92dfb87d432df30780e532796b0c33a2c5a21783a57e72e8eef4 -doccontainersize 1790400 -doccontainerchecksum ecdf8554f1ccd44262017049ce7ebad530aad4174dd3ff918cd17ecc5b83892c923be46aaadafb209f3e5506101b722ce75ee45fd654515d99962500c8cd0cba -docfiles size=486 +containersize 31412 +containerchecksum 4b100e52663c714296d18b487ad5c21fcedfb154bb517ddf399646fc27795da77cf156de18e1119bbe3563dda13cf504e9ef7132bfe427ec48cf4d8a21a9c1bf +doccontainersize 1825324 +doccontainerchecksum 5f7ddec0451a01d2994d532088754b7135e8dee2d915f94b268e0c07dbdffda4a294c8d9012d0b4a524049fd82b3d3029180ab16d33b68d34700beeb9e0ff973 +docfiles size=487 RELOC/doc/latex/bxjscls/LICENSE RELOC/doc/latex/bxjscls/README-ja.md details="Readme (Japanese)" language="ja" RELOC/doc/latex/bxjscls/README.md details="Readme" RELOC/doc/latex/bxjscls/bxjscls-manual.pdf details="User guide (Japanese)" language="ja" RELOC/doc/latex/bxjscls/bxjscls-manual.tex RELOC/doc/latex/bxjscls/bxjscls.pdf details="Package documentation (Japanese)" language="ja" -srccontainersize 78872 -srccontainerchecksum bfaaf9b8e192ac93f1f116ea17003fe5a945a4a75c410750ca9a829ff0e05fe3c4914f0e77eddea381bd25cd189ba42a0b02ac2e015bfa9ff79e593726327bdb +srccontainersize 78928 +srccontainerchecksum efb5fa10b47a48746dea5453979ed80a4ab8ff723d3a4c30ce8b27746b83b6d05f1de6e80b48d6a3ae925d5e1e321d659aed36aa5b0d8f523be6530403a83bc9 srcfiles size=96 RELOC/source/latex/bxjscls/bxjscls.dtx RELOC/source/latex/bxjscls/bxjscls.ins @@ -41024,7 +41027,7 @@ catalogue-contact-repository https://github.com/zr-tex8r catalogue-ctan /language/japanese/BX/bxjscls catalogue-license bsd2 catalogue-topics japanese class -catalogue-version 1.9j +catalogue-version 1.9k name bxnewfont category Package @@ -63001,7 +63004,7 @@ containerchecksum be5230f2fec255b9bf7220a9ad33930032ef617de8665d2c35c4360852f77d name collection-langgerman category Collection -revision 53300 +revision 53815 shortdesc German relocated 1 longdesc Support for German. @@ -63038,6 +63041,7 @@ depend microtype-de depend milog depend presentations depend r_und_s +depend schulmathematik depend templates-fenn depend templates-sommer depend termcal-de @@ -63055,8 +63059,8 @@ depend udesoftec depend uhrzeit depend umlaute depend voss-mathcol -containersize 640 -containerchecksum 600c29a97d1de9feea51b6c5ed2a6b09ff00291a578fc368d1ff98f777081cb72529c5aa87d5e69bfb5e07e246b67341af8ffe60b5ae9da274c05b63c885c49b +containersize 652 +containerchecksum a73e281ccb849825e3a1996273cbd34ef7337fcf5368f556c2909a029fbedb10672a18b984444574cde3a2b39d11a6f23f17bedd382268a2b6aa2226c5a26d61 name collection-langgreek category Collection @@ -63121,10 +63125,10 @@ containerchecksum 2b172a37bd15ab85cdfa52f25c1b7310c23af5f9f4925cd678ee7a6f7731e4 name collection-langjapanese category Collection -revision 52509 +revision 53811 shortdesc Japanese relocated 1 -longdesc Support for Japanese; additional packages in +longdesc Support for Japanese; additional packages are in longdesc collection-langcjk. depend collection-langcjk depend ascmac @@ -63142,6 +63146,8 @@ depend bxwareki depend convbkmk depend endnotesj depend gentombow +depend haranoaji +depend haranoaji-extra depend ifptex depend ifxptex depend ipaex @@ -63179,8 +63185,8 @@ depend uptex-fonts depend wadalab depend zxjafbfont depend zxjatype -containersize 600 -containerchecksum 1d2d8862cbbc57626bc023e0deab3aa2abf3ee92038737583b9babbdd0df33cacf564fce74f03f8618c0f7e707e1ad5dd184bbe7224cf570af5c14799f530300 +containersize 616 +containerchecksum 3d9cc9c20a4ef6dbacae6fda18e625fc3828b4f899460d8e920217b79e19aab5601bd7146e6adaa6d599c81a7424390a98c3b8a26dd5ac759caa57fa74fcb5c4 name collection-langkorean category Collection @@ -127858,6 +127864,70 @@ catalogue-license lppl catalogue-topics bibtex-supp catalogue-version 1.0 +name haranoaji +category Package +revision 53810 +shortdesc Harano Aji Fonts +relocated 1 +longdesc Harano Aji Fonts (Harano Aji Mincho and Harano Aji Gothic) are +longdesc fonts obtained by replacing Adobe-Identity-0 (AI0) CIDs of +longdesc Source Han fonts (Source Han Serif and Source Han Sans) with +longdesc Adobe-Japan1 (AJ1) CIDs. There are 14 fonts, 7 weights each for +longdesc Mincho and Gothic. +containersize 26211208 +containerchecksum 4c137f99d91640c805bfbe9555de08ad1d5e8a2c9aad32d90a3061b8408c8f5cd05ea41150fc09813f02ffe401f517e6cbabf4b5eab4d793b9324e3d00dc2b44 +doccontainersize 3048 +doccontainerchecksum 5b3edc1a1db549a596cbfd383fc5b8e27d7d523e7276e2a79a7aa81f87314d0586b9f4277bfcf79a4c44e2202c80dfec31266384f9f15cdccd14a251fd6e207b +docfiles size=3 + RELOC/doc/fonts/haranoaji/LICENSE + RELOC/doc/fonts/haranoaji/README details="Readme" +runfiles size=10098 + RELOC/fonts/opentype/public/haranoaji/HaranoAjiGothic-Bold.otf + RELOC/fonts/opentype/public/haranoaji/HaranoAjiGothic-Heavy.otf + RELOC/fonts/opentype/public/haranoaji/HaranoAjiGothic-Medium.otf + RELOC/fonts/opentype/public/haranoaji/HaranoAjiGothic-Regular.otf + RELOC/fonts/opentype/public/haranoaji/HaranoAjiMincho-Bold.otf + RELOC/fonts/opentype/public/haranoaji/HaranoAjiMincho-Light.otf + RELOC/fonts/opentype/public/haranoaji/HaranoAjiMincho-Regular.otf +catalogue-also haranoaji-extra +catalogue-contact-home https://github.com/trueroad/HaranoAjiFonts +catalogue-ctan /fonts/haranoaji +catalogue-license ofl +catalogue-topics font-cjk japanese +catalogue-version 20200215 + +name haranoaji-extra +category Package +revision 53811 +shortdesc Harano Aji Fonts +relocated 1 +longdesc Harano Aji Fonts (Harano Aji Mincho and Harano Aji Gothic) are +longdesc fonts obtained by replacing Adobe-Identity-0 (AI0) CIDs of +longdesc Source Han fonts (Source Han Serif and Source Han Sans) with +longdesc Adobe-Japan1 (AJ1) CIDs. There are 14 fonts, 7 weights each for +longdesc Mincho and Gothic. +containersize 25950260 +containerchecksum 0f5997b425e157a5b6ea8a4202150c4ee1d696d6ea956c990f249df8db2a5ecb82f4ca25228905ef2b2ded38f13a9a1c35ae444ae9f2f60f189e293947349ec8 +doccontainersize 3052 +doccontainerchecksum d3eee236a541e1b20572d8f3386ea9d9dd630f6c1cce638e5afde8291f8cea16cb9e3ae790f09d71733405f8ebbb2de0e7a251b5b09fa48bcde9acdd988126e2 +docfiles size=3 + RELOC/doc/fonts/haranoaji-extra/LICENSE + RELOC/doc/fonts/haranoaji-extra/README details="Readme" +runfiles size=10177 + RELOC/fonts/opentype/public/haranoaji-extra/HaranoAjiGothic-ExtraLight.otf + RELOC/fonts/opentype/public/haranoaji-extra/HaranoAjiGothic-Light.otf + RELOC/fonts/opentype/public/haranoaji-extra/HaranoAjiGothic-Normal.otf + RELOC/fonts/opentype/public/haranoaji-extra/HaranoAjiMincho-ExtraLight.otf + RELOC/fonts/opentype/public/haranoaji-extra/HaranoAjiMincho-Heavy.otf + RELOC/fonts/opentype/public/haranoaji-extra/HaranoAjiMincho-Medium.otf + RELOC/fonts/opentype/public/haranoaji-extra/HaranoAjiMincho-SemiBold.otf +catalogue-also haranoaji +catalogue-contact-home https://github.com/trueroad/HaranoAjiFonts +catalogue-ctan /fonts/haranoaji-extra +catalogue-license ofl +catalogue-topics font-cjk japanese +catalogue-version 20200215 + name hardwrap category Package revision 21396 @@ -147401,7 +147471,7 @@ binfiles arch=x86_64-solaris size=3 name kpathsea category TLCore -revision 53569 +revision 53807 shortdesc Path searching library for TeX-related files longdesc Kpathsea is a library and utility programs which provide path longdesc searching facilities for TeX file types, including the @@ -147410,10 +147480,10 @@ longdesc layered on top of a general search mechanism. It is not longdesc distributed separately, but rather is released and maintained longdesc as part of the TeX live sources. depend kpathsea.ARCH -containersize 32164 -containerchecksum aa67df2d689dc939043a645370c236b1de4919610894a9a79aae220f801087ebd34ab68765ab5b8c2c663017c2e6b801cfd4a39ca5f173949c5ee501c3fbe698 -doccontainersize 968120 -doccontainerchecksum 03771da32feab4d9f07b2e2b126a44852a711f91f9e4964f97511c619f55a2185c4a0a2227950d383a9526cb3609809b39f70f1ebc6e55e7af220421beea8a76 +containersize 32296 +containerchecksum f8367cca4e62a83a34357019c7e7d8422e7857a2b8fa13dfa73b375d1c981989dd222c2b52e584cfed34faf92c073468033b569bc1854094f7eb97d51609f09c +doccontainersize 968124 +doccontainerchecksum fd73e652b76eca8730a717c08abea429f284ef836997d9c8189d1be97b9671ad4caa08709ebf1d594349279855a1def9b2b350ad75bb4dee7e3cfa05a72c6650 docfiles size=522 texmf-dist/doc/info/dir texmf-dist/doc/info/kpathsea.info @@ -200959,7 +201029,7 @@ catalogue-version 1.051 name newtxtt category Package -revision 44510 +revision 53809 shortdesc Enhancement of typewriter fonts from newtx relocated 1 longdesc The package provides enhanced fonts with LaTeX support files @@ -200967,11 +201037,11 @@ longdesc providing access to the typewriter fonts from newtx. Regular longdesc and bold weights, slanted variants and a choice of four longdesc different styles for zero. execute addMap newtxtt.map -containersize 116900 -containerchecksum 95c25791796b56eb6e54be98c522861d3704e76c3d2a88c871fb88c9dfca616867a8cb839d8ba9f5b42e03eddf6d27f37cf91bfbdaae5aa13c4ce9fa681be9c9 -doccontainersize 80548 -doccontainerchecksum c4f9e344d0060b569e7503d12b1021bfd68bc58842778d2d9c4014b9f70c10a9a23ebca6495f2acac358a4d6d5710e8db48dcf445b3be5d278cc9818a57bb999 -docfiles size=22 +containersize 116976 +containerchecksum cba0af119d5c1dab0e62046c2d1deba626885be3df5a79b9ae129a143221f1062b33eb91af146e351ee1969157c915e39b96a5ff85116b87e16d5498101fd2f3 +doccontainersize 171356 +doccontainerchecksum 2e96ac40334c855a12da28024aa05df5139c40b99a86e5dd5a94998453c187139eb73c927fccd653e4e99199b894620620dab4705064f99def6565f7501dca3a +docfiles size=45 RELOC/doc/fonts/newtxtt/README details="Readme" RELOC/doc/fonts/newtxtt/newtxtt-doc.pdf details="Package documentation" RELOC/doc/fonts/newtxtt/newtxtt-doc.tex @@ -201122,8 +201192,8 @@ runfiles size=204 RELOC/tex/latex/newtxtt/ts1newtxttz.fd catalogue-ctan /fonts/newtxtt catalogue-license gpl3lppl -catalogue-topics font font-type1 font-mono font-t1enc -catalogue-version 1.055 +catalogue-topics font font-type1 font-mono font-supp font-t1enc +catalogue-version 1.056 name newunicodechar category Package @@ -219558,64 +219628,66 @@ catalogue-version 1.0 name optex category Package -revision 53764 +revision 53804 shortdesc LuaTeX format based on Plain TeX and OPmac -relocated 1 longdesc OpTeX is a LuaTeX format based on Plain TeX macros with power longdesc from OPmac (fonts selection system, colors, external graphics, longdesc references, hyperlinks, ...) with unicode fonts. depend luatex -containersize 67540 -containerchecksum 5d0d23d9afa4aa113de21a4b51157ec3b887738b23d4e5ec3c453f325ef1f1eb0b001cfaab200d99d50563bbd5a6b1baa07c064e5e5dcdf831db8d4d18b31b55 +depend hyphen-base +depend optex.ARCH +execute AddFormat name=optex engine=luatex patterns=hyphen-lan.opm options="optex.ini" fmttriggers=hyphen-base +containersize 67588 +containerchecksum 467d10b4f9f21369cc3abd33a5f44a2810016460a4bd8b0f6ef5ba2b48f850ff5761c91164a86df90ef676ede9c7703bbae7855c8b8359b846adb42c28be98b8 doccontainersize 1290232 -doccontainerchecksum 3b09e4a23aac3844b25e706ae1c3da48a73d7b1db587f6774fc9bba76fa12e9c02db622f1604afd0187faadadaef4f2e93b4c50e8c048a593313ceca079742bf +doccontainerchecksum 215deebdf62449d67c3c2f11bba5f5531327ed3504635fe62da2d0ca9ce10a2cbdbd0f7f1cf2a869032633cb08b04f74cd720499a82514cdc1f63f354e7ecfde docfiles size=318 - RELOC/doc/latex/optex/README details="Readme" - RELOC/doc/latex/optex/demo.tex - RELOC/doc/latex/optex/ring.png + texmf-dist/doc/latex/optex/README details="Readme" + texmf-dist/doc/latex/optex/demo.tex + texmf-dist/doc/latex/optex/ring.png runfiles size=111 - RELOC/tex/luatex/optex/alloc.opm - RELOC/tex/luatex/optex/basics-a.opm - RELOC/tex/luatex/optex/basics-macros.opm - RELOC/tex/luatex/optex/catcodes.opm - RELOC/tex/luatex/optex/csplain-params.opm - RELOC/tex/luatex/optex/f-adventor.opm - RELOC/tex/luatex/optex/f-antt.opm - RELOC/tex/luatex/optex/f-baskerville.opm - RELOC/tex/luatex/optex/f-bonum.opm - RELOC/tex/luatex/optex/f-cursor.opm - RELOC/tex/luatex/optex/f-gfsbodoni.opm - RELOC/tex/luatex/optex/f-heros.opm - RELOC/tex/luatex/optex/f-libertine-s.opm - RELOC/tex/luatex/optex/f-libertine.opm - RELOC/tex/luatex/optex/f-lmfonts.opm - RELOC/tex/luatex/optex/f-pagella.opm - RELOC/tex/luatex/optex/f-schola.opm - RELOC/tex/luatex/optex/f-technika.opm - RELOC/tex/luatex/optex/f-termes.opm - RELOC/tex/luatex/optex/f-xcharter.opm - RELOC/tex/luatex/optex/fams-ini.opm - RELOC/tex/luatex/optex/fonts-catalog.opm - RELOC/tex/luatex/optex/fonts-opmac.opm - RELOC/tex/luatex/optex/fonts-preload.opm - RELOC/tex/luatex/optex/fonts-resize.opm - RELOC/tex/luatex/optex/fonts-select.opm - RELOC/tex/luatex/optex/hyphen-lan.opm - RELOC/tex/luatex/optex/if-macros.opm - RELOC/tex/luatex/optex/logos.opm - RELOC/tex/luatex/optex/luatex-ini.opm - RELOC/tex/luatex/optex/margins.opm - RELOC/tex/luatex/optex/math-macros.opm - RELOC/tex/luatex/optex/math-preload.opm - RELOC/tex/luatex/optex/opmac-rest.opm - RELOC/tex/luatex/optex/optex.ini - RELOC/tex/luatex/optex/outlines.opm - RELOC/tex/luatex/optex/output.opm - RELOC/tex/luatex/optex/parameters.opm - RELOC/tex/luatex/optex/pdfuni-string.opm - RELOC/tex/luatex/optex/plain-macros.opm - RELOC/tex/luatex/optex/prefixed.opm - RELOC/tex/luatex/optex/uni-lcuc.opm + texmf-dist/tex/luatex/optex/alloc.opm + texmf-dist/tex/luatex/optex/basics-a.opm + texmf-dist/tex/luatex/optex/basics-macros.opm + texmf-dist/tex/luatex/optex/catcodes.opm + texmf-dist/tex/luatex/optex/csplain-params.opm + texmf-dist/tex/luatex/optex/f-adventor.opm + texmf-dist/tex/luatex/optex/f-antt.opm + texmf-dist/tex/luatex/optex/f-baskerville.opm + texmf-dist/tex/luatex/optex/f-bonum.opm + texmf-dist/tex/luatex/optex/f-cursor.opm + texmf-dist/tex/luatex/optex/f-gfsbodoni.opm + texmf-dist/tex/luatex/optex/f-heros.opm + texmf-dist/tex/luatex/optex/f-libertine-s.opm + texmf-dist/tex/luatex/optex/f-libertine.opm + texmf-dist/tex/luatex/optex/f-lmfonts.opm + texmf-dist/tex/luatex/optex/f-pagella.opm + texmf-dist/tex/luatex/optex/f-schola.opm + texmf-dist/tex/luatex/optex/f-technika.opm + texmf-dist/tex/luatex/optex/f-termes.opm + texmf-dist/tex/luatex/optex/f-xcharter.opm + texmf-dist/tex/luatex/optex/fams-ini.opm + texmf-dist/tex/luatex/optex/fonts-catalog.opm + texmf-dist/tex/luatex/optex/fonts-opmac.opm + texmf-dist/tex/luatex/optex/fonts-preload.opm + texmf-dist/tex/luatex/optex/fonts-resize.opm + texmf-dist/tex/luatex/optex/fonts-select.opm + texmf-dist/tex/luatex/optex/hyphen-lan.opm + texmf-dist/tex/luatex/optex/if-macros.opm + texmf-dist/tex/luatex/optex/logos.opm + texmf-dist/tex/luatex/optex/luatex-ini.opm + texmf-dist/tex/luatex/optex/margins.opm + texmf-dist/tex/luatex/optex/math-macros.opm + texmf-dist/tex/luatex/optex/math-preload.opm + texmf-dist/tex/luatex/optex/opmac-rest.opm + texmf-dist/tex/luatex/optex/optex.ini + texmf-dist/tex/luatex/optex/outlines.opm + texmf-dist/tex/luatex/optex/output.opm + texmf-dist/tex/luatex/optex/parameters.opm + texmf-dist/tex/luatex/optex/pdfuni-string.opm + texmf-dist/tex/luatex/optex/plain-macros.opm + texmf-dist/tex/luatex/optex/prefixed.opm + texmf-dist/tex/luatex/optex/uni-lcuc.opm catalogue-also csplain catalogue-contact-home http://petr.olsak.net/optex catalogue-ctan /macros/luatex/optex @@ -219623,6 +219695,150 @@ catalogue-license pd catalogue-topics format luatex catalogue-version 0.02 +name optex.aarch64-linux +category Package +revision 53804 +shortdesc aarch64-linux files of optex +containersize 320 +containerchecksum 2584daad5de802bf339a3bc784257fb7e59763d2cae8410c195a17b8eb012ed8f5585928d732501a6af1d5b800b832034acb0e319d47a21e4591ddefbd178176 +binfiles arch=aarch64-linux size=1 + bin/aarch64-linux/optex + +name optex.amd64-freebsd +category Package +revision 53804 +shortdesc amd64-freebsd files of optex +containersize 320 +containerchecksum 02c7d0197b429e7ef5c7f531cbe65453379d449ab5d4521527fbdfcf198cc0486097922021468d341f59c95aca5e144f713714ca92d12b9c375ff8e796f02ba1 +binfiles arch=amd64-freebsd size=1 + bin/amd64-freebsd/optex + +name optex.amd64-netbsd +category Package +revision 53804 +shortdesc amd64-netbsd files of optex +containersize 316 +containerchecksum 8aa34b1f293328882c3ed55e7a25ce4c5f80f42f1b23432fc01ff4251793d8e0abfae586e3332863ab5a171717bb9ec57eca7863dd762ab4c83e5d869e4eb844 +binfiles arch=amd64-netbsd size=1 + bin/amd64-netbsd/optex + +name optex.armhf-linux +category Package +revision 53804 +shortdesc armhf-linux files of optex +containersize 316 +containerchecksum c21f109755791fe8dd4cb3645d6bdd62b46bffb7668ab027dc795e9099d919852023e0934b48f5076f9624aa0ff63320e62b5ec49dd7a77bb0d95ad91e09bb6e +binfiles arch=armhf-linux size=1 + bin/armhf-linux/optex + +name optex.i386-cygwin +category Package +revision 53804 +shortdesc i386-cygwin files of optex +containersize 320 +containerchecksum 6f889f6881321e4b19f9b41b98a437fa55c29c84a34638c6c0289cad6c68221b47d54cfcca1236a03d180e08831e1a52a6a66fabcba9c7646b1cd0382e540529 +binfiles arch=i386-cygwin size=1 + bin/i386-cygwin/optex + +name optex.i386-freebsd +category Package +revision 53804 +shortdesc i386-freebsd files of optex +containersize 316 +containerchecksum 4782b3a2468635a4d6e5fbc5f63f7f59e73e3f5c8b36fd4459af5e1da97d8c1ee6ba0435e1d0c404988472e9af955f8d165877e79023e0af3dd5180010e6362d +binfiles arch=i386-freebsd size=1 + bin/i386-freebsd/optex + +name optex.i386-linux +category Package +revision 53804 +shortdesc i386-linux files of optex +containersize 316 +containerchecksum ee997b8d7fc5df62c66c8b0003f7e812ec19af114f7b283095ead4c20d6b321d80050663aae8b5827b8af4791db58a268c058198acb4f6316a543caa0b12ae60 +binfiles arch=i386-linux size=1 + bin/i386-linux/optex + +name optex.i386-netbsd +category Package +revision 53804 +shortdesc i386-netbsd files of optex +containersize 316 +containerchecksum e183c5331b4313418f78811ae60b5ea0394de8781a4695c2ad7962d4df84a646cc2cff11486c3b2e5f459f3d87c2728a163d995c946174f4c8b2faeab0fea1e0 +binfiles arch=i386-netbsd size=1 + bin/i386-netbsd/optex + +name optex.i386-solaris +category Package +revision 53804 +shortdesc i386-solaris files of optex +containersize 316 +containerchecksum 57e8cf9acbc5f7b2ebb7aa6155403a9ac59928064f0d8a03e6c976ea14788e576561974212957acecf6102308818fb95044dc18677fe1982db9c86f2febb9bc3 +binfiles arch=i386-solaris size=1 + bin/i386-solaris/optex + +name optex.win32 +category Package +revision 53816 +shortdesc win32 files of optex +containersize 864 +containerchecksum 1070c5367a20f138cca85e9a3b35aac705365440e5c3b6bcb295a14ba5afd6fb7b159e514a3caa08a186ef9d3392127a949de427b50073e767c0d740a16544fc +binfiles arch=win32 size=1 + bin/win32/optex.exe + +name optex.x86_64-cygwin +category Package +revision 53804 +shortdesc x86_64-cygwin files of optex +containersize 324 +containerchecksum ccadff1947363965fc9e66a34b6b30bbe848b13ac78c14a6999c8327125912892d1ada19c85c0b25c0d4fd20cfacc45b610a12b644be8c28c521b6341262b3bd +binfiles arch=x86_64-cygwin size=1 + bin/x86_64-cygwin/optex + +name optex.x86_64-darwin +category Package +revision 53804 +shortdesc x86_64-darwin files of optex +containersize 320 +containerchecksum 597d9283fe7da652b82f7830c970b7ca803223faa7ce03381de4c770ec769fc66b0fe526bf14b07c5073f0febb6e0bcf6ad7f63d940768618375c536e3048563 +binfiles arch=x86_64-darwin size=1 + bin/x86_64-darwin/optex + +name optex.x86_64-darwinlegacy +category Package +revision 53804 +shortdesc x86_64-darwinlegacy files of optex +containersize 324 +containerchecksum b534f49009709c4da02b3fba4515bd84e2fc0cbef60ad989734e3db496f549a75fe38585b2ad79ce68e500c5d8690ec3e3f13c2c7d3bfd1cbf84d6a64100ad6c +binfiles arch=x86_64-darwinlegacy size=1 + bin/x86_64-darwinlegacy/optex + +name optex.x86_64-linux +category Package +revision 53804 +shortdesc x86_64-linux files of optex +containersize 320 +containerchecksum 812cb0d91471940e0d5d20c01d5f686a601e31be2cb7bc003b9e9c733083a90c25508d3f311b5b22fba7e488a94a2628dde2e2dcbaf14b1ed60be1db486f0af9 +binfiles arch=x86_64-linux size=1 + bin/x86_64-linux/optex + +name optex.x86_64-linuxmusl +category Package +revision 53804 +shortdesc x86_64-linuxmusl files of optex +containersize 320 +containerchecksum 8b8f003b8b2fe07c08911ddfc21f33aa407671a3a997dce291ebf1d8f35fc53e5940c3374522b23d696d7f07f3292adafeef5e639fd18ec6b7c5382b24315f8a +binfiles arch=x86_64-linuxmusl size=1 + bin/x86_64-linuxmusl/optex + +name optex.x86_64-solaris +category Package +revision 53804 +shortdesc x86_64-solaris files of optex +containersize 316 +containerchecksum 3df28de006e8f855b40188ad9c06e8715a351b3ef3db8c12b251cd74bdbb2e1b560b59b70a31d23c4428aa29eebfbde536fc9caaeb7165ec6e32df4e58ebf690 +binfiles arch=x86_64-solaris size=1 + bin/x86_64-solaris/optex + name optidef category Package revision 50941 @@ -257369,6 +257585,36 @@ catalogue-license lppl1.3 catalogue-topics teaching catalogue-version 0.8.1 +name schulmathematik +category Package +revision 53815 +shortdesc Commands and document classes for German-speaking teachers of mathematics and physics +relocated 1 +longdesc The schulmathematik bundle provides two LaTeX packages and six +longdesc document classes for German-speaking teachers of mathematics +longdesc and physics. +containersize 9932 +containerchecksum ed2db79bc6762f123fcdb452d483c8857c7ae20ad89152c3db9655ed90fe4743f00297a35e82e03d357ad733931aaceff49e0aa7eef2c9d66b2ac673d732629f +doccontainersize 189272 +doccontainerchecksum 13264b961f25e77c101478b0907896f99bc68814bc62659a16fa5d8567a6b3819398f4cbd91e2d53e252892b9f1313fc5b7431d439a8c3780b6ea140f2270348 +docfiles size=59 + RELOC/doc/latex/schulmathematik/README details="Readme" + RELOC/doc/latex/schulmathematik/schulmathematik.pdf details="Package documentation" + RELOC/doc/latex/schulmathematik/schulmathematik.tex +runfiles size=17 + RELOC/tex/latex/schulmathematik/schulma-ab.cls + RELOC/tex/latex/schulmathematik/schulma-gutachten.cls + RELOC/tex/latex/schulmathematik/schulma-klausur.cls + RELOC/tex/latex/schulmathematik/schulma-komp.cls + RELOC/tex/latex/schulmathematik/schulma-mdlprf.cls + RELOC/tex/latex/schulmathematik/schulma-physik.sty + RELOC/tex/latex/schulmathematik/schulma-praes.cls + RELOC/tex/latex/schulmathematik/schulma.sty +catalogue-ctan /macros/latex/contrib/schulmathematik +catalogue-license lppl1.3 +catalogue-topics maths physics teaching +catalogue-version 1.0 + name schulschriften category Package revision 35730 @@ -284167,14 +284413,14 @@ docfiles size=430 name texlive-msg-translations category TLCore -revision 53715 +revision 53808 shortdesc translations of the TeX Live installer and TeX Live Manager longdesc This package contains the translated messages of the TeX Live longdesc installer and TeX Live Manager. For information on creating or longdesc updating translations, see longdesc http://tug.org/texlive/doc.html#install-tl-xlate. -containersize 139868 -containerchecksum 422d1cc095439b9e6ca54f38f5cf50ca887185db590642a665d31821ecfac2cff187a605db850b7b6cf0d5b6c0f19432cfb4788b4d8c92bab12fffec4cab2517 +containersize 139888 +containerchecksum 58fa20ff18af74beff995b90ca375cf8309216b7001b17538f5781dfcad3378d21e7f8f4cb3a50ad8f5de4a6a47e5353b9455b6ad14f2976b32cb853501efd86 runfiles size=388 tlpkg/translations/README tlpkg/translations/cs.po @@ -284235,7 +284481,7 @@ docfiles size=503 name texlive-scripts category TLCore -revision 53602 +revision 53801 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. @@ -284243,10 +284489,10 @@ depend texlive.infra depend texlive-scripts.ARCH execute addMap mathpple.map postaction shortcut type=menu name="TeX Live command-line" cmd=TEXDIR/tlpkg/installer/tl-cmd.bat -containersize 131956 -containerchecksum adb404c2b40a3da467e4b52435d812395a5ebf2cace14d63b03372f5301fe43442cefa115b6b40d6e356756cb02328d4d6e3a2631c9f824b37779f65f85d6764 +containersize 131976 +containerchecksum 698200b6fdc0e76a2d9a72b2ff8f8ab16be09af986c2739a3d4f05ae1c6699b7a0a269dd3581bc5ed09c85cbb3a56779ba52cd9ea8cc393fda2a9f2e3c3efb2b doccontainersize 207788 -doccontainerchecksum 0adef60023b6fe4769972171a37f83c64702f2855d7ef28a8092eac286761a50e945d30aac56509e980f0b7664d7192c9e312056c1b535ec13177e526ace35a8 +doccontainerchecksum d4a3c86d30ed07f9b8b933ecd4ec34724a9a9b1fce3fce963db4515042180f6ea9b142975517e6cf6a9673e46949e02f07d42db3d942df2713d7ed510cf1f203 docfiles size=133 texmf-dist/doc/man/man1/fmtutil-sys.1 texmf-dist/doc/man/man1/fmtutil-sys.man1.pdf @@ -295817,14 +296063,14 @@ binfiles arch=win32 size=5 name tlshell category TLCore -revision 53707 +revision 53801 shortdesc GUI frontend (tcl/tk-based) for tlmgr depend tlshell.ARCH postaction shortcut type=menu name="TeX Live Manager" cmd=TEXDIR/bin/win32/tlshell.exe -containersize 25392 -containerchecksum e8e7ccce498e9dda4e2f491cc54269477198e4c9409e0adffee5f62638d258628f39833de38eb96348e6ea814fbac466818da3fa31ecef3ed8c67338aca80014 +containersize 25508 +containerchecksum 1b8c40f2b6c4fb0a106c28f217dee218069942750c8302b936b89c2e1fd28030370e0d6a2ffe91789f9fee8175fac3384aa4b48a581d9edf1480db3b509fe441 doccontainersize 440 -doccontainerchecksum c8f367b54f01e07b54f68b48e27f30aeb1751035a42b1660079b17a728950b7eadd88050a175704ed7bdfb32c415630a4fe1b5c3df9f820890dab0604ff7f551 +doccontainerchecksum 73d2770e5d28040995db376495938224e8fc4b9b986171f4d39df3557e0d1b99982436bbb6f687f329b533da30534240c8a892580bdfe13fcd22b3058f7b9e6b docfiles size=1 texmf-dist/doc/support/tlshell/README runfiles size=25 diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 index f927e167df..0b461247f3 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 @@ -1 +1 @@ -fb518043cd49fcb430f3eb7d74a2bb90 texlive.tlpdb +95f042f8d86c1ed1e14885130ceebd51 texlive.tlpdb diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 index 68067b6905..21317b1e4d 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 @@ -1 +1 @@ -4b075c6f9974eec757eac4f38f2db75c66bce41492a21664098e84202a91610deba8c76517107b6f90dd5f64aecebb7f5c812b6be2c1194c5d1767b0f819f7bd texlive.tlpdb +8732611666762e2755221d6eaf540c8f84246225c473462c8810309ad0e354e3b5c6ca193ce85803824d31cb4f080ba71bca50c25a0e4b29a247df4e346f8805 texlive.tlpdb diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc index e6ecb259c5..de38d044ce 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----- -iQEcBAEBCgAGBQJeSJLPAAoJEEzhh34ZQ4xwsOIH/RL+1NsPVZu9uUDgi99jTBQ0 -+KGVrTATIHImjzJ/EkgwiCQFetswGwM6u6Q6fwHSaQ6K2nmT06x+d/2158B+HZ2A -K0ZEupBvlcQ88Uisdo5LrtiLtXv2GvrJbfavrMj42rIkkGC7A+kX+jCnaODfbT/S -6bLwW7/Z+UmJ7ceVKFwyShhJBwXXKPaEyyoYLLJlIOmwdp8PywrWp9cefHS9Zoum -XZS9M+/MYhgMvZsOIqQeJy1NAR8BJsse7Sfc7XPwNUAizK2Xjtxs2qoSOpJdFfrC -WvSpomCTPs0LhWJnB4BMsk9irdXsmMJIJF2U5Ug+9GqnpJxwAGvBZoPNHqXGJBY= -=wvEY +iQEcBAEBCgAGBQJeSeShAAoJEEzhh34ZQ4xw/fkH/2C3xtFZGJ3rEqL3YNU8d86s +Gjd41JpXh6pgtBfDqDOUMsyZRDSzevIZ5sqi7dg/bpcnS+jEwRUWLuqkgoScT9yC +P67jj5zvHkc3+9LlzQJnG8ipe/GKLiK45vtTfuUQ9wWgU2clEPafJ7M8ssE4EQLm +JZzKzDlRZu1oLdWem7q8AoN40JH/N44f5f69nkw/ks/ZPGsW/6e8o8z/8cjxq+e5 +esgE8NXirOsOTalwMtpnn6CHuQdQo/1roMHQoPBwExACJ3nNUNNDANU8V3Wc4/vN +b0X0xrSlc8IrSWbZhzo/q1sNCML3+DclRYAGbXNNSd1RkQqMMbb/GRE/FWF09y4= +=Fh0D -----END PGP SIGNATURE----- diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz Binary files differindex a44d49e285..b513d6a34f 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz diff --git a/systems/texlive/tlnet/tlpkg/tltcl/tltcl.tcl b/systems/texlive/tlnet/tlpkg/tltcl/tltcl.tcl index b0b8d1c19d..11f237b18c 100644 --- a/systems/texlive/tlnet/tlpkg/tltcl/tltcl.tcl +++ b/systems/texlive/tlnet/tlpkg/tltcl/tltcl.tcl @@ -1,6 +1,6 @@ #!/usr/bin/env wish -# Copyright 2018 Siep Kroonenberg +# Copyright 2018-2020 Siep Kroonenberg # This file is licensed under the GNU General Public License version 2 # or any later version. @@ -543,6 +543,28 @@ proc native_slashify {s} { return $r } +# test whether a directory is writable. +# 'file writable' merely tests permissions, which may not be good enough +proc dir_writable {d} { + for {set x 0} {$x<100} {incr x} { + set y [expr {int(10000*rand())}] + set newfile [file join $::instroot $y] + if [file exists $newfile] { + continue + } else { + set fid [open $newfile w] + chan close $fid + if [file exists $newfile] { + file delete $newfile + return 1 + } else { + return 0 + } + } + } + return 0 +} + # unix: choose_dir replacing native directory browser if {$::tcl_platform(platform) eq "unix"} { diff --git a/systems/texlive/tlnet/tlpkg/translations/cs.po b/systems/texlive/tlnet/tlpkg/translations/cs.po index 1152b83843..d246d25cf1 100644 --- a/systems/texlive/tlnet/tlpkg/translations/cs.po +++ b/systems/texlive/tlnet/tlpkg/translations/cs.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: TeX Live translation\n" "Report-Msgid-Bugs-To: tex-live@tug.org\n" -"POT-Creation-Date: 2020-02-08 01:55+0100\n" +"POT-Creation-Date: 2020-02-16 19:07+0100\n" "PO-Revision-Date: 2019-03-26 17:30+0200\n" "Last-Translator: Petr Sojka <sojka@fi.muni.cz>\n" "Language-Team: Czech <>\n" @@ -50,7 +50,7 @@ msgstr "Instalační proces" #: tlpkg/installer/install-tl-gui.tcl:933 #: tlpkg/installer/install-tl-gui.tcl:1003 #: tlpkg/installer/install-tl-gui.tcl:1083 -#: tlpkg/installer/install-tl-gui.tcl:1302 tlpkg/tltcl/tltcl.tcl:588 +#: tlpkg/installer/install-tl-gui.tcl:1303 tlpkg/tltcl/tltcl.tcl:610 #: texmf-dist/scripts/tlshell/tlshell.tcl:168 #: texmf-dist/scripts/tlshell/tlshell.tcl:1261 msgid "Cancel" @@ -66,7 +66,7 @@ msgstr "Dokončit" #: tlpkg/installer/install-menu-wizard.pl:41 #: tlpkg/installer/install-menu-perltk.pl:445 -#: tlpkg/installer/install-tl-gui.tcl:1570 +#: tlpkg/installer/install-tl-gui.tcl:1571 msgid "Default paper size" msgstr "Výchozí formát papíru" @@ -95,7 +95,7 @@ msgstr "Instalace pro všechny uživatele" #: tlpkg/installer/install-menu-wizard.pl:46 #: tlpkg/installer/install-menu-perltk.pl:569 -#: tlpkg/installer/install-tl-gui.tcl:1662 +#: tlpkg/installer/install-tl-gui.tcl:1663 msgid "Install TeXworks front end" msgstr "Nainstaluj pomocníka TeXworks" @@ -110,7 +110,7 @@ msgstr "Instalace TeX Live %s" #: tlpkg/installer/install-menu-perltk.pl:630 #: tlpkg/installer/install-menu-perltk.pl:676 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544 -#: tlpkg/installer/install-tl-gui.tcl:1353 +#: tlpkg/installer/install-tl-gui.tcl:1354 #: texmf-dist/scripts/tlshell/tlshell.tcl:2153 msgid "Quit" msgstr "Ukončit" @@ -277,15 +277,15 @@ msgstr "Cílová složka:" #: texmf-dist/scripts/texlive/tlmgrgui.pl:2438 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2443 #: tlpkg/installer/install-tl-gui.tcl:642 -#: tlpkg/installer/install-tl-gui.tcl:1401 -#: tlpkg/installer/install-tl-gui.tcl:1417 -#: tlpkg/installer/install-tl-gui.tcl:1425 -#: tlpkg/installer/install-tl-gui.tcl:1435 -#: tlpkg/installer/install-tl-gui.tcl:1444 -#: tlpkg/installer/install-tl-gui.tcl:1452 -#: tlpkg/installer/install-tl-gui.tcl:1459 -#: tlpkg/installer/install-tl-gui.tcl:1505 -#: tlpkg/installer/install-tl-gui.tcl:1524 +#: tlpkg/installer/install-tl-gui.tcl:1402 +#: tlpkg/installer/install-tl-gui.tcl:1418 +#: tlpkg/installer/install-tl-gui.tcl:1426 +#: tlpkg/installer/install-tl-gui.tcl:1436 +#: tlpkg/installer/install-tl-gui.tcl:1445 +#: tlpkg/installer/install-tl-gui.tcl:1453 +#: tlpkg/installer/install-tl-gui.tcl:1460 +#: tlpkg/installer/install-tl-gui.tcl:1506 +#: tlpkg/installer/install-tl-gui.tcl:1525 msgid "Change" msgstr "Změnit" @@ -359,7 +359,7 @@ msgstr "Ne" #: tlpkg/installer/install-menu-wizard.pl:604 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456 -#: tlpkg/installer/install-tl-gui.tcl:1351 +#: tlpkg/installer/install-tl-gui.tcl:1352 #: texmf-dist/scripts/tlshell/tlshell.tcl:1899 msgid "Install" msgstr "Nainstaluj" @@ -369,20 +369,20 @@ msgstr "Nainstaluj" #: texmf-dist/scripts/texlive/tlmgrgui.pl:143 #: tlpkg/installer/install-tl-gui.tcl:862 #: tlpkg/installer/install-tl-gui.tcl:1099 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "None" msgstr "Žádné" #: tlpkg/installer/install-menu-perltk.pl:49 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "Only new" msgstr "Jen nové" #: tlpkg/installer/install-menu-perltk.pl:50 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145 #: tlpkg/installer/install-tl-gui.tcl:1096 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 #: texmf-dist/scripts/tlshell/tlshell.tcl:2212 #: texmf-dist/scripts/tlshell/tlshell.tcl:2229 msgid "All" @@ -398,17 +398,17 @@ msgid "letter" msgstr "letter" #: tlpkg/installer/install-menu-perltk.pl:55 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "No shortcuts" msgstr "Žádné zkratky" #: tlpkg/installer/install-menu-perltk.pl:56 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "TeX Live menu" msgstr "TeX Live menu" #: tlpkg/installer/install-menu-perltk.pl:57 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "Launcher entry" msgstr "Položka k spuštění" @@ -477,7 +477,7 @@ msgstr "Prosím, vyberte jiné zrcadlo." #: tlpkg/installer/install-tl-gui.tcl:930 #: tlpkg/installer/install-tl-gui.tcl:986 #: tlpkg/installer/install-tl-gui.tcl:1080 -#: tlpkg/installer/install-tl-gui.tcl:1300 tlpkg/tltcl/tltcl.tcl:586 +#: tlpkg/installer/install-tl-gui.tcl:1301 tlpkg/tltcl/tltcl.tcl:608 #: texmf-dist/scripts/tlshell/tlshell.tcl:158 msgid "Ok" msgstr "OK" @@ -543,7 +543,7 @@ msgstr "Portabilní nastavení" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1231 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1240 -#: tlpkg/installer/install-tl-gui.tcl:1478 +#: tlpkg/installer/install-tl-gui.tcl:1479 msgid "Toggle" msgstr "Přepnout" @@ -569,7 +569,7 @@ msgstr "TEXMFHOME (adresář pro uživatelské soubory)" #: tlpkg/installer/install-menu-perltk.pl:440 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513 -#: tlpkg/installer/install-tl-gui.tcl:1561 +#: tlpkg/installer/install-tl-gui.tcl:1562 #: texmf-dist/scripts/tlshell/tlshell.tcl:771 #: texmf-dist/scripts/tlshell/tlshell.tcl:2029 #: texmf-dist/scripts/tlshell/tlshell.tcl:2093 @@ -577,22 +577,22 @@ msgid "Options" msgstr "Volby" #: tlpkg/installer/install-menu-perltk.pl:458 -#: tlpkg/installer/install-tl-gui.tcl:1581 +#: tlpkg/installer/install-tl-gui.tcl:1582 msgid "Allow execution of restricted list of programs via \\write18" msgstr "Povolení spouštění omezeného seznamu programů pomocí \\write18" #: tlpkg/installer/install-menu-perltk.pl:473 -#: tlpkg/installer/install-tl-gui.tcl:1588 +#: tlpkg/installer/install-tl-gui.tcl:1589 msgid "Create all format files" msgstr "Vytvořit všechny formáty" #: tlpkg/installer/install-menu-perltk.pl:485 -#: tlpkg/installer/install-tl-gui.tcl:1596 +#: tlpkg/installer/install-tl-gui.tcl:1597 msgid "Install font/macro doc tree" msgstr "Instalovat dokumentaci fontů/maker" #: tlpkg/installer/install-menu-perltk.pl:498 -#: tlpkg/installer/install-tl-gui.tcl:1606 +#: tlpkg/installer/install-tl-gui.tcl:1607 msgid "Install font/macro source tree" msgstr "Instalovat zdrojové soubory fontů/maker" @@ -602,7 +602,7 @@ msgid "Create symlinks in system directories" msgstr "Vytvořit symbolické linky v systémových adresářích" #: tlpkg/installer/install-menu-perltk.pl:585 -#: tlpkg/installer/install-tl-gui.tcl:1699 +#: tlpkg/installer/install-tl-gui.tcl:1700 msgid "After install, set CTAN as source for package updates" msgstr "Po instalaci nastavte CTAN jako zdroj aktualizace balíků" @@ -1172,7 +1172,7 @@ msgid "Create shortcuts on the desktop" msgstr "Vytvořit zkratky na ploše" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1236 -#: tlpkg/installer/install-tl-gui.tcl:1651 +#: tlpkg/installer/install-tl-gui.tcl:1652 msgid "Install for all users" msgstr "Nainstaluj pro všechny uživatele" @@ -1496,12 +1496,12 @@ msgid "Abort" msgstr "Zruš" #: tlpkg/installer/install-tl-gui.tcl:410 -#: tlpkg/installer/install-tl-gui.tcl:1910 +#: tlpkg/installer/install-tl-gui.tcl:1911 msgid "TeX Live Installer" msgstr "Instalátor TeX Live" #: tlpkg/installer/install-tl-gui.tcl:413 -#: tlpkg/installer/install-tl-gui.tcl:2009 +#: tlpkg/installer/install-tl-gui.tcl:2010 #, tcl-format msgid "" "Trying to load %s.\n" @@ -1543,13 +1543,13 @@ msgid "Remove year" msgstr "Odstraň rok" #: tlpkg/installer/install-tl-gui.tcl:611 -#: tlpkg/installer/install-tl-gui.tcl:1385 -#: tlpkg/installer/install-tl-gui.tcl:1393 +#: tlpkg/installer/install-tl-gui.tcl:1386 +#: tlpkg/installer/install-tl-gui.tcl:1394 msgid "Installation root" msgstr "Kořenový instalační adresář" #: tlpkg/installer/install-tl-gui.tcl:639 -#: tlpkg/installer/install-tl-gui.tcl:1280 tlpkg/tltcl/tltcl.tcl:578 +#: tlpkg/installer/install-tl-gui.tcl:1281 tlpkg/tltcl/tltcl.tcl:600 msgid "Browse..." msgstr "Procházej..." @@ -1567,7 +1567,7 @@ msgid "Cannot deselect own platform" msgstr "Nemohu odvybrat vlastní platformu" #: tlpkg/installer/install-tl-gui.tcl:923 -#: tlpkg/installer/install-tl-gui.tcl:1284 +#: tlpkg/installer/install-tl-gui.tcl:1285 msgid "Binaries" msgstr "Binárky" @@ -1591,52 +1591,52 @@ msgstr "Jazyky" msgid "Other collections" msgstr "Ostatní kolekce" -#: tlpkg/installer/install-tl-gui.tcl:1237 +#: tlpkg/installer/install-tl-gui.tcl:1238 msgid "Warning. Not all configured directories are writable!" msgstr "Varování. Ne všechny konfigurovatelné adresáře jsou zapisovatelné!" -#: tlpkg/installer/install-tl-gui.tcl:1257 +#: tlpkg/installer/install-tl-gui.tcl:1258 msgid "Symlinks" msgstr "Symbolické odkazy" -#: tlpkg/installer/install-tl-gui.tcl:1285 +#: tlpkg/installer/install-tl-gui.tcl:1286 msgid "Man pages" msgstr "Manové stránky" -#: tlpkg/installer/install-tl-gui.tcl:1286 +#: tlpkg/installer/install-tl-gui.tcl:1287 msgid "Info pages" msgstr "Informační stránky" -#: tlpkg/installer/install-tl-gui.tcl:1340 +#: tlpkg/installer/install-tl-gui.tcl:1341 #, tcl-format msgid "TeX Live %s Installer" msgstr "Instalační program TeX Live %s" -#: tlpkg/installer/install-tl-gui.tcl:1358 +#: tlpkg/installer/install-tl-gui.tcl:1359 msgid "Advanced" msgstr "Pokročilý" -#: tlpkg/installer/install-tl-gui.tcl:1388 +#: tlpkg/installer/install-tl-gui.tcl:1389 msgid "Directories" msgstr "Adresáře" -#: tlpkg/installer/install-tl-gui.tcl:1407 +#: tlpkg/installer/install-tl-gui.tcl:1408 msgid "Main tree" msgstr "Hlavní strom" -#: tlpkg/installer/install-tl-gui.tcl:1430 +#: tlpkg/installer/install-tl-gui.tcl:1431 msgid "Local additions" msgstr "Lokální přídavky" -#: tlpkg/installer/install-tl-gui.tcl:1439 +#: tlpkg/installer/install-tl-gui.tcl:1440 msgid "Per-user additions" msgstr "Přídavky jednotlivých uživatelů" -#: tlpkg/installer/install-tl-gui.tcl:1466 +#: tlpkg/installer/install-tl-gui.tcl:1467 msgid "More ..." msgstr "Více ..." -#: tlpkg/installer/install-tl-gui.tcl:1475 +#: tlpkg/installer/install-tl-gui.tcl:1476 msgid "" "Portable setup:\n" "May reset TEXMFLOCAL\n" @@ -1646,76 +1646,76 @@ msgstr "" "Může zrušit nastavení TEXMFLOCAL\n" "a TEXMFHOME" -#: tlpkg/installer/install-tl-gui.tcl:1489 +#: tlpkg/installer/install-tl-gui.tcl:1490 #: texmf-dist/scripts/tlshell/tlshell.tcl:1338 #: texmf-dist/scripts/tlshell/tlshell.tcl:2127 msgid "Platforms" msgstr "Platformy" -#: tlpkg/installer/install-tl-gui.tcl:1495 +#: tlpkg/installer/install-tl-gui.tcl:1496 msgid "Current platform:" msgstr "Aktuální platforma" -#: tlpkg/installer/install-tl-gui.tcl:1502 +#: tlpkg/installer/install-tl-gui.tcl:1503 msgid "N. of additional platform(s):" msgstr "Počet dalších platforem:" -#: tlpkg/installer/install-tl-gui.tcl:1515 +#: tlpkg/installer/install-tl-gui.tcl:1516 msgid "Selections" msgstr "Výběry" -#: tlpkg/installer/install-tl-gui.tcl:1520 +#: tlpkg/installer/install-tl-gui.tcl:1521 msgid "Scheme:" msgstr "Schéma:" -#: tlpkg/installer/install-tl-gui.tcl:1529 +#: tlpkg/installer/install-tl-gui.tcl:1530 msgid "N. of collections:" msgstr "Počet kolekcí:" -#: tlpkg/installer/install-tl-gui.tcl:1532 +#: tlpkg/installer/install-tl-gui.tcl:1533 msgid "Customize" msgstr "Přizpůsobení" -#: tlpkg/installer/install-tl-gui.tcl:1541 +#: tlpkg/installer/install-tl-gui.tcl:1542 msgid "Disk space required (in MB):" msgstr "Požadovaná disková kapacita (v MB):" -#: tlpkg/installer/install-tl-gui.tcl:1619 +#: tlpkg/installer/install-tl-gui.tcl:1620 msgid "Adjust searchpath" msgstr "Přizpůsob vyhledávací cestu" -#: tlpkg/installer/install-tl-gui.tcl:1628 +#: tlpkg/installer/install-tl-gui.tcl:1629 msgid "Desktop integration" msgstr "Integrace desktopu" -#: tlpkg/installer/install-tl-gui.tcl:1640 +#: tlpkg/installer/install-tl-gui.tcl:1641 msgid "File associations" msgstr "Asociace typů souborů" -#: tlpkg/installer/install-tl-gui.tcl:1679 +#: tlpkg/installer/install-tl-gui.tcl:1680 msgid "Create symlinks in standard directories" msgstr "Vytvářet symbolické linky ve standardní adresářích" -#: tlpkg/installer/install-tl-gui.tcl:1685 +#: tlpkg/installer/install-tl-gui.tcl:1686 msgid "Specify directories" msgstr "Specifikovat adresáře" -#: tlpkg/installer/install-tl-gui.tcl:1750 +#: tlpkg/installer/install-tl-gui.tcl:1751 msgid "Custom scheme" msgstr "Přizpůsobení schématu" -#: tlpkg/installer/install-tl-gui.tcl:1935 +#: tlpkg/installer/install-tl-gui.tcl:1936 #, tcl-format msgid "%s not a local or remote repository" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1936 -#: tlpkg/installer/install-tl-gui.tcl:1942 +#: tlpkg/installer/install-tl-gui.tcl:1937 +#: tlpkg/installer/install-tl-gui.tcl:1943 #: texmf-dist/scripts/tlshell/tlshell.tcl:2030 msgid "Error" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1941 +#: tlpkg/installer/install-tl-gui.tcl:1942 #, tcl-format msgid "%s requires an argument" msgstr "" @@ -1728,7 +1728,7 @@ msgstr "Specifické zrcadlo..." msgid "No mirror list available" msgstr "" -#: tlpkg/tltcl/tltcl.tcl:661 +#: tlpkg/tltcl/tltcl.tcl:683 msgid "Select or type" msgstr "Vyberte nebo napište" diff --git a/systems/texlive/tlnet/tlpkg/translations/de.po b/systems/texlive/tlnet/tlpkg/translations/de.po index c5e91b8800..3206b8dd2c 100644 --- a/systems/texlive/tlnet/tlpkg/translations/de.po +++ b/systems/texlive/tlnet/tlpkg/translations/de.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: TeX Live translation\n" "Report-Msgid-Bugs-To: tex-live@tug.org\n" -"POT-Creation-Date: 2020-02-08 01:55+0100\n" +"POT-Creation-Date: 2020-02-16 19:07+0100\n" "PO-Revision-Date: 2019-03-26 06:10+0100\n" "Last-Translator: Uwe Ziegenhagen <ziegenhagen@gmail.com>\n" "Language-Team: TL German Translation Team <tex-live@tug.org>\n" @@ -46,7 +46,7 @@ msgstr "Installation" #: tlpkg/installer/install-tl-gui.tcl:933 #: tlpkg/installer/install-tl-gui.tcl:1003 #: tlpkg/installer/install-tl-gui.tcl:1083 -#: tlpkg/installer/install-tl-gui.tcl:1302 tlpkg/tltcl/tltcl.tcl:588 +#: tlpkg/installer/install-tl-gui.tcl:1303 tlpkg/tltcl/tltcl.tcl:610 #: texmf-dist/scripts/tlshell/tlshell.tcl:168 #: texmf-dist/scripts/tlshell/tlshell.tcl:1261 msgid "Cancel" @@ -62,7 +62,7 @@ msgstr "Beenden" #: tlpkg/installer/install-menu-wizard.pl:41 #: tlpkg/installer/install-menu-perltk.pl:445 -#: tlpkg/installer/install-tl-gui.tcl:1570 +#: tlpkg/installer/install-tl-gui.tcl:1571 msgid "Default paper size" msgstr "Standard-Papierformat" @@ -91,7 +91,7 @@ msgstr "Installation für alle Benutzer" #: tlpkg/installer/install-menu-wizard.pl:46 #: tlpkg/installer/install-menu-perltk.pl:569 -#: tlpkg/installer/install-tl-gui.tcl:1662 +#: tlpkg/installer/install-tl-gui.tcl:1663 msgid "Install TeXworks front end" msgstr "Installiere TeXworks als Frontend" @@ -106,7 +106,7 @@ msgstr "TeX Live %s Installation" #: tlpkg/installer/install-menu-perltk.pl:630 #: tlpkg/installer/install-menu-perltk.pl:676 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544 -#: tlpkg/installer/install-tl-gui.tcl:1353 +#: tlpkg/installer/install-tl-gui.tcl:1354 #: texmf-dist/scripts/tlshell/tlshell.tcl:2153 msgid "Quit" msgstr "Beenden" @@ -276,15 +276,15 @@ msgstr "Zielverzeichnis:" #: texmf-dist/scripts/texlive/tlmgrgui.pl:2438 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2443 #: tlpkg/installer/install-tl-gui.tcl:642 -#: tlpkg/installer/install-tl-gui.tcl:1401 -#: tlpkg/installer/install-tl-gui.tcl:1417 -#: tlpkg/installer/install-tl-gui.tcl:1425 -#: tlpkg/installer/install-tl-gui.tcl:1435 -#: tlpkg/installer/install-tl-gui.tcl:1444 -#: tlpkg/installer/install-tl-gui.tcl:1452 -#: tlpkg/installer/install-tl-gui.tcl:1459 -#: tlpkg/installer/install-tl-gui.tcl:1505 -#: tlpkg/installer/install-tl-gui.tcl:1524 +#: tlpkg/installer/install-tl-gui.tcl:1402 +#: tlpkg/installer/install-tl-gui.tcl:1418 +#: tlpkg/installer/install-tl-gui.tcl:1426 +#: tlpkg/installer/install-tl-gui.tcl:1436 +#: tlpkg/installer/install-tl-gui.tcl:1445 +#: tlpkg/installer/install-tl-gui.tcl:1453 +#: tlpkg/installer/install-tl-gui.tcl:1460 +#: tlpkg/installer/install-tl-gui.tcl:1506 +#: tlpkg/installer/install-tl-gui.tcl:1525 msgid "Change" msgstr "Ändern" @@ -359,7 +359,7 @@ msgstr "Nein" #: tlpkg/installer/install-menu-wizard.pl:604 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456 -#: tlpkg/installer/install-tl-gui.tcl:1351 +#: tlpkg/installer/install-tl-gui.tcl:1352 #: texmf-dist/scripts/tlshell/tlshell.tcl:1899 msgid "Install" msgstr "Installation" @@ -369,20 +369,20 @@ msgstr "Installation" #: texmf-dist/scripts/texlive/tlmgrgui.pl:143 #: tlpkg/installer/install-tl-gui.tcl:862 #: tlpkg/installer/install-tl-gui.tcl:1099 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "None" msgstr "Keine(n)" #: tlpkg/installer/install-menu-perltk.pl:49 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "Only new" msgstr "Nur neue" #: tlpkg/installer/install-menu-perltk.pl:50 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145 #: tlpkg/installer/install-tl-gui.tcl:1096 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 #: texmf-dist/scripts/tlshell/tlshell.tcl:2212 #: texmf-dist/scripts/tlshell/tlshell.tcl:2229 msgid "All" @@ -398,17 +398,17 @@ msgid "letter" msgstr "Letter" #: tlpkg/installer/install-menu-perltk.pl:55 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "No shortcuts" msgstr "Keine Menülinks" #: tlpkg/installer/install-menu-perltk.pl:56 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "TeX Live menu" msgstr "TeX Live Menü" #: tlpkg/installer/install-menu-perltk.pl:57 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "Launcher entry" msgstr "Eintrag im Startmenü" @@ -477,7 +477,7 @@ msgstr "Bitte einen anderen Spiegelserver wählen." #: tlpkg/installer/install-tl-gui.tcl:930 #: tlpkg/installer/install-tl-gui.tcl:986 #: tlpkg/installer/install-tl-gui.tcl:1080 -#: tlpkg/installer/install-tl-gui.tcl:1300 tlpkg/tltcl/tltcl.tcl:586 +#: tlpkg/installer/install-tl-gui.tcl:1301 tlpkg/tltcl/tltcl.tcl:608 #: texmf-dist/scripts/tlshell/tlshell.tcl:158 msgid "Ok" msgstr "Ok" @@ -544,7 +544,7 @@ msgstr "Portable Installation" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1231 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1240 -#: tlpkg/installer/install-tl-gui.tcl:1478 +#: tlpkg/installer/install-tl-gui.tcl:1479 msgid "Toggle" msgstr "Ändern" @@ -570,7 +570,7 @@ msgstr "TEXMFHOME (Eigene Makro-Pakete)" #: tlpkg/installer/install-menu-perltk.pl:440 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513 -#: tlpkg/installer/install-tl-gui.tcl:1561 +#: tlpkg/installer/install-tl-gui.tcl:1562 #: texmf-dist/scripts/tlshell/tlshell.tcl:771 #: texmf-dist/scripts/tlshell/tlshell.tcl:2029 #: texmf-dist/scripts/tlshell/tlshell.tcl:2093 @@ -578,22 +578,22 @@ msgid "Options" msgstr "Optionen" #: tlpkg/installer/install-menu-perltk.pl:458 -#: tlpkg/installer/install-tl-gui.tcl:1581 +#: tlpkg/installer/install-tl-gui.tcl:1582 msgid "Allow execution of restricted list of programs via \\write18" msgstr "Ausführen einer eingeschränkten Liste von Programmen via \\write18" #: tlpkg/installer/install-menu-perltk.pl:473 -#: tlpkg/installer/install-tl-gui.tcl:1588 +#: tlpkg/installer/install-tl-gui.tcl:1589 msgid "Create all format files" msgstr "Alle Formatdateien erstellen" #: tlpkg/installer/install-menu-perltk.pl:485 -#: tlpkg/installer/install-tl-gui.tcl:1596 +#: tlpkg/installer/install-tl-gui.tcl:1597 msgid "Install font/macro doc tree" msgstr "Installation der Font/Macro-Dokumentation" #: tlpkg/installer/install-menu-perltk.pl:498 -#: tlpkg/installer/install-tl-gui.tcl:1606 +#: tlpkg/installer/install-tl-gui.tcl:1607 msgid "Install font/macro source tree" msgstr "Installation der Font/Macro-Quellen" @@ -603,7 +603,7 @@ msgid "Create symlinks in system directories" msgstr "Symbolische Links in Systemverzeichnissen" #: tlpkg/installer/install-menu-perltk.pl:585 -#: tlpkg/installer/install-tl-gui.tcl:1699 +#: tlpkg/installer/install-tl-gui.tcl:1700 msgid "After install, set CTAN as source for package updates" msgstr "Setze nach der Installation CTAN als Paketquelle" @@ -1174,7 +1174,7 @@ msgid "Create shortcuts on the desktop" msgstr "Erstelle Verknüpfungen auf dem Desktop" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1236 -#: tlpkg/installer/install-tl-gui.tcl:1651 +#: tlpkg/installer/install-tl-gui.tcl:1652 msgid "Install for all users" msgstr "Installiere für alle Nutzer" @@ -1498,12 +1498,12 @@ msgid "Abort" msgstr "Breche ab" #: tlpkg/installer/install-tl-gui.tcl:410 -#: tlpkg/installer/install-tl-gui.tcl:1910 +#: tlpkg/installer/install-tl-gui.tcl:1911 msgid "TeX Live Installer" msgstr "TeX Live Installationsprogramm" #: tlpkg/installer/install-tl-gui.tcl:413 -#: tlpkg/installer/install-tl-gui.tcl:2009 +#: tlpkg/installer/install-tl-gui.tcl:2010 #, tcl-format msgid "" "Trying to load %s.\n" @@ -1545,13 +1545,13 @@ msgid "Remove year" msgstr "Entferne Jahr" #: tlpkg/installer/install-tl-gui.tcl:611 -#: tlpkg/installer/install-tl-gui.tcl:1385 -#: tlpkg/installer/install-tl-gui.tcl:1393 +#: tlpkg/installer/install-tl-gui.tcl:1386 +#: tlpkg/installer/install-tl-gui.tcl:1394 msgid "Installation root" msgstr "Stammverzeichnis für die Installation" #: tlpkg/installer/install-tl-gui.tcl:639 -#: tlpkg/installer/install-tl-gui.tcl:1280 tlpkg/tltcl/tltcl.tcl:578 +#: tlpkg/installer/install-tl-gui.tcl:1281 tlpkg/tltcl/tltcl.tcl:600 msgid "Browse..." msgstr "Browse..." @@ -1570,7 +1570,7 @@ msgid "Cannot deselect own platform" msgstr "Die eigene Plattform kann nicht abgewählt werden" #: tlpkg/installer/install-tl-gui.tcl:923 -#: tlpkg/installer/install-tl-gui.tcl:1284 +#: tlpkg/installer/install-tl-gui.tcl:1285 msgid "Binaries" msgstr "Binärdateien" @@ -1594,52 +1594,52 @@ msgstr "Sprachen" msgid "Other collections" msgstr "Andere Sammlungen" -#: tlpkg/installer/install-tl-gui.tcl:1237 +#: tlpkg/installer/install-tl-gui.tcl:1238 msgid "Warning. Not all configured directories are writable!" msgstr "Warnung: Nicht alle konfigurierten Verzeichnisse sind beschreibbar!" -#: tlpkg/installer/install-tl-gui.tcl:1257 +#: tlpkg/installer/install-tl-gui.tcl:1258 msgid "Symlinks" msgstr "Symbolische Links" -#: tlpkg/installer/install-tl-gui.tcl:1285 +#: tlpkg/installer/install-tl-gui.tcl:1286 msgid "Man pages" msgstr "Man pages" -#: tlpkg/installer/install-tl-gui.tcl:1286 +#: tlpkg/installer/install-tl-gui.tcl:1287 msgid "Info pages" msgstr "Info pages" -#: tlpkg/installer/install-tl-gui.tcl:1340 +#: tlpkg/installer/install-tl-gui.tcl:1341 #, tcl-format msgid "TeX Live %s Installer" msgstr "TeX Live %s Installationsprogramm" -#: tlpkg/installer/install-tl-gui.tcl:1358 +#: tlpkg/installer/install-tl-gui.tcl:1359 msgid "Advanced" msgstr "Fortgeschritten" -#: tlpkg/installer/install-tl-gui.tcl:1388 +#: tlpkg/installer/install-tl-gui.tcl:1389 msgid "Directories" msgstr "Verzeichnisse" -#: tlpkg/installer/install-tl-gui.tcl:1407 +#: tlpkg/installer/install-tl-gui.tcl:1408 msgid "Main tree" msgstr "Support Ast" -#: tlpkg/installer/install-tl-gui.tcl:1430 +#: tlpkg/installer/install-tl-gui.tcl:1431 msgid "Local additions" msgstr "Lokale Ergänzungen" -#: tlpkg/installer/install-tl-gui.tcl:1439 +#: tlpkg/installer/install-tl-gui.tcl:1440 msgid "Per-user additions" msgstr "Ergänzungen pro Nutzer" -#: tlpkg/installer/install-tl-gui.tcl:1466 +#: tlpkg/installer/install-tl-gui.tcl:1467 msgid "More ..." msgstr "Mehr ..." -#: tlpkg/installer/install-tl-gui.tcl:1475 +#: tlpkg/installer/install-tl-gui.tcl:1476 msgid "" "Portable setup:\n" "May reset TEXMFLOCAL\n" @@ -1649,76 +1649,76 @@ msgstr "" "Kann TEXMFLOCAL\n" "und TEXMFHOME resetten" -#: tlpkg/installer/install-tl-gui.tcl:1489 +#: tlpkg/installer/install-tl-gui.tcl:1490 #: texmf-dist/scripts/tlshell/tlshell.tcl:1338 #: texmf-dist/scripts/tlshell/tlshell.tcl:2127 msgid "Platforms" msgstr "Plattformen" -#: tlpkg/installer/install-tl-gui.tcl:1495 +#: tlpkg/installer/install-tl-gui.tcl:1496 msgid "Current platform:" msgstr "Aktuelle Plattform:" -#: tlpkg/installer/install-tl-gui.tcl:1502 +#: tlpkg/installer/install-tl-gui.tcl:1503 msgid "N. of additional platform(s):" msgstr "Anzahl der zusätzlichen Plattformen:" -#: tlpkg/installer/install-tl-gui.tcl:1515 +#: tlpkg/installer/install-tl-gui.tcl:1516 msgid "Selections" msgstr "Selektionen" -#: tlpkg/installer/install-tl-gui.tcl:1520 +#: tlpkg/installer/install-tl-gui.tcl:1521 msgid "Scheme:" msgstr "Schema:" -#: tlpkg/installer/install-tl-gui.tcl:1529 +#: tlpkg/installer/install-tl-gui.tcl:1530 msgid "N. of collections:" msgstr "Anzahl der Sammlungen:" -#: tlpkg/installer/install-tl-gui.tcl:1532 +#: tlpkg/installer/install-tl-gui.tcl:1533 msgid "Customize" msgstr "Anpassen" -#: tlpkg/installer/install-tl-gui.tcl:1541 +#: tlpkg/installer/install-tl-gui.tcl:1542 msgid "Disk space required (in MB):" msgstr "Benötigter Speicherplatz (in MB):" -#: tlpkg/installer/install-tl-gui.tcl:1619 +#: tlpkg/installer/install-tl-gui.tcl:1620 msgid "Adjust searchpath" msgstr "Passe Suchpfad an" -#: tlpkg/installer/install-tl-gui.tcl:1628 +#: tlpkg/installer/install-tl-gui.tcl:1629 msgid "Desktop integration" msgstr "Desktop Integration" -#: tlpkg/installer/install-tl-gui.tcl:1640 +#: tlpkg/installer/install-tl-gui.tcl:1641 msgid "File associations" msgstr "Dateiverknüpfungen" -#: tlpkg/installer/install-tl-gui.tcl:1679 +#: tlpkg/installer/install-tl-gui.tcl:1680 msgid "Create symlinks in standard directories" msgstr "Erstelle Symlinks in Standardverzeichnissen" -#: tlpkg/installer/install-tl-gui.tcl:1685 +#: tlpkg/installer/install-tl-gui.tcl:1686 msgid "Specify directories" msgstr "Wähle Verzeichnisse" -#: tlpkg/installer/install-tl-gui.tcl:1750 +#: tlpkg/installer/install-tl-gui.tcl:1751 msgid "Custom scheme" msgstr "Angepasstes Schema" -#: tlpkg/installer/install-tl-gui.tcl:1935 +#: tlpkg/installer/install-tl-gui.tcl:1936 #, tcl-format msgid "%s not a local or remote repository" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1936 -#: tlpkg/installer/install-tl-gui.tcl:1942 +#: tlpkg/installer/install-tl-gui.tcl:1937 +#: tlpkg/installer/install-tl-gui.tcl:1943 #: texmf-dist/scripts/tlshell/tlshell.tcl:2030 msgid "Error" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1941 +#: tlpkg/installer/install-tl-gui.tcl:1942 #, tcl-format msgid "%s requires an argument" msgstr "" @@ -1731,7 +1731,7 @@ msgstr "Spezifischer CTAN-Mirror..." msgid "No mirror list available" msgstr "" -#: tlpkg/tltcl/tltcl.tcl:661 +#: tlpkg/tltcl/tltcl.tcl:683 msgid "Select or type" msgstr "Wähle aus oder tippe ein" diff --git a/systems/texlive/tlnet/tlpkg/translations/es.po b/systems/texlive/tlnet/tlpkg/translations/es.po index e0e3df6888..1504e009fb 100644 --- a/systems/texlive/tlnet/tlpkg/translations/es.po +++ b/systems/texlive/tlnet/tlpkg/translations/es.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: TeX Live translation\n" "Report-Msgid-Bugs-To: tex-live@tug.org\n" -"POT-Creation-Date: 2020-02-08 01:55+0100\n" +"POT-Creation-Date: 2020-02-16 19:07+0100\n" "PO-Revision-Date: 2019-03-30 17:58-0400\n" "Last-Translator: linguafalsa <linguafalsa@gmail.com>\n" "Language-Team: TL Translation Team <tex-live@tug.org>\n" @@ -48,7 +48,7 @@ msgstr "Proceso de instalación" #: tlpkg/installer/install-tl-gui.tcl:933 #: tlpkg/installer/install-tl-gui.tcl:1003 #: tlpkg/installer/install-tl-gui.tcl:1083 -#: tlpkg/installer/install-tl-gui.tcl:1302 tlpkg/tltcl/tltcl.tcl:588 +#: tlpkg/installer/install-tl-gui.tcl:1303 tlpkg/tltcl/tltcl.tcl:610 #: texmf-dist/scripts/tlshell/tlshell.tcl:168 #: texmf-dist/scripts/tlshell/tlshell.tcl:1261 msgid "Cancel" @@ -64,7 +64,7 @@ msgstr "Terminar" #: tlpkg/installer/install-menu-wizard.pl:41 #: tlpkg/installer/install-menu-perltk.pl:445 -#: tlpkg/installer/install-tl-gui.tcl:1570 +#: tlpkg/installer/install-tl-gui.tcl:1571 msgid "Default paper size" msgstr "Tamaño de papel estándar" @@ -93,7 +93,7 @@ msgstr "Instalación para todos los usuarios" #: tlpkg/installer/install-menu-wizard.pl:46 #: tlpkg/installer/install-menu-perltk.pl:569 -#: tlpkg/installer/install-tl-gui.tcl:1662 +#: tlpkg/installer/install-tl-gui.tcl:1663 msgid "Install TeXworks front end" msgstr "Instalar el editor gráfico TeXworks" @@ -108,7 +108,7 @@ msgstr "Instalación de TeX Live %s" #: tlpkg/installer/install-menu-perltk.pl:630 #: tlpkg/installer/install-menu-perltk.pl:676 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544 -#: tlpkg/installer/install-tl-gui.tcl:1353 +#: tlpkg/installer/install-tl-gui.tcl:1354 #: texmf-dist/scripts/tlshell/tlshell.tcl:2153 msgid "Quit" msgstr "Salir" @@ -278,15 +278,15 @@ msgstr "Carpeta de instalación:" #: texmf-dist/scripts/texlive/tlmgrgui.pl:2438 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2443 #: tlpkg/installer/install-tl-gui.tcl:642 -#: tlpkg/installer/install-tl-gui.tcl:1401 -#: tlpkg/installer/install-tl-gui.tcl:1417 -#: tlpkg/installer/install-tl-gui.tcl:1425 -#: tlpkg/installer/install-tl-gui.tcl:1435 -#: tlpkg/installer/install-tl-gui.tcl:1444 -#: tlpkg/installer/install-tl-gui.tcl:1452 -#: tlpkg/installer/install-tl-gui.tcl:1459 -#: tlpkg/installer/install-tl-gui.tcl:1505 -#: tlpkg/installer/install-tl-gui.tcl:1524 +#: tlpkg/installer/install-tl-gui.tcl:1402 +#: tlpkg/installer/install-tl-gui.tcl:1418 +#: tlpkg/installer/install-tl-gui.tcl:1426 +#: tlpkg/installer/install-tl-gui.tcl:1436 +#: tlpkg/installer/install-tl-gui.tcl:1445 +#: tlpkg/installer/install-tl-gui.tcl:1453 +#: tlpkg/installer/install-tl-gui.tcl:1460 +#: tlpkg/installer/install-tl-gui.tcl:1506 +#: tlpkg/installer/install-tl-gui.tcl:1525 msgid "Change" msgstr "Cambiar" @@ -363,7 +363,7 @@ msgstr "No" #: tlpkg/installer/install-menu-wizard.pl:604 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456 -#: tlpkg/installer/install-tl-gui.tcl:1351 +#: tlpkg/installer/install-tl-gui.tcl:1352 #: texmf-dist/scripts/tlshell/tlshell.tcl:1899 msgid "Install" msgstr "Instalar" @@ -373,20 +373,20 @@ msgstr "Instalar" #: texmf-dist/scripts/texlive/tlmgrgui.pl:143 #: tlpkg/installer/install-tl-gui.tcl:862 #: tlpkg/installer/install-tl-gui.tcl:1099 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "None" msgstr "Ninguna" #: tlpkg/installer/install-menu-perltk.pl:49 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "Only new" msgstr "Sólo nuevas" #: tlpkg/installer/install-menu-perltk.pl:50 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145 #: tlpkg/installer/install-tl-gui.tcl:1096 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 #: texmf-dist/scripts/tlshell/tlshell.tcl:2212 #: texmf-dist/scripts/tlshell/tlshell.tcl:2229 msgid "All" @@ -402,17 +402,17 @@ msgid "letter" msgstr "carta" #: tlpkg/installer/install-menu-perltk.pl:55 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "No shortcuts" msgstr "No accesos rápidos" #: tlpkg/installer/install-menu-perltk.pl:56 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "TeX Live menu" msgstr "Menú de TeX Live" #: tlpkg/installer/install-menu-perltk.pl:57 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "Launcher entry" msgstr "Ingreso del lanzador" @@ -481,7 +481,7 @@ msgstr "Por favor seleccione un espejo diferente." #: tlpkg/installer/install-tl-gui.tcl:930 #: tlpkg/installer/install-tl-gui.tcl:986 #: tlpkg/installer/install-tl-gui.tcl:1080 -#: tlpkg/installer/install-tl-gui.tcl:1300 tlpkg/tltcl/tltcl.tcl:586 +#: tlpkg/installer/install-tl-gui.tcl:1301 tlpkg/tltcl/tltcl.tcl:608 #: texmf-dist/scripts/tlshell/tlshell.tcl:158 msgid "Ok" msgstr "Aceptar" @@ -548,7 +548,7 @@ msgstr "Preferencias portables" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1231 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1240 -#: tlpkg/installer/install-tl-gui.tcl:1478 +#: tlpkg/installer/install-tl-gui.tcl:1479 msgid "Toggle" msgstr "Cambiar (sí/no)" @@ -574,7 +574,7 @@ msgstr "TEXMFHOME (directorio de ficheros personales del usuario)" #: tlpkg/installer/install-menu-perltk.pl:440 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513 -#: tlpkg/installer/install-tl-gui.tcl:1561 +#: tlpkg/installer/install-tl-gui.tcl:1562 #: texmf-dist/scripts/tlshell/tlshell.tcl:771 #: texmf-dist/scripts/tlshell/tlshell.tcl:2029 #: texmf-dist/scripts/tlshell/tlshell.tcl:2093 @@ -582,24 +582,24 @@ msgid "Options" msgstr "Opciones" #: tlpkg/installer/install-menu-perltk.pl:458 -#: tlpkg/installer/install-tl-gui.tcl:1581 +#: tlpkg/installer/install-tl-gui.tcl:1582 msgid "Allow execution of restricted list of programs via \\write18" msgstr "" "Permita la ejecución de programas de la lista restricta\n" "a través de \\write18" #: tlpkg/installer/install-menu-perltk.pl:473 -#: tlpkg/installer/install-tl-gui.tcl:1588 +#: tlpkg/installer/install-tl-gui.tcl:1589 msgid "Create all format files" msgstr "Crear todos los archivos de formato" #: tlpkg/installer/install-menu-perltk.pl:485 -#: tlpkg/installer/install-tl-gui.tcl:1596 +#: tlpkg/installer/install-tl-gui.tcl:1597 msgid "Install font/macro doc tree" msgstr "Instalar la documentación de tipos de letra y macros" #: tlpkg/installer/install-menu-perltk.pl:498 -#: tlpkg/installer/install-tl-gui.tcl:1606 +#: tlpkg/installer/install-tl-gui.tcl:1607 msgid "Install font/macro source tree" msgstr "Instalar el árbol de origen de fuentes/macros" @@ -609,7 +609,7 @@ msgid "Create symlinks in system directories" msgstr "Crear enlaces simbólicos en los directorios del sistema" #: tlpkg/installer/install-menu-perltk.pl:585 -#: tlpkg/installer/install-tl-gui.tcl:1699 +#: tlpkg/installer/install-tl-gui.tcl:1700 msgid "After install, set CTAN as source for package updates" msgstr "" "Después de instalar, seleccione a CTAN para actualizar todos los paquetes" @@ -1184,7 +1184,7 @@ msgid "Create shortcuts on the desktop" msgstr "Crea enlaces de acceso rápido en el escritorio" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1236 -#: tlpkg/installer/install-tl-gui.tcl:1651 +#: tlpkg/installer/install-tl-gui.tcl:1652 msgid "Install for all users" msgstr "Instalar para todos los usuarios" @@ -1515,12 +1515,12 @@ msgid "Abort" msgstr "Abortar" #: tlpkg/installer/install-tl-gui.tcl:410 -#: tlpkg/installer/install-tl-gui.tcl:1910 +#: tlpkg/installer/install-tl-gui.tcl:1911 msgid "TeX Live Installer" msgstr "Instalador de TeX Live" #: tlpkg/installer/install-tl-gui.tcl:413 -#: tlpkg/installer/install-tl-gui.tcl:2009 +#: tlpkg/installer/install-tl-gui.tcl:2010 #, tcl-format msgid "" "Trying to load %s.\n" @@ -1562,13 +1562,13 @@ msgid "Remove year" msgstr "Remover año" #: tlpkg/installer/install-tl-gui.tcl:611 -#: tlpkg/installer/install-tl-gui.tcl:1385 -#: tlpkg/installer/install-tl-gui.tcl:1393 +#: tlpkg/installer/install-tl-gui.tcl:1386 +#: tlpkg/installer/install-tl-gui.tcl:1394 msgid "Installation root" msgstr "Raíz de instalación" #: tlpkg/installer/install-tl-gui.tcl:639 -#: tlpkg/installer/install-tl-gui.tcl:1280 tlpkg/tltcl/tltcl.tcl:578 +#: tlpkg/installer/install-tl-gui.tcl:1281 tlpkg/tltcl/tltcl.tcl:600 msgid "Browse..." msgstr "Ojear..." @@ -1587,7 +1587,7 @@ msgid "Cannot deselect own platform" msgstr "No se puede desactivar la propia plataforma" #: tlpkg/installer/install-tl-gui.tcl:923 -#: tlpkg/installer/install-tl-gui.tcl:1284 +#: tlpkg/installer/install-tl-gui.tcl:1285 msgid "Binaries" msgstr "Binarios" @@ -1611,53 +1611,53 @@ msgstr "Lenguajes" msgid "Other collections" msgstr "Otras colecciones" -#: tlpkg/installer/install-tl-gui.tcl:1237 +#: tlpkg/installer/install-tl-gui.tcl:1238 msgid "Warning. Not all configured directories are writable!" msgstr "" "Advertencia: ¡No todos los directorios configurados se pueden escribir!" -#: tlpkg/installer/install-tl-gui.tcl:1257 +#: tlpkg/installer/install-tl-gui.tcl:1258 msgid "Symlinks" msgstr "Enlaces simbólicos" -#: tlpkg/installer/install-tl-gui.tcl:1285 +#: tlpkg/installer/install-tl-gui.tcl:1286 msgid "Man pages" msgstr "Páginas del manual" -#: tlpkg/installer/install-tl-gui.tcl:1286 +#: tlpkg/installer/install-tl-gui.tcl:1287 msgid "Info pages" msgstr "Páginas de información" -#: tlpkg/installer/install-tl-gui.tcl:1340 +#: tlpkg/installer/install-tl-gui.tcl:1341 #, tcl-format msgid "TeX Live %s Installer" msgstr "Instalador de TeX Live %s" -#: tlpkg/installer/install-tl-gui.tcl:1358 +#: tlpkg/installer/install-tl-gui.tcl:1359 msgid "Advanced" msgstr "Avanzado" -#: tlpkg/installer/install-tl-gui.tcl:1388 +#: tlpkg/installer/install-tl-gui.tcl:1389 msgid "Directories" msgstr "Directorios" -#: tlpkg/installer/install-tl-gui.tcl:1407 +#: tlpkg/installer/install-tl-gui.tcl:1408 msgid "Main tree" msgstr "Árbol principal" -#: tlpkg/installer/install-tl-gui.tcl:1430 +#: tlpkg/installer/install-tl-gui.tcl:1431 msgid "Local additions" msgstr "Adiciones locales" -#: tlpkg/installer/install-tl-gui.tcl:1439 +#: tlpkg/installer/install-tl-gui.tcl:1440 msgid "Per-user additions" msgstr "Adiciones por-usuario" -#: tlpkg/installer/install-tl-gui.tcl:1466 +#: tlpkg/installer/install-tl-gui.tcl:1467 msgid "More ..." msgstr "Más ..." -#: tlpkg/installer/install-tl-gui.tcl:1475 +#: tlpkg/installer/install-tl-gui.tcl:1476 msgid "" "Portable setup:\n" "May reset TEXMFLOCAL\n" @@ -1667,76 +1667,76 @@ msgstr "" "Puede restablecer TEXMFLOCAL\n" "y TEXMFHOME" -#: tlpkg/installer/install-tl-gui.tcl:1489 +#: tlpkg/installer/install-tl-gui.tcl:1490 #: texmf-dist/scripts/tlshell/tlshell.tcl:1338 #: texmf-dist/scripts/tlshell/tlshell.tcl:2127 msgid "Platforms" msgstr "Plataformas" -#: tlpkg/installer/install-tl-gui.tcl:1495 +#: tlpkg/installer/install-tl-gui.tcl:1496 msgid "Current platform:" msgstr "Plataforma actual:" -#: tlpkg/installer/install-tl-gui.tcl:1502 +#: tlpkg/installer/install-tl-gui.tcl:1503 msgid "N. of additional platform(s):" msgstr "N. de plataforma(s) adicional(es):" -#: tlpkg/installer/install-tl-gui.tcl:1515 +#: tlpkg/installer/install-tl-gui.tcl:1516 msgid "Selections" msgstr "Selecciones" -#: tlpkg/installer/install-tl-gui.tcl:1520 +#: tlpkg/installer/install-tl-gui.tcl:1521 msgid "Scheme:" msgstr "Esquema:" -#: tlpkg/installer/install-tl-gui.tcl:1529 +#: tlpkg/installer/install-tl-gui.tcl:1530 msgid "N. of collections:" msgstr "N. de colecciones:" -#: tlpkg/installer/install-tl-gui.tcl:1532 +#: tlpkg/installer/install-tl-gui.tcl:1533 msgid "Customize" msgstr "Personalizar" -#: tlpkg/installer/install-tl-gui.tcl:1541 +#: tlpkg/installer/install-tl-gui.tcl:1542 msgid "Disk space required (in MB):" msgstr "Espacio requerido (en MB):" -#: tlpkg/installer/install-tl-gui.tcl:1619 +#: tlpkg/installer/install-tl-gui.tcl:1620 msgid "Adjust searchpath" msgstr "Ajustar la ruta de búsqueda" -#: tlpkg/installer/install-tl-gui.tcl:1628 +#: tlpkg/installer/install-tl-gui.tcl:1629 msgid "Desktop integration" msgstr "Integración del escritorio" -#: tlpkg/installer/install-tl-gui.tcl:1640 +#: tlpkg/installer/install-tl-gui.tcl:1641 msgid "File associations" msgstr "Asociaciones del archivo" -#: tlpkg/installer/install-tl-gui.tcl:1679 +#: tlpkg/installer/install-tl-gui.tcl:1680 msgid "Create symlinks in standard directories" msgstr "Crea enlaces simbólicos en los directorios estándar" -#: tlpkg/installer/install-tl-gui.tcl:1685 +#: tlpkg/installer/install-tl-gui.tcl:1686 msgid "Specify directories" msgstr "Especifica directorios" -#: tlpkg/installer/install-tl-gui.tcl:1750 +#: tlpkg/installer/install-tl-gui.tcl:1751 msgid "Custom scheme" msgstr "Esquema personalizado" -#: tlpkg/installer/install-tl-gui.tcl:1935 +#: tlpkg/installer/install-tl-gui.tcl:1936 #, tcl-format msgid "%s not a local or remote repository" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1936 -#: tlpkg/installer/install-tl-gui.tcl:1942 +#: tlpkg/installer/install-tl-gui.tcl:1937 +#: tlpkg/installer/install-tl-gui.tcl:1943 #: texmf-dist/scripts/tlshell/tlshell.tcl:2030 msgid "Error" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1941 +#: tlpkg/installer/install-tl-gui.tcl:1942 #, tcl-format msgid "%s requires an argument" msgstr "" @@ -1749,7 +1749,7 @@ msgstr "Espejo específico..." msgid "No mirror list available" msgstr "" -#: tlpkg/tltcl/tltcl.tcl:661 +#: tlpkg/tltcl/tltcl.tcl:683 msgid "Select or type" msgstr "Seleccionar o ingresar" diff --git a/systems/texlive/tlnet/tlpkg/translations/fr.po b/systems/texlive/tlnet/tlpkg/translations/fr.po index 7c509242d2..232556053b 100644 --- a/systems/texlive/tlnet/tlpkg/translations/fr.po +++ b/systems/texlive/tlnet/tlpkg/translations/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: TeX Live translation\n" "Report-Msgid-Bugs-To: tex-live@tug.org\n" -"POT-Creation-Date: 2020-02-08 01:55+0100\n" +"POT-Creation-Date: 2020-02-16 19:07+0100\n" "PO-Revision-Date: 2019-05-12 10:49+0100\n" "Last-Translator: Denis Bitouzé <denis.bitouze@univ-littoral.fr>\n" "Language-Team: French <kde-i18n-doc@kde.org>\n" @@ -52,7 +52,7 @@ msgstr "Processus d'installation" #: tlpkg/installer/install-tl-gui.tcl:933 #: tlpkg/installer/install-tl-gui.tcl:1003 #: tlpkg/installer/install-tl-gui.tcl:1083 -#: tlpkg/installer/install-tl-gui.tcl:1302 tlpkg/tltcl/tltcl.tcl:588 +#: tlpkg/installer/install-tl-gui.tcl:1303 tlpkg/tltcl/tltcl.tcl:610 #: texmf-dist/scripts/tlshell/tlshell.tcl:168 #: texmf-dist/scripts/tlshell/tlshell.tcl:1261 msgid "Cancel" @@ -68,7 +68,7 @@ msgstr "Terminer" #: tlpkg/installer/install-menu-wizard.pl:41 #: tlpkg/installer/install-menu-perltk.pl:445 -#: tlpkg/installer/install-tl-gui.tcl:1570 +#: tlpkg/installer/install-tl-gui.tcl:1571 msgid "Default paper size" msgstr "Taille de papier par défaut" @@ -97,7 +97,7 @@ msgstr "Installer pour tous les utilisateurs" #: tlpkg/installer/install-menu-wizard.pl:46 #: tlpkg/installer/install-menu-perltk.pl:569 -#: tlpkg/installer/install-tl-gui.tcl:1662 +#: tlpkg/installer/install-tl-gui.tcl:1663 msgid "Install TeXworks front end" msgstr "Installer l'éditeur intégré TeXworks" @@ -112,7 +112,7 @@ msgstr "Installation de la TeX Live %s" #: tlpkg/installer/install-menu-perltk.pl:630 #: tlpkg/installer/install-menu-perltk.pl:676 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544 -#: tlpkg/installer/install-tl-gui.tcl:1353 +#: tlpkg/installer/install-tl-gui.tcl:1354 #: texmf-dist/scripts/tlshell/tlshell.tcl:2153 msgid "Quit" msgstr "Quitter" @@ -283,15 +283,15 @@ msgstr "Répertoire de destination :" #: texmf-dist/scripts/texlive/tlmgrgui.pl:2438 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2443 #: tlpkg/installer/install-tl-gui.tcl:642 -#: tlpkg/installer/install-tl-gui.tcl:1401 -#: tlpkg/installer/install-tl-gui.tcl:1417 -#: tlpkg/installer/install-tl-gui.tcl:1425 -#: tlpkg/installer/install-tl-gui.tcl:1435 -#: tlpkg/installer/install-tl-gui.tcl:1444 -#: tlpkg/installer/install-tl-gui.tcl:1452 -#: tlpkg/installer/install-tl-gui.tcl:1459 -#: tlpkg/installer/install-tl-gui.tcl:1505 -#: tlpkg/installer/install-tl-gui.tcl:1524 +#: tlpkg/installer/install-tl-gui.tcl:1402 +#: tlpkg/installer/install-tl-gui.tcl:1418 +#: tlpkg/installer/install-tl-gui.tcl:1426 +#: tlpkg/installer/install-tl-gui.tcl:1436 +#: tlpkg/installer/install-tl-gui.tcl:1445 +#: tlpkg/installer/install-tl-gui.tcl:1453 +#: tlpkg/installer/install-tl-gui.tcl:1460 +#: tlpkg/installer/install-tl-gui.tcl:1506 +#: tlpkg/installer/install-tl-gui.tcl:1525 msgid "Change" msgstr "Modifier" @@ -365,7 +365,7 @@ msgstr "Non" #: tlpkg/installer/install-menu-wizard.pl:604 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456 -#: tlpkg/installer/install-tl-gui.tcl:1351 +#: tlpkg/installer/install-tl-gui.tcl:1352 #: texmf-dist/scripts/tlshell/tlshell.tcl:1899 msgid "Install" msgstr "Installer" @@ -375,20 +375,20 @@ msgstr "Installer" #: texmf-dist/scripts/texlive/tlmgrgui.pl:143 #: tlpkg/installer/install-tl-gui.tcl:862 #: tlpkg/installer/install-tl-gui.tcl:1099 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "None" msgstr "Aucun" #: tlpkg/installer/install-menu-perltk.pl:49 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "Only new" msgstr "Seulement les nouveaux" #: tlpkg/installer/install-menu-perltk.pl:50 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145 #: tlpkg/installer/install-tl-gui.tcl:1096 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 #: texmf-dist/scripts/tlshell/tlshell.tcl:2212 #: texmf-dist/scripts/tlshell/tlshell.tcl:2229 msgid "All" @@ -404,17 +404,17 @@ msgid "letter" msgstr "letter" #: tlpkg/installer/install-menu-perltk.pl:55 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "No shortcuts" msgstr "Pas de raccourcis" #: tlpkg/installer/install-menu-perltk.pl:56 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "TeX Live menu" msgstr "Menu TeX Live" #: tlpkg/installer/install-menu-perltk.pl:57 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "Launcher entry" msgstr "Entrée de lanceur" @@ -483,7 +483,7 @@ msgstr "Veuillez choisir un autre miroir." #: tlpkg/installer/install-tl-gui.tcl:930 #: tlpkg/installer/install-tl-gui.tcl:986 #: tlpkg/installer/install-tl-gui.tcl:1080 -#: tlpkg/installer/install-tl-gui.tcl:1300 tlpkg/tltcl/tltcl.tcl:586 +#: tlpkg/installer/install-tl-gui.tcl:1301 tlpkg/tltcl/tltcl.tcl:608 #: texmf-dist/scripts/tlshell/tlshell.tcl:158 msgid "Ok" msgstr "Ok" @@ -550,7 +550,7 @@ msgstr "Options de portabilité" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1231 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1240 -#: tlpkg/installer/install-tl-gui.tcl:1478 +#: tlpkg/installer/install-tl-gui.tcl:1479 msgid "Toggle" msgstr "Basculer" @@ -576,7 +576,7 @@ msgstr "TEXMFHOME (répertoire des fichiers personnels)" #: tlpkg/installer/install-menu-perltk.pl:440 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513 -#: tlpkg/installer/install-tl-gui.tcl:1561 +#: tlpkg/installer/install-tl-gui.tcl:1562 #: texmf-dist/scripts/tlshell/tlshell.tcl:771 #: texmf-dist/scripts/tlshell/tlshell.tcl:2029 #: texmf-dist/scripts/tlshell/tlshell.tcl:2093 @@ -584,22 +584,22 @@ msgid "Options" msgstr "Options" #: tlpkg/installer/install-menu-perltk.pl:458 -#: tlpkg/installer/install-tl-gui.tcl:1581 +#: tlpkg/installer/install-tl-gui.tcl:1582 msgid "Allow execution of restricted list of programs via \\write18" msgstr "Autoriser par défaut l'exécution de certains programmes par \\write18" #: tlpkg/installer/install-menu-perltk.pl:473 -#: tlpkg/installer/install-tl-gui.tcl:1588 +#: tlpkg/installer/install-tl-gui.tcl:1589 msgid "Create all format files" msgstr "Générer tous les formats" #: tlpkg/installer/install-menu-perltk.pl:485 -#: tlpkg/installer/install-tl-gui.tcl:1596 +#: tlpkg/installer/install-tl-gui.tcl:1597 msgid "Install font/macro doc tree" msgstr "Installer la documentation des macros et polices" #: tlpkg/installer/install-menu-perltk.pl:498 -#: tlpkg/installer/install-tl-gui.tcl:1606 +#: tlpkg/installer/install-tl-gui.tcl:1607 msgid "Install font/macro source tree" msgstr "Installer les sources des macros et polices" @@ -609,7 +609,7 @@ msgid "Create symlinks in system directories" msgstr "Créer les liens symboliques dans les répertoires-système" #: tlpkg/installer/install-menu-perltk.pl:585 -#: tlpkg/installer/install-tl-gui.tcl:1699 +#: tlpkg/installer/install-tl-gui.tcl:1700 msgid "After install, set CTAN as source for package updates" msgstr "" "Après l'installation, la source des mises à jour des packages sera CTAN " @@ -1181,7 +1181,7 @@ msgid "Create shortcuts on the desktop" msgstr "Ajouter des raccourcis sur le bureau" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1236 -#: tlpkg/installer/install-tl-gui.tcl:1651 +#: tlpkg/installer/install-tl-gui.tcl:1652 msgid "Install for all users" msgstr "Installer pour tous les utilisateurs" @@ -1512,12 +1512,12 @@ msgid "Abort" msgstr "Annuler" #: tlpkg/installer/install-tl-gui.tcl:410 -#: tlpkg/installer/install-tl-gui.tcl:1910 +#: tlpkg/installer/install-tl-gui.tcl:1911 msgid "TeX Live Installer" msgstr "Installateur de la TeX Live" #: tlpkg/installer/install-tl-gui.tcl:413 -#: tlpkg/installer/install-tl-gui.tcl:2009 +#: tlpkg/installer/install-tl-gui.tcl:2010 #, tcl-format msgid "" "Trying to load %s.\n" @@ -1559,13 +1559,13 @@ msgid "Remove year" msgstr "Supprimer l'année" #: tlpkg/installer/install-tl-gui.tcl:611 -#: tlpkg/installer/install-tl-gui.tcl:1385 -#: tlpkg/installer/install-tl-gui.tcl:1393 +#: tlpkg/installer/install-tl-gui.tcl:1386 +#: tlpkg/installer/install-tl-gui.tcl:1394 msgid "Installation root" msgstr "Racine de l'installation" #: tlpkg/installer/install-tl-gui.tcl:639 -#: tlpkg/installer/install-tl-gui.tcl:1280 tlpkg/tltcl/tltcl.tcl:578 +#: tlpkg/installer/install-tl-gui.tcl:1281 tlpkg/tltcl/tltcl.tcl:600 msgid "Browse..." msgstr "Parcourir..." @@ -1583,7 +1583,7 @@ msgid "Cannot deselect own platform" msgstr "Impossible de désélectionner sa propre plate-forme" #: tlpkg/installer/install-tl-gui.tcl:923 -#: tlpkg/installer/install-tl-gui.tcl:1284 +#: tlpkg/installer/install-tl-gui.tcl:1285 msgid "Binaries" msgstr "Binaires" @@ -1607,54 +1607,54 @@ msgstr "Langues" msgid "Other collections" msgstr "Autres collections" -#: tlpkg/installer/install-tl-gui.tcl:1237 +#: tlpkg/installer/install-tl-gui.tcl:1238 msgid "Warning. Not all configured directories are writable!" msgstr "" "Attention ! Vous n'avez pas de droit en écriture sur certains des " "répertoires configurés." -#: tlpkg/installer/install-tl-gui.tcl:1257 +#: tlpkg/installer/install-tl-gui.tcl:1258 msgid "Symlinks" msgstr "Liens symboliques" -#: tlpkg/installer/install-tl-gui.tcl:1285 +#: tlpkg/installer/install-tl-gui.tcl:1286 msgid "Man pages" msgstr "Pages de man(uels)" -#: tlpkg/installer/install-tl-gui.tcl:1286 +#: tlpkg/installer/install-tl-gui.tcl:1287 msgid "Info pages" msgstr "Pages d'info(rmations)" -#: tlpkg/installer/install-tl-gui.tcl:1340 +#: tlpkg/installer/install-tl-gui.tcl:1341 #, tcl-format msgid "TeX Live %s Installer" msgstr "Installateur de la TeX Live %s" -#: tlpkg/installer/install-tl-gui.tcl:1358 +#: tlpkg/installer/install-tl-gui.tcl:1359 msgid "Advanced" msgstr "Avancé" -#: tlpkg/installer/install-tl-gui.tcl:1388 +#: tlpkg/installer/install-tl-gui.tcl:1389 msgid "Directories" msgstr "Répertoires" -#: tlpkg/installer/install-tl-gui.tcl:1407 +#: tlpkg/installer/install-tl-gui.tcl:1408 msgid "Main tree" msgstr "Arborescence principale" -#: tlpkg/installer/install-tl-gui.tcl:1430 +#: tlpkg/installer/install-tl-gui.tcl:1431 msgid "Local additions" msgstr "Additions locales" -#: tlpkg/installer/install-tl-gui.tcl:1439 +#: tlpkg/installer/install-tl-gui.tcl:1440 msgid "Per-user additions" msgstr "Additions par utilisateur" -#: tlpkg/installer/install-tl-gui.tcl:1466 +#: tlpkg/installer/install-tl-gui.tcl:1467 msgid "More ..." msgstr "Plus..." -#: tlpkg/installer/install-tl-gui.tcl:1475 +#: tlpkg/installer/install-tl-gui.tcl:1476 msgid "" "Portable setup:\n" "May reset TEXMFLOCAL\n" @@ -1664,76 +1664,76 @@ msgstr "" "peut réinitialiser TEXMFLOCAL\n" "et TEXMFHOME" -#: tlpkg/installer/install-tl-gui.tcl:1489 +#: tlpkg/installer/install-tl-gui.tcl:1490 #: texmf-dist/scripts/tlshell/tlshell.tcl:1338 #: texmf-dist/scripts/tlshell/tlshell.tcl:2127 msgid "Platforms" msgstr "Plates-formes" -#: tlpkg/installer/install-tl-gui.tcl:1495 +#: tlpkg/installer/install-tl-gui.tcl:1496 msgid "Current platform:" msgstr "Plate-forme en cours :" -#: tlpkg/installer/install-tl-gui.tcl:1502 +#: tlpkg/installer/install-tl-gui.tcl:1503 msgid "N. of additional platform(s):" msgstr "Nombre de plates-formes additionnelles :" -#: tlpkg/installer/install-tl-gui.tcl:1515 +#: tlpkg/installer/install-tl-gui.tcl:1516 msgid "Selections" msgstr "Sélections" -#: tlpkg/installer/install-tl-gui.tcl:1520 +#: tlpkg/installer/install-tl-gui.tcl:1521 msgid "Scheme:" msgstr "Schéma :" -#: tlpkg/installer/install-tl-gui.tcl:1529 +#: tlpkg/installer/install-tl-gui.tcl:1530 msgid "N. of collections:" msgstr "Nombre de collections :" -#: tlpkg/installer/install-tl-gui.tcl:1532 +#: tlpkg/installer/install-tl-gui.tcl:1533 msgid "Customize" msgstr "Personnaliser" -#: tlpkg/installer/install-tl-gui.tcl:1541 +#: tlpkg/installer/install-tl-gui.tcl:1542 msgid "Disk space required (in MB):" msgstr "Espace disque requis (en MB) :" -#: tlpkg/installer/install-tl-gui.tcl:1619 +#: tlpkg/installer/install-tl-gui.tcl:1620 msgid "Adjust searchpath" msgstr "Ajuster le chemin de recherche" -#: tlpkg/installer/install-tl-gui.tcl:1628 +#: tlpkg/installer/install-tl-gui.tcl:1629 msgid "Desktop integration" msgstr "Intégration au poste de travail" -#: tlpkg/installer/install-tl-gui.tcl:1640 +#: tlpkg/installer/install-tl-gui.tcl:1641 msgid "File associations" msgstr "Associations de fichiers" -#: tlpkg/installer/install-tl-gui.tcl:1679 +#: tlpkg/installer/install-tl-gui.tcl:1680 msgid "Create symlinks in standard directories" msgstr "Créer les liens symboliques dans les répertoires standards" -#: tlpkg/installer/install-tl-gui.tcl:1685 +#: tlpkg/installer/install-tl-gui.tcl:1686 msgid "Specify directories" msgstr "Spécifier les répertoires" -#: tlpkg/installer/install-tl-gui.tcl:1750 +#: tlpkg/installer/install-tl-gui.tcl:1751 msgid "Custom scheme" msgstr "Schéma personnalisé" -#: tlpkg/installer/install-tl-gui.tcl:1935 +#: tlpkg/installer/install-tl-gui.tcl:1936 #, tcl-format msgid "%s not a local or remote repository" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1936 -#: tlpkg/installer/install-tl-gui.tcl:1942 +#: tlpkg/installer/install-tl-gui.tcl:1937 +#: tlpkg/installer/install-tl-gui.tcl:1943 #: texmf-dist/scripts/tlshell/tlshell.tcl:2030 msgid "Error" msgstr "Erreur" -#: tlpkg/installer/install-tl-gui.tcl:1941 +#: tlpkg/installer/install-tl-gui.tcl:1942 #, tcl-format msgid "%s requires an argument" msgstr "" @@ -1746,7 +1746,7 @@ msgstr "Miroir spécifique..." msgid "No mirror list available" msgstr "" -#: tlpkg/tltcl/tltcl.tcl:661 +#: tlpkg/tltcl/tltcl.tcl:683 msgid "Select or type" msgstr "Sélectionner ou saisir" diff --git a/systems/texlive/tlnet/tlpkg/translations/it.po b/systems/texlive/tlnet/tlpkg/translations/it.po index 2fbd4fa940..2f764f61d3 100644 --- a/systems/texlive/tlnet/tlpkg/translations/it.po +++ b/systems/texlive/tlnet/tlpkg/translations/it.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Tex Live translation\n" "Report-Msgid-Bugs-To: tex-live@tug.org\n" -"POT-Creation-Date: 2020-02-08 01:55+0100\n" +"POT-Creation-Date: 2020-02-16 19:07+0100\n" "PO-Revision-Date: 2019-04-02 15:06+0200\n" "Last-Translator: Marco Pallante <marco.pallante@gmail.com>\n" "Language-Team: <>\n" @@ -45,7 +45,7 @@ msgstr "Installazione" #: tlpkg/installer/install-tl-gui.tcl:933 #: tlpkg/installer/install-tl-gui.tcl:1003 #: tlpkg/installer/install-tl-gui.tcl:1083 -#: tlpkg/installer/install-tl-gui.tcl:1302 tlpkg/tltcl/tltcl.tcl:588 +#: tlpkg/installer/install-tl-gui.tcl:1303 tlpkg/tltcl/tltcl.tcl:610 #: texmf-dist/scripts/tlshell/tlshell.tcl:168 #: texmf-dist/scripts/tlshell/tlshell.tcl:1261 msgid "Cancel" @@ -61,7 +61,7 @@ msgstr "Fine" #: tlpkg/installer/install-menu-wizard.pl:41 #: tlpkg/installer/install-menu-perltk.pl:445 -#: tlpkg/installer/install-tl-gui.tcl:1570 +#: tlpkg/installer/install-tl-gui.tcl:1571 msgid "Default paper size" msgstr "Formato pagina predefinito" @@ -90,7 +90,7 @@ msgstr "Installazione per tutti gli utenti" #: tlpkg/installer/install-menu-wizard.pl:46 #: tlpkg/installer/install-menu-perltk.pl:569 -#: tlpkg/installer/install-tl-gui.tcl:1662 +#: tlpkg/installer/install-tl-gui.tcl:1663 msgid "Install TeXworks front end" msgstr "Installa il programma TeXworks" @@ -105,7 +105,7 @@ msgstr "Installazione di TeX Live %s" #: tlpkg/installer/install-menu-perltk.pl:630 #: tlpkg/installer/install-menu-perltk.pl:676 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544 -#: tlpkg/installer/install-tl-gui.tcl:1353 +#: tlpkg/installer/install-tl-gui.tcl:1354 #: texmf-dist/scripts/tlshell/tlshell.tcl:2153 msgid "Quit" msgstr "Esci" @@ -274,15 +274,15 @@ msgstr "Percorso di destinazione:" #: texmf-dist/scripts/texlive/tlmgrgui.pl:2438 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2443 #: tlpkg/installer/install-tl-gui.tcl:642 -#: tlpkg/installer/install-tl-gui.tcl:1401 -#: tlpkg/installer/install-tl-gui.tcl:1417 -#: tlpkg/installer/install-tl-gui.tcl:1425 -#: tlpkg/installer/install-tl-gui.tcl:1435 -#: tlpkg/installer/install-tl-gui.tcl:1444 -#: tlpkg/installer/install-tl-gui.tcl:1452 -#: tlpkg/installer/install-tl-gui.tcl:1459 -#: tlpkg/installer/install-tl-gui.tcl:1505 -#: tlpkg/installer/install-tl-gui.tcl:1524 +#: tlpkg/installer/install-tl-gui.tcl:1402 +#: tlpkg/installer/install-tl-gui.tcl:1418 +#: tlpkg/installer/install-tl-gui.tcl:1426 +#: tlpkg/installer/install-tl-gui.tcl:1436 +#: tlpkg/installer/install-tl-gui.tcl:1445 +#: tlpkg/installer/install-tl-gui.tcl:1453 +#: tlpkg/installer/install-tl-gui.tcl:1460 +#: tlpkg/installer/install-tl-gui.tcl:1506 +#: tlpkg/installer/install-tl-gui.tcl:1525 msgid "Change" msgstr "Cambia" @@ -357,7 +357,7 @@ msgstr "No" #: tlpkg/installer/install-menu-wizard.pl:604 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456 -#: tlpkg/installer/install-tl-gui.tcl:1351 +#: tlpkg/installer/install-tl-gui.tcl:1352 #: texmf-dist/scripts/tlshell/tlshell.tcl:1899 msgid "Install" msgstr "Installa" @@ -367,20 +367,20 @@ msgstr "Installa" #: texmf-dist/scripts/texlive/tlmgrgui.pl:143 #: tlpkg/installer/install-tl-gui.tcl:862 #: tlpkg/installer/install-tl-gui.tcl:1099 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "None" msgstr "Nessuno" #: tlpkg/installer/install-menu-perltk.pl:49 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "Only new" msgstr "Solo nuovi" #: tlpkg/installer/install-menu-perltk.pl:50 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145 #: tlpkg/installer/install-tl-gui.tcl:1096 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 #: texmf-dist/scripts/tlshell/tlshell.tcl:2212 #: texmf-dist/scripts/tlshell/tlshell.tcl:2229 msgid "All" @@ -396,17 +396,17 @@ msgid "letter" msgstr "lettera USA" #: tlpkg/installer/install-menu-perltk.pl:55 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "No shortcuts" msgstr "Nessuna scorciatoia" #: tlpkg/installer/install-menu-perltk.pl:56 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "TeX Live menu" msgstr "Menu di TeX Live" #: tlpkg/installer/install-menu-perltk.pl:57 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "Launcher entry" msgstr "Voce di avvio" @@ -475,7 +475,7 @@ msgstr "Scegli un mirror differente." #: tlpkg/installer/install-tl-gui.tcl:930 #: tlpkg/installer/install-tl-gui.tcl:986 #: tlpkg/installer/install-tl-gui.tcl:1080 -#: tlpkg/installer/install-tl-gui.tcl:1300 tlpkg/tltcl/tltcl.tcl:586 +#: tlpkg/installer/install-tl-gui.tcl:1301 tlpkg/tltcl/tltcl.tcl:608 #: texmf-dist/scripts/tlshell/tlshell.tcl:158 msgid "Ok" msgstr "Ok" @@ -542,7 +542,7 @@ msgstr "Allestimento portabile" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1231 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1240 -#: tlpkg/installer/install-tl-gui.tcl:1478 +#: tlpkg/installer/install-tl-gui.tcl:1479 msgid "Toggle" msgstr "Inverti" @@ -568,7 +568,7 @@ msgstr "TEXMFHOME (cartella dei file specifici per ciascun utente)" #: tlpkg/installer/install-menu-perltk.pl:440 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513 -#: tlpkg/installer/install-tl-gui.tcl:1561 +#: tlpkg/installer/install-tl-gui.tcl:1562 #: texmf-dist/scripts/tlshell/tlshell.tcl:771 #: texmf-dist/scripts/tlshell/tlshell.tcl:2029 #: texmf-dist/scripts/tlshell/tlshell.tcl:2093 @@ -576,23 +576,23 @@ msgid "Options" msgstr "Opzioni" #: tlpkg/installer/install-menu-perltk.pl:458 -#: tlpkg/installer/install-tl-gui.tcl:1581 +#: tlpkg/installer/install-tl-gui.tcl:1582 msgid "Allow execution of restricted list of programs via \\write18" msgstr "" "Consenti l'esecuzione di una ristretta lista di programmi tramite \\write18" #: tlpkg/installer/install-menu-perltk.pl:473 -#: tlpkg/installer/install-tl-gui.tcl:1588 +#: tlpkg/installer/install-tl-gui.tcl:1589 msgid "Create all format files" msgstr "Crea tutti i file di formato" #: tlpkg/installer/install-menu-perltk.pl:485 -#: tlpkg/installer/install-tl-gui.tcl:1596 +#: tlpkg/installer/install-tl-gui.tcl:1597 msgid "Install font/macro doc tree" msgstr "Installa la documentazione per font e macro" #: tlpkg/installer/install-menu-perltk.pl:498 -#: tlpkg/installer/install-tl-gui.tcl:1606 +#: tlpkg/installer/install-tl-gui.tcl:1607 msgid "Install font/macro source tree" msgstr "Installa i sorgenti per font e macro" @@ -602,7 +602,7 @@ msgid "Create symlinks in system directories" msgstr "Crea i collegamenti simbolici nelle cartelle di sistema" #: tlpkg/installer/install-menu-perltk.pl:585 -#: tlpkg/installer/install-tl-gui.tcl:1699 +#: tlpkg/installer/install-tl-gui.tcl:1700 msgid "After install, set CTAN as source for package updates" msgstr "" "Dopo l’installazione, imposta CTAN come sorgente per gli aggiornamenti dei " @@ -1176,7 +1176,7 @@ msgid "Create shortcuts on the desktop" msgstr "Crea collegamenti sul desktop" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1236 -#: tlpkg/installer/install-tl-gui.tcl:1651 +#: tlpkg/installer/install-tl-gui.tcl:1652 msgid "Install for all users" msgstr "Installazione per tutti gli utenti" @@ -1503,12 +1503,12 @@ msgid "Abort" msgstr "Interrompi" #: tlpkg/installer/install-tl-gui.tcl:410 -#: tlpkg/installer/install-tl-gui.tcl:1910 +#: tlpkg/installer/install-tl-gui.tcl:1911 msgid "TeX Live Installer" msgstr "Installazione di TeX Live" #: tlpkg/installer/install-tl-gui.tcl:413 -#: tlpkg/installer/install-tl-gui.tcl:2009 +#: tlpkg/installer/install-tl-gui.tcl:2010 #, tcl-format msgid "" "Trying to load %s.\n" @@ -1550,13 +1550,13 @@ msgid "Remove year" msgstr "Rimuovi l’anno" #: tlpkg/installer/install-tl-gui.tcl:611 -#: tlpkg/installer/install-tl-gui.tcl:1385 -#: tlpkg/installer/install-tl-gui.tcl:1393 +#: tlpkg/installer/install-tl-gui.tcl:1386 +#: tlpkg/installer/install-tl-gui.tcl:1394 msgid "Installation root" msgstr "Posizione dell’installazione" #: tlpkg/installer/install-tl-gui.tcl:639 -#: tlpkg/installer/install-tl-gui.tcl:1280 tlpkg/tltcl/tltcl.tcl:578 +#: tlpkg/installer/install-tl-gui.tcl:1281 tlpkg/tltcl/tltcl.tcl:600 msgid "Browse..." msgstr "Sfoglia…" @@ -1574,7 +1574,7 @@ msgid "Cannot deselect own platform" msgstr "Non puoi disabilitare la tua stessa piattaforma" #: tlpkg/installer/install-tl-gui.tcl:923 -#: tlpkg/installer/install-tl-gui.tcl:1284 +#: tlpkg/installer/install-tl-gui.tcl:1285 msgid "Binaries" msgstr "Eseguibili" @@ -1598,52 +1598,52 @@ msgstr "Lingue" msgid "Other collections" msgstr "Altre collezioni" -#: tlpkg/installer/install-tl-gui.tcl:1237 +#: tlpkg/installer/install-tl-gui.tcl:1238 msgid "Warning. Not all configured directories are writable!" msgstr "Attenzione. Non è possibile scrivere in tutte le cartelle configurate!" -#: tlpkg/installer/install-tl-gui.tcl:1257 +#: tlpkg/installer/install-tl-gui.tcl:1258 msgid "Symlinks" msgstr "Collegamenti simbolici" -#: tlpkg/installer/install-tl-gui.tcl:1285 +#: tlpkg/installer/install-tl-gui.tcl:1286 msgid "Man pages" msgstr "Pagine di manuale" -#: tlpkg/installer/install-tl-gui.tcl:1286 +#: tlpkg/installer/install-tl-gui.tcl:1287 msgid "Info pages" msgstr "Pagine Info" -#: tlpkg/installer/install-tl-gui.tcl:1340 +#: tlpkg/installer/install-tl-gui.tcl:1341 #, tcl-format msgid "TeX Live %s Installer" msgstr "Installazione di TeX Live %s" -#: tlpkg/installer/install-tl-gui.tcl:1358 +#: tlpkg/installer/install-tl-gui.tcl:1359 msgid "Advanced" msgstr "Avanzate" -#: tlpkg/installer/install-tl-gui.tcl:1388 +#: tlpkg/installer/install-tl-gui.tcl:1389 msgid "Directories" msgstr "Cartelle" -#: tlpkg/installer/install-tl-gui.tcl:1407 +#: tlpkg/installer/install-tl-gui.tcl:1408 msgid "Main tree" msgstr "Albero principale" -#: tlpkg/installer/install-tl-gui.tcl:1430 +#: tlpkg/installer/install-tl-gui.tcl:1431 msgid "Local additions" msgstr "Aggiunte locali" -#: tlpkg/installer/install-tl-gui.tcl:1439 +#: tlpkg/installer/install-tl-gui.tcl:1440 msgid "Per-user additions" msgstr "Aggiunte per utente" -#: tlpkg/installer/install-tl-gui.tcl:1466 +#: tlpkg/installer/install-tl-gui.tcl:1467 msgid "More ..." msgstr "Di più …" -#: tlpkg/installer/install-tl-gui.tcl:1475 +#: tlpkg/installer/install-tl-gui.tcl:1476 msgid "" "Portable setup:\n" "May reset TEXMFLOCAL\n" @@ -1653,76 +1653,76 @@ msgstr "" "Puoi reimpostare TEXMFLOCAL\n" "e TEXMFHOME" -#: tlpkg/installer/install-tl-gui.tcl:1489 +#: tlpkg/installer/install-tl-gui.tcl:1490 #: texmf-dist/scripts/tlshell/tlshell.tcl:1338 #: texmf-dist/scripts/tlshell/tlshell.tcl:2127 msgid "Platforms" msgstr "Piattaforme" -#: tlpkg/installer/install-tl-gui.tcl:1495 +#: tlpkg/installer/install-tl-gui.tcl:1496 msgid "Current platform:" msgstr "Piattaforma attuale:" -#: tlpkg/installer/install-tl-gui.tcl:1502 +#: tlpkg/installer/install-tl-gui.tcl:1503 msgid "N. of additional platform(s):" msgstr "N. di piattaforme aggiuntive:" -#: tlpkg/installer/install-tl-gui.tcl:1515 +#: tlpkg/installer/install-tl-gui.tcl:1516 msgid "Selections" msgstr "Selezioni" -#: tlpkg/installer/install-tl-gui.tcl:1520 +#: tlpkg/installer/install-tl-gui.tcl:1521 msgid "Scheme:" msgstr "Schema:" -#: tlpkg/installer/install-tl-gui.tcl:1529 +#: tlpkg/installer/install-tl-gui.tcl:1530 msgid "N. of collections:" msgstr "N. di collezioni:" -#: tlpkg/installer/install-tl-gui.tcl:1532 +#: tlpkg/installer/install-tl-gui.tcl:1533 msgid "Customize" msgstr "Personalizza" -#: tlpkg/installer/install-tl-gui.tcl:1541 +#: tlpkg/installer/install-tl-gui.tcl:1542 msgid "Disk space required (in MB):" msgstr "Spazio richiesto su disco (in MB):" -#: tlpkg/installer/install-tl-gui.tcl:1619 +#: tlpkg/installer/install-tl-gui.tcl:1620 msgid "Adjust searchpath" msgstr "Regola il percorso di ricerca" -#: tlpkg/installer/install-tl-gui.tcl:1628 +#: tlpkg/installer/install-tl-gui.tcl:1629 msgid "Desktop integration" msgstr "Integrazione con il desktop" -#: tlpkg/installer/install-tl-gui.tcl:1640 +#: tlpkg/installer/install-tl-gui.tcl:1641 msgid "File associations" msgstr "Associazioni dei file" -#: tlpkg/installer/install-tl-gui.tcl:1679 +#: tlpkg/installer/install-tl-gui.tcl:1680 msgid "Create symlinks in standard directories" msgstr "Crea i collegamenti simbolici nelle cartelle di sistema" -#: tlpkg/installer/install-tl-gui.tcl:1685 +#: tlpkg/installer/install-tl-gui.tcl:1686 msgid "Specify directories" msgstr "Specifica le cartelle" -#: tlpkg/installer/install-tl-gui.tcl:1750 +#: tlpkg/installer/install-tl-gui.tcl:1751 msgid "Custom scheme" msgstr "Schema personalizzato" -#: tlpkg/installer/install-tl-gui.tcl:1935 +#: tlpkg/installer/install-tl-gui.tcl:1936 #, tcl-format msgid "%s not a local or remote repository" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1936 -#: tlpkg/installer/install-tl-gui.tcl:1942 +#: tlpkg/installer/install-tl-gui.tcl:1937 +#: tlpkg/installer/install-tl-gui.tcl:1943 #: texmf-dist/scripts/tlshell/tlshell.tcl:2030 msgid "Error" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1941 +#: tlpkg/installer/install-tl-gui.tcl:1942 #, tcl-format msgid "%s requires an argument" msgstr "" @@ -1735,7 +1735,7 @@ msgstr "Mirror specifico..." msgid "No mirror list available" msgstr "" -#: tlpkg/tltcl/tltcl.tcl:661 +#: tlpkg/tltcl/tltcl.tcl:683 msgid "Select or type" msgstr "Seleziona o digita" diff --git a/systems/texlive/tlnet/tlpkg/translations/ja.po b/systems/texlive/tlnet/tlpkg/translations/ja.po index c5b1e0365a..70bc813758 100644 --- a/systems/texlive/tlnet/tlpkg/translations/ja.po +++ b/systems/texlive/tlnet/tlpkg/translations/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: TeX Live translation\n" "Report-Msgid-Bugs-To: tex-live@tug.org\n" -"POT-Creation-Date: 2020-02-08 01:55+0100\n" +"POT-Creation-Date: 2020-02-16 19:07+0100\n" "PO-Revision-Date: 2019-08-28 12:20+0900\n" "Last-Translator: Takuto Asakura <tkt.asakura@gmail.com>\n" "Language-Team: TL Translation Team <tex-live@tug.org>\n" @@ -50,7 +50,7 @@ msgstr "インストール処理" #: tlpkg/installer/install-tl-gui.tcl:933 #: tlpkg/installer/install-tl-gui.tcl:1003 #: tlpkg/installer/install-tl-gui.tcl:1083 -#: tlpkg/installer/install-tl-gui.tcl:1302 tlpkg/tltcl/tltcl.tcl:588 +#: tlpkg/installer/install-tl-gui.tcl:1303 tlpkg/tltcl/tltcl.tcl:610 #: texmf-dist/scripts/tlshell/tlshell.tcl:168 #: texmf-dist/scripts/tlshell/tlshell.tcl:1261 msgid "Cancel" @@ -66,7 +66,7 @@ msgstr "終了" #: tlpkg/installer/install-menu-wizard.pl:41 #: tlpkg/installer/install-menu-perltk.pl:445 -#: tlpkg/installer/install-tl-gui.tcl:1570 +#: tlpkg/installer/install-tl-gui.tcl:1571 msgid "Default paper size" msgstr "デフォルト用紙サイズ" @@ -95,7 +95,7 @@ msgstr "すべてのユーザ用にインストール" #: tlpkg/installer/install-menu-wizard.pl:46 #: tlpkg/installer/install-menu-perltk.pl:569 -#: tlpkg/installer/install-tl-gui.tcl:1662 +#: tlpkg/installer/install-tl-gui.tcl:1663 msgid "Install TeXworks front end" msgstr "TeXworks をインストール" @@ -110,7 +110,7 @@ msgstr "TeX Live %s のインストール" #: tlpkg/installer/install-menu-perltk.pl:630 #: tlpkg/installer/install-menu-perltk.pl:676 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544 -#: tlpkg/installer/install-tl-gui.tcl:1353 +#: tlpkg/installer/install-tl-gui.tcl:1354 #: texmf-dist/scripts/tlshell/tlshell.tcl:2153 msgid "Quit" msgstr "終了" @@ -277,15 +277,15 @@ msgstr "インストール先のフォルダ：" #: texmf-dist/scripts/texlive/tlmgrgui.pl:2438 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2443 #: tlpkg/installer/install-tl-gui.tcl:642 -#: tlpkg/installer/install-tl-gui.tcl:1401 -#: tlpkg/installer/install-tl-gui.tcl:1417 -#: tlpkg/installer/install-tl-gui.tcl:1425 -#: tlpkg/installer/install-tl-gui.tcl:1435 -#: tlpkg/installer/install-tl-gui.tcl:1444 -#: tlpkg/installer/install-tl-gui.tcl:1452 -#: tlpkg/installer/install-tl-gui.tcl:1459 -#: tlpkg/installer/install-tl-gui.tcl:1505 -#: tlpkg/installer/install-tl-gui.tcl:1524 +#: tlpkg/installer/install-tl-gui.tcl:1402 +#: tlpkg/installer/install-tl-gui.tcl:1418 +#: tlpkg/installer/install-tl-gui.tcl:1426 +#: tlpkg/installer/install-tl-gui.tcl:1436 +#: tlpkg/installer/install-tl-gui.tcl:1445 +#: tlpkg/installer/install-tl-gui.tcl:1453 +#: tlpkg/installer/install-tl-gui.tcl:1460 +#: tlpkg/installer/install-tl-gui.tcl:1506 +#: tlpkg/installer/install-tl-gui.tcl:1525 msgid "Change" msgstr "変更" @@ -359,7 +359,7 @@ msgstr "いいえ" #: tlpkg/installer/install-menu-wizard.pl:604 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456 -#: tlpkg/installer/install-tl-gui.tcl:1351 +#: tlpkg/installer/install-tl-gui.tcl:1352 #: texmf-dist/scripts/tlshell/tlshell.tcl:1899 msgid "Install" msgstr "インストール" @@ -369,20 +369,20 @@ msgstr "インストール" #: texmf-dist/scripts/texlive/tlmgrgui.pl:143 #: tlpkg/installer/install-tl-gui.tcl:862 #: tlpkg/installer/install-tl-gui.tcl:1099 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "None" msgstr "なし" #: tlpkg/installer/install-menu-perltk.pl:49 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "Only new" msgstr "新規のみ" #: tlpkg/installer/install-menu-perltk.pl:50 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145 #: tlpkg/installer/install-tl-gui.tcl:1096 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 #: texmf-dist/scripts/tlshell/tlshell.tcl:2212 #: texmf-dist/scripts/tlshell/tlshell.tcl:2229 msgid "All" @@ -398,17 +398,17 @@ msgid "letter" msgstr "レター" #: tlpkg/installer/install-menu-perltk.pl:55 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "No shortcuts" msgstr "ショートカットなし" #: tlpkg/installer/install-menu-perltk.pl:56 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "TeX Live menu" msgstr "TeX Live メニュー" #: tlpkg/installer/install-menu-perltk.pl:57 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "Launcher entry" msgstr "ランチャ項目" @@ -477,7 +477,7 @@ msgstr "別のミラーを選択してください．" #: tlpkg/installer/install-tl-gui.tcl:930 #: tlpkg/installer/install-tl-gui.tcl:986 #: tlpkg/installer/install-tl-gui.tcl:1080 -#: tlpkg/installer/install-tl-gui.tcl:1300 tlpkg/tltcl/tltcl.tcl:586 +#: tlpkg/installer/install-tl-gui.tcl:1301 tlpkg/tltcl/tltcl.tcl:608 #: texmf-dist/scripts/tlshell/tlshell.tcl:158 msgid "Ok" msgstr "OK" @@ -544,7 +544,7 @@ msgstr "ポータブル設定" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1231 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1240 -#: tlpkg/installer/install-tl-gui.tcl:1478 +#: tlpkg/installer/install-tl-gui.tcl:1479 msgid "Toggle" msgstr "切替" @@ -570,7 +570,7 @@ msgstr "TEXMFHOME（ユーザ用ファイルをおくディレクトリ）" #: tlpkg/installer/install-menu-perltk.pl:440 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513 -#: tlpkg/installer/install-tl-gui.tcl:1561 +#: tlpkg/installer/install-tl-gui.tcl:1562 #: texmf-dist/scripts/tlshell/tlshell.tcl:771 #: texmf-dist/scripts/tlshell/tlshell.tcl:2029 #: texmf-dist/scripts/tlshell/tlshell.tcl:2093 @@ -578,22 +578,22 @@ msgid "Options" msgstr "オプション" #: tlpkg/installer/install-menu-perltk.pl:458 -#: tlpkg/installer/install-tl-gui.tcl:1581 +#: tlpkg/installer/install-tl-gui.tcl:1582 msgid "Allow execution of restricted list of programs via \\write18" msgstr "\\write18 を用いて制限リストにあるプログラムの実行を許可" #: tlpkg/installer/install-menu-perltk.pl:473 -#: tlpkg/installer/install-tl-gui.tcl:1588 +#: tlpkg/installer/install-tl-gui.tcl:1589 msgid "Create all format files" msgstr "フォーマットファイルをすべて生成" #: tlpkg/installer/install-menu-perltk.pl:485 -#: tlpkg/installer/install-tl-gui.tcl:1596 +#: tlpkg/installer/install-tl-gui.tcl:1597 msgid "Install font/macro doc tree" msgstr "font/macro のドキュメントツリーをインストール" #: tlpkg/installer/install-menu-perltk.pl:498 -#: tlpkg/installer/install-tl-gui.tcl:1606 +#: tlpkg/installer/install-tl-gui.tcl:1607 msgid "Install font/macro source tree" msgstr "font/macro のソースツリーをインストール" @@ -603,7 +603,7 @@ msgid "Create symlinks in system directories" msgstr "システムディレクトリにシンボリックリンクを作成する" #: tlpkg/installer/install-menu-perltk.pl:585 -#: tlpkg/installer/install-tl-gui.tcl:1699 +#: tlpkg/installer/install-tl-gui.tcl:1700 msgid "After install, set CTAN as source for package updates" msgstr "インストール後に CTAN をパッケージのアップデート元に設定" @@ -1171,7 +1171,7 @@ msgid "Create shortcuts on the desktop" msgstr "ショートカットをデスクトップに作成" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1236 -#: tlpkg/installer/install-tl-gui.tcl:1651 +#: tlpkg/installer/install-tl-gui.tcl:1652 msgid "Install for all users" msgstr "すべてのユーザ向けにインストールする" @@ -1495,12 +1495,12 @@ msgid "Abort" msgstr "中止" #: tlpkg/installer/install-tl-gui.tcl:410 -#: tlpkg/installer/install-tl-gui.tcl:1910 +#: tlpkg/installer/install-tl-gui.tcl:1911 msgid "TeX Live Installer" msgstr "TeX Live インストーラ" #: tlpkg/installer/install-tl-gui.tcl:413 -#: tlpkg/installer/install-tl-gui.tcl:2009 +#: tlpkg/installer/install-tl-gui.tcl:2010 #, tcl-format msgid "" "Trying to load %s.\n" @@ -1546,13 +1546,13 @@ msgid "Remove year" msgstr "年を除去" #: tlpkg/installer/install-tl-gui.tcl:611 -#: tlpkg/installer/install-tl-gui.tcl:1385 -#: tlpkg/installer/install-tl-gui.tcl:1393 +#: tlpkg/installer/install-tl-gui.tcl:1386 +#: tlpkg/installer/install-tl-gui.tcl:1394 msgid "Installation root" msgstr "インストール先" #: tlpkg/installer/install-tl-gui.tcl:639 -#: tlpkg/installer/install-tl-gui.tcl:1280 tlpkg/tltcl/tltcl.tcl:578 +#: tlpkg/installer/install-tl-gui.tcl:1281 tlpkg/tltcl/tltcl.tcl:600 msgid "Browse..." msgstr "開く…" @@ -1570,7 +1570,7 @@ msgid "Cannot deselect own platform" msgstr "現在のプラットフォームの選択を外すことはできません" #: tlpkg/installer/install-tl-gui.tcl:923 -#: tlpkg/installer/install-tl-gui.tcl:1284 +#: tlpkg/installer/install-tl-gui.tcl:1285 msgid "Binaries" msgstr "バイナリ" @@ -1594,52 +1594,52 @@ msgstr "言語" msgid "Other collections" msgstr "ほかのコレクション" -#: tlpkg/installer/install-tl-gui.tcl:1237 +#: tlpkg/installer/install-tl-gui.tcl:1238 msgid "Warning. Not all configured directories are writable!" msgstr "警告．指定したディレクトリの一部が書き込み不能です！" -#: tlpkg/installer/install-tl-gui.tcl:1257 +#: tlpkg/installer/install-tl-gui.tcl:1258 msgid "Symlinks" msgstr "シンボリックリンク" -#: tlpkg/installer/install-tl-gui.tcl:1285 +#: tlpkg/installer/install-tl-gui.tcl:1286 msgid "Man pages" msgstr "man ページ" -#: tlpkg/installer/install-tl-gui.tcl:1286 +#: tlpkg/installer/install-tl-gui.tcl:1287 msgid "Info pages" msgstr "info ページ" -#: tlpkg/installer/install-tl-gui.tcl:1340 +#: tlpkg/installer/install-tl-gui.tcl:1341 #, tcl-format msgid "TeX Live %s Installer" msgstr "TeX Live %s インストーラ" -#: tlpkg/installer/install-tl-gui.tcl:1358 +#: tlpkg/installer/install-tl-gui.tcl:1359 msgid "Advanced" msgstr "高度な設定" -#: tlpkg/installer/install-tl-gui.tcl:1388 +#: tlpkg/installer/install-tl-gui.tcl:1389 msgid "Directories" msgstr "ディレクトリ" -#: tlpkg/installer/install-tl-gui.tcl:1407 +#: tlpkg/installer/install-tl-gui.tcl:1408 msgid "Main tree" msgstr "メインツリー" -#: tlpkg/installer/install-tl-gui.tcl:1430 +#: tlpkg/installer/install-tl-gui.tcl:1431 msgid "Local additions" msgstr "ローカルに追加" -#: tlpkg/installer/install-tl-gui.tcl:1439 +#: tlpkg/installer/install-tl-gui.tcl:1440 msgid "Per-user additions" msgstr "ユーザごとに追加" -#: tlpkg/installer/install-tl-gui.tcl:1466 +#: tlpkg/installer/install-tl-gui.tcl:1467 msgid "More ..." msgstr "さらに表示…" -#: tlpkg/installer/install-tl-gui.tcl:1475 +#: tlpkg/installer/install-tl-gui.tcl:1476 msgid "" "Portable setup:\n" "May reset TEXMFLOCAL\n" @@ -1649,76 +1649,76 @@ msgstr "" "TEXMFLOCAL と TEXMFHOME は\n" "リセットされます" -#: tlpkg/installer/install-tl-gui.tcl:1489 +#: tlpkg/installer/install-tl-gui.tcl:1490 #: texmf-dist/scripts/tlshell/tlshell.tcl:1338 #: texmf-dist/scripts/tlshell/tlshell.tcl:2127 msgid "Platforms" msgstr "プラットフォーム" -#: tlpkg/installer/install-tl-gui.tcl:1495 +#: tlpkg/installer/install-tl-gui.tcl:1496 msgid "Current platform:" msgstr "現在のプラットフォーム：" -#: tlpkg/installer/install-tl-gui.tcl:1502 +#: tlpkg/installer/install-tl-gui.tcl:1503 msgid "N. of additional platform(s):" msgstr "追加プラットフォームの数：" -#: tlpkg/installer/install-tl-gui.tcl:1515 +#: tlpkg/installer/install-tl-gui.tcl:1516 msgid "Selections" msgstr "選択したもの" -#: tlpkg/installer/install-tl-gui.tcl:1520 +#: tlpkg/installer/install-tl-gui.tcl:1521 msgid "Scheme:" msgstr "スキーム：" -#: tlpkg/installer/install-tl-gui.tcl:1529 +#: tlpkg/installer/install-tl-gui.tcl:1530 msgid "N. of collections:" msgstr "追加コレクションの数：" -#: tlpkg/installer/install-tl-gui.tcl:1532 +#: tlpkg/installer/install-tl-gui.tcl:1533 msgid "Customize" msgstr "カスタマイズ" -#: tlpkg/installer/install-tl-gui.tcl:1541 +#: tlpkg/installer/install-tl-gui.tcl:1542 msgid "Disk space required (in MB):" msgstr "必要なディスク容量 (MB):" -#: tlpkg/installer/install-tl-gui.tcl:1619 +#: tlpkg/installer/install-tl-gui.tcl:1620 msgid "Adjust searchpath" msgstr "検索パスを調整" -#: tlpkg/installer/install-tl-gui.tcl:1628 +#: tlpkg/installer/install-tl-gui.tcl:1629 msgid "Desktop integration" msgstr "スタートメニューにショートカットを作成" -#: tlpkg/installer/install-tl-gui.tcl:1640 +#: tlpkg/installer/install-tl-gui.tcl:1641 msgid "File associations" msgstr "ファイルの関連付けを変更" -#: tlpkg/installer/install-tl-gui.tcl:1679 +#: tlpkg/installer/install-tl-gui.tcl:1680 msgid "Create symlinks in standard directories" msgstr "シンボリックリンクを標準ディレクトリに作成" -#: tlpkg/installer/install-tl-gui.tcl:1685 +#: tlpkg/installer/install-tl-gui.tcl:1686 msgid "Specify directories" msgstr "ディレクトリを指定" -#: tlpkg/installer/install-tl-gui.tcl:1750 +#: tlpkg/installer/install-tl-gui.tcl:1751 msgid "Custom scheme" msgstr "カスタムスキーム" -#: tlpkg/installer/install-tl-gui.tcl:1935 +#: tlpkg/installer/install-tl-gui.tcl:1936 #, tcl-format msgid "%s not a local or remote repository" msgstr "%s はローカルリポジトリでもリモートリポジトリでもありません" -#: tlpkg/installer/install-tl-gui.tcl:1936 -#: tlpkg/installer/install-tl-gui.tcl:1942 +#: tlpkg/installer/install-tl-gui.tcl:1937 +#: tlpkg/installer/install-tl-gui.tcl:1943 #: texmf-dist/scripts/tlshell/tlshell.tcl:2030 msgid "Error" msgstr "エラー" -#: tlpkg/installer/install-tl-gui.tcl:1941 +#: tlpkg/installer/install-tl-gui.tcl:1942 #, tcl-format msgid "%s requires an argument" msgstr "%s には引数が必要です" @@ -1731,7 +1731,7 @@ msgstr "特定のミラーを選択…" msgid "No mirror list available" msgstr "利用可能なミラーリストがありません" -#: tlpkg/tltcl/tltcl.tcl:661 +#: tlpkg/tltcl/tltcl.tcl:683 msgid "Select or type" msgstr "選択または入力" diff --git a/systems/texlive/tlnet/tlpkg/translations/messages.pot b/systems/texlive/tlnet/tlpkg/translations/messages.pot index 5141449e9a..954e1bde55 100644 --- a/systems/texlive/tlnet/tlpkg/translations/messages.pot +++ b/systems/texlive/tlnet/tlpkg/translations/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: TeX Live 2019\n" "Report-Msgid-Bugs-To: tex-live@tug.org\n" -"POT-Creation-Date: 2020-02-08 01:55+0100\n" +"POT-Creation-Date: 2020-02-16 19:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -50,7 +50,7 @@ msgstr "" #: tlpkg/installer/install-tl-gui.tcl:933 #: tlpkg/installer/install-tl-gui.tcl:1003 #: tlpkg/installer/install-tl-gui.tcl:1083 -#: tlpkg/installer/install-tl-gui.tcl:1302 tlpkg/tltcl/tltcl.tcl:588 +#: tlpkg/installer/install-tl-gui.tcl:1303 tlpkg/tltcl/tltcl.tcl:610 #: texmf-dist/scripts/tlshell/tlshell.tcl:168 #: texmf-dist/scripts/tlshell/tlshell.tcl:1261 msgid "Cancel" @@ -66,7 +66,7 @@ msgstr "" #: tlpkg/installer/install-menu-wizard.pl:41 #: tlpkg/installer/install-menu-perltk.pl:445 -#: tlpkg/installer/install-tl-gui.tcl:1570 +#: tlpkg/installer/install-tl-gui.tcl:1571 msgid "Default paper size" msgstr "" @@ -95,7 +95,7 @@ msgstr "" #: tlpkg/installer/install-menu-wizard.pl:46 #: tlpkg/installer/install-menu-perltk.pl:569 -#: tlpkg/installer/install-tl-gui.tcl:1662 +#: tlpkg/installer/install-tl-gui.tcl:1663 msgid "Install TeXworks front end" msgstr "" @@ -110,7 +110,7 @@ msgstr "" #: tlpkg/installer/install-menu-perltk.pl:630 #: tlpkg/installer/install-menu-perltk.pl:676 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544 -#: tlpkg/installer/install-tl-gui.tcl:1353 +#: tlpkg/installer/install-tl-gui.tcl:1354 #: texmf-dist/scripts/tlshell/tlshell.tcl:2153 msgid "Quit" msgstr "" @@ -267,15 +267,15 @@ msgstr "" #: texmf-dist/scripts/texlive/tlmgrgui.pl:2438 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2443 #: tlpkg/installer/install-tl-gui.tcl:642 -#: tlpkg/installer/install-tl-gui.tcl:1401 -#: tlpkg/installer/install-tl-gui.tcl:1417 -#: tlpkg/installer/install-tl-gui.tcl:1425 -#: tlpkg/installer/install-tl-gui.tcl:1435 -#: tlpkg/installer/install-tl-gui.tcl:1444 -#: tlpkg/installer/install-tl-gui.tcl:1452 -#: tlpkg/installer/install-tl-gui.tcl:1459 -#: tlpkg/installer/install-tl-gui.tcl:1505 -#: tlpkg/installer/install-tl-gui.tcl:1524 +#: tlpkg/installer/install-tl-gui.tcl:1402 +#: tlpkg/installer/install-tl-gui.tcl:1418 +#: tlpkg/installer/install-tl-gui.tcl:1426 +#: tlpkg/installer/install-tl-gui.tcl:1436 +#: tlpkg/installer/install-tl-gui.tcl:1445 +#: tlpkg/installer/install-tl-gui.tcl:1453 +#: tlpkg/installer/install-tl-gui.tcl:1460 +#: tlpkg/installer/install-tl-gui.tcl:1506 +#: tlpkg/installer/install-tl-gui.tcl:1525 msgid "Change" msgstr "" @@ -343,7 +343,7 @@ msgstr "" #: tlpkg/installer/install-menu-wizard.pl:604 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456 -#: tlpkg/installer/install-tl-gui.tcl:1351 +#: tlpkg/installer/install-tl-gui.tcl:1352 #: texmf-dist/scripts/tlshell/tlshell.tcl:1899 msgid "Install" msgstr "" @@ -353,20 +353,20 @@ msgstr "" #: texmf-dist/scripts/texlive/tlmgrgui.pl:143 #: tlpkg/installer/install-tl-gui.tcl:862 #: tlpkg/installer/install-tl-gui.tcl:1099 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "None" msgstr "" #: tlpkg/installer/install-menu-perltk.pl:49 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "Only new" msgstr "" #: tlpkg/installer/install-menu-perltk.pl:50 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145 #: tlpkg/installer/install-tl-gui.tcl:1096 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 #: texmf-dist/scripts/tlshell/tlshell.tcl:2212 #: texmf-dist/scripts/tlshell/tlshell.tcl:2229 msgid "All" @@ -382,17 +382,17 @@ msgid "letter" msgstr "" #: tlpkg/installer/install-menu-perltk.pl:55 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "No shortcuts" msgstr "" #: tlpkg/installer/install-menu-perltk.pl:56 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "TeX Live menu" msgstr "" #: tlpkg/installer/install-menu-perltk.pl:57 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "Launcher entry" msgstr "" @@ -461,7 +461,7 @@ msgstr "" #: tlpkg/installer/install-tl-gui.tcl:930 #: tlpkg/installer/install-tl-gui.tcl:986 #: tlpkg/installer/install-tl-gui.tcl:1080 -#: tlpkg/installer/install-tl-gui.tcl:1300 tlpkg/tltcl/tltcl.tcl:586 +#: tlpkg/installer/install-tl-gui.tcl:1301 tlpkg/tltcl/tltcl.tcl:608 #: texmf-dist/scripts/tlshell/tlshell.tcl:158 msgid "Ok" msgstr "" @@ -523,7 +523,7 @@ msgstr "" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1231 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1240 -#: tlpkg/installer/install-tl-gui.tcl:1478 +#: tlpkg/installer/install-tl-gui.tcl:1479 msgid "Toggle" msgstr "" @@ -549,7 +549,7 @@ msgstr "" #: tlpkg/installer/install-menu-perltk.pl:440 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513 -#: tlpkg/installer/install-tl-gui.tcl:1561 +#: tlpkg/installer/install-tl-gui.tcl:1562 #: texmf-dist/scripts/tlshell/tlshell.tcl:771 #: texmf-dist/scripts/tlshell/tlshell.tcl:2029 #: texmf-dist/scripts/tlshell/tlshell.tcl:2093 @@ -557,22 +557,22 @@ msgid "Options" msgstr "" #: tlpkg/installer/install-menu-perltk.pl:458 -#: tlpkg/installer/install-tl-gui.tcl:1581 +#: tlpkg/installer/install-tl-gui.tcl:1582 msgid "Allow execution of restricted list of programs via \\write18" msgstr "" #: tlpkg/installer/install-menu-perltk.pl:473 -#: tlpkg/installer/install-tl-gui.tcl:1588 +#: tlpkg/installer/install-tl-gui.tcl:1589 msgid "Create all format files" msgstr "" #: tlpkg/installer/install-menu-perltk.pl:485 -#: tlpkg/installer/install-tl-gui.tcl:1596 +#: tlpkg/installer/install-tl-gui.tcl:1597 msgid "Install font/macro doc tree" msgstr "" #: tlpkg/installer/install-menu-perltk.pl:498 -#: tlpkg/installer/install-tl-gui.tcl:1606 +#: tlpkg/installer/install-tl-gui.tcl:1607 msgid "Install font/macro source tree" msgstr "" @@ -582,7 +582,7 @@ msgid "Create symlinks in system directories" msgstr "" #: tlpkg/installer/install-menu-perltk.pl:585 -#: tlpkg/installer/install-tl-gui.tcl:1699 +#: tlpkg/installer/install-tl-gui.tcl:1700 msgid "After install, set CTAN as source for package updates" msgstr "" @@ -1136,7 +1136,7 @@ msgid "Create shortcuts on the desktop" msgstr "" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1236 -#: tlpkg/installer/install-tl-gui.tcl:1651 +#: tlpkg/installer/install-tl-gui.tcl:1652 msgid "Install for all users" msgstr "" @@ -1430,12 +1430,12 @@ msgid "Abort" msgstr "" #: tlpkg/installer/install-tl-gui.tcl:410 -#: tlpkg/installer/install-tl-gui.tcl:1910 +#: tlpkg/installer/install-tl-gui.tcl:1911 msgid "TeX Live Installer" msgstr "" #: tlpkg/installer/install-tl-gui.tcl:413 -#: tlpkg/installer/install-tl-gui.tcl:2009 +#: tlpkg/installer/install-tl-gui.tcl:2010 #, tcl-format msgid "" "Trying to load %s.\n" @@ -1475,13 +1475,13 @@ msgid "Remove year" msgstr "" #: tlpkg/installer/install-tl-gui.tcl:611 -#: tlpkg/installer/install-tl-gui.tcl:1385 -#: tlpkg/installer/install-tl-gui.tcl:1393 +#: tlpkg/installer/install-tl-gui.tcl:1386 +#: tlpkg/installer/install-tl-gui.tcl:1394 msgid "Installation root" msgstr "" #: tlpkg/installer/install-tl-gui.tcl:639 -#: tlpkg/installer/install-tl-gui.tcl:1280 tlpkg/tltcl/tltcl.tcl:578 +#: tlpkg/installer/install-tl-gui.tcl:1281 tlpkg/tltcl/tltcl.tcl:600 msgid "Browse..." msgstr "" @@ -1499,7 +1499,7 @@ msgid "Cannot deselect own platform" msgstr "" #: tlpkg/installer/install-tl-gui.tcl:923 -#: tlpkg/installer/install-tl-gui.tcl:1284 +#: tlpkg/installer/install-tl-gui.tcl:1285 msgid "Binaries" msgstr "" @@ -1523,128 +1523,128 @@ msgstr "" msgid "Other collections" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1237 +#: tlpkg/installer/install-tl-gui.tcl:1238 msgid "Warning. Not all configured directories are writable!" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1257 +#: tlpkg/installer/install-tl-gui.tcl:1258 msgid "Symlinks" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1285 +#: tlpkg/installer/install-tl-gui.tcl:1286 msgid "Man pages" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1286 +#: tlpkg/installer/install-tl-gui.tcl:1287 msgid "Info pages" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1340 +#: tlpkg/installer/install-tl-gui.tcl:1341 #, tcl-format msgid "TeX Live %s Installer" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1358 +#: tlpkg/installer/install-tl-gui.tcl:1359 msgid "Advanced" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1388 +#: tlpkg/installer/install-tl-gui.tcl:1389 msgid "Directories" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1407 +#: tlpkg/installer/install-tl-gui.tcl:1408 msgid "Main tree" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1430 +#: tlpkg/installer/install-tl-gui.tcl:1431 msgid "Local additions" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1439 +#: tlpkg/installer/install-tl-gui.tcl:1440 msgid "Per-user additions" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1466 +#: tlpkg/installer/install-tl-gui.tcl:1467 msgid "More ..." msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1475 +#: tlpkg/installer/install-tl-gui.tcl:1476 msgid "" "Portable setup:\n" "May reset TEXMFLOCAL\n" "and TEXMFHOME" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1489 +#: tlpkg/installer/install-tl-gui.tcl:1490 #: texmf-dist/scripts/tlshell/tlshell.tcl:1338 #: texmf-dist/scripts/tlshell/tlshell.tcl:2127 msgid "Platforms" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1495 +#: tlpkg/installer/install-tl-gui.tcl:1496 msgid "Current platform:" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1502 +#: tlpkg/installer/install-tl-gui.tcl:1503 msgid "N. of additional platform(s):" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1515 +#: tlpkg/installer/install-tl-gui.tcl:1516 msgid "Selections" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1520 +#: tlpkg/installer/install-tl-gui.tcl:1521 msgid "Scheme:" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1529 +#: tlpkg/installer/install-tl-gui.tcl:1530 msgid "N. of collections:" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1532 +#: tlpkg/installer/install-tl-gui.tcl:1533 msgid "Customize" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1541 +#: tlpkg/installer/install-tl-gui.tcl:1542 msgid "Disk space required (in MB):" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1619 +#: tlpkg/installer/install-tl-gui.tcl:1620 msgid "Adjust searchpath" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1628 +#: tlpkg/installer/install-tl-gui.tcl:1629 msgid "Desktop integration" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1640 +#: tlpkg/installer/install-tl-gui.tcl:1641 msgid "File associations" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1679 +#: tlpkg/installer/install-tl-gui.tcl:1680 msgid "Create symlinks in standard directories" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1685 +#: tlpkg/installer/install-tl-gui.tcl:1686 msgid "Specify directories" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1750 +#: tlpkg/installer/install-tl-gui.tcl:1751 msgid "Custom scheme" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1935 +#: tlpkg/installer/install-tl-gui.tcl:1936 #, tcl-format msgid "%s not a local or remote repository" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1936 -#: tlpkg/installer/install-tl-gui.tcl:1942 +#: tlpkg/installer/install-tl-gui.tcl:1937 +#: tlpkg/installer/install-tl-gui.tcl:1943 #: texmf-dist/scripts/tlshell/tlshell.tcl:2030 msgid "Error" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1941 +#: tlpkg/installer/install-tl-gui.tcl:1942 #, tcl-format msgid "%s requires an argument" msgstr "" @@ -1657,7 +1657,7 @@ msgstr "" msgid "No mirror list available" msgstr "" -#: tlpkg/tltcl/tltcl.tcl:661 +#: tlpkg/tltcl/tltcl.tcl:683 msgid "Select or type" msgstr "" diff --git a/systems/texlive/tlnet/tlpkg/translations/nl.po b/systems/texlive/tlnet/tlpkg/translations/nl.po index 290effe52d..f273512459 100644 --- a/systems/texlive/tlnet/tlpkg/translations/nl.po +++ b/systems/texlive/tlnet/tlpkg/translations/nl.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: TeX Live translation\n" "Report-Msgid-Bugs-To: tex-live@tug.org\n" -"POT-Creation-Date: 2020-02-08 01:55+0100\n" +"POT-Creation-Date: 2020-02-16 19:07+0100\n" "PO-Revision-Date: 2019-08-30 13:52+0200\n" "Last-Translator: Siep Kroonenberg <siepo@bitmuis.nl>\n" "Language-Team: TL Translation Team <tex-live@tug.org>\n" @@ -46,7 +46,7 @@ msgstr "Installatie-proces" #: tlpkg/installer/install-tl-gui.tcl:933 #: tlpkg/installer/install-tl-gui.tcl:1003 #: tlpkg/installer/install-tl-gui.tcl:1083 -#: tlpkg/installer/install-tl-gui.tcl:1302 tlpkg/tltcl/tltcl.tcl:588 +#: tlpkg/installer/install-tl-gui.tcl:1303 tlpkg/tltcl/tltcl.tcl:610 #: texmf-dist/scripts/tlshell/tlshell.tcl:168 #: texmf-dist/scripts/tlshell/tlshell.tcl:1261 msgid "Cancel" @@ -62,7 +62,7 @@ msgstr "Sluit af" #: tlpkg/installer/install-menu-wizard.pl:41 #: tlpkg/installer/install-menu-perltk.pl:445 -#: tlpkg/installer/install-tl-gui.tcl:1570 +#: tlpkg/installer/install-tl-gui.tcl:1571 msgid "Default paper size" msgstr "Standaard papier-formaat" @@ -91,7 +91,7 @@ msgstr "Installeer voor alle gebruikers" #: tlpkg/installer/install-menu-wizard.pl:46 #: tlpkg/installer/install-menu-perltk.pl:569 -#: tlpkg/installer/install-tl-gui.tcl:1662 +#: tlpkg/installer/install-tl-gui.tcl:1663 msgid "Install TeXworks front end" msgstr "Installeer TeXworks front-end" @@ -106,7 +106,7 @@ msgstr "TeX Live %s Installatie" #: tlpkg/installer/install-menu-perltk.pl:630 #: tlpkg/installer/install-menu-perltk.pl:676 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544 -#: tlpkg/installer/install-tl-gui.tcl:1353 +#: tlpkg/installer/install-tl-gui.tcl:1354 #: texmf-dist/scripts/tlshell/tlshell.tcl:2153 msgid "Quit" msgstr "Stoppen" @@ -275,15 +275,15 @@ msgstr "Bestemmings-folder:" #: texmf-dist/scripts/texlive/tlmgrgui.pl:2438 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2443 #: tlpkg/installer/install-tl-gui.tcl:642 -#: tlpkg/installer/install-tl-gui.tcl:1401 -#: tlpkg/installer/install-tl-gui.tcl:1417 -#: tlpkg/installer/install-tl-gui.tcl:1425 -#: tlpkg/installer/install-tl-gui.tcl:1435 -#: tlpkg/installer/install-tl-gui.tcl:1444 -#: tlpkg/installer/install-tl-gui.tcl:1452 -#: tlpkg/installer/install-tl-gui.tcl:1459 -#: tlpkg/installer/install-tl-gui.tcl:1505 -#: tlpkg/installer/install-tl-gui.tcl:1524 +#: tlpkg/installer/install-tl-gui.tcl:1402 +#: tlpkg/installer/install-tl-gui.tcl:1418 +#: tlpkg/installer/install-tl-gui.tcl:1426 +#: tlpkg/installer/install-tl-gui.tcl:1436 +#: tlpkg/installer/install-tl-gui.tcl:1445 +#: tlpkg/installer/install-tl-gui.tcl:1453 +#: tlpkg/installer/install-tl-gui.tcl:1460 +#: tlpkg/installer/install-tl-gui.tcl:1506 +#: tlpkg/installer/install-tl-gui.tcl:1525 msgid "Change" msgstr "Wijzig" @@ -357,7 +357,7 @@ msgstr "Nee" #: tlpkg/installer/install-menu-wizard.pl:604 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456 -#: tlpkg/installer/install-tl-gui.tcl:1351 +#: tlpkg/installer/install-tl-gui.tcl:1352 #: texmf-dist/scripts/tlshell/tlshell.tcl:1899 msgid "Install" msgstr "Installeren" @@ -367,20 +367,20 @@ msgstr "Installeren" #: texmf-dist/scripts/texlive/tlmgrgui.pl:143 #: tlpkg/installer/install-tl-gui.tcl:862 #: tlpkg/installer/install-tl-gui.tcl:1099 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "None" msgstr "Geen" #: tlpkg/installer/install-menu-perltk.pl:49 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "Only new" msgstr "Alleen nieuw" #: tlpkg/installer/install-menu-perltk.pl:50 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145 #: tlpkg/installer/install-tl-gui.tcl:1096 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 #: texmf-dist/scripts/tlshell/tlshell.tcl:2212 #: texmf-dist/scripts/tlshell/tlshell.tcl:2229 msgid "All" @@ -396,17 +396,17 @@ msgid "letter" msgstr "letter" #: tlpkg/installer/install-menu-perltk.pl:55 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "No shortcuts" msgstr "Geen TeX Live menu" #: tlpkg/installer/install-menu-perltk.pl:56 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "TeX Live menu" msgstr "TeX Live menu" #: tlpkg/installer/install-menu-perltk.pl:57 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "Launcher entry" msgstr "Launcher item" @@ -475,7 +475,7 @@ msgstr "Kies een andere mirror." #: tlpkg/installer/install-tl-gui.tcl:930 #: tlpkg/installer/install-tl-gui.tcl:986 #: tlpkg/installer/install-tl-gui.tcl:1080 -#: tlpkg/installer/install-tl-gui.tcl:1300 tlpkg/tltcl/tltcl.tcl:586 +#: tlpkg/installer/install-tl-gui.tcl:1301 tlpkg/tltcl/tltcl.tcl:608 #: texmf-dist/scripts/tlshell/tlshell.tcl:158 msgid "Ok" msgstr "Ok" @@ -542,7 +542,7 @@ msgstr "Portable setup" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1231 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1240 -#: tlpkg/installer/install-tl-gui.tcl:1478 +#: tlpkg/installer/install-tl-gui.tcl:1479 msgid "Toggle" msgstr "Wijzig" @@ -568,7 +568,7 @@ msgstr "TEXMFHOME (voor eigen macros etc.)" #: tlpkg/installer/install-menu-perltk.pl:440 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513 -#: tlpkg/installer/install-tl-gui.tcl:1561 +#: tlpkg/installer/install-tl-gui.tcl:1562 #: texmf-dist/scripts/tlshell/tlshell.tcl:771 #: texmf-dist/scripts/tlshell/tlshell.tcl:2029 #: texmf-dist/scripts/tlshell/tlshell.tcl:2093 @@ -576,22 +576,22 @@ msgid "Options" msgstr "Opties" #: tlpkg/installer/install-menu-perltk.pl:458 -#: tlpkg/installer/install-tl-gui.tcl:1581 +#: tlpkg/installer/install-tl-gui.tcl:1582 msgid "Allow execution of restricted list of programs via \\write18" msgstr "Sta uitvoering van een beperkte lijst programmas toe via \\write18" #: tlpkg/installer/install-menu-perltk.pl:473 -#: tlpkg/installer/install-tl-gui.tcl:1588 +#: tlpkg/installer/install-tl-gui.tcl:1589 msgid "Create all format files" msgstr "Genereer alle format bestanden" #: tlpkg/installer/install-menu-perltk.pl:485 -#: tlpkg/installer/install-tl-gui.tcl:1596 +#: tlpkg/installer/install-tl-gui.tcl:1597 msgid "Install font/macro doc tree" msgstr "Installeer font/macro doc folder" #: tlpkg/installer/install-menu-perltk.pl:498 -#: tlpkg/installer/install-tl-gui.tcl:1606 +#: tlpkg/installer/install-tl-gui.tcl:1607 msgid "Install font/macro source tree" msgstr "Installeer font/macro bron folder" @@ -601,7 +601,7 @@ msgid "Create symlinks in system directories" msgstr "Maak symlinks naar standaard-folders" #: tlpkg/installer/install-menu-perltk.pl:585 -#: tlpkg/installer/install-tl-gui.tcl:1699 +#: tlpkg/installer/install-tl-gui.tcl:1700 msgid "After install, set CTAN as source for package updates" msgstr "Kies na installatie CTAN als bron voor nieuwe versies van pakketten" @@ -1174,7 +1174,7 @@ msgid "Create shortcuts on the desktop" msgstr "Maak snelkoppelingen op het bureaublad" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1236 -#: tlpkg/installer/install-tl-gui.tcl:1651 +#: tlpkg/installer/install-tl-gui.tcl:1652 msgid "Install for all users" msgstr "Installeer voor alle gebruikers" @@ -1497,12 +1497,12 @@ msgid "Abort" msgstr "Afbreken" #: tlpkg/installer/install-tl-gui.tcl:410 -#: tlpkg/installer/install-tl-gui.tcl:1910 +#: tlpkg/installer/install-tl-gui.tcl:1911 msgid "TeX Live Installer" msgstr "TeX Live Installatie" #: tlpkg/installer/install-tl-gui.tcl:413 -#: tlpkg/installer/install-tl-gui.tcl:2009 +#: tlpkg/installer/install-tl-gui.tcl:2010 #, tcl-format msgid "" "Trying to load %s.\n" @@ -1548,13 +1548,13 @@ msgid "Remove year" msgstr "Jaar verwijderen" #: tlpkg/installer/install-tl-gui.tcl:611 -#: tlpkg/installer/install-tl-gui.tcl:1385 -#: tlpkg/installer/install-tl-gui.tcl:1393 +#: tlpkg/installer/install-tl-gui.tcl:1386 +#: tlpkg/installer/install-tl-gui.tcl:1394 msgid "Installation root" msgstr "Hoofd TeX-folder" #: tlpkg/installer/install-tl-gui.tcl:639 -#: tlpkg/installer/install-tl-gui.tcl:1280 tlpkg/tltcl/tltcl.tcl:578 +#: tlpkg/installer/install-tl-gui.tcl:1281 tlpkg/tltcl/tltcl.tcl:600 msgid "Browse..." msgstr "Bladeren..." @@ -1572,7 +1572,7 @@ msgid "Cannot deselect own platform" msgstr "Eigen platform is altijd geselecteerd" #: tlpkg/installer/install-tl-gui.tcl:923 -#: tlpkg/installer/install-tl-gui.tcl:1284 +#: tlpkg/installer/install-tl-gui.tcl:1285 msgid "Binaries" msgstr "Binaries" @@ -1596,52 +1596,52 @@ msgstr "Talen" msgid "Other collections" msgstr "Andere collecties" -#: tlpkg/installer/install-tl-gui.tcl:1237 +#: tlpkg/installer/install-tl-gui.tcl:1238 msgid "Warning. Not all configured directories are writable!" msgstr "Waarschuwing. Niet alle geconfigureerde folders zijn schrijfbaar!" -#: tlpkg/installer/install-tl-gui.tcl:1257 +#: tlpkg/installer/install-tl-gui.tcl:1258 msgid "Symlinks" msgstr "Symlinks" -#: tlpkg/installer/install-tl-gui.tcl:1285 +#: tlpkg/installer/install-tl-gui.tcl:1286 msgid "Man pages" msgstr "Man pagina's" -#: tlpkg/installer/install-tl-gui.tcl:1286 +#: tlpkg/installer/install-tl-gui.tcl:1287 msgid "Info pages" msgstr "Info pagina's" -#: tlpkg/installer/install-tl-gui.tcl:1340 +#: tlpkg/installer/install-tl-gui.tcl:1341 #, tcl-format msgid "TeX Live %s Installer" msgstr "TeX Live %s Installatie" -#: tlpkg/installer/install-tl-gui.tcl:1358 +#: tlpkg/installer/install-tl-gui.tcl:1359 msgid "Advanced" msgstr "Geavanceerd" -#: tlpkg/installer/install-tl-gui.tcl:1388 +#: tlpkg/installer/install-tl-gui.tcl:1389 msgid "Directories" msgstr "Folders" -#: tlpkg/installer/install-tl-gui.tcl:1407 +#: tlpkg/installer/install-tl-gui.tcl:1408 msgid "Main tree" msgstr "Hoofd data-folder" -#: tlpkg/installer/install-tl-gui.tcl:1430 +#: tlpkg/installer/install-tl-gui.tcl:1431 msgid "Local additions" msgstr "Lokale toevoegingen" -#: tlpkg/installer/install-tl-gui.tcl:1439 +#: tlpkg/installer/install-tl-gui.tcl:1440 msgid "Per-user additions" msgstr "Toevoegingen per gebruiker" -#: tlpkg/installer/install-tl-gui.tcl:1466 +#: tlpkg/installer/install-tl-gui.tcl:1467 msgid "More ..." msgstr "Meer ..." -#: tlpkg/installer/install-tl-gui.tcl:1475 +#: tlpkg/installer/install-tl-gui.tcl:1476 msgid "" "Portable setup:\n" "May reset TEXMFLOCAL\n" @@ -1651,76 +1651,76 @@ msgstr "" "Kan TEXMFLOCAL en\n" "TEXMFHOME terugzetten" -#: tlpkg/installer/install-tl-gui.tcl:1489 +#: tlpkg/installer/install-tl-gui.tcl:1490 #: texmf-dist/scripts/tlshell/tlshell.tcl:1338 #: texmf-dist/scripts/tlshell/tlshell.tcl:2127 msgid "Platforms" msgstr "Platforms" -#: tlpkg/installer/install-tl-gui.tcl:1495 +#: tlpkg/installer/install-tl-gui.tcl:1496 msgid "Current platform:" msgstr "Huidig platform:" -#: tlpkg/installer/install-tl-gui.tcl:1502 +#: tlpkg/installer/install-tl-gui.tcl:1503 msgid "N. of additional platform(s):" msgstr "Aantal extra platforms:" -#: tlpkg/installer/install-tl-gui.tcl:1515 +#: tlpkg/installer/install-tl-gui.tcl:1516 msgid "Selections" msgstr "Selekties" -#: tlpkg/installer/install-tl-gui.tcl:1520 +#: tlpkg/installer/install-tl-gui.tcl:1521 msgid "Scheme:" msgstr "Schema:" -#: tlpkg/installer/install-tl-gui.tcl:1529 +#: tlpkg/installer/install-tl-gui.tcl:1530 msgid "N. of collections:" msgstr "Aantal collecties:" -#: tlpkg/installer/install-tl-gui.tcl:1532 +#: tlpkg/installer/install-tl-gui.tcl:1533 msgid "Customize" msgstr "Aanpassen" -#: tlpkg/installer/install-tl-gui.tcl:1541 +#: tlpkg/installer/install-tl-gui.tcl:1542 msgid "Disk space required (in MB):" msgstr "Vereiste schijfruimte (in MB):" -#: tlpkg/installer/install-tl-gui.tcl:1619 +#: tlpkg/installer/install-tl-gui.tcl:1620 msgid "Adjust searchpath" msgstr "Zoekpad aanpassen" -#: tlpkg/installer/install-tl-gui.tcl:1628 +#: tlpkg/installer/install-tl-gui.tcl:1629 msgid "Desktop integration" msgstr "Bureaublad-integratie" -#: tlpkg/installer/install-tl-gui.tcl:1640 +#: tlpkg/installer/install-tl-gui.tcl:1641 msgid "File associations" msgstr "Koppeling bestandsformaten" -#: tlpkg/installer/install-tl-gui.tcl:1679 +#: tlpkg/installer/install-tl-gui.tcl:1680 msgid "Create symlinks in standard directories" msgstr "Maak symlinks in standaard folders" -#: tlpkg/installer/install-tl-gui.tcl:1685 +#: tlpkg/installer/install-tl-gui.tcl:1686 msgid "Specify directories" msgstr "Specificeer folders" -#: tlpkg/installer/install-tl-gui.tcl:1750 +#: tlpkg/installer/install-tl-gui.tcl:1751 msgid "Custom scheme" msgstr "Eigen schema" -#: tlpkg/installer/install-tl-gui.tcl:1935 +#: tlpkg/installer/install-tl-gui.tcl:1936 #, tcl-format msgid "%s not a local or remote repository" msgstr "%s is niet een lokale of online installatie-bron" -#: tlpkg/installer/install-tl-gui.tcl:1936 -#: tlpkg/installer/install-tl-gui.tcl:1942 +#: tlpkg/installer/install-tl-gui.tcl:1937 +#: tlpkg/installer/install-tl-gui.tcl:1943 #: texmf-dist/scripts/tlshell/tlshell.tcl:2030 msgid "Error" msgstr "Fout" -#: tlpkg/installer/install-tl-gui.tcl:1941 +#: tlpkg/installer/install-tl-gui.tcl:1942 #, tcl-format msgid "%s requires an argument" msgstr "%s vereist een argument" @@ -1733,7 +1733,7 @@ msgstr "Specifieke CTAN mirror..." msgid "No mirror list available" msgstr "Geen lijst van mirrors beschikbaar" -#: tlpkg/tltcl/tltcl.tcl:661 +#: tlpkg/tltcl/tltcl.tcl:683 msgid "Select or type" msgstr "Kies of type" diff --git a/systems/texlive/tlnet/tlpkg/translations/pl.po b/systems/texlive/tlnet/tlpkg/translations/pl.po index 124530c55a..34e0f7e643 100644 --- a/systems/texlive/tlnet/tlpkg/translations/pl.po +++ b/systems/texlive/tlnet/tlpkg/translations/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: TeX Live 2019\n" "Report-Msgid-Bugs-To: tex-live@tug.org\n" -"POT-Creation-Date: 2020-02-08 01:55+0100\n" +"POT-Creation-Date: 2020-02-16 19:07+0100\n" "PO-Revision-Date: 2019-03-27 19:54+0100\n" "Last-Translator: Zofia Walczak <pelagia48@gmail.com>\n" "Language-Team: \n" @@ -51,7 +51,7 @@ msgstr "Instalacja w toku" #: tlpkg/installer/install-tl-gui.tcl:933 #: tlpkg/installer/install-tl-gui.tcl:1003 #: tlpkg/installer/install-tl-gui.tcl:1083 -#: tlpkg/installer/install-tl-gui.tcl:1302 tlpkg/tltcl/tltcl.tcl:588 +#: tlpkg/installer/install-tl-gui.tcl:1303 tlpkg/tltcl/tltcl.tcl:610 #: texmf-dist/scripts/tlshell/tlshell.tcl:168 #: texmf-dist/scripts/tlshell/tlshell.tcl:1261 msgid "Cancel" @@ -67,7 +67,7 @@ msgstr "Zakończ" #: tlpkg/installer/install-menu-wizard.pl:41 #: tlpkg/installer/install-menu-perltk.pl:445 -#: tlpkg/installer/install-tl-gui.tcl:1570 +#: tlpkg/installer/install-tl-gui.tcl:1571 msgid "Default paper size" msgstr "Domyślny rozmiar papieru" @@ -96,7 +96,7 @@ msgstr "Instalacja dla wszystkich użytkowników" #: tlpkg/installer/install-menu-wizard.pl:46 #: tlpkg/installer/install-menu-perltk.pl:569 -#: tlpkg/installer/install-tl-gui.tcl:1662 +#: tlpkg/installer/install-tl-gui.tcl:1663 msgid "Install TeXworks front end" msgstr "Zainstaluj edytor TeXworks" @@ -111,7 +111,7 @@ msgstr "Instalowanie TeX Live %s" #: tlpkg/installer/install-menu-perltk.pl:630 #: tlpkg/installer/install-menu-perltk.pl:676 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544 -#: tlpkg/installer/install-tl-gui.tcl:1353 +#: tlpkg/installer/install-tl-gui.tcl:1354 #: texmf-dist/scripts/tlshell/tlshell.tcl:2153 msgid "Quit" msgstr "Zakończ" @@ -279,15 +279,15 @@ msgstr "Folder docelowy:" #: texmf-dist/scripts/texlive/tlmgrgui.pl:2438 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2443 #: tlpkg/installer/install-tl-gui.tcl:642 -#: tlpkg/installer/install-tl-gui.tcl:1401 -#: tlpkg/installer/install-tl-gui.tcl:1417 -#: tlpkg/installer/install-tl-gui.tcl:1425 -#: tlpkg/installer/install-tl-gui.tcl:1435 -#: tlpkg/installer/install-tl-gui.tcl:1444 -#: tlpkg/installer/install-tl-gui.tcl:1452 -#: tlpkg/installer/install-tl-gui.tcl:1459 -#: tlpkg/installer/install-tl-gui.tcl:1505 -#: tlpkg/installer/install-tl-gui.tcl:1524 +#: tlpkg/installer/install-tl-gui.tcl:1402 +#: tlpkg/installer/install-tl-gui.tcl:1418 +#: tlpkg/installer/install-tl-gui.tcl:1426 +#: tlpkg/installer/install-tl-gui.tcl:1436 +#: tlpkg/installer/install-tl-gui.tcl:1445 +#: tlpkg/installer/install-tl-gui.tcl:1453 +#: tlpkg/installer/install-tl-gui.tcl:1460 +#: tlpkg/installer/install-tl-gui.tcl:1506 +#: tlpkg/installer/install-tl-gui.tcl:1525 msgid "Change" msgstr "Zmień" @@ -361,7 +361,7 @@ msgstr "Nie" #: tlpkg/installer/install-menu-wizard.pl:604 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456 -#: tlpkg/installer/install-tl-gui.tcl:1351 +#: tlpkg/installer/install-tl-gui.tcl:1352 #: texmf-dist/scripts/tlshell/tlshell.tcl:1899 msgid "Install" msgstr "Instaluj" @@ -371,20 +371,20 @@ msgstr "Instaluj" #: texmf-dist/scripts/texlive/tlmgrgui.pl:143 #: tlpkg/installer/install-tl-gui.tcl:862 #: tlpkg/installer/install-tl-gui.tcl:1099 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "None" msgstr "Żaden" #: tlpkg/installer/install-menu-perltk.pl:49 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "Only new" msgstr "Tylko nowe" #: tlpkg/installer/install-menu-perltk.pl:50 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145 #: tlpkg/installer/install-tl-gui.tcl:1096 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 #: texmf-dist/scripts/tlshell/tlshell.tcl:2212 #: texmf-dist/scripts/tlshell/tlshell.tcl:2229 msgid "All" @@ -400,17 +400,17 @@ msgid "letter" msgstr "letter" #: tlpkg/installer/install-menu-perltk.pl:55 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "No shortcuts" msgstr "Brak skrótów" #: tlpkg/installer/install-menu-perltk.pl:56 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "TeX Live menu" msgstr "Menu TeX Live" #: tlpkg/installer/install-menu-perltk.pl:57 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "Launcher entry" msgstr "Pozycja programu uruchomieniowego" @@ -479,7 +479,7 @@ msgstr "Proszę wybrać inną kopię zasobów (mirror)." #: tlpkg/installer/install-tl-gui.tcl:930 #: tlpkg/installer/install-tl-gui.tcl:986 #: tlpkg/installer/install-tl-gui.tcl:1080 -#: tlpkg/installer/install-tl-gui.tcl:1300 tlpkg/tltcl/tltcl.tcl:586 +#: tlpkg/installer/install-tl-gui.tcl:1301 tlpkg/tltcl/tltcl.tcl:608 #: texmf-dist/scripts/tlshell/tlshell.tcl:158 msgid "Ok" msgstr "Ok" @@ -545,7 +545,7 @@ msgstr "Ustawienia instalacji przenośnej" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1231 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1240 -#: tlpkg/installer/install-tl-gui.tcl:1478 +#: tlpkg/installer/install-tl-gui.tcl:1479 msgid "Toggle" msgstr "Przełącz" @@ -571,7 +571,7 @@ msgstr "TEXMFHOME (katalog dla prywatnych plików użytkownika)" #: tlpkg/installer/install-menu-perltk.pl:440 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513 -#: tlpkg/installer/install-tl-gui.tcl:1561 +#: tlpkg/installer/install-tl-gui.tcl:1562 #: texmf-dist/scripts/tlshell/tlshell.tcl:771 #: texmf-dist/scripts/tlshell/tlshell.tcl:2029 #: texmf-dist/scripts/tlshell/tlshell.tcl:2093 @@ -579,22 +579,22 @@ msgid "Options" msgstr "Opcje" #: tlpkg/installer/install-menu-perltk.pl:458 -#: tlpkg/installer/install-tl-gui.tcl:1581 +#: tlpkg/installer/install-tl-gui.tcl:1582 msgid "Allow execution of restricted list of programs via \\write18" msgstr "Zezwalaj na uruchomienie wybranych programów via \\write18" #: tlpkg/installer/install-menu-perltk.pl:473 -#: tlpkg/installer/install-tl-gui.tcl:1588 +#: tlpkg/installer/install-tl-gui.tcl:1589 msgid "Create all format files" msgstr "Generowanie wszystkich plików formatów" #: tlpkg/installer/install-menu-perltk.pl:485 -#: tlpkg/installer/install-tl-gui.tcl:1596 +#: tlpkg/installer/install-tl-gui.tcl:1597 msgid "Install font/macro doc tree" msgstr "Instalowanie dokumentacji fontów i makr" #: tlpkg/installer/install-menu-perltk.pl:498 -#: tlpkg/installer/install-tl-gui.tcl:1606 +#: tlpkg/installer/install-tl-gui.tcl:1607 msgid "Install font/macro source tree" msgstr "Instalowanie plików źródłowych fontów i makr" @@ -604,7 +604,7 @@ msgid "Create symlinks in system directories" msgstr "Utwórz dowiązania symboliczne w katalogach systemowych" #: tlpkg/installer/install-menu-perltk.pl:585 -#: tlpkg/installer/install-tl-gui.tcl:1699 +#: tlpkg/installer/install-tl-gui.tcl:1700 msgid "After install, set CTAN as source for package updates" msgstr "Po instalacji pobierz aktualizacje pakietów z CTAN" @@ -1176,7 +1176,7 @@ msgid "Create shortcuts on the desktop" msgstr "Utwórz skróty na pulpicie" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1236 -#: tlpkg/installer/install-tl-gui.tcl:1651 +#: tlpkg/installer/install-tl-gui.tcl:1652 msgid "Install for all users" msgstr "Instaluj dla wszystkich użytkowników" @@ -1498,12 +1498,12 @@ msgid "Abort" msgstr "Anuluj" #: tlpkg/installer/install-tl-gui.tcl:410 -#: tlpkg/installer/install-tl-gui.tcl:1910 +#: tlpkg/installer/install-tl-gui.tcl:1911 msgid "TeX Live Installer" msgstr "Instalator TeX Live" #: tlpkg/installer/install-tl-gui.tcl:413 -#: tlpkg/installer/install-tl-gui.tcl:2009 +#: tlpkg/installer/install-tl-gui.tcl:2010 #, tcl-format msgid "" "Trying to load %s.\n" @@ -1545,13 +1545,13 @@ msgid "Remove year" msgstr "Usuń rok" #: tlpkg/installer/install-tl-gui.tcl:611 -#: tlpkg/installer/install-tl-gui.tcl:1385 -#: tlpkg/installer/install-tl-gui.tcl:1393 +#: tlpkg/installer/install-tl-gui.tcl:1386 +#: tlpkg/installer/install-tl-gui.tcl:1394 msgid "Installation root" msgstr "Korzeń instalacji" #: tlpkg/installer/install-tl-gui.tcl:639 -#: tlpkg/installer/install-tl-gui.tcl:1280 tlpkg/tltcl/tltcl.tcl:578 +#: tlpkg/installer/install-tl-gui.tcl:1281 tlpkg/tltcl/tltcl.tcl:600 msgid "Browse..." msgstr "Przeglądaj..." @@ -1569,7 +1569,7 @@ msgid "Cannot deselect own platform" msgstr "Nie można odznaczyć własnego systemu" #: tlpkg/installer/install-tl-gui.tcl:923 -#: tlpkg/installer/install-tl-gui.tcl:1284 +#: tlpkg/installer/install-tl-gui.tcl:1285 msgid "Binaries" msgstr "Binaria" @@ -1593,52 +1593,52 @@ msgstr "Języki" msgid "Other collections" msgstr "Inne kolekcje" -#: tlpkg/installer/install-tl-gui.tcl:1237 +#: tlpkg/installer/install-tl-gui.tcl:1238 msgid "Warning. Not all configured directories are writable!" msgstr "Uwaga. Nie wszystkie skonfigurowane katalogi są zapisywalne!" -#: tlpkg/installer/install-tl-gui.tcl:1257 +#: tlpkg/installer/install-tl-gui.tcl:1258 msgid "Symlinks" msgstr "Dowiązania symboliczne" -#: tlpkg/installer/install-tl-gui.tcl:1285 +#: tlpkg/installer/install-tl-gui.tcl:1286 msgid "Man pages" msgstr "Strony man" -#: tlpkg/installer/install-tl-gui.tcl:1286 +#: tlpkg/installer/install-tl-gui.tcl:1287 msgid "Info pages" msgstr "Dokumentacje info" -#: tlpkg/installer/install-tl-gui.tcl:1340 +#: tlpkg/installer/install-tl-gui.tcl:1341 #, tcl-format msgid "TeX Live %s Installer" msgstr "Instalator TeX Live %s" -#: tlpkg/installer/install-tl-gui.tcl:1358 +#: tlpkg/installer/install-tl-gui.tcl:1359 msgid "Advanced" msgstr "Zaawansowane" -#: tlpkg/installer/install-tl-gui.tcl:1388 +#: tlpkg/installer/install-tl-gui.tcl:1389 msgid "Directories" msgstr "Katalogi" -#: tlpkg/installer/install-tl-gui.tcl:1407 +#: tlpkg/installer/install-tl-gui.tcl:1408 msgid "Main tree" msgstr "Główne drzewo" -#: tlpkg/installer/install-tl-gui.tcl:1430 +#: tlpkg/installer/install-tl-gui.tcl:1431 msgid "Local additions" msgstr "Dodatki lokalne" -#: tlpkg/installer/install-tl-gui.tcl:1439 +#: tlpkg/installer/install-tl-gui.tcl:1440 msgid "Per-user additions" msgstr "Dodatki użytkowników" -#: tlpkg/installer/install-tl-gui.tcl:1466 +#: tlpkg/installer/install-tl-gui.tcl:1467 msgid "More ..." msgstr "Więcej ..." -#: tlpkg/installer/install-tl-gui.tcl:1475 +#: tlpkg/installer/install-tl-gui.tcl:1476 msgid "" "Portable setup:\n" "May reset TEXMFLOCAL\n" @@ -1648,76 +1648,76 @@ msgstr "" "Mogą zmienić TEXMFLOCAL\n" "i TEXMFHOME" -#: tlpkg/installer/install-tl-gui.tcl:1489 +#: tlpkg/installer/install-tl-gui.tcl:1490 #: texmf-dist/scripts/tlshell/tlshell.tcl:1338 #: texmf-dist/scripts/tlshell/tlshell.tcl:2127 msgid "Platforms" msgstr "Systemy operacyjne" -#: tlpkg/installer/install-tl-gui.tcl:1495 +#: tlpkg/installer/install-tl-gui.tcl:1496 msgid "Current platform:" msgstr "Aktualny system:" -#: tlpkg/installer/install-tl-gui.tcl:1502 +#: tlpkg/installer/install-tl-gui.tcl:1503 msgid "N. of additional platform(s):" msgstr "Ilość dodatkowych systemów:" -#: tlpkg/installer/install-tl-gui.tcl:1515 +#: tlpkg/installer/install-tl-gui.tcl:1516 msgid "Selections" msgstr "Wybór" -#: tlpkg/installer/install-tl-gui.tcl:1520 +#: tlpkg/installer/install-tl-gui.tcl:1521 msgid "Scheme:" msgstr "Schemat:" -#: tlpkg/installer/install-tl-gui.tcl:1529 +#: tlpkg/installer/install-tl-gui.tcl:1530 msgid "N. of collections:" msgstr "Ilość kolekcji:" -#: tlpkg/installer/install-tl-gui.tcl:1532 +#: tlpkg/installer/install-tl-gui.tcl:1533 msgid "Customize" msgstr "Dostosuj" -#: tlpkg/installer/install-tl-gui.tcl:1541 +#: tlpkg/installer/install-tl-gui.tcl:1542 msgid "Disk space required (in MB):" msgstr "Wymagana przestrzeń na dysku (w MB)" -#: tlpkg/installer/install-tl-gui.tcl:1619 +#: tlpkg/installer/install-tl-gui.tcl:1620 msgid "Adjust searchpath" msgstr "Dostosuj ścieżkę wyszukiwania" -#: tlpkg/installer/install-tl-gui.tcl:1628 +#: tlpkg/installer/install-tl-gui.tcl:1629 msgid "Desktop integration" msgstr "Integracja pulpitu" -#: tlpkg/installer/install-tl-gui.tcl:1640 +#: tlpkg/installer/install-tl-gui.tcl:1641 msgid "File associations" msgstr "Skojarzenia plików" -#: tlpkg/installer/install-tl-gui.tcl:1679 +#: tlpkg/installer/install-tl-gui.tcl:1680 msgid "Create symlinks in standard directories" msgstr "Utwórz dowiązania symboliczne do standardowych katalogów" -#: tlpkg/installer/install-tl-gui.tcl:1685 +#: tlpkg/installer/install-tl-gui.tcl:1686 msgid "Specify directories" msgstr "Określ katalogi" -#: tlpkg/installer/install-tl-gui.tcl:1750 +#: tlpkg/installer/install-tl-gui.tcl:1751 msgid "Custom scheme" msgstr "Schemat indywidualny" -#: tlpkg/installer/install-tl-gui.tcl:1935 +#: tlpkg/installer/install-tl-gui.tcl:1936 #, tcl-format msgid "%s not a local or remote repository" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1936 -#: tlpkg/installer/install-tl-gui.tcl:1942 +#: tlpkg/installer/install-tl-gui.tcl:1937 +#: tlpkg/installer/install-tl-gui.tcl:1943 #: texmf-dist/scripts/tlshell/tlshell.tcl:2030 msgid "Error" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1941 +#: tlpkg/installer/install-tl-gui.tcl:1942 #, tcl-format msgid "%s requires an argument" msgstr "" @@ -1730,7 +1730,7 @@ msgstr "Konkretna kopia (mirror)..." msgid "No mirror list available" msgstr "" -#: tlpkg/tltcl/tltcl.tcl:661 +#: tlpkg/tltcl/tltcl.tcl:683 msgid "Select or type" msgstr "Wybierz lub wpisz" diff --git a/systems/texlive/tlnet/tlpkg/translations/pt_BR.po b/systems/texlive/tlnet/tlpkg/translations/pt_BR.po index 1a489129e4..faa977aaf3 100644 --- a/systems/texlive/tlnet/tlpkg/translations/pt_BR.po +++ b/systems/texlive/tlnet/tlpkg/translations/pt_BR.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: TeX Live translation\n" "Report-Msgid-Bugs-To: tex-live@tug.org\n" -"POT-Creation-Date: 2020-02-08 01:55+0100\n" +"POT-Creation-Date: 2020-02-16 19:07+0100\n" "PO-Revision-Date: 2020-01-20 10:03-0300\n" "Last-Translator: Paulo Roberto Massa Cereda <cereda.paulo@gmail.com>\n" "Language-Team: Paulo Roberto Massa Cereda <cereda.paulo@gmail.com>\n" @@ -47,7 +47,7 @@ msgstr "Processo de instalação" #: tlpkg/installer/install-tl-gui.tcl:933 #: tlpkg/installer/install-tl-gui.tcl:1003 #: tlpkg/installer/install-tl-gui.tcl:1083 -#: tlpkg/installer/install-tl-gui.tcl:1302 tlpkg/tltcl/tltcl.tcl:588 +#: tlpkg/installer/install-tl-gui.tcl:1303 tlpkg/tltcl/tltcl.tcl:610 #: texmf-dist/scripts/tlshell/tlshell.tcl:168 #: texmf-dist/scripts/tlshell/tlshell.tcl:1261 msgid "Cancel" @@ -63,7 +63,7 @@ msgstr "Finalizar" #: tlpkg/installer/install-menu-wizard.pl:41 #: tlpkg/installer/install-menu-perltk.pl:445 -#: tlpkg/installer/install-tl-gui.tcl:1570 +#: tlpkg/installer/install-tl-gui.tcl:1571 msgid "Default paper size" msgstr "Tamanho padrão do papel" @@ -92,7 +92,7 @@ msgstr "Instalação para todos os usuários" #: tlpkg/installer/install-menu-wizard.pl:46 #: tlpkg/installer/install-menu-perltk.pl:569 -#: tlpkg/installer/install-tl-gui.tcl:1662 +#: tlpkg/installer/install-tl-gui.tcl:1663 msgid "Install TeXworks front end" msgstr "Instalar o editor TeXworks" @@ -107,7 +107,7 @@ msgstr "Instalação do TeX Live %s" #: tlpkg/installer/install-menu-perltk.pl:630 #: tlpkg/installer/install-menu-perltk.pl:676 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544 -#: tlpkg/installer/install-tl-gui.tcl:1353 +#: tlpkg/installer/install-tl-gui.tcl:1354 #: texmf-dist/scripts/tlshell/tlshell.tcl:2153 msgid "Quit" msgstr "Sair" @@ -277,15 +277,15 @@ msgstr "Diretório de destino:" #: texmf-dist/scripts/texlive/tlmgrgui.pl:2438 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2443 #: tlpkg/installer/install-tl-gui.tcl:642 -#: tlpkg/installer/install-tl-gui.tcl:1401 -#: tlpkg/installer/install-tl-gui.tcl:1417 -#: tlpkg/installer/install-tl-gui.tcl:1425 -#: tlpkg/installer/install-tl-gui.tcl:1435 -#: tlpkg/installer/install-tl-gui.tcl:1444 -#: tlpkg/installer/install-tl-gui.tcl:1452 -#: tlpkg/installer/install-tl-gui.tcl:1459 -#: tlpkg/installer/install-tl-gui.tcl:1505 -#: tlpkg/installer/install-tl-gui.tcl:1524 +#: tlpkg/installer/install-tl-gui.tcl:1402 +#: tlpkg/installer/install-tl-gui.tcl:1418 +#: tlpkg/installer/install-tl-gui.tcl:1426 +#: tlpkg/installer/install-tl-gui.tcl:1436 +#: tlpkg/installer/install-tl-gui.tcl:1445 +#: tlpkg/installer/install-tl-gui.tcl:1453 +#: tlpkg/installer/install-tl-gui.tcl:1460 +#: tlpkg/installer/install-tl-gui.tcl:1506 +#: tlpkg/installer/install-tl-gui.tcl:1525 msgid "Change" msgstr "Alterar" @@ -361,7 +361,7 @@ msgstr "Não" #: tlpkg/installer/install-menu-wizard.pl:604 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456 -#: tlpkg/installer/install-tl-gui.tcl:1351 +#: tlpkg/installer/install-tl-gui.tcl:1352 #: texmf-dist/scripts/tlshell/tlshell.tcl:1899 msgid "Install" msgstr "Instalar" @@ -371,20 +371,20 @@ msgstr "Instalar" #: texmf-dist/scripts/texlive/tlmgrgui.pl:143 #: tlpkg/installer/install-tl-gui.tcl:862 #: tlpkg/installer/install-tl-gui.tcl:1099 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "None" msgstr "Nenhum" #: tlpkg/installer/install-menu-perltk.pl:49 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "Only new" msgstr "Apenas novos" #: tlpkg/installer/install-menu-perltk.pl:50 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145 #: tlpkg/installer/install-tl-gui.tcl:1096 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 #: texmf-dist/scripts/tlshell/tlshell.tcl:2212 #: texmf-dist/scripts/tlshell/tlshell.tcl:2229 msgid "All" @@ -400,17 +400,17 @@ msgid "letter" msgstr "carta" #: tlpkg/installer/install-menu-perltk.pl:55 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "No shortcuts" msgstr "Sem atalhos" #: tlpkg/installer/install-menu-perltk.pl:56 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "TeX Live menu" msgstr "Menu TeX Live" #: tlpkg/installer/install-menu-perltk.pl:57 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "Launcher entry" msgstr "Entrada do lançador" @@ -479,7 +479,7 @@ msgstr "Por favor, selecione um espelho diferente." #: tlpkg/installer/install-tl-gui.tcl:930 #: tlpkg/installer/install-tl-gui.tcl:986 #: tlpkg/installer/install-tl-gui.tcl:1080 -#: tlpkg/installer/install-tl-gui.tcl:1300 tlpkg/tltcl/tltcl.tcl:586 +#: tlpkg/installer/install-tl-gui.tcl:1301 tlpkg/tltcl/tltcl.tcl:608 #: texmf-dist/scripts/tlshell/tlshell.tcl:158 msgid "Ok" msgstr "Ok" @@ -546,7 +546,7 @@ msgstr "Configuração portátil" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1231 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1240 -#: tlpkg/installer/install-tl-gui.tcl:1478 +#: tlpkg/installer/install-tl-gui.tcl:1479 msgid "Toggle" msgstr "Alternar" @@ -572,7 +572,7 @@ msgstr "TEXMFHOME (diretório para arquivos específicos do usuário)" #: tlpkg/installer/install-menu-perltk.pl:440 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513 -#: tlpkg/installer/install-tl-gui.tcl:1561 +#: tlpkg/installer/install-tl-gui.tcl:1562 #: texmf-dist/scripts/tlshell/tlshell.tcl:771 #: texmf-dist/scripts/tlshell/tlshell.tcl:2029 #: texmf-dist/scripts/tlshell/tlshell.tcl:2093 @@ -580,22 +580,22 @@ msgid "Options" msgstr "Opções" #: tlpkg/installer/install-menu-perltk.pl:458 -#: tlpkg/installer/install-tl-gui.tcl:1581 +#: tlpkg/installer/install-tl-gui.tcl:1582 msgid "Allow execution of restricted list of programs via \\write18" msgstr "Permitir execução de lista restrita de programas através de \\write18" #: tlpkg/installer/install-menu-perltk.pl:473 -#: tlpkg/installer/install-tl-gui.tcl:1588 +#: tlpkg/installer/install-tl-gui.tcl:1589 msgid "Create all format files" msgstr "Criar todos os formatos de arquivos" #: tlpkg/installer/install-menu-perltk.pl:485 -#: tlpkg/installer/install-tl-gui.tcl:1596 +#: tlpkg/installer/install-tl-gui.tcl:1597 msgid "Install font/macro doc tree" msgstr "Instalar árvore de documentação de fontes/macros" #: tlpkg/installer/install-menu-perltk.pl:498 -#: tlpkg/installer/install-tl-gui.tcl:1606 +#: tlpkg/installer/install-tl-gui.tcl:1607 msgid "Install font/macro source tree" msgstr "Instalar a árvore de código-fonte de fontes/macros" @@ -605,7 +605,7 @@ msgid "Create symlinks in system directories" msgstr "Criar links simbólicos nos diretórios do sistema" #: tlpkg/installer/install-menu-perltk.pl:585 -#: tlpkg/installer/install-tl-gui.tcl:1699 +#: tlpkg/installer/install-tl-gui.tcl:1700 msgid "After install, set CTAN as source for package updates" msgstr "Após a instalação, definir CTAN como fonte para atualização de pacotes" @@ -1179,7 +1179,7 @@ msgid "Create shortcuts on the desktop" msgstr "Criar atalhos na área de trabalho" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1236 -#: tlpkg/installer/install-tl-gui.tcl:1651 +#: tlpkg/installer/install-tl-gui.tcl:1652 msgid "Install for all users" msgstr "Instalar para todos os usuários" @@ -1506,12 +1506,12 @@ msgid "Abort" msgstr "Abortar" #: tlpkg/installer/install-tl-gui.tcl:410 -#: tlpkg/installer/install-tl-gui.tcl:1910 +#: tlpkg/installer/install-tl-gui.tcl:1911 msgid "TeX Live Installer" msgstr "Instalador TeX Live" #: tlpkg/installer/install-tl-gui.tcl:413 -#: tlpkg/installer/install-tl-gui.tcl:2009 +#: tlpkg/installer/install-tl-gui.tcl:2010 #, tcl-format msgid "" "Trying to load %s.\n" @@ -1557,13 +1557,13 @@ msgid "Remove year" msgstr "Remover ano" #: tlpkg/installer/install-tl-gui.tcl:611 -#: tlpkg/installer/install-tl-gui.tcl:1385 -#: tlpkg/installer/install-tl-gui.tcl:1393 +#: tlpkg/installer/install-tl-gui.tcl:1386 +#: tlpkg/installer/install-tl-gui.tcl:1394 msgid "Installation root" msgstr "Raiz da instalação" #: tlpkg/installer/install-tl-gui.tcl:639 -#: tlpkg/installer/install-tl-gui.tcl:1280 tlpkg/tltcl/tltcl.tcl:578 +#: tlpkg/installer/install-tl-gui.tcl:1281 tlpkg/tltcl/tltcl.tcl:600 msgid "Browse..." msgstr "Procurar..." @@ -1582,7 +1582,7 @@ msgid "Cannot deselect own platform" msgstr "Não é possível desmarcar a própria plataforma" #: tlpkg/installer/install-tl-gui.tcl:923 -#: tlpkg/installer/install-tl-gui.tcl:1284 +#: tlpkg/installer/install-tl-gui.tcl:1285 msgid "Binaries" msgstr "Binários" @@ -1606,52 +1606,52 @@ msgstr "Idiomas" msgid "Other collections" msgstr "Outras coleções" -#: tlpkg/installer/install-tl-gui.tcl:1237 +#: tlpkg/installer/install-tl-gui.tcl:1238 msgid "Warning. Not all configured directories are writable!" msgstr "Aviso. Nem todos os diretórios configurados têm permissão de escrita!" -#: tlpkg/installer/install-tl-gui.tcl:1257 +#: tlpkg/installer/install-tl-gui.tcl:1258 msgid "Symlinks" msgstr "Ligações simbólicas" -#: tlpkg/installer/install-tl-gui.tcl:1285 +#: tlpkg/installer/install-tl-gui.tcl:1286 msgid "Man pages" msgstr "Páginas de manual" -#: tlpkg/installer/install-tl-gui.tcl:1286 +#: tlpkg/installer/install-tl-gui.tcl:1287 msgid "Info pages" msgstr "Páginas de informações" -#: tlpkg/installer/install-tl-gui.tcl:1340 +#: tlpkg/installer/install-tl-gui.tcl:1341 #, tcl-format msgid "TeX Live %s Installer" msgstr "Instalador TeX Live %s" -#: tlpkg/installer/install-tl-gui.tcl:1358 +#: tlpkg/installer/install-tl-gui.tcl:1359 msgid "Advanced" msgstr "Avançado" -#: tlpkg/installer/install-tl-gui.tcl:1388 +#: tlpkg/installer/install-tl-gui.tcl:1389 msgid "Directories" msgstr "Diretórios" -#: tlpkg/installer/install-tl-gui.tcl:1407 +#: tlpkg/installer/install-tl-gui.tcl:1408 msgid "Main tree" msgstr "Árvore principal" -#: tlpkg/installer/install-tl-gui.tcl:1430 +#: tlpkg/installer/install-tl-gui.tcl:1431 msgid "Local additions" msgstr "Adições locais" -#: tlpkg/installer/install-tl-gui.tcl:1439 +#: tlpkg/installer/install-tl-gui.tcl:1440 msgid "Per-user additions" msgstr "Adições por usuário" -#: tlpkg/installer/install-tl-gui.tcl:1466 +#: tlpkg/installer/install-tl-gui.tcl:1467 msgid "More ..." msgstr "Mais ..." -#: tlpkg/installer/install-tl-gui.tcl:1475 +#: tlpkg/installer/install-tl-gui.tcl:1476 msgid "" "Portable setup:\n" "May reset TEXMFLOCAL\n" @@ -1661,76 +1661,76 @@ msgstr "" "Pode restabelecer TEXMFLOCAL\n" "e TEXMFHOME" -#: tlpkg/installer/install-tl-gui.tcl:1489 +#: tlpkg/installer/install-tl-gui.tcl:1490 #: texmf-dist/scripts/tlshell/tlshell.tcl:1338 #: texmf-dist/scripts/tlshell/tlshell.tcl:2127 msgid "Platforms" msgstr "Plataformas" -#: tlpkg/installer/install-tl-gui.tcl:1495 +#: tlpkg/installer/install-tl-gui.tcl:1496 msgid "Current platform:" msgstr "Plataforma corrente:" -#: tlpkg/installer/install-tl-gui.tcl:1502 +#: tlpkg/installer/install-tl-gui.tcl:1503 msgid "N. of additional platform(s):" msgstr "Número de plataformas adicionais:" -#: tlpkg/installer/install-tl-gui.tcl:1515 +#: tlpkg/installer/install-tl-gui.tcl:1516 msgid "Selections" msgstr "Seleções" -#: tlpkg/installer/install-tl-gui.tcl:1520 +#: tlpkg/installer/install-tl-gui.tcl:1521 msgid "Scheme:" msgstr "Esquema:" -#: tlpkg/installer/install-tl-gui.tcl:1529 +#: tlpkg/installer/install-tl-gui.tcl:1530 msgid "N. of collections:" msgstr "Número de coleções:" -#: tlpkg/installer/install-tl-gui.tcl:1532 +#: tlpkg/installer/install-tl-gui.tcl:1533 msgid "Customize" msgstr "Personalizar" -#: tlpkg/installer/install-tl-gui.tcl:1541 +#: tlpkg/installer/install-tl-gui.tcl:1542 msgid "Disk space required (in MB):" msgstr "Espaço em disco requerido (em MB):" -#: tlpkg/installer/install-tl-gui.tcl:1619 +#: tlpkg/installer/install-tl-gui.tcl:1620 msgid "Adjust searchpath" msgstr "Ajustar o caminho de busca" -#: tlpkg/installer/install-tl-gui.tcl:1628 +#: tlpkg/installer/install-tl-gui.tcl:1629 msgid "Desktop integration" msgstr "Integração com área de trabalho" -#: tlpkg/installer/install-tl-gui.tcl:1640 +#: tlpkg/installer/install-tl-gui.tcl:1641 msgid "File associations" msgstr "Associações de arquivos" -#: tlpkg/installer/install-tl-gui.tcl:1679 +#: tlpkg/installer/install-tl-gui.tcl:1680 msgid "Create symlinks in standard directories" msgstr "Criar links simbólicos nos diretórios convencionais" -#: tlpkg/installer/install-tl-gui.tcl:1685 +#: tlpkg/installer/install-tl-gui.tcl:1686 msgid "Specify directories" msgstr "Especificar diretórios" -#: tlpkg/installer/install-tl-gui.tcl:1750 +#: tlpkg/installer/install-tl-gui.tcl:1751 msgid "Custom scheme" msgstr "Esquema personalizado" -#: tlpkg/installer/install-tl-gui.tcl:1935 +#: tlpkg/installer/install-tl-gui.tcl:1936 #, tcl-format msgid "%s not a local or remote repository" msgstr "%s não é um repositório local ou remoto" -#: tlpkg/installer/install-tl-gui.tcl:1936 -#: tlpkg/installer/install-tl-gui.tcl:1942 +#: tlpkg/installer/install-tl-gui.tcl:1937 +#: tlpkg/installer/install-tl-gui.tcl:1943 #: texmf-dist/scripts/tlshell/tlshell.tcl:2030 msgid "Error" msgstr "Erro" -#: tlpkg/installer/install-tl-gui.tcl:1941 +#: tlpkg/installer/install-tl-gui.tcl:1942 #, tcl-format msgid "%s requires an argument" msgstr "%s requer um argumento" @@ -1743,7 +1743,7 @@ msgstr "Especificar espelho..." msgid "No mirror list available" msgstr "A lista de espelhos não está disponível" -#: tlpkg/tltcl/tltcl.tcl:661 +#: tlpkg/tltcl/tltcl.tcl:683 msgid "Select or type" msgstr "Selecione ou digite" diff --git a/systems/texlive/tlnet/tlpkg/translations/ru.po b/systems/texlive/tlnet/tlpkg/translations/ru.po index 50dade8035..2627061e2d 100644 --- a/systems/texlive/tlnet/tlpkg/translations/ru.po +++ b/systems/texlive/tlnet/tlpkg/translations/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: TeX Live translation\n" "Report-Msgid-Bugs-To: tex-live@tug.org\n" -"POT-Creation-Date: 2020-02-08 01:55+0100\n" +"POT-Creation-Date: 2020-02-16 19:07+0100\n" "PO-Revision-Date: 2019-03-26 09:17+0800\n" "Last-Translator: Vladimir Lomov <irk.translator@yandex.ru>\n" "Language-Team: Russian <tldoc@tug.org>\n" @@ -52,7 +52,7 @@ msgstr "Процесс установки" #: tlpkg/installer/install-tl-gui.tcl:933 #: tlpkg/installer/install-tl-gui.tcl:1003 #: tlpkg/installer/install-tl-gui.tcl:1083 -#: tlpkg/installer/install-tl-gui.tcl:1302 tlpkg/tltcl/tltcl.tcl:588 +#: tlpkg/installer/install-tl-gui.tcl:1303 tlpkg/tltcl/tltcl.tcl:610 #: texmf-dist/scripts/tlshell/tlshell.tcl:168 #: texmf-dist/scripts/tlshell/tlshell.tcl:1261 msgid "Cancel" @@ -68,7 +68,7 @@ msgstr "Закончить" #: tlpkg/installer/install-menu-wizard.pl:41 #: tlpkg/installer/install-menu-perltk.pl:445 -#: tlpkg/installer/install-tl-gui.tcl:1570 +#: tlpkg/installer/install-tl-gui.tcl:1571 msgid "Default paper size" msgstr "Размер листа по умолчанию" @@ -97,7 +97,7 @@ msgstr "Доступно для всех пользователей" #: tlpkg/installer/install-menu-wizard.pl:46 #: tlpkg/installer/install-menu-perltk.pl:569 -#: tlpkg/installer/install-tl-gui.tcl:1662 +#: tlpkg/installer/install-tl-gui.tcl:1663 msgid "Install TeXworks front end" msgstr "Установить редактор TeXworks" @@ -112,7 +112,7 @@ msgstr "Установка TeX Live %s" #: tlpkg/installer/install-menu-perltk.pl:630 #: tlpkg/installer/install-menu-perltk.pl:676 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544 -#: tlpkg/installer/install-tl-gui.tcl:1353 +#: tlpkg/installer/install-tl-gui.tcl:1354 #: texmf-dist/scripts/tlshell/tlshell.tcl:2153 msgid "Quit" msgstr "Выход" @@ -279,15 +279,15 @@ msgstr "Целевой каталог:" #: texmf-dist/scripts/texlive/tlmgrgui.pl:2438 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2443 #: tlpkg/installer/install-tl-gui.tcl:642 -#: tlpkg/installer/install-tl-gui.tcl:1401 -#: tlpkg/installer/install-tl-gui.tcl:1417 -#: tlpkg/installer/install-tl-gui.tcl:1425 -#: tlpkg/installer/install-tl-gui.tcl:1435 -#: tlpkg/installer/install-tl-gui.tcl:1444 -#: tlpkg/installer/install-tl-gui.tcl:1452 -#: tlpkg/installer/install-tl-gui.tcl:1459 -#: tlpkg/installer/install-tl-gui.tcl:1505 -#: tlpkg/installer/install-tl-gui.tcl:1524 +#: tlpkg/installer/install-tl-gui.tcl:1402 +#: tlpkg/installer/install-tl-gui.tcl:1418 +#: tlpkg/installer/install-tl-gui.tcl:1426 +#: tlpkg/installer/install-tl-gui.tcl:1436 +#: tlpkg/installer/install-tl-gui.tcl:1445 +#: tlpkg/installer/install-tl-gui.tcl:1453 +#: tlpkg/installer/install-tl-gui.tcl:1460 +#: tlpkg/installer/install-tl-gui.tcl:1506 +#: tlpkg/installer/install-tl-gui.tcl:1525 msgid "Change" msgstr "Изменить" @@ -363,7 +363,7 @@ msgstr "Нет" #: tlpkg/installer/install-menu-wizard.pl:604 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456 -#: tlpkg/installer/install-tl-gui.tcl:1351 +#: tlpkg/installer/install-tl-gui.tcl:1352 #: texmf-dist/scripts/tlshell/tlshell.tcl:1899 msgid "Install" msgstr "Установить" @@ -373,20 +373,20 @@ msgstr "Установить" #: texmf-dist/scripts/texlive/tlmgrgui.pl:143 #: tlpkg/installer/install-tl-gui.tcl:862 #: tlpkg/installer/install-tl-gui.tcl:1099 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "None" msgstr "Нет" #: tlpkg/installer/install-menu-perltk.pl:49 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "Only new" msgstr "Только новые" #: tlpkg/installer/install-menu-perltk.pl:50 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145 #: tlpkg/installer/install-tl-gui.tcl:1096 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 #: texmf-dist/scripts/tlshell/tlshell.tcl:2212 #: texmf-dist/scripts/tlshell/tlshell.tcl:2229 msgid "All" @@ -402,17 +402,17 @@ msgid "letter" msgstr "Letter" #: tlpkg/installer/install-menu-perltk.pl:55 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "No shortcuts" msgstr "Не создавать ярлыки" #: tlpkg/installer/install-menu-perltk.pl:56 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "TeX Live menu" msgstr "Меню TeX Live" #: tlpkg/installer/install-menu-perltk.pl:57 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "Launcher entry" msgstr "Только ярлыки" @@ -481,7 +481,7 @@ msgstr "Выберите другое зеркало." #: tlpkg/installer/install-tl-gui.tcl:930 #: tlpkg/installer/install-tl-gui.tcl:986 #: tlpkg/installer/install-tl-gui.tcl:1080 -#: tlpkg/installer/install-tl-gui.tcl:1300 tlpkg/tltcl/tltcl.tcl:586 +#: tlpkg/installer/install-tl-gui.tcl:1301 tlpkg/tltcl/tltcl.tcl:608 #: texmf-dist/scripts/tlshell/tlshell.tcl:158 msgid "Ok" msgstr "Ок" @@ -548,7 +548,7 @@ msgstr "Настройка для мобильного использовани #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1231 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1240 -#: tlpkg/installer/install-tl-gui.tcl:1478 +#: tlpkg/installer/install-tl-gui.tcl:1479 msgid "Toggle" msgstr "Переключить" @@ -574,7 +574,7 @@ msgstr "TEXMFHOME (каталог для личных файлов пользо #: tlpkg/installer/install-menu-perltk.pl:440 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513 -#: tlpkg/installer/install-tl-gui.tcl:1561 +#: tlpkg/installer/install-tl-gui.tcl:1562 #: texmf-dist/scripts/tlshell/tlshell.tcl:771 #: texmf-dist/scripts/tlshell/tlshell.tcl:2029 #: texmf-dist/scripts/tlshell/tlshell.tcl:2093 @@ -582,22 +582,22 @@ msgid "Options" msgstr "Параметры" #: tlpkg/installer/install-menu-perltk.pl:458 -#: tlpkg/installer/install-tl-gui.tcl:1581 +#: tlpkg/installer/install-tl-gui.tcl:1582 msgid "Allow execution of restricted list of programs via \\write18" msgstr "Разрешить выполнение ограниченного набора программ через \\write18" #: tlpkg/installer/install-menu-perltk.pl:473 -#: tlpkg/installer/install-tl-gui.tcl:1588 +#: tlpkg/installer/install-tl-gui.tcl:1589 msgid "Create all format files" msgstr "Создать все форматные файлы" #: tlpkg/installer/install-menu-perltk.pl:485 -#: tlpkg/installer/install-tl-gui.tcl:1596 +#: tlpkg/installer/install-tl-gui.tcl:1597 msgid "Install font/macro doc tree" msgstr "Установить дерево с документацией font/macro" #: tlpkg/installer/install-menu-perltk.pl:498 -#: tlpkg/installer/install-tl-gui.tcl:1606 +#: tlpkg/installer/install-tl-gui.tcl:1607 msgid "Install font/macro source tree" msgstr "Установить дерево исходных файлов font/macro" @@ -607,7 +607,7 @@ msgid "Create symlinks in system directories" msgstr "Создать символьные ссылки в системных каталогах" #: tlpkg/installer/install-menu-perltk.pl:585 -#: tlpkg/installer/install-tl-gui.tcl:1699 +#: tlpkg/installer/install-tl-gui.tcl:1700 msgid "After install, set CTAN as source for package updates" msgstr "После установки задать CTAN источником обновлений пакетов" @@ -1178,7 +1178,7 @@ msgid "Create shortcuts on the desktop" msgstr "Создать ярлыки на рабочем столе" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1236 -#: tlpkg/installer/install-tl-gui.tcl:1651 +#: tlpkg/installer/install-tl-gui.tcl:1652 msgid "Install for all users" msgstr "Установить для всех пользователей" @@ -1501,12 +1501,12 @@ msgid "Abort" msgstr "Отмена" #: tlpkg/installer/install-tl-gui.tcl:410 -#: tlpkg/installer/install-tl-gui.tcl:1910 +#: tlpkg/installer/install-tl-gui.tcl:1911 msgid "TeX Live Installer" msgstr "Программа установки TeX Live" #: tlpkg/installer/install-tl-gui.tcl:413 -#: tlpkg/installer/install-tl-gui.tcl:2009 +#: tlpkg/installer/install-tl-gui.tcl:2010 #, tcl-format msgid "" "Trying to load %s.\n" @@ -1548,13 +1548,13 @@ msgid "Remove year" msgstr "Убрать год" #: tlpkg/installer/install-tl-gui.tcl:611 -#: tlpkg/installer/install-tl-gui.tcl:1385 -#: tlpkg/installer/install-tl-gui.tcl:1393 +#: tlpkg/installer/install-tl-gui.tcl:1386 +#: tlpkg/installer/install-tl-gui.tcl:1394 msgid "Installation root" msgstr "Корневой каталог установки" #: tlpkg/installer/install-tl-gui.tcl:639 -#: tlpkg/installer/install-tl-gui.tcl:1280 tlpkg/tltcl/tltcl.tcl:578 +#: tlpkg/installer/install-tl-gui.tcl:1281 tlpkg/tltcl/tltcl.tcl:600 msgid "Browse..." msgstr "Обзор..." @@ -1572,7 +1572,7 @@ msgid "Cannot deselect own platform" msgstr "Невозможно снять выделение текущей платформы" #: tlpkg/installer/install-tl-gui.tcl:923 -#: tlpkg/installer/install-tl-gui.tcl:1284 +#: tlpkg/installer/install-tl-gui.tcl:1285 msgid "Binaries" msgstr "Программы" @@ -1596,52 +1596,52 @@ msgstr "Языки" msgid "Other collections" msgstr "Другие коллекции" -#: tlpkg/installer/install-tl-gui.tcl:1237 +#: tlpkg/installer/install-tl-gui.tcl:1238 msgid "Warning. Not all configured directories are writable!" msgstr "Предупреждение. Не все каталоги доступны на запись!" -#: tlpkg/installer/install-tl-gui.tcl:1257 +#: tlpkg/installer/install-tl-gui.tcl:1258 msgid "Symlinks" msgstr "Символьные ссылки" -#: tlpkg/installer/install-tl-gui.tcl:1285 +#: tlpkg/installer/install-tl-gui.tcl:1286 msgid "Man pages" msgstr "Документация в man" -#: tlpkg/installer/install-tl-gui.tcl:1286 +#: tlpkg/installer/install-tl-gui.tcl:1287 msgid "Info pages" msgstr "Документация в Info" -#: tlpkg/installer/install-tl-gui.tcl:1340 +#: tlpkg/installer/install-tl-gui.tcl:1341 #, tcl-format msgid "TeX Live %s Installer" msgstr "Программа установки TeX Live %s" -#: tlpkg/installer/install-tl-gui.tcl:1358 +#: tlpkg/installer/install-tl-gui.tcl:1359 msgid "Advanced" msgstr "Дополнительно" -#: tlpkg/installer/install-tl-gui.tcl:1388 +#: tlpkg/installer/install-tl-gui.tcl:1389 msgid "Directories" msgstr "Каталоги" -#: tlpkg/installer/install-tl-gui.tcl:1407 +#: tlpkg/installer/install-tl-gui.tcl:1408 msgid "Main tree" msgstr "Основное дерево" -#: tlpkg/installer/install-tl-gui.tcl:1430 +#: tlpkg/installer/install-tl-gui.tcl:1431 msgid "Local additions" msgstr "Локальные дополнения" -#: tlpkg/installer/install-tl-gui.tcl:1439 +#: tlpkg/installer/install-tl-gui.tcl:1440 msgid "Per-user additions" msgstr "Пользовательские дополнения" -#: tlpkg/installer/install-tl-gui.tcl:1466 +#: tlpkg/installer/install-tl-gui.tcl:1467 msgid "More ..." msgstr "Больше ..." -#: tlpkg/installer/install-tl-gui.tcl:1475 +#: tlpkg/installer/install-tl-gui.tcl:1476 msgid "" "Portable setup:\n" "May reset TEXMFLOCAL\n" @@ -1651,76 +1651,76 @@ msgstr "" "Возможна переустановка переменных TEXMFLOCAL\n" "и TEXMFHOME" -#: tlpkg/installer/install-tl-gui.tcl:1489 +#: tlpkg/installer/install-tl-gui.tcl:1490 #: texmf-dist/scripts/tlshell/tlshell.tcl:1338 #: texmf-dist/scripts/tlshell/tlshell.tcl:2127 msgid "Platforms" msgstr "Платформы" -#: tlpkg/installer/install-tl-gui.tcl:1495 +#: tlpkg/installer/install-tl-gui.tcl:1496 msgid "Current platform:" msgstr "Текущая платформа" -#: tlpkg/installer/install-tl-gui.tcl:1502 +#: tlpkg/installer/install-tl-gui.tcl:1503 msgid "N. of additional platform(s):" msgstr "Количество дополнительных платформ:" -#: tlpkg/installer/install-tl-gui.tcl:1515 +#: tlpkg/installer/install-tl-gui.tcl:1516 msgid "Selections" msgstr "Подборки" -#: tlpkg/installer/install-tl-gui.tcl:1520 +#: tlpkg/installer/install-tl-gui.tcl:1521 msgid "Scheme:" msgstr "Схема:" -#: tlpkg/installer/install-tl-gui.tcl:1529 +#: tlpkg/installer/install-tl-gui.tcl:1530 msgid "N. of collections:" msgstr "Количество коллекций:" -#: tlpkg/installer/install-tl-gui.tcl:1532 +#: tlpkg/installer/install-tl-gui.tcl:1533 msgid "Customize" msgstr "Настроить" -#: tlpkg/installer/install-tl-gui.tcl:1541 +#: tlpkg/installer/install-tl-gui.tcl:1542 msgid "Disk space required (in MB):" msgstr "Требуется места на диске (в МБ):" -#: tlpkg/installer/install-tl-gui.tcl:1619 +#: tlpkg/installer/install-tl-gui.tcl:1620 msgid "Adjust searchpath" msgstr "Настроить пути поиска" -#: tlpkg/installer/install-tl-gui.tcl:1628 +#: tlpkg/installer/install-tl-gui.tcl:1629 msgid "Desktop integration" msgstr "Интеграция с рабочим столом" -#: tlpkg/installer/install-tl-gui.tcl:1640 +#: tlpkg/installer/install-tl-gui.tcl:1641 msgid "File associations" msgstr "Ассоциации файлов" -#: tlpkg/installer/install-tl-gui.tcl:1679 +#: tlpkg/installer/install-tl-gui.tcl:1680 msgid "Create symlinks in standard directories" msgstr "Создать символьные ссылки в стандартных каталогах" -#: tlpkg/installer/install-tl-gui.tcl:1685 +#: tlpkg/installer/install-tl-gui.tcl:1686 msgid "Specify directories" msgstr "Укажите каталоги" -#: tlpkg/installer/install-tl-gui.tcl:1750 +#: tlpkg/installer/install-tl-gui.tcl:1751 msgid "Custom scheme" msgstr "Собственная схема" -#: tlpkg/installer/install-tl-gui.tcl:1935 +#: tlpkg/installer/install-tl-gui.tcl:1936 #, tcl-format msgid "%s not a local or remote repository" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1936 -#: tlpkg/installer/install-tl-gui.tcl:1942 +#: tlpkg/installer/install-tl-gui.tcl:1937 +#: tlpkg/installer/install-tl-gui.tcl:1943 #: texmf-dist/scripts/tlshell/tlshell.tcl:2030 msgid "Error" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1941 +#: tlpkg/installer/install-tl-gui.tcl:1942 #, tcl-format msgid "%s requires an argument" msgstr "" @@ -1733,7 +1733,7 @@ msgstr "Определённое зеркало..." msgid "No mirror list available" msgstr "" -#: tlpkg/tltcl/tltcl.tcl:661 +#: tlpkg/tltcl/tltcl.tcl:683 msgid "Select or type" msgstr "Выберите или введите" diff --git a/systems/texlive/tlnet/tlpkg/translations/sk.po b/systems/texlive/tlnet/tlpkg/translations/sk.po index e365d78bc4..535b32f600 100644 --- a/systems/texlive/tlnet/tlpkg/translations/sk.po +++ b/systems/texlive/tlnet/tlpkg/translations/sk.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: TeX Live translation\n" "Report-Msgid-Bugs-To: tex-live@tug.org\n" -"POT-Creation-Date: 2020-02-08 01:55+0100\n" +"POT-Creation-Date: 2020-02-16 19:07+0100\n" "PO-Revision-Date: 2019-03-22 00:57+0300\n" "Last-Translator: Ján Buša <jan.busa@tuke.sk>\n" "Language-Team: tex-live@tug.org\n" @@ -46,7 +46,7 @@ msgstr "Proces inštalácie" #: tlpkg/installer/install-tl-gui.tcl:933 #: tlpkg/installer/install-tl-gui.tcl:1003 #: tlpkg/installer/install-tl-gui.tcl:1083 -#: tlpkg/installer/install-tl-gui.tcl:1302 tlpkg/tltcl/tltcl.tcl:588 +#: tlpkg/installer/install-tl-gui.tcl:1303 tlpkg/tltcl/tltcl.tcl:610 #: texmf-dist/scripts/tlshell/tlshell.tcl:168 #: texmf-dist/scripts/tlshell/tlshell.tcl:1261 msgid "Cancel" @@ -63,7 +63,7 @@ msgstr "Dokončiť" # Slovak translation update - Jan Busa 02/05/15. #: tlpkg/installer/install-menu-wizard.pl:41 #: tlpkg/installer/install-menu-perltk.pl:445 -#: tlpkg/installer/install-tl-gui.tcl:1570 +#: tlpkg/installer/install-tl-gui.tcl:1571 msgid "Default paper size" msgstr "Predvolený rozmer papiera" @@ -92,7 +92,7 @@ msgstr "Inštalácia pre všetkých používateľov" #: tlpkg/installer/install-menu-wizard.pl:46 #: tlpkg/installer/install-menu-perltk.pl:569 -#: tlpkg/installer/install-tl-gui.tcl:1662 +#: tlpkg/installer/install-tl-gui.tcl:1663 msgid "Install TeXworks front end" msgstr "Nainštalovať pomocný program TeXworks" @@ -107,7 +107,7 @@ msgstr "Inštalácia TeX Live %s" #: tlpkg/installer/install-menu-perltk.pl:630 #: tlpkg/installer/install-menu-perltk.pl:676 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544 -#: tlpkg/installer/install-tl-gui.tcl:1353 +#: tlpkg/installer/install-tl-gui.tcl:1354 #: texmf-dist/scripts/tlshell/tlshell.tcl:2153 msgid "Quit" msgstr "Ukončiť" @@ -275,15 +275,15 @@ msgstr "Cieľový adresár:" #: texmf-dist/scripts/texlive/tlmgrgui.pl:2438 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2443 #: tlpkg/installer/install-tl-gui.tcl:642 -#: tlpkg/installer/install-tl-gui.tcl:1401 -#: tlpkg/installer/install-tl-gui.tcl:1417 -#: tlpkg/installer/install-tl-gui.tcl:1425 -#: tlpkg/installer/install-tl-gui.tcl:1435 -#: tlpkg/installer/install-tl-gui.tcl:1444 -#: tlpkg/installer/install-tl-gui.tcl:1452 -#: tlpkg/installer/install-tl-gui.tcl:1459 -#: tlpkg/installer/install-tl-gui.tcl:1505 -#: tlpkg/installer/install-tl-gui.tcl:1524 +#: tlpkg/installer/install-tl-gui.tcl:1402 +#: tlpkg/installer/install-tl-gui.tcl:1418 +#: tlpkg/installer/install-tl-gui.tcl:1426 +#: tlpkg/installer/install-tl-gui.tcl:1436 +#: tlpkg/installer/install-tl-gui.tcl:1445 +#: tlpkg/installer/install-tl-gui.tcl:1453 +#: tlpkg/installer/install-tl-gui.tcl:1460 +#: tlpkg/installer/install-tl-gui.tcl:1506 +#: tlpkg/installer/install-tl-gui.tcl:1525 msgid "Change" msgstr "Zmeniť" @@ -359,7 +359,7 @@ msgstr "Nie" #: tlpkg/installer/install-menu-wizard.pl:604 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456 -#: tlpkg/installer/install-tl-gui.tcl:1351 +#: tlpkg/installer/install-tl-gui.tcl:1352 #: texmf-dist/scripts/tlshell/tlshell.tcl:1899 msgid "Install" msgstr "Nainštalovať" @@ -369,20 +369,20 @@ msgstr "Nainštalovať" #: texmf-dist/scripts/texlive/tlmgrgui.pl:143 #: tlpkg/installer/install-tl-gui.tcl:862 #: tlpkg/installer/install-tl-gui.tcl:1099 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "None" msgstr "Žiaden" #: tlpkg/installer/install-menu-perltk.pl:49 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "Only new" msgstr "Len nové" #: tlpkg/installer/install-menu-perltk.pl:50 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145 #: tlpkg/installer/install-tl-gui.tcl:1096 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 #: texmf-dist/scripts/tlshell/tlshell.tcl:2212 #: texmf-dist/scripts/tlshell/tlshell.tcl:2229 msgid "All" @@ -398,17 +398,17 @@ msgid "letter" msgstr "letter" #: tlpkg/installer/install-menu-perltk.pl:55 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "No shortcuts" msgstr "Žiadne skratky" #: tlpkg/installer/install-menu-perltk.pl:56 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "TeX Live menu" msgstr "Menu TeX Live" #: tlpkg/installer/install-menu-perltk.pl:57 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "Launcher entry" msgstr "Položka zavádzača" @@ -477,7 +477,7 @@ msgstr "Zvoľte, prosím, iné zrkadlo." #: tlpkg/installer/install-tl-gui.tcl:930 #: tlpkg/installer/install-tl-gui.tcl:986 #: tlpkg/installer/install-tl-gui.tcl:1080 -#: tlpkg/installer/install-tl-gui.tcl:1300 tlpkg/tltcl/tltcl.tcl:586 +#: tlpkg/installer/install-tl-gui.tcl:1301 tlpkg/tltcl/tltcl.tcl:608 #: texmf-dist/scripts/tlshell/tlshell.tcl:158 msgid "Ok" msgstr "OK" @@ -544,7 +544,7 @@ msgstr "Prenosné nastavenie" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1231 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1240 -#: tlpkg/installer/install-tl-gui.tcl:1478 +#: tlpkg/installer/install-tl-gui.tcl:1479 msgid "Toggle" msgstr "Prepnúť" @@ -570,7 +570,7 @@ msgstr "TEXMFHOME (adresár užívateľských súborov)" #: tlpkg/installer/install-menu-perltk.pl:440 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513 -#: tlpkg/installer/install-tl-gui.tcl:1561 +#: tlpkg/installer/install-tl-gui.tcl:1562 #: texmf-dist/scripts/tlshell/tlshell.tcl:771 #: texmf-dist/scripts/tlshell/tlshell.tcl:2029 #: texmf-dist/scripts/tlshell/tlshell.tcl:2093 @@ -578,24 +578,24 @@ msgid "Options" msgstr "Voľby" #: tlpkg/installer/install-menu-perltk.pl:458 -#: tlpkg/installer/install-tl-gui.tcl:1581 +#: tlpkg/installer/install-tl-gui.tcl:1582 msgid "Allow execution of restricted list of programs via \\write18" msgstr "" "Umožniť vykonanie všeobecne neprístupných zoznamov programov prostredníctvom " "\\write 18" #: tlpkg/installer/install-menu-perltk.pl:473 -#: tlpkg/installer/install-tl-gui.tcl:1588 +#: tlpkg/installer/install-tl-gui.tcl:1589 msgid "Create all format files" msgstr "Vytvoriť všetky formátové súbory" #: tlpkg/installer/install-menu-perltk.pl:485 -#: tlpkg/installer/install-tl-gui.tcl:1596 +#: tlpkg/installer/install-tl-gui.tcl:1597 msgid "Install font/macro doc tree" msgstr "Nainštalovať strom dokumentácie fontov/makier" #: tlpkg/installer/install-menu-perltk.pl:498 -#: tlpkg/installer/install-tl-gui.tcl:1606 +#: tlpkg/installer/install-tl-gui.tcl:1607 msgid "Install font/macro source tree" msgstr "Nainštalovať strom zdrojových súborov fontov/makier" @@ -605,7 +605,7 @@ msgid "Create symlinks in system directories" msgstr "Vytvoriť symbolické odkazy v systémových adresároch" #: tlpkg/installer/install-menu-perltk.pl:585 -#: tlpkg/installer/install-tl-gui.tcl:1699 +#: tlpkg/installer/install-tl-gui.tcl:1700 msgid "After install, set CTAN as source for package updates" msgstr "Po inštalácii nastavte CTAN ako zdroj aktualizácií balíkov" @@ -1177,7 +1177,7 @@ msgid "Create shortcuts on the desktop" msgstr "Vytvoriť odkazy na pracovnej ploche" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1236 -#: tlpkg/installer/install-tl-gui.tcl:1651 +#: tlpkg/installer/install-tl-gui.tcl:1652 msgid "Install for all users" msgstr "Nainštalovať pre všetkých používateľov" @@ -1501,12 +1501,12 @@ msgid "Abort" msgstr "Prerušiť" #: tlpkg/installer/install-tl-gui.tcl:410 -#: tlpkg/installer/install-tl-gui.tcl:1910 +#: tlpkg/installer/install-tl-gui.tcl:1911 msgid "TeX Live Installer" msgstr "Inštalátor TeX Live" #: tlpkg/installer/install-tl-gui.tcl:413 -#: tlpkg/installer/install-tl-gui.tcl:2009 +#: tlpkg/installer/install-tl-gui.tcl:2010 #, tcl-format msgid "" "Trying to load %s.\n" @@ -1548,13 +1548,13 @@ msgid "Remove year" msgstr "Odstrániť rok" #: tlpkg/installer/install-tl-gui.tcl:611 -#: tlpkg/installer/install-tl-gui.tcl:1385 -#: tlpkg/installer/install-tl-gui.tcl:1393 +#: tlpkg/installer/install-tl-gui.tcl:1386 +#: tlpkg/installer/install-tl-gui.tcl:1394 msgid "Installation root" msgstr "Root inštalácie" #: tlpkg/installer/install-tl-gui.tcl:639 -#: tlpkg/installer/install-tl-gui.tcl:1280 tlpkg/tltcl/tltcl.tcl:578 +#: tlpkg/installer/install-tl-gui.tcl:1281 tlpkg/tltcl/tltcl.tcl:600 msgid "Browse..." msgstr "Prezerať ..." @@ -1572,7 +1572,7 @@ msgid "Cannot deselect own platform" msgstr "Nie je možné odznačiť vlastnú platformu" #: tlpkg/installer/install-tl-gui.tcl:923 -#: tlpkg/installer/install-tl-gui.tcl:1284 +#: tlpkg/installer/install-tl-gui.tcl:1285 msgid "Binaries" msgstr "Binárky" @@ -1596,52 +1596,52 @@ msgstr "Jazyky" msgid "Other collections" msgstr "Iné zbierky" -#: tlpkg/installer/install-tl-gui.tcl:1237 +#: tlpkg/installer/install-tl-gui.tcl:1238 msgid "Warning. Not all configured directories are writable!" msgstr "Varovanie. Nie všetky nakonfigurované adresáre sú zapisovateľné!" -#: tlpkg/installer/install-tl-gui.tcl:1257 +#: tlpkg/installer/install-tl-gui.tcl:1258 msgid "Symlinks" msgstr "Symbolické odkazy" -#: tlpkg/installer/install-tl-gui.tcl:1285 +#: tlpkg/installer/install-tl-gui.tcl:1286 msgid "Man pages" msgstr "Strany príručiek" -#: tlpkg/installer/install-tl-gui.tcl:1286 +#: tlpkg/installer/install-tl-gui.tcl:1287 msgid "Info pages" msgstr "Informačné strany" -#: tlpkg/installer/install-tl-gui.tcl:1340 +#: tlpkg/installer/install-tl-gui.tcl:1341 #, tcl-format msgid "TeX Live %s Installer" msgstr "Inštalátor TeX Live %s" -#: tlpkg/installer/install-tl-gui.tcl:1358 +#: tlpkg/installer/install-tl-gui.tcl:1359 msgid "Advanced" msgstr "Pokročilé" -#: tlpkg/installer/install-tl-gui.tcl:1388 +#: tlpkg/installer/install-tl-gui.tcl:1389 msgid "Directories" msgstr "Adresáre" -#: tlpkg/installer/install-tl-gui.tcl:1407 +#: tlpkg/installer/install-tl-gui.tcl:1408 msgid "Main tree" msgstr "Hlavný strom" -#: tlpkg/installer/install-tl-gui.tcl:1430 +#: tlpkg/installer/install-tl-gui.tcl:1431 msgid "Local additions" msgstr "Miestne doplnky" -#: tlpkg/installer/install-tl-gui.tcl:1439 +#: tlpkg/installer/install-tl-gui.tcl:1440 msgid "Per-user additions" msgstr "Doplnky pre používateľa" -#: tlpkg/installer/install-tl-gui.tcl:1466 +#: tlpkg/installer/install-tl-gui.tcl:1467 msgid "More ..." msgstr "Viac ..." -#: tlpkg/installer/install-tl-gui.tcl:1475 +#: tlpkg/installer/install-tl-gui.tcl:1476 msgid "" "Portable setup:\n" "May reset TEXMFLOCAL\n" @@ -1651,76 +1651,76 @@ msgstr "" "Môže vymazať TEXMFLOCAL\n" "a TEXMFHOME" -#: tlpkg/installer/install-tl-gui.tcl:1489 +#: tlpkg/installer/install-tl-gui.tcl:1490 #: texmf-dist/scripts/tlshell/tlshell.tcl:1338 #: texmf-dist/scripts/tlshell/tlshell.tcl:2127 msgid "Platforms" msgstr "Platformy" -#: tlpkg/installer/install-tl-gui.tcl:1495 +#: tlpkg/installer/install-tl-gui.tcl:1496 msgid "Current platform:" msgstr "Aktuálna platforma:" -#: tlpkg/installer/install-tl-gui.tcl:1502 +#: tlpkg/installer/install-tl-gui.tcl:1503 msgid "N. of additional platform(s):" msgstr "Počet dodatočných platforiem:" -#: tlpkg/installer/install-tl-gui.tcl:1515 +#: tlpkg/installer/install-tl-gui.tcl:1516 msgid "Selections" msgstr "Výbery" -#: tlpkg/installer/install-tl-gui.tcl:1520 +#: tlpkg/installer/install-tl-gui.tcl:1521 msgid "Scheme:" msgstr "Schéma:" -#: tlpkg/installer/install-tl-gui.tcl:1529 +#: tlpkg/installer/install-tl-gui.tcl:1530 msgid "N. of collections:" msgstr "Počet zbierok:" -#: tlpkg/installer/install-tl-gui.tcl:1532 +#: tlpkg/installer/install-tl-gui.tcl:1533 msgid "Customize" msgstr "Prispôsobiť" -#: tlpkg/installer/install-tl-gui.tcl:1541 +#: tlpkg/installer/install-tl-gui.tcl:1542 msgid "Disk space required (in MB):" msgstr "Požadovaný diskový priestor (v MB)" -#: tlpkg/installer/install-tl-gui.tcl:1619 +#: tlpkg/installer/install-tl-gui.tcl:1620 msgid "Adjust searchpath" msgstr "Upraviť cestu vyhľadávania" -#: tlpkg/installer/install-tl-gui.tcl:1628 +#: tlpkg/installer/install-tl-gui.tcl:1629 msgid "Desktop integration" msgstr "Integrácia pracovnej plochy" -#: tlpkg/installer/install-tl-gui.tcl:1640 +#: tlpkg/installer/install-tl-gui.tcl:1641 msgid "File associations" msgstr "Súborové asociácie" -#: tlpkg/installer/install-tl-gui.tcl:1679 +#: tlpkg/installer/install-tl-gui.tcl:1680 msgid "Create symlinks in standard directories" msgstr "Vytvoriť symbolické odkazy v štandardných adresároch" -#: tlpkg/installer/install-tl-gui.tcl:1685 +#: tlpkg/installer/install-tl-gui.tcl:1686 msgid "Specify directories" msgstr "Špecifikujte adresáre" -#: tlpkg/installer/install-tl-gui.tcl:1750 +#: tlpkg/installer/install-tl-gui.tcl:1751 msgid "Custom scheme" msgstr "Prispôsobenie schémy" -#: tlpkg/installer/install-tl-gui.tcl:1935 +#: tlpkg/installer/install-tl-gui.tcl:1936 #, tcl-format msgid "%s not a local or remote repository" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1936 -#: tlpkg/installer/install-tl-gui.tcl:1942 +#: tlpkg/installer/install-tl-gui.tcl:1937 +#: tlpkg/installer/install-tl-gui.tcl:1943 #: texmf-dist/scripts/tlshell/tlshell.tcl:2030 msgid "Error" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1941 +#: tlpkg/installer/install-tl-gui.tcl:1942 #, tcl-format msgid "%s requires an argument" msgstr "" @@ -1733,7 +1733,7 @@ msgstr "Konkrétne zrkadlo ..." msgid "No mirror list available" msgstr "" -#: tlpkg/tltcl/tltcl.tcl:661 +#: tlpkg/tltcl/tltcl.tcl:683 msgid "Select or type" msgstr "Zvoliť alebo napísať" diff --git a/systems/texlive/tlnet/tlpkg/translations/sl.po b/systems/texlive/tlnet/tlpkg/translations/sl.po index 5cec5dd98c..387914c893 100644 --- a/systems/texlive/tlnet/tlpkg/translations/sl.po +++ b/systems/texlive/tlnet/tlpkg/translations/sl.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: TeX Live translation\n" "Report-Msgid-Bugs-To: tex-live@tug.org\n" -"POT-Creation-Date: 2020-02-08 01:55+0100\n" +"POT-Creation-Date: 2020-02-16 19:07+0100\n" "PO-Revision-Date: 2019-04-08 23:05+0200\n" "Last-Translator: Mojca Miklavec <mojca.miklavec.lists@gmail.com>\n" "Language-Team: TL Translation Team <tex-live@tug.org>\n" @@ -49,7 +49,7 @@ msgstr "Potek namestitve" #: tlpkg/installer/install-tl-gui.tcl:933 #: tlpkg/installer/install-tl-gui.tcl:1003 #: tlpkg/installer/install-tl-gui.tcl:1083 -#: tlpkg/installer/install-tl-gui.tcl:1302 tlpkg/tltcl/tltcl.tcl:588 +#: tlpkg/installer/install-tl-gui.tcl:1303 tlpkg/tltcl/tltcl.tcl:610 #: texmf-dist/scripts/tlshell/tlshell.tcl:168 #: texmf-dist/scripts/tlshell/tlshell.tcl:1261 msgid "Cancel" @@ -66,7 +66,7 @@ msgstr "Konec" #: tlpkg/installer/install-menu-wizard.pl:41 #: tlpkg/installer/install-menu-perltk.pl:445 -#: tlpkg/installer/install-tl-gui.tcl:1570 +#: tlpkg/installer/install-tl-gui.tcl:1571 msgid "Default paper size" msgstr "Privzet format papirja" @@ -97,7 +97,7 @@ msgstr "Namestitev za vse uporabnike" #: tlpkg/installer/install-menu-wizard.pl:46 #: tlpkg/installer/install-menu-perltk.pl:569 -#: tlpkg/installer/install-tl-gui.tcl:1662 +#: tlpkg/installer/install-tl-gui.tcl:1663 msgid "Install TeXworks front end" msgstr "Namesti urejevalnik TeXworks" @@ -112,7 +112,7 @@ msgstr "Namestitev TeX Live %s" #: tlpkg/installer/install-menu-perltk.pl:630 #: tlpkg/installer/install-menu-perltk.pl:676 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544 -#: tlpkg/installer/install-tl-gui.tcl:1353 +#: tlpkg/installer/install-tl-gui.tcl:1354 #: texmf-dist/scripts/tlshell/tlshell.tcl:2153 msgid "Quit" msgstr "Izhod" @@ -285,15 +285,15 @@ msgstr "Ciljni imenik:" #: texmf-dist/scripts/texlive/tlmgrgui.pl:2438 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2443 #: tlpkg/installer/install-tl-gui.tcl:642 -#: tlpkg/installer/install-tl-gui.tcl:1401 -#: tlpkg/installer/install-tl-gui.tcl:1417 -#: tlpkg/installer/install-tl-gui.tcl:1425 -#: tlpkg/installer/install-tl-gui.tcl:1435 -#: tlpkg/installer/install-tl-gui.tcl:1444 -#: tlpkg/installer/install-tl-gui.tcl:1452 -#: tlpkg/installer/install-tl-gui.tcl:1459 -#: tlpkg/installer/install-tl-gui.tcl:1505 -#: tlpkg/installer/install-tl-gui.tcl:1524 +#: tlpkg/installer/install-tl-gui.tcl:1402 +#: tlpkg/installer/install-tl-gui.tcl:1418 +#: tlpkg/installer/install-tl-gui.tcl:1426 +#: tlpkg/installer/install-tl-gui.tcl:1436 +#: tlpkg/installer/install-tl-gui.tcl:1445 +#: tlpkg/installer/install-tl-gui.tcl:1453 +#: tlpkg/installer/install-tl-gui.tcl:1460 +#: tlpkg/installer/install-tl-gui.tcl:1506 +#: tlpkg/installer/install-tl-gui.tcl:1525 msgid "Change" msgstr "Spremeni" @@ -369,7 +369,7 @@ msgstr "Ne" #: tlpkg/installer/install-menu-wizard.pl:604 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456 -#: tlpkg/installer/install-tl-gui.tcl:1351 +#: tlpkg/installer/install-tl-gui.tcl:1352 #: texmf-dist/scripts/tlshell/tlshell.tcl:1899 msgid "Install" msgstr "Namesti" @@ -379,21 +379,21 @@ msgstr "Namesti" #: texmf-dist/scripts/texlive/tlmgrgui.pl:143 #: tlpkg/installer/install-tl-gui.tcl:862 #: tlpkg/installer/install-tl-gui.tcl:1099 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 #, fuzzy msgid "None" msgstr "Brez" #: tlpkg/installer/install-menu-perltk.pl:49 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "Only new" msgstr "Samo nove" #: tlpkg/installer/install-menu-perltk.pl:50 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145 #: tlpkg/installer/install-tl-gui.tcl:1096 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 #: texmf-dist/scripts/tlshell/tlshell.tcl:2212 #: texmf-dist/scripts/tlshell/tlshell.tcl:2229 msgid "All" @@ -409,17 +409,17 @@ msgid "letter" msgstr "letter" #: tlpkg/installer/install-menu-perltk.pl:55 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "No shortcuts" msgstr "Ni bližnjic" #: tlpkg/installer/install-menu-perltk.pl:56 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "TeX Live menu" msgstr "Menu za TeX Live" #: tlpkg/installer/install-menu-perltk.pl:57 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 #, fuzzy msgid "Launcher entry" msgstr "Ikona v hitri zagonski vrstici" @@ -490,7 +490,7 @@ msgstr "Prosimo izberite drugi zrcalni strežnik." #: tlpkg/installer/install-tl-gui.tcl:930 #: tlpkg/installer/install-tl-gui.tcl:986 #: tlpkg/installer/install-tl-gui.tcl:1080 -#: tlpkg/installer/install-tl-gui.tcl:1300 tlpkg/tltcl/tltcl.tcl:586 +#: tlpkg/installer/install-tl-gui.tcl:1301 tlpkg/tltcl/tltcl.tcl:608 #: texmf-dist/scripts/tlshell/tlshell.tcl:158 msgid "Ok" msgstr "V redu" @@ -556,7 +556,7 @@ msgstr "Prenosljiva namestitev" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1231 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1240 -#: tlpkg/installer/install-tl-gui.tcl:1478 +#: tlpkg/installer/install-tl-gui.tcl:1479 msgid "Toggle" msgstr "Vključi/Izključi" @@ -582,7 +582,7 @@ msgstr "TEXMFHOME (uporabnikove datoteke)" #: tlpkg/installer/install-menu-perltk.pl:440 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513 -#: tlpkg/installer/install-tl-gui.tcl:1561 +#: tlpkg/installer/install-tl-gui.tcl:1562 #: texmf-dist/scripts/tlshell/tlshell.tcl:771 #: texmf-dist/scripts/tlshell/tlshell.tcl:2029 #: texmf-dist/scripts/tlshell/tlshell.tcl:2093 @@ -590,22 +590,22 @@ msgid "Options" msgstr "Možnosti" #: tlpkg/installer/install-menu-perltk.pl:458 -#: tlpkg/installer/install-tl-gui.tcl:1581 +#: tlpkg/installer/install-tl-gui.tcl:1582 msgid "Allow execution of restricted list of programs via \\write18" msgstr "Dovoli izvajanje omejenega števila programov z \\write18" #: tlpkg/installer/install-menu-perltk.pl:473 -#: tlpkg/installer/install-tl-gui.tcl:1588 +#: tlpkg/installer/install-tl-gui.tcl:1589 msgid "Create all format files" msgstr "Generiraj vse formate" #: tlpkg/installer/install-menu-perltk.pl:485 -#: tlpkg/installer/install-tl-gui.tcl:1596 +#: tlpkg/installer/install-tl-gui.tcl:1597 msgid "Install font/macro doc tree" msgstr "Namesti dokumentacijo" #: tlpkg/installer/install-menu-perltk.pl:498 -#: tlpkg/installer/install-tl-gui.tcl:1606 +#: tlpkg/installer/install-tl-gui.tcl:1607 msgid "Install font/macro source tree" msgstr "Namesti izvorno kodo" @@ -615,7 +615,7 @@ msgid "Create symlinks in system directories" msgstr "Namesti simbolne povezave v sistemske mape" #: tlpkg/installer/install-menu-perltk.pl:585 -#: tlpkg/installer/install-tl-gui.tcl:1699 +#: tlpkg/installer/install-tl-gui.tcl:1700 msgid "After install, set CTAN as source for package updates" msgstr "Po namestitvi nastavi CTAN za vir posodobitev paketov" @@ -1227,7 +1227,7 @@ msgid "Create shortcuts on the desktop" msgstr "Ustvari bližnjice na namizju" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1236 -#: tlpkg/installer/install-tl-gui.tcl:1651 +#: tlpkg/installer/install-tl-gui.tcl:1652 msgid "Install for all users" msgstr "Namesti za vse uporabnike" @@ -1565,12 +1565,12 @@ msgid "Abort" msgstr "Prekini" #: tlpkg/installer/install-tl-gui.tcl:410 -#: tlpkg/installer/install-tl-gui.tcl:1910 +#: tlpkg/installer/install-tl-gui.tcl:1911 msgid "TeX Live Installer" msgstr "Namestitev TeX Live-a" #: tlpkg/installer/install-tl-gui.tcl:413 -#: tlpkg/installer/install-tl-gui.tcl:2009 +#: tlpkg/installer/install-tl-gui.tcl:2010 #, tcl-format msgid "" "Trying to load %s.\n" @@ -1612,13 +1612,13 @@ msgid "Remove year" msgstr "Odstrani letnico" #: tlpkg/installer/install-tl-gui.tcl:611 -#: tlpkg/installer/install-tl-gui.tcl:1385 -#: tlpkg/installer/install-tl-gui.tcl:1393 +#: tlpkg/installer/install-tl-gui.tcl:1386 +#: tlpkg/installer/install-tl-gui.tcl:1394 msgid "Installation root" msgstr "Korenska mapa za namestitev" #: tlpkg/installer/install-tl-gui.tcl:639 -#: tlpkg/installer/install-tl-gui.tcl:1280 tlpkg/tltcl/tltcl.tcl:578 +#: tlpkg/installer/install-tl-gui.tcl:1281 tlpkg/tltcl/tltcl.tcl:600 #, fuzzy msgid "Browse..." msgstr "Brskaj …" @@ -1638,7 +1638,7 @@ msgid "Cannot deselect own platform" msgstr "Trenutne platforme ni moč odstraniti" #: tlpkg/installer/install-tl-gui.tcl:923 -#: tlpkg/installer/install-tl-gui.tcl:1284 +#: tlpkg/installer/install-tl-gui.tcl:1285 msgid "Binaries" msgstr "Programi" @@ -1662,53 +1662,53 @@ msgstr "Jeziki" msgid "Other collections" msgstr "Ostale zbirke" -#: tlpkg/installer/install-tl-gui.tcl:1237 +#: tlpkg/installer/install-tl-gui.tcl:1238 msgid "Warning. Not all configured directories are writable!" msgstr "Opozorilo: V nekatere od map ni moč pisati!" -#: tlpkg/installer/install-tl-gui.tcl:1257 +#: tlpkg/installer/install-tl-gui.tcl:1258 msgid "Symlinks" msgstr "Simbolne povezave" -#: tlpkg/installer/install-tl-gui.tcl:1285 +#: tlpkg/installer/install-tl-gui.tcl:1286 msgid "Man pages" msgstr "Pomoč 'man'" -#: tlpkg/installer/install-tl-gui.tcl:1286 +#: tlpkg/installer/install-tl-gui.tcl:1287 msgid "Info pages" msgstr "Pomoč 'info'" -#: tlpkg/installer/install-tl-gui.tcl:1340 +#: tlpkg/installer/install-tl-gui.tcl:1341 #, tcl-format msgid "TeX Live %s Installer" msgstr "Namestitev za TeX Live %s" -#: tlpkg/installer/install-tl-gui.tcl:1358 +#: tlpkg/installer/install-tl-gui.tcl:1359 msgid "Advanced" msgstr "Napredno" -#: tlpkg/installer/install-tl-gui.tcl:1388 +#: tlpkg/installer/install-tl-gui.tcl:1389 msgid "Directories" msgstr "Mape" -#: tlpkg/installer/install-tl-gui.tcl:1407 +#: tlpkg/installer/install-tl-gui.tcl:1408 #, fuzzy msgid "Main tree" msgstr "Glavna mapa" -#: tlpkg/installer/install-tl-gui.tcl:1430 +#: tlpkg/installer/install-tl-gui.tcl:1431 msgid "Local additions" msgstr "Lokalni dodatki (za vse uporabnike računalnika)" -#: tlpkg/installer/install-tl-gui.tcl:1439 +#: tlpkg/installer/install-tl-gui.tcl:1440 msgid "Per-user additions" msgstr "Lokalni dodatki (za posamezne uporabnike)" -#: tlpkg/installer/install-tl-gui.tcl:1466 +#: tlpkg/installer/install-tl-gui.tcl:1467 msgid "More ..." msgstr "Več …" -#: tlpkg/installer/install-tl-gui.tcl:1475 +#: tlpkg/installer/install-tl-gui.tcl:1476 msgid "" "Portable setup:\n" "May reset TEXMFLOCAL\n" @@ -1718,80 +1718,80 @@ msgstr "" "lahko ponastavi TEXMFLOCAL\n" "in TEXMFHOME" -#: tlpkg/installer/install-tl-gui.tcl:1489 +#: tlpkg/installer/install-tl-gui.tcl:1490 #: texmf-dist/scripts/tlshell/tlshell.tcl:1338 #: texmf-dist/scripts/tlshell/tlshell.tcl:2127 msgid "Platforms" msgstr "Platforme" -#: tlpkg/installer/install-tl-gui.tcl:1495 +#: tlpkg/installer/install-tl-gui.tcl:1496 msgid "Current platform:" msgstr "Trenutna platforma:" -#: tlpkg/installer/install-tl-gui.tcl:1502 +#: tlpkg/installer/install-tl-gui.tcl:1503 msgid "N. of additional platform(s):" msgstr "Št. dodatnih platform:" -#: tlpkg/installer/install-tl-gui.tcl:1515 +#: tlpkg/installer/install-tl-gui.tcl:1516 #, fuzzy msgid "Selections" msgstr "Izbire" -#: tlpkg/installer/install-tl-gui.tcl:1520 +#: tlpkg/installer/install-tl-gui.tcl:1521 msgid "Scheme:" msgstr "Sheme:" -#: tlpkg/installer/install-tl-gui.tcl:1529 +#: tlpkg/installer/install-tl-gui.tcl:1530 msgid "N. of collections:" msgstr "Št. zbirk:" -#: tlpkg/installer/install-tl-gui.tcl:1532 +#: tlpkg/installer/install-tl-gui.tcl:1533 msgid "Customize" msgstr "Prilagodi" -#: tlpkg/installer/install-tl-gui.tcl:1541 +#: tlpkg/installer/install-tl-gui.tcl:1542 msgid "Disk space required (in MB):" msgstr "Potreben prostor na disku (v MB):" -#: tlpkg/installer/install-tl-gui.tcl:1619 +#: tlpkg/installer/install-tl-gui.tcl:1620 #, fuzzy msgid "Adjust searchpath" msgstr "Prilagodi pot iskanja" -#: tlpkg/installer/install-tl-gui.tcl:1628 +#: tlpkg/installer/install-tl-gui.tcl:1629 #, fuzzy msgid "Desktop integration" msgstr "Integracija z namizjem" -#: tlpkg/installer/install-tl-gui.tcl:1640 +#: tlpkg/installer/install-tl-gui.tcl:1641 msgid "File associations" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1679 +#: tlpkg/installer/install-tl-gui.tcl:1680 #, fuzzy msgid "Create symlinks in standard directories" msgstr "Ustvari simbolne povezave v standardnih mapah" -#: tlpkg/installer/install-tl-gui.tcl:1685 +#: tlpkg/installer/install-tl-gui.tcl:1686 msgid "Specify directories" msgstr "Določi mape" -#: tlpkg/installer/install-tl-gui.tcl:1750 +#: tlpkg/installer/install-tl-gui.tcl:1751 msgid "Custom scheme" msgstr "Shema po meri" -#: tlpkg/installer/install-tl-gui.tcl:1935 +#: tlpkg/installer/install-tl-gui.tcl:1936 #, tcl-format msgid "%s not a local or remote repository" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1936 -#: tlpkg/installer/install-tl-gui.tcl:1942 +#: tlpkg/installer/install-tl-gui.tcl:1937 +#: tlpkg/installer/install-tl-gui.tcl:1943 #: texmf-dist/scripts/tlshell/tlshell.tcl:2030 msgid "Error" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1941 +#: tlpkg/installer/install-tl-gui.tcl:1942 #, tcl-format msgid "%s requires an argument" msgstr "" @@ -1804,7 +1804,7 @@ msgstr "Specifičen zrcalni strežnik …" msgid "No mirror list available" msgstr "" -#: tlpkg/tltcl/tltcl.tcl:661 +#: tlpkg/tltcl/tltcl.tcl:683 #, fuzzy msgid "Select or type" msgstr "Izberi ali napiši" diff --git a/systems/texlive/tlnet/tlpkg/translations/sr.po b/systems/texlive/tlnet/tlpkg/translations/sr.po index 779782e4f0..2825028d4f 100644 --- a/systems/texlive/tlnet/tlpkg/translations/sr.po +++ b/systems/texlive/tlnet/tlpkg/translations/sr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: TeX Live translation\n" "Report-Msgid-Bugs-To: tex-live@tug.org\n" -"POT-Creation-Date: 2020-02-08 01:55+0100\n" +"POT-Creation-Date: 2020-02-16 19:07+0100\n" "PO-Revision-Date: 2019-10-23 02:13+0300\n" "Last-Translator: Nikola Lečić <nikola.lecic@anthesphoria.net>\n" "Language-Team: TL Translation Team <tex-live@tug.org>\n" @@ -51,7 +51,7 @@ msgstr "Процес инсталације" #: tlpkg/installer/install-tl-gui.tcl:933 #: tlpkg/installer/install-tl-gui.tcl:1003 #: tlpkg/installer/install-tl-gui.tcl:1083 -#: tlpkg/installer/install-tl-gui.tcl:1302 tlpkg/tltcl/tltcl.tcl:588 +#: tlpkg/installer/install-tl-gui.tcl:1303 tlpkg/tltcl/tltcl.tcl:610 #: texmf-dist/scripts/tlshell/tlshell.tcl:168 #: texmf-dist/scripts/tlshell/tlshell.tcl:1261 msgid "Cancel" @@ -67,7 +67,7 @@ msgstr "Заврши" #: tlpkg/installer/install-menu-wizard.pl:41 #: tlpkg/installer/install-menu-perltk.pl:445 -#: tlpkg/installer/install-tl-gui.tcl:1570 +#: tlpkg/installer/install-tl-gui.tcl:1571 msgid "Default paper size" msgstr "Подразумевана величина папира" @@ -96,7 +96,7 @@ msgstr "Инсталација за све кориснике" #: tlpkg/installer/install-menu-wizard.pl:46 #: tlpkg/installer/install-menu-perltk.pl:569 -#: tlpkg/installer/install-tl-gui.tcl:1662 +#: tlpkg/installer/install-tl-gui.tcl:1663 msgid "Install TeXworks front end" msgstr "Инсталирај специјализовани едитор TeXworks" @@ -111,7 +111,7 @@ msgstr "TeX Live %s: инсталација" #: tlpkg/installer/install-menu-perltk.pl:630 #: tlpkg/installer/install-menu-perltk.pl:676 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544 -#: tlpkg/installer/install-tl-gui.tcl:1353 +#: tlpkg/installer/install-tl-gui.tcl:1354 #: texmf-dist/scripts/tlshell/tlshell.tcl:2153 msgid "Quit" msgstr "Напусти програм" @@ -280,15 +280,15 @@ msgstr "Циљни директоријум:" #: texmf-dist/scripts/texlive/tlmgrgui.pl:2438 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2443 #: tlpkg/installer/install-tl-gui.tcl:642 -#: tlpkg/installer/install-tl-gui.tcl:1401 -#: tlpkg/installer/install-tl-gui.tcl:1417 -#: tlpkg/installer/install-tl-gui.tcl:1425 -#: tlpkg/installer/install-tl-gui.tcl:1435 -#: tlpkg/installer/install-tl-gui.tcl:1444 -#: tlpkg/installer/install-tl-gui.tcl:1452 -#: tlpkg/installer/install-tl-gui.tcl:1459 -#: tlpkg/installer/install-tl-gui.tcl:1505 -#: tlpkg/installer/install-tl-gui.tcl:1524 +#: tlpkg/installer/install-tl-gui.tcl:1402 +#: tlpkg/installer/install-tl-gui.tcl:1418 +#: tlpkg/installer/install-tl-gui.tcl:1426 +#: tlpkg/installer/install-tl-gui.tcl:1436 +#: tlpkg/installer/install-tl-gui.tcl:1445 +#: tlpkg/installer/install-tl-gui.tcl:1453 +#: tlpkg/installer/install-tl-gui.tcl:1460 +#: tlpkg/installer/install-tl-gui.tcl:1506 +#: tlpkg/installer/install-tl-gui.tcl:1525 msgid "Change" msgstr "Промени" @@ -362,7 +362,7 @@ msgstr "не" #: tlpkg/installer/install-menu-wizard.pl:604 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456 -#: tlpkg/installer/install-tl-gui.tcl:1351 +#: tlpkg/installer/install-tl-gui.tcl:1352 #: texmf-dist/scripts/tlshell/tlshell.tcl:1899 msgid "Install" msgstr "Инсталирај" @@ -372,20 +372,20 @@ msgstr "Инсталирај" #: texmf-dist/scripts/texlive/tlmgrgui.pl:143 #: tlpkg/installer/install-tl-gui.tcl:862 #: tlpkg/installer/install-tl-gui.tcl:1099 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "None" msgstr "ниједан" #: tlpkg/installer/install-menu-perltk.pl:49 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "Only new" msgstr "само нови" #: tlpkg/installer/install-menu-perltk.pl:50 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145 #: tlpkg/installer/install-tl-gui.tcl:1096 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 #: texmf-dist/scripts/tlshell/tlshell.tcl:2212 #: texmf-dist/scripts/tlshell/tlshell.tcl:2229 msgid "All" @@ -401,17 +401,17 @@ msgid "letter" msgstr "letter" #: tlpkg/installer/install-menu-perltk.pl:55 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "No shortcuts" msgstr "Без пречица" #: tlpkg/installer/install-menu-perltk.pl:56 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "TeX Live menu" msgstr "TeX Live у Start менију" #: tlpkg/installer/install-menu-perltk.pl:57 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "Launcher entry" msgstr "Покретач (launcher)" @@ -480,7 +480,7 @@ msgstr "Изаберите друго огледало (mirror)." #: tlpkg/installer/install-tl-gui.tcl:930 #: tlpkg/installer/install-tl-gui.tcl:986 #: tlpkg/installer/install-tl-gui.tcl:1080 -#: tlpkg/installer/install-tl-gui.tcl:1300 tlpkg/tltcl/tltcl.tcl:586 +#: tlpkg/installer/install-tl-gui.tcl:1301 tlpkg/tltcl/tltcl.tcl:608 #: texmf-dist/scripts/tlshell/tlshell.tcl:158 msgid "Ok" msgstr "У реду" @@ -547,7 +547,7 @@ msgstr "Преносива инсталација" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1231 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1240 -#: tlpkg/installer/install-tl-gui.tcl:1478 +#: tlpkg/installer/install-tl-gui.tcl:1479 msgid "Toggle" msgstr "Обрни" @@ -573,7 +573,7 @@ msgstr "TEXMFHOME (директоријум за корисникове фајл #: tlpkg/installer/install-menu-perltk.pl:440 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513 -#: tlpkg/installer/install-tl-gui.tcl:1561 +#: tlpkg/installer/install-tl-gui.tcl:1562 #: texmf-dist/scripts/tlshell/tlshell.tcl:771 #: texmf-dist/scripts/tlshell/tlshell.tcl:2029 #: texmf-dist/scripts/tlshell/tlshell.tcl:2093 @@ -581,22 +581,22 @@ msgid "Options" msgstr "Подешавања" #: tlpkg/installer/install-menu-perltk.pl:458 -#: tlpkg/installer/install-tl-gui.tcl:1581 +#: tlpkg/installer/install-tl-gui.tcl:1582 msgid "Allow execution of restricted list of programs via \\write18" msgstr "Дозволи покретање ограничене листе програма путем \\write18" #: tlpkg/installer/install-menu-perltk.pl:473 -#: tlpkg/installer/install-tl-gui.tcl:1588 +#: tlpkg/installer/install-tl-gui.tcl:1589 msgid "Create all format files" msgstr "Направи све фајлове са форматима" #: tlpkg/installer/install-menu-perltk.pl:485 -#: tlpkg/installer/install-tl-gui.tcl:1596 +#: tlpkg/installer/install-tl-gui.tcl:1597 msgid "Install font/macro doc tree" msgstr "Инсталирај документацију за фонтове и макрое" #: tlpkg/installer/install-menu-perltk.pl:498 -#: tlpkg/installer/install-tl-gui.tcl:1606 +#: tlpkg/installer/install-tl-gui.tcl:1607 msgid "Install font/macro source tree" msgstr "Инсталирај изворни код фонтова и макроа" @@ -606,7 +606,7 @@ msgid "Create symlinks in system directories" msgstr "Направи симболичке линкове у системским директоријумима" #: tlpkg/installer/install-menu-perltk.pl:585 -#: tlpkg/installer/install-tl-gui.tcl:1699 +#: tlpkg/installer/install-tl-gui.tcl:1700 msgid "After install, set CTAN as source for package updates" msgstr "После инсталације подеси CTAN као извор за надоградње пакета" @@ -1183,7 +1183,7 @@ msgid "Create shortcuts on the desktop" msgstr "Направити пречице на десктопу" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1236 -#: tlpkg/installer/install-tl-gui.tcl:1651 +#: tlpkg/installer/install-tl-gui.tcl:1652 msgid "Install for all users" msgstr "Инсталирај за све кориснике" @@ -1508,12 +1508,12 @@ msgid "Abort" msgstr "Прекинути" #: tlpkg/installer/install-tl-gui.tcl:410 -#: tlpkg/installer/install-tl-gui.tcl:1910 +#: tlpkg/installer/install-tl-gui.tcl:1911 msgid "TeX Live Installer" msgstr "TeX Live инсталер" #: tlpkg/installer/install-tl-gui.tcl:413 -#: tlpkg/installer/install-tl-gui.tcl:2009 +#: tlpkg/installer/install-tl-gui.tcl:2010 #, tcl-format msgid "" "Trying to load %s.\n" @@ -1559,13 +1559,13 @@ msgid "Remove year" msgstr "Брисање године" #: tlpkg/installer/install-tl-gui.tcl:611 -#: tlpkg/installer/install-tl-gui.tcl:1385 -#: tlpkg/installer/install-tl-gui.tcl:1393 +#: tlpkg/installer/install-tl-gui.tcl:1386 +#: tlpkg/installer/install-tl-gui.tcl:1394 msgid "Installation root" msgstr "Корен инсталације" #: tlpkg/installer/install-tl-gui.tcl:639 -#: tlpkg/installer/install-tl-gui.tcl:1280 tlpkg/tltcl/tltcl.tcl:578 +#: tlpkg/installer/install-tl-gui.tcl:1281 tlpkg/tltcl/tltcl.tcl:600 msgid "Browse..." msgstr "Изабрати директоријум..." @@ -1583,7 +1583,7 @@ msgid "Cannot deselect own platform" msgstr "Не можете удаљити сопствену платформу" #: tlpkg/installer/install-tl-gui.tcl:923 -#: tlpkg/installer/install-tl-gui.tcl:1284 +#: tlpkg/installer/install-tl-gui.tcl:1285 msgid "Binaries" msgstr "Програми" @@ -1607,52 +1607,52 @@ msgstr "Језици" msgid "Other collections" msgstr "Друге колекције" -#: tlpkg/installer/install-tl-gui.tcl:1237 +#: tlpkg/installer/install-tl-gui.tcl:1238 msgid "Warning. Not all configured directories are writable!" msgstr "Упозорење: у неке од изабраних директоријума није могуће уписивање!" -#: tlpkg/installer/install-tl-gui.tcl:1257 +#: tlpkg/installer/install-tl-gui.tcl:1258 msgid "Symlinks" msgstr "Симболички линкови" -#: tlpkg/installer/install-tl-gui.tcl:1285 +#: tlpkg/installer/install-tl-gui.tcl:1286 msgid "Man pages" msgstr "Man странице" -#: tlpkg/installer/install-tl-gui.tcl:1286 +#: tlpkg/installer/install-tl-gui.tcl:1287 msgid "Info pages" msgstr "Info странице" -#: tlpkg/installer/install-tl-gui.tcl:1340 +#: tlpkg/installer/install-tl-gui.tcl:1341 #, tcl-format msgid "TeX Live %s Installer" msgstr "TeX Live %s инсталер" -#: tlpkg/installer/install-tl-gui.tcl:1358 +#: tlpkg/installer/install-tl-gui.tcl:1359 msgid "Advanced" msgstr "Напредно" -#: tlpkg/installer/install-tl-gui.tcl:1388 +#: tlpkg/installer/install-tl-gui.tcl:1389 msgid "Directories" msgstr "Директоријуми" -#: tlpkg/installer/install-tl-gui.tcl:1407 +#: tlpkg/installer/install-tl-gui.tcl:1408 msgid "Main tree" msgstr "Главно дрво" -#: tlpkg/installer/install-tl-gui.tcl:1430 +#: tlpkg/installer/install-tl-gui.tcl:1431 msgid "Local additions" msgstr "Локални додаци" -#: tlpkg/installer/install-tl-gui.tcl:1439 +#: tlpkg/installer/install-tl-gui.tcl:1440 msgid "Per-user additions" msgstr "Додаци корисника" -#: tlpkg/installer/install-tl-gui.tcl:1466 +#: tlpkg/installer/install-tl-gui.tcl:1467 msgid "More ..." msgstr "Више опција..." -#: tlpkg/installer/install-tl-gui.tcl:1475 +#: tlpkg/installer/install-tl-gui.tcl:1476 msgid "" "Portable setup:\n" "May reset TEXMFLOCAL\n" @@ -1662,76 +1662,76 @@ msgstr "" "(могуће је ресетовање\n" "TEXMFLOCAL и TEXMFHOME)" -#: tlpkg/installer/install-tl-gui.tcl:1489 +#: tlpkg/installer/install-tl-gui.tcl:1490 #: texmf-dist/scripts/tlshell/tlshell.tcl:1338 #: texmf-dist/scripts/tlshell/tlshell.tcl:2127 msgid "Platforms" msgstr "Платформе" -#: tlpkg/installer/install-tl-gui.tcl:1495 +#: tlpkg/installer/install-tl-gui.tcl:1496 msgid "Current platform:" msgstr "Тренутна платформа:" -#: tlpkg/installer/install-tl-gui.tcl:1502 +#: tlpkg/installer/install-tl-gui.tcl:1503 msgid "N. of additional platform(s):" msgstr "Број допунских платформи:" -#: tlpkg/installer/install-tl-gui.tcl:1515 +#: tlpkg/installer/install-tl-gui.tcl:1516 msgid "Selections" msgstr "Изабрано" -#: tlpkg/installer/install-tl-gui.tcl:1520 +#: tlpkg/installer/install-tl-gui.tcl:1521 msgid "Scheme:" msgstr "Шема:" -#: tlpkg/installer/install-tl-gui.tcl:1529 +#: tlpkg/installer/install-tl-gui.tcl:1530 msgid "N. of collections:" msgstr "Број колекција:" -#: tlpkg/installer/install-tl-gui.tcl:1532 +#: tlpkg/installer/install-tl-gui.tcl:1533 msgid "Customize" msgstr "Подешавања" -#: tlpkg/installer/install-tl-gui.tcl:1541 +#: tlpkg/installer/install-tl-gui.tcl:1542 msgid "Disk space required (in MB):" msgstr "Неопходно место на диску (MB):" -#: tlpkg/installer/install-tl-gui.tcl:1619 +#: tlpkg/installer/install-tl-gui.tcl:1620 msgid "Adjust searchpath" msgstr "Подешавање путање за претрагу" -#: tlpkg/installer/install-tl-gui.tcl:1628 +#: tlpkg/installer/install-tl-gui.tcl:1629 msgid "Desktop integration" msgstr "Интеграција са десктопом" -#: tlpkg/installer/install-tl-gui.tcl:1640 +#: tlpkg/installer/install-tl-gui.tcl:1641 msgid "File associations" msgstr "Тип фајла - програм" -#: tlpkg/installer/install-tl-gui.tcl:1679 +#: tlpkg/installer/install-tl-gui.tcl:1680 msgid "Create symlinks in standard directories" msgstr "Направи симболичке линкове у стандардним директоријумима" -#: tlpkg/installer/install-tl-gui.tcl:1685 +#: tlpkg/installer/install-tl-gui.tcl:1686 msgid "Specify directories" msgstr "Подешавање директоријума" -#: tlpkg/installer/install-tl-gui.tcl:1750 +#: tlpkg/installer/install-tl-gui.tcl:1751 msgid "Custom scheme" msgstr "Сопствена шема" -#: tlpkg/installer/install-tl-gui.tcl:1935 +#: tlpkg/installer/install-tl-gui.tcl:1936 #, tcl-format msgid "%s not a local or remote repository" msgstr "%s није ни локални и удаљени репозиторијум" -#: tlpkg/installer/install-tl-gui.tcl:1936 -#: tlpkg/installer/install-tl-gui.tcl:1942 +#: tlpkg/installer/install-tl-gui.tcl:1937 +#: tlpkg/installer/install-tl-gui.tcl:1943 #: texmf-dist/scripts/tlshell/tlshell.tcl:2030 msgid "Error" msgstr "Грешка" -#: tlpkg/installer/install-tl-gui.tcl:1941 +#: tlpkg/installer/install-tl-gui.tcl:1942 #, tcl-format msgid "%s requires an argument" msgstr "Уз %s је потребан аргумент" @@ -1744,7 +1744,7 @@ msgstr "Специјални сајт-огледало (mirror)" msgid "No mirror list available" msgstr "Недоступан списак сајтова-огледала (mirror)" -#: tlpkg/tltcl/tltcl.tcl:661 +#: tlpkg/tltcl/tltcl.tcl:683 msgid "Select or type" msgstr "Изаберите или откуцајте" diff --git a/systems/texlive/tlnet/tlpkg/translations/uk.po b/systems/texlive/tlnet/tlpkg/translations/uk.po index f79f96f823..65956f7863 100644 --- a/systems/texlive/tlnet/tlpkg/translations/uk.po +++ b/systems/texlive/tlnet/tlpkg/translations/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: TeX Live 2010\n" "Report-Msgid-Bugs-To: tex-live@tug.org\n" -"POT-Creation-Date: 2020-02-08 01:55+0100\n" +"POT-Creation-Date: 2020-02-16 19:07+0100\n" "PO-Revision-Date: 2019-03-23 09:02+0200\n" "Last-Translator: Andriy Bandura <andriykopanytsia@gmail.com>\n" "Language-Team: Ukrainian <andriykopanytsia@gmail.com>\n" @@ -51,7 +51,7 @@ msgstr "Процес установки" #: tlpkg/installer/install-tl-gui.tcl:933 #: tlpkg/installer/install-tl-gui.tcl:1003 #: tlpkg/installer/install-tl-gui.tcl:1083 -#: tlpkg/installer/install-tl-gui.tcl:1302 tlpkg/tltcl/tltcl.tcl:588 +#: tlpkg/installer/install-tl-gui.tcl:1303 tlpkg/tltcl/tltcl.tcl:610 #: texmf-dist/scripts/tlshell/tlshell.tcl:168 #: texmf-dist/scripts/tlshell/tlshell.tcl:1261 msgid "Cancel" @@ -67,7 +67,7 @@ msgstr "Завершити" #: tlpkg/installer/install-menu-wizard.pl:41 #: tlpkg/installer/install-menu-perltk.pl:445 -#: tlpkg/installer/install-tl-gui.tcl:1570 +#: tlpkg/installer/install-tl-gui.tcl:1571 msgid "Default paper size" msgstr "Типовий розмір паперу" @@ -96,7 +96,7 @@ msgstr "Встановити для усіх користувачів" #: tlpkg/installer/install-menu-wizard.pl:46 #: tlpkg/installer/install-menu-perltk.pl:569 -#: tlpkg/installer/install-tl-gui.tcl:1662 +#: tlpkg/installer/install-tl-gui.tcl:1663 msgid "Install TeXworks front end" msgstr "Установити редактор TeXworks" @@ -111,7 +111,7 @@ msgstr "Встановлення TeX Live %s" #: tlpkg/installer/install-menu-perltk.pl:630 #: tlpkg/installer/install-menu-perltk.pl:676 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544 -#: tlpkg/installer/install-tl-gui.tcl:1353 +#: tlpkg/installer/install-tl-gui.tcl:1354 #: texmf-dist/scripts/tlshell/tlshell.tcl:2153 msgid "Quit" msgstr "Вийти" @@ -279,15 +279,15 @@ msgstr "Цільовий каталог:" #: texmf-dist/scripts/texlive/tlmgrgui.pl:2438 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2443 #: tlpkg/installer/install-tl-gui.tcl:642 -#: tlpkg/installer/install-tl-gui.tcl:1401 -#: tlpkg/installer/install-tl-gui.tcl:1417 -#: tlpkg/installer/install-tl-gui.tcl:1425 -#: tlpkg/installer/install-tl-gui.tcl:1435 -#: tlpkg/installer/install-tl-gui.tcl:1444 -#: tlpkg/installer/install-tl-gui.tcl:1452 -#: tlpkg/installer/install-tl-gui.tcl:1459 -#: tlpkg/installer/install-tl-gui.tcl:1505 -#: tlpkg/installer/install-tl-gui.tcl:1524 +#: tlpkg/installer/install-tl-gui.tcl:1402 +#: tlpkg/installer/install-tl-gui.tcl:1418 +#: tlpkg/installer/install-tl-gui.tcl:1426 +#: tlpkg/installer/install-tl-gui.tcl:1436 +#: tlpkg/installer/install-tl-gui.tcl:1445 +#: tlpkg/installer/install-tl-gui.tcl:1453 +#: tlpkg/installer/install-tl-gui.tcl:1460 +#: tlpkg/installer/install-tl-gui.tcl:1506 +#: tlpkg/installer/install-tl-gui.tcl:1525 msgid "Change" msgstr "Змінити" @@ -362,7 +362,7 @@ msgstr "Ні" #: tlpkg/installer/install-menu-wizard.pl:604 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456 -#: tlpkg/installer/install-tl-gui.tcl:1351 +#: tlpkg/installer/install-tl-gui.tcl:1352 #: texmf-dist/scripts/tlshell/tlshell.tcl:1899 msgid "Install" msgstr "Встановити" @@ -372,20 +372,20 @@ msgstr "Встановити" #: texmf-dist/scripts/texlive/tlmgrgui.pl:143 #: tlpkg/installer/install-tl-gui.tcl:862 #: tlpkg/installer/install-tl-gui.tcl:1099 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "None" msgstr "Нічого" #: tlpkg/installer/install-menu-perltk.pl:49 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "Only new" msgstr "Тільки нові" #: tlpkg/installer/install-menu-perltk.pl:50 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145 #: tlpkg/installer/install-tl-gui.tcl:1096 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 #: texmf-dist/scripts/tlshell/tlshell.tcl:2212 #: texmf-dist/scripts/tlshell/tlshell.tcl:2229 msgid "All" @@ -401,17 +401,17 @@ msgid "letter" msgstr "letter" #: tlpkg/installer/install-menu-perltk.pl:55 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "No shortcuts" msgstr "Без ярликів" #: tlpkg/installer/install-menu-perltk.pl:56 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "TeX Live menu" msgstr "Меню TeX Live" #: tlpkg/installer/install-menu-perltk.pl:57 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "Launcher entry" msgstr "Елемент запуску" @@ -480,7 +480,7 @@ msgstr "Будь ласка, виберіть інше дзеркало." #: tlpkg/installer/install-tl-gui.tcl:930 #: tlpkg/installer/install-tl-gui.tcl:986 #: tlpkg/installer/install-tl-gui.tcl:1080 -#: tlpkg/installer/install-tl-gui.tcl:1300 tlpkg/tltcl/tltcl.tcl:586 +#: tlpkg/installer/install-tl-gui.tcl:1301 tlpkg/tltcl/tltcl.tcl:608 #: texmf-dist/scripts/tlshell/tlshell.tcl:158 msgid "Ok" msgstr "Гаразд" @@ -547,7 +547,7 @@ msgstr "Портована версія" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1231 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1240 -#: tlpkg/installer/install-tl-gui.tcl:1478 +#: tlpkg/installer/install-tl-gui.tcl:1479 msgid "Toggle" msgstr "Перемкнути" @@ -573,7 +573,7 @@ msgstr "TEXMFHOME (каталог для власних файлів корис #: tlpkg/installer/install-menu-perltk.pl:440 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513 -#: tlpkg/installer/install-tl-gui.tcl:1561 +#: tlpkg/installer/install-tl-gui.tcl:1562 #: texmf-dist/scripts/tlshell/tlshell.tcl:771 #: texmf-dist/scripts/tlshell/tlshell.tcl:2029 #: texmf-dist/scripts/tlshell/tlshell.tcl:2093 @@ -581,22 +581,22 @@ msgid "Options" msgstr "Параметри" #: tlpkg/installer/install-menu-perltk.pl:458 -#: tlpkg/installer/install-tl-gui.tcl:1581 +#: tlpkg/installer/install-tl-gui.tcl:1582 msgid "Allow execution of restricted list of programs via \\write18" msgstr "Дозволити виконання обмеженого списку програм через \\write18" #: tlpkg/installer/install-menu-perltk.pl:473 -#: tlpkg/installer/install-tl-gui.tcl:1588 +#: tlpkg/installer/install-tl-gui.tcl:1589 msgid "Create all format files" msgstr "Створити усі форматні файли" #: tlpkg/installer/install-menu-perltk.pl:485 -#: tlpkg/installer/install-tl-gui.tcl:1596 +#: tlpkg/installer/install-tl-gui.tcl:1597 msgid "Install font/macro doc tree" msgstr "Установити дерево документації шрифтів і макросів" #: tlpkg/installer/install-menu-perltk.pl:498 -#: tlpkg/installer/install-tl-gui.tcl:1606 +#: tlpkg/installer/install-tl-gui.tcl:1607 msgid "Install font/macro source tree" msgstr "Установити дерево вихідних кодів шрифтів і макросів" @@ -606,7 +606,7 @@ msgid "Create symlinks in system directories" msgstr "Створити символічні посилання у системних каталогах" #: tlpkg/installer/install-menu-perltk.pl:585 -#: tlpkg/installer/install-tl-gui.tcl:1699 +#: tlpkg/installer/install-tl-gui.tcl:1700 msgid "After install, set CTAN as source for package updates" msgstr "Після встановлення задати CTAN як джерело оновлень пакунків" @@ -1178,7 +1178,7 @@ msgid "Create shortcuts on the desktop" msgstr "Створити ярлики на робочому столі" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1236 -#: tlpkg/installer/install-tl-gui.tcl:1651 +#: tlpkg/installer/install-tl-gui.tcl:1652 msgid "Install for all users" msgstr "Встановити для усіх користувачів" @@ -1498,12 +1498,12 @@ msgid "Abort" msgstr "Перервати" #: tlpkg/installer/install-tl-gui.tcl:410 -#: tlpkg/installer/install-tl-gui.tcl:1910 +#: tlpkg/installer/install-tl-gui.tcl:1911 msgid "TeX Live Installer" msgstr "Встановлювач Tex Live" #: tlpkg/installer/install-tl-gui.tcl:413 -#: tlpkg/installer/install-tl-gui.tcl:2009 +#: tlpkg/installer/install-tl-gui.tcl:2010 #, tcl-format msgid "" "Trying to load %s.\n" @@ -1545,13 +1545,13 @@ msgid "Remove year" msgstr "Вилучити рік" #: tlpkg/installer/install-tl-gui.tcl:611 -#: tlpkg/installer/install-tl-gui.tcl:1385 -#: tlpkg/installer/install-tl-gui.tcl:1393 +#: tlpkg/installer/install-tl-gui.tcl:1386 +#: tlpkg/installer/install-tl-gui.tcl:1394 msgid "Installation root" msgstr "Корінь встановлення" #: tlpkg/installer/install-tl-gui.tcl:639 -#: tlpkg/installer/install-tl-gui.tcl:1280 tlpkg/tltcl/tltcl.tcl:578 +#: tlpkg/installer/install-tl-gui.tcl:1281 tlpkg/tltcl/tltcl.tcl:600 msgid "Browse..." msgstr "Огляд..." @@ -1569,7 +1569,7 @@ msgid "Cannot deselect own platform" msgstr "Не можна зняти виділення з власної платформи" #: tlpkg/installer/install-tl-gui.tcl:923 -#: tlpkg/installer/install-tl-gui.tcl:1284 +#: tlpkg/installer/install-tl-gui.tcl:1285 msgid "Binaries" msgstr "Програми" @@ -1593,52 +1593,52 @@ msgstr "Мови" msgid "Other collections" msgstr "Інші збірки" -#: tlpkg/installer/install-tl-gui.tcl:1237 +#: tlpkg/installer/install-tl-gui.tcl:1238 msgid "Warning. Not all configured directories are writable!" msgstr "Попередження. Не всі налаштовані каталоги доступні для запису!" -#: tlpkg/installer/install-tl-gui.tcl:1257 +#: tlpkg/installer/install-tl-gui.tcl:1258 msgid "Symlinks" msgstr "Символьні посилання" -#: tlpkg/installer/install-tl-gui.tcl:1285 +#: tlpkg/installer/install-tl-gui.tcl:1286 msgid "Man pages" msgstr "Сторінки man" -#: tlpkg/installer/install-tl-gui.tcl:1286 +#: tlpkg/installer/install-tl-gui.tcl:1287 msgid "Info pages" msgstr "Сторінки info" -#: tlpkg/installer/install-tl-gui.tcl:1340 +#: tlpkg/installer/install-tl-gui.tcl:1341 #, tcl-format msgid "TeX Live %s Installer" msgstr "Встановлювач TeX Live %s" -#: tlpkg/installer/install-tl-gui.tcl:1358 +#: tlpkg/installer/install-tl-gui.tcl:1359 msgid "Advanced" msgstr "Додатково" -#: tlpkg/installer/install-tl-gui.tcl:1388 +#: tlpkg/installer/install-tl-gui.tcl:1389 msgid "Directories" msgstr "Каталоги" -#: tlpkg/installer/install-tl-gui.tcl:1407 +#: tlpkg/installer/install-tl-gui.tcl:1408 msgid "Main tree" msgstr "Головне дерево" -#: tlpkg/installer/install-tl-gui.tcl:1430 +#: tlpkg/installer/install-tl-gui.tcl:1431 msgid "Local additions" msgstr "Локальні доповнення" -#: tlpkg/installer/install-tl-gui.tcl:1439 +#: tlpkg/installer/install-tl-gui.tcl:1440 msgid "Per-user additions" msgstr "Користувацькі доповнення" -#: tlpkg/installer/install-tl-gui.tcl:1466 +#: tlpkg/installer/install-tl-gui.tcl:1467 msgid "More ..." msgstr "Більше ..." -#: tlpkg/installer/install-tl-gui.tcl:1475 +#: tlpkg/installer/install-tl-gui.tcl:1476 msgid "" "Portable setup:\n" "May reset TEXMFLOCAL\n" @@ -1648,76 +1648,76 @@ msgstr "" "Можливе перезадання TEXMFLOCAL\n" "та TEXMFHOME" -#: tlpkg/installer/install-tl-gui.tcl:1489 +#: tlpkg/installer/install-tl-gui.tcl:1490 #: texmf-dist/scripts/tlshell/tlshell.tcl:1338 #: texmf-dist/scripts/tlshell/tlshell.tcl:2127 msgid "Platforms" msgstr "Платформи" -#: tlpkg/installer/install-tl-gui.tcl:1495 +#: tlpkg/installer/install-tl-gui.tcl:1496 msgid "Current platform:" msgstr "Поточна платформа:" -#: tlpkg/installer/install-tl-gui.tcl:1502 +#: tlpkg/installer/install-tl-gui.tcl:1503 msgid "N. of additional platform(s):" msgstr "Число додаткових платформ:" -#: tlpkg/installer/install-tl-gui.tcl:1515 +#: tlpkg/installer/install-tl-gui.tcl:1516 msgid "Selections" msgstr "Вибірки" -#: tlpkg/installer/install-tl-gui.tcl:1520 +#: tlpkg/installer/install-tl-gui.tcl:1521 msgid "Scheme:" msgstr "Схема:" -#: tlpkg/installer/install-tl-gui.tcl:1529 +#: tlpkg/installer/install-tl-gui.tcl:1530 msgid "N. of collections:" msgstr "Число збірок:" -#: tlpkg/installer/install-tl-gui.tcl:1532 +#: tlpkg/installer/install-tl-gui.tcl:1533 msgid "Customize" msgstr "Налаштувати" -#: tlpkg/installer/install-tl-gui.tcl:1541 +#: tlpkg/installer/install-tl-gui.tcl:1542 msgid "Disk space required (in MB):" msgstr "Потрібний простір (у МБ):" -#: tlpkg/installer/install-tl-gui.tcl:1619 +#: tlpkg/installer/install-tl-gui.tcl:1620 msgid "Adjust searchpath" msgstr "Змінити шляхи пошуку" -#: tlpkg/installer/install-tl-gui.tcl:1628 +#: tlpkg/installer/install-tl-gui.tcl:1629 msgid "Desktop integration" msgstr "Інтеграція зі стільницею" -#: tlpkg/installer/install-tl-gui.tcl:1640 +#: tlpkg/installer/install-tl-gui.tcl:1641 msgid "File associations" msgstr "Прив'язки файлів" -#: tlpkg/installer/install-tl-gui.tcl:1679 +#: tlpkg/installer/install-tl-gui.tcl:1680 msgid "Create symlinks in standard directories" msgstr "Створити символьні посилання у типових каталогах" -#: tlpkg/installer/install-tl-gui.tcl:1685 +#: tlpkg/installer/install-tl-gui.tcl:1686 msgid "Specify directories" msgstr "Вказати каталоги" -#: tlpkg/installer/install-tl-gui.tcl:1750 +#: tlpkg/installer/install-tl-gui.tcl:1751 msgid "Custom scheme" msgstr "Власна схема" -#: tlpkg/installer/install-tl-gui.tcl:1935 +#: tlpkg/installer/install-tl-gui.tcl:1936 #, tcl-format msgid "%s not a local or remote repository" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1936 -#: tlpkg/installer/install-tl-gui.tcl:1942 +#: tlpkg/installer/install-tl-gui.tcl:1937 +#: tlpkg/installer/install-tl-gui.tcl:1943 #: texmf-dist/scripts/tlshell/tlshell.tcl:2030 msgid "Error" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1941 +#: tlpkg/installer/install-tl-gui.tcl:1942 #, tcl-format msgid "%s requires an argument" msgstr "" @@ -1730,7 +1730,7 @@ msgstr "Особливе дзеркало" msgid "No mirror list available" msgstr "" -#: tlpkg/tltcl/tltcl.tcl:661 +#: tlpkg/tltcl/tltcl.tcl:683 msgid "Select or type" msgstr "Виберіть або введіть" diff --git a/systems/texlive/tlnet/tlpkg/translations/vi.po b/systems/texlive/tlnet/tlpkg/translations/vi.po index f5a12f9c0f..e96f018d26 100644 --- a/systems/texlive/tlnet/tlpkg/translations/vi.po +++ b/systems/texlive/tlnet/tlpkg/translations/vi.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: TeX Live translation\n" "Report-Msgid-Bugs-To: tex-live@tug.org\n" -"POT-Creation-Date: 2020-02-08 01:55+0100\n" +"POT-Creation-Date: 2020-02-16 19:07+0100\n" "PO-Revision-Date: 2019-03-28 03:38+0700\n" "Last-Translator: Anh K. Huỳnh <kyanh@viettug.org>\n" "Language-Team: TL Translation Team <tex-live@tug.org>\n" @@ -49,7 +49,7 @@ msgstr "Tiến trình cài đặt" #: tlpkg/installer/install-tl-gui.tcl:933 #: tlpkg/installer/install-tl-gui.tcl:1003 #: tlpkg/installer/install-tl-gui.tcl:1083 -#: tlpkg/installer/install-tl-gui.tcl:1302 tlpkg/tltcl/tltcl.tcl:588 +#: tlpkg/installer/install-tl-gui.tcl:1303 tlpkg/tltcl/tltcl.tcl:610 #: texmf-dist/scripts/tlshell/tlshell.tcl:168 #: texmf-dist/scripts/tlshell/tlshell.tcl:1261 msgid "Cancel" @@ -65,7 +65,7 @@ msgstr "Kết thúc" #: tlpkg/installer/install-menu-wizard.pl:41 #: tlpkg/installer/install-menu-perltk.pl:445 -#: tlpkg/installer/install-tl-gui.tcl:1570 +#: tlpkg/installer/install-tl-gui.tcl:1571 msgid "Default paper size" msgstr "Cỡ giấy mặc định" @@ -94,7 +94,7 @@ msgstr "Cài đặt cho mọi người dùng trên máy" #: tlpkg/installer/install-menu-wizard.pl:46 #: tlpkg/installer/install-menu-perltk.pl:569 -#: tlpkg/installer/install-tl-gui.tcl:1662 +#: tlpkg/installer/install-tl-gui.tcl:1663 msgid "Install TeXworks front end" msgstr "Cài đặt trình soạn thảo TeXworks" @@ -109,7 +109,7 @@ msgstr "Cài đặt TeX Live %s" #: tlpkg/installer/install-menu-perltk.pl:630 #: tlpkg/installer/install-menu-perltk.pl:676 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544 -#: tlpkg/installer/install-tl-gui.tcl:1353 +#: tlpkg/installer/install-tl-gui.tcl:1354 #: texmf-dist/scripts/tlshell/tlshell.tcl:2153 msgid "Quit" msgstr "Thoát" @@ -278,15 +278,15 @@ msgstr "Cài đặt vào thư mục:" #: texmf-dist/scripts/texlive/tlmgrgui.pl:2438 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2443 #: tlpkg/installer/install-tl-gui.tcl:642 -#: tlpkg/installer/install-tl-gui.tcl:1401 -#: tlpkg/installer/install-tl-gui.tcl:1417 -#: tlpkg/installer/install-tl-gui.tcl:1425 -#: tlpkg/installer/install-tl-gui.tcl:1435 -#: tlpkg/installer/install-tl-gui.tcl:1444 -#: tlpkg/installer/install-tl-gui.tcl:1452 -#: tlpkg/installer/install-tl-gui.tcl:1459 -#: tlpkg/installer/install-tl-gui.tcl:1505 -#: tlpkg/installer/install-tl-gui.tcl:1524 +#: tlpkg/installer/install-tl-gui.tcl:1402 +#: tlpkg/installer/install-tl-gui.tcl:1418 +#: tlpkg/installer/install-tl-gui.tcl:1426 +#: tlpkg/installer/install-tl-gui.tcl:1436 +#: tlpkg/installer/install-tl-gui.tcl:1445 +#: tlpkg/installer/install-tl-gui.tcl:1453 +#: tlpkg/installer/install-tl-gui.tcl:1460 +#: tlpkg/installer/install-tl-gui.tcl:1506 +#: tlpkg/installer/install-tl-gui.tcl:1525 msgid "Change" msgstr "Thay đổi" @@ -361,7 +361,7 @@ msgstr "Không" #: tlpkg/installer/install-menu-wizard.pl:604 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456 -#: tlpkg/installer/install-tl-gui.tcl:1351 +#: tlpkg/installer/install-tl-gui.tcl:1352 #: texmf-dist/scripts/tlshell/tlshell.tcl:1899 msgid "Install" msgstr "Cài đặt" @@ -371,20 +371,20 @@ msgstr "Cài đặt" #: texmf-dist/scripts/texlive/tlmgrgui.pl:143 #: tlpkg/installer/install-tl-gui.tcl:862 #: tlpkg/installer/install-tl-gui.tcl:1099 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "None" msgstr "Không" #: tlpkg/installer/install-menu-perltk.pl:49 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "Only new" msgstr "Chỉ cái mới" #: tlpkg/installer/install-menu-perltk.pl:50 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145 #: tlpkg/installer/install-tl-gui.tcl:1096 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 #: texmf-dist/scripts/tlshell/tlshell.tcl:2212 #: texmf-dist/scripts/tlshell/tlshell.tcl:2229 msgid "All" @@ -400,17 +400,17 @@ msgid "letter" msgstr "thư tín (letter)" #: tlpkg/installer/install-menu-perltk.pl:55 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "No shortcuts" msgstr "Không tạo liên kết nhanh" #: tlpkg/installer/install-menu-perltk.pl:56 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "TeX Live menu" msgstr "Menu TeXLive" #: tlpkg/installer/install-menu-perltk.pl:57 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "Launcher entry" msgstr "Nơi khởi động chương trình" @@ -479,7 +479,7 @@ msgstr "Vui lòng chọn mirror khác." #: tlpkg/installer/install-tl-gui.tcl:930 #: tlpkg/installer/install-tl-gui.tcl:986 #: tlpkg/installer/install-tl-gui.tcl:1080 -#: tlpkg/installer/install-tl-gui.tcl:1300 tlpkg/tltcl/tltcl.tcl:586 +#: tlpkg/installer/install-tl-gui.tcl:1301 tlpkg/tltcl/tltcl.tcl:608 #: texmf-dist/scripts/tlshell/tlshell.tcl:158 msgid "Ok" msgstr "Đồng ý" @@ -545,7 +545,7 @@ msgstr "Cài đặt linh hoạt để dùng trên máy khác" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1231 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1240 -#: tlpkg/installer/install-tl-gui.tcl:1478 +#: tlpkg/installer/install-tl-gui.tcl:1479 msgid "Toggle" msgstr "Hoán đổi" @@ -571,7 +571,7 @@ msgstr "TEXMFHOME (thư mục người dùng chứa các gói bổ sung)" #: tlpkg/installer/install-menu-perltk.pl:440 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513 -#: tlpkg/installer/install-tl-gui.tcl:1561 +#: tlpkg/installer/install-tl-gui.tcl:1562 #: texmf-dist/scripts/tlshell/tlshell.tcl:771 #: texmf-dist/scripts/tlshell/tlshell.tcl:2029 #: texmf-dist/scripts/tlshell/tlshell.tcl:2093 @@ -579,22 +579,22 @@ msgid "Options" msgstr "Tùy chọn" #: tlpkg/installer/install-menu-perltk.pl:458 -#: tlpkg/installer/install-tl-gui.tcl:1581 +#: tlpkg/installer/install-tl-gui.tcl:1582 msgid "Allow execution of restricted list of programs via \\write18" msgstr "Cho phép (La)TeX chạy chương trình hệ thống bằng \\write18" #: tlpkg/installer/install-menu-perltk.pl:473 -#: tlpkg/installer/install-tl-gui.tcl:1588 +#: tlpkg/installer/install-tl-gui.tcl:1589 msgid "Create all format files" msgstr "Tạo mọi tập tin định dạng cho TeX" #: tlpkg/installer/install-menu-perltk.pl:485 -#: tlpkg/installer/install-tl-gui.tcl:1596 +#: tlpkg/installer/install-tl-gui.tcl:1597 msgid "Install font/macro doc tree" msgstr "Cài đặt tài liệu cho font/macro" #: tlpkg/installer/install-menu-perltk.pl:498 -#: tlpkg/installer/install-tl-gui.tcl:1606 +#: tlpkg/installer/install-tl-gui.tcl:1607 msgid "Install font/macro source tree" msgstr "Cài đặt mã nguồn của font/macro" @@ -604,7 +604,7 @@ msgid "Create symlinks in system directories" msgstr "Tạo liên kết vào các thư mục hệ thống" #: tlpkg/installer/install-menu-perltk.pl:585 -#: tlpkg/installer/install-tl-gui.tcl:1699 +#: tlpkg/installer/install-tl-gui.tcl:1700 msgid "After install, set CTAN as source for package updates" msgstr "Sau khi cài xong, đặt CTAN làm nguồn để cập nhật các gói" @@ -1174,7 +1174,7 @@ msgid "Create shortcuts on the desktop" msgstr "Tạo liên kết nhanh trên Desktop" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1236 -#: tlpkg/installer/install-tl-gui.tcl:1651 +#: tlpkg/installer/install-tl-gui.tcl:1652 msgid "Install for all users" msgstr "Cài đặt cho mọi người trên máy" @@ -1499,12 +1499,12 @@ msgid "Abort" msgstr "Bỏ ngang" #: tlpkg/installer/install-tl-gui.tcl:410 -#: tlpkg/installer/install-tl-gui.tcl:1910 +#: tlpkg/installer/install-tl-gui.tcl:1911 msgid "TeX Live Installer" msgstr "Chương trình cài đặt TeX Live" #: tlpkg/installer/install-tl-gui.tcl:413 -#: tlpkg/installer/install-tl-gui.tcl:2009 +#: tlpkg/installer/install-tl-gui.tcl:2010 #, tcl-format msgid "" "Trying to load %s.\n" @@ -1546,13 +1546,13 @@ msgid "Remove year" msgstr "Bỏ năm" #: tlpkg/installer/install-tl-gui.tcl:611 -#: tlpkg/installer/install-tl-gui.tcl:1385 -#: tlpkg/installer/install-tl-gui.tcl:1393 +#: tlpkg/installer/install-tl-gui.tcl:1386 +#: tlpkg/installer/install-tl-gui.tcl:1394 msgid "Installation root" msgstr "Thư mục gốc của bộ cài đặt" #: tlpkg/installer/install-tl-gui.tcl:639 -#: tlpkg/installer/install-tl-gui.tcl:1280 tlpkg/tltcl/tltcl.tcl:578 +#: tlpkg/installer/install-tl-gui.tcl:1281 tlpkg/tltcl/tltcl.tcl:600 msgid "Browse..." msgstr "Duyệt tìm..." @@ -1572,7 +1572,7 @@ msgid "Cannot deselect own platform" msgstr "Không thể bỏ chọn kiến trúc của chính máy đang chạy" #: tlpkg/installer/install-tl-gui.tcl:923 -#: tlpkg/installer/install-tl-gui.tcl:1284 +#: tlpkg/installer/install-tl-gui.tcl:1285 msgid "Binaries" msgstr "Tập tin thi hành" @@ -1596,52 +1596,52 @@ msgstr "Ngôn ngữ" msgid "Other collections" msgstr "Các nhóm khác" -#: tlpkg/installer/install-tl-gui.tcl:1237 +#: tlpkg/installer/install-tl-gui.tcl:1238 msgid "Warning. Not all configured directories are writable!" msgstr "Cảnh báo: Không thể ghi vào một số thư mục!" -#: tlpkg/installer/install-tl-gui.tcl:1257 +#: tlpkg/installer/install-tl-gui.tcl:1258 msgid "Symlinks" msgstr "Liên kết mềm" -#: tlpkg/installer/install-tl-gui.tcl:1285 +#: tlpkg/installer/install-tl-gui.tcl:1286 msgid "Man pages" msgstr "Tài liệu man" -#: tlpkg/installer/install-tl-gui.tcl:1286 +#: tlpkg/installer/install-tl-gui.tcl:1287 msgid "Info pages" msgstr "Tài liệu info" -#: tlpkg/installer/install-tl-gui.tcl:1340 +#: tlpkg/installer/install-tl-gui.tcl:1341 #, tcl-format msgid "TeX Live %s Installer" msgstr "Chương trình cài đặt TeX Live %s" -#: tlpkg/installer/install-tl-gui.tcl:1358 +#: tlpkg/installer/install-tl-gui.tcl:1359 msgid "Advanced" msgstr "Nâng cao" -#: tlpkg/installer/install-tl-gui.tcl:1388 +#: tlpkg/installer/install-tl-gui.tcl:1389 msgid "Directories" msgstr "Thư mục" -#: tlpkg/installer/install-tl-gui.tcl:1407 +#: tlpkg/installer/install-tl-gui.tcl:1408 msgid "Main tree" msgstr "Cây cấu trúc chính" -#: tlpkg/installer/install-tl-gui.tcl:1430 +#: tlpkg/installer/install-tl-gui.tcl:1431 msgid "Local additions" msgstr "Phần bổ sung trên máy" -#: tlpkg/installer/install-tl-gui.tcl:1439 +#: tlpkg/installer/install-tl-gui.tcl:1440 msgid "Per-user additions" msgstr "Phần bổ sung cho mỗi người dùng trên máy" -#: tlpkg/installer/install-tl-gui.tcl:1466 +#: tlpkg/installer/install-tl-gui.tcl:1467 msgid "More ..." msgstr "Tiếp tục..." -#: tlpkg/installer/install-tl-gui.tcl:1475 +#: tlpkg/installer/install-tl-gui.tcl:1476 msgid "" "Portable setup:\n" "May reset TEXMFLOCAL\n" @@ -1651,76 +1651,76 @@ msgstr "" "Có thể thay đổi TEXMFLOCAL\n" "và TEXMFHOME" -#: tlpkg/installer/install-tl-gui.tcl:1489 +#: tlpkg/installer/install-tl-gui.tcl:1490 #: texmf-dist/scripts/tlshell/tlshell.tcl:1338 #: texmf-dist/scripts/tlshell/tlshell.tcl:2127 msgid "Platforms" msgstr "Kiến trúc" -#: tlpkg/installer/install-tl-gui.tcl:1495 +#: tlpkg/installer/install-tl-gui.tcl:1496 msgid "Current platform:" msgstr "Kiến trúc đang chọn:" -#: tlpkg/installer/install-tl-gui.tcl:1502 +#: tlpkg/installer/install-tl-gui.tcl:1503 msgid "N. of additional platform(s):" msgstr "Số kiến trúc bổ sung:" -#: tlpkg/installer/install-tl-gui.tcl:1515 +#: tlpkg/installer/install-tl-gui.tcl:1516 msgid "Selections" msgstr "Các lựa chọn" -#: tlpkg/installer/install-tl-gui.tcl:1520 +#: tlpkg/installer/install-tl-gui.tcl:1521 msgid "Scheme:" msgstr "Mẫu:" -#: tlpkg/installer/install-tl-gui.tcl:1529 +#: tlpkg/installer/install-tl-gui.tcl:1530 msgid "N. of collections:" msgstr "Số nhóm:" -#: tlpkg/installer/install-tl-gui.tcl:1532 +#: tlpkg/installer/install-tl-gui.tcl:1533 msgid "Customize" msgstr "Tùy chọn" -#: tlpkg/installer/install-tl-gui.tcl:1541 +#: tlpkg/installer/install-tl-gui.tcl:1542 msgid "Disk space required (in MB):" msgstr "Lượng đĩa cần thiết (MB):" -#: tlpkg/installer/install-tl-gui.tcl:1619 +#: tlpkg/installer/install-tl-gui.tcl:1620 msgid "Adjust searchpath" msgstr "Chỉnh đường dẫn tìm kiếm tập tin thi hành" -#: tlpkg/installer/install-tl-gui.tcl:1628 +#: tlpkg/installer/install-tl-gui.tcl:1629 msgid "Desktop integration" msgstr "Tích hợp với Desktop" -#: tlpkg/installer/install-tl-gui.tcl:1640 +#: tlpkg/installer/install-tl-gui.tcl:1641 msgid "File associations" msgstr "Thay đổi cách mở tập tin" -#: tlpkg/installer/install-tl-gui.tcl:1679 +#: tlpkg/installer/install-tl-gui.tcl:1680 msgid "Create symlinks in standard directories" msgstr "Tạo liên kết mềm trong các thư mục tiêu chuẩn" -#: tlpkg/installer/install-tl-gui.tcl:1685 +#: tlpkg/installer/install-tl-gui.tcl:1686 msgid "Specify directories" msgstr "Chọn thư mục" -#: tlpkg/installer/install-tl-gui.tcl:1750 +#: tlpkg/installer/install-tl-gui.tcl:1751 msgid "Custom scheme" msgstr "Chọn mẫu" -#: tlpkg/installer/install-tl-gui.tcl:1935 +#: tlpkg/installer/install-tl-gui.tcl:1936 #, tcl-format msgid "%s not a local or remote repository" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1936 -#: tlpkg/installer/install-tl-gui.tcl:1942 +#: tlpkg/installer/install-tl-gui.tcl:1937 +#: tlpkg/installer/install-tl-gui.tcl:1943 #: texmf-dist/scripts/tlshell/tlshell.tcl:2030 msgid "Error" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1941 +#: tlpkg/installer/install-tl-gui.tcl:1942 #, tcl-format msgid "%s requires an argument" msgstr "" @@ -1733,7 +1733,7 @@ msgstr "Chọn kho đệm..." msgid "No mirror list available" msgstr "" -#: tlpkg/tltcl/tltcl.tcl:661 +#: tlpkg/tltcl/tltcl.tcl:683 msgid "Select or type" msgstr "Chọn hoặc nhập vào" diff --git a/systems/texlive/tlnet/tlpkg/translations/zh_CN.po b/systems/texlive/tlnet/tlpkg/translations/zh_CN.po index db67d77b26..eadda98bca 100644 --- a/systems/texlive/tlnet/tlpkg/translations/zh_CN.po +++ b/systems/texlive/tlnet/tlpkg/translations/zh_CN.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: TeX Live translation\n" "Report-Msgid-Bugs-To: tex-live@tug.org\n" -"POT-Creation-Date: 2020-02-08 01:55+0100\n" +"POT-Creation-Date: 2020-02-16 19:07+0100\n" "PO-Revision-Date: 2009-09-22 12:54+0800\n" "Last-Translator: Jiang Jiang <gzjjgod@gmail.com>\n" "Language-Team: TL Translation Team <tex-live@tug.org>\n" @@ -45,7 +45,7 @@ msgstr "安装过程" #: tlpkg/installer/install-tl-gui.tcl:933 #: tlpkg/installer/install-tl-gui.tcl:1003 #: tlpkg/installer/install-tl-gui.tcl:1083 -#: tlpkg/installer/install-tl-gui.tcl:1302 tlpkg/tltcl/tltcl.tcl:588 +#: tlpkg/installer/install-tl-gui.tcl:1303 tlpkg/tltcl/tltcl.tcl:610 #: texmf-dist/scripts/tlshell/tlshell.tcl:168 #: texmf-dist/scripts/tlshell/tlshell.tcl:1261 msgid "Cancel" @@ -61,7 +61,7 @@ msgstr "完成" #: tlpkg/installer/install-menu-wizard.pl:41 #: tlpkg/installer/install-menu-perltk.pl:445 -#: tlpkg/installer/install-tl-gui.tcl:1570 +#: tlpkg/installer/install-tl-gui.tcl:1571 #, fuzzy msgid "Default paper size" msgstr "缺省的纸张给" @@ -91,7 +91,7 @@ msgstr "为所有用户安装" #: tlpkg/installer/install-menu-wizard.pl:46 #: tlpkg/installer/install-menu-perltk.pl:569 -#: tlpkg/installer/install-tl-gui.tcl:1662 +#: tlpkg/installer/install-tl-gui.tcl:1663 msgid "Install TeXworks front end" msgstr "安装 TeXworks 前端" @@ -106,7 +106,7 @@ msgstr "TeX Live %s 安装" #: tlpkg/installer/install-menu-perltk.pl:630 #: tlpkg/installer/install-menu-perltk.pl:676 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544 -#: tlpkg/installer/install-tl-gui.tcl:1353 +#: tlpkg/installer/install-tl-gui.tcl:1354 #: texmf-dist/scripts/tlshell/tlshell.tcl:2153 msgid "Quit" msgstr "退出" @@ -263,15 +263,15 @@ msgstr "目的文件夹:" #: texmf-dist/scripts/texlive/tlmgrgui.pl:2438 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2443 #: tlpkg/installer/install-tl-gui.tcl:642 -#: tlpkg/installer/install-tl-gui.tcl:1401 -#: tlpkg/installer/install-tl-gui.tcl:1417 -#: tlpkg/installer/install-tl-gui.tcl:1425 -#: tlpkg/installer/install-tl-gui.tcl:1435 -#: tlpkg/installer/install-tl-gui.tcl:1444 -#: tlpkg/installer/install-tl-gui.tcl:1452 -#: tlpkg/installer/install-tl-gui.tcl:1459 -#: tlpkg/installer/install-tl-gui.tcl:1505 -#: tlpkg/installer/install-tl-gui.tcl:1524 +#: tlpkg/installer/install-tl-gui.tcl:1402 +#: tlpkg/installer/install-tl-gui.tcl:1418 +#: tlpkg/installer/install-tl-gui.tcl:1426 +#: tlpkg/installer/install-tl-gui.tcl:1436 +#: tlpkg/installer/install-tl-gui.tcl:1445 +#: tlpkg/installer/install-tl-gui.tcl:1453 +#: tlpkg/installer/install-tl-gui.tcl:1460 +#: tlpkg/installer/install-tl-gui.tcl:1506 +#: tlpkg/installer/install-tl-gui.tcl:1525 msgid "Change" msgstr "修改" @@ -345,7 +345,7 @@ msgstr "否" #: tlpkg/installer/install-menu-wizard.pl:604 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456 -#: tlpkg/installer/install-tl-gui.tcl:1351 +#: tlpkg/installer/install-tl-gui.tcl:1352 #: texmf-dist/scripts/tlshell/tlshell.tcl:1899 msgid "Install" msgstr "安装" @@ -355,20 +355,20 @@ msgstr "安装" #: texmf-dist/scripts/texlive/tlmgrgui.pl:143 #: tlpkg/installer/install-tl-gui.tcl:862 #: tlpkg/installer/install-tl-gui.tcl:1099 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "None" msgstr "无" #: tlpkg/installer/install-menu-perltk.pl:49 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "Only new" msgstr "只有新的" #: tlpkg/installer/install-menu-perltk.pl:50 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145 #: tlpkg/installer/install-tl-gui.tcl:1096 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 #: texmf-dist/scripts/tlshell/tlshell.tcl:2212 #: texmf-dist/scripts/tlshell/tlshell.tcl:2229 msgid "All" @@ -384,17 +384,17 @@ msgid "letter" msgstr "letter" #: tlpkg/installer/install-menu-perltk.pl:55 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "No shortcuts" msgstr "" #: tlpkg/installer/install-menu-perltk.pl:56 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "TeX Live menu" msgstr "" #: tlpkg/installer/install-menu-perltk.pl:57 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "Launcher entry" msgstr "" @@ -463,7 +463,7 @@ msgstr "" #: tlpkg/installer/install-tl-gui.tcl:930 #: tlpkg/installer/install-tl-gui.tcl:986 #: tlpkg/installer/install-tl-gui.tcl:1080 -#: tlpkg/installer/install-tl-gui.tcl:1300 tlpkg/tltcl/tltcl.tcl:586 +#: tlpkg/installer/install-tl-gui.tcl:1301 tlpkg/tltcl/tltcl.tcl:608 #: texmf-dist/scripts/tlshell/tlshell.tcl:158 msgid "Ok" msgstr "确定" @@ -525,7 +525,7 @@ msgstr "" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1231 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1240 -#: tlpkg/installer/install-tl-gui.tcl:1478 +#: tlpkg/installer/install-tl-gui.tcl:1479 msgid "Toggle" msgstr "切换" @@ -551,7 +551,7 @@ msgstr "TEXMFHOME (用户专有文件的目录)" #: tlpkg/installer/install-menu-perltk.pl:440 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513 -#: tlpkg/installer/install-tl-gui.tcl:1561 +#: tlpkg/installer/install-tl-gui.tcl:1562 #: texmf-dist/scripts/tlshell/tlshell.tcl:771 #: texmf-dist/scripts/tlshell/tlshell.tcl:2029 #: texmf-dist/scripts/tlshell/tlshell.tcl:2093 @@ -559,22 +559,22 @@ msgid "Options" msgstr "选项" #: tlpkg/installer/install-menu-perltk.pl:458 -#: tlpkg/installer/install-tl-gui.tcl:1581 +#: tlpkg/installer/install-tl-gui.tcl:1582 msgid "Allow execution of restricted list of programs via \\write18" msgstr "允许用 \\write18 执行一部分在限制列表内的程序" #: tlpkg/installer/install-menu-perltk.pl:473 -#: tlpkg/installer/install-tl-gui.tcl:1588 +#: tlpkg/installer/install-tl-gui.tcl:1589 msgid "Create all format files" msgstr "创建所有格式文件" #: tlpkg/installer/install-menu-perltk.pl:485 -#: tlpkg/installer/install-tl-gui.tcl:1596 +#: tlpkg/installer/install-tl-gui.tcl:1597 msgid "Install font/macro doc tree" msgstr "安装字体/宏包文档目录树" #: tlpkg/installer/install-menu-perltk.pl:498 -#: tlpkg/installer/install-tl-gui.tcl:1606 +#: tlpkg/installer/install-tl-gui.tcl:1607 msgid "Install font/macro source tree" msgstr "安装字体/宏包源码目录树" @@ -584,7 +584,7 @@ msgid "Create symlinks in system directories" msgstr "创建指向系统目录的符号链接" #: tlpkg/installer/install-menu-perltk.pl:585 -#: tlpkg/installer/install-tl-gui.tcl:1699 +#: tlpkg/installer/install-tl-gui.tcl:1700 msgid "After install, set CTAN as source for package updates" msgstr "" @@ -1144,7 +1144,7 @@ msgid "Create shortcuts on the desktop" msgstr "" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1236 -#: tlpkg/installer/install-tl-gui.tcl:1651 +#: tlpkg/installer/install-tl-gui.tcl:1652 msgid "Install for all users" msgstr "给所有用户安装" @@ -1440,12 +1440,12 @@ msgid "Abort" msgstr "" #: tlpkg/installer/install-tl-gui.tcl:410 -#: tlpkg/installer/install-tl-gui.tcl:1910 +#: tlpkg/installer/install-tl-gui.tcl:1911 msgid "TeX Live Installer" msgstr "" #: tlpkg/installer/install-tl-gui.tcl:413 -#: tlpkg/installer/install-tl-gui.tcl:2009 +#: tlpkg/installer/install-tl-gui.tcl:2010 #, tcl-format msgid "" "Trying to load %s.\n" @@ -1485,13 +1485,13 @@ msgid "Remove year" msgstr "" #: tlpkg/installer/install-tl-gui.tcl:611 -#: tlpkg/installer/install-tl-gui.tcl:1385 -#: tlpkg/installer/install-tl-gui.tcl:1393 +#: tlpkg/installer/install-tl-gui.tcl:1386 +#: tlpkg/installer/install-tl-gui.tcl:1394 msgid "Installation root" msgstr "" #: tlpkg/installer/install-tl-gui.tcl:639 -#: tlpkg/installer/install-tl-gui.tcl:1280 tlpkg/tltcl/tltcl.tcl:578 +#: tlpkg/installer/install-tl-gui.tcl:1281 tlpkg/tltcl/tltcl.tcl:600 msgid "Browse..." msgstr "" @@ -1509,7 +1509,7 @@ msgid "Cannot deselect own platform" msgstr "" #: tlpkg/installer/install-tl-gui.tcl:923 -#: tlpkg/installer/install-tl-gui.tcl:1284 +#: tlpkg/installer/install-tl-gui.tcl:1285 msgid "Binaries" msgstr "" @@ -1533,128 +1533,128 @@ msgstr "" msgid "Other collections" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1237 +#: tlpkg/installer/install-tl-gui.tcl:1238 msgid "Warning. Not all configured directories are writable!" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1257 +#: tlpkg/installer/install-tl-gui.tcl:1258 msgid "Symlinks" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1285 +#: tlpkg/installer/install-tl-gui.tcl:1286 msgid "Man pages" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1286 +#: tlpkg/installer/install-tl-gui.tcl:1287 msgid "Info pages" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1340 +#: tlpkg/installer/install-tl-gui.tcl:1341 #, tcl-format msgid "TeX Live %s Installer" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1358 +#: tlpkg/installer/install-tl-gui.tcl:1359 msgid "Advanced" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1388 +#: tlpkg/installer/install-tl-gui.tcl:1389 msgid "Directories" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1407 +#: tlpkg/installer/install-tl-gui.tcl:1408 msgid "Main tree" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1430 +#: tlpkg/installer/install-tl-gui.tcl:1431 msgid "Local additions" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1439 +#: tlpkg/installer/install-tl-gui.tcl:1440 msgid "Per-user additions" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1466 +#: tlpkg/installer/install-tl-gui.tcl:1467 msgid "More ..." msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1475 +#: tlpkg/installer/install-tl-gui.tcl:1476 msgid "" "Portable setup:\n" "May reset TEXMFLOCAL\n" "and TEXMFHOME" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1489 +#: tlpkg/installer/install-tl-gui.tcl:1490 #: texmf-dist/scripts/tlshell/tlshell.tcl:1338 #: texmf-dist/scripts/tlshell/tlshell.tcl:2127 msgid "Platforms" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1495 +#: tlpkg/installer/install-tl-gui.tcl:1496 msgid "Current platform:" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1502 +#: tlpkg/installer/install-tl-gui.tcl:1503 msgid "N. of additional platform(s):" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1515 +#: tlpkg/installer/install-tl-gui.tcl:1516 msgid "Selections" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1520 +#: tlpkg/installer/install-tl-gui.tcl:1521 msgid "Scheme:" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1529 +#: tlpkg/installer/install-tl-gui.tcl:1530 msgid "N. of collections:" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1532 +#: tlpkg/installer/install-tl-gui.tcl:1533 msgid "Customize" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1541 +#: tlpkg/installer/install-tl-gui.tcl:1542 msgid "Disk space required (in MB):" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1619 +#: tlpkg/installer/install-tl-gui.tcl:1620 msgid "Adjust searchpath" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1628 +#: tlpkg/installer/install-tl-gui.tcl:1629 msgid "Desktop integration" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1640 +#: tlpkg/installer/install-tl-gui.tcl:1641 msgid "File associations" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1679 +#: tlpkg/installer/install-tl-gui.tcl:1680 msgid "Create symlinks in standard directories" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1685 +#: tlpkg/installer/install-tl-gui.tcl:1686 msgid "Specify directories" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1750 +#: tlpkg/installer/install-tl-gui.tcl:1751 msgid "Custom scheme" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1935 +#: tlpkg/installer/install-tl-gui.tcl:1936 #, tcl-format msgid "%s not a local or remote repository" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1936 -#: tlpkg/installer/install-tl-gui.tcl:1942 +#: tlpkg/installer/install-tl-gui.tcl:1937 +#: tlpkg/installer/install-tl-gui.tcl:1943 #: texmf-dist/scripts/tlshell/tlshell.tcl:2030 msgid "Error" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1941 +#: tlpkg/installer/install-tl-gui.tcl:1942 #, tcl-format msgid "%s requires an argument" msgstr "" @@ -1667,7 +1667,7 @@ msgstr "" msgid "No mirror list available" msgstr "" -#: tlpkg/tltcl/tltcl.tcl:661 +#: tlpkg/tltcl/tltcl.tcl:683 msgid "Select or type" msgstr "" diff --git a/systems/texlive/tlnet/tlpkg/translations/zh_TW.po b/systems/texlive/tlnet/tlpkg/translations/zh_TW.po index 7a46bfe113..95fd18c4de 100644 --- a/systems/texlive/tlnet/tlpkg/translations/zh_TW.po +++ b/systems/texlive/tlnet/tlpkg/translations/zh_TW.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: TeX Live translation\n" "Report-Msgid-Bugs-To: tex-live@tug.org\n" -"POT-Creation-Date: 2020-02-08 01:55+0100\n" +"POT-Creation-Date: 2020-02-16 19:07+0100\n" "PO-Revision-Date: 2009-09-03 12:34+0200\n" "Last-Translator: Norbert Preining <preining@logic.at>\n" "Language-Team: TL Translation Team <tex-live@tug.org>\n" @@ -46,7 +46,7 @@ msgstr "安裝 TeX Live" #: tlpkg/installer/install-tl-gui.tcl:933 #: tlpkg/installer/install-tl-gui.tcl:1003 #: tlpkg/installer/install-tl-gui.tcl:1083 -#: tlpkg/installer/install-tl-gui.tcl:1302 tlpkg/tltcl/tltcl.tcl:588 +#: tlpkg/installer/install-tl-gui.tcl:1303 tlpkg/tltcl/tltcl.tcl:610 #: texmf-dist/scripts/tlshell/tlshell.tcl:168 #: texmf-dist/scripts/tlshell/tlshell.tcl:1261 msgid "Cancel" @@ -62,7 +62,7 @@ msgstr "完成" #: tlpkg/installer/install-menu-wizard.pl:41 #: tlpkg/installer/install-menu-perltk.pl:445 -#: tlpkg/installer/install-tl-gui.tcl:1570 +#: tlpkg/installer/install-tl-gui.tcl:1571 msgid "Default paper size" msgstr "" @@ -92,7 +92,7 @@ msgstr "安裝 TeX Live" #: tlpkg/installer/install-menu-wizard.pl:46 #: tlpkg/installer/install-menu-perltk.pl:569 -#: tlpkg/installer/install-tl-gui.tcl:1662 +#: tlpkg/installer/install-tl-gui.tcl:1663 #, fuzzy msgid "Install TeXworks front end" msgstr "安裝字體/巨集包文檔目錄樹" @@ -108,7 +108,7 @@ msgstr "TeX Live %s 安裝" #: tlpkg/installer/install-menu-perltk.pl:630 #: tlpkg/installer/install-menu-perltk.pl:676 #: texmf-dist/scripts/texlive/tlmgrgui.pl:544 -#: tlpkg/installer/install-tl-gui.tcl:1353 +#: tlpkg/installer/install-tl-gui.tcl:1354 #: texmf-dist/scripts/tlshell/tlshell.tcl:2153 msgid "Quit" msgstr "退出" @@ -265,15 +265,15 @@ msgstr "" #: texmf-dist/scripts/texlive/tlmgrgui.pl:2438 #: texmf-dist/scripts/texlive/tlmgrgui.pl:2443 #: tlpkg/installer/install-tl-gui.tcl:642 -#: tlpkg/installer/install-tl-gui.tcl:1401 -#: tlpkg/installer/install-tl-gui.tcl:1417 -#: tlpkg/installer/install-tl-gui.tcl:1425 -#: tlpkg/installer/install-tl-gui.tcl:1435 -#: tlpkg/installer/install-tl-gui.tcl:1444 -#: tlpkg/installer/install-tl-gui.tcl:1452 -#: tlpkg/installer/install-tl-gui.tcl:1459 -#: tlpkg/installer/install-tl-gui.tcl:1505 -#: tlpkg/installer/install-tl-gui.tcl:1524 +#: tlpkg/installer/install-tl-gui.tcl:1402 +#: tlpkg/installer/install-tl-gui.tcl:1418 +#: tlpkg/installer/install-tl-gui.tcl:1426 +#: tlpkg/installer/install-tl-gui.tcl:1436 +#: tlpkg/installer/install-tl-gui.tcl:1445 +#: tlpkg/installer/install-tl-gui.tcl:1453 +#: tlpkg/installer/install-tl-gui.tcl:1460 +#: tlpkg/installer/install-tl-gui.tcl:1506 +#: tlpkg/installer/install-tl-gui.tcl:1525 msgid "Change" msgstr "改變" @@ -342,7 +342,7 @@ msgstr "否" #: tlpkg/installer/install-menu-wizard.pl:604 #: texmf-dist/scripts/texlive/tlmgrgui.pl:456 -#: tlpkg/installer/install-tl-gui.tcl:1351 +#: tlpkg/installer/install-tl-gui.tcl:1352 #: texmf-dist/scripts/tlshell/tlshell.tcl:1899 #, fuzzy msgid "Install" @@ -353,21 +353,21 @@ msgstr "安裝 TeX Live" #: texmf-dist/scripts/texlive/tlmgrgui.pl:143 #: tlpkg/installer/install-tl-gui.tcl:862 #: tlpkg/installer/install-tl-gui.tcl:1099 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 #, fuzzy msgid "None" msgstr "否" #: tlpkg/installer/install-menu-perltk.pl:49 #: texmf-dist/scripts/texlive/tlmgrgui.pl:144 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 msgid "Only new" msgstr "" #: tlpkg/installer/install-menu-perltk.pl:50 #: texmf-dist/scripts/texlive/tlmgrgui.pl:145 #: tlpkg/installer/install-tl-gui.tcl:1096 -#: tlpkg/installer/install-tl-gui.tcl:1638 +#: tlpkg/installer/install-tl-gui.tcl:1639 #: texmf-dist/scripts/tlshell/tlshell.tcl:2212 #: texmf-dist/scripts/tlshell/tlshell.tcl:2229 msgid "All" @@ -383,17 +383,17 @@ msgid "letter" msgstr "" #: tlpkg/installer/install-menu-perltk.pl:55 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "No shortcuts" msgstr "" #: tlpkg/installer/install-menu-perltk.pl:56 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "TeX Live menu" msgstr "" #: tlpkg/installer/install-menu-perltk.pl:57 -#: tlpkg/installer/install-tl-gui.tcl:1626 +#: tlpkg/installer/install-tl-gui.tcl:1627 msgid "Launcher entry" msgstr "" @@ -462,7 +462,7 @@ msgstr "" #: tlpkg/installer/install-tl-gui.tcl:930 #: tlpkg/installer/install-tl-gui.tcl:986 #: tlpkg/installer/install-tl-gui.tcl:1080 -#: tlpkg/installer/install-tl-gui.tcl:1300 tlpkg/tltcl/tltcl.tcl:586 +#: tlpkg/installer/install-tl-gui.tcl:1301 tlpkg/tltcl/tltcl.tcl:608 #: texmf-dist/scripts/tlshell/tlshell.tcl:158 msgid "Ok" msgstr "確定" @@ -524,7 +524,7 @@ msgstr "" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1181 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1231 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1240 -#: tlpkg/installer/install-tl-gui.tcl:1478 +#: tlpkg/installer/install-tl-gui.tcl:1479 msgid "Toggle" msgstr "切換" @@ -551,7 +551,7 @@ msgstr "TEXMFLOCAL (存放本地格式檔等)" #: tlpkg/installer/install-menu-perltk.pl:440 #: texmf-dist/scripts/texlive/tlmgrgui.pl:513 -#: tlpkg/installer/install-tl-gui.tcl:1561 +#: tlpkg/installer/install-tl-gui.tcl:1562 #: texmf-dist/scripts/tlshell/tlshell.tcl:771 #: texmf-dist/scripts/tlshell/tlshell.tcl:2029 #: texmf-dist/scripts/tlshell/tlshell.tcl:2093 @@ -559,22 +559,22 @@ msgid "Options" msgstr "選項" #: tlpkg/installer/install-menu-perltk.pl:458 -#: tlpkg/installer/install-tl-gui.tcl:1581 +#: tlpkg/installer/install-tl-gui.tcl:1582 msgid "Allow execution of restricted list of programs via \\write18" msgstr "" #: tlpkg/installer/install-menu-perltk.pl:473 -#: tlpkg/installer/install-tl-gui.tcl:1588 +#: tlpkg/installer/install-tl-gui.tcl:1589 msgid "Create all format files" msgstr "創建所有格式檔" #: tlpkg/installer/install-menu-perltk.pl:485 -#: tlpkg/installer/install-tl-gui.tcl:1596 +#: tlpkg/installer/install-tl-gui.tcl:1597 msgid "Install font/macro doc tree" msgstr "安裝字體/巨集包文檔目錄樹" #: tlpkg/installer/install-menu-perltk.pl:498 -#: tlpkg/installer/install-tl-gui.tcl:1606 +#: tlpkg/installer/install-tl-gui.tcl:1607 msgid "Install font/macro source tree" msgstr "安裝字體/巨集包源碼目錄樹" @@ -584,7 +584,7 @@ msgid "Create symlinks in system directories" msgstr "創建指向系統目錄的符號鏈結" #: tlpkg/installer/install-menu-perltk.pl:585 -#: tlpkg/installer/install-tl-gui.tcl:1699 +#: tlpkg/installer/install-tl-gui.tcl:1700 msgid "After install, set CTAN as source for package updates" msgstr "" @@ -1165,7 +1165,7 @@ msgid "Create shortcuts on the desktop" msgstr "" #: texmf-dist/scripts/texlive/tlmgrgui.pl:1236 -#: tlpkg/installer/install-tl-gui.tcl:1651 +#: tlpkg/installer/install-tl-gui.tcl:1652 msgid "Install for all users" msgstr "" @@ -1463,12 +1463,12 @@ msgid "Abort" msgstr "" #: tlpkg/installer/install-tl-gui.tcl:410 -#: tlpkg/installer/install-tl-gui.tcl:1910 +#: tlpkg/installer/install-tl-gui.tcl:1911 msgid "TeX Live Installer" msgstr "" #: tlpkg/installer/install-tl-gui.tcl:413 -#: tlpkg/installer/install-tl-gui.tcl:2009 +#: tlpkg/installer/install-tl-gui.tcl:2010 #, tcl-format msgid "" "Trying to load %s.\n" @@ -1508,13 +1508,13 @@ msgid "Remove year" msgstr "" #: tlpkg/installer/install-tl-gui.tcl:611 -#: tlpkg/installer/install-tl-gui.tcl:1385 -#: tlpkg/installer/install-tl-gui.tcl:1393 +#: tlpkg/installer/install-tl-gui.tcl:1386 +#: tlpkg/installer/install-tl-gui.tcl:1394 msgid "Installation root" msgstr "" #: tlpkg/installer/install-tl-gui.tcl:639 -#: tlpkg/installer/install-tl-gui.tcl:1280 tlpkg/tltcl/tltcl.tcl:578 +#: tlpkg/installer/install-tl-gui.tcl:1281 tlpkg/tltcl/tltcl.tcl:600 msgid "Browse..." msgstr "" @@ -1532,7 +1532,7 @@ msgid "Cannot deselect own platform" msgstr "" #: tlpkg/installer/install-tl-gui.tcl:923 -#: tlpkg/installer/install-tl-gui.tcl:1284 +#: tlpkg/installer/install-tl-gui.tcl:1285 msgid "Binaries" msgstr "" @@ -1556,128 +1556,128 @@ msgstr "" msgid "Other collections" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1237 +#: tlpkg/installer/install-tl-gui.tcl:1238 msgid "Warning. Not all configured directories are writable!" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1257 +#: tlpkg/installer/install-tl-gui.tcl:1258 msgid "Symlinks" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1285 +#: tlpkg/installer/install-tl-gui.tcl:1286 msgid "Man pages" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1286 +#: tlpkg/installer/install-tl-gui.tcl:1287 msgid "Info pages" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1340 +#: tlpkg/installer/install-tl-gui.tcl:1341 #, tcl-format msgid "TeX Live %s Installer" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1358 +#: tlpkg/installer/install-tl-gui.tcl:1359 msgid "Advanced" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1388 +#: tlpkg/installer/install-tl-gui.tcl:1389 msgid "Directories" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1407 +#: tlpkg/installer/install-tl-gui.tcl:1408 msgid "Main tree" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1430 +#: tlpkg/installer/install-tl-gui.tcl:1431 msgid "Local additions" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1439 +#: tlpkg/installer/install-tl-gui.tcl:1440 msgid "Per-user additions" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1466 +#: tlpkg/installer/install-tl-gui.tcl:1467 msgid "More ..." msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1475 +#: tlpkg/installer/install-tl-gui.tcl:1476 msgid "" "Portable setup:\n" "May reset TEXMFLOCAL\n" "and TEXMFHOME" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1489 +#: tlpkg/installer/install-tl-gui.tcl:1490 #: texmf-dist/scripts/tlshell/tlshell.tcl:1338 #: texmf-dist/scripts/tlshell/tlshell.tcl:2127 msgid "Platforms" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1495 +#: tlpkg/installer/install-tl-gui.tcl:1496 msgid "Current platform:" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1502 +#: tlpkg/installer/install-tl-gui.tcl:1503 msgid "N. of additional platform(s):" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1515 +#: tlpkg/installer/install-tl-gui.tcl:1516 msgid "Selections" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1520 +#: tlpkg/installer/install-tl-gui.tcl:1521 msgid "Scheme:" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1529 +#: tlpkg/installer/install-tl-gui.tcl:1530 msgid "N. of collections:" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1532 +#: tlpkg/installer/install-tl-gui.tcl:1533 msgid "Customize" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1541 +#: tlpkg/installer/install-tl-gui.tcl:1542 msgid "Disk space required (in MB):" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1619 +#: tlpkg/installer/install-tl-gui.tcl:1620 msgid "Adjust searchpath" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1628 +#: tlpkg/installer/install-tl-gui.tcl:1629 msgid "Desktop integration" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1640 +#: tlpkg/installer/install-tl-gui.tcl:1641 msgid "File associations" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1679 +#: tlpkg/installer/install-tl-gui.tcl:1680 msgid "Create symlinks in standard directories" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1685 +#: tlpkg/installer/install-tl-gui.tcl:1686 msgid "Specify directories" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1750 +#: tlpkg/installer/install-tl-gui.tcl:1751 msgid "Custom scheme" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1935 +#: tlpkg/installer/install-tl-gui.tcl:1936 #, tcl-format msgid "%s not a local or remote repository" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1936 -#: tlpkg/installer/install-tl-gui.tcl:1942 +#: tlpkg/installer/install-tl-gui.tcl:1937 +#: tlpkg/installer/install-tl-gui.tcl:1943 #: texmf-dist/scripts/tlshell/tlshell.tcl:2030 msgid "Error" msgstr "" -#: tlpkg/installer/install-tl-gui.tcl:1941 +#: tlpkg/installer/install-tl-gui.tcl:1942 #, tcl-format msgid "%s requires an argument" msgstr "" @@ -1690,7 +1690,7 @@ msgstr "" msgid "No mirror list available" msgstr "" -#: tlpkg/tltcl/tltcl.tcl:661 +#: tlpkg/tltcl/tltcl.tcl:683 msgid "Select or type" msgstr "" diff --git a/systems/win32/miktex/tm/packages/files.csv.lzma b/systems/win32/miktex/tm/packages/files.csv.lzma Binary files differindex 9f95402e40..6a54d4a787 100644 --- a/systems/win32/miktex/tm/packages/files.csv.lzma +++ b/systems/win32/miktex/tm/packages/files.csv.lzma diff --git a/systems/win32/miktex/tm/packages/next/files.csv.lzma b/systems/win32/miktex/tm/packages/next/files.csv.lzma Binary files differindex 0ad7e97c62..9b59b21f0f 100644 --- a/systems/win32/miktex/tm/packages/next/files.csv.lzma +++ b/systems/win32/miktex/tm/packages/next/files.csv.lzma diff --git a/systems/win32/miktex/tm/packages/next/pr.ini b/systems/win32/miktex/tm/packages/next/pr.ini index bb67d6eb9a..4522200f7d 100644 --- a/systems/win32/miktex/tm/packages/next/pr.ini +++ b/systems/win32/miktex/tm/packages/next/pr.ini @@ -2,9 +2,9 @@ [repository]
-date=1581887714
+date=1581974288
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=ec1f39c06b1d5af88a926607a5240a23
-numpkg=3859
+lstdigest=3e8b18c18764658c91f683d8adeee6ef
+numpkg=3862
relstate=next
-version=7351
+version=7352
diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini index 8b1428de1d..5e4a4e10b6 100644 --- a/systems/win32/miktex/tm/packages/pr.ini +++ b/systems/win32/miktex/tm/packages/pr.ini @@ -2,9 +2,9 @@ [repository]
-date=1581887479
-lastupd=euclideangeometry hitszthesis miktex-bibtex-bin-2.9 miktex-bibtex-bin-x64-2.9 miktex-dvicopy-bin-2.9 miktex-dvicopy-bin-x64-2.9 miktex-luatex-bin-2.9 miktex-luatex-bin-x64-2.9 newpx sdaps miktex-runtime-bin-2.9 miktex-runtime-bin-x64-2.9 miktex-arctrl-bin-2.9 miktex-arctrl-bin-x64-2.9 miktex-asymptote-bin-2.9 miktex-asymptote-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
-lstdigest=2f1706a89c61511dc507a50f4d12066b
-numpkg=3859
+date=1581973870
+lastupd=archaeologie breqn bxjscls haranoaji haranoaji-extra luatexko newtxtt schulmathematik xetexko euclideangeometry hitszthesis miktex-bibtex-bin-2.9 miktex-bibtex-bin-x64-2.9 miktex-dvicopy-bin-2.9 miktex-dvicopy-bin-x64-2.9 miktex-luatex-bin-2.9 miktex-luatex-bin-x64-2.9 newpx sdaps miktex-runtime-bin-2.9
+lstdigest=66e2e2de8af392a94697e0728ca935f3
+numpkg=3862
relstate=stable
-version=7351
+version=7352
diff --git a/systems/win32/w32tex/ChangeLog b/systems/win32/w32tex/ChangeLog index b714e6574c..ccfbd3ebaf 100644 --- a/systems/win32/w32tex/ChangeLog +++ b/systems/win32/w32tex/ChangeLog @@ -1,5 +1,15 @@ W32TeX (x86 & x64) ChangeLog +[2020/02/16] +(01) ltxpkgdocs.tar.xz + Update documents for packages. +(02) newtxpx-boondoxfonts.tar.xz + Update newpx fonts. +(03) ptex-w32.tar.xz + Update makejvf.exe. +(04) win64/ptex-w64.tar.xz + Update makejvf.exe. + [2020/02/15] (01) aleph-w32.tar.xz Update format files. @@ -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: -2020-02-17-02-02 +2020-02-18-02-02 |