diff options
author | Norbert Preining <norbert@preining.info> | 2019-11-27 03:01:12 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2019-11-27 03:01:12 +0000 |
commit | 5142daa13e19b32afa064863e039da3afaf06e83 (patch) | |
tree | d8299dbf426b9b0e6cafacc4cbe5a6a762bf28a9 | |
parent | bd1c54bb99e58d8c140acb0b0a536037f96349b4 (diff) |
CTAN sync 201911270301
129 files changed, 13795 insertions, 2149 deletions
diff --git a/FILES.byname b/FILES.byname index 38e516dce8..e7af948984 100644 --- a/FILES.byname +++ b/FILES.byname @@ -3051,9 +3051,9 @@ 2016/03/05 | 19090 | dviware/dvi2tty/tex2ucs.h 2016/03/04 | 1712 | dviware/dvi2tty/TODO 2016/03/25 | 62468 | dviware/dvi2tty.zip -2019/02/05 | 41652 | dviware/dviasm/dviasm.py -2019/02/05 | 513 | dviware/dviasm/README -2019/02/05 | 11029 | dviware/dviasm.zip +2019/11/26 | 42676 | dviware/dviasm/dviasm.py +2019/11/26 | 524 | dviware/dviasm/README +2019/11/26 | 11342 | dviware/dviasm.zip 1994/07/28 | 600757 | dviware/dvi-augsburg/amiga/dvi363.lha 1994/07/28 | 1964 | dviware/dvi-augsburg/amiga/dvi363.liesmich 1994/07/28 | 1876 | dviware/dvi-augsburg/amiga/dvi363.readme @@ -4990,7 +4990,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 -2019/11/25 | 220420 | FILES.last07days +2019/11/26 | 156602 | 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 @@ -119391,27 +119391,27 @@ 1995/01/27 | 48128 | fonts/utilities/fontload/vms/subfont.exe-alpha 1995/01/27 | 89600 | fonts/utilities/fontload/vms/subfont.exe-vax 2007/11/24 | 136238 | fonts/utilities/fontload.zip -2019/11/18 | 13334 | fonts/utilities/fontools/bin/afm2afm -2019/11/18 | 114777 | fonts/utilities/fontools/bin/autoinst -2019/11/18 | 27582 | fonts/utilities/fontools/bin/ot2kpx -2019/11/18 | 7628 | fonts/utilities/fontools/bin/splitttc -2019/11/18 | 27083 | fonts/utilities/fontools/doc/afm2afm.pdf -2019/11/18 | 69934 | fonts/utilities/fontools/doc/autoinst.pdf -2019/11/18 | 27462 | fonts/utilities/fontools/doc/ot2kpx.pdf -2019/11/18 | 20574 | fonts/utilities/fontools/doc/splitttc.pdf -2019/11/18 | 17997 | fonts/utilities/fontools/GPLv2.txt -2019/11/18 | 2906 | fonts/utilities/fontools/README -2019/11/18 | 8032 | fonts/utilities/fontools/share/fontools_lgr.enc -2019/11/18 | 2855 | fonts/utilities/fontools/share/fontools_ly1.enc -2019/11/18 | 2587 | fonts/utilities/fontools/share/fontools_ot1.enc -2019/11/18 | 2815 | fonts/utilities/fontools/share/fontools_t1.enc -2019/11/18 | 2908 | fonts/utilities/fontools/share/fontools_t2a.enc -2019/11/18 | 3730 | fonts/utilities/fontools/share/fontools_t2b.enc -2019/11/18 | 3652 | fonts/utilities/fontools/share/fontools_t2c.enc -2019/11/18 | 2656 | fonts/utilities/fontools/share/fontools_t3.enc -2019/11/18 | 3080 | fonts/utilities/fontools/share/fontools_ts1.enc -2019/11/18 | 2751 | fonts/utilities/fontools/share/fontools_ts3.enc -2019/11/18 | 195460 | fonts/utilities/fontools.zip +2019/11/26 | 13334 | fonts/utilities/fontools/bin/afm2afm +2019/11/26 | 114778 | fonts/utilities/fontools/bin/autoinst +2019/11/26 | 27582 | fonts/utilities/fontools/bin/ot2kpx +2019/11/26 | 7628 | fonts/utilities/fontools/bin/splitttc +2019/11/26 | 27061 | fonts/utilities/fontools/doc/afm2afm.pdf +2019/11/26 | 69935 | fonts/utilities/fontools/doc/autoinst.pdf +2019/11/26 | 27439 | fonts/utilities/fontools/doc/ot2kpx.pdf +2019/11/26 | 20550 | fonts/utilities/fontools/doc/splitttc.pdf +2019/11/26 | 17997 | fonts/utilities/fontools/GPLv2.txt +2019/11/26 | 2906 | fonts/utilities/fontools/README +2019/11/26 | 8032 | fonts/utilities/fontools/share/fontools_lgr.enc +2019/11/26 | 2855 | fonts/utilities/fontools/share/fontools_ly1.enc +2019/11/26 | 2587 | fonts/utilities/fontools/share/fontools_ot1.enc +2019/11/26 | 2815 | fonts/utilities/fontools/share/fontools_t1.enc +2019/11/26 | 2907 | fonts/utilities/fontools/share/fontools_t2a.enc +2019/11/26 | 3729 | fonts/utilities/fontools/share/fontools_t2b.enc +2019/11/26 | 3651 | fonts/utilities/fontools/share/fontools_t2c.enc +2019/11/26 | 2656 | fonts/utilities/fontools/share/fontools_t3.enc +2019/11/26 | 3080 | fonts/utilities/fontools/share/fontools_ts1.enc +2019/11/26 | 2751 | fonts/utilities/fontools/share/fontools_ts3.enc +2019/11/26 | 195399 | fonts/utilities/fontools.zip 2007/11/26 | 1775673 | fonts/utilities/freetype/freetype-2.3.5.tar.gz 2007/11/26 | 189 | fonts/utilities/freetype/freetype-2.3.5.tar.gz.sig 2007/11/26 | 117706 | fonts/utilities/freetype/freetype-doc-2.3.5.tar.gz @@ -156654,30 +156654,30 @@ 2014/06/23 | 584 | info/pstricks_calcnotes/README 2014/04/03 | 652952 | info/pstricks_calcnotes/ThreeAppsPDF.pdf 2014/06/22 | 2060099 | info/pstricks_calcnotes.zip -2019/10/19 | 381070 | info/ptex-manual/eptexdoc.pdf -2019/10/19 | 55147 | info/ptex-manual/eptexdoc.tex -2019/10/19 | 694464 | info/ptex-manual/eptex_resume.pdf -2019/10/19 | 95260 | info/ptex-manual/eptex_resume.tex -2019/10/19 | 3173 | info/ptex-manual/fam256d.tex -2019/10/19 | 3372 | info/ptex-manual/fam256p.tex -2019/10/19 | 157050 | info/ptex-manual/jfm.pdf -2019/10/19 | 16427 | info/ptex-manual/jfm.tex -2019/10/19 | 251872 | info/ptex-manual/jtex_asciimw.pdf -2019/10/19 | 35293 | info/ptex-manual/jtex_asciimw.tex -2019/10/19 | 145704 | info/ptex-manual/jtexdoc_asciimw.pdf -2019/10/19 | 20341 | info/ptex-manual/jtexdoc_asciimw.tex -2019/10/19 | 1516 | info/ptex-manual/LICENSE -2019/10/19 | 264764 | info/ptex-manual/ptexdoc_asciimw.pdf -2019/10/19 | 42357 | info/ptex-manual/ptexdoc_asciimw.tex -2019/10/19 | 69161 | info/ptex-manual/ptex-guide-en.pdf -2019/10/19 | 21651 | info/ptex-manual/ptex-guide-en.tex -2019/10/19 | 381437 | info/ptex-manual/ptex-manual.pdf -2019/10/19 | 4211 | info/ptex-manual/ptex-manual.sty -2019/10/19 | 71084 | info/ptex-manual/ptex-manual.tex -2019/10/19 | 164929 | info/ptex-manual/ptexskip_asciimw.pdf -2019/10/19 | 19615 | info/ptex-manual/ptexskip_asciimw.tex -2019/10/19 | 1206 | info/ptex-manual/README.md -2019/10/19 | 2541983 | info/ptex-manual.zip +2019/11/26 | 380603 | info/ptex-manual/eptexdoc.pdf +2019/11/26 | 63372 | info/ptex-manual/eptexdoc.tex +2019/11/26 | 694464 | info/ptex-manual/eptex_resume.pdf +2019/11/26 | 95260 | info/ptex-manual/eptex_resume.tex +2019/11/26 | 3173 | info/ptex-manual/fam256d.tex +2019/11/26 | 3372 | info/ptex-manual/fam256p.tex +2019/11/26 | 157050 | info/ptex-manual/jfm.pdf +2019/11/26 | 16427 | info/ptex-manual/jfm.tex +2019/11/26 | 251872 | info/ptex-manual/jtex_asciimw.pdf +2019/11/26 | 35293 | info/ptex-manual/jtex_asciimw.tex +2019/11/26 | 145704 | info/ptex-manual/jtexdoc_asciimw.pdf +2019/11/26 | 20341 | info/ptex-manual/jtexdoc_asciimw.tex +2019/11/26 | 1516 | info/ptex-manual/LICENSE +2019/11/26 | 264764 | info/ptex-manual/ptexdoc_asciimw.pdf +2019/11/26 | 42357 | info/ptex-manual/ptexdoc_asciimw.tex +2019/11/26 | 99191 | info/ptex-manual/ptex-guide-en.pdf +2019/11/26 | 37155 | info/ptex-manual/ptex-guide-en.tex +2019/11/26 | 381432 | info/ptex-manual/ptex-manual.pdf +2019/11/26 | 4282 | info/ptex-manual/ptex-manual.sty +2019/11/26 | 71067 | info/ptex-manual/ptex-manual.tex +2019/11/26 | 164929 | info/ptex-manual/ptexskip_asciimw.pdf +2019/11/26 | 19615 | info/ptex-manual/ptexskip_asciimw.tex +2019/11/26 | 1206 | info/ptex-manual/README.md +2019/11/26 | 2577716 | info/ptex-manual.zip 1994/01/21 | 22111 | info/qh2winh.zip 2013/01/03 | 4070156 | info/russian/Computer_Typesetting_Using_LaTeX/ctex.pdf 2013/01/03 | 7383534 | info/russian/Computer_Typesetting_Using_LaTeX/ctex.tar.gz @@ -158091,7 +158091,7 @@ 2009/09/08 | 175772 | install/macros/latex/contrib/appendix.tds.zip 2018/03/09 | 187753 | install/macros/latex/contrib/ascmac.tds.zip 2010/03/20 | 235440 | install/macros/latex/contrib/asyfig.tds.zip -2019/11/23 | 470481 | install/macros/latex/contrib/attachfile2.tds.zip +2019/11/26 | 473930 | install/macros/latex/contrib/attachfile2.tds.zip 2016/09/19 | 374121 | install/macros/latex/contrib/attachfile.tds.zip 2017/02/24 | 557280 | install/macros/latex/contrib/autobreak.tds.zip 2015/01/18 | 423458 | install/macros/latex/contrib/autonum.tds.zip @@ -158220,7 +158220,7 @@ 2019/07/25 | 1083290 | install/macros/latex/contrib/jsclasses.tds.zip 2019/10/13 | 15682209 | install/macros/latex/contrib/koma-script.tds.zip 2015/12/09 | 171418 | install/macros/latex/contrib/ksp-thesis.tds.zip -2019/10/11 | 781473 | install/macros/latex/contrib/l3backend.tds.zip +2019/11/25 | 785272 | install/macros/latex/contrib/l3backend.tds.zip 2019/11/01 | 785644 | install/macros/latex/contrib/l3build.tds.zip 2019/10/11 | 4942596 | install/macros/latex/contrib/l3experimental.tds.zip 2019/11/07 | 9430371 | install/macros/latex/contrib/l3kernel.tds.zip @@ -174836,10 +174836,10 @@ 2010/03/20 | 384 | macros/latex/contrib/asyfig/example/test-asyfig.tex 2010/03/20 | 1694 | macros/latex/contrib/asyfig/README 2012/09/25 | 230041 | macros/latex/contrib/asyfig.zip -2019/11/23 | 91028 | macros/latex/contrib/attachfile2/attachfile2.dtx -2019/11/23 | 443676 | macros/latex/contrib/attachfile2/attachfile2.pdf -2019/11/23 | 258 | macros/latex/contrib/attachfile2/README.md -2019/11/24 | 451828 | macros/latex/contrib/attachfile2.zip +2019/11/26 | 92590 | macros/latex/contrib/attachfile2/attachfile2.dtx +2019/11/26 | 445753 | macros/latex/contrib/attachfile2/attachfile2.pdf +2019/11/26 | 543 | macros/latex/contrib/attachfile2/README.md +2019/11/26 | 454280 | macros/latex/contrib/attachfile2.zip 2016/09/19 | 72701 | macros/latex/contrib/attachfile/attachfile.dtx 2016/09/19 | 2107 | macros/latex/contrib/attachfile/attachfile.ins 2016/09/19 | 361030 | macros/latex/contrib/attachfile/attachfile.pdf @@ -176233,41 +176233,76 @@ 2014/11/04 | 394 | macros/latex/contrib/biblatex-contrib/biblatex-anonymous/makefile 2014/06/17 | 76 | macros/latex/contrib/biblatex-contrib/biblatex-anonymous/README 2018/09/02 | 63636 | macros/latex/contrib/biblatex-contrib/biblatex-anonymous.zip -2019/11/23 | 9285 | macros/latex/contrib/biblatex-contrib/biblatex-apa/american-apa.lbx -2019/11/23 | 58863 | macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.bbx -2019/11/23 | 15018 | macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.cbx -2019/11/23 | 1665 | macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.dbx -2019/11/23 | 12482 | macros/latex/contrib/biblatex-contrib/biblatex-apa/austrian-apa.lbx -2019/11/23 | 63851 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.pdf -2019/11/23 | 12759 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test-citations.bib -2019/11/23 | 200185 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.pdf -2019/11/23 | 81322 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test-references.bib -2019/11/23 | 29150 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.tex -2019/11/23 | 17902 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.tex -2019/11/23 | 9344 | macros/latex/contrib/biblatex-contrib/biblatex-apa/brazilian-apa.lbx -2019/11/23 | 9184 | macros/latex/contrib/biblatex-contrib/biblatex-apa/british-apa.lbx -2019/11/23 | 9661 | macros/latex/contrib/biblatex-contrib/biblatex-apa/danish-apa.lbx -2019/11/23 | 9295 | macros/latex/contrib/biblatex-contrib/biblatex-apa/dutch-apa.lbx -2019/11/23 | 9310 | macros/latex/contrib/biblatex-contrib/biblatex-apa/english-apa.lbx -2019/11/23 | 9558 | macros/latex/contrib/biblatex-contrib/biblatex-apa/french-apa.lbx -2019/11/23 | 10219 | macros/latex/contrib/biblatex-contrib/biblatex-apa/galician-apa.lbx -2019/11/23 | 12455 | macros/latex/contrib/biblatex-contrib/biblatex-apa/german-apa.lbx -2019/11/23 | 10659 | macros/latex/contrib/biblatex-contrib/biblatex-apa/greek-apa.lbx -2019/11/23 | 9616 | macros/latex/contrib/biblatex-contrib/biblatex-apa/italian-apa.lbx -2019/11/23 | 12498 | macros/latex/contrib/biblatex-contrib/biblatex-apa/naustrian-apa.lbx -2019/11/23 | 12596 | macros/latex/contrib/biblatex-contrib/biblatex-apa/ngerman-apa.lbx -2019/11/23 | 9338 | macros/latex/contrib/biblatex-contrib/biblatex-apa/norsk-apa.lbx -2019/11/23 | 9338 | macros/latex/contrib/biblatex-contrib/biblatex-apa/norwegian-apa.lbx -2019/11/23 | 12506 | macros/latex/contrib/biblatex-contrib/biblatex-apa/nswissgerman-apa.lbx -2019/11/23 | 9354 | macros/latex/contrib/biblatex-contrib/biblatex-apa/nynorsk-apa.lbx -2019/11/23 | 9310 | macros/latex/contrib/biblatex-contrib/biblatex-apa/portuguese-apa.lbx -2019/11/23 | 1744 | macros/latex/contrib/biblatex-contrib/biblatex-apa/README -2019/11/23 | 9979 | macros/latex/contrib/biblatex-contrib/biblatex-apa/russian-apa.lbx -2019/11/23 | 9970 | macros/latex/contrib/biblatex-contrib/biblatex-apa/slovene-apa.lbx -2019/11/23 | 10217 | macros/latex/contrib/biblatex-contrib/biblatex-apa/spanish-apa.lbx -2019/11/23 | 9158 | macros/latex/contrib/biblatex-contrib/biblatex-apa/swedish-apa.lbx -2019/11/23 | 12588 | macros/latex/contrib/biblatex-contrib/biblatex-apa/swissgerman-apa.lbx -2019/11/23 | 365007 | macros/latex/contrib/biblatex-contrib/biblatex-apa.zip +2019/11/26 | 5283 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/american-apa6.lbx +2019/11/26 | 67551 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.bbx +2019/11/26 | 18087 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.cbx +2019/11/26 | 2086 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.dbx +2019/11/26 | 8217 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/austrian-apa6.lbx +2019/11/26 | 92348 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6.pdf +2019/11/26 | 14864 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6-test-citations.bib +2019/11/26 | 38864 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6-test.pdf +2019/11/26 | 38281 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6-test-references.bib +2019/11/26 | 17414 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6-test.tex +2019/11/26 | 32380 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6.tex +2019/11/26 | 4970 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/brazilian-apa6.lbx +2019/11/26 | 5156 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/british-apa6.lbx +2019/11/26 | 5395 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/danish-apa6.lbx +2019/11/26 | 5075 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/dutch-apa6.lbx +2019/11/26 | 5282 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/english-apa6.lbx +2019/11/26 | 5378 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/french-apa6.lbx +2019/11/26 | 5987 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/galician-apa6.lbx +2019/11/26 | 8192 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/german-apa6.lbx +2019/11/26 | 6355 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/greek-apa6.lbx +2019/11/26 | 5312 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/italian-apa6.lbx +2019/11/26 | 8231 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/naustrian-apa6.lbx +2019/11/26 | 8332 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/ngerman-apa6.lbx +2019/11/26 | 5077 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/norsk-apa6.lbx +2019/11/26 | 5077 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/norwegian-apa6.lbx +2019/11/26 | 8243 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/nswissgerman-apa6.lbx +2019/11/26 | 5093 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/nynorsk-apa6.lbx +2019/11/26 | 4844 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/portuguese-apa6.lbx +2019/11/26 | 1759 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/README +2019/11/26 | 5737 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/russian-apa6.lbx +2019/11/26 | 5649 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/slovene-apa6.lbx +2019/11/26 | 6023 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/spanish-apa6.lbx +2019/11/26 | 4874 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/swedish-apa6.lbx +2019/11/26 | 8239 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/swissgerman-apa6.lbx +2019/11/26 | 213018 | macros/latex/contrib/biblatex-contrib/biblatex-apa6.zip +2019/11/26 | 14523 | macros/latex/contrib/biblatex-contrib/biblatex-apa/american-apa.lbx +2019/11/26 | 64457 | macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.bbx +2019/11/26 | 18831 | macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.cbx +2019/11/26 | 2048 | macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.dbx +2019/11/26 | 12280 | macros/latex/contrib/biblatex-contrib/biblatex-apa/austrian-apa.lbx +2019/11/26 | 64311 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.pdf +2019/11/26 | 12759 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test-citations.bib +2019/11/26 | 221809 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.pdf +2019/11/26 | 91157 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test-references.bib +2019/11/26 | 32559 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.tex +2019/11/26 | 18294 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.tex +2019/11/26 | 9142 | macros/latex/contrib/biblatex-contrib/biblatex-apa/brazilian-apa.lbx +2019/11/26 | 8988 | macros/latex/contrib/biblatex-contrib/biblatex-apa/british-apa.lbx +2019/11/26 | 9459 | macros/latex/contrib/biblatex-contrib/biblatex-apa/danish-apa.lbx +2019/11/26 | 9093 | macros/latex/contrib/biblatex-contrib/biblatex-apa/dutch-apa.lbx +2019/11/26 | 9114 | macros/latex/contrib/biblatex-contrib/biblatex-apa/english-apa.lbx +2019/11/26 | 9356 | macros/latex/contrib/biblatex-contrib/biblatex-apa/french-apa.lbx +2019/11/26 | 10017 | macros/latex/contrib/biblatex-contrib/biblatex-apa/galician-apa.lbx +2019/11/26 | 12253 | macros/latex/contrib/biblatex-contrib/biblatex-apa/german-apa.lbx +2019/11/26 | 10457 | macros/latex/contrib/biblatex-contrib/biblatex-apa/greek-apa.lbx +2019/11/26 | 9414 | macros/latex/contrib/biblatex-contrib/biblatex-apa/italian-apa.lbx +2019/11/26 | 12296 | macros/latex/contrib/biblatex-contrib/biblatex-apa/naustrian-apa.lbx +2019/11/26 | 12394 | macros/latex/contrib/biblatex-contrib/biblatex-apa/ngerman-apa.lbx +2019/11/26 | 9136 | macros/latex/contrib/biblatex-contrib/biblatex-apa/norsk-apa.lbx +2019/11/26 | 9136 | macros/latex/contrib/biblatex-contrib/biblatex-apa/norwegian-apa.lbx +2019/11/26 | 12304 | macros/latex/contrib/biblatex-contrib/biblatex-apa/nswissgerman-apa.lbx +2019/11/26 | 9152 | macros/latex/contrib/biblatex-contrib/biblatex-apa/nynorsk-apa.lbx +2019/11/26 | 9108 | macros/latex/contrib/biblatex-contrib/biblatex-apa/portuguese-apa.lbx +2019/11/26 | 1744 | macros/latex/contrib/biblatex-contrib/biblatex-apa/README +2019/11/26 | 9776 | macros/latex/contrib/biblatex-contrib/biblatex-apa/russian-apa.lbx +2019/11/26 | 9768 | macros/latex/contrib/biblatex-contrib/biblatex-apa/slovene-apa.lbx +2019/11/26 | 10015 | macros/latex/contrib/biblatex-contrib/biblatex-apa/spanish-apa.lbx +2019/11/26 | 8956 | macros/latex/contrib/biblatex-contrib/biblatex-apa/swedish-apa.lbx +2019/11/26 | 12386 | macros/latex/contrib/biblatex-contrib/biblatex-apa/swissgerman-apa.lbx +2019/11/26 | 392738 | macros/latex/contrib/biblatex-contrib/biblatex-apa.zip 2018/11/20 | 1241705 | macros/latex/contrib/biblatex-contrib/biblatex-archaeology/biblatex-archaeology.dtx 2018/11/20 | 40319 | macros/latex/contrib/biblatex-contrib/biblatex-archaeology/biblatex-archaeology.ins 2018/11/20 | 611046 | macros/latex/contrib/biblatex-contrib/biblatex-archaeology/biblatex-archaeology-nodoc.dtx @@ -187567,18 +187602,19 @@ 2018/09/20 | 112188 | macros/latex/contrib/kvmap/kvmap.pdf 2018/09/20 | 594 | macros/latex/contrib/kvmap/README.md 2018/09/20 | 117064 | macros/latex/contrib/kvmap.zip -2019/10/11 | 1201 | macros/latex/contrib/l3backend/CHANGELOG.md -2019/10/11 | 13557 | macros/latex/contrib/l3backend/l3backend-basics.dtx -2019/10/11 | 14504 | macros/latex/contrib/l3backend/l3backend-box.dtx -2019/10/11 | 740224 | macros/latex/contrib/l3backend/l3backend-code.pdf -2019/10/11 | 1266 | macros/latex/contrib/l3backend/l3backend-code.tex -2019/10/11 | 8938 | macros/latex/contrib/l3backend/l3backend-color.dtx -2019/10/11 | 42705 | macros/latex/contrib/l3backend/l3backend-draw.dtx -2019/10/11 | 21206 | macros/latex/contrib/l3backend/l3backend-graphics.dtx -2019/10/11 | 3487 | macros/latex/contrib/l3backend/l3backend.ins -2019/10/11 | 63624 | macros/latex/contrib/l3backend/l3backend-pdf.dtx -2019/10/11 | 545 | macros/latex/contrib/l3backend/README.md -2019/10/11 | 757955 | macros/latex/contrib/l3backend.zip +2019/11/25 | 1348 | macros/latex/contrib/l3backend/CHANGELOG.md +2019/11/25 | 13330 | macros/latex/contrib/l3backend/l3backend-basics.dtx +2019/11/25 | 14504 | macros/latex/contrib/l3backend/l3backend-box.dtx +2019/11/25 | 742409 | macros/latex/contrib/l3backend/l3backend-code.pdf +2019/11/25 | 1298 | macros/latex/contrib/l3backend/l3backend-code.tex +2019/11/25 | 8938 | macros/latex/contrib/l3backend/l3backend-color.dtx +2019/11/25 | 42705 | macros/latex/contrib/l3backend/l3backend-draw.dtx +2019/11/25 | 21206 | macros/latex/contrib/l3backend/l3backend-graphics.dtx +2019/11/25 | 14244 | macros/latex/contrib/l3backend/l3backend-header.dtx +2019/11/25 | 3586 | macros/latex/contrib/l3backend/l3backend.ins +2019/11/25 | 47976 | macros/latex/contrib/l3backend/l3backend-pdf.dtx +2019/11/25 | 545 | macros/latex/contrib/l3backend/README.md +2019/11/26 | 761058 | macros/latex/contrib/l3backend.zip 2019/11/01 | 11010 | macros/latex/contrib/l3build/CHANGELOG.md 2019/11/01 | 2339 | macros/latex/contrib/l3build/CONTRIBUTING.md 2019/11/01 | 1817 | macros/latex/contrib/l3build/l3build.1 @@ -241540,65 +241576,66 @@ 2019/05/27 | 96489 | support/lyluatex/lyluatex.tex 2019/05/27 | 2868 | support/lyluatex/README.md 2019/05/28 | 1334865 | support/lyluatex.zip -2019/11/03 | 21474 | support/make4ht/changelog.tex -2019/11/03 | 4641 | support/make4ht/domfilters/make4ht-aeneas.lua -2019/11/03 | 6807 | support/make4ht/domfilters/make4ht-collapsetoc.lua -2019/11/03 | 1047 | support/make4ht/domfilters/make4ht-fixinlines.lua -2019/11/03 | 595 | support/make4ht/domfilters/make4ht-idcolons.lua -2019/11/03 | 2768 | support/make4ht/domfilters/make4ht-joincharacters.lua -2019/11/03 | 2216 | support/make4ht/domfilters/make4ht-joincolors.lua -2019/11/03 | 627 | support/make4ht/domfilters/make4ht-odtimagesize.lua -2019/11/03 | 321 | support/make4ht/domfilters/make4ht-odtpartable.lua -2019/11/03 | 986 | support/make4ht/domfilters/make4ht-t4htlinks.lua -2019/11/03 | 2169 | support/make4ht/domfilters/make4ht-tablerows.lua -2019/11/03 | 995 | support/make4ht/extensions/make4ht-ext-common_domfilters.lua -2019/11/03 | 627 | support/make4ht/extensions/make4ht-ext-common_filters.lua -2019/11/03 | 8335 | support/make4ht/extensions/make4ht-ext-dvisvgm_hashes.lua -2019/11/03 | 309 | support/make4ht/extensions/make4ht-ext-join_colors.lua -2019/11/03 | 974 | support/make4ht/extensions/make4ht-ext-latexmk_build.lua -2019/11/03 | 271 | support/make4ht/extensions/make4ht-ext-mathjaxnode.lua -2019/11/03 | 288 | support/make4ht/extensions/make4ht-ext-odttemplate.lua -2019/11/03 | 3861 | support/make4ht/extensions/make4ht-ext-preprocess_input.lua -2019/11/03 | 4301 | support/make4ht/extensions/make4ht-ext-staticsite.lua -2019/11/03 | 1329 | support/make4ht/extensions/make4ht-ext-tidy.lua -2019/11/03 | 798 | support/make4ht/filters/make4ht-cleanspan.lua -2019/11/03 | 264 | support/make4ht/filters/make4ht-cleanspan-nat.lua -2019/11/03 | 2270 | support/make4ht/filters/make4ht-domfilter.lua -2019/11/03 | 291 | support/make4ht/filters/make4ht-entities.lua -2019/11/03 | 713 | support/make4ht/filters/make4ht-entities-to-unicode.lua -2019/11/03 | 596 | support/make4ht/filters/make4ht-filter.lua -2019/11/03 | 386 | support/make4ht/filters/make4ht-fixligatures.lua -2019/11/03 | 425 | support/make4ht/filters/make4ht-fix-links.lua -2019/11/03 | 402 | support/make4ht/filters/make4ht-hruletohr.lua -2019/11/03 | 3191 | support/make4ht/filters/make4ht-mathjaxnode.lua -2019/11/03 | 2324 | support/make4ht/filters/make4ht-odttemplate.lua -2019/11/03 | 3412 | support/make4ht/filters/make4ht-staticsite.lua -2019/11/03 | 1215 | support/make4ht/filters/make4ht-svg-height.lua -2019/11/03 | 1143 | support/make4ht/formats/make4ht-docbook.lua -2019/11/03 | 464 | support/make4ht/formats/make4ht-html5.lua -2019/11/03 | 7468 | support/make4ht/formats/make4ht-odt.lua -2019/11/03 | 344 | support/make4ht/formats/make4ht-tei.lua -2019/11/03 | 349 | support/make4ht/formats/make4ht-xhtml.lua -2019/11/03 | 9796 | support/make4ht/lapp-mk4.lua -2019/11/03 | 4028 | support/make4ht/make4ht -2019/11/03 | 7915 | support/make4ht/make4ht-aeneas-config.lua -2019/11/03 | 2465 | support/make4ht/make4ht-config.lua -2019/11/03 | 127067 | support/make4ht/make4ht-doc.pdf -2019/11/03 | 798 | support/make4ht/make4ht-doc.tex -2019/11/03 | 5355 | support/make4ht/make4ht-dvireader.lua -2019/11/03 | 2679 | support/make4ht/make4ht-errorlogparser.lua -2019/11/03 | 1039 | support/make4ht/make4ht-filterlib.lua -2019/11/03 | 3277 | support/make4ht/make4ht-htlatex.lua -2019/11/03 | 6005 | support/make4ht/make4ht-indexing.lua -2019/11/03 | 6356 | support/make4ht/make4ht-lib.lua -2019/11/03 | 2905 | support/make4ht/make4ht-logging.lua -2019/11/03 | 1093 | support/make4ht/make4ht-odtfilter.lua -2019/11/03 | 3247 | support/make4ht/make4ht-xtpipes.lua -2019/11/03 | 9928 | support/make4ht/mkparams.lua -2019/11/03 | 16356 | support/make4ht/mkutils.lua -2019/11/03 | 36892 | support/make4ht/README -2019/11/03 | 46112 | support/make4ht/readme.tex -2019/11/03 | 217572 | support/make4ht.zip +2019/11/26 | 22455 | support/make4ht/changelog.tex +2019/11/26 | 4641 | support/make4ht/domfilters/make4ht-aeneas.lua +2019/11/26 | 6807 | support/make4ht/domfilters/make4ht-collapsetoc.lua +2019/11/26 | 1047 | support/make4ht/domfilters/make4ht-fixinlines.lua +2019/11/26 | 595 | support/make4ht/domfilters/make4ht-idcolons.lua +2019/11/26 | 3273 | support/make4ht/domfilters/make4ht-joincharacters.lua +2019/11/26 | 2216 | support/make4ht/domfilters/make4ht-joincolors.lua +2019/11/26 | 1406 | support/make4ht/domfilters/make4ht-mathmlfixes.lua +2019/11/26 | 627 | support/make4ht/domfilters/make4ht-odtimagesize.lua +2019/11/26 | 321 | support/make4ht/domfilters/make4ht-odtpartable.lua +2019/11/26 | 986 | support/make4ht/domfilters/make4ht-t4htlinks.lua +2019/11/26 | 2169 | support/make4ht/domfilters/make4ht-tablerows.lua +2019/11/26 | 1034 | support/make4ht/extensions/make4ht-ext-common_domfilters.lua +2019/11/26 | 627 | support/make4ht/extensions/make4ht-ext-common_filters.lua +2019/11/26 | 8335 | support/make4ht/extensions/make4ht-ext-dvisvgm_hashes.lua +2019/11/26 | 309 | support/make4ht/extensions/make4ht-ext-join_colors.lua +2019/11/26 | 974 | support/make4ht/extensions/make4ht-ext-latexmk_build.lua +2019/11/26 | 271 | support/make4ht/extensions/make4ht-ext-mathjaxnode.lua +2019/11/26 | 288 | support/make4ht/extensions/make4ht-ext-odttemplate.lua +2019/11/26 | 3861 | support/make4ht/extensions/make4ht-ext-preprocess_input.lua +2019/11/26 | 4301 | support/make4ht/extensions/make4ht-ext-staticsite.lua +2019/11/26 | 1329 | support/make4ht/extensions/make4ht-ext-tidy.lua +2019/11/26 | 798 | support/make4ht/filters/make4ht-cleanspan.lua +2019/11/26 | 264 | support/make4ht/filters/make4ht-cleanspan-nat.lua +2019/11/26 | 2270 | support/make4ht/filters/make4ht-domfilter.lua +2019/11/26 | 291 | support/make4ht/filters/make4ht-entities.lua +2019/11/26 | 713 | support/make4ht/filters/make4ht-entities-to-unicode.lua +2019/11/26 | 596 | support/make4ht/filters/make4ht-filter.lua +2019/11/26 | 386 | support/make4ht/filters/make4ht-fixligatures.lua +2019/11/26 | 425 | support/make4ht/filters/make4ht-fix-links.lua +2019/11/26 | 402 | support/make4ht/filters/make4ht-hruletohr.lua +2019/11/26 | 3191 | support/make4ht/filters/make4ht-mathjaxnode.lua +2019/11/26 | 2324 | support/make4ht/filters/make4ht-odttemplate.lua +2019/11/26 | 3412 | support/make4ht/filters/make4ht-staticsite.lua +2019/11/26 | 1215 | support/make4ht/filters/make4ht-svg-height.lua +2019/11/26 | 1143 | support/make4ht/formats/make4ht-docbook.lua +2019/11/26 | 395 | support/make4ht/formats/make4ht-html5.lua +2019/11/26 | 7599 | support/make4ht/formats/make4ht-odt.lua +2019/11/26 | 344 | support/make4ht/formats/make4ht-tei.lua +2019/11/26 | 326 | support/make4ht/formats/make4ht-xhtml.lua +2019/11/26 | 9796 | support/make4ht/lapp-mk4.lua +2019/11/26 | 4028 | support/make4ht/make4ht +2019/11/26 | 7915 | support/make4ht/make4ht-aeneas-config.lua +2019/11/26 | 2465 | support/make4ht/make4ht-config.lua +2019/11/26 | 128196 | support/make4ht/make4ht-doc.pdf +2019/11/26 | 798 | support/make4ht/make4ht-doc.tex +2019/11/26 | 5355 | support/make4ht/make4ht-dvireader.lua +2019/11/26 | 2679 | support/make4ht/make4ht-errorlogparser.lua +2019/11/26 | 1039 | support/make4ht/make4ht-filterlib.lua +2019/11/26 | 3277 | support/make4ht/make4ht-htlatex.lua +2019/11/26 | 6005 | support/make4ht/make4ht-indexing.lua +2019/11/26 | 6356 | support/make4ht/make4ht-lib.lua +2019/11/26 | 2905 | support/make4ht/make4ht-logging.lua +2019/11/26 | 1093 | support/make4ht/make4ht-odtfilter.lua +2019/11/26 | 3247 | support/make4ht/make4ht-xtpipes.lua +2019/11/26 | 9928 | support/make4ht/mkparams.lua +2019/11/26 | 16404 | support/make4ht/mkutils.lua +2019/11/26 | 37005 | support/make4ht/README +2019/11/26 | 46241 | support/make4ht/readme.tex +2019/11/26 | 219731 | support/make4ht.zip 2018/02/21 | 59658 | support/makedtx/makedtx.dtx 2018/02/21 | 1370 | support/makedtx/makedtx.ins 2018/02/21 | 300434 | support/makedtx/makedtx.pdf @@ -248870,7 +248907,7 @@ 2019/11/18 | 1344 | systems/texlive/tlnet/archive/collection-pictures.tar.xz 2019/11/02 | 868 | systems/texlive/tlnet/archive/collection-plaingeneric.tar.xz 2019/10/03 | 812 | systems/texlive/tlnet/archive/collection-pstricks.tar.xz -2019/08/22 | 1460 | systems/texlive/tlnet/archive/collection-publishers.tar.xz +2019/11/26 | 1464 | systems/texlive/tlnet/archive/collection-publishers.tar.xz 2019/02/28 | 340 | systems/texlive/tlnet/archive/collection-texworks.tar.xz 2019/02/28 | 388 | systems/texlive/tlnet/archive/collection-wintools.tar.xz 2019/11/08 | 648 | systems/texlive/tlnet/archive/collection-xetex.tar.xz @@ -250145,8 +250182,8 @@ 2019/02/28 | 1500 | systems/texlive/tlnet/archive/dynamicnumber.tar.xz 2019/02/28 | 377732 | systems/texlive/tlnet/archive/dynblocks.doc.tar.xz 2019/02/28 | 2084 | systems/texlive/tlnet/archive/dynblocks.tar.xz -2019/02/28 | 752860 | systems/texlive/tlnet/archive/dynkin-diagrams.doc.tar.xz -2019/02/28 | 16548 | systems/texlive/tlnet/archive/dynkin-diagrams.tar.xz +2019/11/26 | 17516 | systems/texlive/tlnet/archive/dynkin-diagrams.doc.tar.xz +2019/11/26 | 16684 | systems/texlive/tlnet/archive/dynkin-diagrams.tar.xz 2019/02/28 | 127664 | systems/texlive/tlnet/archive/dyntree.doc.tar.xz 2019/02/28 | 8784 | systems/texlive/tlnet/archive/dyntree.source.tar.xz 2019/02/28 | 3120 | systems/texlive/tlnet/archive/dyntree.tar.xz @@ -255256,8 +255293,8 @@ 2019/02/28 | 93292 | systems/texlive/tlnet/archive/poster-mac.doc.tar.xz 2019/02/28 | 3152 | systems/texlive/tlnet/archive/poster-mac.tar.xz 2019/02/28 | 943004 | systems/texlive/tlnet/archive/powerdot.doc.tar.xz -2019/02/28 | 1408480 | systems/texlive/tlnet/archive/powerdot-FUBerlin.doc.tar.xz -2019/02/28 | 2708 | systems/texlive/tlnet/archive/powerdot-FUBerlin.tar.xz +2019/11/26 | 280080 | systems/texlive/tlnet/archive/powerdot-fuberlin.doc.tar.xz +2019/11/26 | 2704 | systems/texlive/tlnet/archive/powerdot-fuberlin.tar.xz 2019/02/28 | 67028 | systems/texlive/tlnet/archive/powerdot.source.tar.xz 2019/02/28 | 26284 | systems/texlive/tlnet/archive/powerdot.tar.xz 2019/02/28 | 9412 | systems/texlive/tlnet/archive/powerdot-tuliplab.doc.tar.xz @@ -255978,9 +256015,9 @@ 2019/02/28 | 398972 | systems/texlive/tlnet/archive/regstats.doc.tar.xz 2019/02/28 | 13252 | systems/texlive/tlnet/archive/regstats.source.tar.xz 2019/02/28 | 3648 | systems/texlive/tlnet/archive/regstats.tar.xz -2019/11/05 | 8552192 | systems/texlive/tlnet/archive/reledmac.doc.tar.xz -2019/11/05 | 203528 | systems/texlive/tlnet/archive/reledmac.source.tar.xz -2019/11/05 | 52888 | systems/texlive/tlnet/archive/reledmac.tar.xz +2019/11/26 | 8552524 | systems/texlive/tlnet/archive/reledmac.doc.tar.xz +2019/11/26 | 203504 | systems/texlive/tlnet/archive/reledmac.source.tar.xz +2019/11/26 | 52892 | systems/texlive/tlnet/archive/reledmac.tar.xz 2019/02/28 | 26504 | systems/texlive/tlnet/archive/relenc.doc.tar.xz 2019/02/28 | 26728 | systems/texlive/tlnet/archive/relenc.source.tar.xz 2019/02/28 | 11188 | systems/texlive/tlnet/archive/relenc.tar.xz @@ -257196,8 +257233,8 @@ 2019/04/06 | 280 | systems/texlive/tlnet/archive/texlive-cz.tar.xz 2019/03/28 | 1299960 | systems/texlive/tlnet/archive/texlive-de.doc.tar.xz 2019/03/28 | 272 | systems/texlive/tlnet/archive/texlive-de.tar.xz -2019/11/24 | 155536 | systems/texlive/tlnet/archive/texlive-docindex.doc.tar.xz -2019/11/24 | 109876 | systems/texlive/tlnet/archive/texlive-docindex.tar.xz +2019/11/26 | 155684 | systems/texlive/tlnet/archive/texlive-docindex.doc.tar.xz +2019/11/26 | 109876 | systems/texlive/tlnet/archive/texlive-docindex.tar.xz 2019/08/15 | 1856616 | systems/texlive/tlnet/archive/texlive-en.doc.tar.xz 2019/08/15 | 276 | systems/texlive/tlnet/archive/texlive-en.tar.xz 2019/04/01 | 2279380 | systems/texlive/tlnet/archive/texlive-es.doc.tar.xz @@ -257253,13 +257290,13 @@ 2019/02/28 | 372 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.tar.xz 2019/02/28 | 372 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.tar.xz 2019/02/28 | 372 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.tar.xz -2019/11/25 | 51244 | systems/texlive/tlnet/archive/texlive-scripts.doc.tar.xz +2019/11/26 | 51248 | systems/texlive/tlnet/archive/texlive-scripts.doc.tar.xz 2019/02/28 | 372 | systems/texlive/tlnet/archive/texlive-scripts.i386-cygwin.tar.xz 2019/02/28 | 372 | systems/texlive/tlnet/archive/texlive-scripts.i386-freebsd.tar.xz 2019/02/28 | 372 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.tar.xz 2019/02/28 | 372 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.tar.xz 2019/02/28 | 372 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.tar.xz -2019/11/25 | 85432 | systems/texlive/tlnet/archive/texlive-scripts.tar.xz +2019/11/26 | 85452 | systems/texlive/tlnet/archive/texlive-scripts.tar.xz 2019/08/31 | 11636 | systems/texlive/tlnet/archive/texlive-scripts.win32.tar.xz 2019/02/28 | 372 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.tar.xz 2019/02/28 | 376 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-darwinlegacy.tar.xz @@ -258812,16 +258849,16 @@ 2019/02/28 | 136844 | systems/texlive/tlnet/archive/zxjatype.doc.tar.xz 2019/02/28 | 8412 | systems/texlive/tlnet/archive/zxjatype.tar.xz 2019/10/19 | 106951 | systems/texlive/tlnet/install-tl -2019/11/25 | 3946942 | systems/texlive/tlnet/install-tl-unx.tar.gz -2019/11/25 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 -2019/11/25 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc +2019/11/26 | 3946955 | systems/texlive/tlnet/install-tl-unx.tar.gz +2019/11/26 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2019/11/26 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc 2019/05/09 | 4543 | systems/texlive/tlnet/install-tl-windows.bat -2019/11/25 | 18699000 | systems/texlive/tlnet/install-tl-windows.exe -2019/11/25 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 -2019/11/25 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc -2019/11/25 | 22539006 | systems/texlive/tlnet/install-tl.zip -2019/11/25 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 -2019/11/25 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc +2019/11/26 | 18700273 | systems/texlive/tlnet/install-tl-windows.exe +2019/11/26 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 +2019/11/26 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc +2019/11/26 | 22539015 | systems/texlive/tlnet/install-tl.zip +2019/11/26 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 +2019/11/26 | 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 @@ -258830,7 +258867,7 @@ 2019/03/13 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg 2019/09/14 | 48351 | systems/texlive/tlnet/tlpkg/installer/config.guess 2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt -2019/11/24 | 5791 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl +2019/11/25 | 5802 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl 2018/04/29 | 13647 | systems/texlive/tlnet/tlpkg/installer/DirSelect.pm 2017/04/16 | 2629 | systems/texlive/tlnet/tlpkg/installer/installer-options.txt 2019/06/25 | 5491 | systems/texlive/tlnet/tlpkg/installer/install-menu-extl.pl @@ -258876,12 +258913,12 @@ 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 -2019/11/25 | 15964857 | systems/texlive/tlnet/tlpkg/texlive.tlpdb -2019/11/25 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2019/11/26 | 15965049 | systems/texlive/tlnet/tlpkg/texlive.tlpdb +2019/11/26 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 2019/11/09 | 87503 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm -2019/11/25 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 -2019/11/25 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc -2019/11/25 | 2142836 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +2019/11/26 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +2019/11/26 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +2019/11/26 | 2142172 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz 2019/03/03 | 57785 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm 2018/12/17 | 36910 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm 2018/08/31 | 14972 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm @@ -261228,6 +261265,7 @@ 2010/03/30 | 223960 | systems/win32/miktex/tm/packages/asyfig.tar.lzma 2018/04/11 | 1927495 | systems/win32/miktex/tm/packages/asymptote.tar.lzma 2014/04/23 | 648197 | systems/win32/miktex/tm/packages/asypictureb.tar.lzma +2019/11/26 | 464534 | systems/win32/miktex/tm/packages/attachfile2.tar.lzma 2016/09/20 | 371943 | systems/win32/miktex/tm/packages/attachfile.tar.lzma 2016/06/21 | 719868 | systems/win32/miktex/tm/packages/aucklandthesis.tar.lzma 2016/07/15 | 65733 | systems/win32/miktex/tm/packages/augie.tar.lzma @@ -261393,7 +261431,7 @@ 2013/09/09 | 34440 | systems/win32/miktex/tm/packages/bibhtml.tar.lzma 2018/11/22 | 884678 | systems/win32/miktex/tm/packages/biblatex-abnt.tar.lzma 2018/09/04 | 64282 | systems/win32/miktex/tm/packages/biblatex-anonymous.tar.lzma -2019/09/10 | 246563 | systems/win32/miktex/tm/packages/biblatex-apa.tar.lzma +2019/11/26 | 313584 | systems/win32/miktex/tm/packages/biblatex-apa.tar.lzma 2018/11/22 | 4480255 | systems/win32/miktex/tm/packages/biblatex-archaeology.tar.lzma 2018/02/14 | 192153 | systems/win32/miktex/tm/packages/biblatex-arthistory-bonn.tar.lzma 2010/07/12 | 2404 | systems/win32/miktex/tm/packages/biblatex-authoryear-icomp-tt.tar.lzma @@ -261543,7 +261581,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 -2019/07/28 | 1777919 | systems/win32/miktex/tm/packages/bxjscls.tar.lzma +2019/11/26 | 1935899 | 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 @@ -261570,7 +261608,7 @@ 2019/07/05 | 1553683 | systems/win32/miktex/tm/packages/cantarell.tar.lzma 2005/05/04 | 25470 | systems/win32/miktex/tm/packages/captcont.cab 2010/03/08 | 217522 | systems/win32/miktex/tm/packages/captdef.tar.lzma -2019/09/08 | 1911706 | systems/win32/miktex/tm/packages/caption.tar.lzma +2019/11/26 | 1808735 | systems/win32/miktex/tm/packages/caption.tar.lzma 2010/01/26 | 77039 | systems/win32/miktex/tm/packages/capt-of.tar.lzma 2015/12/04 | 493328 | systems/win32/miktex/tm/packages/carbohydrates.tar.lzma 2018/06/23 | 86560 | systems/win32/miktex/tm/packages/carlisle.tar.lzma @@ -261899,7 +261937,7 @@ 2018/12/18 | 84116 | systems/win32/miktex/tm/packages/datetime2-russian.tar.lzma 2018/12/18 | 80558 | systems/win32/miktex/tm/packages/datetime2-samin.tar.lzma 2019/09/17 | 295399 | systems/win32/miktex/tm/packages/datetime2-scottish.tar.lzma -2019/11/12 | 295802 | systems/win32/miktex/tm/packages/datetime2-serbian.tar.lzma +2019/11/26 | 299671 | systems/win32/miktex/tm/packages/datetime2-serbian.tar.lzma 2019/10/05 | 79871 | systems/win32/miktex/tm/packages/datetime2-slovak.tar.lzma 2019/10/05 | 79328 | systems/win32/miktex/tm/packages/datetime2-slovene.tar.lzma 2017/11/14 | 296234 | systems/win32/miktex/tm/packages/datetime2-spanish.tar.lzma @@ -262014,7 +262052,7 @@ 2016/11/03 | 32074 | systems/win32/miktex/tm/packages/dvips.tar.lzma 2015/11/03 | 164085 | systems/win32/miktex/tm/packages/dynamicnumber.tar.lzma 2014/09/29 | 380557 | systems/win32/miktex/tm/packages/dynblocks.tar.lzma -2019/01/26 | 771674 | systems/win32/miktex/tm/packages/dynkin-diagrams.tar.lzma +2019/11/26 | 34493 | systems/win32/miktex/tm/packages/dynkin-diagrams.tar.lzma 2006/08/26 | 141965 | systems/win32/miktex/tm/packages/dyntree.tar.bz2 2008/06/26 | 314142 | systems/win32/miktex/tm/packages/ean13isbn.tar.lzma 2016/07/15 | 3965 | systems/win32/miktex/tm/packages/ean.tar.lzma @@ -262121,6 +262159,7 @@ 2011/02/19 | 282023 | systems/win32/miktex/tm/packages/epsf.tar.lzma 2010/06/04 | 422775 | systems/win32/miktex/tm/packages/epspdfconversion.tar.lzma 2019/02/07 | 269297 | systems/win32/miktex/tm/packages/epspdf.tar.lzma +2019/11/26 | 372275 | systems/win32/miktex/tm/packages/epstopdf-pkg.tar.lzma 2016/01/03 | 174659 | systems/win32/miktex/tm/packages/eq2db.tar.lzma 2011/06/23 | 184246 | systems/win32/miktex/tm/packages/eqell.tar.lzma 2019/11/02 | 2686411 | systems/win32/miktex/tm/packages/eqexam.tar.lzma @@ -262258,7 +262297,7 @@ 2019/10/04 | 281928 | 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 -2019/11/25 | 510075 | systems/win32/miktex/tm/packages/files.csv.lzma +2019/11/26 | 509921 | 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 @@ -262326,6 +262365,7 @@ 2005/06/25 | 33931 | systems/win32/miktex/tm/packages/fontsampler.cab 2017/10/20 | 2051602 | systems/win32/miktex/tm/packages/fonts-arundina.tar.lzma 2017/02/03 | 2021910 | systems/win32/miktex/tm/packages/fonts-churchslavonic.tar.lzma +2019/11/26 | 827057 | systems/win32/miktex/tm/packages/fontsetup.tar.lzma 2019/10/20 | 1377382 | systems/win32/miktex/tm/packages/fontspec.tar.lzma 2018/11/11 | 12792540 | systems/win32/miktex/tm/packages/fonts-tlwg.tar.lzma 2017/07/16 | 330987 | systems/win32/miktex/tm/packages/fonttable.tar.lzma @@ -262335,7 +262375,7 @@ 2016/12/05 | 26465 | systems/win32/miktex/tm/packages/footmisx.tar.lzma 2012/07/03 | 113754 | systems/win32/miktex/tm/packages/footnotebackref.tar.lzma 2019/11/10 | 74935 | systems/win32/miktex/tm/packages/footnotehyper.tar.lzma -2018/10/17 | 416145 | systems/win32/miktex/tm/packages/footnoterange.tar.lzma +2019/11/26 | 416498 | systems/win32/miktex/tm/packages/footnoterange.tar.lzma 2016/07/15 | 62364 | systems/win32/miktex/tm/packages/footnpag.tar.lzma 2008/06/26 | 257341 | systems/win32/miktex/tm/packages/forarray.tar.lzma 2012/10/04 | 89389 | systems/win32/miktex/tm/packages/foreign.tar.lzma @@ -262855,7 +262895,7 @@ 2007/01/19 | 56963 | systems/win32/miktex/tm/packages/leftidx.tar.bz2 2019/10/20 | 628747 | systems/win32/miktex/tm/packages/leipzig.tar.lzma 2013/07/01 | 451593 | systems/win32/miktex/tm/packages/lengthconvert.tar.lzma -2019/11/22 | 443347 | systems/win32/miktex/tm/packages/letterswitharrows.tar.lzma +2019/11/26 | 463737 | systems/win32/miktex/tm/packages/letterswitharrows.tar.lzma 2017/08/05 | 955435 | systems/win32/miktex/tm/packages/lettre.tar.lzma 2019/04/08 | 397095 | systems/win32/miktex/tm/packages/lettrine.tar.lzma 2011/03/15 | 56985 | systems/win32/miktex/tm/packages/levy-font.tar.lzma @@ -263364,9 +263404,9 @@ 2018/01/12 | 157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma 2019/11/11 | 38784 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma 2019/11/11 | 42872 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma -2019/11/25 | 192045 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma -2019/11/25 | 1142955 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma -2019/11/25 | 1065196 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma +2019/11/26 | 192385 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma +2019/11/26 | 1144748 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma +2019/11/26 | 1066726 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma 2019/11/11 | 13040 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma 2019/11/11 | 14027 | 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 @@ -263407,6 +263447,7 @@ 2010/04/13 | 1319837 | systems/win32/miktex/tm/packages/modroman.tar.lzma 2017/05/02 | 146669 | systems/win32/miktex/tm/packages/modular.tar.lzma 2018/05/04 | 179116 | systems/win32/miktex/tm/packages/modulus.tar.lzma +2019/11/26 | 631111 | systems/win32/miktex/tm/packages/mol2chemfig.tar.lzma 2008/04/02 | 107181 | systems/win32/miktex/tm/packages/mongolian-babel.tar.lzma 2012/11/02 | 297548 | systems/win32/miktex/tm/packages/monofill.tar.lzma 2010/04/13 | 2852397 | systems/win32/miktex/tm/packages/montex.tar.lzma @@ -263502,191 +263543,192 @@ 2019/11/22 | 2250896 | systems/win32/miktex/tm/packages/newcomputermodern.tar.lzma 2013/03/11 | 4261 | systems/win32/miktex/tm/packages/newenviron.tar.lzma 2009/09/11 | 159025 | systems/win32/miktex/tm/packages/newfile.tar.lzma +2019/11/26 | 120397 | systems/win32/miktex/tm/packages/newfloat.tar.lzma 2009/04/21 | 411400 | systems/win32/miktex/tm/packages/newlfm.tar.lzma 2019/10/28 | 2149220 | systems/win32/miktex/tm/packages/newpx.tar.lzma 2005/06/25 | 43902 | systems/win32/miktex/tm/packages/newsletr.cab 2007/12/30 | 204631 | systems/win32/miktex/tm/packages/newspaper.tar.lzma 2018/06/08 | 440019 | systems/win32/miktex/tm/packages/newtxsf.tar.lzma -2019/11/11 | 5341871 | systems/win32/miktex/tm/packages/newtx.tar.lzma +2019/11/26 | 5373159 | systems/win32/miktex/tm/packages/newtx.tar.lzma 2017/05/23 | 196873 | 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 -2019/11/25 | 510194 | systems/win32/miktex/tm/packages/next/files.csv.lzma -2019/11/25 | 29260 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma -2019/11/25 | 33398 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma -2019/11/25 | 861862 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma -2019/11/25 | 954757 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma -2019/11/25 | 24007 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma -2019/11/25 | 26206 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma -2019/11/25 | 29273 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma -2019/11/25 | 34839 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma -2019/11/25 | 49737 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma -2019/11/25 | 57209 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma -2019/11/25 | 84523 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma -2019/11/25 | 94339 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma -2019/11/25 | 60293 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma -2019/11/25 | 67351 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma -2019/11/25 | 26645 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma -2019/11/25 | 30271 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma -2019/11/25 | 328609 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma -2019/11/25 | 391475 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma -2019/11/25 | 32194 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma -2019/11/25 | 36376 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma -2019/11/25 | 49290 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma -2019/11/25 | 54062 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma -2019/11/25 | 198193 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma -2019/11/25 | 214115 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma -2019/11/25 | 169226 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma -2019/11/25 | 184218 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma -2019/11/25 | 52018 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma -2019/11/25 | 58764 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma -2019/11/25 | 20665 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma -2019/11/25 | 22933 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma -2019/11/25 | 449958 | systems/win32/miktex/tm/packages/next/miktex-doc-2.9.tar.lzma -2019/11/25 | 40991 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma -2019/11/25 | 45840 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma -2019/11/25 | 271554 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma -2019/11/25 | 308633 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma -2019/11/25 | 40725 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma -2019/11/25 | 44977 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma -2019/11/25 | 113039 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma -2019/11/25 | 127122 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma -2019/11/25 | 1206606 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma -2019/11/25 | 1327338 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma -2019/11/25 | 33548 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma -2019/11/25 | 38877 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma -2019/11/25 | 43409 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma -2019/11/25 | 47982 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma -2019/11/25 | 45433 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma -2019/11/25 | 50495 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma -2019/11/25 | 56655 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma -2019/11/25 | 61700 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma -2019/11/25 | 133233 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma -2019/11/25 | 152065 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma -2019/11/25 | 69711 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma -2019/11/25 | 72621 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma -2019/11/25 | 68834 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma -2019/11/25 | 77422 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma -2019/11/25 | 246520 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma -2019/11/25 | 281552 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma -2019/11/25 | 25314 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma -2019/11/25 | 28760 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma -2019/11/25 | 100667 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma -2019/11/25 | 116476 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma -2019/11/25 | 63292 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma -2019/11/25 | 72564 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma -2019/11/25 | 94268 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma -2019/11/25 | 111240 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma -2019/11/25 | 35207 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma -2019/11/25 | 39877 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma -2019/11/25 | 457031 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma -2019/11/25 | 544071 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma -2019/11/25 | 137164 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma -2019/11/25 | 149923 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma -2019/11/25 | 92915 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma -2019/11/25 | 108874 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma -2019/11/25 | 15895 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma -2019/11/25 | 17676 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma -2019/11/25 | 27771 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma -2019/11/25 | 29685 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma -2019/11/25 | 498743 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma -2019/11/25 | 561200 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma -2019/11/25 | 540169 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma -2019/11/25 | 575838 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma -2019/11/25 | 93418 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma -2019/11/25 | 102472 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma -2019/11/25 | 1698679 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma -2019/11/25 | 1956729 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma -2019/11/25 | 67268 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma -2019/11/25 | 73621 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma -2019/11/25 | 26988 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma -2019/11/25 | 31256 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma -2019/11/25 | 7500 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma -2019/11/25 | 8481 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma -2019/11/25 | 167804 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma -2019/11/25 | 182755 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma -2019/11/25 | 247380 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma -2019/11/25 | 281253 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma -2019/11/25 | 87326 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma -2019/11/25 | 92032 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma -2019/11/25 | 77868 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma -2019/11/25 | 86605 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma -2019/11/25 | 165972 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma -2019/11/25 | 184991 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma -2019/11/25 | 147008 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma -2019/11/25 | 165749 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma -2019/11/25 | 195059 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma -2019/11/25 | 177510 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma -2019/11/25 | 80530 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma -2019/11/25 | 91182 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma -2019/11/25 | 30997 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma -2019/11/25 | 34848 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma -2019/11/25 | 56432 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma -2019/11/25 | 62826 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma -2019/11/25 | 41928 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma -2019/11/25 | 45739 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma -2019/11/25 | 45621 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma -2019/11/25 | 52139 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma -2019/11/25 | 354296 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-2.9.tar.lzma -2019/11/25 | 387323 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-x64-2.9.tar.lzma -2019/11/25 | 321493 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma -2019/11/25 | 355858 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma -2019/11/25 | 187028 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma -2019/11/25 | 194084 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma -2019/11/25 | 201923 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma -2019/11/25 | 237472 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma -2019/11/25 | 77945 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma -2019/11/25 | 87304 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma -2019/11/25 | 932608 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma -2019/11/25 | 1042936 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma -2019/11/25 | 19795 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma -2019/11/25 | 23342 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma -2019/11/25 | 31162 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma -2019/11/25 | 36620 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma -2019/11/25 | 63114 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma -2019/11/25 | 71573 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma -2019/11/25 | 42594 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma -2019/11/25 | 50824 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma -2019/11/25 | 1067747 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma -2019/11/25 | 1195597 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma -2019/11/25 | 41883 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma -2019/11/25 | 50845 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma -2019/11/25 | 53435 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-2.9.tar.lzma -2019/11/25 | 59482 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64-2.9.tar.lzma -2019/11/25 | 26811 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma -2019/11/25 | 29125 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma -2019/11/25 | 16050 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma -2019/11/25 | 17769 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma -2019/11/25 | 63185 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma -2019/11/25 | 69193 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma -2019/11/25 | 147060 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma -2019/11/25 | 160548 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma -2019/11/25 | 70285 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma -2019/11/25 | 79804 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma -2019/11/25 | 91191 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma -2019/11/25 | 96285 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma -2019/11/25 | 2457307 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma -2019/11/25 | 2579521 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma -2019/11/25 | 54923 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma -2019/11/25 | 60874 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma -2019/11/25 | 26500 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma -2019/11/25 | 32360 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma -2019/11/25 | 61453 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma -2019/11/25 | 65085 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma -2019/11/25 | 247023 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma -2019/11/25 | 276940 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma -2019/11/25 | 533610 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma -2019/11/25 | 563595 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma -2019/11/25 | 38798 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma -2019/11/25 | 42966 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma -2019/11/25 | 191959 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma -2019/11/25 | 1142044 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma -2019/11/25 | 1065199 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma -2019/11/25 | 13060 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma -2019/11/25 | 14055 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma +2019/11/26 | 509867 | systems/win32/miktex/tm/packages/next/files.csv.lzma +2019/11/26 | 29238 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma +2019/11/26 | 33398 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma +2019/11/26 | 863199 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma +2019/11/26 | 954073 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma +2019/11/26 | 24071 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma +2019/11/26 | 26175 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma +2019/11/26 | 29295 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma +2019/11/26 | 34845 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma +2019/11/26 | 49770 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma +2019/11/26 | 57218 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma +2019/11/26 | 84535 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma +2019/11/26 | 94237 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma +2019/11/26 | 60328 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma +2019/11/26 | 67255 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma +2019/11/26 | 26661 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma +2019/11/26 | 30239 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma +2019/11/26 | 328873 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma +2019/11/26 | 391460 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma +2019/11/26 | 32265 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma +2019/11/26 | 36379 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma +2019/11/26 | 49262 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma +2019/11/26 | 53994 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma +2019/11/26 | 198079 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma +2019/11/26 | 214151 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma +2019/11/26 | 169200 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma +2019/11/26 | 184159 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma +2019/11/26 | 51772 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma +2019/11/26 | 58795 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma +2019/11/26 | 20737 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma +2019/11/26 | 22958 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma +2019/11/26 | 449940 | systems/win32/miktex/tm/packages/next/miktex-doc-2.9.tar.lzma +2019/11/26 | 40989 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma +2019/11/26 | 45809 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma +2019/11/26 | 271811 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma +2019/11/26 | 308658 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma +2019/11/26 | 40736 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma +2019/11/26 | 44980 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma +2019/11/26 | 112991 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma +2019/11/26 | 127171 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma +2019/11/26 | 1203294 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma +2019/11/26 | 1329051 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma +2019/11/26 | 33547 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma +2019/11/26 | 38862 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma +2019/11/26 | 43438 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma +2019/11/26 | 47976 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma +2019/11/26 | 45465 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma +2019/11/26 | 50578 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma +2019/11/26 | 56620 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma +2019/11/26 | 61654 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma +2019/11/26 | 133204 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma +2019/11/26 | 152162 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma +2019/11/26 | 69606 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma +2019/11/26 | 72595 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma +2019/11/26 | 68672 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma +2019/11/26 | 77317 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma +2019/11/26 | 246455 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma +2019/11/26 | 281673 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma +2019/11/26 | 25326 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma +2019/11/26 | 28708 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma +2019/11/26 | 100681 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma +2019/11/26 | 116800 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma +2019/11/26 | 63286 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma +2019/11/26 | 72572 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma +2019/11/26 | 94636 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma +2019/11/26 | 111234 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma +2019/11/26 | 35214 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma +2019/11/26 | 39844 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma +2019/11/26 | 457346 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma +2019/11/26 | 544014 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma +2019/11/26 | 137167 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma +2019/11/26 | 150088 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma +2019/11/26 | 92935 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma +2019/11/26 | 108757 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma +2019/11/26 | 15895 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma +2019/11/26 | 17696 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma +2019/11/26 | 27819 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma +2019/11/26 | 29688 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma +2019/11/26 | 498553 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma +2019/11/26 | 560768 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma +2019/11/26 | 538879 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma +2019/11/26 | 575920 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma +2019/11/26 | 93475 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma +2019/11/26 | 102378 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma +2019/11/26 | 1679152 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma +2019/11/26 | 1945841 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma +2019/11/26 | 67251 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma +2019/11/26 | 73633 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma +2019/11/26 | 26976 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma +2019/11/26 | 31292 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma +2019/11/26 | 7505 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma +2019/11/26 | 8482 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma +2019/11/26 | 167844 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma +2019/11/26 | 182758 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma +2019/11/26 | 247499 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma +2019/11/26 | 281284 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma +2019/11/26 | 87274 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma +2019/11/26 | 91979 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma +2019/11/26 | 77959 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma +2019/11/26 | 86580 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma +2019/11/26 | 166012 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma +2019/11/26 | 185296 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma +2019/11/26 | 146761 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma +2019/11/26 | 165960 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma +2019/11/26 | 194995 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma +2019/11/26 | 177581 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma +2019/11/26 | 80506 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma +2019/11/26 | 91153 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma +2019/11/26 | 30990 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma +2019/11/26 | 34833 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma +2019/11/26 | 56420 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma +2019/11/26 | 62908 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma +2019/11/26 | 41879 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma +2019/11/26 | 45740 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma +2019/11/26 | 45589 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma +2019/11/26 | 52140 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma +2019/11/26 | 354501 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-2.9.tar.lzma +2019/11/26 | 387511 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-x64-2.9.tar.lzma +2019/11/26 | 321500 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma +2019/11/26 | 356320 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma +2019/11/26 | 187295 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma +2019/11/26 | 193312 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma +2019/11/26 | 202428 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma +2019/11/26 | 237539 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma +2019/11/26 | 77936 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma +2019/11/26 | 87217 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma +2019/11/26 | 932879 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma +2019/11/26 | 1042661 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma +2019/11/26 | 19790 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma +2019/11/26 | 23343 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma +2019/11/26 | 31151 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma +2019/11/26 | 36632 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma +2019/11/26 | 63273 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma +2019/11/26 | 71696 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma +2019/11/26 | 42572 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma +2019/11/26 | 50789 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma +2019/11/26 | 1068589 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma +2019/11/26 | 1195622 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma +2019/11/26 | 41862 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma +2019/11/26 | 50827 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma +2019/11/26 | 53444 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-2.9.tar.lzma +2019/11/26 | 59457 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64-2.9.tar.lzma +2019/11/26 | 26800 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma +2019/11/26 | 29143 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma +2019/11/26 | 16042 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma +2019/11/26 | 17761 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma +2019/11/26 | 63115 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma +2019/11/26 | 69211 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma +2019/11/26 | 147094 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma +2019/11/26 | 160558 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma +2019/11/26 | 70247 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma +2019/11/26 | 79844 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma +2019/11/26 | 91338 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma +2019/11/26 | 96207 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma +2019/11/26 | 2459482 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma +2019/11/26 | 2579406 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma +2019/11/26 | 54740 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma +2019/11/26 | 61217 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma +2019/11/26 | 26508 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma +2019/11/26 | 32347 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma +2019/11/26 | 61565 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma +2019/11/26 | 65022 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma +2019/11/26 | 246891 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma +2019/11/26 | 276598 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma +2019/11/26 | 533453 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma +2019/11/26 | 563303 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma +2019/11/26 | 39219 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma +2019/11/26 | 42943 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma +2019/11/26 | 192393 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma +2019/11/26 | 1145576 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma +2019/11/26 | 1066302 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma +2019/11/26 | 13060 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma +2019/11/26 | 14046 | 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 -2019/11/25 | 652 | systems/win32/miktex/tm/packages/next/pr.ini +2019/11/26 | 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 @@ -263707,7 +263749,7 @@ 2006/04/13 | 83718 | systems/win32/miktex/tm/packages/noitcrul.cab 2012/06/11 | 126690 | systems/win32/miktex/tm/packages/nolbreaks.tar.lzma 2005/09/24 | 48145 | systems/win32/miktex/tm/packages/nomencl.cab -2019/05/07 | 542548 | systems/win32/miktex/tm/packages/nomencl.tar.lzma +2019/11/26 | 543232 | systems/win32/miktex/tm/packages/nomencl.tar.lzma 2006/04/22 | 54211 | systems/win32/miktex/tm/packages/nomentbl.cab 2005/06/02 | 128501 | systems/win32/miktex/tm/packages/nonfloat.cab 2011/04/19 | 792767 | systems/win32/miktex/tm/packages/nonumonpart.tar.lzma @@ -263741,7 +263783,7 @@ 2017/10/01 | 235240 | systems/win32/miktex/tm/packages/numspell.tar.lzma 2019/03/19 | 5642168 | systems/win32/miktex/tm/packages/nwejm.tar.lzma 2005/12/30 | 63383 | systems/win32/miktex/tm/packages/oands.cab -2019/11/16 | 14095923 | systems/win32/miktex/tm/packages/oberdiek.tar.lzma +2019/11/26 | 13263327 | systems/win32/miktex/tm/packages/oberdiek.tar.lzma 2016/07/16 | 285629 | systems/win32/miktex/tm/packages/objectz.tar.lzma 2014/04/07 | 854578 | systems/win32/miktex/tm/packages/obnov.tar.lzma 2013/01/24 | 541997 | systems/win32/miktex/tm/packages/ocg-p.tar.lzma @@ -263835,6 +263877,7 @@ 2010/03/30 | 369241 | systems/win32/miktex/tm/packages/pdf14.tar.lzma 2019/05/14 | 46702 | systems/win32/miktex/tm/packages/pdfarticle.tar.lzma 2019/08/16 | 5254 | systems/win32/miktex/tm/packages/pdfbook2.tar.lzma +2019/11/26 | 1534 | systems/win32/miktex/tm/packages/pdfcolmk.tar.lzma 2018/11/02 | 1216834 | systems/win32/miktex/tm/packages/pdfcomment.tar.lzma 2005/06/13 | 408363 | systems/win32/miktex/tm/packages/pdfcprot.cab 2012/11/08 | 13358 | systems/win32/miktex/tm/packages/pdfcrop.tar.lzma @@ -263843,13 +263886,14 @@ 2011/08/11 | 384460 | systems/win32/miktex/tm/packages/pdfmarginpar.tar.lzma 2019/11/04 | 553574 | systems/win32/miktex/tm/packages/pdfoverlay.tar.lzma 2015/07/28 | 1817839 | systems/win32/miktex/tm/packages/pdfpagediff.tar.lzma -2019/09/24 | 363544 | systems/win32/miktex/tm/packages/pdfpages.tar.lzma +2019/11/26 | 363599 | systems/win32/miktex/tm/packages/pdfpages.tar.lzma 2018/07/22 | 82751 | systems/win32/miktex/tm/packages/pdfpc-movie.tar.lzma 2017/12/04 | 270667 | systems/win32/miktex/tm/packages/pdfprivacy.tar.lzma 2019/02/23 | 585467 | systems/win32/miktex/tm/packages/pdfreview.tar.lzma 2016/07/16 | 446208 | systems/win32/miktex/tm/packages/pdfscreen.tar.lzma 2004/06/12 | 277750 | systems/win32/miktex/tm/packages/pdfslide.cab 2010/11/13 | 265152 | systems/win32/miktex/tm/packages/pdfsync.tar.lzma +2019/11/26 | 427325 | systems/win32/miktex/tm/packages/pdftexcmds.tar.lzma 2018/11/14 | 14586 | systems/win32/miktex/tm/packages/pdftex-quiet.tar.lzma 2019/05/23 | 29295 | systems/win32/miktex/tm/packages/pdftex.tar.lzma 2014/01/31 | 71588 | systems/win32/miktex/tm/packages/pdf-trans.tar.lzma @@ -263917,6 +263961,7 @@ 2011/04/08 | 603802 | systems/win32/miktex/tm/packages/piff.tar.lzma 2008/12/09 | 56609 | systems/win32/miktex/tm/packages/pigpen.tar.lzma 2011/12/07 | 296908 | systems/win32/miktex/tm/packages/pinlabel.tar.lzma +2019/11/26 | 56146 | systems/win32/miktex/tm/packages/pinoutikz.tar.lzma 2011/11/22 | 131707 | systems/win32/miktex/tm/packages/pitex.tar.lzma 2004/08/23 | 126341 | systems/win32/miktex/tm/packages/pittetd.cab 2016/07/18 | 57109 | systems/win32/miktex/tm/packages/pitthesis.tar.lzma @@ -263970,7 +264015,7 @@ 2018/06/04 | 314792 | systems/win32/miktex/tm/packages/postage.tar.lzma 2016/07/18 | 2930 | systems/win32/miktex/tm/packages/postcards.tar.lzma 2010/06/04 | 97045 | systems/win32/miktex/tm/packages/poster.tar.lzma -2009/07/26 | 1410341 | systems/win32/miktex/tm/packages/powerdot-fuberlin.tar.lzma +2019/11/26 | 283083 | systems/win32/miktex/tm/packages/powerdot-fuberlin.tar.lzma 2017/08/29 | 1030567 | systems/win32/miktex/tm/packages/powerdot.tar.lzma 2018/06/09 | 1279130 | systems/win32/miktex/tm/packages/powerdot-tuliplab.tar.lzma 2003/11/29 | 865775 | systems/win32/miktex/tm/packages/ppower4.cab @@ -263985,7 +264030,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 -2019/11/25 | 430 | systems/win32/miktex/tm/packages/pr.ini +2019/11/26 | 391 | 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 @@ -264132,11 +264177,11 @@ 2011/12/01 | 957238 | systems/win32/miktex/tm/packages/punknova.tar.lzma 2016/07/29 | 6387 | systems/win32/miktex/tm/packages/punk.tar.lzma 2017/07/12 | 173140 | systems/win32/miktex/tm/packages/pxbase.tar.lzma -2019/11/22 | 387222 | systems/win32/miktex/tm/packages/pxchfon.tar.lzma +2019/11/26 | 387216 | systems/win32/miktex/tm/packages/pxchfon.tar.lzma 2018/04/04 | 204193 | systems/win32/miktex/tm/packages/pxcjkcat.tar.lzma 2009/01/22 | 695938 | systems/win32/miktex/tm/packages/pxfonts.tar.lzma 2011/03/17 | 62963 | systems/win32/miktex/tm/packages/pxgreeks.tar.lzma -2019/10/26 | 112970 | systems/win32/miktex/tm/packages/pxjahyper.tar.lzma +2019/11/26 | 118928 | systems/win32/miktex/tm/packages/pxjahyper.tar.lzma 2019/02/16 | 128742 | systems/win32/miktex/tm/packages/pxjodel.tar.lzma 2013/05/06 | 2352 | systems/win32/miktex/tm/packages/pxpgfmark.tar.lzma 2018/08/17 | 842504 | systems/win32/miktex/tm/packages/pxrubrica.tar.lzma @@ -264200,7 +264245,7 @@ 2018/05/04 | 547083 | systems/win32/miktex/tm/packages/regexpatch.tar.lzma 2019/01/03 | 179806 | systems/win32/miktex/tm/packages/register.tar.lzma 2012/01/10 | 416161 | systems/win32/miktex/tm/packages/regstats.tar.lzma -2019/11/10 | 8814642 | systems/win32/miktex/tm/packages/reledmac.tar.lzma +2019/11/26 | 8815184 | systems/win32/miktex/tm/packages/reledmac.tar.lzma 2016/07/18 | 62816 | systems/win32/miktex/tm/packages/relenc.tar.lzma 2013/05/29 | 315594 | systems/win32/miktex/tm/packages/relsize.tar.lzma 2010/02/12 | 58689 | systems/win32/miktex/tm/packages/renditions.tar.lzma @@ -264661,7 +264706,7 @@ 2019/07/05 | 987774 | systems/win32/miktex/tm/packages/tikz-imagelabels.tar.lzma 2013/01/07 | 175983 | systems/win32/miktex/tm/packages/tikzinclude.tar.lzma 2008/06/20 | 118922 | systems/win32/miktex/tm/packages/tikz-inet.tar.lzma -2019/06/07 | 123086 | systems/win32/miktex/tm/packages/tikz-kalender.tar.lzma +2019/11/26 | 123182 | systems/win32/miktex/tm/packages/tikz-kalender.tar.lzma 2018/03/20 | 277954 | systems/win32/miktex/tm/packages/tikz-karnaugh.tar.lzma 2018/02/07 | 242117 | systems/win32/miktex/tm/packages/tikz-ladder.tar.lzma 2018/02/18 | 53503 | systems/win32/miktex/tm/packages/tikz-layers.tar.lzma @@ -264934,7 +264979,7 @@ 2008/04/02 | 202156 | systems/win32/miktex/tm/packages/xargs.tar.lzma 2018/12/30 | 1229818 | systems/win32/miktex/tm/packages/xassoccnt.tar.lzma 2018/07/05 | 320079 | systems/win32/miktex/tm/packages/xbmks.tar.lzma -2019/10/25 | 2359200 | systems/win32/miktex/tm/packages/xcharter.tar.lzma +2019/11/26 | 2362595 | systems/win32/miktex/tm/packages/xcharter.tar.lzma 2011/09/03 | 212010 | systems/win32/miktex/tm/packages/xcite.tar.lzma 2019/04/08 | 354418 | systems/win32/miktex/tm/packages/xcjk2uni.tar.lzma 2018/01/07 | 348703 | systems/win32/miktex/tm/packages/xcntperchap.tar.lzma @@ -264973,7 +265018,7 @@ 2015/11/25 | 486715 | systems/win32/miktex/tm/packages/xifthen.tar.lzma 2017/11/18 | 1746 | systems/win32/miktex/tm/packages/xii-lat.tar.lzma 2017/11/18 | 1593 | systems/win32/miktex/tm/packages/xii.tar.lzma -2019/11/02 | 480767 | systems/win32/miktex/tm/packages/xindex.tar.lzma +2019/11/26 | 481162 | systems/win32/miktex/tm/packages/xindex.tar.lzma 2016/11/05 | 133165 | systems/win32/miktex/tm/packages/xindy.tar.lzma 2019/09/13 | 2412479 | systems/win32/miktex/tm/packages/xint.tar.lzma 2019/09/08 | 547780 | systems/win32/miktex/tm/packages/xits.tar.lzma @@ -265091,13 +265136,13 @@ 2019/11/15 | 4908836 | systems/win32/w32tex/aleph-w32.tar.xz 2019/11/23 | 63029448 | systems/win32/w32tex/biblatex-biber.tar.xz 2016/12/13 | 65971452 | systems/win32/w32tex/cbfonts.tar.xz -2019/11/23 | 551634 | systems/win32/w32tex/ChangeLog +2019/11/25 | 552126 | 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 2013/09/03 | 352299 | systems/win32/w32tex/ChangeLog.3 2017/06/24 | 644754 | systems/win32/w32tex/ChangeLog.4 -2019/11/23 | 22178368 | systems/win32/w32tex/cjkzr.tar.xz +2019/11/25 | 22180144 | systems/win32/w32tex/cjkzr.tar.xz 2013/04/27 | 15858676 | systems/win32/w32tex/context-doc.tar.xz 2019/11/15 | 132043296 | systems/win32/w32tex/context.tar.xz 2019/11/23 | 902480 | systems/win32/w32tex/cweb-w32.tar.xz @@ -265114,8 +265159,8 @@ 2019/11/21 | 34675672 | systems/win32/w32tex/latex-dev.tar.xz 2019/11/17 | 29459456 | systems/win32/w32tex/latex.tar.xz 2019/08/14 | 996476 | systems/win32/w32tex/lcdf-typetools-w32.tar.xz -2019/11/18 | 378504904 | systems/win32/w32tex/ltxpkgdocs.tar.xz -2019/11/18 | 34208352 | systems/win32/w32tex/ltxpkgs.tar.xz +2019/11/25 | 378704732 | systems/win32/w32tex/ltxpkgdocs.tar.xz +2019/11/25 | 34209148 | systems/win32/w32tex/ltxpkgs.tar.xz 2019/11/17 | 3908280 | systems/win32/w32tex/luajittex-dev-w32.tar.xz 2019/11/17 | 3905800 | systems/win32/w32tex/luajittex-exp-w32.tar.xz 2019/11/17 | 3910148 | systems/win32/w32tex/luajittex-w32.tar.xz @@ -265132,7 +265177,7 @@ 2019/11/22 | 8243124 | systems/win32/w32tex/newtxpx-boondoxfonts.tar.xz 2019/11/07 | 1217272 | systems/win32/w32tex/omegaj-w32.tar.xz 2019/09/08 | 357888 | systems/win32/w32tex/otfbeta.tar.xz -2019/11/15 | 12830544 | systems/win32/w32tex/pdftex-w32.tar.xz +2019/11/25 | 12855336 | systems/win32/w32tex/pdftex-w32.tar.xz 2019/11/23 | 81360816 | systems/win32/w32tex/pgfcontrib.tar.xz 2015/01/26 | 189072 | systems/win32/w32tex/plain2-2.54-w32.tar.xz 2019/10/22 | 2933444 | systems/win32/w32tex/platex.tar.xz @@ -265153,7 +265198,7 @@ 2019/04/15 | 97136 | systems/win32/w32tex/tiff2png-w32.tar.xz 2013/04/08 | 308444 | systems/win32/w32tex/timesnew.tar.xz 2019/03/14 | 1739 | systems/win32/w32tex/TLW64/00README.TLW64 -2019/11/17 | 90114524 | systems/win32/w32tex/TLW64/tl-win64.zip +2019/11/25 | 90134191 | systems/win32/w32tex/TLW64/tl-win64.zip 2019/08/14 | 819188 | systems/win32/w32tex/ttf2pk-w32.tar.xz 2019/08/14 | 830416 | systems/win32/w32tex/ttf2pt1-w32.tar.xz 2017/10/13 | 1773368 | systems/win32/w32tex/tuftelatex.tar.xz @@ -265192,7 +265237,7 @@ 2019/11/04 | 376096 | systems/win32/w32tex/win64/mftrace-w64.tar.xz 2018/04/20 | 362532 | systems/win32/w32tex/win64/m-tx-w64.tar.xz 2019/08/14 | 406956 | systems/win32/w32tex/win64/omegaj-w64.tar.xz -2019/10/27 | 6265732 | systems/win32/w32tex/win64/pdftex-w64.tar.xz +2019/11/25 | 6267972 | systems/win32/w32tex/win64/pdftex-w64.tar.xz 2015/01/26 | 41440 | systems/win32/w32tex/win64/plain2-2.54-w64.tar.xz 2018/03/04 | 551252 | systems/win32/w32tex/win64/pmx-w64.tar.xz 2019/08/28 | 791776 | systems/win32/w32tex/win64/pstoedit-w64.tar.xz @@ -265305,7 +265350,7 @@ 2004/06/04 | 404 | tds/tds.sed 2004/06/23 | 65418 | tds/tds.tex 2019/05/29 | 304264 | tds.zip -2019/11/26 | 186 | timestamp +2019/11/27 | 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 2c650d6477..a08fe09ba7 100644 --- a/FILES.byname.gz +++ b/FILES.byname.gz diff --git a/FILES.last07days b/FILES.last07days index 226ecb9588..c9c5b92e0d 100644 --- a/FILES.last07days +++ b/FILES.last07days @@ -1,159 +1,502 @@ +2019/11/26 | 9928 | support/make4ht/mkparams.lua +2019/11/26 | 99191 | info/ptex-manual/ptex-guide-en.pdf +2019/11/26 | 986 | support/make4ht/domfilters/make4ht-t4htlinks.lua +2019/11/26 | 9796 | support/make4ht/lapp-mk4.lua +2019/11/26 | 9776 | macros/latex/contrib/biblatex-contrib/biblatex-apa/russian-apa.lbx +2019/11/26 | 9768 | macros/latex/contrib/biblatex-contrib/biblatex-apa/slovene-apa.lbx +2019/11/26 | 974 | support/make4ht/extensions/make4ht-ext-latexmk_build.lua +2019/11/26 | 96207 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma +2019/11/26 | 954073 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma +2019/11/26 | 95260 | info/ptex-manual/eptex_resume.tex +2019/11/26 | 94636 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma +2019/11/26 | 9459 | macros/latex/contrib/biblatex-contrib/biblatex-apa/danish-apa.lbx +2019/11/26 | 94237 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma +2019/11/26 | 9414 | macros/latex/contrib/biblatex-contrib/biblatex-apa/italian-apa.lbx +2019/11/26 | 9356 | macros/latex/contrib/biblatex-contrib/biblatex-apa/french-apa.lbx +2019/11/26 | 93475 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma +2019/11/26 | 932879 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma +2019/11/26 | 92935 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma +2019/11/26 | 92590 | macros/latex/contrib/attachfile2/attachfile2.dtx +2019/11/26 | 92348 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6.pdf +2019/11/26 | 91979 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma +2019/11/26 | 9152 | macros/latex/contrib/biblatex-contrib/biblatex-apa/nynorsk-apa.lbx +2019/11/26 | 9142 | macros/latex/contrib/biblatex-contrib/biblatex-apa/brazilian-apa.lbx +2019/11/26 | 9136 | macros/latex/contrib/biblatex-contrib/biblatex-apa/norwegian-apa.lbx +2019/11/26 | 9136 | macros/latex/contrib/biblatex-contrib/biblatex-apa/norsk-apa.lbx +2019/11/26 | 91338 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma +2019/11/26 | 91157 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test-references.bib +2019/11/26 | 91153 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma +2019/11/26 | 9114 | macros/latex/contrib/biblatex-contrib/biblatex-apa/english-apa.lbx +2019/11/26 | 9108 | macros/latex/contrib/biblatex-contrib/biblatex-apa/portuguese-apa.lbx +2019/11/26 | 9093 | macros/latex/contrib/biblatex-contrib/biblatex-apa/dutch-apa.lbx +2019/11/26 | 8988 | macros/latex/contrib/biblatex-contrib/biblatex-apa/british-apa.lbx +2019/11/26 | 8956 | macros/latex/contrib/biblatex-contrib/biblatex-apa/swedish-apa.lbx +2019/11/26 | 8815184 | systems/win32/miktex/tm/packages/reledmac.tar.lzma +2019/11/26 | 87274 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma +2019/11/26 | 87217 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma +2019/11/26 | 86580 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma +2019/11/26 | 863199 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma +2019/11/26 | 8552524 | systems/texlive/tlnet/archive/reledmac.doc.tar.xz +2019/11/26 | 85452 | systems/texlive/tlnet/archive/texlive-scripts.tar.xz +2019/11/26 | 8482 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma +2019/11/26 | 84535 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma +2019/11/26 | 8335 | support/make4ht/extensions/make4ht-ext-dvisvgm_hashes.lua +2019/11/26 | 8332 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/ngerman-apa6.lbx +2019/11/26 | 827057 | systems/win32/miktex/tm/packages/fontsetup.tar.lzma +2019/11/26 | 8243 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/nswissgerman-apa6.lbx +2019/11/26 | 8239 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/swissgerman-apa6.lbx +2019/11/26 | 8231 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/naustrian-apa6.lbx +2019/11/26 | 8217 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/austrian-apa6.lbx +2019/11/26 | 8192 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/german-apa6.lbx +2019/11/26 | 80506 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma +2019/11/26 | 8032 | fonts/utilities/fontools/share/fontools_lgr.enc +2019/11/26 | 798 | support/make4ht/make4ht-doc.tex +2019/11/26 | 798 | support/make4ht/filters/make4ht-cleanspan.lua +2019/11/26 | 79844 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma +2019/11/26 | 7915 | support/make4ht/make4ht-aeneas-config.lua +2019/11/26 | 77959 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma +2019/11/26 | 77936 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma +2019/11/26 | 77317 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma +2019/11/26 | 7628 | fonts/utilities/fontools/bin/splitttc +2019/11/26 | 761058 | macros/latex/contrib/l3backend.zip +2019/11/26 | 7599 | support/make4ht/formats/make4ht-odt.lua +2019/11/26 | 7505 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma +2019/11/26 | 73633 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma +2019/11/26 | 72595 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma +2019/11/26 | 72572 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma +2019/11/26 | 71696 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma +2019/11/26 | 713 | support/make4ht/filters/make4ht-entities-to-unicode.lua +2019/11/26 | 71067 | info/ptex-manual/ptex-manual.tex +2019/11/26 | 70247 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma +2019/11/26 | 69935 | fonts/utilities/fontools/doc/autoinst.pdf +2019/11/26 | 69606 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma +2019/11/26 | 694464 | info/ptex-manual/eptex_resume.pdf +2019/11/26 | 69211 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma +2019/11/26 | 68672 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma +2019/11/26 | 6807 | support/make4ht/domfilters/make4ht-collapsetoc.lua +2019/11/26 | 67551 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.bbx +2019/11/26 | 67255 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma +2019/11/26 | 67251 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma +2019/11/26 | 652 | systems/win32/miktex/tm/packages/next/pr.ini +2019/11/26 | 65022 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma +2019/11/26 | 64457 | macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.bbx +2019/11/26 | 64311 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.pdf +2019/11/26 | 6356 | support/make4ht/make4ht-lib.lua +2019/11/26 | 6355 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/greek-apa6.lbx +2019/11/26 | 63372 | info/ptex-manual/eptexdoc.tex +2019/11/26 | 63286 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma +2019/11/26 | 63273 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma +2019/11/26 | 63115 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma +2019/11/26 | 631111 | systems/win32/miktex/tm/packages/mol2chemfig.tar.lzma +2019/11/26 | 62908 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma +2019/11/26 | 627 | support/make4ht/extensions/make4ht-ext-common_filters.lua +2019/11/26 | 627 | support/make4ht/domfilters/make4ht-odtimagesize.lua +2019/11/26 | 61654 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma +2019/11/26 | 61565 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma +2019/11/26 | 61217 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma +2019/11/26 | 60328 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma +2019/11/26 | 6023 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/spanish-apa6.lbx +2019/11/26 | 6005 | support/make4ht/make4ht-indexing.lua +2019/11/26 | 5987 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/galician-apa6.lbx +2019/11/26 | 596 | support/make4ht/filters/make4ht-filter.lua +2019/11/26 | 595 | support/make4ht/domfilters/make4ht-idcolons.lua +2019/11/26 | 59457 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64-2.9.tar.lzma +2019/11/26 | 58795 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma +2019/11/26 | 575920 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma +2019/11/26 | 5737 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/russian-apa6.lbx +2019/11/26 | 57218 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma +2019/11/26 | 56620 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma +2019/11/26 | 5649 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/slovene-apa6.lbx +2019/11/26 | 56420 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma +2019/11/26 | 563303 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma +2019/11/26 | 56146 | systems/win32/miktex/tm/packages/pinoutikz.tar.lzma +2019/11/26 | 560768 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma +2019/11/26 | 54740 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma +2019/11/26 | 544014 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma +2019/11/26 | 543 | macros/latex/contrib/attachfile2/README.md +2019/11/26 | 543232 | systems/win32/miktex/tm/packages/nomencl.tar.lzma +2019/11/26 | 53994 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma +2019/11/26 | 5395 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/danish-apa6.lbx +2019/11/26 | 538879 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma +2019/11/26 | 5378 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/french-apa6.lbx +2019/11/26 | 5373159 | systems/win32/miktex/tm/packages/newtx.tar.lzma +2019/11/26 | 5355 | support/make4ht/make4ht-dvireader.lua +2019/11/26 | 53444 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-2.9.tar.lzma +2019/11/26 | 533453 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma +2019/11/26 | 5312 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/italian-apa6.lbx +2019/11/26 | 52892 | systems/texlive/tlnet/archive/reledmac.tar.xz +2019/11/26 | 5283 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/american-apa6.lbx +2019/11/26 | 5282 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/english-apa6.lbx +2019/11/26 | 524 | dviware/dviasm/README +2019/11/26 | 52140 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma +2019/11/26 | 51772 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma +2019/11/26 | 5156 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/british-apa6.lbx +2019/11/26 | 51248 | systems/texlive/tlnet/archive/texlive-scripts.doc.tar.xz +2019/11/26 | 509921 | systems/win32/miktex/tm/packages/files.csv.lzma +2019/11/26 | 509867 | systems/win32/miktex/tm/packages/next/files.csv.lzma +2019/11/26 | 5093 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/nynorsk-apa6.lbx +2019/11/26 | 50827 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma +2019/11/26 | 50789 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma +2019/11/26 | 5077 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/norwegian-apa6.lbx +2019/11/26 | 5077 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/norsk-apa6.lbx +2019/11/26 | 5075 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/dutch-apa6.lbx +2019/11/26 | 50578 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma +2019/11/26 | 498553 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma +2019/11/26 | 49770 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma +2019/11/26 | 4970 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/brazilian-apa6.lbx +2019/11/26 | 49262 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma +2019/11/26 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2019/11/26 | 4874 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/swedish-apa6.lbx +2019/11/26 | 4844 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/portuguese-apa6.lbx +2019/11/26 | 481162 | systems/win32/miktex/tm/packages/xindex.tar.lzma +2019/11/26 | 47976 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma +2019/11/26 | 473930 | install/macros/latex/contrib/attachfile2.tds.zip +2019/11/26 | 464534 | systems/win32/miktex/tm/packages/attachfile2.tar.lzma +2019/11/26 | 4641 | support/make4ht/domfilters/make4ht-aeneas.lua +2019/11/26 | 463737 | systems/win32/miktex/tm/packages/letterswitharrows.tar.lzma +2019/11/26 | 46241 | support/make4ht/readme.tex +2019/11/26 | 45809 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma +2019/11/26 | 45740 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma +2019/11/26 | 457346 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma +2019/11/26 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +2019/11/26 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc +2019/11/26 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc +2019/11/26 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc +2019/11/26 | 45589 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma +2019/11/26 | 45465 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma +2019/11/26 | 454280 | macros/latex/contrib/attachfile2.zip +2019/11/26 | 449940 | systems/win32/miktex/tm/packages/next/miktex-doc-2.9.tar.lzma +2019/11/26 | 44980 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma +2019/11/26 | 445753 | macros/latex/contrib/attachfile2/attachfile2.pdf +2019/11/26 | 43438 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma +2019/11/26 | 4301 | support/make4ht/extensions/make4ht-ext-staticsite.lua +2019/11/26 | 42943 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma +2019/11/26 | 4282 | info/ptex-manual/ptex-manual.sty +2019/11/26 | 427325 | systems/win32/miktex/tm/packages/pdftexcmds.tar.lzma +2019/11/26 | 42676 | dviware/dviasm/dviasm.py +2019/11/26 | 425 | support/make4ht/filters/make4ht-fix-links.lua +2019/11/26 | 42572 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma +2019/11/26 | 42357 | info/ptex-manual/ptexdoc_asciimw.tex +2019/11/26 | 41879 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma +2019/11/26 | 41862 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma +2019/11/26 | 416498 | systems/win32/miktex/tm/packages/footnoterange.tar.lzma +2019/11/26 | 40989 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma +2019/11/26 | 40736 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma +2019/11/26 | 402 | support/make4ht/filters/make4ht-hruletohr.lua +2019/11/26 | 4028 | support/make4ht/make4ht +2019/11/26 | 39844 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma +2019/11/26 | 395 | support/make4ht/formats/make4ht-html5.lua +2019/11/26 | 3946955 | systems/texlive/tlnet/install-tl-unx.tar.gz +2019/11/26 | 392738 | macros/latex/contrib/biblatex-contrib/biblatex-apa.zip +2019/11/26 | 39219 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma +2019/11/26 | 391 | systems/win32/miktex/tm/packages/pr.ini +2019/11/26 | 391460 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma +2019/11/26 | 38864 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6-test.pdf +2019/11/26 | 38862 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma +2019/11/26 | 387511 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-x64-2.9.tar.lzma +2019/11/26 | 387216 | systems/win32/miktex/tm/packages/pxchfon.tar.lzma +2019/11/26 | 386 | support/make4ht/filters/make4ht-fixligatures.lua +2019/11/26 | 3861 | support/make4ht/extensions/make4ht-ext-preprocess_input.lua +2019/11/26 | 38281 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6-test-references.bib +2019/11/26 | 381432 | info/ptex-manual/ptex-manual.pdf +2019/11/26 | 380603 | info/ptex-manual/eptexdoc.pdf +2019/11/26 | 3729 | fonts/utilities/fontools/share/fontools_t2b.enc +2019/11/26 | 372275 | systems/win32/miktex/tm/packages/epstopdf-pkg.tar.lzma +2019/11/26 | 37155 | info/ptex-manual/ptex-guide-en.tex +2019/11/26 | 37005 | support/make4ht/README +2019/11/26 | 36632 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma +2019/11/26 | 3651 | fonts/utilities/fontools/share/fontools_t2c.enc +2019/11/26 | 36379 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma +2019/11/26 | 363599 | systems/win32/miktex/tm/packages/pdfpages.tar.lzma +2019/11/26 | 356320 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma +2019/11/26 | 354501 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-2.9.tar.lzma +2019/11/26 | 35293 | info/ptex-manual/jtex_asciimw.tex +2019/11/26 | 35214 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma +2019/11/26 | 34845 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma +2019/11/26 | 34833 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma +2019/11/26 | 344 | support/make4ht/formats/make4ht-tei.lua +2019/11/26 | 34493 | systems/win32/miktex/tm/packages/dynkin-diagrams.tar.lzma +2019/11/26 | 3412 | support/make4ht/filters/make4ht-staticsite.lua +2019/11/26 | 3372 | info/ptex-manual/fam256p.tex +2019/11/26 | 33547 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma +2019/11/26 | 33398 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma +2019/11/26 | 328873 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma +2019/11/26 | 3277 | support/make4ht/make4ht-htlatex.lua +2019/11/26 | 3273 | support/make4ht/domfilters/make4ht-joincharacters.lua +2019/11/26 | 326 | support/make4ht/formats/make4ht-xhtml.lua +2019/11/26 | 32559 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.tex +2019/11/26 | 3247 | support/make4ht/make4ht-xtpipes.lua +2019/11/26 | 32380 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6.tex +2019/11/26 | 32347 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma +2019/11/26 | 32265 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma +2019/11/26 | 321 | support/make4ht/domfilters/make4ht-odtpartable.lua +2019/11/26 | 321500 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma +2019/11/26 | 3191 | support/make4ht/filters/make4ht-mathjaxnode.lua +2019/11/26 | 3173 | info/ptex-manual/fam256d.tex +2019/11/26 | 313584 | systems/win32/miktex/tm/packages/biblatex-apa.tar.lzma +2019/11/26 | 31292 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma +2019/11/26 | 31151 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma +2019/11/26 | 309 | support/make4ht/extensions/make4ht-ext-join_colors.lua +2019/11/26 | 30990 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma +2019/11/26 | 308658 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma +2019/11/26 | 3080 | fonts/utilities/fontools/share/fontools_ts1.enc +2019/11/26 | 30239 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma +2019/11/26 | 299671 | systems/win32/miktex/tm/packages/datetime2-serbian.tar.lzma +2019/11/26 | 29688 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma +2019/11/26 | 29295 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma +2019/11/26 | 29238 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma +2019/11/26 | 291 | support/make4ht/filters/make4ht-entities.lua +2019/11/26 | 29143 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma +2019/11/26 | 2907 | fonts/utilities/fontools/share/fontools_t2a.enc +2019/11/26 | 2906 | fonts/utilities/fontools/README +2019/11/26 | 2905 | support/make4ht/make4ht-logging.lua +2019/11/26 | 288 | support/make4ht/extensions/make4ht-ext-odttemplate.lua +2019/11/26 | 28708 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma +2019/11/26 | 2855 | fonts/utilities/fontools/share/fontools_ly1.enc +2019/11/26 | 283083 | systems/win32/miktex/tm/packages/powerdot-fuberlin.tar.lzma +2019/11/26 | 281673 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma +2019/11/26 | 2815 | fonts/utilities/fontools/share/fontools_t1.enc +2019/11/26 | 281284 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma +2019/11/26 | 280080 | systems/texlive/tlnet/archive/powerdot-fuberlin.doc.tar.xz +2019/11/26 | 27819 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma +2019/11/26 | 276598 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma +2019/11/26 | 27582 | fonts/utilities/fontools/bin/ot2kpx +2019/11/26 | 2751 | fonts/utilities/fontools/share/fontools_ts3.enc +2019/11/26 | 27439 | fonts/utilities/fontools/doc/ot2kpx.pdf +2019/11/26 | 271 | support/make4ht/extensions/make4ht-ext-mathjaxnode.lua +2019/11/26 | 271811 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma +2019/11/26 | 27061 | fonts/utilities/fontools/doc/afm2afm.pdf +2019/11/26 | 2704 | systems/texlive/tlnet/archive/powerdot-fuberlin.tar.xz +2019/11/26 | 26976 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma +2019/11/26 | 26800 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma +2019/11/26 | 2679 | support/make4ht/make4ht-errorlogparser.lua +2019/11/26 | 26661 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma +2019/11/26 | 2656 | fonts/utilities/fontools/share/fontools_t3.enc +2019/11/26 | 26508 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma +2019/11/26 | 264 | support/make4ht/filters/make4ht-cleanspan-nat.lua +2019/11/26 | 264764 | info/ptex-manual/ptexdoc_asciimw.pdf +2019/11/26 | 26175 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma +2019/11/26 | 2587 | fonts/utilities/fontools/share/fontools_ot1.enc +2019/11/26 | 2579406 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma +2019/11/26 | 2577716 | info/ptex-manual.zip +2019/11/26 | 25326 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma +2019/11/26 | 251872 | info/ptex-manual/jtex_asciimw.pdf +2019/11/26 | 247499 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma +2019/11/26 | 246891 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma +2019/11/26 | 2465 | support/make4ht/make4ht-config.lua +2019/11/26 | 246455 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma +2019/11/26 | 2459482 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma +2019/11/26 | 24071 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma +2019/11/26 | 237539 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma +2019/11/26 | 2362595 | systems/win32/miktex/tm/packages/xcharter.tar.lzma +2019/11/26 | 23343 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma +2019/11/26 | 2324 | support/make4ht/filters/make4ht-odttemplate.lua +2019/11/26 | 22958 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma +2019/11/26 | 2270 | support/make4ht/filters/make4ht-domfilter.lua +2019/11/26 | 22539015 | systems/texlive/tlnet/install-tl.zip +2019/11/26 | 22455 | support/make4ht/changelog.tex +2019/11/26 | 221809 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.pdf +2019/11/26 | 2216 | support/make4ht/domfilters/make4ht-joincolors.lua +2019/11/26 | 219731 | support/make4ht.zip +2019/11/26 | 2169 | support/make4ht/domfilters/make4ht-tablerows.lua +2019/11/26 | 2142172 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +2019/11/26 | 214151 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma +2019/11/26 | 213018 | macros/latex/contrib/biblatex-contrib/biblatex-apa6.zip +2019/11/26 | 2086 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.dbx +2019/11/26 | 20737 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma +2019/11/26 | 20550 | fonts/utilities/fontools/doc/splitttc.pdf +2019/11/26 | 2048 | macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.dbx +2019/11/26 | 203504 | systems/texlive/tlnet/archive/reledmac.source.tar.xz +2019/11/26 | 20341 | info/ptex-manual/jtexdoc_asciimw.tex +2019/11/26 | 202428 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma +2019/11/26 | 198079 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma +2019/11/26 | 19790 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma +2019/11/26 | 19615 | info/ptex-manual/ptexskip_asciimw.tex +2019/11/26 | 195399 | fonts/utilities/fontools.zip +2019/11/26 | 194995 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma +2019/11/26 | 1945841 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma +2019/11/26 | 1935899 | systems/win32/miktex/tm/packages/bxjscls.tar.lzma +2019/11/26 | 193312 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma +2019/11/26 | 192393 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma +2019/11/26 | 192385 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma +2019/11/26 | 18831 | macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.cbx +2019/11/26 | 187295 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma +2019/11/26 | 18700273 | systems/texlive/tlnet/install-tl-windows.exe +2019/11/26 | 185296 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma +2019/11/26 | 184159 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma +2019/11/26 | 18294 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.tex +2019/11/26 | 182758 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma +2019/11/26 | 18087 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.cbx +2019/11/26 | 1808735 | systems/win32/miktex/tm/packages/caption.tar.lzma +2019/11/26 | 17997 | fonts/utilities/fontools/GPLv2.txt +2019/11/26 | 17761 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma +2019/11/26 | 177581 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma +2019/11/26 | 17696 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma +2019/11/26 | 1759 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/README +2019/11/26 | 17516 | systems/texlive/tlnet/archive/dynkin-diagrams.doc.tar.xz +2019/11/26 | 1744 | macros/latex/contrib/biblatex-contrib/biblatex-apa/README +2019/11/26 | 17414 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6-test.tex +2019/11/26 | 169200 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma +2019/11/26 | 1679152 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma +2019/11/26 | 167844 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma +2019/11/26 | 16684 | systems/texlive/tlnet/archive/dynkin-diagrams.tar.xz +2019/11/26 | 166012 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma +2019/11/26 | 165960 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma +2019/11/26 | 164929 | info/ptex-manual/ptexskip_asciimw.pdf +2019/11/26 | 16427 | info/ptex-manual/jfm.tex +2019/11/26 | 16404 | support/make4ht/mkutils.lua +2019/11/26 | 160558 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma +2019/11/26 | 16042 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma +2019/11/26 | 15965049 | systems/texlive/tlnet/tlpkg/texlive.tlpdb +2019/11/26 | 15895 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma +2019/11/26 | 157050 | info/ptex-manual/jfm.pdf +2019/11/26 | 155684 | systems/texlive/tlnet/archive/texlive-docindex.doc.tar.xz +2019/11/26 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 +2019/11/26 | 1534 | systems/win32/miktex/tm/packages/pdfcolmk.tar.lzma +2019/11/26 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2019/11/26 | 152162 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma +2019/11/26 | 1516 | info/ptex-manual/LICENSE +2019/11/26 | 150088 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma +2019/11/26 | 14864 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6-test-citations.bib +2019/11/26 | 147094 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma +2019/11/26 | 146761 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma +2019/11/26 | 1464 | systems/texlive/tlnet/archive/collection-publishers.tar.xz +2019/11/26 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 +2019/11/26 | 145704 | info/ptex-manual/jtexdoc_asciimw.pdf +2019/11/26 | 14523 | macros/latex/contrib/biblatex-contrib/biblatex-apa/american-apa.lbx +2019/11/26 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +2019/11/26 | 1406 | support/make4ht/domfilters/make4ht-mathmlfixes.lua +2019/11/26 | 14046 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma +2019/11/26 | 137167 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma +2019/11/26 | 13334 | fonts/utilities/fontools/bin/afm2afm +2019/11/26 | 133204 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma +2019/11/26 | 1329 | support/make4ht/extensions/make4ht-ext-tidy.lua +2019/11/26 | 1329051 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma +2019/11/26 | 13263327 | systems/win32/miktex/tm/packages/oberdiek.tar.lzma +2019/11/26 | 13060 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma +2019/11/26 | 128196 | support/make4ht/make4ht-doc.pdf +2019/11/26 | 12759 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test-citations.bib +2019/11/26 | 127171 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma +2019/11/26 | 12394 | macros/latex/contrib/biblatex-contrib/biblatex-apa/ngerman-apa.lbx +2019/11/26 | 12386 | macros/latex/contrib/biblatex-contrib/biblatex-apa/swissgerman-apa.lbx +2019/11/26 | 123182 | systems/win32/miktex/tm/packages/tikz-kalender.tar.lzma +2019/11/26 | 12304 | macros/latex/contrib/biblatex-contrib/biblatex-apa/nswissgerman-apa.lbx +2019/11/26 | 12296 | macros/latex/contrib/biblatex-contrib/biblatex-apa/naustrian-apa.lbx +2019/11/26 | 12280 | macros/latex/contrib/biblatex-contrib/biblatex-apa/austrian-apa.lbx +2019/11/26 | 12253 | macros/latex/contrib/biblatex-contrib/biblatex-apa/german-apa.lbx +2019/11/26 | 1215 | support/make4ht/filters/make4ht-svg-height.lua +2019/11/26 | 1206 | info/ptex-manual/README.md +2019/11/26 | 120397 | systems/win32/miktex/tm/packages/newfloat.tar.lzma +2019/11/26 | 1203294 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma +2019/11/26 | 1195622 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma +2019/11/26 | 118928 | systems/win32/miktex/tm/packages/pxjahyper.tar.lzma +2019/11/26 | 116800 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma +2019/11/26 | 114778 | fonts/utilities/fontools/bin/autoinst +2019/11/26 | 1145576 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma +2019/11/26 | 1144748 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma +2019/11/26 | 1143 | support/make4ht/formats/make4ht-docbook.lua +2019/11/26 | 11342 | dviware/dviasm.zip +2019/11/26 | 112991 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma +2019/11/26 | 111234 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma +2019/11/26 | 109876 | systems/texlive/tlnet/archive/texlive-docindex.tar.xz +2019/11/26 | 1093 | support/make4ht/make4ht-odtfilter.lua +2019/11/26 | 108757 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma +2019/11/26 | 1068589 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma +2019/11/26 | 1066726 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma +2019/11/26 | 1066302 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma +2019/11/26 | 1047 | support/make4ht/domfilters/make4ht-fixinlines.lua +2019/11/26 | 10457 | macros/latex/contrib/biblatex-contrib/biblatex-apa/greek-apa.lbx +2019/11/26 | 1042661 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma +2019/11/26 | 1039 | support/make4ht/make4ht-filterlib.lua +2019/11/26 | 1034 | support/make4ht/extensions/make4ht-ext-common_domfilters.lua +2019/11/26 | 102378 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma +2019/11/26 | 100681 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma +2019/11/26 | 10017 | macros/latex/contrib/biblatex-contrib/biblatex-apa/galician-apa.lbx +2019/11/26 | 10015 | macros/latex/contrib/biblatex-contrib/biblatex-apa/spanish-apa.lbx 2019/11/25 | 997 | graphics/mol2chemfig/docs/examples/morphine.tex 2019/11/25 | 997 | graphics/mol2chemfig/docs/examples/morphine-f.tex -2019/11/25 | 96285 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma 2019/11/25 | 957 | graphics/mol2chemfig/docs/examples/atcc.tex -2019/11/25 | 954757 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma -2019/11/25 | 94339 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma -2019/11/25 | 94268 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma 2019/11/25 | 941676 | systems/texlive/tlnet/archive/pdftools.win32.tar.xz -2019/11/25 | 93418 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma -2019/11/25 | 932608 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma -2019/11/25 | 92915 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma -2019/11/25 | 92032 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma -2019/11/25 | 91191 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma -2019/11/25 | 91182 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma 2019/11/25 | 9089 | graphics/mol2chemfig/docs/examples/doxorubicin.sdf 2019/11/25 | 902 | graphics/mol2chemfig/docs/examples/cubane.mol -2019/11/25 | 87326 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma -2019/11/25 | 87304 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma -2019/11/25 | 86605 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma -2019/11/25 | 861862 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma +2019/11/25 | 90134191 | systems/win32/w32tex/TLW64/tl-win64.zip +2019/11/25 | 8938 | macros/latex/contrib/l3backend/l3backend-color.dtx 2019/11/25 | 860 | graphics/mol2chemfig/docs/chapters/hydrogens.tex 2019/11/25 | 860594 | macros/latex/contrib/reledmac/reledmac.dtx -2019/11/25 | 85432 | systems/texlive/tlnet/archive/texlive-scripts.tar.xz 2019/11/25 | 84 | graphics/mol2chemfig/docs/examples/plp-arrows.sh -2019/11/25 | 8481 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma -2019/11/25 | 84523 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma 2019/11/25 | 839 | graphics/mol2chemfig/docs/chapters/tpic2.tex 2019/11/25 | 8376 | graphics/mol2chemfig/sampledoc/weg.tex 2019/11/25 | 818 | macros/latex/contrib/powerdot-FUBerlin/doc/exampleClass.tex 2019/11/25 | 814 | macros/latex/contrib/powerdot-FUBerlin/doc/exampleStyle.tex 2019/11/25 | 8128 | graphics/mol2chemfig/sampledoc/sample.tex -2019/11/25 | 80530 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma 2019/11/25 | 79 | graphics/mol2chemfig/docs/examples/doxo-recalculated-rotated.sh -2019/11/25 | 79804 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma 2019/11/25 | 791 | graphics/mol2chemfig/docs/examples/hand-coded-tex/twisted-commented.tex +2019/11/25 | 785272 | install/macros/latex/contrib/l3backend.tds.zip 2019/11/25 | 77 | graphics/mol2chemfig/docs/README -2019/11/25 | 77945 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma -2019/11/25 | 77868 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma -2019/11/25 | 77422 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma 2019/11/25 | 770025 | graphics/mol2chemfig.zip 2019/11/25 | 76 | graphics/mol2chemfig/docs/examples/phenol-add-h.sh 2019/11/25 | 75 | graphics/mol2chemfig/docs/examples/doxo-ratcheted-rotated.sh -2019/11/25 | 7500 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma 2019/11/25 | 74 | graphics/mol2chemfig/docs/examples/doxo-recalculated-flopped.sh +2019/11/25 | 742409 | macros/latex/contrib/l3backend/l3backend-code.pdf 2019/11/25 | 73 | graphics/mol2chemfig/docs/examples/doxo-hand-rotated.sh -2019/11/25 | 73621 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma 2019/11/25 | 732 | systems/texlive/tlnet/archive/collection-latexrecommended.tar.xz -2019/11/25 | 72621 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma -2019/11/25 | 72564 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma 2019/11/25 | 71 | graphics/mol2chemfig/docs/examples/phenol-as-submol.sh -2019/11/25 | 71573 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma 2019/11/25 | 70 | graphics/mol2chemfig/docs/examples/doxo-ratcheted.sh 2019/11/25 | 708951 | macros/latex/contrib/powerdot-FUBerlin.zip -2019/11/25 | 70285 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma 2019/11/25 | 69 | graphics/mol2chemfig/docs/examples/hand-coded-tex/caffeine.tex -2019/11/25 | 69711 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma 2019/11/25 | 692 | systems/texlive/tlnet/archive/attachfile2.win32.tar.xz -2019/11/25 | 69193 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma -2019/11/25 | 68834 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma 2019/11/25 | 67 | graphics/mol2chemfig/docs/examples/doxo-recalculated.sh 2019/11/25 | 676 | graphics/mol2chemfig/docs/examples/cubane-n.tex -2019/11/25 | 67351 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma -2019/11/25 | 67268 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma 2019/11/25 | 66 | graphics/mol2chemfig/docs/examples/phenol-from-smiles-w.sh 2019/11/25 | 65 | graphics/mol2chemfig/docs/examples/phenol-from-smiles-wz.sh 2019/11/25 | 659 | graphics/mol2chemfig/docs/test.tex 2019/11/25 | 655 | graphics/pgf/contrib/dynkin-diagrams/README -2019/11/25 | 652 | systems/win32/miktex/tm/packages/next/pr.ini -2019/11/25 | 65085 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma 2019/11/25 | 649 | graphics/mol2chemfig/docs/examples/buildscripts.sh 2019/11/25 | 64100 | systems/texlive/tlnet/archive/pdftools.doc.tar.xz 2019/11/25 | 63 | graphics/mol2chemfig/docs/examples/doxo-numbered.sh 2019/11/25 | 63 | graphics/mol2chemfig/docs/examples/cubane-cross-n.sh -2019/11/25 | 63292 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma 2019/11/25 | 631 | graphics/mol2chemfig/docs/mol2chemfig-doc.tex -2019/11/25 | 63185 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma -2019/11/25 | 63114 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma 2019/11/25 | 6300 | systems/texlive/tlnet/archive/pdftexcmds.tar.xz -2019/11/25 | 62826 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma 2019/11/25 | 627 | graphics/mol2chemfig/docs/chapters/recalculating.tex +2019/11/25 | 6267972 | systems/win32/w32tex/win64/pdftex-w64.tar.xz 2019/11/25 | 6242 | graphics/mol2chemfig/docs/examples/daptomycin-u.tex -2019/11/25 | 61700 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma -2019/11/25 | 61453 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma 2019/11/25 | 60 | graphics/mol2chemfig/docs/examples/doxo-strip-h.sh 2019/11/25 | 60 | graphics/mol2chemfig/docs/examples/cubane-cross.sh -2019/11/25 | 60874 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma -2019/11/25 | 60293 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma 2019/11/25 | 59 | graphics/mol2chemfig/docs/examples/phenol-smi-terse.tex 2019/11/25 | 598 | graphics/mol2chemfig/docs/chapters/abstract.tex 2019/11/25 | 5952 | systems/texlive/tlnet/archive/collection-latexextra.tar.xz 2019/11/25 | 594 | graphics/pgf/contrib/dynkin-diagrams/d44.tex -2019/11/25 | 59482 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64-2.9.tar.lzma -2019/11/25 | 58764 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma 2019/11/25 | 5807 | graphics/mol2chemfig/docs/examples/optionlist.tex +2019/11/25 | 5802 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl 2019/11/25 | 57 | graphics/mol2chemfig/docs/examples/caffeine-from-smiles-rotated.sh -2019/11/25 | 575838 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma -2019/11/25 | 57209 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma -2019/11/25 | 56655 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma -2019/11/25 | 56432 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma -2019/11/25 | 563595 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma -2019/11/25 | 561200 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma 2019/11/25 | 55 | graphics/mol2chemfig/docs/examples/phenol-from-smiles.sh 2019/11/25 | 55 | graphics/mol2chemfig/docs/examples/morphine-k.sh 2019/11/25 | 5592 | systems/texlive/tlnet/archive/newfloat.tar.xz 2019/11/25 | 55737 | graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.tex -2019/11/25 | 54923 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma -2019/11/25 | 544071 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma +2019/11/25 | 552126 | systems/win32/w32tex/ChangeLog +2019/11/25 | 545 | macros/latex/contrib/l3backend/README.md 2019/11/25 | 543 | graphics/pgf/contrib/dynkin-diagrams/borovoi.tex -2019/11/25 | 54062 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma 2019/11/25 | 54032 | systems/texlive/tlnet/archive/pinoutikz.doc.tar.xz -2019/11/25 | 540169 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma 2019/11/25 | 536 | systems/texlive/tlnet/archive/collection-latex.tar.xz -2019/11/25 | 53435 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-2.9.tar.lzma -2019/11/25 | 533610 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma 2019/11/25 | 52 | graphics/mol2chemfig/docs/examples/daptomycin-u.sh 2019/11/25 | 522236 | systems/texlive/tlnet/archive/nomencl.doc.tar.xz -2019/11/25 | 52139 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma -2019/11/25 | 52018 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma 2019/11/25 | 5191 | macros/latex/contrib/powerdot-FUBerlin/latex/FUpowerdot.cls 2019/11/25 | 515 | graphics/mol2chemfig/docs/chapters/flip-rotate.tex -2019/11/25 | 51244 | systems/texlive/tlnet/archive/texlive-scripts.doc.tar.xz 2019/11/25 | 5108 | graphics/mol2chemfig/docs/examples/daptomycin.tex -2019/11/25 | 510194 | systems/win32/miktex/tm/packages/next/files.csv.lzma -2019/11/25 | 510075 | systems/win32/miktex/tm/packages/files.csv.lzma 2019/11/25 | 50 | graphics/mol2chemfig/docs/examples/mp.sh -2019/11/25 | 50845 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma -2019/11/25 | 50824 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma 2019/11/25 | 5072 | macros/latex/contrib/powerdot-FUBerlin/latex/powerdot-BerlinFU.sty -2019/11/25 | 50495 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma -2019/11/25 | 498743 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma -2019/11/25 | 49737 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma -2019/11/25 | 49290 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma -2019/11/25 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 2019/11/25 | 48 | graphics/mol2chemfig/docs/examples/morphine-n.sh 2019/11/25 | 48 | graphics/mol2chemfig/docs/examples/morphine-f.sh 2019/11/25 | 47 | graphics/mol2chemfig/docs/examples/daptomycin1.sh 2019/11/25 | 47 | graphics/mol2chemfig/docs/examples/caffeine-from-smiles.sh -2019/11/25 | 47982 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma +2019/11/25 | 47976 | macros/latex/contrib/l3backend/l3backend-pdf.dtx 2019/11/25 | 46 | graphics/mol2chemfig/docs/examples/cubane-n.sh 2019/11/25 | 468 | systems/texlive/tlnet/archive/pdfcolmk.doc.tar.xz 2019/11/25 | 4617 | macros/latex/contrib/powerdot-FUBerlin/doc/demo-powerdotFU.tex 2019/11/25 | 45 | graphics/mol2chemfig/docs/examples/doxo-from-sdf.sh 2019/11/25 | 45 | graphics/mol2chemfig/docs/chapters/arrows.tex -2019/11/25 | 45840 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma -2019/11/25 | 45739 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma -2019/11/25 | 457031 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma -2019/11/25 | 45621 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma -2019/11/25 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc -2019/11/25 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc -2019/11/25 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc -2019/11/25 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc -2019/11/25 | 45433 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma 2019/11/25 | 45165 | graphics/mol2chemfig/docs/examples/hand-coded-tex/sodium-green.png 2019/11/25 | 450 | graphics/mol2chemfig/docs/examples/twisted.mol -2019/11/25 | 449958 | systems/win32/miktex/tm/packages/next/miktex-doc-2.9.tar.lzma -2019/11/25 | 44977 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma 2019/11/25 | 444 | graphics/mol2chemfig/docs/examples/phenol-with-hydrogens.tex 2019/11/25 | 440512 | systems/texlive/tlnet/archive/oberdiek.source.tar.xz 2019/11/25 | 43 | graphics/mol2chemfig/docs/examples/morphine.sh @@ -161,53 +504,37 @@ 2019/11/25 | 439 | graphics/mol2chemfig/docs/chapters/tpic1.tex 2019/11/25 | 437824 | systems/texlive/tlnet/archive/pdftools.x86_64-solaris.tar.xz 2019/11/25 | 436 | graphics/mol2chemfig/docs/chapters/context.tex -2019/11/25 | 43409 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma 2019/11/25 | 433608 | systems/texlive/tlnet/archive/attachfile2.doc.tar.xz -2019/11/25 | 430 | systems/win32/miktex/tm/packages/pr.ini -2019/11/25 | 42966 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma 2019/11/25 | 429000 | systems/texlive/tlnet/archive/pdftools.x86_64-linuxmusl.tar.xz 2019/11/25 | 4279 | graphics/mol2chemfig/lua/rpc.lua -2019/11/25 | 42594 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma +2019/11/25 | 42705 | macros/latex/contrib/l3backend/l3backend-draw.dtx 2019/11/25 | 424688 | systems/texlive/tlnet/archive/pdftools.i386-solaris.tar.xz 2019/11/25 | 4193 | graphics/mol2chemfig/docs/chapters/composite.tex -2019/11/25 | 41928 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma -2019/11/25 | 41883 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma 2019/11/25 | 41094 | graphics/pgf/contrib/dynkin-diagrams.zip -2019/11/25 | 40991 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma -2019/11/25 | 40725 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma 2019/11/25 | 4047 | graphics/mol2chemfig/docs/examples/doxo-raw.tex 2019/11/25 | 403868 | systems/texlive/tlnet/archive/pdftexcmds.doc.tar.xz 2019/11/25 | 402812 | systems/texlive/tlnet/archive/footnoterange.doc.tar.xz -2019/11/25 | 39877 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma 2019/11/25 | 396948 | systems/texlive/tlnet/archive/pdftools.i386-linux.tar.xz -2019/11/25 | 3946942 | systems/texlive/tlnet/install-tl-unx.tar.gz -2019/11/25 | 391475 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma 2019/11/25 | 38 | graphics/mol2chemfig/docs/examples/packmoles.sh -2019/11/25 | 38877 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma -2019/11/25 | 38798 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma 2019/11/25 | 3876 | systems/texlive/tlnet/archive/epstopdf-pkg.tar.xz -2019/11/25 | 387323 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-x64-2.9.tar.lzma 2019/11/25 | 384120 | systems/texlive/tlnet/archive/pdftools.x86_64-linux.tar.xz 2019/11/25 | 381968 | systems/texlive/tlnet/archive/pdftools.x86_64-darwin.tar.xz 2019/11/25 | 380208 | systems/texlive/tlnet/archive/pdftools.aarch64-linux.tar.xz 2019/11/25 | 378 | graphics/mol2chemfig/docs/chapters/tpic3.tex +2019/11/25 | 378704732 | systems/win32/w32tex/ltxpkgdocs.tar.xz 2019/11/25 | 372704 | systems/texlive/tlnet/archive/pdftools.x86_64-cygwin.tar.xz 2019/11/25 | 366 | graphics/mol2chemfig/docs/chapters/tutorial.tex -2019/11/25 | 36620 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma 2019/11/25 | 365720 | systems/texlive/tlnet/archive/pxchfon.doc.tar.xz 2019/11/25 | 3648 | systems/texlive/tlnet/archive/nomencl.tar.xz 2019/11/25 | 364612 | systems/texlive/tlnet/archive/pdftools.i386-cygwin.tar.xz 2019/11/25 | 364480 | systems/texlive/tlnet/archive/pdftools.amd64-freebsd.tar.xz -2019/11/25 | 36376 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma +2019/11/25 | 3586 | macros/latex/contrib/l3backend/l3backend.ins 2019/11/25 | 357017 | macros/latex/contrib/powerdot-FUBerlin/doc/exampleClass.pdf 2019/11/25 | 356 | systems/texlive/tlnet/archive/attachfile2.x86_64-darwinlegacy.tar.xz 2019/11/25 | 356180 | systems/texlive/tlnet/archive/epstopdf-pkg.doc.tar.xz -2019/11/25 | 355858 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma 2019/11/25 | 355389 | macros/latex/contrib/powerdot-FUBerlin/doc/exampleStyle.pdf -2019/11/25 | 354296 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-2.9.tar.lzma 2019/11/25 | 3530 | graphics/mol2chemfig/docs/examples/crown-ether.mol 2019/11/25 | 352 | systems/texlive/tlnet/archive/attachfile2.x86_64-linuxmusl.tar.xz -2019/11/25 | 35207 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma 2019/11/25 | 351 | graphics/mol2chemfig/docs/examples/hand-coded-tex/chemfig-settings.tex 2019/11/25 | 351308 | systems/texlive/tlnet/archive/pdftools.x86_64-darwinlegacy.tar.xz 2019/11/25 | 34 | graphics/mol2chemfig/docs/examples/atcc.sh @@ -223,172 +550,100 @@ 2019/11/25 | 348 | systems/texlive/tlnet/archive/attachfile2.amd64-netbsd.tar.xz 2019/11/25 | 348 | systems/texlive/tlnet/archive/attachfile2.amd64-freebsd.tar.xz 2019/11/25 | 348 | systems/texlive/tlnet/archive/attachfile2.aarch64-linux.tar.xz -2019/11/25 | 34848 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma -2019/11/25 | 34839 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma 2019/11/25 | 346172 | systems/texlive/tlnet/archive/pdftools.amd64-netbsd.tar.xz 2019/11/25 | 344 | systems/texlive/tlnet/archive/attachfile2.i386-cygwin.tar.xz 2019/11/25 | 344664 | systems/texlive/tlnet/archive/pdftools.i386-freebsd.tar.xz -2019/11/25 | 33548 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma -2019/11/25 | 33398 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma +2019/11/25 | 34209148 | systems/win32/w32tex/ltxpkgs.tar.xz 2019/11/25 | 332812 | systems/texlive/tlnet/archive/pdftools.i386-netbsd.tar.xz -2019/11/25 | 328609 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma -2019/11/25 | 32360 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma -2019/11/25 | 32194 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma -2019/11/25 | 321493 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma -2019/11/25 | 31256 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma -2019/11/25 | 31162 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma 2019/11/25 | 311484 | systems/texlive/tlnet/archive/pdftools.armhf-linux.tar.xz -2019/11/25 | 30997 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma -2019/11/25 | 308633 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma 2019/11/25 | 305 | graphics/mol2chemfig/docs/examples/hand-coded-tex/sodium-green2.tex 2019/11/25 | 303 | graphics/mol2chemfig/docs/examples/hand-coded-tex/stuff.tex 2019/11/25 | 302 | graphics/mol2chemfig/docs/examples/hand-coded-tex/aspirin.tex -2019/11/25 | 30271 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma 2019/11/25 | 3022 | graphics/mol2chemfig/sampledoc/fmn.mol 2019/11/25 | 3022 | graphics/mol2chemfig/docs/examples/fmnh.mol 2019/11/25 | 3015 | graphics/mol2chemfig/docs/examples/cubane.sdf 2019/11/25 | 29 | graphics/mol2chemfig/docs/examples/printoptions.sh 2019/11/25 | 29 | graphics/mol2chemfig/docs/examples/caffeine.smi -2019/11/25 | 29685 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma -2019/11/25 | 29273 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma -2019/11/25 | 29260 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma -2019/11/25 | 29125 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma -2019/11/25 | 28760 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma 2019/11/25 | 28420 | systems/texlive/tlnet/archive/caption.tar.xz 2019/11/25 | 282 | graphics/mol2chemfig/install/mol2chemfig-1.5/PKG-INFO -2019/11/25 | 281552 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma -2019/11/25 | 281253 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma 2019/11/25 | 2782 | graphics/mol2chemfig/docs/examples/doxo-numbered.tex -2019/11/25 | 27771 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma -2019/11/25 | 276940 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma 2019/11/25 | 273 | macros/latex/contrib/powerdot-FUBerlin/README -2019/11/25 | 271554 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma -2019/11/25 | 26988 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma -2019/11/25 | 26811 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma 2019/11/25 | 2664 | graphics/mol2chemfig/docs/chapters/installation.tex -2019/11/25 | 26645 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma 2019/11/25 | 2658 | graphics/mol2chemfig/docs/examples/dichlorofluorescein.mol -2019/11/25 | 26500 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma 2019/11/25 | 2630 | graphics/mol2chemfig/lua/mol2chemfig_client_1_2.lua 2019/11/25 | 2624 | systems/texlive/tlnet/archive/footnoterange.tar.xz -2019/11/25 | 26206 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma -2019/11/25 | 2579521 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma 2019/11/25 | 2567 | graphics/mol2chemfig/README -2019/11/25 | 25314 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma 2019/11/25 | 2481 | graphics/mol2chemfig/docs/chapters/output.tex -2019/11/25 | 247380 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma -2019/11/25 | 247023 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma -2019/11/25 | 246520 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma -2019/11/25 | 2457307 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma -2019/11/25 | 24007 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma 2019/11/25 | 2399 | graphics/mol2chemfig/docs/chapters/submolecules.tex 2019/11/25 | 2384 | macros/latex/contrib/powerdot-FUBerlin/doc/demo-powerdotFU.pdf -2019/11/25 | 237472 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma 2019/11/25 | 233 | graphics/mol2chemfig/docs/chapters/help.tex -2019/11/25 | 23342 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma 2019/11/25 | 231 | graphics/mol2chemfig/docs/examples/hand-coded-tex/sodium-green3.tex 2019/11/25 | 2310 | graphics/mol2chemfig/docs/chapters/conclusion.tex 2019/11/25 | 229 | macros/latex/contrib/powerdot-FUBerlin/Changes -2019/11/25 | 22933 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma 2019/11/25 | 229324 | graphics/mol2chemfig/mol2chemfig-doc.pdf -2019/11/25 | 22539006 | systems/texlive/tlnet/install-tl.zip 2019/11/25 | 224528 | graphics/mol2chemfig/docs/examples/mp06900.pdf 2019/11/25 | 2242 | graphics/mol2chemfig/sampledoc/penicilling.mol 2019/11/25 | 223 | graphics/mol2chemfig/docs/examples/hand-coded-tex/sodium-green1.tex +2019/11/25 | 22180144 | systems/win32/w32tex/cjkzr.tar.xz 2019/11/25 | 2151 | graphics/mol2chemfig/docs/chapters/introduction.tex -2019/11/25 | 2142836 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz -2019/11/25 | 214115 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma +2019/11/25 | 21206 | macros/latex/contrib/l3backend/l3backend-graphics.dtx 2019/11/25 | 2115 | graphics/mol2chemfig/docs/chapters/bond-lengths.tex 2019/11/25 | 2109 | graphics/mol2chemfig/docs/examples/morphine.mol 2019/11/25 | 209 | graphics/mol2chemfig/docs/examples/caffeine-smi2.tex 2019/11/25 | 208 | graphics/mol2chemfig/sampledoc/README_SAMPLEDOC 2019/11/25 | 2080 | graphics/mol2chemfig/sampledoc/plp.mol 2019/11/25 | 2080 | graphics/mol2chemfig/docs/examples/plp.mol -2019/11/25 | 20665 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma 2019/11/25 | 2064 | graphics/mol2chemfig/sampledoc/plp2.mol 2019/11/25 | 2064 | graphics/mol2chemfig/docs/examples/plp2.mol 2019/11/25 | 2063 | graphics/mol2chemfig/docs/examples/atcc.mol 2019/11/25 | 2042 | graphics/mol2chemfig/docs/examples/doxo-stripped.tex -2019/11/25 | 201923 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma 2019/11/25 | 1985433 | language/japanese/BX/bxjscls.zip -2019/11/25 | 198193 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma 2019/11/25 | 1980160 | macros/latex/contrib/reledmac/reledmac.pdf -2019/11/25 | 19795 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma 2019/11/25 | 196 | graphics/mol2chemfig/docs/examples/phenol-as-submol.tex -2019/11/25 | 1956729 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma -2019/11/25 | 195059 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma -2019/11/25 | 194084 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma -2019/11/25 | 192045 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma -2019/11/25 | 191959 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma 2019/11/25 | 19128 | systems/texlive/tlnet/archive/attachfile2.source.tar.xz 2019/11/25 | 190896 | systems/texlive/tlnet/archive/caption.source.tar.xz 2019/11/25 | 1899 | graphics/mol2chemfig/docs/examples/ce-submol2.tex 2019/11/25 | 18932 | systems/texlive/tlnet/archive/pxchfon.tar.xz -2019/11/25 | 187028 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma -2019/11/25 | 18699000 | systems/texlive/tlnet/install-tl-windows.exe 2019/11/25 | 18612 | systems/texlive/tlnet/archive/nomencl.source.tar.xz 2019/11/25 | 185644 | systems/texlive/tlnet/archive/oberdiek.tar.xz 2019/11/25 | 1854 | graphics/pgf/contrib/dynkin-diagrams/simple-lie-algebras.tex -2019/11/25 | 184991 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma 2019/11/25 | 1844 | systems/texlive/tlnet/archive/pdftools.tar.xz -2019/11/25 | 184218 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma 2019/11/25 | 183 | graphics/mol2chemfig/docs/examples/phenol-smi-wrapped.tex 2019/11/25 | 1829 | graphics/pgf/contrib/dynkin-diagrams/EulerProducts.tex -2019/11/25 | 182755 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma -2019/11/25 | 17769 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma -2019/11/25 | 177510 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma -2019/11/25 | 17676 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma 2019/11/25 | 1764 | systems/texlive/tlnet/archive/pinoutikz.tar.xz 2019/11/25 | 171 | graphics/mol2chemfig/docs/examples/phenol-smi.tex 2019/11/25 | 1712 | graphics/mol2chemfig/docs/examples/mp.mol -2019/11/25 | 1698679 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma -2019/11/25 | 169226 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma 2019/11/25 | 1682 | graphics/mol2chemfig/docs/examples/doxo-recalculated-rotated.tex -2019/11/25 | 167804 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma 2019/11/25 | 16672 | systems/texlive/tlnet/archive/pdftexcmds.source.tar.xz -2019/11/25 | 165972 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma -2019/11/25 | 165749 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma 2019/11/25 | 16566 | graphics/mol2chemfig/lua/json.lua 2019/11/25 | 161 | graphics/mol2chemfig/docs/examples/dichlorofluorescein3.sh 2019/11/25 | 1610 | graphics/mol2chemfig/docs/examples/doxo-recalculated.tex 2019/11/25 | 1610 | graphics/mol2chemfig/docs/examples/doxo-recalculated-flopped.tex -2019/11/25 | 160548 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma -2019/11/25 | 16050 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma -2019/11/25 | 15964857 | systems/texlive/tlnet/tlpkg/texlive.tlpdb 2019/11/25 | 158 | graphics/mol2chemfig/docs/examples/twisted.sh -2019/11/25 | 15895 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma 2019/11/25 | 1585136 | systems/texlive/tlnet/archive/caption.doc.tar.xz 2019/11/25 | 1569 | graphics/mol2chemfig/docs/examples/morphine-k.tex -2019/11/25 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 2019/11/25 | 1531 | graphics/mol2chemfig/docs/preamble.tex -2019/11/25 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 2019/11/25 | 1527 | graphics/mol2chemfig/sampledoc/plpa.tex -2019/11/25 | 152065 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma -2019/11/25 | 149923 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma 2019/11/25 | 1494 | graphics/mol2chemfig/sampledoc/plpmarked.tex 2019/11/25 | 1494 | graphics/mol2chemfig/docs/examples/dcf-submol2.tex -2019/11/25 | 147060 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma -2019/11/25 | 147008 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma 2019/11/25 | 1468 | graphics/mol2chemfig/sampledoc/plp3.tex 2019/11/25 | 14664 | systems/texlive/tlnet/archive/newfloat.source.tar.xz -2019/11/25 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 2019/11/25 | 145 | graphics/pgf/contrib/dynkin-diagrams/DoneTwoElBendy.tex -2019/11/25 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +2019/11/25 | 14504 | macros/latex/contrib/l3backend/l3backend-box.dtx 2019/11/25 | 1430 | graphics/mol2chemfig/docs/chapters/polishing.tex +2019/11/25 | 14244 | macros/latex/contrib/l3backend/l3backend-header.dtx 2019/11/25 | 140 | graphics/mol2chemfig/docs/examples/dichlorofluorescein2.sh -2019/11/25 | 14055 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma 2019/11/25 | 138 | graphics/mol2chemfig/docs/examples/caffeine-smi.tex 2019/11/25 | 1388 | graphics/mol2chemfig/docs/examples/morphine-n.tex 2019/11/25 | 1381 | graphics/mol2chemfig/docs/examples/caffeine.mol 2019/11/25 | 1376 | systems/texlive/tlnet/archive/collection-mathscience.tar.xz 2019/11/25 | 1375 | graphics/mol2chemfig/sampledoc/plpb.tex -2019/11/25 | 137164 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma 2019/11/25 | 135 | graphics/pgf/contrib/dynkin-diagrams/DoneTwoElStraight.tex -2019/11/25 | 133233 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma -2019/11/25 | 1327338 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma -2019/11/25 | 13060 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma +2019/11/25 | 1348 | macros/latex/contrib/l3backend/CHANGELOG.md +2019/11/25 | 13330 | macros/latex/contrib/l3backend/l3backend-basics.dtx +2019/11/25 | 1298 | macros/latex/contrib/l3backend/l3backend-code.tex +2019/11/25 | 12855336 | systems/win32/w32tex/pdftex-w32.tar.xz 2019/11/25 | 12730076 | systems/texlive/tlnet/archive/oberdiek.doc.tar.xz -2019/11/25 | 127122 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma 2019/11/25 | 1260 | graphics/mol2chemfig/sampledoc/plp3highlighted.tex 2019/11/25 | 1253 | graphics/mol2chemfig/docs/examples/eschers-cubane.tex 2019/11/25 | 1240 | graphics/mol2chemfig/docs/examples/ce-submol3.tex @@ -399,40 +654,26 @@ 2019/11/25 | 12132 | systems/texlive/tlnet/archive/epstopdf-pkg.source.tar.xz 2019/11/25 | 1212 | systems/texlive/tlnet/archive/pdfcolmk.tar.xz 2019/11/25 | 1206 | graphics/mol2chemfig/sampledoc/penicilling.tex -2019/11/25 | 1206606 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma 2019/11/25 | 119 | graphics/mol2chemfig/docs/examples/setbondstyle.tex -2019/11/25 | 1195597 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma 2019/11/25 | 1188 | graphics/mol2chemfig/docs/chapters/atom-numbers.tex -2019/11/25 | 116476 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma 2019/11/25 | 1156 | graphics/mol2chemfig/sampledoc/plpn.tex 2019/11/25 | 114 | graphics/mol2chemfig/docs/examples/dichlorofluorescein1.sh -2019/11/25 | 1142955 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma -2019/11/25 | 1142044 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma 2019/11/25 | 1139 | graphics/mol2chemfig/sampledoc/plp.tex 2019/11/25 | 1139 | graphics/mol2chemfig/docs/examples/plp.tex -2019/11/25 | 113039 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma 2019/11/25 | 1119 | graphics/mol2chemfig/lua/mol2chemfig.lua -2019/11/25 | 111240 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma 2019/11/25 | 11056 | systems/texlive/tlnet/archive/attachfile2.tar.xz -2019/11/25 | 108874 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma 2019/11/25 | 10844 | systems/texlive/tlnet/archive/footnoterange.source.tar.xz 2019/11/25 | 10736 | graphics/mol2chemfig/docs/examples/daptomycin.mol 2019/11/25 | 106 | graphics/mol2chemfig/docs/examples/plp.sh 2019/11/25 | 1067 | graphics/mol2chemfig/docs/examples/mp.tex -2019/11/25 | 1067747 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma -2019/11/25 | 1065199 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma -2019/11/25 | 1065196 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma 2019/11/25 | 1052 | graphics/mol2chemfig/docs/examples/dcf-submol1.tex 2019/11/25 | 1050 | graphics/mol2chemfig/docs/chapters/compatibility.tex -2019/11/25 | 1042936 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma 2019/11/25 | 1032 | graphics/pgf/contrib/dynkin-diagrams/hermitian-symmetric-spaces.tex 2019/11/25 | 1024 | graphics/mol2chemfig/sampledoc/plp2.tex 2019/11/25 | 1024 | graphics/mol2chemfig/docs/examples/plp2.tex -2019/11/25 | 102472 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma 2019/11/25 | 10207223 | macros/latex/contrib/reledmac.zip 2019/11/25 | 101802 | graphics/mol2chemfig/sampledoc/sample.pdf 2019/11/25 | 101703 | graphics/mol2chemfig/sampledoc/weg.pdf -2019/11/25 | 100667 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma 2019/11/25 | 1002 | graphics/mol2chemfig/docs/chapters/crossing-bonds.tex 2019/11/25 | 100188 | systems/texlive/tlnet/archive/newfloat.doc.tar.xz 2019/11/24 | 99155 | macros/latex/contrib/oberdiek/classlist.pdf @@ -464,7 +705,6 @@ 2019/11/24 | 61973 | macros/latex/contrib/oberdiek/embedfile.dtx 2019/11/24 | 58895 | macros/latex/contrib/oberdiek/pdfescape.dtx 2019/11/24 | 58817 | macros/latex/contrib/oberdiek/kvsetkeys.dtx -2019/11/24 | 5791 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl 2019/11/24 | 560339 | macros/latex/contrib/oberdiek/stringenc.pdf 2019/11/24 | 549 | macros/latex/contrib/epstopdf-pkg/README.md 2019/11/24 | 54431 | macros/latex/contrib/oberdiek/pdfrender.dtx @@ -478,7 +718,6 @@ 2019/11/24 | 48987 | macros/latex/contrib/caption/caption2.dtx 2019/11/24 | 46858 | macros/latex/contrib/epstopdf-pkg/epstopdf.dtx 2019/11/24 | 46667 | macros/latex/contrib/caption/subcaption.dtx -2019/11/24 | 451828 | macros/latex/contrib/attachfile2.zip 2019/11/24 | 43927 | macros/latex/contrib/oberdiek/atveryend.dtx 2019/11/24 | 433 | macros/latex/contrib/newfloat/CHANGELOG 2019/11/24 | 428201 | language/japanese/pxchfon.zip @@ -599,7 +838,6 @@ 2019/11/24 | 157732 | macros/latex/contrib/oberdiek/hypdoc.pdf 2019/11/24 | 15737 | macros/latex/contrib/caption/cat.eps 2019/11/24 | 157246 | macros/latex/contrib/oberdiek/iflang.pdf -2019/11/24 | 155536 | systems/texlive/tlnet/archive/texlive-docindex.doc.tar.xz 2019/11/24 | 15491629 | macros/latex/contrib/oberdiek.zip 2019/11/24 | 154721 | macros/latex/contrib/oberdiek/accsupp.pdf 2019/11/24 | 154507 | macros/latex/contrib/caption/subcaption.pdf @@ -664,7 +902,6 @@ 2019/11/24 | 112554 | macros/latex/contrib/oberdiek/scrindex.pdf 2019/11/24 | 112077 | macros/latex/contrib/newfloat/newfloat.pdf 2019/11/24 | 111664 | macros/latex/contrib/oberdiek/hypcap.pdf -2019/11/24 | 109876 | systems/texlive/tlnet/archive/texlive-docindex.tar.xz 2019/11/24 | 109506 | macros/latex/contrib/oberdiek/hypgotoe.pdf 2019/11/24 | 108641 | macros/latex/contrib/oberdiek/bigintcalc.dtx 2019/11/24 | 107235 | macros/latex/contrib/oberdiek/bmpsize.dtx @@ -679,54 +916,31 @@ 2019/11/24 | 101561 | macros/latex/contrib/oberdiek/transparent.pdf 2019/11/24 | 100795 | macros/latex/contrib/oberdiek/kvoptions.dtx 2019/11/24 | 100555 | macros/latex/contrib/oberdiek/twoopt.pdf -2019/11/23 | 9979 | macros/latex/contrib/biblatex-contrib/biblatex-apa/russian-apa.lbx -2019/11/23 | 9970 | macros/latex/contrib/biblatex-contrib/biblatex-apa/slovene-apa.lbx 2019/11/23 | 98395040 | systems/win32/w32tex/web2c-lib.tar.xz -2019/11/23 | 9661 | macros/latex/contrib/biblatex-contrib/biblatex-apa/danish-apa.lbx -2019/11/23 | 9616 | macros/latex/contrib/biblatex-contrib/biblatex-apa/italian-apa.lbx -2019/11/23 | 9558 | macros/latex/contrib/biblatex-contrib/biblatex-apa/french-apa.lbx -2019/11/23 | 9354 | macros/latex/contrib/biblatex-contrib/biblatex-apa/nynorsk-apa.lbx -2019/11/23 | 9344 | macros/latex/contrib/biblatex-contrib/biblatex-apa/brazilian-apa.lbx -2019/11/23 | 9338 | macros/latex/contrib/biblatex-contrib/biblatex-apa/norwegian-apa.lbx -2019/11/23 | 9338 | macros/latex/contrib/biblatex-contrib/biblatex-apa/norsk-apa.lbx -2019/11/23 | 9310 | macros/latex/contrib/biblatex-contrib/biblatex-apa/portuguese-apa.lbx -2019/11/23 | 9310 | macros/latex/contrib/biblatex-contrib/biblatex-apa/english-apa.lbx -2019/11/23 | 9295 | macros/latex/contrib/biblatex-contrib/biblatex-apa/dutch-apa.lbx -2019/11/23 | 9285 | macros/latex/contrib/biblatex-contrib/biblatex-apa/american-apa.lbx -2019/11/23 | 9184 | macros/latex/contrib/biblatex-contrib/biblatex-apa/british-apa.lbx -2019/11/23 | 9158 | macros/latex/contrib/biblatex-contrib/biblatex-apa/swedish-apa.lbx -2019/11/23 | 91028 | macros/latex/contrib/attachfile2/attachfile2.dtx 2019/11/23 | 902480 | systems/win32/w32tex/cweb-w32.tar.xz 2019/11/23 | 897580 | systems/texlive/tlnet/archive/tex4ht.tar.xz 2019/11/23 | 8628 | graphics/pinoutikz/pinoutikz_doc_en.tex 2019/11/23 | 839640 | systems/texlive/tlnet/archive/newtx.doc.tar.xz 2019/11/23 | 81763 | macros/latex/contrib/nomencl/sample03.pdf 2019/11/23 | 81360816 | systems/win32/w32tex/pgfcontrib.tar.xz -2019/11/23 | 81322 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test-references.bib 2019/11/23 | 80166 | macros/latex/contrib/nomencl/sample02.pdf 2019/11/23 | 782 | graphics/pinoutikz/README.md 2019/11/23 | 700 | macros/latex/contrib/pdfcolmk/pdfcolmk.sty 2019/11/23 | 6716 | systems/texlive/tlnet/archive/datetime2-serbian.tar.xz 2019/11/23 | 64840 | macros/latex/contrib/nomencl/nomencl.dtx -2019/11/23 | 63851 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.pdf 2019/11/23 | 63029448 | systems/win32/w32tex/biblatex-biber.tar.xz 2019/11/23 | 626158 | macros/latex/contrib/nomencl.zip 2019/11/23 | 61192 | systems/texlive/tlnet/archive/tex4ht.doc.tar.xz -2019/11/23 | 58863 | macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.bbx 2019/11/23 | 55327 | graphics/pinoutikz.zip -2019/11/23 | 551634 | systems/win32/w32tex/ChangeLog 2019/11/23 | 53111 | graphics/pinoutikz/pinoutikz_doc_en.pdf 2019/11/23 | 4972 | systems/texlive/tlnet/archive/letterswitharrows.source.tar.xz 2019/11/23 | 48310 | macros/latex/contrib/nomencl/sample04.pdf -2019/11/23 | 470481 | install/macros/latex/contrib/attachfile2.tds.zip 2019/11/23 | 454324 | systems/texlive/tlnet/archive/letterswitharrows.doc.tar.xz 2019/11/23 | 4534008 | systems/texlive/tlnet/archive/newtx.tar.xz 2019/11/23 | 446444 | systems/texlive/tlnet/archive/xindex.doc.tar.xz 2019/11/23 | 4436 | systems/texlive/tlnet/archive/tikz-kalender.tar.xz -2019/11/23 | 443676 | macros/latex/contrib/attachfile2/attachfile2.pdf 2019/11/23 | 44352 | systems/texlive/tlnet/archive/pst-eucl.tar.xz 2019/11/23 | 424756 | systems/texlive/tlnet/archive/xcharter.doc.tar.xz -2019/11/23 | 365007 | macros/latex/contrib/biblatex-contrib/biblatex-apa.zip 2019/11/23 | 3452 | graphics/pinoutikz/pinoutikz.sty 2019/11/23 | 34412 | macros/latex/contrib/nomencl/sample01.pdf 2019/11/23 | 34344 | systems/texlive/tlnet/archive/pdfpages.source.tar.xz @@ -735,38 +949,20 @@ 2019/11/23 | 314776 | systems/texlive/tlnet/archive/pdfpages.doc.tar.xz 2019/11/23 | 3052 | systems/texlive/tlnet/archive/letterswitharrows.tar.xz 2019/11/23 | 29976 | systems/texlive/tlnet/archive/xindex.tar.xz -2019/11/23 | 29150 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.tex 2019/11/23 | 277140 | systems/texlive/tlnet/archive/datetime2-serbian.doc.tar.xz -2019/11/23 | 258 | macros/latex/contrib/attachfile2/README.md 2019/11/23 | 2478880 | systems/win32/w32tex/tex4htk-w32.tar.xz 2019/11/23 | 240 | macros/latex/contrib/pdfcolmk/README.md -2019/11/23 | 22178368 | systems/win32/w32tex/cjkzr.tar.xz 2019/11/23 | 2151 | language/japanese/pxjahyper/README-ja.md -2019/11/23 | 200185 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.pdf 2019/11/23 | 1944120 | systems/texlive/tlnet/archive/xcharter.tar.xz -2019/11/23 | 17902 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.tex -2019/11/23 | 1744 | macros/latex/contrib/biblatex-contrib/biblatex-apa/README -2019/11/23 | 1665 | macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.dbx 2019/11/23 | 15704 | systems/texlive/tlnet/archive/datetime2-serbian.source.tar.xz -2019/11/23 | 15018 | macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.cbx 2019/11/23 | 1492800 | macros/latex/contrib/fontsetup.zip 2019/11/23 | 13764 | systems/texlive/tlnet/archive/pdfpages.tar.xz -2019/11/23 | 12759 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test-citations.bib -2019/11/23 | 12596 | macros/latex/contrib/biblatex-contrib/biblatex-apa/ngerman-apa.lbx -2019/11/23 | 12588 | macros/latex/contrib/biblatex-contrib/biblatex-apa/swissgerman-apa.lbx -2019/11/23 | 12506 | macros/latex/contrib/biblatex-contrib/biblatex-apa/nswissgerman-apa.lbx -2019/11/23 | 12498 | macros/latex/contrib/biblatex-contrib/biblatex-apa/naustrian-apa.lbx -2019/11/23 | 12482 | macros/latex/contrib/biblatex-contrib/biblatex-apa/austrian-apa.lbx -2019/11/23 | 12455 | macros/latex/contrib/biblatex-contrib/biblatex-apa/german-apa.lbx 2019/11/23 | 120946 | language/japanese/pxjahyper.zip 2019/11/23 | 1205472 | systems/texlive/tlnet/archive/pst-eucl.doc.tar.xz 2019/11/23 | 118464 | systems/texlive/tlnet/archive/tikz-kalender.doc.tar.xz 2019/11/23 | 1144 | macros/latex/contrib/nomencl/README 2019/11/23 | 112376 | systems/texlive/tlnet/archive/lexend.tar.xz 2019/11/23 | 112352 | systems/texlive/tlnet/archive/lexend.doc.tar.xz -2019/11/23 | 10659 | macros/latex/contrib/biblatex-contrib/biblatex-apa/greek-apa.lbx -2019/11/23 | 10219 | macros/latex/contrib/biblatex-contrib/biblatex-apa/galician-apa.lbx -2019/11/23 | 10217 | macros/latex/contrib/biblatex-contrib/biblatex-apa/spanish-apa.lbx 2019/11/22 | 984 | fonts/xcharter/vf/XCharter-BoldItalic-tlf-ot1G.vf 2019/11/22 | 9814 | indexing/xindex/lualatex/xindex-lapp.lua 2019/11/22 | 976 | fonts/xcharter/vf/XCharter-Italic-tlf-ot1G.vf @@ -956,7 +1152,6 @@ 2019/11/22 | 456608 | macros/latex/contrib/letterswitharrows.zip 2019/11/22 | 454076 | macros/latex/contrib/letterswitharrows/letterswitharrows.pdf 2019/11/22 | 4447725 | install/fonts/xcharter.tds.zip -2019/11/22 | 443347 | systems/win32/miktex/tm/packages/letterswitharrows.tar.lzma 2019/11/22 | 43960588 | systems/win32/w32tex/web2c-w32.tar.xz 2019/11/22 | 4375239 | fonts/xcharter.zip 2019/11/22 | 436 | macros/latex/contrib/letterswitharrows/README @@ -976,7 +1171,6 @@ 2019/11/22 | 3948 | fonts/xcharter/enc/xch1_evj3rb.enc 2019/11/22 | 3932 | fonts/xcharter/enc/xch1_3v4tq3.enc 2019/11/22 | 3901 | fonts/xcharter/tex/T2ASRBXCharter-TOsF.fd -2019/11/22 | 387222 | systems/win32/miktex/tm/packages/pxchfon.tar.lzma 2019/11/22 | 3838 | fonts/xcharter/tex/T2ASRBXCharter-TLF.fd 2019/11/22 | 3833 | fonts/xcharter/enc/xch1_nfh2jb.enc 2019/11/22 | 3807 | fonts/xcharter/enc/xch1_62ztbr.enc @@ -1892,167 +2086,3 @@ 2019/11/20 | 104948 | macros/latex-dev/base/ltnews11.pdf 2019/11/20 | 103204 | biblio/bibtex/contrib/gbt7714/gbt7714.dtx 2019/11/20 | 10178 | macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerouterthemefocus.sty -2019/11/19 | 9944 | systems/texlive/tlnet/archive/chktex.tar.xz -2019/11/19 | 98060 | systems/texlive/tlnet/archive/cjkutils.doc.tar.xz -2019/11/19 | 979992 | systems/texlive/tlnet/archive/velthuis.doc.tar.xz -2019/11/19 | 9616 | systems/texlive/tlnet/archive/afm2pl.tar.xz -2019/11/19 | 944 | systems/texlive/tlnet/archive/dvipng.tar.xz -2019/11/19 | 94352 | systems/texlive/tlnet/archive/t1utils.doc.tar.xz -2019/11/19 | 936 | systems/texlive/tlnet/archive/uptex.tar.xz -2019/11/19 | 92412 | systems/texlive/tlnet/archive/dvisvgm.doc.tar.xz -2019/11/19 | 9216 | systems/texlive/tlnet/archive/bibtex8.tar.xz -2019/11/19 | 916 | systems/texlive/tlnet/archive/tex.tar.xz -2019/11/19 | 908 | systems/texlive/tlnet/archive/dvisvgm.tar.xz -2019/11/19 | 889945 | graphics/pgf/contrib/chemplants.zip -2019/11/19 | 85800 | systems/texlive/tlnet/archive/fontinst.tar.xz -2019/11/19 | 84228 | systems/texlive/tlnet/archive/luatexja.source.tar.xz -2019/11/19 | 83160 | systems/texlive/tlnet/archive/pstools.doc.tar.xz -2019/11/19 | 820 | systems/texlive/tlnet/archive/ptex.tar.xz -2019/11/19 | 8057 | graphics/pgf/contrib/chemplants/chemplants-changes.tex -2019/11/19 | 7936 | macros/latex/contrib/knowledge/knowledge-configuration.dtx -2019/11/19 | 782277 | macros/latex/contrib/knowledge.zip -2019/11/19 | 74976 | systems/texlive/tlnet/archive/dviljk.doc.tar.xz -2019/11/19 | 739512 | systems/texlive/tlnet/archive/m-tx.doc.tar.xz -2019/11/19 | 722239 | graphics/pgf/contrib/chemplants/chemplants-doc.pdf -2019/11/19 | 721456 | fonts/newcomputermodern/NewCMMath-Regular.otf -2019/11/19 | 720 | systems/texlive/tlnet/archive/autosp.tar.xz -2019/11/19 | 71968 | systems/texlive/tlnet/archive/metafont.doc.tar.xz -2019/11/19 | 71928 | systems/texlive/tlnet/archive/tetex.tar.xz -2019/11/19 | 697731 | macros/latex/contrib/knowledge/knowledge.pdf -2019/11/19 | 6952 | macros/latex/contrib/realhats/realhats.dtx -2019/11/19 | 68840 | systems/texlive/tlnet/archive/seetexk.doc.tar.xz -2019/11/19 | 6852 | systems/texlive/tlnet/archive/xdvi.tar.xz -2019/11/19 | 67480 | systems/texlive/tlnet/archive/bibtexu.doc.tar.xz -2019/11/19 | 6699 | macros/latex/contrib/knowledge/knowledge-example.tex -2019/11/19 | 644 | systems/texlive/tlnet/archive/seetexk.tar.xz -2019/11/19 | 64088 | systems/texlive/tlnet/archive/amsmath.source.tar.xz -2019/11/19 | 63868 | systems/texlive/tlnet/archive/tex.doc.tar.xz -2019/11/19 | 635472 | fonts/newcomputermodern/NewCMSans10-BoldOblique.otf -2019/11/19 | 628 | systems/texlive/tlnet/archive/omegaware.tar.xz -2019/11/19 | 628 | systems/texlive/tlnet/archive/aleph.tar.xz -2019/11/19 | 62396 | systems/texlive/tlnet/archive/ps2pk.doc.tar.xz -2019/11/19 | 620 | systems/texlive/tlnet/archive/t1utils.tar.xz -2019/11/19 | 580 | systems/texlive/tlnet/archive/dtl.tar.xz -2019/11/19 | 5728749 | fonts/cochineal.zip -2019/11/19 | 564 | systems/texlive/tlnet/archive/detex.tar.xz -2019/11/19 | 559948 | fonts/newcomputermodern/NewCMMono10-BoldOblique.otf -2019/11/19 | 54400 | systems/texlive/tlnet/archive/tpic2pdftex.doc.tar.xz -2019/11/19 | 5388 | systems/texlive/tlnet/archive/psutils.tar.xz -2019/11/19 | 5351 | macros/latex/contrib/realhats/hats/realhats-fez.pdf -2019/11/19 | 532 | systems/texlive/tlnet/archive/dviljk.tar.xz -2019/11/19 | 53292 | systems/texlive/tlnet/archive/latex-bin.doc.tar.xz -2019/11/19 | 525284 | systems/texlive/tlnet/archive/tetex.doc.tar.xz -2019/11/19 | 52488 | systems/texlive/tlnet/archive/dtl.doc.tar.xz -2019/11/19 | 516 | systems/texlive/tlnet/archive/latex-bin.tar.xz -2019/11/19 | 514052 | systems/texlive/tlnet/archive/dvips.doc.tar.xz -2019/11/19 | 504 | systems/texlive/tlnet/archive/ps2pk.tar.xz -2019/11/19 | 504 | systems/texlive/tlnet/archive/dvi2tty.tar.xz -2019/11/19 | 48332 | systems/texlive/tlnet/archive/aleph.doc.tar.xz -2019/11/19 | 481184 | systems/texlive/tlnet/archive/axodraw2.doc.tar.xz -2019/11/19 | 468 | systems/texlive/tlnet/archive/dvidvi.tar.xz -2019/11/19 | 466032 | systems/texlive/tlnet/archive/makeindex.doc.tar.xz -2019/11/19 | 464 | systems/texlive/tlnet/archive/synctex.tar.xz -2019/11/19 | 4628 | systems/texlive/tlnet/archive/makeindex.tar.xz -2019/11/19 | 45464 | systems/texlive/tlnet/archive/microtype.tar.xz -2019/11/19 | 4544 | systems/texlive/tlnet/archive/m-tx.tar.xz -2019/11/19 | 44536 | graphics/pgf/contrib/chemplants/chemplants.sty -2019/11/19 | 444 | systems/texlive/tlnet/archive/tpic2pdftex.tar.xz -2019/11/19 | 43820 | systems/texlive/tlnet/archive/fontools.tar.xz -2019/11/19 | 42903 | macros/latex/contrib/knowledge/knowledge-utils.dtx -2019/11/19 | 425800 | systems/texlive/tlnet/archive/chktex.doc.tar.xz -2019/11/19 | 41736 | systems/texlive/tlnet/archive/synctex.doc.tar.xz -2019/11/19 | 4149444 | systems/texlive/tlnet/archive/velthuis.tar.xz -2019/11/19 | 4141 | macros/latex/contrib/realhats/hats/realhats-tophat.pdf -2019/11/19 | 41360 | systems/texlive/tlnet/archive/afm2pl.doc.tar.xz -2019/11/19 | 410344 | systems/texlive/tlnet/archive/fontinst.source.tar.xz -2019/11/19 | 38880 | systems/texlive/tlnet/archive/dviout-util.doc.tar.xz -2019/11/19 | 380 | systems/texlive/tlnet/archive/vlna.tar.xz -2019/11/19 | 35876 | systems/texlive/tlnet/archive/dvi2tty.doc.tar.xz -2019/11/19 | 3548 | systems/texlive/tlnet/archive/gsftopk.tar.xz -2019/11/19 | 3516 | systems/texlive/tlnet/archive/pdfbook2.tar.xz -2019/11/19 | 348 | systems/texlive/tlnet/archive/pdfjam.x86_64-darwinlegacy.tar.xz -2019/11/19 | 344 | systems/texlive/tlnet/archive/pdfjam.x86_64-linuxmusl.tar.xz -2019/11/19 | 34496 | systems/texlive/tlnet/archive/dvips.tar.xz -2019/11/19 | 340 | systems/texlive/tlnet/archive/pdfjam.x86_64-solaris.tar.xz -2019/11/19 | 340 | systems/texlive/tlnet/archive/pdfjam.x86_64-darwin.tar.xz -2019/11/19 | 340 | systems/texlive/tlnet/archive/pdfjam.x86_64-cygwin.tar.xz -2019/11/19 | 340 | systems/texlive/tlnet/archive/pdfjam.i386-solaris.tar.xz -2019/11/19 | 340 | systems/texlive/tlnet/archive/pdfjam.i386-netbsd.tar.xz -2019/11/19 | 340 | systems/texlive/tlnet/archive/pdfjam.i386-freebsd.tar.xz -2019/11/19 | 340 | systems/texlive/tlnet/archive/pdfjam.armhf-linux.tar.xz -2019/11/19 | 340 | systems/texlive/tlnet/archive/pdfjam.amd64-netbsd.tar.xz -2019/11/19 | 340 | systems/texlive/tlnet/archive/pdfjam.amd64-freebsd.tar.xz -2019/11/19 | 340 | systems/texlive/tlnet/archive/pdfjam.aarch64-linux.tar.xz -2019/11/19 | 33984 | systems/texlive/tlnet/archive/axodraw2.source.tar.xz -2019/11/19 | 336 | systems/texlive/tlnet/archive/pdfjam.x86_64-linux.tar.xz -2019/11/19 | 336 | systems/texlive/tlnet/archive/pdfjam.i386-linux.tar.xz -2019/11/19 | 336 | systems/texlive/tlnet/archive/pdfjam.i386-cygwin.tar.xz -2019/11/19 | 33572 | systems/texlive/tlnet/archive/metafont.tar.xz -2019/11/19 | 33164 | systems/texlive/tlnet/archive/bibtex8.doc.tar.xz -2019/11/19 | 32204 | systems/texlive/tlnet/archive/kpathsea.tar.xz -2019/11/19 | 3123608 | systems/texlive/tlnet/archive/dvipdfmx.doc.tar.xz -2019/11/19 | 3110 | macros/latex/contrib/realhats/hats/realhats-dunce.pdf -2019/11/19 | 30728 | systems/texlive/tlnet/archive/texdoctk.doc.tar.xz -2019/11/19 | 306220 | systems/texlive/tlnet/archive/dvipng.doc.tar.xz -2019/11/19 | 3048036 | systems/texlive/tlnet/archive/luatexja.doc.tar.xz -2019/11/19 | 30296 | systems/texlive/tlnet/archive/amsmath.tar.xz -2019/11/19 | 299484 | systems/texlive/tlnet/archive/uptex.doc.tar.xz -2019/11/19 | 296 | systems/texlive/tlnet/archive/dvipos.tar.xz -2019/11/19 | 292 | systems/texlive/tlnet/archive/bibtexu.tar.xz -2019/11/19 | 28512 | systems/texlive/tlnet/archive/dvipos.doc.tar.xz -2019/11/19 | 276544 | systems/texlive/tlnet/archive/autosp.doc.tar.xz -2019/11/19 | 27540 | systems/texlive/tlnet/archive/gsftopk.doc.tar.xz -2019/11/19 | 270284 | fonts/newcomputermodern/NewCMSans10-Bold.otf -2019/11/19 | 26704 | systems/texlive/tlnet/archive/texdoctk.tar.xz -2019/11/19 | 26648 | systems/texlive/tlnet/archive/dvipdfmx.tar.xz -2019/11/19 | 2614 | macros/latex/contrib/knowledge/makefile -2019/11/19 | 258904 | systems/texlive/tlnet/archive/lcdftypetools.doc.tar.xz -2019/11/19 | 25612 | systems/texlive/tlnet/archive/axodraw2.tar.xz -2019/11/19 | 25592 | systems/texlive/tlnet/archive/cyrillic-bin.doc.tar.xz -2019/11/19 | 248 | systems/texlive/tlnet/archive/dviout-util.tar.xz -2019/11/19 | 2392 | macros/latex/contrib/realhats/hats/realhats-santa.pdf -2019/11/19 | 2345548 | systems/texlive/tlnet/archive/amsmath.doc.tar.xz -2019/11/19 | 229819 | graphics/pgf/contrib/chemplants/chemplants-doc.tex -2019/11/19 | 21828 | systems/texlive/tlnet/archive/detex.doc.tar.xz -2019/11/19 | 2176 | systems/texlive/tlnet/archive/pdfbook2.doc.tar.xz -2019/11/19 | 210052 | fonts/newcomputermodern/NewCMMono10-Bold.otf -2019/11/19 | 2025 | macros/latex/contrib/knowledge/README.md -2019/11/19 | 2016 | systems/texlive/tlnet/archive/cjkutils.tar.xz -2019/11/19 | 19324 | systems/texlive/tlnet/archive/dvidvi.doc.tar.xz -2019/11/19 | 180432 | systems/texlive/tlnet/archive/luatexja.tar.xz -2019/11/19 | 1759 | macros/latex/contrib/knowledge/knowledge.ins -2019/11/19 | 17264772 | systems/win32/w32tex/luatexja.tar.xz -2019/11/19 | 171896 | systems/texlive/tlnet/archive/xdvi.doc.tar.xz -2019/11/19 | 1685308 | systems/texlive/tlnet/archive/luatex.doc.tar.xz -2019/11/19 | 1646840 | systems/texlive/tlnet/archive/microtype.doc.tar.xz -2019/11/19 | 152502 | macros/latex/contrib/knowledge/knowledge-code.dtx -2019/11/19 | 150614 | macros/latex/contrib/knowledge/knowledge.tex -2019/11/19 | 1504 | systems/texlive/tlnet/archive/cyrillic-bin.tar.xz -2019/11/19 | 1502 | macros/latex/contrib/realhats/hats/realhats-crown.pdf -2019/11/19 | 149076 | systems/texlive/tlnet/archive/omegaware.doc.tar.xz -2019/11/19 | 1457 | macros/latex/contrib/realhats/hats/realhats-sombrero.pdf -2019/11/19 | 1455 | macros/latex/contrib/realhats/hats/realhats-ash.pdf -2019/11/19 | 142828 | systems/texlive/tlnet/archive/vlna.doc.tar.xz -2019/11/19 | 142140 | systems/texlive/tlnet/archive/microtype.source.tar.xz -2019/11/19 | 141869 | macros/latex/contrib/realhats.zip -2019/11/19 | 138028 | systems/texlive/tlnet/archive/ttfutils.doc.tar.xz -2019/11/19 | 135820 | systems/texlive/tlnet/archive/psutils.doc.tar.xz -2019/11/19 | 1350 | macros/latex/contrib/realhats/hats/realhats-cowboy.pdf -2019/11/19 | 12924 | systems/texlive/tlnet/archive/luatex.tar.xz -2019/11/19 | 128428 | systems/texlive/tlnet/archive/ptex.doc.tar.xz -2019/11/19 | 126892 | systems/texlive/tlnet/archive/fontools.doc.tar.xz -2019/11/19 | 1262 | macros/latex/contrib/realhats/realhats.ins -2019/11/19 | 12620 | macros/latex/contrib/realhats/readme_images/hats.png -2019/11/19 | 12148 | systems/texlive/tlnet/archive/pdfjam.tar.xz -2019/11/19 | 119507 | graphics/pgf/contrib/chemplants/chemplants-changes.pdf -2019/11/19 | 1178 | macros/latex/contrib/realhats/hats/realhats-witch.pdf -2019/11/19 | 11536 | systems/texlive/tlnet/archive/pstools.tar.xz -2019/11/19 | 1143 | macros/latex/contrib/realhats/hats/realhats-beret.pdf -2019/11/19 | 1113 | graphics/pgf/contrib/chemplants/README.md -2019/11/19 | 110184 | systems/texlive/tlnet/archive/pdfjam.doc.tar.xz -2019/11/19 | 108724 | systems/texlive/tlnet/archive/ttfutils.tar.xz -2019/11/19 | 1072944 | systems/texlive/tlnet/archive/kpathsea.doc.tar.xz -2019/11/19 | 1041 | macros/latex/contrib/realhats/README.md -2019/11/19 | 103649 | macros/latex/contrib/realhats/realhats.pdf -2019/11/19 | 1019508 | systems/texlive/tlnet/archive/fontinst.doc.tar.xz -2019/11/19 | 1004 | systems/texlive/tlnet/archive/lcdftypetools.tar.xz diff --git a/dviware/dviasm/README b/dviware/dviasm/README index d2fc73b610..f81b426b9c 100644 --- a/dviware/dviasm/README +++ b/dviware/dviasm/README @@ -1,4 +1,4 @@ -DVIasm is a TeX utility program written by Jin-Hwan Cho, that is +DVIasm is a TeX utility program originally written by Jin-Hwan Cho, that is designed for editing DeVice-Independent (DVI) files directly. It consists of a single Python program, dviasm.py, in a human readable diff --git a/dviware/dviasm/dviasm.py b/dviware/dviasm/dviasm.py index 05ff94fc68..ae903932c1 100755 --- a/dviware/dviasm/dviasm.py +++ b/dviware/dviasm/dviasm.py @@ -1,10 +1,12 @@ -#! /usr/bin/env python2.7 +#! /usr/bin/env python3 # -*- coding: utf-8 -*- # # This is DVIasm, a DVI utility for editing DVI files directly. # # Copyright (C) 2007-2008 by Jin-Hwan Cho <chofchof@ktug.or.kr> # Copyright (C) 2011-2017 by Khaled Hosny <khaledhosny@eglug.org> +# Copyright (C) 2019 by Arthur Reutenauer <arthur@reutenauer.eu> +# Copyright (C) 2019 by Hironobu Yamashita <h.y.acetaminophen@gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -78,7 +80,7 @@ def ValidID(dvi_id): return True def BadDVI(msg): - raise AttributeError, 'Bad DVI file: %s!' % msg + raise AttributeError('Bad DVI file: %s!' % msg) def GetByte(fp): # { returns the next byte, unsigned } try: return ord(fp.read(1)) @@ -91,40 +93,40 @@ def SignedByte(fp): # { returns the next byte, signed } else: return b - 256 def Get2Bytes(fp): # { returns the next two bytes, unsigned } - try: a, b = map(ord, fp.read(2)) + try: a, b = fp.read(2) except: BadDVI('Failed to Get2Bytes()') return (a << 8) + b def SignedPair(fp): # {returns the next two bytes, signed } - try: a, b = map(ord, fp.read(2)) + try: a, b = fp.read(2) except: BadDVI('Failed to SignedPair()') if a < 128: return (a << 8) + b else: return ((a - 256) << 8) + b def Get3Bytes(fp): # { returns the next three bytes, unsigned } - try: a, b, c = map(ord, fp.read(3)) + try: a, b, c = fp.read(3) except: BadDVI('Failed to Get3Bytes()') return (((a << 8) + b) << 8) + c def SignedTrio(fp): # { returns the next three bytes, signed } - try: a, b, c = map(ord, fp.read(3)) + try: a, b, c = fp.read(3) except: BadDVI('Failed to SignedTrio()') if a < 128: return (((a << 8) + b) << 8) + c else: return ((((a - 256) << 8) + b) << 8) + c def Get4Bytes(fp): # { returns the next four bytes, unsigned } - try: a, b, c, d = map(ord, fp.read(4)) + try: a, b, c, d = fp.read(4) except: BadDVI('Failed to Get4Bytes()') return (((((a << 8) + b) << 8) + c) << 8) + d def SignedQuad(fp): # { returns the next four bytes, signed } - try: a, b, c, d = map(ord, fp.read(4)) + try: a, b, c, d = fp.read(4) except: BadDVI('Failed to get SignedQuad()') if a < 128: return (((((a << 8) + b) << 8) + c) << 8) + d else: return ((((((a - 256) << 8) + b) << 8) + c) << 8) + d def PutByte(q): - return chr(q & 0xff) + return bytes.fromhex('%02x' % (q & 0xff)) def Put2Bytes(q): return PutByte(q>>8) + PutByte(q) @@ -161,7 +163,7 @@ def PutGlyphs(width, glyphs): for glyph in glyphs: s.append(Put2Bytes(glyph["id"])) - return ''.join(s) + return b''.join(s) def PutTextGlyphs(text, width, glyphs): s = [] @@ -171,7 +173,7 @@ def PutTextGlyphs(text, width, glyphs): s.append(Put2Bytes(ch)) s.append(PutGlyphs(width, glyphs)) - return ''.join(s) + return b''.join(s) def GetInt(s): try: return int(s) @@ -184,11 +186,11 @@ def GetStrASCII(s): # used in Parse() def UCS2toJIS(c): s = c.encode('iso2022-jp') if len(s) == 1: return ord(s) - else: return (ord(s[3]) << 8) + ord(s[4]) + else: return (s[3] << 8) + s[4] def GetStrUTF8(s): # used in Parse() if len(s) > 1 and ((s[0] == "'" and s[-1] == "'") or (s[0] == '"' and s[-1] == '"')): - t = s[1:-1].decode('string_escape').decode('utf8') + t = s[1:-1] if is_ptex: return [UCS2toJIS(c) for c in t] else: return [ord(c) for c in t] else: return '' @@ -215,19 +217,26 @@ def PutStrLatin1(t): # unsed in Dump() warning('Not support characters > 65535; may skip %d.\n' % o) return "'%s'" % s +def DecodeISO2022JP(c): + try: + s = bytes.fromhex("1b 24 42 %02x %02x" % (c//256, c%256)).decode('iso2022-jp') + except UnicodeDecodeError: + s = '' + return s + def PutStrUTF8(t): # unsed in Dump() s = '' if is_subfont: for o in t: - s += unichr((subfont_idx << 8) + o).encode('utf8') + s += chr((subfont_idx << 8) + o).encode('utf8') else: # not the case of subfont for o in t: if o == 92: s += '\\\\' elif 32 <= o < 127: s += chr(o) elif o < 128: s += ('\\x%02x' % o) elif is_ptex: - s += ''.join(['\x1b$B', chr(o/256), chr(o%256)]).decode('iso2022-jp').encode('utf8') - else: s += unichr(o).encode('utf8') + s += DecodeISO2022JP(o) + else: s += chr(o) return "'%s'" % s def PutStrSJIS(t): # unsed in Dump() @@ -237,7 +246,7 @@ def PutStrSJIS(t): # unsed in Dump() elif 32 <= o < 127: s += chr(o) elif o < 128: s += ('\\x%02x' % o) else: - s += ''.join(['\x1b$B', chr(o/256), chr(o%256)]).decode('iso2022-jp').encode('sjis') + s += DecodeISO2022JP(o).encode('sjis') return "'%s'" % s def IsFontChanged(f, z): @@ -287,7 +296,7 @@ class DVI(object): # Load: DVI -> Internal Format ########################################################## def Load(self, fn): - fp = file(fn, 'rb') + fp = open(fn, 'rb') self.LoadFromFile(fp) fp.close() @@ -301,7 +310,7 @@ class DVI(object): while loc >= 0: fp.seek(loc) if GetByte(fp) != BOP: BadDVI('byte %d is not bop' % fp.tell()) - cnt = [SignedQuad(fp) for i in xrange(10)] + cnt = [SignedQuad(fp) for i in range(10)] loc = SignedQuad(fp) page = self.ProcessPage(fp) self.pages.insert(0, {'count':cnt, 'content':page}) @@ -329,7 +338,7 @@ class DVI(object): warning('magnification is %d; use the default 1000!' % mag) else: self.mag = mag - self.comment = fp.read(GetByte(fp)) + self.comment = fp.read(GetByte(fp)).decode('utf8') self.ComputeConversionFactors() def ProcessPostamble(self, fp): @@ -378,19 +387,22 @@ class DVI(object): m = GetByte(fp) if not ValidID(m): warning('identification in byte %d should be one of: %s!' % (fp.tell() - 1, DVI_IDS)) + if not self.id == m: + if not (self.id == 2 and m == 3): # pTeX/upTeX with dir allowed + warning('ID byte mismatch: preamble %d vs postamble %d!' % (self.id, m)) def DefineFont(self, e, fp): c = SignedQuad(fp) # font_check_sum q = SignedQuad(fp) # font_scaled_size d = SignedQuad(fp) # font_design_size - n = fp.read(GetByte(fp) + GetByte(fp)) + n = fp.read(GetByte(fp) + GetByte(fp)).decode('utf8') try: f = self.font_def[e] except KeyError: self.font_def[e] = {'name':n, 'checksum':c, 'scaled_size':q, 'design_size':d} - if q <= 0 or q >= 01000000000: + if q <= 0 or q >= 0o1000000000: warning("%s---not loaded, bad scale (%d)!" % (n, q)) - elif d <= 0 or d >= 01000000000: + elif d <= 0 or d >= 0o1000000000: warning("%s---not loaded, bad design size (%d)!" % (n, d)) else: if f['checksum'] != c: @@ -406,7 +418,7 @@ class DVI(object): size = Get4Bytes(fp) # scaled size flags = Get2Bytes(fp) l = GetByte(fp) # name length - fnt_name = fp.read(l) + fnt_name = fp.read(l).decode('utf8') index = Get4Bytes(fp) # face index ext = [] embolden = 0 @@ -486,7 +498,7 @@ class DVI(object): elif o < FNT_NUM_0 + 64 or o in (FNT1, FNT2, FNT3, FNT4): s.append([FNT1, p]) elif o in (XXX1, XXX2, XXX3, XXX4): - q = fp.read(p) + q = fp.read(p).decode('utf8') s.append([XXX1, q]) elif o in (FNT_DEF1, FNT_DEF2, FNT_DEF3, FNT_DEF4): self.DefineFont(p, fp) @@ -590,41 +602,41 @@ class DVI(object): # Save: Internal Format -> DVI ########################################################## def Save(self, fn): - fp = file(fn, 'wb') + fp = open(fn, 'wb') self.SaveToFile(fp) fp.close() def SaveToFile(self, fp): # WritePreamble - fp.write(''.join([chr(PRE), PutByte(self.id), PutSignedQuad(self.numerator), PutSignedQuad(self.denominator), PutSignedQuad(self.mag), PutByte(len(self.comment)), self.comment])) + fp.write(b''.join([bytes.fromhex('%02x' % PRE), PutByte(self.id), PutSignedQuad(self.numerator), PutSignedQuad(self.denominator), PutSignedQuad(self.mag), PutByte(len(self.comment)), self.comment.encode('utf8')])) # WriteFontDefinitions self.WriteFontDefinitions(fp) # WritePages stackdepth = 0; loc = -1 for page in self.pages: w = x = y = z = 0; stack = [] - s = [chr(BOP)] + s = [bytes.fromhex('%02x' % BOP)] s.extend([PutSignedQuad(c) for c in page['count']]) s.append(PutSignedQuad(loc)) for cmd in page['content']: if cmd[0] == SET1: for o in cmd[1]: - if o < 128: s.append(chr(SET_CHAR_0 + o)) + if o < 128: s.append(bytes.fromhex('%02x' % (SET_CHAR_0 + o))) else: s.append(self.CmdPair([SET1, o])) elif cmd[0] in (SET_RULE, PUT_RULE): - s.append(chr(cmd[0]) + PutSignedQuad(cmd[1][0]) + PutSignedQuad(cmd[1][1])) + s.append(bytes.fromhex('%02x' % cmd[0]) + PutSignedQuad(cmd[1][0]) + PutSignedQuad(cmd[1][1])) elif cmd[0] == PUT1: s.append(self.CmdPair([PUT1, cmd[1][0]])) elif cmd[0] in (RIGHT1, DOWN1): s.append(self.CmdPair(cmd)) elif cmd[0] in (W0, X0, Y0, Z0): - s.append(chr(cmd[0])) + s.append(bytes.fromhex('%02x' % cmd[0])) elif cmd[0] == PUSH: - s.append(chr(PUSH)) + s.append(bytes.fromhex('%02x' % PUSH)) stack.append((w, x, y, z)) if len(stack) > stackdepth: stackdepth = len(stack) elif cmd[0] == POP: - s.append(chr(POP)) + s.append(bytes.fromhex('%02x' % POP)) w, x, y, z = stack.pop() elif cmd[0] == W1: w = cmd[1]; s.append(self.CmdPair(cmd)) @@ -635,18 +647,19 @@ class DVI(object): elif cmd[0] == Z1: z = cmd[1]; s.append(self.CmdPair(cmd)) elif cmd[0] == FNT1: - if cmd[1] < 64: s.append(chr(FNT_NUM_0 + cmd[1])) + if cmd[1] < 64: s.append(bytes.fromhex('%02x' % (FNT_NUM_0 + cmd[1]))) else: s.append(self.CmdPair(cmd)) elif cmd[0] == XXX1: + cmd1 = cmd[1].encode('utf8') l = len(cmd[1]) - if l < 256: s.append(chr(XXX1) + chr(l) + cmd[1]) - else: s.append(chr(XXX4) + PutSignedQuad(l) + cmd[1]) + if l < 256: s.append(bytes.fromhex('%02x' % XXX1) + bytes.fromhex('%02x' % l) + cmd1) + else: s.append(bytes.fromhex('%02x' % XXX4) + PutSignedQuad(l) + cmd1) elif cmd[0] == DIR: - s.append(chr(DIR) + chr(cmd[1])) + s.append(bytes.fromhex('%02x' % DIR) + bytes.fromhex('%02x' % cmd[1])) elif cmd[0] == BEGIN_REFLECT: - s.append(chr(BEGIN_REFLECT)) + s.append(bytes.fromhex('%02x' % BEGIN_REFLECT)) elif cmd[0] == END_REFLECT: - s.append(chr(END_REFLECT)) + s.append(bytes.fromhex('%02x' % END_REFLECT)) elif cmd[0] == GLYPHS: s.append(PutByte(GLYPHS)) s.append(PutGlyphs(cmd[1], cmd[2])) @@ -655,19 +668,19 @@ class DVI(object): s.append(PutTextGlyphs(cmd[1], cmd[2], cmd[3])) else: warning('invalid command %s!' % cmd[0]) - s.append(chr(EOP)) + s.append(bytes.fromhex('%02x' % EOP)) loc = fp.tell() - fp.write(''.join(s)) + fp.write(b''.join(s)) # WritePostamble post_loc = fp.tell() - fp.write(''.join([chr(POST), PutSignedQuad(loc), PutSignedQuad(self.numerator), PutSignedQuad(self.denominator), PutSignedQuad(self.mag), PutSignedQuad(self.max_v), PutSignedQuad(self.max_h), Put2Bytes(stackdepth+1), Put2Bytes(len(self.pages))])) + fp.write(b''.join([bytes.fromhex('%02x' % POST), PutSignedQuad(loc), PutSignedQuad(self.numerator), PutSignedQuad(self.denominator), PutSignedQuad(self.mag), PutSignedQuad(self.max_v), PutSignedQuad(self.max_h), Put2Bytes(stackdepth+1), Put2Bytes(len(self.pages))])) # WriteFontDefinitions self.WriteFontDefinitions(fp) # WritePostPostamble - fp.write(''.join([chr(POST_POST), PutSignedQuad(post_loc), PutByte(self.id), '\xdf\xdf\xdf\xdf'])) + fp.write(b''.join([bytes.fromhex('%02x' % POST_POST), PutSignedQuad(post_loc), PutByte(self.id_post), b'\xdf\xdf\xdf\xdf'])) loc = fp.tell() while (loc % 4) != 0: - fp.write('\xdf'); loc += 1 + fp.write(b'\xdf'); loc += 1 def WriteFontDefinitions(self, fp): s = [] @@ -679,9 +692,8 @@ class DVI(object): s.append(PutSignedQuad(self.font_def[e]['scaled_size'])) s.append(Put2Bytes(flags)) s.append(PutByte(len(self.font_def[e]['name']))) - s.append(self.font_def[e]['name']) + s.append(self.font_def[e]['name'].encode('utf8')) s.append(PutSignedQuad(self.font_def[e]['index'])) - print >> sys.stderr, self.font_def[e]['name'], self.font_def[e]['index'] if flags & XDV_FLAG_COLORED: s.append(PutSignedQuad(self.font_def[e]['color'])) if flags & XDV_FLAG_EXTEND: s.append(PutSignedQuad(self.font_def[e]['extend'])) if flags & XDV_FLAG_SLANT: s.append(PutSignedQuad(self.font_def[e]['slant'])) @@ -693,20 +705,20 @@ class DVI(object): s.append(PutSignedQuad(self.font_def[e]['checksum'])) s.append(PutSignedQuad(self.font_def[e]['scaled_size'])) s.append(PutSignedQuad(self.font_def[e]['design_size'])) - s.append('\x00') + s.append(b'\x00') s.append(PutByte(len(self.font_def[e]['name']))) - s.append(self.font_def[e]['name']) - fp.write(''.join(s)) + s.append(self.font_def[e]['name'].encode('utf8')) + fp.write(b''.join(s)) def CmdPair(self, cmd): l, q = PutSigned(cmd[1]) - return chr(cmd[0] + l) + q + return bytes.fromhex('%02x' % (cmd[0] + l)) + q ########################################################## # Parse: Text -> Internal Format ########################################################## def Parse(self, fn, encoding=''): - fp = file(fn, 'r') + fp = open(fn, 'r') s = fp.read() fp.close() self.ParseFromString(s, encoding=encoding) @@ -717,6 +729,7 @@ class DVI(object): else: GetStr = GetStrUTF8 self.Initialize() self.fnt_num = 0 + dir_used = 0 for l in s.split('\n'): l = l.strip() if not l or l[0] == '%': continue @@ -818,7 +831,7 @@ class DVI(object): else: is_subfont = False try: - e = self.font_def.keys()[self.font_def.values().index(f)] + e = list(self.font_def.keys())[list(self.font_def.values()).index(f)] except: e = self.fnt_num self.font_def[self.fnt_num] = f @@ -850,6 +863,7 @@ class DVI(object): self.cur_page.append([Z0]) elif key == 'dir': self.cur_page.append([DIR, GetInt(val)]) + dir_used = 1 elif key == 'begin_reflect': self.cur_page.append([BEGIN_REFLECT]) elif key == 'end_reflect': @@ -862,11 +876,15 @@ class DVI(object): self.cur_page.append([TEXT_GLYPHS, text, w, glyphs]) else: warning('invalid command %s!' % key) + if self.id == 2 and dir_used == 1: # standard DVI with dir -> force pTeX/upTeX spec + self.id_post = 3 + else: + self.id_post = self.id def AppendFNT1(self): f = {'name':cur_font+"%02x"%subfont_idx, 'design_size':cur_dsize, 'scaled_size':cur_ssize, 'checksum':0} try: - e = self.font_def.keys()[self.font_def.values().index(f)] + e = list(self.font_def.keys())[list(self.font_def.values()).index(f)] except: e = self.fnt_num self.font_def[e] = f @@ -877,7 +895,7 @@ class DVI(object): # Dump: Internal Format -> Text ########################################################## def Dump(self, fn, tabsize=2, encoding=''): - fp = file(fn, 'w') + fp = open(fn, 'w') self.DumpToFile(fp, tabsize=tabsize, encoding=encoding) fp.close() @@ -1130,10 +1148,12 @@ binary format. It is fully documented at http://tug.org/TUGboat/Articles/tb28-2/tb89cho.pdf http://ajt.ktug.kr/assets/2008/5/1/0201cho.pdf""" - version = """This is %prog-20190202 by Jin-Hwan Cho (Korean TeX Society) + version = """This is %prog-20191126 Copyright (C) 2007-2008 by Jin-Hwan Cho <chofchof@ktug.or.kr> Copyright (C) 2011-2017 by Khaled Hosny <khaledhosny@eglug.org> +Copyright (C) 2019 by Arthur Reutenauer <arthur@reutenauer.eu> +Copyright (C) 2019 by Hironobu Yamashita <h.y.acetaminophen@gmail.com> This is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1159,7 +1179,7 @@ the Free Software Foundation, either version 3 of the License, or help="tab size for push/pop [default=%default]") parser.add_option("-p", "--ptex", action="store_true", dest="ptex", default=False, - help="extended DVI for Japanese pTeX") + help="ISO-2022-JP-encoded DVI for Japanese pTeX") parser.add_option("-s", "--subfont", action="append", type="string", dest="subfont", metavar="STR", @@ -1191,7 +1211,7 @@ def IsDVI(fname): from os.path import splitext if splitext(fname)[1] not in ('.dvi', '.xdv'): return False try: - fp = file(fname, 'rb') + fp = open(fname, 'rb') fp.seek(0) if GetByte(fp) != PRE: return False fp.seek(-4, 2) diff --git a/fonts/utilities/fontools/bin/afm2afm b/fonts/utilities/fontools/bin/afm2afm index c05b55fd36..65d03e3ef3 100755 --- a/fonts/utilities/fontools/bin/afm2afm +++ b/fonts/utilities/fontools/bin/afm2afm @@ -37,7 +37,7 @@ use File::Basename; use Getopt::Long; use Pod::Usage; -my $VERSION = "20191118"; +my $VERSION = "20191126"; parse_commandline(); @@ -421,7 +421,7 @@ See the GNU General Public License for more details. =head1 VERSION -This document describes B<afm2afm> version 20191118. +This document describes B<afm2afm> version 20191126. =head1 RECENT CHANGES diff --git a/fonts/utilities/fontools/bin/autoinst b/fonts/utilities/fontools/bin/autoinst index 30a6a0f0ed..038769de76 100755 --- a/fonts/utilities/fontools/bin/autoinst +++ b/fonts/utilities/fontools/bin/autoinst @@ -40,7 +40,7 @@ use Getopt::Long (); use Pod::Usage (); use POSIX (); -my $VERSION = '20191118'; +my $VERSION = '20191126'; my ($d, $m, $y) = (localtime time)[3 .. 5]; my $TODAY = sprintf "%04d/%02d/%02d", $y + 1900, $m + 1, $d; @@ -983,7 +983,7 @@ sub make_cmdline { "--encoding=$item->{encoding}[0]", set_targetdirs($item->{font}{family}), '--no-updmap', - ($item->{font}{filename} =~ m/[.]ttf\z/xms + ($item->{font}{filename} =~ m/[.]ttf\z/xmsi ? '--no-type1' : ''), ($SCHEME{$item->{encoding}[0]} @@ -2833,7 +2833,7 @@ GNU General Public License for more details. =head1 VERSION -This document describes B<autoinst> version 20191118. +This document describes B<autoinst> version 20191126. =head1 RECENT CHANGES diff --git a/fonts/utilities/fontools/bin/ot2kpx b/fonts/utilities/fontools/bin/ot2kpx index b26a9c7942..91e34e0fa8 100755 --- a/fonts/utilities/fontools/bin/ot2kpx +++ b/fonts/utilities/fontools/bin/ot2kpx @@ -38,7 +38,7 @@ use Getopt::Long (); use List::Util @List::Util::EXPORT_OK; use Pod::Usage; -my $VERSION = "20191118"; +my $VERSION = "20191126"; our ($NUM_GLYPHS, $UNITS_PER_EM, %kern); @@ -858,7 +858,7 @@ See the GNU General Public License for more details. =head1 VERSION -This document describes B<ot2kpx> version 20191118. +This document describes B<ot2kpx> version 20191126. =head1 RECENT CHANGES diff --git a/fonts/utilities/fontools/bin/splitttc b/fonts/utilities/fontools/bin/splitttc index bf1a34c8a6..44da4eafff 100755 --- a/fonts/utilities/fontools/bin/splitttc +++ b/fonts/utilities/fontools/bin/splitttc @@ -37,7 +37,7 @@ use File::Basename; use Getopt::Long; use Pod::Usage; -my $VERSION = "20191118"; +my $VERSION = "20191126"; parse_commandline(); @@ -245,7 +245,7 @@ See the GNU General Public License for more details. =head1 VERSION -This document describes B<splitttc> version 20191118. +This document describes B<splitttc> version 20191126. =head1 RECENT CHANGES diff --git a/fonts/utilities/fontools/doc/afm2afm.pdf b/fonts/utilities/fontools/doc/afm2afm.pdf Binary files differindex d0fae6082d..436dbc988e 100644 --- a/fonts/utilities/fontools/doc/afm2afm.pdf +++ b/fonts/utilities/fontools/doc/afm2afm.pdf diff --git a/fonts/utilities/fontools/doc/autoinst.pdf b/fonts/utilities/fontools/doc/autoinst.pdf Binary files differindex 5241c03ec7..ec9d0c5124 100644 --- a/fonts/utilities/fontools/doc/autoinst.pdf +++ b/fonts/utilities/fontools/doc/autoinst.pdf diff --git a/fonts/utilities/fontools/doc/ot2kpx.pdf b/fonts/utilities/fontools/doc/ot2kpx.pdf Binary files differindex 101cab415a..25e7b37726 100644 --- a/fonts/utilities/fontools/doc/ot2kpx.pdf +++ b/fonts/utilities/fontools/doc/ot2kpx.pdf diff --git a/fonts/utilities/fontools/doc/splitttc.pdf b/fonts/utilities/fontools/doc/splitttc.pdf Binary files differindex 36ff334aab..a1549ee1f1 100644 --- a/fonts/utilities/fontools/doc/splitttc.pdf +++ b/fonts/utilities/fontools/doc/splitttc.pdf diff --git a/fonts/utilities/fontools/share/fontools_t2a.enc b/fonts/utilities/fontools/share/fontools_t2a.enc index 418cb4990a..06d4c18f6c 100644 --- a/fonts/utilities/fontools/share/fontools_t2a.enc +++ b/fonts/utilities/fontools/share/fontools_t2a.enc @@ -297,7 +297,7 @@ % LIGKERN quoteright quoteright =: quotedblright; % LIGKERN comma comma =: quotedblbase; % LIGKERN less less =: guillemotleft; -% LIGKERN greater greater =: guillemotright4; +% LIGKERN greater greater =: guillemotright; % % LIGKERN || = 32 ; % diff --git a/fonts/utilities/fontools/share/fontools_t2b.enc b/fonts/utilities/fontools/share/fontools_t2b.enc index 3ae126d6c4..1ae0654f48 100644 --- a/fonts/utilities/fontools/share/fontools_t2b.enc +++ b/fonts/utilities/fontools/share/fontools_t2b.enc @@ -297,7 +297,7 @@ % LIGKERN quoteright quoteright =: quotedblright; % LIGKERN comma comma =: quotedblbase; % LIGKERN less less =: guillemotleft; -% LIGKERN greater greater =: guillemotright4; +% LIGKERN greater greater =: guillemotright; % % LIGKERN || = 32 ; % diff --git a/fonts/utilities/fontools/share/fontools_t2c.enc b/fonts/utilities/fontools/share/fontools_t2c.enc index 52f5d1cf96..e2a95aefb2 100644 --- a/fonts/utilities/fontools/share/fontools_t2c.enc +++ b/fonts/utilities/fontools/share/fontools_t2c.enc @@ -297,7 +297,7 @@ % LIGKERN quoteright quoteright =: quotedblright; % LIGKERN comma comma =: quotedblbase; % LIGKERN less less =: guillemotleft; -% LIGKERN greater greater =: guillemotright4; +% LIGKERN greater greater =: guillemotright; % % LIGKERN || = 32 ; % diff --git a/info/ptex-manual/README.md b/info/ptex-manual/README.md index 2fb6a003af..7a4f165607 100644 --- a/info/ptex-manual/README.md +++ b/info/ptex-manual/README.md @@ -7,7 +7,7 @@ This is a project of preparing a manual of Japanese pTeX and e-pTeX. The following documents are maintained by Japanese TeX Development Community: - * ptex-guide-en.pdf: Guide of pTeX and friends (in English) + * ptex-guide-en.pdf: Guide to pTeX and friends (in English) * ptex-manual.pdf: The manual of pTeX. * eptexdoc.pdf: The manual of e-pTeX. * jfm.pdf: Specification of JFM (Japanese Font Metric) format. @@ -36,6 +36,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2019-10-19 +2019-11-26 Japanese TeX Development Community diff --git a/info/ptex-manual/eptexdoc.pdf b/info/ptex-manual/eptexdoc.pdf Binary files differindex 30ef9193c9..4836488c05 100644 --- a/info/ptex-manual/eptexdoc.pdf +++ b/info/ptex-manual/eptexdoc.pdf diff --git a/info/ptex-manual/eptexdoc.tex b/info/ptex-manual/eptexdoc.tex index 62d11cc730..e4e7650324 100644 --- a/info/ptex-manual/eptexdoc.tex +++ b/info/ptex-manual/eptexdoc.tex @@ -28,7 +28,7 @@ %%%%%%%%%%%%%%%% % logos -\newcommand{\OMEGA}{$\Omega$} +\newcommand{\OMEGA}{\texorpdfstring{$\Omega$}{Ω}} \protected\def\epTeX{$\varepsilon$\nobreakdash-\pTeX} \protected\def\eupTeX{$\varepsilon$\nobreakdash-\upTeX} \protected\def\eTeX{$\varepsilon$\nobreakdash-\TeX} @@ -217,7 +217,7 @@ tracing機能やæ¡ä»¶åˆ¤æ–æ–‡ã®å¼·åŒ–ãªã©ã‚ã‚‹ãŒï¼Œãã“ら辺ã¯ãƒ‘ッã 以下,\eTeX 拡張を\pTeX æ‹¡å¼µã¨ãƒžãƒ¼ã‚¸ã™ã‚‹ã«ã‚ãŸã£ã¦èª¿æ•´ã—ãŸç®‡æ‰€ã‚’è¿°ã¹ã‚‹ï¼Ž \begin{cslist} - \csitem[\.{lastnodetype}] + \csitem[\.{lastnodetype} (read-only integer)] \pTeX æ‹¡å¼µã§ã¯ï¼Œ\TeX ã¨æ¯”較ã—ã¦\node{dir\_node}ã¨\node{disp\_node}ã¨ã„ã†2種類ã®ãƒŽãƒ¼ãƒ‰ãŒ è¿½åŠ ã•ã‚ŒãŸï¼Žå‰è€…ã¯ï¼Œç¾åœ¨ã®ãƒªã‚¹ãƒˆã®ä¸ã«é•ã†çµ„æ–¹å‘ã®boxを挿入ã™ã‚‹éš›ã«å¯¸æ³•ã‚’補æ£ã™ã‚‹ãŸã‚ã«ä½œã‚‰ã‚Œï¼Œ \.{hbox}ã‚„\.{vbox}ã®ã‚³ãƒ³ãƒ†ãƒŠã¨ãªã£ã¦ã„る. @@ -241,7 +241,7 @@ tracing機能やæ¡ä»¶åˆ¤æ–æ–‡ã®å¼·åŒ–ãªã©ã‚ã‚‹ãŒï¼Œãã“ら辺ã¯ãƒ‘ッã \item 14&unset node\cr\item 15&math mode nodes\cr \end{multilist}} - \csitem[\.{currentiftype}] + \csitem[\.{currentiftype} (read-only integer)] \ifnum\epTeXversion>190131 %%%%% TL2019-hack æ¡ä»¶åˆ¤æ–æ–‡ã¨ãれを表ã™æ•°å—ã¨ã®å¯¾å¿œã¯ä»¥ä¸‹ã®ã‚ˆã†ã«ãªã£ã¦ã„ã‚‹ (\epTeX~190709以é™ï¼‰ï¼Ž @@ -305,7 +305,7 @@ tracing機能やæ¡ä»¶åˆ¤æ–æ–‡ã®å¼·åŒ–ãªã©ã‚ã‚‹ãŒï¼Œãã“ら辺ã¯ãƒ‘ッã ã®ã‚ˆã†ã«ã‚¨ãƒ©ãƒ¼ãŒå‡ºã‚‹ï¼Ž \end{itemize} - \csitem[\.{iffontchar}] + \csitem[\.{iffontchar} <font> <number>] \begin{itemize} \item 和文フォントã®å ´åˆï¼š \.{iffontchar} <Japanese font> <number>\\ <Japanese font>ã‚’$f$,<number>ã‚’$c$ã¨ãŠãã¨ï¼Œ @@ -355,13 +355,18 @@ fam256d.tex}(本文)ã¨\texttt{fam256p.tex}(preamble部)ã«å¯¾å¿œã™ã‚‹ï extended modeã®æ™‚ã«é™ã‚Šæœ‰åŠ¹ã«ãªã‚‹ï¼Ž \paragraph{æ•°å¼ãƒ•ã‚©ãƒ³ãƒˆåˆ¶é™ã®ç·©å’Œ} -\OMEGA ã®å¤§ããªç‰¹å¾´ã¨ã—ã¦ã¯ï¼Œ\TeX 内部ã®ãƒ‡ãƒ¼ã‚¿æ§‹é€ ã‚’å€ã®é ˜åŸŸã‚’用ã„るよㆠ-ã«æ”¹å¤‰ã—\footnote{詳ã—ã„話ã¯\texttt{texk/web2c/texmfmem.h}ä¸ã®å…±ç”¨ä½“% -\texttt{memoryword}ã®å®šç¾©ã‚’å‚照.大雑把ã«è¨€ã†ã¨ï¼Œ1ã¤ã®ã€Œãƒ¡ãƒ¢ãƒªè¦ç´ ã€ã«2ã¤ã®32\,bitæ•´ -æ•°ã‚’åŒæ™‚ã«æ ¼ç´ã§ãるよã†ã«ãªã£ã¦ã„る.},\TeX ã«å¾“æ¥ã‹ã‚‰å˜åœ¨ã— -ã¦ã„ãŸã€Œ256個制é™ã€ã‚’$2^{16}$個ã«ã¾ã§ç·©å’Œã—ãŸã“ã¨ãŒæŒ™ã’られる.åŒæ§˜ã«ï¼Œ -\OMEGA ã§ã¯ï¼ˆ\cite{yamamoto}ã«ã‚‚ã‚るよã†ã«ï¼‰æ•°å¼ãƒ•ã‚©ãƒ³ãƒˆã‚’åŒæ™‚ã«256個ã¾ã§ -用ã„ã‚‹ã“ã¨ãŒã§ã,å„フォントも65536æ–‡å—ã¾ã§è¨±ã•ã‚Œã‚‹ã‚ˆã†ã«ãªã£ã¦ã„る. +\OMEGA ã®å¤§ããªç‰¹å¾´ã¨ã—ã¦ã¯ï¼Œ\TeX 内部ã®ãƒ‡ãƒ¼ã‚¿æ§‹é€ を改変㗠+\footnote{詳ã—ãã¯\texttt{texk/web2c/texmfmem.h}ä¸ã®å…±ç”¨ä½“% +\texttt{memoryword}ã®å®šç¾©ã‚’å‚照.大雑把ã«è¨€ã†ã¨ï¼Œ +1ã¤ã®ã€Œãƒ¡ãƒ¢ãƒªè¦ç´ ã€ã«2ã¤ã®32\,bitæ•´æ•°ã‚’åŒæ™‚ã«æ ¼ç´ã§ãるよã†ã«ãªã£ã¦ã„る. +ãªãŠï¼Œå°‘ãªãã¨ã‚‚tetex3以é™ã§ã¯\texttt{memoryword}ã¯8ãƒã‚¤ãƒˆã§ã‚ã‚‹ãŒï¼Œ +\TeX 82ã§ã¯1ã¤ã®ã€Œãƒ¡ãƒ¢ãƒªè¦ç´ ã€ã‚’2ã¤ã®32\,bitæ•´æ•°ã¨ã—ã¦ä½¿ã†ã“ã¨ã¯ã—ã¦ã„ãªã„. +% [TODO] æ£ç¢ºã«ã¯ "big TeX" ã‹ã‚‰ã ãŒï¼Œ +% ・big TeX ã¯ã„ã¤ã‹ã‚‰ã‚ã‚‹ã®ã‹ï¼Ÿ ・ãã‚ŒãŒæ¨™æº–ã«ãªã£ãŸã®ã¯ã„ã¤ã‹ã‚‰ï¼Ÿ +}, +\TeX ã«å¾“æ¥ã‹ã‚‰å˜åœ¨ã—ã¦ã„ãŸã„ãã¤ã‹ã®ã€Œ256個制é™ã€ã‚’$2^{16}$個ã«ã¾ã§ç·©å’Œã—ãŸã“ã¨ãŒæŒ™ã’られる. +åŒæ§˜ã«ï¼Œ\OMEGA ã§ã¯ï¼ˆ\cite{yamamoto}ã«ã‚‚ã‚るよã†ã«ï¼‰æ•°å¼ãƒ•ã‚©ãƒ³ãƒˆã‚’ +åŒæ™‚ã«256個ã¾ã§ç”¨ã„ã‚‹ã“ã¨ãŒã§ã,å„フォントも65536æ–‡å—ã¾ã§è¨±ã•ã‚Œã‚‹ã‚ˆã†ã«ãªã£ã¦ã„る. \medskip @@ -389,26 +394,27 @@ extended modeã®æ™‚ã«é™ã‚Šæœ‰åŠ¹ã«ãªã‚‹ï¼Ž ã™ãªã‚ã¡ï¼Œä»¥ä¸‹ã®ãƒ—リミティブãŒè¿½åŠ ã•ã‚Œã¦ã„ã‚‹\footnote{\OMEGA ã§ã¯\bits{8}ã®ã¨ã“ã‚ãŒ\bits{16}ã« ãªã£ã¦ã„る.}. \begin{cslist}[itemsep=\dimexpr-\baselineskip+\medskipamount] -\csitem[\.{omathcode} \bits{8}\texttt{=}\bits{27}]\ -\csitem[\.{omathcode} \bits{8}]\ -\csitem[\.{omathchar} \bits{27}]\ -\csitem[\.{omathaccent} \bits{27}]\ -\csitem[\.{omathchardef} <control sequence>\texttt{=}\bits{27}]\ -\csitem[\.{odelcode} \bits{8}\texttt{=}\bits{27}\ \bits{24}]\ -\csitem[\.{odelimiter} \bits{27}\ \bits{24}]\ -\csitem[\.{oradical} \bits{27}\ \bits{24}]\ + \csitem[\.{omathcode} \bits{8}\texttt{=}\bits{27}]\ + \csitem[\.{omathcode} \bits{8}]\ + \csitem[\.{omathchar} \bits{27}]\ + \csitem[\.{omathaccent} \bits{27}]\ + \csitem[\.{omathchardef} <control sequence>\texttt{=}\bits{27}]\ + \csitem[\.{odelcode} \bits{8}\texttt{=}\bits{27}\ \bits{24}]\ + \csitem[\.{odelimiter} \bits{27}\ \bits{24}]\ + \csitem[\.{oradical} \bits{27}\ \bits{24}]\ \end{cslist} \vspace{-\baselineskip} ã“ã“ã§ï¼Œ27\,bitã¨ã‹24\,bitã®è‡ªç„¶æ•°ã®æ„味ã«ã¤ã„ã¦ã¯ï¼Œä¸Šã®è¡¨ã® \OMEGA ã®è¡Œã‚’å‚ç…§ã—ã¦æ¬²ã—ã„.上ã«æ›¸ã„ãŸå†…部ã®ãƒ‡ãƒ¼ã‚¿æ§‹é€ ã‹ã‚‰æŽ¨æ¸¬ã§ãる通り, -\.{omathchar}ç‰ã®character codeã®æŒ‡å®šã«ä½¿ã‚れる16\,bitã®æ•°å€¤ã®ã†ã¡å®Ÿéš›ã«ä½¿ã‚れるã®ã¯ä¸‹ä½ -8\,bitã§ã‚り,上ä½8\,bitã¯ç„¡è¦–ã•ã‚Œã‚‹ï¼Ž -例ãˆã°ï¼Œ|\omathchar"4012345|ã¨|\omathchar"4010045|ã¯å†…部表ç¾ã¨ã—ã¦ã¯å…¨ãåŒã˜ã§ã‚る. +\.{omathchar}ç‰ã®character codeã®æŒ‡å®šã«ä½¿ã‚れる16\,bitã®æ•°å€¤ã®ã†ã¡ +実際ã«ä½¿ã‚れるã®ã¯ä¸‹ä½8\,bitã§ã‚り,上ä½8\,bitã¯ç„¡è¦–ã•ã‚Œã‚‹ï¼Ž +例ãˆã°ï¼Œ|\omathchar"4012345|ã¨|\omathchar"4010045|ã¯åŒç¾©ã§ã‚る. -ãªãŠï¼Œ|\odelcode|~\bits 8ã¨ã—㦠-delimiter codeã‚’å–å¾—ã—よã†ã¨ã—ã¦ã‚‚,ç¾æ™‚点ã®ãƒ‘ッãƒã§ã¯ï¼Œã†ã¾ã動作ã—ãªã„ -\footnote{51\,bit自然数を返ã•ãªã„ã¨ã„ã‘ãªã„ã§ã™ã‹ã‚‰ããˆï¼Žã‚„ã‚‹æ°—ãŒã‚れ㰠-検討ã—ã¦ã¿ã¾ã™ï¼Ž}. +ãªãŠï¼Œ|\mathcode|~\bits 8ã¨ã—ã¦math code値をå–å¾—ã§ãã‚‹æ–‡å—ã¯ãƒ•ã‚¡ãƒŸãƒªç•ªå·ãŒ16未満ã®ã‚‚ã® +(ã™ãªã‚ã¡ï¼Œ\TeX82ã«ãŠã‘ã‚‹|\mathcode|æ ¼ç´å€¤ã®å½¢å¼ã«å½“ã¦ã¯ã¾ã‚‹ã‚‚ã®ï¼‰ã«é™ã‚‰ã‚Œã‚‹ï¼Ž +delimiter codeã«ã¤ã„ã¦ã‚‚åŒæ§˜ã§ã‚る. +ã•ã‚‰ã«ï¼Œ|\odelcode|~\bits 8ã¨ã—ã¦51\,bitã®å½¢å¼ã®delimiter codeã‚’å–å¾—ã™ã‚‹ã“ã¨ã¯ã§ããªã„ +($-1$ãŒè¿”る). \medskip \LaTeX ã«ãŠã„ã¦æ•°å¼ãƒ•ã‚©ãƒ³ãƒˆã‚’åŒæ™‚ã«16個以上使ã†ã«ã¯ï¼Œ|\omathchar|% @@ -454,7 +460,7 @@ delimiter codeã‚’å–å¾—ã—よã†ã¨ã—ã¦ã‚‚,ç¾æ™‚点ã®ãƒ‘ッãƒã§ã¯ï¼Œã† }. \item |\gluestretchorder|\indcs{gluestretchorder}, |\glueshrinkorder|\indcs{glueshrinkorder}ã®å‹•ä½œã‚’\eTeX ã®ãã‚Œã¨åˆã‚ã›ãŸï¼Ž - 具体的ã«ã¯ï¼Œã‚ã‚‹é©å½“ãªglue~|\someglue|ã®ä¼¸ã³é‡ã‚’<stretch>ã¨ãŠãã¨ã, + 具体的ã«ã¯ï¼Œã‚ã‚‹glue~|\someglue|ã®ä¼¸ã³é‡ã‚’<stretch>ã¨ãŠãã¨ã, \[ \hbox{|\gluestretchorder\someglue|}= \begin{cases} @@ -469,21 +475,23 @@ delimiter codeã‚’å–å¾—ã—よã†ã¨ã—ã¦ã‚‚,ç¾æ™‚点ã®ãƒ‘ッãƒã§ã¯ï¼Œã† \end{itemize} \paragraph{レジスタã«ã¤ã„ã¦} -\OMEGA ã§ã¯ï¼ˆå‰ã«ã‚‚書ã„ãŸãŒï¼‰ãƒ‡ãƒ¼ã‚¿æ§‹é€ ã®å¤‰æ›´ãŒè¡Œã‚れ,ãã‚Œã«ã‚ˆã£ã¦ãƒ¬ã‚¸ -スタãŒå„種類ã‚ãŸã‚Š65536個使ãˆã‚‹ã‚ˆã†ã«ãªã£ã¦ã„る. +\OMEGA ã§ã¯ï¼ˆå‰ã«ã‚‚書ã„ãŸãŒï¼‰ãƒ‡ãƒ¼ã‚¿æ§‹é€ ã®å¤‰æ›´ãŒè¡Œã‚れ,ãã‚Œã«ã‚ˆã£ã¦ãƒ¬ã‚¸ã‚¹ã‚¿ãŒ +å„種類ã‚ãŸã‚Š0番ã‹ã‚‰65535番ã¾ã§ã®65536個を使ãˆã‚‹ã‚ˆã†ã«ãªã£ã¦ã„る. 一方,\eTeX ã§ã¯ï¼Œ256番以é™ã®ãƒ¬ã‚¸ã‚¹ã‚¿ã‚’専用ã®sparse treeã«æ ¼ç´ã™ã‚‹ã“ã¨ã«ã‚ˆã‚Šï¼Œ 32767番ã¾ã§ã®ãƒ¬ã‚¸ã‚¹ã‚¿ã®ä½¿ç”¨ã‚’å¯èƒ½ã«ã—ã¦ã„ãŸï¼Žã“ã®ãƒ„ãƒªãƒ¼æ§‹é€ ã‚’åˆ†æžã—ã¦ã¿ã‚‹ -ã¨ï¼Œ65536個ã¾ã§ãƒ¬ã‚¸ã‚¹ã‚¿ã‚’æ‹¡å¼µã™ã‚‹ã®ã¯ã•ã»ã©é›£ã—ããªã„ã“ã¨ã®ã‚ˆã† -ã«æ€ã‚ã‚ŒãŸï¼Žå…·ä½“çš„ã«ã¯ï¼Œãƒ„リーã®éšŽå±¤ã‚’1ã¤å¢—ã‚„ã—ã¦ã¿ãŸï¼ˆã ã‹ã‚‰ï¼ŒãŠãらã -å„種類ã‚ãŸã‚Š$16\cdot 32768=524288$個ã¾ã§ä½¿ãˆã‚‹ã¨ã¯æ€ã†ãŒï¼Œã“ã‚Œã¯ãã‚ŠãŒæ‚ª -ã„). -ãã“ã§ï¼Œ\epTeX ã§ã¯\eTeX æµã®æ–¹æ³•ã‚’用ã„ãªãŒã‚‰ã‚‚,レジスタを㕠-らã«65536個ã¾ã§å¢—ã‚„ã—ã¦ã„る. +ã¨ï¼Œ65536個ã¾ã§ãƒ¬ã‚¸ã‚¹ã‚¿ã‚’æ‹¡å¼µã™ã‚‹ã®ã¯ã•ã»ã©é›£ã—ããªã„ã“ã¨ãŒåˆ†ã‹ã£ãŸï¼Ž +ãã“ã§ï¼Œ\epTeX ã§ã¯\eTeX æµã®æ–¹æ³•ã‚’用ã„ãªãŒã‚‰ã‚‚, +ツリーã®éšŽå±¤ã‚’1ã¤å¢—ã‚„ã—ã¦ï¼Œãƒ¬ã‚¸ã‚¹ã‚¿(count, dimen, skip, muskip, box, token)ã‚’ +\OMEGA ã¨åŒã˜ã‚ˆã†ã«0番ã‹ã‚‰65535番ã¾ã§ã®65536個を使ãˆã‚‹ã‚ˆã†ã«ã—ãŸï¼Ž +åŒæ§˜ã«ï¼Œãƒžãƒ¼ã‚¯(mark)ã®ã‚¯ãƒ©ã‚¹æ•°ã‚‚32768個ã‹ã‚‰65536個ã¾ã§å¢—ã‚„ã—ã¦ã„る. \section{\hologo{pdfTeX}ç”±æ¥ã®æ©Ÿèƒ½} 開発ä¸ã®\LaTeX 3ã§ã¯ï¼Œ\eTeX æ‹¡å¼µã®ä»–ã«ï¼Œ\hologo{pdfTeX}ã§å°Žå…¥ã•ã‚ŒãŸ -\.{pdfstrcmp}(åˆã¯ãã®åŒç‰å“)ãŒå¿…è¦ã¨ãªã£ã¦ãŠã‚Šï¼Œã‚‚ã¯ã‚„純粋ãª\eTeX ã§ã™ã‚‰ +プリミティブ\.{pdfstrcmp}(ã¾ãŸã¯ãã®åŒç‰å“% +\footnote{\hologo{XeTeX}ã§ã¯\.{strcmp}ã¨ã„ã†å称ã§ï¼Œ +\hologo{LuaTeX}ã§ã¯Luaを用ã„ã¦å®Ÿè£…ã•ã‚Œã¦ã„る.})% +ãŒå¿…è¦ã¨ãªã£ã¦ãŠã‚Šï¼Œã‚‚ã¯ã‚„純粋ãª\eTeX ã§ã™ã‚‰ \LaTeX 3を利用ã™ã‚‹ã“ã¨ã¯ã§ããªã„状æ³ã§ã‚ã‚‹ (\cite{expl31,expl32,expl33}). ãã®ä»–ã«ã‚‚,\hologo{pdfTeX}ç”±æ¥ã®ã„ãã¤ã‹ã®ãƒ—リミティブ(\cite{pdftexman})ã®å®Ÿè£…㌠日本ã®\TeX ユーザã‹ã‚‰ã‚り, @@ -496,7 +504,7 @@ delimiter codeã‚’å–å¾—ã—よã†ã¨ã—ã¦ã‚‚,ç¾æ™‚点ã®ãƒ‘ッãƒã§ã¯ï¼Œã† \csitem [\.{pdfstrcmp} <general text> <general text>] 2ã¤ã®å¼•æ•°ã‚’æ–‡å—列化ã—ãŸã‚‚ã®ã‚’å…ˆé ãƒã‚¤ãƒˆã‹ã‚‰æ¯”較ã—, çµæžœã‚’$-1$(第1引数ã®æ–¹ãŒå…ˆï¼‰ï¼Œ0(ç‰ã—ã„),1(第2引数ã®æ–¹ãŒå…ˆï¼‰ã¨ã—ã¦æ–‡å—列ã§è¿”ã™ï¼Ž - + 比較ã™ã‚‹æ–‡å—列ä¸ã«å’Œæ–‡æ–‡å—ãŒã‚ã‚‹å ´åˆã«ã¯ï¼Œï¼ˆ\epTeX ã®å†…部漢å—コードã«ã‹ã‹ã‚らãšï¼‰ UTF-8ã§ç¬¦å·åŒ–ã—ã¦æ¯”較ã™ã‚‹ï¼Ž ãã®ãŸã‚,例ãˆã° @@ -512,17 +520,20 @@ delimiter codeã‚’å–å¾—ã—よã†ã¨ã—ã¦ã‚‚,ç¾æ™‚点ã®ãƒ‘ッãƒã§ã¯ï¼Œã† |\UseRawInputEncoding|ã®å®Ÿè¡ŒãŒå¿…è¦ã«ãªã‚‹ï¼Ž }. - \csitem[\.{pdfpagewidth}, \.{pdfpageheight}] + \csitem[\.{pdfpagewidth}, \.{pdfpageheight} (dimension)] ページã®ã€Œå¹…ã€ã€Œé«˜ã•ã€ã‚’表ã™å†…部長ã•ã§ã‚ã‚‹ãŒï¼Œ \emph{ã“ã“ã§è¨€ã†ã€Œå¹…ã€ã¯ã€Œå—é€ã‚Šæ–¹å‘ã€ã®ã“ã¨ã§ã¯ãªã,物ç†çš„ãªæ„味ã§ã‚ã‚‹}. ã“ã®2ã¤ã®å†…部長ã•ã‚’è¨å®šã™ã‚‹ã ã‘ã§ã¯dviã«ä½•ã®å½±éŸ¿ã‚‚与ãˆãªã„. - ã™ã後ã§è¿°ã¹ã‚‹\.{pdflastxpos}, \.{pdflastypos}ã«ã‚ˆã‚‹å‡ºåŠ›ä½ç½®ã®å–å¾— + 後ã§è¿°ã¹ã‚‹\.{pdflastxpos}, \.{pdflastypos}ã«ã‚ˆã‚‹å‡ºåŠ›ä½ç½®ã®å–å¾— ã®éš›ã®åŽŸç‚¹ä½ç½®ã‚’è¨å®šã™ã‚‹ãŸã‚ã ã‘ã«ä½¿ã‚れ,åˆæœŸå€¤ã¯0ã§ã‚る. + \csitem[\.{readpapersizespecial} (integer)] + \pTeX 系列ã§ã¯ï¼Œ 用紙サイズã®æŒ‡å®šã«ã¯ä¼çµ±çš„ã«papersize specialãŒåˆ©ç”¨ã•ã‚Œã¦ããŸï¼Žãれを考慮ã—ã¦ï¼Œ + 本内部整数\.{readpapersizespecial}(既定値ã¯1)ãŒæ£ã®å ´åˆã¯ papersize specialãŒdviä¸ã«æ›¸ã出ã•ã‚Œã‚‹æ™‚,\epTeX ã«ã¯ãã®å†…容を解釈ã—㦠- 自動的ã«\.{pdfpagewidth}, \.{pdfpageheight}ã®å€¤ã‚’è¨å®šã™ã‚‹æ©Ÿèƒ½ãŒã‚ã‚‹ + 自動的ã«\.{pdfpagewidth}, \.{pdfpageheight}ã®å€¤ã‚’è¨å®šã™ã‚‹ \footnote{% papersize specialã§æŒ‡å®šã—ãŸé•·ã•ã¯å¸¸ã«\texttt{true}付ãã§è§£é‡ˆã™ã‚‹ã®ãŒæ…£ç¿’㨠ãªã£ã¦ã„ã‚‹ãŒï¼Œ\epTeX~180901よりå‰ã§ã¯\texttt{true}ãªã—ã®å¯¸æ³•ã¨ã—ã¦è§£é‡ˆã™ã‚‹ã¨ã„ㆠ@@ -533,7 +544,7 @@ delimiter codeã‚’å–å¾—ã—よã†ã¨ã—ã¦ã‚‚,ç¾æ™‚点ã®ãƒ‘ッãƒã§ã¯ï¼Œã† \def\<#1>{\langle\mbox{#1}\rangle} \begin{align*} \<special> &\longrightarrow \texttt{papersize=}\<length>\texttt{,}\<length>\\ - \<length> &\longrightarrow \<decimal> + \<length> &\longrightarrow \<decimal> \<optional~\texttt{true}>\<physical unit>\\ \<decimal> &\longrightarrow \texttt{.} \mid \<digit>\<decimal> \mid \<decimal>\<digit> @@ -541,12 +552,13 @@ delimiter codeã‚’å–å¾—ã—よã†ã¨ã—ã¦ã‚‚,ç¾æ™‚点ã®ãƒ‘ッãƒã§ã¯ï¼Œã† è² ã®ç¬¦å·ã‚„å°æ•°ç‚¹ã¨ã—ã¦ã®ã€Œ\texttt{,}ã€ï¼Œãã—ã¦ä¸€åˆ‡ã®ç©ºç™½ã‚’許容ã—ãªã„ã¨ã“ã‚㫠注目ã—ã¦ã»ã—ã„.ã¾ãŸï¼Œ\texttt{zw},~\texttt{zh},~\texttt{em},~\texttt{ex}ã¨ã„ㆠç¾åœ¨ã®ãƒ•ã‚©ãƒ³ãƒˆã«ä¾å˜ã™ã‚‹å˜ä½ã‚‚使用ä¸å¯èƒ½ã§ã‚る. - }.\epTeX~180901よりå‰ã§ã¯ã“ã®æ©Ÿèƒ½ã¯å¸¸ã«æœ‰åŠ¹ - ã§ã‚ã£ãŸãŒï¼Œ\epTeX~180901以é™ã§ã¯å†…部整数 - \.{readpapersizespecial}\indcs{readpapersizespecial}(既定値ã¯1)ãŒæ£ã®å ´åˆã®ã¿æœ‰åŠ¹ã¨ãªã‚‹ï¼Ž - - \csitem[\.{pdflastxpos}, \.{pdflastypos}] - \.{pdfsavepos}\indcs{pdfsavepos}ãŒç½®ã‹ã‚ŒãŸå ´æ‰€ã®ï¼Œdviã«ãŠã‘る出力ä½ç½®ã‚’è¿”ã™å†…部整数(èªã¿å–り専用). + }. + + ã“ã®ãƒ—リミティブã¯\epTeX~180901ã§è¿½åŠ ã•ã‚ŒãŸï¼Žãれよりå‰ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã§ã¯ + å‰æ®µè½ã§è¿°ã¹ãŸæ©Ÿèƒ½ã¯å¸¸ã«æœ‰åŠ¹ã§ã‚ã£ãŸï¼Ž + + \csitem[\.{pdflastxpos}, \.{pdflastypos} (read-only integer)] + \.{pdfsavepos}\indcs{pdfsavepos}ãŒç½®ã‹ã‚ŒãŸå ´æ‰€ã®ï¼Œdviã«ãŠã‘る出力ä½ç½®ã‚’è¿”ã™å†…部整数. 原点ã¯ãƒšãƒ¼ã‚¸ã®ï¼ˆç‰©ç†çš„ãªæ„味ã®ï¼‰å·¦ä¸‹éš…ã§ã‚り,$y$軸ã¯ï¼ˆç‰©ç†çš„ãªï¼‰ä¸Šæ–¹å‘ã«å‘ã‹ã£ã¦å¢—åŠ ã™ã‚‹ï¼Ž \begin{itemize} \item ページã®ç‰©ç†çš„ãªå¹…ã¨é«˜ã•ã¯ã™ã上ã®\.{pdfpagewidth}, \.{pdfpageheight}ã§è¨å®šã™ã‚‹ï¼Ž @@ -561,7 +573,7 @@ delimiter codeã‚’å–å¾—ã—よã†ã¨ã—ã¦ã‚‚,ç¾æ™‚点ã®ãƒ‘ッãƒã§ã¯ï¼Œã† 移動ã—ãŸã¨ã“ã‚ã«ãªã‚‹ \footnote{ã“ã‚Œã¯\hologo{pdfTeX}ã®dviモードや\hologo{XeTeX}ã¨åŒã˜æŒ™å‹•ã§ã‚る.}. \end{itemize} - + \csitem[\.{pdfcreationdate}] エンジン起動時ã®æ™‚刻を,\texttt{\pdfcreationdate}ã®å½¢å¼ã§è¡¨ã—ãŸæ–‡å—列ã«å±•é–‹ã™ã‚‹ï¼Ž 末尾ã«|+09'00'|ãªã©ã¨è¡¨ç¤ºã•ã‚Œã‚‹ã®ã¯ãƒãƒ¼ã‚«ãƒ«ã®ã‚¿ã‚¤ãƒ ゾーンã§ã‚ã‚‹ãŒï¼Œ @@ -580,24 +592,24 @@ delimiter codeã‚’å–å¾—ã—よã†ã¨ã—ã¦ã‚‚,ç¾æ™‚点ã®ãƒ‘ッãƒã§ã¯ï¼Œã† ãã‚Œãžã‚Œ<filename>ã®æ›´æ–°æ™‚刻(\.{pdfcreationdate}ã¨åŒã˜å½¢å¼ï¼‰ã¨ ファイルサイズを表ã™æ–‡å—列ã«å±•é–‹ã™ã‚‹ï¼Ž ã“れらも\Pkg{standalone}パッケージã®ãŸã‚ã«\epTeX ã«å®Ÿè£…ã•ã‚ŒãŸãƒ—リミティブã§ã‚る. - + \csitem[\.{pdffiledump} \textrm{[}\texttt{offset} <offset>\textrm{]}% \ \texttt{length} <length> <filename>] <filename>ã§ä¸Žãˆã‚‰ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«åã®<offset>ãƒã‚¤ãƒˆç›®ï¼ˆå…ˆé ã¯0)ã‹ã‚‰<length>ãƒã‚¤ãƒˆã‚’èªã¿è¾¼ã¿ï¼Œ 16進表記(大文å—)ã—ãŸã‚‚ã®ã«å±•é–‹ã•ã‚Œã‚‹ï¼Ž - + 本プリミティブã¯Heiko Oberdiekæ°ã«ã‚ˆã‚‹\Pkg{bmpsize}パッケージを\epTeX ã§ã‚‚使ã†ãŸã‚㫠角藤ã•ã‚“ãŒå®Ÿè£…ã—ãŸã‚‚ã®ã§ã‚ã‚‹(2014/05/06). - - \csitem[\.{pdfshellescape}] - \.{write18}ã«ã‚ˆã‚‹shell-escapeãŒåˆ©ç”¨å¯èƒ½ã«ãªã£ã¦ã„ã‚‹ã‹ã‚’示ã™å†…部整数(èªã¿å–り専用). + + \csitem[\.{pdfshellescape} (read-only integer)] + \.{write18}ã«ã‚ˆã‚‹shell-escapeãŒåˆ©ç”¨å¯èƒ½ã«ãªã£ã¦ã„ã‚‹ã‹ã‚’示ã™å†…部整数. 0ãªã‚‰ã°ä¸è¨±å¯ï¼Œ1ãªã‚‰ã°è¨±å¯ï¼Œ2ãªã‚‰ã°restricted shell-escape% \footnote{ã‚らã‹ã˜ã‚「安全ã€ã¨èªã‚られãŸãƒ—ãƒã‚°ãƒ©ãƒ (\texttt{texmf.cnf}ä¸ã§æŒ‡å®šã™ã‚‹ï¼‰ ã®ã¿å®Ÿè¡Œã‚’許å¯ã™ã‚‹ä»•çµ„ã¿ï¼Ž}% ã§ã‚る. - + 本プリミティブã¯\TeX ユーザã®é›†ã„2014ã§ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’å—ã‘ã¦å®Ÿè£…ã•ã‚ŒãŸ(\cite{pdfse}). - + \csitem[\.{pdfmdfivesum} {[\texttt{file}]} <general text>] 引数<general text>ã®MD5ãƒãƒƒã‚·ãƒ¥å€¤ã‹ï¼Œã‚ã‚‹ã„ã¯\texttt{file}ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã¯ ファイルåãŒ<general text>ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®MD5ãƒãƒƒã‚·ãƒ¥å€¤ã‚’計算ã™ã‚‹ï¼Ž @@ -607,8 +619,8 @@ delimiter codeã‚’å–å¾—ã—よã†ã¨ã—ã¦ã‚‚,ç¾æ™‚点ã®ãƒ‘ッãƒã§ã¯ï¼Œã† ã“ã®ãƒ—リミティブã¯\cite{xe5}以é™ã®è°è«–ã‚’å…ƒã«ï¼Œè§’è—¤ã•ã‚“ãŒãƒªã‚¯ã‚¨ã‚¹ãƒˆã—ãŸã‚‚ã®ã§ï¼Œ 2015/07/04ã«\epTeX ã«å®Ÿè£…ã•ã‚Œã¦ã„る. - - \csitem[\.{pdfpritimive}, \.{ifpdfprimitive}] + + \csitem[\.{pdfpritimive} <control sequence>, \.{ifpdfprimitive} <control sequence>] \.{pdfprimitive}ã¯æ¬¡ã«ç¶šã制御綴ãŒãƒ—リミティブã¨åŒã˜å称ã§ã‚ã£ãŸå ´åˆã«ï¼Œ プリミティブ本æ¥ã®æ„味ã§å®Ÿè¡Œã•ã›ã‚‹ã‚‚ã®ã§ã‚る.例ãˆã° \begin{verbatim} @@ -620,20 +632,21 @@ delimiter codeã‚’å–å¾—ã—よã†ã¨ã—ã¦ã‚‚,ç¾æ™‚点ã®ãƒ‘ッãƒã§ã¯ï¼Œã† ã“れらã®ãƒ—リミティブã¯2015/07/15版ã®\Pkg{expl3}パッケージã§ä½¿ã‚れ㟠(\cite{15715})ã“ã¨ã‚’å—ã‘ã¦å®Ÿè£…ã•ã‚ŒãŸã‚‚ã®ã ãŒï¼Œ - ç¾åœ¨ã§ã¯ã“れらã®ãƒ—リミティブã¯ä½¿ã‚ã‚Œã¦ã„ãªã„. + ç¾åœ¨ã§ã¯\Pkg{expl3}パッケージã§ã¯ã“れらã®ãƒ—リミティブã¯è¦æ±‚ã—ã¦ã„ãªã„. \csitem[\.{pdfuniformdeviate} <number>, \.{pdfnormaldeviate}] \.{pdfuniformdeviate}ã¯ï¼Œ0以上<number>未満ã®ä¸€æ§˜åˆ†å¸ƒã«å¾“ã†ä¹±æ•°ï¼ˆæ•´æ•°å€¤ï¼‰ã‚’生æˆã™ã‚‹ï¼Ž \.{pdfnormaldeviate}ã¯ï¼Œå¹³å‡å€¤0,標準åå·®65536ã®æ£è¦åˆ†å¸ƒã«å¾“ã†ä¹±æ•°ï¼ˆæ•´æ•°å€¤ï¼‰ã‚’生æˆã™ã‚‹ï¼Ž - - ç¾åœ¨ã®ä¹±æ•°ç”Ÿæˆã®ç¨®ã®å€¤ã¯ï¼Œ\.{pdfrandomseed}\indcs{pdfrandomseed}ã§å–å¾—ã§ãる(èªã¿å–り専用). - 種ã®åˆæœŸåŒ–ã«ã¯ã‚·ã‚¹ãƒ†ãƒ ã®ãƒžã‚¤ã‚¯ãƒç§’å˜ä½ã§ã®ç¾åœ¨æ™‚åˆ»æƒ…å ±ãŒä½¿ã‚れる.ã¾ãŸï¼Œç¨®ã®å€¤ã¯ - \.{pdfsetrandomseed} <number>\indcs{pdfsetrandomseed}ã«ã‚ˆã£ã¦ç‰¹å®šã®å€¤ã«è¨å®šå¯èƒ½ã§ã‚る. - - \LaTeX3ã®l3fpã«ãŠã„ã¦ï¼Œ2016/11/12ã‚ãŸã‚Šã‹ã‚‰å®Ÿè£…ã•ã‚ŒãŸä¹±æ•°ç”Ÿæˆæ©Ÿèƒ½(\cite{random})ã‚’ + + \csitem[\.{pdfrandomseed} (read-only integer), \.{pdfsetrandomseed} <number>] + 乱数生æˆã®ç¨®ã®å€¤ã¯ï¼Œ\.{pdfrandomseed}ã§å–å¾—ã§ãる. + 種ã®åˆæœŸåŒ–ã«ã¯ã‚·ã‚¹ãƒ†ãƒ ã®ãƒžã‚¤ã‚¯ãƒç§’å˜ä½ã§ã®ç¾åœ¨æ™‚åˆ»æƒ…å ±ãŒä½¿ã‚れる.ã¾ãŸï¼Œç¨®ã®å€¤ã‚’ + è¨å®šã™ã‚‹ã«ã¯\.{pdfsetrandomseed}ã«å¼•æ•°ã¨ã—ã¦æ¸¡ã›ã°è‰¯ã„. + + \LaTeX3ã®\Pkg{l3fp}ã«ãŠã„ã¦ï¼Œ2016/11/12ã‚ãŸã‚Šã‹ã‚‰å®Ÿè£…ã•ã‚ŒãŸä¹±æ•°ç”Ÿæˆæ©Ÿèƒ½(\cite{random})ã‚’ サãƒãƒ¼ãƒˆã™ã‚‹ãŸã‚ã«\epTeX~161114ã‹ã‚‰å®Ÿè£…ã•ã‚ŒãŸï¼Ž - \csitem[\.{pdfelapsedtime}, \.{pdfresettimer}] + \csitem[\.{pdfelapsedtime} (read-only integer), \.{pdfresettimer}] \.{pdfelapsedtime}ã¯ï¼Œã‚¨ãƒ³ã‚¸ãƒ³èµ·å‹•ã‹ã‚‰ã®çµŒéŽæ™‚é–“ã‚’``scaled seconds''ã™ãªã‚ã¡ $1/65536$秒å˜ä½ã§è¿”ã™ï¼Žã“ã®å€¤ã¯\.{pdfresettimer}ã«ã‚ˆã£ã¦å†ã³0ã«ãƒªã‚»ãƒƒãƒˆã§ãる. ã™ã上ã®ä¹±æ•°ç”Ÿæˆãƒ—リミティブã¨åŒæ™‚ã«å®Ÿè£…ã•ã‚ŒãŸï¼Ž @@ -648,19 +661,20 @@ delimiter codeã‚’å–å¾—ã—よã†ã¨ã—ã¦ã‚‚,ç¾æ™‚点ã®ãƒ‘ッãƒã§ã¯ï¼Œã† \epTeX~180518以é™ã§åˆ©ç”¨å¯èƒ½ã§ã‚る. \ifnum\epTeXversion>190131 %%%%% TL2019-hack - \csitem[\.{ifincsname}] + \csitem[\.{ifincsname}] \texttt{\.{csname}~...~\.{endcsname}}内ã§è©•ä¾¡ã•ã‚ŒãŸã¡ã‚‡ã†ã©ãã®æ™‚ã«çœŸã¨ãªã‚‹ï¼Ž \LaTeX~2019-10-01ã§è¡Œã‚れる変更(\cite{latex95,tjb83})ã§å¿…è¦ã«ãªã£ãŸãŸã‚ã« \epTeX~190709ã§å°Žå…¥ã•ã‚ŒãŸï¼Ž \fi %%%%% TL2019 \end{cslist} + \section{ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç•ªå·} \pTeX~p3.8.0ã«\.{ptexversion}ãŒå®Ÿè£…ã•ã‚ŒãŸã®ã¨åŒæ™‚ã«ï¼Œ\epTeX ã§ã‚‚ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç•ªå·ã‚’ å–å¾—ã™ã‚‹\.{epTeXversion}プリミティブãŒ\epTeX~180121ã‹ã‚‰è¿½åŠ ã•ã‚ŒãŸï¼Ž \begin{cslist} - \csitem[\.{epTeXversion}] + \csitem[\.{epTeXversion} (read-only integer)] \epTeX ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç•ªå·ï¼ˆä¾‹ãˆã°\the\epTeXversion)を内部整数ã§è¿”ã™ï¼Ž\epTeX 起動時ã®ãƒãƒŠãƒ¼ã§ã¯ \eTeX, \pTeX ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç•ªå·ã‚‚表示ã•ã‚Œã‚‹ã®ã§ï¼Œãれをå†ç¾ã—よã†ã¨ã™ã‚‹ã¨ä»¥ä¸‹ã®ã‚ˆã†ã«ãªã‚‹ï¼Ž \begin{verbatim} @@ -668,8 +682,6 @@ This is e-pTeX, Version 3.14159265-% p\number\ptexversion.\number\ptexminorversion\ptexrevision-% \number\epTeXversion-\number\eTeXversion\eTeXrevision ... \end{verbatim} - - \end{cslist} @@ -707,17 +719,20 @@ min10フォントメトリックã§ã€Œã¡ã‚‡ã£ã¨ã€ã‚’組むã¨ã€Œã‚‡ã£ã€ã® 改善ã™ã‚‹åŠ©ã‘ã«ãªã‚‹ã“ã¨ã‚’目指ã—ã¦å®Ÿè£…ã•ã‚ŒãŸï¼Ž \begin{cslist} - \csitem[\.{lastnodechar}] - ç¾åœ¨æ§‹ç¯‰ä¸ã®ãƒªã‚¹ãƒˆã®ã€Œæœ€å¾Œã®ãƒŽãƒ¼ãƒ‰ã€ãŒæ–‡å—ç”±æ¥ã§ã‚ã‚Œã°ï¼Œãã®ã‚³ãƒ¼ãƒ‰ç•ªå·ï¼ˆå†…部コード)を内部整数ã¨ã—ã¦è¿”ã™ï¼Ž - + \csitem[\.{lastnodechar} (read-only integer)] + ç¾åœ¨æ§‹ç¯‰ä¸ã®ãƒªã‚¹ãƒˆã®ã€Œæœ€å¾Œã®ãƒŽãƒ¼ãƒ‰ã€ãŒæ–‡å—ç”±æ¥ã§ã‚ã‚Œã°ï¼Œ + ãã®ã‚³ãƒ¼ãƒ‰ç•ªå·ï¼ˆå†…部コード)を内部整数ã¨ã—ã¦è¿”ã™ï¼Ž + 上記「最後ã®ãƒŽãƒ¼ãƒ‰ã€ã§ã¯ï¼Œ\pTeX ã«ã‚ˆã£ã¦è‡ªå‹•æŒ¿å…¥ã•ã‚Œã‚‹ \begin{itemize} \item JFMã«ã‚ˆã£ã¦å…¥ã‚‹ã‚°ãƒ«ãƒ¼ \item 行末ç¦å‰‡å‡¦ç†ã®ãŸã‚ã«æŒ¿å…¥ã•ã‚Œã‚‹ãƒšãƒŠãƒ«ãƒ†ã‚£ \item 欧文文å—ã®ãƒ™ãƒ¼ã‚¹ãƒ©ã‚¤ãƒ³è£œæ£ç”¨ã®ãƒŽãƒ¼ãƒ‰ \end{itemize} - ã¯ç„¡è¦–ã•ã‚Œã‚‹ï¼Žã¾ãŸï¼Œã€Œæœ€å¾Œã®ãƒŽãƒ¼ãƒ‰ã€ãŒæ¬§æ–‡æ–‡å—ã®ãƒªã‚¬ãƒãƒ£ã§ã‚ã£ãŸå ´åˆã¯ï¼Œãƒªã‚¬ãƒãƒ£ãれ自身ã®ã‚³ãƒ¼ãƒ‰ç•ªå·ã§ã¯ãªã, - 最後ã®æ§‹æˆè¦ç´ ã®æ–‡å—ã®ã‚³ãƒ¼ãƒ‰ç•ªå·ã‚’è¿”ã™ï¼Žã€Œæœ€å¾Œã®ãƒŽãƒ¼ãƒ‰ã€ãŒæ–‡å—を表ã™ã‚‚ã®ã§ãªã‹ã£ãŸå ´åˆã¯ï¼Œ$-1$ãŒè¿”る. + ã¯ç„¡è¦–ã•ã‚Œã‚‹ï¼Žã¾ãŸï¼Œã€Œæœ€å¾Œã®ãƒŽãƒ¼ãƒ‰ã€ãŒæ¬§æ–‡æ–‡å—ã®ãƒªã‚¬ãƒãƒ£ã§ã‚ã£ãŸå ´åˆã¯ï¼Œ + リガãƒãƒ£ãれ自身ã®ã‚³ãƒ¼ãƒ‰ç•ªå·ã§ã¯ãªã, + 最後ã®æ§‹æˆè¦ç´ ã®æ–‡å—ã®ã‚³ãƒ¼ãƒ‰ç•ªå·ã‚’è¿”ã™ï¼Ž + 「最後ã®ãƒŽãƒ¼ãƒ‰ã€ãŒæ–‡å—を表ã™ã‚‚ã®ã§ãªã‹ã£ãŸå ´åˆã¯ï¼Œ$-1$ãŒè¿”る. \end{cslist} 例ãˆã°ï¼Œ\.{lastnodechar}を使ã£ã¦ @@ -735,7 +750,6 @@ min10フォントメトリックã§ã€Œã¡ã‚‡ã£ã¨ã€ã‚’組むã¨ã€Œã‚‡ã£ã€ã® }ãŒå¾—られる.ã“ã‚Œã«ã‚ˆã£ã¦ï¼Œ\.{textmc}ç‰ã®å‘½ä»¤ã®ç›´å‰ã®æ–‡å—を知るã“ã¨ãŒã§ãã‚‹ã®ã§ï¼Œ ã‚ã¨ã¯\TeX マクãƒå´ã§ãªã‚“ã¨ã‹ã§ãã‚‹ã ã‚ã†ï¼Œã¨ã„ã†ç›®è«–見ã§ã‚る. - ã¾ãŸï¼Œä¸Šè¨˜ã®èª¬æ˜Žã«ã‚ã‚‹ã¨ãŠã‚Šï¼Œ \begin{verbatim} abcfi\the\lastnodechar, abc\char"1C \the\lastnodechar @@ -770,11 +784,12 @@ abcfi\the\lastnodechar, abc\char"1C \the\lastnodechar \begin{verbatim} ã“ã‚Œã¯ï¼Œ\relax\sffamily{}\the\lastnodechar\textmc{『ã»ã’党宣言ã€}…… \end{verbatim} -ãªã©ã¨ãƒŽãƒ¼ãƒ‰ã«é–¢ä¿‚ã—ãªã„ã‚‚ã®ãŒé€”ä¸ã«ã‚ã£ã¦ã‚‚,ãã‚Œã¯å˜ç´”ã«ç„¡è¦–ã•ã‚Œã¦ +ã®ã‚ˆã†ã«ãƒŽãƒ¼ãƒ‰ã‚’作らãªã„\.{relax}, |{}|, \.{sffamily}ãªã©ãŒé€”ä¸ã«ã‚ã£ã¦ã‚‚, +ãれらã¯å˜ç´”ã«ç„¡è¦–ã•ã‚Œã¦ \begin{quote} ã“ã‚Œã¯ï¼Œ\relax\sffamily{}\the\lastnodechar\textmc{『ã»ã’党宣言ã€}…… \end{quote} -ã¨ãªã‚‹ï¼Ž +ã¨ã€Œï¼Œã€ã®å†…部コードãŒå–å¾—ã•ã‚Œã‚‹ï¼Ž \section{\.{lastnodesubtype}プリミティブ} \cite{tjb28,plt63}ãªã©ã®è°è«–ã§ï¼Œã€Œæœ€å¾Œã®ã‚°ãƒ«ãƒ¼ãŒJFMグルーã ã‘\.{unskip}ã™ã‚‹ã€å‡¦ç†ã®å¿…è¦æ€§ãŒ @@ -783,13 +798,13 @@ abcfi\the\lastnodechar, abc\char"1C \the\lastnodechar ãã®ãŸã‚,\epTeX~180226ã§\.{lastnodesubtype}ãƒ—ãƒªãƒŸãƒ†ã‚£ãƒ–ã‚’è¿½åŠ ã—ãŸï¼Ž \begin{cslist} - \csitem[\.{lastnodesubtype}] - ç¾åœ¨æ§‹ç¯‰ä¸ã®ãƒªã‚¹ãƒˆã®ã€Œæœ€å¾Œã®ãƒŽãƒ¼ãƒ‰ã€ï¼ˆ\.{lastnodechar}プリミティブã¨åŒæ§˜ï¼‰ã® - subtype値を内部整数ã¨ã—ã¦è¿”ã™ï¼Ž -\begin{itemize} - \item 「最後ã®ãƒŽãƒ¼ãƒ‰ã€ãŒæ–‡å—ノードã®ã¨ãã¯0ãŒè¿”る. - \item ç¾åœ¨æ§‹ç¯‰ä¸ã®ãƒªã‚¹ãƒˆãŒç©ºã®ã¨ãã¯$-1$ãŒè¿”る. -\end{itemize} + \csitem[\.{lastnodesubtype} (read-only integer)] + ç¾åœ¨æ§‹ç¯‰ä¸ã®ãƒªã‚¹ãƒˆã®ã€Œæœ€å¾Œã®ãƒŽãƒ¼ãƒ‰ã€ï¼ˆ\.{lastnodechar}プリミティブã¨åŒæ§˜ï¼‰ã® + subtype値を内部整数ã¨ã—ã¦è¿”ã™ï¼Ž + \begin{itemize} + \item 「最後ã®ãƒŽãƒ¼ãƒ‰ã€ãŒæ–‡å—ノードã®ã¨ãã¯0ãŒè¿”る. + \item ç¾åœ¨æ§‹ç¯‰ä¸ã®ãƒªã‚¹ãƒˆãŒç©ºã®ã¨ãã¯$-1$ãŒè¿”る. + \end{itemize} \end{cslist} 実際ã«æœ‰ç”¨ãªã®ã¯ï¼Œä»¥ä¸‹ã®å ´åˆã§ã‚ã‚ã†ï¼š @@ -872,17 +887,148 @@ abcfi\the\lastnodechar, abc\char"1C \the\lastnodechar \cite{eptexinputenc}ã‚’å‚ç…§ã—ã¦ã»ã—ã„ãŒï¼ŒãŠãŠã¾ã‹ã«è¿°ã¹ã‚‹ã¨ä»¥ä¸‹ã®ã‚ˆã†ã«ãªã‚‹ã ã‚ã†ï¼Ž \begin{cslist} - \csitem[\.{epTeXinputencoding} <encoding>] + \csitem[\.{epTeXinputencoding} <encoding>] ç¾åœ¨èªã¿è¾¼ã‚“ã§ã„るファイルã®æ–‡å—コードを<encoding>ã«å¤‰æ›´ã™ã‚‹ï¼Ž 実際ã«å¤‰æ›´ã•ã‚Œã‚‹ã®ã¯ã€Œæ¬¡ã®è¡Œã€ã§ã‚り,ã¾ãŸç¾åœ¨ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‹ã‚‰ã•ã‚‰ã«\.{input}ç‰ã§ èªã¾ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã«ã¯åŠ¹åŠ›ã‚’åŠã¼ã•ãªã„. + + 引数<encoding>ã®èªã¿å–ã‚Šã¯ï¼Œ + (\LaTeX ã§å®šç¾©ãŒä¸Šæ›¸ãã•ã‚Œã¦ã„ãªã„,プリミティブã®ï¼‰\.{input}ã®å¼•æ•°ï¼ˆãƒ•ã‚¡ã‚¤ãƒ«å)を + å–å¾—ã™ã‚‹ã®ã¨åŒã˜ãƒ«ãƒ¼ãƒãƒ³ãŒç”¨ã„られる. + ãã®ãŸã‚, +\begin{verbatim} +\epTeXinputencoding sjis +\end{verbatim} + ã®ã‚ˆã†ã«ï¼Œ<encoding>ã¯|{}|ã§å›²ã¾ãªã„ã“ã¨ï¼Ž <encoding>ã®æœ«å°¾ã¯ï¼Œç©ºç™½ãƒˆãƒ¼ã‚¯ãƒ³ã‚„展開ä¸èƒ½ãƒˆãƒ¼ã‚¯ãƒ³ã«ã‚ˆã£ã¦åŒºåˆ‡ã‚‰ã‚Œã‚‹ï¼Ž - % [TODO] ã“ã‚Œã§åˆã£ã¦ã„ã¾ã™ã‹ï¼Ÿ -- aminophen + % scan_file_name ã§<encoding> ã‚’å–å¾—ã—ã¦ã„ã‚‹ã®ã§ï¼Œ + % \epTeXinputencoding "euc" \epTeXinputencoding ""e""u""c"" ã‚‚ OK. <encoding>ã®å€¤ã¯ï¼ŒåŸºæœ¬çš„ã«ã¯\pTeX ã®\texttt{-kanji}オプションã§æŒ‡å®šã§ãる値 (\texttt{euc}, \texttt{sjis}, \texttt{jis}, \texttt{utf8})ã§ã‚る. + 大文å—å°æ–‡å—ã¯è€ƒæ…®ã—ãªã„(\TeX ã®\.{uccode}, \.{lccode}ã¯å‚ç…§ã—ãªã„). + % BINARY, ISO-2022-JP, EUC-JP, Shift_JIS, UTF-8 (, uptex) ã‚‚ OK + % ptexenc å´ã§ strcasecmp ã§æ¯”較ã—ã¦ã„ã‚‹ã®ã§ï¼Œå¤§æ–‡å—・å°æ–‡å—ã®åŒºåˆ¥ã¯ã—ãªã„ + % (\uccode, \lccode ã¯å‚ç…§ã—ãªã„) \end{cslist} +\ifnum\epTeXversion>190131 %%%%% TL2019-hack +\section{\.{current[x]spacingmode}プリミティブ} +ã‚‚ã¨ã‚‚ã¨\pTeX 系列ã§ã¯ï¼Œ\.{kanjiskip},~\.{xkanjiskip}ã®æŒ¿å…¥ãŒæœ‰åŠ¹ã«ãªã£ã¦ã„ã‚‹ã‹ +直接的ã«çŸ¥ã‚‹æ–¹æ³•ãŒ\.{showmode}プリミティブã—ã‹ãªã‹ã£ãŸï¼Ž +ã“ã‚Œã§ã¯ä½¿ã„å‹æ‰‹ãŒæ‚ªã„ã®ã§ï¼Œ +\.{currentspacingmode}, \.{currentxspacingmode}プリミティブãŒ2019/10/28ã« +山下ã•ã‚“ã«ã‚ˆã£ã¦å®Ÿè£…ã•ã‚ŒãŸ(\cite{tjb94}). + +\begin{cslist} + \csitem[\.{currentspacingmode} (read-only integer)] + \pTeX ã®ã€Œæ¨™æº–ã§\.{kanjiskip}を挿入ã™ã‚‹ã€æ©Ÿèƒ½ãŒæœ‰åŠ¹(\.{autospacing})ãªã‚‰ã°1, + 無効(\.{noautospacing})ãªã‚‰ã°0ã‚’è¿”ã™ï¼Ž + \csitem[\.{currentxspacingmode} (read-only integer)] + \pTeX ã®ã€Œæ¨™æº–ã§\.{xkanjiskip}を挿入ã™ã‚‹ã€æ©Ÿèƒ½ãŒæœ‰åŠ¹(\.{autoxspacing})ãªã‚‰ã°1, + 無効(\.{noautoxspacing})ãªã‚‰ã°0ã‚’è¿”ã™ï¼Ž +\end{cslist} + +åŒæ§˜ã«ï¼Œ\eupTeX ã§ã‚‚\.{currentcjktoken}プリミティブãŒ2019/10/28ã«å®Ÿè£…ã•ã‚ŒãŸï¼Ž +% e-pTeX ã®è¿½åŠ プリミティブã§ã¯ãªã„ãŒï¼Œãƒ‰ã‚ュメント化ã®éƒ½åˆä¸Šã“ã“ã«æ›¸ã„ãŸï¼Ž + +\begin{cslist} + \csitem[\.{currentcjktoken}(read-only integer,\emph{\eupTeX ã®ã¿})] + \upTeX ã®ã€Œå’Œæ–‡(CJK)æ–‡å—ã¨æ¬§æ–‡æ–‡å—を区別ã™ã‚‹ã€æ©Ÿèƒ½ã«ã¤ã„ã¦ï¼Œ + \.{enablecjktoken}ã®çŠ¶æ…‹ãªã‚‰ã°0, + \.{disablecjktoken}ã®çŠ¶æ…‹ãªã‚‰ã°1, + \.{forcecjktoken}ã®çŠ¶æ…‹ãªã‚‰ã°2ã‚’è¿”ã™ï¼Ž +\end{cslist} +\fi %%%%% TL2019 + +\ifnum\epTeXversion>190131 %%%%% TL2019-hack +\section{\.{Uchar}, \.{Ucharcat}プリミティブ} +\hologo{XeTeX}, \hologo{LuaTeX}ã«ã¯ï¼Œå¼•æ•°<character code>ã‚’æ–‡å—コードã¨ã™ã‚‹ +\emph{æ–‡å—トークン}ã«å±•é–‹ã•ã‚Œã‚‹ã€Œ\.{Uchar} <character code>ã€ã¨ã„ã†ãƒ—リミティブãŒå˜åœ¨ã™ã‚‹ +\footnote{\.{char}ã¯å±•é–‹ä¸èƒ½ãƒ—リミティブã§ã‚ã‚‹ã“ã¨ã«æ³¨æ„.}. +ã¾ãŸï¼Œ\hologo{XeTeX}ã«ã¯ã€Œ\.{Ucharcat}~<character code>~<category code>ã€ã¨ã„ã†ï¼Œ +æ–‡å—コード・カテゴリーコードãŒãã‚Œãžã‚Œ<character code>, <category code>ã§ã‚ã‚‹ +æ–‡å—トークンを作るプリミティブãŒå˜åœ¨ã™ã‚‹\footnote{\hologo{LuaTeX}ã§ã¯Luaã«ã‚ˆã‚‹ä»£æ›¿ç‰©ãŒã‚る.}. + +% pTeX ã®ã€ŒæŠœã‘é“ã€ã®å…·ä½“çš„ãªã‚³ãƒ¼ãƒ‰ï¼Ÿ +\pTeX ã§ã€Œå’Œæ–‡ç‰ˆ\.{Uchar}ã€ã«ç›¸å½“ã™ã‚‹ã“ã¨ã¯\TeX~Live 2019以å‰ã®\pTeX ã§ã¯ãƒžã‚¯ãƒã§å®Ÿç¾ã™ã‚‹ã“ã¨ãŒå¯èƒ½ã ãŒï¼Œ +å°†æ¥ã®\pTeX ã®æ”¹ä¿®ã§ä¸å¯èƒ½ã«ãªã‚‹æã‚Œ(\cite{tjb81,tjb95})ãŒã‚ã‚‹ã®ã§ï¼Œ +\epTeX~191112ã§å‰æ®µè½ã§è¿°ã¹ãŸ\.{Uchar}, \.{Ucharcat}ãƒ—ãƒªãƒŸãƒ†ã‚£ãƒ–ã‚’è¿½åŠ ã™ã‚‹ã“ã¨ã«ã—ãŸï¼Ž + +\begin{cslist} + \csitem[\.{Uchar} <character code>] + æ–‡å—コードãŒ<character code>ã®æ–‡å—トークンã«å±•é–‹ã•ã‚Œã‚‹ï¼Ž + 指定ã—ãŸå€¤ã¨å¾—られる文å—トークンã®å¯¾å¿œè¡¨ã¯æ¬¡ã®é€šã‚Šï¼Ž + + \begin{center} + \small\medskip + \begin{tabular}{lccc} + \toprule + <character code>&和文・欧文&\multicolumn{2}{c}{category code}\\\cmidrule(lr){3-4} + &&\epTeX&\eupTeX\\ + \midrule + 0--31, 33--255&欧文文å—トークン&12&12\\ + 32 &欧文文å—トークン&10&10\\ + 256以上ã®<kanji code>&和文文å—トークン&---(都度å–得)&ãã®æ™‚ã®\.{kcatcode}\footnotemark\\ + \bottomrule + \end{tabular} + \end{center} + \footnotetext{ã‚‚ã—\.{kcatcode}ã®å€¤ãŒ15ã ã£ãŸã¨ãã¯ï¼Œå¾—られる和文文å—トークン㮠+ \.{kcatcode}ã¯18ã¨ãªã‚‹ï¼Ž} + + \csitem[\.{Ucharcat} <character code> <category code>] + æ–‡å—コード・カテゴリーコードãŒãã‚Œãžã‚Œ<character code>, <category code>ã®æ–‡å—トークンã«å±•é–‹ã•ã‚Œã‚‹ï¼Ž + + \epTeX ã§ã¯å’Œæ–‡æ–‡å—トークンã«ã¯ã‚«ãƒ†ã‚´ãƒªãƒ¼ã‚³ãƒ¼ãƒ‰ã®æƒ…å ±ã¯ä¿å˜ã•ã‚Œãªã„ãŸã‚, + \epTeX ã®\.{Ucharcat}ã¯æ¬§æ–‡æ–‡å—トークンã®ç”Ÿæˆã—ã‹ã‚µãƒãƒ¼ãƒˆã—ãªã„. + 具体的ã«ã¯ï¼Œ + 指定å¯èƒ½ãªå€¤ã¯<character code>ãŒ0--255,<category code>ãŒ1--4, 6--8, 10--13ã®ã¿ã§ã‚る. +\end{cslist} +\begin{dangerous} + \eupTeX ã§ã¯ï¼Œ\.{Ucharcat}ã§å’Œæ–‡æ–‡å—トークンã®ç”Ÿæˆã‚‚サãƒãƒ¼ãƒˆã—ã¦ã„る. + + \medskip + \begin{itemize} + \item <character code>ãŒ0--127ã®ã¨ãã¯ï¼Œæ¬§æ–‡æ–‡å—トークンã®ã¿ç”Ÿæˆå¯èƒ½ã§ã‚る.従ã£ã¦ + <category code>ã®æŒ‡å®šå¯èƒ½å€¤ã¯1--4, 6--8, 10--13. + \item <character code>ãŒ128--255ã®ã¨ãã¯ï¼Œæ¬§æ–‡æ–‡å—トークン・和文文å—トークン㮠+ ã©ã¡ã‚‰ã‚‚生æˆå¯èƒ½ã§ã‚る. + <category code>ã®æŒ‡å®šå¯èƒ½å€¤ã¯1--4, 6--8, 10--13(以上欧文文å—トークンを生æˆï¼‰ï¼Œ + ãŠã‚ˆã³16--19(和文文å—トークンを生æˆï¼‰ï¼Ž + \item <character code>ãŒ256以上ã®ã¨ãã¯ï¼Œå’Œæ–‡æ–‡å—トークンã®ã¿ç”Ÿæˆå¯èƒ½ã§ã‚る.従ã£ã¦ + <category code>ã®æŒ‡å®šå¯èƒ½å€¤ã¯16--19. + \end{itemize} +\end{dangerous} +\begin{dangerous} + \.{Uchar}ã§å’Œæ–‡æ–‡å—トークンを生æˆã™ã‚‹ã«ã¯ï¼Œãã®å’Œæ–‡æ–‡å—コードを + 与ãˆã‚‹å¿…è¦ãŒã‚ã‚‹ãŒï¼Œãã®å€¤ã¯å†…部漢å—コードã«ä¾ã‚‹ã®ã§ï¼Œ + |\jis|ã‚„|\euc|ç‰ã®æ–‡å—コード変æ›ãƒ—リミティブを使ã†ã®ãŒä¾¿åˆ©ã§ã‚ã‚‹ + (例ãˆã°|\Uchar\jis"3441|ã§ã€Œ\Uchar\jis"3441ã€ã‚’得る). + + ãŸã ã—,\eupTeX ã®\.{Ucharcat}ã§ã¯<character code>ã¨<category code>ã‚’ + 空白トークンã§åŒºåˆ‡ã‚‹å¿…è¦ãŒã‚り,注æ„ã‚’è¦ã™ã‚‹ï¼Ž + 例ãˆã°ï¼Œã‚«ãƒ†ã‚´ãƒªãƒ¼ã‚³ãƒ¼ãƒ‰17ã®ã€Œæ¼¢ã€ã‚’得よã†ã¨ã—ã¦ï¼Œ + å˜ã« + \begin{quote} + \verb+\Ucharcat\jis"3441 17 % エラー+ + \end{quote} + ã¨æ›¸ãã¨ã‚¨ãƒ©ãƒ¼\footnote{% + \.{jis}ã®å±•é–‹æ™‚ã«å¾Œã‚ã®ç©ºç™½ãƒˆãƒ¼ã‚¯ãƒ³ãŒé£Ÿã‚ã‚Œã¦ã—ã¾ã„,\.{Uchar}ã«ã¯ + æ–‡å—コード2845017($\text{æ¼¢}=\text{U+6F22}\rightarrow 28450$ã¨17㌠+ 繋ãŒã£ãŸçµæžœï¼‰ãŒæ¸¡ã£ã¦ã—ã¾ã†ï¼Ž + }ãŒç™ºç”Ÿã™ã‚‹ï¼Žæ¬¡ã®ã‚ˆã†ã«æ›¸ã‘ã°ã‚¨ãƒ©ãƒ¼ãŒå›žé¿ã§ãるよã†ã§ã‚る. + \begin{quote} + \verb+\Ucharcat\jis"3441\noexpand\space17 % エラー回é¿+ + \end{quote} + ã‚ã‚‹ã„ã¯ï¼š + \begin{quote} + \verb+\Ucharcat\numexpr\jis"3441\relax 17 % エラー回é¿+ + \end{quote} +\end{dangerous} +\fi %%%%% TL2019 + + + \begin{comment} \section{互æ›æ€§} \eTeX, \pTeX ã¨ã®äº’æ›æ€§ã‚’ã¯ã‹ã‚‹ã®ã«æœ‰åŠ¹ãªæ‰‹æ®µã¨ã—ã¦ã¯ï¼Œã¾ãš\texttt{TRIP} @@ -948,38 +1094,39 @@ $3$\,sp)ã ãŒï¼Œã©ã“ã‹æ°—ã«ãªã‚‹ã¨ã“ã‚ã§ã‚る. \begin{thebibliography}{99} \bibitem{h7k} åŒ—å· å¼˜å…¸ï¼Œã€Œè¨ˆç®—æ•°å¦II 作æ¥è¨˜éŒ²ã€ï¼Œ2008.\\ \url{https://osdn.jp/projects/eptex/document/resume/ja/1/resume.pdf}ã»ã‹ï¼Œ - 本pdfã¨åŒã˜ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«ã‚ã‚‹\texttt{resume.pdf}ãŒãã‚Œã«ã‚ãŸã‚‹ï¼Ž - \bibitem{yamamoto} 山本 和義,「数å¼famã®åˆ¶é™ã¨luatexã€ï¼ŒæŽ²ç¤ºæ¿ã€Œ\TeX\ - Q\ \&\ Aã€ï¼Œ2009/02/12.\\ + 本pdfã¨åŒã˜ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«ã‚ã‚‹\texttt{eptex\_resume.pdf}ãŒãã‚Œã«ã‚ãŸã‚‹ï¼Ž + \bibitem{yamamoto} 山本 和義,「数å¼famã®åˆ¶é™ã¨luatexã€ï¼Œ + 掲示æ¿ã€Œ\TeX\ Q\ \&\ Aã€ï¼Œ2009/02/12.\\ \url{http://oku.edu.mie-u.ac.jp/~okumura/texfaq/qa/52744.html} - \bibitem{yamamoto2} 山本 和義,「Re: æ•°å¼famã®åˆ¶é™ã¨luatexã€ï¼ŒæŽ²ç¤ºæ¿ã€Œ\TeX\ - Q\ \&\ Aã€ï¼Œ2009/02/16. + \bibitem{yamamoto2} 山本 和義,「Re: æ•°å¼famã®åˆ¶é™ã¨luatexã€ï¼Œ + 掲示æ¿ã€Œ\TeX\ Q\ \&\ Aã€ï¼Œ2009/02/16. \url{http://oku.edu.mie-u.ac.jp/~okumura/texfaq/qa/52767.html} -\bibitem{yamamoto3} 山本 和義,「数å¼fam拡張マクムfor e-pTeXç‰ã€ï¼ŒæŽ²ç¤ºæ¿ã€Œ\TeX\ - Q\ \&\ Aã€ï¼Œ2009/02/21. + \bibitem{yamamoto3} 山本 和義,「数å¼fam拡張マクムfor e-pTeXç‰ã€ï¼Œ + 掲示æ¿ã€Œ\TeX\ Q\ \&\ Aã€ï¼Œ2009/02/21. \url{http://oku.edu.mie-u.ac.jp/~okumura/texfaq/qa/52799.html} -\bibitem{expl31} 河原,「パッケージã¨ãƒ‡ã‚£ã‚¹ãƒˆãƒªãƒ“ューションã«ã¤ã„ã¦ã€ï¼ŒæŽ²ç¤ºæ¿ã€Œ\TeX\ - Q\ \&\ Aã€ï¼Œ2010/12/16. + \bibitem{expl31} 河原,「パッケージã¨ãƒ‡ã‚£ã‚¹ãƒˆãƒªãƒ“ューションã«ã¤ã„ã¦ã€ï¼Œ + 掲示æ¿ã€Œ\TeX\ Q\ \&\ Aã€ï¼Œ2010/12/16. \url{http://oku.edu.mie-u.ac.jp/~okumura/texfaq/qa/55464.html} - \bibitem{expl32} 角藤 亮,「Re: パッケージã¨ãƒ‡ã‚£ã‚¹ãƒˆãƒªãƒ“ューションã«ã¤ã„ã¦ã€ï¼ŒæŽ²ç¤ºæ¿ã€Œ\TeX\ - Q\ \&\ Aã€ï¼Œ2010/12/19. + \bibitem{expl32} 角藤 亮,「Re: パッケージã¨ãƒ‡ã‚£ã‚¹ãƒˆãƒªãƒ“ューションã«ã¤ã„ã¦ã€ï¼Œ + 掲示æ¿ã€Œ\TeX\ Q\ \&\ Aã€ï¼Œ2010/12/19. \url{http://oku.edu.mie-u.ac.jp/~okumura/texfaq/qa/55478.html} - \bibitem{expl33} zrbabbler,「LaTeX3 㨠expl3 パッケージã€ï¼Œãƒ–ãƒã‚°ã€Œãƒžã‚¯ãƒãƒ„イーターã€å†… - ,2010/12/22. + \bibitem{expl33} zrbabbler,「LaTeX3 㨠expl3 パッケージã€ï¼Œ + ブãƒã‚°ã€Œãƒžã‚¯ãƒãƒ„イーターã€å†…,2010/12/22. \url{http://d.hatena.ne.jp/zrbabbler/20101222/1293050561} - \bibitem{strcmp} 角藤 亮,「Re: e-pTeX 101231ã€ï¼ŒæŽ²ç¤ºæ¿ã€Œ\TeX\ - Q\ \&\ Aã€ï¼Œ2011/01/01.\\ + \bibitem{strcmp} 角藤 亮,「Re: e-pTeX 101231ã€ï¼Œ + 掲示æ¿ã€Œ\TeX\ Q\ \&\ Aã€ï¼Œ2011/01/01.\\ \url{http://oku.edu.mie-u.ac.jp/~okumura/texfaq/qa/55528.html} \bibitem{pdfse} Dora TeX,「Re: |\pdfshellescape|, |\lastnodechar| ã®å®Ÿè£…ã€ï¼Œ\TeX~Forum,2014/11/19. \url{http://oku.edu.mie-u.ac.jp/tex/mod/forum/discuss.php?d=1435#p8053} \bibitem{lnc} åŒ—å· å¼˜å…¸ï¼Œã€Œ|\lastnodechar| プリミティブã«ã¤ã„ã¦ã€ï¼Œ2014/12/15.\\ - \url{https://ja.osdn.net/projects/eptex/wiki/lastnodechar} + \url{https://ja.osdn.net/projects/eptex/wiki/lastnodechar} \bibitem{xe5} Joseph Wright, ``[XeTeX] |\(pdf)mdfivesum|'', 2015/07/01,\\ \url{http://tug.org/pipermail/xetex/2015-July/026044.html} - \bibitem{15715} tat tsan,「[expl3 / e(u)ptex] 2015/07/15 版 expl3 パッケージ㌠- ã€(u)platex ã§é€šã‚‰ãªã„ã€ï¼Œ\TeX~Forum,2015/07/26.\\ + \bibitem{15715} tat tsan, + 「[expl3 / e(u)ptex] 2015/07/15 版 expl3 パッケージãŒã€(u)platex ã§é€šã‚‰ãªã„ã€ï¼Œ + \TeX~Forum,2015/07/26.\\ \url{http://oku.edu.mie-u.ac.jp/tex/mod/forum/discuss.php?d=1632} \bibitem{random} Joseph Wright, ``[tex-live] Random number primitives'', 2016/11/12,\\ @@ -988,11 +1135,11 @@ $3$\,sp)ã ãŒï¼Œã©ã“ã‹æ°—ã«ãªã‚‹ã¨ã“ã‚ã§ã‚る. \url{http://abenori.blogspot.jp/2016/02/e-ptexeptexinputencoding.html}. \bibitem{etexman} The \NTS\!\ Team. \textit{The \eTeX\ manual} (v2.0). \\ |$TEXMFDIST/doc/etex/base/etex_man.pdf| - \bibitem{omegaman} J.\ Plaice, Y.\ Haralambous. \textit{Draft - documentation for the $\it\Omega$ system}, 1999.\\ + \bibitem{omegaman} J.\ Plaice, Y.\ Haralambous. + \textit{Draft documentation for the $\it\Omega$ system}, 1999.\\ |$TEXMFDIST/doc/omega/base/doc-1.8.tex| - \bibitem{pdftexman} H\`an Th\'{\^e} Th\`anh et al. \textit{The - \hologo{pdfTeX}\ user manual}, 2015.\\ + \bibitem{pdftexman} H\`an Th\'{\^e} Th\`anh et al. + \textit{The \hologo{pdfTeX}\ user manual}, 2015.\\ |$TEXMFDIST/doc/pdftex/manual/pdftex-a.pdf| \bibitem{l2e26} The \LaTeX3 Project Team, \textit{\LaTeX\ News Issue 26}, 2017.\\ @@ -1004,7 +1151,7 @@ $3$\,sp)ã ãŒï¼Œã©ã“ã‹æ°—ã«ãªã‚‹ã¨ã“ã‚ã§ã‚る. \bibitem{plt63} Dora TeX, 「p 指定㮠tabular ã§ã®ã‚»ãƒ«å†’é ã® |\relax\par|ã€ï¼Œ2018/02/19.\\ \url{https://github.com/texjporg/platex/issues/63}. - \bibitem{expanded1} Joseph Wright, + \bibitem{expanded1} Joseph Wright, ``[tex-live] Primitive parity, |\expanded| and |\Ucharcat|'', 2018/05/04,\\ \url{http://tug.org/pipermail/tex-live/2018-May/041599.html} @@ -1012,12 +1159,20 @@ $3$\,sp)ã ãŒï¼Œã©ã“ã‹æ°—ã«ãªã‚‹ã¨ã“ã‚ã§ã‚る. Joseph Wright, ``A `new' primitive: |\expanded|'', 2018/12/06.\\ \url{https://www.texdev.net/2018/12/06/a-new-primitive-expanded} \bibitem{latex95} - Volker-Weissmann, ``Feature Request: Better error messages for non-ASCII symbols in labels.'', + Volker-Weissmann, ``Feature Request: Better error messages for + non-ASCII symbols in labels.'', 2018/12/03.\\ \url{https://github.com/latex3/latex2e/issues/95} \ifnum\epTeXversion>190131 %%%%% TL2019-hack + \bibitem{tjb81} åŒ—å· å¼˜å…¸ï¼Œã€Œãƒã‚¤ãƒˆåˆ—ã¨å’Œæ–‡æ–‡å—トークンã®åŒºåˆ¥ã€ï¼Œ2019/06/08.\\ + \url{https://github.com/texjporg/tex-jp-build/issues/81}. \bibitem{tjb83} aminophen,「[e-pTeX] |\ifincsname|ã€ï¼Œ2019/07/09.\\ \url{https://github.com/texjporg/tex-jp-build/issues/83}. + \bibitem{tjb94} aminophen,「e(u)ptex: add |\current(x)spacingmode|, |\currentcjktoken|ã€ï¼Œ% + 2019/10/28.\\ + \url{https://github.com/texjporg/tex-jp-build/pull/94}. + \bibitem{tjb95} åŒ—å· å¼˜å…¸ï¼Œã€Œ[eptex] |\Uchar| and |\Ucharcat|ã€ï¼Œ2019/10/30.\\ + \url{https://github.com/texjporg/tex-jp-build/issues/95}. \fi %%%%% TL2019 \end{thebibliography} diff --git a/info/ptex-manual/ptex-guide-en.pdf b/info/ptex-manual/ptex-guide-en.pdf Binary files differindex f33abf4c40..6228a3f4b5 100644 --- a/info/ptex-manual/ptex-guide-en.pdf +++ b/info/ptex-manual/ptex-guide-en.pdf diff --git a/info/ptex-manual/ptex-guide-en.tex b/info/ptex-manual/ptex-guide-en.tex index bbf6918839..7e7eab90ba 100644 --- a/info/ptex-manual/ptex-guide-en.tex +++ b/info/ptex-manual/ptex-guide-en.tex @@ -16,11 +16,12 @@ \usepackage[dvipdfmx,hyperfootnotes=false]{hyperref} \usepackage{pxjahyper} \usepackage{hologo} +\usepackage{xspace} \usepackage{makeidx}\makeindex % common \usepackage{ptex-manual} - +\let\emph=\origemph \makeatletter \newlist{simplelist}{description}1 \setlist[simplelist]{% @@ -55,14 +56,14 @@ \def\pLaTeX{p\LaTeX}\def\upLaTeX{u\pLaTeX} \def\pdfTeX{pdf\TeX} \def\OMEGA{$\Omega$} -\def\TL{\TeX\ Live\ } +\def\TL{\TeX\ Live\xspace} \def\_{\leavevmode\vrule width .45em height -.2ex depth .3ex\relax} \frenchspacing \begin{document} \catcode`\<=13 -\title{\emph{Guide of \pTeX\ for developers not interested in Japanese}} +\title{\textsf{\textbf{Guide to \pTeX\ for developers unfamiliar with Japanese}}} \author{Japanese \TeX\ Development Community\null \thanks{\url{https://texjp.org},\ e-mail: \texttt{issue(at)texjp.org}}} \date{version p\the\ptexversion.\the\ptexminorversion\ptexrevision, \today} @@ -71,7 +72,7 @@ \pTeX\ and its variants, \upTeX, \epTeX\ and \eupTeX, are all \TeX\ engines with native Japanese support. Its output is always a DVI file, which can be processed by several -DVI drivers with Japanese support including {\em dvips} and {\em dvipdfmx}. +DVI drivers with Japanese support including \emph{dvips} and \emph{dvipdfmx}. Formats based on \LaTeX\ is called \pLaTeX\ when running on \pTeX/\epTeX, and called \upLaTeX\ when running on \upTeX/\eupTeX. @@ -93,7 +94,7 @@ We hope that this document helps authors of packages or classes to proceed with supporting \pTeX\ family smoothly. \begin{quotation} -Note: This English edition (\jobname.pdf) is {\em not} meant +Note: This English edition (\jobname.pdf) is \emph{not} meant to be a complete translation of Japanese edition (ptex-manual.pdf). For example, this document does not cover the following aspects of \pTeX: \begin{itemize} @@ -129,8 +130,8 @@ so we focus mainly on \epTeX/\eupTeX. \section{Compatibility with Western \TeX} %%% pTeX/upTeX 㯠Knuthian TeX ã«å¯¾ã—ã¦ã»ã¼ä¸Šä½äº’æ› -\pTeX/\upTeX\ are almost uppercompatible with Knuthian \TeX, -however, they do not pass TRIP test. +\pTeX/\upTeX\ are almost upward compatible with Knuthian \TeX, +however, they do not pass the TRIP test. %%% 入力ã®8bitã®æ‰±ã„ãŒç•°ãªã‚‹ã€‚フォントã®8bitã¯ãã®ã¾ã¾ In \pTeX/\upTeX, input handling is different from Knuthian \TeX; if a pair of two or more 8-bit codes matches Japanese character code, @@ -138,16 +139,16 @@ it is regarded as one Japanese character. There is no difference in handling 8-bit TFM font. %%% e-pTeX/e-upTeX 㯠e-TeX ã«å¯¾ã—ã¦ã»ã¼ä¸Šä½äº’æ› -\epTeX/\eupTeX\ are almost uppercompatible with \eTeX, +\epTeX/\eupTeX\ are almost upward compatible with \eTeX, however, input handling is similar to \pTeX/\upTeX. -It does not pass e-TRIP test. +It does not pass the e-TRIP test. %%% ã ã‘ã© e-TeX ã¯ã‚‚ã†ãªã,pdfTeX ã® DVI モードãŒã‚ã‚‹ã ã‘ That said, please note that ``raw \eTeX'' is unavailable anymore in \TeX\ Live and derived distributions; they provide a command |etex| only as ``DVI mode of \pdfTeX.'' %%% e-pTeX/e-upTeX 㯠pdfTeX ã® DVI モードã«å¯¾ã—ã¦ä¸Šä½äº’æ›ã§ã¯ãªã„ We should note that -\epTeX/\eupTeX\ are {\em not} uppercompatible with DVI mode of \pdfTeX, +\epTeX/\eupTeX\ are \emph{not} upward compatible with DVI mode of \pdfTeX, which will be discussed later in section \ref{dvi-pdftex}. %%% LaTeX ムニャムニャ @@ -171,7 +172,7 @@ related to the followings: \item Adjustment for mixing horizontal and vertical texts \end{itemize} %%% author レベルã§ã¯ LaTeX ã¨ã»ã¼äº’æ›ï¼ŒãŸã ã—例外ã‚ã‚Š -For authors, \pLaTeX/\upLaTeX\ is almost uppercompatible with +For authors, \pLaTeX/\upLaTeX\ are almost upward compatible with original \LaTeX, except for the followings: \begin{itemize} \item Order of float objects; in \pLaTeX/\upLaTeX, @@ -182,7 +183,7 @@ original \LaTeX, except for the followings: % [TODO] ä»–ã«ã‚‚ã‚ã‚‹ã‹ï¼Ÿ \end{itemize} %%% developer レベルã§ã¯ pdfTeX 拡張や pLaTeX カーãƒãƒ«ã§ãƒ ニャムニャ -For developers, additional cares may be needed, +For developers, additional care may be needed, for changes in the kernel macros and/or absence of \pdfTeX\ features. %%% 際立ã£ãŸ pTeX 系列ã®ç‰¹å¾´ @@ -192,7 +193,7 @@ The most important characteristics of \pTeX/\upTeX\ can be summarized as follows: %%% 欧文ã¨å’Œæ–‡ãŒåˆ¥å€‹ã«å˜åœ¨ã™ã‚‹ãƒ»ç¸¦çµ„ãŒã‚ã‚‹ \begin{itemize} - \item Japanese characters are interpret and handled completely apart from + \item Japanese characters are interpreted and handled completely apart from Western characters. \item Texts can be aligned vertically, called ``tate-gumi'' (縦組). The horizontal alignment of texts is called ``yoko-gumi'' (横組), @@ -211,20 +212,83 @@ summarized as follows: \section{Output format --- DVI} %%% DVI ã ã‘ -The output of \pTeX/\upTeX\ is always a DVI file. +The output of \pTeX\ family is always a DVI file. +This is in contrast to the mainstream of \pdfTeX\ in the Western \TeX\ world. + +In case you are not familiar with DVI output processing, +first we give some general notice on how to get a ``correct'' output +using \LaTeX\ in DVI mode. + +\begin{itemize} + \item The DVI format is, as its name suggests, inherently driver-independent. + However, some \LaTeX\ packages (\Pkg{graphicx}, \Pkg{color}, \Pkg{hyperref} etc.) + embed some \.{special} commands into the DVI, which can be interpreted later + by some specific DVI driver. + Such a DVI is no longer driver-independent, thus those are called + driver-dependent packages. + \item In almost all major \TeX\ distributions (of course including \TL), + the default DVI driver is set to |dvips|. + When you choose to process the resulting DVI file with a driver + other than dvips (e.g. dvipdfmx) after running \LaTeX, + you need to pass a proper driver option (e.g. |[dvipdfmx]|) to + all driver-dependent packages. +\end{itemize} + +%%% 日本㮠DVI ドライãƒã®çŠ¶æ³ +Now, let's move on to the situation in Japan, +which is slightly complicated due to historical reasons +but may also apply to other countries: +\begin{itemize} + \item There are two major conventions to pass a proper driver option + to all driver-dependent packages: + \begin{enumerate} + \item To give a driver option to each driver-dependent package: +\begin{verbatim} +\documentclass{article} +\usepackage[dvipdfmx]{graphicx} +\usepackage[dvipdfmx]{color} +\end{verbatim} + \item To have a driver option as global: +\begin{verbatim} +\documentclass[dvipdfmx]{article} +\usepackage{graphicx} +\usepackage{color} +\end{verbatim} + \end{enumerate} + The former convention has been used for many years since 1990s + when the number of driver-dependent packages was limited. + But in recent years (around 2010--), there are much more + driver-dependent packages available. Thus + we (Japanese \TeX\ experts) advise a global driver option + rather than individual package options for simplicity, + but not yet fully widespread.\footnote{The fact that + there had been a mismatch in option names + (\code{[dvipdfm]} vs. \code{[dvipdfmx]}) + between packages may also have been part of it; + \Pkg{geometry} did not understand \code{[dvipdfmx]} option until 2018!} + \item Many people still see driver options as ``optional''; + they do without driver options unless really needed. + For example, the convention of having a global driver option + does no harm even when no driver-dependent package is used, but + some users choose to omit a driver option to avoid a warning: +\begin{verbatim} +LaTeX Warning: Unused global option(s): + [dvipdfmx]. +\end{verbatim} +\end{itemize} + +\subsection{Extensions of DVI format in \pTeX\ family} + %%% pTeX ã® DVI ã¯æ¬§æ–‡ã®æ¨ªçµ„ã¿ã ã‘ãªã‚‰æ™®é€šã€‚和文ãŒå…¥ã‚‹ã¨ç‰¹æ®Šï¼Œç¸¦çµ„ãªã‚‰IDも変化 -Its DVI format is completely compatible with Knuthian \TeX, -as long as the following conditions are met: +The DVI format output by \pTeX\ family is fully compatible with +Knuthian \TeX, as long as the following conditions are met: \begin{itemize} \item No Japanese characters are typeset. \item There is no portion of vertical text alignment. \end{itemize} -\subsection{Extensions of DVI format} - -In \pTeX/\upTeX, -some additional DVI commands, which are defined in the -standard \cite{dvistd0} but never used in \TeX82, are used. +However, some additional DVI commands, which are defined in the +standard \cite{dvistd0} but never used in \TeX82, can come out. \begin{itemize} \item |set2| (129), |put2| (134): Appears in both \pTeX\ and \upTeX\ DVI. @@ -254,37 +318,23 @@ Normally it is set to 2, as with \TeX82; however, when |dir| (255) appears at least once in a single \pTeX/\upTeX\ DVI, the |post_post| table of postamble contains $\mathrm{ID} = 3$. -%%% 日本㮠DVI ドライãƒã®çŠ¶æ³ \subsection{DVI drivers with Japanese support} -There is some DVI drivers with Japanese support. -The most eminent drivers are {\em dvips} and {\em dvipdfmx}. -Nowadays most of casual Japanese users are using {\em dvipdfmx} as a DVI driver. -On the other hand, users of {\em dvips} are unignorable, especially those +There are some DVI drivers with Japanese support. +The most eminent drivers are \emph{dvips} and \emph{dvipdfmx}. +Nowadays most of casual Japanese users are using \emph{dvipdfmx} as a DVI driver. +On the other hand, users of \emph{dvips} are unignorable, especially those working in publishing industry. +In recent years, most of major driver-dependent packages support +both two drivers. -\subsubsection{Using {\em dvipdfmx}} +\subsubsection{Using \emph{dvipdfmx}} A DVI file which is output by \pTeX\ can be converted directly to a PDF file using dvipdfmx. % [TODO] Mention kanji-config-updmap for font setup -{\em Note for casual \LaTeX\ users} --- -when you choose to process the resulting DVI file with dvipdfmx -after running \LaTeX\ (command |platex| or |uplatex|), -you need to pass a proper driver option |[dvipdfmx]| for -all driver-dependent packages, such as |graphicx| and |color|. -This is because the default for such packages is set to |dvips| mode -as with the original \LaTeX\ in DVI mode (command |latex|). -For simplicity, we recommend a global driver option |[dvipdfmx]| -as in the following example: -\begin{verbatim} - \documentclass[dvipdfmx,...]{article} - \usepackage{graphicx} - \usepackage{color} -\end{verbatim} - -\subsubsection{Using {\em dvips}} +\subsubsection{Using \emph{dvips}} A DVI file which is output by \pTeX\ can be converted to a PostScript file using dvips. @@ -302,17 +352,65 @@ developed by Japanese \TeX\ Development Community. We focus on programming aspects of \pTeX\ and its variants. %%% レジスタã®æ•° -\subsection{Number of registers} +\subsection{Number of registers and marks} \pTeX\ and \upTeX\ have exactly the same number ($=256$) of registers -as Knuthian \TeX. +(count, dimen, skip, muskip, box, and token) as Knuthian \TeX. \epTeX\ and \eupTeX\ in extended mode have more registers; there are 65536, which is twice as many as 32768 of \eTeX. +Similarly \epTeX\ and \eupTeX\ have 65536 mark classes, +which is twice as many as 32768 of \eTeX. -% [TODO] ã¾ã¨ã‚㦠65536 個ã¨æ›¸ã„ã¦è‰¯ã„? レジスタã®ç¨®é¡žæ¯Žã«æ›¸ãã¹ã? +The following code presents an example of detecting the number of +regsiters and mark classes available: +\begin{verbatim} + \ifx\eTeXversion\undefined + % Knuthian TeX, pTeX, upTeX: + % 256 registers, 1 mark + \else + \ifx\omathchar\undefined + % e-TeX, pdfTeX (in extended mode): + % 32768 registers, 32768 mark classes + \else + % e-pTeX, e-upTeX (in extended mode): + % 65536 registers, 65536 mark classes + \fi + \fi +\end{verbatim} +Here a primitive \.{omathchar}, which is derived from \OMEGA, is used +as a marker of a change file \code{fam256.ch}.\footnote{% +There is another \pTeX-derived engine named \pTeX-ng (or Asiatic \pTeX) +\url{https://github.com/clerkma/ptex-ng}; it is based on +\eTeX\ and \upTeX, but currently does not adopt \code{fam256.ch} +so it has the same number of registers and mark classes as \eTeX.} + +%%% æ•°å¼ãƒ•ã‚¡ãƒŸãƒªã®æ•° +\subsection{Number of math families} + +In \pTeX\ and \upTeX, +the number of math fonts is restricted to 16, +each of which can contain 256 characters (same as Knuthian \TeX). +In \epTeX\ and \eupTeX, a change file \code{fam256.ch}, +which is derived from \OMEGA, extends the upper limit to 256. +As a consequence, \epTeX\ and \eupTeX\ allows 256 math fonts, +each of which can contain 256 characters.\footnote{\OMEGA\ allows +256 math fonts, each of which can contain 65536 characters.} + +For \pLaTeX/\upLaTeX\ users to use more than 16 math fonts, +it is necessary to use macros which exploit \OMEGA-derived primitives +such as \.{omathchar}. +Recent (u)\pLaTeX\ (since 2016/11/29) partially supports this, +and the maximum number of math alphabets that can be defined by +|\DeclareMathAlphabet| is extended to 256 (|\e@mathgroup@top|) +without needing any extension package. +However, symbol fonts are restricted to 16 as +|\DeclareMathSymbol| etc still use the standard \.{mathchar} etc. +A simple solution to use more symbol fonts as well as math alphabets +is to load a package \Pkg{mathfam256}\footnote{% +\url{https://www.ctan.org/pkg/mathfam256}} though it's still preliminary. %%% 拡張プリミティブ -\subsection{Additional primitives} +\subsection{Additional primitives and keywords} % tex -ini: 322 multiletter control sequences % ptex -ini: 366 multiletter control sequences % uptex -ini: 374 multiletter control sequences @@ -325,7 +423,7 @@ there are 65536, which is twice as many as 32768 of \eTeX. Here we provide only complete lists of additional primitives of \pTeX\ family in alphabetical order. -Feature of each primitive can be found in Japanese edition. +The features of each primitive can be found in Japanese edition. % [TODO] 抜ã‘ãŒãªã„ã‹ï¼Ÿ % [TODO] ã‚¢ãƒ«ãƒ•ã‚¡ãƒ™ãƒƒãƒˆé †ã«æ£ã—ã並んã§ã„ã‚‹ã‹ï¼Ÿ @@ -410,6 +508,8 @@ Knuthian \TeX; however, it is enabled in \pTeX\ family. %%% ãã®ä»–ã®ç‹¬è‡ªæ‹¡å¼µ \subsubsection{\epTeX\ additions (available in \epTeX, \eupTeX)} \begin{simplelist} + \csitem[\.{currentspacingmode} \New{191112 (\TL2020)}] + \csitem[\.{currentxspacingmode} \New{191112 (\TL2020)}] \csitem[\.{epTeXinputencoding} \New{160201 (\TL2016)}] \csitem[\.{epTeXversion} \New{180121 (\TL2018)}] \csitem[\.{expanded} \New{180518 (\TL2019)}] @@ -446,10 +546,18 @@ Knuthian \TeX; however, it is enabled in \pTeX\ family. \csitem[\.{pdfstrcmp}] \csitem[\.{pdfuniformdeviate} \New{161114 (\TL2017)}] \csitem[\.{readpapersizespecial} \New{180901 (\TL2019)}] + \csitem[\.{Uchar} \New{191112 (\TL2020)}] + \csitem[\.{Ucharcat} \New{191112 (\TL2020)}] \csitem[\.{vfi}] \csitem[\texttt{fi}\index{fi=\texttt{fi}}] \end{simplelist} +%%% e-upTeX ã®ç‹¬è‡ªæ‹¡å¼µ +\subsubsection{\eupTeX\ additions (available in \eupTeX)} +\begin{simplelist} + \csitem[\.{currentcjktoken} \New{191112 (\TL2020)}] +\end{simplelist} + % [TODO] 引数ã¯ä½•ã§è¿”り値ã¯ä½•ã‹ï¼Œexpandable? %%% (e-)TeX ã«ã‚る㌠(e-)upTeX ã«ãªã„ã‚‚ã® @@ -462,7 +570,7 @@ One is enc\TeX\ extension, such as |\mubyte|. The ML\TeX\ extension, such as |\charsubdef|, is included but not well-tested. %%% コマンドラインオプションã®è©± -% [TODO] ptex.man1.pdf ã‚‚å‚ç…§ +% [TODO] Please also refer to ptex.man1.pdf \subsection{Behavior of Western \TeX\ primitives} @@ -478,7 +586,6 @@ other codes will give an error ``! Bad character code.'' |\sfcode|, |\mathcode|, |\delcode|, - |\mathchardef|, |\lccode|, |\uccode|. \end{quote} @@ -501,6 +608,7 @@ The following primitives are extended to support Japanese characters: \.{chardef} <control sequence>=<character code>] In addition to 0--255, internal codes of Japanese characters are allowed. For putting Japanese characters, a Japanese font is chosen. + More information can be found in \ref{chardef}. \csitem[\.{font}, \.{fontname}, \.{fontdimen}] % [TODO] @@ -525,14 +633,16 @@ If either token is a control sequence, unless the current equivalent of that control sequence has been |\let| equal to a non-active character token. \end{quote} -However, this includes a lie; in the real implementation of tex.web, +However, this includes a lie; in the real implementation of \code{tex.web}, a control sequence is considered to have a category code 0. \end{dangerous} \subsection{Case study} -Based on the above knowledge, we provide some code examples +Here we provide some code examples which may be useful for package developers. +% [TODO] 本当㯠Based on the above knowledge ã¨ã—ãŸã„ã¨ã“ã‚ã ㌠+% 説明ãŒåœ§å€’çš„ã«ä¸è¶³ã—ã¦ã„ã‚‹ã®ã§å¤©ä¸‹ã‚Šçš„ãªã‚³ãƒ¼ãƒ‰è§£èª¬â€¦ %%% pTeX ã‹ã©ã†ã‹ã®åˆ¤å®š \subsubsection{Detecting \pTeX} @@ -542,23 +652,210 @@ the safer solution for detecting \pTeX\ is to test if a primitive |\kanjiskip| is defined. \begin{verbatim} \ifx\kanjiskip\undefined - % not pTeX, upTeX, e-pTeX and e-upTeX \else - % pTeX, upTeX, e-pTeX and e-upTeX + % pTeX / upTeX / e-pTeX / e-upTeX + \fi +\end{verbatim} + +%%% upTeX ã‹ã©ã†ã‹ã®åˆ¤å®š +\subsubsection{Detecting \upTeX} + +\upTeX/\eupTeX\ are almost upward compatible +with \pTeX/\epTeX\ respectively, however, +there are two major differences: +\begin{enumerate} + \item Improvements in the \.{kcatcode} business, + mainly for better handling of Latin-1 characters and CJK tokens. + \item Unicode as the default internal kanji encoding, + for direct use of its huge character set. +\end{enumerate} + +The first difference can be detected by checking if +\.{...cjktoken} primitive is defined. +\begin{verbatim} + \ifx\enablecjktoken\undefined + \else + % upTeX/e-upTeX \fi \end{verbatim} -% [TODO] upTeX 系列㯠\enablecjktoken ã‹ \ucs ã‹ï¼Ÿ -% [TODO] \forcecjktoken ã¯æ¯”較的新ã—ã„? -% [TODO] 内部コード㌠uptex ã‹ã©ã†ã‹ã®åˆ¤å®š +The second difference can be detected by checking if +the character \code{0x2121} (fullwidth space in JIS encoding) +is stored as \hex{3000} internally. +\begin{verbatim} + \ifx\kanjiskip\undefined + \else + \ifnum\jis"2121="3000 + % upTeX/e-upTeX with internal Unicode + \else + % pTeX/e-pTeX + % or, upTeX/e-upTeX with internal EUC-JP or Shift-JIS + \fi + \fi +\end{verbatim} +Please note that +the format-build setting of \verb+-kanji-internal=(sjis|euc)+ with +\upTeX\ makes it effectively \pTeX\ regarding the character set, +which means that only JIS~X~0208 character set is supported. %%% pTeX ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³åˆ¤å®š +% [TODO] 何ãŒæœ‰ç”¨ï¼Ÿ + +%%% 大ããªå®šæ•°ã‚’定義ã™ã‚‹è©± +\subsubsection{Defining large integer constants} +\label{chardef} + +According to \cite{topic} (Section 3.3), +\begin{quote} +A control sequence that has been defined with a \.{chardef} command +can also be used as a <number>. +This fact is used in allocation commands such as |\newbox|. +Tokens defined with \.{mathchardef} can also be used this way. +\end{quote} +Here is the list of primitives which can be used for this purpose +in \pTeX\ family: +\begin{simplelist} + \csitem[\.{chardef} <control sequence>=<character code>] + Defines a control sequence to be a synonym for + \.{char} <character code>. + + \csitem[\.{kchardef} <control sequence>=<character code> (for \upTeX/\eupTeX)] + Defines a control sequence to be a synonym for + \.{kchar} <character code>. + + \csitem[\.{mathchardef} <control sequence>=<15-bit number>] + Defines a control sequence to be a synonym for + \.{mathchar} <15-bit number>. + + \csitem[\.{omathchardef} <control sequence>=<27-bit number> (for \epTeX/\eupTeX)] + Defines a control sequence to be a synonym for + \.{omathchar} <27-bit number>. +\end{simplelist} + +The first two (\.{chardef} and \.{kchardef}) are usable only when +the integer being defined is in the range of valid character codes, +which is not necessarily continuous (see \ref{kanji-internal}). +The most efficient and convenient way of defining integer constants +is as follows: +\begin{itemize} + \item 0--255: \.{chardef} + % "FF = 255 + \item 256--32767: \.{mathchardef} + % "7FFF = 32767 + \item 32768--134217727: \.{omathchardef} (only for \epTeX/\eupTeX) + % "7FFFFFF = 134217727 + \item (optional) 256--2147483647: \.{chardef} (only for \upTeX/\eupTeX) + % "7FFFFFFF = 2147483647 (+1 => ! Number too big.) +\end{itemize} + +%%% 指定ã®ã‚³ãƒ¼ãƒ‰ã®å’Œæ–‡ãƒˆãƒ¼ã‚¯ãƒ³ã‚’得る方法 +\subsubsection{Creating a Japanese character token with a specified code} + +Short version: +\begin{itemize} + \item With \epTeX~191112 or later (\TL2020), + you can use expandable primitives \.{Uchar} and \.{Ucharcat} + \item Otherwise, use the ``\.{kansuji} trick''. +\end{itemize} + +\paragraph{The ``\.{kansuji} trick''} +This is a modified version of the ``\.{lowercase} trick'' +available in \pTeX\ family. + +\begin{dangerous} +Short note on the ``\.{lowercase} trick'': +to create a character token with a specified code value between 0--255 +with Knuthian \TeX, the ``\.{lowercase} trick'' can be used; for example, +\begin{verbatim} + \begingroup + \lccode`\?=\mycount + \lowercase{\endgroup \def\X{?}} +\end{verbatim} +defines |\X| which expands to a character number |\mycount| +while the \.{catcode} of |?| (\the\catcode`\?) is preserved. +However, the trick cannot be applied to Japanese characters, +since \pTeX\ family does not support \.{lccode} outside 0--255. +\end{dangerous} + +\.{kansuji} is an expandable primitive like \.{number} or \.{romannumeral}, +and it converts an integer into its corresponding kanji notation +called ``kansuji'' (漢数å—). The important point here is that +the number-kanji mapping can be altered by \.{kansujichar}. + +Example 1: equivalent to |\def\X{ã‚}| (JIS code \code{0x2422} is ``ã‚''): +\begin{verbatim} + \begingroup + \kansujichar1=\jis"2422 \xdef\X{\kansuji1} + \endgroup +\end{verbatim} + +Example 2: equivalent to |\def\日本{Japan}|. +\begin{verbatim} + \begingroup + \kansujichar5=\jis"467C\relax + \kansujichar6=\jis"4B5C\relax + \expandafter\gdef\csname\kansuji56\endcsname{Japan} + \endgroup +\end{verbatim} + +Since \.{kansujichar} accepts only Japanese character code, +the ``\.{kansuji} trick'' and the ``\.{lowercase} trick'' should be +used complementarily. + +\paragraph{\.{Uchar}, \.{Ucharcat}} +The ``\.{kansuji} trick'' above include an assignment of \.{kansujichar} +which is unexpandable. +\epTeX~191112 or later (\TL2020) provides expandable primitives +\.{Uchar} and \.{Ucharcat}, which are derived from \hologo{XeTeX}. + +\begin{simplelist} + \csitem[\.{Uchar} <character code>] + Expands to a character token with specified slot <character code>. + \begin{itemize} + \item When an 8-bit number (0--255) is given, + it expands to a Latin character token with category code 12, + except for a space character (32) which has category code 10. + \item When a Japanese character code greater than 255 is given, + it expands to a Japanese character token with its current category code; + 16--18 for \epTeX, 16--19 for \eupTeX. + % [TODO] 本当㯠pTeX ã§ã¯å’Œæ–‡æ–‡å—トークン自体㯠\kcatcode ã‚’ + % æŒãŸãªã„ãŒï¼Œç°¡å˜ã®ãŸã‚ã¾ã‚ã„ã£ã‹ï¼Ž + \end{itemize} + + \csitem[\.{Ucharcat} <character code> <category code>] + Expands to a character token with slot <character code> and + <category code> specified. + \begin{itemize} + \item With \epTeX: + \begin{itemize} + \item Only 8-bit number (0--255) are allowed for <character code>; + that is, only Latin characters can be generated. + \item The values allowed for <category code> are 1--4, 6--8, 10--13. + \end{itemize} + \item With \eupTeX: + \begin{itemize} + \item When <character code> is between 0--127, + only Latin characters can be generated. + Thus, the values allowed for <category code> are + 1--4, 6--8, 10--13. + \item When <character code> is between 128--255, + both Latin and Japanese characters can be generated + depending on the specified <category code>; + 1--4, 6--8, 10--13: Latin character, + 16--19: Japanese character. + \item When <character code> is greater than 255, + only Japanese characters can be generated. + Thus, the values allowed for <category code> are + 16--19. + \end{itemize} + \end{itemize} +\end{simplelist} %%% pdfTeX ã¨é•ã†ã¨ã“ã‚ \subsection{Difference from \pdfTeX\ in DVI mode}\label{dvi-pdftex} As stated above, -\epTeX/\eupTeX\ are {\em not} uppercompatible with DVI mode of \pdfTeX. +\epTeX/\eupTeX\ are \emph{not} upward compatible with DVI mode of \pdfTeX. %%% pdfTeX ã® DVI モードã«ã‚ã£ã¦ e-(u)pTeX ã«ãªã„プリミティブ %%% ãã®ä»–ムニャムニャ @@ -591,29 +888,112 @@ This section does not aim to explain Japanese typesetting completely; here we provide a minimum requirement for ``getting away'' with Japanese. %%% 空白・ペナルティ挿入:å‹æ‰‹ã«å…¥ã£ã¦ãã‚‹ï¼ -\subsection{Automatic insertion of glues and penalties} +\subsection{Automatic insertion of glue and penalties} -Sometimes \pTeX\ family automatically inserts glues and penalties +Sometimes \pTeX\ family automatically inserts glue and penalties between characters. % [TODO] ã‚‚ã†å°‘ã—ã ã‘詳ã—ã %%% 和文フォント \subsection{Japanese fonts} -For typesetting Japanese characters, a JFM (Japanese \TeX\ font metric) -format is used. It is a modified version of \TeX\ TFM. - %%% 欧文ã¨ã¯åˆ¥å€‹ +\pTeX\ family can have 3 different ``current'' fonts at the same time; +a Latin font, a Japanese font for horizontal writing (``yoko-gumi''), +and a Japanese font for vertical writing (``tate-gumi''). +The first one is the same as in the Knuthian \TeX, +which is defined in a standard TFM format. +The latter two are specific to \pTeX\ family, which are defined +in a JFM (Japanese \TeX\ font metric) format.\footnote{% +A JFM is a modified version of the standard TFM. +It can be created by (u)pPLtoTF, and decoded by (u)pTFtoPL. +Please also refer to the man pages of these programs +(\code{ppltotf.man1.pdf} and \code{ptftopl.man1.pdf}).} + +While typesetting, \pTeX\ family automatically switches between +these 3 fonts, depending on the character code and the writing direction: +\begin{itemize} + \item For typesetting Latin characters, + the current Latin font shown by |\the\font| is selected. + \item For typesetting Japanese characters, + the current Japanese font suitable for the current writing direction + is selected. It is shown by |\the\jfont| for horizontal writing + and |\the\tfont| for vertical writing. +\end{itemize} + %%% \nullfont ã—ã¦ã‚‚全部消ãˆãªã„ +%%% 「和文 \nullfontã€ã¯å’Œæ–‡ãƒ•ã‚©ãƒ³ãƒˆãŒä¸€å›žã‚‚ã‚°ãƒãƒ¼ãƒãƒ«ã« +%%% è¨å®šã•ã‚Œã¦ã„ãªã„ã¨ã = iniTeX 時ã—ã‹ãªã„ +In Knuthian \TeX, the primitive \.{nullfont} refers to an ``empty font'' +in which all characters are undefined. +However in \pTeX\ family, this is regarded as a Latin font +and there is no equivalent to ``Japanese \.{nullfont}'' by design. +To elaborate, it is possible \emph{only} when no Japanese font is +set globally, i.e. in ini\TeX\ mode. +Once a valid Japanese font is selected, there is no way of +selecting ``Japanese \.{nullfont}'' to discard all characters. + +Moreover, \pTeX\ and friends assume that each Japanese font +(except ``Japanese \.{nullfont}'' in ini\TeX\ mode) +contains all valid Japanese character code. +In other words, all Japanese fonts share the same character set +corresponding to the whole valid Japanese character code range.\label{jfont} + +\section{Other strange beasts} %%% 縦組ã¯è«¦ã‚よㆠ+% [TODO] ã©ã“ã«æ›¸ãã‹å›°ã£ãŸã®ã§æœ€å¾Œã«ï¼šå†…部コードã®ã‚¢ãƒ¬ãªè©± +\subsection{Internal kanji encodings}\label{kanji-internal} + +The <character code> is a union of the following two: +\begin{itemize} + \item Range of numbers between 0--255, and + \item Numbers allowed for internal code of Japanese characters. +\end{itemize} +The former is the same as Knuthian \TeX, but the latter is a problem. +In \upTeX/\eupTeX\ with \code{-kanji-internal=uptex} (default on), +the range is very simple: +\[ c \ge 0 \] +However in \pTeX/\epTeX, only legacy encodings (EUC-JP as |euc|, +or Shift-JIS as |sjis|) are available for \code{-kanji-internal}. +In this case, the range can be represented as follows: +\[ + c = 256c_1+c_2 \; (c_i\in C_i) +\] +where +\[ + \begin{cases} + C_1=C_2=\{\hex{a1},\dots,\hex{fe}\} & (\mathtt{euc}), \\ + C_1=\{\hex{81},\dots,\hex{9f}\}\cup\{\hex{e0},\dots,\hex{fc}\}, + C_2=\{\hex{40},\dots,\hex{7e}\}\cup\{\hex{80},\dots,\hex{fc}\} & (\mathtt{sjis}). + \end{cases} +\] +Therefore, the overall range of <character code> is \emph{not} continuous. + +To check whether an integer is a valid Japanese character code or not, +you can use \.{iffontchar} with \epTeX~190709 or later (\TL2020). +Suppose a count register |\mycount| stores an integer, you can do it as follows: +\begin{verbatim} + \iffontchar\jfont\mycount + % \mycount is a valid Japanese character code + \fi +\end{verbatim} +Here the primitive \.{jfont} is used merely as +a representative non-empty\footnote{This assumption is always safe after +one of the standard \pTeX\ formats (e.g. plain \pTeX, \pLaTeX) is loaded.} +Japanese font containing all valid Japanese character code (see \ref{jfont}). + + \newpage \begin{thebibliography}{99} \bibitem{dvistd0} TUG DVI Standards Working Group, \textit{The DVI Driver Standard, Level 0}.\\ \url{https://ctan.org/pkg/dvistd} + \bibitem{topic} Victor Eijkhout, \textit{\TeX\ by Topic, A \TeX nician's Reference}, + Addison-Wesley, 1992.\\ + \url{https://www.eijkhout.net/texbytopic/texbytopic.html} \end{thebibliography} \newpage diff --git a/info/ptex-manual/ptex-manual.pdf b/info/ptex-manual/ptex-manual.pdf Binary files differindex 219af34588..6c35fa4654 100644 --- a/info/ptex-manual/ptex-manual.pdf +++ b/info/ptex-manual/ptex-manual.pdf diff --git a/info/ptex-manual/ptex-manual.sty b/info/ptex-manual/ptex-manual.sty index 686d10998e..10b527e921 100644 --- a/info/ptex-manual/ptex-manual.sty +++ b/info/ptex-manual/ptex-manual.sty @@ -19,7 +19,8 @@ \leavevmode\par\nopagebreak} }{} -\def\emph#1{{\bfseries\sffamily\gtfamily\mathversion{bold}#1}} +\let\origemph=\emph +\def\emph#1{{\bfseries\sffamily\gtfamily\selectfont\mathversion{bold}#1}} \def\paragraph#1{\par\medskip\par\noindent\emph{â– #1}\par\nobreak} \def\Pkg#1{\textsf{#1}} @@ -115,6 +116,7 @@ \bigskipamount=\baselineskip \medskipamount=.5\baselineskip \smallskipamount=.25\baselineskip + \clubpenalty=10000 \widowpenalty=9999 \divide\@tempdima by\dimexpr1zw\relax\@tempcnta=\@tempdima \leftskip=\dimexpr\textwidth-\@tempcnta zw\relax \@totalleftmargin\dimexpr\leftskip+0zw diff --git a/info/ptex-manual/ptex-manual.tex b/info/ptex-manual/ptex-manual.tex index 176624be85..f298c03870 100644 --- a/info/ptex-manual/ptex-manual.tex +++ b/info/ptex-manual/ptex-manual.tex @@ -1248,7 +1248,6 @@ p3.1.2ã§å¾©æ´»ã—ãŸã¨ã„ã†çµŒç·¯ãŒã‚る.}. |\sfcode|, |\mathcode|, |\delcode|, - |\mathchardef|, |\lccode|, |\uccode| \end{quote} diff --git a/macros/latex/contrib/attachfile2/README.md b/macros/latex/contrib/attachfile2/README.md index d014b5549a..54f2651121 100644 --- a/macros/latex/contrib/attachfile2/README.md +++ b/macros/latex/contrib/attachfile2/README.md @@ -1,11 +1,18 @@ # attachfile2 -attach files to PDF documents +Attach files to PDF documents +This package can be used to attach files to a PDF document. +It is a further development of Scott Pakin's package +attachfile for pdfTeX. Apart from bug fixes, +package attachfile2 adds support for dvips, +some new options, gets and writes meta information data about +the attached files. + See the embedfile package for a newer package supporting this feature. This package comes with a Perl script pdfatfi.pl -that should be installed somewhere in PATH as `pdfatfi', see also -package documentation. +that should be installed somewhere in PATH as `pdfatfi', +see also package documentation. diff --git a/macros/latex/contrib/attachfile2/attachfile2.dtx b/macros/latex/contrib/attachfile2/attachfile2.dtx index 0b5922b976..2f4aefb8dd 100644 --- a/macros/latex/contrib/attachfile2/attachfile2.dtx +++ b/macros/latex/contrib/attachfile2/attachfile2.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % % File: attachfile2.dtx -% Version: 2019/11/24 v2.10 +% Version: 2019/11/26 v2.11 % Info: Attach files into PDF % % Copyright (C) @@ -27,9 +27,9 @@ % % This work consists of the main source file attachfile2.dtx % and the derived files -% attachfile2.sty, attachfile2.pdf, attachfile2.ins, attachfile2.drv, +% attachfile2.sty, attachfile2.pdf, % atfi-dvips.def, atfi-pdftex.def, atfi-dvipdfmx.def, atfi-luatex.def -% pdfatfi.pl. +% pdfatfi.pl pdfatfi.1. % % Distribution: % CTAN:macros/latex/contrib/attachfile2/attachfile2.dtx @@ -69,6 +69,7 @@ % TDS:tex/latex/attachfile2/atfi-luatex.def % TDS:scripts/attachfile2/pdfatfi.pl (exec flag) % TDS:doc/latex/attachfile2/attachfile2.pdf +% TDS:doc/man/man1/pdfatfi.1 % TDS:source/latex/attachfile2/attachfile2.dtx % %<*ignore> @@ -86,7 +87,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: attachfile2 2019/11/24 v2.10 Attach files into PDF (HO)} +\Msg{* Package: attachfile2 2019/11/26 v2.11 Attach files into PDF (HO)} \Msg{************************************************************************} \keepsilent @@ -98,7 +99,7 @@ This is a generated file. Project: attachfile2 -Version: 2019/11/24 v2.10 +Version: 2019/11/26 v2.11 Copyright (C) 2005-2010, 2012 Heiko Oberdiek @@ -123,9 +124,9 @@ https://github.com/ho-tex/attachfile2/issues This work consists of the main source file attachfile2.dtx and the derived files - attachfile2.sty, attachfile2.pdf, attachfile2.ins, attachfile2.drv, + attachfile2.sty, attachfile2.pdf, atfi-dvips.def, atfi-pdftex.def, atfi-dvipdfmx.def, atfi-luatex.def - pdfatfi.pl. + pdfatfi.pl, pdfatfi.1. \endpreamble \let\MetaPrefix\DoubleperCent @@ -141,6 +142,8 @@ and the derived files \file{atfi-dvipdfmx.def}{\from{attachfile2.dtx}{dvipdfmx}}% \nopreamble \nopostamble + \usedir{doc/man/man1/}% + \file{pdfatfi.1}{\from{attachfile2.dtx}{pdfatfiman}}% \usedir{scripts/attachfile2}% \csname execfiletrue\endcsname \file{pdfatfi.pl}{\from{attachfile2.dtx}{pdfatfi}}% @@ -177,7 +180,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{attachfile2.drv}% - [2019/11/24 v2.10 Attach files into PDF (HO)]% + [2019/11/26 v2.11 Attach files into PDF (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2011/11/22] \begin{document} @@ -206,7 +209,7 @@ and the derived files % \GetFileInfo{attachfile2.drv} % % \title{The \xpackage{attachfile2} package} -% \date{2019/11/24 v2.10} +% \date{2019/11/26 v2.11} % \author{Heiko Oberdiek\thanks % {Please report any issues at \url{https://github.com/ho-tex/attachfile2/issues}}} % @@ -434,7 +437,7 @@ and the derived files %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{attachfile2}% - [2019/11/24 v2.10 Attach files into PDF (HO)]% + [2019/11/26 v2.11 Attach files into PDF (HO)]% % \end{macrocode} % % \subsubsection{Loading of packages} @@ -1623,7 +1626,7 @@ and the derived files %<*pdftex> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{atfi-pdftex.def}% - [2019/11/24 v2.10 attachfile2 driver for pdfTeX (HO)]% + [2019/11/26 v2.11 attachfile2 driver for pdfTeX (HO)]% % \end{macrocode} % % \paragraph{Macros for graphics data} @@ -1807,7 +1810,7 @@ and the derived files %<*luatex> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{atfi-luatex.def}% - [2019/11/24 v2.10 attachfile2 driver for luaTeX (HO)]% + [2019/11/26 v2.11 attachfile2 driver for luaTeX (HO)]% \protected\def\atfi@literal {\pdfextension literal} \def\atfi@GSAVE{q } \def\atfi@GRESTORE{Q } @@ -1941,7 +1944,7 @@ and the derived files %<*dvips> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{atfi-dvips.def}% - [2019/11/24 v2.10 attachfile2 driver for dvips (HO)]% + [2019/11/26 v2.11 attachfile2 driver for dvips (HO)]% % \end{macrocode} % % \paragraph{Macros for graphics data} @@ -2516,7 +2519,7 @@ and the derived files %<*dvipdfmx> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{atfi-dvipdfmx.def}% - [2019/11/24 v2.10 attachfile2 driver for dvipdfmx/XeTeX (HO)]% + [2019/11/26 v2.11 attachfile2 driver for dvipdfmx/XeTeX (HO)]% % \end{macrocode} % % \paragraph{Macros for graphics data} @@ -2788,7 +2791,7 @@ my $prj = 'pdfatfi'; my $file = "$prj.pl"; my $program = uc($&) if $file =~ /^\w+/; my $version = "2.9"; -my $date = "2019/11/24"; +my $date = "2019/11/26"; my $author = "Heiko Oberdiek"; my $copyright = "Copyright (c) 2005-2010, 2012 by $author."; # @@ -2978,6 +2981,60 @@ __END__ %</pdfatfi> % \end{macrocode} % +% \begin{macrocode} +%<*pdfatfiman> +.TH pdfatfi 1 "2019-11-24" +.SH NAME +pdfatfi \- Help program for the LaTeX package attachfile2. +.SH SYNOPSIS +pdfatfi <command> [<options>] <file[.atfi]>] +.SH DESCRIPTION +Helper program for the LaTeX package attachfile2. + +This package also tries to get and add meta information data, +such as file size, file date, checksum, .... + +The script pdfatfi.pl is provided for use with old versions of +pdfTeX and XeTeX that do not provide access +to file metadata. + +The use of the Perl script is not mandatory. This data can be shown +by PDF viewers, but they are not a requirement of the PDF specification. + +Package attachfile2 and the Perl script communicate +via an auxiliary file with file extension .atfi. The script +is used between two LaTeX runs and updates the auxiliary file. + +.nf +latex test +pdfatfi test +latex test +dvips test +ps2pdf test.ps test.pdf +.fi + +.SH OPTIONS +Various options are supported +.IP --help +Show help text. +.IP --version +Print version number +.IP --(no)quiet +Suppress/don't suppress messages +.IP --(no)verbose +Verbose (not verbose) printing. +.IP --(no)debug +Debug infomation printed (not printed) +.SH BUGS +Please log issues on the GitHub homepage: +.br +https://github.com/ho-tex/attachfile2/issues. +.SH AUTHOR +Heiko Oberdiek (ho-tex@tug.org) +.SH SEE ALSO +See attachfile2.pdf for more details. +%</pdfatfiman> +% \end{macrocode} % % \section{Installation} % @@ -3113,8 +3170,8 @@ __END__ % \subsection{Refresh file name databases} % % If your \TeX~distribution -% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh -% these. For example, \teTeX\ users run \verb|texhash| or +% (\TeX\,Live, \mikTeX, \dots) relies on file name databases, you must refresh +% these. For example, \TeX\,Live\ users run \verb|texhash| or % \verb|mktexlsr|. % % \subsection{Script installation} @@ -3288,6 +3345,10 @@ __END__ % \item % use \CTANpkg{iftex} not \CTANpkg{ifpdf}, \CTANpkg{ifxetex}, \CTANpkg{ifluatex}. % \end{Version} +% \begin{Version}{2019/11/26 v2.11} +% \item +% Add man file for \verb|pdfatfi|. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/macros/latex/contrib/attachfile2/attachfile2.pdf b/macros/latex/contrib/attachfile2/attachfile2.pdf Binary files differindex 193c7e6793..a0a5c5052d 100644 --- a/macros/latex/contrib/attachfile2/attachfile2.pdf +++ b/macros/latex/contrib/attachfile2/attachfile2.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/american-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/american-apa.lbx index cb2a128c6d..8e9be02758 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/american-apa.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/american-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{american-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{american-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{american} \NewBibliographyString{revisededition} @@ -19,10 +19,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -61,10 +58,92 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{execorder} +\NewBibliographyString{senate} +\NewBibliographyString{resolution} +\NewBibliographyString{houseofrepresentatives} +\NewBibliographyString{report} +\NewBibliographyString{us} +\NewBibliographyString{southcarolina} +\NewBibliographyString{constitution} +\NewBibliographyString{section} +\NewBibliographyString{amendment} +\NewBibliographyString{proposed} +\NewBibliographyString{repealed} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} +\NewBibliographyString{alabama} +\NewBibliographyString{alaska} +\NewBibliographyString{arizona} +\NewBibliographyString{arkansas} +\NewBibliographyString{california} +\NewBibliographyString{colorado} +\NewBibliographyString{connecticut} +\NewBibliographyString{delaware} +\NewBibliographyString{florida} +\NewBibliographyString{georgia} +\NewBibliographyString{hawaii} +\NewBibliographyString{idaho} +\NewBibliographyString{illinois} +\NewBibliographyString{indiana} +\NewBibliographyString{iowa} +\NewBibliographyString{kansas} +\NewBibliographyString{kentucky} +\NewBibliographyString{louisiana} +\NewBibliographyString{maine} +\NewBibliographyString{maryland} +\NewBibliographyString{massachusetts} +\NewBibliographyString{michigan} +\NewBibliographyString{minnesota} +\NewBibliographyString{mississippi} +\NewBibliographyString{missouri} +\NewBibliographyString{montana} +\NewBibliographyString{nebraska} +\NewBibliographyString{nevada} +\NewBibliographyString{newhampshire} +\NewBibliographyString{newjersey} +\NewBibliographyString{newmexico} +\NewBibliographyString{newyork} +\NewBibliographyString{northcarolina} +\NewBibliographyString{northdakota} +\NewBibliographyString{ohio} +\NewBibliographyString{oklahoma} +\NewBibliographyString{oregon} +\NewBibliographyString{pennsylvania} +\NewBibliographyString{rhodeisland} +\NewBibliographyString{southcarolina} +\NewBibliographyString{southdakota} +\NewBibliographyString{tennessee} +\NewBibliographyString{texas} +\NewBibliographyString{utah} +\NewBibliographyString{vermont} +\NewBibliographyString{virginia} +\NewBibliographyString{washington} +\NewBibliographyString{westvirginia} +\NewBibliographyString{wisconsin} +\NewBibliographyString{wyoming} \DeclareBibliographyStrings{% inherit = {american}, - article = {{article}{article}}, + ofthe = {{of\space the}{of\space the}}, + tothe = {{to\space the}{to\space the}}, + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + proposed = {{proposed}{proposed}}, + repealed = {{was repealed in}{repealed}}, + execorder = {{Executive\space Order}{Exec\adddot\space Order}}, + senate = {{Senate}{S\adddot}}, + resolution = {{Resolution}{Res\adddot}}, + houseofrepresentatives = {{House\space of\space Representatives}{H\adddot R\adddot}}, + report = {{Report}{Rep\adddot}}, + us = {{U\adddot S\adddot}{U\adddot S\adddot}}, + southcarolina = {{South\space Carolina}{S\adddot C\adddot}}, + constitution = {{Constitution}{Const\adddot}}, + section = {{Section}{§}}, + amendment = {{amendment}{amend\adddot}}, + article = {{article}{art\adddot}}, painting = {{painting}{painting}}, present = {{present}{present}}, song = {{song}{song}}, @@ -99,10 +178,7 @@ with = {{with}{with}}, reprintas = {{reprinted as}{reprinted as}}, reprintfrom = {{reprinted from}{reprinted from}}, - commentonarticle = {{comment\space on\space the\space article}{comment\space on\space the\space article}}, - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}}, - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}}, - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}}, + commenton = {{comment\space on}{comment\space on}}, part = {{part}{pt\adddot}}, paragraph = {{paragraph}{para\adddot}}, paragraphs = {{paragraphs}{paras\adddot}}, @@ -136,7 +212,57 @@ annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, commonera = {{C\adddot E\adddot}{C\adddot E\adddot}}, - beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}} + beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}, + alabama = {{Alabama}{{A\adddot L\adddot}}}, + alaska = {{Alaska}{{A\adddot K\adddot}}}, + arizona = {{Arizona}{{A\adddot Z\adddot}}}, + arkansas = {{Arkansas}{{A\adddot R\adddot}}}, + california = {{California}{{C\adddot A\adddot}}}, + colorado = {{Colorado}{{C\adddot O\adddot}}}, + connecticut = {{Connecticut}{{C\adddot T\adddot}}}, + delaware = {{Delaware}{{D\adddot E\adddot}}}, + florida = {{Florida}{{F\adddot L\adddot}}}, + georgia = {{Georgia}{{G\adddot A\adddot}}}, + hawaii = {{Hawaii}{{H\adddot I\adddot}}}, + idaho = {{Idaho}{{I\adddot D\adddot}}}, + illinois = {{Illinois}{{I\adddot L\adddot}}}, + indiana = {{Indiana}{{I\adddot N\adddot}}}, + iowa = {{Iowa}{{I\adddot A\adddot}}}, + kansas = {{Kansas}{{K\adddot S\adddot}}}, + kentucky = {{Kentucky}{{K\adddot Y\adddot}}}, + louisiana = {{Louisiana}{{L\adddot A\adddot}}}, + maine = {{Maine}{{M\adddot E\adddot}}}, + maryland = {{Maryland}{{M\adddot D\adddot}}}, + massachusetts = {{Massachusetts}{{M\adddot A\adddot}}}, + michigan = {{Michigan}{{M\adddot I\adddot}}}, + minnesota = {{Minnesota}{{M\adddot N\adddot}}}, + mississippi = {{Mississippi}{{M\adddot S\adddot}}}, + missouri = {{Missouri}{{M\adddot O\adddot}}}, + montana = {{Montana}{{M\adddot T\adddot}}}, + nebraska = {{Nebraska}{{N\adddot E\adddot}}}, + nevada = {{Nevada}{{N\adddot V\adddot}}}, + newhampshire = {{New Hampshire}{{N\adddot H\adddot}}}, + newjersey = {{New Jersey}{{N\adddot J\adddot}}}, + newmexico = {{New Mexico}{{N\adddot M\adddot}}}, + newyork = {{New York}{{N\adddot Y\adddot}}}, + northcarolina = {{North Carolina}{{N\adddot C\adddot}}}, + northdakota = {{North Dakota}{{N\adddot D\adddot}}}, + ohio = {{Ohio}{{O\adddot H\adddot}}}, + oklahoma = {{Oklahoma}{{O\adddot K\adddot}}}, + oregon = {{Oregon}{{O\adddot R\adddot}}}, + pennsylvania = {{Pennsylvania}{{P\adddot A\adddot}}}, + rhodeisland = {{Rhode Island}{{R\adddot I\adddot}}}, + southcarolina = {{South Carolina}{{S\adddot C\adddot}}}, + southdakota = {{South Dakota}{{S\adddot D\adddot}}}, + tennessee = {{Tennessee}{{T\adddot N\adddot}}}, + texas = {{Texas}{{T\adddot X\adddot}}}, + utah = {{Utah}{{U\adddot T\adddot}}}, + vermont = {{Vermont}{{V\adddot T\adddot}}}, + virginia = {{Virginia}{{V\adddot A\adddot}}}, + washington = {{Washington}{{W\adddot A\adddot}}}, + westvirginia = {{West Virginia}{{W\adddot V\adddot}}}, + wisconsin = {{Wisconsin}{{W\adddot I\adddot}}}, + wyoming = {{Wyoming}{{W\adddot Y\adddot}}} } % diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.bbx index 41480df9df..b514708cea 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.bbx @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Philip Kime. -\ProvidesFile{apa.bbx}[2019/11/23\space v9.0\space APA biblatex references style] +\ProvidesFile{apa.bbx}[2019/11/27\space v9.1\space APA biblatex references style] \RequireBiber[3] \RequireBibliographyStyle{standard} \urlstyle{rm} % APA examples all have URLs in same font as text @@ -98,7 +98,16 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Multiple related entries, even though there are no +% examples in APA 7th, should probably be this + +\renewcommand*{\relateddelim}{\addcomma\addspace} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Force roman numerals into arabic using % etoolbox macros @@ -123,7 +132,10 @@ \blx@metadateinfo{#1}% \iffieldundef{#1year}{} {\datecircaprint - \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ... + \ifboolexpr{ test {\ifstrequal{#1}{url}} + or test {\ifentrytype{legal}} + or ( test {\ifentrytype{legadminmaterial}} and + test {\ifkeyword{proposed}} ) } {\printtext{% \mkbibdateapalongmdy{#1year}{#1month}{#1day}% \iffieldundef{#1endyear}% @@ -259,10 +271,13 @@ \literal{nodate} } +% CONSTITUTION entrytypes have no dates at all so no fall back to nodate literal either +\DeclareLabeldate[constitution]{\field{date}} + \ExecuteBibliographyOptions{% abbreviate=true,% autocite=inline,% - backref=true,% + backref=false,% citetracker=true,% date=apalong,% dateabbrev=false,% @@ -317,19 +332,6 @@ } } -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% It is not APA standard to have backrefs in the bib -% Some users might like it though. - -\newbool{apa:backref} -\DeclareBibliographyOption{apabackref}{% - \ifstrequal{#1}{true} - {\global\booltrue{apa:backref}} - {\global\boolfalse{apa:backref}}} - -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Flag to say whether the "in" has % been placed already in IN* @@ -352,27 +354,23 @@ \ifbibstring{#1}{\bibcpstring{#1}}{#1}}} % TITLE -\DeclareFieldFormat{title}{\mkbibemph{#1}\isdot} -\DeclareFieldFormat[article]{title}{#1\isdot} -\DeclareFieldFormat[inbook]{title}{#1\isdot} -\DeclareFieldFormat[incollection]{title}{#1\isdot} -\DeclareFieldFormat[inproceedings]{title}{\mkbibemph{#1}\isdot} -\DeclareFieldFormat[proceedings]{title}{\mkbibemph{#1}\isdot} -\DeclareFieldFormat[periodical]{title}{#1\isdot} -\DeclareFieldFormat[thesis]{title}{\mkbibemph{#1}} -\DeclareFieldFormat[patent]{title}{\mkbibemph{#1}} -\DeclareFieldFormat[unpublished]{title}{\mkbibemph{#1}} -\DeclareFieldFormat[image]{title}{\mkbibemph{#1}} -\DeclareFieldFormat[misc]{title}{#1\isdot} -\DeclareFieldFormat[audio]{title}{\iffieldundef{maintitle}{\mkbibemph{#1}\isdot}{#1}} -\DeclareFieldFormat[video]{title}{\iffieldundef{maintitle}{\mkbibemph{#1}\isdot}{#1}} +\DeclareFieldFormat*{title}{\mkbibemph{#1}\isdot} +\DeclareFieldFormat[article,inbook,incollection,periodical,misc,legislation,legadminmaterial,jurisdiction,inproceedings,legal]{title}{#1\isdot} +\DeclareFieldFormat[audio,video]{title}{\iffieldundef{maintitle}{\mkbibemph{#1}\isdot}{#1}} + +% SUBTITLE +\DeclareFieldFormat[legmaterial]{subtitle}{\mkbibemph{#1}} % TITLEADDON \DeclareFieldFormat{titleaddon}{\mkbibbrackets{\bbx@colon@search\MakeSentenceCase*{#1}}} +\DeclareFieldFormat[legislation]{titleaddon}{#1} % MAINTITLEADDON \DeclareFieldFormat{maintitleaddon}{\mkbibbrackets{\bbx@colon@search\MakeSentenceCase*{#1}}} +% NOTE +\DeclareFieldFormat[legmaterial,legadminmaterial]{note}{\mkbibparens{#1}} + % BOOKTITLEADDON \DeclareFieldFormat{booktitleaddon}{\mkbibbrackets{\bbx@colon@search\MakeSentenceCase*{#1}}} @@ -382,11 +380,8 @@ % ORIGTITLE \DeclareFieldFormat{origtitle}{\mkbibemph{\bbx@colon@search\MakeSentenceCase*{#1}}\isdot} -\DeclareFieldFormat[article]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot} -\DeclareFieldFormat[inbook]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot} -\DeclareFieldFormat[incollection]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot} -\DeclareFieldFormat[inproceedings]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot} -\DeclareFieldFormat[proceedings]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot} + +\DeclareFieldFormat[article,inbook,incollection,inproceedings,proceedings]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot} % VOLUME \DeclareFieldFormat{volume}{\iffieldundef{maintitle} @@ -409,25 +404,35 @@ {\apanum{#1}}} {\mkbibemph{\apanum{#1}}}} \DeclareFieldFormat[report]{number}{\apanum{#1}} -\DeclareFieldFormat[article]{number}{\mkbibparens{\apanum{#1}}} +\DeclareFieldFormat[article,periodical]{number}{\mkbibparens{\apanum{#1}}} \DeclareFieldFormat[reprint]{number}{\mkbibbrackets{\apanum{#1}}} -\DeclareFieldFormat[periodical]{number}{\mkbibparens{\apanum{#1}}} +\DeclareFieldFormat{legmaterialnum}{% + \ifthenelse{% + \iffieldequalstr{type}{report}\OR% + \iffieldequalstr{type}{execorder}}{\bibcpstring{number}~\apanum{#1}}{\apanum{#1}}} + % PAGES -\DeclareFieldFormat[inbook]{pages}{\mkpageprefix[bookpagination]{#1}} -\DeclareFieldFormat[incollection]{pages}{\mkpageprefix[bookpagination]{#1}} +\DeclareFieldFormat[inbook,incollection]{pages}{\mkpageprefix[bookpagination]{#1}} \DeclareFieldFormat[periodical]{pages}{#1} +% PART +\DeclareFieldFormat*{part}{#1} + % LOCATION -\DeclareListFormat[misc]{location}{\mkbibemph{#1}} -\DeclareListFormat[periodical]{location}{\mkbibemph{#1}} +\DeclareListFormat[misc,periodical]{location}{\mkbibemph{#1}} +\DeclareListFormat{publisher}{% + \usebibmacro{publisher:delim}{#1}% + #1\isdot} +\DeclareListFormat{location}{% + \usebibmacro{location:delim}{#1}% + #1\isdot} % NAMEADDON \DeclareFieldFormat[misc]{nameaddon}{\mkbibparens{#1}} % VERSION -\DeclareFieldFormat[dataset]{version}{\bibcpstring{version}~#1} -\DeclareFieldFormat[software]{version}{\bibcpstring{version}~#1} +\DeclareFieldFormat[dataset,software]{version}{\bibcpstring{version}~#1} % URL \DeclareFieldFormat{url}{\url{#1}} @@ -529,6 +534,17 @@ \newunit\newblock% \usebibmacro{labelyear+extradate}} +\newbibmacro*{author/editor:related}{% + \ifthenelse{\ifnameundef{author}\AND\ifnameundef{groupauthor}} + {\ifnameundef{editor} + {\usebibmacro{title}% + % need to clear all title fields so we don't get them again later + \clearfield{title}% + \clearfield{subtitle}% + \clearfield{titleaddon}} + {\usebibmacro{editorinauthpos:related}}} + {\usebibmacro{author:related}}} + \newbibmacro*{editorinauthpos}{% \printnames[apaauthor][-\value{listtotal}]{editor}% \setunit{\addspace}% @@ -538,6 +554,15 @@ % need to clear editor so we don't get an "In" clause later \clearname{editor}}} +\newbibmacro*{editorinauthpos:related}{% + \printnames[apanames][-\value{listtotal}]{editor}% + \setunit{\addspace}% + \ifnameundef{editor} + {} + {\printtext[parens]{\usebibmacro{apaeditorstrg}{editor}}% + % need to clear editor so we don't get an "In" clause later + \clearname{editor}}} + \renewbibmacro*{author}{% \ifnameundef{author} {\printnames[apaauthor][-\value{listtotal}]{groupauthor}} @@ -550,6 +575,12 @@ \printnames[apaauthor][-\value{listtotal}]{with}} \setunit*{\addspace}}} +\newbibmacro*{author:related}{% + \ifnameundef{author} + {\printnames[apanames][-\value{listtotal}]{groupauthor}} + {\printnames[apanames][-\value{listtotal}]{author}}% + \setunit*{\addspace}} + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -650,17 +681,6 @@ \setunit{\addspace}% \ifentrytype{inbook}{}{\usebibmacro{addinfo1}}% additional info in parens \setunit{\addspace}% - \iffieldundef{related} - {} - {\ifthenelse{\iffieldequalstr{relatedtype}{reviewofbook}\OR% - \iffieldequalstr{relatedtype}{reviewoffilm}\OR% - \iffieldequalstr{relatedtype}{reviewoftv}\OR% - \iffieldequalstr{relatedtype}{commentonarticle}} - {\usebibmacro{related:init}% - \usebibmacro{related}% - \togglefalse{bbx:related}}% disable default related expansion later on - {}}% - \setunit{\addspace}% \printfield{titleaddon}% \setunit{\addspace}% \usebibmacro{addinfo2}}}% @@ -725,7 +745,7 @@ \iffieldundef{eprinttype} {} {\printtext{% - \iffieldbibstring{eprinttype}{\bibcpstring{\strfield{eprinttype}}}{\strfield{eprinttype}}% + \iffieldbibstring{eprinttype}{\bibcplstring{\strfield{eprinttype}}}{\strfield{eprinttype}}% \setunit{\addspace}}}% \printfield{eprint}} @@ -1100,10 +1120,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 10.2.24) Multiple publishers, semi-colon sep -\DeclareListFormat{publisher}{% - \usebibmacro{publisher:delim}{#1}% - #1\isdot} - \newbibmacro*{publisher:delim}[1]{% \ifnumgreater{\value{listcount}}{\value{liststart}} {\printdelim[publisher]{multilistdelim}} @@ -1132,10 +1148,10 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 10.1 Example 18) Comment on article -\newcommand*{\begrelateddelimcommentonarticle}{\addspace} -\DeclareFieldFormat{related:commentonarticle}{\def\bibstring{\blx@imc@bibcpstring}\mkbibbrackets{#1}} +\newcommand*{\begrelateddelimcommenton}{\addspace} +\DeclareFieldFormat{related:commenton}{\def\bibstring{\blx@imc@bibcpstring}\mkbibbrackets{#1}} -\renewbibmacro*{related:commentonarticle}[1]{% +\newbibmacro*{related:commenton}[1]{% \entrydata*{#1}{% \printtext{\mkbibquote{\printfield[apacase]{title}}}}} @@ -1146,24 +1162,15 @@ % (APA 10.7) Reviews - role strings need to be the % short versions in reviews -\newcommand*{\begrelateddelimreviewofbook}{\addspace} -\DeclareFieldFormat{related:reviewofbook}{\def\bibstring{\blx@imc@bibcpsstring}\mkbibbrackets{#1}} -\newbibmacro*{related:reviewofbook}[1]{\usebibmacro{related:reviewofx}{#1}} - -\newcommand*{\begrelateddelimreviewoffilm}{\addspace} -\DeclareFieldFormat{related:reviewoffilm}{\def\bibstring{\blx@imc@bibcpsstring}\mkbibbrackets{#1}} -\newbibmacro*{related:reviewoffilm}[1]{\usebibmacro{related:reviewofx}{#1}} - -\newcommand*{\begrelateddelimreviewoftv}{\addspace} -\DeclareFieldFormat{related:reviewoftv}{\def\bibstring{\blx@imc@bibcpsstring}\mkbibbrackets{#1}} -\newbibmacro*{related:reviewoftv}[1]{\usebibmacro{related:reviewofx}{#1}} - \DeclareFieldFormat{reviewtitle}{% \iffieldequalstr{entrysubtype}{tvepisode} {\mkbibquote{\bbx@colon@search\MakeSentenceCase*{#1}}} {\bbx@colon@search\MakeSentenceCase*{#1}}} -\newbibmacro*{related:reviewofx}[1]{% +\newcommand*{\begrelateddelimreviewof}{\addspace} +\DeclareFieldFormat{related:reviewof}{\def\bibstring{\blx@imc@bibcpsstring}\mkbibbrackets{#1}} + +\newbibmacro*{related:reviewof}[1]{% \entrydata*{#1}{% \printtext{\mkbibemph{% \printfield[reviewtitle]{title}% @@ -1174,7 +1181,7 @@ \setunit{\addcomma\addspace}% \biblstring{byauthor}% \setunit{\addspace}% - \printnames[apanames][-\value{listtotal}]{author}}}} + \usebibmacro{author/editor:related}}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1219,8 +1226,20 @@ {}} \newcommand*{\begrelateddelimreprintfrom}{\addperiod\addspace} + +% Some APA related entries are just after title, some are at the end of +% the entry. This is for those after the title +\newbibmacro*{apa:related}{% + \iffieldundef{related} + {} + {\ifthenelse{\iffieldequalstr{relatedtype}{reviewof}\OR% + \iffieldequalstr{relatedtype}{commenton}} + {\usebibmacro{related:init}% + \usebibmacro{related}% + \togglefalse{bbx:related}}% disable default related expansion later on + {}}} + \DeclareFieldFormat{related:reprintfrom}{\let\bibstring\bibcpstring\mkbibparens{#1}} -\DeclareFieldFormat{related:reviewof}{\mkbibbrackets{#1}} \renewbibmacro*{related:reprintfrom}[1]{% \entrydata*{#1}{% @@ -1294,7 +1313,76 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 11.4) Court cases + +\newtoggle{apa:courtdate} + +\DeclareListFormat{citation}{% + \global\toggletrue{apa:courtdate}% + \hasitemannotation[\currentlist][citeorg]% + {#1\addspace\mkbibparens{\getitemannotation[\currentlist][citeorg]% + \hasitemannotation[\currentlist][citedate] + {\addspace\getitemannotation[\currentlist][citedate]% + \global\togglefalse{apa:courtdate}} % disable normal date printing if it's in the citation info + {}}} + {\ifitemannotation[\currentlist][citeinfo]{appeal} + {\mkbibemph{#1}} + {#1}}% + \ifthenelse{\value{listcount}<\value{liststop}} + {\addcomma\addspace} + {}} + +\DeclareFieldFormat{courtdate}{% + % disable normal date printing if it's in the citation info + \iftoggle{apa:courtdate} + {\iflistundef{organization} + {\printtext{\mkbibparens{#1}}} + {\printtext{\mkbibparens{% + \printlist{organization}\space #1}}}} + {}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 11.5) Statutes + +\newbibmacro*{statdate}{% + \iffieldundef{origyear} + {\printtext[parens]{\printlabeldate}} + {\printtext[parens]{\printorigdate% + \addspace\&\addspace rev\adddot\addspace\printlabeldate}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 11.6) Legislative Material and Admin Material + +\newbibmacro*{location:delim}[1]{% + \ifnumgreater{\value{listcount}}{\value{liststart}} + {\printdelim[location]{multilistdelim}} + {}} + +\DeclareDelimFormat[location]{multilistdelim}{\addcomma\space} +\DeclareDelimFormat[location]{finallistdelim}{\addcomma\space} + +\newbibmacro*{legmattitle}{% + \iffieldundef{title} + {\bibcpsstring{\thefield{source}}% + \setunit*{\addspace}% + \bibcpsstring{\thefield{type}}% + \setunit*{\addspace}% + \printfield[legmaterialnum]{number}} + {\printfield{title}% + \setunit*{\addcolon\addspace}\newblock + \printfield{subtitle}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 10.x) General entrytype drivers % Custom driver to make a cleaner example for 9.44 @@ -1309,6 +1397,8 @@ \usebibmacro{author/editor}% \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% + \setunit{\addspace}\newblock + \usebibmacro{apa:related}% \newunit\newblock \usebibmacro{journal+issuetitle}% \setunit{\bibpagespunct}% @@ -1326,7 +1416,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1336,6 +1426,8 @@ \usebibmacro{author/editor}% \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% + \setunit{\addspace}\newblock + \usebibmacro{apa:related}% \newunit\newblock \usebibmacro{mainaudio}% \newunit\newblock @@ -1351,7 +1443,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1374,7 +1466,28 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% + \usebibmacro{annotation}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{constitution}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \bibcpsstring{\thefield{source}}% + \setunit{\addspace}\newblock + \bibcpsstring{\thefield{type}}% + \setunit{\addspace}\newblock + \iffieldundef{amendment}{}{\bibsstring{amendment}\setunit{\addspace}\printfield{amendment}}% + \setunit{\addcomma\addspace}\newblock + \iffieldundef{article}{}{\bibsstring{article}\setunit{\addspace}\printfield{article}}% + \setunit{\addcomma\addspace}\newblock + \iffieldundef{section}{}{\bibsstring{section}\setunit{\addspace}\printfield{section}}% + \setunit{\addcomma\addspace}\newblock + \iffieldundef{part}{}{\bibsstring{paragraph}\setunit{\addspace}\printfield{part}}% + \setunit{\addspace}\newblock + \ifkeyword{repealed}{\printtext[parens]{\biblcsstring{repealed}\setunit{\addspace}\printeventdate}}{}% + \usebibmacro{doi+url}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1403,7 +1516,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1424,7 +1537,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1434,6 +1547,8 @@ \usebibmacro{author/editor}% \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% + \setunit{\addspace}\newblock + \usebibmacro{apa:related}% \newunit\newblock \usebibmacro{editor+trans}% \newblock @@ -1453,7 +1568,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1463,6 +1578,8 @@ \usebibmacro{author/editor}% \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% + \setunit{\addspace}\newblock + \usebibmacro{apa:related}% \newunit\newblock \usebibmacro{editor+trans}% \setunit*{\addcomma\addspace}\newblock @@ -1482,7 +1599,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1492,6 +1609,8 @@ \usebibmacro{author/editor}% \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% + \setunit{\addspace}\newblock + \usebibmacro{apa:related}% \newunit\newblock \usebibmacro{editor+trans}% \setunit*{\addcomma\addspace}\newblock @@ -1518,7 +1637,83 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% + \usebibmacro{annotation}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{jurisdiction}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \printfield{title}% + \setunit{\addcomma\addspace}\newblock + \printlist{citation}% + \setunit{\addspace}\newblock + \printtext[courtdate]{\printlabeldate}% + \newunit\newblock + \usebibmacro{doi+url}% + \usebibmacro{pageref}% + \usebibmacro{annotation}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{legal}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \printfield{title}% + \setunit{\addspace}% + \printfield{titleaddon}% + \setunit{\addcomma\addspace}\newblock + \printlabeldate% + \setunit{\addcomma\addspace}\newblock + \usebibmacro{doi+url}% + \usebibmacro{pageref}% + \usebibmacro{annotation}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{legislation}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \printfield{title}% + \setunit{\addspace}% + \printfield{titleaddon}% + \setunit{\addcomma\addspace}\newblock + \printlist{location}% + \setunit{\addspace}\newblock + \usebibmacro{statdate}% + \newunit\newblock + \usebibmacro{doi+url}% + \usebibmacro{pageref}% + \usebibmacro{annotation}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{legadminmaterial}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{legmattitle}% + \setunit{\addcomma\addspace}\newblock + \printlist{citation}% + \setunit{\addspace}\newblock + \printtext[parens]{\ifkeyword{proposed}{\bibstring{proposed}\space}{}\printlabeldate}% + \setunit{\addspace}\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{doi+url}% + \usebibmacro{pageref}% + \usebibmacro{annotation}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{legmaterial}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{legmattitle}% + \setunit{\addcomma\addspace}\newblock + \printlist{location}% + \setunit{\addspace}\newblock + \printtext[parens]{\printlabeldate}% + \setunit{\addspace}\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{doi+url}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1547,7 +1742,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1557,6 +1752,8 @@ \usebibmacro{author/editor}% \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% + \setunit{\addspace}\newblock + \usebibmacro{apa:related}% \newunit\newblock \usebibmacro{location+publisher}% \newunit\newblock @@ -1568,7 +1765,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1578,6 +1775,8 @@ \usebibmacro{author/editor}% \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% + \setunit{\addspace}\newblock + \usebibmacro{apa:related}% \newunit\newblock \printlist{organization}% \addperiod\addspace @@ -1590,7 +1789,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1600,6 +1799,8 @@ \usebibmacro{author/editor}% \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% + \setunit{\addspace}\newblock + \usebibmacro{apa:related}% \newunit\newblock \usebibmacro{location+publisher}% \newunit\newblock @@ -1613,7 +1814,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{finentry}} \DeclareBibliographyDriver{periodical}{% @@ -1641,7 +1842,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1651,6 +1852,8 @@ \usebibmacro{author/editor}% \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% + \setunit{\addspace}\newblock + \usebibmacro{apa:related}% \newunit\newblock \usebibmacro{eventinfo}% \setunit{\addcomma\addspace}% @@ -1674,7 +1877,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1684,6 +1887,8 @@ \usebibmacro{author/editor}% \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% + \setunit{\addspace}\newblock + \usebibmacro{apa:related}% \newunit\newblock \printlist{institution}% \newunit\newblock @@ -1699,7 +1904,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1721,7 +1926,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1746,7 +1951,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1756,6 +1961,8 @@ \usebibmacro{author/editor}% \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% + \setunit{\addspace}\newblock + \usebibmacro{apa:related}% \setunit{\addspace}% \printfield{howpublished}% \newunit\newblock @@ -1773,7 +1980,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1783,6 +1990,8 @@ \usebibmacro{author/editor}% \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% + \setunit{\addspace}\newblock + \usebibmacro{apa:related}% \newunit\newblock \usebibmacro{mainvideo}% \newunit\newblock @@ -1796,7 +2005,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1878,15 +2087,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Wrapper for backrefs - -\newbibmacro{apa:pageref}{% - \ifbool{apa:backref}{\usebibmacro{pageref}}{}} - -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Unchanged from authoryear-comp \DeclareBibliographyOption{dashed}[true]{% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.cbx index 6989787742..d1b5965ca8 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.cbx @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Philip Kime. -\ProvidesFile{apa.cbx}[2019/11/23\space v9.0\space APA biblatex citation style] +\ProvidesFile{apa.cbx}[2019/11/27\space v9.1\space APA biblatex citation style] \RequireBiber[3] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -43,27 +43,33 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 8.17) ampersand separator in parenthetical cites +\newtoggle{apa:inpcite} + \DeclareDelimFormat[parencite]{finalnamedelim} {\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space} \DeclareCiteCommand{\parencite}[\mkbibparens] {\usebibmacro{cite:init}% - \usebibmacro{prenote}} + \usebibmacro{prenote}% + \toggletrue{apa:inpcite}} {\usebibmacro{citeindex}% \usebibmacro{cite}% \usebibmacro{cite:post}} {} - {\usebibmacro{postnote}} + {\usebibmacro{postnote}% + \togglefalse{apa:inpcite}} \DeclareCiteCommand*{\parencite}[\mkbibparens] {\usebibmacro{cite:init}% - \usebibmacro{prenote}} + \usebibmacro{prenote}% + \toggletrue{apa:inpcite}} {\usebibmacro{citeindex}% \usebibmacro{citeyear}% - \usebibmacro{cite:post}} + \usebibmacro{cite:post}% + \togglefalse{apa:inpcite}} {} {\usebibmacro{postnote}} @@ -288,18 +294,83 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 8.14) Fall back to title for citations without authors +% (APA 11) Bizarre and special rules for legal information \DeclareFieldFormat{citetitle}{\mkbibquote{#1}} -\DeclareFieldFormat[online]{citetitle}{\mkbibquote{#1}} -\DeclareFieldFormat[inbook]{citetitle}{\mkbibquote{#1}} -\DeclareFieldFormat[book]{citetitle}{\mkbibemph{#1}} -\DeclareFieldFormat[manual]{citetitle}{\mkbibemph{#1}} -\DeclareFieldFormat[report]{citetitle}{\mkbibemph{#1}} -\DeclareFieldFormat[periodical]{citetitle}{\mkbibemph{#1}} +\DeclareFieldFormat[book,manual,report,preiodical,legmaterial,jurisdiction]{citetitle}{\mkbibemph{#1}} +\DeclareFieldFormat[legislation,legadminmaterial,legal]{citetitle}{#1} \newbibmacro*{cite:noname}{% - \printfield[citetitle]{labeltitle}} - + \iffieldundef{labeltitle} + {\ifthenelse{\ifentrytype{legmaterial}\OR% + \ifentrytype{legadminmaterial}} + {\let\blx@tempa\bibcplstring% \textcite default + \let\blx@tempb\bibcplstring% \textcite default + \iftoggle{apa:inpcite} + {\iffieldequalstr{type}{execorder}{\let\blx@tempb\bibcpsstring}{}% + \iffieldequalstr{type}{resolution}{\let\blx@tempa\bibcpsstring}{}% + \iffieldequalstr{type}{report}{\let\blx@tempa\bibcpsstring\let\blx@tempb\bibcpsstring}{}} + {}% + \iffieldundef{source}{}{\blx@tempa{\thefield{source}}}% + \setunit{\addspace}% + \iffieldundef{type}{}{\blx@tempb{\thefield{type}}}% + \setunit{\addspace}% + \printfield[legmaterialnum]{number}} + {\ifentrytype{constitution}{\usebibmacro{cite:noname:const}}{}}} + {\printfield[citetitle]{labeltitle}}} + +% CONSTITUTION entrytypes are messier +\newbibmacro*{cite:noname:const}{% + \iftoggle{apa:inpcite} + {\bibcpsstring{\thefield{source}}% + \setunit{\addspace}% + \bibcpsstring{\thefield{type}}% + \setunit{\addspace}% + \iffieldundef{amendment}{}{\bibsstring{amendment}% + \setunit{\addspace}% + \printfield{amendment}% + \setunit{\addcomma\addspace}% + \ifkeyword{repealed} + {\biblcsstring{repealed}% + \setunit{\addspace}% + \printeventdate} + {}}% + \setunit{\addspace}% + \iffieldundef{article}{}{\bibsstring{article}\setunit{\addspace}\printfield{article}}% + \setunit{\addcomma\addspace}\newblock + \iffieldundef{section}{}{\bibsstring{section}\setunit{\addspace}\printfield{section}}% + \setunit{\addcomma\addspace}\newblock + \iffieldundef{part}{}{\bibsstring{paragraph}\setunit{\addspace}\printfield{part}}} + {}% + \iftoggle{apa:intcite} + {\iffieldundef{amendment}{}{\bibcplstring{amendment}% + \setunit{\addspace}% + \printfield{amendment}% + \setunit{\addspace}% + \biblcsstring{tothe}}% + \iffieldundef{article}{}{\bibcplstring{article}\setunit{\addspace}\printfield{article}}% + \setunit{\addcomma\addspace}% + \iffieldundef{part}{}{\biblstring{paragraph}% + \setunit{\addspace}% + \printfield{part}% + \setunit{\addcomma\addspace}% + \biblcsstring{ofthe}}% + \setunit{\addcomma\addspace}% + \iffieldundef{section}{}{\bibcplstring{section}% + \setunit{\addspace}% + \printfield{section}% + \setunit{\addcomma\addspace}% + \biblcsstring{ofthe}} + \setunit{\addspace}% + \bibcplstring{\thefield{source}}% + \setunit{\addspace}% + \bibcplstring{\thefield{type}}% + \setunit{\addspace}% + \ifkeyword{repealed} + {\biblclstring{repealed}\setunit{\addspace}\printeventdate} + {}} + {}} + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -325,7 +396,8 @@ \DeclareDelimFormat[nptextcite]{finalnamedelim} {\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space} -\DeclareMultiCiteCommand{\nptextcites}{\nptextcite}{\multicitedelim} +\DeclareMultiCiteCommand{\nptextcites}{\nptextcite}{\setunit{\multicitedelim}} + \DeclareCiteCommand{\nptextcite} {\usebibmacro{cite:init}% \usebibmacro{prenote}} @@ -462,14 +534,27 @@ {} {\usebibmacro{postnote}} -\DeclareMultiCiteCommand{\textcites}{\textcite}{\compcitedelim} +\DeclareMultiCiteCommand{\textcites}{\textcite}{\setunit{\compcitedelim}} +\DeclareMultiCiteCommand{\cites}{\cite}{\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite} + {\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\footcites}[\mkbibfootnote]{\footcite} + {\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext] + {\footcitetext}{\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibparens\mkbibfootnote] +{\smartcite}{\setunit{\multicitedelim}} + +\newtoggle{apa:intcite} \DeclareCiteCommand{\textcite} {\usebibmacro{cite:init}% - \usebibmacro{prenote}} + \usebibmacro{prenote}% + \toggletrue{apa:intcite}} {\usebibmacro{citeindex}% \usebibmacro{textcite}% - \usebibmacro{cite:post}} + \usebibmacro{cite:post}% + \togglefalse{apa:intcite}} {} {\usebibmacro{textcite:postnote}} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.dbx index 479c8d24a9..c3d07d40d2 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.dbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.dbx @@ -12,10 +12,13 @@ %% %% The Current Maintainer of this work is Philip Kime. -\ProvidesFile{apa.dbx}[2019/11/23\space v9.0\space APA biblatex style data model] +\ProvidesFile{apa.dbx}[2019/11/27\space v9.1\space APA biblatex style data model] \RequireBiber[3] \DeclareDatamodelEntrytypes{ + constitution, + legmaterial, + legadminmaterial, nameonly} \DeclareDatamodelFields[type=list, datatype=name]{ @@ -25,23 +28,42 @@ execdirector, with} -\DeclareDatamodelFields[type=field, datatype=literal]{ - abstractloc, - appentry, - urldescription} +\DeclareDatamodelFields[type=list, datatype=literal]{ + citation} -\DeclareDatamodelFields[type=field, datatype=verbatim]{ - abstracturl} +\DeclareDatamodelFields[type=field, datatype=literal]{ + source, + article, + section, + amendment, + appentry} \DeclareDatamodelEntryfields{ with, groupauthor, narrator, execproducer, - execdirector, - abstractloc, - abstracturl, - urldescription} + execdirector} + +% APA Court cases +\DeclareDatamodelEntryfields[jurisdiction]{ + organization + citation} + +% Legislative material +\DeclareDatamodelEntryfields[legmaterial]{ + source} + +% Admin and Executive material +\DeclareDatamodelEntryfields[legadminmaterial]{ + citation, + source} + +% Constitution/charters +\DeclareDatamodelEntryfields[constitution]{ + article, + section, + amendment} \DeclareDatamodelEntryfields[software]{ appentry} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/austrian-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/austrian-apa.lbx index 846ae4ae84..b7308670f7 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/austrian-apa.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/austrian-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{austrian-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{austrian-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{austrian} % Following DGPs guidlines for German/Austrian @@ -22,10 +22,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -64,10 +61,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {austrian}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -93,11 +98,7 @@ part = {{part}{pt\adddot}},%FIXME andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}}, - commentonarticle = {{Comment\space on\space the\space article} - {Comment\space on\space the\space article}},%FIXME - reviewofbook = {{Review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{Review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{Review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{Comment\space on}{Comment\space on}},%FIXME producer = {{Produzent}{Produzent}}, producers = {{producers}{producers}},%FIXME execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}}, diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test-references.bib b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test-references.bib index 420eafd695..8995de9111 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test-references.bib +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test-references.bib @@ -810,7 +810,8 @@ TITLE = {From this article, it sounds like men are figuring something out that women have known forever. {I} know of many}, RELATED = {10.1:18r}, - RELATEDTYPE = {commentonarticle}, + RELATEDTYPE = {commenton}, + RELATEDSTRING = {Comment on the article}, JOURNALTITLE = {The Washington Post}, KEYWORDS = {nonacademic}, DATE = {2019-01-15}, @@ -1547,7 +1548,8 @@ AUTHOR = {L. A. Mirabito and N. C. Heck}, TITLE = {Bringing {LGBTQ} Youth Theater into the Spotlight}, RELATED = {10.7:67r}, - RELATEDTYPE = {reviewoffilm}, + RELATEDTYPE = {reviewof}, + RELATEDSTRING = {Review of the film}, JOURNALTITLE = {Psychology of Sexual Orientation and Gender Diversity}, VOLUME = {3}, NUMBER = {4}, @@ -1571,7 +1573,8 @@ AUTHOR = {F. Santos}, TITLE = {Reframing Refugee Children's Stories}, RELATED = {10.7:68r}, - RELATEDTYPE = {reviewofbook}, + RELATEDTYPE = {reviewof}, + RELATEDSTRING = {Review of the book}, JOURNALTITLE = {The New York Times}, KEYWORDS = {nonacademic}, DATE = {2019-01-11}, @@ -1595,7 +1598,8 @@ TITLE = {\textup{The good place} ends its Remarkable Second Season With Irrational Hope, Unexpected Gifts, and a Smile}, RELATED = {10.7:69r}, - RELATEDTYPE = {reviewoftv}, + RELATEDTYPE = {reviewof}, + RELATEDSTRING = {Review of the TV series episode}, ORGANIZATION = {A.V. Club}, DATE = {2018-02-01}, URL = {https://www.avclub.com/the-good-place-ends-its-remarkable-second-season-with-i-1822649316} @@ -2416,6 +2420,217 @@ URLDATE = {2019-07-03} } +% (APA 11.4 Example 1) +@JURISDICTION{11.4:1, + TITLE = {Brown v. Board of Education}, + CITATION = {347 U.S. 483}, + URL = {http://www.oyez.org/cases/1940-1955/347us483}, + DATE = {1954} +} + +% (APA 11.4 Example 2) +@JURISDICTION{11.4:2, + TITLE = {Obergefell v. Hodges}, + CITATION = {576 U.S. \_\_\_}, + URL = {https://www.supremecourt.gov/opinions/14pdf/14-556_3204.pdf}, + DATE = {2015} +} + +% (APA 11.4 Example 3) +% court/date which applies to the entire CITATION list can be given in the +% ORGANIZATION and DATE fields +@JURISDICTION{11.4:3, + TITLE = {Daubert v. Merrell Dow Pharmaceuticals, Inc.}, + CITATION = {951 F.2d 1128}, + ORGANIZATION = {9th Cir.}, + URL = {https://openjurist.org/951/f2d/1128/william-dabert-v-merrell-dow-pharmaceuticals}, + DATE = {1991} +} + +% (APA 11.4 Example 4) +@JURISDICTION{11.4:4, + TITLE = {Burriola v. Greater Toledo YMCA}, + CITATION = {133 F.Supp.2d 1034}, + ORGANIZATION = {N.D. Ohio}, + URL = {https://law.justia.com/cases/federal/district-courts/FSupp2/133/1034/2293141/}, + DATE = {2001} +} + +% (APA 11.4 Example 5) +% For courts and year attached to specific elements of the citation list, +% don't use ORGANIZATION/DATE, use literal citeorg/citedate annotations +% use the citeinfo annotation with the special annotation value "appeal" for +% any affirmed/repealed status in the citatation list +% DATA/ORIGDATE are also included to make citations work +@JURISDICTION{11.4:5, + TITLE = {Durflinger v. Artiles}, + CITATION = {563 F.Supp. 332 and aff'd and 727 F.2d 888}, + CITATION+an:citeorg = {1="D. Kan.";3="10th Cir."}, + CITATION+an:citedate = {1="1981";3="1984"}, + CITATION+an:citeinfo = {2=appeal}, + URL = {https://openjurist.org/727/f2d/888/durflinger-v-artiles}, + DATE = {1984}, + ORIGDATE = {1981} +} + +% (APA 11.4 Example 6) +@JURISDICTION{11.4:6, + TITLE = {Tarasoff v. Regents of the University of California}, + CITATION = {17 Cal.3d 425 and 131 Cal. Rptr. 14 and 551 P.2d 334}, + URL = {https://www.casebriefs.com/blog/law/torts/tors-keyed-to-dobbs/the-duty-to-protect-from-third-persons/tarasoff-v-regents-of-university-of-california}, + DATE = {1976} +} + +% (APA 11.4 Example 7) +@JURISDICTION{11.4:7, + TITLE = {Texas v. Morales}, + CITATION = {826 S.W.2d 201}, + CITATION+an:citeorg = {1="Tex. Ct. App."}, + CITATION+an:citedate = {1="1992"}, + URL = {https://www.leagle.com/decision/19921027826sw2d20111010}, + DATE = {1992} +} + +% (APA 11.5 Example 8) +% Notice the use of TITLEADDON here as this shouldn't appear in the +% citation and so can't be in TITLE - the 11.5 APA section is inconsistent here +@LEGISLATION{11.5:8, + TITLE = {American With Disabilities Act}, + TITLEADDON = {of 1990}, + LOCATION = {42 U.S.C § 12101 \emph{et seq.}}, + URL = {https://www.ada.gov/pubs/adastatute08.htm}, + DATE = {1990} +} + +% (APA 11.5 Example 9) +% Notice the use of TITLEADDON here as this shouldn't appear in the +% citation and so can't be in TITLE - the 11.5 APA section is inconsistent here +@LEGISLATION{11.5:9, + TITLE = {Civil Rights Act}, + TITLEADDON = {of 1964}, + LOCATION = {Pub. L. No. 88--352, 78 Stat. 241}, + URL = {https://www.govinfo.gov/content/pkg/STATUE-78/pdf/STATUTE-78-Pg241.pdf}, + DATE = {1964} +} + +% (APA 11.5 Example 10) +@LEGISLATION{11.5:10, + TITLE = {Every Student Succeeds Act}, + LOCATION = {20 U.S.C § 6301}, + URL = {https://www.congress.gov/114/plaws/publ95/PLAW-114publ95.pdf}, + DATE = {2015} +} + +% (APA 11.5 Example 11) +@LEGISLATION{11.5:11, + TITLE = {Lilly Leadbetter Fair Play Act}, + TITLEADDON = {of 2009}, + LOCATION = {Pub. L. No. 111-2, 123 Stat. 5}, + URL = {https://www.govinfo.gov/content/pkg/PLAW-111publ2/pdf/PLAW-111publ2.pdf}, + DATE = {2009} +} + +% (APA 11.5 Example 12) +@LEGISLATION{11.5:12, + TITLE = {Patsy Mink Equal Opportunity in Education Act}, + LOCATION = {20 U.S.C § 1681 \emph{et seq.}}, + URL = {https://www.justice.org/crt/title-ix-education-amendments-1972}, + DATE = {1972} +} + +% (APA 11.5 Example 13) +@LEGISLATION{11.5:13, + TITLE = {Florida Mental Health Act}, + LOCATION = {Fla. Stat. § 394}, + URL = {http://www.leg.state.fl.us/statues/index.cfm?App_mode=Display_Statute&URL=0300-0399/0394/0394.html}, + DATE = {2009}, + ORIGDATE = {1971} +} + +% (APA 11.6 Example 14) +@LEGMATERIAL{11.6:14, + TITLE = {Federal Real Property Reform}, + SUBTITLE = {How cutting red tape and better management count + achieve billions in savings, U.S. Senate + Committee on Homeland Security and Governmental Affairs}, + LOCATION = {114th Cong.}, + NOTE = {testimony of Norman Dong}, + URL = {http://www.gsa.gov/portal/content/233107}, + DATE = {2016} +} + +% (APA 11.6 Example 15) +% Note the use of SHORTTITLE to use a shortened title in citations +@LEGMATERIAL{11.6:15, + TITLE = {Strengthening the Federal Student Loan Program + for Borrowers}, + SUBTITLE = {Hearing before the U.S. Senate Committee on + Health, Education, Labor \& Pensions}, + SHORTTITLE = {Strengthening the Federal Student Loan Program}, + LOCATION = {113th Cong.}, + URL = {https://www.help.senate.gov/hearings/strengthening-the-federal-student-load-program-for-borrowers}, + DATE = {2014} +} + +% (APA 11.6 Example 16) +@LEGISLATION{11.6:16, + TITLE = {Mental Health on Campus Improvement Act}, + LOCATION = {H.R 1100, 113th Cong.}, + URL = {https://www.congress.gov/bill/113th-congress/house-bill/1100}, + DATE = {2013} +} + +% (APA 11.6 Example 17) +@LEGMATERIAL{11.6:17, + SOURCE = {senate}, + TYPE = {resolution}, + NUMBER = {438}, + LOCATION = {114th Cong. and 162 Cong. Rec. 2394}, + NOTE = {enacted}, + URL = {https://www.congress.gov/congressional-record/2016/04/21/senate-section/article/S2394-2}, + DATE = {2016} +} + +% (APA 11.6 Example 18) +@LEGMATERIAL{11.6:18, + SOURCE = {houseofrepresentatives}, + TYPE = {report}, + NUMBER = {114-358}, + URL = {https://www.gpo.gov/fdsys/pkg/CRPT-114rpt358/pdf/CRPT-114hrpt358.pdf}, + DATE = {2015} +} + +% (APA 11.7 Example 19) +@LEGADMINMATERIAL{11.7:19, + TITLE = {Protection of Human Subjects}, + CITATION = {45 C.F.R. § 46}, + URL = {https://www.hhs.gov/ohrp/sites/default/files/ohrp/policy/ohrpregulations.pdf}, + DATE = {2009} +} + +% (APA 11.7 Example 20) +% Note the use of SHORTTITLE to use a shortened title in citations +@LEGADMINMATERIAL{11.7:20, + TITLE = {Defining and Delimiting the Exemptions for + Executive, Administrative, Professional, Outside + Sales and Computer Employees}, + SHORTTITLE = {Defining and Delimiting}, + CITATION = {81 F.R. 32391}, + URL = {https://www.federalregister.gov/articles/2016/05/23/2016-11754/defining-and-delimiting-the-exemptions-for-executive-administrative-professional-outside-sales-and}, + NOTE = {to be codified at 29 C.F.R. § 541}, + KEYWORDS = {proposed}, + DATE = {2016-05-23} +} + +% (APA 11.7 Example 21) +@LEGADMINMATERIAL{11.7:21, + TYPE = {execorder}, + NUMBER = {13,676}, + CITATION = {3 C.F.R. 294}, + URL = {https://www.govinfo.gov/content/pkg/CFR-2015-title3-vol1/pdf/CFR-2015-title3-vol1-eo13676.pdf}, + DATE = {2014} +} + % (APA 11.8 Example 22) @PATENT{11.8:22, AUTHOR = {S. C. Hiremath and S. Kumar and F. Lu and A Salehi}, @@ -2428,3 +2643,59 @@ DATE = {2016} } +% (APA 11.9 Example 23) +@CONSTITUTION{11.9:23, + SOURCE = {us}, + TYPE = {constitution}, + ARTICLE = {I}, + SECTION = {3} +} + +% (APA 11.9 Example 24) +@CONSTITUTION{11.9:24, + SOURCE = {southcarolina}, + TYPE = {constitution}, + ARTICLE = {IX}, + SECTION = {3} +} + +% (APA 11.9 Example 25) +@CONSTITUTION{11.9:25, + SOURCE = {us}, + TYPE = {constitution}, + AMENDMENT = {XIX} +} + +% (APA 11.9 Example 26) +% Use KEYWORD "repealed" (which is a localised string) and EVENTDATE for the date of repeal +@CONSTITUTION{11.9:26, + SOURCE = {us}, + TYPE = {constitution}, + AMENDMENT = {XIX}, + KEYWORDS = {repealed}, + EVENTDATE = {1933} +} + +% (APA 11.9 Example 27) +@CONSTITUTION{11.9:27, + SOURCE = {us}, + TYPE = {constitution}, + AMENDMENT = {I--X} +} + +% (APA 11.9 Example 28) +% Use PART for paragraph +@CONSTITUTION{11.9:28, + SOURCE = {unitednations}, + TYPE = {charter}, + ARTICLE = {1}, + PART = {3} +} + +% (APA 11.10 Example 29) +@LEGAL{11.10:29, + TITLE = {United Nations Convention on the Rights of the Child}, + DATE = {1989-11-20}, + URL = {https://www.ohchr.org/en/professionalinterest/pages/crc.aspx} +} + diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.pdf Binary files differindex 0ec0090acf..92de9ef490 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.tex b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.tex index 0f9e33c0c9..47255082d8 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.tex @@ -994,7 +994,119 @@ the help of lower-level commands:\\\\ \printbibliography[title={APA 10.16 References}] \end{refsection} +\newpage +\subsection{APA 11.4--Cases or Court Decisions} + +\begin{refsection} + +\noindent\apa{11.4 Example 1}\\ +\apaex{\parencite{11.4:1}}\\ +\apaex{\textcite{11.4:1}} + +\noindent\apa{11.4 Example 2}\\ +\apaex{\parencite{11.4:2}}\\ +\apaex{\textcite{11.4:2}} + +\noindent\apa{11.4 Example 3}\\ +\apaex{\parencite{11.4:3}}\\ +\apaex{\textcite{11.4:3}} + +\noindent\apa{11.4 Example 4}\\ +\apaex{\parencite{11.4:4}}\\ +\apaex{\textcite{11.4:4}} + +\noindent\apa{11.4 Example 5}\\ +\apaex{\parencite{11.4:5}}\\ +\apaex{\textcite{11.4:5}} + +\noindent\apa{11.4 Example 6}\\ +\apaex{\parencite{11.4:6}}\\ +\apaex{\textcite{11.4:6}} + +\noindent\apa{11.4 Example 7}\\ +\apaex{\parencite{11.4:7}}\\ +\apaex{\textcite{11.4:7}} + +\printbibliography[title={APA 11.4 References}] +\end{refsection} +\newpage +\subsection{APA 11.5--Statues (Laws and Acts)} + +\begin{refsection} + +\noindent\apa{11.5 Example 8}\\ +\apaex{\parencite{11.5:8}}\\ +\apaex{\textcite{11.5:8}} + +\noindent\apa{11.5 Example 9}\\ +\apaex{\parencite{11.5:9}}\\ +\apaex{\textcite{11.5:9}} + +\noindent\apa{11.5 Example 10}\\ +\apaex{\parencite{11.5:10}}\\ +\apaex{\textcite{11.5:10}} + +\noindent\apa{11.5 Example 11}\\ +\apaex{\parencite{11.5:11}}\\ +\apaex{\textcite{11.5:11}} + +\noindent\apa{11.5 Example 12}\\ +\apaex{\parencite{11.5:12}}\\ +\apaex{\textcite{11.5:12}} + +\noindent\apa{11.5 Example 13}\\ +\apaex{\parencite{11.5:13}}\\ +\apaex{\textcite{11.5:13}} + +\printbibliography[title={APA 11.5 References}] +\end{refsection} +\newpage +\subsection{APA 11.6--Legislative Materials} + +\begin{refsection} + +\noindent\apa{11.6 Example 14}\\ +\apaex{\parencite{11.6:14}}\\ +\apaex{\textcite{11.6:14}} + +\noindent\apa{11.6 Example 15}\\ +\apaex{\parencite{11.6:15}}\\ +\apaex{\textcite{11.6:15}} + +\noindent\apa{11.6 Example 16}\\ +\apaex{\parencite{11.6:16}}\\ +\apaex{\textcite{11.6:16}} +\noindent\apa{11.6 Example 17}\\ +\apaex{\parencite{11.6:17}}\\ +\apaex{\textcite{11.6:17}} + +\noindent\apa{11.6 Example 18}\\ +\apaex{\parencite{11.6:18}}\\ +\apaex{\textcite{11.6:18}} + +\printbibliography[title={APA 11.6 References}] +\end{refsection} +\newpage +\subsection{APA 11.7--Administrative and Executive Materials} + +\begin{refsection} + +\noindent\apa{11.7 Example 19}\\ +\apaex{\parencite{11.7:19}}\\ +\apaex{\textcite{11.7:19}} + +\noindent\apa{11.7 Example 20}\\ +\apaex{\parencite{11.7:20}}\\ +\apaex{\textcite{11.7:20}} + +\noindent\apa{11.7 Example 21}\\ +\apaex{\parencite{11.7:21}}\\ +\apaex{\textcite{11.7:21}} + + +\printbibliography[title={APA 11.7 References}] +\end{refsection} \newpage \subsection{APA 11.8--Patents} @@ -1006,6 +1118,48 @@ the help of lower-level commands:\\\\ \printbibliography[title={APA 11.8 References}] \end{refsection} +\newpage +\subsection{APA 11.9--Constitutions and Charters} + +\begin{refsection} + +\noindent\apa{11.9 Example 23}\\ +\apaex{\parencite{11.9:23}}\\ +\apaex{\textcite{11.9:23}} + +\noindent\apa{11.9 Example 24}\\ +\apaex{\parencite{11.9:24}}\\ +\apaex{\textcite{11.9:24}} + +\noindent\apa{11.9 Example 25}\\ +\apaex{\parencite{11.9:25}}\\ +\apaex{\textcite{11.9:25}} + +\noindent\apa{11.9 Example 26}\\ +\apaex{\parencite{11.9:26}}\\ +\apaex{\textcite{11.9:26}} + +\noindent\apa{11.9 Example 27}\\ +\apaex{\parencite{11.9:27}}\\ +\apaex{\textcite{11.9:27}} + +\noindent\apa{11.9 Example 28}\\ +\apaex{\parencite{11.9:28}}\\ +\apaex{\textcite{11.9:28}} + +\printbibliography[title={APA 11.9 References}] +\end{refsection} +\newpage +\subsection{APA 11.10--Treaties and International Conventions} + +\begin{refsection} + +\noindent\apa{11.10 Example 29}\\ +\apaex{\parencite{11.10:29}}\\ +\apaex{\textcite{11.10:29}} + +\printbibliography[title={APA 11.9 References}] +\end{refsection} \end{document} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.pdf Binary files differindex 0fd4f1aa8a..1ea1b80462 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.tex b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.tex index 5202c2f914..eb9b13c115 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.tex @@ -24,7 +24,7 @@ url={http://mirror.ctan.org/macros/latex/exptl/biblatex-contrib/biblatex-apa/}, author={Philip Kime}, email={Philip@kime.org.uk}, - revision={9.0}, + revision={9.1}, date={\today}} \hypersetup{% @@ -67,14 +67,17 @@ your language, they are generally marked with ``\texttt{\%FIXME}``. \subsection{About} This package is a Bib\LaTeX\ style for APA (American Psychological -Association) style compliant documents typeset in \latex. It implements a -citation style (\file{apa.cbx}), a references section style +Association) 7th Edition style compliant documents typeset in \latex. It +implements a citation style (\file{apa.cbx}), a references section style (\file{apa.bbx}), some data model enhancements (\file{apa.dbx}) and string localisation files (\path{<language>-apa.lbx}). The style is loaded just like any other Bib\LaTeX\ styles but don't try to use the citation and references styles separately as they rely on each other, macro-wise, in places. +Please see the package |biblatex-apa6| on CTAN for the APA 6th edition +conformant version of this style. + In general, there is no attempt to generalise this style for non-APA requirements--it is written for APA compliance only. Having said that, there are a few options which allow users to change the APA defaults. @@ -179,18 +182,6 @@ style will ensure this too. \subsection{Package options}\label{opts} -The following options are set as usual in the options passed to -|biblatex|. - -\begin{ltxcode} -apabackref=true|false -\end{ltxcode}%| - -\noindent It is not APA style to include backreferences in the References to -pages where citations of the entry occur. However, this is very -useful, especially in proofing and so if you set the |apabackref| -option to «true», these are enabled. The default is «false». - \begin{ltxcode} apamaxprtauth=<num> \end{ltxcode} @@ -198,7 +189,7 @@ apamaxprtauth=<num> \noindent This option controls the number of author/editor names which are printed in the References. APA style defaults to 20. You can change this if you really want to fully print all author list references in certain -contexts (for example in a CV where you are an author in position 21 \ldots) +contexts (for example in a CV where you are an author in position 21 \ldots). \subsection{Localisation} @@ -237,17 +228,6 @@ A customisable macro \cmd{urldatecomma} determines what comes between the date of a URL and the URL itself. This defaults to the standard comma and space as per APA style but just a space in germanic localisations. -\subsection{Limitations} -\label{use:limit} -There are certain limitations you need to bear in mind when using these -styles. The APA manual is written without much regard for automation of -citation and references processing---it just tells you how it wants things to -look and the implicit assumption is that you would type out everything by -hand if necessary. Having said that, the majority of the APA citation -and references style is implemented, there are just a few exceptions which -are hardly worth the coding pain since they are ambiguous and easily worked -around. - \section{Details} The detailed information for this style is contained in the example document and @@ -257,7 +237,7 @@ accompanying \path{.bib} files: \item[\path{biblatex-apa-test.tex}]\footnote{\path{biblatex-apa-test.pdf} is also provided and is the typeset version of this \latex source file.} This document typesets every useful example from - \apa{8}--\apa{10}. The examples in it aim to look as much like the APA + \apa{8--10}. The examples in it aim to look as much like the APA manual examples as possible. All citation examples in the document are real examples using a \path{.bib} file. \item[\path{biblatex-apa-test-citations.bib}] This contains the \path{.bib} @@ -265,10 +245,10 @@ accompanying \path{.bib} files: in this file---it's just used to provide real data for the citation examples. \item[\path{biblatex-apa-test-references.bib}] This contains the - \path{.bib} entries for all of the examples in \apa{9} and \apa{10}. This + \path{.bib} entries for all of the examples in \apa{9--11}. This file is the main documentation for the |biblatex-apa| implementation of the APA References section style. To see how the style deals with a - particular example from \apa{9} or \apa{10}, look it up in here. Every + particular example from \apa{9--11}, look it up in here. Every example is marked with the APA example number and has explanatory notes where necessary. \item[\path{apa.cbx}] The |biblatex-apa| citations style. It is @@ -388,11 +368,37 @@ because date formatting differs in the style between academic and non-academic articles. This is a more general solution than introducing new entry types which are not supported by other software. +\subsubsection{Legal Entry Types} + +\apa{11} contains the format guidelines for legal references. This is fully +implemented and the |biblatex-apa-test-references.bib| demonstrates which +entry types and fields are used to produce the \apa{11} examples. There are +some custom entry types and fields used to manage this, as you will see in +the |.bib| file. Considerable use is made of localisation strings in legal +entries due to the requirements that certain strings change their +abbreviation status between citations and references (and even between +parenthetical and narrative citations). + +The localisation strings for the U.S. specific elements of this section +(most of it) are not provided in other languages as there is not much +point. Feel free to copy them from |american-apa.lbx| if you really need +to. Localisation strings for all 50 U.S. States are provided to support +state constitution references. + +Pay attention to the |JURISDICTION| entries in the example |.bib| which use +|biber|'s data annotation feature in order to match the required style +elements. The names of the data annotations are not optional and must match +the examples. + \section{Revision history}\label{rev} \begin{changelog} -\begin{release}{9.0}{2019-} +\begin{release}{9.1}{2019-11-27} +\item Bug fixes, internal improvements and implementation of \apa{11}. +\end{release} + +\begin{release}{9.0}{2019-11-23} \item First release (of APA 7th edition style) \end{release} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/brazilian-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/brazilian-apa.lbx index 21c066eb3e..30bab9da75 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/brazilian-apa.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/brazilian-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{brazilian-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{brazilian-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{brazilian} \NewBibliographyString{revisededition} @@ -19,10 +19,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -61,10 +58,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {brazilian}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -106,11 +111,7 @@ part = {{part}{pt\adddot}},%FIXME paragraph = {{paragraph}{para\adddot}},%FIXME paragraphs = {{paragraphs}{paras\adddot}},%FIXME - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME revisededition = {{Edi\c{c}\~ao\space Revisada}{ed\adddotspace rev\adddot}}, on = {{em}{em}}, retrieved = {{recuperado}{recuperado}}, diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/british-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/british-apa.lbx index 24264adb55..825020df7a 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/british-apa.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/british-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{british-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{british-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{british} \NewBibliographyString{revisededition} @@ -19,10 +19,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -61,10 +58,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {british}, - article = {{article}{article}}, + tothe = {{to\space the}{to\space the}}, + ofthe = {{of\space the}{of\space the}}, + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}}, painting = {{painting}{painting}}, present = {{present}{present}}, song = {{song}{song}}, @@ -113,11 +118,7 @@ from = {{from}{from}}, archivedat = {{archived\space at}{archived\space at}}, reviewof = {{Review\space of}{review\space of}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}}, - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}}, - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}}, - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}}, + commenton = {{comment\space on}{comment\space on}}, with = {{with}{with}}, paragraph = {{paragraph}{para\adddot}}, paragraphs = {{paragraphs}{paras\adddot}}, diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/danish-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/danish-apa.lbx index 71850bba64..d33d304e28 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/danish-apa.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/danish-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{danish-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{danish-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{danish} \NewBibliographyString{revisededition} @@ -19,10 +19,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -61,10 +58,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {danish}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -106,11 +111,7 @@ supplement = {{supplement}{suppl\adddot}},%FIXME part = {{part}{pt\adddot}},%FIXME revisededition = {{revideret\space udgave}{rev\adddotspace udg\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME page = {{side}{{}s\adddot}}, pages = {{sider}{{}s\adddot}}, on = {{p{\aa}}{p{\aa}}}, diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/dutch-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/dutch-apa.lbx index 443cd13bf7..8b26277330 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/dutch-apa.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/dutch-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{dutch-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{dutch-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{dutch} \NewBibliographyString{revisededition} @@ -19,10 +19,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -61,10 +58,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {dutch}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -106,11 +111,7 @@ supplement = {{supplement}{suppl\adddot}},%FIXME part = {{part}{pt\adddot}},%FIXME revisededition = {{Herziene\space editie}{herz\adddotspace ed\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME page = {{Pagina}{{}p\adddot}}, pages = {{Pagina's}{{}pp\adddot}}, on = {{op}{op}}, diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/english-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/english-apa.lbx index e24f59bc72..c2ef3e36b1 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/english-apa.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/english-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{english-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{english-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{english} \NewBibliographyString{revisededition} @@ -19,10 +19,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -61,10 +58,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {american}, - article = {{article}{article}}, + tothe = {{to\space the}{to\space the}}, + ofthe = {{of\space the}{of\space the}}, + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}}, painting = {{painting}{painting}}, present = {{present}{present}}, song = {{song}{song}}, @@ -106,11 +111,7 @@ supplement = {{supplement}{suppl\adddot}}, part = {{part}{pt\adddot}}, revisededition = {{Revised\space Edition}{rev\adddotspace ed\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}}, - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}}, - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}}, - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}}, + commenton = {{comment\space on}{comment\space on}}, page = {{Page}{{}p\adddot}}, pages = {{Pages}{{}pp\adddot}}, on = {{on}{on}}, diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/french-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/french-apa.lbx index 99d80e9653..80def4037e 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/french-apa.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/french-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{french-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{french-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{french} \NewBibliographyString{revisededition} @@ -19,10 +19,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -61,10 +58,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {french}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}}, song = {{song}{song}},%FIXME @@ -106,11 +111,7 @@ supplement = {{supplement}{suppl\adddot}},%FIXME part = {{part}{pt\adddot}},%FIXME revisededition = {{\'Edition\space R\'evis\'e}{\'Ed\adddotspace R\'ev\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME page = {{Page}{{}p\adddot}}, pages = {{Pages}{{}p\adddot}}, on = {{le}{le}}, diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/galician-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/galician-apa.lbx index db115cc5e7..e788e900a6 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/galician-apa.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/galician-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{galician-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{galician-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{galician} \setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced @@ -21,10 +21,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -63,10 +60,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {galician}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -123,11 +128,7 @@ mathesis = {{tese\addabbrvspace de\addabbrvspace mestrado}{tese\addabbrvspace de\addabbrvspace mestrado}}, phdthesis = {{tese\addabbrvspace doutoral}{tese\addabbrvspace doutoral}}, revisededition = {{edici\'on\space revisada}{edici\'on\space revisada}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME host = {{host}{host}}, page = {{p\'axina}{{}p\adddot}}, pages = {{p\'axinas}{{}pp\adddot}}, diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/german-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/german-apa.lbx index 9b380179cd..8926150f09 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/german-apa.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/german-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{german-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{german-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{german} % Following DGPs guidlines for German/Austrian @@ -22,10 +22,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -64,10 +61,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {german}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -110,11 +115,7 @@ part = {{part}{pt\adddot}},%FIXME andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME page = {{Seite}{{}S\adddot}}, pages = {{Seiten}{{}S\adddot}}, on = {{am}{am}}, diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/greek-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/greek-apa.lbx index 7e2f4226f8..1bc9219752 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/greek-apa.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/greek-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{greek-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{greek-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{greek} \NewBibliographyString{revisededition} @@ -19,10 +19,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -61,10 +58,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {greek}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -106,11 +111,7 @@ supplement = {{supplement}{suppl\adddot}},%FIXME part = {{part}{pt\adddot}},%FIXME revisededition = {{ΑναθεωÏημÎνη\space Έκδοση}{εκδ \adddotspace εκ\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME page = {{Σελίδα}{{}σ\adddot}}, pages = {{Σελίδες}{{}σσ\adddot}}, on = {{στις}{στις}}, diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/italian-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/italian-apa.lbx index d5f00590ab..e534891968 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/italian-apa.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/italian-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{italian-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{italian-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{italian} \NewBibliographyString{revisededition} @@ -19,10 +19,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -61,10 +58,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {italian}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -106,11 +111,7 @@ supplement = {{supplement}{suppl\adddot}},%FIXME part = {{part}{pt\adddot}},%FIXME revisededition = {{Edizione\space Revisionata}{Ed\adddotspace Rev\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME page = {{Pagina}{{}p\adddot}}, pages = {{Pagine}{{}pp\adddot}}, on = {{il}{il}}, diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/naustrian-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/naustrian-apa.lbx index e9d8f44ec8..a6867a932d 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/naustrian-apa.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/naustrian-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{naustrian-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{naustrian-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{naustrian} % Following DGPs guidlines for German/Austrian @@ -22,10 +22,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -64,10 +61,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {naustrian}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -110,11 +115,7 @@ part = {{part}{pt\adddot}},%FIXME andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME page = {{Seite}{{}S\adddot}}, pages = {{Seiten}{{}S\adddot}}, on = {{am}{am}}, diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/ngerman-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/ngerman-apa.lbx index c6be4e9b50..c4f4b8e664 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/ngerman-apa.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/ngerman-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{ngerman-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{ngerman-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{ngerman} % Following DGPs guidlines for German/Austrian @@ -22,10 +22,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -64,10 +61,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {ngerman}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -111,11 +116,7 @@ abstract = {{Abstract}{Abstract}}, andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME page = {{Seite}{{}S\adddot}}, pages = {{Seiten}{{}S\adddot}}, on = {{auf}{auf}}, diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/norsk-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/norsk-apa.lbx index 6c4132e862..b9449b520b 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/norsk-apa.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/norsk-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{norsk-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{norsk-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{norsk} \NewBibliographyString{revisededition} @@ -19,10 +19,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -61,10 +58,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {norsk}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -106,11 +111,7 @@ supplement = {{supplement}{suppl\adddot}},%FIXME part = {{part}{pt\adddot}},%FIXME revisededition = {{revidert\space utgave}{rev\adddotspace utg\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME page = {{side}{{}s\adddot}}, pages = {{sider}{{}s\adddot}}, on = {{p{\aa}}{p{\aa}}}, diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/norwegian-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/norwegian-apa.lbx index 556a8c8841..e8bbc7f099 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/norwegian-apa.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/norwegian-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{norwegian-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{norwegian-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{norwegian} \NewBibliographyString{revisededition} @@ -19,10 +19,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -61,10 +58,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {norwegian}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -106,11 +111,7 @@ supplement = {{supplement}{suppl\adddot}},%FIXME part = {{part}{pt\adddot}},%FIXME revisededition = {{revidert\space utgave}{rev\adddotspace utg\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME page = {{side}{{}s\adddot}}, pages = {{sider}{{}s\adddot}}, on = {{p{\aa}}{p{\aa}}}, diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/nswissgerman-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/nswissgerman-apa.lbx index 079a6c7e4f..cf639c9483 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/nswissgerman-apa.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/nswissgerman-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{nswissgerman-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{nswissgerman-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{nswissgerman} % Following DGPs guidlines for German/Austrian/Swiss German @@ -22,10 +22,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -64,10 +61,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {nswissgerman}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -110,11 +115,7 @@ part = {{part}{pt\adddot}},%FIXME andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME page = {{Seite}{{}S\adddot}}, pages = {{Seiten}{{}S\adddot}}, on = {{am}{am}}, diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/nynorsk-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/nynorsk-apa.lbx index 8837cbb3dc..c52db140a0 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/nynorsk-apa.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/nynorsk-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{nynorsk-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{nynorsk-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{nynorsk} \NewBibliographyString{revisededition} @@ -19,10 +19,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -61,10 +58,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {nynorsk}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -106,11 +111,7 @@ supplement = {{supplement}{suppl\adddot}},%FIXME part = {{part}{pt\adddot}},%FIXME revisededition = {{revidert\space utg{\aa}ve}{rev\adddotspace utg\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME page = {{side}{{}s\adddot}}, pages = {{sider}{{}s\adddot}}, on = {{p{\aa}}{p{\aa}}}, diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/portuguese-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/portuguese-apa.lbx index aef149d64e..982754efcf 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/portuguese-apa.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/portuguese-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{portuguese-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{portuguese-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{portuguese} \NewBibliographyString{revisededition} @@ -19,10 +19,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -61,10 +58,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {portuguese}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -108,11 +113,7 @@ paragraph = {{paragraph}{para\adddot}},%FIXME paragraphs = {{paragraphs}{paras\adddot}},%FIXME revisededition = {{Edi\c{c}\~ao\space Revista}{ed\adddotspace rev\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME on = {{em}{em}}, retrieved = {{obtido}{obtido}}, available = {{dispon\'ivel}{disp.}}, diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/russian-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/russian-apa.lbx index e5a9e397d7..4b59c78406 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/russian-apa.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/russian-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{russian-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{russian-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{russian} \NewBibliographyString{revisededition} @@ -19,10 +19,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commento} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -61,10 +58,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {russian}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -106,11 +111,7 @@ supplement = {{supplement}{suppl\adddot}},%FIXME part = {{part}{pt\adddot}},%FIXME revisededition = {{иÑправленное издание}{иÑпр\adddotspace изд\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME on = {{на}{на}}, retrieved = {{получено}{получено}}, available = {{доÑтупно}{доÑтупно}}, diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/slovene-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/slovene-apa.lbx index 5e61d3fb3e..2588071be5 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/slovene-apa.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/slovene-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{slovene-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{slovene-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{slovene} \NewBibliographyString{revisededition} @@ -19,10 +19,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -61,6 +58,10 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \NewBibliographyString{% Month name variants used after day datejanuary, @@ -79,7 +80,11 @@ \DeclareBibliographyStrings{% inherit = {slovene}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -121,11 +126,7 @@ supplement = {{supplement}{suppl\adddot}},%FIXME part = {{part}{pt\adddot}},%FIXME revisededition = {{dopolnjena izdaja}{dopolnjena iz\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME on = {{na}{na}}, retrieved = {{pridobljeno}{pridobljeno}}, available = {{dostopno}{dostopno}}, diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/spanish-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/spanish-apa.lbx index ba72381db8..f94b47d957 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/spanish-apa.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/spanish-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{spanish-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{spanish-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{spanish} \setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced @@ -21,10 +21,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -63,10 +60,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {spanish}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -123,11 +128,7 @@ mathesis = {{Tesis\addabbrvspace de\addabbrvspace maestr\'ia}{Tesis\addabbrvspace de\addabbrvspace maestr\'ia}}, phdthesis = {{Tesis\addabbrvspace doctoral}{Tesis\addabbrvspace doctoral}}, revisededition = {{Edici\'on\space revisada}{Edici\'on\space revisada}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME page = {{P\'agina}{{}p\adddot}}, pages = {{P\'aginas}{{}pp\adddot}}, on = {{el}{el}}, diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/swedish-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/swedish-apa.lbx index 3b6d70ef4c..f0a247d54b 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/swedish-apa.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/swedish-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{swedish-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{swedish-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{swedish} \NewBibliographyString{revisededition} @@ -20,10 +20,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -62,10 +59,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {swedish}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -107,11 +112,7 @@ supplement = {{supplement}{suppl\adddot}},%FIXME part = {{part}{pt\adddot}},%FIXME revisededition = {{reviderad\space utg{\aa}va}{rev\adddotspace utg\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME page = {{sida}{{}s\adddot}}, pages = {{sidor}{{}s\adddot}}, on = {{p{\aa}}{p{\aa}}}, diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/swissgerman-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/swissgerman-apa.lbx index 2073ff067d..494869632c 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/swissgerman-apa.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/swissgerman-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{swissgerman-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{swissgerman-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{swissgerman} % Following DGPs guidlines for German/Austrian/Swiss German @@ -22,10 +22,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -64,10 +61,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {swissgerman}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -111,11 +116,7 @@ part = {{part}{pt\adddot}},%FIXME andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME page = {{Seite}{{}S\adddot}}, pages = {{Seiten}{{}S\adddot}}, on = {{am}{am}}, diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/README b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/README new file mode 100644 index 0000000000..e1c844da64 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/README @@ -0,0 +1,34 @@ +Permission is granted to copy, distribute and/or modify this software under +the terms of the LaTeX Project Public License, version +1.3c (http://www.latex-project.org/lppl.txt). The current +maintainer is Philip Kime (© 2018). + +This package is a biblatex style for APA (American Psychological +Association) 6th Edition style compliant documents typeset in LaTeX. It +implements a citation style (apa6.cbx) and a references section style +(apa6.bbx). The styles are loaded just like any other biblatex +styles but I wouldn't try to use the citation and references styles +separately as they rely on each other, macro-wise, in places. + +In this document and in the code, the specific APA requirements are +referred to by the section and (if appropriate) the example number of the +APA Style Guide 6th Edition). + +You will need to be using csquotes >= 4.3 and biblatex >= 3.4 The biber +backend for biblatex >= 2.5 is also required. This style will not work +correctly if using bibtex as the backend for biblatex. If you want to take +advantage of the biblatex \DeclareQuotePunctuation facility to enforce the +APA required "American punctuation", you should use the babel package with +the "american" option (see biblatex manual section |3.9.1|). You can of +course use other languages but in such cases, to adhere to APA "American" +punctuation rules (following commas moved inside closing quotes etc.), then +you should set up \DeclareQuotePunctuation yourself as per section 4.7.5 of +the biblatex manual. + +You can also use this with apa.cls version 1.3.4 or greater by using the +"noapacite" class option to that class package (which prevents it from +trying to use plain bibtex with the apacite package). + +Please refer first to biblatex-apa6.pdf for the main documentation. + + diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/american-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/american-apa6.lbx new file mode 100644 index 0000000000..2edf71b300 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/american-apa6.lbx @@ -0,0 +1,144 @@ +\ProvidesFile{american-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation] +\InheritBibliographyExtras{american} + +% (APA 6.22) The example abbreviations + +\NewBibliographyString{revisededition} +\NewBibliographyString{typechair} +\NewBibliographyString{typechairs} +\NewBibliographyString{typevolume} +\NewBibliographyString{typevolumes} +\NewBibliographyString{typeseries} +\NewBibliographyString{typeseriess} +\NewBibliographyString{typevolseries} +\NewBibliographyString{typevolseriess} +\NewBibliographyString{on} +\NewBibliographyString{retrieved} +\NewBibliographyString{available} +\NewBibliographyString{from} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\DeclareBibliographyStrings{% + inherit = {american}, + revisededition = {{Revised\space Edition}{rev\adddotspace ed\adddot}}, + page = {{Page}{{}p\adddot}}, + pages = {{Pages}{{}pp\adddot}}, + on = {{on}{on}}, + retrieved = {{retrieved}{retrieved}}, + available = {{available}{available}}, + from = {{from}{from}}, + archivedat = {{archived\space at}{archived\space at}}, + with = {{with}{with}}, + reprintas = {{reprinted as}{reprinted as}}, + reprintfrom = {{reprinted from}{reprinted from}}, + reviewof = {{review\space of}{review\space of}}, + paragraph = {{\P}{\P}}, + paragraphs = {{\P\P}{\P\P}}, + producer = {{producer}{producer}}, + execproducer = {{executive producer}{executive producer}}, + director = {{director}{director}}, + writer = {{writer}{writer}}, + mathesis = {{Master's\addabbrvspace thesis}{Master's\addabbrvspace thesis}}, + phdthesis = {{Doctoral\addabbrvspace dissertation}{Doctoral\addabbrvspace dissertation}}, + origyear = {{original\space work\space published}{original\space work\space published}}, + typechair = {{Chair}{Chair}}, + typechairs = {{Chairs}{Chairs}}, + typevolume = {{Volume\space Editor}{Vol\adddotspace Ed\adddot}}, + typevolumes = {{Volume\space Editors}{Vol\adddotspace Eds\adddot}}, + typeseries = {{Series\space Editor}{Series\space Ed\adddot}}, + typeseriess = {{Series\space Editors}{Series\space Eds\adddot}}, + typevolseries = {{Series\space and\space Volume\space Editor}{Series\space\& Vol\adddotspace Ed\adddot}}, + typevolseriess = {{Series\space and\space Volume\space Editors}{Series\space\& Vol\adddotspace Eds\adddot}}, + annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, + beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, +} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.10 Example 68) Drop end* when they are the same as * + +% You must use \printdate to get here otherwise it will be ignored + +\DeclareBibliographyExtras{% + \def\urldatecomma{\addcomma\addspace}% + \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}}}% + \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#2}% + {}% + {\mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}% + \iffieldundef{#1}% + {}% + {\ifthenelse{\iffieldundef{#3}}% + {\ifthenelse{\iffieldundef{#2}}% + {}% + {\addspace}}% + {\addcomma\addspace}% + \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +\endinput diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.bbx new file mode 100644 index 0000000000..08a37060cf --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.bbx @@ -0,0 +1,2243 @@ +%% Copyright 2019 Philip Kime +%% +%% 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 Philip Kime. + +\ProvidesFile{apa6.bbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex references style] +\RequireBiber[3] +\RequireBibliographyStyle{standard} +\urlstyle{rm} % APA examples all have URLs in same font as text + +% Declare the language mapping suffix +\DeclareLanguageMappingSuffix{-apa6} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Automated capitalisation after colons +% (https://blog.apastyle.org/apastyle/2011/06/capitalization-after-colons.html) +% Copied and adapted from ieee.bbx + +% {<process>} {*} {<text>} +\newcommand*{\bbx@colon@search}[3]{% + \bbx@colon@search@aux#1#2\empty#3: \stop +} +\long\def\bbx@colon@search@aux#1#2#3: #4\stop{% + \expandafter#1\expandafter#2\expandafter{#3}% + \ifblank{#4} + {} + {% + : % + \bbx@colon@search@aux#1#2\empty#4\stop + }% +} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Used to join citations/references to +% extradate + +\newcommand{\apashortdash}{-} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Allow variable max authors/editors limit + +\newcommand{\maxprtauth}{7} +\DeclareBibliographyOption{apamaxprtauth}{% + \ifstrempty{#1} + {} + {\renewcommand{\maxprtauth}{#1}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.22) Force roman numerals into arabic +% using etoolbox macros + +\newcommand{\apanum}[1]{\ifrmnum{#1}{\rmntonum{#1}}{#1}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Apa defines no particular hanging indent but this makes it look like the +% examples in the style manual. + +\setlength{\bibhang}{2.5em} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 4.16 Example 29) Some DSM macros + +\gdef\DSMIII{\emph{DSM-III}} +\gdef\DSMIIIR{\emph{DSM-III-R}} +\gdef\DSMIV{\emph{DSM-IV}} +\gdef\DSMIVTR{\emph{DSM-IV-TR}} +\gdef\PsycSCAN{\emph{PsycSCAN}} +\gdef\PsycARTICLES{\emph{PsycARTICLES}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% + +% Date formats. Suppress end range of less specific fields +\newcommand*{\mkdaterangeapalong}[1]{% + \begingroup + \blx@metadateinfo{#1}% + \iffieldundef{#1year}{} + {\datecircaprint + \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ... + {\printtext{% + \mkbibdateapalongmdy{#1year}{#1month}{#1day}% + \iffieldundef{#1endyear}% + {}% + {\iffieldequalstr{#1endyear}{}% open-ended range? + {\mbox{\bibdatedash}} + {\bibdatedash% + \iffieldsequal{#1year}{#1endyear}% + {\iffieldsequal{#1month}{#1endmonth}% + {\iffieldsequal{#1day}{#1endday}% + {}% + {\mkbibdateapalongmdy{}{}{#1endday}}}% + {\mkbibdateapalongmdy{}{#1endmonth}{#1endday}}}% + {\mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}}% + \dateuncertainprint}} + {\printtext{% + \mkbibdateapalong{#1year}{#1month}{#1day}% + \dateeraprint{#1year}% + \iffieldundef{#1endyear}% + {}% + {\iffieldequalstr{#1endyear}{}% open-ended range? + {\mbox{\bibdatedash}} + {\bibdatedash% + \iffieldsequal{#1year}{#1endyear}% + {\iffieldsequal{#1month}{#1endmonth}% + {\iffieldsequal{#1day}{#1endday}% + {}% + {\mkbibdateapalong{}{}{#1endday}}}% + {\mkbibdateapalong{}{#1endmonth}{#1endday}}}% + {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}% + \dateeraprint{#1endyear}}}% + \enddateuncertainprint}}}}% + \endgroup} + +% Only for DATE as only \printdateextra is used +\newcommand*{\mkdaterangeapalongextra}[1]{% + \begingroup + \blx@metadateinfo{#1}% + \iffieldundef{#1year}{} + {\printtext{% + \datecircaprint + \mkbibdateapalongextra{#1year}{#1month}{#1day}% + \dateeraprint{#1year}% + \dateuncertainprint + \iffieldundef{#1endyear}% + {}% + {\iffieldequalstr{#1endyear}{}% open-ended range? + {\mbox{\bibdatedash}} + {\bibdatedash% + \iffieldsequal{#1year}{#1endyear}% + {\iffieldsequal{#1month}{#1endmonth}% + {\iffieldsequal{#1day}{#1endday}% + {}% + {\mkbibdateapalongextra{}{}{#1endday}}} + {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}} + {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}% + \dateeraprint{#1endyear}}}% + \enddateuncertainprint}}}% + \endgroup} + +\AtEndPreamble{% + \renewcommand*{\datecircaprint}{% + \ifdatecirca{\biblcstring{circa}\printdelim{datecircadelim}}{}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.09 Example 62) ERIC +% eprint references + +\DeclareFieldFormat{eprint:eric}{% + \printtext{\bibcpstring{retrieved}}% + \setunit{\addspace}% + \printtext{\bibstring{from}}\addspace% + ERIC\addspace database\adddot\addspace% + \mkbibparens{#1}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.12) Five author max before "et al" and a one author truncation policy +% However, only after the first cite, see the labelname format +% in .cbx. It's also overridden per-entry by uniquelist +% (APA 6.x) Citation tracking is global +% (APA 6.14) Use initials to disambiguate shared surnames +% (APA 6.16) Use year postfix to disambiguate multiple items in same year +% (APA 6.10) Never reference anything not cited +% (APA 6.25) Author initials only +% (APA 6.25) Sorting is nyt but we need to account for PUBSTATE which comes +% after all normal cites for the same author + +\DeclareSortingTemplate{apa}{ + \sort{ + \field{presort} + } + \sort[final]{ + \field{sortkey} + } + \sort{ + \field{sortname} + \field{author} + \field{editor} + \field{translator} + \field{writer} + \field{director} + \field{producer} + \field{execproducer} + \field{sorttitle} + \field{title} + } + \sort{ + \field{pubstate} + } + \sort{ + \field{sortyear} + \field{year} + \literal{-2000000000}% APA has "nodates" coming first + } + \sort{ + \field{sorttitle} + \field{title} + } + \sort{ + \field{volume} + \literal{0} + } +} + +% Don't fall back on other year fields if there is no year, use +% "nodate" string +\DeclareLabeldate{% + \field{pubstate} + \field{date} + \field{year}%legacy - no EDTF support + \literal{nodate} +} + +% Due to APA strange requirements like truncation after first cite and +% ellipsis from 7th to n-1 in bib, there might be some really strange +% edge cases which can't be handled as this needs treating in the style +% after biber has finished. Very unlikely though. +\ExecuteBibliographyOptions{% + abbreviate=true,% + autocite=inline,% + backref=true,% + citetracker=true,% + date=apalong,% + dateabbrev=false,% + datecirca=true,% + dateera=christian,% + labeldate=apalong,% + dateuncertain=true,% + eventdate=comp,% + labeldateparts=true,% + maxbibnames=7,% + maxcitenames=2,% + minbibnames=6,% + mincitenames=1,% + mincrossrefs=999,% + origdate=apalong,% + pagetracker=true,% + sortcites=true,% + sorting=apa,% + uniquelist=minyear,% + uniquename=full,% + uniqueprimaryauthor=true,% + urldate=apalong,% + useprefix=true,% + usetranslator=true} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +% Enforce ignoring of PUBSTATE if there is a YEAR or DATE field +\DeclareStyleSourcemap{ + \maps[datatype=bibtex]{ + \map{ + \step[fieldsource=year, final] + \step[fieldset=pubstate, null] + } + \map{ + \step[fieldsource=date, final] + \step[fieldset=pubstate, null] + } + } +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% It is not APA standard to have backrefs in the bib +% Some users might like it though. + +\newbool{apa:backref} +\DeclareBibliographyOption{apabackref}{% + \ifstrequal{#1}{true} + {\global\booltrue{apa:backref}} + {\global\boolfalse{apa:backref}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.29) Additional material sometimes goes in parens +% after title. This bool tracks the parens. + +\newbool{bbx:parens} +\AtEveryBibitem{\global\boolfalse{bbx:parens}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.06:47) Reviews are awkward - if no author, date +% position changes so we need a flag to +% track this + +\newbool{bbx:noreviewauthor} +\AtEveryBibitem{\global\boolfalse{bbx:noreviewauthor}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.30) Sometimes "Vol" is inside the additional +% material parens, sometimes not. This bool +% tracks if it has been inserted yet. +% Can't use \clearfield{volume} as some +% later number format tests need to know +% whether volume was defined. + +\newbool{bbx:volseen} +\AtEveryBibitem{\global\boolfalse{bbx:volseen}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.27) This bool tracks if the title was put +% in the author position. +% Can't use \clearfield{title} as some +% later punctuation tests need to know +% whether title was defined. + +\newbool{bbx:titleinauthpos} +\AtEveryBibitem{\global\boolfalse{bbx:titleinauthpos}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.27) Need a flag to say when the editor +% is in author position because this +% can effect where the year goes. + +\newbool{bbx:editorinauthpos} +\AtEveryBibitem{\global\boolfalse{bbx:editorinauthpos}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.27) Flag to say whether the "in" has +% been placed already in IN* +% Reset every bibitem. + +\newbool{bbx:in} +\AtEveryBibitem{\global\boolfalse{bbx:in}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Set up some standard APA formats + +\DeclareFieldFormat{volume}{\apanum{#1}} +\DeclareFieldFormat{chapter}{\bibcpstring{chapter}~\apanum{#1}} +\DeclareFieldFormat{volumes}{\bibcpstring{volumes}~#1} +\DeclareFieldFormat{addendum}{\mkbibparens{#1}} +\DeclareFieldFormat{part}{#1} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.25) Works by the same author have the full author +% name, not an eliding dash. Author is always +% last name first. +% (APA 6.27) Ellipsis in 7th position and then nothing until last +% (APA 7.10 Example 67) Unknown names and dates +% + +% \printnames does different things depending on whether the format you are +% calling is the default for the name field or is a custom format: +% +% * Default format (e.g. "labelname" format for printing labelname): no +% start/stop max/minnames truncation is done first - the format is +% supposed to do it. +% * Custom format (e.g. "labelname" format for printing author): +% max/minnames truncation is done before calling the format so we have +% to do \printnames[format][-\value{listtotal}]{field} to ensure we get +% all of the names in the list to work on + +\DeclareNameAlias{default}{apaauthor} + +\DeclareNameFormat{apaauthor}{% + \ifthenelse{\value{listcount}=\maxprtauth\AND\value{listcount}<\value{listtotal}} + {\addcomma\space\ldots\space} + {\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{listtotal}} + {} + {\iffieldannotation{uncertain} + {\mkbibbrackets{\usebibmacro{name:apa:family-given}% + {\namepartfamily}% + {\namepartgiven}% + {\namepartgiveni}% + {\namepartprefix}% + {\namepartsuffix}?}} + {\usebibmacro{name:apa:family-given}% + {\namepartfamily}% + {\namepartgiven}% + {\namepartgiveni}% + {\namepartprefix}% + {\namepartsuffix}}}}% + \ifthenelse{\value{listcount}=\value{listtotal}}% + {\ifmorenames{\printdelim{andothersdelim}\bibstring{andothers}}{}}{}} + +\renewbibmacro*{author}{% + \ifnameundef{author} + {\usebibmacro{labeltitle}} + {\printnames[apaauthor][-\value{listtotal}]{author}% + \setunit*{\addspace}% + \printfield{nameaddon}% + \ifnameundef{with} + {} + {\setunit{}\addspace\mkbibparens{\printtext{\bibstring{with}\addspace}% + \printnames[apaauthor][-\value{listtotal}]{with}} + \setunit*{\addspace}}}% + \newunit\newblock% + \usebibmacro{labelyear+extradate}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.27) References section delimiters are ampersands, not " and " +% (APA 6.27) Use blank for long lists +% (APA 4.03) Serial comma for lists of three or more + +\DeclareDelimFormat[bib,biblist]{finalnamedelim}{% + \ifthenelse{\value{listcount}>\maxprtauth} + {} + {\ifthenelse{\value{liststop}>2} + {\finalandcomma\addspace\&\space} + {\addspace\&\space}}} + +\DeclareDelimFormat[bib,biblist]{finalnamedelim:apa:family-given}{% + \ifthenelse{\value{listcount}>\maxprtauth} + {} + {\finalandcomma\addspace\&\space}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.28) Use "nodate" bibstring for references with no year +% Months and days go into parenthesis with year, if set +% (APA 6.29) Issue goes where month normally goes if it +% is set. +% (APA 7.10) circa or uncertain dates in brackets + +% Make sure endmonth gets an expansion too +\DeclareFieldFormat{endmonth}{\mkbibmonth{#1}} + +\newbibmacro*{monthorissue}{% + \iffieldundef{issue} + {\iffieldundef{month} + {} + {\addcomma\space\printfield{month}% + \iffieldundef{endmonth}{}{/\printfield{endmonth}}}} + {\addcomma\space\printfield{issue}}} + +\newbibmacro*{labelyear+extradate}{% + \iffieldundef{labelyear} + {\iffieldundef{origyear} + {} + {\printtext[apadate]{\printorigdate}}}% + {\printtext[apadate]{\printlabeldateextra}}} + +\DeclareFieldFormat{apadate}{% + \ifboolexpr{ test {\ifdatecirca} or test {\ifdateuncertain} } + {\printtext{\mkbibbrackets{#1}}} + {\printtext{\mkbibparens{#1}}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.29) General format of titles. +% Ugly Chicago-style lowercasing of English titles + +\DeclareFieldFormat{apacase}{\bbx@colon@search\MakeSentenceCase*{#1}} + +\DeclareFieldFormat{issuetitle}{#1\isdot} +\DeclareFieldFormat{title}{\iffieldequalstr{titleisdescription}{true}{\mkbibbrackets{#1}}{\mkbibemph{#1}\isdot}} +\DeclareFieldFormat{origtitle}{\mkbibemph{\bbx@colon@search\MakeSentenceCase*{#1}}\isdot} +\DeclareFieldFormat[article]{title}{#1\isdot} +\DeclareFieldFormat[article]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot} +\DeclareFieldFormat[inbook]{title}{#1\isdot} +\DeclareFieldFormat[inbook]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot} +\DeclareFieldFormat[incollection]{title}{#1\isdot} +\DeclareFieldFormat[incollection]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot} +\DeclareFieldFormat[inproceedings]{title}{#1\isdot} +\DeclareFieldFormat[inproceedings]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot} +\DeclareFieldFormat[proceedings]{title}{#1\isdot} +\DeclareFieldFormat[proceedings]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.01 Example 10) Newspapers have prefix for pages. + +\DeclareFieldFormat[newsarticle]{pages}{% + \DeclareNumChars{.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ}% + \mkpageprefix{#1}% + \DeclareNumChars{.}} + +\DeclareFieldFormat[newsarticle]{newspaper}{\mkbibemph{#1}} +\DeclareFieldFormat[newsarticle]{entrysubtype}{\mkbibbrackets{#1}} +\DeclareFieldFormat[newsarticle]{title}{#1} +\DeclareFieldFormat[article]{pages}{#1} + +\newbibmacro*{newspaper}{% + \printfield{newspaper} + \setunit{\addcomma\space}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.29) Additional {main}title information in brackets (using) +% {MAIN}TITLEADDON field. Colon after maintitle. + +\DeclareFieldFormat{titleaddon}{\mkbibbrackets{\bbx@colon@search\MakeSentenceCase*{#1}}} +\DeclareFieldFormat{maintitleaddon}{\mkbibbrackets{\bbx@colon@search\MakeSentenceCase*{#1}}} +\DeclareFieldFormat{booktitleaddon}{\mkbibbrackets{\bbx@colon@search\MakeSentenceCase*{#1}}} + +\newbibmacro*{bookaddinfo}{% + \ifthenelse{\iffieldundef{edition}\AND\iffieldundef{volumes}} + {} + {\printtext{\bibopenparen}% + \printfield{edition}% + \setunit*{\addcomma\addspace}% + \printfield{volumes}% + \setunit{}% + \printtext{\bibcloseparen}}% +} + +\renewbibmacro*{title}{% + \ifthenelse{\iffieldundef{title}\AND\iffieldundef{subtitle}} + {} + {\iffieldundef{origtitle} + {\printtext[title]{% + \printfield[apacase]{title}% + \setunit{\subtitlepunct}% + \printfield[apacase]{subtitle}}} + {\printfield{origtitle}% + \setunit{\addspace}% + \printtext[brackets]{% + \printfield[apacase]{title}% + \setunit{\subtitlepunct}% + \printfield[apacase]{subtitle}}}% + \setunit{\addspace}% + \printfield{titleaddon}% + \iffieldequalstr{entrytype}{book}% + {\setunit{\addspace}\usebibmacro{bookaddinfo}}% + {}% + \ifthenelse{% + \ifnameundef{author}\AND% + \(\ifnameundef{editor}\AND\NOT\boolean{bbx:editorinauthpos}\)\AND% + \ifnameundef{producer}\AND% + \ifnameundef{director}\AND% + \ifnameundef{writer}} + {\newunit\newblock + \usebibmacro{labelyear+extradate}} + {}}} + +\renewbibmacro*{maintitle}{% + \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{mainsubtitle}} + {} + {\printtext[maintitle]{% + \printfield[apacase]{maintitle}% + \setunit{\subtitlepunct}% + \printfield[apacase]{mainsubtitle}}% + \setunit{\addspace}} + \printfield{maintitleaddon}% + \addcolon} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.30) Format of volume and number for articles + +\DeclareFieldFormat[article]{volume}{\mkbibemph{\apanum{#1}}} +\DeclareFieldFormat[article]{number}{\mkbibparens{\apanum{#1}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.30) Commas between title and volume for articles + +\renewbibmacro*{journal+issuetitle}{% + \usebibmacro{journal}% + \setunit*{\addcomma\addspace}% + \printfield{volume}% + \printfield{number}% + \setunit{\addspace}\newblock + \usebibmacro{issuename}% + \newunit} + +\newbibmacro*{issuename}{% + \iffieldundef{issuetitle} + {} + {\printtext[issuetitle]{% + \printfield[noformat]{issuetitle}% + \setunit{\subtitlepunct}% + \printfield[noformat]{issuesubtitle}}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.29) Additional information for non-periodicals in +% parenthesis after title. This is ugly but it's +% hard to put in "optional parens" like this +% around an unknown amount of characters. + +\newbibmacro*{addinfo}{% + \ifthenelse{\iffieldundef{edition}\AND% + \iffieldundef{chapter}\AND% + \iffieldundef{volumes}\AND% + \iffieldundef{pages}\AND% + \iffieldundef{number}\AND% + \(\iffieldundef{volume}\OR\boolean{bbx:volseen}\)} + {} + {\printtext{\bibopenparen}% + \printfield{edition}% + \setunit*{\addcomma\addspace}% + \printfield{chapter}% + \setunit*{\addcomma\addspace}% + \notbool{bbx:volseen}% + {\iffieldundef{volume}{}{\global\booltrue{bbx:volseen}}% + \printfield{volume}% + \iffieldundef{part}{}{\printfield{part}}}{}% + \setunit*{\addcomma\addspace}% + \printfield{volumes}% + \setunit*{\addcomma\addspace}% + \printfield{pages}% + \setunit{}% + \printtext{\bibcloseparen}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.27) "In " precedes editor/trans list, no colon + +\newbibmacro*{in}{% + \ifbool{bbx:in}% + {}% + {\global\booltrue{bbx:in}% + \bibcpstring{in}\setunit{\space}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.27) Editors have first names first ... +% (APA 7.02 Example 27) ... unless there is no author + +\DeclareNameFormat{apanames}{% + \ifthenelse{\value{listcount}=\maxprtauth\AND\value{listcount}<\value{listtotal}} + {\addcomma\space\ldots\space} + {\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{listtotal}} + {} + {\usebibmacro{name:apa:given-family}% + {\namepartfamily}% + {\namepartgiven}% + {\namepartgiveni}% + {\namepartprefix}% + {\namepartsuffix}}}% + \ifthenelse{\value{listcount}=\value{listtotal}}% + {\ifmorenames{\printdelim{andothersdelim}\bibstring{andothers}}{}}{}} + +\renewbibmacro*{author/editor}{% + \ifnameundef{author} + {\ifnameundef{editor} + {} + {\usebibmacro{editorinauthpos}}} + {\global\boolfalse{bbx:editorinauthpos}% + \usebibmacro{author}}} + +\newbibmacro*{editorinauthpos}{% + \global\booltrue{bbx:editorinauthpos}% + \printnames[apaauthor][-\value{listtotal}]{editor}% + \setunit{\addspace}% + \ifnameundef{editor} + {} + {\printtext[parens]{\usebibmacro{apaeditorstrg}{editor}}% + % need to clear editor so we don't get an "In" clause later + % But we also need to set a flag to say we did this so we + % don't lose sight of the fact we once had an editor for + % various year placement tests + \clearname{editor}% + \setunit{\adddot\addspace}% + \usebibmacro{labelyear+extradate}% + \setunit{\adddot\addspace}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.27) Name format. Don't capitalise prefixes +% (APA 6.27) Full name disambiguation using brackets + +% #1 = family name +% #2 = given name +% #3 = given name (initials) +% #4 = name prefix +% #5 = name suffix + +\newbibmacro*{name:delim:apa:family-given}[1]{% + \ifnumgreater{\value{listcount}}{\value{liststart}} + {\ifboolexpr{ + test {\ifnumless{\value{listcount}}{\value{liststop}}} + or + test \ifmorenames + } + {\printdelim{multinamedelim}} + {\printdelim{finalnamedelim:apa:family-given}}} + {}} + +\newbibmacro*{name:apa:family-given}[5]{% + \ifuseprefix + {\usebibmacro{name:delim:apa:family-given}{#4#1}% + \usebibmacro{name:hook}{#4#1}% + \ifdefvoid{#4}{}{% + \mkbibnameprefix{#4}\isdot% + \ifprefchar{}{\bibnamedelimc}}% + \mkbibnamefamily{#1}\isdot% + \ifdefvoid{#2}{}{\revsdnamepunct\bibnamedelimd\mkbibnamegiven{#3}\isdot% + \ifthenelse{\value{uniquename}>1} + {\bibnamedelimd\mkbibbrackets{#2}} + {}}% + \ifdefvoid{#5}{}{\addcomma\bibnamedelimd\mkbibnamesuffix{#5}\isdot}} + {\usebibmacro{name:delim:apa:family-given}{#1}% + \usebibmacro{name:hook}{#1}% + \mkbibnamefamily{#1}\isdot + \ifboolexpe{% + test {\ifdefvoid{#2}} + and + test {\ifdefvoid{#4}}} + {} + {\revsdnamepunct}% + \ifdefvoid{#2}{}{\bibnamedelimd\mkbibnamegiven{#3}% + \ifthenelse{\value{uniquename}>1} + {\bibnamedelimd\mkbibbrackets{#2}} + {}}% + \ifdefvoid{#4}{}{% + \bibnamedelimc\mkbibnameprefix{#4}% + \ifprefchar{}{\bibnamedelimc}}% + \ifdefvoid{#5}{}{\addcomma\bibnamedelimd\mkbibnamesuffix{#5}\isdot}}} + +\newbibmacro*{name:apa:given-family}[5]{% + \usebibmacro{name:delim}{#2#4#1#5}% + \usebibmacro{name:hook}{#2#4#1#5}% + \ifdefvoid{#2}{}{\mkbibnamegiven{#3}\isdot% + \ifthenelse{\value{uniquename}>1} + {\bibnamedelimd\mkbibbrackets{#2}} + {}% + \bibnamedelimd}% + \ifdefvoid{#4}{}{% + \mkbibnameprefix{#4}\isdot + \ifprefchar{}{\bibnamedelimc}}% + \mkbibnamefamily{#1}\isdot% + \ifdefvoid{#5}{}{\bibnamedelimd\mkbibnamesuffix{#5}\isdot}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.27) Editor string in parens after author list +% (APA 7.02 Example 21) Collapse editor and trans if same +% (APA 7.02 Example 26) Translator + + +% Separated out into book and in* macros because otherwise +% this makes one ugly, huge, unreadable beast. + +\newbibmacro*{book:editor+trans}{% + \ifthenelse{\ifnameundef{editor}\AND% + \ifnameundef{editora}\AND% + \ifnameundef{editorb}\AND% + \ifnameundef{editorc}\AND% + \ifnameundef{translator}}% + {}% + {\ifnamesequal{editor}{translator}% + {\printtext{\bibopenparen}\global\booltrue{bbx:parens}% + \printnames[apanames][-\value{listtotal}]{editor}% + \setunit*{\addcomma\addspace}% + \usebibmacro{apaeditorstrg}{editor}% + \setunit*{\addspace\&\space}% + \printtext{\bibcpstring{translator}}% + \ifbool{bbx:parens}{\printtext{\bibcloseparen}\global\boolfalse{bbx:parens}}{}} + {\printtext{\bibopenparen}\global\booltrue{bbx:parens}% + \ifnameundef{editor}% + {}% + {\printnames[apanames][-\value{listtotal}]{editor}% + \setunit{\addcomma\addspace}% + \usebibmacro{apaeditorstrg}{editor}% + \clearname{editor}% + \setunit{\adddot}% + \setunit*{\addspace\&\space}}% + \ifnameundef{translator}% + {\setunit{}}% + {\printnames[apanames][-\value{listtotal}]{translator}% + \setunit{\addcomma\addspace}% + \printtext{\bibcpstring{translator}}% + \clearname{translator}% + \setunit{\adddot}}% + \ifbool{bbx:parens}{\printtext{\bibcloseparen}\global\boolfalse{bbx:parens}}{}}}} + +\newbibmacro*{editor+trans}{% + \ifthenelse{\ifnameundef{editor}\AND% + \ifnameundef{editora}\AND% + \ifnameundef{editorb}\AND% + \ifnameundef{editorc}\AND% + \ifnameundef{translator}}% + {\setunit{\adddot\addspace}}% + {\ifnamesequal{editor}{translator}% + {\usebibmacro{in}% + \printnames[apanames][-\value{listtotal}]{editor}% + \setunit{\addspace\bibopenparen\global\booltrue{bbx:parens}}% + \usebibmacro{apaeditorstrg}{editor}% + \setunit*{\addspace\&\space}% + \printtext{\bibcpstring{translator}}% + \ifbool{bbx:parens}{\printtext{\bibcloseparen}\global\boolfalse{bbx:parens}}{}} + {\ifnameundef{translator}% + {}% + {\setunit{\addspace}% + \printtext[parens]{\printnames[apanames][-\value{listtotal}]{translator}% + \setunit{\addcomma\addspace}% + \printtext{\bibcpstring{translator}}}% + \clearname{translator}% + \setunit{\adddot\addspace}}% + \usebibmacro{in}% + \usebibmacro{editorx}}% + \setunit{\addcomma\addspace}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.29) Special journal issues are periodicals + +\DeclareFieldFormat[periodical]{pages}{#1} +\DeclareFieldFormat[periodical]{title}{#1\isdot} +\DeclareFieldFormat[periodical]{issuetitle}{\mkbibbrackets{#1}} +\DeclareFieldFormat[periodical]{volume}{\mkbibemph{\apanum{#1}}} +\DeclareFieldFormat[periodical]{number}{\mkbibparens{\apanum{#1}}} +\DeclareListFormat[periodical]{location}{\mkbibemph{#1}} + +\renewbibmacro*{periodical}{% + \iffieldundef{title} + {} + {\printtext[title]{% + \printfield[apacase]{title}% + \setunit{\subtitlepunct}% + \printfield[apacase]{subtitle}}}} + +\renewbibmacro*{title+issuetitle}{% + \usebibmacro{periodical}% + \setunit{\addspace}% + \printfield{issuetitle}% + \notbool{bbx:editorinauthpos} + {\newunit + \usebibmacro{labelyear+extradate}} + {}} + +\newbibmacro*{pnumber}{% + \printfield{volume}% + \printfield{number}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.02 Example 21) Original year + +% Only give ORIGYEAR in references if both: +% YEAR is also given +% YEAR and ORIGYEAR are different + +\newbibmacro*{origyear}{% + \ifboolexpr{% + not test {\iffieldundef{origyear}} + not test {\iffieldundef{labelyear}} + and not test {\iffieldsequal{labelyear}{origyear}}} + {\printtext{\mkbibparens{\bibcpstring{origyear}~\printorigdate}}} + {}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.02) "In " before booktitle, edited or not +% (APA 6.30) Non-periodical volume number followed by "." + +\renewbibmacro*{maintitle+title}{% + \iffieldsequal{maintitle}{title} + {\clearfield{maintitle}% + \clearfield{mainsubtitle}% + \clearfield{maintitleaddon}} + {\iffieldundef{maintitle} + {} + {\usebibmacro{maintitle}% + \newunit\newblock + \iffieldundef{volume} + {} + {\setunit{\global\booltrue{bbx:volseen}}% + \printfield{volume}% + \printfield{part}% + \setunit{\adddot\space}}}}% + \usebibmacro{title}% + \newunit} + +\renewbibmacro*{maintitle+booktitle}{% + \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}} + {} + {\usebibmacro{in}% + \iffieldundef{maintitle} + {} + {\usebibmacro{maintitle}% + \newunit\newblock + \iffieldundef{volume} + {} + {\setunit{\addspace\global\booltrue{bbx:volseen}}% + \printfield{volume}% + \printfield{part}% + \setunit{\adddot\addspace}}}% + \usebibmacro{booktitle}}} + +\renewbibmacro*{booktitle}{% + \ifthenelse{\iffieldundef{booktitle}\AND\iffieldundef{booksubtitle}} + {} + {\printtext[booktitle]{% + \printfield[apacase]{booktitle}% + \setunit{\subtitlepunct}% + \printfield[apacase]{booksubtitle}}% + \setunit{\addspace}}% + \printfield{booktitleaddon}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.29) Colon separates title/subtitle +% Skip if following terminating punctuation + +\renewcommand*{\subtitlepunct}{\ifterm{}{\addcolon}\space} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.30) Format of volume depends on whether +% there is a maintitle (what APA calls "series") or not. + +\DeclareFieldFormat{volume}{\iffieldundef{maintitle} + {\bibcpstring{volume}~\apanum{#1}} + {\mkbibemph{\bibcpstring{volume}~\apanum{#1}}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.30) Number for reports with no prefix if not +% a numeral. Report number is optional and so must be +% the parens. + +\DeclareFieldFormat{number}{\iffieldundef{volume} + {\ifinteger{\thefield{number}} + {\addspace\mkbibemph{\bibcpstring{number}~\apanum{#1}}\adddot} + {\apanum{#1}}} + {\mkbibemph{\apanum{#1}}}} + +\DeclareFieldFormat[report]{number}{\mkbibparens{\iffieldundef{type} + {} + {\printfield{type}\setunit{\addspace}}% + \bibcpstring{number}~\apanum{#1}}} + +\newbibmacro*{apa:reportnum}{% + \iffieldundef{number}% + {}% + {\printfield{number}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.30) Location only shows first item + +\DeclareListFormat{default}{% + \usebibmacro{list:delim}{#1}% + #1\isdot} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.02 Example 38) Proceedings emph number, location +% and location. Pages have no prefix + +\DeclareListFormat[proceedings]{location}{\mkbibemph{#1}} +\DeclareFieldFormat[proceedings]{pages}{#1} +\DeclareFieldFormat[proceedings]{number}{\mkbibemph{\apanum{#1}}} +\DeclareFieldFormat[proceedings]{volume}{\mkbibemph{\apanum{#1}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.02 Example 40--44) Theses titles and volume +% Titles are not emph if only an abstract + +\DeclareFieldFormat[thesis]{title}{\mkbibemph{#1}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.05) Unpublished theses + +\DeclareFieldFormat[unpublished]{title}{\mkbibemph{#1}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.06) Reviews + +% The title of the review depends on the entrytype of the thing reviewed +\newcommand*{\begrelateddelimreviewof}{\addspace} +\DeclareFieldFormat[review]{title}{% + \entrydata*{\thefield{related}}{% + \ifentrytype{article} + {\mkbibemph{\printtext[apacase]{\thefield{savedtitle}}}} + {\printtext[apacase]{\thefield{savedtitle}}}}} + +\DeclareFieldFormat[review]{pages}{#1} +\DeclareFieldFormat[review]{volume}{\mkbibemph{\apanum{#1}}} +\DeclareFieldFormat[review]{number}{\mkbibparens{\apanum{#1}}} + +\newbibmacro*{reviewauthor}{% + \ifnameundef{author} + {\booltrue{bbx:noreviewauthor}} + {\usebibmacro{author}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Media authors + +\newbibmacro*{producer}{% + \ifnameundef{producer} + {} + {\printnames[apaauthor][-\value{listtotal}]{producer}% + \addspace + \printtext[parens]{\bibcpstring{producer}}% + \setunit*{\addcomma\addspace\&\addspace}}} + +\newbibmacro*{director}{% + \ifnameundef{director} + {} + {\printnames[apaauthor][-\value{listtotal}]{director}% + \addspace + \printtext[parens]{\bibcpstring{director}}% + \setunit*{\addcomma\addspace\&\addspace}}} + +\newbibmacro*{writer}{% + \ifnameundef{writer} + {} + {\printnames[apaauthor][-\value{listtotal}]{writer}% + \addspace + \printtext[parens]{\bibcpstring{writer}}% + \setunit*{\addcomma\addspace\&\addspace}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%% +% (APA 7.07) Misc and data + +\DeclareFieldFormat[data]{title}{\mkbibemph{#1}} +\DeclareFieldFormat[data]{entrysubtype}{\mkbibbrackets{#1}} +\DeclareFieldFormat[misc]{entrysubtype}{\mkbibbrackets{#1}} +\DeclareFieldFormat[misc]{nameaddon}{\mkbibparens{#1}} +\DeclareFieldFormat[misc]{title}{\iffieldequalstr{titleisdescription}{true}{\mkbibbrackets{#1}}{{#1}\isdot}} + +\newbibmacro*{datatitle}{% + \iffieldundef{title} + {\iffieldundef{entrysubtype} + {} + {\printfield{entrysubtype}}} + {\iffieldundef{entrysubtype} + {} + {\usebibmacro{title}\addspace + \printfield{entrysubtype}}}} + +% +%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.07) Audiovisual + +\DeclareFieldFormat[video]{title}{\iffieldundef{maintitle}{\mkbibemph{#1}}{#1}} +\DeclareFieldFormat[video]{maintitle}{\mkbibemph{#1}} +\DeclareFieldFormat[video]{entrysubtype}{\mkbibbrackets{#1}} +\DeclareFieldFormat[audio]{entrysubtype}{\mkbibbrackets{#1}} +\DeclareFieldFormat[music]{title}{#1} +\DeclareFieldFormat[music]{maintitle}{\mkbibemph{#1}} +\DeclareFieldFormat[music]{mainsubtitle}{\mkbibemph{#1}} +\DeclareFieldFormat[audio]{howpublished}{\mkbibparens{#1}} + +\newbibmacro*{tvseries}{% + \iffieldundef{maintitle} + {} + {\usebibmacro{in}% + \ifnameundef{execproducer} + {} + {\printnames[apanames][-\value{listtotal}]{execproducer}% + \addspace + \printtext[parens]{\bibcpstring{execproducer}}} + \setunit{\addcomma\addspace}% + \usebibmacro{avmaintitle}% + \newunit}} + +\newbibmacro*{avmaintitle}{% + \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{mainsubtitle}} + {} + {\printtext[maintitle]{% + \printfield[apacase]{maintitle}% + \setunit{\subtitlepunct}% + \printfield[apacase]{mainsubtitle}}% + \setunit{\addspace}} + \printfield{maintitleaddon}} + +\newbibmacro*{album}{% + \iffieldundef{maintitle} + {} + {\bibcpstring{on}% + \setunit{\addspace}% + \usebibmacro{avmaintitle}% + \newunit}} + + +% +%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%% +% (APA 7.10) Letter/Letters + +\DeclareFieldFormat[letter]{title}{\mkbibbrackets{#1}} +\DeclareFieldFormat[letters]{title}{#1} +\DeclareFieldFormat[letter]{number}{\mkbibparens{#1}} +\DeclareFieldFormat[letters]{number}{\mkbibparens{#1}} + +% +%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%% +% (APA 6.31) URLs + +\DeclareFieldFormat{url}{\url{#1}} +\DeclareFieldFormat{abstracturl}{\url{#1}} +\DeclareFieldFormat{urldate}{#1} + +\renewbibmacro*{url+urldate}{% + \ifthenelse{\(\iffieldundef{url}\AND\iffieldundef{abstracturl}\AND\iffieldundef{abstractloc}\)\OR\NOT\iffieldundef{doi}} + {} + {\ifthenelse{\iffieldundef{abstracturl}\AND\iffieldundef{abstractloc}} + {} + {\printtext{\bibcpstring{abstract}}\addspace}% + \iffieldequalstr{entrysubtype}{{DVD}} + {\printtext{\bibstring{available}}} + {\printtext{\bibstring{retrieved}}}% + \setunit{\addspace}% + \iffieldundef{urlyear} + {} + {\printtext{\printurldate}% + \setunit*{\urldatecomma}}% + \printtext{\bibstring{from}}% + \setunit*{\addspace}% + \printfield{urldescription}% + \setunit*{\addcolon\addspace}% + \iffieldundef{url}{}{\printfield{url}\renewcommand*{\finentrypunct}{\relax}}% + \iffieldundef{abstractloc}{}{\printfield{abstractloc}\renewcommand*{\finentrypunct}{\relax}}% + \iffieldundef{abstracturl}{}{\printfield{abstracturl}\renewcommand*{\finentrypunct}{\relax}}}} + +% +%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.11) Non-emph titles for online items +% Subtype in brackets + + +\DeclareFieldFormat[online]{title}{#1} +\DeclareFieldFormat[online]{entrysubtype}{\mkbibbrackets{#1}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA A7.07) Emph titles for patents + +\DeclareFieldFormat[patent]{title}{\mkbibemph{#1}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.08 Example 56) Software has version in title + +\DeclareFieldFormat[software]{title}{#1} +\DeclareFieldFormat[software]{version}{\mkbibparens{\bibcpstring{version}~#1}} + +\newbibmacro*{apa:softwaretitle}{% + \printtext[title]{% + \printfield[apacase]{title}% + \setunit{\subtitlepunct}% + \printfield[apacase]{subtitle}}% + \setunit{\addspace}% + \iffieldundef{version}% + {} + {\printfield{version}} + \printfield{titleaddon}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Hacky bits to suppress final period in some cases. +% * If there is an ORIGYEAR field (APA 7.02:21) +% * Unless there is a RELATED and ADDENDUM +\newbibmacro*{apa:finpunct}{% + \iffieldundef{origyear} + {\ifboolexpr{ + test {\iffieldundef{addendum}} + and + test {\iffieldundef{related}}} + {} + {\renewcommand*{\finentrypunct}{\relax}}} + {\renewcommand*{\finentrypunct}{\relax}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Related entries + +\DeclareFieldFormat{related:reprintfrom}{\mkbibparens{#1}} +\DeclareFieldFormat{related:reviewof}{\mkbibbrackets{#1}} + +\renewbibmacro*{related:reprintfrom}[1]{% + \entrydata*{#1}{% + \printtext{\mkbibemph{\printfield[apacase]{title}}}% + \setunit{\bibpagespunct}% + \printfield{pages}% + \setunit{\addcomma\addspace}% + \bibstring{byauthor}\addspace + \ifnameundef{editor} + {} + {\printnames[apanames][-\value{listtotal}]{editor}% + \setunit{\addcomma\addspace}% + \usebibmacro{apaeditorstrg}{editor}% + \setunit{\addcomma\addspace}% + \printlabeldateextra + \setunit{\addcomma\addspace}}% + \printnames[apanames][-\value{listtotal}]{author}% + \setunit{\addcomma\addspace}% + \usebibmacro{location+publisher}% + \newunit\newblock + \usebibmacro{related}}} + +\newbibmacro*{related:reviewof}[1]{% + \setunit{}% Sanitise this in case no author + \entrydata*{#1}{% + \ifentrytype{article} + {\printtext{\printfield[apacase]{title}}} + {\printtext{\mkbibemph{\printfield[apacase]{title}}}}% + \setunit{\addspace}% + \bibstring{byauthor}\addspace + \printnames[apanames][-\value{listtotal}]{author}% + \printnames[apanames][-\value{listtotal}]{producer}% + \printnames[apanames][-\value{listtotal}]{director}% + \setunit{\addcomma\addspace}% + \printdateextra + \newunit\newblock + \usebibmacro{related}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.x) General type layouts + +\DeclareBibliographyDriver{article}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/editor}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{title}% + \newunit\newblock + \usebibmacro{journal+issuetitle}% + \setunit{\bibpagespunct}% + \printfield{pages}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \printfield{addendum}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{apa:finpunct}% + \usebibmacro{apa:pageref}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{newsarticle}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/editor}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{title}% + \newunit\newblock + \usebibmacro{newspaper}% + \setunit{\bibpagespunct}% + \printfield{pages}% + \newunit\newblock + \printfield{entrysubtype}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \printfield{addendum}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{apa:finpunct}% + \usebibmacro{apa:pageref}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{book}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/editor}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{maintitle+title}% + \setunit{\addspace}\newblock + \usebibmacro{book:editor+trans}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{location+publisher}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \usebibmacro{origyear}% + \newunit\newblock + \printfield{addendum}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{apa:pageref}% + \usebibmacro{apa:finpunct}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{booklet}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/editor}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{title}% + \newunit\newblock + \printfield{howpublished}% + \newunit\newblock + \printfield{type}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{location+publisher}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \printfield{addendum}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{apa:pageref}% + \usebibmacro{apa:finpunct}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{proceedings}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/editor}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{title}% + \newunit\newblock + \usebibmacro{booktitle}% + \setunit{\addcomma\addspace}\newblock + \usebibmacro{location+publisher}% + \setunit{\addcomma\addspace}% + \printfield{volume}% + \setunit*{\adddot}% + \printfield{number}% + \setunit{\addcomma\addspace} + \printfield{pages}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \printlist{organization}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \printfield{addendum}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{apa:pageref}% + \usebibmacro{apa:finpunct}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{collection}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/editor}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{title}% + \newunit\newblock + \usebibmacro{location+publisher}% + \setunit{\addcomma\addspace}% + \printfield{number}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \printfield{addendum}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{apa:pageref}% + \usebibmacro{apa:finpunct}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{inbook}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{title}% + \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock + \usebibmacro{editor+trans}% + \newblock + \usebibmacro{maintitle+booktitle}% + \newblock + \usebibmacro{addinfo}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{location+publisher}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \setunit*{\addspace}\newblock + \usebibmacro{origyear}% + \newunit\newblock + \printfield{addendum}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{apa:pageref}% + \usebibmacro{apa:finpunct}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{incollection}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{title}% + \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock + \usebibmacro{editor+trans}% + \setunit*{\addcomma\addspace}\newblock + \usebibmacro{maintitle+booktitle}% + \newblock + \usebibmacro{addinfo}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{location+publisher}% + \newunit\newblock + \usebibmacro{origyear}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \printfield{addendum}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{apa:pageref}% + \usebibmacro{apa:finpunct}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{inproceedings}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{title}% + \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock + \usebibmacro{editor+trans}% + \setunit*{\addcomma\addspace}\newblock + \usebibmacro{maintitle+booktitle}% + \iffieldundef{eventyear}{}{\setunit{\addcomma\addspace}}% + \printeventdate + \setunit*{\addspace}\newblock + \usebibmacro{addinfo}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \printlist{organization}% + \newunit + \printfield[apacase]{eventtitle}% + \newunit + \printfield{venue}% + \iffieldundef{pages} + {\setunit{\addcomma\addspace}} + {\newunit}% + \newblock + \usebibmacro{location+publisher}% + \newunit\newblock + \usebibmacro{origyear}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \printfield{addendum}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{apa:pageref}% + \usebibmacro{apa:finpunct}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{manual}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/editor}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{title}% + \newunit\newblock + \printfield{edition}% + \newunit\newblock + \printfield{type}% + \newunit + \printfield{version}% + \newunit + \printfield{note}% + \newunit\newblock + \printlist{organization}% + \newunit + \usebibmacro{location+publisher}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \printfield{addendum}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{apa:pageref}% + \usebibmacro{apa:finpunct}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{online}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{title}% + \ifthenelse{\iffieldundef{title}\AND\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock + \printfield{entrysubtype}% + \addperiod\addspace + \iftoggle{bbx:doi} + {\printfield{doi}% + \iffieldundef{doi}{}{\renewcommand*{\finentrypunct}{\relax}}} + {}% + \newunit\newblock + \iftoggle{bbx:eprint} + {\usebibmacro{eprint}% + \iffieldundef{eprint}{}{\renewcommand*{\finentrypunct}{\relax}}} + {}% + \newunit\newblock + \usebibmacro{url+urldate}% + \iffieldundef{url}{}{\renewcommand*{\finentrypunct}{\relax}} + \newunit\newblock + \printfield{addendum}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{apa:pageref}% + \usebibmacro{apa:finpunct}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{patent}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{title}% + \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock + \setunit*{\addspace}% + \printfield{number}% + \newunit\newblock + \usebibmacro{location+publisher}% + \newunit\newblock + \usebibmacro{byholder}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \printfield{addendum}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{apa:pageref}% + \usebibmacro{apa:finpunct}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{periodical}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/editor}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{title+issuetitle}% + \setunit{\adddot\addspace} + \usebibmacro{journal}% + \setunit{\addcomma\addspace} + \printlist{location}% + \setunit{\addcomma\addspace} + \usebibmacro{pnumber}% + \setunit{\addcomma\addspace} + \printfield{pages}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \printfield{addendum}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{apa:pageref}% + \usebibmacro{apa:finpunct}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{report}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/editor}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{title}% + \usebibmacro{apa:reportnum}% + \newunit\newblock + \printlist{institution}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{location+publisher}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \printfield{addendum}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{apa:pageref}% + \usebibmacro{apa:finpunct}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{thesis}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{title}% + \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock + \usebibmacro{type+institution}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \printfield{addendum}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{apa:pageref}% + \usebibmacro{apa:finpunct}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{review}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{reviewauthor}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{title}% + \newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \newunit\newblock + \ifbool{bbx:noreviewauthor}{\usebibmacro{labelyear+extradate}}{}% + \newunit\newblock + \usebibmacro{journal+issuetitle}% + \newunit\newblock + \printfield{note}% + \setunit{\bibpagespunct}% + \printfield{pages}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \printfield{addendum}% + \usebibmacro{apa:pageref}% + \usebibmacro{apa:finpunct}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{misc}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{title}% + \ifthenelse{\iffieldundef{title}\AND\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock + \printfield{entrysubtype}% + \newunit\newblock + \printfield{howpublished}% + \newunit\newblock + \printfield{type}% + \newunit + \printfield{version}% + \newunit + \printfield{note}% + \newunit\newblock + \printlist{organization}% + \newunit\newblock + \printlist{institution}% + \setunit*{\addcomma\addspace}% + \usebibmacro{location+publisher}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \printfield{addendum}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{apa:pageref}% + \usebibmacro{apa:finpunct}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{data}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{datatitle}% + \newunit\newblock + \printfield{type}% + \newunit + \printfield{version}% + \newunit + \printfield{note}% + \newunit\newblock + \printlist{organization}% + \newunit\newblock + \usebibmacro{location+publisher}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \printfield{addendum}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{apa:pageref}% + \usebibmacro{apa:finpunct}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{letter}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/editor}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{title}% + \newunit\newblock + \printlist{institution}% + \setunit{\addspace}\newblock + \printfield{number}% + \newunit\newblock + \printfield{note}% + \setunit{\addcomma\addspace}\newblock + \usebibmacro{location+publisher}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \printfield{addendum}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{apa:pageref}% + \usebibmacro{apa:finpunct}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{letters}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/editor}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{title}% + \newunit\newblock + \printlist{institution}% + \setunit{\addspace}\newblock + \printfield{number}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{location+publisher}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \printfield{addendum}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{apa:pageref}% + \usebibmacro{apa:finpunct}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{video}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{writer}% + \usebibmacro{director}% + \usebibmacro{producer}% + \newunit\newblock + \usebibmacro{labelyear+extradate}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{title}% + \setunit{\addspace}\newblock + \printfield{entrysubtype}% + \newunit\newblock + \usebibmacro{tvseries}% + \newunit\newblock + \usebibmacro{location+publisher}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \printfield{addendum}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{apa:pageref}% + \usebibmacro{apa:finpunct}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{movie}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{writer}% + \usebibmacro{director}% + \usebibmacro{producer}% + \newunit\newblock + \usebibmacro{labelyear+extradate}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{title}% + \setunit{\addspace}\newblock + \printfield{entrysubtype}% + \newunit\newblock + \usebibmacro{tvseries}% + \newunit\newblock + \usebibmacro{location+publisher}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \printfield{addendum}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{apa:pageref}% + \usebibmacro{apa:finpunct}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{audio}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{writer}% + \usebibmacro{director}% + \usebibmacro{producer}% + \newunit\newblock + \usebibmacro{labelyear+extradate}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{title}% + \setunit{\addspace}\newblock + \printfield{entrysubtype}% + \newunit\newblock + \usebibmacro{location+publisher}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \printfield{addendum}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{apa:pageref}% + \usebibmacro{apa:finpunct}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{music}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{title}% + \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock + \usebibmacro{album}% + \newunit\newblock + \usebibmacro{location+publisher}% + \printfield{addendum}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{apa:pageref}% + \usebibmacro{apa:finpunct}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{software}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/editor}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{apa:softwaretitle}% + \newunit\newblock + \usebibmacro{location+publisher}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \printfield{addendum}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{apa:pageref}% + \usebibmacro{apa:finpunct}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{unpublished}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/editor}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{title}% + \newunit\newblock + \printfield{howpublished}% + \iflistundef{institution} + {\newunit} + {\setunit{\addcomma\addspace}}% + \newblock + \printlist{institution}% + \setunit*{\addcomma\addspace}\newblock + \printfield{note}% + \setunit*{\addcomma\addspace}\newblock + \printlist{location}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \printfield{addendum}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{apa:pageref}% + \usebibmacro{apa:finpunct} + \usebibmacro{finentry}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Modified, common macros + +\newbibmacro*{editorx}{% + \ifnameundef{editor} + {} + {\printnames[apanames][-\value{listtotal}]{editor}% + \setunit{\addspace}% + \printtext[parens]{\usebibmacro{apaeditorstrg}{editor}} + \clearname{editor}% + \newunit}% + \ifnameundef{editora} + {} + {\printnames[apanames][-\value{listtotal}]{editora}% + \setunit{\addspace}% + \printtext[parens]{\usebibmacro{apaeditorstrg}{editora}} + \clearname{editora}% + \newunit}% + \ifnameundef{editorb} + {} + {\printnames[apanames][-\value{listtotal}]{editorb}% + \setunit{\addspace}% + \printtext[parens]{\usebibmacro{apaeditorstrg}{editorb}} + \clearname{editorb}% + \newunit}% + \ifnameundef{editorc} + {} + {\printnames[apanames][-\value{listtotal}]{editorc}% + \setunit{\addspace}% + \printtext[parens]{\usebibmacro{apaeditorstrg}{editorc}} + \clearname{editorc}% + \newunit}} + +\newbibmacro*{apaeditorstrg}[1]{% + \iffieldundef{#1type} + {\ifthenelse{\value{#1}>1\OR\ifandothers{#1}} + {\bibcpstring{editors}} + {\bibcpstring{editor}}} + {\ifthenelse{\value{#1}>1\OR\ifandothers{#1}} + {\bibcpstring{type\thefield{#1type}s}} + {\bibcpstring{type\thefield{#1type}}}}} + +\renewbibmacro*{doi+eprint+url}{% + \iftoggle{bbx:doi} + {\printfield{doi}% + \iffieldundef{doi}{}{\renewcommand*{\finentrypunct}{\relax}}} + {}% + \newunit\newblock + \iftoggle{bbx:eprint} + {\usebibmacro{eprint}% + \iffieldundef{eprint}{}{\renewcommand*{\finentrypunct}{\relax}}} + {}% + \newunit\newblock + \iftoggle{bbx:url} + {\usebibmacro{url+urldate}% + \iffieldundef{url}{}{\renewcommand*{\finentrypunct}{\relax}}} + {}} + + +\DeclareFieldFormat{doi}{% + doi\addcolon + \ifhyperref + {\href{https://doi.org/#1}{\nolinkurl{#1}}} + {\nolinkurl{#1}}} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.02) No LOCATION/PUBLISHER if there is a DOI +% (Inconsistent in 2nd printing, see 7.04:39 which +% is incorrect in 2nd printing) + +\newbibmacro*{location+publisher}{% + \iffieldundef{doi} + {\printlist[default][1-1]{location}% + \setunit*{\addcolon\space}% + \printlist{publisher}% + \newunit} + {}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\newbibmacro*{type+institution}{% + \setunit{\addspace}% + \ifboolexpr{ test {\iffieldundef{type}} and test {\iflistundef{institution}} } + {} + {\printtext[parens]{% + \iflistundef{institution} + {\setunit*{\addspace}} + {\setunit*{\addcolon\space}}% + \printfield{type}% + \setunit*{\addcomma\space}% + \printlist{institution}% + \setunit*{\addcomma\space}% + \printlist{location}}% + \newunit}} + +\newbibmacro*{labeltitle}{% + \iffieldundef{label} + {\printfield{title}% + \clearfield{title}% + \setunit{\addspace}% + \printfield{entrysubtype}% + \clearfield{entrysubtype}% + \global\booltrue{bbx:titleinauthpos}} + {\printfield{label}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Wrapper for backrefs + +\newbibmacro{apa:pageref}{% + \ifbool{apa:backref}{\usebibmacro{pageref}}{}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% + +% Unchanged from authoryear-comp + +\DeclareBibliographyOption{dashed}[true]{% + \ifstrequal{#1}{true} + {\ExecuteBibliographyOptions{pagetracker}% + \renewbibmacro*{bbx:savehash}{\savefield{fullhash}{\bbx@lasthash}}} + {\ExecuteBibliographyOptions{pagetracker=false}% + \renewbibmacro*{bbx:savehash}{}}} + +\DeclareFieldFormat{shorthandwidth}{#1} +\setlength{\bibitemsep}{0pt} + +\DeclareNameAlias{author}{sortname} +\DeclareNameAlias{editor}{sortname} +\DeclareNameAlias{translator}{sortname} + +\defbibenvironment{bibliography} + {\list + {} + {\setlength{\leftmargin}{\bibhang}% + \setlength{\itemindent}{-\leftmargin}% + \setlength{\itemsep}{\bibitemsep}% + \setlength{\parsep}{\bibparsep}}} + {\endlist} + {\item} + +\defbibenvironment{shorthands} + {\list + {\printfield[shorthandwidth]{shorthand}} + {\setlength{\labelwidth}{\shorthandwidth}% + \setlength{\leftmargin}{\labelwidth}% + \setlength{\labelsep}{\biblabelsep}% + \addtolength{\leftmargin}{\labelsep}% + \setlength{\itemsep}{\bibitemsep}% + \setlength{\parsep}{\bibparsep}% + \renewcommand*{\makelabel}[1]{##1\hss}}} + {\endlist} + {\item} + +\InitializeBibliographyStyle{% + \global\undef\bbx@lasthash} + +\newbibmacro*{bbx:savehash}{% + \savefield{fullhash}{\bbx@lasthash}} + +\newbool{bbx@inset} +\DeclareBibliographyDriver{set}{% + \booltrue{bbx@inset}% + \entryset{}{}% + \newunit\newblock + \usebibmacro{setpageref}% + \finentry} + +\endinput diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.cbx new file mode 100644 index 0000000000..5ab584a083 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.cbx @@ -0,0 +1,538 @@ +%% Copyright 2019 Philip Kime +%% +%% 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 Philip Kime. + +\ProvidesFile{apa6.cbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex citation style] +\RequireBiber[3] + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.16) labelyear postfix is not emphasised or italic +% Dashes between labelyear and non-numeric year (or pseudo-year) + +\DeclareFieldFormat{extradate}{\iffieldnums{labelyear}{\mknumalph{#1}}{\apashortdash\mknumalph{#1}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.11) requires comma separator between authors and years + +\DeclareDelimFormat{nameyeardelim}{\addcomma\space} +\DeclareDelimFormat[textcite]{nameyeardelim}{\addcomma\space} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.12) No comma before "et al" if there is only one name +% preceding it + +\DeclareDelimFormat{andothersdelim}{\ifnum\value{listcount}>2 \finalandcomma\fi\addspace} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.12) ampersand separator in parenthetical cites + +\DeclareDelimFormat[parencite]{finalnamedelim} + {\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space} + +\DeclareCiteCommand{\parencite}[\mkbibparens] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}% + \usebibmacro{cite:post}} + {} + {\usebibmacro{postnote}} + +\DeclareCiteCommand*{\parencite}[\mkbibparens] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{citeyear}% + \usebibmacro{cite:post}} + {} + {\usebibmacro{postnote}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.11) Suffices are not shown in citations +% (APA 6.12) 3-5 authors have "et al." after first cite +% (Blog https://blog.apastyle.org/apastyle/2014/01/when-to-use-author-initials-for-text-citations.html) Initials only for primary author and only when not unique across all *primary* authors + +\newbibmacro*{labelname:doname}[8]{% + \ifboolexpr{test {\ifnumcomp{\value{listcount}}{>}{1}} + or + test {\ifuniqueprimaryauthor}} + {\setcounter{uniquename}{0}} + {}% + \ifcase\value{uniquename}% + \ifuseprefix + {\usebibmacro{name:family}{#1}{#3}{#5}{\relax}} + {\usebibmacro{name:family}{#1}{#3}{\relax}{\relax}}% + \or + \ifuseprefix + {\usebibmacro{name:given-family}{#1}{#4}{#5}{\relax}} + {\usebibmacro{name:given-family}{#1}{#4}{\relax}{\relax}}% + \or + \ifuseprefix + {\usebibmacro{name:given-family}{#1}{#3}{#5}{\relax}} + {\usebibmacro{name:given-family}{#1}{#3}{\relax}{\relax}}% + \fi + \usebibmacro{name:andothers}} + +% Can't do this with the built-in printnames format as APA requires truncation +% and disambiguation only after first cite +% We either use uniquelist or minnames for truncation. If uniquelist isn't +% defined, we fall back on minnames +% +% \printnames does different things depending on whether the format you are +% calling is the default for the name field or is a custom format: +% +% max/minnames truncation is done before calling the format so we have +% to do \printnames[format][-\value{listtotal}]{field} to ensure we get +% all of the names in the list to work on here +% +% Explicit "and others" is dealt with in labelname:doname via a custom name:andothers + +\DeclareNameFormat{labelname}{% + % First set the truncation point + \ifthenelse{\value{uniquelist}>1} + {\numdef\cbx@min{\value{uniquelist}}} + {\numdef\cbx@min{\value{minnames}}}% + % Always print the first name and the second if there are only two since + % "et al" must always be plural + \ifboolexpr{test {\ifnumcomp{\value{listcount}}{=}{1}} + or test {\ifnumcomp{\value{listtotal}}{=}{2}}} + {\usebibmacro{labelname:doname}% + {\namepartfamily}% + {\namepartfamilyi}% + {\namepartgiven}% + {\namepartgiveni}% + {\namepartprefix}% + {\namepartprefixi}% + {\namepartsuffix}% + {\namepartsuffixi}} + % We are looking at name >=3 + % If the list is 6 or more names or we have seen citation before, potential truncation + {\ifboolexpr{test {\ifnumcomp{\value{listtotal}}{>}{5}} + or test {\ifciteseen}} + % Less than the truncation point, print normally + {\ifnumcomp{\value{listcount}}{<}{\cbx@min + 1} + {\usebibmacro{labelname:doname}% + {\namepartfamily}% + {\namepartfamilyi}% + {\namepartgiven}% + {\namepartgiveni}% + {\namepartprefix}% + {\namepartprefixi}% + {\namepartsuffix}% + {\namepartsuffixi}} + {}% + % At potential truncation point ... + \ifnumcomp{\value{listcount}}{=}{\cbx@min + 1} + % but enforce plurality of et al - only truncate here if there is at + % least one more element after the current potential truncation point + % so that "et al" covers at least two elements. + {\ifnumcomp{\value{listcount}}{<}{\value{listtotal}} + {\printdelim{andothersdelim}\bibstring{andothers}} + {\usebibmacro{labelname:doname}% + {\namepartfamily}% + {\namepartfamilyi}% + {\namepartgiven}% + {\namepartgiveni}% + {\namepartprefix}% + {\namepartprefixi}% + {\namepartsuffix}% + {\namepartsuffixi}}} + {}% + % After truncation point, do not print name + \ifnumcomp{\value{listcount}}{>}{\cbx@min + 1} + {\relax}% + {}}% + % We are looking at name >=3 + % Name list is < 6 names or we haven't seen this citation before, print normally + {\usebibmacro{labelname:doname}% + {\namepartfamily}% + {\namepartfamilyi}% + {\namepartgiven}% + {\namepartgiveni}% + {\namepartprefix}% + {\namepartprefixi}% + {\namepartsuffix}% + {\namepartsuffixi}}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.13) Groups as names +% SHORTAUTHOR brackets in parencites + +\DeclareNameFormat{sabrackets}{% + \mkbibbrackets{% + \usebibmacro{labelname:doname}% + {\namepartfamily}% + {\namepartfamilyi}% + {\namepartgiven}% + {\namepartgiveni}% + {\namepartprefix}% + {\namepartprefixi}% + {\namepartsuffix}% + {\namepartsuffixi}}} + +\DeclareFieldFormat{shorthand}{\ifciteseen + {#1} + {\mkbibbrackets{#1}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.13) Deal with SHORTAUTHOR fields +% (APA 6.16) Multiple same author cites in a compact citation call do not +% need to be repeated but the full years must be repeated with +% their extradate postfixes +% (APA 6.18) Cite ORIGYEAR/YEAR if ORIGYEAR present +% (APA 6.28) ISSUE after year when available +\def\citeresetapa{\global\let\cbx@apa@names\@empty} +\citeresetapa +\def\cbx@apa@ifnamesaved{% + \xifinlist{\thefield{fullhash}}{\cbx@apa@names} + {\@firstoftwo} + {\@secondoftwo}} + +\newbibmacro*{cite:author}{% + \iffieldequals{fullhash}{\cbx@lasthash} +% Multiple cites in one command + {\setunit{\compcitedelim}% + \usebibmacro{cite:plabelyear+extradate}}% +% Single cite + {\ifthenelse{\ifnameundef{labelname}\OR\iffieldequalstr{entrytype}{patent}} +% No author/editor + {\usebibmacro{cite:noname}% + \savefield{fullhash}{\cbx@lasthash}} +% Normal cite + {\ifnameundef{shortauthor} + {\printnames[labelname][-\value{listtotal}]{labelname}}% + {\cbx@apa@ifnamesaved + {\printnames{shortauthor}} + {\printnames[labelname][-\value{listtotal}]{author}\addspace\printnames[sabrackets]{shortauthor}}}% + \savefield{fullhash}{\cbx@lasthash}}}% + \setunit{\multicitedelim}} + +% Using fullhash instead of namehash otherwise we may omit namelist for +% lists which are equal only because of minnames truncation i.e: +% +% X and Y and Z (2009) +% X and W and V (2010) +% +% which have the same namehash due to minnames visibility truncation to 1 +% would be printed incorrectly as +% \cite{one, two} -> X, Y & Z 2009, 2010 +\newbibmacro*{cite}{% + \iffieldequals{fullhash}{\cbx@lasthash} +% Multiple cites in one command + {\setunit{\compcitedelim}% + \usebibmacro{cite:plabelyear+extradate}}% +% Single cite + {\ifthenelse{\ifnameundef{labelname}\OR\iffieldequalstr{entrytype}{patent}} +% No author/editor + {\usebibmacro{cite:noname}% + \setunit{\printdelim{nameyeardelim}}% + \usebibmacro{cite:plabelyear+extradate}% + \savefield{fullhash}{\cbx@lasthash}} +% Normal cite + {\ifnameundef{shortauthor} + {\printnames[labelname][-\value{listtotal}]{labelname}}% + {\cbx@apa@ifnamesaved + {\printnames{shortauthor}} + {\printnames[labelname][-\value{listtotal}]{author}\addspace\printnames[sabrackets]{shortauthor}}}% + \setunit{\printdelim{nameyeardelim}}% + \usebibmacro{cite:plabelyear+extradate}% + \savefield{fullhash}{\cbx@lasthash}}}% + \setunit{\multicitedelim}} + +\newbibmacro*{textcite}{% + \iffieldequals{fullhash}{\cbx@lasthash} +% Compact cite - more than one thing for same author + {\setunit{\compcitedelim}% + \usebibmacro{cite:plabelyear+extradate}} +% New cite + {% + \ifbool{cbx:parens} + {\bibcloseparen\global\boolfalse{cbx:parens}} + {}% + \setunit{\compcitedelim}% + \ifthenelse{\ifnameundef{labelname}\OR\iffieldequalstr{entrytype}{patent}} + % No author/editor or patent + {\iffieldundef{shorthand}% + % Cite using title + {\usebibmacro{cite:noname}% + \setunit{\ifbool{cbx:np}% + {\printdelim{nameyeardelim}}% + {\global\booltrue{cbx:parens}\addspace\bibopenparen}}% + \usebibmacro{cite:plabelyear+extradate}} + % Cite using shorthand + {\usebibmacro{cite:shorthand}}} + % Normal cite with author/editor + % Normal full cite + {\ifnameundef{shortauthor}% + % Normal full cite + {\printnames[labelname][-\value{listtotal}]{labelname}} + % Cite using short author + {\cbx@apa@ifnamesaved + {\printnames{shortauthor}} + {\printnames[labelname][-\value{listtotal}]{author}}}% + % Year + \setunit{\ifbool{cbx:np} + {\printdelim{nameyeardelim}} + {\global\booltrue{cbx:parens}\addspace\bibopenparen}}% + % Put the shortauthor inside the year brackets if necessary + \ifnameundef{shortauthor} + {} + {\cbx@apa@ifnamesaved + {} + {\printnames{shortauthor}\setunit{\printdelim{nameyeardelim}}}}% + % Actual year printing + \usebibmacro{cite:plabelyear+extradate}% + % Save name hash for checks later + \savefield{fullhash}{\cbx@lasthash}}}} + +\newbibmacro*{cite:plabelyear+extradate}{% + \iffieldundef{labelyear}{} + {\printtext[bibhyperref]{% + \clearfield{labelmonth}% don't want months in citations + \clearfield{labelday}% don't want days in citations + \clearfield{labelendmonth}% don't want months in citations + \clearfield{labelendday}% don't want days in citations + \iffieldsequal{labelyear}{labelendyear}% Don't want no-op year ranges + {\clearfield{labelendyear}} + {}% + \iffieldundef{origyear}{} + {\ifboolexpr{ test {\iforigdatecirca} or test {\iforigdateuncertain} } + {\mkbibbrackets{\printorigdate}} + {\printorigdate}% + \setunit*{\addslash}}% + \ifboolexpr{ test {\iflabeldatecirca} or test {\iflabeldateuncertain} } + {\mkbibbrackets{\printlabeldateextra}} + {\printlabeldateextra}}}% + \iffieldundef{issue} + {} + {\addcomma\addspace\printfield{issue}}} + +\newbibmacro*{cite:shorthand}{% + \ifciteseen + {\printfield{shorthand}} + {\printnames[labelname][-\value{listtotal}]{labelname}% + \setunit{\printdelim{nameyeardelim}}% + \printfield{title}\space\printfield{shorthand}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.15) Fall back to title for citations without authors + +\DeclareFieldFormat{citetitle}{\mkbibquote{#1}} +\DeclareFieldFormat[online]{citetitle}{\mkbibquote{#1}} +\DeclareFieldFormat[inbook]{citetitle}{\mkbibquote{#1}} +\DeclareFieldFormat[book]{citetitle}{\mkbibemph{#1}} +\DeclareFieldFormat[report]{citetitle}{\mkbibemph{#1}} +\DeclareFieldFormat[periodical]{citetitle}{\mkbibemph{#1}} +\DeclareFieldFormat[patent]{citetitle}{#1} + +\newbibmacro*{cite:noname}{% + \printfield[citetitle]{labeltitle}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.21) No parens round year for cites when the cite is in +% parentheses. Use new command \nptextcite for such cites. + +\DeclareDelimFormat[nptextcite]{finalnamedelim} + {\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space} + +\DeclareMultiCiteCommand{\nptextcites}{\nptextcite}{\multicitedelim} +\DeclareCiteCommand{\nptextcite} + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \global\booltrue{cbx:np}% + \usebibmacro{textcite}% + \usebibmacro{cite:post}% + \global\boolfalse{cbx:np}}% + {} + {\iffieldundef{postnote} + {} + {\printdelim{nameyeardelim}% + \printfield{postnote}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% No shorthand +% +\newbibmacro*{citeyear}{% + \iffieldundef{labelyear} + {\usebibmacro{cite:init}} + {\iffieldequals{fullhash}{\cbx@lasthash} + {\setunit{\compcitedelim}% + \usebibmacro{cite:plabelyear+extradate}} + {\usebibmacro{cite:plabelyear+extradate}% + \savefield{fullhash}{\cbx@lasthash}}}% + \setunit{\multicitedelim}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Fullcite should use "&" +% Also need to reset the global booleans which are normally done at +% every bib item but since these aren't bib items, they are not reset + +\DeclareDelimFormat[fullcite,fullcitebib]{finalnamedelim} + {\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space} + +\DeclareCiteCommand{\fullcite} + {\usebibmacro{prenote}} + {\usedriver + {\DeclareNameAlias{sortname}{default}% + \global\boolfalse{bbx:parens}% + \global\boolfalse{bbx:volseen}% + \global\boolfalse{bbx:titleinauthpos}% + \global\boolfalse{bbx:editorinauthpos}% + \global\boolfalse{bbx:in}% + \global\let\blx@related@loop\@empty} + {\thefield{entrytype}}% + \usebibmacro{cite:post}} + {\multicitedelim} + {\usebibmacro{postnote}} + +\DeclareCiteCommand{\fullcitebib} + {\list{} + {\setlength{\leftmargin}{\bibhang}% + \setlength{\itemindent}{-\leftmargin}% + \setlength{\itemsep}{\bibitemsep}% + \setlength{\parsep}{\bibparsep}}\item} + {\usedriver + {\DeclareNameAlias{sortname}{default}% + \global\boolfalse{bbx:parens}% + \global\boolfalse{bbx:volseen}% + \global\boolfalse{bbx:titleinauthpos}% + \global\boolfalse{bbx:editorinauthpos}% + \global\boolfalse{bbx:in}} + {\thefield{entrytype}}% + \finentry + \usebibmacro{cite:post}} + {\item} + {\endlist} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\newbool{cbx:parens} % boolean to say we're inside parens +\newbool{cbx:np} % boolean to say we're using a non-parentheses text cite + +\newbibmacro*{textcite:postnote}{% + \usebibmacro{postnote}% + \ifbool{cbx:parens} + {\bibcloseparen\global\boolfalse{cbx:parens}} + {}} + +\newbibmacro*{cite:init}{% + \global\boolfalse{cbx:parens}% + \global\undef\cbx@lasthash} + +\newbibmacro*{cite:post}{% + \xifinlist{\thefield{fullhash}}{\cbx@apa@names} + {} + {\listxadd{\cbx@apa@names}{\thefield{fullhash}}}} + +\newbibmacro*{cite:labelyear}{% + \printfield{labelyear}} + +\newbibmacro*{cite:extradate}{% + \printfield{extradate}} + +\newbibmacro*{cite:labelyear+extradate}{% + \iffieldundef{labelyear} + {} + {\printfield{labelyear}% + \printfield{extradate}}} + +\DeclareCiteCommand{\citeyear} + {\boolfalse{citetracker}% + \boolfalse{pagetracker}% + \usebibmacro{prenote}} + {\usebibmacro{cite:plabelyear+extradate}} + {\multinamedelim} + {\usebibmacro{postnote}} + +\DeclareCiteCommand{\cite} + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}% + \usebibmacro{cite:post}} + {} + {\usebibmacro{postnote}} + +\DeclareCiteCommand*{\cite} + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{citeyear}% + \usebibmacro{cite:post}} + {} + {\usebibmacro{postnote}} + +\DeclareCiteCommand{\footcite}[\mkbibfootnote] + {\bibsentence + \usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}% + \usebibmacro{cite:post}} + {} + {\usebibmacro{postnote}} + +\DeclareMultiCiteCommand{\textcites}{\textcite}{\compcitedelim} + +\DeclareCiteCommand{\textcite} + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{textcite}% + \usebibmacro{cite:post}} + {} + {\usebibmacro{textcite:postnote}} + +\DeclareCiteCommand{\citeauthor} + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite:author}% + \usebibmacro{cite:post}} + {} + {\usebibmacro{postnote}} + +\endinput diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.dbx new file mode 100644 index 0000000000..ae97a33c4a --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.dbx @@ -0,0 +1,128 @@ +%% Copyright 2019 Philip Kime +%% +%% 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 Philip Kime. + +\ProvidesFile{apa6.dbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex style data model] +\RequireBiber[3] + +\DeclareDatamodelEntrytypes{ + letters, + data, + newsarticle} + +\DeclareDatamodelFields[type=list, datatype=name]{ + with, + writer, + producer, + execproducer, + director} + +\DeclareDatamodelFields[type=field, datatype=literal]{ + abstractloc, + titleisdescription, + newspaper, + urldescription} + +\DeclareDatamodelFields[type=field, datatype=verbatim]{ + abstracturl} + +\DeclareDatamodelEntryfields{ + titleisdescription, + with, + abstractloc, + abstracturl, + urldescription} + + +\DeclareDatamodelEntryfields[video]{ + writer, + producer, + execproducer, + director} + +\DeclareDatamodelEntryfields[newsarticle]{ + author, + newspaper, + title, + day, + endday, + endmonth, + endyear, + month, + year, + addendum, + doi, + editor, + editora, + editorb, + editorc, + editoratype, + editorbtype, + editorctype, + eid, + eprint, + eprintclass, + eprinttype, + issn, + issue, + issuetitle, + issuesubtitle, + language, + note, + number, + origlanguage, + pages, + series, + subtitle, + titleaddon, + translator, + url, + urlday, + urlendday, + urlendmonth, + urlendyear, + urlmonth, + urlyear, + volume} + +\DeclareDatamodelEntryfields[data]{ + title, + day, + endday, + endmonth, + endyear, + day, + endday, + endmonth, + endyear, + month, + year, + addendum, + author, + language, + location, + note, + organization, + pubstate, + subtitle, + titleaddon, + type, + url, + urlday, + urlendday, + urlendmonth, + urlendyear, + urlmonth, + urlyear, + version} + diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/austrian-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/austrian-apa6.lbx new file mode 100644 index 0000000000..66d59e8717 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/austrian-apa6.lbx @@ -0,0 +1,213 @@ +\ProvidesFile{austrian-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation] +\InheritBibliographyExtras{austrian} + +% Following DGPs guidlines for German/Austrian +% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf + +% (APA 6.22) The example abbreviations + +\NewBibliographyString{revisededition} +\NewBibliographyString{typechair} +\NewBibliographyString{typechairs} +\NewBibliographyString{typevolume} +\NewBibliographyString{typevolumes} +\NewBibliographyString{typeseries} +\NewBibliographyString{typeseriess} +\NewBibliographyString{typevolseries} +\NewBibliographyString{typevolseriess} +\NewBibliographyString{on} +\NewBibliographyString{retrieved} +\NewBibliographyString{available} +\NewBibliographyString{from} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\DeclareBibliographyStrings{% + inherit = {austrian}, + andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, + revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}}, + producer = {{Produzent}{Produzent}}, + execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}}, + director = {{Regisseur}{Regisseur}}, + writer = {{Autor}{Autor}}, + page = {{Seite}{{}S\adddot}}, + pages = {{Seiten}{{}S\adddot}}, + on = {{am}{am}}, + retrieved = {{Zugriff\space am}{Zugriff\space am}}, + available = {{erh\"altlich}{erh\"altlich}}, + with = {{mit}{mit}}, + from = {{unter}{unter}}, + archivedat = {{archiviert\space unter}{archiviert\space unter}}, + reviewof = {{Rezension\space des}{Rezension\space des}}, + paragraph = {{\P}{\P}}, + paragraphs = {{\P\P}{\P\P}}, + origyear = {{Original\space erschienen}{Original\space erschienen}}, + typechair = {{Leitung}{Leitung}}, + typechairs = {{Leitung}{Leitung}}, + typevolume = {{Bandherausgeber}{Bandhrsg\adddot}}, + typevolumes = {{Bandherausgeber}{Bandhrsg\adddot}}, + typeseries = {{Reihenherausgeber}{Reihenhrsg\adddot}}, + typeseriess = {{Reihenherausgeber}{Reihenhrsg\adddot}}, + typevolseries = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}}, + typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}}, + annodomini = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}}, + beforechrist = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}}, +} + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.10 Example 68) Drop end* when they are the same as * + +% You must use \printdate to get here otherwise it will be ignored +\DeclareBibliographyExtras{% + \renewcommand{\apashortdash}{~}% + \def\urldatecomma{\addspace}% + \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}% + \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}} + {} + {\addcomma\space}}% + \iffieldundef{#3}% + {}% + {\mkbibordinal{\thefield{#3}}% + \iffieldundef{#2} + {} + {\addspace}}% + \iffieldundef{#2}% + {}% + {\mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}% + \printfield{extradate}% + \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}} + {} + {\addcomma\space}}% + \iffieldundef{#3}% + {}% + {\mkbibordinal{\thefield{#3}}% + \iffieldundef{#2} + {} + {\addspace}}% + \iffieldundef{#2}% + {}% + {\mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#3}% + {}% + {\mkbibordinal{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3}% + {}% + {\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#1}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}% + \def\apa@lbx@de@mkdaterangeapalong#1{% + \begingroup + \blx@metadateinfo{#1}% + \iffieldundef{#1year}{} + {\datecircaprint + \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ... + {\printtext{% + \iffieldsequal{#1year}{#1endyear} + {\iffieldsequal{#1month}{#1endmonth} + {\mkbibdateapalongmdy{}{}{#1day}} + {\mkbibdateapalongmdy{}{#1month}{#1day}}} + {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}% + \iffieldundef{#1endyear}% + {}% + {\iffieldequalstr{#1endyear}{}% open-ended range? + {\mbox{\bibdatedash}} + {\bibdatedash% + \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}% + \dateuncertainprint}} + {\printtext{% + \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}} + and test {\iffieldsequal{#1month}{#1endmonth}}} + {\mkbibdateapalong{#1year}{}{#1day}}% + {\mkbibdateapalong{#1year}{#1month}{#1day}}% + \dateeraprint{#1year}% + \iffieldundef{#1endyear}% + {}% + {\iffieldequalstr{#1endyear}{}% open-ended range? + {\mbox{\bibdatedash}} + {\bibdatedash% + \iffieldsequal{#1year}{#1endyear}% + {\mkbibdateapalong{}{#1endmonth}{#1endday}}% + {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}% + \dateeraprint{#1endyear}}}% + \enddateuncertainprint}}}}% + \endgroup}% + \def\apa@lbx@de@mkdaterangeapalongextra#1{% + \begingroup + \blx@metadateinfo{#1}% + \iffieldundef{#1year}{} + {\printtext{% + \datecircaprint + \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}} + and test {\iffieldsequal{#1month}{#1endmonth}}} + {\mkbibdateapalongextra{#1year}{}{#1day}}% + {\mkbibdateapalongextra{#1year}{#1month}{#1day}}% + \dateeraprint{#1year}% + \dateuncertainprint + \iffieldundef{#1endyear}% + {}% + {\iffieldequalstr{#1endyear}{}% open-ended range? + {\mbox{\bibdatedash}} + {\bibdatedash% + \iffieldsequal{#1year}{#1endyear}% + {\mkbibdateapalongextra{}{#1endmonth}{#1endday}} + {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}% + \dateeraprint{#1endyear}}}% + \enddateuncertainprint}}}% + \endgroup}% + \savecommand\mkdaterangeapalong + \savecommand\mkdaterangeapalongextra + \def\mkdaterangeapalong{% + \apa@lbx@de@mkdaterangeapalong}% + \def\mkdaterangeapalongextra#1{% + \apa@lbx@de@mkdaterangeapalongextra{#1}}% +} + +\UndeclareBibliographyExtras{% + \restorecommand\mkdaterangeapalong + \restorecommand\mkdaterangeapalongextra +} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\endinput diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6-test-citations.bib b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6-test-citations.bib new file mode 100644 index 0000000000..d0245f48c2 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6-test-citations.bib @@ -0,0 +1,624 @@ +% (APA 6.11) +@BOOK{6.11, + AUTHOR = {Kessler, Jr., A.}, + TITLE = {Title}, + DATE = {2003}, +} + +% (APA 6.12) +@BOOK{6.12a, + AUTHOR = {A. Smith and B. Jones}, + TITLE = {Title}, + DATE = {2007}, +} + +@BOOK{6.12b, + AUTHOR = {A. Kisangau and B. Lyaruu and C. Hosea and D. Joseph}, + TITLE = {Title}, + DATE = {2007}, +} + +@BOOK{6.12c, + AUTHOR = {A. Ireys and B. Chernoff and C. DeVet and D. Kim}, + TITLE = {Title}, + DATE = {2001}, +} + +@BOOK{6.12d, + AUTHOR = {A. Ireys and B. Chernoff and E. Stein and C. DeVet and F. Silver}, + TITLE = {Title}, + DATE = {2001}, +} + +@BOOK{6.12e, + AUTHOR = {A. Kurtines and B. Szapocznik}, + TITLE = {Title}, + DATE = {2003}, +} + +@BOOK{6.12f, + AUTHOR = {A. Jöreskog and B. Sörbon}, + TITLE = {Title}, + DATE = {2007}, +} + +@BOOK{6.12g, + AUTHOR = {A. Kosslyn and B. Koenig and C. Barrett and D. Cave and E. Tang and F. Gabrieli}, + TITLE = {Title}, + DATE = {1996}, +} + +@BOOK{6.12h, + AUTHOR = {A. Kosslyn and B. Koenig and F. Gabrieli and E. Tang and G. Marsolek and H. Daly}, + TITLE = {Title}, + DATE = {1996}, +} + +@BOOK{6.12i, + AUTHOR = {A. Albert and B. Bryant and C. Cuthbert and D. Dinge}, + TITLE = {Title}, + DATE = {1990}, +} + +@BOOK{6.12j, + AUTHOR = {A. Albert and B. Bryant and C. Cuthbert and E. Elide}, + TITLE = {Title 2}, + DATE = {1991}, +} + +% (APA 6.13) +% These are all misc so that we can turn off uniquelist because they all interact and +% break the examples otherwise. The reason is that we are generating these examples +% from a real datasource. The table as displayed in the APA 6th assumes that the examples +% are just static strings. +@MISC{6.13a, + AUTHOR = {A. Walker}, + TITLE = {Title}, + DATE = {2007}, +} + +@MISC{6.13b, + AUTHOR = {A. Walker and B. Allen}, + TITLE = {Title}, + DATE = {2004}, +} + +@MISC{6.13c, + AUTHOR = {A. Bradley and B. Ramirez and C. Soo}, + TITLE = {Title}, + DATE = {1999}, +} + +@MISC{6.13d, + AUTHOR = {A. Bradley and B. Ramirez and C. Soo and D. Walsh}, + TITLE = {Title}, + DATE = {2006}, +} + +@MISC{6.13e, + AUTHOR = {A. Walker and B. Allen and A. Bradley and B. Ramirez and C. Soo}, + TITLE = {Title}, + DATE = {2008}, +} + +@MISC{6.13f, + AUTHOR = {Z. Wasserstein and A. Walker and B. Allen and A. Bradley and B. Ramirez and C. Soo}, + TITLE = {Title}, + DATE = {2005}, +} + +@MISC{6.13g, + AUTHOR = {{National Institute of Mental Health}}, + SHORTAUTHOR = {NIMH}, + TITLE = {Title}, + DATE = {2003}, +} + +@MISC{6.13h, + AUTHOR = {{University of Pittsburgh}}, + TITLE = {Title}, + DATE = {2005}, +} + +@MISC{6.13i, + AUTHOR = {{The American Psychological Association}}, + SHORTAUTHOR = {APA}, + TITLE = {Title1}, + DATE = {2005}, +} + +@MISC{6.13j, + AUTHOR = {{The American Psychological Association}}, + SHORTAUTHOR = {APA}, + TITLE = {Title2}, + DATE = {2006}, +} + +% (APA 6.14) +@BOOK{6.14, + AUTHOR = {I. Light}, + TITLE = {Deflecting Immigration}, + SUBTITLE = {Networks, Markets, and Regulation in {L}os {A}ngeles}, + DATE = {2006}, + LOCATION = {New York, NY}, + PUBLISHER = {Russell Sage Foundation}, +} + +% (APA 6.15) +@ARTICLE{6.15a, + TITLE = {Study Finds Something Interesting}, + SHORTTITLE = {Study Finds}, + DATE = {2007}, +} + +@BOOK{6.15b, + TITLE = {College Bound Seniors}, + DATE = {2008}, +} + +@BOOK{6.15c, + AUTHOR = {Anonymous}, + TITLE = {Title}, + DATE = {1998}, +} + +% (APA 6.16) +@BOOK{6.16a, + AUTHOR = {{Department of Veterans Affairs}}, + TITLE = {Title1}, + DATE = {2001}, +} + +@BOOK{6.16b, + AUTHOR = {{Department of Veterans Affairs}}, + TITLE = {Title1}, + DATE = {2003}, +} + +@BOOK{6.16c, + AUTHOR = {A. Gogel}, + TITLE = {Title1}, + DATE = {1990}, +} + +@BOOK{6.16d, + AUTHOR = {A. Gogel}, + TITLE = {Title2}, + DATE = {2006}, +} + +@BOOK{6.16e, + AUTHOR = {A. Gogel}, + TITLE = {Title3}, + PUBSTATE = {inpress}, +} + +@BOOK{6.16f, + AUTHOR = {A. Derryberry and B. Reed}, + TITLE = {Title1}, + DATE = {2005}, +} + +@BOOK{6.16g, + AUTHOR = {A. Derryberry and B. Reed}, + TITLE = {Title2}, + DATE = {2005}, +} + +@BOOK{6.16h, + AUTHOR = {A. Derryberry and B. Reed}, + TITLE = {Title3}, + PUBSTATE = {inpress}, +} + +@BOOK{6.16i, + AUTHOR = {A. Rothbart}, + TITLE = {Title1}, + DATE = {2003}, +} + +@BOOK{6.16j, + AUTHOR = {A. Rothbart}, + TITLE = {Title2}, + DATE = {2003}, +} + +@BOOK{6.16k, + AUTHOR = {A. Miller}, + TITLE = {Title}, + DATE = {1999}, +} + +@BOOK{6.16l, + AUTHOR = {A. Shafrankse and B. Mahoney}, + TITLE = {Title}, + DATE = {1998}, +} + +@BOOK{6.16m, + AUTHOR = {A. Minor}, + TITLE = {Title}, + DATE = {2001}, +} + +@BOOK{6.16n, + AUTHOR = {A. Adams}, + TITLE = {Title}, + DATE = {1999}, +} + +@BOOK{6.16o, + AUTHOR = {A. Storandt}, + TITLE = {Title}, + DATE = {2007}, +} + +% PUBSTATE is not used as there is a year - enforces by a style source map in .bbx +@BOOK{6.16p, + AUTHOR = {Steven Smidge}, + TITLE = {Something 1}, + DATE = {2000}, + PUBSTATE = {inpress} +} + +@BOOK{6.16q, + AUTHOR = {Steven Smidge}, + TITLE = {Something 2}, + PUBSTATE = {inpress} +} + +@BOOK{6.16r, + AUTHOR = {Steven Smidge}, + TITLE = {Something 3}, + PUBSTATE = {inpress} +} + + +% (APA 6.17) +@BOOK{6.17, + AUTHOR = {A. Nicholson}, + TITLE = {Title}, + DATE = {2003}, +} + +% (APA 6.18) +@BOOK{6.18a, + AUTHOR = {Aristotle}, + TITLE = {Ethics}, + TRANSLATOR = {S. Translator}, + DATE = {1931}, +} + +@BOOK{6.18b, + AUTHOR = {H. James}, + TITLE = {Novel}, + ORIGDATE = {1890}, + DATE = {1983}, +} + +% Last two examples need no references entry + +% (APA 6.19) +@BOOK{6.19a, + AUTHOR = {{Centers for Disease Control and Prevention}}, + TITLE = {Title}, + DATE = {2005}, +} + +@BOOK{6.19b, + AUTHOR = {A. Shimamura}, + TITLE = {Title}, + DATE = {1989}, +} + +% (APA 6.20) - No examples need references entry + +% (APA 6.21) +@BOOK{6.21, + AUTHOR = {{U.S. Department of Labor}}, + TITLE = {Title}, + DATE = {2007}, +} + +% (APA 6.28a) +@BOOK{6.28a, + AUTHOR = {Arthur Somebody}, + TITLE = {Some Title}, +} + +% These are copied from the references .bib file just so the sections splitting works +@ARTICLE{7.01:3b, + AUTHOR = {M. A. Light and I. H. Light}, + TITLE = {The Geographic Expansion of Mexican Immigration in the United States and its Implications for Local Law Enforcement}, + DATE = {2008}, + JOURNALTITLE = {Law Enforcement Executive Forum Journal}, + VOLUME = {8}, + NUMBER = {1}, + PAGES = {73--82}, +} + +@ARTICLE{7.01:12c, + TITLE = {Capital Punishment in the United Kingdom}, + SHORTTITLE = {Capital Punishment}, + TITLEADDON = {Special issue}, + JOURNALTITLE = {Psychology, Public Policy and Law}, + VOLUME = {10}, + NUMBER = {4}, + DATE = {2004} +} + +@PATENT{A7.07, + AUTHOR = {I. M. Smith}, + TITLE = {{U}.{S}. {P}atent {N}o. 123,445}, + DATE = {1998}, + LOCATION = {Washington, DC}, + PUBLISHER = {U.S. Patent and Trademark Office} +} + +% Testing fullcite so make it nice and long +@ARTICLE{FC1, + AUTHOR = {Arthur Amorous and Brian Belligerent and Clive Clandestine}, + TITLE = {Names Which Inspire Envy}, + SUBTITLE = {The Fashions of Nominal Imprudence}, + DATE = {1923}, + JOURNALTITLE = {Journal of International Interest}, + VOLUME = {87}, + NUMBER = {12}, + PAGES = {1423--1458}, +} + +% Testing uniqueness for identical name lists and subset lists +@BOOK{UL1, + AUTHOR = {Jeremy Jester and Gregory Gesticulate and Randolf Rumble}, + TITLE = {Many Things and Other Topics}, + DATE = {2010} +} + +@BOOK{UL2, + AUTHOR = {Jeremy Jester and Gregory Gesticulate and Randolf Rumble}, + TITLE = {Random Articles Found Under Cats}, + DATE = {2010} +} + +@BOOK{UL3, + AUTHOR = {Patricia Petulant and Cloe Clueless and Brian Beffudled}, + TITLE = {Can You Say a Word?}, + DATE = {2010} +} + +@BOOK{UL4, + AUTHOR = {Patricia Petulant and Cloe Clueless and Brian Beffudled and Graham Grunt}, + TITLE = {Looking at Spiders}, + DATE = {2010} +} + +% Testing "with" +@BOOK{with1, + AUTHOR = {James Jaunty and Russell Rendition}, + WITH = {Alan Also}, + TITLE = {Look for Lost Limps}, + DATE = {2000} +} + +% Testing citeauthor +@BOOK{ca1, + AUTHOR = {Brian Blameless and Colin Careless and Derek Delusional}, + TITLE = {Three Modern Men}, + DATE = {2001} +} + +% Testing no date +@BOOK{nodate1, + AUTHOR = {Neil Nodate}, + TITLE = {Testing}, + URLDATE = {2012} +} + +@BOOK{nodate2, + AUTHOR = {Neil Nodate}, + TITLE = {Testing 2}, +} + +% Testing full name expansion (APA 6.27) +@ARTICLE{6.27a, + AUTHOR = {Paul Janet}, + TITLE = {The Notion of Personality}, + ORIGTITLE = {La notion de la personnalité}, + JOURNALTITLE = {Revue Scientifique}, + VOLUME = {10}, + PAGES = {574-575}, + DATE = {1876} +} + +@ARTICLE{6.27b, + AUTHOR = {Pierre Janet}, + TITLE = {The Pathogenesis of Some Impulsions}, + JOURNALTITLE = {Journal of Abnormal Psychology}, + VOLUME = {1}, + PAGES = {1-17}, + DATE = {1906} +} + +% Suffix test for first-last (editor) +@INCOLLECTION{stest1, + AUTHOR = {Gring, III, Alan J.}, + EDITOR = {Greaves, Jr., Percy L.}, + TITLE = {A test of suffix 1}, + DATE = {1968}, + LOCATION = {New York, NY}, + PUBLISHER = {Wiley}, + PAGES = {1--34} +} + +% Suffix test for first-last (editor) +@INCOLLECTION{stest2, + EDITOR = {Greaves, Jr., Percy L.}, + TITLE = {A test of suffix 2}, + DATE = {1968}, + LOCATION = {New York, NY}, + PUBLISHER = {Wiley}, + PAGES = {1--34} +} + +% Don't forget that useprefix=false doesn't ignore the prefix completely - it is still used in +% hash and uniqueness generation and so there are two different "Greaves" here - one von and one not +% Prefix test (useprefix=true) +@BOOK{pretest, + AUTHOR = {Luis von Mises}, + TITLE = {A Title}, + DATE = {2000} +} + +% Prefix test (useprefix=false) +@MISC{nopretest, + OPTIONS = {useprefix=false}, + AUTHOR = {Luis von Mises}, + TITLE = {Another Title}, + DATE = {2001} +} + +% Prefix + suffix test (useprefix=true) first-last +@INCOLLECTION{presufftest, + EDITOR = {von Greaves, Jr., Percy L.}, + TITLE = {A test of prefix 2}, + DATE = {1969}, +} + +% Prefix + suffix test (useprefix=false) +@MISC{nopresufftest, + OPTIONS = {useprefix=false}, + AUTHOR = {von Greaves, Jr., Percy L.}, + TITLE = {A test of noprefix 2}, + DATE = {2001} +} + +% Prefix + suffix test (useprefix=true) +@BOOK{presufftest2, + AUTHOR = {von Greaves, Jr., Percy L.}, + TITLE = {A test of noprefix 2}, + DATE = {2001} +} + +% Oxford comma tests +@BOOK{oc1, + AUTHOR = {Hilarious, Hillary and Mirthful, Malcolm and Chuckles, Charles}, + TITLE = {Laughter Through the Ages}, + DATE = {1987} +} + +@BOOK{oc2, + AUTHOR = {Miserable, Markus and Doleful, Derek and Bitter, Brian}, + TITLE = {Dictionary of Depressions}, + DATE = {1987} +} + +% Test "and others" +@ARTICLE{ao1, + AUTHOR = {Boker, S. and Neale, M. and Maes, H. and Wilde, M. and + Spiegel, M. and Brick, T. and Spies, J. and Estabrook, + R. and Kenny, S. and Bates, T. and others}, + TITLE = {Open{M}x: {A}n open source extended structural + equation modeling framework}, + JOURNAL = {Psychometrika}, + VOLUME = {76}, + NUMBER = {2}, + PAGES = {306--317}, + DATE = {2011} +} + +@ARTICLE{ao2, + AUTHOR = {Olive, K. A. and others}, + DATE = {2014} +} + +% Testing season +@ARTICLE{season1, + AUTHOR = {Terrence Test}, + TITLE = {Some Title}, + JOURNAL = {Jolly Journal}, + ISSUE = {Spring}, + PAGES = {100--103}, + DATE = {2001} +} +% Testing name initials as per: http://blog.apastyle.org/apastyle/2014/01/when-to-use-author-initials-for-text-citations.html +@BOOK{first, + AUTHOR = {Brown, Y. and Campbell, W. K.}, + DATE = {2004} +} + +@BOOK{second, + AUTHOR = {Campbell, A. and Muncer, M. and Gorman, B.}, + DATE = {1993} +} + +@BOOK{third, + AUTHOR = {Campbell, W. K. and Bush, C. P. and Brunell, A. B.}, + DATE = {2005} +} + +@BOOK{fourth, + AUTHOR = {Smyth, L. N. and Campbell, A. and Adams, K.}, + DATE = {1992} +} + +@ARTICLE{deutsch1963, + TITLE = {Attention: Some theoretical considerations}, + AUTHOR = {Deutsch, J. Anthony and Deutsch, Diana}, + JOURNAL = {Psychological Review}, + VOLUME = {70}, + NUMBER = {1}, + PAGES = {1--10}, + DATE = {1963}, +} + +% Testing multicite name elision +@ARTICLE{kingetal2005a, + AUTHOR = {King, J. E. and Weiss, A. and Farmer, K. H.}, + TITLE = {Title}, + DATE = {2005} +} + +@ARTICLE{weissetal2007a, + AUTHOR = {Weiss, A. and King, J. E. and Hopkins, W. D.}, + TITLE = {Title}, + DATE = {2007} +} + +@ARTICLE{weissetal2009a, + AUTHOR = {Weiss, A. and Inoue-Murayama, M. and Hong, K-W. and Inoue, E. and Udono, S. and Ochiai, T. and Matsuzawa, T. and Hirata, S. and King, J. E.}, + TITLE = {Title}, + DATE = {2009} +} + +% Testing era output +@BOOK{plato, + AUTHOR = {Plato}, + TITLE = {Meno}, + DATE = {-0379%} +} + +% Testing citation with complete dates +@ARTICLE{Ludwig2014, + ENTRYSUBTYPE = {nonacademic}, + AUTHOR = {Ludwig, Jan}, + TITLE = {Wenn nichts mehr geht}, + URL = {http://www.zeit.de/campus/2014/06/pruefungsergebnis-klage}, + JOURNALTITLE = {Zeit Campus}, + DATE = {2014-10-08}, + LANGUAGE = {de} +} + +% Testing date range with same months, different days +@BOOK{daterange1, + AUTHOR = {Freddy Furnishings}, + TITLE = {Authorship Provisions in Augment}, + DATE = {1984-02-01/1984-02-27}, +} + +% Testing date range with different months +@BOOK{daterange2, + AUTHOR = {Graham Granary}, + TITLE = {Authorship Provisions in Augment}, + DATE = {1984-02-27/1984-03-01}, +} + diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6-test-references.bib b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6-test-references.bib new file mode 100644 index 0000000000..c6d6892f39 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6-test-references.bib @@ -0,0 +1,1060 @@ +% (APA 7.01 Example 1) +% Note that the URL is suppressed if there is a DOI +@ARTICLE{7.01:1, + AUTHOR = {K. L. Herbst-Damm and J. A. Kulik}, + TITLE = {Volunteer Support, Marital Status, and the Survival Times of Terminally Ill Patients}, + JOURNALTITLE = {Health Psychology}, + VOLUME = {24}, + PAGES = {225--229}, + DATE = {2005}, + DOI = {10.1037/0278-6133.24.2.225}, + URL = {http://some.url} + +} + +% (APA 7.01 Example 2) +% Note here that there is a month but this should not be shown in ARTICLES +% as per 6.28 +@ARTICLE{7.01:2, + AUTHOR = {D. G. Gilbert and J. F. McClernon and N. E. Rabinovich and C. Sugai and L. C. Plath and G. Asgaard and D. Dickinson and N. Botros}, + TITLE = {Effects of Quitting Smoking and {EEG} Activation and Attention Last for More Than 31 Days and are More Severe With Stress, Dependence, {DRD2 A1} Allele, and Depressive Traits}, + JOURNALTITLE = {Nicotine and Tobacco Research}, + VOLUME = {6}, + PAGES = {249--267}, + DATE = {2004-06-22}, + DOI = {10.1080/14622200410001676305} +} + +% (APA 7.01 Example 3) +@ARTICLE{7.01:3a, + AUTHOR = {T. J. Sillick and N. S. Schutte}, + TITLE = {Emotional Intelligence and Self-esteem Mediate Between Perceived Early Parental Love and Adult Happiness}, + JOURNALTITLE = {E-Journal of Applied Psychology}, + VOLUME = {2}, + NUMBER = {2}, + PAGES = {38--48}, + DATE = {2006}, + URL = {http://ojs.lib.swin.edu.au/index.php/ejap} +} + +@ARTICLE{7.01:3b, + AUTHOR = {M. A. Light and I. H. Light}, + TITLE = {The Geographic Expansion of {M}exican Immigration in the {U}nited {S}tates and its Implications for Local Law Enforcement}, + DATE = {2008}, + JOURNALTITLE = {Law Enforcement Executive Forum Journal}, + VOLUME = {8}, + NUMBER = {1}, + PAGES = {73--82}, +} + +% (APA 7.01 Example 4) +@ARTICLE{7.01:4, + AUTHOR = {P. Guimard and A. Florin}, + ORIGTITLE = {Les évaluations des enseignants en grande section de maternelle sont-elles prédictives des difficultés de lecture au cours préparatoire?}, + TITLE = {Are Teacher Ratings in Kindergarten Predictive of Reading Difficulties in First Grade?}, + JOURNALTITLE = {Approche Neuropsychologique des Apprentissages chez l'Enfant}, + VOLUME = {19}, + PAGES = {5--17}, + DATE = {2007}, +} + +% (APA 7.01 Example 5) +% PUBSTATE field is reserved for biblatex defined keys so use NOTE for such non-standard +% things +@ARTICLE{7.01:5, + AUTHOR = {S. C. {Von Ledebur}}, + TITLE = {Optimizing Knowledge Transfer by New Employees in Companies}, + JOURNALTITLE = {Knowledge Management Research \& Practice}, + DATE = {2007}, + NOTE = {Advance online publication}, + DOI = {10.1057/palgrave.kmrp.8500141} +} + +% (APA 7.01 Example 6) +@ARTICLE{7.01:6, + AUTHOR = {R. Briscoe}, + PUBSTATE = {inpress}, + TITLE = {Egocentric Spatial Representation in Action and Perception}, + JOURNALTITLE = {Philosophy and Phenomenological Research}, + URL = {http://cogprints.org/5780/1/ECSRAP.F07.pdf} +} + +% (APA 7.01 Example 7) +% Note the use of "nonacademic" ENTRYSUBTYPE. This is a "Magazine Article" +% and has different date format requirements +@ARTICLE{7.01:7, + ENTRYSUBTYPE = {nonacademic}, + AUTHOR = {J. Chamberlin and A. Novotney and E. Packard and M. Price}, + TITLE = {Enhancing Worker Well-being}, + SUBTITLE = {Occupational Health Psychologists Convene to Share Their Research on Work, Stress, and Health}, + JOURNALTITLE = {Monitor on Psychology}, + VOLUME = {39}, + NUMBER = {5}, + PAGES = {26-29}, + DATE = {2008-05} +} + +% (APA 7.01 Example 8) +% Note the use of "nonacademic" ENTRYSUBTYPE. This is a "Online Magazine Article" +% and has different date format requirements +@ARTICLE{7.01:8, + ENTRYSUBTYPE = {nonacademic}, + AUTHOR = {Richard Clay}, + TITLE = {Science vs. Ideology}, + SUBTITLE = {Psychologists Fight Back About the Misuse of Research}, + JOURNALTITLE = {Monitor on Psychology}, + VOLUME = {39}, + NUMBER = {6}, + DATE = {2008-06}, + URL = {http://www.apa.org/monitor/} +} + +% (APA 7.01 Example 9) +% The date format in the formatted APA example is inconsistent with all other date +% range examples which have a '-' separating the range. We use '-' here too. +% Note the use of "nonacademic" ENTRYSUBTYPE. This is a "Newsletter Article" +% and has different date format requirements +@ARTICLE{7.01:9, + ENTRYSUBTYPE = {nonacademic}, + TITLE = {Six Sites Meet for Comprehensive Anti-gang Initiative Conference}, + SHORTTITLE = {Six Sites Meet}, + JOURNALTITLE = {OJJDP News {@} a Glance}, + DATE = {2006-11/2006-12}, + URL = {http://www.ncjrs.gov/html/ojjdp/news_at_glance/216684/topstory.html} +} + +% (APA 7.01 Example 10) +% Use entrytype "NEWSARTICLE" for newspaper articles so that the pages specification +% is formatted correctly (needs "p/pp" whereas normal articles don't) +% Use the "NEWSPAPER" field for the title of the paper, otherwise this entrytype +% is similar to ARTICLE +% Numeral format is redefined to allow page number starting in letters +% Discontinuous pages are ok +@NEWSARTICLE{7.01:10, + AUTHOR = {J. Schwartz}, + TITLE = {Obesity Affects Economic, Social Status}, + NEWSPAPER = {The Washington Post}, + PAGES = {A1, A4}, + DATE = {1993-09-30}, +} + +% (APA 7.01 Example 11) +@NEWSARTICLE{7.01:11, + AUTHOR = {J. E. Brody}, + TITLE = {Mental Reserves Keep Brain Agile}, + NEWSPAPER = {The New York Times}, + DATE = {2007-12-11}, + URL = {http://www.nytimes.com} +} + +% (APA 7.01 Example 12) +@PERIODICAL{7.01:12a, + EDITOR = {C. Haney and R. L. Wiener}, + TITLE = {Capital Punishment in the {United States}}, + ISSUETITLE = {Special issue}, + JOURNALTITLE = {Psychology, Public Policy, and Law}, + VOLUME = {10}, + NUMBER = {4}, + DATE = {2004} +} + +@PERIODICAL{7.01:12b, + EDITOR = {P. Greenfield and Z. Yan}, + TITLE = {Children, Adolescents, and the {I}nternet}, + ISSUETITLE = {Special section}, + JOURNALTITLE = {Developmental Psychology}, + VOLUME = {42}, + PAGES = {391--458}, + DATE = {2006} +} + +% APA manual implicit example made explicit - no editors +@PERIODICAL{7.01:12c, + TITLE = {Capital Punishment in the {United Kingdom}}, + SHORTTITLE = {Capital Punishment}, + ISSUETITLE = {Special issue}, + JOURNALTITLE = {Psychology, Public Policy, and Law}, + VOLUME = {10}, + NUMBER = {4}, + DATE = {2004} +} + +% (APA 7.01 Example 13) +% Monographs can be specified as articles with appropriate NUMBER fields +@ARTICLE{7.01:13a, + AUTHOR = {D. C. Ganster and J. Schaubroeck and W. E. Sime and B. T. Mayes}, + TITLE = {The Nomological Validity of the {T}ype {A} Personality Among Employed Adults}, + TITLEADDON = {Monograph}, + JOURNALTITLE = {Journal of Applied Psychology}, + VOLUME = {76}, + PAGES = {143--168}, + DATE = {1991}, + DOI = {10.1037/0021-9010.76.1.143} +} + +% Implicit example made explicit (Given in APA 5th Ed. Manual) +@ARTICLE{7.01:13b, + AUTHOR = {P. L. Harris and R. D. Kavanaugh}, + TITLE = {Young Children's Understanding of Pretense}, + JOURNALTITLE = {Monographs of the Society for Research in Child Development}, + VOLUME = {58}, + NUMBER = {1, Serial No. 231}, + DATE = {1993} +} + +% Implicit example made explicit (Given in APA 5th Ed. Manual) +@ARTICLE{7.01:13c, + AUTHOR = {W. F. Battig and W. E. Montague}, + TITLE = {Category Norms for Verbal Items in 56 Categories}, + SUBTITLE = {A Replication and Extension of the {C}onnecticut Category Norms}, + JOURNALTITLE = {Journal of Experimental Psychology Monographs}, + VOLUME = {80}, + NUMBER = {3, Pt. 2}, + DATE = {1969} +} + +% (APA 7.01 Example 14) +@ARTICLE{7.01:14, + TITLE = {Editorial: ``{W}hat a Disaster'' and Why Does This Question Matter?}, + TITLEADDON = {Editorial}, + JOURNALTITLE = {Journal of Contingencies and Crisis Management}, + VOLUME = {14}, + PAGES = {1--2}, + DATE = {2006} +} + +% (APA 7.01 Example 15) +% Note use of font change +@ARTICLE{7.01:15, + AUTHOR = {S. Marshall-Pescini and A. Whiten}, + TITLE = {Social Learning of Nut-Cracking Behaviour in {E}ast {A}frican Sanctuary-living Chimpanzees (\textsl{Pan troglodytes schweinfurthii})}, + TITLEADDON = {Supplemental material}, + JOURNALTITLE = {Journal of Comparitive Psychology}, + VOLUME = {122}, + PAGES = {186--194}, + DATE = {2008}, + DOI = {10.1037/0735-7036.122.2.186.supp} +} + +% (APA 7.01 Example 16) +@ARTICLE{7.01:16a, + AUTHOR = {N. J. Woolf and S. L. Young and M. S. Fanselow and L. L. Butcher}, + TITLE = {{MAP-2} Expression in Cholinoceptive Pyramidal Cells of Rodent Cortex and Hippocampus is Altered by {P}avlovian Conditioning}, + TITLEADDON = {Abstract}, + JOURNALTITLE = {Society for Neuroscience Abstracts}, + VOLUME = {17}, + PAGES = {480}, + DATE = {1991} +} + +% Note use of ABSTRACTURL field value to specify that the URL is for the abstract +% and so the entry gets "Abstract retrieved from" instead of just "retrieved from" +@ARTICLE{7.01:16b, + AUTHOR = {S. R. Lassen and M. M. Steele and W. Sailor}, + TITLE = {The Relationship of School-wide Positive Behavour Support to Academic Achievement in an Urban Middle School}, + JOURNALTITLE = {Psychology in the Schools}, + VOLUME = {43}, + PAGES = {701--712}, + DATE = {2006}, + ABSTRACTURL = {http://www.interscience.wiley.com} +} + +% (APA 7.01 Example 17) +% Such unstructured abstract information uses the ABSTRACTLOC field +% If the abstract/article was retreived from a standard online URI, things are little +% better defined - see examples 7.01:16*). +@ARTICLE{7.01:17, + AUTHOR = {L. R. Hare and K. O'Neill}, + TITLE = {Effectiveness and Efficiency in Small Academic Peer Groups}, + JOURNALTITLE = {Small Group Research}, + VOLUME = {31}, + PAGES = {24--53}, + DATE = {2000}, + ABSTRACTLOC = {{S}ociological {A}bstracts database. (Accession No. 200010185)} +} + +% (APA 7.02 Example 18) +@BOOK{7.02:18, + AUTHOR = {M. A. Shotton}, + TITLE = {Computer Addiction? {A} Study of Computer Dependency}, + LOCATION = {London, England}, + PUBLISHER = {Taylor \& Francis}, + DATE = {1989} +} + +% (APA 7.02 Example 19) +% Note the different year to the actual example to stop bibaltex generating extrayear +% since the APA examples pretend each example is effectively an entry from a +% different bibliography +@BOOK{7.02:19a, + AUTHOR = {M. A. Shotton}, + TITLE = {Computer Addiction? A Study of Computer Dependency}, + TITLEADDON = {{DX} {R}eader version}, + DATE = {1990}, + URL = {http://www.ebbokstore.tandf.co.uk/html/index.asp} +} + +@BOOK{7.02:19b, + AUTHOR = {G. R. Schiraldi}, + TITLE = {The Post-traumatic Stress Disorder Sourcebook}, + SUBTITLE = {A Guide to Healing, Recovery, and Growth}, + TITLEADDON = {{A}dobe {D}igital {E}ditions version}, + DATE = {2001}, + DOI = {10.1036/0071393722} +} + +% (APA 7.02 Example 20) +@BOOK{7.02:20, + AUTHOR = {E. O'Keefe}, + TITLE = {Egoism \& the Crisis in {W}estern Values}, + URL = {http://www.onlineoriginals.com/showitem.asp?itemID=135} +} + +% (APA 7.02 Example 21) +% NOTE is automatically generated from ORIGDATE +@INBOOK{7.02:21, + AUTHOR = {S. Freud}, + EDITOR = {J. Strachey}, + TRANSLATOR = {J. Strachey}, + TITLE = {The Method of Interpreting Dreams}, + BOOKTITLE = {The Standard Edition of the Complete Psychological Works of {S}igmund {F}reud}, + VOLUME = {4}, + PAGES = {96--121}, + SUBTITLE = {An Analysis of a Specimen Dream}, + DATE = {1953}, + ORIGDATE = {1900}, + URL = {http://books.google.com/books}, +} + +% (APA 7.02 Example 22) +@BOOK{7.02:22, + EDITOR = {N. Thomas}, + TITLE = {Perspectives on the Community College}, + SUBTITLE = {A Journey of Discovery}, + TITLEADDON = {Monograph}, + DATE = {2002}, + URL = {http://eric.ed.gov/} +} + +% (APA 7.02 Example 23) +@BOOK{7.02:23, + EDITOR = {S. Koch}, + TITLE = {Psychology}, + SUBTITLE = {A Study of Science}, + VOLUMES = {1--6}, + LOCATION = {New York, NY}, + PUBLISHER = {McGraw-Hill}, + DATE = {1959/1963} +} + +% (APA 7.02 Example 24) +@INBOOK{7.02:24, + AUTHOR = {Strong, Jr., E. K. and R. S. Uhrbrock}, + EDITORA = {L. Outhwaite}, + EDITORATYPE = {series}, + TITLE = {Bibliography in Job Analysis}, + BOOKTITLE = {Personnel {R}esearch {S}eries}, + BOOKSUBTITLE = {Vol. 1. {J}ob Analysis and the Curriculum}, + PAGES = {140--146}, + DATE = {1923}, + DOI = {10.1037/10762-000} +} + +% (APA 7.02 Example 25) +@INBOOK{7.02:25, + AUTHOR = {D. M. Haybron}, + EDITOR = {M. Eid and R. J. Larsen}, + TITLE = {Philosophy and the Science of Subjective Well-Being}, + BOOKTITLE = {The Science of Subjective Well-Being}, + LOCATION = {New York, NY}, + PUBLISHER = {Guildford Press}, + PAGES = {17-43}, + DATE = {2008}, +} + +% (APA 7.02 Example 26) +@INBOOK{7.02:26, + AUTHOR = {J. Piaget}, + EDITOR = {K. Richardson and S. Sheldon}, + TRANSLATOR = {G. Gellerier and J. Langer}, + TITLE = {Extracts From {P}iaget's Theory}, + BOOKTITLE = {Cognitive Development to Adolescence}, + BOOKSUBTITLE = {A Reader}, + PAGES = {3--18}, + LOCATION = {Hillsdale, NJ}, + PUBLISHER = {Erlbaum}, + DATE = {1988}, + RELATED = {mcppiaget}, + RELATEDTYPE = {reprintfrom} +} + +@INCOLLECTION{mcppiaget, + EDITOR = {P. H. Mussen}, + TITLE = {Manual of Child Psychology}, + DATE = {1970}, + LOCATION = {New York, NY}, + PUBLISHER = {Wiley}, + PAGES = {703--732} +} + +% (APA 7.02 Example 27) +@BOOK{7.02:27, + EDITOR = {G. R. VandenBos}, + TITLE = {{APA} Dictionary of Psychology}, + LOCATION = {Washington, DC}, + PUBLISHER = {American Psychological Association}, + DATE = {2007}, +} + +% (APA 7.02 Example 28) +@BOOK{7.02:28, + AUTHOR = {{Real Academia Española}}, + ORIGTITLE = {Diccionario de la lengua española}, + TITLE = {Dictionary of the {S}panish Language}, + EDITION = {22}, + LOCATION = {Madrid, Spain}, + PUBLISHER = {Author}, + DATE = {2001}, +} + +% (APA 7.02 Example 29) +% If the EDITION field is not just an edition number like "2" or "4" (which +% will be turned into an ordinal like "2nd" or "4th" by the style automatically), +% then make the EDITION field the exact string you need. +@INBOOK{7.02:29, + AUTHOR = {G. Graham}, + EDITOR = {E. N. Zalta}, + TITLE = {Behaviourism}, + BOOKTITLE = {The {S}tanford Encyclopedia of Philosophy}, + EDITION = {Fall 2007 ed.}, + DATE = {2005}, + URL = {http://plato.stanford.edu/entries/behaviourism/} +} + +% (APA 7.02 Example 30) +@INBOOK{7.02:30, + TITLE = {Heuristic}, + BOOKTITLE = {{M}erriam-{W}ebster's Online Dictionary}, + EDITION = {11}, + URL = {http://www.m-w.com/dicitonary/heuristic} +} + +% (APA 7.03 Example 31) +% NUMBER contains report number, "No." is added automatically and TYPE contains the +% report type +@REPORT{7.03:31, + AUTHOR = {{U.S. Department of Health and Human Services, National Institutes of Health, National Heart, Lung and Blood Institute}}, + TITLE = {Managing Asthma}, + SUBTITLE = {A Guide for Schools}, + TYPE = {NIH Publication}, + NUMBER = {02-2650}, + DATE = {2003}, + URL = {http://www.nhlbi.nih.gov/health/prof/lung/asthma/asth_sch.pdf} +} + +% (APA 7.03 Example 32) +@REPORT{7.03:32, + AUTHOR = {{American Psychological Association, Task Force on the Sexualization of Girls}}, + TITLE = {Report of the {APA} {T}ask {F}orce on the {S}exualization of {G}irls}, + DATE = {2007}, + URL = {http://www.apa.org/pi/wpo/sexualization.html} +} + +% (APA 7.03 Example 33) +% Use URLDESCRIPTION to introduce website address; defaults to just "Retreived from" +% if not present +@REPORT{7.03:33, + AUTHOR = {S. S. A. Kessy and F. M. Urio}, + TITLE = {The Contribution of Microfinance Institutions to Poverty Reduction in {T}anzania}, + TYPE = {Research Report}, + NUMBER = {06.3}, + DATE = {2006}, + URLDESCRIPTION = {Research on Poverty Alleviation website}, + URL = {http://www.repoa.or.tz/documents_storage/Publications/Reports/06.3_Kessey_and_Urio.pdf} +} + +% (APA 7.03 Example 34) +% This example is an anomaly as it doesnt' have "No." before the report number. +% This style does this consistently for all reports with numbers +@REPORT{7.03:34, + AUTHOR = {J. E. McDaniel and C. G. Miskel}, + TITLE = {The Effect of Groups and Individuals on National Decisionmaking}, + SUBTITLE = {Influence and Domination in the Reading Policymaking Environment}, + TYPE = {CIERA Report}, + NUMBER = {3-025}, + DATE = {2002}, + URLDESCRIPTION = {University of Michigan, Center for Improvement of Early Reading Achievement website}, + URL = {http://www.ciera.org/library/reports/inquiry-3/3-025/3-025.pdf} +} + +% (APA 7.03 Example 35) +@TECHREPORT{7.03:35, + AUTHOR = {{Employee Benefit Research Institute}}, + TITLE = {Sources of health Insurance and Characteristics of the Uninsured}, + TYPE = {Issue Brief}, + NUMBER = {123}, + DATE = {1992-02}, + LOCATION = {Washington, DC}, + PUBLISHER = {Author} +} + +% (APA 7.04 Example 36) +@INPROCEEDINGS{7.04:36, + AUTHOR = {J. Muellbauer}, + TITLE = {Housing, Credit and Consumer Expenditure}, + EDITORA = {S. C. Ludvigson}, + EDITORATYPE = {chair}, + BOOKTITLE = {Housing and Consumer Behaviour}, + EVENTTITLE = {Symposium Conducted at the Meeting of the {F}ederal {R}eserve {B}ank of {K}ansas {C}ity}, + LOCATION = {Jackson Hole, WY}, + DATE = {2007-09} +} + +% (APA 7.04 Example 37) +% Unpublished conference papers are UNPUBLISHED type +@UNPUBLISHED{7.04:37, + AUTHOR = {S. Liu}, + TITLE = {Defending Against Business Crises with the Help of Inteligent Agent Based Early Warning Solutions}, + DATE = {2005-05}, + LOCATION = {Miami, FL}, + NOTE = {Paper presented at the Seventh International Conferene on Enterprise Information Systems}, + ABSTRACTURL = {http://www.iceis.org/iceis2005/abstracts_2005.htm} +} + +% (APA 7.04 Example 38) +@PROCEEDINGS{7.04:38, + AUTHOR = {S. Herculano-Houzel and C. E. Collins and P. Wong and J. H. Kaas and R. Lent}, + TITLE = {The Basic Nonuniformity of the Cerebral Cortex}, + BOOKTITLE = {Proceedings of the {N}ational {A}cademy of {S}ciences, {USA}}, + VOLUME = {105}, + PAGES = {12593--12598}, + DATE = {2008}, + DOI = {10.1073/pnas.0805417105} +} + +% (APA 7.04 Example 39) +% Note that there is a LOCATION and PUBLISHER but these are ignored because +% there is a DOI. This is inconsistent in the 2nd printing of 6th Edition +% but is clear from the example formats at the beginning of 7.02 +@INPROCEEDINGS{7.04:39, + AUTHOR = {I. Katz and K. Gabayan and H. Aghajan}, + TITLE = {A Multi-touch Surface Using Multiple Cameras}, + EDITOR = {J. Blanc-Talon and W. Philips and D. Popescu and P. Scheunders}, + MAINTITLE = {Lecture {N}otes in {C}omputer {S}cience}, + VOLUME = {4678}, + BOOKTITLE = {Advanced {C}oncepts for {I}ntelligent {V}ision {S}ystems}, + PAGES = {97--108}, + LOCATION = {Berlin, Germany}, + PUBLISHER = {Springer-Verlag}, + DATE = {2007}, + DOI = {10.1007/978-3-540-74607-2_9} +} + +% (APA 7.05 Example 40) +% The PHDTHESIS and MASTERSTHESIS are the same as THESIS but they supply a default +% TYPE field automatically +@MASTERSTHESIS{7.05:40, + AUTHOR = {D. S. McNiel}, + TITLE = {Meaning Through Narrative}, + SUBTITLE = {A Personal Narrative Discussing Growing Up with an Alchoholic Mother}, + DATE = {2006}, + NOTE = {Available from ProQuest Dissertations and Theses database}, + ADDENDUM = {UMI No. 1434728} +} + +% (APA 7.05 Example 41) +@PHDTHESIS{7.05:41, + AUTHOR = {R. J. Adams}, + TITLE = {Building a Foundation for Evaluation of Instruction in Higher Education and Continuing Education}, + DATE = {1973}, + URL = {http://www.ohiolink.edu/etd/} +} + +% (APA 7.05 Example 42) +@PHDTHESIS{7.05:42, + AUTHOR = {A. Bruckman}, + TITLE = {{MOOSE Crossing}}, + SUBTITLE = {Construction, Community, and Learning in a Networked Virtual World for Kids}, + INSTITUTION = {Massachusetts Institute of Technology}, + DATE = {1977}, + URL = {http://www-static.cc.gatech.edu/~asb/thesis/} +} + +% (APA 7.05 Example 43) +% This example formats naturally as an article as it has VOLUME, NUMBER etc. +@ARTICLE{7.05:43, + AUTHOR = {L. G. Appelbaum}, + JOURNALTITLE = {Dissertation Abstracts International: Section B. Sciences and Engineering}, + TITLE = {Three Studies of Human Information Processing}, + SUBTITLE = {Texture Amplification, Motion Representation, and Figure-Ground Segregation}, + VOLUME = {65}, + NUMBER = {10}, + DATE = {2005}, + PAGES = {5428} +} + +% (APA 7.05 Example 44) +% Note we're overriding TYPE here which is usually automatically set for PHDTHESIS since, +% for some reason, this entry has "Doctoral thesis" instead of the usual "Doctoral +% dissertation" +@PHDTHESIS{7.05:44, + AUTHOR = {P. Carlbom}, + TITLE = {Carbody and Passengers in Rail Vehicle Dynamics}, + TYPE = {Doctoral thesis}, + INSTITUTION = {Royal Institute of Technology, Stockholm}, + LOCATION = {Sweden}, + DATE = {2000}, + URL = {http://urn.kb.se/resolve?urn=urn:nbn:se:kth:diva-3029} +} + +% (APA 7.06 Example 45) +% Note how this is handled by the biblatex/biber "related entries" functionality +% We have included the year in the reviewed item for consistency, as per 7.06:46 +% The comma after the reviewed title is ommited for consistency, as per 7.06:48 +@REVIEW{7.06:45, + AUTHOR = {B. R. Schatz}, + TITLE = {Learning By Text or Context?}, + REVIEWTEXT = {the book}, + RELATED = {brdu}, + RELATEDTYPE = {reviewof}, + RELATEDSTRING = {Review of the book}, + JOURNALTITLE = {Science}, + VOLUME = {290}, + PAGES = {1304}, + DATE = {2000-11-17}, + DOI = {10.1126/science.290.5495.1304}, +} + +@BOOK{brdu, + AUTHOR = {John Seely Brown and Paul Duguid}, + TITLE = {The Social Life of Information}, + DATE = {2000}, + PUBLISHER = {Harvard Business School Press} +} + +% (APA 7.06 Example 46) +% Note that this example drops the "produced" in the reviewed item. It's not worth +% automating this sort of verb as "by" is perfectly acceptable. +@REVIEW{7.06:46, + AUTHOR = {A. Axelman and J. L. Shapiro}, + TITLE = {Does the Solution Warrant the Problem?}, + RELATED = {apavid}, + RELATEDTYPE = {reviewof}, + RELATEDSTRING = {Review of the {DVD}}, + JOURNALTITLE = {PsycCRITIQUES}, + VOLUME = {52}, + NUMBER = {51}, + DATE = {2007}, + DOI = {10.1037/a0009036} +} + +@VIDEO{apavid, + PRODUCER = {{the American Psychological Association}}, + TITLE = {Brief Therapy With Adolescents}, + DATE = {2007} +} + +% (APA 7.06 Example 47) +% Again we drop the "produced" as with Example 46 +@REVIEW{7.06:47, + RELATED = {bioshock}, + RELATEDTYPE = {reviewof}, + RELATEDSTRING = {Review of the video game}, + URL = {http://www.whattheyplay.com/products/bioshock-for-xbox-360/?fm=3&ob=1&t=0#166}, +} + +@SOFTWARE{bioshock, + AUTHOR = {{2K Games}}, + ENTRYSUBTYPE = {Computer Game}, + TITLE = {Bio{S}hock}, + DATE = {2007} +} + +% (APA 7.06 Example 48) +@REVIEW{7.06:48, + AUTHOR = {K. S. Wolf}, + TITLE = {The Future for {D}eaf Individuals is Not That Bleak}, + RELATED = {deaf}, + RELATEDTYPE = {reviewof}, + RELATEDSTRING = {Peer commentary on the paper}, + DATE = {2005}, + URL = {http://www.personalityresearch.org/papers/hal.htm#wolf} +} + +@ARTICLE{deaf, + AUTHOR = {K. S. Wolf}, + TITLE = {``{D}ecrease of {D}eaf potential in a mainstreamed environment''}, + JOURNALTITLE = {Some Journal}, + VOLUME = {2}, + NUMBER = {1}, + PAGES = {1--10}, + DATE = {2003}, +} + +% (APA 7.07 Example 49) +% The "Available from" string is conditionalised by testing for "{DVD}" as +% the ENTRYSUBTYPE. A bit hacky but an edge case anyway. +% 3nd printing is incorrect as it has a period before the "(Producer)" +@VIDEO{7.07:49, + ENTRYSUBTYPE = {{DVD}}, + PRODUCER = {{American Psychological Association}}, + TITLE = {Responding Therapeutically to Patient Expressions of Sexual Attraction}, + DATE = {2000}, + URL = {http://www.apa.org/videos/} +} + +% (APA 7.07 Example 50) +@AUDIO{7.07:50, + ENTRYSUBTYPE = {Audio podcast}, + PRODUCER = {D. {Van Nuys}}, + TITLE = {Shrink Rap Radio}, + DATE = {2007-12-19}, + URL = {http://www.shrinkrapradio.com/} +} + +% (APA 7.07 Example 51) +@VIDEO{7.07:51, + ENTRYSUBTYPE = {Television series episode}, + WRITER = {D. Egan}, + DIRECTOR = {J. Alexander}, + EXECPRODUCER = {D. Shore}, + TITLE = {Failure to Communicate}, + MAINTITLE = {House}, + LOCATION = {New York, NY}, + PUBLISHER = {Fox Broadcasting}, + DATE = {2005}, +} + +% (APA 7.07 Example 52) +% Note use of SORTKEY to make sorting ignore the lower case AUTHOR +@MUSIC{7.07:52, + SORTKEY = {Lang, K. D.}, + ENTRYSUBTYPE = {{CD}}, + AUTHOR = {{lang}, {k} {d}}, + TITLE = {Shadow and the Frame}, + MAINTITLE = {Watershed}, + MAINTITLEADDON = {{CD}}, + LOCATION = {New York, NY}, + PUBLISHER = {Nonesuch Records}, + DATE = {2008}, +} + +% (APA 7.07 Example 53) +@MISC{7.07:53, + AUTHOR = {{Lewis County Geographic Information Services}}, + NAMEADDON = {Cartographer}, + TITLE = {Population Density, 2000 {U}.{S}. {C}ensus}, + ENTRYSUBTYPE = {Demographic map}, + DATE = {2002}, + URL = {http://www.co.lewis.wa.us/publicworks/maps/Demographics/census-pop-dens_2000.pdf} +} + +% (APA 7.08 Example 54) +@DATA{7.08:54, + ENTRYSUBTYPE = {Data file and code book}, + AUTHOR = {{Pew Hispanic Center}}, + TITLE = {Changing Channels and Crisscrossing Cultures}, + SUBTITLE = {A Survey of {L}atinos on the News Media}, + DATE = {2004}, + URL = {http://pewhispanic.org/datasets/} +} + +% (APA 7.08 Example 55) +@MISC{7.08:55, + AUTHOR = {M. L. Friedlander and V. Escudero and L. Heatherington}, + TITLE = {{E-SOFTA}}, + SUBTITLE = {System for Observing Family Therapy Alliances}, + ENTRYSUBTYPE = {Software and training videos}, + DATE = {2002}, + NOTE = {Unpublished instrument}, + URL = {http://www.softa-soatif.com/} +} + +% (APA 7.08 Example 56) +@SOFTWARE{7.08:56, + TITLE = {Comprehensive {M}eta-{A}nalysis}, + TITLEADDON = {Computer software}, + VERSION = {2}, + LOCATION = {Englewood, NJ}, + PUBLISHER = {Biostat} +} + +% (APA 7.08 Example 57) +@MISC{7.08:57, + TITLE = {{Eyelink II}}, + ENTRYSUBTYPE = {Apparatus and software}, + LOCATION = {Mississauga, Ontario, Canada}, + PUBLISHER = {SR Research}, + DATE = {2004}, +} + +% (APA 7.09 Example 58) +@UNPUBLISHED{7.09:58, + AUTHOR = {E. Blackwell and P. J. Conrod}, + TITLE = {A Five-Dimensional Measure of Drinking Motives}, + HOWPUBLISHED = {Unpublished manuscript}, + INSTITUTION = {Department of Psychology, University of British Columbia}, + LOCATION = {Vancouver, Canada}, + DATE = {2003}, +} + +% (APA 7.09 Example 59) +@UNPUBLISHED{7.09:59, + AUTHOR = {J. Y. Ting and P. Florsheim and W. Huang}, + TITLE = {Mental Health Help-Seeking in Ethnic Minority Populations}, + SUBTITLE = {A Theoretical Perspective}, + HOWPUBLISHED = {Manuscript submitted for publication}, + DATE = {2008}, +} + +% (APA 7.09 Example 60) +@DATA{7.09:60, + AUTHOR = {F. Bordi and J. E. LeDoux}, + ENTRYSUBTYPE = {Auditory response latencies in rat auditory cortex}, + NOTE = {Unpublished raw data}, + DATE = {1993}, +} + +% (APA 7.09 Example 61) +@UNPUBLISHED{7.09:61a, + AUTHOR = {S. D. Mitchell}, + TITLE = {The Import of Uncertainty}, + DATE = {2000}, + URL = {http://philsci-archive.pitt.edu/archive/00000162/} +} + +@ARTICLE{7.09:61b, + AUTHOR = {S. D. Mitchell}, + TITLE = {The Import of Uncertainty}, + JOURNALTITLE = {The Pluralist}, + VOLUME = {2}, + NUMBER = {1}, + PAGES = {58--71}, + DATE = {2007}, +} + +% (APA 7.09 Example 62) +% "eric" is defined as a recognised eprint type in the style and will be formatted as a +% localised version of "Retrieved from ERIC database (<eprintid>)" +@UNPUBLISHED{7.09:62, + AUTHOR = {K. Kubota}, + TITLE = {``{S}oaking'' Model for Learning}, + SUBTITLE = {Analyzing {J}apanese Learning/Teaching Process from a Socio-Historical Perspective}, + DATE = {2007}, + EPRINTTYPE = {eric}, + EPRINT = {ED498566} +} + +% (APA 7.10 Example 63) +@LETTER{7.10:63, + AUTHOR = {L. K. Frank}, + TITLE = {Letter to {R}obert {M}. {O}gden}, + INSTITUTION = {Rockerfeller Archive Center}, + NUMBER = {GEB series 1.3, Box 371, Folder 3877}, + LOCATION = {Tarrytown, NY}, + DATE = {1935-02-04}, +} + +% (APA 7.10 Example 64) +@LETTER{7.10:64, + AUTHOR = {G. P. Zacharius}, + TITLE = {Letter to {W}illiam {R}ickel ({W}. {R}ickel, {T}rans.)}, + DATE = {1953-08-15}, + NOTE = {Copy in possession of Hendrika Vande Kemp} +} + +% (APA 7.10 Example 65) +% Entrytype is "LETTERS" (plural) for a collection of letters +@LETTERS{7.10:65, + AUTHOR = {G. W. Allport}, + TITLE = {Correspondence}, + DATE = {1930/1967}, + INSTITUTION = {Gordon W. Allport Papers}, + NUMBER = {HUG 4118.10}, + LOCATION = {{Harvard University Archives, Cambridge}, MA}, +} + +% (APA 7.10 Example 66) +@UNPUBLISHED{7.10:66, + AUTHOR = {A. Berliner}, + TITLE = {Notes for a Lecture on Reminiscences of {W}undt and {L}epizig}, + DATE = {1959}, + HOWPUBLISHED = {Anna Berliner Memoirs (Box M50)}, + LOCATION = {{Archives of the History of American Psychology, University of Akron, Akron}, OH} +} + +% (APA 7.10 Example 67) +% biblatex 3.4+ supports data annotations which can be use to deal with uncertain authors +% biblatex 3.5+ supports uncertainty marker for dates +@UNPUBLISHED{7.10:67, + AUTHOR = {A. Allport}, + AUTHOR+an = {=uncertain}, + TITLE = {Marion {T}aylor Today---By the Biographer}, + DATE = {1937~}, + HOWPUBLISHED = {Unpublished manuscript, Marion Taylor Papers}, + LOCATION = {{Schlesinger Library, Radcliffe College, Cambridge}, MA} +} + +% (APA 7.10 Example 68) +@MISC{7.10:68, + AUTHOR = {{Subcommitee on Mental Hygiene Personnel in School Programs}}, + TITLE = {{Meeting of Subcommittee on Mental Hygiene Personnel in School Programs}}, + HOWPUBLISHED = {David Shakow Papers (M1360)}, + INSTITUTION = {Archives of the History of American Psychology}, + LOCATION = {University of Akron, Akron, OH}, + DATE = {1949-11-05/1949-11-06} +} + +% (APA 7.10 Example 69) +@MISC{7.10:69, + AUTHOR = {M. B. Smith}, + TITLE = {Interview by {C}. {A}. {K}iesler}, + ENTRYSUBTYPE = {Tape recording}, + HOWPUBLISHED = {President's Oral History Project, American Psychological Association}, + LOCATION = {APA Archives, Washington, DC}, + DATE = {1989-08-12}, +} + +% (APA 7.10 Example 70) +% Note that this example is inconsistent in the APA 6th Edition (2nd printing) manual +% with example 7.10:69. They differ in that 7.10:69 has a period before the location +% and 7.10:70 has a comma. I have chosen a period for consistency. +@UNPUBLISHED{7.10:70, + AUTHOR = {C. F. Sparkman}, + TITLE = {An Oral History with {D}r. {C}olley {F}. {S}parkman/{I}nterviewer: {O}rley {B}. {C}audill}, + HOWPUBLISHED = {Mississippi Oral History Program (Vol. 289)}, + INSTITUTION = {University of Southern Mississippi}, + LOCATION = {Hattiesburg}, + DATE = {1973} +} + +% (APA 7.10 Example 71) +% If no normal paper citation, use ENTRYSUBTYPE to say what this NEWSARTICLE is +@NEWSARTICLE{7.10:71, + TITLE = {Psychoanalysis Institute to Open}, + DATE = {1948-09-18}, + ENTRYSUBTYPE = {Clipping from an unidentified Dayton, OH newspaper}, + NOTE = {Copy in possession of author} +} + +% (APA 7.10 Example 72) +@UNPUBLISHED{7.10:72, + AUTHOR = {{Sci-Art Publishers}}, + TITLE = {Sci-{A}rt {P}ublications}, + TITLEADDON = {Brochure}, + HOWPUBLISHED = {Cambridge, MA: Author. A. A. Roback Papers (HUGFP 104.50, Box 2, Folder ``Miscellaneous Psychological Materials'')}, + LOCATION = {Harvard University Archives, Cambridge, MA}, + DATE = {1935} +} + +% (APA 7.10 Example 73) +% biblatex 3.5+ supports ISO8601 circa markers in dates +% Note that this example is inconsistent in the APA 6th Edition (2nd printing) manual +% with example 7.10:67. They differ in that 7.10:67 has brackets around the approximate +% date and 7.10:73 has parenthesis. I have chosen brackets for consistency. +% Use TITLEISDESCRIPTION to indicate a title that is really a description and not a real +% title +@MISC{7.10:73, + TITLEISDESCRIPTION = {true}, + TITLE = {{Photographs of Robert M. Yerkes}}, + DATE = {1917~/1954}, + HOWPUBLISHED = {Robert Mearns Yerkes Papers (Box 137, Folder 2292)}, + LOCATION = {{Manuscripts and Archives, Yale University Library, New Haven}, CT} +} + +% (APA 7.11 Example 74) +@ONLINE{7.11:74, + ENTRYSUBTYPE = {Online forum comment}, + AUTHOR = {T. Rampersad}, + TITLE = {Re: {T}raditional Knowledge and Traditional Cultural Expressions}, + DATE = {2005-06-08}, + URL = {http://www.wipo.int/roller/comments/ipisforum/Weblog/theme_eight_how_can_cultural#comments}, +} + +% (APA 7.11 Example 75) +@ONLINE{7.11:75, + ENTRYSUBTYPE = {Electronic mailing list message}, + AUTHOR = {S. Smith}, + TITLE = {Re: Disputed Estimates of {IQ}}, + DATE = {2006-01-05}, + URL = {http://tech.groups.yahoo.com/group/ForensicNetwork/message/670}, +} + +% (APA 7.11 Example 76) +@ONLINE{7.11:76a, + ENTRYSUBTYPE = {Web log post}, + AUTHOR = {{PZ Myers}}, + TITLE = {The Unfortunate Prerequisites and Consequences of Partitioning Your Mind}, + DATE = {2007-01-22}, + URL = {http://scienceblogs.com/pharyngula/2007/01/the_unfortunate_prerequisites.php}, +} + +@ONLINE{7.11:76b, + ENTRYSUBTYPE = {Web log comment}, + AUTHOR = {MiddleKid}, + TITLE = {Re: {T}he Unfortunate Prerequisites and Consequences of Partitioning Your Mind}, + DATE = {2007-01-22}, + URL = {http://scienceblogs.com/pharyngula/2007/01/the_unfortunate_prerequisites.php}, +} + +% (APA 7.11 Example 77) +@ONLINE{7.11:77, + ENTRYSUBTYPE = {Video file}, + AUTHOR = {R. Norton}, + TITLE = {How to Train a Cat to Operate a Light Switch}, + DATE = {2006-11-04}, + URL = {http://www.youtube.com/watch?v=Vja83KLQXZs}, +} + +% (APA A7.07) +@PATENT{A7.07, + AUTHOR = {I. M. Smith}, + TITLE = {{U}.{S}. {P}atent {N}o. 123,445}, + DATE = {1998}, + LOCATION = {Washington, DC}, + PUBLISHER = {U.S. Patent and Trademark Office} +} + +% APA 6th doesn't have any extended date format examples. +% Also test order of inpress and nodate, see +% http://blog.apastyle.org/apastyle/2013/01/alphabetizing-in-press-and-no-date-references.html +@ONLINE{habitat1, + TITLE = {Mission, Vision \& Values}, + URL = {http://www.tchabitat.org/missionvisionvalues}, + ORGANIZATION = {Twin Cities Habitat for Humanity website}, + URLDATE = {2011-09-15} +} + +@ONLINE{habitat2, + TITLE = {Mission, Vision \& Values}, + DATE = {2011}, + URL = {http://www.tchabitat.org/missionvisionvalues}, + ORGANIZATION = {Twin Cities Habitat for Humanity website}, + URLDATE = {2011-09} +} + +@ONLINE{habitat3, + TITLE = {Mission, Vision \& Values}, + DATE = {2012}, + URL = {http://www.tchabitat.org/missionvisionvalues}, + ORGANIZATION = {Twin Cities Habitat for Humanity website}, + URLDATE = {2012} +} + +@ONLINE{habitat4, + TITLE = {Mission, Vision \& Values}, + PUBSTATE = {inpress}, + URL = {http://www.tchabitat.org/missionvisionvalues}, + ORGANIZATION = {Twin Cities Habitat for Humanity website}, + URLDATE = {2011-09-15} +} + +@INPROCEEDINGS{proc1, + AUTHOR = {Anon, A. N.}, + TITLE = {A very interesting paper}, + BOOKTITLE = {Proc. {UKACC} International Conference on Control}, + DATE = {2010-09}, + EVENTDATE = {2010-09-07/2010-09-10}, + LOCATION = {Coventry}, + PAGES = {1--3} +} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6-test.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6-test.pdf Binary files differnew file mode 100644 index 0000000000..a314bcdaa1 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6-test.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6-test.tex b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6-test.tex new file mode 100644 index 0000000000..04ebcc67d4 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6-test.tex @@ -0,0 +1,458 @@ +\documentclass[paper=a4]{article} +\usepackage[american]{babel} +\usepackage{csquotes} +\usepackage{shortvrb} +\usepackage{ifthen} +\usepackage{color} +\usepackage[retainmissing]{MnSymbol} +\usepackage[top=2.5cm]{geometry} + +% Unicode +\usepackage{fontspec} +\setmainfont[Ligatures=TeX]{TeXGyrePagella} +\setsansfont[Ligatures=TeX]{TexGyreHeros} +\setmonofont[Ligatures=NoCommon]{TeXGyreCursor} +\MakeAutoQuote{«}{»} + +% Biblatex +\usepackage[style=apa6]{biblatex} + +% Custom settings for misc entries in order to format the table for 6.13* +% This table implies that the examples on each line are in a separate +% document but since we are generating the citations from a real data +% source, we have to prevent the usual uniquelist processing by making +% all of the examples MISC entrytypes and changing uniquelist +% per-type. There is no point in just typesetting static data as this +% wouldn't be a test of anything. +\ExecuteBibliographyOptions[misc]{uniquelist=false} +\DeclareNameFormat[misc]{labelname}{% + \ifthenelse{\value{listcount}=1\OR\value{listtotal}=2} + {\usebibmacro{labelname:doname} + {\namepartfamily} + {\namepartfamilyi} + {\namepartgiven} + {\namepartgiveni} + {\namepartprefix} + {\namepartprefixi} + {\namepartsuffix} + {\namepartsuffixi}} + {\ifthenelse{\value{listtotal}>5} + {\ifnum\value{listcount}=2 \andothersdelim\bibstring{andothers}\fi + \ifnum\value{listcount}>2 \relax\fi} + {\ifciteseen + {\ifnum\value{listcount}=2 \andothersdelim\bibstring{andothers}\fi + \ifnum\value{listcount}=3 \relax\fi + \ifnum\value{listcount}=4 \relax\fi + \ifnum\value{listcount}=5 \relax\fi} + {\usebibmacro{labelname:doname} + {\namepartfamily} + {\namepartfamilyi} + {\namepartgiven} + {\namepartgiveni} + {\namepartprefix} + {\namepartprefixi} + {\namepartsuffix} + {\namepartsuffixi}}}}} +\MakeShortVerb{\|} + +\newcommand\apa[2][]{\ifthenelse{\equal{#1}{}}% + {\textcolor{blue}{\texttt{(APA #2)}}}% + {\textcolor{blue}{\texttt{(APA #2 Example #1)}}}} + +\setlength{\parskip}{3ex} + +\makeatletter +% This solution to detokenize leaving a space after the command and +% arguments is due to Bruno Le Floch on T.SE +\long\def\apaexi#1{% + \catcode64=11 + \begingroup + % Ensure that every character is preserved by \lowercase. + \count@\z@ + \loop\ifnum\count@<256 + \lccode\count@\z@ + \advance\count@\@ne + \repeat + % Except spaces, changed to ^^A + \lccode32=\@ne + \lowercase{% + \endgroup + \expandafter\test@\detokenize{#1}\relax% + \catcode64=12}} +% Then map {^^A => space, space =>} onto the string. +\def\test@#1{% + \ifx#1\relax\test@end\fi + \ifnum`#1=\@ne\space\else#1\fi + \test@} +\def\test@end\fi#1\test@{\fi} + +\def\apaex#1{\hbox{\hspace{-4em}\texttt{\small\apaexi{#1}}}\\$\rcurvearrowse$ \textbf{#1}} +\def\apaexs#1{\hbox{\texttt{\footnotesize\apaexi{#1}}} \textbf{\small #1}} +\makeatother + +% This just makes it easier to find a specific (APA 7.x) example in the +% typeset references section +\reversemarginpar +\renewbibmacro*{begentry}{\marginpar{\footnotesize \textcolor{blue}{\thefield{entrykey}}}} + +\usepackage[colorlinks=true]{hyperref} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%% END PREAMBLE %%%%%%%%%%%%%%%%%%%%%%%%% + +\begin{document} +\section*{|biblatex-apa| style examples} +This file typesets just about all useful examples from +\apa{6.11}--\apa{6.21} and \apa{7.01}--\apa{7.11}. Also included are some +clarifications from the APA blog +(\url{http://blog.apastyle.org/apastyle/}). Please refer to the +|biblatex-apa6-test-references.bib| file for details on the references +entries. The |.bib| key for each entry in the References section is listed +for convenience in the left margin. The keys are not arbitrary and consist +of the APA section they are taken from (7.01--7.11), followed by a colon, +followed by the example number. This makes it easier to cross-reference the +typeset examples with the commented |.bib| file. I chose not to put the +examples in the References section in example number order so that the APA +requirements for References list alphabetisation and order could also be +demonstrated. + +\section*{Citations} +\begin{refsection}[../bibtex/bib/biblatex-apa6-test-citations] +\noindent Please see accompanying file |biblatex-apa6-test-citations.bib| +for the bibliographic entries which these examples use. + +\noindent\apa{4.03}\\ +Oxford comma in citations for three or more names:\\ +\apaex{\textcite{oc1}}\\ +\apaex{\parencite{oc2}} + +\noindent\apa{6.11}\\ +Simple cite. «Jr.» suffix is not shown (bib entry for this example has a suffix):\\ +\apaex{\textcite{6.11}} + +\noindent Within a paragraph, not in the «narrative sense»:\\ +\apaex{\autocite{6.11}} + +\noindent To cite the parts separately:\\ +\apaex{\citeyear{6.11}, \citeauthor{6.11}} + +\noindent The per-paragraph rules for elision of years are more flexible in +APA 6th edition. There is more discretion to do this as the narrative +consistency suggests and so this style no longer automatically elides years +after the first mention within a paragraph. Cases can be handled as +per the examples above. + +\noindent\apa{6.12} \apa{6.13}\\ +Citations like\\ +\apaex{\textcite{6.12a}}\\ +which have two authors are never name-truncated after the first cite:\\ +\apaex{\textcite{6.12a}} + +\noindent First citation of 3--5 author entry:\\ +\apaex{\textcite{6.12b}} + +\noindent Subsequent citations:\\ +\apaex{\textcite{6.12b}}\\ +Subsequent citations within a paragraph:\\ +\apaex{\citeauthor{6.12b}} + +\noindent Note that the dropping of the year for subsequent paragraph +citations is not automatic as there may be cases where you don't want to do +this (see APA 6.11). + +\noindent Automatic list disambiguation for ambiguous truncations after +first cite. Note that «et al» is plural so +it will only truncate two or more names. If it would truncate just one +name, we just give the name:\\ +\apaex{\textcite{6.12c}}\\ +\apaex{\textcite{6.12d}}\\ +\apaex{\textcite{6.12c}}\footnote{This example is incorrect in the + APA 6th edition manual because «et al» is replacing only one name. This has been + verified with the APA and will be corrected in future editions.}\\ +\apaex{\textcite{6.12d}} + +\noindent Multiple-authors in running text are separated by «and». +However, in parenthetical cites, multiple authors are separated by «\&»:\\ +\apaex{\textcite{6.12e}}\\ +\apaex{\parencite{6.12f}} + +\noindent Automatic list disambiguation for ambiguous truncations again, +this time the truncation is on first cite as there are more than 5 authors:\\ +\apaex{\textcite{6.12g}}\\ +\apaex{\textcite{6.12h}} + +\noindent Automatic list disambiguation is only for ambiguous author lists +in the same year so these are not disambiguated:\\ +\apaex{\textcite{6.12i}}\\ +\apaex{\textcite{6.12j}}\\ +\apaex{\textcite{6.12i}}\\ +\apaex{\textcite{6.12j}} + +\noindent The following table replicates with real data the examples +in Table 6.1, p.~177 of the APA 6th Edition manual. Note that this +table in the APA manual essentially assumes that the citations on each +line are in a separate document since there is no list disambiguation +or repeated cite truncations between lines. To simulate this with real +data, the source for this document uses |\citereset| between lines and +makes all of the data entries of MISC type, unsetting «uniquelist» for +this type and using a custom labelname style. + +\begin{center} +\begin{tabular}{lllll} +\textbf{\parbox{2cm}{\center Type of citation}} & \textbf{\parbox{2.4cm}{\center First + citation in text}} & \textbf{\parbox{2.4cm}{\center Subsequent citations in + text}} & \textbf{\parbox{2.4cm}{\center Parenthetical format, first citation + in text}} & \textbf{\parbox{2.4cm}{\center Parenthetical format, subsequent + citations in text}}\\\\ +\hline +\\ +\parbox{2cm}{\raggedright One work by one author} +& \parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13a}}} & +\parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13a}}}\citereset +& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13a}}} +& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13a}}}\\\\ +\parbox{2cm}{\raggedright One work by two authors} +& \parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13b}}} & +\parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13b}}}\citereset +& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13b}}} +& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13b}}}\\\\ +\parbox{2cm}{\raggedright One work by three authors} +& \parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13c}}} & +\parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13c}}}\citereset +& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13c}}} +& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13c}}}\\\\ +\parbox{2cm}{\raggedright One work by four authors} +& \parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13d}}} & +\parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13d}}}\citereset +& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13d}}} +& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13d}}}\\\\ +\parbox{2cm}{\raggedright One work by five authors} +& \parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13e}}} & +\parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13e}}}\citereset +& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13e}}} +& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13e}}}\\\\ +\parbox{2cm}{\raggedright One work by six authors} +& \parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13f}}} & +\parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13f}}}\citereset +& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13f}}} +& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13f}}}\\\\ +\parbox{2cm}{\raggedright Groups (readily identified through abbreviation) as authors} +& \parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13g}}} & +\parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13g}}}\citereset\citeresetapa +& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13g}}} +& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13g}}}\\\\ +\parbox{2cm}{\raggedright Groups (no abbreviation) as authors} +& \parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13h}}} & +\parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13h}}}\citereset +& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13h}}} +& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13h}}}\\\\ +\hline +\end{tabular} +\end{center} + +\noindent\apa{6.13}\\ +Author abbreviations should work between citations of different works by +the author:\\ +\apaex{\parencite{6.13i}}\\ +\apaex{\parencite{6.13i}}\\ +\apaex{\parencite{6.13j}} + +\noindent\apa{6.14}\\ +Citations of an entry with an author who shares a +surname with another entry always appears with initials when primary +author. It is not explicit in the APA 6th edition manual but initials only +appear with primary authors\footnote{\url{http://blog.apastyle.org/apastyle/2014/01/when-to-use-author-initials-for-text-citations.html}}:\\ +\apaex{\textcite{6.14}}\\ +\apaex{\textcite{7.01:3b}} + +\noindent\apa{6.15}\\ +Use |SHORTTITLE| field of the entry if it exists:\\ +\apaex{\parencite{6.15a}}\\\\ +Books, reports etc. use italics instead of quotes:\\ +\apaex{\textcite{6.15b}}\\\\ +Citing anonymous author:\\ +\apaex{\textcite{6.15c}} + +\noindent\apa{6.16}\\ +Two or more works within the same parentheses:\\ +\apaex{\parencite{6.16a,6.16b}}\\ +\apaex{\parencite{6.16c,6.16d,6.16e}} + +\noindent Citations of works by same authors in the same year:\\ +\apaex{\parencite{6.16f,6.16g,6.16h,6.16i,6.16j}}\\\\ +\textcolor{red}{Note: This example, (p.~178 APA Manual 6th edition, 2nd + printing) is slightly odd as the «in press-a» is not indicated and + should be «in press» since no other in press items are listed for the + same authors in the example.} + +\noindent Compact citations in alphabetic order:\\ +\apaex{\parencites{6.16k,6.16l}} + +\noindent Compact citations with special order:\\ +\apaex{\parencites{6.16m}[see also][]{6.16n,6.16o}} + +\noindent «in press» should have hyphen before disambiguating part of label +(also in references):\\ +\apaex{\parencite{6.16p,6.16q,6.16r}} + +\noindent\apa{6.17}\\ +Secondary sources:\\ +\apaex{\parencite[as cited in][]{6.17}} + +\noindent\apa{6.18}\\ +Classical works:\\ +\apaex{(\citeauthor{6.18a}, trans. \citeyear{6.18a})}\\ +\textcolor{red}{Note: The example is managed using lower-level cite + commands. This is another example of the APA not really thinking about + automated processing and specifying an anomalous infix format. It would + be better and probably acceptable for it to be:}\\ +\apaex{\parencite[][trans.]{6.18a}}\\\\ +Entries with an |ORIGDATE| field will automatically use it:\\ +\apaex{\textcite{6.18b}}\\\\ +The other examples of standard classical texts in this section should just +be typed by hand--there is little benefit to automating these examples and +they wouldn't usually be in the References section anyway. + +\noindent\apa{6.19}\\ +These examples are easily dealt with using standard |biblatex| functionality.\\ +\apaex{\parencite[][10]{6.19a}}\\ +\apaex{\parencite[][Chapter 3]{6.19b}} + +\noindent\apa{6.20}\\ +Such cases are just typed out--they have no Reference section entry and +don't therefore have a bibliography database entry. + +\noindent\apa{6.21}\\ +Within parentheses, use the |\nptextcite| command which is equivalent to +the |\textcite| command but omits the parenthesis and uses commas instead. +See the |biblatex-apa6| docs.\\ +\apaex{(\nptextcite[see Table 3 of][]{6.21} for complete data)} + +\noindent\apa{6.28}\\ +Entries with no date use «n.d.».\\ +\apaex{\textcite{6.28a}}\\ +\apaex{\parencite{6.28a}}\\ +\apaex{(\nptextcite{6.28a})} + +\noindent\apa{7.01:12c}\\ +Issue with no editors\\ +\apaex{\parencite{7.01:12c}} + +\noindent\apa{A7.07}\\ +A patent citation uses the title but with no quotes\\ +\apaex{\textcite{A7.07}}\\ +\apaex{\parencite{A7.07}} + +\noindent Some tests of uniqueness and uniquelist + +\noindent Two works by same authors in same year are disambiguated by extradate «a» +and «b» and are truncated after first cite because it is the same author +list and therefore not ambiguous:\\ +\apaex{\textcite{UL1}}\\ +\apaex{\textcite{UL1}}\\ +\apaex{\textcite{UL2}}\\ +\apaex{\textcite{UL2}}\\ + +\noindent One author list is an ordered subset of the other and so both need fully +expanding to be properly disambiguated. Truncating either would be ambiguous.\\ +\apaex{\textcite{UL3}}\\ +\apaex{\textcite{UL3}}\\ +\apaex{\textcite{UL4}}\\ +\apaex{\textcite{UL4}} + +\noindent Some misc citation cases\\ +\apaex{\textcite{6.16c,6.16d,6.16e}}\\ +\apaex{\textcite{6.16f,6.16g,6.16h}}\\ +\apaex{\textcite{6.16f,6.16g,6.16h,6.16i,6.16j}}\\ +Note here that the multicite delimiter is a comma as in running text, a +semi-colon would be strange: +\apaex{\textcites{6.16f}{6.16g}{6.16h}{6.16i}{6.16j}}\\ +\apaex{\cite{6.16f,6.16g,6.16h,6.16i,6.16j}}\\ +\apaex{\cite{6.16k,6.16l}}\\ +\apaex{\fullcite{FC1}}\\ +\apaex{\fullcitebib{FC1}} + +\noindent Testing «with»---should not be present in cites (APA 6.27)\\ +\apaex{\cite{with1}}\\ +\apaex{\textcite{with1}} + +\noindent Testing author name citing\\ +\apaex{\citeauthor{ca1}}\\ +\apaex{\citeauthor{ca1}} + +\noindent Testing nodate\\ +\apaex{\textcite{nodate1}}\\ +\apaex{\textcite{nodate2}} + +\noindent Testing full name expansion (APA 6.27). See citation refs for how +these appear in references\\ +\apaex{\textcite{6.27a}}\\ +\apaex{\textcite{6.27b}} + +\noindent Testing suffices\\ +\apaex{\textcite{stest1}}\\ +\apaex{\textcite{stest2}} + +\noindent Testing prefices\\ +\apaex{\textcite{pretest}}\\ +\apaex{\textcite{nopretest}} + +% presufftest2 and nopresufftest are the same name and so even though +% useprefix=false nopresufftest, hashes are the same so there is an extradate +\noindent Testing prefices plus suffices\\ +\apaex{\textcite{presufftest}}\\ +\apaex{\textcite{presufftest2}}\\ +\apaex{\textcite{nopresufftest}} + +\noindent Testing «and others»\\ +\apaex{\textcite{ao1}}\\ +\apaex{\textcite{ao2}} + +\noindent Testing seasonal periodical citations\\ +\apaex{\textcite{season1}} + +\noindent Testing first list name initials only as per:\\ +\url{http://blog.apastyle.org/apastyle/2014/01/when-to-use-author-initials-for-text-citations.html}\\ +First citation:\\ +\apaex{\parencite{first,second,third,fourth,deutsch1963}}\\ +Second citation:\\ +\apaex{\parencite{first,second,third,fourth,deutsch1963}} + +% Testing name elision in cites +% That is, \parencite{kingetal2005a,weissetal2007a,weissetal2009a} +% Should give: +% (King, Weiss, & Farmer, 2005; Weiss, King, & Hopkins, 2007; Weiss et al., 2009) +% and not +% (King, Weiss, & Farmer, 2005; Weiss, King, & Hopkins, 2007, 2009) +% which happens if elision is based on namehash because the mincitenames +% truncation of the 2007 and 2009 names is the same +\noindent{Testing name elision in cites}\\ +\apaex{\parencite{kingetal2005a,weissetal2007a,weissetal2009a}} + +\noindent Testing circa/BCE/uncertain era format\\ +\apaex{\nptextcite{plato}} + +\noindent Testing citation formats for complete dates\\ +\apaex{\textcite{Ludwig2014}} + +\noindent Testing month ranges with same months, different days\\ +\apaex{\textcite{daterange1}} + +\noindent Testing month ranges with different months\\ +\apaex{\textcite{daterange2}} + +\end{refsection} +\begin{refsection}[../bibtex/bib/biblatex-apa6-test-references] +\nocite{*} +\end{refsection} +\newpage +% Just (APA 7.x) real references and related entry examples here +\printbibliography[section=2] +\newpage +% Include a references section for citation examples just so hyperref +% targets can be checked +\printbibliography[section=1,title=Misc citation references] +\end{document} + +% Local Variables: +% TeX-engine: luatex +% End: diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6.pdf Binary files differnew file mode 100644 index 0000000000..c2fa631927 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6.tex b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6.tex new file mode 100644 index 0000000000..731be80627 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6.tex @@ -0,0 +1,882 @@ +\documentclass{ltxdockit} +\usepackage[british]{babel} +\usepackage[strict]{csquotes} +\usepackage{shortvrb} +\usepackage{ifthen} +\usepackage{listings} +\usepackage{metalogo} +\MakeAutoQuote{«}{»} +\MakeShortVerb{\|} + +% Unicode +\usepackage{fontspec} +\setmainfont[Ligatures=TeX]{TeXGyrePagella} +\setsansfont[Ligatures=TeX]{TexGyreHeros} +\setmonofont[Ligatures=NoCommon]{TeXGyreCursor} + +\newcommand\apa[2][]{\ifthenelse{\equal{#1}{}}% + {\texttt{(APA #2)}}% + {\texttt{(APA #2 Example #1)}}} + +\titlepage{% + title={APA 6th Edition Bib\LaTeX\ style}, + subtitle={Citation and References macros for Bib\LaTeX}, + url={http://mirror.ctan.org/macros/latex/exptl/biblatex-contrib/biblatex-apa/}, + author={Philip Kime}, + email={Philip@kime.org.uk}, + revision={8.0}, + date={\today}} + +\hypersetup{% + pdftitle={APA Bib\LaTeX\ style}, + pdfsubject={APA 6 Conformant Style for Bib\LaTeX}, + pdfauthor={Philip Kime}, + pdfkeywords={latex, biblatex, APA, style}} + +\begin{document} + +\printtitlepage +\tableofcontents + +\section{Important Changes}\label{special} + +\textbf{This is a legacy style for a previous edition of the APA guidelines. The +latest version is always on CTAN with the name |biblatex-apa|}.\\[2ex] + +Please see the revision history below (section \ref{rev}) for details on changes in each +version. This section is just for important things like incompatible +changes which users should be aware of. + +\minisec{7.8} +|ARTICLE| entries now correctly do not print month/day in the bibliography +as per APA 6.28. For non-academic articles (APA 7.01, examples 7, 8 and 9), +use the new: + +\begin{verbatim} + ENTRYSUBTYPE = {nonacademic} +\end{verbatim} + +This will allow month/day data in the bibliography. In the future, there +may be other differences for |ARTICLE| subtypes and it is better to keep +these semantically distinct from standard academic journal articles. + +\minisec{7.5} +This version requires |biblatex| $>=$3.8 and |biber| $>=$2.8. + +\minisec{7.1} +This version requires |biblatex| $>=$3.6 and |biber| $>=$2.6. + +\minisec{7.0} +This version requires |biblatex| $>=$3.5 and |biber| $>=$2.6. Uncertain, +approximate and era-marked dates are now supported in the |biblatex| core +and therefore special fields are no longer needed in the style. See example +files, in particular \texttt{7.10:67} entry in the references test +\file{.bib} and the \texttt{plato} entry in the citation test \file{.bib}. + +\minisec{7.0} +This version requires |biblatex| $>=$3.5 and |biber| $>=$2.6. + +\minisec{6.9} +This version requires |biblatex| $>=$3.4 and |biber| $>=$2.5. + +\minisec{6.8} +This version requires |biblatex| $>=$3.3 and |biber| $>=$2.4. + +\minisec{5.0} +The style now uses the customisable data model functionality of |biblatex| +2.0 and |biber| 1.0 and so these are now required. Several cases +which previously were forced to use custom fields like |USERA|, +|USERB| etc. can now be more naturally implemented with semantically +appropriate fields. See \file{biblatex-apa-references.bib} for +examples. This particularly aids the use of |VIDEO| entries, for +example which now support fields |DIRECTOR|, |PRODUCER|, +|WRITER| and |EXECPRODUCER|. + +Entries which relate to other entries like reviews and reprints are +now implemented more naturally using the |biblatex| 2 «related +entries» functionality. See entries with the |RELATED| field in +\file{biblatex-apa-references.bib} and the |biblatex| manual for +details and examples. + +Entries where authors are listed as «with» are now supported using the +name field |WITH|. See examples file. + +\minisec{4.5} +|biber| is now \emph{required}. This is because APA style needs a custom +sorting scheme and only |biber| supports this. |bibtex| support is going +away in |biblatex| eventually anyway so it's best to switch. + +\minisec{4.4} +The |\maxprtauth| command is now a package option called +«apamaxprtauth», see section \ref{opts}. + +\minisec{4.3} +Specifying entries as «in press» should now be done using the official |biblatex| +mechanism for this. Instead of, for example: + +\begin{verbatim} + YEAR = {in press} +\end{verbatim} + +\noindent you should use: + +\begin{verbatim} + PUBSTATE = {inpress} +\end{verbatim} + +\noindent as «|inpress|» is a |biblatex| localisation string which will +render correctly in supported languages. If you still use the older method, +it will still work but the string will always appear as the English «in +press». + +\section{Introduction}\label{int} + +\subsection{About} + +This package is a Bib\LaTeX\ style for APA (American Psychological +Association) 6th Edition style compliant documents typeset in \latex. It +implements a citation style (\file{apa.cbx}), a references section style +(\file{apa.bbx}), some data model enhancements (\file{apa.dbx}) and string +localisation files (\path{<language>-apa.lbx}). Currently there are only +string localisations for a few languages---if you can help with any other +languages, please mail me; the localisation |.lbx| files are very small and +simple and it would be a small translation task for the few APA-specific +strings needed. The styles are loaded just like any other Bib\LaTeX\ styles +but I wouldn't try to use the citation and references styles separately as +they rely on each other, macro-wise, in places. + +In this document and in the code, the specific APA requirements are +referred to by the section and (if appropriate) the example number of the +APA Style Guide (6th Edition). + +\subsection{Requirements}\label{ref:req} + +You will need to be using \sty{csquotes} ($\geq$ 4.3), Bib\LaTeX\ ($\geq$ +3.4) and Biber ($\geq$ 2.5). If you want to take advantage of the +Bib\LaTeX\ |\DeclareQuotePunctuation| facility to enforce the APA required +«American» punctuation, you should normally use the \sty{babel} package +with the «american» option (see Bib\LaTeX\ manual section |3.9.1|). You can +of course use other languages but in such cases, to adhere to APA +«American» punctuation rules (following commas moved inside closing quotes +etc.), then you should set up |\DeclareQuotePunctuation| yourself as per +section |4.7.5| of the Bib\LaTeX\ manual. + +If you are using the |apa.cls| \latex class, you need be using version +$\geq$ 1.3.4. The class should be invoked with the |noapacite| class option +as per the |apa.cls| documentation. Without this class option, the +|apa.cls| class will automatically try to use plain Bib\TeX\ with the +|apacite| style which is completely incompatible with Bib\LaTeX. + +\subsection{License} + +Permission is granted to copy, distribute and/or modify this software under +the terms of the \latex Project Public License, version +1.3c\footnote{\url{http://www.latex-project.org/lppl.txt}}. The current +maintainer is Philip Kime (\textcopyright\ 2015). + +\subsection{History} + +When I started using Bib\LaTeX, I assumed there would be an APA style +when I went looking. I was wrong. I started to try to make one and realised +why there was none. The APA style manual is enormous; the citation and +references specifications run to about 60 pages and are very specific in +terms of formatting. They are also not entirely consistent but then again, +it is rare to have such a thorough specification to work from. +Inconsistencies in the manual and workarounds are noted in the examples +document. + +\subsection{Acknowledgments} + +Thanks to Philipp Lehman for Bib\LaTeX\ which really has been a major +advance over pure Bib\TeX. Thanks to Alexander van Loon for the Dutch +localisation. Thanks to Paul Thompson for the suggestion to +parameterise the max authors setting. Thanks to George Gkotsis for the +Greek localisation. Thanks to Erikson Kaszubowski for the Brazilian +localisation. Thanks to Braulio José Solano Rojas for the Spanish +localisation. Thanks to Stefan Mayer for the |subtitlepunct| suggestion. +Thanks to HÃ¥kon Malmedal for the Norwegian localisation. Thanks to +Johann Gründl for the Austrian localisation. Thanks to Svante Kvarnström +for the Swedish localisation. Thanks to Hendrik Maryns for further Dutch +localisation. Thanks to Tea TusÌŒar and Bogdan FilipicÌŒ for the Slovenian +localisation. Thanks to Sebastian Ørsted for the Danish localisation. +Thanks to Jürgen Spitzmüller for the DGPs localisation hints. Thanks to +Sergei Golovan for the Russian localisation. Thanks to VÃtor MÃguez for the +Galacian localisation. + +\section{Use}\label{ref:use} +\label{use} +This package is available via \TeX Live as |biblatex-apa|. You can find it +through the provided \TeX Live update utilities which will install it +automatically for you. If you need to install manually (to use a new +version which has not yet been published to the \TeX Live updaters, for +example), you can download it from CTAN and then, put the \path{.cbx}, +\path{.bbx} and \path{.lbx} files in your texmf tree, usually:\\ + +\noindent\path{<texmf>/tex/latex/biblatex/cbx/apa.cbx}\\ +\path{<texmf>/tex/latex/biblatex/bbx/apa.bbx}\\ +\path{<texmf>/tex/latex/biblatex/lbx/<language>-apa.lbx}\\ + +\noindent Specify the style in the usual way when loading Bib\LaTeX. If you +are using \sty{babel}: + +\begin{ltxcode} +\usepackage[american]{babel} +\usepackage{csquotes} +\usepackage[style=apa]{biblatex} +\end{ltxcode} + +or \sty{polyglossia}: + +\begin{ltxcode} +\usepackage{polyglossia} +\setdefaultlanguage[variant=american]{english} +\usepackage{csquotes} +\usepackage[style=apa]{biblatex} +\end{ltxcode} + +\noindent Note that the APA manual requires the forcing of titles into +«sentence case», that is, initial cap followed by lower case for sentence +units, with the exception of names and material from languages which do not +follow English capitalisation. As of version 0.8a, Bib\LaTeX\ has a +|\MakeSentenceCase| macro which deals with this. So, in the traditional +Bib\TeX\ way, capitalise correctly in the |.bib| file, protecting names etc. +with the usual brace pairs and the style will take care of forcing the +APA-style sentence case in the References section. Unlike the References +section, titles in citations in the APA style appear in normal case and the +style will ensure this too. + +\subsection{Package options}\label{opts} + +The following options are set as usual in the options passed to +|biblatex|. + +\begin{ltxcode} +apabackref=true|false +\end{ltxcode}% | stupid comment to stop emacs highlighting as verb due + % to single pipe + +\noindent It is not APA style to include backreferences in the References to +pages where citations of the entry occur. However, this is very +useful, especially in proofing and so if you set the |apabackref| +option to «true», these are enabled. The default is «false». + +\begin{ltxcode} +apamaxprtauth=<num> +\end{ltxcode} + +\noindent This option controls the number of author/editor names which are +printed in the References. APA style defaults to 7. You can change this if +you really want to fully print all author list references in certain +contexts (for example in a CV where you are an author in position 8 \ldots) + +Setting Bib\LaTeX package options which change name processing +like \opt{uniquename} and \opt{uniquelist} is not supported as this style +does tricky things internally to match the peculiar APA standard. You +should not need to change them anyway as then you wouldn't be using APA +style anyway. + +\subsection{Localisation} + +Localisation is provided for APA-specific strings in the accompanying +|.lbx| files which are loaded automatically. + +Normal use will invoke \sty{babel} with the «american» language or +\sty{polyglossia} with «american» variant of «english». + +The \file{english-apa.lbx} is a copy of the \file{american-apa.lbx} since +the default is «American» English. + +The APA manual does not mention nor sanction any non «American» English +strings but it is quite common for non-English journals to ask for APA style +bibliographies and so this must be supported. + +If not using the \sty{babel} «american» option, it may be necessary to set up +the |\DeclareQuotePunctuation| option as mentioned in section \ref{ref:req} +above. You would only need to do this if, for some strange reason, a +non-american journal required the (unpleasant) american practice of moving +final punctuation marks inside closing quotes. + +\subsubsection{Date formats} + +Obviously, an American style uses month/day/year formats. European formats +are usually day/month/year. The APA style dictates long date formats and so +this is not really apparent in the bibliography. There is an APA standard +for long date formats which may not be correct for European journals using +roughly APA formatting standards (German journals tend to have a different +long date format, for example). The «american» babel option will give you +APA compliant US date formats. Default sensible date formats are included +for german, ngerman and french. You should redefine the |\mkbibdatelong| +macro in the relevant language |*-apa.lbx| file to change this if needed. + +A customisable macro \cmd{urldatecomma} determines what comes between the +date of a URL and the URL itself. This defaults to the standard comma and +space as per APA style but just a space in germanic localisations. + +\subsection{Limitations} +\label{use:limit} +There are certain limitations you need to bear in mind when using these +styles. The APA manual is written without much regard for automation of +citation and references processing---it just tells you how it wants things to +look and the implicit assumption is that you would type out everything by +hand if necessary. Having said that, the majority of the APA citation +and references style is implemented, there are just a few exceptions which +are hardly worth the coding pain since they are ambiguous and easily worked +around. + +\section{Details} + +The detailed information for this style is contained in the example document and +accompanying \path{.bib} files: +\begin{description} +\item[\path{biblatex-apa.tex}] This document. +\item[\path{biblatex-apa-test.tex}]\footnote{\path{biblatex-apa-test.pdf} + is also provided and is the typeset version of this \latex source + file.} This document typesets just about every useful example from + \apa{6.11}--\apa{6.21} and \apa{7.01}--\apa{7.11}. The examples in it + aim to look as much like the APA manual examples as possible. All + citation examples in the document are real examples using a \path{.bib} + file. +\item[\path{biblatex-apa-test-citations.bib}] This contains the \path{.bib} + entries for the citations examples. You won't find anything of interest + in this file---it's just used to provide real data for the citation + examples. +\item[\path{biblatex-apa-test-references.bib}] This contains the + \path{.bib} entries for all of the examples in \apa{7.x}. This file is + the main documentation for the |biblatex-apa| implementation of the APA + References section style. To see how the style deals with a particular + example from \apa{7.x}, look it up in here. Every example is marked with + the APA example number and has explanatory notes. +\item[\path{apa.cbx}] The |biblatex-apa| citations style. It is + decently structured with comments but shouldn't need to be read for + normal use. +\item[\path{apa.bbx}] The |biblatex-apa| references style. It is + decently structured with comments but shouldn't need to be read for + normal use. +\item[\path{apa.dbx}] The |biblatex-apa| data model additions. This allows + users to utilise more natural entry type and field names for certain + entries. See comments in the \path{biblatex-apa-test-references.bib}. +\item[\path{*.lbx}] The |biblatex-apa| localisation files. These files + override some language-specific macros for some fixed strings. +\end{description} + +\subsection{Citations} + +To specify something as «in press», use the |biblatex| |PUBSTATE| field +with the special key value of «|inpress|» (see |biblatex| manual, section +4.9.2.11). See the notes on the |PUBSTATE| field in section \ref{refs} +below. + +\apa{6.13} requires that there should be no parentheses around the year of +the citation when the citation itself occurs within parenthesis. This is +tricky to completely automate within the remit of a citation style since it +requires knowledge of the current typesetting state. So, the new citation +command + +\begin{ltxsyntax} +\cmditem{nptextcite}[prenote][postnote]{key}<punctuation> +\end{ltxsyntax} + +\noindent is provided for such situations. It is identical to |\textcite| +but does not put parentheses around the year and separates items with +commas. See examples using this command in \path{biblatex-apa-test.tex}. +There is also a multi-cite version |\nptextcites| that works in the same +way as |\textcites|. + +The |\fullcite| command uses ampersands, like the references section +and there is also a |\fullcitebib| command which is the same as +|\fullcite| but which fakes a mini references section with APA style +indentation and so is not intended to be used inline like +|\fullcite|. See examples in the test file. + +\subsection{References}\label{refs} + +The references style was based on the Bib\LaTeX\ default +|authoryear-comp| style but is heavily modified. If in doubt read the +example references |.bib| as it is commented and you can learn a lot from +the examples by picking something close to what you need from the APA +examples and then looking in this file to see how it was implemented. Some +general notes: + +\begin{itemize} +\setlength{\itemsep}{0pt} +\item The |PUBSTATE| field takes priority over any date field. If you specify + something with a |PUBSTATE| field like «inpress», then the year label in + citations and the references will be the localisation of the |PUBSTATE| + value key (|PUBSTATE| takes a pre-defined set of localisation keys as + values, see |biblatex| manual). +\item APA style sometimes refers to the «series» of a multi-volume work. + This corresponds to the |MAINTITLE| field in the \file{.bib} and + \emph{not} the |SERIES| field. +\item |VOLUME|, |NUMBER| and |CHAPTER| are forced into arabic numerals if + they are given as roman numerals, as required by \apa{6.22}. +\end{itemize} + +\subsubsection{Journal number for journals with per-issue pagination} +As per APA 6th edition section 6.30 and 7.01, journals which paginate by +issue need the volume number including in the reference section. Since +there is no way to automatically determine when this is the case, use the +|biber| sourcemap feature to implement this, removing the |NUMBER| field +from journals known to implement continuous pagination across volumes. For +example, with this in your preamble: + +\begin{lstlisting}[style=latex]{} +\DeclareSourcemap{ + \maps[datatype=bibtex]{ + \map{ + \step[fieldsource=journaltitle, + match=\regexp{(?:journal\stitle\sone|journal\stitle\stwo)}] + \step[fieldset=number, null] + } + } +} +\end{lstlisting} +% +Simply include |NUMBER| fields for all journals and entries with +|JOURNALTITLE| of «journal title one» or «journal title two» (which +are known to paginate across all numbers of a volume) will have +their |NUMBER| field dynamically removed at document compile time, as +required. + +\subsubsection{Retrieval dates for online items} + +APA 6th edition section 6.32 says «Do not include retrieval dates unless +the source material may change over time (e.g., Wikis)». This is open to +interpretation of what constitutes a Wiki and what counts as «changing over +time». The style does not implement anything for this requirement by +default but you can automate your own interpretation by putting this in +your preamble: + +\begin{lstlisting}[style=latex]{} +\DeclareSourcemap{ + \maps[datatype=bibtex]{ + \map{ + \step[fieldsource=url, + notmatch=\regexp{wiki}, + final=1] + \step[fieldset=urldate, null] + } + } +} +\end{lstlisting} + +\noindent This will dynamically remove the |URLDATE| field from any entry +where the |URL| field doesn't match the regular expression «wiki». Modify this +regular expression according to taste. This modification is dynamically +applied to the data stream by |biber| and does not change your \file{.bib}. + +\section{Revision history}\label{rev} + +\begin{changelog} + +\begin{release}{8.0}{2019-09-07} +\item Removed unused and unneeded use of NUMBER and SERIES fields +\end{release} + +\begin{release}{7.9}{2019-09-03} +\item Bugfix release +\end{release} + +\begin{release}{7.8}{2019-08-30} +\item Fixed date rules for |ARTICLE|s +\end{release} + +\begin{release}{7.7}{2018-04-02} +\item Bug fixes and example alignments +\end{release} + +\begin{release}{7.6}{2018-03-05} +\item Internal cleanup and bugfixes +\end{release} + +\begin{release}{7.5}{2017-11-05} +\item Compat for bibaltex 3.8 +\item |\DeclareLanguageMapping| is now no longer necessary due to the new + |\DeclareLanguageMappingSuffix| macro. +\end{release} + +\begin{release}{7.4}{2017-01-06} +\item Minor bugfix release +\end{release} + +\begin{release}{7.3}{2016-12-21} +\item Minor bugfix release +\end{release} + +\begin{release}{7.2}{2016-10-24} +\item Minor bugfix release for date fields +\end{release} + +\begin{release}{7.1}{2016-09-15} +\item Minor bugfix release for legacy YEAR fields and |inpress| strings +\item Requires |biblatex| 3.6+ and biber 2.6+ +\end{release} + +\begin{release}{7.0}{2016-09-14} +\item Added \cmd{urldatacomma} +\item Now following DGPs guidelines for some formatting in Germanic + locales. +\item Requires |biblatex| 3.5+ and biber 2.6+ +\end{release} + +\begin{release}{6.9}{2016-05-13} +\item Bug fixes +\item Requires |biblatex| 3.4+ and biber 2.5+ +\end{release} + +\begin{release}{6.8}{2016-03-01} +\item Bug fixes +\item Updated to use new \cmd{DeclareNameFormat} structure for |biblatex| + 3.3+ (which is now required) +\end{release} + +\begin{release}{6.7}{2015-01-23} +\item Bug fixes +\end{release} + +\begin{release}{6.6}{2014-10-23} +\item Bug fixes +\end{release} + +\begin{release}{6.5}{2014-04-16} +\item Bug fixes +\item Slovenian localisation +\end{release} + +\begin{release}{6.4}{2013-10-30} +\item Fixed explicit «and others» problem +\item Improved french localisation +\end{release} + +\begin{release}{6.3}{2013-10-28} +\item Fixed issue where |SHORTAUTHOR| was only being used for exact same citations. +\end{release} + +\begin{release}{6.2}{2013-10-19} +\item Corrected Dutch translations +\item Fixed Norwegian lbx corruption +\item Misc bugfixes +\end{release} + +\begin{release}{6.1}{2013-07-19} +\item Corrected APA 6.12 error and switched to uniquelist=minyear +\item Documented way of automating some APA 6.32 requirements +\end{release} + +\begin{release}{6.0}{2013-07-10} +\item Added Swedish localisation +\item Fixed useprefix=false issue +\end{release} + +\begin{release}{5.9}{2013-05-08} +\item Compatibility with |biblatex| 2.6--«nodate» is now part of core +\item autocite is set to inline +\end{release} + +\begin{release}{5.8}{2013-03-07} +\item Made BOOK like INBOOK for order of online/reprint information +\item Fixes for recursive RELATED fields +\end{release} + +\begin{release}{5.7}{2012-12-28} +\item New name code to allow full name disambiguation as per APA 6.27 +\item Fixes to IN* types +\end{release} + +\begin{release}{5.6}{2012-12-19} +\item Fixed problems with EVENTDATE format +\end{release} + +\begin{release}{5.5}{2012-12-17} +\item Fixed serial comma requirement (APA 4.03) +\end{release} + +\begin{release}{5.4}{2012-11-28} +\item Updated for |biblatex| 2.4 +\end{release} + +\begin{release}{5.3}{2012-11-21} +\item Updated for some |biblatex| changes. +\end{release} + +\begin{release}{5.2}{2012-09-30} +\item Entries with no YEAR no longer fall back on other date fields + and use «nodate» bibstring. +\item «nodate» bibstring no longer lowercased and supports extrayear +\end{release} + +\begin{release}{5.1}{2012-08-01} +\item Added Norwegian localisation (thanks to HÃ¥kon Malmedal) +\item Fixed some documentation issues +\end{release} + +\begin{release}{5.0}{2012-07-01} +\item Using |biblatex| 2.0/|biber 1.0| data model facility. +\end{release} + +\begin{release}{4.8}{2012-06-02} +\item Put in proper package version strings +\item Fixed a problem with \cmd{textcites} (thanks to Florian Sesser and + Cornielia Entner for reporting) +\end{release} + +\begin{release}{4.7}{2012-04-19} +\item Made |firstinits=false| possible +\item Fixed a problem with explicit «and others» with names (thanks to + George Pigman) +\end{release} + +\begin{release}{4.6}{2012-02-08} +\item Reduced the Biber requirement to a warning due to bug in |biblatex| 1.7 +\item Added Italian localisation (thanks to Luca Montanelli) +\end{release} + +\begin{release}{4.5}{2012-01-31} +\item Noted in manual that |biber| is now required due to custom sorting. +\item Added |INSTITUTION| field to |REPORT| entries +\end{release} + +\begin{release}{4.4}{2012-01-25} +\item |\maxprtauth| command is now a package option «apamaxprtauth» +\item New package option «apabackref» controlling whether + backreferences and links to citations appear in the References. +\end{release} + +\begin{release}{4.3}{2012-01-22} +\item «et al» now only replaces two or more names since it's plural +\item «in press» items now should use the |biblatex| |PUBSTATE| field +\item Fixed «in press» hyphenation issue for disambiguation in references +\item URLs are now by default in roman font as per APA style. +\end{release} + +\begin{release}{4.2}{2011-11-12} +\item Fixed macro name typo +\end{release} + +\begin{release}{4.1}{2011-11-02} +\item |subtitlepunct| now skips if following terminating punctuation +\end{release} + +\begin{release}{4.0}{2011-10-05} +\item Disabled «smart and» for spanish localisation as it breaks ampersands +\end{release} + +\begin{release}{3.9}{2011-10-03} +\item Fixed data format issue in localisations +\end{release} + +\begin{release}{3.8}{2011-09-25} +\item Fixed slanted/italic confusion in bibliography +\end{release} + +\begin{release}{3.7}{2011-09-23} +\item Fixed issue no dates when labelyear defined +\end{release} + +\begin{release}{3.6}{2011-09-20} +\item Fixed issue with American format long dates +\end{release} + +\begin{release}{3.5}{2011-09-05} +\item Fixed issue Editor name part order when in Author position (thanks to + Johann Bauer) +\end{release} + +\begin{release}{3.4}{2011-09-01} +\item Fixed issue with |\fullcite| not resetting |bbx| globals +\end{release} + +\begin{release}{3.3}{2011-08-23} +\item Spanish localisation +\end{release} + +\begin{release}{3.2}{2011-08-12} +\item Minor fix in |inbook| format +\item Doc clean up +\end{release} + +\begin{release}{3.1}{2011-07-31} +\item Made compatible with Bib\LaTeX\ 1.6 +\end{release} + +\begin{release}{3.0}{2011-05-06} +\item |maxnames| and |minnames| are now set to sensible things and actually + used. Biber $\geq$ 0.9.3 is now required as this implements a fix for + |uniquelist| in Bib\LaTeX\ which needs |maxnames| and |minnames| set to + real values. +\item Fixed bug with commas before «et al» not appearing in some cases. +\end{release} + +\begin{release}{2.9}{2011-05-03} +\item APA wants no space between volume and number for articles, even though it's + horribly ugly\ldots +\item Made urls not optional with Bib\LaTeX\ url toggle in |ONLINE| entrytype (thanks to Mattias Erll) +\end{release} + +\begin{release}{2.8}{2011-04-23} +\item Added a Greek localisation strings file. +\end{release} + +\begin{release}{2.7}{2011-04-1} +\item Biber is now a strongly recommended requirement due to APA name and + name list disambiguation requirements. +\item Updated for Bib\LaTeX\ 1.4/Biber 0.9 with automatic list + disambiguation. Package now deals with all APA 6th Edition citation examples. +\end{release} + +\begin{release}{2.6}{2011-03-15} +\item Made fullcite use ampersand +\item Added fullcitebib macro to allow fake bib citations +\end{release} + +\begin{release}{2.5}{2010-11-24} +\item Refactored hyperref to only link from years to make it + consistent across cite commands +\item Added hyperref target references section for citation examples +\item Fixed textcite multicite issue +\end{release} + +\begin{release}{2.4}{2010-11-14} +\item Fixed postnotes/hyperref for textcite +\end{release} + +\begin{release}{2.3}{2010-11-04} +\item Overhauled hyperref functionality and made more robust +\end{release} + +\begin{release}{2.2}{2010-10-15} +\item Parameterised max author/editor list (thanks to Paul Thompson) +\item Better rudimentary regression script +\item Completely reconfigured EPRINT/EPRINTTYPE +\end{release} + +\begin{release}{2.1}{2010-10-17} +\item New Dutch localisation (thanks to Alexander van Loon) +\end{release} + +\begin{release}{2.0}{2010-09-30} +\item Moved to new date format code internally +\end{release} + +\begin{release}{1.9}{2010-09-27} +\item Moved docs to LuaLaTeX compat +\item Fixed german/ngerman date formats +\item Cleaned up date format code +\end{release} + +\begin{release}{1.8}{2010-08-06} +\item Fixed seven author ellipsis bug +\end{release} + +\begin{release}{1.7}{2010-08-05} +\item Corrected dateless entry format, added examples to test doc +\item Corrected multi delim for |\citeyear| +\item Updated test doc for Bib\LaTeX\ 0.9b compat +\end{release} + +\begin{release}{1.6}{2010-07-19} +\item Added correct |\citeyear| definition +\end{release} + +\begin{release}{1.5}{2010-07-12} +\item Corrected |NOTE/ADDENDUM| examples +\item Made |\nptextcite| behave more consistently like |\textcite| for multi-cites. +\end{release} + +\begin{release}{1.4}{2010-07-07} +\item Removed extra space after DOI +\end{release} + +\begin{release}{1.3}{2010-07-05} +\item Fixed Oxford comma bug +\end{release} + +\begin{release}{1.2}{2010-06-18} +\item Made style arguments more explicit in |.bbx| +\item Fixed bad documentation due to beta Bib\LaTeX\ version. +\item Updated docs - minimum Bib\LaTeX\ version +\end{release} + +\begin{release}{1.1}{2010-05-28} +\item Fixed |INBOOK| |citetitle| format to match |BOOK|. +\item Fixed |extrayear| in entries with full date specifications. +\end{release} + +\begin{release}{1.0}{2010-05-12} +\item Fixed |TYPE| and |NUMBER| fields in |REPORT| entries. Now more + flexible. +\item |PUBSTATE| is now valid for articles. +\item |DOI|, if present, suppresses any |URL| field. +\item Abstract retrieval string is now conditional on |USERB| field, not on + the existence of an abstract. +\item Default strings for |PHDTHESIS| and |MASTERSTHESIS| entries corrected. +\item |LOCATION| is now valid for thesis entries and comes after |INSTITUTION|. +\end{release} + +\begin{release}{0.9}{2010-03-08} +\item Update for APA manual 6th edition and Bib\LaTeX\ 0.9 +\end{release} + +\begin{release}{0.8}{2010-02-15} +\item Fixed bug with spaces after nptextcite +\item Updated for Bib\LaTeX\ 0.9 +\end{release} + +\begin{release}{0.7}{2010-01-20} +\item Made hyperref links more consistent, using the whole citation and not + just the year. +\end{release} + +\begin{release}{0.6}{2009-11-20} +\item Corrected two bugs in |cite| macro which left a trailing space after + multiple cites and actually cited the year twice for multiple cite + commands in some circumstances. +\item Corrected bug where |\textcite| would leave a stray open bracket on + the stack when year was suppressed within a paragraph. +\end{release} + +\begin{release}{0.5}{2009-09-19} +\item Replaced literal string with localised form in url macro. +\item Moved localisation strings into \sty{.lbx} files. +\item |\DeclareLanguageMapping| is now needed in preamble. +\item Moved |\DeclareBibliographyExtras| into \sty{.lbx} files. +\item Some support for alternative localised date formats. +\item Fixed slant/italic font problem since the |\mkbibemph| macro had + changed in Bib\LaTeX\ 0.8e. +\item Fixed |liststop| error which was preventing name lists with two + entries from having the comma before the ampersand. +\end{release} + +\begin{release}{0.4}{2009-07-24} +\item Fixed bug where multiple year ranges were not displayed properly. +\item Updated to remove pre-Bib\LaTeX\ 0.8e macros error. +\end{release} + +\begin{release}{0.3}{2008-12-21} +\item Updated to use new fields (|EVENTTITLE|) and new options + (|usetranslator|) from Bib\LaTeX\ 0.8b. +\end{release} + +\begin{release}{0.2}{2008-12-06} +\item Added |noremoteinfo| option). +\item Fixed bbx bug with more than 7 authors still printing names after «et al». Was + due to resetting maxnames to 999. +\item Removed the customised (hacked) |apa-biblatex.cls| class from the package as + |apa.cls| version 1.3.4 is compatible with Bib\LaTeX\. +\item Altered documentation about requiring the «american» babel option. + This is not required if you set up |\DeclareQuotePunctuation| yourself. +\item Added minimum required version of \sty{csquotes}. +\item Minor doc tweaks. +\end{release} + +\begin{release}{0.1}{2008-12-01} +\item Initial release +\end{release} + + + +\end{changelog} +\end{document} + +% Local Variables: +% TeX-engine: luatex +% End: diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/brazilian-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/brazilian-apa6.lbx new file mode 100644 index 0000000000..590501e7ab --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/brazilian-apa6.lbx @@ -0,0 +1,136 @@ +\ProvidesFile{brazilian-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation] +\InheritBibliographyExtras{brazilian} + +% (APA 6.22) The example abbreviations + +\NewBibliographyString{revisededition} +\NewBibliographyString{typechair} +\NewBibliographyString{typechairs} +\NewBibliographyString{typevolume} +\NewBibliographyString{typevolumes} +\NewBibliographyString{typeseries} +\NewBibliographyString{typeseriess} +\NewBibliographyString{typevolseries} +\NewBibliographyString{typevolseriess} +\NewBibliographyString{on} +\NewBibliographyString{retrieved} +\NewBibliographyString{available} +\NewBibliographyString{from} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\DeclareBibliographyStrings{% + inherit = {brazilian}, + revisededition = {{Edi\c{c}\~ao\space Revisada}{ed\adddotspace rev\adddot}}, + on = {{em}{em}}, + retrieved = {{recuperado}{recuperado}}, + available = {{dispon\'ivel}{disp.}}, + from = {{de}{de}}, + archivedat = {{arquivado\space em}{arquivado\space em}}, + reviewof = {{Revis\~ao\space de}{revis\~ao\space de}}, + producer = {{producer}{producer}}, + execproducer = {{executive producer}{executive producer}}, + director = {{director}{director}}, + writer = {{writer}{writer}}, + with = {{with}{with}}, + origyear = {{trabalho\space original\space publicado\space em}{trabalho\space original\space publicado\space em}}, + typechair = {{Coordenador}{Coord\adddot}}, + typechairs = {{Coordenadores}{Coords\adddot}}, + typevolume = {{Editor\space do\space Volume}{Ed\adddotspace Vol\adddot}}, + typevolumes = {{Editores\space do\space Volume}{Eds\adddotspace Vol\adddot}}, + typeseries = {{Editor\space da\space S\'erie}{Ed\adddotspace S\'erie\adddot}}, + typeseriess = {{Editores\space da\space S\'erie}{Eds\adddotspace S\'erie\adddot}}, + typevolseries = {{Editor\space da\space S\'erie\space e\space do\space Volume}{Ed\adddotspace Vol\space\&\space S\'erie}}, + typevolseriess = {{Editores\space da\space S\'erie\space e\space do\space Volume}{Eds\adddotspace Vol\space\&\space S\'erie}}, + annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, + beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, +} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.10 Example 68) Drop end* when they are the same as * + +% You must use \printdate to get here otherwise it will be ignored + +\DeclareBibliographyExtras{% + \def\urldatecomma{\addcomma\addspace}% + \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}}}% + \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#3}% + {}% + {\stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3}% + {}% + {\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#1}% + {}% + {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}% + {}% + {\addspace}% + \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +\endinput diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/british-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/british-apa6.lbx new file mode 100644 index 0000000000..3843f5ce94 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/british-apa6.lbx @@ -0,0 +1,142 @@ +\ProvidesFile{british-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation] +\InheritBibliographyExtras{british} + +% (APA 6.22) The example abbreviations + +\NewBibliographyString{revisededition} +\NewBibliographyString{typechair} +\NewBibliographyString{typechairs} +\NewBibliographyString{typevolume} +\NewBibliographyString{typevolumes} +\NewBibliographyString{typeseries} +\NewBibliographyString{typeseriess} +\NewBibliographyString{typevolseries} +\NewBibliographyString{typevolseriess} +\NewBibliographyString{on} +\NewBibliographyString{retrieved} +\NewBibliographyString{available} +\NewBibliographyString{from} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\DeclareBibliographyStrings{% + inherit = {british}, + revisededition = {{Revised\space Edition}{rev\adddotspace ed\adddot}}, + page = {{Page}{{}p\adddot}}, + pages = {{Pages}{{}pp\adddot}}, + on = {{on}{on}}, + retrieved = {{retrieved}{retrieved}}, + available = {{available}{available}}, + from = {{from}{from}}, + archivedat = {{archived\space at}{archived\space at}}, + reviewof = {{Review\space of}{review\space of}}, + producer = {{producer}{producer}}, + execproducer = {{executive producer}{executive producer}}, + director = {{director}{director}}, + writer = {{writer}{writer}}, + with = {{with}{with}}, + paragraph = {{\P}{\P}}, + paragraphs = {{\P\P}{\P\P}}, + mathesis = {{Master's thesis}{Master's\addabbrvspace thesis}}, + phdthesis = {{Doctoral\addabbrvspace dissertation}{Doctoral\addabbrvspace dissertation}}, + origyear = {{original\space work\space published}{original\space work\space published}}, + typechair = {{Chair}{Chair}}, + typechairs = {{Chairs}{Chairs}}, + typevolume = {{Volume\space Editor}{Vol\adddotspace Ed\adddot}}, + typevolumes = {{Volume\space Editors}{Vol\adddotspace Eds\adddot}}, + typeseries = {{Series\space Editor}{Series\space Ed\adddot}}, + typeseriess = {{Series\space Editors}{Series\space Eds\adddot}}, + typevolseries = {{Series\space and\space Volume\space Editor}{Series\space\& Vol\adddotspace Ed\adddot}}, + typevolseriess = {{Series\space and\space Volume\space Editors}{Series\space\& Vol\adddotspace Eds\adddot}}, + annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, + beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, +} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.10 Example 68) Drop end* when they are the same as * + +% You must use \printdate to get here otherwise it will be ignored + +\DeclareBibliographyExtras{% + \def\urldatecomma{\addcomma\addspace}% + \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}}}% + \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#2}% + {}% + {\mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}% + \iffieldundef{#1}% + {}% + {\ifthenelse{\iffieldundef{#3}}% + {\ifthenelse{\iffieldundef{#2}}% + {}% + {\addspace}}% + {\addcomma\addspace}% + \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +\endinput diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/danish-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/danish-apa6.lbx new file mode 100644 index 0000000000..c157ec8955 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/danish-apa6.lbx @@ -0,0 +1,155 @@ +\ProvidesFile{danish-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation] +\InheritBibliographyExtras{danish} + +% (APA 6.22) The example abbreviations + +\NewBibliographyString{revisededition} +\NewBibliographyString{typechair} +\NewBibliographyString{typechairs} +\NewBibliographyString{typevolume} +\NewBibliographyString{typevolumes} +\NewBibliographyString{typeseries} +\NewBibliographyString{typeseriess} +\NewBibliographyString{typevolseries} +\NewBibliographyString{typevolseriess} +\NewBibliographyString{on} +\NewBibliographyString{retrieved} +\NewBibliographyString{available} +\NewBibliographyString{from} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\DeclareBibliographyStrings{% + inherit = {danish}, + revisededition = {{revideret\space udgave}{rev\adddotspace udg\adddot}}, + page = {{side}{{}s\adddot}}, + pages = {{sider}{{}s\adddot}}, + on = {{p{\aa}}{p{\aa}}}, + retrieved = {{hentet}{hentet}}, + available = {{tilgængelig}{tilgængelig}}, + from = {{fra}{fra}}, + archivedat = {{arkiveret\space ved}{arkiveret\space ved}}, + reviewof = {{anmeldelse\space af}{anmeldelse\space af}}, + producer = {{producer}{producer}}, + execproducer = {{producent}{producent}}, + director = {{instrukt{\o}r}{instrukt{\o}r}}, + writer = {{manuskript}{manuskript}}, + with = {{med}{med}}, + paragraph = {{\P}{\P}}, + paragraphs = {{\P\P}{\P\P}}, + january = {{januar}{januar}}, + february = {{februar}{februar}}, + march = {{marts}{marts}}, + april = {{april}{april}}, + may = {{maj}{maj}}, + june = {{juni}{juni}}, + july = {{juli}{juli}}, + august = {{august}{august}}, + september = {{september}{september}}, + october = {{oktober}{oktober}}, + november = {{november}{november}}, + december = {{december}{december}}, + mathesis = {{Speciale}{Speciale}}, + phdthesis = {{Ph.d.-afhandling}{Ph.d.-afhandling}}, + origyear = {{oprindeligt\space offentliggjort}{oprindeligt\space offentliggjort}}, + typechair = {{ordstyrer}{ordstyrer}}, + typechairs = {{ordstyrere}{ordstyrere}}, + typevolume = {{bindredakt{\o}r}{bindred\adddot}}, + typevolumes = {{bindredakt{\o}rer}{bindred\adddot}}, + typeseries = {{serieredakt{\o}r}{seriered\adddot}}, + typeseriess = {{serieredakt{\o}rer}{seriered\adddot}}, + typevolseries = {{serie- og bindredakt{\o}r}{serie- og bindred\adddot}}, + typevolseriess = {{serie- og bindredakt{\o}rer}{serie- og bindred\adddot}}, + annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, + beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, +} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.10 Example 68) Drop end* when they are the same as * + +% You must use \printdate to get here otherwise it will be ignored + +\DeclareBibliographyExtras{% + \def\urldatecomma{\addcomma\addspace}% + \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\thefield{#1}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#1}% + {} + {\addcomma\addspace}% + \stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3} + {\iffieldundef{#1} + {} + {\addspace}}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\thefield{#1}\printfield{extradate}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#1}% + {} + {\addcomma\addspace}% + \stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3} + {\iffieldundef{#1} + {} + {\addspace}}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#3}% + {}% + {\stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3}% + {}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#1}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \thefield{#1}}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/dutch-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/dutch-apa6.lbx new file mode 100644 index 0000000000..6756cce9c4 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/dutch-apa6.lbx @@ -0,0 +1,142 @@ +\ProvidesFile{dutch-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation] +\InheritBibliographyExtras{dutch} + +% (APA 6.22) The example abbreviations + +\NewBibliographyString{revisededition} +\NewBibliographyString{typechair} +\NewBibliographyString{typechairs} +\NewBibliographyString{typevolume} +\NewBibliographyString{typevolumes} +\NewBibliographyString{typeseries} +\NewBibliographyString{typeseriess} +\NewBibliographyString{typevolseries} +\NewBibliographyString{typevolseriess} +\NewBibliographyString{on} +\NewBibliographyString{retrieved} +\NewBibliographyString{available} +\NewBibliographyString{from} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\DeclareBibliographyStrings{% + inherit = {dutch}, + revisededition = {{Herziene\space editie}{herz\adddotspace ed\adddot}}, + page = {{Pagina}{{}p\adddot}}, + pages = {{Pagina's}{{}pp\adddot}}, + on = {{op}{op}}, + retrieved = {{verkregen}{verkregen}}, + available = {{beschikbaar}{beschikbaar}}, + from = {{van}{van}}, + archivedat = {{gearchiveerd\space onder}{gearchiveerd\space onder}}, + reviewof = {{bespreking\space van}{bespreking\space van}}, + producer = {{producent}{producent}}, + execproducer = {{uitvoerend producent}{uitvoerend producent}}, + director = {{regisseur}{regisseur}}, + writer = {{schrijver}{schrijver}}, + with = {{met}{met}},% FIXME: check + paragraph = {{par\adddot}{par\adddot}}, + paragraphs = {{par\adddot}{par\adddot}}, + mathesis = {{masterscriptie}{masterscriptie}}, + phdthesis = {{proefschrift}{proefschrift}}, + origyear = {{origineel\space werk\space gepubliceerd}{origineel\space werk\space gepubliceerd}}, + typechair = {{hoofd}{hoofd}}, + typechairs = {{hoofden}{hoofden}}, + typevolume = {{Deelredacteur}{Deelred\adddot}}, + typevolumes = {{Deelredacteuren}{Deelred\adddot}}, + typeseries = {{Reeksredacteur}{Reeksred\adddot}}, + typeseriess = {{Reeksredacteuren}{Reeksred\adddot}}, + typevolseries = {{Reeks-\space en\space deelredacteur}{Reeks-\space\& deelred\adddot}}, + typevolseriess = {{Reeks-\space en\space deelredacteuren}{Reeks-\space\& deelred\adddot}}, + annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, + beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, +} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.10 Example 68) Drop end* when they are the same as * + +% You must use \printdate to get here otherwise it will be ignored + +\DeclareBibliographyExtras{% + \def\urldatecomma{\addcomma\addspace}% + \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}}}% + \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#3}% + {}% + {\stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3}% + {}% + {\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#1}% + {}% + {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}% + {}% + {\addspace}% + \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +\endinput diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/english-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/english-apa6.lbx new file mode 100644 index 0000000000..a028706c99 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/english-apa6.lbx @@ -0,0 +1,144 @@ +\ProvidesFile{english-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation] +\InheritBibliographyExtras{english} + +% (APA 6.22) The example abbreviations + +\NewBibliographyString{revisededition} +\NewBibliographyString{typechair} +\NewBibliographyString{typechairs} +\NewBibliographyString{typevolume} +\NewBibliographyString{typevolumes} +\NewBibliographyString{typeseries} +\NewBibliographyString{typeseriess} +\NewBibliographyString{typevolseries} +\NewBibliographyString{typevolseriess} +\NewBibliographyString{on} +\NewBibliographyString{retrieved} +\NewBibliographyString{available} +\NewBibliographyString{from} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\DeclareBibliographyStrings{% + inherit = {american}, + revisededition = {{Revised\space Edition}{rev\adddotspace ed\adddot}}, + page = {{Page}{{}p\adddot}}, + pages = {{Pages}{{}pp\adddot}}, + on = {{on}{on}}, + retrieved = {{retrieved}{retrieved}}, + available = {{available}{available}}, + from = {{from}{from}}, + archivedat = {{archived\space at}{archived\space at}}, + with = {{with}{with}}, + reprintas = {{reprinted as}{reprinted as}}, + reprintfrom = {{reprinted from}{reprinted from}}, + reviewof = {{review\space of}{review\space of}}, + paragraph = {{\P}{\P}}, + paragraphs = {{\P\P}{\P\P}}, + producer = {{producer}{producer}}, + execproducer = {{executive producer}{executive producer}}, + director = {{director}{director}}, + writer = {{writer}{writer}}, + mathesis = {{Master's\addabbrvspace thesis}{Master's\addabbrvspace thesis}}, + phdthesis = {{Doctoral\addabbrvspace dissertation}{Doctoral\addabbrvspace dissertation}}, + origyear = {{original\space work\space published}{original\space work\space published}}, + typechair = {{Chair}{Chair}}, + typechairs = {{Chairs}{Chairs}}, + typevolume = {{Volume\space Editor}{Vol\adddotspace Ed\adddot}}, + typevolumes = {{Volume\space Editors}{Vol\adddotspace Eds\adddot}}, + typeseries = {{Series\space Editor}{Series\space Ed\adddot}}, + typeseriess = {{Series\space Editors}{Series\space Eds\adddot}}, + typevolseries = {{Series\space and\space Volume\space Editor}{Series\space\& Vol\adddotspace Ed\adddot}}, + typevolseriess = {{Series\space and\space Volume\space Editors}{Series\space\& Vol\adddotspace Eds\adddot}}, + annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, + beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, +} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.10 Example 68) Drop end* when they are the same as * + +% You must use \print*date to get here otherwise it will be ignored + +\DeclareBibliographyExtras{% + \def\urldatecomma{\addcomma\addspace}% + \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}}}% + \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#2}% + {}% + {\mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}% + \iffieldundef{#1}% + {}% + {\ifthenelse{\iffieldundef{#3}}% + {\ifthenelse{\iffieldundef{#2}}% + {}% + {\addspace}}% + {\addcomma\addspace}% + \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +\endinput diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/french-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/french-apa6.lbx new file mode 100644 index 0000000000..c25b3f181f --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/french-apa6.lbx @@ -0,0 +1,137 @@ +\ProvidesFile{french-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation] +\InheritBibliographyExtras{french} + +% (APA 6.22) The example abbreviations + +\NewBibliographyString{revisededition} +\NewBibliographyString{typechair} +\NewBibliographyString{typechairs} +\NewBibliographyString{typevolume} +\NewBibliographyString{typevolumes} +\NewBibliographyString{typeseries} +\NewBibliographyString{typeseriess} +\NewBibliographyString{typevolseries} +\NewBibliographyString{typevolseriess} +\NewBibliographyString{on} +\NewBibliographyString{retrieved} +\NewBibliographyString{available} +\NewBibliographyString{from} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\DeclareBibliographyStrings{% + inherit = {french}, + inpress = {{sous presse}{sous presse}},% remove when biblatex has it + revisededition = {{\'Edition\space R\'evis\'e}{\'Ed\adddotspace R\'ev\adddot}}, + page = {{Page}{{}p\adddot}}, + pages = {{Pages}{{}p\adddot}}, + on = {{le}{le}}, + retrieved = {{R\'ecup\'er\'ee}{R\'ecup\'er\'ee}}, + with = {{avec}{avec}}, + producer = {{producteur}{producteur}}, + execproducer = {{producteur ex\'ecutif}{producteur ex\'ecutif}}, + director = {{r\'ealisateur}{r\'ealisateur}}, + writer = {{\'ecrivain}{\'ecrivain}}, + available = {{disponible}{disponible}}, + from = {{\`a\space partir\space de}{\`a\space partir\space de}}, + archivedat = {{archiv\'es\space \`a}{archiv\'es\space \`a}}, + reviewof = {{critique\space de}{critique\space de}}, + paragraph = {{\P}{\P}}, + paragraphs = {{\P}{\P}}, + origyear = {{Date\space de\space premi\`ere publication}{Date\space de\space premi\`ere publication}}, + typechair = {{Ma\^itre\space de\space Conf\'erence}{Ma\^itre\space de\space Conf\'erence}}, + typechairs = {{Ma\^itres\space de\space Conf\'erence}{Ma\^itres\space de\space Conf\'erence}}, + typevolume = {{R\'edacteur\space du\space volume}{R\'ed\adddotspace vol\adddot}}, + typevolumes = {{R\'edacteur\space du\space volume}{R\'eds\adddotspace vol\adddot}}, + typeseries = {{R\'edacteur\space de\space la\space s\'erie}{R\'ed\adddotspace ser\adddot}}, + typeseriess = {{R\'edacteurs\space de\space la\space s\'erie}{R\'eds\adddotspace ser\adddot}}, + typevolseries = {{R\'edacteur\space de\space la\space s\'erie\space et\space du volume}{Red\adddotspace vol\space\&\space ser\adddot}}, + typevolseriess = {{Directeurs\space de\space Publication\space et\space R\'edacteurs\space en\space chef}{Reds\adddotspace vol\space\&\space ser\adddot}}, + annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, + beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.10 Example 68) Drop end* when they are the same as * + +% You must use \printdate to get here otherwise it will be ignored +\DeclareBibliographyExtras{% + \def\urldatecomma{\addcomma\addspace}% + \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}}}% + \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#3}% + {}% + {\stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3}% + {}% + {\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#1}% + {}% + {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}% + {}% + {\addspace}% + \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +\endinput diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/galician-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/galician-apa6.lbx new file mode 100644 index 0000000000..f7a118a520 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/galician-apa6.lbx @@ -0,0 +1,153 @@ +\ProvidesFile{galician-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation] +\InheritBibliographyExtras{galician} + +\setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced + +% (APA 6.22) The example abbreviations + +\NewBibliographyString{revisededition} +\NewBibliographyString{typechair} +\NewBibliographyString{typechairs} +\NewBibliographyString{typevolume} +\NewBibliographyString{typevolumes} +\NewBibliographyString{typeseries} +\NewBibliographyString{typeseriess} +\NewBibliographyString{typevolseries} +\NewBibliographyString{typevolseriess} +\NewBibliographyString{on} +\NewBibliographyString{retrieved} +\NewBibliographyString{available} +\NewBibliographyString{from} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\DeclareBibliographyStrings{% + inherit = {galician}, + inpress = {{no prelo}{no prelo}},% remove when biblatex has it + january = {{xaneiro}{xaneiro}}, + february = {{febreiro}{febreiro}}, + march = {{marzo}{marzo}}, + april = {{abril}{abril}}, + may = {{maio}{maio}}, + june = {{xu\~no}{xu\~no}}, + july = {{xullo}{xullo}}, + august = {{agosto}{agosto}}, + september = {{setembro}{setembro}}, + october = {{outubro}{outubro}}, + november = {{novembro}{novembro}}, + december = {{decembro}{decembro}}, + nodate = {{s\adddot d\adddot}{s\adddot d\adddot}}, + mathesis = {{tese\addabbrvspace de\addabbrvspace mestrado}{tese\addabbrvspace de\addabbrvspace mestrado}}, + phdthesis = {{tese\addabbrvspace doutoral}{tese\addabbrvspace doutoral}}, + revisededition = {{edici\'on\space revisada}{edici\'on\space revisada}}, + producer = {{produtor}{produtor}}, + execproducer = {{produtor executivo}{produtor executivo}}, + director = {{director}{director}}, + writer = {{escritor}{escritor}}, + with = {{con}{con}}, + page = {{p\'axina}{{}p\adddot}}, + pages = {{p\'axinas}{{}pp\adddot}}, + on = {{o}{o}}, + retrieved = {{obtido}{obtido}}, + available = {{dispo\~nible}{dispo\~nible}}, + from = {{desde}{desde}}, + archivedat = {{arquivado en}{arquivado en}}, + reviewof = {{revisi\'on\space de}{revisi\'on\space de}}, + paragraph = {{\P}{\P}}, + paragraphs = {{\P\P}{\P\P}}, + origyear = {{data\space orixinal\space de\space publicaci\'on}{data\space orixinal\space de\space publicaci\'on}}, + typechair = {{coordinador}{coord\adddot}}, + typechairs = {{coordinadores}{coords\adddot}}, + typevolume = {{editor\space do\space volume}{ed\adddotspace vol\adddot}}, + typevolumes = {{editores\space do\space volume}{eds\adddotspace vol\adddot}}, + typeseries = {{editor\space da\space serie}{ed\adddotspace ser\adddot}}, + typeseriess = {{editores\space da\space serie}{eds\adddotspace ser\adddot}}, + typevolseries = {{editor\space da\space serie\space e\space do\space volume}{ed\adddotspace vol\space\&\space ser\adddot}}, + typevolseriess = {{editores\space da\space serie\space e\space do\space volume}{eds\adddotspace vol\space\&\space ser\adddot}}, + annodomini = {{d\adddot\space C\adddot}{d\adddot\space C\adddot}}, + beforechrist = {{a\adddot\space C\adddot}{a\adddot\space C\adddot}}, +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.10 Example 68) Drop end* when they are the same as * + +% You must use \printdate to get here otherwise it will be ignored + +\DeclareBibliographyExtras{% + \def\urldatecomma{\addcomma\addspace}% + \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#2}% + {}% + {\stripzeros{\thefield{#3}}\addspace de\addspace}}% + \mkbibmonth{\thefield{#2}}% +}}% + \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#3}% + {}% + {el\addspace\stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {\addspace{en}\addspace}% + {\iffieldundef{#3}% + {en\addspace}% + {\addspace{de}\addspace}% + \mkbibmonth{\thefield{#2}}{\addspace{de}\addspace}}% + \iffieldundef{#1}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \thefield{#1}}}} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +\endinput diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/german-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/german-apa6.lbx new file mode 100644 index 0000000000..2284ae5376 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/german-apa6.lbx @@ -0,0 +1,212 @@ +\ProvidesFile{german-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation] +\InheritBibliographyExtras{german} + +% (APA 6.22) The example abbreviations + +% Following DGPs guidlines for German/Austrian +% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf + +\NewBibliographyString{revisededition} +\NewBibliographyString{typechair} +\NewBibliographyString{typechairs} +\NewBibliographyString{typevolume} +\NewBibliographyString{typevolumes} +\NewBibliographyString{typeseries} +\NewBibliographyString{typeseriess} +\NewBibliographyString{typevolseries} +\NewBibliographyString{typevolseriess} +\NewBibliographyString{on} +\NewBibliographyString{retrieved} +\NewBibliographyString{available} +\NewBibliographyString{from} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\DeclareBibliographyStrings{% + inherit = {german}, + andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, + revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}}, + producer = {{Produzent}{Produzent}}, + execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}}, + director = {{Regisseur}{Regisseur}}, + writer = {{Autor}{Autor}}, + page = {{Seite}{{}S\adddot}}, + pages = {{Seiten}{{}S\adddot}}, + on = {{am}{am}}, + retrieved = {{Zugriff}{Zugriff}}, + available = {{Erh\"altlich}{Erh\"altlich}}, + with = {{mit}{mit}}, + from = {{unter}{unter}}, + archivedat = {{archiviert\space unter}{archiviert\space unter}}, + reviewof = {{Rezension\space des}{Rezension\space des}}, + paragraph = {{\P}{\P}}, + paragraphs = {{\P\P}{\P\P}}, + origyear = {{Original\space erschienen}{Original\space erschienen}}, + typechair = {{Leitung}{Leitung}}, + typechairs = {{Leitung}{Leitung}}, + typevolume = {{Bandherausgeber}{Bandhrsg\adddot}}, + typevolumes = {{Bandherausgeber}{Bandhrsg\adddot}}, + typeseries = {{Reihenherausgeber}{Reihenhrsg\adddot}}, + typeseriess = {{Reihenherausgeber}{Reihenhrsg\adddot}}, + typevolseries = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}}, + typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}}, + annodomini = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}}, + beforechrist = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}}, +} + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.10 Example 68) Drop end* when they are the same as * + +% You must use \printdate to get here otherwise it will be ignored +\DeclareBibliographyExtras{% + \renewcommand{\apashortdash}{~}% + \def\urldatecomma{\addspace}% + \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}% + \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}} + {} + {\addcomma\space}}% + \iffieldundef{#3}% + {}% + {\mkbibordinal{\thefield{#3}}% + \iffieldundef{#2} + {} + {\addspace}}% + \iffieldundef{#2}% + {}% + {\mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}% + \printfield{extradate}% + \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}} + {} + {\addcomma\space}}% + \iffieldundef{#3}% + {}% + {\mkbibordinal{\thefield{#3}}% + \iffieldundef{#2} + {} + {\addspace}}% + \iffieldundef{#2}% + {}% + {\mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#3}% + {}% + {\mkbibordinal{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3}% + {}% + {\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#1}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}% + \def\apa@lbx@de@mkdaterangeapalong#1{% + \begingroup + \blx@metadateinfo{#1}% + \iffieldundef{#1year}{} + {\datecircaprint + \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ... + {\printtext{% + \iffieldsequal{#1year}{#1endyear} + {\iffieldsequal{#1month}{#1endmonth} + {\mkbibdateapalongmdy{}{}{#1day}} + {\mkbibdateapalongmdy{}{#1month}{#1day}}} + {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}% + \iffieldundef{#1endyear}% + {}% + {\iffieldequalstr{#1endyear}{}% open-ended range? + {\mbox{\bibdatedash}} + {\bibdatedash% + \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}% + \dateuncertainprint}} + {\printtext{% + \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}} + and test {\iffieldsequal{#1month}{#1endmonth}}} + {\mkbibdateapalong{#1year}{}{#1day}}% + {\mkbibdateapalong{#1year}{#1month}{#1day}}% + \dateeraprint{#1year}% + \iffieldundef{#1endyear}% + {}% + {\iffieldequalstr{#1endyear}{}% open-ended range? + {\mbox{\bibdatedash}} + {\bibdatedash% + \iffieldsequal{#1year}{#1endyear}% + {\mkbibdateapalong{}{#1endmonth}{#1endday}}% + {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}% + \dateeraprint{#1endyear}}}% + \enddateuncertainprint}}}}% + \endgroup}% + \def\apa@lbx@de@mkdaterangeapalongextra#1{% + \begingroup + \blx@metadateinfo{#1}% + \iffieldundef{#1year}{} + {\printtext{% + \datecircaprint + \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}} + and test {\iffieldsequal{#1month}{#1endmonth}}} + {\mkbibdateapalongextra{#1year}{}{#1day}}% + {\mkbibdateapalongextra{#1year}{#1month}{#1day}}% + \dateeraprint{#1year}% + \dateuncertainprint + \iffieldundef{#1endyear}% + {}% + {\iffieldequalstr{#1endyear}{}% open-ended range? + {\mbox{\bibdatedash}} + {\bibdatedash% + \iffieldsequal{#1year}{#1endyear}% + {\mkbibdateapalongextra{}{#1endmonth}{#1endday}} + {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}% + \dateeraprint{#1endyear}}}% + \enddateuncertainprint}}}% + \endgroup}% + \savecommand\mkdaterangeapalong + \savecommand\mkdaterangeapalongextra + \def\mkdaterangeapalong{% + \apa@lbx@de@mkdaterangeapalong}% + \def\mkdaterangeapalongextra#1{% + \apa@lbx@de@mkdaterangeapalongextra{#1}}% +} + +\UndeclareBibliographyExtras{% + \restorecommand\mkdaterangeapalong + \restorecommand\mkdaterangeapalongextra +} +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\endinput diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/greek-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/greek-apa6.lbx new file mode 100644 index 0000000000..89d3fd03f6 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/greek-apa6.lbx @@ -0,0 +1,159 @@ +\ProvidesFile{greek-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation] +\InheritBibliographyExtras{greek} + +% (APA 6.22) The example abbreviations + +\NewBibliographyString{revisededition} +\NewBibliographyString{typechair} +\NewBibliographyString{typechairs} +\NewBibliographyString{typevolume} +\NewBibliographyString{typevolumes} +\NewBibliographyString{typeseries} +\NewBibliographyString{typeseriess} +\NewBibliographyString{typevolseries} +\NewBibliographyString{typevolseriess} +\NewBibliographyString{on} +\NewBibliographyString{retrieved} +\NewBibliographyString{available} +\NewBibliographyString{from} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\DeclareBibliographyStrings{% + inherit = {greek}, + revisededition = {{ΑναθεωÏημÎνη\space Έκδοση}{εκδ \adddotspace εκ\adddot}}, + page = {{Σελίδα}{{}σ\adddot}}, + pages = {{Σελίδες}{{}σσ\adddot}}, + on = {{στις}{στις}}, + retrieved = {{ανακτήθηκε}{ανακτήθηκε}}, + available = {{διαθÎσιμο}{διαθÎσιμο}}, + from = {{από}{από}}, + archivedat = {{αÏχειοθετήθηκε\space στις}{αÏχειοθετήθηκε\space στις}}, + reviewof = {{ΑναθεώÏηση\space του}{αναθεώÏηση\space του}}, + producer = {{producer}{producer}}, + execproducer = {{executive producer}{executive producer}}, + director = {{director}{director}}, + writer = {{writer}{writer}}, + with = {{with}{with}}, + paragraph = {{\P}{\P}}, + paragraphs = {{\P\P}{\P\P}}, + mathesis = {{Μεταπτυχιακή εÏγασία}{Μεταπτυχιακή\addabbrvspace εÏγασία}}, + phdthesis = {{ΔιδακτοÏική\addabbrvspace διατÏιβή}{ΔιδακτοÏική\addabbrvspace διατÏιβή}}, + origyear = {{Ï€Ïωτότυπη\space εÏγασία\space δημοσιευμÎνη}{Ï€Ïωτότυπη\space εÏγασία\space δημοσιευμÎνη}}, + typechair = {{Î ÏόεδÏος}{Î ÏόεδÏος}}, + typechairs = {{Î ÏόεδÏοι}{Î ÏόεδÏοι}}, + typevolume = {{Τόμος\space Συντάκτης}{Τομ\adddotspace Συν\adddot}}, + typevolumes = {{Τόμοι\space Συντάκτες}{Τομ\adddotspace Συν\adddot}}, + typeseries = {{ΣειÏά\space Συντάκτης}{ΣειÏά\space Συν\adddot}}, + typeseriess = {{ΣειÏά\space Συντάκτες}{ΣειÏά\space Συν\adddot}}, + typevolseries = {{ΣειÏά\space και\space Τόμος\space Συντάκτης}{ΣειÏά\space\& Τομ\adddotspace Συν\adddot}}, + typevolseriess = {{ΣειÏά\space και\space Τόμος\space Συντάκτες}{ΣειÏά\space\& Τομ\adddotspace Συν\adddot}}, + annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, + beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, +} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.10 Example 68) Drop end* when they are the same as * + +% You must use \printdate to get here otherwise it will be ignored + +\DeclareBibliographyExtras{% + \def\urldatecomma{\addcomma\addspace}% + \protected\def\lbx@gr@mkbibmonth#1{% + \ifcase0#1\relax + #1\BibliographyWarning{Month out of range}% + \or\abx@bibmonth{datejanuary}% + \or\abx@bibmonth{datefebruary}% + \or\abx@bibmonth{datemarch}% + \or\abx@bibmonth{dateapril}% + \or\abx@bibmonth{datemay}% + \or\abx@bibmonth{datejune}% + \or\abx@bibmonth{datejuly}% + \or\abx@bibmonth{dateaugust}% + \or\abx@bibmonth{dateseptember}% + \or\abx@bibmonth{dateoctober}% + \or\abx@bibmonth{datenovember}% + \or\abx@bibmonth{datedecember}% + \else + #1\BibliographyWarning{Month out of range}% + \fi}% + \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \lbx@gr@mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \lbx@gr@mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}}}% + \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#3}% + {}% + {\stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3}% + {}% + {\addspace}% + \lbx@gr@mkbibmonth{\thefield{#2}}}% + \iffieldundef{#1}% + {}% + {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}% + {}% + {\addspace}% + \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\endinput diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/italian-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/italian-apa6.lbx new file mode 100644 index 0000000000..9c82fa5377 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/italian-apa6.lbx @@ -0,0 +1,142 @@ +\ProvidesFile{italian-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation] +\InheritBibliographyExtras{italian} + +% (APA 6.22) The example abbreviations + +\NewBibliographyString{revisededition} +\NewBibliographyString{typechair} +\NewBibliographyString{typechairs} +\NewBibliographyString{typevolume} +\NewBibliographyString{typevolumes} +\NewBibliographyString{typeseries} +\NewBibliographyString{typeseriess} +\NewBibliographyString{typevolseries} +\NewBibliographyString{typevolseriess} +\NewBibliographyString{on} +\NewBibliographyString{retrieved} +\NewBibliographyString{available} +\NewBibliographyString{from} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\DeclareBibliographyStrings{% + inherit = {italian}, + revisededition = {{Edizione\space Revisionata}{Ed\adddotspace Rev\adddot}}, + page = {{Pagina}{{}p\adddot}}, + pages = {{Pagine}{{}pp\adddot}}, + on = {{il}{il}}, + retrieved = {{recuperato}{recuperato}}, + available = {{disponibile}{disponibile}}, + from = {{da}{da}}, + archivedat = {{archiviato\space il}{archiviato\space il}}, + reviewof = {{Revisione\space di}{revisione\space di}}, + producer = {{producer}{producer}}, + execproducer = {{executive producer}{executive producer}}, + director = {{director}{director}}, + writer = {{writer}{writer}}, + with = {{with}{with}}, + paragraph = {{\P}{\P}}, + paragraphs = {{\P\P}{\P\P}}, + mathesis = {{Tesi\space di\space laurea}{Tesi\space di\space laurea}}, + phdthesis = {{Tesi\space di\space dottorato}{Tesi\space di\space dottorato}}, + origyear = {{Data\space di\space prima\space pubblicazione}{Data\space di\space prima\space pubblicazione}}, + typechair = {{Moderatore}{Moderatore}}, + typechairs = {{Moderatori}{Moderatori}}, + typevolume = {{Redattore\space del\space Volume}{Red\adddotspace Vol\adddot}}, + typevolumes = {{Redattori\space del\space Volume}{Red\adddotspace Vol\adddot}}, + typeseries = {{Curatore\space della\space Collana}{Cur\addotspace Coll\adddot}}, + typeseriess = {{Curatori\space della\space Collana}{Cur\addotspace Coll\adddot}}, + typevolseries = {{Curatore\space della\space Collana\space e\space del\space Volume}{Cur\addotspace Coll\addot\& Vol\adddot}}, + typevolseriess = {{Curatori\space della\space Collana\space e\space del\space Volume}{Cur\addotspace Coll\addot\& Vol\adddot}}, + annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, + beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, +} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.10 Example 68) Drop end* when they are the same as * + +% You must use \printdate to get here otherwise it will be ignored + +\DeclareBibliographyExtras{% + \def\urldatecomma{\addcomma\addspace}% + \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}}}% + \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#2}% + {}% + {\mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}% + \iffieldundef{#1}% + {}% + {\ifthenelse{\iffieldundef{#3}}% + {\ifthenelse{\iffieldundef{#2}}% + {}% + {\addspace}}% + {\addcomma\addspace}% + \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +\endinput diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/naustrian-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/naustrian-apa6.lbx new file mode 100644 index 0000000000..0b9a18d7d3 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/naustrian-apa6.lbx @@ -0,0 +1,214 @@ +\ProvidesFile{naustrian-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation] +\InheritBibliographyExtras{naustrian} + +% (APA 6.22) The example abbreviations + +% Following DGPs guidlines for German/Austrian +% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf + +\NewBibliographyString{revisededition} +\NewBibliographyString{typechair} +\NewBibliographyString{typechairs} +\NewBibliographyString{typevolume} +\NewBibliographyString{typevolumes} +\NewBibliographyString{typeseries} +\NewBibliographyString{typeseriess} +\NewBibliographyString{typevolseries} +\NewBibliographyString{typevolseriess} +\NewBibliographyString{on} +\NewBibliographyString{retrieved} +\NewBibliographyString{available} +\NewBibliographyString{from} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\DeclareBibliographyStrings{% + inherit = {naustrian}, + andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, + revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}}, + producer = {{Produzent}{Produzent}}, + execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}}, + director = {{Autor}{Autor}}, + writer = {{Schriftsteller}{Schriftsteller}}, + with = {{mit}{mit}}, + page = {{Seite}{{}S\adddot}}, + pages = {{Seiten}{{}S\adddot}}, + on = {{am}{am}}, + retrieved = {{Zugriff\space am}{Zugriff\space am}}, + available = {{erh\"altlich}{erh\"altlich}}, + from = {{unter}{unter}}, + archivedat = {{archiviert\space unter}{archiviert\space unter}}, + reviewof = {{Rezension\space des}{Rezension\space des}}, + paragraph = {{\P}{\P}}, + paragraphs = {{\P\P}{\P\P}}, + origyear = {{Original\space erschienen}{Original\space erschienen}}, + typechair = {{Leitung}{Leitung}}, + typechairs = {{Leitung}{Leitung}}, + typevolume = {{Bandherausgeber}{Bandhrsg\adddot}}, + typevolumes = {{Bandherausgeber}{Bandhrsg\adddot}}, + typeseries = {{Reihenherausgeber}{Reihenhrsg\adddot}}, + typeseriess = {{Reihenherausgeber}{Reihenhrsg\adddot}}, + typevolseries = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}}, + typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}}, + annodomini = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}}, + beforechrist = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}}, +} + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.10 Example 68) Drop end* when they are the same as * + +% You must use \printdate to get here otherwise it will be ignored +\DeclareBibliographyExtras{% + \renewcommand{\apashortdash}{~}% + \def\urldatecomma{\addspace}% + \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}% + \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}} + {} + {\addcomma\space}}% + \iffieldundef{#3}% + {}% + {\mkbibordinal{\thefield{#3}}% + \iffieldundef{#2} + {} + {\addspace}}% + \iffieldundef{#2}% + {}% + {\mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}% + \printfield{extradate}% + \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}} + {} + {\addcomma\space}}% + \iffieldundef{#3}% + {}% + {\mkbibordinal{\thefield{#3}}% + \iffieldundef{#2} + {} + {\addspace}}% + \iffieldundef{#2}% + {}% + {\mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#3}% + {}% + {\mkbibordinal{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3}% + {}% + {\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#1}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}% + \def\apa@lbx@de@mkdaterangeapalong#1{% + \begingroup + \blx@metadateinfo{#1}% + \iffieldundef{#1year}{} + {\datecircaprint + \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ... + {\printtext{% + \iffieldsequal{#1year}{#1endyear} + {\iffieldsequal{#1month}{#1endmonth} + {\mkbibdateapalongmdy{}{}{#1day}} + {\mkbibdateapalongmdy{}{#1month}{#1day}}} + {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}% + \iffieldundef{#1endyear}% + {}% + {\iffieldequalstr{#1endyear}{}% open-ended range? + {\mbox{\bibdatedash}} + {\bibdatedash% + \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}% + \dateuncertainprint}} + {\printtext{% + \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}} + and test {\iffieldsequal{#1month}{#1endmonth}}} + {\mkbibdateapalong{#1year}{}{#1day}}% + {\mkbibdateapalong{#1year}{#1month}{#1day}}% + \dateeraprint{#1year}% + \iffieldundef{#1endyear}% + {}% + {\iffieldequalstr{#1endyear}{}% open-ended range? + {\mbox{\bibdatedash}} + {\bibdatedash% + \iffieldsequal{#1year}{#1endyear}% + {\mkbibdateapalong{}{#1endmonth}{#1endday}}% + {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}% + \dateeraprint{#1endyear}}}% + \enddateuncertainprint}}}}% + \endgroup}% + \def\apa@lbx@de@mkdaterangeapalongextra#1{% + \begingroup + \blx@metadateinfo{#1}% + \iffieldundef{#1year}{} + {\printtext{% + \datecircaprint + \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}} + and test {\iffieldsequal{#1month}{#1endmonth}}} + {\mkbibdateapalongextra{#1year}{}{#1day}}% + {\mkbibdateapalongextra{#1year}{#1month}{#1day}}% + \dateeraprint{#1year}% + \dateuncertainprint + \iffieldundef{#1endyear}% + {}% + {\iffieldequalstr{#1endyear}{}% open-ended range? + {\mbox{\bibdatedash}} + {\bibdatedash% + \iffieldsequal{#1year}{#1endyear}% + {\mkbibdateapalongextra{}{#1endmonth}{#1endday}} + {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}% + \dateeraprint{#1endyear}}}% + \enddateuncertainprint}}}% + \endgroup}% + \savecommand\mkdaterangeapalong + \savecommand\mkdaterangeapalongextra + \def\mkdaterangeapalong{% + \apa@lbx@de@mkdaterangeapalong}% + \def\mkdaterangeapalongextra#1{% + \apa@lbx@de@mkdaterangeapalongextra{#1}}% +} + +\UndeclareBibliographyExtras{% + \restorecommand\mkdaterangeapalong + \restorecommand\mkdaterangeapalongextra +} + + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\endinput diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/ngerman-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/ngerman-apa6.lbx new file mode 100644 index 0000000000..2d01ef9607 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/ngerman-apa6.lbx @@ -0,0 +1,215 @@ +\ProvidesFile{ngerman-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation] +\InheritBibliographyExtras{ngerman} + +% (APA 6.22) The example abbreviations + +% Following DGPs guidlines for German/Austrian +% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf + +\NewBibliographyString{revisededition} +\NewBibliographyString{typechair} +\NewBibliographyString{typechairs} +\NewBibliographyString{typevolume} +\NewBibliographyString{typevolumes} +\NewBibliographyString{typeseries} +\NewBibliographyString{typeseriess} +\NewBibliographyString{typevolseries} +\NewBibliographyString{typevolseriess} +\NewBibliographyString{on} +\NewBibliographyString{retrieved} +\NewBibliographyString{available} +\NewBibliographyString{from} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\DeclareBibliographyStrings{% + inherit = {ngerman}, + abstract = {{Abstract}{Abstract}}, + andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, + revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}}, + producer = {{Produzent}{Produzent}}, + execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}}, + director = {{Regisseur}{Regisseur}}, + writer = {{Autor}{Autor}}, + with = {{mit}{mit}}, + page = {{Seite}{{}S\adddot}}, + pages = {{Seiten}{{}S\adddot}}, + on = {{auf}{auf}}, + retrieved = {{verf\"ugbar}{verf\"ugbar}}, + available = {{Erh\"altlich}{Erh\"altlich}}, + from = {{unter}{unter}}, + archivedat = {{archiviert\space unter}{archiviert\space unter}}, + reviewof = {{Rezension\space des}{Rezension\space des}}, + paragraph = {{\P}{\P}}, + paragraphs = {{\P\P}{\P\P}}, + origyear = {{Original\space erschienen}{Original\space erschienen}}, + typechair = {{Leitung}{Leitung}}, + typechairs = {{Leitung}{Leitung}}, + typevolume = {{Bandherausgeber}{Bandhrsg\adddot}}, + typevolumes = {{Bandherausgeber}{Bandhrsg\adddot}}, + typeseries = {{Reihenherausgeber}{Reihenhrsg\adddot}}, + typeseriess = {{Reihenherausgeber}{Reihenhrsg\adddot}}, + typevolseries = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}}, + typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}}, + annodomini = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}}, + beforechrist = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}}, + nodate = {{nicht\space datiert}{{}n\adddot\addabthinspace d\adddot}} +} + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.10 Example 68) Drop end* when they are the same as * + +% You must use \printdate to get here otherwise it will be ignored +\DeclareBibliographyExtras{% + \renewcommand{\apashortdash}{~}% + \def\urldatecomma{\addspace}% + \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}% + \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}} + {} + {\addcomma\space}}% + \iffieldundef{#3}% + {}% + {\mkbibordinal{\thefield{#3}}% + \iffieldundef{#2} + {} + {\addspace}}% + \iffieldundef{#2}% + {}% + {\mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}% + \printfield{extradate}% + \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}} + {} + {\addcomma\space}}% + \iffieldundef{#3}% + {}% + {\mkbibordinal{\thefield{#3}}% + \iffieldundef{#2} + {} + {\addspace}}% + \iffieldundef{#2}% + {}% + {\mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#3}% + {}% + {\mkbibordinal{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3}% + {}% + {\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#1}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}% + \def\apa@lbx@de@mkdaterangeapalong#1{% + \begingroup + \blx@metadateinfo{#1}% + \iffieldundef{#1year}{} + {\datecircaprint + \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ... + {\printtext{% + \iffieldsequal{#1year}{#1endyear} + {\iffieldsequal{#1month}{#1endmonth} + {\mkbibdateapalongmdy{}{}{#1day}} + {\mkbibdateapalongmdy{}{#1month}{#1day}}} + {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}% + \iffieldundef{#1endyear}% + {}% + {\iffieldequalstr{#1endyear}{}% open-ended range? + {\mbox{\bibdatedash}} + {\bibdatedash% + \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}% + \dateuncertainprint}} + {\printtext{% + \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}} + and test {\iffieldsequal{#1month}{#1endmonth}}} + {\mkbibdateapalong{#1year}{}{#1day}}% + {\mkbibdateapalong{#1year}{#1month}{#1day}}% + \dateeraprint{#1year}% + \iffieldundef{#1endyear}% + {}% + {\iffieldequalstr{#1endyear}{}% open-ended range? + {\mbox{\bibdatedash}} + {\bibdatedash% + \iffieldsequal{#1year}{#1endyear}% + {\mkbibdateapalong{}{#1endmonth}{#1endday}}% + {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}% + \dateeraprint{#1endyear}}}% + \enddateuncertainprint}}}}% + \endgroup}% + \def\apa@lbx@de@mkdaterangeapalongextra#1{% + \begingroup + \blx@metadateinfo{#1}% + \iffieldundef{#1year}{} + {\printtext{% + \datecircaprint + \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}} + and test {\iffieldsequal{#1month}{#1endmonth}}} + {\mkbibdateapalongextra{#1year}{}{#1day}}% + {\mkbibdateapalongextra{#1year}{#1month}{#1day}}% + \dateeraprint{#1year}% + \dateuncertainprint + \iffieldundef{#1endyear}% + {}% + {\iffieldequalstr{#1endyear}{}% open-ended range? + {\mbox{\bibdatedash}} + {\bibdatedash% + \iffieldsequal{#1year}{#1endyear}% + {\mkbibdateapalongextra{}{#1endmonth}{#1endday}} + {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}% + \dateeraprint{#1endyear}}}% + \enddateuncertainprint}}}% + \endgroup}% + \savecommand\mkdaterangeapalong + \savecommand\mkdaterangeapalongextra + \def\mkdaterangeapalong{% + \apa@lbx@de@mkdaterangeapalong}% + \def\mkdaterangeapalongextra#1{% + \apa@lbx@de@mkdaterangeapalongextra{#1}}% +} + +\UndeclareBibliographyExtras{% + \restorecommand\mkdaterangeapalong + \restorecommand\mkdaterangeapalongextra +} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\endinput diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/norsk-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/norsk-apa6.lbx new file mode 100644 index 0000000000..888bd6c768 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/norsk-apa6.lbx @@ -0,0 +1,146 @@ +\ProvidesFile{norsk-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation] +\InheritBibliographyExtras{norsk} + +% (APA 6.22) The example abbreviations + +\NewBibliographyString{revisededition} +\NewBibliographyString{typechair} +\NewBibliographyString{typechairs} +\NewBibliographyString{typevolume} +\NewBibliographyString{typevolumes} +\NewBibliographyString{typeseries} +\NewBibliographyString{typeseriess} +\NewBibliographyString{typevolseries} +\NewBibliographyString{typevolseriess} +\NewBibliographyString{on} +\NewBibliographyString{retrieved} +\NewBibliographyString{available} +\NewBibliographyString{from} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\DeclareBibliographyStrings{% + inherit = {norsk}, + revisededition = {{revidert\space utgave}{rev\adddotspace utg\adddot}}, + page = {{side}{{}s\adddot}}, + pages = {{sider}{{}s\adddot}}, + on = {{p{\aa}}{p{\aa}}}, + retrieved = {{hentet}{hentet}}, + available = {{tilgjengelig}{tilgjengelig}}, + from = {{fra}{fra}}, + archivedat = {{arkivert\space ved}{arkivert\space ved}}, + reviewof = {{anmeldelse\space av}{anmeldelse\space av}}, + producer = {{produsent}{produsent}}, + execproducer = {{ut{\o}vende produsent}{ut{\o}vende produsent}}, + director = {{regiss{\o}r}{regiss{\o}r}}, + writer = {{manus}{manus}}, + with = {{med}{med}}, + paragraph = {{\P}{\P}}, + paragraphs = {{\P\P}{\P\P}}, + mathesis = {{Masteroppgave}{Masteroppgave}}, + phdthesis = {{Doktoravhandling}{Doktoravhandling}}, + origyear = {{opprinnelig\space publisert}{opprinnelig\space publisert}}, + typechair = {{ordstyrer}{ordstyrer}}, + typechairs = {{ordstyrere}{ordstyrere}}, + typevolume = {{bindredakt{\o}r}{bindred\adddot}}, + typevolumes = {{bindredakt{\o}rer}{bindred\adddot}}, + typeseries = {{serieredakt{\o}r}{seriered\adddot}}, + typeseriess = {{serieredakt{\o}rer}{seriered\adddot}}, + typevolseries = {{serie- og bindredakt{\o}r}{serie- og bindred\adddot}}, + typevolseriess = {{serie- og bindredakt{\o}rer}{serie- og bindred\adddot}}, + annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, + beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, +} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.10 Example 68) Drop end* when they are the same as * + +% You must use \printdate to get here otherwise it will be ignored + +\DeclareBibliographyExtras{% + \def\urldatecomma{\addcomma\addspace}% + \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#1}% + {} + {\addcomma\addspace}% + \stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3} + {\iffieldundef{#1} + {} + {\addspace}}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#1}% + {} + {\addcomma\addspace}% + \stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3} + {\iffieldundef{#1} + {} + {\addspace}}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#3}% + {}% + {\stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3}% + {}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#1}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +\endinput diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/norwegian-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/norwegian-apa6.lbx new file mode 100644 index 0000000000..28736a539f --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/norwegian-apa6.lbx @@ -0,0 +1,143 @@ +\ProvidesFile{norwegian-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation] +\InheritBibliographyExtras{norwegian} + +% (APA 6.22) The example abbreviations + +\NewBibliographyString{revisededition} +\NewBibliographyString{typechair} +\NewBibliographyString{typechairs} +\NewBibliographyString{typevolume} +\NewBibliographyString{typevolumes} +\NewBibliographyString{typeseries} +\NewBibliographyString{typeseriess} +\NewBibliographyString{typevolseries} +\NewBibliographyString{typevolseriess} +\NewBibliographyString{on} +\NewBibliographyString{retrieved} +\NewBibliographyString{available} +\NewBibliographyString{from} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\DeclareBibliographyStrings{% + inherit = {norwegian}, + revisededition = {{revidert\space utgave}{rev\adddotspace utg\adddot}}, + page = {{side}{{}s\adddot}}, + pages = {{sider}{{}s\adddot}}, + on = {{p{\aa}}{p{\aa}}}, + retrieved = {{hentet}{hentet}}, + available = {{tilgjengelig}{tilgjengelig}}, + from = {{fra}{fra}}, + archivedat = {{arkivert\space ved}{arkivert\space ved}}, + reviewof = {{anmeldelse\space av}{anmeldelse\space av}}, + producer = {{produsent}{produsent}}, + execproducer = {{ut{\o}vende produsent}{ut{\o}vende produsent}}, + director = {{regiss{\o}r}{regiss{\o}r}}, + writer = {{manus}{manus}}, + with = {{med}{med}}, + paragraph = {{\P}{\P}}, + paragraphs = {{\P\P}{\P\P}}, + mathesis = {{Masteroppgave}{Masteroppgave}}, + phdthesis = {{Doktoravhandling}{Doktoravhandling}}, + origyear = {{opprinnelig\space publisert}{opprinnelig\space publisert}}, + typechair = {{ordstyrer}{ordstyrer}}, + typechairs = {{ordstyrere}{ordstyrere}}, + typevolume = {{bindredakt{\o}r}{bindred\adddot}}, + typevolumes = {{bindredakt{\o}rer}{bindred\adddot}}, + typeseries = {{serieredakt{\o}r}{seriered\adddot}}, + typeseriess = {{serieredakt{\o}rer}{seriered\adddot}}, + typevolseries = {{serie- og bindredakt{\o}r}{serie- og bindred\adddot}}, + typevolseriess = {{serie- og bindredakt{\o}rer}{serie- og bindred\adddot}}, + annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, + beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, +} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.10 Example 68) Drop end* when they are the same as * + +% You must use \printdate to get here otherwise it will be ignored + +\DeclareBibliographyExtras{% + \def\urldatecomma{\addcomma\addspace}% + \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#1}% + {} + {\addcomma\addspace}% + \stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3} + {\iffieldundef{#1} + {} + {\addspace}}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#1}% + {} + {\addcomma\addspace}% + \stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3} + {\iffieldundef{#1} + {} + {\addspace}}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#3}% + {}% + {\stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3}% + {}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#1}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/nswissgerman-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/nswissgerman-apa6.lbx new file mode 100644 index 0000000000..cdf0130100 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/nswissgerman-apa6.lbx @@ -0,0 +1,214 @@ +\ProvidesFile{nswissgerman-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation] +\InheritBibliographyExtras{nswissgerman} + +% (APA 6.22) The example abbreviations + +% Following DGPs guidlines for German/Austrian/Swiss German +% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf + +\NewBibliographyString{revisededition} +\NewBibliographyString{typechair} +\NewBibliographyString{typechairs} +\NewBibliographyString{typevolume} +\NewBibliographyString{typevolumes} +\NewBibliographyString{typeseries} +\NewBibliographyString{typeseriess} +\NewBibliographyString{typevolseries} +\NewBibliographyString{typevolseriess} +\NewBibliographyString{on} +\NewBibliographyString{retrieved} +\NewBibliographyString{available} +\NewBibliographyString{from} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\DeclareBibliographyStrings{% + inherit = {nswissgerman}, + andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, + revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}}, + producer = {{Produzent}{Produzent}}, + execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}}, + director = {{Regisseur}{Regisseur}}, + writer = {{Autor}{Autor}}, + with = {{mit}{mit}}, + page = {{Seite}{{}S\adddot}}, + pages = {{Seiten}{{}S\adddot}}, + on = {{am}{am}}, + retrieved = {{Zugriff\space am}{Zugriff\space am}}, + available = {{erh\"altlich}{erh\"altlich}}, + from = {{unter}{unter}}, + archivedat = {{archiviert\space unter}{archiviert\space unter}}, + reviewof = {{Rezension\space des}{Rezension\space des}}, + paragraph = {{\P}{\P}}, + paragraphs = {{\P\P}{\P\P}}, + origyear = {{Original\space erschienen}{Original\space erschienen}}, + typechair = {{Leitung}{Leitung}}, + typechairs = {{Leitung}{Leitung}}, + typevolume = {{Bandherausgeber}{Bandhrsg\adddot}}, + typevolumes = {{Bandherausgeber}{Bandhrsg\adddot}}, + typeseries = {{Reihenherausgeber}{Reihenhrsg\adddot}}, + typeseriess = {{Reihenherausgeber}{Reihenhrsg\adddot}}, + typevolseries = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}}, + typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}}, + annodomini = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}}, + beforechrist = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}}, +} + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.10 Example 68) Drop end* when they are the same as * + +% You must use \printdate to get here otherwise it will be ignored +\DeclareBibliographyExtras{% + \renewcommand{\apashortdash}{~}% + \def\urldatecomma{\addspace}% + \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}% + \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}} + {} + {\addcomma\space}}% + \iffieldundef{#3}% + {}% + {\mkbibordinal{\thefield{#3}}% + \iffieldundef{#2} + {} + {\addspace}}% + \iffieldundef{#2}% + {}% + {\mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}% + \printfield{extradate}% + \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}} + {} + {\addcomma\space}}% + \iffieldundef{#3}% + {}% + {\mkbibordinal{\thefield{#3}}% + \iffieldundef{#2} + {} + {\addspace}}% + \iffieldundef{#2}% + {}% + {\mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#3}% + {}% + {\mkbibordinal{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3}% + {}% + {\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#1}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}% + \def\apa@lbx@de@mkdaterangeapalong#1{% + \begingroup + \blx@metadateinfo{#1}% + \iffieldundef{#1year}{} + {\datecircaprint + \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ... + {\printtext{% + \iffieldsequal{#1year}{#1endyear} + {\iffieldsequal{#1month}{#1endmonth} + {\mkbibdateapalongmdy{}{}{#1day}} + {\mkbibdateapalongmdy{}{#1month}{#1day}}} + {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}% + \iffieldundef{#1endyear}% + {}% + {\iffieldequalstr{#1endyear}{}% open-ended range? + {\mbox{\bibdatedash}} + {\bibdatedash% + \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}% + \dateuncertainprint}} + {\printtext{% + \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}} + and test {\iffieldsequal{#1month}{#1endmonth}}} + {\mkbibdateapalong{#1year}{}{#1day}}% + {\mkbibdateapalong{#1year}{#1month}{#1day}}% + \dateeraprint{#1year}% + \iffieldundef{#1endyear}% + {}% + {\iffieldequalstr{#1endyear}{}% open-ended range? + {\mbox{\bibdatedash}} + {\bibdatedash% + \iffieldsequal{#1year}{#1endyear}% + {\mkbibdateapalong{}{#1endmonth}{#1endday}}% + {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}% + \dateeraprint{#1endyear}}}% + \enddateuncertainprint}}}}% + \endgroup}% + \def\apa@lbx@de@mkdaterangeapalongextra#1{% + \begingroup + \blx@metadateinfo{#1}% + \iffieldundef{#1year}{} + {\printtext{% + \datecircaprint + \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}} + and test {\iffieldsequal{#1month}{#1endmonth}}} + {\mkbibdateapalongextra{#1year}{}{#1day}}% + {\mkbibdateapalongextra{#1year}{#1month}{#1day}}% + \dateeraprint{#1year}% + \dateuncertainprint + \iffieldundef{#1endyear}% + {}% + {\iffieldequalstr{#1endyear}{}% open-ended range? + {\mbox{\bibdatedash}} + {\bibdatedash% + \iffieldsequal{#1year}{#1endyear}% + {\mkbibdateapalongextra{}{#1endmonth}{#1endday}} + {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}% + \dateeraprint{#1endyear}}}% + \enddateuncertainprint}}}% + \endgroup}% + \savecommand\mkdaterangeapalong + \savecommand\mkdaterangeapalongextra + \def\mkdaterangeapalong{% + \apa@lbx@de@mkdaterangeapalong}% + \def\mkdaterangeapalongextra#1{% + \apa@lbx@de@mkdaterangeapalongextra{#1}}% +} + +\UndeclareBibliographyExtras{% + \restorecommand\mkdaterangeapalong + \restorecommand\mkdaterangeapalongextra +} + + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\endinput diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/nynorsk-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/nynorsk-apa6.lbx new file mode 100644 index 0000000000..0a9748dd88 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/nynorsk-apa6.lbx @@ -0,0 +1,146 @@ +\ProvidesFile{nynorsk-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation] +\InheritBibliographyExtras{nynorsk} + +% (APA 6.22) The example abbreviations + +\NewBibliographyString{revisededition} +\NewBibliographyString{typechair} +\NewBibliographyString{typechairs} +\NewBibliographyString{typevolume} +\NewBibliographyString{typevolumes} +\NewBibliographyString{typeseries} +\NewBibliographyString{typeseriess} +\NewBibliographyString{typevolseries} +\NewBibliographyString{typevolseriess} +\NewBibliographyString{on} +\NewBibliographyString{retrieved} +\NewBibliographyString{available} +\NewBibliographyString{from} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\DeclareBibliographyStrings{% + inherit = {nynorsk}, + revisededition = {{revidert\space utg{\aa}ve}{rev\adddotspace utg\adddot}}, + page = {{side}{{}s\adddot}}, + pages = {{sider}{{}s\adddot}}, + on = {{p{\aa}}{p{\aa}}}, + retrieved = {{henta}{henta}}, + available = {{tilgjengeleg}{tilgjengeleg}}, + from = {{fr{\aa}}{fr{\aa}}}, + archivedat = {{arkivert\space ved}{arkivert\space ved}}, + reviewof = {{melding\space av}{melding\space av}}, + producer = {{produsent}{produsent}}, + execproducer = {{ut{\o}vande produsent}{ut{\o}vande produsent}}, + director = {{regiss{\o}r}{regiss{\o}r}}, + writer = {{manus}{manus}}, + with = {{med}{med}}, + paragraph = {{\P}{\P}}, + paragraphs = {{\P\P}{\P\P}}, + mathesis = {{Masteroppg{\aa}ve}{Masteroppg{\aa}ve}}, + phdthesis = {{Doktoravhandling}{Doktoravhandling}}, + origyear = {{opphavleg\space publisert}{opphavleg\space publisert}}, + typechair = {{ordstyrar}{ordstyrar}}, + typechairs = {{ordstyrarar}{ordstyrarar}}, + typevolume = {{bindredakt{\o}r}{bindred\adddot}}, + typevolumes = {{bindredakt{\o}rar}{bindred\adddot}}, + typeseries = {{serieredakt{\o}r}{seriered\adddot}}, + typeseriess = {{serieredakt{\o}rar}{seriered\adddot}}, + typevolseries = {{serie- og bindredakt{\o}r}{serie- og bindred\adddot}}, + typevolseriess = {{serie- og bindredakt{\o}rar}{serie- og bindred\adddot}}, + annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, + beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, +} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.10 Example 68) Drop end* when they are the same as * + +% You must use \printdate to get here otherwise it will be ignored + +\DeclareBibliographyExtras{% + \def\urldatecomma{\addcomma\addspace}% + \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#1}% + {} + {\addcomma\addspace}% + \stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3} + {\iffieldundef{#1} + {} + {\addspace}}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#1}% + {} + {\addcomma\addspace}% + \stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3} + {\iffieldundef{#1} + {} + {\addspace}}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#3}% + {}% + {\stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3}% + {}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#1}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +\endinput diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/portuguese-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/portuguese-apa6.lbx new file mode 100644 index 0000000000..4f7a522de8 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/portuguese-apa6.lbx @@ -0,0 +1,134 @@ +\ProvidesFile{portuguese-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation] +\InheritBibliographyExtras{portuguese} + +% (APA 6.22) The example abbreviations + +\NewBibliographyString{revisededition} +\NewBibliographyString{typechair} +\NewBibliographyString{typechairs} +\NewBibliographyString{typevolume} +\NewBibliographyString{typevolumes} +\NewBibliographyString{typeseries} +\NewBibliographyString{typeseriess} +\NewBibliographyString{typevolseries} +\NewBibliographyString{typevolseriess} +\NewBibliographyString{on} +\NewBibliographyString{retrieved} +\NewBibliographyString{available} +\NewBibliographyString{from} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\DeclareBibliographyStrings{% + inherit = {portuguese}, + revisededition = {{Edi\c{c}\~ao\space Revista}{ed\adddotspace rev\adddot}}, + on = {{em}{em}}, + retrieved = {{obtido}{obtido}}, + available = {{dispon\'ivel}{disp.}}, + from = {{de}{de}}, + archivedat = {{arquivado\space em}{arquivado\space em}}, + reviewof = {{Revis\~ao\space de}{revis\~ao\space de}}, + producer = {{produtor}{produtor}}, + execproducer = {{produtor executivo}{produtor executivo}}, + director = {{diretor}{diretor}}, + writer = {{escritor}{escritor}}, + with = {{com}{com}}, + origyear = {{trabalho\space original\space publicado\space em}{trabalho\space original\space publicado\space em}}, + typechair = {{Coordenador}{Coord\adddot}}, + typechairs = {{Coordenadores}{Coords\adddot}}, + typevolume = {{Editor\space do\space Volume}{Ed\adddot\space Vol\adddot}}, + typevolumes = {{Editores\space do\space Volume}{Eds\adddot\space Vol\adddot}}, + typeseries = {{Editor\space da\space S\'erie}{Ed\adddot\space S\'erie\adddot}}, + typeseriess = {{Editores\space da\space S\'erie}{Eds\adddot\space S\'erie\adddot}}, + typevolseries = {{Editor\space da\space S\'erie\space e\space do\space Volume}{Ed\adddot\space Vol\space\&\space S\'erie}}, + typevolseriess = {{Editores\space da\space S\'erie\space e\space do\space Volume}{Eds\adddot\space Vol\space\&\space S\'erie}}, +} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.10 Example 68) Drop end* when they are the same as * + +% You must use \printdate to get here otherwise it will be ignored + +\DeclareBibliographyExtras{% + \def\urldatecomma{\addcomma\addspace}% + \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}}}% + \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#3}% + {}% + {\stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3}% + {}% + {\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#1}% + {}% + {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}% + {}% + {\addspace}% + \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +\endinput diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/russian-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/russian-apa6.lbx new file mode 100644 index 0000000000..c574ef0dbd --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/russian-apa6.lbx @@ -0,0 +1,147 @@ +\ProvidesFile{russian-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation] +\InheritBibliographyExtras{russian} + +% (APA 6.22) The example abbreviations + +\NewBibliographyString{revisededition} +\NewBibliographyString{typechair} +\NewBibliographyString{typechairs} +\NewBibliographyString{typevolume} +\NewBibliographyString{typevolumes} +\NewBibliographyString{typeseries} +\NewBibliographyString{typeseriess} +\NewBibliographyString{typevolseries} +\NewBibliographyString{typevolseriess} +\NewBibliographyString{on} +\NewBibliographyString{retrieved} +\NewBibliographyString{available} +\NewBibliographyString{from} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\DeclareBibliographyStrings{% + inherit = {russian}, + revisededition = {{иÑправленное издание}{иÑпр\adddotspace изд\adddot}}, + on = {{на}{на}}, + retrieved = {{получено}{получено}}, + available = {{доÑтупно}{доÑтупно}}, + from = {{c}{c}}, + archivedat = {{в архиве\space на}{в архиве\space на}}, + with = {{Ñ}{Ñ}}, + paragraph = {{абзац}{абз\adddot}}, + paragraphs = {{абзацы}{абз\adddot}}, + producer = {{продюÑер}{продюÑер}}, + execproducer = {{иÑполнительный продюÑер}{иÑполнительный продюÑер}}, + director = {{режиÑÑер}{режиÑÑер}}, + writer = {{ÑценариÑÑ‚}{ÑценариÑÑ‚}}, + origyear = {{оригинальнаÑ\space работа\space опубликована}{ориг\adddotspace работа\space опубл\adddot}}, + typechair = {{ПредÑедатель}{ПредÑедатель}}, + typechairs = {{ПредÑедатели}{ПредÑедатели}}, + typevolume = {{Редактор\space тома}{Ред\adddotspace Ñ‚\adddot}}, + typevolumes = {{Редакторы\space тома}{Ред\adddotspace Ñ‚\adddot}}, + typeseries = {{Редактор\space Ñерии}{Ред\adddotspace Ñер\adddot}}, + typeseriess = {{Редакторы\space Ñерии}{Ред\adddotspace Ñер\adddot}}, + typevolseries = {{Редактор\space Ñерии\space и\space тома}{Ред\adddotspace Ñер\adddotspace и\space Ñ‚\adddot}}, + typevolseriess = {{Редакторы\space Ñерии\space и\space тома}{Ред\adddotspace Ñер\adddotspace и\space Ñ‚\adddot}}, + annodomini = {{нашей\space Ñры}{н\adddotspace Ñ\adddot}}, + beforechrist = {{до\space нашей\space Ñры}{до н\adddotspace Ñ\adddot}}, +} + +\protected\gdef\lbx@sl@mkbibmonth#1{% + \ifcase0#1\relax + #1\BibliographyWarning{Month out of range}% + \or\abx@bibmonth{datejanuary}% + \or\abx@bibmonth{datefebruary}% + \or\abx@bibmonth{datemarch}% + \or\abx@bibmonth{dateapril}% + \or\abx@bibmonth{datemay}% + \or\abx@bibmonth{datejune}% + \or\abx@bibmonth{datejuly}% + \or\abx@bibmonth{dateaugust}% + \or\abx@bibmonth{dateseptember}% + \or\abx@bibmonth{dateoctober}% + \or\abx@bibmonth{datenovember}% + \or\abx@bibmonth{datedecember}% + \else + #1\BibliographyWarning{Month out of range}% + \fi}% + +\DeclareBibliographyExtras{% + \def\urldatecomma{\addspace}% + \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3} + {\iffieldundef{#1} + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + {\addspace\lbx@sl@mkbibmonth{\thefield{#2}}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3} + {\iffieldundef{#1} + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + {\addspace\lbx@sl@mkbibmonth{\thefield{#2}}}}}% + \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#3}% + {}% + {\stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3}% + {\mkbibmonth{\thefield{#2}}}% + {\addspace\lbx@sl@mkbibmonth{\thefield{#2}}}}% + \iffieldundef{#1}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} + +\endinput diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/slovene-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/slovene-apa6.lbx new file mode 100644 index 0000000000..86d1f32930 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/slovene-apa6.lbx @@ -0,0 +1,175 @@ +\ProvidesFile{slovene-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation] +\InheritBibliographyExtras{slovene} + +% (APA 6.22) The example abbreviations + +\NewBibliographyString{revisededition} +\NewBibliographyString{typechair} +\NewBibliographyString{typechairs} +\NewBibliographyString{typevolume} +\NewBibliographyString{typevolumes} +\NewBibliographyString{typeseries} +\NewBibliographyString{typeseriess} +\NewBibliographyString{typevolseries} +\NewBibliographyString{typevolseriess} +\NewBibliographyString{on} +\NewBibliographyString{retrieved} +\NewBibliographyString{available} +\NewBibliographyString{from} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\NewBibliographyString{% Month name variants used after day + datejanuary, + datefebruary, + datemarch, + dateapril, + datemay, + datejune, + datejuly, + dateaugust, + dateseptember, + dateoctober, + datenovember, + datedecember% +} + +\DeclareBibliographyStrings{% + inherit = {slovene}, + revisededition = {{dopolnjena izdaja}{dopolnjena iz\adddot}}, + on = {{na}{na}}, + retrieved = {{pridobljeno}{pridobljeno}}, + available = {{dostopno}{dostopno}}, + from = {{}{}}, + archivedat = {{arhivirano\space na}{arhivirano\space na}}, + with = {{z}{z}}, + paragraph = {{\P}{\P}}, + paragraphs = {{\P\P}{\P\P}}, + producer = {{producent}{producent}}, + execproducer = {{izvr\v{s}ni producent}{izvr\v{s}ni producent}}, + director = {{re\v{z}iser}{re\v{z}iser}}, + writer = {{avtor}{avtor}}, + datejanuary = {{januarja}{januarja}}, + datefebruary = {{februarja}{februarja}}, + datemarch = {{marca}{marca}}, + dateapril = {{aprila}{aprila}}, + datemay = {{maja}{maja}}, + datejune = {{junija}{junija}}, + datejuly = {{julija}{julija}}, + dateaugust = {{avgusta}{avgusta}}, + dateseptember = {{septembra}{septembra}}, + dateoctober = {{oktobra}{oktobra}}, + datenovember = {{novembra}{novembra}}, + datedecember = {{decembra}{decembra}}, + origyear = {{izvirno\space delo\space objavljeno}{izvirno\space delo\space objavljeno}}, + typechair = {{Predsednik}{Predsednik}}, + typechairs = {{Predsedniki}{Predsedniki}}, + typevolume = {{urednik}{ur\adddot}}, + typevolumes = {{uredniki}{ur\adddot}}, + typeseries = {{urednik}{ur\adddot}}, + typeseriess = {{uredniki}{ur\adddot}}, + typevolseries = {{urednik}{ur\adddot}}, + typevolseriess = {{uredniki}{ur\adddot}}, + annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, + beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, +} + +\protected\gdef\lbx@sl@mkbibmonth#1{% + \ifcase0#1\relax + #1\BibliographyWarning{Month out of range}% + \or\abx@bibmonth{datejanuary}% + \or\abx@bibmonth{datefebruary}% + \or\abx@bibmonth{datemarch}% + \or\abx@bibmonth{dateapril}% + \or\abx@bibmonth{datemay}% + \or\abx@bibmonth{datejune}% + \or\abx@bibmonth{datejuly}% + \or\abx@bibmonth{dateaugust}% + \or\abx@bibmonth{dateseptember}% + \or\abx@bibmonth{dateoctober}% + \or\abx@bibmonth{datenovember}% + \or\abx@bibmonth{datedecember}% + \else + #1\BibliographyWarning{Month out of range}% + \fi}% + +\DeclareBibliographyExtras{% + \def\urldatecomma{\addcomma\addspace}% + \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#1}% + {} + {\addcomma\addspace}% + \stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3} + {\iffieldundef{#1} + {} + {\addspace}}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#1}% + {} + {\addcomma\addspace}% + \stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3} + {\iffieldundef{#1} + {} + {\addspace}}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#3}% + {}% + {\stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3}% + {}% + {\adddot\addspace}% + \lbx@sl@mkbibmonth{\thefield{#2}}}% + \iffieldundef{#1}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} + +\endinput diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/spanish-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/spanish-apa6.lbx new file mode 100644 index 0000000000..a3fd406240 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/spanish-apa6.lbx @@ -0,0 +1,152 @@ +\ProvidesFile{spanish-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation] +\InheritBibliographyExtras{spanish} + +\setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced + +% (APA 6.22) The example abbreviations + +\NewBibliographyString{revisededition} +\NewBibliographyString{typechair} +\NewBibliographyString{typechairs} +\NewBibliographyString{typevolume} +\NewBibliographyString{typevolumes} +\NewBibliographyString{typeseries} +\NewBibliographyString{typeseriess} +\NewBibliographyString{typevolseries} +\NewBibliographyString{typevolseriess} +\NewBibliographyString{on} +\NewBibliographyString{retrieved} +\NewBibliographyString{available} +\NewBibliographyString{from} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\DeclareBibliographyStrings{% + inherit = {spanish}, + inpress = {{en prensa}{en prensa}},% remove when biblatex has it + january = {{enero}{enero}}, + february = {{febrero}{febrero}}, + march = {{marzo}{marzo}}, + april = {{abril}{abril}}, + may = {{mayo}{mayo}}, + june = {{junio}{junio}}, + july = {{julio}{julio}}, + august = {{agosto}{agosto}}, + september = {{septiembre}{septiembre}}, + october = {{octubre}{octubre}}, + november = {{noviembre}{noviembre}}, + december = {{diciembre}{diciembre}}, + nodate = {{s\adddot f\adddot}{s\adddot f\adddot}}, + mathesis = {{Tesis\addabbrvspace de\addabbrvspace maestr\'ia}{Tesis\addabbrvspace de\addabbrvspace maestr\'ia}}, + phdthesis = {{Tesis\addabbrvspace doctoral}{Tesis\addabbrvspace doctoral}}, + revisededition = {{Edici\'on\space revisada}{Edici\'on\space revisada}}, + producer = {{productor}{productor}}, + execproducer = {{productor ejecutivo}{productor ejecutivo}}, + director = {{director}{director}}, + writer = {{escritor}{escritor}}, + with = {{con}{con}}, + page = {{P\'agina}{{}p\adddot}}, + pages = {{P\'aginas}{{}pp\adddot}}, + on = {{el}{el}}, + retrieved = {{Recuperado}{Recuperado}}, + available = {{disponible}{disponible}}, + from = {{desde}{desde}}, + archivedat = {{archivado en}{archivado en}}, + reviewof = {{revisi\'on\space de}{revisi\'on\space de}}, + paragraph = {{\P}{\P}}, + paragraphs = {{\P\P}{\P\P}}, + origyear = {{Fecha\space inicial\space de\space publicaci\'on}{Fecha\space inicial\space de\space publicaci\'on}}, + typechair = {{Coordinador}{Coord\adddot}}, + typechairs = {{Coordinadores}{Coords\adddot}}, + typevolume = {{Editor\space del\space volumen}{Ed\adddotspace vol\adddot}}, + typevolumes = {{Editores\space del\space volumen}{Eds\adddotspace vol\adddot}}, + typeseries = {{Editor\space de\space la\space serie}{Ed\adddotspace ser\adddot}}, + typeseriess = {{Editores\space de\space la\space serie}{Eds\adddotspace ser\adddot}}, + typevolseries = {{Editor\space de\space la\space serie\space y\space del\space volumen}{Ed\adddotspace vol\space\&\space ser\adddot}}, + typevolseriess = {{Editores\space de\space la\space serie\space y\space del\space volumen}{Eds\adddotspace vol\space\&\space ser\adddot}}, + annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, + beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.10 Example 68) Drop end* when they are the same as * + +% You must use \printdate to get here otherwise it will be ignored +\DeclareBibliographyExtras{% + \def\urldatecomma{\addcomma\addspace}% + \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#2}% + {}% + {\stripzeros{\thefield{#3}}\addspace de\addspace}}% + \mkbibmonth{\thefield{#2}}% +}}% + \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#3}% + {}% + {el\addspace\stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {\addspace{en}\addspace}% + {\iffieldundef{#3}% + {en\addspace}% + {\addspace{de}\addspace}% + \mkbibmonth{\thefield{#2}}{\addspace{de}\addspace}}% + \iffieldundef{#1}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \thefield{#1}}}} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +\endinput diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/swedish-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/swedish-apa6.lbx new file mode 100644 index 0000000000..dc8ebe7cc9 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/swedish-apa6.lbx @@ -0,0 +1,139 @@ +\ProvidesFile{swedish-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation] +\InheritBibliographyExtras{swedish} + +% (APA 6.22) The example abbreviations + +\NewBibliographyString{revisededition} +\NewBibliographyString{typechair} +\NewBibliographyString{typechairs} +\NewBibliographyString{typevolume} +\NewBibliographyString{typevolumes} +\NewBibliographyString{typeseries} +\NewBibliographyString{typeseriess} +\NewBibliographyString{typevolseries} +\NewBibliographyString{typevolseriess} +\NewBibliographyString{on} +\NewBibliographyString{retrieved} +\NewBibliographyString{available} +\NewBibliographyString{from} +\NewBibliographyString{nodate} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\DeclareBibliographyStrings{% + inherit = {swedish}, + revisededition = {{reviderad\space utg{\aa}va}{rev\adddotspace utg\adddot}}, + page = {{sida}{{}s\adddot}}, + pages = {{sidor}{{}s\adddot}}, + on = {{p{\aa}}{p{\aa}}}, + retrieved = {{h\"amtad}{h\"amtad}}, + available = {{tillg\"anglig}{tillg\"anglig}}, + from = {{fr{\aa}n}{fr{\aa}n}}, + archivedat = {{arkiverat\space vid}{arkiverat\space vid}}, + nodate = {{utan\space {\aa}r}{u\adddot~{\aa}}}, + reviewof = {{granskning\space av}{granskning\space av}}, + producer = {{producent}{producent}}, + execproducer = {{exekutiv\space producent}{exekutiv\space producent}}, + director = {{regiss\"or}{regiss\"or}}, + editor = {{redakt\"or}{red\adddot}}, + editors = {{redakt\"or}{red\adddot}}, + writer = {{manus}{manus}}, + with = {{med}{med}}, + paragraph = {{\P}{\P}}, + paragraphs = {{\P\P}{\P\P}}, + mathesis = {{examensuppsats}{examensuppsats}}, + phdthesis = {{doktorsavhandling}{doktorsavhandling}}, + origyear = {{originalarbete\space publicerat}{originalarbete\space publicerat}}, + typechair = {{ordf\"orande}{ordf\"orande}}, + typechairs = {{ordf\"oranden}{ordf\"oranden}}, + typevolume = {{redakt\"or}{red\adddot}}, + typevolumes = {{redakt\"orer}{red\adddot}}, + typeseries = {{redakt\"or}{red\adddot}}, + typeseriess = {{redakt\"orer}{red\adddot}}, + typevolseries = {{redakt\"or}{red\adddot}}, + typevolseriess = {{redakt\"orer}{red\adddot}}, + annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, + beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, +} + + +\DeclareBibliographyExtras{% + \def\urldatecomma{\addcomma\addspace}% + \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#1}% + {} + {\addcomma\addspace}% + \stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3} + {\iffieldundef{#1} + {} + {\addspace}}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#1}% + {} + {\addcomma\addspace}% + \stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3} + {\iffieldundef{#1} + {} + {\addspace}}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#3}% + {}% + {\stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3}% + {}% + {\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#1}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} + +\endinput diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/swissgerman-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/swissgerman-apa6.lbx new file mode 100644 index 0000000000..83af38ef92 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/swissgerman-apa6.lbx @@ -0,0 +1,213 @@ +\ProvidesFile{swissgerman-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation] +\InheritBibliographyExtras{swissgerman} + +% Following DGPs guidlines for German/Austrian/Swiss German +% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf + +% (APA 6.22) The example abbreviations + +\NewBibliographyString{revisededition} +\NewBibliographyString{typechair} +\NewBibliographyString{typechairs} +\NewBibliographyString{typevolume} +\NewBibliographyString{typevolumes} +\NewBibliographyString{typeseries} +\NewBibliographyString{typeseriess} +\NewBibliographyString{typevolseries} +\NewBibliographyString{typevolseriess} +\NewBibliographyString{on} +\NewBibliographyString{retrieved} +\NewBibliographyString{available} +\NewBibliographyString{from} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\DeclareBibliographyStrings{% + inherit = {swissgerman}, + andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, + revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}}, + producer = {{Produzent}{Produzent}}, + execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}}, + director = {{Regisseur}{Regisseur}}, + writer = {{Autor}{Autor}}, + page = {{Seite}{{}S\adddot}}, + pages = {{Seiten}{{}S\adddot}}, + on = {{am}{am}}, + retrieved = {{Zugriff\space am}{Zugriff\space am}}, + available = {{erh\"altlich}{erh\"altlich}}, + with = {{mit}{mit}}, + from = {{unter}{unter}}, + archivedat = {{archiviert\space unter}{archiviert\space unter}}, + reviewof = {{Rezension\space des}{Rezension\space des}}, + paragraph = {{\P}{\P}}, + paragraphs = {{\P\P}{\P\P}}, + origyear = {{Original\space erschienen}{Original\space erschienen}}, + typechair = {{Leitung}{Leitung}}, + typechairs = {{Leitung}{Leitung}}, + typevolume = {{Bandherausgeber}{Bandhrsg\adddot}}, + typevolumes = {{Bandherausgeber}{Bandhrsg\adddot}}, + typeseries = {{Reihenherausgeber}{Reihenhrsg\adddot}}, + typeseriess = {{Reihenherausgeber}{Reihenhrsg\adddot}}, + typevolseries = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}}, + typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}}, + annodomini = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}}, + beforechrist = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}}, +} + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.10 Example 68) Drop end* when they are the same as * + +% You must use \printdate to get here otherwise it will be ignored +\DeclareBibliographyExtras{% + \renewcommand{\apashortdash}{~}% + \def\urldatecomma{\addspace}% + \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}% + \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}} + {} + {\addcomma\space}}% + \iffieldundef{#3}% + {}% + {\mkbibordinal{\thefield{#3}}% + \iffieldundef{#2} + {} + {\addspace}}% + \iffieldundef{#2}% + {}% + {\mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}% + \printfield{extradate}% + \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}} + {} + {\addcomma\space}}% + \iffieldundef{#3}% + {}% + {\mkbibordinal{\thefield{#3}}% + \iffieldundef{#2} + {} + {\addspace}}% + \iffieldundef{#2}% + {}% + {\mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% + \iffieldundef{#3}% + {}% + {\mkbibordinal{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3}% + {}% + {\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#1}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}% + \def\apa@lbx@de@mkdaterangeapalong#1{% + \begingroup + \blx@metadateinfo{#1}% + \iffieldundef{#1year}{} + {\datecircaprint + \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ... + {\printtext{% + \iffieldsequal{#1year}{#1endyear} + {\iffieldsequal{#1month}{#1endmonth} + {\mkbibdateapalongmdy{}{}{#1day}} + {\mkbibdateapalongmdy{}{#1month}{#1day}}} + {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}% + \iffieldundef{#1endyear}% + {}% + {\iffieldequalstr{#1endyear}{}% open-ended range? + {\mbox{\bibdatedash}} + {\bibdatedash% + \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}% + \dateuncertainprint}} + {\printtext{% + \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}} + and test {\iffieldsequal{#1month}{#1endmonth}}} + {\mkbibdateapalong{#1year}{}{#1day}}% + {\mkbibdateapalong{#1year}{#1month}{#1day}}% + \dateeraprint{#1year}% + \iffieldundef{#1endyear}% + {}% + {\iffieldequalstr{#1endyear}{}% open-ended range? + {\mbox{\bibdatedash}} + {\bibdatedash% + \iffieldsequal{#1year}{#1endyear}% + {\mkbibdateapalong{}{#1endmonth}{#1endday}}% + {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}% + \dateeraprint{#1endyear}}}% + \enddateuncertainprint}}}}% + \endgroup}% + \def\apa@lbx@de@mkdaterangeapalongextra#1{% + \begingroup + \blx@metadateinfo{#1}% + \iffieldundef{#1year}{} + {\printtext{% + \datecircaprint + \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}} + and test {\iffieldsequal{#1month}{#1endmonth}}} + {\mkbibdateapalongextra{#1year}{}{#1day}}% + {\mkbibdateapalongextra{#1year}{#1month}{#1day}}% + \dateeraprint{#1year}% + \dateuncertainprint + \iffieldundef{#1endyear}% + {}% + {\iffieldequalstr{#1endyear}{}% open-ended range? + {\mbox{\bibdatedash}} + {\bibdatedash% + \iffieldsequal{#1year}{#1endyear}% + {\mkbibdateapalongextra{}{#1endmonth}{#1endday}} + {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}% + \dateeraprint{#1endyear}}}% + \enddateuncertainprint}}}% + \endgroup}% + \savecommand\mkdaterangeapalong + \savecommand\mkdaterangeapalongextra + \def\mkdaterangeapalong{% + \apa@lbx@de@mkdaterangeapalong}% + \def\mkdaterangeapalongextra#1{% + \apa@lbx@de@mkdaterangeapalongextra{#1}}% +} + +\UndeclareBibliographyExtras{% + \restorecommand\mkdaterangeapalong + \restorecommand\mkdaterangeapalongextra +} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\endinput diff --git a/macros/latex/contrib/l3backend/CHANGELOG.md b/macros/latex/contrib/l3backend/CHANGELOG.md index 36f2fe987e..a009da31d9 100644 --- a/macros/latex/contrib/l3backend/CHANGELOG.md +++ b/macros/latex/contrib/l3backend/CHANGELOG.md @@ -6,42 +6,42 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] -## [2019-10-11] +## [2019-11-25] ### Changed +- Move dvips header material to `.pro` file + +## [2019-10-11] +### Changed - Improved functionality in generic mode ## [2019-09-05] ### Added - - Support for EPS and PDF files with `dvisvgm` backend ### Fixed - - Some primitive use in the `dvips` backend ## [2019-08-25] ### Fixed - - Setting for PDF version in `dvipdfmx` route - Support for PDF objects with XeTeX ## [2019-07-01] ### Added - - Driver support for anonymous objects ### Changed - - Moved backend code to separate release module `l3backend` - Include `l3backend` in file names - Moved backend code to internal for each 'parent' module -[Unreleased]: https://github.com/latex3/latex3/compare/2019-10-11...HEAD +[Unreleased]: https://github.com/latex3/latex3/compare/2019-11-25...HEAD +[2019-11-25]: https://github.com/latex3/latex3/compare/2019-10-11...2019-11-25 [2019-10-11]: https://github.com/latex3/latex3/compare/2019-09-05...2019-10-11 [2019-09-05]: https://github.com/latex3/latex3/compare/2019-08-25...2019-09-05 [2019-08-25]: https://github.com/latex3/latex3/compare/2019-07-01...2019-08-25 diff --git a/macros/latex/contrib/l3backend/README.md b/macros/latex/contrib/l3backend/README.md index fb3c01febd..5b0a2c3921 100644 --- a/macros/latex/contrib/l3backend/README.md +++ b/macros/latex/contrib/l3backend/README.md @@ -1,7 +1,7 @@ LaTeX3 Backend Drivers ====================== -Release 2019-10-11 +Release 2019-11-25 This package forms parts of `expl3`, and contains the code used to interface with backends (drivers) across the `expl3` codebase. The functions here are diff --git a/macros/latex/contrib/l3backend/l3backend-basics.dtx b/macros/latex/contrib/l3backend/l3backend-basics.dtx index 3bb240f1e6..2ac78b51da 100644 --- a/macros/latex/contrib/l3backend/l3backend-basics.dtx +++ b/macros/latex/contrib/l3backend/l3backend-basics.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-11} +% \date{Released 2019-11-25} % % \maketitle % @@ -151,25 +151,15 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{\__kernel_backend_postscript_header:n} -% PostScript for the header: a small saving but makes the code clearer. -% This is held until the start of shipout such that a document with no -% actual output does not write anything. +% PostScript for the header: a small saving but makes the code clearer. +% This is held until the start of shipout such that a document with no +% actual output does not write anything. % \begin{macrocode} -\cs_new_protected:Npx \__kernel_backend_postscript_header:n #1 -%<*initex> - { \__kernel_backend_literal:n { ! #1 } } -%</initex> -%<*package> - { - \cs_if_exist:NTF \AtBeginDvi - { \exp_not:N \AtBeginDvi } - { \use:n } - { \__kernel_backend_literal:n { ! #1 } } - } -%</package> +\cs_if_exist:NTF \AtBeginDvi + { \exp_not:N \AtBeginDvi } + { \use:n } + { \__kernel_backend_literal:n { header = l3backend-dvips.pro } } % \end{macrocode} -% \end{macro} % % \begin{macro} % { diff --git a/macros/latex/contrib/l3backend/l3backend-box.dtx b/macros/latex/contrib/l3backend/l3backend-box.dtx index 651537398d..0b37cbb157 100644 --- a/macros/latex/contrib/l3backend/l3backend-box.dtx +++ b/macros/latex/contrib/l3backend/l3backend-box.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-11} +% \date{Released 2019-11-25} % % \maketitle % diff --git a/macros/latex/contrib/l3backend/l3backend-code.pdf b/macros/latex/contrib/l3backend/l3backend-code.pdf Binary files differindex 218d64d794..e767cdc4e2 100644 --- a/macros/latex/contrib/l3backend/l3backend-code.pdf +++ b/macros/latex/contrib/l3backend/l3backend-code.pdf diff --git a/macros/latex/contrib/l3backend/l3backend-code.tex b/macros/latex/contrib/l3backend/l3backend-code.tex index 62a6bf5e2a..55dce66e1f 100644 --- a/macros/latex/contrib/l3backend/l3backend-code.tex +++ b/macros/latex/contrib/l3backend/l3backend-code.tex @@ -43,7 +43,8 @@ for those people who are interested. l3backend-color.dtx , l3backend-draw.dtx , l3backend-graphics.dtx , - l3backend-pdf.dtx + l3backend-pdf.dtx , + l3backend-header.dtx } \ExplSyntaxOff diff --git a/macros/latex/contrib/l3backend/l3backend-color.dtx b/macros/latex/contrib/l3backend/l3backend-color.dtx index 4bf4b1a0d9..efc778a3bc 100644 --- a/macros/latex/contrib/l3backend/l3backend-color.dtx +++ b/macros/latex/contrib/l3backend/l3backend-color.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-11} +% \date{Released 2019-11-25} % % \maketitle % diff --git a/macros/latex/contrib/l3backend/l3backend-draw.dtx b/macros/latex/contrib/l3backend/l3backend-draw.dtx index fcbf889d5f..dafdf6a43b 100644 --- a/macros/latex/contrib/l3backend/l3backend-draw.dtx +++ b/macros/latex/contrib/l3backend/l3backend-draw.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-11} +% \date{Released 2019-11-25} % % \maketitle % diff --git a/macros/latex/contrib/l3backend/l3backend-graphics.dtx b/macros/latex/contrib/l3backend/l3backend-graphics.dtx index 5ed22d54fa..9b0943d478 100644 --- a/macros/latex/contrib/l3backend/l3backend-graphics.dtx +++ b/macros/latex/contrib/l3backend/l3backend-graphics.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-11} +% \date{Released 2019-11-25} % % \maketitle % diff --git a/macros/latex/contrib/l3backend/l3backend-header.dtx b/macros/latex/contrib/l3backend/l3backend-header.dtx new file mode 100644 index 0000000000..b1f2495c79 --- /dev/null +++ b/macros/latex/contrib/l3backend/l3backend-header.dtx @@ -0,0 +1,574 @@ +% \iffalse meta-comment +% +%% File: l3backend-header.dtx +% +% Copyright (C) 2019 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 +% license or (at your option) any later version. The latest version +% of this license is in the file +% +% https://www.latex-project.org/lppl.txt +% +% This file is part of the "l3backend bundle" (The Work in LPPL) +% and all files in that bundle must be distributed together. +% +% ----------------------------------------------------------------------- +% +% The development version of the bundle can be found at +% +% https://github.com/latex3/latex3 +% +% for those people who are interested. +% +%<*driver> +\documentclass[full,kernel]{l3doc} +\begin{document} + \DocInput{\jobname.dtx} +\end{document} +%</driver> +% \fi +% +% \title{^^A +% The \textsf{l3backend-header} package\\ Backend graphics support^^A +% } +% +% \author{^^A +% The \LaTeX3 Project\thanks +% {^^A +% E-mail: +% \href{mailto:latex-team@latex-project.org} +% {latex-team@latex-project.org}^^A +% }^^A +% } +% +% \date{Released 2019-11-25} +% +% \maketitle +% +% \begin{documentation} +% +% \end{documentation} +% +% \begin{implementation} +% +% \section{\pkg{l3backend-header} Implementation} +% +% \begin{macrocode} +%<*dvips&header> +% \end{macrocode} +% +% \begin{macro}{pdf.globaldict} +% A small global dictionary for backend use. +% \begin{macrocode} +true setglobal +/pdf.globaldict 4 dict def +false setglobal +% \end{macrocode} +% \end{macro} +% +% \begin{macro} +% { +% pdf.cvs , +% pdf.dvi.pt , +% pdf.pt.dvi , +% pdf.rect.ht +% } +% Small utilities for PostScript manipulations. Conversion to DVI dimensions +% is done here to allow for |Resolution|. The total height of a rectangle +% (an array) needs a little maths, in contrast to simply extracting a value. +% \begin{macrocode} + +/pdf.cvs { 65534 string cvs } def +/pdf.dvi.pt { 72.27 mul Resolution div } def +/pdf.pt.dvi { 72.27 div Resolution mul } def +/pdf.rect.ht { dup 1 get neg exch 3 get add } def +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{pdf.linkmargin, pdf.linkdp.pad, pdf.linkht.pad} +% Settings which are defined up-front in |SDict|. +% \begin{macrocode} +/pdf.linkmargin { 1 pdf.pt.dvi } def +/pdf.linkdp.pad { 0 } def +/pdf.linkht.pad { 0 } def +% \end{macrocode} +% \end{macro} +% +% \begin{macro} +% { +% pdf.rect , +% pdf.save.ll , +% pdf.save.ur , +% pdf.save.linkll , +% pdf.save.linkur , +% pdf.llx , +% pdf.lly , +% pdf.urx , +% pdf.ury +% } +% Functions for marking the limits of an annotation/link, plus drawing the +% border. We separate links for generic annotations to support adding a +% margin and setting a minimal size. +% \begin{macrocode} +/pdf.rect + { /Rect [ pdf.llx pdf.lly pdf.urx pdf.ury ] } def +/pdf.save.ll + { + currentpoint + /pdf.lly exch def + /pdf.llx exch def + } + def +/pdf.save.ur + { + currentpoint + /pdf.ury exch def + /pdf.urx exch def + } + def +/pdf.save.linkll + { + currentpoint + pdf.linkmargin add + pdf.linkdp.pad add + /pdf.lly exch def + pdf.linkmargin sub + /pdf.llx exch def + } + def +/pdf.save.linkur + { + currentpoint + pdf.linkmargin sub + pdf.linkht.pad sub + /pdf.ury exch def + pdf.linkmargin add + /pdf.urx exch def + } + def +% \end{macrocode} +% \end{macro} +% +% \begin{macro} +% { +% pdf.dest.anchor , +% pdf.dest.x , +% pdf.dest.y , +% pdf.dest.point , +% pdf.dest2device , +% pdf.dev.x , +% pdf.dev.y , +% pdf.tmpa , +% pdf.tmpb , +% pdf.tmpc , +% pdf.tmpd +% } +% For finding the anchor point of a destination link. We make the use case +% a separate function as it comes up a lot, and as this makes it easier to +% adjust if we need additional effects. We also need a more complex approach +% to convert a co-ordinate pair correctly when defining a rectangle: this +% can otherwise be out when using a landscape page. (Thanks to Alexander +% Grahn for the approach here.) +% \begin{macrocode} +/pdf.dest.anchor + { + currentpoint exch + pdf.dvi.pt 72 add + /pdf.dest.x exch def + pdf.dvi.pt + vsize 72 sub exch sub + /pdf.dest.y exch def + } + def +/pdf.dest.point + { pdf.dest.x pdf.dest.y } def +/pdf.dest2device + { + /pdf.dest.y exch def + /pdf.dest.x exch def + matrix currentmatrix + matrix defaultmatrix + matrix invertmatrix + matrix concatmatrix + cvx exec + /pdf.dev.y exch def + /pdf.dev.x exch def + /pdf.tmpd exch def + /pdf.tmpc exch def + /pdf.tmpb exch def + /pdf.tmpa exch def + pdf.dest.x pdf.tmpa mul + pdf.dest.y pdf.tmpc mul add + pdf.dev.x add + pdf.dest.x pdf.tmpb mul + pdf.dest.y pdf.tmpd mul add + pdf.dev.y add + } + def +% \end{macrocode} +% \end{macro} +% +% \begin{macro} +% { +% pdf.bordertracking , +% pdf.bordertracking.begin , +% pdf.bordertracking.end , +% pdf.leftboundary , +% pdf.rightboundary , +% pdf.brokenlink.rect , +% pdf.brokenlink.skip , +% pdf.brokenlink.dict , +% pdf.bordertracking.endpage , +% pdf.bordertracking.continue , +% pdf.originx , +% pdf.originy +% } +% To know where a breakable link can go, we need to track the boundary +% rectangle. That can be done by hooking into |a| and |x| operations: +% those names have to be retained. The boundary is stored at the end of +% the operation. Special effort is needed at the start and end of pages +% (or rather galleys), such that everything works properly. +% \begin{macrocode} +/pdf.bordertracking false def +/pdf.bordertracking.begin + { + SDict /pdf.bordertracking true put + SDict /pdf.leftboundary undef + SDict /pdf.rightboundary undef + /a where + { + /a + { + currentpoint pop + SDict /pdf.rightboundary known dup + { + SDict /pdf.rightboundary get 2 index lt + { not } + if + } + if + { pop } + { SDict exch /pdf.rightboundary exch put } + ifelse + moveto + currentpoint pop + SDict /pdf.leftboundary known dup + { + SDict /pdf.leftboundary get 2 index gt + { not } + if + } + if + { pop } + { SDict exch /pdf.leftboundary exch put } + ifelse + } + put + } + if + } + def +/pdf.bordertracking.end + { + /a where { /a { moveto } put } if + /x where { /x { 0 exch rmoveto } put } if + SDict /pdf.leftboundary known + { pdf.outerbox 0 pdf.leftboundary put } + if + SDict /pdf.rightboundary known + { pdf.outerbox 2 pdf.rightboundary put } + if + SDict /pdf.bordertracking false put + } + def + /pdf.bordertracking.endpage +{ + pdf.bordertracking + { + pdf.bordertracking.end + true setglobal + pdf.globaldict + /pdf.brokenlink.rect [ pdf.outerbox aload pop ] put + pdf.globaldict + /pdf.brokenlink.skip pdf.baselineskip put + pdf.globaldict + /pdf.brokenlink.dict + pdf.link.dict pdf.cvs put + false setglobal + mark pdf.link.dict cvx exec /Rect + [ + pdf.llx + pdf.lly + pdf.outerbox 2 get pdf.linkmargin add + currentpoint exch pop + pdf.outerbox pdf.rect.ht sub pdf.linkmargin sub + ] + /ANN pdf.pdfmark + } + if +} + def +/pdf.bordertracking.continue + { + /pdf.link.dict pdf.globaldict + /pdf.brokenlink.dict get def + /pdf.outerbox pdf.globaldict + /pdf.brokenlink.rect get def + /pdf.baselineskip pdf.globaldict + /pdf.brokenlink.skip get def + pdf.globaldict dup dup + /pdf.brokenlink.dict undef + /pdf.brokenlink.skip undef + /pdf.brokenlink.rect undef + currentpoint + /pdf.originy exch def + /pdf.originx exch def + /a where + { + /a + { + moveto + SDict + begin + currentpoint pdf.originy ne exch + pdf.originx ne or + { + pdf.save.linkll + /pdf.lly + pdf.lly pdf.outerbox 1 get sub def + pdf.bordertracking.begin + } + if + end + } + put + } + if + /x where + { + /x + { + 0 exch rmoveto + SDict~ + begin + currentpoint + pdf.originy ne exch pdf.originx ne or + { + pdf.save.linkll + /pdf.lly + pdf.lly pdf.outerbox 1 get sub def + pdf.bordertracking.begin + } + if + end + } + put + } + if + } + def +% \end{macrocode} +% \end{macro} +% +% \begin{macro} +% { +% pdf.breaklink , +% pdf.breaklink.write , +% pdf.count , +% pdf.currentrect +% } +% Dealing with link breaking itself has multiple stage. The first step is to +% find the |Rect| entry in the dictionary, looping over key--value pairs. +% The first line is handled first, adjusting the rectangle to stay inside the +% text area. The second phase is a loop over the height of the bulk of the +% link area, done on the basis of a number of baselines. Finally, the end of +% the link area is tidied up, again from the boundary of the text area. +% \begin{macrocode} +/pdf.breaklink + { + pop + counttomark 2 mod 0 eq + { + counttomark /pdf.count exch def + { + pdf.count 0 eq { exit } if + counttomark 2 roll + 1 index /Rect eq + { + dup 4 array copy + dup dup + 1 get + pdf.outerbox pdf.rect.ht + pdf.linkmargin 2 mul add sub + 3 exch put + dup + pdf.outerbox 2 get + pdf.linkmargin add + 2 exch put + dup dup + 3 get + pdf.outerbox pdf.rect.ht + pdf.linkmargin 2 mul add add + 1 exch put + /pdf.currentrect exch def + pdf.breaklink.write + { + pdf.currentrect + dup + pdf.outerbox 0 get + pdf.linkmargin sub + 0 exch put + dup + pdf.outerbox 2 get + pdf.linkmargin add + 2 exch put + dup dup + 1 get + pdf.baselineskip add + 1 exch put + dup dup + 3 get + pdf.baselineskip add + 3 exch put + /pdf.currentrect exch def + pdf.breaklink.write + } + 1 index 3 get + pdf.linkmargin 2 mul add + pdf.outerbox pdf.rect.ht add + 2 index 1 get sub + pdf.baselineskip div round cvi 1 sub + exch + repeat + pdf.currentrect + dup + pdf.outerbox 0 get + pdf.linkmargin sub + 0 exch put + dup dup + 1 get + pdf.baselineskip add + 1 exch put + dup dup + 3 get + pdf.baselineskip add + 3 exch put + dup 2 index 2 get 2 exch put + /pdf.currentrect exch def + pdf.breaklink.write + SDict /pdf.pdfmark.good false put + exit + } + { pdf.count 2 sub /pdf.count exch def } + ifelse + } + loop + } + if + /ANN +} + def +/pdf.breaklink.write + { + counttomark 1 sub + index /_objdef eq + { + counttomark -2 roll + dup wcheck + { + readonly + counttomark 2 roll + } + { pop pop } + ifelse + } + if + counttomark 1 add copy + pop pdf.currentrect + /ANN pdfmark + } + def +% \end{macrocode} +% \end{macro} +% +% \begin{macro} +% { +% pdf.pdfmark , +% pdf.pdfmark.good , +% pdf.outerbox , +% pdf.baselineskip , +% pdf.pdfmark.dict +% } +% The business end of breaking links starts by hooking into |pdfmarks|. +% Unlike \pkg{hypdvips}, we avoid altering any links we have not created +% by using a copy of the core |pdfmarks| function. Only mark types which +% are known are altered. At present, this is purely |ANN| marks, which are +% measured relative to the size of the baseline skip. If they are +% more than one apparent line high, breaking is applied. +% \begin{macrocode} +/pdf.pdfmark + { + SDict /pdf.pdfmark.good true put + dup /ANN eq + { + pdf.pdfmark.store + pdf.pdfmark.dict + begin + Subtype /Link eq + currentdict /Rect known and + SDict /pdf.outerbox known and + SDict /pdf.baselineskip known and + { + Rect 3 get + pdf.linkmargin 2 mul add + pdf.outerbox pdf.rect.ht add + Rect 1 get sub + pdf.baselineskip div round cvi 0 gt + { pdf.breaklink } + if + } + if + end + SDict /pdf.outerbox undef + SDict /pdf.baselineskip undef + currentdict /pdf.pdfmark.dict undef + } + if + pdf.pdfmark.good + { pdfmark } + { cleartomark } + ifelse + } + def +/pdf.pdfmark.store + { + /pdf.pdfmark.dict 65534 dict def + counttomark 1 add copy + pop + { + dup mark eq + { + pop + exit + } + { + pdf.pdfmark.dict + begin def end + } + ifelse + } + loop +} + def +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} +%</dvips&header> +% \end{macrocode} +% +% \end{implementation} +% +% \PrintIndex diff --git a/macros/latex/contrib/l3backend/l3backend-pdf.dtx b/macros/latex/contrib/l3backend/l3backend-pdf.dtx index 832b835c10..ad4d3028ac 100644 --- a/macros/latex/contrib/l3backend/l3backend-pdf.dtx +++ b/macros/latex/contrib/l3backend/l3backend-pdf.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-11} +% \date{Released 2019-11-25} % % \maketitle % @@ -232,535 +232,6 @@ % In \texttt{dvips}, annotations have to be constructed manually. As such, % we need the object code above for some definitions. % -% \begin{macro}{pdf.globaldict} -% A small global dictionary for backend use. -% \begin{macrocode} -\__kernel_backend_postscript_header:n - { - true ~ setglobal ~ - /pdf.globaldict ~ 4 ~ dict ~ def ~ - false ~ setglobal - } -% \end{macrocode} -% \end{macro} -% -% \begin{macro} -% { -% pdf.cvs , -% pdf.dvi.pt , -% pdf.pt.dvi , -% pdf.rect.ht -% } -% Small utilities for PostScript manipulations. Conversion to DVI dimensions -% is done here to allow for |Resolution|. The total height of a rectangle -% (an array) needs a little maths, in contrast to simply extracting a value. -% \begin{macrocode} -\__kernel_backend_postscript_header:n - { - /pdf.cvs { 65534 ~ string ~ cvs } def - /pdf.dvi.pt { 72.27 ~ mul ~ Resolution ~ div } def - /pdf.pt.dvi { 72.27 ~ div ~ Resolution ~ mul } def - /pdf.rect.ht { dup ~ 1 ~ get ~ neg ~ exch ~ 3 ~ get ~ add } def - } -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{pdf.linkmargin, pdf.linkdp.pad, pdf.linkht.pad} -% Settings which are defined up-front in |SDict|. -% \begin{macrocode} -\__kernel_backend_postscript_header:n - { - /pdf.linkmargin { 1 ~ pdf.pt.dvi } def - /pdf.linkdp.pad { 0 } def - /pdf.linkht.pad { 0 } def - } -% \end{macrocode} -% \end{macro} -% -% \begin{macro} -% { -% pdf.rect , -% pdf.save.ll , -% pdf.save.ur , -% pdf.save.linkll , -% pdf.save.linkur , -% pdf.llx , -% pdf.lly , -% pdf.urx , -% pdf.ury -% } -% Functions for marking the limits of an annotation/link, plus drawing the -% border. We separate links for generic annotations to support adding a -% margin and setting a minimal size. -% \begin{macrocode} -\__kernel_backend_postscript_header:n - { - /pdf.rect - { /Rect [ pdf.llx ~ pdf.lly ~ pdf.urx ~ pdf.ury ] } def - /pdf.save.ll - { - currentpoint - /pdf.lly ~ exch ~ def - /pdf.llx ~ exch ~ def - } - def - /pdf.save.ur - { - currentpoint - /pdf.ury ~ exch ~ def - /pdf.urx ~ exch ~ def - } - def - /pdf.save.linkll - { - currentpoint ~ - pdf.linkmargin ~ add ~ - pdf.linkdp.pad ~ add - /pdf.lly ~ exch ~ def ~ - pdf.linkmargin ~ sub - /pdf.llx ~ exch ~ def - } - def - /pdf.save.linkur - { - currentpoint ~ - pdf.linkmargin ~ sub ~ - pdf.linkht.pad ~ sub - /pdf.ury ~ exch ~ def ~ - pdf.linkmargin ~ add - /pdf.urx ~ exch ~ def - } - def - } -% \end{macrocode} -% \end{macro} -% -% \begin{macro} -% { -% pdf.dest.anchor , -% pdf.dest.x , -% pdf.dest.y , -% pdf.dest.point , -% pdf.dest2device , -% pdf.dev.x , -% pdf.dev.y , -% pdf.tmpa , -% pdf.tmpb , -% pdf.tmpc , -% pdf.tmpd -% } -% For finding the anchor point of a destination link. We make the use case -% a separate function as it comes up a lot, and as this makes it easier to -% adjust if we need additional effects. We also need a more complex approach -% to convert a co-ordinate pair correctly when defining a rectangle: this -% can otherwise be out when using a landscape page. (Thanks to Alexander -% Grahn for the approach here.) -% \begin{macrocode} -\__kernel_backend_postscript_header:n - { - /pdf.dest.anchor - { - currentpoint ~ exch ~ - pdf.dvi.pt ~ 72 ~ add ~ - /pdf.dest.x ~ exch ~ def ~ - pdf.dvi.pt ~ - vsize ~ 72 ~ sub ~ exch ~ sub ~ - /pdf.dest.y ~ exch ~ def - } - def - /pdf.dest.point - { pdf.dest.x ~ pdf.dest.y } def - /pdf.dest2device - { - /pdf.dest.y ~ exch ~ def - /pdf.dest.x ~ exch ~ def ~ - matrix ~ currentmatrix ~ - matrix ~ defaultmatrix ~ - matrix ~ invertmatrix ~ - matrix ~ concatmatrix ~ - cvx ~ exec - /pdf.dev.y ~ exch ~ def - /pdf.dev.x ~ exch ~ def - /pdf.tmpd ~ exch ~ def - /pdf.tmpc ~ exch ~ def - /pdf.tmpb ~ exch ~ def - /pdf.tmpa ~ exch ~ def ~ - pdf.dest.x ~ pdf.tmpa ~ mul ~ - pdf.dest.y ~ pdf.tmpc ~ mul ~ add ~ - pdf.dev.x ~ add ~ - pdf.dest.x ~ pdf.tmpb ~ mul ~ - pdf.dest.y ~ pdf.tmpd ~ mul ~ add ~ - pdf.dev.y ~ add - } - def - } -% \end{macrocode} -% \end{macro} -% -% \begin{macro} -% { -% pdf.bordertracking , -% pdf.bordertracking.begin , -% pdf.bordertracking.end , -% pdf.leftboundary , -% pdf.rightboundary , -% pdf.brokenlink.rect , -% pdf.brokenlink.skip , -% pdf.brokenlink.dict , -% pdf.bordertracking.endpage , -% pdf.bordertracking.continue , -% pdf.originx , -% pdf.originy -% } -% To know where a breakable link can go, we need to track the boundary -% rectangle. That can be done by hooking into |a| and |x| operations: -% those names have to be retained. The boundary is stored at the end of -% the operation. Special effort is needed at the start and end of pages -% (or rather galleys), such that everything works properly. -% \begin{macrocode} -\__kernel_backend_postscript_header:n - { - /pdf.bordertracking ~ false ~ def - /pdf.bordertracking.begin - { - SDict ~ /pdf.bordertracking ~ true ~ put ~ - SDict ~ /pdf.leftboundary ~ undef ~ - SDict ~ /pdf.rightboundary ~ undef ~ - /a ~ where - { - /a - { - currentpoint ~ pop ~ - SDict /pdf.rightboundary ~ known ~ dup - { - SDict /pdf.rightboundary ~ get ~ 2 ~ index ~ lt - { not } - if - } - if - { pop } - { SDict ~ exch /pdf.rightboundary ~ exch ~ put } - ifelse ~ - moveto ~ - currentpoint ~ pop ~ - SDict /pdf.leftboundary ~ known ~ dup - { - SDict /pdf.leftboundary ~ get ~ 2 ~ index ~ gt - { not } - if - } - if - { pop } - { SDict ~ exch /pdf.leftboundary ~ exch ~ put } - ifelse - } - put - } - if - } - def - /pdf.bordertracking.end - { - /a ~ where { /a { moveto } put } if - /x ~ where { /x { 0 ~ exch ~ rmoveto } put } if ~ - SDict /pdf.leftboundary ~ known - { pdf.outerbox ~ 0 ~ pdf.leftboundary ~ put } - if ~ - SDict /pdf.rightboundary ~ known - { pdf.outerbox ~ 2 ~ pdf.rightboundary ~ put } - if ~ - SDict /pdf.bordertracking ~ false ~ put - } - def - /pdf.bordertracking.endpage - { - pdf.bordertracking - { - pdf.bordertracking.end ~ - true ~ setglobal ~ - pdf.globaldict - /pdf.brokenlink.rect [ pdf.outerbox ~ aload ~ pop ] put ~ - pdf.globaldict - /pdf.brokenlink.skip ~ pdf.baselineskip ~ put ~ - pdf.globaldict - /pdf.brokenlink.dict ~ - pdf.link.dict ~ pdf.cvs ~ put ~ - false ~ setglobal ~ - mark ~ pdf.link.dict ~ cvx ~ exec ~ /Rect - [ - pdf.llx ~ - pdf.lly ~ - pdf.outerbox ~ 2 ~ get ~ pdf.linkmargin ~ add ~ - currentpoint ~ exch ~ pop ~ - pdf.outerbox ~ pdf.rect.ht ~ sub ~ pdf.linkmargin ~ sub - ] - /ANN ~ pdf.pdfmark - } - if - } - def - /pdf.bordertracking.continue - { - /pdf.link.dict ~ pdf.globaldict - /pdf.brokenlink.dict ~ get ~ def - /pdf.outerbox ~ pdf.globaldict - /pdf.brokenlink.rect ~ get ~ def - /pdf.baselineskip ~ pdf.globaldict - /pdf.brokenlink.skip ~ get ~ def ~ - pdf.globaldict ~ dup ~ dup - /pdf.brokenlink.dict ~ undef - /pdf.brokenlink.skip ~ undef - /pdf.brokenlink.rect ~ undef ~ - currentpoint - /pdf.originy ~ exch ~ def - /pdf.originx ~ exch ~ def - /a ~ where - { - /a - { - moveto ~ - SDict ~ - begin ~ - currentpoint ~ pdf.originy ~ ne ~ exch ~ - pdf.originx ~ ne ~ or - { - pdf.save.linkll - /pdf.lly ~ - pdf.lly ~ pdf.outerbox ~ 1 ~ get ~ sub ~ def ~ - pdf.bordertracking.begin - } - if ~ - end - } - put - } - if - /x ~ where - { - /x - { - 0 ~ exch ~ rmoveto ~ - SDict~ - begin ~ - currentpoint ~ - pdf.originy ~ ne ~ exch ~ pdf.originx ~ ne ~ or - { - pdf.save.linkll - /pdf.lly ~ - pdf.lly ~ pdf.outerbox ~ 1 ~ get ~ sub ~ def ~ - pdf.bordertracking.begin - } - if ~ - end - } - put - } - if - } - def - } -% \end{macrocode} -% \end{macro} -% -% \begin{macro} -% { -% pdf.breaklink , -% pdf.breaklink.write , -% pdf.count , -% pdf.currentrect -% } -% Dealing with link breaking itself has multiple stage. The first step is to -% find the |Rect| entry in the dictionary, looping over key--value pairs. -% The first line is handled first, adjusting the rectangle to stay inside the -% text area. The second phase is a loop over the height of the bulk of the -% link area, done on the basis of a number of baselines. Finally, the end of -% the link area is tidied up, again from the boundary of the text area. -% \begin{macrocode} -\__kernel_backend_postscript_header:n - { - /pdf.breaklink - { - pop ~ - counttomark ~ 2 ~ mod ~ 0 ~ eq - { - counttomark /pdf.count ~ exch ~ def - { - pdf.count ~ 0 ~ eq { exit } if ~ - counttomark ~ 2 ~ roll ~ - 1 ~ index ~ /Rect ~ eq - { - dup ~ 4 ~ array ~ copy ~ - dup ~ dup ~ - 1 ~ get ~ - pdf.outerbox ~ pdf.rect.ht ~ - pdf.linkmargin ~ 2 ~ mul ~ add ~ sub ~ - 3 ~ exch ~ put ~ - dup ~ - pdf.outerbox ~ 2 ~ get ~ - pdf.linkmargin ~ add ~ - 2 ~ exch ~ put ~ - dup ~ dup ~ - 3 ~ get ~ - pdf.outerbox ~ pdf.rect.ht ~ - pdf.linkmargin ~ 2 ~ mul ~ add ~ add ~ - 1 ~ exch ~ put - /pdf.currentrect ~ exch ~ def ~ - pdf.breaklink.write - { - pdf.currentrect ~ - dup ~ - pdf.outerbox ~ 0 ~ get ~ - pdf.linkmargin ~ sub ~ - 0 ~ exch ~ put ~ - dup ~ - pdf.outerbox ~ 2 ~ get ~ - pdf.linkmargin ~ add ~ - 2 ~ exch ~ put ~ - dup ~ dup ~ - 1 ~ get ~ - pdf.baselineskip ~ add ~ - 1 ~ exch ~ put ~ - dup ~ dup ~ - 3 ~ get ~ - pdf.baselineskip ~ add ~ - 3 ~ exch ~ put ~ - /pdf.currentrect ~ exch ~ def ~ - pdf.breaklink.write - } - 1 ~ index ~ 3 ~ get ~ - pdf.linkmargin ~ 2 ~ mul ~ add ~ - pdf.outerbox ~ pdf.rect.ht ~ add ~ - 2 ~ index ~ 1 ~ get ~ sub ~ - pdf.baselineskip ~ div ~ round ~ cvi ~ 1 ~ sub ~ - exch ~ - repeat ~ - pdf.currentrect ~ - dup ~ - pdf.outerbox ~ 0 ~ get ~ - pdf.linkmargin ~ sub ~ - 0 ~ exch ~ put ~ - dup ~ dup ~ - 1 ~ get ~ - pdf.baselineskip ~ add ~ - 1 ~ exch ~ put ~ - dup ~ dup ~ - 3 ~ get ~ - pdf.baselineskip ~ add ~ - 3 ~ exch ~ put ~ - dup ~ 2 ~ index ~ 2 ~ get ~ 2 ~ exch ~ put - /pdf.currentrect ~ exch ~ def ~ - pdf.breaklink.write ~ - SDict /pdf.pdfmark.good ~ false ~ put ~ - exit - } - { pdf.count ~ 2 ~ sub /pdf.count ~ exch ~ def } - ifelse - } - loop - } - if - /ANN - } - def - /pdf.breaklink.write - { - counttomark ~ 1 ~ sub ~ - index /_objdef ~ eq - { - counttomark ~ -2 ~ roll ~ - dup ~ wcheck ~ - { - readonly ~ - counttomark ~ 2 ~ roll - } - { pop ~ pop } - ifelse - } - if ~ - counttomark ~ 1 ~ add ~ copy ~ - pop ~ pdf.currentrect - /ANN ~ pdfmark - } - def - } -% \end{macrocode} -% \end{macro} -% -% \begin{macro} -% { -% pdf.pdfmark , -% pdf.pdfmark.good , -% pdf.outerbox , -% pdf.baselineskip , -% pdf.pdfmark.dict -% } -% The business end of breaking links starts by hooking into |pdfmarks|. -% Unlike \pkg{hypdvips}, we avoid altering any links we have not created -% by using a copy of the core |pdfmarks| function. Only mark types which -% are known are altered. At present, this is purely |ANN| marks, which are -% measured relative to the size of the baseline skip. If they are -% more than one apparent line high, breaking is applied. -% \begin{macrocode} -\__kernel_backend_postscript_header:n - { - /pdf.pdfmark - { - SDict /pdf.pdfmark.good ~ true ~ put ~ - dup /ANN ~ eq - { - pdf.pdfmark.store ~ - pdf.pdfmark.dict ~ - begin ~ - Subtype /Link ~ eq ~ - currentdict /Rect ~ known ~ and ~ - SDict /pdf.outerbox ~ known ~ and ~ - SDict /pdf.baselineskip ~ known ~ and ~ - { - Rect ~ 3 ~ get ~ - pdf.linkmargin ~ 2 ~ mul ~ add ~ - pdf.outerbox ~ pdf.rect.ht ~ add ~ - Rect ~ 1 ~ get ~ sub ~ - pdf.baselineskip ~ div ~ round ~ cvi ~ 0 ~ gt - { pdf.breaklink } - if - } - if ~ - end ~ - SDict /pdf.outerbox ~ undef ~ - SDict /pdf.baselineskip ~ undef ~ - currentdict /pdf.pdfmark.dict ~ undef ~ - } - if ~ - pdf.pdfmark.good - { pdfmark } - { cleartomark } - ifelse - } - def - /pdf.pdfmark.store - { - /pdf.pdfmark.dict ~ 65534 ~ dict ~ def ~ - counttomark ~ 1 ~ add ~ copy ~ - pop - { - dup ~ mark ~ eq - { - pop ~ - exit - } - { - pdf.pdfmark.dict ~ - begin ~ def ~ end - } - ifelse - } - loop - } - def - } -% \end{macrocode} -% \end{macro} -% % \begin{variable}{\l_@@_backend_content_box} % The content of an annotation. % \begin{macrocode} diff --git a/macros/latex/contrib/l3backend/l3backend.ins b/macros/latex/contrib/l3backend/l3backend.ins index 149f08b9ee..1a92aade18 100644 --- a/macros/latex/contrib/l3backend/l3backend.ins +++ b/macros/latex/contrib/l3backend/l3backend.ins @@ -77,6 +77,10 @@ and all files in that bundle must be distributed together. \from{l3backend-graphics.dtx}{package,dvips} \from{l3backend-pdf.dtx} {package,dvips} } + \file{l3backend-dvips.pro} + { + \from{l3backend-header.dtx} {header,dvips} + } } \generate { diff --git a/support/make4ht/README b/support/make4ht/README index df14833239..3b2e6b0085 100644 --- a/support/make4ht/README +++ b/support/make4ht/README @@ -403,6 +403,10 @@ detect compilation errors in the TeX log file. : Process bibliography using the `biber` command. +`Make:pythontex` + +: Process the input file using `pythontex`. + `Make:bibtex` : Process bibliography using the `bibtex` command. @@ -602,6 +606,10 @@ tablerows : remove spurious rows from HTML tables. +mathmlfixes + +: fix common issues for MathML. + t4htlinks : fix hyperlinks in the ODT format. diff --git a/support/make4ht/changelog.tex b/support/make4ht/changelog.tex index 723de6762b..8fdd699e83 100644 --- a/support/make4ht/changelog.tex +++ b/support/make4ht/changelog.tex @@ -3,6 +3,47 @@ \begin{itemize} \item + 2019/11/28 + + \begin{itemize} + \tightlist + \item + version \texttt{0.3c} released. + \item + updated \texttt{mathmlfixes} DOM filter. It handles + \texttt{\textless{}mstyle\textgreater{}} element inside token + elements now. + \item + use \texttt{mathmlfixes} and \texttt{joincharacters} DOM filters for + math XML files in the ODT output. + \end{itemize} +\item + 2019/11/25 + + \begin{itemize} + \tightlist + \item + added \texttt{pythontex} command. + \item + added \texttt{mathmlfixes} DOM filter. + \item + use the \texttt{mathmlfixes} DOM filter in + \texttt{common\_domfilters} extension. + \end{itemize} +\item + 2019/11/22 + + \begin{itemize} + \tightlist + \item + \texttt{make4ht-joincharacters} dom filter: added support for the + \texttt{\textless{}mi\textgreater{}} element. Test all attributes + for match when joining characters. + \item + \texttt{html5} format: use the \texttt{common\_domfilters} by + default. + \end{itemize} +\item 2019/11/03 \begin{itemize} diff --git a/support/make4ht/domfilters/make4ht-joincharacters.lua b/support/make4ht/domfilters/make4ht-joincharacters.lua index 30ed6e1382..5830eae78e 100644 --- a/support/make4ht/domfilters/make4ht-joincharacters.lua +++ b/support/make4ht/domfilters/make4ht-joincharacters.lua @@ -1,8 +1,23 @@ +local log = logging.new("joincharacters") + local charclasses = { span=true, mn = true, + mi = true } +local has_matching_attributes = function (el, next_el) + local el_attr = el._attr or {} + local next_attr = next_el._attr or {} + -- if the number of attributes doesn't match, elements don't match + if #next_attr ~= #el_attr then return false end + for k, v in pairs(el_attr) do + -- if any attribute doesn't match, elements don't match + if v~=next_attr[k] then return false end + end + return true +end + local function join_characters(obj,par) -- join adjanced span and similar elements inserted by -- tex4ht to just one object. @@ -10,12 +25,13 @@ local function join_characters(obj,par) local options = get_filter_settings "joincharacters" local charclasses = options.charclasses or par.charclasses or charclasses + obj:traverse_elements(function(el) local get_name = function(curr) return string.lower(curr:get_element_name()) end local get_class = function(next_el) - return next_el:get_attribute("class") + return next_el:get_attribute("class") or next_el:get_attribute("mathvariant") end local is_span = function(next_el) return charclasses[get_name(next_el)] @@ -41,7 +57,7 @@ local function join_characters(obj,par) while next_el do -- save the next element because we will remove it later local real_next = get_next(next_el) - if get_name(el) == get_name(next_el) and get_class(el) == get_class(next_el) and not el:get_attribute("id") then + if get_name(el) == get_name(next_el) and has_matching_attributes(el,next_el) and not el:get_attribute("id") then -- it the following element match, copy it's children to the current element for _, child in ipairs(next_el:get_children()) do el:add_child_node(child) diff --git a/support/make4ht/domfilters/make4ht-mathmlfixes.lua b/support/make4ht/domfilters/make4ht-mathmlfixes.lua new file mode 100644 index 0000000000..a52b0e5d6b --- /dev/null +++ b/support/make4ht/domfilters/make4ht-mathmlfixes.lua @@ -0,0 +1,46 @@ +-- <mglyph> should be inside <mi>, so we don't process it +-- even though it is a token element +local token = {"mi", "mn", "mo", "mtext", "mspace", "ms"} +local token_elements = {} +for _, tok in ipairs(token) do token_elements[tok] = true end + +local function is_token_element(el) + return token_elements[el:get_element_name()] +end + +local function fix_token_elements(el) + -- find token elements that are children of other token elements + if is_token_element(el) then + local parent = el:get_parent() + if is_token_element(parent) then + -- change top element in nested token elements to mstyle + parent._name = "mstyle" + end + end +end + +local function fix_nested_mstyle(el) + -- the <mstyle> element can be child of token elements + -- we must exterminate it + if el:get_element_name() == "mstyle" then + local parent = el:get_parent() + if is_token_element(parent) then + -- if parent doesn't have the mathvariant attribute copy it from <mstyle> + if not parent:get_attribute("mathvariant") then + local mathvariant = el:get_attribute("mathvariant") + parent:set_attribute("mathvariant", mathvariant) + end + -- copy the contents of <mstyle> to the parent element + parent._children = el._children + end + end +end + +return function(dom) + dom:traverse_elements(function(el) + fix_token_elements(el) + fix_nested_mstyle(el) + end) + return dom +end + diff --git a/support/make4ht/extensions/make4ht-ext-common_domfilters.lua b/support/make4ht/extensions/make4ht-ext-common_domfilters.lua index 9399492d90..ec687cd042 100644 --- a/support/make4ht/extensions/make4ht-ext-common_domfilters.lua +++ b/support/make4ht/extensions/make4ht-ext-common_domfilters.lua @@ -19,14 +19,14 @@ function M.modify_build(make) local count = 0 if current_format == "odt" then -- some formats doesn't make sense in the ODT format - local process = filter {"joincharacters"} - local charclasses = {mn = true, ["text:span"] = true} + local process = filter {"joincharacters", "mathmlfixes"} + local charclasses = {mn = true, ["text:span"] = true, mi=true} make:match("4oo$", process, {charclasses= charclasses}) -- match math documents make:match("4om$", process, {charclasses= charclasses}) count = 2 else - local process = filter {"fixinlines", "idcolons", "joincharacters", "tablerows"} + local process = filter {"fixinlines", "idcolons", "joincharacters", "mathmlfixes", "tablerows"} make:match("html$", process) count = 1 end diff --git a/support/make4ht/formats/make4ht-html5.lua b/support/make4ht/formats/make4ht-html5.lua index 633a45e7f3..a70309fa7a 100644 --- a/support/make4ht/formats/make4ht-html5.lua +++ b/support/make4ht/formats/make4ht-html5.lua @@ -3,8 +3,7 @@ local M = {} local mkutils = require "mkutils" function M.prepare_extensions(extensions) - -- return mkutils.add_extensions("+common_domfilters", extensions) - return extensions --mkutils.add_extensions("+tidy", extensions) + return mkutils.add_extensions("+common_domfilters", extensions) end function M.prepare_parameters(parameters,extensions) diff --git a/support/make4ht/formats/make4ht-odt.lua b/support/make4ht/formats/make4ht-odt.lua index c515a154a1..30fdc0744d 100644 --- a/support/make4ht/formats/make4ht-odt.lua +++ b/support/make4ht/formats/make4ht-odt.lua @@ -136,6 +136,9 @@ function M.modify_build(make) -- fix the image dimensions wrongly set by xtpipes local domfilters = domfilter {"t4htlinks", "odtpartable"} make:match("4oo$", domfilters) + -- fixes for mathml + local mathmldomfilters = domfilter {"joincharacters","mathmlfixes"} + make:match("4om$", mathmldomfilters) -- execute it before xtpipes, because we don't want xtpipes to mess with t4htlink elements move_matches(make) -- convert XML entities for Unicode characters produced by Xtpipes to characters diff --git a/support/make4ht/formats/make4ht-xhtml.lua b/support/make4ht/formats/make4ht-xhtml.lua index 4a4ac6689c..25fb339c0f 100644 --- a/support/make4ht/formats/make4ht-xhtml.lua +++ b/support/make4ht/formats/make4ht-xhtml.lua @@ -3,8 +3,7 @@ local M = {} local mkutils = require "mkutils" function M.prepare_extensions(extensions) - -- return mkutils.add_extensions("+common_domfilters", extensions) - return extensions + return mkutils.add_extensions("+common_domfilters", extensions) end function M.prepare_parameters(parameters,extensions) diff --git a/support/make4ht/make4ht b/support/make4ht/make4ht index fd153164cd..10311088d7 100755 --- a/support/make4ht/make4ht +++ b/support/make4ht/make4ht @@ -29,7 +29,7 @@ make4ht [options] filename ["tex4ht.sty op." "tex4ht op." "t4ht op" "latex op"] -- set version number. the template should be replaced by the -- actual version number by the build script -local version = "v0.3b" +local version = "v0.3c" mkparams.version_number = version local args = mkparams.get_args() diff --git a/support/make4ht/make4ht-doc.pdf b/support/make4ht/make4ht-doc.pdf Binary files differindex 9676888d51..949fa599c6 100644 --- a/support/make4ht/make4ht-doc.pdf +++ b/support/make4ht/make4ht-doc.pdf diff --git a/support/make4ht/mkutils.lua b/support/make4ht/mkutils.lua index 0ea85c7b56..944ab99cc7 100644 --- a/support/make4ht/mkutils.lua +++ b/support/make4ht/mkutils.lua @@ -440,6 +440,7 @@ end -- for the BibLaTeX support env.Make:add("biber", "biber ${input}") env.Make:add("bibtex", "bibtex ${input}") +env.Make:add("pythontex", "pythontex ${input}") --- load the output format plugins function load_output_format(format_name) diff --git a/support/make4ht/readme.tex b/support/make4ht/readme.tex index ff1d942d18..a326ce1010 100644 --- a/support/make4ht/readme.tex +++ b/support/make4ht/readme.tex @@ -477,6 +477,8 @@ Process the \texttt{DVI} file and create output files. Create the CSS file and generate images. \item[\texttt{Make:biber}] Process bibliography using the \texttt{biber} command. +\item[\texttt{Make:pythontex}] +Process the input file using \texttt{pythontex}. \item[\texttt{Make:bibtex}] Process bibliography using the \texttt{bibtex} command. \item[\texttt{Make:xindy}] @@ -664,6 +666,8 @@ resolve tables nested inside paragraphs, which is invalid in the ODT format. \item[tablerows] remove spurious rows from HTML tables. +\item[mathmlfixes] +fix common issues for MathML. \item[t4htlinks] fix hyperlinks in the ODT format. \end{description} diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl index e9672159be..73a097a05a 100644 --- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl +++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl @@ -7,6 +7,7 @@ $mirrors = { 'https://mirror.marwan.ma/ctan/' => 1 }, 'South Africa' => { + 'http://ftp.leg.uct.ac.za/pub/packages/ctan/' => 1, 'http://ftp.sun.ac.za/ftp/CTAN/' => 1, 'http://mirror.ufs.ac.za/ctan/' => 1 } @@ -17,8 +18,7 @@ $mirrors = { 'http://mirrors.cqu.edu.cn/CTAN/' => 1, 'http://mirrors.hit.edu.cn/CTAN/' => 1, 'http://mirrors.sjtug.sjtu.edu.cn/ctan/' => 1, - 'http://mirrors.tuna.tsinghua.edu.cn/CTAN/' => 1, - 'http://mirrors.ustc.edu.cn/CTAN/' => 1 + 'http://mirrors.tuna.tsinghua.edu.cn/CTAN/' => 1 }, 'Hong Kong' => { 'https://mirror-hk.koddos.net/CTAN/' => 1 diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb index 5914b90894..d8721f4d84 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/52916 +depend revision/52923 name 00texlive.image category TLCore -revision 52914 +revision 52922 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 @@ -2938,7 +2938,7 @@ runfiles size=4975 tlpkg/tlpsrc/postage.tlpsrc tlpkg/tlpsrc/postcards.tlpsrc tlpkg/tlpsrc/poster-mac.tlpsrc - tlpkg/tlpsrc/powerdot-FUBerlin.tlpsrc + tlpkg/tlpsrc/powerdot-fuberlin.tlpsrc tlpkg/tlpsrc/powerdot-tuliplab.tlpsrc tlpkg/tlpsrc/powerdot.tlpsrc tlpkg/tlpsrc/ppr-prv.tlpsrc @@ -4077,7 +4077,7 @@ depend opt_w32_multi_user:1 name 00texlive.installer category TLCore -revision 52904 +revision 52919 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 @@ -65016,7 +65016,7 @@ containerchecksum 336ecc5633674197d366aa52ad2ce650378868110ccc8203c64b9a2ebb69cf name collection-publishers category Collection -revision 51925 +revision 52922 shortdesc Publisher styles, theses, etc. relocated 1 depend collection-latex @@ -65153,7 +65153,7 @@ depend opteng depend philosophersimprint depend pittetd depend pkuthss -depend powerdot-FUBerlin +depend powerdot-fuberlin depend powerdot-tuliplab depend pracjourn depend procIAGssymp @@ -65243,8 +65243,8 @@ depend wsemclassic depend yathesis depend yazd-thesis depend york-thesis -containersize 1460 -containerchecksum 3ff65b8b007456d71ce63e06569023b37fc06e05b777fc89aab3bbebfe3ed9e8e7d33801d1f32b7fd6ce350f88f0b8710e50f5c398024c064eadfc315c9a1ed1 +containersize 1464 +containerchecksum 55e30484e5c5aaa6f7cc7920508a7a4e7f100025bf8f18c039718d21a9a39c17a431f32d92e55ef06a18ffb676e5d4ab1fa21d24df89adbd8345ba8486773be0 name collection-texworks category Collection @@ -92009,29 +92009,35 @@ catalogue-version 0.2b name dynkin-diagrams category Package -revision 49808 +revision 52920 shortdesc Draw Dynkin, Coxeter, and Satake diagrams using TikZ relocated 1 longdesc Draws Dynkin, Coxeter, and Satake diagrams in LaTeX documents, longdesc using the TikZ package. The package requires etoolbox, expl3, longdesc pgfkeys, pgfopts, TikZ, xparse, and xstring. -containersize 16548 -containerchecksum 077268d796ca7e45df408fec24dbdeaa8d2192097f99880edefc12b7773359ef78ee243c0e479b6259c11b928908e8cbfead96b1ef0470831a65d1c58ebc4dfc -doccontainersize 752860 -doccontainerchecksum c188c4e237439e6f38e062a89428413f94951c747e3c0cd122ea3ad8b0ca4d516f545dc2c6ac5fe5221d8a6d86b8754acc1981986d0eb53498f00a3b56809cf5 -docfiles size=202 +containersize 16684 +containerchecksum 969f5c4e344cd52f5fd9f604766674bff6e3a60b76e7e656d4c56f720ceedee3229bf6c917a6cab2bbd1809d98131c168cfd3b69c004a5bbc7263664aed23d47 +doccontainersize 17516 +doccontainerchecksum 5ca421386d2d2412e81bb18a4c6160d9da917add8f8fdbbf0b5c6d564c510abd3e6faf3e444327c7aa867c4900e95410f9f326095b0b1d7d6e60a9342bf21ea8 +docfiles size=27 + RELOC/doc/latex/dynkin-diagrams/DoneTwoElBendy.tex + RELOC/doc/latex/dynkin-diagrams/DoneTwoElStraight.tex + RELOC/doc/latex/dynkin-diagrams/EulerProducts.tex RELOC/doc/latex/dynkin-diagrams/README details="Readme" + RELOC/doc/latex/dynkin-diagrams/borovoi.tex + RELOC/doc/latex/dynkin-diagrams/d44.tex RELOC/doc/latex/dynkin-diagrams/dynkin-diagrams.bib - RELOC/doc/latex/dynkin-diagrams/dynkin-diagrams.pdf details="Package documentation" RELOC/doc/latex/dynkin-diagrams/dynkin-diagrams.tex + RELOC/doc/latex/dynkin-diagrams/hermitian-symmetric-spaces.tex + RELOC/doc/latex/dynkin-diagrams/simple-lie-algebras.tex runfiles size=30 RELOC/tex/latex/dynkin-diagrams/dynkin-diagrams.sty catalogue-contact-home http://euclid.ucc.ie/Mckay/ catalogue-ctan /graphics/pgf/contrib/dynkin-diagrams -catalogue-date 2019-01-24 13:42:02 +0100 +catalogue-date 2019-11-25 12:58:53 +0100 catalogue-license lppl1.3c catalogue-topics diagram pgf-tikz expl3 -catalogue-version 3.141592 +catalogue-version 3.1415926 name dyntree category Package @@ -234165,9 +234171,9 @@ catalogue-license lppl1.3 catalogue-topics presentation class catalogue-version 1.5c -name powerdot-FUBerlin +name powerdot-fuberlin category Package -revision 15878 +revision 52922 shortdesc Powerdot, using the style of FU Berlin relocated 1 longdesc The bundle provides a powerdot-derived class and a package for @@ -234178,29 +234184,27 @@ longdesc \style=BerlinFU as a class option. Examples of using both the longdesc class and the package are provided; the PDF is visually longdesc identical, so the catalogue only lists one; the sources of the longdesc examples do of course differ. -containersize 2708 -containerchecksum 607e182a393baf3701b944459e9cdd59451c402722226aff8f09e89702e46723be269b21b3eff35c8f71adc4624b00f083bd4aa0ebde66d49a32bf7de1eeaa48 -doccontainersize 1408480 -doccontainerchecksum d822434b9e03f500779ad0b035100d01cbb197a68e931d17871bbe00ef3defbe594796be28c375502129424ef1309eb49e5f9f6cf1fa5ba8b4b8719a2825a011 -docfiles size=1135 - RELOC/doc/latex/powerdot-FUBerlin/FULogo.eps - RELOC/doc/latex/powerdot-FUBerlin/FULogo_RGB.eps - RELOC/doc/latex/powerdot-FUBerlin/FUbib.eps - RELOC/doc/latex/powerdot-FUBerlin/FUseal.eps - RELOC/doc/latex/powerdot-FUBerlin/README details="Readme" - RELOC/doc/latex/powerdot-FUBerlin/exampleClass.pdf details="Example of use of the class" - RELOC/doc/latex/powerdot-FUBerlin/exampleClass.tex - RELOC/doc/latex/powerdot-FUBerlin/exampleStyle.pdf - RELOC/doc/latex/powerdot-FUBerlin/exampleStyle.tex - RELOC/doc/latex/powerdot-FUBerlin/silberlaube2.eps +containersize 2704 +containerchecksum 73026a8e853bb9141ef3d8915768ca07a9f5caba4e810cf08ab2f41b8c6ee42071065e347ecdc1da070686765591d5cca02a372bd256fc1f9871547a7e1657a2 +doccontainersize 280080 +doccontainerchecksum f2011b2d9362cdd1006714e71c3178b279cf764dc82f10ac31370d197de98a5131dec0c64bc17d4746a554396687e115e6880ae6940d902b34dbd91aa75ba308 +docfiles size=182 + RELOC/doc/latex/powerdot-fuberlin/Changes + RELOC/doc/latex/powerdot-fuberlin/README details="Readme" + RELOC/doc/latex/powerdot-fuberlin/demo-powerdotFU.pdf + RELOC/doc/latex/powerdot-fuberlin/demo-powerdotFU.tex + RELOC/doc/latex/powerdot-fuberlin/exampleClass.pdf details="Example of use of the class" + RELOC/doc/latex/powerdot-fuberlin/exampleClass.tex + RELOC/doc/latex/powerdot-fuberlin/exampleStyle.pdf + RELOC/doc/latex/powerdot-fuberlin/exampleStyle.tex runfiles size=4 - RELOC/tex/latex/powerdot-FUBerlin/FUpowerdot.cls - RELOC/tex/latex/powerdot-FUBerlin/powerdot-BerlinFU.sty + RELOC/tex/latex/powerdot-fuberlin/FUpowerdot.cls + RELOC/tex/latex/powerdot-fuberlin/powerdot-BerlinFU.sty catalogue-ctan /macros/latex/contrib/powerdot-FUBerlin -catalogue-date 2016-06-24 19:18:15 +0200 +catalogue-date 2019-11-25 14:52:26 +0100 catalogue-license lppl catalogue-topics presentation -catalogue-version 0.01 +catalogue-version 0.02a name powerdot-tuliplab category Package @@ -247547,7 +247551,7 @@ catalogue-version 1.0h name reledmac category Package -revision 52640 +revision 52921 shortdesc Typeset scholarly editions relocated 1 longdesc A package for typesetting scholarly critical editions, @@ -247556,10 +247560,10 @@ longdesc itself was a LaTeX port of the plain TeX EDMAC macros. The longdesc package supports indexing by page and by line numbers, and longdesc simple tabular- and array-style environments. The package is longdesc distributed with the related reledpar package. -containersize 52888 -containerchecksum 78dae7298708c04380101573f05b1dd44a14fb1a34544a8c8b4c7398fa56be507379287e9d80b5e7b2f650a682e43545ad49358ec3b9b6659aac4da96801b81b -doccontainersize 8552192 -doccontainerchecksum 178b43adee08a37f43a6b64b01ac1aefe1f45c6e6d9615fb1c3677c1c3846be8e09dbae67253d439187eca18089ddb25fea7c4e2e3bf3873d956f3d0d1e5d1fc +containersize 52892 +containerchecksum ce6b6e02e8d364e14bb689ff24358bab735ad11ba7953fc36c8b3455c5d1443dc78b56c92dd47ad96120d414cee680a120fc729eaaa47b4db47ae1c5080758bd +doccontainersize 8552524 +doccontainerchecksum 11e1d2837eaf872a56ab9c4c3b8ef34e094839f36fbe8f26ea51c69fd85d2ae1690d046f8e03e5dc12336dd63037878c4c24160d4e3e04b1cb71f3fd89fdd2f2 docfiles size=2571 RELOC/doc/latex/reledmac/README details="Readme" RELOC/doc/latex/reledmac/doc-include/migrate-mac.dtx @@ -247664,8 +247668,8 @@ docfiles size=2571 RELOC/doc/latex/reledmac/migration.pdf RELOC/doc/latex/reledmac/reledmac.pdf details="Package documentation" RELOC/doc/latex/reledmac/reledpar.pdf -srccontainersize 203528 -srccontainerchecksum f89fdd63d70713c85d5edbaa8636808906bb561db21e3924b1c295f33f56b3d85fefbe603f3e986ec0c90ff3265256e459084dc6839be3a7afe8fa1bb9e6a903 +srccontainersize 203504 +srccontainerchecksum 8d64f83ad5241ec9403ec7847c6165642149559358d6e77249cc89587d6daad76b49467736888166977dc544525bbeb367cc19d31e4d7f7f450eb6c6d0234c12 srcfiles size=288 RELOC/source/latex/reledmac/migration.dtx RELOC/source/latex/reledmac/reledmac.dtx @@ -247680,10 +247684,10 @@ catalogue-contact-bugs https://github.com/maieul/ledmac/issues/ catalogue-contact-repository https://github.com/maieul/ledmac/ catalogue-contact-support http://geekographie.maieul.net/146 catalogue-ctan /macros/latex/contrib/reledmac -catalogue-date 2019-11-04 21:11:35 +0100 +catalogue-date 2019-11-25 15:22:12 +0100 catalogue-license lppl1.3 catalogue-topics crit-ed -catalogue-version 2.32.1a +catalogue-version 2.32.1b name relenc category Package @@ -283226,15 +283230,15 @@ docfiles size=572 name texlive-docindex category TLCore -revision 52898 +revision 52919 shortdesc top-level TeX Live doc.html, etc. longdesc These files are regenerated as needed, which is often, so we longdesc make them a separate package. See the tl-update-auto script longdesc for the process. containersize 109876 -containerchecksum 18a28393b3fdc0dcd3d1a7e541dfaa9e24dc1e2dd3b706f686476095623ebcbe2c2d86eeee5fc47e15425c5aaf4cbe6c8fcaaa31ed69099380663cb741d9c875 -doccontainersize 155536 -doccontainerchecksum 0f0ebf8474ca920bb0b11e1c1b1e9b04139b8dee71d3337429a7fbcc7e2302b62600c143e4d9c714dabf5cb143cb04b0b32ed593736908f3ec2501d5629188d9 +containerchecksum 0abce06a8431285a0618665ff898943d4adfefc33c44bad501872d229b8e59a5c6b930111f9662b60b8917e4f92e4907f2efe20b1e267d4c8712028968ae3ad2 +doccontainersize 155684 +doccontainerchecksum 2ced4a8f7a13ede4c02182aaf6f93a15a1647690023920af1973c9e8124b2f8dd6ad1933832b5ff08d834164210ca80bdca303b5bfb9d3c3720fd47cf970c58f docfiles size=305 doc.html runfiles size=270 @@ -283451,17 +283455,17 @@ docfiles size=503 name texlive-scripts category TLCore -revision 52904 +revision 52919 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. depend texlive.infra depend texlive-scripts.ARCH postaction shortcut type=menu name="TeX Live command-line" cmd=TEXDIR/tlpkg/installer/tl-cmd.bat -containersize 85432 -containerchecksum 8334212927d6c214806c73cfc20128b26c31508f275404aa93909ee2750db9fe9be75d410d0e70be39c413c147310eefd56eebd07c5f9e4e2b526091c2ee9c2b -doccontainersize 51244 -doccontainerchecksum 60afd6bf3d7944afa9c76b2bbf6016cd8bfd3eb2154c12dba1e21d3d940332238057031b864bcafe3739bc6bcdca44cfc6d9db8875a424253132a4c1cb348cb2 +containersize 85452 +containerchecksum e93db9cc8d0032f053ecfaa63e99833b0f4dec5a142b7d299228019d29b1037e683983b6034bba5c7b095e63c195d6de4846285f4f4b224892551f02ffc95401 +doccontainersize 51248 +doccontainerchecksum 299e3de7932603c68424096009e4a349d793ae40d882abbb4392b205bb164dc2441b9b291fac65741b03a3cfdb0f314a772adbc95dc861a0d2fda22f4956bc4e docfiles size=20 texmf-dist/doc/man/man1/install-tl.1 texmf-dist/doc/man/man1/install-tl.man1.pdf diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 index f887347c18..fc1546ebb8 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 @@ -1 +1 @@ -14b546cdef606b0b3795f085043ee8a8 texlive.tlpdb +83c8621373ee4b9298cc7364301a4f23 texlive.tlpdb diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 index d2ee040584..4c06570bcc 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 @@ -1 +1 @@ -8a2485ca05ce02dcb97f86ea49636a09aa2e76608d6c408f3a29a173f3ba00e679b35664c876804521a839959762e6dc4ac1d00975db4a7b997eb53362ebd974 texlive.tlpdb +a5f4212e299c5ac3d5db063d8645588c92d6ff6cc973d4281411323370a611a0fc9ffd9cd54ee2dd98bda43f5732d1a68e741d2a5d169bb9d79ccba6a9c5a02f texlive.tlpdb diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc index f8b4d096b1..1ec9893303 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----- -iQEcBAEBCgAGBQJd2ya2AAoJEEzhh34ZQ4xw/1sIAIYJ2Eht2YKeBDPsd1XWl4wU -Z0exQM4V8DTvMbtbtx9yTAFb0jdDpsFQLEESf10I67ZmLThHMAB7/61T+TqcsecN -5SODUDtokobiCxpgo4CnuSgBfuJt233nrmozfD1dmtBwSf5V5kB8yCyVPtA/nPWR -tKEd2fjpX5V6eZpm+zW9iKNGme+TaGsk+pgq2d72ezblv4UDQHc0gpZDuMa46rjG -I2dRm0nqAn8iUODKWdNAWLR55tfUvlxEq8EBsTkhbVXb9rYlfuBqgOzLyo2GHzAs -aYlrWEopsp8ciYEG6WaSGhOiwjffd0sGVlZc0ql8cvu560lnTc07t64R8V4P/NE= -=Z6Vx +iQEcBAEBCgAGBQJd3HgEAAoJEEzhh34ZQ4xwE2cH/Ryp1blb5LpVS91VCj2CKI5U +2t6WDeBz+TzqD4vPPutAL/cvatGFgLJbbIfzuZxj68GnTUaI1DKv+KnytmKj29XR +FUn6cKP/gRbKoS9d45q9nyEqM1gkK6xtQ8mqYcPfs+5sHIDJQIuSNz6rHLD/4W+G +3apVZ6h2rWoVu0vtyD3J8cUWeBJHwudQ3S3jkm+pdbWubReFQ1vFyaUT7Bq2q1m2 +KHufLzzUSpHYsXBhP+AyyTTjR7bE3sx2beiGfszNHMCSfFvFuGp7gBTDorBEI0v9 +MHGs0Vp4exdrFSvQXDbB/5u6DccWP1W3WBGJFTK518ZNGf8t3yqtYKxGOb8M58k= +=bjgJ -----END PGP SIGNATURE----- diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz Binary files differindex fef9185ff1..95261ea129 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz diff --git a/systems/win32/miktex/tm/packages/files.csv.lzma b/systems/win32/miktex/tm/packages/files.csv.lzma Binary files differindex c068a1b0fe..8c676f98f1 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 3fd0450b66..50fc881eb5 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 6851764fdb..fa14d5e118 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=1574716569
+date=1574803045
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=b32e30e4c18e4b6b59d58cbaa33b77dc
-numpkg=3769
+lstdigest=4e12e38b32f6dc427098f60b329334bb
+numpkg=3777
relstate=next
-version=7268
+version=7269
diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini index ecdb157f1e..b817e5ce3c 100644 --- a/systems/win32/miktex/tm/packages/pr.ini +++ b/systems/win32/miktex/tm/packages/pr.ini @@ -2,9 +2,9 @@ [repository]
-date=1574716308
-lastupd=beamertheme-focus gbt7714 latex-base-dev letterswitharrows lexend memoir newcomputermodern pst-eucl pxchfon chemplants cochineal fontools knowledge latex-amsmath-dev latex-graphics-dev latex-tools-dev luatexja microtype miktex-runtime-bin-2.9 miktex-runtime-bin-x64-2.9
-lstdigest=65f9b7669d9b964da749e475748efdca
-numpkg=3769
+date=1574802719
+lastupd=attachfile2 biblatex-apa bxjscls caption datetime2-serbian dynkin-diagrams epstopdf-pkg fontsetup footnoterange letterswitharrows mol2chemfig newfloat newtx nomencl oberdiek pdfcolmk pdfpages pdftexcmds pinoutikz powerdot-fuberlin
+lstdigest=ecfda68140f0c4711508642c629e2a6e
+numpkg=3777
relstate=stable
-version=7268
+version=7269
diff --git a/systems/win32/w32tex/ChangeLog b/systems/win32/w32tex/ChangeLog index fd5eacec9b..9b4e00a98d 100644 --- a/systems/win32/w32tex/ChangeLog +++ b/systems/win32/w32tex/ChangeLog @@ -1,5 +1,20 @@ W32TeX (x86 & x64) ChangeLog +[2019/11/25] +(01) cjkzr.tar.xz + Update bxglyphwiki, and pxchfon. +(02) ltxpkgdocs.tar.xz +(03) ltxpkgs.tar.xz + Add attachfile2 (split from oberdiek), + epstopdf-pkg (split from oberdiek), newfloat, + pdfcolmk (split from oberdiek), and pdftexcmds (split from oberdiek). + Update caption, footnoterange, knowledge, memoir, nomencl, + oberdiek, and pdfpages. +(04) pdftex-w32.tar.xz + Rebuild poppler utilities. +(05) win64/pdftex-w64.tar.xz + Rebuild poppler utilities. + [2019/11/24] (01) biblatex-biber.tar.xz Update biblatex-apa. @@ -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: -2019-11-26-02-02 +2019-11-27-02-02 |