summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-02-02 03:04:21 +0000
committerNorbert Preining <norbert@preining.info>2023-02-02 03:04:21 +0000
commit1cbbd7b2417e7e77710bec38f8245c0d2231dddd (patch)
treefab9ca72c7b4b8a42dfab8c3b743a07f7aa53275
parent665dcbc32c9499a686db2c369349632986af26e6 (diff)
CTAN sync 202302020304
-rw-r--r--FILES.byname399
-rw-r--r--FILES.byname.gzbin2513398 -> 2513400 bytes
-rw-r--r--FILES.last07days254
-rw-r--r--biblio/ctan-bibdata/ctan.bib32
-rw-r--r--biblio/ctan-bibdata/ctan.pdfbin3648580 -> 3649230 bytes
-rw-r--r--fonts/utilities/fontools/README2
-rwxr-xr-xfonts/utilities/fontools/bin/afm2afm8
-rwxr-xr-xfonts/utilities/fontools/bin/autoinst442
-rwxr-xr-xfonts/utilities/fontools/bin/ot2kpx8
-rwxr-xr-xfonts/utilities/fontools/bin/splitttc8
-rw-r--r--fonts/utilities/fontools/doc/afm2afm.pdfbin27066 -> 26775 bytes
-rw-r--r--fonts/utilities/fontools/doc/autoinst.pdfbin71042 -> 71157 bytes
-rw-r--r--fonts/utilities/fontools/doc/ot2kpx.pdfbin27441 -> 27149 bytes
-rw-r--r--fonts/utilities/fontools/doc/splitttc.pdfbin20585 -> 20367 bytes
-rw-r--r--fonts/utilities/fontools/share/fontools_cs.enc309
-rw-r--r--fonts/utilities/fontools/share/fontools_l7x.enc306
-rw-r--r--fonts/utilities/fontools/share/fontools_lgr.enc587
-rw-r--r--fonts/utilities/fontools/share/fontools_ly1.enc514
-rw-r--r--fonts/utilities/fontools/share/fontools_oml.enc524
-rw-r--r--fonts/utilities/fontools/share/fontools_ot1.enc518
-rw-r--r--fonts/utilities/fontools/share/fontools_qx.enc310
-rw-r--r--fonts/utilities/fontools/share/fontools_t1.enc518
-rw-r--r--fonts/utilities/fontools/share/fontools_t2a.enc515
-rw-r--r--fonts/utilities/fontools/share/fontools_t2b.enc515
-rw-r--r--fonts/utilities/fontools/share/fontools_t2c.enc515
-rw-r--r--fonts/utilities/fontools/share/fontools_t3.enc522
-rw-r--r--fonts/utilities/fontools/share/fontools_t4.enc309
-rw-r--r--fonts/utilities/fontools/share/fontools_t5.enc305
-rw-r--r--fonts/utilities/fontools/share/fontools_ts1.enc512
-rw-r--r--fonts/utilities/fontools/share/fontools_ts3.enc522
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-oxref/Makefile15
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-oxref/README.md2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxalph-doc.pdfbin436778 -> 465051 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnotes-doc.pdfbin443291 -> 472736 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnum-doc.pdfbin439195 -> 469463 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.dtx1273
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.pdfbin535848 -> 566202 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxyear-doc.pdfbin440823 -> 469196 bytes
-rw-r--r--macros/latex/contrib/l3kernel/CHANGELOG.md8
-rw-r--r--macros/latex/contrib/l3kernel/README.md2
-rw-r--r--macros/latex/contrib/l3kernel/expl3.dtx4
-rw-r--r--macros/latex/contrib/l3kernel/expl3.pdfbin622767 -> 622614 bytes
-rw-r--r--macros/latex/contrib/l3kernel/interface3.pdfbin1779014 -> 1778872 bytes
-rw-r--r--macros/latex/contrib/l3kernel/interface3.tex2
-rw-r--r--macros/latex/contrib/l3kernel/l3basics.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3bootstrap.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3box.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3candidates.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3cctab.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3clist.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3coffins.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3color.dtx16
-rw-r--r--macros/latex/contrib/l3kernel/l3debug.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3deprecation.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3doc.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3doc.pdfbin557803 -> 557634 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3docstrip.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3docstrip.pdfbin151818 -> 151654 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3expan.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3file.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3flag.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-assign.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-aux.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-basics.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-convert.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-expo.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-extended.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-logic.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-parse.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-random.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-round.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-traps.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-trig.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fparray.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3int.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3intarray.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3kernel-functions.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3keys.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3legacy.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3luatex.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3msg.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3names.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3news.pdfbin395876 -> 395876 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news01.pdfbin122710 -> 122710 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news02.pdfbin150674 -> 150674 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news03.pdfbin148706 -> 148706 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news04.pdfbin114586 -> 114586 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news05.pdfbin112485 -> 112485 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news06.pdfbin151569 -> 151569 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news07.pdfbin128316 -> 128316 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news08.pdfbin163456 -> 163456 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news09.pdfbin250136 -> 250136 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news10.pdfbin150283 -> 150283 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news11.pdfbin170076 -> 170076 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news12.pdfbin204992 -> 204992 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3pdf.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3prefixes.pdfbin81614 -> 81614 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3prg.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3prop.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3quark.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3regex.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3seq.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3skip.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3sort.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3str-convert.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3str.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3styleguide.pdfbin296239 -> 296082 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3styleguide.tex2
-rw-r--r--macros/latex/contrib/l3kernel/l3syntax-changes.pdfbin242907 -> 242752 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3syntax-changes.tex2
-rw-r--r--macros/latex/contrib/l3kernel/l3sys.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3term-glossary.pdfbin215443 -> 215290 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3term-glossary.tex2
-rw-r--r--macros/latex/contrib/l3kernel/l3text-case.dtx3
-rw-r--r--macros/latex/contrib/l3kernel/l3text-map.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3text-purify.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3text.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3tl-analysis.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3tl.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3token.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3unicode.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/source3.pdfbin7323123 -> 7323495 bytes
-rw-r--r--macros/latex/contrib/l3kernel/source3.tex2
-rw-r--r--macros/latex/contrib/l3packages/CHANGELOG.md11
-rw-r--r--macros/latex/contrib/l3packages/README.md2
-rw-r--r--macros/latex/contrib/l3packages/l3keys2e.dtx4
-rw-r--r--macros/latex/contrib/l3packages/l3keys2e.pdfbin412658 -> 412281 bytes
-rw-r--r--macros/latex/contrib/l3packages/xfp.dtx4
-rw-r--r--macros/latex/contrib/l3packages/xfp.pdfbin332357 -> 331993 bytes
-rw-r--r--macros/latex/contrib/l3packages/xfrac.dtx4
-rw-r--r--macros/latex/contrib/l3packages/xfrac.pdfbin482935 -> 482562 bytes
-rw-r--r--macros/latex/contrib/l3packages/xparse.dtx4
-rw-r--r--macros/latex/contrib/l3packages/xparse.pdfbin534579 -> 534213 bytes
-rw-r--r--macros/latex/contrib/l3packages/xtemplate.dtx44
-rw-r--r--macros/latex/contrib/l3packages/xtemplate.pdfbin450100 -> 450311 bytes
-rw-r--r--macros/xetex/latex/xduts/xduts.dtx33
-rw-r--r--macros/xetex/latex/xduts/xduts.pdfbin332217 -> 332421 bytes
-rw-r--r--systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl4
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb77
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.md52
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha5122
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc14
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.xzbin2448320 -> 2445864 bytes
-rw-r--r--timestamp2
145 files changed, 6411 insertions, 3691 deletions
diff --git a/FILES.byname b/FILES.byname
index 7090597dcd..c90a0a0c46 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -2048,12 +2048,12 @@
2022/12/25 | 1673 | biblio/citation-style-language/README.md
2022/12/25 | 11958 | biblio/citation-style-language/vancouver.csl
2022/12/25 | 604004 | biblio/citation-style-language.zip
-2023/01/31 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2023/02/01 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
2022/10/08 | 127 | biblio/ctan-bibdata/biblatex-ctan/ctan.cbx
-2023/01/31 | 2764968 | biblio/ctan-bibdata/ctan.bib
-2023/01/31 | 3649425 | biblio/ctan-bibdata/ctan.pdf
+2023/02/01 | 2764968 | biblio/ctan-bibdata/ctan.bib
+2023/02/01 | 3648580 | biblio/ctan-bibdata/ctan.pdf
2023/01/16 | 1489 | biblio/ctan-bibdata/README
-2023/01/31 | 4045122 | biblio/ctan-bibdata.zip
+2023/02/01 | 4043464 | biblio/ctan-bibdata.zip
2022/02/06 | 3110 | biblio/pbibtex/pbibtex-base/cpp.awk
2022/02/06 | 1009 | biblio/pbibtex/pbibtex-base/generate.sh
2022/02/06 | 22422 | biblio/pbibtex/pbibtex-base/jabbrv.bst
@@ -5407,7 +5407,7 @@
1990/10/02 | 5440 | dviware/vutex/vaxvms.hlp
1990/10/02 | 812 | dviware/vutex/vaxvms.ins
1990/10/02 | 127576 | dviware/vutex/vutex.web
-2023/01/31 | 158572 | FILES.last07days
+2023/02/01 | 146200 | FILES.last07days
2021/07/24 | 1139410 | fonts/aboensis/Aboensis.glyphs
2021/07/24 | 18907382 | fonts/aboensis/aboensis.pdf
2021/07/24 | 137860 | fonts/aboensis/Aboensis-Regular.otf
@@ -146486,28 +146486,33 @@
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
-2022/01/24 | 13334 | fonts/utilities/fontools/bin/afm2afm
-2022/01/24 | 161508 | fonts/utilities/fontools/bin/autoinst
-2022/01/24 | 27582 | fonts/utilities/fontools/bin/ot2kpx
-2022/01/24 | 9480 | fonts/utilities/fontools/bin/splitttc
-2022/01/24 | 27066 | fonts/utilities/fontools/doc/afm2afm.pdf
-2022/01/24 | 71042 | fonts/utilities/fontools/doc/autoinst.pdf
-2022/01/24 | 27441 | fonts/utilities/fontools/doc/ot2kpx.pdf
-2022/01/24 | 20585 | fonts/utilities/fontools/doc/splitttc.pdf
-2022/01/24 | 17997 | fonts/utilities/fontools/GPLv2.txt
-2022/01/24 | 3003 | fonts/utilities/fontools/README
-2022/01/24 | 8032 | fonts/utilities/fontools/share/fontools_lgr.enc
-2022/01/24 | 2855 | fonts/utilities/fontools/share/fontools_ly1.enc
-2022/01/24 | 2248 | fonts/utilities/fontools/share/fontools_oml.enc
-2022/01/24 | 2589 | fonts/utilities/fontools/share/fontools_ot1.enc
-2022/01/24 | 2816 | fonts/utilities/fontools/share/fontools_t1.enc
-2022/01/24 | 2909 | fonts/utilities/fontools/share/fontools_t2a.enc
-2022/01/24 | 3731 | fonts/utilities/fontools/share/fontools_t2b.enc
-2022/01/24 | 3653 | fonts/utilities/fontools/share/fontools_t2c.enc
-2022/01/24 | 2656 | fonts/utilities/fontools/share/fontools_t3.enc
-2022/01/24 | 3080 | fonts/utilities/fontools/share/fontools_ts1.enc
-2022/01/24 | 2751 | fonts/utilities/fontools/share/fontools_ts3.enc
-2022/01/24 | 206159 | fonts/utilities/fontools.zip
+2023/02/01 | 13334 | fonts/utilities/fontools/bin/afm2afm
+2023/02/01 | 168174 | fonts/utilities/fontools/bin/autoinst
+2023/02/01 | 27582 | fonts/utilities/fontools/bin/ot2kpx
+2023/02/01 | 9480 | fonts/utilities/fontools/bin/splitttc
+2023/02/01 | 26775 | fonts/utilities/fontools/doc/afm2afm.pdf
+2023/02/01 | 71157 | fonts/utilities/fontools/doc/autoinst.pdf
+2023/02/01 | 27149 | fonts/utilities/fontools/doc/ot2kpx.pdf
+2023/02/01 | 20367 | fonts/utilities/fontools/doc/splitttc.pdf
+2023/02/01 | 17997 | fonts/utilities/fontools/GPLv2.txt
+2023/02/01 | 3003 | fonts/utilities/fontools/README
+2023/02/01 | 3420 | fonts/utilities/fontools/share/fontools_cs.enc
+2023/02/01 | 3409 | fonts/utilities/fontools/share/fontools_l7x.enc
+2023/02/01 | 17241 | fonts/utilities/fontools/share/fontools_lgr.enc
+2023/02/01 | 3366 | fonts/utilities/fontools/share/fontools_ly1.enc
+2023/02/01 | 3318 | fonts/utilities/fontools/share/fontools_oml.enc
+2023/02/01 | 3318 | fonts/utilities/fontools/share/fontools_ot1.enc
+2023/02/01 | 3448 | fonts/utilities/fontools/share/fontools_qx.enc
+2023/02/01 | 3478 | fonts/utilities/fontools/share/fontools_t1.enc
+2023/02/01 | 3542 | fonts/utilities/fontools/share/fontools_t2a.enc
+2023/02/01 | 4364 | fonts/utilities/fontools/share/fontools_t2b.enc
+2023/02/01 | 4286 | fonts/utilities/fontools/share/fontools_t2c.enc
+2023/02/01 | 5468 | fonts/utilities/fontools/share/fontools_t3.enc
+2023/02/01 | 3664 | fonts/utilities/fontools/share/fontools_t4.enc
+2023/02/01 | 3844 | fonts/utilities/fontools/share/fontools_t5.enc
+2023/02/01 | 3592 | fonts/utilities/fontools/share/fontools_ts1.enc
+2023/02/01 | 5420 | fonts/utilities/fontools/share/fontools_ts3.enc
+2023/02/01 | 217823 | 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
@@ -193341,8 +193346,8 @@
2023/01/16 | 971287 | install/macros/latex/contrib/l3backend.tds.zip
2022/11/10 | 817286 | install/macros/latex/contrib/l3build.tds.zip
2023/01/24 | 4451432 | install/macros/latex/contrib/l3experimental.tds.zip
-2023/01/24 | 14020560 | install/macros/latex/contrib/l3kernel.tds.zip
-2023/01/16 | 2254278 | install/macros/latex/contrib/l3packages.tds.zip
+2023/02/01 | 14019631 | install/macros/latex/contrib/l3kernel.tds.zip
+2023/02/01 | 2253282 | install/macros/latex/contrib/l3packages.tds.zip
2021/09/03 | 583760 | install/macros/latex/contrib/lastpage.tds.zip
2009/09/02 | 556672 | install/macros/latex/contrib/layouts.tds.zip
2008/07/25 | 125603 | install/macros/latex/contrib/lcyw.tds.zip
@@ -213447,15 +213452,15 @@
2015/05/31 | 763 | macros/latex/contrib/biblatex-contrib/biblatex-opcit-booktitle/makefile
2015/05/31 | 345 | macros/latex/contrib/biblatex-contrib/biblatex-opcit-booktitle/README
2018/10/24 | 113539 | macros/latex/contrib/biblatex-contrib/biblatex-opcit-booktitle.zip
-2021/01/18 | 3073 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/Makefile
-2021/01/18 | 436778 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxalph-doc.pdf
-2021/01/18 | 443291 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnotes-doc.pdf
-2021/01/18 | 439195 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnum-doc.pdf
-2021/01/18 | 472235 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.dtx
-2021/01/18 | 535848 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.pdf
-2021/01/18 | 440823 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxyear-doc.pdf
-2021/01/18 | 5403 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/README.md
-2021/01/19 | 2344565 | macros/latex/contrib/biblatex-contrib/biblatex-oxref.zip
+2023/02/01 | 3715 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/Makefile
+2023/02/01 | 465051 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxalph-doc.pdf
+2023/02/01 | 472736 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnotes-doc.pdf
+2023/02/01 | 469463 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnum-doc.pdf
+2023/02/01 | 491631 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.dtx
+2023/02/01 | 566202 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.pdf
+2023/02/01 | 469196 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxyear-doc.pdf
+2023/02/01 | 5403 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/README.md
+2023/02/01 | 2493002 | macros/latex/contrib/biblatex-contrib/biblatex-oxref.zip
2022/09/16 | 225122 | macros/latex/contrib/biblatex-contrib/biblatex-philosophy/biblatex-philosophy.dtx
2022/09/16 | 544191 | macros/latex/contrib/biblatex-contrib/biblatex-philosophy/biblatex-philosophy.pdf
2022/09/16 | 9422 | macros/latex/contrib/biblatex-contrib/biblatex-philosophy/examples.zip
@@ -226117,132 +226122,132 @@
2023/01/24 | 1624 | macros/latex/contrib/l3experimental/xgalley.ins
2023/01/24 | 299636 | macros/latex/contrib/l3experimental/xgalley.pdf
2023/01/24 | 4414253 | macros/latex/contrib/l3experimental.zip
-2023/01/24 | 43537 | macros/latex/contrib/l3kernel/CHANGELOG.md
-2023/01/24 | 70859 | macros/latex/contrib/l3kernel/expl3.dtx
-2023/01/24 | 622767 | macros/latex/contrib/l3kernel/expl3.pdf
-2023/01/24 | 1779014 | macros/latex/contrib/l3kernel/interface3.pdf
-2023/01/24 | 1908 | macros/latex/contrib/l3kernel/interface3.tex
-2023/01/24 | 129434 | macros/latex/contrib/l3kernel/l3basics.dtx
-2023/01/24 | 14927 | macros/latex/contrib/l3kernel/l3bootstrap.dtx
-2023/01/24 | 79792 | macros/latex/contrib/l3kernel/l3box.dtx
-2023/01/24 | 68290 | macros/latex/contrib/l3kernel/l3candidates.dtx
-2023/01/24 | 32429 | macros/latex/contrib/l3kernel/l3cctab.dtx
-2023/01/24 | 82707 | macros/latex/contrib/l3kernel/l3clist.dtx
-2023/01/24 | 87493 | macros/latex/contrib/l3kernel/l3coffins.dtx
-2023/01/24 | 110994 | macros/latex/contrib/l3kernel/l3color.dtx
-2023/01/24 | 43212 | macros/latex/contrib/l3kernel/l3debug.dtx
-2023/01/24 | 23530 | macros/latex/contrib/l3kernel/l3deprecation.dtx
-2023/01/24 | 155616 | macros/latex/contrib/l3kernel/l3doc.dtx
-2023/01/24 | 557803 | macros/latex/contrib/l3kernel/l3doc.pdf
-2023/01/24 | 2390 | macros/latex/contrib/l3kernel/l3docstrip.dtx
-2023/01/24 | 151818 | macros/latex/contrib/l3kernel/l3docstrip.pdf
-2023/01/24 | 106428 | macros/latex/contrib/l3kernel/l3expan.dtx
-2023/01/24 | 136649 | macros/latex/contrib/l3kernel/l3file.dtx
-2023/01/24 | 9436 | macros/latex/contrib/l3kernel/l3flag.dtx
-2023/01/24 | 11781 | macros/latex/contrib/l3kernel/l3fparray.dtx
-2023/01/24 | 7454 | macros/latex/contrib/l3kernel/l3fp-assign.dtx
-2023/01/24 | 47216 | macros/latex/contrib/l3kernel/l3fp-aux.dtx
-2023/01/24 | 84785 | macros/latex/contrib/l3kernel/l3fp-basics.dtx
-2023/01/24 | 19641 | macros/latex/contrib/l3kernel/l3fp-convert.dtx
-2023/01/24 | 70578 | macros/latex/contrib/l3kernel/l3fp.dtx
-2023/01/24 | 49311 | macros/latex/contrib/l3kernel/l3fp-expo.dtx
-2023/01/24 | 51059 | macros/latex/contrib/l3kernel/l3fp-extended.dtx
-2023/01/24 | 23011 | macros/latex/contrib/l3kernel/l3fp-logic.dtx
-2023/01/24 | 105029 | macros/latex/contrib/l3kernel/l3fp-parse.dtx
-2023/01/24 | 25650 | macros/latex/contrib/l3kernel/l3fp-random.dtx
-2023/01/24 | 18531 | macros/latex/contrib/l3kernel/l3fp-round.dtx
-2023/01/24 | 12783 | macros/latex/contrib/l3kernel/l3fp-traps.dtx
-2023/01/24 | 73835 | macros/latex/contrib/l3kernel/l3fp-trig.dtx
-2023/01/24 | 6224 | macros/latex/contrib/l3kernel/l3.ins
-2023/01/24 | 34166 | macros/latex/contrib/l3kernel/l3intarray.dtx
-2023/01/24 | 90018 | macros/latex/contrib/l3kernel/l3int.dtx
-2023/01/24 | 26737 | macros/latex/contrib/l3kernel/l3kernel-functions.dtx
-2023/01/24 | 127087 | macros/latex/contrib/l3kernel/l3keys.dtx
-2023/01/24 | 4538 | macros/latex/contrib/l3kernel/l3legacy.dtx
-2023/01/24 | 23866 | macros/latex/contrib/l3kernel/l3luatex.dtx
-2023/01/24 | 74250 | macros/latex/contrib/l3kernel/l3msg.dtx
-2023/01/24 | 82195 | macros/latex/contrib/l3kernel/l3names.dtx
-2023/01/24 | 122710 | macros/latex/contrib/l3kernel/l3news01.pdf
-2023/01/24 | 4937 | macros/latex/contrib/l3kernel/l3news01.tex
-2023/01/24 | 150674 | macros/latex/contrib/l3kernel/l3news02.pdf
-2023/01/24 | 6677 | macros/latex/contrib/l3kernel/l3news02.tex
-2023/01/24 | 148706 | macros/latex/contrib/l3kernel/l3news03.pdf
-2023/01/24 | 6482 | macros/latex/contrib/l3kernel/l3news03.tex
-2023/01/24 | 114586 | macros/latex/contrib/l3kernel/l3news04.pdf
-2023/01/24 | 5429 | macros/latex/contrib/l3kernel/l3news04.tex
-2023/01/24 | 112485 | macros/latex/contrib/l3kernel/l3news05.pdf
-2023/01/24 | 4716 | macros/latex/contrib/l3kernel/l3news05.tex
-2023/01/24 | 151569 | macros/latex/contrib/l3kernel/l3news06.pdf
-2023/01/24 | 6433 | macros/latex/contrib/l3kernel/l3news06.tex
-2023/01/24 | 128316 | macros/latex/contrib/l3kernel/l3news07.pdf
-2023/01/24 | 4977 | macros/latex/contrib/l3kernel/l3news07.tex
-2023/01/24 | 163456 | macros/latex/contrib/l3kernel/l3news08.pdf
-2023/01/24 | 9465 | macros/latex/contrib/l3kernel/l3news08.tex
-2023/01/24 | 250136 | macros/latex/contrib/l3kernel/l3news09.pdf
-2023/01/24 | 107383 | macros/latex/contrib/l3kernel/l3news09.tex
-2023/01/24 | 150283 | macros/latex/contrib/l3kernel/l3news10.pdf
-2023/01/24 | 9999 | macros/latex/contrib/l3kernel/l3news10.tex
-2023/01/24 | 170076 | macros/latex/contrib/l3kernel/l3news11.pdf
-2023/01/24 | 8481 | macros/latex/contrib/l3kernel/l3news11.tex
-2023/01/24 | 204992 | macros/latex/contrib/l3kernel/l3news12.pdf
-2023/01/24 | 14913 | macros/latex/contrib/l3kernel/l3news12.tex
-2023/01/24 | 395876 | macros/latex/contrib/l3kernel/l3news.pdf
-2023/01/24 | 4890 | macros/latex/contrib/l3kernel/l3news.tex
-2023/01/24 | 19161 | macros/latex/contrib/l3kernel/l3pdf.dtx
-2023/01/24 | 45040 | macros/latex/contrib/l3kernel/l3prefixes.csv
-2023/01/24 | 81614 | macros/latex/contrib/l3kernel/l3prefixes.pdf
-2023/01/24 | 2821 | macros/latex/contrib/l3kernel/l3prefixes.tex
-2023/01/24 | 66654 | macros/latex/contrib/l3kernel/l3prg.dtx
-2023/01/24 | 57974 | macros/latex/contrib/l3kernel/l3prop.dtx
-2023/01/24 | 35441 | macros/latex/contrib/l3kernel/l3quark.dtx
-2023/01/24 | 304752 | macros/latex/contrib/l3kernel/l3regex.dtx
-2023/01/24 | 90470 | macros/latex/contrib/l3kernel/l3seq.dtx
-2023/01/24 | 76279 | macros/latex/contrib/l3kernel/l3skip.dtx
-2023/01/24 | 40704 | macros/latex/contrib/l3kernel/l3sort.dtx
-2023/01/24 | 113427 | macros/latex/contrib/l3kernel/l3str-convert.dtx
-2023/01/24 | 78244 | macros/latex/contrib/l3kernel/l3str.dtx
-2023/01/24 | 296239 | macros/latex/contrib/l3kernel/l3styleguide.pdf
-2023/01/24 | 11884 | macros/latex/contrib/l3kernel/l3styleguide.tex
-2023/01/24 | 242907 | macros/latex/contrib/l3kernel/l3syntax-changes.pdf
-2023/01/24 | 6267 | macros/latex/contrib/l3kernel/l3syntax-changes.tex
-2023/01/24 | 33655 | macros/latex/contrib/l3kernel/l3sys.dtx
-2023/01/24 | 215443 | macros/latex/contrib/l3kernel/l3term-glossary.pdf
-2023/01/24 | 6169 | macros/latex/contrib/l3kernel/l3term-glossary.tex
-2023/01/24 | 60878 | macros/latex/contrib/l3kernel/l3text-case.dtx
-2023/01/24 | 51006 | macros/latex/contrib/l3kernel/l3text.dtx
-2023/01/24 | 16633 | macros/latex/contrib/l3kernel/l3text-map.dtx
-2023/01/24 | 21665 | macros/latex/contrib/l3kernel/l3text-purify.dtx
-2023/01/24 | 62840 | macros/latex/contrib/l3kernel/l3tl-analysis.dtx
-2023/01/24 | 145318 | macros/latex/contrib/l3kernel/l3tl.dtx
-2023/01/24 | 118855 | macros/latex/contrib/l3kernel/l3token.dtx
-2023/01/24 | 32409 | macros/latex/contrib/l3kernel/l3unicode.dtx
-2023/01/24 | 3929 | macros/latex/contrib/l3kernel/README.md
-2023/01/24 | 24841 | macros/latex/contrib/l3kernel/source3body.tex
-2023/01/24 | 7323123 | macros/latex/contrib/l3kernel/source3.pdf
-2023/01/24 | 2229 | macros/latex/contrib/l3kernel/source3.tex
-2023/01/24 | 13761468 | macros/latex/contrib/l3kernel.zip
-2023/01/16 | 6908 | macros/latex/contrib/l3packages/CHANGELOG.md
-2023/01/16 | 1444 | macros/latex/contrib/l3packages/l3keys2e-demo.tex
-2023/01/16 | 12312 | macros/latex/contrib/l3packages/l3keys2e.dtx
-2023/01/16 | 1228 | macros/latex/contrib/l3packages/l3keys2e.ins
-2023/01/16 | 412658 | macros/latex/contrib/l3packages/l3keys2e.pdf
-2023/01/16 | 3843 | macros/latex/contrib/l3packages/README.md
-2023/01/16 | 7374 | macros/latex/contrib/l3packages/xfp.dtx
-2023/01/16 | 1191 | macros/latex/contrib/l3packages/xfp.ins
-2023/01/16 | 332357 | macros/latex/contrib/l3packages/xfp.pdf
-2023/01/16 | 39366 | macros/latex/contrib/l3packages/xfrac.dtx
-2023/01/16 | 1306 | macros/latex/contrib/l3packages/xfrac.ins
-2023/01/16 | 482935 | macros/latex/contrib/l3packages/xfrac.pdf
-2023/01/16 | 84537 | macros/latex/contrib/l3packages/xparse-2018-04-12.sty
-2023/01/16 | 6195 | macros/latex/contrib/l3packages/xparse-2020-10-01.sty
-2023/01/16 | 55460 | macros/latex/contrib/l3packages/xparse.dtx
-2023/01/16 | 80215 | macros/latex/contrib/l3packages/xparse-generic.tex
-2023/01/16 | 1272 | macros/latex/contrib/l3packages/xparse.ins
-2023/01/16 | 534579 | macros/latex/contrib/l3packages/xparse.pdf
-2023/01/16 | 99985 | macros/latex/contrib/l3packages/xtemplate.dtx
-2023/01/16 | 1561 | macros/latex/contrib/l3packages/xtemplate.ins
-2023/01/16 | 450100 | macros/latex/contrib/l3packages/xtemplate.pdf
-2023/01/16 | 2236261 | macros/latex/contrib/l3packages.zip
+2023/02/01 | 43699 | macros/latex/contrib/l3kernel/CHANGELOG.md
+2023/02/01 | 70859 | macros/latex/contrib/l3kernel/expl3.dtx
+2023/02/01 | 622614 | macros/latex/contrib/l3kernel/expl3.pdf
+2023/02/01 | 1778872 | macros/latex/contrib/l3kernel/interface3.pdf
+2023/02/01 | 1908 | macros/latex/contrib/l3kernel/interface3.tex
+2023/02/01 | 129434 | macros/latex/contrib/l3kernel/l3basics.dtx
+2023/02/01 | 14927 | macros/latex/contrib/l3kernel/l3bootstrap.dtx
+2023/02/01 | 79792 | macros/latex/contrib/l3kernel/l3box.dtx
+2023/02/01 | 68290 | macros/latex/contrib/l3kernel/l3candidates.dtx
+2023/02/01 | 32429 | macros/latex/contrib/l3kernel/l3cctab.dtx
+2023/02/01 | 82707 | macros/latex/contrib/l3kernel/l3clist.dtx
+2023/02/01 | 87493 | macros/latex/contrib/l3kernel/l3coffins.dtx
+2023/02/01 | 111041 | macros/latex/contrib/l3kernel/l3color.dtx
+2023/02/01 | 43212 | macros/latex/contrib/l3kernel/l3debug.dtx
+2023/02/01 | 23530 | macros/latex/contrib/l3kernel/l3deprecation.dtx
+2023/02/01 | 155616 | macros/latex/contrib/l3kernel/l3doc.dtx
+2023/02/01 | 557634 | macros/latex/contrib/l3kernel/l3doc.pdf
+2023/02/01 | 2390 | macros/latex/contrib/l3kernel/l3docstrip.dtx
+2023/02/01 | 151654 | macros/latex/contrib/l3kernel/l3docstrip.pdf
+2023/02/01 | 106428 | macros/latex/contrib/l3kernel/l3expan.dtx
+2023/02/01 | 136649 | macros/latex/contrib/l3kernel/l3file.dtx
+2023/02/01 | 9436 | macros/latex/contrib/l3kernel/l3flag.dtx
+2023/02/01 | 11781 | macros/latex/contrib/l3kernel/l3fparray.dtx
+2023/02/01 | 7454 | macros/latex/contrib/l3kernel/l3fp-assign.dtx
+2023/02/01 | 47216 | macros/latex/contrib/l3kernel/l3fp-aux.dtx
+2023/02/01 | 84785 | macros/latex/contrib/l3kernel/l3fp-basics.dtx
+2023/02/01 | 19641 | macros/latex/contrib/l3kernel/l3fp-convert.dtx
+2023/02/01 | 70578 | macros/latex/contrib/l3kernel/l3fp.dtx
+2023/02/01 | 49311 | macros/latex/contrib/l3kernel/l3fp-expo.dtx
+2023/02/01 | 51059 | macros/latex/contrib/l3kernel/l3fp-extended.dtx
+2023/02/01 | 23011 | macros/latex/contrib/l3kernel/l3fp-logic.dtx
+2023/02/01 | 105029 | macros/latex/contrib/l3kernel/l3fp-parse.dtx
+2023/02/01 | 25650 | macros/latex/contrib/l3kernel/l3fp-random.dtx
+2023/02/01 | 18531 | macros/latex/contrib/l3kernel/l3fp-round.dtx
+2023/02/01 | 12783 | macros/latex/contrib/l3kernel/l3fp-traps.dtx
+2023/02/01 | 73835 | macros/latex/contrib/l3kernel/l3fp-trig.dtx
+2023/02/01 | 6224 | macros/latex/contrib/l3kernel/l3.ins
+2023/02/01 | 34166 | macros/latex/contrib/l3kernel/l3intarray.dtx
+2023/02/01 | 90018 | macros/latex/contrib/l3kernel/l3int.dtx
+2023/02/01 | 26737 | macros/latex/contrib/l3kernel/l3kernel-functions.dtx
+2023/02/01 | 127087 | macros/latex/contrib/l3kernel/l3keys.dtx
+2023/02/01 | 4538 | macros/latex/contrib/l3kernel/l3legacy.dtx
+2023/02/01 | 23866 | macros/latex/contrib/l3kernel/l3luatex.dtx
+2023/02/01 | 74250 | macros/latex/contrib/l3kernel/l3msg.dtx
+2023/02/01 | 82195 | macros/latex/contrib/l3kernel/l3names.dtx
+2023/02/01 | 122710 | macros/latex/contrib/l3kernel/l3news01.pdf
+2023/02/01 | 4937 | macros/latex/contrib/l3kernel/l3news01.tex
+2023/02/01 | 150674 | macros/latex/contrib/l3kernel/l3news02.pdf
+2023/02/01 | 6677 | macros/latex/contrib/l3kernel/l3news02.tex
+2023/02/01 | 148706 | macros/latex/contrib/l3kernel/l3news03.pdf
+2023/02/01 | 6482 | macros/latex/contrib/l3kernel/l3news03.tex
+2023/02/01 | 114586 | macros/latex/contrib/l3kernel/l3news04.pdf
+2023/02/01 | 5429 | macros/latex/contrib/l3kernel/l3news04.tex
+2023/02/01 | 112485 | macros/latex/contrib/l3kernel/l3news05.pdf
+2023/02/01 | 4716 | macros/latex/contrib/l3kernel/l3news05.tex
+2023/02/01 | 151569 | macros/latex/contrib/l3kernel/l3news06.pdf
+2023/02/01 | 6433 | macros/latex/contrib/l3kernel/l3news06.tex
+2023/02/01 | 128316 | macros/latex/contrib/l3kernel/l3news07.pdf
+2023/02/01 | 4977 | macros/latex/contrib/l3kernel/l3news07.tex
+2023/02/01 | 163456 | macros/latex/contrib/l3kernel/l3news08.pdf
+2023/02/01 | 9465 | macros/latex/contrib/l3kernel/l3news08.tex
+2023/02/01 | 250136 | macros/latex/contrib/l3kernel/l3news09.pdf
+2023/02/01 | 107383 | macros/latex/contrib/l3kernel/l3news09.tex
+2023/02/01 | 150283 | macros/latex/contrib/l3kernel/l3news10.pdf
+2023/02/01 | 9999 | macros/latex/contrib/l3kernel/l3news10.tex
+2023/02/01 | 170076 | macros/latex/contrib/l3kernel/l3news11.pdf
+2023/02/01 | 8481 | macros/latex/contrib/l3kernel/l3news11.tex
+2023/02/01 | 204992 | macros/latex/contrib/l3kernel/l3news12.pdf
+2023/02/01 | 14913 | macros/latex/contrib/l3kernel/l3news12.tex
+2023/02/01 | 395876 | macros/latex/contrib/l3kernel/l3news.pdf
+2023/02/01 | 4890 | macros/latex/contrib/l3kernel/l3news.tex
+2023/02/01 | 19161 | macros/latex/contrib/l3kernel/l3pdf.dtx
+2023/02/01 | 45040 | macros/latex/contrib/l3kernel/l3prefixes.csv
+2023/02/01 | 81614 | macros/latex/contrib/l3kernel/l3prefixes.pdf
+2023/02/01 | 2821 | macros/latex/contrib/l3kernel/l3prefixes.tex
+2023/02/01 | 66654 | macros/latex/contrib/l3kernel/l3prg.dtx
+2023/02/01 | 57974 | macros/latex/contrib/l3kernel/l3prop.dtx
+2023/02/01 | 35441 | macros/latex/contrib/l3kernel/l3quark.dtx
+2023/02/01 | 304752 | macros/latex/contrib/l3kernel/l3regex.dtx
+2023/02/01 | 90470 | macros/latex/contrib/l3kernel/l3seq.dtx
+2023/02/01 | 76279 | macros/latex/contrib/l3kernel/l3skip.dtx
+2023/02/01 | 40704 | macros/latex/contrib/l3kernel/l3sort.dtx
+2023/02/01 | 113427 | macros/latex/contrib/l3kernel/l3str-convert.dtx
+2023/02/01 | 78244 | macros/latex/contrib/l3kernel/l3str.dtx
+2023/02/01 | 296082 | macros/latex/contrib/l3kernel/l3styleguide.pdf
+2023/02/01 | 11884 | macros/latex/contrib/l3kernel/l3styleguide.tex
+2023/02/01 | 242752 | macros/latex/contrib/l3kernel/l3syntax-changes.pdf
+2023/02/01 | 6267 | macros/latex/contrib/l3kernel/l3syntax-changes.tex
+2023/02/01 | 33655 | macros/latex/contrib/l3kernel/l3sys.dtx
+2023/02/01 | 215290 | macros/latex/contrib/l3kernel/l3term-glossary.pdf
+2023/02/01 | 6169 | macros/latex/contrib/l3kernel/l3term-glossary.tex
+2023/02/01 | 60868 | macros/latex/contrib/l3kernel/l3text-case.dtx
+2023/02/01 | 51006 | macros/latex/contrib/l3kernel/l3text.dtx
+2023/02/01 | 16633 | macros/latex/contrib/l3kernel/l3text-map.dtx
+2023/02/01 | 21665 | macros/latex/contrib/l3kernel/l3text-purify.dtx
+2023/02/01 | 62840 | macros/latex/contrib/l3kernel/l3tl-analysis.dtx
+2023/02/01 | 145318 | macros/latex/contrib/l3kernel/l3tl.dtx
+2023/02/01 | 118855 | macros/latex/contrib/l3kernel/l3token.dtx
+2023/02/01 | 32409 | macros/latex/contrib/l3kernel/l3unicode.dtx
+2023/02/01 | 3929 | macros/latex/contrib/l3kernel/README.md
+2023/02/01 | 24841 | macros/latex/contrib/l3kernel/source3body.tex
+2023/02/01 | 7323495 | macros/latex/contrib/l3kernel/source3.pdf
+2023/02/01 | 2229 | macros/latex/contrib/l3kernel/source3.tex
+2023/02/01 | 13760580 | macros/latex/contrib/l3kernel.zip
+2023/02/01 | 7097 | macros/latex/contrib/l3packages/CHANGELOG.md
+2023/02/01 | 1444 | macros/latex/contrib/l3packages/l3keys2e-demo.tex
+2023/02/01 | 12312 | macros/latex/contrib/l3packages/l3keys2e.dtx
+2023/02/01 | 1228 | macros/latex/contrib/l3packages/l3keys2e.ins
+2023/02/01 | 412281 | macros/latex/contrib/l3packages/l3keys2e.pdf
+2023/02/01 | 3843 | macros/latex/contrib/l3packages/README.md
+2023/02/01 | 7374 | macros/latex/contrib/l3packages/xfp.dtx
+2023/02/01 | 1191 | macros/latex/contrib/l3packages/xfp.ins
+2023/02/01 | 331993 | macros/latex/contrib/l3packages/xfp.pdf
+2023/02/01 | 39366 | macros/latex/contrib/l3packages/xfrac.dtx
+2023/02/01 | 1306 | macros/latex/contrib/l3packages/xfrac.ins
+2023/02/01 | 482562 | macros/latex/contrib/l3packages/xfrac.pdf
+2023/02/01 | 84537 | macros/latex/contrib/l3packages/xparse-2018-04-12.sty
+2023/02/01 | 6195 | macros/latex/contrib/l3packages/xparse-2020-10-01.sty
+2023/02/01 | 55460 | macros/latex/contrib/l3packages/xparse.dtx
+2023/02/01 | 80215 | macros/latex/contrib/l3packages/xparse-generic.tex
+2023/02/01 | 1272 | macros/latex/contrib/l3packages/xparse.ins
+2023/02/01 | 534213 | macros/latex/contrib/l3packages/xparse.pdf
+2023/02/01 | 101005 | macros/latex/contrib/l3packages/xtemplate.dtx
+2023/02/01 | 1561 | macros/latex/contrib/l3packages/xtemplate.ins
+2023/02/01 | 450311 | macros/latex/contrib/l3packages/xtemplate.pdf
+2023/02/01 | 2235192 | macros/latex/contrib/l3packages.zip
2008/03/30 | 76250 | macros/latex/contrib/labbook/labboode.pdf
2003/08/06 | 81327 | macros/latex/contrib/labbook/labbook.dtx
2003/06/03 | 1041 | macros/latex/contrib/labbook/labbook.el
@@ -253453,12 +253458,12 @@
2011/05/07 | 5176 | macros/xetex/latex/unisugar/unisugar.sty
2011/05/07 | 25480 | macros/xetex/latex/unisugar/unisugar.tex
2011/05/08 | 495308 | macros/xetex/latex/unisugar.zip
-2023/01/28 | 3637 | macros/xetex/latex/xduts/README.md
-2023/01/28 | 881135 | macros/xetex/latex/xduts/xdulogo.pdf
-2023/01/28 | 275463 | macros/xetex/latex/xduts/xduts.dtx
-2023/01/28 | 1186 | macros/xetex/latex/xduts/xduts.ins
-2023/01/28 | 332217 | macros/xetex/latex/xduts/xduts.pdf
-2023/01/28 | 1262318 | macros/xetex/latex/xduts.zip
+2023/02/01 | 3637 | macros/xetex/latex/xduts/README.md
+2023/02/01 | 881135 | macros/xetex/latex/xduts/xdulogo.pdf
+2023/02/01 | 275589 | macros/xetex/latex/xduts/xduts.dtx
+2023/02/01 | 1186 | macros/xetex/latex/xduts/xduts.ins
+2023/02/01 | 332421 | macros/xetex/latex/xduts/xduts.pdf
+2023/02/01 | 1262766 | macros/xetex/latex/xduts.zip
2017/08/03 | 11999 | macros/xetex/latex/xechangebar/cbtest1.tex
2017/08/03 | 338 | macros/xetex/latex/xechangebar/README
2017/08/03 | 35213 | macros/xetex/latex/xechangebar/xechangebar.sty
@@ -288406,8 +288411,8 @@
2022/08/24 | 264708 | systems/texlive/tlnet/archive/beamerswitch.doc.r64182.tar.xz
2022/08/24 | 4936 | systems/texlive/tlnet/archive/beamerswitch.r64182.tar.xz
2022/08/24 | 20600 | systems/texlive/tlnet/archive/beamerswitch.source.r64182.tar.xz
-2022/09/13 | 690552 | systems/texlive/tlnet/archive/beamerthemeamurmaple.doc.r64346.tar.xz
-2022/09/13 | 6028 | systems/texlive/tlnet/archive/beamerthemeamurmaple.r64346.tar.xz
+2023/02/01 | 749444 | systems/texlive/tlnet/archive/beamerthemeamurmaple.doc.r65698.tar.xz
+2023/02/01 | 6304 | systems/texlive/tlnet/archive/beamerthemeamurmaple.r65698.tar.xz
2022/12/11 | 1012920 | systems/texlive/tlnet/archive/beamertheme-arguelles.doc.r65234.tar.xz
2022/12/11 | 2676 | systems/texlive/tlnet/archive/beamertheme-arguelles.r65234.tar.xz
2019/02/28 | 332524 | systems/texlive/tlnet/archive/beamertheme-cuerna.doc.r42161.tar.xz
@@ -298899,8 +298904,8 @@
2019/02/28 | 436 | systems/texlive/tlnet/archive/tamethebeast.r15878.tar.xz
2019/02/28 | 117652 | systems/texlive/tlnet/archive/t-angles.doc.r15878.tar.xz
2019/02/28 | 5684 | systems/texlive/tlnet/archive/t-angles.r15878.tar.xz
-2023/01/28 | 702924 | systems/texlive/tlnet/archive/tangramtikz.doc.r65643.tar.xz
-2023/01/28 | 3756 | systems/texlive/tlnet/archive/tangramtikz.r65643.tar.xz
+2023/02/01 | 723896 | systems/texlive/tlnet/archive/tangramtikz.doc.r65697.tar.xz
+2023/02/01 | 4820 | systems/texlive/tlnet/archive/tangramtikz.r65697.tar.xz
2019/02/28 | 27740 | systems/texlive/tlnet/archive/tap.doc.r31731.tar.xz
2019/02/28 | 53796 | systems/texlive/tlnet/archive/tapir.doc.r20484.tar.xz
2019/02/28 | 51876 | systems/texlive/tlnet/archive/tapir.r20484.tar.xz
@@ -299254,7 +299259,7 @@
2022/09/13 | 600 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.r64356.tar.xz
2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.r64356.tar.xz
2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.r64356.tar.xz
-2023/01/31 | 424552 | systems/texlive/tlnet/archive/texlive-scripts.doc.r65682.tar.xz
+2023/02/01 | 424408 | systems/texlive/tlnet/archive/texlive-scripts.doc.r65696.tar.xz
2020/01/27 | 916 | systems/texlive/tlnet/archive/texlive-scripts-extra.aarch64-linux.r53577.tar.xz
2020/01/27 | 924 | systems/texlive/tlnet/archive/texlive-scripts-extra.amd64-freebsd.r53577.tar.xz
2020/01/27 | 916 | systems/texlive/tlnet/archive/texlive-scripts-extra.amd64-netbsd.r53577.tar.xz
@@ -299278,7 +299283,7 @@
2022/09/13 | 592 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r64356.tar.xz
2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r64356.tar.xz
2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r64356.tar.xz
-2023/01/31 | 113684 | systems/texlive/tlnet/archive/texlive-scripts.r65682.tar.xz
+2023/02/01 | 113708 | systems/texlive/tlnet/archive/texlive-scripts.r65696.tar.xz
2022/09/13 | 580 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r64356.tar.xz
2022/11/29 | 36264 | systems/texlive/tlnet/archive/texlive-scripts.win32.r65128.tar.xz
2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r64356.tar.xz
@@ -299856,9 +299861,9 @@
2019/02/28 | 1924 | systems/texlive/tlnet/archive/tocvsec2.r33146.tar.xz
2019/02/28 | 8052 | systems/texlive/tlnet/archive/tocvsec2.source.r33146.tar.xz
2019/02/28 | 179880 | systems/texlive/tlnet/archive/todo.doc.r17746.tar.xz
-2021/06/06 | 443836 | systems/texlive/tlnet/archive/todonotes.doc.r59465.tar.xz
-2021/06/06 | 4772 | systems/texlive/tlnet/archive/todonotes.r59465.tar.xz
-2021/06/06 | 18812 | systems/texlive/tlnet/archive/todonotes.source.r59465.tar.xz
+2023/02/01 | 469396 | systems/texlive/tlnet/archive/todonotes.doc.r65699.tar.xz
+2023/02/01 | 4852 | systems/texlive/tlnet/archive/todonotes.r65699.tar.xz
+2023/02/01 | 19820 | systems/texlive/tlnet/archive/todonotes.source.r65699.tar.xz
2019/02/28 | 1900 | systems/texlive/tlnet/archive/todo.r17746.tar.xz
2019/02/28 | 7408 | systems/texlive/tlnet/archive/todo.source.r17746.tar.xz
2021/08/26 | 1168688 | systems/texlive/tlnet/archive/tokcycle.doc.r60320.tar.xz
@@ -300669,8 +300674,8 @@
2022/08/06 | 437732 | systems/texlive/tlnet/archive/wrapstuff.doc.r64058.tar.xz
2022/08/06 | 11744 | systems/texlive/tlnet/archive/wrapstuff.r64058.tar.xz
2022/08/06 | 16376 | systems/texlive/tlnet/archive/wrapstuff.source.r64058.tar.xz
-2023/01/21 | 939184 | systems/texlive/tlnet/archive/writeongrid.doc.r65598.tar.xz
-2023/01/21 | 3592 | systems/texlive/tlnet/archive/writeongrid.r65598.tar.xz
+2023/02/01 | 941472 | systems/texlive/tlnet/archive/writeongrid.doc.r65700.tar.xz
+2023/02/01 | 3760 | systems/texlive/tlnet/archive/writeongrid.r65700.tar.xz
2019/02/28 | 401712 | systems/texlive/tlnet/archive/wsemclassic.doc.r31532.tar.xz
2019/02/28 | 3772 | systems/texlive/tlnet/archive/wsemclassic.r31532.tar.xz
2019/02/28 | 6948 | systems/texlive/tlnet/archive/wsemclassic.source.r31532.tar.xz
@@ -301145,16 +301150,16 @@
2020/07/18 | 47816 | systems/texlive/tlnet/archive/zztex.doc.r55862.tar.xz
2020/07/18 | 101724 | systems/texlive/tlnet/archive/zztex.r55862.tar.xz
2022/07/17 | 124404 | systems/texlive/tlnet/install-tl
-2023/01/31 | 5828908 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2023/01/31 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2023/01/31 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2023/02/01 | 5828783 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2023/02/01 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2023/02/01 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2021/04/11 | 4945 | systems/texlive/tlnet/install-tl-windows.bat
-2023/01/31 | 20438132 | systems/texlive/tlnet/install-tl-windows.exe
-2023/01/31 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2023/01/31 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2023/01/31 | 25513709 | systems/texlive/tlnet/install-tl.zip
-2023/01/31 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2023/01/31 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2023/02/01 | 20437284 | systems/texlive/tlnet/install-tl-windows.exe
+2023/02/01 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2023/02/01 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2023/02/01 | 25513723 | systems/texlive/tlnet/install-tl.zip
+2023/02/01 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2023/02/01 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
2022/04/03 | 1229 | systems/texlive/tlnet/README.md
2022/04/03 | 0 | systems/texlive/tlnet/TEXLIVE_2022
2023/01/17 | 8401 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
@@ -301164,7 +301169,7 @@
2023/01/17 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
2023/01/17 | 49938 | systems/texlive/tlnet/tlpkg/installer/config.guess
2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2023/01/30 | 7219 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2023/01/31 | 7264 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2023/01/11 | 216583 | systems/texlive/tlnet/tlpkg/installer/curl/curl-ca-bundle.crt
2020/04/15 | 2606592 | systems/texlive/tlnet/tlpkg/installer/curl/curl.exe
2017/04/16 | 2629 | systems/texlive/tlnet/tlpkg/installer/installer-options.txt
@@ -301207,12 +301212,12 @@
2021/05/16 | 20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
2021/12/21 | 5429 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
2021/12/21 | 27582 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2023/01/31 | 18020867 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2023/01/31 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2023/02/01 | 18020934 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2023/02/01 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2022/04/18 | 86658 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2023/01/31 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2023/01/31 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2023/01/31 | 2448320 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2023/02/01 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2023/02/01 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2023/02/01 | 2445864 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2022/09/14 | 58922 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
2022/10/04 | 42404 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
2021/12/21 | 16130 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -311460,7 +311465,7 @@
2014/07/05 | 611 | systems/win32/yandy/README
2014/07/05 | 1004628 | systems/win32/yandy/yandy-src.tar.xz
2014/07/05 | 1012416 | systems/win32/yandy.zip
-2023/02/01 | 186 | timestamp
+2023/02/02 | 186 | timestamp
2002/08/26 | 61898 | usergrps/dante/antrag.pdf
2002/08/26 | 118217 | usergrps/dante/antrag.ps
2021/11/11 | 917 | usergrps/dante/dtk/doc/beispiel.bib
diff --git a/FILES.byname.gz b/FILES.byname.gz
index 7c39f8ecc3..526e46b705 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index 39c5eb6805..67d1f2c8ec 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,9 +1,209 @@
+2023/02/01 | 9999 | macros/latex/contrib/l3kernel/l3news10.tex
+2023/02/01 | 9480 | fonts/utilities/fontools/bin/splitttc
+2023/02/01 | 9465 | macros/latex/contrib/l3kernel/l3news08.tex
+2023/02/01 | 9436 | macros/latex/contrib/l3kernel/l3flag.dtx
+2023/02/01 | 941472 | systems/texlive/tlnet/archive/writeongrid.doc.r65700.tar.xz
+2023/02/01 | 90470 | macros/latex/contrib/l3kernel/l3seq.dtx
+2023/02/01 | 90018 | macros/latex/contrib/l3kernel/l3int.dtx
+2023/02/01 | 881135 | macros/xetex/latex/xduts/xdulogo.pdf
+2023/02/01 | 87493 | macros/latex/contrib/l3kernel/l3coffins.dtx
+2023/02/01 | 8481 | macros/latex/contrib/l3kernel/l3news11.tex
+2023/02/01 | 84785 | macros/latex/contrib/l3kernel/l3fp-basics.dtx
+2023/02/01 | 84537 | macros/latex/contrib/l3packages/xparse-2018-04-12.sty
+2023/02/01 | 82707 | macros/latex/contrib/l3kernel/l3clist.dtx
+2023/02/01 | 82195 | macros/latex/contrib/l3kernel/l3names.dtx
+2023/02/01 | 81614 | macros/latex/contrib/l3kernel/l3prefixes.pdf
+2023/02/01 | 80215 | macros/latex/contrib/l3packages/xparse-generic.tex
+2023/02/01 | 79792 | macros/latex/contrib/l3kernel/l3box.dtx
+2023/02/01 | 78244 | macros/latex/contrib/l3kernel/l3str.dtx
+2023/02/01 | 76279 | macros/latex/contrib/l3kernel/l3skip.dtx
+2023/02/01 | 749444 | systems/texlive/tlnet/archive/beamerthemeamurmaple.doc.r65698.tar.xz
+2023/02/01 | 7454 | macros/latex/contrib/l3kernel/l3fp-assign.dtx
+2023/02/01 | 74250 | macros/latex/contrib/l3kernel/l3msg.dtx
+2023/02/01 | 73835 | macros/latex/contrib/l3kernel/l3fp-trig.dtx
+2023/02/01 | 7374 | macros/latex/contrib/l3packages/xfp.dtx
+2023/02/01 | 7323495 | macros/latex/contrib/l3kernel/source3.pdf
+2023/02/01 | 723896 | systems/texlive/tlnet/archive/tangramtikz.doc.r65697.tar.xz
+2023/02/01 | 71157 | fonts/utilities/fontools/doc/autoinst.pdf
+2023/02/01 | 7097 | macros/latex/contrib/l3packages/CHANGELOG.md
+2023/02/01 | 70859 | macros/latex/contrib/l3kernel/expl3.dtx
+2023/02/01 | 70578 | macros/latex/contrib/l3kernel/l3fp.dtx
+2023/02/01 | 68290 | macros/latex/contrib/l3kernel/l3candidates.dtx
+2023/02/01 | 6677 | macros/latex/contrib/l3kernel/l3news02.tex
+2023/02/01 | 66654 | macros/latex/contrib/l3kernel/l3prg.dtx
+2023/02/01 | 6482 | macros/latex/contrib/l3kernel/l3news03.tex
+2023/02/01 | 6433 | macros/latex/contrib/l3kernel/l3news06.tex
+2023/02/01 | 6304 | systems/texlive/tlnet/archive/beamerthemeamurmaple.r65698.tar.xz
+2023/02/01 | 62840 | macros/latex/contrib/l3kernel/l3tl-analysis.dtx
+2023/02/01 | 6267 | macros/latex/contrib/l3kernel/l3syntax-changes.tex
+2023/02/01 | 622614 | macros/latex/contrib/l3kernel/expl3.pdf
+2023/02/01 | 6224 | macros/latex/contrib/l3kernel/l3.ins
+2023/02/01 | 6195 | macros/latex/contrib/l3packages/xparse-2020-10-01.sty
+2023/02/01 | 6169 | macros/latex/contrib/l3kernel/l3term-glossary.tex
+2023/02/01 | 60868 | macros/latex/contrib/l3kernel/l3text-case.dtx
+2023/02/01 | 5828783 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2023/02/01 | 57974 | macros/latex/contrib/l3kernel/l3prop.dtx
+2023/02/01 | 566202 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.pdf
+2023/02/01 | 557634 | macros/latex/contrib/l3kernel/l3doc.pdf
+2023/02/01 | 55460 | macros/latex/contrib/l3packages/xparse.dtx
+2023/02/01 | 5468 | fonts/utilities/fontools/share/fontools_t3.enc
+2023/02/01 | 5429 | macros/latex/contrib/l3kernel/l3news04.tex
+2023/02/01 | 5420 | fonts/utilities/fontools/share/fontools_ts3.enc
+2023/02/01 | 5403 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/README.md
+2023/02/01 | 534213 | macros/latex/contrib/l3packages/xparse.pdf
+2023/02/01 | 51059 | macros/latex/contrib/l3kernel/l3fp-extended.dtx
+2023/02/01 | 51006 | macros/latex/contrib/l3kernel/l3text.dtx
+2023/02/01 | 4977 | macros/latex/contrib/l3kernel/l3news07.tex
+2023/02/01 | 4937 | macros/latex/contrib/l3kernel/l3news01.tex
+2023/02/01 | 49311 | macros/latex/contrib/l3kernel/l3fp-expo.dtx
+2023/02/01 | 491631 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.dtx
+2023/02/01 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2023/02/01 | 4890 | macros/latex/contrib/l3kernel/l3news.tex
+2023/02/01 | 4852 | systems/texlive/tlnet/archive/todonotes.r65699.tar.xz
+2023/02/01 | 482562 | macros/latex/contrib/l3packages/xfrac.pdf
+2023/02/01 | 4820 | systems/texlive/tlnet/archive/tangramtikz.r65697.tar.xz
+2023/02/01 | 472736 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnotes-doc.pdf
+2023/02/01 | 47216 | macros/latex/contrib/l3kernel/l3fp-aux.dtx
+2023/02/01 | 4716 | macros/latex/contrib/l3kernel/l3news05.tex
+2023/02/01 | 469463 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnum-doc.pdf
+2023/02/01 | 469396 | systems/texlive/tlnet/archive/todonotes.doc.r65699.tar.xz
+2023/02/01 | 469196 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxyear-doc.pdf
+2023/02/01 | 465051 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxalph-doc.pdf
+2023/02/01 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2023/02/01 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2023/02/01 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2023/02/01 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2023/02/01 | 4538 | macros/latex/contrib/l3kernel/l3legacy.dtx
+2023/02/01 | 45040 | macros/latex/contrib/l3kernel/l3prefixes.csv
+2023/02/01 | 450311 | macros/latex/contrib/l3packages/xtemplate.pdf
+2023/02/01 | 43699 | macros/latex/contrib/l3kernel/CHANGELOG.md
+2023/02/01 | 4364 | fonts/utilities/fontools/share/fontools_t2b.enc
+2023/02/01 | 43212 | macros/latex/contrib/l3kernel/l3debug.dtx
+2023/02/01 | 4286 | fonts/utilities/fontools/share/fontools_t2c.enc
+2023/02/01 | 424408 | systems/texlive/tlnet/archive/texlive-scripts.doc.r65696.tar.xz
+2023/02/01 | 412281 | macros/latex/contrib/l3packages/l3keys2e.pdf
+2023/02/01 | 40704 | macros/latex/contrib/l3kernel/l3sort.dtx
+2023/02/01 | 4043464 | biblio/ctan-bibdata.zip
+2023/02/01 | 395876 | macros/latex/contrib/l3kernel/l3news.pdf
+2023/02/01 | 39366 | macros/latex/contrib/l3packages/xfrac.dtx
+2023/02/01 | 3929 | macros/latex/contrib/l3kernel/README.md
+2023/02/01 | 3844 | fonts/utilities/fontools/share/fontools_t5.enc
+2023/02/01 | 3843 | macros/latex/contrib/l3packages/README.md
+2023/02/01 | 3760 | systems/texlive/tlnet/archive/writeongrid.r65700.tar.xz
+2023/02/01 | 3715 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/Makefile
+2023/02/01 | 3664 | fonts/utilities/fontools/share/fontools_t4.enc
+2023/02/01 | 3648580 | biblio/ctan-bibdata/ctan.pdf
+2023/02/01 | 3637 | macros/xetex/latex/xduts/README.md
+2023/02/01 | 3592 | fonts/utilities/fontools/share/fontools_ts1.enc
+2023/02/01 | 35441 | macros/latex/contrib/l3kernel/l3quark.dtx
+2023/02/01 | 3542 | fonts/utilities/fontools/share/fontools_t2a.enc
+2023/02/01 | 3478 | fonts/utilities/fontools/share/fontools_t1.enc
+2023/02/01 | 3448 | fonts/utilities/fontools/share/fontools_qx.enc
+2023/02/01 | 3420 | fonts/utilities/fontools/share/fontools_cs.enc
+2023/02/01 | 34166 | macros/latex/contrib/l3kernel/l3intarray.dtx
+2023/02/01 | 3409 | fonts/utilities/fontools/share/fontools_l7x.enc
+2023/02/01 | 3366 | fonts/utilities/fontools/share/fontools_ly1.enc
+2023/02/01 | 33655 | macros/latex/contrib/l3kernel/l3sys.dtx
+2023/02/01 | 332421 | macros/xetex/latex/xduts/xduts.pdf
+2023/02/01 | 331993 | macros/latex/contrib/l3packages/xfp.pdf
+2023/02/01 | 3318 | fonts/utilities/fontools/share/fontools_ot1.enc
+2023/02/01 | 3318 | fonts/utilities/fontools/share/fontools_oml.enc
+2023/02/01 | 32429 | macros/latex/contrib/l3kernel/l3cctab.dtx
+2023/02/01 | 32409 | macros/latex/contrib/l3kernel/l3unicode.dtx
+2023/02/01 | 304752 | macros/latex/contrib/l3kernel/l3regex.dtx
+2023/02/01 | 3003 | fonts/utilities/fontools/README
+2023/02/01 | 296082 | macros/latex/contrib/l3kernel/l3styleguide.pdf
+2023/02/01 | 2821 | macros/latex/contrib/l3kernel/l3prefixes.tex
+2023/02/01 | 2764968 | biblio/ctan-bibdata/ctan.bib
+2023/02/01 | 27582 | fonts/utilities/fontools/bin/ot2kpx
+2023/02/01 | 275589 | macros/xetex/latex/xduts/xduts.dtx
+2023/02/01 | 27149 | fonts/utilities/fontools/doc/ot2kpx.pdf
+2023/02/01 | 26775 | fonts/utilities/fontools/doc/afm2afm.pdf
+2023/02/01 | 26737 | macros/latex/contrib/l3kernel/l3kernel-functions.dtx
+2023/02/01 | 25650 | macros/latex/contrib/l3kernel/l3fp-random.dtx
+2023/02/01 | 25513723 | systems/texlive/tlnet/install-tl.zip
+2023/02/01 | 250136 | macros/latex/contrib/l3kernel/l3news09.pdf
+2023/02/01 | 2493002 | macros/latex/contrib/biblatex-contrib/biblatex-oxref.zip
+2023/02/01 | 24841 | macros/latex/contrib/l3kernel/source3body.tex
+2023/02/01 | 2445864 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2023/02/01 | 242752 | macros/latex/contrib/l3kernel/l3syntax-changes.pdf
+2023/02/01 | 2390 | macros/latex/contrib/l3kernel/l3docstrip.dtx
+2023/02/01 | 23866 | macros/latex/contrib/l3kernel/l3luatex.dtx
+2023/02/01 | 23530 | macros/latex/contrib/l3kernel/l3deprecation.dtx
+2023/02/01 | 23011 | macros/latex/contrib/l3kernel/l3fp-logic.dtx
+2023/02/01 | 2253282 | install/macros/latex/contrib/l3packages.tds.zip
+2023/02/01 | 2235192 | macros/latex/contrib/l3packages.zip
+2023/02/01 | 2229 | macros/latex/contrib/l3kernel/source3.tex
+2023/02/01 | 217823 | fonts/utilities/fontools.zip
+2023/02/01 | 21665 | macros/latex/contrib/l3kernel/l3text-purify.dtx
+2023/02/01 | 215290 | macros/latex/contrib/l3kernel/l3term-glossary.pdf
+2023/02/01 | 204992 | macros/latex/contrib/l3kernel/l3news12.pdf
+2023/02/01 | 20437284 | systems/texlive/tlnet/install-tl-windows.exe
+2023/02/01 | 20367 | fonts/utilities/fontools/doc/splitttc.pdf
+2023/02/01 | 19820 | systems/texlive/tlnet/archive/todonotes.source.r65699.tar.xz
+2023/02/01 | 19641 | macros/latex/contrib/l3kernel/l3fp-convert.dtx
+2023/02/01 | 19161 | macros/latex/contrib/l3kernel/l3pdf.dtx
+2023/02/01 | 1908 | macros/latex/contrib/l3kernel/interface3.tex
+2023/02/01 | 18531 | macros/latex/contrib/l3kernel/l3fp-round.dtx
+2023/02/01 | 18020934 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2023/02/01 | 17997 | fonts/utilities/fontools/GPLv2.txt
+2023/02/01 | 1778872 | macros/latex/contrib/l3kernel/interface3.pdf
+2023/02/01 | 17241 | fonts/utilities/fontools/share/fontools_lgr.enc
+2023/02/01 | 170076 | macros/latex/contrib/l3kernel/l3news11.pdf
+2023/02/01 | 168174 | fonts/utilities/fontools/bin/autoinst
+2023/02/01 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2023/02/01 | 16633 | macros/latex/contrib/l3kernel/l3text-map.dtx
+2023/02/01 | 163456 | macros/latex/contrib/l3kernel/l3news08.pdf
+2023/02/01 | 1561 | macros/latex/contrib/l3packages/xtemplate.ins
+2023/02/01 | 155616 | macros/latex/contrib/l3kernel/l3doc.dtx
+2023/02/01 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2023/02/01 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2023/02/01 | 151654 | macros/latex/contrib/l3kernel/l3docstrip.pdf
+2023/02/01 | 151569 | macros/latex/contrib/l3kernel/l3news06.pdf
+2023/02/01 | 150674 | macros/latex/contrib/l3kernel/l3news02.pdf
+2023/02/01 | 150283 | macros/latex/contrib/l3kernel/l3news10.pdf
+2023/02/01 | 14927 | macros/latex/contrib/l3kernel/l3bootstrap.dtx
+2023/02/01 | 14913 | macros/latex/contrib/l3kernel/l3news12.tex
+2023/02/01 | 148706 | macros/latex/contrib/l3kernel/l3news03.pdf
+2023/02/01 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2023/02/01 | 145318 | macros/latex/contrib/l3kernel/l3tl.dtx
+2023/02/01 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2023/02/01 | 1444 | macros/latex/contrib/l3packages/l3keys2e-demo.tex
+2023/02/01 | 14019631 | install/macros/latex/contrib/l3kernel.tds.zip
+2023/02/01 | 13760580 | macros/latex/contrib/l3kernel.zip
+2023/02/01 | 136649 | macros/latex/contrib/l3kernel/l3file.dtx
+2023/02/01 | 13334 | fonts/utilities/fontools/bin/afm2afm
+2023/02/01 | 1306 | macros/latex/contrib/l3packages/xfrac.ins
+2023/02/01 | 129434 | macros/latex/contrib/l3kernel/l3basics.dtx
+2023/02/01 | 128316 | macros/latex/contrib/l3kernel/l3news07.pdf
+2023/02/01 | 12783 | macros/latex/contrib/l3kernel/l3fp-traps.dtx
+2023/02/01 | 1272 | macros/latex/contrib/l3packages/xparse.ins
+2023/02/01 | 127087 | macros/latex/contrib/l3kernel/l3keys.dtx
+2023/02/01 | 1262766 | macros/xetex/latex/xduts.zip
+2023/02/01 | 12312 | macros/latex/contrib/l3packages/l3keys2e.dtx
+2023/02/01 | 1228 | macros/latex/contrib/l3packages/l3keys2e.ins
+2023/02/01 | 122710 | macros/latex/contrib/l3kernel/l3news01.pdf
+2023/02/01 | 1191 | macros/latex/contrib/l3packages/xfp.ins
+2023/02/01 | 118855 | macros/latex/contrib/l3kernel/l3token.dtx
+2023/02/01 | 11884 | macros/latex/contrib/l3kernel/l3styleguide.tex
+2023/02/01 | 1186 | macros/xetex/latex/xduts/xduts.ins
+2023/02/01 | 11781 | macros/latex/contrib/l3kernel/l3fparray.dtx
+2023/02/01 | 114586 | macros/latex/contrib/l3kernel/l3news04.pdf
+2023/02/01 | 113708 | systems/texlive/tlnet/archive/texlive-scripts.r65696.tar.xz
+2023/02/01 | 113427 | macros/latex/contrib/l3kernel/l3str-convert.dtx
+2023/02/01 | 112485 | macros/latex/contrib/l3kernel/l3news05.pdf
+2023/02/01 | 111041 | macros/latex/contrib/l3kernel/l3color.dtx
+2023/02/01 | 107383 | macros/latex/contrib/l3kernel/l3news09.tex
+2023/02/01 | 106428 | macros/latex/contrib/l3kernel/l3expan.dtx
+2023/02/01 | 105029 | macros/latex/contrib/l3kernel/l3fp-parse.dtx
+2023/02/01 | 101005 | macros/latex/contrib/l3packages/xtemplate.dtx
2023/01/31 | 968 | systems/texlive/tlnet/archive/collection-luatex.r65693.tar.xz
2023/01/31 | 862987 | graphics/pgf/contrib/tangramtikz.zip
2023/01/31 | 82295 | macros/latex/contrib/todonotes/todonotes.dtx
2023/01/31 | 7854 | macros/latex/contrib/todonotes/img/AlteredAppearenceOfListOfTodos.png
2023/01/31 | 762 | macros/latex/contrib/todonotes/examples/externalize.tex
2023/01/31 | 743 | macros/latex/contrib/abntexto/abntexto.bib
+2023/01/31 | 7264 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2023/01/31 | 6992 | systems/texlive/tlnet/archive/eolang.r65688.tar.xz
2023/01/31 | 6868 | systems/texlive/tlnet/archive/pseudo.r65690.tar.xz
2023/01/31 | 668 | macros/latex/contrib/todonotes/examples/saveColorByUsingLayers.tex
@@ -11,25 +211,16 @@
2023/01/31 | 631666 | macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-doc.pdf
2023/01/31 | 61076 | systems/texlive/tlnet/archive/tagpdf.source.r65691.tar.xz
2023/01/31 | 59588 | systems/texlive/tlnet/archive/tramlines.doc.r65692.tar.xz
-2023/01/31 | 5828908 | systems/texlive/tlnet/install-tl-unx.tar.gz
2023/01/31 | 572738 | macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-fr.pdf
2023/01/31 | 515760 | systems/texlive/tlnet/archive/naive-ebnf.doc.r65689.tar.xz
2023/01/31 | 495 | macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/LICENSE
2023/01/31 | 495439 | macros/latex/contrib/todonotes.zip
-2023/01/31 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2023/01/31 | 458337 | macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-en.pdf
-2023/01/31 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2023/01/31 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2023/01/31 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2023/01/31 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2023/01/31 | 440579 | graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-en.pdf
2023/01/31 | 439375 | graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-fr.pdf
2023/01/31 | 4376 | systems/texlive/tlnet/archive/naive-ebnf.source.r65689.tar.xz
-2023/01/31 | 424552 | systems/texlive/tlnet/archive/texlive-scripts.doc.r65682.tar.xz
-2023/01/31 | 4045122 | biblio/ctan-bibdata.zip
2023/01/31 | 3764 | systems/texlive/tlnet/archive/tikzviolinplots.r65687.tar.xz
2023/01/31 | 37331 | graphics/pgf/contrib/tangramtikz/tex/TangramTikz.sty
-2023/01/31 | 3649425 | biblio/ctan-bibdata/ctan.pdf
2023/01/31 | 356267 | macros/latex/contrib/todonotes/todonotes.pdf
2023/01/31 | 344913 | macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-sidebar.pdf
2023/01/31 | 32924 | systems/texlive/tlnet/archive/tagpdf.r65691.tar.xz
@@ -39,13 +230,10 @@
2023/01/31 | 307980 | systems/texlive/tlnet/archive/tikzviolinplots.doc.r65687.tar.xz
2023/01/31 | 29245 | macros/latex/contrib/todonotes/examples/externalize.pdf
2023/01/31 | 27784 | macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-fr.tex
-2023/01/31 | 2764968 | biblio/ctan-bibdata/ctan.bib
2023/01/31 | 26849 | macros/latex/contrib/todonotes/examples/saveColorByUsingLayers.pdf
2023/01/31 | 267832 | systems/texlive/tlnet/archive/erewhon-math.r65684.tar.xz
2023/01/31 | 25990 | macros/latex/contrib/abntexto/abntexto.cls
-2023/01/31 | 25513709 | systems/texlive/tlnet/install-tl.zip
2023/01/31 | 252716 | systems/texlive/tlnet/archive/urlbst.doc.r65694.tar.xz
-2023/01/31 | 2448320 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2023/01/31 | 24332 | macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/tex/beamerthemeAmurmaple.sty
2023/01/31 | 239 | macros/latex/contrib/abntexto/README
2023/01/31 | 23300 | systems/texlive/tlnet/archive/urlbst.source.r65694.tar.xz
@@ -53,7 +241,6 @@
2023/01/31 | 218600 | systems/texlive/tlnet/archive/xcharter-math.r65686.tar.xz
2023/01/31 | 21028 | graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-fr.tex
2023/01/31 | 2044 | systems/texlive/tlnet/archive/naive-ebnf.r65689.tar.xz
-2023/01/31 | 20438132 | systems/texlive/tlnet/install-tl-windows.exe
2023/01/31 | 2031436 | systems/texlive/tlnet/archive/tagpdf.doc.r65691.tar.xz
2023/01/31 | 20002 | macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-doc.tex
2023/01/31 | 1988520 | systems/texlive/tlnet/archive/erewhon-math.doc.r65684.tar.xz
@@ -61,27 +248,20 @@
2023/01/31 | 19701 | graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-en.tex
2023/01/31 | 1966132 | systems/texlive/tlnet/archive/xcharter-math.doc.r65686.tar.xz
2023/01/31 | 1857764 | systems/texlive/tlnet/archive/concmath-otf.doc.r65683.tar.xz
-2023/01/31 | 18020867 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
2023/01/31 | 1778668 | macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple.zip
2023/01/31 | 17497 | macros/latex/contrib/writeongrid/tex/WriteOnGrid.sty
2023/01/31 | 170260 | macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/logo.png
-2023/01/31 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
2023/01/31 | 1631 | macros/latex/contrib/todonotes/README
2023/01/31 | 1585256 | systems/texlive/tlnet/archive/eolang.doc.r65688.tar.xz
2023/01/31 | 1560 | systems/texlive/tlnet/archive/collection-pictures.r65687.tar.xz
2023/01/31 | 15484 | systems/texlive/tlnet/archive/eolang.source.r65688.tar.xz
2023/01/31 | 1544780 | systems/texlive/tlnet/archive/euler-math.doc.r65685.tar.xz
-2023/01/31 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2023/01/31 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
2023/01/31 | 14810 | macros/latex/contrib/abntexto/abntexto.tex
-2023/01/31 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2023/01/31 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
2023/01/31 | 14428 | macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-en.tex
2023/01/31 | 14284 | systems/texlive/tlnet/archive/urlbst.r65694.tar.xz
2023/01/31 | 135020 | systems/texlive/tlnet/archive/concmath-otf.r65683.tar.xz
2023/01/31 | 124830 | macros/latex/contrib/abntexto/abntexto-manual.pdf
2023/01/31 | 1237 | macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/README.md
-2023/01/31 | 113684 | systems/texlive/tlnet/archive/texlive-scripts.r65682.tar.xz
2023/01/31 | 108315 | macros/latex/contrib/abntexto.zip
2023/01/31 | 107380 | systems/texlive/tlnet/archive/lparse.doc.r65693.tar.xz
2023/01/31 | 1068 | systems/texlive/tlnet/archive/tramlines.r65692.tar.xz
@@ -108,7 +288,6 @@
2023/01/30 | 777 | macros/latex/contrib/tagpdf/ex-spaceglyph-listings.tex
2023/01/30 | 75824 | systems/texlive/tlnet/archive/moodle.source.r65672.tar.xz
2023/01/30 | 72236 | systems/texlive/tlnet/archive/spectralsequences.r65667.tar.xz
-2023/01/30 | 7219 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2023/01/30 | 72193 | dviware/dvisvgm/doc/dvisvgm.1
2023/01/30 | 7184 | macros/luatex/generic/lparse/lparse-doc.tex
2023/01/30 | 7131 | macros/luatex/generic/lparse/lparse.lua
@@ -1095,7 +1274,6 @@
2023/01/28 | 88408 | systems/win32/miktex/tm/packages/miktex-png-bin-x64-2.9.tar.lzma
2023/01/28 | 8818 | macros/latex/contrib/ufrgscca/latex/ufrgscca-en-coord.def
2023/01/28 | 88153 | macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.pdf
-2023/01/28 | 881135 | macros/xetex/latex/xduts/xdulogo.pdf
2023/01/28 | 88039 | macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.pdf
2023/01/28 | 877742 | macros/latex/contrib/bmstu/examples/bmstu-examples.pdf
2023/01/28 | 8772 | systems/win32/miktex/tm/packages/miktex-md5-bin-x64-2.9.tar.lzma
@@ -1155,7 +1333,6 @@
2023/01/28 | 72811 | systems/win32/miktex/tm/packages/miktex-tex4ht-bin-x64-2.9.tar.lzma
2023/01/28 | 706 | macros/latex/contrib/hvfloat/doc/examples/runAll.sh
2023/01/28 | 705732 | systems/win32/miktex/tm/packages/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2023/01/28 | 702924 | systems/texlive/tlnet/archive/tangramtikz.doc.r65643.tar.xz
2023/01/28 | 699533 | systems/win32/miktex/tm/packages/miktex-harfbuzz-bin-x64-2.9.tar.lzma
2023/01/28 | 694136 | fonts/uptex-fonts/vf/upkorrm-v.vf
2023/01/28 | 694136 | fonts/uptex-fonts/vf/upkorrm-h.vf
@@ -1245,14 +1422,12 @@
2023/01/28 | 40127 | systems/win32/miktex/tm/packages/miktex-chktex-bin-x64-2.9.tar.lzma
2023/01/28 | 395125 | systems/win32/miktex/tm/packages/miktex-cairo-bin-x64-2.9.tar.lzma
2023/01/28 | 3877 | macros/latex/contrib/bmstu/bmstu.cls
-2023/01/28 | 3756 | systems/texlive/tlnet/archive/tangramtikz.r65643.tar.xz
2023/01/28 | 37451 | systems/win32/miktex/tm/packages/miktex-posix-bin-x64-2.9.tar.lzma
2023/01/28 | 3704 | systems/texlive/tlnet/archive/uol-physics-report.source.r65646.tar.xz
2023/01/28 | 370176 | macros/latex/contrib/moodle/moodle.dtx
2023/01/28 | 369655 | macros/latex/contrib/moodle/moodle.pdf
2023/01/28 | 36564 | systems/win32/miktex/tm/packages/miktex-axohelp-bin-x64-2.9.tar.lzma
2023/01/28 | 36411 | systems/win32/miktex/tm/packages/miktex-arctrl-bin-x64-2.9.tar.lzma
-2023/01/28 | 3637 | macros/xetex/latex/xduts/README.md
2023/01/28 | 354190 | macros/latex/contrib/bmstu/examples/inc/img/tuz.png
2023/01/28 | 353525 | systems/win32/miktex/tm/packages/miktex-xetex-bin-x64-2.9.tar.lzma
2023/01/28 | 35188 | systems/win32/miktex/tm/packages/miktex-mspack-bin-x64-2.9.tar.lzma
@@ -1260,7 +1435,6 @@
2023/01/28 | 33799 | systems/win32/miktex/tm/packages/miktex-uriparser-bin-x64-2.9.tar.lzma
2023/01/28 | 33634 | systems/win32/miktex/tm/packages/miktex-makeindex-bin-x64-2.9.tar.lzma
2023/01/28 | 33301 | macros/latex/contrib/ufrgscca/latex/ufrgscca-coord.sty
-2023/01/28 | 332217 | macros/xetex/latex/xduts/xduts.pdf
2023/01/28 | 3291 | fonts/uptex-fonts/source/upjisr-v.pl
2023/01/28 | 328941 | systems/win32/miktex/tm/packages/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
2023/01/28 | 3279 | fonts/uptex-fonts/source/upschr-v.pl
@@ -1284,7 +1458,6 @@
2023/01/28 | 2831412 | systems/win32/miktex/tm/packages/miktex-texworks-bin-x64-2.9.tar.lzma
2023/01/28 | 2770 | fonts/uptex-fonts/source/uptchr-v.pl
2023/01/28 | 27678 | systems/win32/miktex/tm/packages/miktex-teckit-bin-x64-2.9.tar.lzma
-2023/01/28 | 275463 | macros/xetex/latex/xduts/xduts.dtx
2023/01/28 | 2753 | fonts/uptex-fonts/source/uptchr-h.pl
2023/01/28 | 272 | systems/texlive/tlnet/archive/texlive-es.r65640.tar.xz
2023/01/28 | 271855 | systems/win32/miktex/tm/packages/miktex-console-bin-x64-2.9.tar.lzma
@@ -1387,12 +1560,10 @@
2023/01/28 | 1300 | fonts/uptex-fonts/tfm/ugoth10.tfm
2023/01/28 | 129396 | macros/latex/contrib/bmstu/bmstu-logo.pdf
2023/01/28 | 1270 | macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.tex
-2023/01/28 | 1262318 | macros/xetex/latex/xduts.zip
2023/01/28 | 122112 | macros/latex/contrib/hvfloat/doc/hvfloat.tex
2023/01/28 | 121738 | macros/latex/contrib/hvfloat/doc/examples/wide2s2c.pdf
2023/01/28 | 12096 | macros/latex/contrib/bmstu/examples/bmstu-examples.tex
2023/01/28 | 120723 | macros/latex/contrib/hvfloat/doc/examples/wide1s2c.pdf
-2023/01/28 | 1186 | macros/xetex/latex/xduts/xduts.ins
2023/01/28 | 117150 | systems/win32/miktex/tm/packages/miktex-gregorio-bin-x64-2.9.tar.lzma
2023/01/28 | 1166476 | systems/win32/miktex/tm/packages/miktex-asymptote-bin-x64-2.9.tar.lzma
2023/01/28 | 11491 | macros/latex/contrib/ufrgscca/latex/ufrgscca-cover.sty
@@ -1632,28 +1803,3 @@
2023/01/26 | 110750 | graphics/pgf/contrib/codeanatomy/codeanatomy.pdf
2023/01/26 | 10664 | macros/latex/contrib/univie-ling/README
2023/01/26 | 102008 | graphics/pgf/contrib/codeanatomy/codeanatomy.usage.pdf
-2023/01/25 | 990 | graphics/pgf/contrib/pixelarttikz/doc/cap.csv
-2023/01/25 | 9058 | graphics/pgf/contrib/pixelarttikz/tex/PixelArtTikz.sty
-2023/01/25 | 832 | macros/luatex/latex/luaquotes/README
-2023/01/25 | 801869 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf
-2023/01/25 | 759 | graphics/pgf/contrib/pixelarttikz/doc/test1.csv
-2023/01/25 | 68936 | macros/luatex/latex/luaquotes.zip
-2023/01/25 | 60240 | macros/luatex/latex/luaquotes/luaquotes-documentation.pdf
-2023/01/25 | 529 | macros/latex/contrib/proflycee/doc/testscript.py
-2023/01/25 | 501108 | graphics/pgf/contrib/pixelarttikz/doc/PixelArtTikz-doc-fr.pdf
-2023/01/25 | 490717 | graphics/pgf/contrib/pixelarttikz/doc/PixelArtTikz-doc-en.pdf
-2023/01/25 | 411 | graphics/pgf/contrib/pixelarttikz/README.md
-2023/01/25 | 400369 | macros/latex/contrib/schooldocs/schooldocs-examples.pdf
-2023/01/25 | 39027 | macros/latex/contrib/schooldocs/schooldocs.dtx
-2023/01/25 | 36 | graphics/pgf/contrib/pixelarttikz/doc/base.csv
-2023/01/25 | 338567 | support/TeX4ht/source/tex4ht-ooffice.tex
-2023/01/25 | 32549 | macros/luatex/latex/luaquotes/luaquotes-documentation.tex
-2023/01/25 | 235606 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex
-2023/01/25 | 216121 | support/TeX4ht/source/ChangeLog
-2023/01/25 | 2069156 | systems/doc/luatex.zip
-2023/01/25 | 19340 | macros/luatex/latex/luaquotes/luaquotes.sty
-2023/01/25 | 19194 | graphics/pgf/contrib/pixelarttikz/doc/PixelArtTikz-doc-fr.tex
-2023/01/25 | 1756139 | macros/latex/contrib/proflycee.zip
-2023/01/25 | 16770 | graphics/pgf/contrib/pixelarttikz/doc/PixelArtTikz-doc-en.tex
-2023/01/25 | 154926 | macros/latex/contrib/schooldocs/schooldocs.pdf
-2023/01/25 | 132594 | macros/latex/contrib/proflycee/tex/ProfLycee.sty
diff --git a/biblio/ctan-bibdata/ctan.bib b/biblio/ctan-bibdata/ctan.bib
index 945a832bb6..424e334ced 100644
--- a/biblio/ctan-bibdata/ctan.bib
+++ b/biblio/ctan-bibdata/ctan.bib
@@ -1,7 +1,7 @@
%% bib file of all CTAN packages
%% (C) Herbert Voß
%%
-%% created at 01-02-2023, 02:01:38
+%% created at 02-02-2023, 02:00:17
%%
%% This file is provided under the terms of the LPPL v1.3 or
@@ -7601,8 +7601,8 @@
title = {The \texttt{biblatex-oxref} package},
subtitle = {Bib\LaTeX{} styles inspired by the Oxford Guide to Style},
author = {Alex Ball},
- date = {2021-01-19},
- version = {2.2},
+ date = {2023-02-01},
+ version = {3.0},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/biblatex-contrib/biblatex-oxref},
url = {https://ctan.org/pkg/biblatex-oxref},
@@ -23642,7 +23642,7 @@
title = {The \texttt{expl3} package},
subtitle = {Wrapper package for experimental \LaTeX{}3},
author = {{The \LaTeX{} Project Team}},
- date = {2023-01-24},
+ date = {2023-02-01},
version = {},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/l3kernel},
@@ -26237,7 +26237,7 @@
title = {The \texttt{fontools} package},
subtitle = {Tools to simplify using fonts (especially TT/OTF ones)},
author = {Marc Penninga},
- date = {2022-01-24},
+ date = {2023-02-01},
version = {},
license = {gpl2},
mirror = {https://mirror.ctan.org/fonts/utilities/fontools},
@@ -36217,7 +36217,7 @@
title = {The \texttt{l3docstrip} package},
subtitle = {Strip documentation in \LaTeX{}3 source},
author = {{The \LaTeX{} Project Team}},
- date = {2023-01-24},
+ date = {2023-02-01},
version = {},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/l3kernel},
@@ -36239,7 +36239,7 @@
title = {The \texttt{l3kernel} package},
subtitle = {LaTeX3 programming conventions},
author = {{The \LaTeX{} Project Team}},
- date = {2023-01-24},
+ date = {2023-02-01},
version = {},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/l3kernel},
@@ -36250,7 +36250,7 @@
title = {The \texttt{l3keys2e} package},
subtitle = {LaTeX2e option processing using \LaTeX{}3 keys},
author = {{The \LaTeX{} Project Team}},
- date = {2023-01-16},
+ date = {2023-02-01},
version = {},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/l3packages},
@@ -36261,7 +36261,7 @@
title = {The \texttt{l3packages} package},
subtitle = {High-level \LaTeX{}3 concepts},
author = {{The \LaTeX{} Project Team}},
- date = {2023-01-16},
+ date = {2023-02-01},
version = {},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/l3packages},
@@ -36272,7 +36272,7 @@
title = {The \texttt{l3regex} package},
subtitle = {Regular expression facilities for \LaTeX{}},
author = {{The \LaTeX{} Project Team}},
- date = {2023-01-24},
+ date = {2023-02-01},
version = {},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/l3kernel/l3regex.dtx},
@@ -75542,8 +75542,8 @@
title = {The \texttt{xduts} package},
subtitle = {Xidian University \TeX{} Suite},
author = {{Unknown}},
- date = {2023-01-28},
- version = {4.3.0.0},
+ date = {2023-02-01},
+ version = {4.3.0.2},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/xetex/latex/xduts},
url = {https://ctan.org/pkg/xduts},
@@ -75918,7 +75918,7 @@
title = {The \texttt{xfp} package},
subtitle = {Interface to the \LaTeX{}3 floating point unit},
author = {{The \LaTeX{} Project Team}},
- date = {2023-01-16},
+ date = {2023-02-01},
version = {},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/l3packages},
@@ -75929,7 +75929,7 @@
title = {The \texttt{xfrac} package},
subtitle = {Split-level fractions in \LaTeX{}2e*},
author = {Morten Høgholm and Lars Madsen and Will Robertson and Joseph Wright},
- date = {2023-01-16},
+ date = {2023-02-01},
version = {},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/l3packages},
@@ -76311,7 +76311,7 @@
title = {The \texttt{xparse} package},
subtitle = {A generic document command parser},
author = {{The \LaTeX{} Project Team}},
- date = {2023-01-16},
+ date = {2023-02-01},
version = {},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/l3packages},
@@ -76576,7 +76576,7 @@
title = {The \texttt{xtemplate} package},
subtitle = {A high-level interface for declaring document commands},
author = {{The \LaTeX{} Project Team}},
- date = {2023-01-16},
+ date = {2023-02-01},
version = {},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/l3packages},
diff --git a/biblio/ctan-bibdata/ctan.pdf b/biblio/ctan-bibdata/ctan.pdf
index 0f965bfdba..ae5c5f00fc 100644
--- a/biblio/ctan-bibdata/ctan.pdf
+++ b/biblio/ctan-bibdata/ctan.pdf
Binary files differ
diff --git a/fonts/utilities/fontools/README b/fonts/utilities/fontools/README
index 684b0fdda6..a7edc5d48e 100644
--- a/fonts/utilities/fontools/README
+++ b/fonts/utilities/fontools/README
@@ -79,6 +79,6 @@ See the GNU General Public License for more details.
LICENSE & COPYRIGHT
===================
-This software is copyright (C) 2005-2022 Marc Penninga.
+This software is copyright (C) 2005-2023 Marc Penninga.
It is released under the terms of the GNU General Public Licence;
see the file GPLv2.txt for the license conditions.
diff --git a/fonts/utilities/fontools/bin/afm2afm b/fonts/utilities/fontools/bin/afm2afm
index 894764918e..37ddbb679a 100755
--- a/fonts/utilities/fontools/bin/afm2afm
+++ b/fonts/utilities/fontools/bin/afm2afm
@@ -4,7 +4,7 @@
----------------------------------------------------------------------------
- Copyright (C) 2005-2022 Marc Penninga.
+ Copyright (C) 2005-2023 Marc Penninga.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -37,7 +37,7 @@ use File::Basename;
use Getopt::Long;
use Pod::Usage;
-my $VERSION = "20220124";
+my $VERSION = "20230201";
parse_commandline();
@@ -398,7 +398,7 @@ Marc Penninga <marcpenninga@gmail.com>
=head1 COPYRIGHT
-Copyright (C) 2005-2022 Marc Penninga.
+Copyright (C) 2005-2023 Marc Penninga.
=head1 LICENSE
@@ -421,7 +421,7 @@ See the GNU General Public License for more details.
=head1 VERSION
-This document describes B<afm2afm> version 20220124.
+This document describes B<afm2afm> version 20230201.
=head1 RECENT CHANGES
diff --git a/fonts/utilities/fontools/bin/autoinst b/fonts/utilities/fontools/bin/autoinst
index e52391452f..5f3a71c1df 100755
--- a/fonts/utilities/fontools/bin/autoinst
+++ b/fonts/utilities/fontools/bin/autoinst
@@ -4,7 +4,7 @@
----------------------------------------------------------------------------
- Copyright (C) 2005-2022 Marc Penninga.
+ Copyright (C) 2005-2023 Marc Penninga.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -41,7 +41,7 @@ use Getopt::Long ();
use Pod::Usage ();
use POSIX ();
-my $VERSION = '20220124';
+my $VERSION = '20230201';
my ($d, $m, $y) = (localtime time)[3 .. 5];
my $TODAY = sprintf "%04d/%02d/%02d", $y + 1900, $m + 1, $d;
@@ -129,15 +129,17 @@ sub main {
LaTeX::create_support_files(\@workitems, $family, $to_nfss);
Otftotfm::run_commands(\@commands, $family, $log);
- if ($ARGV{t1suffix}) {
- Work::modify_fontnames($family, $fontlist);
- }
+ if (!$ARGV{manual}) {
+ if ($ARGV{t1suffix}) {
+ Work::modify_fontnames($family, $fontlist);
+ }
- print <<"END_MESSAGE_UPDMAP";
+ print <<"END_MESSAGE_UPDMAP";
[INFO] Done generating fonts!
Please update TeX's databases (by calling 'texhash' and 'updmap'
or their equivalents on your system) before using these fonts.
END_MESSAGE_UPDMAP
+ }
}
$log->close();
@@ -587,6 +589,7 @@ sub parse {
my $metadata = _get_metadata($filename);
$self->_parse_metadata($metadata)
+ ->_parse_cffdata()
->_parse_os2data()
->_parse_featuredata()
->_parse_sizedata()
@@ -631,6 +634,15 @@ sub _parse_metadata {
$data->{$key} =~ s/\s+//xmsg;
}
+ for my $item (qw(family subfamily fullname)) {
+ if (!$data->{$item}) {
+ die <<"END_ERR_METADATA_MISSING"
+[ERROR] Parsing font metadata failed for $self->{filename}:
+ could not find '$item' metadata item
+END_ERR_METADATA_MISSING
+ }
+ }
+
$data->{family} = $data->{preferredfamily} || $data->{family};
$data->{subfamily} = $data->{preferredsubfamily} || $data->{subfamily};
$data->{fullname} =~ s/\A$data->{family}//xms;
@@ -638,7 +650,7 @@ sub _parse_metadata {
# clean up family name (it's used in LaTeX command names)
my @DIGITS = qw(Zero One Two Three Four Five Six Seven Eight Nine);
- $data->{family} =~ s/(?: LT | MT)(?: Std | Pro )\z//xms;
+ $data->{family} =~ s/(?: LT | MT)(?: Std | Pro )//xms;
$data->{family} =~ s/(\d)/$DIGITS[$1]/xmsge;
$data->{family} =~ s/[^A-Za-z]+//xmsg;
@@ -791,6 +803,47 @@ sub _parse_metadata {
# --------------------------------------------------------------------------
+# Reads the 'Name INDEX' entry from the CFF table, if that exists.
+#
+# We need this entry only because cfftot1 uses it instead of
+# --------------------------------------------------------------------------
+sub _parse_cffdata {
+ my $self = shift;
+
+ my $tables;
+ eval {
+ my $cmd = qq(otfinfo --tables "$self->{filename}");
+ open my $otfinfo, '-|:raw', $cmd
+ or die "could not fork(): $!";
+ $tables = do { local $/; <$otfinfo> };
+ close $otfinfo
+ or die "'$cmd' failed";
+ } or warn "[WARNING] $@";
+
+ if (index($tables, 'CFF') == -1) {
+ $self->{cff_name} = $self->{name};
+ return $self;
+ }
+
+ my $cff_table;
+ eval {
+ my $cmd = qq(otfinfo --dump-table "CFF" "$self->{filename}");
+ open my $otfinfo, '-|:raw', $cmd
+ or die "could not fork(): $!";
+ $cff_table = do { local $/; <$otfinfo> };
+ close $otfinfo
+ or die "'$cmd' failed";
+ } or warn "[WARNING] $@";
+
+ my ($name_index) = unpack '@8C/Z', $cff_table;
+
+ $self->{cff_name} = $name_index;
+
+ return $self;
+}
+
+
+# --------------------------------------------------------------------------
# Parses usWeightClass and usWidthClass from the OS/2 table.
# --------------------------------------------------------------------------
sub _parse_os2data {
@@ -1098,37 +1151,37 @@ END_STY_HEADER
END_STY_XKEYVAL
+ my ($figurestyle_default, $figurealign_default);
if ($seen{LF} or $seen{TLF}) {
print {$STY}
"\\DeclareOptionX{lining}{\\edef\\$fam\@figurestyle{LF}}\n";
+ $figurestyle_default = 'LF';
}
if ($seen{OsF} or $seen{TOsF}) {
print {$STY}
"\\DeclareOptionX{oldstyle}{\\edef\\$fam\@figurestyle{OsF}}\n";
+ $figurestyle_default = 'OsF';
}
if ($seen{TLF} or $seen{TOsF}) {
print {$STY}
"\\DeclareOptionX{tabular}{\\edef\\$fam\@figurealign{T}}\n";
+ $figurealign_default = 'T';
}
if ($seen{LF} or $seen{OsF}) {
print {$STY}
"\\DeclareOptionX{proportional}{\\edef\\$fam\@figurealign{}}\n";
+ $figurealign_default = '';
}
print {$STY} <<"END_STY_MAINFONT";
+\\edef\\$fam\@figurestyle{$figurestyle_default}
+\\edef\\$fam\@figurealign{$figurealign_default}
+
\\DeclareOptionX{mainfont}{
\\renewcommand{\\familydefault}{\\$ARGV{nfss}default}
}
END_STY_MAINFONT
- my $defaults
- = $seen{OsF} ? 'oldstyle,proportional'
- : $seen{TOsF} ? 'oldstyle,tabular'
- : $seen{LF} ? 'lining,proportional'
- : $seen{TLF} ? 'lining,tabular'
- : die "[ERROR] Internal bug, please report!"
- ;
-
for my $series (qw(heavy black extrabold demibold semibold bold)) {
if ( $seen{$series} ) {
print {$STY}
@@ -1144,6 +1197,7 @@ END_STY_MAINFONT
"{$series}}\n";
}
}
+ print {$STY} "\n";
if ($ARGV{math}) {
print {$STY} <<"END_STY_MATHOPTION";
@@ -1160,24 +1214,32 @@ END_STY_MAINFONT
END_STY_MATHOPTION
- if ($seen{LF} or $seen{TLF}) {
- print {$STY} "\\newcommand*{\\$fam\@mathfigurestyle}{LF}\n";
- }
- elsif ($seen{OsF} or $seen{TOsF}) {
- print {$STY} "\\newcommand*{\\$fam\@mathfigurestyle}{OsF}\n";
- }
-
+ my ($mathfigurestyle_default, $mathfigurealign_default);
if ($seen{OsF} or $seen{TOsF}) {
print {$STY}
- "\\DeclareOptionX{matholdstyle}\n",
- " {\\renewcommand*{\\$fam\@mathfigurestyle}{OsF}}\n";
+ "\\DeclareOptionX{matholdstyle}{\\edef\\$fam\@mathfigurestyle{OsF}}\n";
+ $mathfigurestyle_default = 'OsF';
}
if ($seen{LF} or $seen{TLF}) {
print {$STY}
- "\\DeclareOptionX{mathlining}\n",
- " {\\renewcommand{\\$fam\@mathfigurestyle}{LF}}\n";
+ "\\DeclareOptionX{mathlining}{\\edef\\$fam\@mathfigurestyle{LF}}\n";
+ $mathfigurestyle_default = 'LF';
+ }
+ if ($seen{LF} or $seen{OsF}) {
+ print {$STY}
+ "\\DeclareOptionX{mathproportional}{\\edef\\$fam\@mathfigurealign{}}\n";
+ $mathfigurealign_default = '';
}
- print {$STY} "\n";
+ if ($seen{TLF} or $seen{TOsF}) {
+ print {$STY}
+ "\\DeclareOptionX{mathtabular}{\\edef\\$fam\@mathfigurealign{T}}\n";
+ $mathfigurealign_default = 'T';
+ }
+ print {$STY} <<"END_STY_MATHDEFAULTS";
+\\edef\\$fam\@mathfigurestyle{$mathfigurestyle_default}
+\\edef\\$fam\@mathfigurealign{$mathfigurealign_default}
+
+END_STY_MATHDEFAULTS
if ($seen{sw}) {
print {$STY} <<"END_STY_MATHCALOPTION";
@@ -1189,17 +1251,15 @@ END_STY_MATHCALOPTION
}
print {$STY} <<"END_STY_PROCESSOPTIONS";
-\\ExecuteOptionsX{$defaults}
\\ProcessOptionsX\\relax
END_STY_PROCESSOPTIONS
- print {$STY} <<"END_STY_PACKAGES";
-\\RequirePackage{@{[ $seen{TS1} ? "fontenc,textcomp" : "fontenc" ]}}
-\\RequirePackage{ifthen}
-\\RequirePackage{mweights}
-
-END_STY_PACKAGES
+ print {$STY} "\\RequirePackage[@{[ join ',', grep { $_ ne 'OT1' } @{$ARGV{encoding}} ]}]{fontenc}\n";
+ print {$STY} "\\RequirePackage{textcomp}\n" if $seen{TS1};
+ print {$STY} "\\RequirePackage{ifthen}\n";
+ print {$STY} "\\RequirePackage{mweights}\n";
+ print {$STY} "\n";
print {$STY} <<'END_STY_FONTAXES_START';
\IfFileExists{fontaxes.sty}{
@@ -1226,6 +1286,13 @@ END_STY_FONTAXES_SW
\DeclareTextFontCommand{\textsup}{\supfigures}
\let\textsu\textsup
\let\textsuperior\textsup
+ \let\@oldtextsuperscript\textsuperscript
+ \def\textsuperscript{\@ifstar\@oldtextsuperscript\textsup}
+ \def\@makefnmark{%
+ \mbox{\footnotemarkfont\textsuperscript{\@thefnmark}}}
+ \@ifundefined{ftntm@font}%
+ {\let\footnotemarkfont\normalfont}%
+ {\let\footnotemarkfont\ftntm@font}
END_STY_FONTAXES_SUP
}
@@ -1240,6 +1307,8 @@ END_STY_FONTAXES_SUP
\DeclareTextFontCommand{\textinf}{\inffigures}
\let\textin\textinf
\let\textinferior\textinf
+ \let\@oldtextsubscript\textsubscript
+ \def\textsubscript{\@ifstar\@oldtextsubscript\textinf}
END_STY_FONTAXES_INF
}
@@ -1340,27 +1409,44 @@ END_STYLE_REST
if ($ARGV{math}) {
print {$STY} <<"END_STY_MATH";
+% Logically these definitions belong inside the \\if$fam\@math,
+% but somehow Latex doesn't like that.
\\newif\\if$fam\@mathLATINup\\$fam\@mathLATINupfalse
\\newif\\if$fam\@mathlatinup\\$fam\@mathlatinupfalse
\\newif\\if$fam\@mathGREEKup\\$fam\@mathGREEKupfalse
\\newif\\if$fam\@mathgreekup\\$fam\@mathgreekupfalse
\\if$fam\@math
- \\DeclareSymbolFont{newoperators} {OT1}{$fam-\\$fam\@figurealign\\$fam\@mathfigurestyle}{\\mdseries\@$ARGV{nfss}}{n}
- \\SetSymbolFont{newoperators}{bold}{OT1}{$fam-\\$fam\@figurealign\\$fam\@mathfigurestyle}{\\bfseries\@$ARGV{nfss}}{n}
+ \\ifthenelse{\\equal{\\$fam\@mathstyle}{TeX}}
+ {\\$fam\@mathGREEKuptrue}
+ {}
+ \\ifthenelse{\\equal{\\$fam\@mathstyle}{french}}
+ {\\$fam\@mathLATINuptrue
+ \\$fam\@mathGREEKuptrue
+ \\$fam\@mathgreekuptrue}
+ {}
+ \\ifthenelse{\\equal{\\$fam\@mathstyle}{upright}}
+ {\\$fam\@mathLATINuptrue
+ \\$fam\@mathlatinuptrue
+ \\$fam\@mathGREEKuptrue
+ \\$fam\@mathgreekuptrue}
+ {}
- \\DeclareSymbolFont{newletters} {OML}{$fam-\\$fam\@figurealign\\$fam\@mathfigurestyle}{\\mdseries\@$ARGV{nfss}}{it}
- \\SetSymbolFont{newletters}{bold}{OML}{$fam-\\$fam\@figurealign\\$fam\@mathfigurestyle}{\\bfseries\@$ARGV{nfss}}{it}
+ \\DeclareSymbolFont{newoperators} {OT1}{$fam-\\$fam\@mathfigurealign\\$fam\@mathfigurestyle}{\\mdseries\@$ARGV{nfss}}{n}
+ \\SetSymbolFont{newoperators}{bold}{OT1}{$fam-\\$fam\@mathfigurealign\\$fam\@mathfigurestyle}{\\bfseries\@$ARGV{nfss}}{n}
+
+ \\DeclareSymbolFont{newletters} {OML}{$fam-\\$fam\@mathfigurealign\\$fam\@mathfigurestyle}{\\mdseries\@$ARGV{nfss}}{it}
+ \\SetSymbolFont{newletters}{bold}{OML}{$fam-\\$fam\@mathfigurealign\\$fam\@mathfigurestyle}{\\bfseries\@$ARGV{nfss}}{it}
\\DeclareSymbolFontAlphabet{\\mathrm}{newoperators}
\\DeclareSymbolFontAlphabet{\\mathnormal}{newletters}
\\def\\operator\@font{\\mathgroup\\symnewoperators}
- \\SetMathAlphabet{\\mathit}{normal}{OT1}{$fam-\\$fam\@figurealign\\$fam\@mathfigurestyle}{\\mdseries\@$ARGV{nfss}}{it}
- \\SetMathAlphabet{\\mathit}{bold} {OT1}{$fam-\\$fam\@figurealign\\$fam\@mathfigurestyle}{\\bfseries\@$ARGV{nfss}}{it}
+ \\SetMathAlphabet{\\mathit}{normal}{OT1}{$fam-\\$fam\@mathfigurealign\\$fam\@mathfigurestyle}{\\mdseries\@$ARGV{nfss}}{it}
+ \\SetMathAlphabet{\\mathit}{bold} {OT1}{$fam-\\$fam\@mathfigurealign\\$fam\@mathfigurestyle}{\\bfseries\@$ARGV{nfss}}{it}
- \\SetMathAlphabet{\\mathbf}{normal}{OT1}{$fam-\\$fam\@figurealign\\$fam\@mathfigurestyle}{\\bfseries\@$ARGV{nfss}}{n}
- \\SetMathAlphabet{\\mathbf}{bold} {OT1}{$fam-\\$fam\@figurealign\\$fam\@mathfigurestyle}{\\bfseries\@$ARGV{nfss}}{n}
+ \\SetMathAlphabet{\\mathbf}{normal}{OT1}{$fam-\\$fam\@mathfigurealign\\$fam\@mathfigurestyle}{\\bfseries\@$ARGV{nfss}}{n}
+ \\SetMathAlphabet{\\mathbf}{bold} {OT1}{$fam-\\$fam\@mathfigurealign\\$fam\@mathfigurestyle}{\\bfseries\@$ARGV{nfss}}{n}
\\def\\re\@DeclareMathSymbol#1#2#3#4{%
\\if\\relax\\noexpand#1\\let#1=\\undefined\\fi
@@ -1439,8 +1525,10 @@ END_STYLE_REST
\\re\@DeclareMathSymbol{Y}{\\mathalpha}{newletters}{`Y}
\\re\@DeclareMathSymbol{Z}{\\mathalpha}{newletters}{`Z}
- \\re\@DeclareMathSymbol{\\imath}{\\mathord}{newletters}{"7B}
- \\re\@DeclareMathSymbol{\\jmath}{\\mathord}{newletters}{"7C}
+ \\re\@DeclareMathSymbol{\\partial}{\\mathord}{newletters}{"40}
+ \\re\@DeclareMathSymbol{\\ell} {\\mathord}{newletters}{"60}
+ \\re\@DeclareMathSymbol{\\imath} {\\mathord}{newletters}{"7B}
+ \\re\@DeclareMathSymbol{\\jmath} {\\mathord}{newletters}{"7C}
%
% A number of math symbol declarations have been commented out,
@@ -1528,21 +1616,6 @@ END_STYLE_REST
\\re\@DeclareMathSymbol{\\varphi} {\\mathord}{newletters}{"27}
\\fi
- \\ifthenelse{\\equal{\\$fam\@mathstyle}{TeX}}
- {\\$fam\@mathGREEKuptrue}
- {}
- \\ifthenelse{\\equal{\\$fam\@mathstyle}{french}}
- {\\$fam\@mathLATINuptrue
- \\$fam\@mathGREEKuptrue
- \\$fam\@mathgreekuptrue}
- {}
- \\ifthenelse{\\equal{\\$fam\@mathstyle}{upright}}
- {\\$fam\@mathLATINuptrue
- \\$fam\@mathlatinuptrue
- \\$fam\@mathGREEKuptrue
- \\$fam\@mathgreekuptrue}
- {}
-
\\if$fam\@mathLATINup
\\re\@DeclareMathSymbol{A}{\\mathalpha}{newoperators}{`A}
\\re\@DeclareMathSymbol{B}{\\mathalpha}{newoperators}{`B}
@@ -1573,8 +1646,8 @@ END_STYLE_REST
\\fi
\\if$fam\@mathlatinup
- \\DeclareSymbolFont{upletters} {OML}{$fam-\\$fam\@figurealign\\$fam\@mathfigurestyle}{\\mdseries\@$ARGV{nfss}}{n}
- \\SetSymbolFont{upletters}{bold}{OML}{$fam-\\$fam\@figurealign\\$fam\@mathfigurestyle}{\\bfseries\@$ARGV{nfss}}{n}
+ \\DeclareSymbolFont{upletters} {OML}{$fam-\\$fam\@mathfigurealign\\$fam\@mathfigurestyle}{\\mdseries\@$ARGV{nfss}}{n}
+ \\SetSymbolFont{upletters}{bold}{OML}{$fam-\\$fam\@mathfigurealign\\$fam\@mathfigurestyle}{\\bfseries\@$ARGV{nfss}}{n}
\\re\@DeclareMathSymbol{a}{\\mathord}{upletters}{`a}
\\re\@DeclareMathSymbol{b}{\\mathord}{upletters}{`b}
@@ -1624,8 +1697,8 @@ END_STYLE_REST
\\fi
\\if$fam\@mathgreekup
- \\DeclareSymbolFont{upletters} {OML}{$fam-\\$fam\@figurealign\\$fam\@mathfigurestyle}{\\mdseries\@$ARGV{nfss}}{n}
- \\SetSymbolFont{upletters}{bold}{OML}{$fam-\\$fam\@figurealign\\$fam\@mathfigurestyle}{\\bfseries\@$ARGV{nfss}}{n}
+ \\DeclareSymbolFont{upletters} {OML}{$fam-\\$fam\@mathfigurealign\\$fam\@mathfigurestyle}{\\mdseries\@$ARGV{nfss}}{n}
+ \\SetSymbolFont{upletters}{bold}{OML}{$fam-\\$fam\@mathfigurealign\\$fam\@mathfigurestyle}{\\bfseries\@$ARGV{nfss}}{n}
\\re\@DeclareMathSymbol{\\alpha} {\\mathord}{upletters}{"0B}
\\re\@DeclareMathSymbol{\\beta} {\\mathord}{upletters}{"0C}
@@ -1665,8 +1738,8 @@ END_STY_MATH
if ($seen{sw}) {
print {$STY} <<"END_STY_MATHCAL";
\\if$fam\@mathcal
- \\SetMathAlphabet{\\mathcal}{normal}{OT1}{$fam-\\$fam\@figurealign\\$fam\@mathfigurestyle}{\\mdseries\@$ARGV{nfss}}{sw}
- \\SetMathAlphabet{\\mathcal}{bold} {OT1}{$fam-\\$fam\@figurealign\\$fam\@mathfigurestyle}{\\bfseries\@$ARGV{nfss}}{sw}
+ \\SetMathAlphabet{\\mathcal}{normal}{OT1}{$fam-\\$fam\@mathfigurealign\\$fam\@mathfigurestyle}{\\mdseries\@$ARGV{nfss}}{sw}
+ \\SetMathAlphabet{\\mathcal}{bold} {OT1}{$fam-\\$fam\@mathfigurealign\\$fam\@mathfigurestyle}{\\bfseries\@$ARGV{nfss}}{sw}
\\fi
END_STY_MATHCAL
@@ -1907,6 +1980,7 @@ I'm using the following options:
math: @{[ $ARGV{math} ? 'yes' : 'no' ]}
mathspacing: $ARGV{mathspacing}
+ auto/manual: @{[ $ARGV{manual} ? 'manual' : 'auto' ]}
fontname suffix: @{[ $ARGV{t1suffix} || '(none)' ]}
END_ARGUMENTS
@@ -2097,6 +2171,7 @@ Possible options:
-math Generate basic math fonts
-mathspacing=AMOUNT Letterspace the math fonts by AMOUNT/1000 em
+ -manual Manual mode (see documentation)
-t1suffix=SUFFIX Add SUFFIX to name of generated pfb fonts
font[s] The fonts (.otf or .ttf format) to install.
@@ -2127,6 +2202,7 @@ END_USAGE
target => '',
vendor => 'lcdftools',
typeface => '',
+ manual => '0', # 0 = no, 1 = yes
dryrun => '0', # 0 = no, 1 = yes
logfile => '',
figurekern => '1', # 0 = no, 1 = yes
@@ -2175,6 +2251,7 @@ sub parse_options {
'target=s' => \$ARGV{target},
'vendor=s' => \$ARGV{vendor},
'typeface=s' => \$ARGV{typeface},
+ 'manual' => \$ARGV{manual},
'dryrun' => \$ARGV{dryrun},
'figurekern!' => \$ARGV{figurekern},
'logfile=s' => \$ARGV{logfile},
@@ -2287,7 +2364,7 @@ sub create_command {
|| Util::any( map { $_ eq 'liga' } @{$workitem->{features}} );
return join q( ), 'otftotfm',
- '--automatic',
+ ($ARGV{manual} ? '--pl' : '--automatic'),
"--encoding=$workitem->{enc_file}",
$targetdirs,
'--no-updmap',
@@ -2313,44 +2390,52 @@ sub create_command {
# --------------------------------------------------------------------------
-# Executes all commands.
+# Executes (or saves to file, when $ARGV{manual} is true) all commands.
# --------------------------------------------------------------------------
sub run_commands {
my ($commandlist, $family, $log) = @_;
- my $n_cmds = scalar @{$commandlist};
- my ($log_ncmds, $ceil) = (1, 10);
- while ($n_cmds >= $ceil) {
- $log_ncmds++;
- $ceil *= 10;
- }
- my $template = sprintf "%%%dd of %%%dd", $log_ncmds, $log_ncmds;
- my $l_template = 4 + 2 * $log_ncmds;
- $| = 1; # autoflush
- print "[INFO] Generating fonts for $family: ", " " x $l_template;
-
- my $i_cmd = 1;
- my $oops = 0;
- for my $command (@{$commandlist}) {
- print "\b" x $l_template;
- printf $template, $i_cmd++, $n_cmds;
- open my $otftotfm, '-|', "$command 2>&1"
- or die "could not fork(): $!";
- my $msgs = do { local $/; <$otftotfm> };
- close $otftotfm
- or do {
- warn "\n$command\n\n$msgs\n";
- $log->log("\n$command\n\n$msgs\n");
- $oops = 1;
- };
+ if ($ARGV{manual}) {
+ open my $BAT, '>', 'autoinst.bat'
+ or die "[ERROR] Can't create 'autoinst.bat': $!";
+ print {$BAT} "$_\n" for @{$commandlist};
+ close $BAT;
}
- print "\n";
- $| = 0;
- if ($oops) {
- warn <<"END_OTFTOTFM_WARNING";
+ else {
+ my $n_cmds = scalar @{$commandlist};
+ my ($log_ncmds, $ceil) = (1, 10);
+ while ($n_cmds >= $ceil) {
+ $log_ncmds++;
+ $ceil *= 10;
+ }
+ my $template = sprintf "%%%dd of %%%dd", $log_ncmds, $log_ncmds;
+ my $l_template = 4 + 2 * $log_ncmds;
+ $| = 1; # autoflush
+ print "[INFO] Generating fonts for $family: ", " " x $l_template;
+
+ my $i_cmd = 1;
+ my $oops = 0;
+ for my $command (@{$commandlist}) {
+ print "\b" x $l_template;
+ printf $template, $i_cmd++, $n_cmds;
+ open my $otftotfm, '-|', "$command 2>&1"
+ or die "could not fork(): $!";
+ my $msgs = do { local $/; <$otftotfm> };
+ close $otftotfm
+ or do {
+ warn "\n$command\n\n$msgs\n";
+ $log->log("\n$command\n\n$msgs\n");
+ $oops = 1;
+ };
+ }
+ print "\n";
+ $| = 0;
+ if ($oops) {
+ warn <<"END_OTFTOTFM_WARNING";
[ERROR] One or more calls to 'otftotfm' returned a non-zero status code;
please check the messages above and in the log file.
END_OTFTOTFM_WARNING
+ }
}
return;
@@ -2705,7 +2790,7 @@ sub process_encoding_options {
# or have an accompanying .enc file in the current directory.
my @encodings = split /,/, $ARGV{encoding};
for my $enc (@encodings) {
- if ($enc !~ m/\A(OT1|T1|TS1|LY1|LGR|T2[ABC]|T3|TS3)\z/xmsi) {
+ if ($enc !~ m/\A(OT1|T[1345]|T2[ABC]|TS[13]|LY1|LGR|CS|L7X|QX)\z/xmsi) {
my $try = $enc;
$try .= '.enc' if $try !~ m/[.]enc\z/xmsi;
if (!-e $try) {
@@ -2753,7 +2838,12 @@ sub process_encoding_options {
sub process_target_options{
my $localtarget = File::Spec->catdir( Cwd::getcwd(), 'autoinst_output' );
- if (!$ARGV{target}) {
+ if ($ARGV{manual}) {
+ warn "[WARNING] Option '-target' overridden by '-manual'!\n"
+ if $ARGV{target};
+ $ARGV{target} = $localtarget;
+ }
+ elsif (!$ARGV{target}) {
my $is_windows_os = ( $^O =~ /^MSWin/i );
my $kpsepath = $is_windows_os
? eval { qx( kpsewhich -expand-var=\$TEXMFLOCAL;\$TEXMFHOME ) }
@@ -3086,7 +3176,7 @@ sub cleanup {
}
else {
($workitem->{enc_file} = $workitem->{encoding})
- =~ s{ \A (OT1|OML|T1|TS1|LY1|LGR|T2[ABC]|T3|TS3) \z }
+ =~ s{ \A (OT1|OML|T[1345]|T2[ABC]|TS[13]|LY1|LGR|CS|L7X|QX) \z }
{fontools_\L$1\E}xmsi;
}
@@ -3144,6 +3234,9 @@ sub modify_fontnames {
# The otftotfm-generated map file refers to the original otf files;
# we need to change this to use our name-modified Type1 fonts instead.
+ # Note that cfftot1 uses the Name INDEX from the CFF table,
+ # not the PostScript name from the name table. These two names are
+ # usually equal, but not necessarily (sec 5.4.2 in OpenType spec).
my $mapfile = File::Spec->catfile(
$ARGV{target},
'fonts',
@@ -3178,17 +3271,23 @@ sub modify_fontnames {
}
my $newfullfam = $full_family . q( ) . $ARGV{t1suffix};
- my $newname = $font->{name};
- if ($newname =~ m/$family/xms) {
- $newname =~ s/$family/$newfam/xms;
+ my $newname;
+ if ($font->{cff_name} =~ m/$family/xms) {
+ ($newname = $font->{cff_name}) =~ s/$family/$newfam/xms;
}
else {
- $newname =~ s/(.+?)(-|\z)/$1$ARGV{t1suffix$2}/xms;
+ (my $dashfam = $font->{originalfamily}) =~ s/[ ]/-/xmsg;
+ if ($font->{cff_name} =~ m/$dashfam(.+)/xms) {
+ $newname = $dashfam . '-' . $ARGV{t1suffix} . $1;
+ }
+ else {
+ $newname = $font->{cff_name} . $ARGV{t1suffix};
+ }
}
for my $suffix (q(), q(LCDFJ)) {
my $oldfn = File::Spec->catfile(
- $pfb_dir, $font->{name} . $suffix . '.pfb');
+ $pfb_dir, $font->{cff_name} . $suffix . '.pfb');
my $newfn = File::Spec->catfile(
$pfb_dir, $newname . $suffix . '.pfb');
@@ -3207,7 +3306,7 @@ sub modify_fontnames {
for (@pfbdata) {
if (m/%!PS-AdobeFont-1.0:[ ] | \/FontName[ ]/xms) {
- s/$font->{name}/$newname/;
+ s/$font->{cff_name}/$newname/;
}
if (m/\/Notice[ ]/xms) {
s/[(]/($NOTICE/xms;
@@ -3227,7 +3326,7 @@ sub modify_fontnames {
unlink $oldfn unless $oldfn eq $newfn;
- $mapdata =~ s/$font->{name}$suffix.pfb/$newname$suffix.pfb/g;
+ $mapdata =~ s/$font->{cff_name}$suffix(?!-)/$newname$suffix/g;
}
}
@@ -3345,10 +3444,10 @@ in roman, italic and slanted shapes.
=item -
Families with "Titling" characters;
-these "... replace the default glyphs
+these I<"... replace the default glyphs
with corresponding forms designed specifically for titling.
These may be all-capital and/or larger on the body,
-and adjusted for viewing at larger sizes"
+and adjusted for viewing at larger sizes">
(according to the OpenType Specification).
=item -
@@ -3443,16 +3542,16 @@ yourself.
Choose which figure style to use.
The defaults are "oldstyle" and "proportional" (if available).
-=item C<<< scale=I<< <number> >> >>>, C<scale=MatchLowercase>
+=item C<<< scale=I<< <factor> >> >>>, C<scale=MatchLowercase>
-Scale the font by a factor of I<< <number> >>.
-E.g., to increase the size of the font by 5%, use
-C<<< \usepackage[scale=1.05]{I<< <FontFamily> >>} >>>.
+Scale the font by I<< <factor> >>;
+as an example, C<<< \usepackage[scale=1.05]{I<< <FontFamily> >>} >>>
+will increase the font's size by 5%.
The special value C<MatchLowercase> may be used to scale the font
so that its x-height matches that of the current main font
(which is usually Computer Modern Roman, unless you have loaded
another font package before this one).
-The name C<scaled> may be used as a synonym for C<scale>.
+The word "scale" may also be spelled as "scaled".
=item C<medium>, C<book>, C<text>, C<normal>, C<regular>
@@ -3490,15 +3589,21 @@ to place swash on F<fontaxes>' secondary shape axis (F<fontaxes> places it
on the primary shape axis) to make them behave properly when nested, so that
C<\swshape\upshape> will give upright swash.
+Finally, the style file redefines Latex's C<\textsuperscript> and
+C<\textsubscript> commands to use the fonts' superior and inferior figures,
+and modifies Latex's footnote mechanism to use C<\textsuperscript>
+instead of reduced-size numerals from the regular text font.
+The old versions of these commands are still available as
+C<\textsuperscript*> and C<\textsubscript*>.
+
There are no commands for accessing the numerator and denominator
fonts; these can be selected using F<fontaxes>' standard commands,
e.g., C<\fontfigurestyle{numerator}\selectfont>.
-These commands are only generated for existing shapes and number styles;
-no commands are generated for shapes and styles that are missing from
-your fonts.
-Also these commands are built on top of F<fontaxes>, so if that package
-cannot be found, you're limited to using the lower-level commands from
+Once again: all these commands are only generated for existing shapes and number styles;
+no commands are generated for shapes and styles that are missing from your fonts.
+Note that all these commands are built on top of F<fontaxes>; if that package
+cannot be found, you're limited to using lower-level commands from
standard NFSS (C<\fontfamily>, C<\fontseries>, C<\fontshape> etc.).
By default, B<autoinst> generates text fonts with OT1, LY1 and T1
@@ -3524,14 +3629,14 @@ to access these math fonts:
Use these fonts for the maths in your document.
-=item C<mathlining>, C<matholdstyle>
+=item C<mathlining>, C<matholdstyle>, C<mathtabular>, C<mathproportional>
-Choose which figure style to use in maths.
-The default is "mathlining".
+Choose which figure style and alignment to use in maths.
+The defaults are "mathlining" and "mathtabular".
=item C<mathcal>
-Use the swash characters from your fonts as the C<\mathcal> alphabet.
+Use the swash characters from these fonts as the C<\mathcal> alphabet.
(This option will only exist if your fonts actually contain swash characters,
plus a C<swsh> feature to access them).
@@ -3559,7 +3664,7 @@ before loading the B<autoinst>-generated style file.
Finally, note that B<autoinst> doesn't check if your fonts actually contains
all of the required characters;
it just assumes that they do and sets up the style file accordingly.
-Even if your fonts contain greek, characters such as C<\varepsilon>
+Even if your fonts do contain greek, characters such as C<\varepsilon>
may be missing.
You may also find that some glyphs I<are> present in your fonts,
but don't work well in equations or don't match with other symbols;
@@ -3658,14 +3763,17 @@ are not compatible with files generated by newer versions.
Since F<pdfTeX> cannot subset otf-flavoured OpenType fonts,
I<otftotfm> will convert such fonts to Type1 (pfb) format.
However, many fonts (at least those licensed under the SIL Open Font License)
-do not allow distributing such converted versions under their original name.
+do not allow redistributing such converted versions under their original name.
-To meet these licensing requirements, B<autoinst> provides
-a I<-t1suffix> command-line option that appends
-a user-defined suffix to the names
+In order to try to meet such licensing requirements, B<autoinst> provides
+a I<-t1suffix> command-line option that appends a suffix to the names
(both the filename and the internal font name)
of all generated Type1 fonts; see L</COMMAND-LINE OPTIONS> below.
+Please note that I am not a lawyer and do not guarantee that
+this suffix is sufficient to meet the license's requirements.
+When in doubt, consult a real lawyer!
+
=head2 Sorry, LIGTABLE too long for me to handle
@@ -3673,10 +3781,15 @@ The LIGTABLE in TeX's F<tfm> files, which contains a font's ligatures
and kerning pairs, is limited to about 32,500 entries (2^15 - 256).
If the number of ligatures plus kerns in a font is higher than that limit,
I<pltotf> and I<vptovf> will complain loudly and ignore the excess entries.
-This happens at least with Adobe's Source Serif 4 and Minion 3.
+This happens at least with Adobe's Source Serif 4 and Minion 3 font families.
+Even when I<pltotf> and I<vptovf> don't warn about the LIGTABLE's size,
+you may still find that I<pdftex> crashes with a
+C<Bad metric (TFM) file> error.
The best way to handle this situation is to use B<autoinst>'s C<-extra> option
to raise F<otftotfm>'s value for the C<--min-kern> parameter, which causes it
-to ignore small kerning pairs: C<-extra='--min-kern=5.0'>.
+to ignore small kerning pairs: C<-extra='--min-kern=6.0'>.
+Finding the correct value for the C<--min-kern> parameter may require some
+trial and error.
=head2 A note for MiKTeX users
@@ -3763,8 +3876,8 @@ For each encoding argument, B<autoinst> will first check if it is
the filename of an encoding file, and if found it will use that;
otherwise the argument is assumed to be the name of one of
the built-in encodings.
-Currently B<autoinst> comes with built-in support for the OT1, T1/TS1, LY1, LGR,
-T2A/B/C and T3/TS3 encodings.
+Currently B<autoinst> comes with built-in support for the OT1, T1/TS1, LY1,
+T2A/B/C, T3/TS3, T4, T5, LGR, CS, L7X and QX encodings.
(These files are called F<fontools_ot1.enc> etc. to avoid name clashes
with other packages; the F<fontools_> prefix may be omitted.)
@@ -3970,6 +4083,38 @@ Pass I<extra options> to the commands for I<otftotfm>.
To prevent I<extra options> from accidentily being interpreted as
options to B<autoinst>, they should be properly quoted.
+=item B<-manual>
+
+Manual mode; for users who want to post-process the generated files
+and commands. By default, B<autoinst> immediately executes all
+F<otftotfm> commands it generates;
+in manual mode, these are instead written to a file F<autoinst.bat>.
+Furthermore it tells F<otftotfm> to generate human readable (and editable)
+F<pl/vpl> files instead of the default F<tfm/vf> ones,
+and to place all generated files in a subdirectory C<./autoinst_output/>
+of the current directory, rather than install them into your TeX installation.
+
+When using this option, you need to execute the following manual steps after
+B<autoinst> has finished:
+
+=over 2
+
+=item - run F<pltotf> and F<vptovf> on the generated F<pl> and F<vf> files,
+to convert them to F<tfm/vf> format;
+
+=item - move all generated files to a proper TEXMF tree,
+and, if necessary, update the filename database;
+
+=item - tell TeX about the new F<map> file
+(usually by running C<updmap> or similar).
+
+=back
+
+Note that some options (I<-target>, I<-vendor> and I<-typeface>)
+are meaningless, and hence ignored, in manual mode.
+
+Also note that font name modification doesn't happen in manual mode.
+
=item B<-nofigurekern>
Some fonts provide kerning pairs for tabular figures.
@@ -4016,7 +4161,7 @@ don't paraphase.
=head1 COPYRIGHT
-Copyright (C) 2005-2022 Marc Penninga.
+Copyright (C) 2005-2023 Marc Penninga.
=head1 LICENSE
@@ -4039,7 +4184,7 @@ GNU General Public License for more details.
=head1 VERSION
-This document describes B<autoinst> version 20220124.
+This document describes B<autoinst> version 20230201.
=head1 RECENT CHANGES
@@ -4048,6 +4193,21 @@ This document describes B<autoinst> version 20220124.
=over 12
+=item I<2023-02-01>
+
+Added support for the T4, T5, CS, L7X and QX encodings.
+
+=item I<2023-01-31>
+
+If the fonts contain superior and/or inferior figures,
+the generated style file now redefines the C<\textsuperscript>
+and C<\textsubscript> commands, and patches Latex's footnote
+mechanism to use these figures
+(inspired by the F<realscripts> package).
+Fixed a few bugs in metadata parsing, style file generation
+and the C<-t1suffix> option, so that the latter also works
+for dvips and dvipdfmx.
+
=item I<2021-11-15>
Bugfix: font info parsing now works for Adobe Source Serif 4.
@@ -4078,6 +4238,13 @@ The I<-encoding> option now also accepts filenames of encoding files
in directories other than the current directory.
Directory names containing spaces do (or at least should) also work.
+=back
+
+
+=begin Really_old_history
+
+=over 12
+
=item I<2020-12-18>
Fixed a problem with files not being found on Windows.
@@ -4129,13 +4296,6 @@ an argument to I<-inferiors>.
Don't create empty subdirectories in the target TEXMF tree.
-=back
-
-
-=begin Really_old_history
-
-=over 12
-
=item I<2019-11-18>
Fine-tuned calling of F<kpsewhich> on Windows (patch by Akira Kakuto).
@@ -4258,7 +4418,7 @@ Fine-tuned the decision where to put generated files;
in particular, create $TEXMFHOME if it doesn't already exist
and $TEXMFLOCAL isn't user-writable.
-When we can't find a user-writable TEXMF tree,
+In manual mode, or when we can't find a user-writable TEXMF tree,
put all generated files into a subdirectory C<./autoinst_output/>
instead of all over the current working directory.
diff --git a/fonts/utilities/fontools/bin/ot2kpx b/fonts/utilities/fontools/bin/ot2kpx
index 88ce76fc30..04c9f8d47e 100755
--- a/fonts/utilities/fontools/bin/ot2kpx
+++ b/fonts/utilities/fontools/bin/ot2kpx
@@ -4,7 +4,7 @@
----------------------------------------------------------------------------
- Copyright (C) 2005-2022 Marc Penninga.
+ Copyright (C) 2005-2023 Marc Penninga.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -38,7 +38,7 @@ use Getopt::Long ();
use List::Util @List::Util::EXPORT_OK;
use Pod::Usage;
-my $VERSION = "20220124";
+my $VERSION = "20230201";
our ($NUM_GLYPHS, $UNITS_PER_EM, %kern);
@@ -835,7 +835,7 @@ Marc Penninga <marcpenninga@gmail.com>
=head1 COPYRIGHT
-Copyright (C) 2005-2022 Marc Penninga.
+Copyright (C) 2005-2023 Marc Penninga.
=head1 LICENSE
@@ -858,7 +858,7 @@ See the GNU General Public License for more details.
=head1 VERSION
-This document describes B<ot2kpx> version 20220124.
+This document describes B<ot2kpx> version 20230201.
=head1 RECENT CHANGES
diff --git a/fonts/utilities/fontools/bin/splitttc b/fonts/utilities/fontools/bin/splitttc
index 52aaf42fba..fdf359a1e5 100755
--- a/fonts/utilities/fontools/bin/splitttc
+++ b/fonts/utilities/fontools/bin/splitttc
@@ -4,7 +4,7 @@
----------------------------------------------------------------------------
- Copyright (C) 2022 Marc Penninga.
+ Copyright (C) 2023 Marc Penninga.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -38,7 +38,7 @@ use File::Basename;
use Getopt::Long;
use Pod::Usage;
-my $VERSION = "20220124";
+my $VERSION = "20230201";
parse_commandline();
@@ -280,7 +280,7 @@ Marc Penninga <marcpenninga@gmail.com>
=head1 COPYRIGHT
-Copyright (C) 2019-2022 Marc Penninga.
+Copyright (C) 2019-2023 Marc Penninga.
=head1 LICENSE
@@ -303,7 +303,7 @@ See the GNU General Public License for more details.
=head1 VERSION
-This document describes B<splitttc> version 20220124.
+This document describes B<splitttc> version 20230201.
=head1 RECENT CHANGES
diff --git a/fonts/utilities/fontools/doc/afm2afm.pdf b/fonts/utilities/fontools/doc/afm2afm.pdf
index 55d7d916f1..2bd3fca2f8 100644
--- a/fonts/utilities/fontools/doc/afm2afm.pdf
+++ b/fonts/utilities/fontools/doc/afm2afm.pdf
Binary files differ
diff --git a/fonts/utilities/fontools/doc/autoinst.pdf b/fonts/utilities/fontools/doc/autoinst.pdf
index ace0e43d01..949f4eac26 100644
--- a/fonts/utilities/fontools/doc/autoinst.pdf
+++ b/fonts/utilities/fontools/doc/autoinst.pdf
Binary files differ
diff --git a/fonts/utilities/fontools/doc/ot2kpx.pdf b/fonts/utilities/fontools/doc/ot2kpx.pdf
index 9b0f6182ce..7d2f0a7020 100644
--- a/fonts/utilities/fontools/doc/ot2kpx.pdf
+++ b/fonts/utilities/fontools/doc/ot2kpx.pdf
Binary files differ
diff --git a/fonts/utilities/fontools/doc/splitttc.pdf b/fonts/utilities/fontools/doc/splitttc.pdf
index e5fe6aa849..f46df562e3 100644
--- a/fonts/utilities/fontools/doc/splitttc.pdf
+++ b/fonts/utilities/fontools/doc/splitttc.pdf
Binary files differ
diff --git a/fonts/utilities/fontools/share/fontools_cs.enc b/fonts/utilities/fontools/share/fontools_cs.enc
new file mode 100644
index 0000000000..b405db28aa
--- /dev/null
+++ b/fonts/utilities/fontools/share/fontools_cs.enc
@@ -0,0 +1,309 @@
+% A version of the CS encoding, intended for use with otftotfm.
+% Based on the file lm-cs.enc from the Latin Modern package
+/otftotfmCSEncoding [
+% 0x00
+ /Gamma
+ /Delta
+ /Theta
+ /Lambda
+ /Xi
+ /Pi
+ /Sigma
+ /Upsilon
+% 0x08
+ /Phi
+ /Psi
+ /Omega
+ /ff
+ /fi
+ /fl
+ /ffi
+ /ffl
+% 0x10
+ /dotlessi
+ /dotlessj
+ /grave
+ /acute
+ /caron
+ /breve
+ /macron
+ /ring
+% 0x18
+ /cedilla
+ /germandbls
+ /ae
+ /oe
+ /oslash
+ /AE
+ /OE
+ /Oslash
+% 0x20
+ /space
+ /exclam
+ /quotedblright
+ /numbersign
+ /dollar
+ /percent
+ /ampersand
+ /quoteright
+% 0x28
+ /parenleft
+ /parenright
+ /asterisk
+ /plus
+ /comma
+ /hyphen
+ /period
+ /slash
+% 0x30
+ /zero
+ /one
+ /two
+ /three
+ /four
+ /five
+ /six
+ /seven
+% 0x38
+ /eight
+ /nine
+ /colon
+ /semicolon
+ /exclamdown
+ /equal
+ /questiondown
+ /question
+% 0x40
+ /at
+ /A
+ /B
+ /C
+ /D
+ /E
+ /F
+ /G
+% 0x48
+ /H
+ /I
+ /J
+ /K
+ /L
+ /M
+ /N
+ /O
+% 0x50
+ /P
+ /Q
+ /R
+ /S
+ /T
+ /U
+ /V
+ /W
+% 0x58
+ /X
+ /Y
+ /Z
+ /bracketleft
+ /backslash
+ /bracketright
+ /circumflex
+ /dotaccent
+% 0x60
+ /quoteleft
+ /a
+ /b
+ /c
+ /d
+ /e
+ /f
+ /g
+% 0x6a
+ /h
+ /i
+ /j
+ /k
+ /l
+ /m
+ /n
+ /o
+% 0x70
+ /p
+ /q
+ /r
+ /s
+ /t
+ /u
+ /v
+ /w
+% 0x78
+ /x
+ /y
+ /z
+ /endash
+ /emdash
+ /hungarumlaut
+ /tilde
+ /dieresis
+% 0x80
+ /ellipsis
+ /dagger
+ /daggerdbl
+ /bullet
+ /sterling
+ /paragraph
+ /Euro
+ /.notdef
+% 0x88
+ /trademark
+ /copyright
+ /registered
+ /.notdef
+ /.notdef
+ /perthousand
+ /guilsinglleft
+ /guilsinglright
+% 0x90
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /longs
+ /.notdef
+ /florin
+% 0x98
+ /Agrave
+ /.notdef
+ /quotesinglbase
+ /.notdef
+ /hyphen.alt
+ /ogonek
+ /guillemotleft
+ /guillemotright
+% 0xA0
+ /.notdef
+ /Aogonek
+ /.notdef
+ /Lslash
+ /currency
+ /Lcaron
+ /Sacute
+ /section
+% 0xA8
+ /.notdef
+ /Scaron
+ /Scommaaccent
+ /Tcaron
+ /Zacute
+ /.notdef
+ /Zcaron
+ /Zdotaccent
+% 0xB0
+ /degree
+ /aogonek
+ /.notdef
+ /lslash
+ /.notdef
+ /lcaron
+ /sacute
+ /.notdef
+% 0xB8
+ /agrave
+ /scaron
+ /scommaaccent
+ /tcaron
+ /zacute
+ /tcommaaccent
+ /zcaron
+ /zdotaccent
+% 0xC0
+ /Racute
+ /Aacute
+ /Acircumflex
+ /Abreve
+ /Adieresis
+ /Lacute
+ /Cacute
+ /Ccedilla
+% 0xC8
+ /Ccaron
+ /Eacute
+ /Eogonek
+ /Edieresis
+ /Ecaron
+ /Iacute
+ /Icircumflex
+ /Dcaron
+% 0xD0
+ /Eth
+ /Nacute
+ /Ncaron
+ /Oacute
+ /Ocircumflex
+ /Ohungarumlaut
+ /Odieresis
+ /multiply
+% 0xD8
+ /Rcaron
+ /Uring
+ /Uacute
+ /Uhungarumlaut
+ /Udieresis
+ /Yacute
+ /Tcommaaccent
+ /.notdef
+% 0xE0
+ /racute
+ /aacute
+ /acircumflex
+ /abreve
+ /adieresis
+ /lacute
+ /cacute
+ /ccedilla
+% 0xE8
+ /ccaron
+ /eacute
+ /eogonek
+ /edieresis
+ /ecaron
+ /iacute
+ /icircumflex
+ /dcaron
+% 0xF0
+ /eth
+ /nacute
+ /ncaron
+ /oacute
+ /ocircumflex
+ /ohungarumlaut
+ /odieresis
+ /divide
+% 0xF8
+ /rcaron
+ /uring
+ /uacute
+ /uhungarumlaut
+ /udieresis
+ /yacute
+ /quotedblbase
+ /quotedblleft
+] def
+%
+% UNICODING Delta =: Deltagreek Delta;
+% UNICODING Omega =: Omegagreek Omega;
+%
+% LIGKERN question quoteleft =: questiondown;
+% LIGKERN exclam quoteleft =: exclamdown;
+% LIGKERN hyphen hyphen =: endash;
+% LIGKERN endash hyphen =: emdash;
+% LIGKERN quoteleft quoteleft =: quotedblleft;
+% LIGKERN quoteright quoteright =: quotedblright;
+% LIGKERN comma comma =: quotedblbase;
+% LIGKERN less less =: guillemotleft;
+% LIGKERN greater greater =: guillemotright;
+%
+% LIGKERN || = 32;
+%
+% UNICODING ff =: ; fi =: ; fl =: ; ffi =: ; ffl =: ;
diff --git a/fonts/utilities/fontools/share/fontools_l7x.enc b/fonts/utilities/fontools/share/fontools_l7x.enc
new file mode 100644
index 0000000000..e9da67217d
--- /dev/null
+++ b/fonts/utilities/fontools/share/fontools_l7x.enc
@@ -0,0 +1,306 @@
+% A version of the L7X encoding, intended for use with otftotfm.
+% Based on the file lm-l7x.enc from the Latin Modern package
+/otftotfmL7XEncoding [
+% 0x00
+ /grave
+ /acute
+ /circumflex
+ /tilde
+ /dieresis
+ /hungarumlaut
+ /ring
+ /caron
+% 0x08
+ /breve
+ /macron
+ /dotaccent
+ /cedilla
+ /ogonek
+ /quotesinglbase
+ /guilsinglleft
+ /guilsinglright
+% 0x10
+ /quotedblleft
+ /quotedblright
+ /quotedblbase
+ /guillemotleft
+ /guillemotright
+ /endash
+ /emdash
+ /cwm
+% 0x18
+ /perthousandzero
+ /dotlessi
+ /dotlessj
+ /ff
+ /fi
+ /fl
+ /ffi
+ /ffl
+% 0x20
+ /space
+ /exclam
+ /quotedbl
+ /numbersign
+ /dollar
+ /percent
+ /ampersand
+ /quoteright
+% 0x28
+ /parenleft
+ /parenright
+ /asterisk
+ /plus
+ /comma
+ /hyphen
+ /period
+ /slash
+% 0x30
+ /zero
+ /one
+ /two
+ /three
+ /four
+ /five
+ /six
+ /seven
+% 0x38
+ /eight
+ /nine
+ /colon
+ /semicolon
+ /less
+ /equal
+ /greater
+ /question
+% 0x40
+ /at
+ /A
+ /B
+ /C
+ /D
+ /E
+ /F
+ /G
+% 0x48
+ /H
+ /I
+ /J
+ /K
+ /L
+ /M
+ /N
+ /O
+% 0x50
+ /P
+ /Q
+ /R
+ /S
+ /T
+ /U
+ /V
+ /W
+% 0x58
+ /X
+ /Y
+ /Z
+ /bracketleft
+ /backslash
+ /bracketright
+ /asciicircum
+ /underscore
+% 0x60
+ /quoteleft
+ /a
+ /b
+ /c
+ /d
+ /e
+ /f
+ /g
+% 0x68
+ /h
+ /i
+ /j
+ /k
+ /l
+ /m
+ /n
+ /o
+% 0x70
+ /p
+ /q
+ /r
+ /s
+ /t
+ /u
+ /v
+ /w
+% 0x78
+ /x
+ /y
+ /z
+ /braceleft
+ /bar
+ /braceright
+ /asciitilde
+ /.notdef
+% 0x80
+ /Euro
+ /.notdef
+ /.notdef
+ /florin
+ /.notdef
+ /ellipsis
+ /dagger
+ /daggerdbl
+% 0x88
+ /.notdef
+ /perthousand
+ /.notdef
+ /.notdef
+ /OE
+ /.notdef
+ /.notdef
+ /.notdef
+% 0x90
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /bullet
+ /.notdef
+ /.notdef
+% 0x98
+ /.notdef
+ /trademark
+ /.notdef
+ /.notdef
+ /oe
+ /.notdef
+ /.notdef
+ /.notdef
+% 0xA0
+ /nbspace
+ /.notdef
+ /cent
+ /sterling
+ /currency
+ /.notdef
+ /brokenbar
+ /section
+% 0xA8
+ /Oslash
+ /copyright
+ /Rcommaaccent
+ /.notdef
+ /logicalnot
+ /hyphen.alt
+ /registered
+ /AE
+% 0xB0
+ /degree
+ /plusminus
+ /twosuperior
+ /threesuperior
+ /.notdef
+ /mu
+ /paragraph
+ /periodcentered
+% 0xB8
+ /oslash
+ /onesuperior
+ /rcommaaccent
+ /.notdef
+ /onequarter
+ /onehalf
+ /threequarters
+ /ae
+% 0xC0
+ /Aogonek
+ /Iogonek
+ /Amacron
+ /Cacute
+ /Adieresis
+ /Aring
+ /Eogonek
+ /Emacron
+% 0xC8
+ /Ccaron
+ /Eacute
+ /Zacute
+ /Edotaccent
+ /Gcommaaccent
+ /Kcommaaccent
+ /Imacron
+ /Lcommaaccent
+% 0xD0
+ /Scaron
+ /Nacute
+ /Ncommaaccent
+ /Oacute
+ /Omacron
+ /Otilde
+ /Odieresis
+ /multiply
+% 0xD8
+ /Uogonek
+ /Lslash
+ /Sacute
+ /Umacron
+ /Udieresis
+ /Zdotaccent
+ /Zcaron
+ /germandbls
+% 0xE0
+ /aogonek
+ /iogonek
+ /amacron
+ /cacute
+ /adieresis
+ /aring
+ /eogonek
+ /emacron
+% 0xE8
+ /ccaron
+ /eacute
+ /zacute
+ /edotaccent
+ /gcommaaccent
+ /kcommaaccent
+ /imacron
+ /lcommaaccent
+% 0xF0
+ /scaron
+ /nacute
+ /ncommaaccent
+ /oacute
+ /omacron
+ /otilde
+ /odieresis
+ /divide
+% 0xF8
+ /uogonek
+ /lslash
+ /sacute
+ /umacron
+ /udieresis
+ /zdotaccent
+ /zcaron
+ /.notdef
+] def
+%
+% UNICODING perthousandzero =: perthousandzero zeroinferior emptyslot;
+%
+% LIGKERN hyphen hyphen =: endash;
+% LIGKERN endash hyphen =: emdash;
+% LIGKERN quoteleft quoteleft =: quotedblleft;
+% LIGKERN quoteright quoteright =: quotedblright;
+% LIGKERN comma comma =: quotedblbase;
+% LIGKERN less less =: guillemotleft;
+% LIGKERN greater greater =: guillemotright;
+%
+% LIGKERN || = 32;
+%
+% UNICODING ff =: ; fi =: ; fl =: ; ffi =: ; ffl =: ;
diff --git a/fonts/utilities/fontools/share/fontools_lgr.enc b/fonts/utilities/fontools/share/fontools_lgr.enc
index 8732270bbb..dd5525991f 100644
--- a/fonts/utilities/fontools/share/fontools_lgr.enc
+++ b/fonts/utilities/fontools/share/fontools_lgr.enc
@@ -1,318 +1,325 @@
-% A version of the T1 encoding, intended for use with otftotfm.
-% CODINGSCHEME GREEK FONT ENCODING - LGR
+% A version of the LGR encoding, intended for use with otftotfm.
+% Based on the file CB.enc from the cbgreek-complete package
/otftotfmLGREncoding [
% 0x00
-/endash
-/uni032F
-/u10144
-/u10145
-/u10146
-/u10147
-/uni03DB
-/uni03DB.alt
+ /endash
+ /breveinvertedbelowcmb
+ /u10144 % GREEK ACROPHONIC ATTIC FIFTY
+ /u10145 % GREEK ACROPHONIC ATTIC FIVE HUNDRED
+ /u10146 % GREEK ACROPHONIC ATTIC FIVE THOUSAND
+ /u10147 % GREEK ACROPHONIC ATTIC FIFTY THOUSAND
+ /uni03DB % GREEK SMALL LETTER STIGMA
+ /uni03DB.var % variant; exists only in cbgreek?
% 0x08
-/uni1FBE
-/uni1FBC
-/uni1FCC
-/uni1FFC
-/Alpha
-/Upsilondieresis
-/alpha
-/upsilondieresis
+ /uni1FBE % GREEK PROSGEGRAMMENI
+ /uni1FBC % GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI
+ /uni1FCC % GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI
+ /uni1FFC % GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI
+ /uni0391.alt % cm-unicode has /Alpharightphantomdiaeresis
+ /uni03AB.alt % cm-unicode has /Upsilondiaeresisshifted
+ /uni03B1.alt % cm-unicode has /alpharightphantomdiaeresis
+ /uni03CB.alt % cm-unicode has /upsilondiaeresisshifted
% 0x10
-/uni0316
-/uni0317
-/uni03DF
-/uni03D9
-/uni032E
-/uni03D8
-/uni03DA
-/uni03E0
+ /acutelowmod
+ /gravelowmod
+ /uni03DF % GREEK SMALL LETTER KOPPA
+ /uni03D9 % GREEK SMALL LETTER ARCHAIC KOPPA
+ /brevebelowcmb
+ /uni03D8 % GREEK LETTER ARCHAIC KOPPA
+ /uni03DA.var % GREEK LETTER STIGMA (variant)
+ /Sampigreek
% 0x18
-/Euro
-/perthousand
-/uni0259
-/uni03E1
-/quoteleft
-/quoteright
-/breve
-/macron
+ /Euro
+ /perthousand
+ /schwa
+ /uni03E1 % GREEK SMALL LETTER SAMPI
+ /quoteleft
+ /quoteright
+ /breve
+ /macron
% 0x20
-/uni1FC1
-/exclam
-/dieresis
-/dieresistonos
-/uni1FED
-/percent
-/periodcentered
-/tonos
+ /uni1FC1 % GREEK DIALYTIKA AND PERISPOMENI
+ /exclam
+ /dieresis
+ /dieresistonos
+ /uni1FED % GREEK DIALYTIKA AND VARIA
+ /percent
+ /periodcentered
+ /tonos
% 0x28
-/parenleft
-/parenright
-/asterisk
-/plus
-/comma
-/hyphen
-/period
-/slash
+ /parenleft
+ /parenright
+ /asterisk
+ /plus
+ /comma
+ /hyphen
+ /period
+ /slash
% 0x30
-/zero
-/one
-/two
-/three
-/four
-/five
-/six
-/seven
+ /zero
+ /one
+ /two
+ /three
+ /four
+ /five
+ /six
+ /seven
% 0x38
-/eight
-/nine
-/colon
-/anoteleia
-/uni1FFE
-/equal
-/uni1FBF
-/semicolon
+ /eight
+ /nine
+ /colon
+ /anoteleia
+ /uni1FFE % GREEK DASIA
+ /equal
+ /uni1FBF % GREEK PSILI
+ /questiongreek
% 0x40
-/uni1FDF
-/Alpha
-/Beta
-/uni1FDD
-/Delta
-/Epsilon
-/Phi
-/Gamma
+ /uni1FDF % GREEK DASIA AND PERISPOMENI
+ /Alpha
+ /Beta
+ /uni1FDD % GREEK DASIA AND VARIA
+ /Delta
+ /Epsilon
+ /Phi
+ /Gamma
% 0x48
-/Eta
-/Iota
-/Theta
-/Kappa
-/Lambda
-/Mu
-/Nu
-/Omicron
+ /Eta
+ /Iota
+ /Theta
+ /Kappa
+ /Lambda
+ /Mu
+ /Nu
+ /Omicron
% 0x50
-/Pi
-/Chi
-/Rho
-/Sigma
-/Tau
-/Upsilon
-/uni1FDE
-/Omega
+ /Pi
+ /Chi
+ /Rho
+ /Sigma
+ /Tau
+ /Upsilon
+ /uni1FDE % GREEK DASIA AND OXIA
+ /Omega
% 0x58
-/Xi
-/Psi
-/Zeta
-/bracketleft
-/uni1FCF
-/bracketright
-/uni1FCE
-/uni1FCD
+ /Xi
+ /Psi
+ /Zeta
+ /bracketleft
+ /uni1FCF % GREEK PSILI AND PERISPOMENI
+ /bracketright
+ /uni1FCE % GREEK PSILI AND OXIA
+ /uni1FCD % GREEK PSILI AND VARIA
% 0x60
-/uni1FEF
-/alpha
-/beta
-/sigma1
-/delta
-/epsilon
-/phi
-/gamma
+ /uni1FEF % GREEK VARIA
+ /alpha
+ /beta
+ /sigma1
+ /delta
+ /epsilon
+ /phi
+ /gamma
% 0x68
-/eta
-/iota
-/theta
-/kappa
-/lambda
-/mu
-/nu
-/omicron
+ /eta
+ /iota
+ /theta
+ /kappa
+ /lambda
+ /mu
+ /nu
+ /omicron
% 0x70
-/pi
-/chi
-/rho
-/sigma
-/tau
-/upsilon
-/cwm
-/omega
+ /pi
+ /chi
+ /rho
+ /sigma
+ /tau
+ /upsilon
+ /cwm
+ /omega
% 0x78
-/xi
-/psi
-/zeta
-/guillemotleft
-/uni037A
-/guillemotright
-/uni1FC0
-/emdash
+ /xi
+ /psi
+ /zeta
+ /guillemotleft
+ /ypogegrammeni
+ /guillemotright
+ /perispomenigreekcmb
+ /emdash
% 0x80
-/uni1F70
-/uni1F01
-/uni1F00
-/uni1F03
-/uni1FB2
-/uni1F81
-/uni1F80
-/uni1F83
+ /uni1F70 % GREEK SMALL LETTER ALPHA WITH VARIA
+ /uni1F01 % GREEK SMALL LETTER ALPHA WITH DASIA
+ /uni1F00 % GREEK SMALL LETTER ALPHA WITH PSILI
+ /uni1F03 % GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
+ /uni1FB2 % GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI
+ /uni1F81 % GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
+ /uni1F80 % GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
+ /uni1F83 % GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
% 0x88
-/alphatonos
-/uni1F05
-/uni1F04
-/uni1F02
-/uni1FB4
-/uni1F85
-/uni1F84
-/uni1F82
+ /alphatonos
+ /uni1F05 % GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
+ /uni1F04 % GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
+ /uni1F02 % GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
+ /uni1FB4 % GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
+ /uni1F85 % GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+ /uni1F84 % GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+ /uni1F82 % GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
% 0x90
-/uni1FB6
-/uni1F07
-/uni1F06
-/uni03DD
-/uni1FB7
-/uni1F87
-/uni1F86
-/.notdef
+ /uni1FB6 % GREEK SMALL LETTER ALPHA WITH PERISPOMENI
+ /uni1F07 % GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
+ /uni1F06 % GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
+ /uni03DD % GREEK SMALL LETTER DIGAMMA
+ /uni1FB7 % GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
+ /uni1F87 % GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+ /uni1F86 % GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+ /uni035D % SPACE + COMBINING DOUBLE BREVE?
% 0x98
-/uni1F74
-/uni1F21
-/uni1F20
-/.notdef
-/uni1FC2
-/uni1F91
-/uni1F90
-/.notdef
+ /uni1F74 % GREEK SMALL LETTER ETA WITH VARIA
+ /uni1F21 % GREEK SMALL LETTER ETA WITH DASIA
+ /uni1F20 % GREEK SMALL LETTER ETA WITH PSILI
+ /.notdef
+ /uni1FC2 % GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI
+ /uni1F91 % GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
+ /uni1F90 % GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
+ /.notdef
% 0xA0
-/etatonos
-/uni1F25
-/uni1F24
-/uni1F23
-/uni1FC4
-/uni1F95
-/uni1F94
-/uni1F93
+ /etatonos
+ /uni1F25 % GREEK SMALL LETTER ETA WITH DASIA AND OXIA
+ /uni1F24 % GREEK SMALL LETTER ETA WITH PSILI AND OXIA
+ /uni1F23 % GREEK SMALL LETTER ETA WITH DASIA AND VARIA
+ /uni1FC4 % GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
+ /uni1F95 % GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+ /uni1F94 % GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+ /uni1F93 % GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
% 0xA8
-/uni1FC6
-/uni1F27
-/uni1F26
-/uni1F22
-/uni1FC7
-/uni1F97
-/uni1F96
-/uni1F92
+ /uni1FC6 % GREEK SMALL LETTER ETA WITH PERISPOMENI
+ /uni1F27 % GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
+ /uni1F26 % GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
+ /uni1F22 % GREEK SMALL LETTER ETA WITH PSILI AND VARIA
+ /uni1FC7 % GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
+ /uni1F97 % GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+ /uni1F96 % GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+ /uni1F92 % GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
% 0xB0
-/uni1F7C
-/uni1F61
-/uni1F60
-/uni1F63
-/uni1FF2
-/uni1FA1
-/uni1FA0
-/uni1FA3
+ /uni1F7C % GREEK SMALL LETTER OMEGA WITH VARIA
+ /uni1F61 % GREEK SMALL LETTER OMEGA WITH DASIA
+ /uni1F60 % GREEK SMALL LETTER OMEGA WITH PSILI
+ /uni1F63 % GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
+ /uni1FF2 % GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI
+ /uni1FA1 % GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
+ /uni1FA0 % GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
+ /uni1FA3 % GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
% 0xB8
-/omegatonos
-/uni1F65
-/uni1F64
-/uni1F62
-/uni1FF4
-/uni1FA5
-/uni1FA4
-/uni1FA2
+ /omegatonos
+ /uni1F65 % GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
+ /uni1F64 % GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
+ /uni1F62 % GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
+ /uni1FF4 % GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
+ /uni1FA5 % GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+ /uni1FA4 % GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+ /uni1FA2 % GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
% 0xC0
-/uni1FF6
-/uni1F67
-/uni1F66
-/uni03DC
-/uni1FF7
-/uni1FA7
-/uni1FA6
-/.notdef
+ /uni1FF6 % GREEK SMALL LETTER OMEGA WITH PERISPOMENI
+ /uni1F67 % GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
+ /uni1F66 % GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
+ /Digammagreek
+ /uni1FF7 % GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
+ /uni1FA7 % GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+ /uni1FA6 % GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+ /.notdef
% 0xC8
-/uni1F76
-/uni1F31
-/uni1F30
-/uni1F33
-/uni1F7A
-/uni1F51
-/uni1F50
-/uni1F53
+ /uni1F76 % GREEK SMALL LETTER IOTA WITH VARIA
+ /uni1F31 % GREEK SMALL LETTER IOTA WITH DASIA
+ /uni1F30 % GREEK SMALL LETTER IOTA WITH PSILI
+ /uni1F33 % GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
+ /uni1F7A % GREEK SMALL LETTER UPSILON WITH VARIA
+ /uni1F51 % GREEK SMALL LETTER UPSILON WITH DASIA
+ /uni1F50 % GREEK SMALL LETTER UPSILON WITH PSILI
+ /uni1F53 % GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
% 0xD0
-/iotatonos
-/uni1F35
-/uni1F34
-/uni1F32
-/upsilontonos
-/uni1F55
-/uni1F54
-/uni1F52
+ /iotatonos
+ /uni1F35 % GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
+ /uni1F34 % GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
+ /uni1F32 % GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
+ /upsilontonos
+ /uni1F55 % GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
+ /uni1F54 % GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
+ /uni1F52 % GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
% 0xD8
-/uni1FD6
-/uni1F37
-/uni1F36
-/Iotadieresis
-/uni1FE6
-/uni1F57
-/uni1F56
-/Upsilondieresis
+ /uni1FD6 % GREEK SMALL LETTER IOTA WITH PERISPOMENI
+ /uni1F37 % GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
+ /uni1F36 % GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
+ /Iotadieresis
+ /uni1FE6 % GREEK SMALL LETTER UPSILON WITH PERISPOMENI
+ /uni1F57 % GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
+ /uni1F56 % GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
+ /Upsilondieresis
% 0xE0
-/uni1F72
-/uni1F11
-/uni1F10
-/uni1F13
-/uni1F78
-/uni1F41
-/uni1F40
-/uni1F43
+ /uni1F72 % GREEK SMALL LETTER EPSILON WITH VARIA
+ /uni1F11 % GREEK SMALL LETTER EPSILON WITH DASIA
+ /uni1F10 % GREEK SMALL LETTER EPSILON WITH PSILI
+ /uni1F13 % GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
+ /uni1F78 % GREEK SMALL LETTER OMICRON WITH VARIA
+ /uni1F41 % GREEK SMALL LETTER OMICRON WITH DASIA
+ /uni1F40 % GREEK SMALL LETTER OMICRON WITH PSILI
+ /uni1F43 % GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
% 0xE8
-/epsilontonos
-/uni1F15
-/uni1F14
-/uni1F12
-/omicrontonos
-/uni1F45
-/uni1F44
-/uni1F42
+ /epsilontonos
+ /uni1F15 % GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
+ /uni1F14 % GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
+ /uni1F12 % GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
+ /omicrontonos
+ /uni1F45 % GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
+ /uni1F44 % GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
+ /uni1F42 % GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
% 0xF0
-/iotadieresis
-/uni1FD2
-/iotadieresistonos
-/uni1FD7
-/upsilondieresis
-/uni1FE2
-/upsilondieresistonos
-/uni1FE7
+ /iotadieresis
+ /uni1FD2 % GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
+ /iotadieresistonos
+ /uni1FD7 % GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
+ /upsilondieresis
+ /uni1FE2 % GREEK SMALL LETTER UPSILON WITH DAILYTIKA AND VARIA
+ /upsilondieresistonos
+ /uni1FE7 % GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
% 0xF8
-/uni1FB3
-/uni1FC3
-/uni1FF3
-/uni1FE5
-/uni1FE4
-/.notdef
-/uni0374
-/uni0375
+ /uni1FB3 % GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI
+ /uni1FC3 % GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI
+ /uni1FF3 % GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI
+ /uni1FE5 % GREEK SMALL LETTER RHO WITH DASIA
+ /uni1FE4 % GREEK SMALL LETTER RHO WITH PSILI
+ /cwm
+ /numeralsigngreek
+ /numeralsignlowergreek
] def
-% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
-% LIGKERN parenleft parenleft =: guillemotleft ;
-% LIGKERN parenright parenright =: guillemotright ;
+%
+% UNICODING Delta =: Deltagreek Delta;
+% UNICODING Omega =: Omegagreek Omega;
+% UNICODING mu =: mugreek mu;
+% UNICODING questiongreek =: questiongreek semicolon;
+% UNICODING perispomenigreekcmb =: uni1FC0 perispomenigreekcmb;
+%
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN parenleft parenleft =: guillemotleft ;
+% LIGKERN parenright parenright =: guillemotright ;
% LIGKERN dieresis tonos =: dieresistonos
% LIGKERN tonos dieresis =: dieresistonos
% LIGKERN tonos alpha =: alphatonos ;
% LIGKERN tonos epsilon =: epsilontonos ;
-% LIGKERN tonos eta =: etatonos ;
-% LIGKERN tonos iota =: iotatonos ;
+% LIGKERN tonos eta =: etatonos ;
+% LIGKERN tonos iota =: iotatonos ;
% LIGKERN tonos omicron =: omicrontonos ;
% LIGKERN tonos upsilon =: upsilontonos ;
% LIGKERN tonos omega =: omegatonos ;
% LIGKERN tonos Alpha =: Alphatonos ;
% LIGKERN tonos Epsilon =: Epsilontonos ;
-% LIGKERN tonos Eta =: Etatonos ;
-% LIGKERN tonos Iota =: Iotatonos ;
+% LIGKERN tonos Eta =: Etatonos ;
+% LIGKERN tonos Iota =: Iotatonos ;
% LIGKERN tonos Omicron =: Omicrontonos ;
% LIGKERN tonos Upsilon =: Upsilontonos ;
% LIGKERN tonos Omega =: Omegatonos ;
% LIGKERN dieresis iota =: iotadieresis ; dieresis Iota =: Iotadieresis ;
% LIGKERN dieresis upsilon =: upsilondieresis ;
% LIGKERN dieresis Upsilon =: Upsilondieresis ;
-% LIGKERN dieresistonos iota =: iotadieresistonos ;
+% LIGKERN dieresistonos iota =: iotadieresistonos ;
% LIGKERN dieresistonos upsilon =: upsilondieresistonos ;
% LIGKERN tonos tonos =: quoteright ; uni1FEF uni1FEF =: quoteleft ;
% LIGKERN uni1FBF tonos =: uni1FCE ; uni1FBF uni1FEF =: uni1FCD ;
@@ -323,28 +330,28 @@
% LIGKERN dieresis uni1FEF =: uni1FED ; uni1FEF dieresis =: uni1FED ;
% LIGKERN uni1FCE alpha =: uni1F04 ; uni1FCF alpha =: uni1F06 ; uni1FBF alpha =: uni1F00 ;
% LIGKERN uni1FCD alpha =: uni1F02 ; uni1FDF alpha =: uni1F07 ; uni1FFE alpha =: uni1F01 ;
-% LIGKERN uni1FDE alpha =: uni1F05 ; uni1FEF alpha =: uni1F70 ;
+% LIGKERN uni1FDE alpha =: uni1F05 ; uni1FEF alpha =: uni1F70 ;
% LIGKERN uni1FDD alpha =: uni1F03 ; uni1FC0 alpha =: uni1FB6 ;
-% LIGKERN alpha uni037A =: uni1FB3 ; alphatonos uni037A =: uni1FB4 ;
-% LIGKERN uni1F00 uni037A =: uni1F80 ; uni1F01 uni037A =: uni1F81 ;
-% LIGKERN uni1F02 uni037A =: uni1F82 ; uni1F03 uni037A =: uni1F83 ;
-% LIGKERN uni1F04 uni037A =: uni1F84 ; uni1F05 uni037A =: uni1F85 ;
-% LIGKERN uni1F06 uni037A =: uni1F86 ; uni1F07 uni037A =: uni1F87 ;
-% LIGKERN uni1F70 uni037A =: uni1FB2 ; uni1FB6 uni037A =: uni1FB7 ;
+% LIGKERN alpha ypogegrammeni =: uni1FB3 ; alphatonos ypogegrammeni =: uni1FB4 ;
+% LIGKERN uni1F00 ypogegrammeni =: uni1F80 ; uni1F01 ypogegrammeni =: uni1F81 ;
+% LIGKERN uni1F02 ypogegrammeni =: uni1F82 ; uni1F03 ypogegrammeni =: uni1F83 ;
+% LIGKERN uni1F04 ypogegrammeni =: uni1F84 ; uni1F05 ypogegrammeni =: uni1F85 ;
+% LIGKERN uni1F06 ypogegrammeni =: uni1F86 ; uni1F07 ypogegrammeni =: uni1F87 ;
+% LIGKERN uni1F70 ypogegrammeni =: uni1FB2 ; uni1FB6 ypogegrammeni =: uni1FB7 ;
% LIGKERN uni1FCE epsilon =: uni1F14 ; uni1FBF epsilon =: uni1F10 ;
% LIGKERN uni1FCD epsilon =: uni1F12 ; uni1FFE epsilon =: uni1F11 ;
-% LIGKERN uni1FDE epsilon =: uni1F15 ; uni1FEF epsilon =: uni1F72 ;
+% LIGKERN uni1FDE epsilon =: uni1F15 ; uni1FEF epsilon =: uni1F72 ;
% LIGKERN uni1FDD epsilon =: uni1F13 ;
% LIGKERN uni1FCE eta =: uni1F24 ; uni1FCF eta =: uni1F26 ; uni1FBF eta =: uni1F20 ;
% LIGKERN uni1FCD eta =: uni1F22 ; uni1FDF eta =: uni1F27 ; uni1FFE eta =: uni1F21 ;
-% LIGKERN uni1FDE eta =: uni1F25 ; uni1FEF eta =: uni1F74 ;
+% LIGKERN uni1FDE eta =: uni1F25 ; uni1FEF eta =: uni1F74 ;
% LIGKERN uni1FDD eta =: uni1F23 ; uni1FC0 eta =: uni1FC6 ;
-% LIGKERN eta uni037A =: uni1FC3 ; etatonos uni037A =: uni1FC4 ;
-% LIGKERN uni1F20 uni037A =: uni1F90 ; uni1F21 uni037A =: uni1F91 ;
-% LIGKERN uni1F22 uni037A =: uni1F92 ; uni1F23 uni037A =: uni1F93 ;
-% LIGKERN uni1F24 uni037A =: uni1F94 ; uni1F25 uni037A =: uni1F95 ;
-% LIGKERN uni1F26 uni037A =: uni1F96 ; uni1F27 uni037A =: uni1F97 ;
-% LIGKERN uni1F74 uni037A =: uni1FC2 ; uni1FC6 uni037A =: uni1FC7 ;
+% LIGKERN eta ypogegrammeni =: uni1FC3 ; etatonos ypogegrammeni =: uni1FC4 ;
+% LIGKERN uni1F20 ypogegrammeni =: uni1F90 ; uni1F21 ypogegrammeni =: uni1F91 ;
+% LIGKERN uni1F22 ypogegrammeni =: uni1F92 ; uni1F23 ypogegrammeni =: uni1F93 ;
+% LIGKERN uni1F24 ypogegrammeni =: uni1F94 ; uni1F25 ypogegrammeni =: uni1F95 ;
+% LIGKERN uni1F26 ypogegrammeni =: uni1F96 ; uni1F27 ypogegrammeni =: uni1F97 ;
+% LIGKERN uni1F74 ypogegrammeni =: uni1FC2 ; uni1FC6 ypogegrammeni =: uni1FC7 ;
% LIGKERN uni1FCE iota =: uni1F34 ; uni1FBF iota =: uni1F30 ;
% LIGKERN uni1FCD iota =: uni1F32 ; uni1FFE iota =: uni1F31 ;
% LIGKERN uni1FDE iota =: uni1F35 ; uni1FEF iota =: uni1F76 ;
@@ -353,7 +360,7 @@
% LIGKERN uni1FCF iota =: uni1F36 ; uni1FDF iota =: uni1F37 ;
% LIGKERN uni1FCE omicron =: uni1F44 ; uni1FBF omicron =: uni1F40 ;
% LIGKERN uni1FCD omicron =: uni1F42 ; uni1FFE omicron =: uni1F41 ;
-% LIGKERN uni1FDE omicron =: uni1F45 ; uni1FEF omicron =: uni1F78 ;
+% LIGKERN uni1FDE omicron =: uni1F45 ; uni1FEF omicron =: uni1F78 ;
% LIGKERN uni1FDD omicron =: uni1F43 ;
% LIGKERN uni1FCE upsilon =: uni1F54 ; uni1FBF upsilon =: uni1F50 ;
% LIGKERN uni1FCD upsilon =: uni1F52 ; uni1FFE upsilon =: uni1F51 ;
@@ -363,18 +370,18 @@
% LIGKERN uni1FCF upsilon =: uni1F56 ; uni1FDF upsilon =: uni1F57 ;
% LIGKERN uni1FCE omega =: uni1F64 ; uni1FCF omega =: uni1F66 ; uni1FBF omega =: uni1F60 ;
% LIGKERN uni1FCD omega =: uni1F62 ; uni1FDF omega =: uni1F67 ; uni1FFE omega =: uni1F61 ;
-% LIGKERN uni1FDE omega =: uni1F65 ; uni1FEF omega =: uni1F7C ;
+% LIGKERN uni1FDE omega =: uni1F65 ; uni1FEF omega =: uni1F7C ;
% LIGKERN uni1FDD omega =: uni1F63 ; uni1FC0 omega =: uni1FF6 ;
-% LIGKERN omega uni037A =: uni1FF3 ; omegatonos uni037A =: uni1FF4 ;
-% LIGKERN uni1F60 uni037A =: uni1FA0 ; uni1F61 uni037A =: uni1FA1 ;
-% LIGKERN uni1F62 uni037A =: uni1FA2 ; uni1F63 uni037A =: uni1FA3 ;
-% LIGKERN uni1F64 uni037A =: uni1FA4 ; uni1F65 uni037A =: uni1FA5 ;
-% LIGKERN uni1F66 uni037A =: uni1FA6 ; uni1F67 uni037A =: uni1FA7 ;
-% LIGKERN uni1F7C uni037A =: uni1FF2 ; uni1FF6 uni037A =: uni1FF7 ;
+% LIGKERN omega ypogegrammeni =: uni1FF3 ; omegatonos ypogegrammeni =: uni1FF4 ;
+% LIGKERN uni1F60 ypogegrammeni =: uni1FA0 ; uni1F61 ypogegrammeni =: uni1FA1 ;
+% LIGKERN uni1F62 ypogegrammeni =: uni1FA2 ; uni1F63 ypogegrammeni =: uni1FA3 ;
+% LIGKERN uni1F64 ypogegrammeni =: uni1FA4 ; uni1F65 ypogegrammeni =: uni1FA5 ;
+% LIGKERN uni1F66 ypogegrammeni =: uni1FA6 ; uni1F67 ypogegrammeni =: uni1FA7 ;
+% LIGKERN uni1F7C ypogegrammeni =: uni1FF2 ; uni1FF6 ypogegrammeni =: uni1FF7 ;
% LIGKERN uni1FBF rho =: uni1FE4 ; uni1FFE rho =: uni1FE5 ;
% LIGKERN || = 01 ; sigma || =:| sigma1 ; sigma guillemotright =:| sigma1 ;
% LIGKERN sigma parenright =:| sigma1 ; sigma period =:| sigma1 ;
-% LIGKERN sigma comma =:| sigma1 ; sigma exclam =:| sigma1 ;
+% LIGKERN sigma comma =:| sigma1 ; sigma exclam =:| sigma1 ;
% LIGKERN sigma semicolon =:| sigma1 ; sigma anoteleia =:| sigma1 ;
% LIGKERN Alpha uni1FBE =: uni1FBC ;
% LIGKERN Eta uni1FBE =: uni1FCC ;
diff --git a/fonts/utilities/fontools/share/fontools_ly1.enc b/fonts/utilities/fontools/share/fontools_ly1.enc
index 70133cc9c0..45ab6e9142 100644
--- a/fonts/utilities/fontools/share/fontools_ly1.enc
+++ b/fonts/utilities/fontools/share/fontools_ly1.enc
@@ -2,293 +2,293 @@
% CODINGSCHEME TEX TYPEWRITER AND WINDOWS ANSI
/otftotfmLY1Encoding [
% 0x00
-/.notdef
-/Euro
-/.notdef
-/.notdef
-/fraction
-/dotaccent
-/hungarumlaut
-/ogonek
+ /.notdef
+ /Euro
+ /.notdef
+ /.notdef
+ /fraction
+ /dotaccent
+ /hungarumlaut
+ /ogonek
% 0x08
-/.notdef
-/.notdef
-/cwm
-/ff
-/fi
-/fl
-/ffi
-/ffl
+ /fl
+ /.notdef
+ /cwm
+ /ff
+ /fi
+ /.notdef
+ /ffi
+ /ffl
% 0x10
-/dotlessi
-/dotlessj
-/grave
-/acute
-/caron
-/breve
-/macron
-/ring
+ /dotlessi
+ /dotlessj
+ /grave
+ /acute
+ /caron
+ /breve
+ /macron
+ /ring
% 0x18
-/cedilla
-/germandbls
-/ae
-/oe
-/oslash
-/AE
-/OE
-/Oslash
+ /cedilla
+ /germandbls
+ /ae
+ /oe
+ /oslash
+ /AE
+ /OE
+ /Oslash
% 0x20
-/space
-/exclam
-/quotedbl
-/numbersign
-/dollar
-/percent
-/ampersand
-/quoteright
+ /space
+ /exclam
+ /quotedbl
+ /numbersign
+ /dollar
+ /percent
+ /ampersand
+ /quoteright
% 0x28
-/parenleft
-/parenright
-/asterisk
-/plus
-/comma
-/hyphen
-/period
-/slash
+ /parenleft
+ /parenright
+ /asterisk
+ /plus
+ /comma
+ /hyphen
+ /period
+ /slash
% 0x30
-/zero
-/one
-/two
-/three
-/four
-/five
-/six
-/seven
+ /zero
+ /one
+ /two
+ /three
+ /four
+ /five
+ /six
+ /seven
% 0x38
-/eight
-/nine
-/colon
-/semicolon
-/less
-/equal
-/greater
-/question
+ /eight
+ /nine
+ /colon
+ /semicolon
+ /less
+ /equal
+ /greater
+ /question
% 0x40
-/at
-/A
-/B
-/C
-/D
-/E
-/F
-/G
+ /at
+ /A
+ /B
+ /C
+ /D
+ /E
+ /F
+ /G
% 0x48
-/H
-/I
-/J
-/K
-/L
-/M
-/N
-/O
+ /H
+ /I
+ /J
+ /K
+ /L
+ /M
+ /N
+ /O
% 0x50
-/P
-/Q
-/R
-/S
-/T
-/U
-/V
-/W
+ /P
+ /Q
+ /R
+ /S
+ /T
+ /U
+ /V
+ /W
% 0x58
-/X
-/Y
-/Z
-/bracketleft
-/backslash
-/bracketright
-/circumflex
-/underscore
+ /X
+ /Y
+ /Z
+ /bracketleft
+ /backslash
+ /bracketright
+ /circumflex
+ /underscore
% 0x60
-/quoteleft
-/a
-/b
-/c
-/d
-/e
-/f
-/g
+ /quoteleft
+ /a
+ /b
+ /c
+ /d
+ /e
+ /f
+ /g
% 0x68
-/h
-/i
-/j
-/k
-/l
-/m
-/n
-/o
+ /h
+ /i
+ /j
+ /k
+ /l
+ /m
+ /n
+ /o
% 0x70
-/p
-/q
-/r
-/s
-/t
-/u
-/v
-/w
+ /p
+ /q
+ /r
+ /s
+ /t
+ /u
+ /v
+ /w
% 0x78
-/x
-/y
-/z
-/braceleft
-/bar
-/braceright
-/tilde
-/dieresis
+ /x
+ /y
+ /z
+ /braceleft
+ /bar
+ /braceright
+ /tilde
+ /dieresis
% 0x80
-/Lslash
-/quotesingle
-/quotesinglbase
-/florin
-/quotedblbase
-/ellipsis
-/dagger
-/daggerdbl
+ /Lslash
+ /quotesingle
+ /quotesinglbase
+ /florin
+ /quotedblbase
+ /ellipsis
+ /dagger
+ /daggerdbl
% 0x88
-/circumflex
-/perthousand
-/Scaron
-/guilsinglleft
-/OE
-/Zcaron
-/asciicircum
-/minus
+ /circumflex
+ /perthousand
+ /Scaron
+ /guilsinglleft
+ /OE
+ /Zcaron
+ /asciicircum
+ /minus
% 0x90
-/lslash
-/quoteleft
-/quoteright
-/quotedblleft
-/quotedblright
-/bullet
-/endash
-/emdash
+ /lslash
+ /quoteleft
+ /quoteright
+ /quotedblleft
+ /quotedblright
+ /bullet
+ /endash
+ /emdash
% 0x98
-/tilde
-/trademark
-/scaron
-/guilsinglright
-/oe
-/zcaron
-/asciitilde
-/Ydieresis
+ /tilde
+ /trademark
+ /scaron
+ /guilsinglright
+ /oe
+ /zcaron
+ /asciitilde
+ /Ydieresis
% 0xA0
-/cwm
-/exclamdown
-/cent
-/sterling
-/currency
-/yen
-/brokenbar
-/section
+ /cwm
+ /exclamdown
+ /cent
+ /sterling
+ /currency
+ /yen
+ /brokenbar
+ /section
% 0xA8
-/dieresis
-/copyright
-/ordfeminine
-/guillemotleft
-/logicalnot
-/sfthyphen
-/registered
-/macron
+ /dieresis
+ /copyright
+ /ordfeminine
+ /guillemotleft
+ /logicalnot
+ /sfthyphen
+ /registered
+ /macron
% 0xB0
-/degree
-/plusminus
-/twosuperior
-/threesuperior
-/acute
-/mu
-/paragraph
-/periodcentered
+ /degree
+ /plusminus
+ /twosuperior
+ /threesuperior
+ /acute
+ /mu
+ /paragraph
+ /periodcentered
% 0xB8
-/cedilla
-/onesuperior
-/ordmasculine
-/guillemotright
-/onequarter
-/onehalf
-/threequarters
-/questiondown
+ /cedilla
+ /onesuperior
+ /ordmasculine
+ /guillemotright
+ /onequarter
+ /onehalf
+ /threequarters
+ /questiondown
% 0xC0
-/Agrave
-/Aacute
-/Acircumflex
-/Atilde
-/Adieresis
-/Aring
-/AE
-/Ccedilla
+ /Agrave
+ /Aacute
+ /Acircumflex
+ /Atilde
+ /Adieresis
+ /Aring
+ /AE
+ /Ccedilla
% 0xC8
-/Egrave
-/Eacute
-/Ecircumflex
-/Edieresis
-/Igrave
-/Iacute
-/Icircumflex
-/Idieresis
+ /Egrave
+ /Eacute
+ /Ecircumflex
+ /Edieresis
+ /Igrave
+ /Iacute
+ /Icircumflex
+ /Idieresis
% 0xD0
-/Eth
-/Ntilde
-/Ograve
-/Oacute
-/Ocircumflex
-/Otilde
-/Odieresis
-/multiply
+ /Eth
+ /Ntilde
+ /Ograve
+ /Oacute
+ /Ocircumflex
+ /Otilde
+ /Odieresis
+ /multiply
% 0xD8
-/Oslash
-/Ugrave
-/Uacute
-/Ucircumflex
-/Udieresis
-/Yacute
-/Thorn
-/germandbls
+ /Oslash
+ /Ugrave
+ /Uacute
+ /Ucircumflex
+ /Udieresis
+ /Yacute
+ /Thorn
+ /germandbls
% 0xE0
-/agrave
-/aacute
-/acircumflex
-/atilde
-/adieresis
-/aring
-/ae
-/ccedilla
+ /agrave
+ /aacute
+ /acircumflex
+ /atilde
+ /adieresis
+ /aring
+ /ae
+ /ccedilla
% 0xE8
-/egrave
-/eacute
-/ecircumflex
-/edieresis
-/igrave
-/iacute
-/icircumflex
-/idieresis
+ /egrave
+ /eacute
+ /ecircumflex
+ /edieresis
+ /igrave
+ /iacute
+ /icircumflex
+ /idieresis
% 0xF0
-/eth
-/ntilde
-/ograve
-/oacute
-/ocircumflex
-/otilde
-/odieresis
-/divide
+ /eth
+ /ntilde
+ /ograve
+ /oacute
+ /ocircumflex
+ /otilde
+ /odieresis
+ /divide
% 0xF8
-/oslash
-/ugrave
-/uacute
-/ucircumflex
-/udieresis
-/yacute
-/thorn
-/ydieresis
+ /oslash
+ /ugrave
+ /uacute
+ /ucircumflex
+ /udieresis
+ /yacute
+ /thorn
+ /ydieresis
] def
%
% LIGKERN question quoteleft =: questiondown;
@@ -297,7 +297,7 @@
% LIGKERN endash hyphen =: emdash;
% LIGKERN quoteleft quoteleft =: quotedblleft;
% LIGKERN quoteright quoteright =: quotedblright;
-% LIGKERN comma comma =: quotedblbase;
+% LIGKERN comma comma =: quotedblbase;
% LIGKERN less less =: guillemotleft;
% LIGKERN greater greater =: guillemotright;
%
diff --git a/fonts/utilities/fontools/share/fontools_oml.enc b/fonts/utilities/fontools/share/fontools_oml.enc
index d67d3460e6..8db5c77b6b 100644
--- a/fonts/utilities/fontools/share/fontools_oml.enc
+++ b/fonts/utilities/fontools/share/fontools_oml.enc
@@ -2,291 +2,303 @@
% CODINGSCHEME TEX MATH ITALIC
/otftotfmOMLEncoding [
% 0x00
-/Gamma
-/Delta
-/Theta
-/Lambda
-/Xi
-/Pi
-/Sigma
-/Upsilon
+ /Gamma
+ /Delta
+ /Theta
+ /Lambda
+ /Xi
+ /Pi
+ /Sigma
+ /Upsilon
% 0x08
-/Phi
-/Psi
-/Omega
-/alpha
-/beta
-/gamma
-/delta
-/epsilon1
+ /Phi
+ /Psi
+ /Omega
+ /alpha
+ /beta
+ /gamma
+ /delta
+ /epsilon1
% 0x10
-/zeta
-/eta
-/theta
-/iota
-/kappa
-/lambda
-/mu
-/nu
+ /zeta
+ /eta
+ /theta
+ /iota
+ /kappa
+ /lambda
+ /mu
+ /nu
% 0x18
-/xi
-/pi
-/rho
-/sigma
-/tau
-/upsilon
-/phi
-/chi
+ /xi
+ /pi
+ /rho
+ /sigma
+ /tau
+ /upsilon
+ /phi
+ /chi
% 0x20
-/psi
-/omega
-/epsilon
-/theta1
-/pi1
-/rho1
-/sigma1
-/phi1
+ /psi
+ /omega
+ /epsilon
+ /theta1
+ /pi1
+ /rho1
+ /sigma1
+ /phi1
% 0x28
-/harpoonleftup
-/harpoonleftdown
-/harpoonrightup
-/harpoonrightdown
-/hookrightchar
-/hookleftchar
-/triangleright
-/triangleleft
+ /harpoonleftup
+ /harpoonleftdown
+ /harpoonrightup
+ /harpoonrightdown
+ /hookrightchar
+ /hookleftchar
+ /triangleright
+ /triangleleft
% 0x30
-/zero
-/one
-/two
-/three
-/four
-/five
-/six
-/seven
+ /zero
+ /one
+ /two
+ /three
+ /four
+ /five
+ /six
+ /seven
% 0x38
-/eight
-/nine
-/period
-/comma
-/less
-/slash
-/greater
-/star
+ /eight
+ /nine
+ /period
+ /comma
+ /less
+ /slash
+ /greater
+ /star
% 0x40
-/partialdiff
-/A
-/B
-/C
-/D
-/E
-/F
-/G
+ /partialdiff
+ /A
+ /B
+ /C
+ /D
+ /E
+ /F
+ /G
% 0x48
-/H
-/I
-/J
-/K
-/L
-/M
-/N
-/O
+ /H
+ /I
+ /J
+ /K
+ /L
+ /M
+ /N
+ /O
% 0x50
-/P
-/Q
-/R
-/S
-/T
-/U
-/V
-/W
+ /P
+ /Q
+ /R
+ /S
+ /T
+ /U
+ /V
+ /W
% 0x58
-/X
-/Y
-/Z
-/flat
-/natural
-/sharp
-/slurbelow
-/slurabove
+ /X
+ /Y
+ /Z
+ /flat
+ /natural
+ /sharp
+ /slurbelow
+ /slurabove
% 0x60
-/lscript
-/a
-/b
-/c
-/d
-/e
-/f
-/g
+ /lscript
+ /a
+ /b
+ /c
+ /d
+ /e
+ /f
+ /g
% 0x68
-/h
-/i
-/j
-/k
-/l
-/m
-/n
-/o
+ /h
+ /i
+ /j
+ /k
+ /l
+ /m
+ /n
+ /o
% 0x70
-/p
-/q
-/r
-/s
-/t
-/u
-/v
-/w
+ /p
+ /q
+ /r
+ /s
+ /t
+ /u
+ /v
+ /w
% 0x78
-/x
-/y
-/z
-/dotlessi
-/dotlessj
-/weierstrass
-/vector
-/tie
+ /x
+ /y
+ /z
+ /dotlessi
+ /dotlessj
+ /weierstrass
+ /vector
+ /tie
% 0x80
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0x88
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0x90
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0x98
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xA0
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xA8
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xB0
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xB8
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xC0
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xC8
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xD0
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xD8
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xE0
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xE8
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xF0
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xF8
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
] def
+%
+% UNICODING Delta =: Deltagreek Delta;
+% UNICODING Omega =: Omegagreek Omega;
+% UNICODING mu =: mugreek mu;
+% UNICODING harpoonleftup =: harpoonleftup arrowlefttophalf;;
+% UNICODING harpoonleftdown =: harpoonleftdown arrowleftbothalf
+% UNICODING harpoonrightup =: harpoonrightup arrowrighttophalf;
+% UNICODING harpoonrightdown =: harpoonrightdown arrowrightbothalf;
+% UNICODING hookrightchar =: hookrightchar arrowhookleft;
+% UNICODING hookleftchar =: hookleftchar arrowhookright;
+% UNICODING star =: star asteriskcentered;
+% UNICODING tie =: tie uni0311;
diff --git a/fonts/utilities/fontools/share/fontools_ot1.enc b/fonts/utilities/fontools/share/fontools_ot1.enc
index 59bf94c87c..0cb0d1901d 100644
--- a/fonts/utilities/fontools/share/fontools_ot1.enc
+++ b/fonts/utilities/fontools/share/fontools_ot1.enc
@@ -2,301 +2,307 @@
% CODINGSCHEME TEX TEXT
/otftotfmOT1Encoding [
% 0x00
-/Gamma
-/Delta
-/Theta
-/Lambda
-/Xi
-/Pi
-/Sigma
-/Upsilon
+ /Gamma
+ /Delta
+ /Theta
+ /Lambda
+ /Xi
+ /Pi
+ /Sigma
+ /Upsilon
% 0x08
-/Phi
-/Psi
-/Omega
-/ff
-/fi
-/fl
-/ffi
-/ffl
+ /Phi
+ /Psi
+ /Omega
+ /ff
+ /fi
+ /fl
+ /ffi
+ /ffl
% 0x10
-/dotlessi
-/dotlessj
-/grave
-/acute
-/caron
-/breve
-/macron
-/ring
+ /dotlessi
+ /dotlessj
+ /grave
+ /acute
+ /caron
+ /breve
+ /macron
+ /ring
% 0x18
-/cedilla
-/germandbls
-/ae
-/oe
-/oslash
-/AE
-/OE
-/Oslash
+ /cedilla
+ /germandbls
+ /ae
+ /oe
+ /oslash
+ /AE
+ /OE
+ /Oslash
% 0x20
-/uni2423
-/exclam
-/quotedblright
-/numbersign
-/dollar
-/percent
-/ampersand
-/quoteright
+ /lslashslash
+ /exclam
+ /quotedblright
+ /numbersign
+ /dollar
+ /percent
+ /ampersand
+ /quoteright
% 0x28
-/parenleft
-/parenright
-/asterisk
-/plus
-/comma
-/hyphen
-/period
-/slash
+ /parenleft
+ /parenright
+ /asterisk
+ /plus
+ /comma
+ /hyphen
+ /period
+ /slash
% 0x30
-/zero
-/one
-/two
-/three
-/four
-/five
-/six
-/seven
+ /zero
+ /one
+ /two
+ /three
+ /four
+ /five
+ /six
+ /seven
% 0x38
-/eight
-/nine
-/colon
-/semicolon
-/exclamdown
-/equal
-/questiondown
-/question
+ /eight
+ /nine
+ /colon
+ /semicolon
+ /exclamdown
+ /equal
+ /questiondown
+ /question
% 0x40
-/at
-/A
-/B
-/C
-/D
-/E
-/F
-/G
+ /at
+ /A
+ /B
+ /C
+ /D
+ /E
+ /F
+ /G
% 0x48
-/H
-/I
-/J
-/K
-/L
-/M
-/N
-/O
+ /H
+ /I
+ /J
+ /K
+ /L
+ /M
+ /N
+ /O
% 0x50
-/P
-/Q
-/R
-/S
-/T
-/U
-/V
-/W
+ /P
+ /Q
+ /R
+ /S
+ /T
+ /U
+ /V
+ /W
% 0x58
-/X
-/Y
-/Z
-/bracketleft
-/quotedblleft
-/bracketright
-/circumflex
-/dotaccent
+ /X
+ /Y
+ /Z
+ /bracketleft
+ /quotedblleft
+ /bracketright
+ /circumflex
+ /dotaccent
% 0x60
-/quoteleft
-/a
-/b
-/c
-/d
-/e
-/f
-/g
+ /quoteleft
+ /a
+ /b
+ /c
+ /d
+ /e
+ /f
+ /g
% 0x68
-/h
-/i
-/j
-/k
-/l
-/m
-/n
-/o
+ /h
+ /i
+ /j
+ /k
+ /l
+ /m
+ /n
+ /o
% 0x70
-/p
-/q
-/r
-/s
-/t
-/u
-/v
-/w
+ /p
+ /q
+ /r
+ /s
+ /t
+ /u
+ /v
+ /w
% 0x78
-/x
-/y
-/z
-/endash
-/emdash
-/hungarumlaut
-/tilde
-/dieresis
+ /x
+ /y
+ /z
+ /endash
+ /emdash
+ /hungarumlaut
+ /tilde
+ /dieresis
% 0x80
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0x88
-/.notdef
-/.notdef
-/Lslash
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /Lslash
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0x90
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0x98
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xA0
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xA8
-/.notdef
-/.notdef
-/lslash
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /lslash
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xB0
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xB8
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xC0
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xC8
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xD0
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xD8
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xE0
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xE8
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xF0
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xF8
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
] def
%
+% UNICODING Delta =: Deltagreek Delta;
+% UNICODING Omega =: Omegagreek Omega;
+% UNICODING lslashslash =: lslashslash solidusshortoverlaycmb;
+%
% LIGKERN question quoteleft =: questiondown;
% LIGKERN exclam quoteleft =: exclamdown;
% LIGKERN hyphen hyphen =: endash;
% LIGKERN endash hyphen =: emdash;
% LIGKERN quoteleft quoteleft =: quotedblleft;
% LIGKERN quoteright quoteright =: quotedblright;
+% LIGKERN lslashslash L =: Lslash;
+% LIGKERN lslashslash l =: lslash;
%
% LIGKERN || = 32;
%
diff --git a/fonts/utilities/fontools/share/fontools_qx.enc b/fonts/utilities/fontools/share/fontools_qx.enc
new file mode 100644
index 0000000000..b62b305dfa
--- /dev/null
+++ b/fonts/utilities/fontools/share/fontools_qx.enc
@@ -0,0 +1,310 @@
+% A version of the QX encoding, intended for use with otftotfm.
+% Based on the file qx.enc from the dvips package
+/otftotfmQXEncoding [
+% 0x00
+ /alpha
+ /Delta
+ /beta
+ /delta
+ /pi
+ /Pi
+ /Sigma
+ /mu
+% 0x08
+ /ellipsis
+ /f_k
+ /Omega
+ /ff
+ /fi
+ /fl
+ /ffi
+ /ffl
+% 0x10
+ /dotlessi
+ /dotlessj
+ /grave
+ /acute
+ /caron
+ /breve
+ /macron
+ /ring
+% 0x18
+ /cedilla
+ /germandbls
+ /ae
+ /oe
+ /oslash
+ /AE
+ /OE
+ /Oslash
+% 0x20
+ /space
+ /exclam
+ /quotedblright
+ /numbersign
+ /dollar
+ /percent
+ /ampersand
+ /quoteright
+% 0x28
+ /parenleft
+ /parenright
+ /asterisk
+ /plus
+ /comma
+ /hyphen
+ /period
+ /slash
+% 0x30
+ /zero
+ /one
+ /two
+ /three
+ /four
+ /five
+ /six
+ /seven
+% 0x38
+ /eight
+ /nine
+ /colon
+ /semicolon
+ /exclamdown
+ /equal
+ /questiondown
+ /question
+% 0x40
+ /at
+ /A
+ /B
+ /C
+ /D
+ /E
+ /F
+ /G
+% 0x48
+ /H
+ /I
+ /J
+ /K
+ /L
+ /M
+ /N
+ /O
+% 0x50
+ /P
+ /Q
+ /R
+ /S
+ /T
+ /U
+ /V
+ /W
+% 0x58
+ /X
+ /Y
+ /Z
+ /bracketleft
+ /quotedblleft
+ /bracketright
+ /circumflex
+ /dotaccent
+% 0x60
+ /quoteleft
+ /a
+ /b
+ /c
+ /d
+ /e
+ /f
+ /g
+% 0x68
+ /h
+ /i
+ /j
+ /k
+ /l
+ /m
+ /n
+ /o
+% 0x70
+ /p
+ /q
+ /r
+ /s
+ /t
+ /u
+ /v
+ /w
+% 0x78
+ /x
+ /y
+ /z
+ /endash
+ /emdash
+ /hungarumlaut
+ /tilde
+ /dieresis
+% 0x80
+ /Euro
+ /Aogonek
+ /Cacute
+ /greater
+ /greaterequal
+ /approxequal
+ /Eogonek
+ /Iogonek
+% 0x88
+ /less
+ /lessequal
+ /Lslash
+ /Nacute
+ /asciitilde
+ /asciicircum
+ /ell
+ /dagger
+% 0x90
+ /daggerdbl
+ /Sacute
+ /Scaron
+ /Scommaaccent
+ /degree
+ /Tcommaaccent
+ /ogonek
+ /Uogonek
+% 0x98
+ /Ydieresis
+ /Zacute
+ /Zcaron
+ /Zdotaccent
+ /IJ
+ /braceleft
+ /braceright
+ /section
+% 0xA0
+ /.notdef
+ /aogonek
+ /cacute
+ /registered
+ /copyright
+ /divide
+ /eogonek
+ /iogonek
+% 0xA8
+ /minus
+ /multiply
+ /lslash
+ /nacute
+ /plusminus
+ /infinity
+ /guillemotleft
+ /guillemotright
+% 0xB0
+ /paragraph
+ /sacute
+ /scaron
+ /scommaaccent
+ /bullet
+ /tcommaaccent
+ /threequartersemdash
+ /uogonek
+% 0xB8
+ /ydieresis
+ /zacute
+ /zcaron
+ /zdotaccent
+ /ij
+ /periodcentered
+ /quotedbl
+ /quotesingle
+% 0xC0
+ /Agrave
+ /Aacute
+ /Acircumflex
+ /Atilde
+ /Adieresis
+ /Aring
+ /backslash
+ /Ccedilla
+% 0xC8
+ /Egrave
+ /Eacute
+ /Ecircumflex
+ /Edieresis
+ /Igrave
+ /Iacute
+ /Icircumflex
+ /Idieresis
+% 0xD0
+ /Eth
+ /Ntilde
+ /Ograve
+ /Oacute
+ /Ocircumflex
+ /Otilde
+ /Odieresis
+ /currency
+% 0xD8
+ /perthousand
+ /Ugrave
+ /Uacute
+ /Ucircumflex
+ /Udieresis
+ /Yacute
+ /Thorn
+ /bar
+% 0xE0
+ /agrave
+ /aacute
+ /acircumflex
+ /atilde
+ /adieresis
+ /aring
+ /underscore
+ /ccedilla
+% 0xE8
+ /egrave
+ /eacute
+ /ecircumflex
+ /edieresis
+ /igrave
+ /iacute
+ /icircumflex
+ /idieresis
+% 0xF0
+ /eth
+ /ntilde
+ /ograve
+ /oacute
+ /ocircumflex
+ /otilde
+ /odieresis
+ /anglearc
+% 0xF8
+ /diameter
+ /ugrave
+ /uacute
+ /ucircumflex
+ /udieresis
+ /yacute
+ /thorn
+ /quotedblbase
+] def
+%
+% UNICODING Delta =: Deltagreek Delta;
+% UNICODING Omega =: Omegagreek Omega;
+% UNICODING mu =: mugreek mu;
+%
+% LIGKERN question quoteleft =: questiondown;
+% LIGKERN exclam quoteleft =: exclamdown;
+% LIGKERN hyphen hyphen =: endash;
+% LIGKERN endash hyphen =: emdash;
+% LIGKERN quoteleft quoteleft =: quotedblleft;
+% LIGKERN quoteright quoteright =: quotedblright;
+% LIGKERN comma comma =: quotedblbase;
+% LIGKERN less less =: guillemotleft;
+% LIGKERN greater greater =: guillemotright;
+%
+% LIGKERN || = 32;
+%
+% UNICODING ff =: ; fi =: ; fl =: ; ffi =: ; ffl =: ;
diff --git a/fonts/utilities/fontools/share/fontools_t1.enc b/fonts/utilities/fontools/share/fontools_t1.enc
index f6f9e412a3..59caada7de 100644
--- a/fonts/utilities/fontools/share/fontools_t1.enc
+++ b/fonts/utilities/fontools/share/fontools_t1.enc
@@ -2,295 +2,299 @@
% CODINGSCHEME EXTENDED TEX FONT ENCODING - LATIN
/otftotfmT1Encoding [
% 0x00
-/grave
-/acute
-/circumflex
-/tilde
-/dieresis
-/hungarumlaut
-/ring
-/caron
+ /grave
+ /acute
+ /circumflex
+ /tilde
+ /dieresis
+ /hungarumlaut
+ /ring
+ /caron
% 0x08
-/breve
-/macron
-/dotaccent
-/cedilla
-/ogonek
-/quotesinglbase
-/guilsinglleft
-/guilsinglright
+ /breve
+ /macron
+ /dotaccent
+ /cedilla
+ /ogonek
+ /quotesinglbase
+ /guilsinglleft
+ /guilsinglright
% 0x10
-/quotedblleft
-/quotedblright
-/quotedblbase
-/guillemotleft
-/guillemotright
-/endash
-/emdash
-/cwm
+ /quotedblleft
+ /quotedblright
+ /quotedblbase
+ /guillemotleft
+ /guillemotright
+ /endash
+ /emdash
+ /cwm
% 0x18
-/perthousandzero
-/dotlessi
-/dotlessj
-/ff
-/fi
-/fl
-/ffi
-/ffl
+ /perthousandzero
+ /dotlessi
+ /dotlessj
+ /ff
+ /fi
+ /fl
+ /ffi
+ /ffl
% 0x20
-/uni2423
-/exclam
-/quotedbl
-/numbersign
-/dollar
-/percent
-/ampersand
-/quoteright
+ /visualspace
+ /exclam
+ /quotedbl
+ /numbersign
+ /dollar
+ /percent
+ /ampersand
+ /quoteright
% 0x28
-/parenleft
-/parenright
-/asterisk
-/plus
-/comma
-/hyphen
-/period
-/slash
+ /parenleft
+ /parenright
+ /asterisk
+ /plus
+ /comma
+ /hyphen
+ /period
+ /slash
% 0x30
-/zero
-/one
-/two
-/three
-/four
-/five
-/six
-/seven
+ /zero
+ /one
+ /two
+ /three
+ /four
+ /five
+ /six
+ /seven
% 0x38
-/eight
-/nine
-/colon
-/semicolon
-/less
-/equal
-/greater
-/question
+ /eight
+ /nine
+ /colon
+ /semicolon
+ /less
+ /equal
+ /greater
+ /question
% 0x40
-/at
-/A
-/B
-/C
-/D
-/E
-/F
-/G
+ /at
+ /A
+ /B
+ /C
+ /D
+ /E
+ /F
+ /G
% 0x48
-/H
-/I
-/J
-/K
-/L
-/M
-/N
-/O
+ /H
+ /I
+ /J
+ /K
+ /L
+ /M
+ /N
+ /O
% 0x50
-/P
-/Q
-/R
-/S
-/T
-/U
-/V
-/W
+ /P
+ /Q
+ /R
+ /S
+ /T
+ /U
+ /V
+ /W
% 0x58
-/X
-/Y
-/Z
-/bracketleft
-/backslash
-/bracketright
-/asciicircum
-/underscore
+ /X
+ /Y
+ /Z
+ /bracketleft
+ /backslash
+ /bracketright
+ /asciicircum
+ /underscore
% 0x60
-/quoteleft
-/a
-/b
-/c
-/d
-/e
-/f
-/g
+ /quoteleft
+ /a
+ /b
+ /c
+ /d
+ /e
+ /f
+ /g
% 0x68
-/h
-/i
-/j
-/k
-/l
-/m
-/n
-/o
+ /h
+ /i
+ /j
+ /k
+ /l
+ /m
+ /n
+ /o
% 0x70
-/p
-/q
-/r
-/s
-/t
-/u
-/v
-/w
+ /p
+ /q
+ /r
+ /s
+ /t
+ /u
+ /v
+ /w
% 0x78
-/x
-/y
-/z
-/braceleft
-/bar
-/braceright
-/asciitilde
-/hyphenchar
+ /x
+ /y
+ /z
+ /braceleft
+ /bar
+ /braceright
+ /asciitilde
+ /hyphenchar
% 0x80
-/Abreve
-/Aogonek
-/Cacute
-/Ccaron
-/Dcaron
-/Ecaron
-/Eogonek
-/Gbreve
+ /Abreve
+ /Aogonek
+ /Cacute
+ /Ccaron
+ /Dcaron
+ /Ecaron
+ /Eogonek
+ /Gbreve
% 0x88
-/Lacute
-/Lcaron
-/Lslash
-/Nacute
-/Ncaron
-/Eng
-/Ohungarumlaut
-/Racute
+ /Lacute
+ /Lcaron
+ /Lslash
+ /Nacute
+ /Ncaron
+ /Eng
+ /Ohungarumlaut
+ /Racute
% 0x90
-/Rcaron
-/Sacute
-/Scaron
-/Scedilla
-/Tcaron
-/Tcedilla
-/Uhungarumlaut
-/Uring
+ /Rcaron
+ /Sacute
+ /Scaron
+ /Scedilla
+ /Tcaron
+ /Tcedilla
+ /Uhungarumlaut
+ /Uring
% 0x98
-/Ydieresis
-/Zacute
-/Zcaron
-/Zdotaccent
-/IJ
-/Idotaccent
-/dbar
-/section
+ /Ydieresis
+ /Zacute
+ /Zcaron
+ /Zdotaccent
+ /IJ
+ /Idotaccent
+ /dbar
+ /section
% 0xA0
-/abreve
-/aogonek
-/cacute
-/ccaron
-/dcaron
-/ecaron
-/eogonek
-/gbreve
+ /abreve
+ /aogonek
+ /cacute
+ /ccaron
+ /dcaron
+ /ecaron
+ /eogonek
+ /gbreve
% 0xA8
-/lacute
-/lcaron
-/lslash
-/nacute
-/ncaron
-/eng
-/ohungarumlaut
-/racute
+ /lacute
+ /lcaron
+ /lslash
+ /nacute
+ /ncaron
+ /eng
+ /ohungarumlaut
+ /racute
% 0xB0
-/rcaron
-/sacute
-/scaron
-/scedilla
-/tcaron
-/tcedilla
-/uhungarumlaut
-/uring
+ /rcaron
+ /sacute
+ /scaron
+ /scedilla
+ /tcaron
+ /tcedilla
+ /uhungarumlaut
+ /uring
% 0xB8
-/ydieresis
-/zacute
-/zcaron
-/zdotaccent
-/ij
-/exclamdown
-/questiondown
-/sterling
+ /ydieresis
+ /zacute
+ /zcaron
+ /zdotaccent
+ /ij
+ /exclamdown
+ /questiondown
+ /sterling
% 0xC0
-/Agrave
-/Aacute
-/Acircumflex
-/Atilde
-/Adieresis
-/Aring
-/AE
-/Ccedilla
+ /Agrave
+ /Aacute
+ /Acircumflex
+ /Atilde
+ /Adieresis
+ /Aring
+ /AE
+ /Ccedilla
% 0xC8
-/Egrave
-/Eacute
-/Ecircumflex
-/Edieresis
-/Igrave
-/Iacute
-/Icircumflex
-/Idieresis
+ /Egrave
+ /Eacute
+ /Ecircumflex
+ /Edieresis
+ /Igrave
+ /Iacute
+ /Icircumflex
+ /Idieresis
% 0xD0
-/Eth
-/Ntilde
-/Ograve
-/Oacute
-/Ocircumflex
-/Otilde
-/Odieresis
-/OE
+ /Eth
+ /Ntilde
+ /Ograve
+ /Oacute
+ /Ocircumflex
+ /Otilde
+ /Odieresis
+ /OE
% 0xD8
-/Oslash
-/Ugrave
-/Uacute
-/Ucircumflex
-/Udieresis
-/Yacute
-/Thorn
-/SS
+ /Oslash
+ /Ugrave
+ /Uacute
+ /Ucircumflex
+ /Udieresis
+ /Yacute
+ /Thorn
+ /SS
% 0xE0
-/agrave
-/aacute
-/acircumflex
-/atilde
-/adieresis
-/aring
-/ae
-/ccedilla
+ /agrave
+ /aacute
+ /acircumflex
+ /atilde
+ /adieresis
+ /aring
+ /ae
+ /ccedilla
% 0xE8
-/egrave
-/eacute
-/ecircumflex
-/edieresis
-/igrave
-/iacute
-/icircumflex
-/idieresis
+ /egrave
+ /eacute
+ /ecircumflex
+ /edieresis
+ /igrave
+ /iacute
+ /icircumflex
+ /idieresis
% 0xF0
-/eth
-/ntilde
-/ograve
-/oacute
-/ocircumflex
-/otilde
-/odieresis
-/oe
+ /eth
+ /ntilde
+ /ograve
+ /oacute
+ /ocircumflex
+ /otilde
+ /odieresis
+ /oe
% 0xF8
-/oslash
-/ugrave
-/uacute
-/ucircumflex
-/udieresis
-/yacute
-/thorn
-/germandbls
+ /oslash
+ /ugrave
+ /uacute
+ /ucircumflex
+ /udieresis
+ /yacute
+ /thorn
+ /germandbls
] def
%
+% UNICODING perthousandzero =: perthousandzero zeroinferior emptyslot;
+% UNICODING visualspace =: uni2423 uni02FD;
+% UNICODING SS =: uni1E9E SS;
+%
% LIGKERN question quoteleft =: questiondown;
% LIGKERN exclam quoteleft =: exclamdown;
% LIGKERN hyphen hyphen =: endash;
@@ -301,6 +305,6 @@
% LIGKERN less less =: guillemotleft;
% LIGKERN greater greater =: guillemotright;
%
-% LIGKERN || = 32 ;
+% LIGKERN || = 32;
%
% UNICODING ff =: ; fi =: ; fl =: ; ffi =: ; ffl =: ;
diff --git a/fonts/utilities/fontools/share/fontools_t2a.enc b/fonts/utilities/fontools/share/fontools_t2a.enc
index 1932d4c560..ae553fdda9 100644
--- a/fonts/utilities/fontools/share/fontools_t2a.enc
+++ b/fonts/utilities/fontools/share/fontools_t2a.enc
@@ -2,295 +2,298 @@
% CODINGSCHEME TEX CYRILLIC FONT ENCODING - T2A
/otftotfmT2AEncoding [
% 0x00
-/grave
-/acute
-/circumflex
-/tilde
-/dieresis
-/hungarumlaut
-/ring
-/caron
+ /grave
+ /acute
+ /circumflex
+ /tilde
+ /dieresis
+ /hungarumlaut
+ /ring
+ /caron
% 0x08
-/breve
-/macron
-/dotaccent
-/cedilla
-/ogonek
-/uni04C0
-/angleleft
-/angleright
+ /breve
+ /macron
+ /dotaccent
+ /cedilla
+ /ogonek
+ /uni04C0
+ /angleleft
+ /angleright
% 0x10
-/quotedblleft
-/quotedblright
-/cyrflex
-/dblgrave
-/cyrbreve
-/endash
-/emdash
-/.notdef
+ /quotedblleft
+ /quotedblright
+ /cyrflex
+ /dblgrave
+ /cyrbreve
+ /endash
+ /emdash
+ /.notdef
% 0x18
-/perthousandzero
-/dotlessi
-/dotlessj
-/ff
-/fi
-/fl
-/ffi
-/ffl
+ /perthousandzero
+ /dotlessi
+ /dotlessj
+ /ff
+ /fi
+ /fl
+ /ffi
+ /ffl
% 0x20
-/uni2423
-/exclam
-/quotedbl
-/numbersign
-/dollar
-/percent
-/ampersand
-/quoteright
+ /visualspace
+ /exclam
+ /quotedbl
+ /numbersign
+ /dollar
+ /percent
+ /ampersand
+ /quoteright
% 0x28
-/parenleft
-/parenright
-/asterisk
-/plus
-/comma
-/hyphen
-/period
-/slash
+ /parenleft
+ /parenright
+ /asterisk
+ /plus
+ /comma
+ /hyphen
+ /period
+ /slash
% 0x30
-/zero
-/one
-/two
-/three
-/four
-/five
-/six
-/seven
+ /zero
+ /one
+ /two
+ /three
+ /four
+ /five
+ /six
+ /seven
% 0x38
-/eight
-/nine
-/colon
-/semicolon
-/less
-/equal
-/greater
-/question
+ /eight
+ /nine
+ /colon
+ /semicolon
+ /less
+ /equal
+ /greater
+ /question
% 0x40
-/at
-/A
-/B
-/C
-/D
-/E
-/F
-/G
+ /at
+ /A
+ /B
+ /C
+ /D
+ /E
+ /F
+ /G
% 0x48
-/H
-/I
-/J
-/K
-/L
-/M
-/N
-/O
+ /H
+ /I
+ /J
+ /K
+ /L
+ /M
+ /N
+ /O
% 0x50
-/P
-/Q
-/R
-/S
-/T
-/U
-/V
-/W
+ /P
+ /Q
+ /R
+ /S
+ /T
+ /U
+ /V
+ /W
% 0x58
-/X
-/Y
-/Z
-/bracketleft
-/backslash
-/bracketright
-/asciicircum
-/underscore
+ /X
+ /Y
+ /Z
+ /bracketleft
+ /backslash
+ /bracketright
+ /asciicircum
+ /underscore
% 0x60
-/quoteleft
-/a
-/b
-/c
-/d
-/e
-/f
-/g
+ /quoteleft
+ /a
+ /b
+ /c
+ /d
+ /e
+ /f
+ /g
% 0x68
-/h
-/i
-/j
-/k
-/l
-/m
-/n
-/o
+ /h
+ /i
+ /j
+ /k
+ /l
+ /m
+ /n
+ /o
% 0x70
-/p
-/q
-/r
-/s
-/t
-/u
-/v
-/w
+ /p
+ /q
+ /r
+ /s
+ /t
+ /u
+ /v
+ /w
% 0x78
-/x
-/y
-/z
-/braceleft
-/bar
-/braceright
-/asciitilde
-/hyphen
+ /x
+ /y
+ /z
+ /braceleft
+ /bar
+ /braceright
+ /asciitilde
+ /hyphen
% 0x80
-/afii10050
-/uni0492
-/afii10051
-/afii10060
-/uni04BA
-/uni0496
-/uni0498
-/afii10058
+ /afii10050
+ /uni0492
+ /afii10051
+ /afii10060
+ /uni04BA
+ /uni0496
+ /uni0498
+ /afii10058
% 0x88
-/afii10056
-/uni049A
-/uni04A0
-/uni049C
-/uni04D4
-/uni04A2
-/uni04A4
-/afii10054
+ /afii10056
+ /uni049A
+ /uni04A0
+ /uni049C
+ /uni04D4
+ /uni04A2
+ /uni04A4
+ /afii10054
% 0x90
-/uni04E8
-/uni04AA
-/afii10062
-/uni04AE
-/uni04B0
-/uni04B2
-/afii10145
-/uni04B8
+ /uni04E8
+ /uni04AA
+ /afii10062
+ /uni04AE
+ /uni04B0
+ /uni04B2
+ /afii10145
+ /uni04B8
% 0x98
-/uni04B6
-/afii10053
-/uni04D8
-/afii10059
-/afii10023
-/afii61352
-/currency
-/section
+ /uni04B6
+ /afii10053
+ /uni04D8
+ /afii10059
+ /afii10023
+ /afii61352
+ /currency
+ /section
% 0xA0
-/afii10098
-/uni0493
-/afii10099
-/afii10108
-/uni04BB
-/uni0497
-/uni0499
-/afii10106
+ /afii10098
+ /uni0493
+ /afii10099
+ /afii10108
+ /uni04BB
+ /uni0497
+ /uni0499
+ /afii10106
% 0xA8
-/afii10104
-/uni049B
-/uni04A1
-/uni049D
-/uni04D5
-/uni04A3
-/uni04A5
-/afii10102
+ /afii10104
+ /uni049B
+ /uni04A1
+ /uni049D
+ /uni04D5
+ /uni04A3
+ /uni04A5
+ /afii10102
% 0xB0
-/uni04E9
-/uni04AB
-/afii10110
-/uni04AF
-/uni04B1
-/uni04B3
-/afii10193
-/uni04B9
+ /uni04E9
+ /uni04AB
+ /afii10110
+ /uni04AF
+ /uni04B1
+ /uni04B3
+ /afii10193
+ /uni04B9
% 0xB8
-/uni04B7
-/afii10101
-/afii10846
-/afii10107
-/afii10071
-/quotedblbase
-/guillemotleft
-/guillemotright
+ /uni04B7
+ /afii10101
+ /afii10846
+ /afii10107
+ /afii10071
+ /quotedblbase
+ /guillemotleft
+ /guillemotright
% 0xC0
-/afii10017
-/afii10018
-/afii10019
-/afii10020
-/afii10021
-/afii10022
-/afii10024
-/afii10025
+ /afii10017
+ /afii10018
+ /afii10019
+ /afii10020
+ /afii10021
+ /afii10022
+ /afii10024
+ /afii10025
% 0xC8
-/afii10026
-/afii10027
-/afii10028
-/afii10029
-/afii10030
-/afii10031
-/afii10032
-/afii10033
+ /afii10026
+ /afii10027
+ /afii10028
+ /afii10029
+ /afii10030
+ /afii10031
+ /afii10032
+ /afii10033
% 0xD0
-/afii10034
-/afii10035
-/afii10036
-/afii10037
-/afii10038
-/afii10039
-/afii10040
-/afii10041
+ /afii10034
+ /afii10035
+ /afii10036
+ /afii10037
+ /afii10038
+ /afii10039
+ /afii10040
+ /afii10041
% 0xD8
-/afii10042
-/afii10043
-/afii10044
-/afii10045
-/afii10046
-/afii10047
-/afii10048
-/afii10049
+ /afii10042
+ /afii10043
+ /afii10044
+ /afii10045
+ /afii10046
+ /afii10047
+ /afii10048
+ /afii10049
% 0xE0
-/afii10065
-/afii10066
-/afii10067
-/afii10068
-/afii10069
-/afii10070
-/afii10072
-/afii10073
+ /afii10065
+ /afii10066
+ /afii10067
+ /afii10068
+ /afii10069
+ /afii10070
+ /afii10072
+ /afii10073
% 0xE8
-/afii10074
-/afii10075
-/afii10076
-/afii10077
-/afii10078
-/afii10079
-/afii10080
-/afii10081
+ /afii10074
+ /afii10075
+ /afii10076
+ /afii10077
+ /afii10078
+ /afii10079
+ /afii10080
+ /afii10081
% 0xF0
-/afii10082
-/afii10083
-/afii10084
-/afii10085
-/afii10086
-/afii10087
-/afii10088
-/afii10089
+ /afii10082
+ /afii10083
+ /afii10084
+ /afii10085
+ /afii10086
+ /afii10087
+ /afii10088
+ /afii10089
% 0xF8
-/afii10090
-/afii10091
-/afii10092
-/afii10093
-/afii10094
-/afii10095
-/afii10096
-/afii10097
+ /afii10090
+ /afii10091
+ /afii10092
+ /afii10093
+ /afii10094
+ /afii10095
+ /afii10096
+ /afii10097
] def
%
+% UNICODING perthousandzero =: perthousandzero zeroinferior emptyslot;
+% UNICODING visualspace =: uni2423 uni02FD;
+%
% LIGKERN hyphen hyphen =: endash;
% LIGKERN endash hyphen =: emdash;
% LIGKERN quoteleft quoteleft =: quotedblleft;
diff --git a/fonts/utilities/fontools/share/fontools_t2b.enc b/fonts/utilities/fontools/share/fontools_t2b.enc
index 3ec4a3b8ff..7fc55400aa 100644
--- a/fonts/utilities/fontools/share/fontools_t2b.enc
+++ b/fonts/utilities/fontools/share/fontools_t2b.enc
@@ -2,295 +2,298 @@
% CODINGSCHEME TEX CYRILLIC FONT ENCODING - T2B
/otftotfmT2BEncoding [
% 0x00
-/grave
-/acute
-/circumflex
-/tilde
-/dieresis
-/hungarumlaut
-/ring
-/caron
+ /grave
+ /acute
+ /circumflex
+ /tilde
+ /dieresis
+ /hungarumlaut
+ /ring
+ /caron
% 0x08
-/breve
-/macron
-/dotaccent
-/cedilla
-/ogonek
-/uni04C0
-/angleleft
-/angleright
+ /breve
+ /macron
+ /dotaccent
+ /cedilla
+ /ogonek
+ /uni04C0
+ /angleleft
+ /angleright
% 0x10
-/quotedblleft
-/quotedblright
-/cyrflex
-/dblgrave
-/cyrbreve
-/endash
-/emdash
-/.notdef
+ /quotedblleft
+ /quotedblright
+ /cyrflex
+ /dblgrave
+ /cyrbreve
+ /endash
+ /emdash
+ /.notdef
% 0x18
-/perthousandzero
-/dotlessi
-/dotlessj
-/ff
-/fi
-/fl
-/ffi
-/ffl
+ /perthousandzero
+ /dotlessi
+ /dotlessj
+ /ff
+ /fi
+ /fl
+ /ffi
+ /ffl
% 0x20
-/uni2423
-/exclam
-/quotedbl
-/numbersign
-/dollar
-/percent
-/ampersand
-/quoteright
+ /visualspace
+ /exclam
+ /quotedbl
+ /numbersign
+ /dollar
+ /percent
+ /ampersand
+ /quoteright
% 0x28
-/parenleft
-/parenright
-/asterisk
-/plus
-/comma
-/hyphen
-/period
-/slash
+ /parenleft
+ /parenright
+ /asterisk
+ /plus
+ /comma
+ /hyphen
+ /period
+ /slash
% 0x30
-/zero
-/one
-/two
-/three
-/four
-/five
-/six
-/seven
+ /zero
+ /one
+ /two
+ /three
+ /four
+ /five
+ /six
+ /seven
% 0x38
-/eight
-/nine
-/colon
-/semicolon
-/less
-/equal
-/greater
-/question
+ /eight
+ /nine
+ /colon
+ /semicolon
+ /less
+ /equal
+ /greater
+ /question
% 0x40
-/at
-/A
-/B
-/C
-/D
-/E
-/F
-/G
+ /at
+ /A
+ /B
+ /C
+ /D
+ /E
+ /F
+ /G
% 0x48
-/H
-/I
-/J
-/K
-/L
-/M
-/N
-/O
+ /H
+ /I
+ /J
+ /K
+ /L
+ /M
+ /N
+ /O
% 0x50
-/P
-/Q
-/R
-/S
-/T
-/U
-/V
-/W
+ /P
+ /Q
+ /R
+ /S
+ /T
+ /U
+ /V
+ /W
% 0x58
-/X
-/Y
-/Z
-/bracketleft
-/backslash
-/bracketright
-/asciicircum
-/underscore
+ /X
+ /Y
+ /Z
+ /bracketleft
+ /backslash
+ /bracketright
+ /asciicircum
+ /underscore
% 0x60
-/quoteleft
-/a
-/b
-/c
-/d
-/e
-/f
-/g
+ /quoteleft
+ /a
+ /b
+ /c
+ /d
+ /e
+ /f
+ /g
% 0x68
-/h
-/i
-/j
-/k
-/l
-/m
-/n
-/o
+ /h
+ /i
+ /j
+ /k
+ /l
+ /m
+ /n
+ /o
% 0x70
-/p
-/q
-/r
-/s
-/t
-/u
-/v
-/w
+ /p
+ /q
+ /r
+ /s
+ /t
+ /u
+ /v
+ /w
% 0x78
-/x
-/y
-/z
-/braceleft
-/bar
-/braceright
-/asciitilde
-/hyphen
+ /x
+ /y
+ /z
+ /braceleft
+ /bar
+ /braceright
+ /asciitilde
+ /hyphen
% 0x80
-/CYRGDSCHCRS % CYRILLIC CAPITAL LETTER GHE WITH STROKE AND DESCENDER
-/uni0492
-/CYRGDSC % CYRILLIC CAPITAL LETTER GHE WITH DESCENDER
-/uni0494
-/uni04BA
-/uni0496
-/CYRDELTA % CYRILLIC CAPITAL LETTER DELTA
-/uni04E0
+ /CYRGDSCHCRS % CYRILLIC CAPITAL LETTER GHE WITH STROKE AND DESCENDER
+ /uni0492
+ /CYRGDSC % CYRILLIC CAPITAL LETTER GHE WITH DESCENDER
+ /uni0494
+ /uni04BA
+ /uni0496
+ /CYRDELTA % CYRILLIC CAPITAL LETTER DELTA
+ /uni04E0
% 0x88
-/afii10058
-/uni049A
-/CYRLDSC % CYRILLIC CAPITAL LETTER EL WITH DESCENDER
-/uni04C3
-/CYRLHK % CYRILLIC CAPITAL LETTER EL WITH HOOK
-/uni04A2
-/uni04A4
-/uni04C7
+ /afii10058
+ /uni049A
+ /CYRLDSC % CYRILLIC CAPITAL LETTER EL WITH DESCENDER
+ /uni04C3
+ /CYRLHK % CYRILLIC CAPITAL LETTER EL WITH HOOK
+ /uni04A2
+ /uni04A4
+ /uni04C7
% 0x90
-/uni04E8
-/CYRSACRS % CYRILLIC CAPITAL LETTER ES WITH STROKE
-/afii10062
-/uni04AE
-/CYRHHCRS % CYRILLIC CAPITAL LETTER HA WITH STROKE
-/uni04B2
-/CYRHHK % CYRILLIC CAPITAL LETTER HA WITH HOOK
-/uni04CB
+ /uni04E8
+ /CYRSACRS % CYRILLIC CAPITAL LETTER ES WITH STROKE
+ /afii10062
+ /uni04AE
+ /CYRHHCRS % CYRILLIC CAPITAL LETTER HA WITH STROKE
+ /uni04B2
+ /CYRHHK % CYRILLIC CAPITAL LETTER HA WITH HOOK
+ /uni04CB
% 0x98
-/uni04B6
-/afii10059
-/uni04D8
-/CYREPS % CYRILLIC CAPITAL LETTER EPSILON
-/afii10023
-/afii61352
-/currency
-/section
+ /uni04B6
+ /afii10059
+ /uni04D8
+ /CYREPS % CYRILLIC CAPITAL LETTER EPSILON
+ /afii10023
+ /afii61352
+ /currency
+ /section
% 0xA0
-/cyrgdschcrs % CYRILLIC SMALL LETTER GHE WITH STROKE AND DESCENDER
-/uni0493
-/cyrgdsc % CYRILLIC SMALL LETTER GHE WITH DESCENDER
-/uni0495
-/uni04BB
-/uni0497
-/cyrdelta % CYRILLIC SMALL LETTER DELTA
-/uni04E1
+ /cyrgdschcrs % CYRILLIC SMALL LETTER GHE WITH STROKE AND DESCENDER
+ /uni0493
+ /cyrgdsc % CYRILLIC SMALL LETTER GHE WITH DESCENDER
+ /uni0495
+ /uni04BB
+ /uni0497
+ /cyrdelta % CYRILLIC SMALL LETTER DELTA
+ /uni04E1
% 0xA8
-/afii10106
-/uni049B
-/cyrldsc % CYRILLIC SMALL LETTER EL WITH DESCENDER
-/uni04C4
-/cyrlhk % CYRILLIC SMALL LETTER EL WITH HOOK
-/uni04A3
-/uni04A5
-/uni04C8
+ /afii10106
+ /uni049B
+ /cyrldsc % CYRILLIC SMALL LETTER EL WITH DESCENDER
+ /uni04C4
+ /cyrlhk % CYRILLIC SMALL LETTER EL WITH HOOK
+ /uni04A3
+ /uni04A5
+ /uni04C8
% 0xB0
-/uni04E9
-/cyrsacrs % CYRILLIC SMALL LETTER ES WITH STROKE
-/afii10110
-/uni04AF
-/cyrhhcrs % CYRILLIC SMALL LETTER HA WITH STROKE
-/uni04B3
-/cyrhhk % CYRILLIC SMALL LETTER HA WITH HOOK
-/uni04CC
+ /uni04E9
+ /cyrsacrs % CYRILLIC SMALL LETTER ES WITH STROKE
+ /afii10110
+ /uni04AF
+ /cyrhhcrs % CYRILLIC SMALL LETTER HA WITH STROKE
+ /uni04B3
+ /cyrhhk % CYRILLIC SMALL LETTER HA WITH HOOK
+ /uni04CC
% 0xB8
-/uni04B7
-/afii10107
-/afii10846
-/cyreps % CYRILLIC SMALL LETTER EPSILON
-/afii10071
-/quotedblbase
-/guillemotleft
-/guillemotright
+ /uni04B7
+ /afii10107
+ /afii10846
+ /cyreps % CYRILLIC SMALL LETTER EPSILON
+ /afii10071
+ /quotedblbase
+ /guillemotleft
+ /guillemotright
% 0xC0
-/afii10017
-/afii10018
-/afii10019
-/afii10020
-/afii10021
-/afii10022
-/afii10024
-/afii10025
+ /afii10017
+ /afii10018
+ /afii10019
+ /afii10020
+ /afii10021
+ /afii10022
+ /afii10024
+ /afii10025
% 0xC8
-/afii10026
-/afii10027
-/afii10028
-/afii10029
-/afii10030
-/afii10031
-/afii10032
-/afii10033
+ /afii10026
+ /afii10027
+ /afii10028
+ /afii10029
+ /afii10030
+ /afii10031
+ /afii10032
+ /afii10033
% 0xD0
-/afii10034
-/afii10035
-/afii10036
-/afii10037
-/afii10038
-/afii10039
-/afii10040
-/afii10041
+ /afii10034
+ /afii10035
+ /afii10036
+ /afii10037
+ /afii10038
+ /afii10039
+ /afii10040
+ /afii10041
% 0xD8
-/afii10042
-/afii10043
-/afii10044
-/afii10045
-/afii10046
-/afii10047
-/afii10048
-/afii10049
+ /afii10042
+ /afii10043
+ /afii10044
+ /afii10045
+ /afii10046
+ /afii10047
+ /afii10048
+ /afii10049
% 0xE0
-/afii10065
-/afii10066
-/afii10067
-/afii10068
-/afii10069
-/afii10070
-/afii10072
-/afii10073
+ /afii10065
+ /afii10066
+ /afii10067
+ /afii10068
+ /afii10069
+ /afii10070
+ /afii10072
+ /afii10073
% 0xE8
-/afii10074
-/afii10075
-/afii10076
-/afii10077
-/afii10078
-/afii10079
-/afii10080
-/afii10081
+ /afii10074
+ /afii10075
+ /afii10076
+ /afii10077
+ /afii10078
+ /afii10079
+ /afii10080
+ /afii10081
% 0xF0
-/afii10082
-/afii10083
-/afii10084
-/afii10085
-/afii10086
-/afii10087
-/afii10088
-/afii10089
+ /afii10082
+ /afii10083
+ /afii10084
+ /afii10085
+ /afii10086
+ /afii10087
+ /afii10088
+ /afii10089
% 0xF8
-/afii10090
-/afii10091
-/afii10092
-/afii10093
-/afii10094
-/afii10095
-/afii10096
-/afii10097
+ /afii10090
+ /afii10091
+ /afii10092
+ /afii10093
+ /afii10094
+ /afii10095
+ /afii10096
+ /afii10097
] def
%
+% UNICODING perthousandzero =: perthousandzero zeroinferior emptyslot;
+% UNICODING visualspace =: uni2423 uni02FD;
+%
% LIGKERN hyphen hyphen =: endash;
% LIGKERN endash hyphen =: emdash;
% LIGKERN quoteleft quoteleft =: quotedblleft;
diff --git a/fonts/utilities/fontools/share/fontools_t2c.enc b/fonts/utilities/fontools/share/fontools_t2c.enc
index 753c851a36..888bd03110 100644
--- a/fonts/utilities/fontools/share/fontools_t2c.enc
+++ b/fonts/utilities/fontools/share/fontools_t2c.enc
@@ -2,295 +2,298 @@
% CODINGSCHEME TEX CYRILLIC FONT ENCODING - T2C
/otftotfmT2CEncoding [
% 0x00
-/grave
-/acute
-/circumflex
-/tilde
-/dieresis
-/hungarumlaut
-/ring
-/caron
+ /grave
+ /acute
+ /circumflex
+ /tilde
+ /dieresis
+ /hungarumlaut
+ /ring
+ /caron
% 0x08
-/breve
-/macron
-/dotaccent
-/cedilla
-/ogonek
-/uni04C0
-/angleleft
-/angleright
+ /breve
+ /macron
+ /dotaccent
+ /cedilla
+ /ogonek
+ /uni04C0
+ /angleleft
+ /angleright
% 0x10
-/quotedblleft
-/quotedblright
-/cyrflex
-/dblgrave
-/cyrbreve
-/endash
-/emdash
-/.notdef
+ /quotedblleft
+ /quotedblright
+ /cyrflex
+ /dblgrave
+ /cyrbreve
+ /endash
+ /emdash
+ /.notdef
% 0x10
-/perthousandzero
-/dotlessi
-/dotlessj
-/ff
-/fi
-/fl
-/ffi
-/ffl
+ /perthousandzero
+ /dotlessi
+ /dotlessj
+ /ff
+ /fi
+ /fl
+ /ffi
+ /ffl
% 0x20
-/uni2423
-/exclam
-/quotedbl
-/numbersign
-/dollar
-/percent
-/ampersand
-/quoteright
+ /visualspace
+ /exclam
+ /quotedbl
+ /numbersign
+ /dollar
+ /percent
+ /ampersand
+ /quoteright
% 0x28
-/parenleft
-/parenright
-/asterisk
-/plus
-/comma
-/hyphen
-/period
-/slash
+ /parenleft
+ /parenright
+ /asterisk
+ /plus
+ /comma
+ /hyphen
+ /period
+ /slash
% 0x30
-/zero
-/one
-/two
-/three
-/four
-/five
-/six
-/seven
+ /zero
+ /one
+ /two
+ /three
+ /four
+ /five
+ /six
+ /seven
% 0x38
-/eight
-/nine
-/colon
-/semicolon
-/less
-/equal
-/greater
-/question
+ /eight
+ /nine
+ /colon
+ /semicolon
+ /less
+ /equal
+ /greater
+ /question
% 0x40
-/at
-/A
-/B
-/C
-/D
-/E
-/F
-/G
+ /at
+ /A
+ /B
+ /C
+ /D
+ /E
+ /F
+ /G
% 0x48
-/H
-/I
-/J
-/K
-/L
-/M
-/N
-/O
+ /H
+ /I
+ /J
+ /K
+ /L
+ /M
+ /N
+ /O
% 0x50
-/P
-/Q
-/R
-/S
-/T
-/U
-/V
-/W
+ /P
+ /Q
+ /R
+ /S
+ /T
+ /U
+ /V
+ /W
% 0x58
-/X
-/Y
-/Z
-/bracketleft
-/backslash
-/bracketright
-/asciicircum
-/underscore
+ /X
+ /Y
+ /Z
+ /bracketleft
+ /backslash
+ /bracketright
+ /asciicircum
+ /underscore
% 0x60
-/quoteleft
-/a
-/b
-/c
-/d
-/e
-/f
-/g
+ /quoteleft
+ /a
+ /b
+ /c
+ /d
+ /e
+ /f
+ /g
% 0x68
-/h
-/i
-/j
-/k
-/l
-/m
-/n
-/o
+ /h
+ /i
+ /j
+ /k
+ /l
+ /m
+ /n
+ /o
% 0x70
-/p
-/q
-/r
-/s
-/t
-/u
-/v
-/w
+ /p
+ /q
+ /r
+ /s
+ /t
+ /u
+ /v
+ /w
% 0x78
-/x
-/y
-/z
-/braceleft
-/bar
-/braceright
-/asciitilde
-/hyphen
+ /x
+ /y
+ /z
+ /braceleft
+ /bar
+ /braceright
+ /asciitilde
+ /hyphen
% 0x80
-/uni04A6
-/uni04B4
-/uni04AC
-/uni0494
-/uni04BA
-/CYRRDSC % CYRILLIC CAPITAL LETTER ER WITH DESCENDER
-/uni048E
-/uni04E0
+ /uni04A6
+ /uni04B4
+ /uni04AC
+ /uni0494
+ /uni04BA
+ /CYRRDSC % CYRILLIC CAPITAL LETTER ER WITH DESCENDER
+ /uni048E
+ /uni04E0
% 0x88
-/CYRMDSC % CYRILLIC CAPITAL LETTER EM WITH DESCENDER
-/uni049A
-/CYRLDSC % CYRILLIC CAPITAL LETTER EL WITH DESCENDER
-/uni049E
-/CYRLHK % CYRILLIC CAPITAL LETTER EL WITH HOOK
-/uni04A2
-/CYRMHK % CYRILLIC CAPITAL LETTER EM WITH HOOK
-/uni04C7
+ /CYRMDSC % CYRILLIC CAPITAL LETTER EM WITH DESCENDER
+ /uni049A
+ /CYRLDSC % CYRILLIC CAPITAL LETTER EL WITH DESCENDER
+ /uni049E
+ /CYRLHK % CYRILLIC CAPITAL LETTER EL WITH HOOK
+ /uni04A2
+ /CYRMHK % CYRILLIC CAPITAL LETTER EM WITH HOOK
+ /uni04C7
% 0x90
-/uni04E8
-/uni04BC
-/uni04BE
-/uni048C
-/CYRISHRTDSC % CYRILLIC CAPITAL LETTER SHORT I WITH DESCENDER
-/uni04B2
-/afii10145
-/uni04A8
+ /uni04E8
+ /uni04BC
+ /uni04BE
+ /uni048C
+ /CYRISHRTDSC % CYRILLIC CAPITAL LETTER SHORT I WITH DESCENDER
+ /uni04B2
+ /afii10145
+ /uni04A8
% 0x98
-/uni04B6
-/CYRNLHK % CYRILLIC CAPITAL LETTER EN WITH LEFT HOOK
-/uni04D8
-/CYRRHK % CYRILLIC CAPITAL LETTER ER WITH HOOK
-/afii10023
-/afii61352
-/currency
-/section
+ /uni04B6
+ /CYRNLHK % CYRILLIC CAPITAL LETTER EN WITH LEFT HOOK
+ /uni04D8
+ /CYRRHK % CYRILLIC CAPITAL LETTER ER WITH HOOK
+ /afii10023
+ /afii61352
+ /currency
+ /section
% 0xA0
-/uni04A7
-/uni04B5
-/uni04AD
-/uni0495
-/uni04BB
-/cyrrdsc % CYRILLIC SMALL LETTER ER WITH DESCENDER
-/uni048F
-/uni04E1
+ /uni04A7
+ /uni04B5
+ /uni04AD
+ /uni0495
+ /uni04BB
+ /cyrrdsc % CYRILLIC SMALL LETTER ER WITH DESCENDER
+ /uni048F
+ /uni04E1
% 0xA8
-/cyrmdsc % CYRILLIC SMALL LETTER EM WITH DESCENDER
-/uni049B
-/cyrldsc % CYRILLIC SMALL LETTER EL WITH DESCENDER
-/uni049F
-/cyrlhk % CYRILLIC SMALL LETTER EL WITH HOOK
-/uni04A3
-/cyrmhk % CYRILLIC SMALL LETTER EM WITH HOOK
-/uni04C8
+ /cyrmdsc % CYRILLIC SMALL LETTER EM WITH DESCENDER
+ /uni049B
+ /cyrldsc % CYRILLIC SMALL LETTER EL WITH DESCENDER
+ /uni049F
+ /cyrlhk % CYRILLIC SMALL LETTER EL WITH HOOK
+ /uni04A3
+ /cyrmhk % CYRILLIC SMALL LETTER EM WITH HOOK
+ /uni04C8
% 0xB0
-/uni04E9
-/uni04BD
-/uni04BF
-/uni048D
-/cyrishrtdsc % CYRILLIC SMALL LETTER SHORT I WITH DESCENDER
-/uni04B3
-/afii10193
-/uni04A9
+ /uni04E9
+ /uni04BD
+ /uni04BF
+ /uni048D
+ /cyrishrtdsc % CYRILLIC SMALL LETTER SHORT I WITH DESCENDER
+ /uni04B3
+ /afii10193
+ /uni04A9
% 0xB8
-/uni04B7
-/cyrnlhk % CYRILLIC SMALL LETTER EN WITH LEFT HOOK
-/afii10846
-/cyrrhk % CYRILLIC SMALL LETTER ER WITH HOOK
-/afii10071
-/quotedblbase
-/guillemotleft
-/guillemotright
+ /uni04B7
+ /cyrnlhk % CYRILLIC SMALL LETTER EN WITH LEFT HOOK
+ /afii10846
+ /cyrrhk % CYRILLIC SMALL LETTER ER WITH HOOK
+ /afii10071
+ /quotedblbase
+ /guillemotleft
+ /guillemotright
% 0xC0
-/afii10017
-/afii10018
-/afii10019
-/afii10020
-/afii10021
-/afii10022
-/afii10024
-/afii10025
+ /afii10017
+ /afii10018
+ /afii10019
+ /afii10020
+ /afii10021
+ /afii10022
+ /afii10024
+ /afii10025
% 0xC8
-/afii10026
-/afii10027
-/afii10028
-/afii10029
-/afii10030
-/afii10031
-/afii10032
-/afii10033
+ /afii10026
+ /afii10027
+ /afii10028
+ /afii10029
+ /afii10030
+ /afii10031
+ /afii10032
+ /afii10033
% 0xD0
-/afii10034
-/afii10035
-/afii10036
-/afii10037
-/afii10038
-/afii10039
-/afii10040
-/afii10041
+ /afii10034
+ /afii10035
+ /afii10036
+ /afii10037
+ /afii10038
+ /afii10039
+ /afii10040
+ /afii10041
% 0xD8
-/afii10042
-/afii10043
-/afii10044
-/afii10045
-/afii10046
-/afii10047
-/afii10048
-/afii10049
+ /afii10042
+ /afii10043
+ /afii10044
+ /afii10045
+ /afii10046
+ /afii10047
+ /afii10048
+ /afii10049
% 0xE0
-/afii10065
-/afii10066
-/afii10067
-/afii10068
-/afii10069
-/afii10070
-/afii10072
-/afii10073
+ /afii10065
+ /afii10066
+ /afii10067
+ /afii10068
+ /afii10069
+ /afii10070
+ /afii10072
+ /afii10073
% 0xE8
-/afii10074
-/afii10075
-/afii10076
-/afii10077
-/afii10078
-/afii10079
-/afii10080
-/afii10081
+ /afii10074
+ /afii10075
+ /afii10076
+ /afii10077
+ /afii10078
+ /afii10079
+ /afii10080
+ /afii10081
% 0xF0
-/afii10082
-/afii10083
-/afii10084
-/afii10085
-/afii10086
-/afii10087
-/afii10088
-/afii10089
+ /afii10082
+ /afii10083
+ /afii10084
+ /afii10085
+ /afii10086
+ /afii10087
+ /afii10088
+ /afii10089
% 0xF8
-/afii10090
-/afii10091
-/afii10092
-/afii10093
-/afii10094
-/afii10095
-/afii10096
-/afii10097
+ /afii10090
+ /afii10091
+ /afii10092
+ /afii10093
+ /afii10094
+ /afii10095
+ /afii10096
+ /afii10097
] def
%
+% UNICODING perthousandzero =: perthousandzero zeroinferior emptyslot;
+% UNICODING visualspace =: uni2423 uni02FD;
+%
% LIGKERN hyphen hyphen =: endash;
% LIGKERN endash hyphen =: emdash;
% LIGKERN quoteleft quoteleft =: quotedblleft;
diff --git a/fonts/utilities/fontools/share/fontools_t3.enc b/fonts/utilities/fontools/share/fontools_t3.enc
index 443073dcdf..6826ae15eb 100644
--- a/fonts/utilities/fontools/share/fontools_t3.enc
+++ b/fonts/utilities/fontools/share/fontools_t3.enc
@@ -1,276 +1,286 @@
% A version of the T3 encoding, intended for use with otftotfm.
+%
+% I don't remember where I found this; but it contains many
+% non-standard glyph names (i.e., missing from glyphlist.txt),
+% so that otftotfm won't use those slots.
+%
+% TODO: we should try and find these glyphs in the Unicode standard
+% and replace the non-standard names with /uni.... codes.
+%
% CODINGSCHEME IPA ENCODING
/otftotfmT3Encoding [
% 0x00
-/uni02CB
-/uni02CA
-/uni02C6
-/uni02DC
-/dieresis
-/uni02BA
-/uni02DA
-/uni02C7
-/uni02D8
-/uni02C9
-/uni02D9
-/cedilla
-/uni02DB
-/space_uni030F
-/subgrave
-/subacute
+ /uni02CB
+ /uni02CA
+ /uni02C6
+ /uni02DC
+ /dieresis
+ /uni02BA
+ /uni02DA
+ /uni02C7
+ /uni02D8
+ /uni02C9
+ /uni02D9
+ /cedilla
+ /uni02DB
+ /uni030F % was /space_uni030F
+ /uni0316 % was /subgrave
+ /uni0317 % was /subacute
% 0x10
-/space_uni0311
-/space_uni032A
-/space_uni033A
-/space_uni033B
-/uni02BE
-/uni02BF
-/space_uni032B
-/space_uni033C
-/uni02DF
-/dotlessi
-/dotlessj
-/uni02D6
-/uni02D4
-/uni02D5
-/advancing
-/retracting
+ /uni0311 % was /space_uni0311
+ /uni032A % was /space_uni032A
+ /uni033A % was /space_uni033A
+ /uni033B % was /space_uni033B
+ /uni02BE
+ /uni02BF
+ /uni032B % was /space_uni032B
+ /uni033C % was /space_uni033C
+ /uni02DF
+ /dotlessi
+ /dotlessj
+ /uni02D6
+ /uni02D4
+ /uni02D5
+ /advancing % unknown glyph name, so won't be used
+ /retracting % unknown glyph name, so won't be used
% 0x20
-/celpal
-/uni01C3
-/uni02C8
-/hooktop
-/space_uni0322
-/space_uni0321
-/uni0360
-/quoteright
-/parenleft
-/parenright
-/asterisk
-/plus
-/comma
-/hyphen
-/period
-/slash
+ /uni02B9 % was /celpal
+ /uni01C3
+ /uni02C8
+ /hooktop
+ /uni0322 % was /space_uni0322
+ /uni0321 % was /space_uni0321
+ /uni0360
+ /quoteright
+ /parenleft
+ /parenright
+ /asterisk
+ /plus
+ /comma
+ /hyphen
+ /period
+ /slash
% 0x30
-/uni0289
-/uni0268
-/uni028C
-/uni025C
-/uni0265
-/uni0250
-/uni0252
-/uni0264
-/uni0275
-/uni0258
-/uni02D0
-/uni02D1
-/uni203F
-/equal
-/uni2322
-/question
+ /uni0289
+ /uni0268
+ /uni028C
+ /uni025C
+ /uni0265
+ /uni0250
+ /uni0252
+ /uni0264
+ /uni0275
+ /uni0258
+ /uni02D0
+ /uni02D1
+ /uni203F
+ /equal
+ /uni2322
+ /question
% 0x40
-/uni0259
-/uni0251
-/beta.ipa
-/uni0255
-/eth
-/uni025B
-/uni0278
-/uni0263
-/uni0266
-/uni026A
-/uni029D
-/uni0281
-/uni028E
-/uni0271
-/eng.ipa
-/uni0254
+ /uni0259
+ /uni0251
+ /beta.ipa
+ /uni0255
+ /eth
+ /uni025B
+ /uni0278
+ /uni0263
+ /uni0266
+ /uni026A
+ /uni029D
+ /uni0281
+ /uni028E
+ /uni0271
+ /eng.ipa
+ /uni0254
% 0x50
-/uni0294
-/uni0295
-/uni027E
-/uni0283
-/theta.ipa
-/uni028A
-/uni028B
-/uni026F
-/chi.ipa
-/uni028F
-/uni0292
-/bracketleft
-/uni02BD
-/bracketright
-/uni02FA
-/uni02F9
+ /uni0294
+ /uni0295
+ /uni027E
+ /uni0283
+ /theta.ipa
+ /uni028A
+ /uni028B
+ /uni026F
+ /chi.ipa
+ /uni028F
+ /uni0292
+ /bracketleft
+ /uni02BD
+ /bracketright
+ /uni02FA
+ /uni02F9
% 0x60
-/uni02BB
-/a
-/b
-/c
-/d
-/e
-/f
-/uni0261
-/h
-/i
-/j
-/k
-/l
-/m
-/n
-/o
+ /uni02BB
+ /a
+ /b
+ /c
+ /d
+ /e
+ /f
+ /uni0261
+ /h
+ /i
+ /j
+ /k
+ /l
+ /m
+ /n
+ /o
% 0x70
-/p
-/q
-/r
-/s
-/t
-/u
-/v
-/w
-/x
-/y
-/z
-/uni01C1
-/uni01C0
-/uni01C2
-/uni02DE
-/uni02CC
+ /p
+ /q
+ /r
+ /s
+ /t
+ /u
+ /v
+ /w
+ /x
+ /y
+ /z
+ /uni01C1
+ /uni01C0
+ /uni01C2
+ /uni02DE
+ /uni02CC
% 0x80
-/longleveltone
-/longfallingtone1
-/longfallingtone2
-/longfallingtone3
-/longfallingtone4
-/longrisingtone1
-/longrisingtone2
-/longrisingtone3
-/longrisingtone4
-/shortleveltone
-/shortfallingtone1
-/shortfallingtone2
-/shortfallingtone3
-/shortfallingtone4
-/shortrisingtone1
-/shortrisingtone2
+ /longleveltone % unknown glyph name, so won't be used
+ /longfallingtone1 % unknown glyph name, so won't be used
+ /longfallingtone2 % unknown glyph name, so won't be used
+ /longfallingtone3 % unknown glyph name, so won't be used
+ /longfallingtone4 % unknown glyph name, so won't be used
+ /longrisingtone1 % unknown glyph name, so won't be used
+ /longrisingtone2 % unknown glyph name, so won't be used
+ /longrisingtone3 % unknown glyph name, so won't be used
+ /longrisingtone4 % unknown glyph name, so won't be used
+ /shortleveltone % unknown glyph name, so won't be used
+ /shortfallingtone1 % unknown glyph name, so won't be used
+ /shortfallingtone2 % unknown glyph name, so won't be used
+ /shortfallingtone3 % unknown glyph name, so won't be used
+ /shortfallingtone4 % unknown glyph name, so won't be used
+ /shortrisingtone1 % unknown glyph name, so won't be used
+ /shortrisingtone2 % unknown glyph name, so won't be used
% 0x90
-/shortrisingtone3
-/shortrisingtone4
-/uni2502
-/uni2551
-/uniA71C
-/uniA71B
-/uni2197
-/uni2198
-/uni1DC4
-/uni1DC5
-/uni1DC8
-/uni1DC9
-/space_uni030D
-/space_uni030E
-/gravedot
-/dotacute
+ /shortrisingtone3 % unknown glyph name, so won't be used
+ /shortrisingtone4 % unknown glyph name, so won't be used
+ /uni2502
+ /uni2551
+ /uniA71C
+ /uniA71B
+ /uni2197
+ /uni2198
+ /uni1DC4
+ /uni1DC5
+ /uni1DC8
+ /uni1DC9
+ /uni030D % was /space_uni030D
+ /uni030E % was /space_uni030E
+ /gravedot % unknown glyph name, so won't be used
+ /dotacute % unknown glyph name, so won't be used
% 0xa0
-/uni0180
-/uni0111
-/uni0221
-/uni1D91
-/uni1D07
-/g
-/longilefthook
-/uni0285
-/uni1D0A
-/uni029E
-/uni019A
-/lambda.ipa
-/uni019b
-/lyogh.old
-/uni0235
-/turnce
+ /uni0180
+ /uni0111
+ /uni0221
+ /uni1D91
+ /uni1D07
+ /g
+ /longilefthook % unknown glyph name, so won't be used
+ /uni0285
+ /uni1D0A
+ /uni029E
+ /uni019A
+ /lambda.ipa
+ /uni019b
+ /lyogh.old % unknown glyph name, so won't be used
+ /uni0235
+ /turnce % unknown glyph name, so won't be used
% 0xb0
-/omega.ipa
-/omega.sc.ipa
-/uni0286
-/uni01AB
-/uni0236
-/uni02A6
-/uni02AE
-/uni02AF
-/uni0293
-/uni01B9
-/afii10094
-/afii10092
-/uni02C0
-/uni02C2
-/uni02C3
-/pipe.var
+ /omega.ipa
+ /omega.sc.ipa
+ /uni0286
+ /uni01AB
+ /uni0236
+ /uni02A6
+ /uni02AE
+ /uni02AF
+ /uni0293
+ /uni01B9
+ /afii10094
+ /afii10092
+ /uni02C0
+ /uni02C2
+ /uni02C3
+ /bar % was /pipe.var
% 0xc0
-/uni1D00
-/uni0188
-/uni0297
-/uni02A4
-/uni025A
-/uni029A
-/uni025E
-/uni025D
-/babygamma.old
-/uni029B
-/uni0267
-/uni029C
-/uni0269
-/bardotlessjold
-/uni0199
-/uni029F
+ /uni1D00
+ /uni0188
+ /uni0297
+ /uni02A4
+ /uni025A
+ /uni029A
+ /uni025E
+ /uni025D
+ /babygamma.old % unknown glyph name, so won't be used
+ /uni029B
+ /uni0267
+ /uni029C
+ /uni0269
+ /bardotlessjold % unknown glyph name, so won't be used
+ /uni0199
+ /uni029F
% 0xd0
-/uni026E
-/uni0277
-/uni01A5
-/uni02A0
-/uni027C
-/uni027A
-/uni01AD
-/uni0276
-/uni0287
-/uni02A7
-/uni1D1C
-/uni0296
-/uni02A1
-/uni02A2
-/uni0225
-/uni01BF
+ /uni026E
+ /uni0277
+ /uni01A5
+ /uni02A0
+ /uni027C
+ /uni027A
+ /uni01AD
+ /uni0276
+ /uni0287
+ /uni02A7
+ /uni1D1C
+ /uni0296
+ /uni02A1
+ /uni02A2
+ /uni0225
+ /uni01BF
% 0xe0
-/uni0299
-/uni0253
-/uni0257
-/uni0256
-/uni0260
-/uni0262
-/uni00E6
-/uni00E7
-/uni0127
-/uni025F
-/uni0284
-/uni026B
-/uni026C
-/uni026D
-/uni0270
-/uni0273
+ /uni0299
+ /uni0253
+ /uni0257
+ /uni0256
+ /uni0260
+ /uni0262
+ /uni00E6
+ /uni00E7
+ /uni0127
+ /uni025F
+ /uni0284
+ /uni026B
+ /uni026C
+ /uni026D
+ /uni0270
+ /uni0273
% 0xf0
-/uni0274
-/uni0272
-/uni0298
-/uni027D
-/uni0279
-/uni027B
-/uni0280
-/uni0153
-/uni00F8
-/uni0282
-/uni0288
-/uni028D
-/uni0290
-/uni0291
-/uni00FE
-/uni0195
+ /uni0274
+ /uni0272
+ /uni0298
+ /uni027D
+ /uni0279
+ /uni027B
+ /uni0280
+ /uni0153
+ /uni00F8
+ /uni0282
+ /uni0288
+ /uni028D
+ /uni0290
+ /uni0291
+ /uni00FE
+ /uni0195
] def
+%
+% LIGKERN * {L} *;
diff --git a/fonts/utilities/fontools/share/fontools_t4.enc b/fonts/utilities/fontools/share/fontools_t4.enc
new file mode 100644
index 0000000000..77664a3976
--- /dev/null
+++ b/fonts/utilities/fontools/share/fontools_t4.enc
@@ -0,0 +1,309 @@
+% Encoding file for the T4 encoding, intended for use with otftotfm.
+% Based on the file fc.rme fromnt the fc fonts package
+/otftotfmT4Encoding [
+% 0x00
+ /grave
+ /acute
+ /circumflex
+ /tilde
+ /dieresis
+ /hungarumlaut
+ /ring
+ /caron
+% 0x08
+ /breve
+ /macron
+ /dotaccent
+ /cedilla
+ /ogonek
+ /quotesinglbase
+ /guilsinglleft
+ /guilsinglright
+% 0x10
+ /quotedblleft
+ /quotedblright
+ /quotedblbase
+ /guillemotleft
+ /guillemotright
+ /endash
+ /emdash
+ /cwm
+% 0x18
+ /perthousandzero
+ /dotlessi
+ /dotlessj
+ /ff
+ /fi
+ /fl
+ /ffi
+ /ffl
+% 0x20
+ /visualspace
+ /exclam
+ /quotedbl
+ /numbersign
+ /dollar
+ /percent
+ /ampersand
+ /quoteright
+% 0x28
+ /parenleft
+ /parenright
+ /asterisk
+ /plus
+ /comma
+ /hyphen
+ /period
+ /slash
+% 0x30
+ /zero
+ /one
+ /two
+ /three
+ /four
+ /five
+ /six
+ /seven
+% 0x38
+ /eight
+ /nine
+ /colon
+ /semicolon
+ /less
+ /equal
+ /greater
+ /question
+% 0x40
+ /at
+ /A
+ /B
+ /C
+ /D
+ /E
+ /F
+ /G
+% 0x48
+ /H
+ /I
+ /J
+ /K
+ /L
+ /M
+ /N
+ /O
+% 0x50
+ /P
+ /Q
+ /R
+ /S
+ /T
+ /U
+ /V
+ /W
+% 0x58
+ /X
+ /Y
+ /Z
+ /bracketleft
+ /backslash
+ /bracketright
+ /asciicircum
+ /underscore
+% 0x60
+ /quoteleft
+ /a
+ /b
+ /c
+ /d
+ /e
+ /f
+ /g
+% 0x68
+ /h
+ /i
+ /j
+ /k
+ /l
+ /m
+ /n
+ /o
+% 0x70
+ /p
+ /q
+ /r
+ /s
+ /t
+ /u
+ /v
+ /w
+% 0x78
+ /x
+ /y
+ /z
+ /braceleft
+ /bar
+ /braceright
+ /asciitilde
+ /hyphenchar
+% 0x80
+ /Bhook
+ /Dhook
+ /Eopen
+ /Ereversed
+ /Fhook
+ /Ecaron
+ /Gammaafrican
+ /Hbar
+% 0x88
+ /Khook
+ /Nhookleft
+ /Oopen
+ /Nacute
+ /Esh
+ /Eng
+ /Vhook
+ /Yhook
+% 0x90
+ /Chook
+ /Phook
+ /Scaron
+ /Ndotaccent
+ /Nlinebelow
+ /Sdotbelow
+ /Ezh
+ /Tbar
+% 0x98
+ /Edot
+ /Edotbelow
+ /Thook
+ /Tretroflexhook
+ /tesh
+ /f_j %fj
+ /dcroat
+ /dblgravecmb
+% 0xA0
+ /bhook
+ /dhook
+ /eopen
+ /eturned
+ /uni0192
+ /ecaron
+ /gammalatinsmall
+ /hbar
+% 0xA8
+ /khook
+ /nhookleft
+ /oopen
+ /nacute
+ /esh
+ /eng
+ /vhook
+ /yhook
+% 0xB0
+ /chook
+ /phook
+ /scaron
+ /ndotaccent
+ /nlinebelow
+ /sdotbelow
+ /ezh
+ /tbar
+% 0xB8
+ /edot
+ /edotbelow
+ /thook
+ /tretroflexhook
+ /dblverticallineabovecmb
+ /exclamdown
+ /questiondown
+ /verticallineabovecmb
+% 0xC0
+ /Iotaafrican
+ /Idotbelow
+ /Eopentilde % not in Unicode
+ /Atilde
+ /Macute
+ /Oopentilde % not in Unicode
+ /AE
+ /Ccedilla
+% 0xC8
+ /Egrave
+ /Eacute
+ /Ecaron
+ /Edieresis
+ /Elinebelow % not in Unicode
+ /Emacron
+ /Etilde
+ /Itilde
+% 0xD0
+ /Dafrican
+ /Ntilde
+ /Ograve
+ /uni022E
+ /Ocircumflex
+ /Otilde
+ /Odieresis
+ /OE
+% 0xD8
+ /Oslash
+ /Odotbelow
+ /Olinebelow % not in Unicode
+ /Omacron
+ /Ocaron
+ /Udotbelow
+ /Utilde
+ /solidusshortoverlaycmb
+% 0xE0
+ /iotalatin
+ /idotbelow
+ /eopentilde % not in Unicode
+ /atilde
+ /macute
+ /oopentilde % not in Unicode
+ /ae
+ /ccedilla
+% 0xE8
+ /egrave
+ /eacute
+ /ecaron
+ /edieresis
+ /elinebelow % not in Unicode
+ /emacron
+ /etilde
+ /itilde
+% 0xF0
+ /dtail
+ /ntilde
+ /ograve
+ /uni022F
+ /ocircumflex
+ /otilde
+ /odieresis
+ /oe
+% 0xF8
+ /oslash
+ /odotbelow
+ /olinebelow % not in Unicode
+ /omacron
+ /ocaron
+ /udotbelow
+ /utilde
+ /germandbls
+] def
+%
+% UNICODING perthousandzero =: perthousandzero zeroinferior emptyslot;
+% UNICODING visualspace =: uni2423 uni02FD;
+%
+% LIGKERN question quoteleft =: questiondown;
+% LIGKERN exclam quoteleft =: exclamdown;
+% LIGKERN hyphen hyphen =: endash;
+% LIGKERN endash hyphen =: emdash;
+% LIGKERN quoteleft quoteleft =: quotedblleft;
+% LIGKERN quoteright quoteright =: quotedblright;
+% LIGKERN comma comma =: quotedblbase;
+% LIGKERN less less =: guillemotleft;
+% LIGKERN greater greater =: guillemotright;
+%
+% LIGKERN || = 32;
+%
+% UNICODING ff =: ; fi =: ; fl =: ; ffi =: ; ffl =: ;
diff --git a/fonts/utilities/fontools/share/fontools_t5.enc b/fonts/utilities/fontools/share/fontools_t5.enc
new file mode 100644
index 0000000000..9129472d4a
--- /dev/null
+++ b/fonts/utilities/fontools/share/fontools_t5.enc
@@ -0,0 +1,305 @@
+% Encoding file for the T5 encoding, intended for use with otftotfm.
+% Based on the file t5.enc from the vntex package
+/otftotfmT5Encoding [
+% 0x00
+ /grave
+ /acute
+ /circumflex
+ /tilde
+ /dieresis
+ /dotbelowcomb
+ /ring
+ /caron
+% 0x08
+ /breve
+ /macron
+ /dotaccent
+ /cedilla
+ /hookabovecomb
+ /quotesinglbase
+ /guilsinglleft
+ /guilsinglright
+% 0x10
+ /quotedblleft
+ /quotedblright
+ /quotedblbase
+ /guillemotleft
+ /guillemotright
+ /endash
+ /emdash
+ /cwm
+% 0x18
+ /perthousandzero
+ /dotlessi
+ /Yhookabove
+ /yhookabove
+ /Ydotbelow
+ /ydotbelow
+ /Dcroat
+ /dcroat
+% 0x20
+ /visualspace
+ /exclam
+ /quotedbl
+ /numbersign
+ /dollar
+ /percent
+ /ampersand
+ /quoteright
+% 0x28
+ /parenleft
+ /parenright
+ /asterisk
+ /plus
+ /comma
+ /hyphen
+ /period
+ /slash
+% 0x30
+ /zero
+ /one
+ /two
+ /three
+ /four
+ /five
+ /six
+ /seven
+% 0x38
+ /eight
+ /nine
+ /colon
+ /semicolon
+ /less
+ /equal
+ /greater
+ /question
+% 0x40
+ /at
+ /A
+ /B
+ /C
+ /D
+ /E
+ /F
+ /G
+% 0x48
+ /H
+ /I
+ /J
+ /K
+ /L
+ /M
+ /N
+ /O
+% 0x50
+ /P
+ /Q
+ /R
+ /S
+ /T
+ /U
+ /V
+ /W
+% 0x58
+ /X
+ /Y
+ /Z
+ /bracketleft
+ /backslash
+ /bracketright
+ /asciicircum
+ /underscore
+% 0x60
+ /quoteleft
+ /a
+ /b
+ /c
+ /d
+ /e
+ /f
+ /g
+% 0x68
+ /h
+ /i
+ /j
+ /k
+ /l
+ /m
+ /n
+ /o
+% 0x70
+ /p
+ /q
+ /r
+ /s
+ /t
+ /u
+ /v
+ /w
+% 0x78
+ /x
+ /y
+ /z
+ /braceleft
+ /bar
+ /braceright
+ /asciitilde
+ /sfthyphen
+% 0x80
+ /Agrave
+ /Aacute
+ /Atilde
+ /Ahookabove
+ /Adotbelow
+ /Acircumflex
+ /Acircumflexgrave
+ /Acircumflexacute
+% 0x88
+ /Acircumflextilde
+ /Acircumflexhookabove
+ /Acircumflexdotbelow
+ /Abreve
+ /Abrevegrave
+ /Abreveacute
+ /Abrevetilde
+ /Abrevehookabove
+% 0x90
+ /Abrevedotbelow
+ /Egrave
+ /Eacute
+ /Etilde
+ /Ehookabove
+ /Edotbelow
+ /Ecircumflex
+ /Ecircumflexgrave
+% 0x98
+ /Ecircumflexacute
+ /Ecircumflextilde
+ /Ecircumflexhookabove
+ /Ecircumflexdotbelow
+ /Igrave
+ /Iacute
+ /Itilde
+ /Ihookabove
+% 0xA0
+ /agrave
+ /aacute
+ /atilde
+ /ahookabove
+ /adotbelow
+ /acircumflex
+ /acircumflexgrave
+ /acircumflexacute
+% 0xA8
+ /acircumflextilde
+ /acircumflexhookabove
+ /acircumflexdotbelow
+ /abreve
+ /abrevegrave
+ /abreveacute
+ /abrevetilde
+ /abrevehookabove
+% 0xB0
+ /abrevedotbelow
+ /egrave
+ /eacute
+ /etilde
+ /ehookabove
+ /edotbelow
+ /ecircumflex
+ /ecircumflexgrave
+% 0xB8
+ /ecircumflexacute
+ /ecircumflextilde
+ /ecircumflexhookabove
+ /ecircumflexdotbelow
+ /igrave
+ /iacute
+ /itilde
+ /ihookabove
+% 0xC0
+ /Idotbelow
+ /Ograve
+ /Oacute
+ /Otilde
+ /Ohookabove
+ /Odotbelow
+ /Ocircumflex
+ /Ocircumflexgrave
+% 0xC8
+ /Ocircumflexacute
+ /Ocircumflextilde
+ /Ocircumflexhookabove
+ /Ocircumflexdotbelow
+ /Ohorn
+ /Ohorngrave
+ /Ohornacute
+ /Ohorntilde
+% 0xD0
+ /Ohornhookabove
+ /Ohorndotbelow
+ /Ugrave
+ /Uacute
+ /Utilde
+ /Uhookabove
+ /Udotbelow
+ /Uhorn
+% 0xD8
+ /Uhorngrave
+ /Uhornacute
+ /Uhorntilde
+ /Uhornhookabove
+ /Uhorndotbelow
+ /Ygrave
+ /Yacute
+ /Ytilde
+% 0xE0
+ /idotbelow
+ /ograve
+ /oacute
+ /otilde
+ /ohookabove
+ /odotbelow
+ /ocircumflex
+ /ocircumflexgrave
+% 0xE8
+ /ocircumflexacute
+ /ocircumflextilde
+ /ocircumflexhookabove
+ /ocircumflexdotbelow
+ /ohorn
+ /ohorngrave
+ /ohornacute
+ /ohorntilde
+% 0xF0
+ /ohornhookabove
+ /ohorndotbelow
+ /ugrave
+ /uacute
+ /utilde
+ /uhookabove
+ /udotbelow
+ /uhorn
+% 0xF8
+ /uhorngrave
+ /uhornacute
+ /uhorntilde
+ /uhornhookabove
+ /uhorndotbelow
+ /ygrave
+ /yacute
+ /ytilde
+] def
+%
+% UNICODING perthousandzero =: perthousandzero zeroinferior emptyslot;
+% UNICODING visualspace =: uni2423 uni02FD;
+%
+% LIGKERN hyphen hyphen =: endash;
+% LIGKERN endash hyphen =: emdash;
+% LIGKERN quoteleft quoteleft =: quotedblleft;
+% LIGKERN quoteright quoteright =: quotedblright;
+% LIGKERN comma comma =: quotedblbase;
+% LIGKERN less less =: guillemotleft;
+% LIGKERN greater greater =: guillemotright;
+%
+% LIGKERN || = 32;
diff --git a/fonts/utilities/fontools/share/fontools_ts1.enc b/fonts/utilities/fontools/share/fontools_ts1.enc
index 6905d2ff60..2ca5e6d098 100644
--- a/fonts/utilities/fontools/share/fontools_ts1.enc
+++ b/fonts/utilities/fontools/share/fontools_ts1.enc
@@ -2,292 +2,292 @@
% CODINGSCHEME TEX TEXT COMPANION SYMBOLS 1---TS1
/otftotfmTS1Encoding [
% 0x00
-/capitalgrave
-/capitalacute
-/capitalcircumflex
-/capitaltilde
-/capitaldieresis
-/capitalhungarumlaut
-/capitalring
-/capitalcaron
+ /capitalgrave
+ /capitalacute
+ /capitalcircumflex
+ /capitaltilde
+ /capitaldieresis
+ /capitalhungarumlaut
+ /capitalring
+ /capitalcaron
% 0x08
-/capitalbreve
-/capitalmacron
-/capitaldotaccent
-/cedilla
-/ogonek
-/quotesinglbase
-/.notdef
-/.notdef
+ /capitalbreve
+ /capitalmacron
+ /capitaldotaccent
+ /cedilla
+ /ogonek
+ /quotesinglbase
+ /.notdef
+ /.notdef
% 0x10
-/.notdef
-/.notdef
-/quotedblbase
-/.notdef
-/.notdef
-/twelveudash
-/threequartersemdash
-/capitalcompwordmark
+ /.notdef
+ /.notdef
+ /quotedblbase
+ /.notdef
+ /.notdef
+ /twelveudash
+ /threequartersemdash
+ /capitalcompwordmark
% 0x18
-/arrowleft
-/arrowright
-/tieaccentlowercase
-/tieaccentcapital
-/newtieaccentlowercase
-/newtieaccentcapital
-/.notdef
-/ascendercompwordmark
+ /arrowleft
+ /arrowright
+ /tieaccentlowercase
+ /tieaccentcapital
+ /newtieaccentlowercase
+ /newtieaccentcapital
+ /.notdef
+ /ascendercompwordmark
% 0x20
-/blank
-/.notdef
-/.notdef
-/.notdef
-/dollar
-/.notdef
-/.notdef
-/quotesingle
+ /blank
+ /.notdef
+ /.notdef
+ /.notdef
+ /dollar
+ /.notdef
+ /.notdef
+ /quotesingle
% 0x28
-/.notdef
-/.notdef
-/asteriskcentered
-/.notdef
-/comma
-/hyphendbl
-/period
-/fraction
+ /.notdef
+ /.notdef
+ /asteriskcentered
+ /.notdef
+ /comma
+ /hyphendbl
+ /period
+ /fraction
% 0x30
-/zerooldstyle
-/oneoldstyle
-/twooldstyle
-/threeoldstyle
-/fouroldstyle
-/fiveoldstyle
-/sixoldstyle
-/sevenoldstyle
+ /zerooldstyle
+ /oneoldstyle
+ /twooldstyle
+ /threeoldstyle
+ /fouroldstyle
+ /fiveoldstyle
+ /sixoldstyle
+ /sevenoldstyle
% 0x38
-/eightoldstyle
-/nineoldstyle
-/.notdef
-/.notdef
-/angbracketleft
-/minus
-/angbracketright
-/.notdef
+ /eightoldstyle
+ /nineoldstyle
+ /.notdef
+ /.notdef
+ /angbracketleft
+ /minus
+ /angbracketright
+ /.notdef
% 0x40
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0x48
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/Omegainv
-/.notdef
-/bigcircle
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /Omegainv
+ /.notdef
+ /bigcircle
% 0x50
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/Omega
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /Omega
% 0x58
-/.notdef
-/.notdef
-/.notdef
-/openbracketleft
-/.notdef
-/openbracketright
-/arrowup
-/arrowdown
+ /.notdef
+ /.notdef
+ /.notdef
+ /openbracketleft
+ /.notdef
+ /openbracketright
+ /arrowup
+ /arrowdown
% 0x60
-/asciigrave
-/.notdef
-/born
-/divorced
-/died
-/.notdef
-/.notdef
-/.notdef
+ /asciigrave
+ /.notdef
+ /born
+ /divorced
+ /died
+ /.notdef
+ /.notdef
+ /.notdef
% 0x68
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/leaf
-/married
-/musicalnote
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /leaf
+ /married
+ /musicalnote
+ /.notdef
% 0x70
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0x78
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/tildelow
-/hyphendblchar
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /tildelow
+ /hyphendblchar
% 0x80
-/asciibreve
-/asciicaron
-/asciiacutedbl
-/asciigravedbl
-/dagger
-/daggerdbl
-/bardbl
-/perthousand
+ /asciibreve
+ /asciicaron
+ /asciiacutedbl
+ /asciigravedbl
+ /dagger
+ /daggerdbl
+ /bardbl
+ /perthousand
% 0x88
-/bullet
-/centigrade
-/dollaroldstyle
-/centoldstyle
-/florin
-/colonmonetary
-/won
-/naira
+ /bullet
+ /centigrade
+ /dollaroldstyle
+ /centoldstyle
+ /florin
+ /colonmonetary
+ /won
+ /naira
% 0x90
-/guarani
-/peso
-/lira
-/recipe
-/interrobang
-/interrobangdown
-/dong
-/trademark
+ /guarani
+ /peso
+ /lira
+ /recipe
+ /interrobang
+ /interrobangdown
+ /dong
+ /trademark
% 0x98
-/pertenthousand
-/pilcrow
-/baht
-/numero
-/discount
-/estimated
-/openbullet
-/servicemark
+ /pertenthousand
+ /pilcrow
+ /baht
+ /numero
+ /discount
+ /estimated
+ /openbullet
+ /servicemark
% 0xA0
-/quillbracketleft
-/quillbracketright
-/cent
-/sterling
-/currency
-/yen
-/brokenbar
-/section
+ /quillbracketleft
+ /quillbracketright
+ /cent
+ /sterling
+ /currency
+ /yen
+ /brokenbar
+ /section
% 0xA8
-/asciidieresis
-/copyright
-/ordfeminine
-/copyleft
-/logicalnot
-/circledP
-/registered
-/asciimacron
+ /asciidieresis
+ /copyright
+ /ordfeminine
+ /copyleft
+ /logicalnot
+ /circledP
+ /registered
+ /asciimacron
% 0xB0
-/degree
-/plusminus
-/twosuperior
-/threesuperior
-/asciiacute
-/mu
-/paragraph
-/periodcentered
+ /degree
+ /plusminus
+ /twosuperior
+ /threesuperior
+ /asciiacute
+ /mu
+ /paragraph
+ /periodcentered
% 0xB8
-/referencemark
-/onesuperior
-/ordmasculine
-/radical
-/onequarter
-/onehalf
-/threequarters
-/euro
+ /referencemark
+ /onesuperior
+ /ordmasculine
+ /radical
+ /onequarter
+ /onehalf
+ /threequarters
+ /euro
% 0xC0
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xC8
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xD0
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/multiply
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /multiply
+ /.notdef
% 0xD8
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xE0
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xE8
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xF0
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/divide
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /divide
+ /.notdef
% 0xF8
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
] def
diff --git a/fonts/utilities/fontools/share/fontools_ts3.enc b/fonts/utilities/fontools/share/fontools_ts3.enc
index 15ebbb33d0..c272b4f246 100644
--- a/fonts/utilities/fontools/share/fontools_ts3.enc
+++ b/fonts/utilities/fontools/share/fontools_ts3.enc
@@ -1,276 +1,286 @@
% A version of the TS3 encoding, intended for use with otftotfm.
+%
+% I don't remember where I found this; but it contains many
+% non-standard glyph names (i.e., missing from glyphlist.txt),
+% so that otftotfm won't use those slots.
+%
+% TODO: we should try and find these glyphs in the Unicode standard
+% and replace the non-standard names with /uni.... codes.
+%
% CODINGSCHEME IPA SYMBOL ENCODING
/otftotfmTS3Encoding [
% 0x00
-/revpolhook
-/rhooklong
-/palhooklong
-/palhookvar
-/rectanglesuperscript
-/leftarrowsuperscript
-/uni02D7
-/arrowdown.ipa
-/uparrow.ipa
-/uni0362
-/space_uni034D
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /revpolhook % unknown glyph name, so won't be used
+ /rhooklong % unknown glyph name, so won't be used
+ /palhooklong % unknown glyph name, so won't be used
+ /palhookvar % unknown glyph name, so won't be used
+ /rectanglesuperscript % unknown glyph name, so won't be used
+ /leftarrowsuperscript % unknown glyph name, so won't be used
+ /uni02D7
+ /arrowdown.ipa
+ /arrowup.ipa % was /uparrow.ipa
+ /uni0362
+ /uni034D % was /space_uni034D
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0x10
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0x20
-/uni1D90
-/scriptainverted
-/uniA735
-/uniA72D
-/uni0297.var
-/stretchccurl
-/stretchcvarcurl
-/dfronthook
-/dfronthook.var
-/uni0238
-/uni1D92
-/uni1D93
-/gamma.ipa
-/gammafronttail
-/gammabacktail
-/hhookrtail
+ /uni1D90
+ /scriptainverted % unknown glyph name, so won't be used
+ /uniA735
+ /uniA72D
+ /uni0297.var
+ /stretchccurl % unknown glyph name, so won't be used
+ /stretchcvarcurl % unknown glyph name, so won't be used
+ /dfronthook % unknown glyph name, so won't be used
+ /dfronthook.var % unknown glyph name, so won't be used
+ /uni0238
+ /uni1D92
+ /uni1D93
+ /gamma.ipa
+ /gammafronttail % unknown glyph name, so won't be used
+ /gammabacktail % unknown glyph name, so won't be used
+ /hhookrtail % unknown glyph name, so won't be used
% 0x30
-/uniA727
-/uni027F
-/jcrossedtailvar
-/uni0284.var
-/hm
-/nfrontbar
-/uni019E
-/female
-/uni26B2
-/uni0298.old
-/uni1D97
-/omegainverted
-/plhook
-/uni0239
-/uni01AA
-/tfronthook
+ /uniA727
+ /uni027F
+ /jcrossedtailvar % unknown glyph name, so won't be used
+ /uni0284.var
+ /hm % unknown glyph name, so won't be used
+ /nfrontbar % unknown glyph name, so won't be used
+ /uni019E
+ /female
+ /uni26B2
+ /uni0298.old
+ /uni1D97
+ /omegainverted % unknown glyph name, so won't be used
+ /plhook % unknown glyph name, so won't be used
+ /uni0239
+ /uni01AA
+ /tfronthook % unknown glyph name, so won't be used
% 0x40
-/invertedtcurl
-/twoturned
-/uni01BA
-/threeturned
-/invertedglotstopcurl
-/glotstopturned
-/pipe.var
-/uni01C1.var
-/uni01C2.var
-/lr
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /invertedtcurl % unknown glyph name, so won't be used
+ /twoturned % unknown glyph name, so won't be used
+ /uni01BA
+ /threeturned % unknown glyph name, so won't be used
+ /invertedglotstopcurl % unknown glyph name, so won't be used
+ /glotstopturned % unknown glyph name, so won't be used
+ /bar % was /pipe.var
+ /uni01C1.var
+ /uni01C2.var
+ /lr % unknown glyph name, so won't be used
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0x50
-/thorn.var1
-/thorn.var2
-/thorn.var3
-/thorn.var4
-/uni0294.var1
-/uni0294.var2
-/uni0294.var3
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /thorn.var1
+ /thorn.var2
+ /thorn.var3
+ /thorn.var4
+ /uni0294.var1
+ /uni0294.var2
+ /uni0294.var3
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0x60
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0x70
-/ascinverted
-/ao.sc
-/delta.sc.ipa
-/uniA730
-/uni1D0B
-/kscturned
-/lscreversed
-/uni1D0D
-/uni1D18
-/q.sc.ipa
-/uni1D19
-/uscturned
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /ascinverted % unknown glyph name, so won't be used
+ /ao.sc % unknown glyph name, so won't be used
+ /delta.sc.ipa
+ /uniA730
+ /uni1D0B
+ /kscturned % unknown glyph name, so won't be used
+ /lscreversed % unknown glyph name, so won't be used
+ /uni1D0D
+ /uni1D18
+ /q.sc.ipa
+ /uni1D19
+ /uscturned % unknown glyph name, so won't be used
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0x80
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0x90
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xa0
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xb0
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xc0
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xd0
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xe0
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
% 0xf0
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
+ /.notdef
] def
+%
+% LIGKERN * {L} *;
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/Makefile b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/Makefile
index e58dba0ac6..4235b7b579 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/Makefile
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/Makefile
@@ -25,9 +25,22 @@ $(NAME).pdf: $(NAME).dtx $(NAME).bbx $(STY1).bbx $(STY1).cbx british-$(NAME).lbx
$(STYS:%=%-doc.pdf): %-doc.pdf : %-doc.tex $(NAME).bbx %.bbx %.cbx british-$(NAME).lbx english-$(NAME).lbx
latexmk -silent -lualatex -shell-escape -interaction=nonstopmode $< >/dev/null
+test-oxalph.tex : test-template.tex
+ sed 's/style=oxref/style=oxalph/' $< > $@
+test-oxnotes.tex : test-template.tex
+ sed 's/style=oxref/style=oxnotes,scnames/' $< > $@
+test-oxnum.tex : test-template.tex
+ sed 's/style=oxref/style=oxnum,scnames,backref=true/' $< > $@
+test-oxyear.tex : test-template.tex
+ sed 's/style=oxref/style=oxyear/' $< > $@
+$(STYS:%=test-%.pdf): test-%.pdf : test-%.tex $(NAME).bbx %.bbx %.cbx british-$(NAME).lbx english-$(NAME).lbx
+ latexmk -silent -lualatex -shell-escape -interaction=nonstopmode $< >/dev/null
+$(STYS:%=%.bbi): %.bbi : test-%.pdf
+ pdftotext $< $@
+
clean:
@for log in *.log; do [ -e "$$log" ] || continue; grep "WARNING: biblatex-oxref" $$log; test $$? -eq 1; done
- rm -f $(NAME).{$(AUX)} $(STYS:%=%-doc.{$(AUX)})
+ rm -f $(NAME).{$(AUX)} $(STYS:%=%-doc.{$(AUX)}) $(STYS:%=test-%.{tex,pdf}) $(STYS:%=test-%.{$(AUX)})
rm -f $(STYS:%=%.doc) {american,british,english}-$(NAME).doc
rm -rf _minted-*
rm -f $(NAME).markdown.in
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/README.md b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/README.md
index 070e51eb27..8d5c13f87a 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/README.md
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/README.md
@@ -140,7 +140,7 @@ first two steps.
## Licence
-Copyright 2016–2021 Alex Ball.
+Copyright 2016–2023 Alex Ball.
This work consists of the documented LaTeX file oxref.dtx and a Makefile.
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxalph-doc.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxalph-doc.pdf
index d298a7d4f2..a0d43bbfef 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxalph-doc.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxalph-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnotes-doc.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnotes-doc.pdf
index 032b19373f..f43b5fa6bf 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnotes-doc.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnotes-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnum-doc.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnum-doc.pdf
index 8851a9b454..e7d2cae73f 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnum-doc.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnum-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.dtx b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.dtx
index 66eeb6bee5..6ce62d568e 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.dtx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.dtx
@@ -1,6 +1,6 @@
% \iffalse
%<*internal|bbx|cbx|dbx|lbx|doc>
-\def\Version{2021/01/18 v2.2}
+\def\Version{2023/02/01 v3.0}
%</internal|bbx|cbx|dbx|lbx|doc>
%<*internal>
\iffalse
@@ -133,6 +133,16 @@ stipulations and examples provided by the 2014 *New Hart's Rules* and the 2002
edition = {2},
publisher = {Oxford University Press},
location = {Oxford, UK}}
+@book{law.oxford2012oscola,
+ author = {{Faculty of Law, University of Oxford}},
+ editor = {Donal Nolan and Sandra Meredith},
+ title = {{OSCOLA}},
+ subtitle = {The {Oxford} {University} Standard for Citation of Legal Authorities},
+ date = {2012},
+ edition = {4},
+ publisher = {Hart},
+ location = {Oxford, UK},
+ url = {https://www.law.ox.ac.uk/oscola}}
%</bib>
%<*internal>
\fi
@@ -166,7 +176,7 @@ See: http://www.latex-project.org/lppl.txt
\endpreamble
\postamble
-Copyright (C) 2016–2021 Alex Ball
+Copyright (C) 2016–2023 Alex Ball
\endpostamble
\usedir{tex/latex/\jobname}
@@ -380,6 +390,13 @@ Copyright (C) 2016–2021 Alex Ball
}
%</doc>
+%<*!doc>
+\usepackage[tightLists=false]{markdown}
+\markdownSetup{rendererPrototypes={%
+ link = {\href{#3}{#1}},%
+}}
+
+%</!doc>
\hypersetup{pdfborder={0 0 0},pdfencoding=unicode}
\usepackage[noabbrev,capitalize,nameinlink]{cleveref}
\crefname{page}{page}{pages}
@@ -476,10 +493,6 @@ Copyright (C) 2016–2021 Alex Ball
\GetFileInfo{\jobname.tex}
%</doc>
%<*driver>
-\usepackage[tightLists=false]{markdown}
-\markdownSetup{rendererPrototypes={%
- link = {\href{#3}{#1}}%
-}}
% For typesetting the implementation
\makeatletter
@@ -842,7 +855,7 @@ first two steps.
## Licence
-Copyright 2016–2021 Alex Ball.
+Copyright 2016–2023 Alex Ball.
This work consists of the documented LaTeX file oxref.dtx and a Makefile.
@@ -1066,6 +1079,9 @@ Where a source is provided, it refers to a section from one of the reference wor
\item[NHR]
\fullcite{waddingham2014nhr}
+
+\item[OSCOLA]
+\fullcite{law.oxford2012oscola}
\end{description}
Where the source is starred (*), this indicates the example is not quite how it appears in the book,
@@ -1238,7 +1254,7 @@ Up to two author names are given, after which \enquote{et al.} is used.
brady.etal1994hehsa}
\end{egcite}
-If different authors have the same surname, they are distiguished by their initial.
+If different authors have the same surname, they are distinguished by their initial.
%</y>
%</n|m|a|y>
@@ -1368,8 +1384,8 @@ to put \enquote{(Ps.-)} after the name in the bibliography.
%<n|m><OGS \S15.2.1>
%<a|y><OGS \S15.2.1\textdagger>
{boethius1976dds}
-%<n|m>\textsc{Boethius (Ps.-)}, \emph{De disciplina scolarium: Édition critique, introduction et notes}, ed. Olga Weijers (Leiden, 1976).
-%<a|y>Boethius (Ps.-) (1976), \emph{De disciplina scolarium: Édition critique, introduction et notes}, ed. O.\ Weijers (Leiden).
+%<n|m>\textsc{Boethius} (\textsc{Ps.-}), \emph{De disciplina scolarium: Édition critique, introduction et notes}, ed. Olga Weijers (Leiden, 1976).
+%<a|y>Boethius (Ps.-) (1976), \emph{De disciplina scolarium: Édition critique, introduction et notes}, ed.\@ O. Weijers (Leiden).
\toggletrue{blx@bibliography}
\tcblower
\begin{Verbatim}
@@ -1399,9 +1415,9 @@ Oxford style is to give the attribution in square brackets.
\begin{bibexbox}
%<n|m><OGS \S15.2.1>
%<a|y><OGS \S15.2.1\textdagger>
-{balfour1768pe}
-%<n|m>{[James Balfour]}, \emph{Philosophical Essays} (Edinburgh, 1768).
-%<a|y>{[Balfour, J.]} (1768), \emph{Philosophical Essays} (Edinburgh).
+{balfour1768pe}[]
+%<n|m>[James Balfour], \emph{Philosophical Essays} (Edinburgh, 1768).
+%<a|y>[Balfour, J.] (1768), \emph{Philosophical Essays} (Edinburgh).
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@@ -1509,7 +1525,7 @@ In cases where an author changes the name under which they publish (e.g.\ due to
%<n|m><OGS \S15.17.4>
%<a|y><OGS \S15.17.4\textdagger>
{joukovsky1967gdd}
-%<n|m>\textsc{Joukovsky, F.} (= \textsc{Joukovsky-Micha, F.}), \enquote{La Guerre des dieux et des géants chez les poètes francais du XVI\textsuperscript{e} siècle (1500–1585)}, \emph{Bibliothèque d'Humanisme et Renaissance}, 29 (1967), 55–92.
+%<n|m>\textsc{Joukovsky}, \textsc{F.} (= \textsc{Joukovsky-Micha}, \textsc{F.}), \enquote{La Guerre des dieux et des géants chez les poètes francais du XVI\textsuperscript{e} siècle (1500–1585)}, \emph{Bibliothèque d'Humanisme et Renaissance}, 29 (1967), 55–92.
%<a|y>Joukovsky, F. (= Joukovsky-Micha, F.) (1967), \enquote{La Guerre des dieux et des géants chez les poètes francais du XVI\textsuperscript{e} siècle (1500–1585)}, \emph{Bibliothèque d'Humanisme et Renaissance}, 29: 55–92.
\toggletrue{blx@bibliography}
\tcblower
@@ -1553,8 +1569,8 @@ If the contribution of the translators or revisers is so great they could be joi
\begin{bibexbox}
{kuehner.blass1890ef}
-%<n|m>\textsc{Kühner, Raphael}, rev. \textsc{Blass, Friedrich}, \emph{Ausführliche grammatik der griechischen sprache}, i: \emph{Elementar- und Formenlehre} (Hannover: Hahnsche Buchhandlung, 1890–2).
-%<a|y>Kühner, R., rev. Blass, F. (1890–2), \emph{Ausführliche grammatik der griechischen sprache}, i: \emph{Elementar- und Formenlehre} (Hannover: Hahnsche Buchhandlung).
+%<n|m>\textsc{Kühner}, \textsc{Raphael}, rev. \textsc{Blass}, \textsc{Friedrich}, \emph{Ausführliche grammatik der griechischen sprache}, i: \emph{Elementar- und Formenlehre} (Hannover: Hahnsche Buchhandlung, 1890–2).
+%<a|y>Kühner, R., rev. Blass, F. (1890–2), \emph{Ausführliche grammatik der griechischen sprache}, i: \emph{Elementar- und Formenlehre} (Hannover: Hahnsche Buchhandlung).
\toggletrue{blx@bibliography}
\tcblower
\begin{Verbatim}
@@ -1803,7 +1819,7 @@ The \emph{Oxford Guide to Style} consistently prefers volume and part numbers to
%<*n|m>
\begin{bibexbox}<OGS \S15.4.1>
{goldblatt1973dmm}
-Robert Goldblatt, \enquote{Diodorean Modality in Minkowski Space-Time}, \emph{Studia Logica}, 39/3 (1973), 219--36.
+Robert Goldblatt, \enquote{Diodorean Modality in Minkowski Space-Time}, \emph{Studia Logica}, 39/3 (1973), 219–36.
\tcblower
\begin{Verbatim}
%</n|m>
@@ -1848,7 +1864,7 @@ Hollingsworth, T. H. (1957), \enquote{A Demographic Study of the British Ducal F
% Internal quotes, subtitle, no number
\begin{bibexbox}<OGS \S15.4.1>
{inalcik1992csm}
-Halil Inalcik, \enquote{Comments on \enquote{Sultanism}: Max Weber's Typification of the Ottoman Polity}, \emph{Princeton Papers in Near Eastern Studies}, 1 (1992), 49--72.
+Halil Inalcik, \enquote{Comments on \enquote{Sultanism}: Max Weber's Typification of the Ottoman Polity}, \emph{Princeton Papers in Near Eastern Studies}, 1 (1992), 49–72.
\tcblower
\begin{Verbatim}
%</n|m>
@@ -1897,8 +1913,8 @@ Unwin, T. (1994), \enquote{Structural Change in Estonian Agriculture: From Comma
%<n|m><OGS \S15.2.1>
%<a|y><OGS \S15.2.1\textdagger>
{vaucouleurs1975nmn}
-%<n|m>Gerald de Vaucouleurs et al., \enquote{The New Martian Nomenclature of the International Astronomical Union}, \emph{Icarus}, 26 (1975), 85--98.
-%<a|y>Vaucouleurs, G. de, et al. (1975), \enquote{The New Martian Nomenclature of the International Astronomical Union}, \emph{Icarus}, 26: 85--98.
+%<n|m>Gerald de Vaucouleurs et al., \enquote{The New Martian Nomenclature of the International Astronomical Union}, \emph{Icarus}, 26 (1975), 85–98.
+%<a|y>Vaucouleurs, G. de, et al. (1975), \enquote{The New Martian Nomenclature of the International Astronomical Union}, \emph{Icarus}, 26: 85–98.
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@@ -1919,8 +1935,8 @@ Unwin, T. (1994), \enquote{Structural Change in Estonian Agriculture: From Comma
%<n|m><NHR \S18.8.5>
%<a|y><NHR \S18.8.5\textdagger>
{druin2002rcd}
-%<n|m>A. Druin, \enquote{The Role of Children in the Design of New Technology}, \emph{Behaviour \& Information Technology}, 21/1 (2002), 1–25. doi: \path{10.1080/01449290110108659}
-%<a|y>Druin, A. (2002), \enquote{The Role of Children in the Design of New Technology}, \emph{Behaviour \& Information Technology}, 21/1: 1–25. doi: \path{10.1080/01449290110108659}
+%<n|m>A. Druin, \enquote{The Role of Children in the Design of New Technology}, \emph{Behaviour \& Information Technology}, 21/1 (2002), 1–25. doi: \nolinkurl{10.1080/01449290110108659}
+%<a|y>Druin, A. (2002), \enquote{The Role of Children in the Design of New Technology}, \emph{Behaviour \& Information Technology}, 21/1: 1–25. doi: \nolinkurl{10.1080/01449290110108659}
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@@ -1942,8 +1958,8 @@ Unwin, T. (1994), \enquote{Structural Change in Estonian Agriculture: From Comma
%<n|m><NHR \S18.8.5*>
%<a|y><NHR \S18.8.5*\textdagger>
{li.etal2013flh}
-%<n|m>Shu Li et al., \enquote{Forever Love: The Hitherto Earliest Record of Copulating Insects from the Middle Jurassic of China}, \emph{PLoS ONE}, 8/11 (2013), e78188. doi: \path{10.1371/journal.pone.0078188}
-%<a|y>Li, S. et al. (2013), \enquote{Forever Love: The Hitherto Earliest Record of Copulating Insects from the Middle Jurassic of China}, \emph{PLoS ONE}, 8/11, e78188. doi: \path{10.1371/journal.pone.0078188}
+%<n|m>Shu Li et al., \enquote{Forever Love: The Hitherto Earliest Record of Copulating Insects from the Middle Jurassic of China}, \emph{PLoS ONE}, 8/11 (2013), e78188. doi: \nolinkurl{10.1371/journal.pone.0078188}
+%<a|y>Li, S., et al. (2013), \enquote{Forever Love: The Hitherto Earliest Record of Copulating Insects from the Middle Jurassic of China}, \emph{PLoS ONE}, 8/11, e78188. doi: \nolinkurl{10.1371/journal.pone.0078188}
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@@ -1967,7 +1983,7 @@ Unwin, T. (1994), \enquote{Structural Change in Estonian Agriculture: From Comma
%<*n|m>
\begin{bibexbox}<OGS \S15.4.1>
{lindars1965eir}
-B. Lindars, \enquote{Ezechiel and Individual Responsibility}, \emph{VT} 15 (1965), 452--67.
+B. Lindars, \enquote{Ezechiel and Individual Responsibility}, \emph{VT} 15 (1965), 452–67.
\tcblower
\begin{Verbatim}
%</n|m>
@@ -2017,8 +2033,8 @@ B. Lindars, \enquote{Ezechiel and Individual Responsibility}, \emph{VT} 15 (1965
%<n|m><NHR \S18.3.3>
%<a|y><NHR \S18.3.3\textdagger>
{moody1953mdb}
-%<n|m>T. W. Moody, \enquote{Michael Davitt and the British Labour Movement, 1882--1906}, \emph{Transactions of the Royal Historical Society}, 5th ser., 3 (1953), 53–76.
-%<a|y>Moody, T. W. (1953), \enquote{Michael Davitt and the British Labour Movement, 1882--1906}, \emph{Transactions of the Royal Historical Society}, 5th ser., 3: 53–76.
+%<n|m>T. W. Moody, \enquote{Michael Davitt and the British Labour Movement, 1882–1906}, \emph{Transactions of the Royal Historical Society}, 5th ser., 3 (1953), 53–76.
+%<a|y>Moody, T. W. (1953), \enquote{Michael Davitt and the British Labour Movement, 1882–1906}, \emph{Transactions of the Royal Historical Society}, 5th ser., 3: 53–76.
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@@ -2041,7 +2057,7 @@ B. Lindars, \enquote{Ezechiel and Individual Responsibility}, \emph{VT} 15 (1965
%<*n|m>
\begin{bibexbox}<OGS \S15.4.3>
{barnes1971has}
-J. Barnes, \enquote{Homonymy in Aristotle and Speusippus}, \emph{Classical Quarterly}, \textsc{ns} 21 (1971), 65--80.
+J. Barnes, \enquote{Homonymy in Aristotle and Speusippus}, \emph{Classical Quarterly}, \textsc{ns} 21 (1971), 65–80.
\tcblower
\begin{Verbatim}
%</n|m>
@@ -2094,7 +2110,7 @@ Hankinson, R. J. (1989), \enquote{Galen and the Best of All Possible Worlds}, \e
% No author
\begin{bibexbox}<OGS \S15.4.1>
{bw1984wen}
-\enquote{Who's Excellent Now?}, \emph{Business Week}, 5 Nov. 1984, 76--86.
+\enquote{Who's Excellent Now?}, \emph{Business Week}, 5 Nov. 1984, 76–86.
\tcblower
\begin{Verbatim}
%</n|m>
@@ -2153,7 +2169,7 @@ Marx, K. (1842), \enquote{Der Kommunismus und die Augsburger \enquote{Allgemeine
% No pages
\begin{bibexbox}<OGS \S15.19.2>
{who1983nsb}
-WHO (World Health Organization) (1983), \enquote{Nutrition: Sex Bias of Nutritional Status of Children 0--4 Years}, \emph{Weekly Epidemiologial Record}, 20 May.
+WHO (World Health Organization) (1983), \enquote{Nutrition: Sex Bias of Nutritional Status of Children 0–4 Years}, \emph{Weekly Epidemiologial Record}, 20 May.
\tcblower
\begin{Verbatim}
%</a|y>
@@ -2178,8 +2194,8 @@ WHO (World Health Organization) (1983), \enquote{Nutrition: Sex Bias of Nutritio
%<n|m><OGS \S15.3>
%<a|y><OGS \S15.3\textdagger>
{boyce1957pgi}
-%<n|m>M. Boyce, \enquote{The Parthian \emph{Gsn} and Iranian Minstrel Tradition}, \emph{Journal of the Royal Asiatic Society}, 1957, 10--45.
-%<a|y>Boyce, M. (1957), \enquote{The Parthian \emph{Gsn} and Iranian Minstrel Tradition}, \emph{Journal of the Royal Asiatic Society}: 10--45.
+%<n|m>M. Boyce, \enquote{The Parthian \emph{Gsn} and Iranian Minstrel Tradition}, \emph{Journal of the Royal Asiatic Society}, 1957, 10–45.
+%<a|y>Boyce, M. (1957), \enquote{The Parthian \emph{Gsn} and Iranian Minstrel Tradition}, \emph{Journal of the Royal Asiatic Society}: 10–45.
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@@ -2209,8 +2225,8 @@ or add the book details to a periodical entry.
%<n|m><OGS \S15.4.1>
%<a|y><OGS \S15.4.1\textdagger>
{bec1976isc}
-%<n|m>C. Bec (ed.), \emph{Italie 1500--1550: Une situation de crise?} = \emph{Annales de l'Université Jean Moulin}, 1975/2 (Langues étrangères, 2; Lyon, 1976), 99--109.
-%<a|y>Bec, C. (1976) (ed.), \emph{Italie 1500--1550: Une situation de crise?} = \emph{Annales de l'Université Jean Moulin}, 1975/2 (Langues étrangères, 2; Lyon), 99--109.
+%<n|m>C. Bec (ed.), \emph{Italie 1500–1550: Une situation de crise?} = \emph{Annales de l'Université Jean Moulin}, 1975/2 (Langues étrangères, 2; Lyon, 1976), 99–109.
+%<a|y>Bec, C. (1976) (ed.), \emph{Italie 1500–1550: Une situation de crise?} = \emph{Annales de l'Université Jean Moulin}, 1975/2 (Langues étrangères, 2; Lyon), 99–109.
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@@ -2242,8 +2258,8 @@ or add the book details to a periodical entry.
%<n|m><OGS \S15.4.1>
%<a|y><OGS \S15.4.1\textdagger>
{trisoglio1973gnq}
-%<n|m>F. Trisoglio, \emph{Gregorio di Nazianzo in un quarentennio di recherche (1925--1965)} = \emph{Rivista Iasalliana}, 40 (1973).
-%<a|y>Trisoglio, F. (1973), \emph{Gregorio di Nazianzo in un quarentennio di recherche (1925--1965)} = \emph{Rivista Iasalliana}, 40.
+%<n|m>F. Trisoglio, \emph{Gregorio di Nazianzo in un quarentennio di recherche (1925–1965)} = \emph{Rivista Iasalliana}, 40 (1973).
+%<a|y>Trisoglio, F. (1973), \emph{Gregorio di Nazianzo in un quarentennio di recherche (1925–1965)} = \emph{Rivista Iasalliana}, 40.
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@@ -2271,8 +2287,8 @@ or add the book details to a periodical entry.
%<n|m><OGS \S15.4.1>
%<a|y><OGS \S15.4.1\textdagger>
{zhentao.etal1989ars}
-%<n|m>X. Zhentao, K. K. C. Yau, and F. R. Stephenson, \enquote{Astronomical Records on the Shang Dynasty Oracle Bones}, \emph{Archaeoastronomy}, 14 (1989); Supplement to \emph{Journal for the History of Astronomy}, 20, pp. S61--S72.
-%<a|y>Zhentao, X., Yau, K. K. C., and Stephenson, F. R. (1989) \enquote{Astronomical Records on the Shang Dynasty Oracle Bones}, \emph{Archaeoastronomy}, 14; Supplement to \emph{Journal for the History of Astronomy}, 20, pp. S61--S72.
+%<n|m>X. Zhentao, K. K. C. Yau, and F. R. Stephenson, \enquote{Astronomical Records on the Shang Dynasty Oracle Bones}, \emph{Archaeoastronomy}, 14 (1989); Supplement to \emph{Journal for the History of Astronomy}, 20, pp. S61–S72.
+%<a|y>Zhentao, X., Yau, K. K. C., and Stephenson, F. R. (1989), \enquote{Astronomical Records on the Shang Dynasty Oracle Bones}, \emph{Archaeoastronomy}, 14; Supplement to \emph{Journal for the History of Astronomy}, 20: pp. S61–S72.
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@@ -2411,8 +2427,8 @@ in a periodical, this is a descriptor rather than a title.
%<n|m><OGS \S15.4.4>
%<a|y><OGS \S15.4.4\textdagger>
{dean1995rpb}
-%<n|m>J. Dean, review of Philippe Basiron, \emph{My Early Life} (Bourges, 1994), in \emph{Res facta}, 17 (1995), 56--9.
-%<a|y>Dean, J. (1995), review of P. Basiron (1994), \emph{My Early Life} (Bourges), in \emph{Res facta}, 17: 56--9.
+%<n|m>J. Dean, review of Philippe Basiron, \emph{My Early Life} (Bourges, 1994), in \emph{Res facta}, 17 (1995), 56–9.
+%<a|y>Dean, J. (1995), review of P. Basiron (1994), \emph{My Early Life} (Bourges), in \emph{Res facta}, 17: 56–9.
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@@ -2437,8 +2453,8 @@ in a periodical, this is a descriptor rather than a title.
%<n|m><OGS \S15.4.4>
%<a|y><OGS \S15.4.4\textdagger>
{jocelyn1989pav}
-%<n|m>H. D. Jocelyn, \enquote{Probus and Virgil}, review of Maria Luisa Delvigo, \emph{Testo virgiliano e tradizione indiretta} (Pisa, 1987), in \emph{CR}, \textsc{ns} 39 (1989), 27--8.
-%<a|y>Jocelyn, H. D. (1989), \enquote{Probus and Virgil}, review of M. L. Delvigo (1987), \emph{Testo virgiliano e tradizione indiretta} (Pisa), in \emph{CR}, \textsc{ns} 39: 27--8.
+%<n|m>H. D. Jocelyn, \enquote{Probus and Virgil}, review of Maria Luisa Delvigo, \emph{Testo virgiliano e tradizione indiretta} (Pisa, 1987), in \emph{CR}, \textsc{ns} 39 (1989), 27–8.
+%<a|y>Jocelyn, H. D. (1989), \enquote{Probus and Virgil}, review of M. L. Delvigo (1987), \emph{Testo virgiliano e tradizione indiretta} (Pisa), in \emph{CR}, \textsc{ns} 39: 27–8.
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@@ -2635,7 +2651,7 @@ Smith, T. (1988), \emph{Famine and Gender} (New Haven, Conn.).
%<a|y><OGS \S15.2.1\textdagger>
{boas.botschuyver1952dc}
%<n|m>\emph{Distichia Catonis}, ed. Marcus Boas and Henricus Johannes Botschuyver (Amsterdam, 1952).
-%<a|y>\emph{Distichia Catonis} (1952), ed. M.\ Boas and H.\ J.\ Botschuyver (Amsterdam).
+%<a|y>\emph{Distichia Catonis} (1952), ed. M. Boas and H. J. Botschuyver (Amsterdam).
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@@ -2768,7 +2784,7 @@ Where all volumes were published consistently, the following form is used:
%<a|y>\spec{Author (Year), \emph{Title}, n \lit{vols.} (Location: Publisher), VolNo. Pages.}
%<*n>
-\begin{egcite}{\dots(Brussels, 1867--88), ii. 367--8}
+\begin{egcite}{\dots(Brussels, 1867–88), ii. 367–8}
\cite[ii.~\mkcomprange{367-368}]%
{straeten1867lmp}
\end{egcite}
@@ -2784,8 +2800,8 @@ Where all volumes were published consistently, the following form is used:
%<n|m><OGS \S15.2.6>
%<a|y><OGS \S15.2.6\textdagger>
{straeten1867lmp}%
-%<n|m>Edmond Vander Straeten, \emph{La Musique aux Pays-Bas avant le XIX\textsuperscript{e} siècle}, 8 vols. (Brussels, 1867--88).
-%<a|y>Vander Straeten, E. (1867--88), \emph{La Musique aux Pays-Bas avant le XIX\textsuperscript{e} siècle}, 8 vols. (Brussels).
+%<n|m>Edmond Vander Straeten, \emph{La Musique aux Pays-Bas avant le XIX\textsuperscript{e} siècle}, 8 vols. (Brussels, 1867–88).
+%<a|y>Vander Straeten, E. (1867–88), \emph{La Musique aux Pays-Bas avant le XIX\textsuperscript{e} siècle}, 8 vols. (Brussels).
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@@ -2808,8 +2824,8 @@ Where the publisher changed between volumes, the following form is used:
%<n|m><OGS \S15.2.6*>
%<a|y><OGS \S15.2.6*\textdagger>
{ritter1838hap}
-%<n|m>Heinrich Ritter, \emph{The History of Ancient Philosophy}, trans. Alexander J. W. Morrison, 4~vols. (Oxford: Talboys and London: Bohn, 1838--46).
-%<a|y>Ritter, H. (1838--46), \emph{The History of Ancient Philosophy}, trans. A. J. W. Morrison, 4~vols. (Oxford: Talboys and London: Bohn).
+%<n|m>Heinrich Ritter, \emph{The History of Ancient Philosophy}, trans. Alexander J. W. Morrison, 4~vols. (Oxford: Talboys and London: Bohn, 1838–46).
+%<a|y>Ritter, H. (1838–46), \emph{The History of Ancient Philosophy}, trans. A. J. W. Morrison, 4~vols. (Oxford: Talboys and London: Bohn).
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@@ -2840,7 +2856,7 @@ Where the publisher changed between volumes, the following form is used:
%<a|y><OGS \S15.2.6*\textdagger>
{ritter1838hap:mv}
%<n|m>Heinrich Ritter, \emph{The History of Ancient Philosophy}, trans. Alexander J. W. Morrison, 4~vols., i–iii (Oxford: Talboys, 1838–9), iv (London: Bohn, 1846).
-%<a|y>Ritter, H (1838-46). \emph{The History of Ancient Philosophy}, trans. A. J. W. Morrison, 4~vols., i–iii (Oxford: Talboys, 1838–9), iv (London: Bohn, 1846).
+%<a|y>Ritter, H. (1838–46), \emph{The History of Ancient Philosophy}, trans. A. J. W. Morrison, 4~vols., i–iii (Oxford: Talboys, 1838–9), iv (London: Bohn, 1846).
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@@ -2877,20 +2893,20 @@ Where the volumes are merely numbered, the following form is used:
%</n|m|a|y>
%<*n>
-\begin{egcite}{\dots ii (Brussels, 1867--88), 367--8}
-\cite[367--368]{straeten1867lmp.ii}
+\begin{egcite}{\dots ii (Brussels, 1867–88), 367–8}
+\cite[367–368]{straeten1867lmp.ii}
\end{egcite}
%</n>
%<*m>
\begin{egcite}{}
-\cite[367--368]{straeten1867lmp.ii}
+\cite[367–368]{straeten1867lmp.ii}
\end{egcite}
%</m>
%<*n|m>
\begin{bibexbox}<OGS \S15.2.6>
{straeten1867lmp.ii}
-Edmond Vander Straeten, \emph{La Musique aux Pays-Bas avant le XIX\textsuperscript{e} siècle}, ii (Brussels, 1867--88).
+Edmond Vander Straeten, \emph{La Musique aux Pays-Bas avant le XIX\textsuperscript{e} siècle}, ii (Brussels, 1867–88).
\tcblower
\begin{Verbatim}
%</n|m>
@@ -2940,14 +2956,14 @@ the following form is used:
%<n|m><OGS \S15.2.2>
%<a|y><OGS \S15.2.2\textdagger>
{brady.etal1994hehsa}
-%<n|m>Thomas A. Brady, Jr., Heiko A. Oberman, and James D. Tracy (eds.), \emph{Handbook of European History, 1400--1600: Late Middle Ages, Renaissance and Reformation}, i: \emph{Structures and Assertions} (Leiden: E. J. Brill, 1994).
-%<a|y>Brady, Jr., T. A., Oberman, H. A., and Tracy, J. D. (1994) (eds.), \emph{Handbook of European History, 1400--1600: Late Middle Ages, Renaissance and Reformation}, i: \emph{Structures and Assertions} (Leiden: E. J. Brill).
+%<n|m>Thomas A. Brady, Jr., Heiko A. Oberman, and James D. Tracy (eds.), \emph{Handbook of European History, 1400–1600: Late Middle Ages, Renaissance and Reformation}, i: \emph{Structures and Assertions} (Leiden: E. J. Brill, 1994).
+%<a|y>Brady, Jr., T. A., Oberman, H. A., and Tracy, J. D. (1994) (eds.), \emph{Handbook of European History, 1400–1600: Late Middle Ages, Renaissance and Reformation}, i: \emph{Structures and Assertions} (Leiden: E. J. Brill).
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@mvcollection{brady.etal1994hehsa,
editor = {Brady, Jr., Thomas A. and Heiko A. Oberman and James D. Tracy},
- maintitle = {Handbook of European History, 1400--1600},
+ maintitle = {Handbook of European History, 1400–1600},
mainsubtitle = {{Late} {Middle} {Ages,} {Renaissance} and {Reformation}},
volume = {1},
title = {Structures and Assertions},
@@ -2959,7 +2975,7 @@ the following form is used:
\end{bibexbox}
%<*n>
-\begin{egcite}{\dots (Cambridge: CUP, 1932), 42--56}
+\begin{egcite}{\dots (Cambridge: CUP, 1932), 42–56}
\cite[42-56]{ward.waller1932che}
\end{egcite}
%</n>
@@ -3004,14 +3020,14 @@ the following form is used:
%<n|m><NHR \S18.2.7>
%<a|y><NHR \S18.2.7\textdagger>
{fischer1989asf}
-%<n|m>David Hackett Fischer, \emph{Albion’s Seed: Four British Folkways in America}, [vol.\ i of \emph{America: A Cultural History}] (New York: Oxford University Press, 1989).
-%<a|y>Fischer, D. H. (1989), \emph{Albion’s Seed: Four British Folkways in America}, [vol.\ i of \emph{America: A Cultural History}] (New York: Oxford University Press).
+%<n|m>David Hackett Fischer, \emph{Albion's Seed: Four British Folkways in America}, [vol.\@ i of \emph{America: A Cultural History}] (New York: Oxford University Press, 1989).
+%<a|y>Fischer, D. H. (1989), \emph{Albion's Seed: Four British Folkways in America}, [vol.\@ i of \emph{America: A Cultural History}] (New York: Oxford University Press).
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@book{fischer1989asf,
author = {David Hackett Fischer},
- title = {Albion’s Seed},
+ title = {Albion's Seed},
subtitle = {Four British Folkways in America},
volume = {1},
maintitle = {America},
@@ -3025,7 +3041,7 @@ the following form is used:
\section{Additions, translations, and revisions}
-Where works have significant introductions, forewords, afterwords, illustrations, etc.\ this may be noted as follows:
+Where works have significant introductions, forewords, afterwords, illustrations, etc.\@ this may be noted as follows:
%<n|m>\spec{Author, \emph{Title}, \lit{with an} Addition \lit{by} Contributor (Location: Publisher, Year).}
%<a|y>\spec{Author (Year), \emph{Title}, \lit{with an} Addition \lit{by} Contributor (Location: Publisher).}
@@ -3059,8 +3075,8 @@ Translators are credited as follows:
%<n|m><NHR \S18.2.14>
%<a|y><NHR \S18.2.14\textdagger>
{bischoff1990lpa}
-%<n|m>Bernhard Bischoff, \emph{Latin Palaeography: Antiquity and the Middle Ages}, trans. Dáibhi Ó Cróinín and David Ganz (Cambridge, 1990).
-%<a|y>Bischoff, B. (1990), \emph{Latin Palaeography: Antiquity and the Middle Ages}, trans. D. Ó Cróinín and D. Ganz (Cambridge).
+%<n|m>Bernhard Bischoff, \emph{Latin Palaeography: Antiquity and the Middle Ages}, trans. Dáibhi Ó~Cróinín and David Ganz (Cambridge, 1990).
+%<a|y>Bischoff, B. (1990), \emph{Latin Palaeography: Antiquity and the Middle Ages}, trans. D. Ó~Cróinín and D. Ganz (Cambridge).
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@@ -3068,15 +3084,15 @@ Translators are credited as follows:
author = {Bernhard Bischoff},
title = {Latin Palaeography},
subtitle = {Antiquity and the Middle Ages},
- translator = {Dáibhi Ó Cróinín and David Ganz},
+ translator = {Dáibhi Ó~Cróinín and David Ganz},
location = {Cambridge},
date = {1990}}
%<*n|m|a|y>
\end{Verbatim}
\end{bibexbox}
-%<n|m>\spec{Author, \emph{Title}, \lit{trans.\ with} Addition Translator(s) (Location: Publisher, Year).}
-%<a|y>\spec{Author (Year), \emph{Title}, \lit{trans.\ with} Addition Translator(s) (Location: Publisher).}
+%<n|m>\spec{Author, \emph{Title}, \lit{trans.\@ with} Addition Translator(s) (Location: Publisher, Year).}
+%<a|y>\spec{Author (Year), \emph{Title}, \lit{trans.\@ with} Addition Translator(s) (Location: Publisher).}
\begin{bibexbox}
%<n|m><NHR \S18.2.14>
@@ -3112,7 +3128,7 @@ Where the author\slash editor is common to both, the following form is used:
%</n|m|a|y>
%<*n>
-\begin{egcite}{\dots (3rd edn., 1990), 419--21}
+\begin{egcite}{\dots (3rd edn., 1990), 419–21}
\cite[419-421]{baker1990iel}
\end{egcite}
%</n>
@@ -3139,7 +3155,7 @@ J. H. Baker, \emph{An Introduction to English Legal History} (3rd edn., 1990).
%<*a|y>
\begin{bibexbox}<NHR \S17.3.2*>
{maitland2001mvr}
-Maitland, G. (2001), \emph{Maitland's Vertebral Manipulation} (6th edn., Oxford: Butterworth--Heinemann).
+Maitland, G. (2001), \emph{Maitland's Vertebral Manipulation} (6th edn., Oxford: Butterworth–Heinemann).
\tcblower
\begin{Verbatim}
%</a|y>
@@ -3236,9 +3252,9 @@ J. D. Denniston, \emph{The Greek Particles} (1934; 2nd edn., Oxford, 1954).
\tip{Use the localization key \code{revised} as the edition to get \enquote{revised edition}. Use the localization key \code{revisedenlarged} as the edition to get \enquote{revised and enlarged edition}}
-\begin{bibexbox}<OGS \S15.2.1*>
-{gibbon1686dfs}
-{[John Gibbon]}, \emph{Day-Fatality: Or Some Observations on Days Lucky and Unlucky}, (London, 1678; rev.~edn., 1686).
+\begin{bibexbox}<OGS \S15.2.1>
+{gibbon1686dfs}[]
+[John Gibbon], \emph{Day-Fatality: Or Some Observations on Days Lucky and Unlucky} (London, 1678; rev.~edn., 1686).
\tcblower
\begin{Verbatim}
%</n|m>
@@ -3288,21 +3304,27 @@ Marx, K. (1867), \emph{Capital: A Critique of Political Economy}, i, trans. B. F
If the publication has not been revised, but has been re-typeset by a different publisher,
the \emph{Oxford Guide to Style} suggests putting the original date in a note at the end,
-rather than within the publication block%
+after rather than within the publication block%
%<n|m>.
%<a|y>, but this does not affect the author–date style since the original date is at the head of the reference anyway.
%<n|m>\spec{Author, \emph{Title} (Location: Publisher, Year) (\lit{originally pub.} Year).}
%<a|y>\spec{Author (OrigYear), \emph{Title} (Location: Publisher).}
-%<n|m>\tip{This format is triggered if you specify an original date but do not specify the original publisher or location, nor the edition of the later publication.}
-%<n|m>\info{In the following example, you will see the style uses \enquote{originally published} instead of \enquote{first published}. This is because \enquote{originally} is more common among the available examples.}
+%<*n|m>
+\tip{This format is triggered if you specify an original date but do not specify the original publisher or location, nor the edition of the later publication.}
+\info{In the \emph{Oxford Guide to Style}, the following example has the string \enquote{first pub.\@} in place of the more common \enquote{originally pub.\@};
+to use this phrase in all entries, use the regular \pkg{biblatex} command to reset the string:}
+\begin{tcblisting}{listing only,left skip=2em}
+\DefineBibliographyStrings{english}{origpubin={first pub\adddot}}
+\end{tcblisting}
+%</n|m>
\begin{bibexbox}
-%<n|m><OGS \S15.2.3>
+%<n|m><OGS \S15.2.3*>
%<a|y><OGS \S15.2.3\textdagger>
{bettelheim1976uem}
-%<n|m>Bruno Bettelheim, \emph{The Uses of Enchantment: The Meaning and Importance of Fairy Tales} (Harmondsworth: Penguin Books, 1988) (first pub. 1976).
+%<n|m>Bruno Bettelheim, \emph{The Uses of Enchantment: The Meaning and Importance of Fairy Tales} (Harmondsworth: Penguin Books, 1988) (originally pub. 1976).
%<a|y>Bettelheim, B. (1976), \emph{The Uses of Enchantment: The Meaning and Importance of Fairy Tales} (Harmondsworth: Penguin Books, 1988).
\tcblower
\begin{Verbatim}
@@ -3330,8 +3352,8 @@ rather than within the publication block%
%<n|m><OGS \S15.2.4>
%<a|y><OGS \S15.2.4\textdagger>
{adam.tannery1897odd}
-%<n|m>C. Adam and D. Tannery (eds.), \emph{Œuvres de Descartes} (Paris: Cerf, 1897--1913; repr. Paris: J. Vrin, CNRS, 1964--76).
-%<a|y>Adam, C. and Tannery, D. (1897--1913) (eds.), \emph{Œuvres de Descartes} (Paris: Cerf; repr. Paris: J. Vrin, CNRS, 1964--76).
+%<n|m>C. Adam and D. Tannery (eds.), \emph{Œuvres de Descartes} (Paris: Cerf, 1897–1913; repr. Paris: J. Vrin, CNRS, 1964–76).
+%<a|y>Adam, C., and Tannery, D. (1897–1913) (eds.), \emph{Œuvres de Descartes} (Paris: Cerf; repr. Paris: J. Vrin, CNRS, 1964–76).
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@@ -3545,8 +3567,8 @@ provide both to make it easier to locate.
%<n|m><OGS \S15.2.5>
%<a|y><OGS \S15.2.5\textdagger>
{salinger1953ns}
-%<n|m>J. D. Salinger, \emph{Nine Stories} (Boston: Little, Brown, 1953), published in the UK as \emph{For Esmé---With Love and Squalor, and Other Stories} (London: Hamish Hamilton, 1953).
-%<a|y>Salinger, J. D. (1953), \emph{Nine Stories} (Boston: Little, Brown), published in the UK as \emph{For Esmé---With Love and Squalor, and Other Stories} (London: Hamish Hamilton, 1953).
+%<n|m>J. D. Salinger, \emph{Nine Stories} (Boston: Little, Brown, 1953), published in the UK as \emph{For Esmé—With Love and Squalor, and Other Stories} (London: Hamish Hamilton, 1953).
+%<a|y>Salinger, J. D. (1953), \emph{Nine Stories} (Boston: Little, Brown), published in the UK as \emph{For Esmé—With Love and Squalor, and Other Stories} (London: Hamish Hamilton, 1953).
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@@ -3580,7 +3602,7 @@ provide both to make it easier to locate.
%<*n|m>
\begin{bibexbox}<OGS \S15.2.7>
{garlandia1972dmm}
-Johannes de Garlandia, \emph{De mensurabili musica}, ed. Erich Reimer, 2 vols. (Beihefte zum Archiv für Musikwissenschaft, 10--11; Wiesbaden, 1972).
+Johannes de Garlandia, \emph{De mensurabili musica}, ed. Erich Reimer, 2 vols. (Beihefte zum Archiv für Musikwissenschaft, 10–11; Wiesbaden, 1972).
\tcblower
\begin{Verbatim}
%</n|m>
@@ -3726,7 +3748,7 @@ The \code{incollection} entry type is intended for citing one of a collection of
%<*n|m>
\begin{bibexbox}<OGS \S15.3>
{shearman1993vsf}
-John Shearman, \enquote{The Vatican Stanze: Functions and Decoration}, in George Holmes (ed.), \emph{Art and Politics in Renaissance Italy: British Academy Lectures} (Oxford: Clarendon Press, 1993), 185--240.
+John Shearman, \enquote{The Vatican Stanze: Functions and Decoration}, in George Holmes (ed.), \emph{Art and Politics in Renaissance Italy: British Academy Lectures} (Oxford: Clarendon Press, 1993), 185–240.
\tcblower
\begin{Verbatim}
%</n|m>
@@ -3770,9 +3792,9 @@ Magarey, M. E. (1988), \enquote{Examination of the Cervical and Thoracic Spine},
\end{Verbatim}
\end{bibexbox}
-\begin{bibexbox}<NHR \S17.3.2>
+\begin{bibexbox}<NHR \S17.3.2*>
{jessop1997gcc}
-Jessop, B. (1997), \enquote{The Governance of Complexity and Complexity of Governance}, in A. Amin and J. Hausner (eds.), \emph{Beyond Markets and Hierarchy}, (Aldershot: Edward Elgar).
+Jessop, B. (1997), \enquote{The Governance of Complexity and Complexity of Governance}, in A. Amin and J. Hausner (eds.), \emph{Beyond Markets and Hierarchy} (Aldershot: Edward Elgar).
\tcblower
\begin{Verbatim}
%</a|y>
@@ -3834,11 +3856,11 @@ Biblatex provides the \code{bookinbook} entry type for citing a part of an antho
\tip{Use \code{origdate} to give the date of original publication.}
\begin{bibexbox}
-%<n|m><OGS \S15.3>
-%<a|y><OGS \S15.3\textdagger>
+%<n|m><OGS \S15.3*>
+%<a|y><OGS \S15.3*\textdagger>
{frege1892osr}
-%<n|m>G. Frege, \enquote{On Sense and Reference}, in id., \emph{Philosophical Writings}, trans. and ed. P. T. Geach and M. Black (Oxford: Blackwell, 1952) (originally pub. 1892).
-%<a|y>Frege, G. (1892), \enquote{On Sense and Reference}, in id., \emph{Philosophical Writings}, trans. and ed. P. T. Geach and M. Black (Oxford: Blackwell, 1952).
+%<n|m>G. Frege, \enquote{On Sense and Reference}, in id., \emph{Philosophical Writings}, ed. and trans. P. T. Geach and M. Black (Oxford: Blackwell, 1952) (originally pub. 1892).
+%<a|y>Frege, G. (1892), \enquote{On Sense and Reference}, in id., \emph{Philosophical Writings}, ed. and trans. P. T. Geach and M. Black (Oxford: Blackwell, 1952).
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@@ -3858,6 +3880,12 @@ Biblatex provides the \code{bookinbook} entry type for citing a part of an antho
\end{Verbatim}
\end{bibexbox}
+\info{In the \emph{Oxford Guide to Style}, the above example has the string \enquote{trans.\@ and ed.\@} in place of \enquote{ed.\@ and trans.\@};
+to use this phrase in all entries, use the regular \pkg{biblatex} command to reset the string:}
+\begin{tcblisting}{listing only,left skip=2em}
+\DefineBibliographyStrings{english}{byeditortr={trans\adddotspace and ed\adddot}}
+\end{tcblisting}
+
\subsection{Both versions equally accessible}
\tip{Put the key of the original work in \code{related}, and in \code{relatedtype} use the keyword \code{reprintfrom}.}
@@ -3866,8 +3894,8 @@ Biblatex provides the \code{bookinbook} entry type for citing a part of an antho
%<n|m><OGS \S15.3>
%<a|y><OGS \S15.3\textdagger>
{owen1986pi}
-%<n|m>G. E. L. Owen, \enquote{Philosophical Invective}, in id., \emph{Logic, Science and Dialectic}, ed. M. Nussbaum (Ithaca, NY: Cornell University Press, 1986), 347--64. From \emph{Oxford Studies in Ancient Philosophy}, 1 (1983), 1--25.
-%<a|y>Owen, G. E. L. (1986) \enquote{Philosophical Invective}, in id., \emph{Logic, Science and Dialectic}, ed. M. Nussbaum (Ithaca, NY: Cornell University Press), 347--64. From \emph{Oxford Studies in Ancient Philosophy}, 1 (1983): 1--25.
+%<n|m>G. E. L. Owen, \enquote{Philosophical Invective}, in id., \emph{Logic, Science and Dialectic}, ed. M. Nussbaum (Ithaca, NY: Cornell University Press, 1986), 347–64. From \emph{Oxford Studies in Ancient Philosophy}, 1 (1983), 1–25.
+%<a|y>Owen, G. E. L. (1986), \enquote{Philosophical Invective}, in id., \emph{Logic, Science and Dialectic}, ed. M. Nussbaum (Ithaca, NY: Cornell University Press), 347–64. From \emph{Oxford Studies in Ancient Philosophy}, 1 (1983): 1–25.
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@@ -4001,8 +4029,8 @@ The \code{proceedings} entry type is intended for a set of conference papers tha
%<n|m><OGS \S15.2.12>
%<a|y><OGS \S15.2.12\textdagger>
{icp1975pic}
-%<n|m>\emph{Proceedings of the XIV International Congress of Papyrologists: Oxford, 24--31 July 1974} (London, 1975).
-%<a|y>\emph{Proceedings of the XIV International Congress of Papyrologists: Oxford, 24--31 July 1974} (1975) (London).
+%<n|m>\emph{Proceedings of the XIV International Congress of Papyrologists: Oxford, 24–31 July 1974} (London, 1975).
+%<a|y>\emph{Proceedings of the XIV International Congress of Papyrologists: Oxford, 24–31 July 1974} (1975) (London).
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@@ -4037,8 +4065,8 @@ The \code{proceedings} entry type is intended for a set of conference papers tha
%<n|m><OGS \S15.2.13>
%<a|y><OGS \S15.2.13\textdagger>
{iau1922tia}
-%<n|m>International Astronomical Union, \emph{Transactions of the International Astronomical Union, Rome}, 12--20 May 1922 (London: Imperial College Bookstall, 1922).
-%<a|y>International Astronomical Union (1922), \emph{Transactions of the International Astronomical Union, Rome}, 12--20 May 1922 (London: Imperial College Bookstall).
+%<n|m>International Astronomical Union, \emph{Transactions of the International Astronomical Union, Rome}, 12–20 May 1922 (London: Imperial College Bookstall, 1922).
+%<a|y>International Astronomical Union (1922), \emph{Transactions of the International Astronomical Union, Rome}, 12–20 May 1922 (London: Imperial College Bookstall).
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@@ -4235,7 +4263,7 @@ The \code{inproceedings} entry type is intended for a conference paper published
%<*n|m>
\begin{bibexbox}<OGS \S15.6>
{holfordstrevens1999hlm}
-Leofranc Holford-Strevens, \enquote{Humanism and the Language of Music Theory Treatises}, paper given at the 65th Annual Meeting of the American Musicological Society, Kansas City, MO, 4--7 Nov. 1999.
+Leofranc Holford-Strevens, \enquote{Humanism and the Language of Music Theory Treatises}, paper given at the 65th Annual Meeting of the American Musicological Society, Kansas City, MO, 4–7 Nov. 1999.
\tcblower
\begin{Verbatim}
%</n|m>
@@ -4282,7 +4310,7 @@ Mason, J. B., Habicht, J. P., and Tabatabai, H. (1984), \enquote{Notes on Nutrit
%<*a|y>
\begin{bibexbox}<OGS \S15.19.2>
{pritchard.pritchard1990ard}
-Pritchard, E., and Pritchard, J. (1990), \enquote{A Reply to Drèze}, unpub.\ paper.
+Pritchard, E., and Pritchard, J. (1990), \enquote{A Reply to Drèze}, unpub.\@ paper.
\tcblower
\begin{Verbatim}
%</a|y>
@@ -4291,7 +4319,7 @@ Pritchard, E., and Pritchard, J. (1990), \enquote{A Reply to Drèze}, unpub.\ pa
author = {E. Pritchard and J. Pritchard},
date = {1990},
title = {A Reply to Drèze},
- howpublished = {unpub.\ paper}}
+ howpublished = {unpub.\@ paper}}
%</a|y|bib>
%<*a|y>
\end{Verbatim}
@@ -4395,9 +4423,9 @@ WHO (World Health Organization) (1986), \emph{Nutrition and Development in East
\end{Verbatim}
\end{bibexbox}
-\begin{bibexbox}<NHR \S17.3.2>
+\begin{bibexbox}<NHR \S17.3.2*>
{cnnr2008tut}
-CNNR/GMH (Comisión Nacional de Reparación y Reconciliación y Grupo de Memoria Historica) (2008), \emph{Trujilla: Una Tragedia que no Cesa [Trujilla: A Tragedy Without End]}, (Bogotá, Columbia: CNRR).
+CNNR/GMH (Comisión Nacional de Reparación y Reconciliación y Grupo de Memoria Historica) (2008), \emph{Trujilla: Una Tragedia que no Cesa} [\emph{Trujilla: A Tragedy Without End}] (Bogotá, Columbia: CNRR).
\tcblower
\begin{Verbatim}
%</a|y>
@@ -4434,7 +4462,9 @@ CNNR/GMH (Comisión Nacional de Reparación y Reconciliación y Grupo de Memoria
%<*a|y>
\begin{bibexbox}<OGS \S15.19.2>
{opcs1979amt}
-Office of Population Censuses and Surveys (1979a), \emph{Area Mortality Tables: The Registrar-General's Decennial Supplement for England and Wales 1969--1973}, Series DS, No.~3 (London)
+%<a>Office of Population Censuses and Surveys (1979),
+%<y>Office of Population Censuses and Surveys (1979\emph{a}),
+\emph{Area Mortality Tables: The Registrar-General's Decennial Supplement for England and Wales 1969–1973}, Series DS, No.~3 (London)
\tcblower
\begin{Verbatim}
%</a|y>
@@ -4443,7 +4473,7 @@ Office of Population Censuses and Surveys (1979a), \emph{Area Mortality Tables:
author = {{Office of Population Censuses and Surveys}},
date = {1979},
title = {Area Mortality Tables},
- subtitle = {The Registrar-General's Decennial Supplement for England and Wales 1969--1973},
+ subtitle = {The Registrar-General's Decennial Supplement for England and Wales 1969–1973},
series = {Series DS},
number = {3},
location = {London}}
@@ -4454,7 +4484,9 @@ Office of Population Censuses and Surveys (1979a), \emph{Area Mortality Tables:
\begin{bibexbox}<OGS \S15.19.2>
{opcs1979pnc}
-Office of Population Censuses and Surveys (1979b), \emph{Projections of the New Commonwealth and Pakistani Population}, OPCS Monitor PP2 79/1 (London)
+%<a>Office of Population Censuses and Surveys (1979),
+%<y>Office of Population Censuses and Surveys (1979\emph{b}),
+\emph{Projections of the New Commonwealth and Pakistani Population}, OPCS Monitor PP2 79/1 (London)
\tcblower
\begin{Verbatim}
%</a|y>
@@ -4870,7 +4902,7 @@ The \emph{Oxford Guide to Style} offers several ways of expressing the recording
%</n|m|a|y>
@music{pageNDmn,
title = {The Mirror of Narcissus},
- subtitle = {Songs by Guillaume do Machaut},
+ subtitle = {Songs by Guillaume de Machaut},
editor = {{Gothic Voices}},
editortype = {performer},
editora = {Christopher Page},
@@ -4980,7 +5012,7 @@ Sometimes publishers will put several works on a single release without giving i
%<a|y><NHR \S18.7.2*\textdagger>
{davis1997sw}
%<n|m>Miles Davis et al., \enquote{So What}, in \emph{Kind of Blue}, rec. 1959 (Columbia CK 64935, 1997) [CD].
-%<a|y>Davis, M. et al. (1959), \enquote{So What}, in \emph{Kind of Blue} (Columbia CK 64935, 1997) [CD].
+%<a|y>Davis, M., et al. (1959), \enquote{So What}, in \emph{Kind of Blue} (Columbia CK 64935, 1997) [CD].
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@@ -5034,8 +5066,8 @@ Sometimes publishers will put several works on a single release without giving i
%<n|m><OGS \S15.14.2>
%<a|y><OGS \S15.14.2\textdagger>
{britt1986pho}
-%<n|m>\enquote{Percy and Harold and Other Stories}, \emph{Thomas the Tank Engine and Friends} series (Britt Allcroft 5-014861-100224, 1986).
-%<a|y>\enquote{Percy and Harold and Other Stories} (1986), \emph{Thomas the Tank Engine and Friends} series (Britt Allcroft 5-014861-100224).
+%<n|m>\enquote{Percy and Harold and Other Stories}, \emph{Thomas the Tank Engine and Friends \textup{series}} (Britt Allcroft 5-014861-100224, 1986).
+%<a|y>\enquote{Percy and Harold and Other Stories} (1986), \emph{Thomas the Tank Engine and Friends \textup{series}} (Britt Allcroft 5-014861-100224).
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@@ -5083,8 +5115,8 @@ Sometimes publishers will put several works on a single release without giving i
%<n|m><OGS \S15.14.2>
%<a|y><OGS \S15.14.2\textdagger>
{reiner1983tst}
-%<n|m>\emph{This is Spinal Tap: A Rockumentary by Marti Di Bergi}, dir.\ Rob Reiner (Embassy Pictures, 1983).
-%<a|y>\emph{This is Spinal Tap: A Rockumentary by Marti Di Bergi} (1983), dir.\ R. Reiner (Embassy Pictures).
+%<n|m>\emph{This is Spinal Tap: A Rockumentary by Marti Di Bergi}, dir.\@ Rob Reiner (Embassy Pictures, 1983).
+%<a|y>\emph{This is Spinal Tap: A Rockumentary by Marti Di Bergi} (1983), dir.\@ R. Reiner (Embassy Pictures).
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@@ -5108,11 +5140,11 @@ Sometimes publishers will put several works on a single release without giving i
\begin{bibexbox}
-%<n|m><OGS \S15.14.2>
-%<a|y><OGS \S15.14.2\textdagger>
+%<n|m><OGS \S15.14.2*>
+%<a|y><OGS \S15.14.2*\textdagger>
{kaurismaki1989lcg}
-%<n|m>\emph{Leningrad Cowboys Go America} (Villealfa Filmproductions, 1989), dir.\@ and screenplay by Aki Kaurismäki, story by Sakke Järvenpää, Aki Kaurismäki, Mato Valtonen.
-%<a|y>\emph{Leningrad Cowboys Go America} (1989) (Villealfa Filmproductions), dir.\@ and screenplay by A. Kaurismäki, story by S. Järvenpää, A. Kaurismäki, M. Valtonen.
+%<n|m>\emph{Leningrad Cowboys Go America} (Villealfa Filmproductions, 1989), dir.\@ and screenplay by Aki Kaurismäki, story by Sakke Järvenpää, Aki Kaurismäki, and Mato Valtonen.
+%<a|y>\emph{Leningrad Cowboys Go America} (1989) (Villealfa Filmproductions), dir.\@ and screenplay by A. Kaurismäki, story by S. Järvenpää, A. Kaurismäki, and M. Valtonen.
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@@ -5120,7 +5152,7 @@ Sometimes publishers will put several works on a single release without giving i
title = {Leningrad Cowboys Go America},
publisher = {Villealfa Filmproductions},
date = {1989},
- editortype = {dir.\ and screenplay by},
+ editortype = {dir.\@ and screenplay by},
editor = {Aki Kaurismäki},
editoratype = {story by},
editora = {Sakke Järvenpää and Aki Kaurismäki and Mato Valtonen},
@@ -5263,7 +5295,7 @@ The \emph{Oxford Guide to Style} prints all information about the transmission,
%<n|m><NHR \S18.8.5*>
%<a|y><NHR \S18.8.5*\textdagger>
{perry2013ifm}
-%<n|m>Grayson Perry, \enquote{I Found Myself in the Art World} [podcast], Reith Lecture, BBC Radio 4 (5 Nov. 2013), \url{http://downloads.bbc.co.uk/podcasts/radio4/reith/reith_20131105-0940b.mp3}, accessed 5 Nov. 2013.
+%<n|m>Grayson Perry, \enquote{I Found Myself in the Art World} [podcast], Reith Lecture, BBC Radio 4 (5 Nov. 2013), \url{http://downloads.bbc.co.uk/podcasts/radio4/reith/reith_20131105-0940b.mp3}, accessed 5 Nov. 2013.
%<a|y>Perry, G. (2013), \enquote{I Found Myself in the Art World} [podcast], Reith Lecture, BBC Radio 4 (5 Nov.), \url{http://downloads.bbc.co.uk/podcasts/radio4/reith/reith_20131105-0940b.mp3}, accessed 5 Nov. 2013.
\tcblower
\begin{Verbatim}
@@ -5318,7 +5350,7 @@ The \emph{Oxford Guide to Style} prints all information about the transmission,
%<a|y><NHR \S18.8.5*\textdagger>
{yousafzai2013mwa}
%<n|m>Malala Yousafzai, \enquote{Making a Wish for Action on Global Education: Malala Yousafzai Addresses Youth Assembly at UN on her 16th Birthday, 12 July 2013} [webcast], UN Web TV (12 July 2013), \url{http://webtv.un.org/search/malala-yousafzai-un-youth-assembly/2542094251001?term=malala}, accessed 15 Feb. 2015.
-%<a|y>Yousafzai, M. (2013), \enquote{Making a Wish for Action on Global Education: Malala Yousafzai Addresses Youth Assembly at UN on her 16th Birthday, 12 July 2013} [webcast], UN Web TV, (12 July), \url{http://webtv.un.org/search/malala-yousafzai-un-youth-assembly/2542094251001?term=malala}, accessed 15 Feb. 2015.
+%<a|y>Yousafzai, M. (2013), \enquote{Making a Wish for Action on Global Education: Malala Yousafzai Addresses Youth Assembly at UN on her 16th Birthday, 12 July 2013} [webcast], UN Web TV (12 July), \url{http://webtv.un.org/search/malala-yousafzai-un-youth-assembly/2542094251001?term=malala}, accessed 15 Feb. 2015.
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@@ -5551,7 +5583,7 @@ Standard \textsf{biblatex} only provides for one title for online resources, whi
%<a|y><NHR \S18.8.5\textdagger>
{hooper2013lfs}
%<n|m>Richard Hooper, \enquote{Lebanon's Forgotten Space Programme}, BBC News Magazine (14 Nov. 2013), \url{http://www.bbc.co.uk/news/magazine-24735423}, accessed 14 Nov. 2013.
-%<a|y>Hooper, R. (2013), \enquote{Lebanon's Forgotten Space Programme}, BBC News Magazine (14 Nov.) \url{http://www.bbc.co.uk/news/magazine-24735423}, accessed 14 Nov. 2013.
+%<a|y>Hooper, R. (2013), \enquote{Lebanon's Forgotten Space Programme}, BBC News Magazine (14 Nov.), \url{http://www.bbc.co.uk/news/magazine-24735423}, accessed 14 Nov. 2013.
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@@ -5838,7 +5870,14 @@ Standard \textsf{biblatex} only provides for one title for online resources, whi
\pkg[biblatex]{Oxref} provides only a basic level of support for legal references, in case you need to use some in a mainly non-legal text.
For a more thorough and robust treatment, intended for a specialist readership, I recommend you use the \pkg{oscola} style instead.
-Since there is a family resemblence between the \emph{Oxford Guide to Style\slash New Hart's Rules} and the \emph{Oxford Standard for the Citation of Legal Authorities}, \pkg[biblatex]{oxref} largely mimics \pkg{oscola} and its data model, though there are some small formatting differences. What you should \emph{not} expect from \pkg[biblatex]{oxref} are facilities for compiling specialist indices of sources, or anything special regarding the handling of postnotes.
+Since there is a family resemblence between the \emph{Oxford Guide to Style\slash New Hart's Rules}
+and the \emph{Oxford Standard for the Citation of Legal Authorities},
+\pkg[biblatex]{oxref} largely mimics \pkg{oscola} and its data model, though there are some small formatting differences.
+What you should \emph{not} expect from \pkg[biblatex]{oxref} are facilities for compiling specialist indices of sources,
+or anything special regarding the handling of postnotes.
+
+\pkg[biblatex]{Oxref} follows \pkg{oscola} in stripping out abbreviation dots from most fields using regular expressions,
+but if you want to retain a dot that it strips, you can do so by writing it \verb|{.}|, \cs{adddot} or \cs{addotspace}.
%<y>Since legal references are usually cited using footnotes, how \textsf{oxyear} should behave is not well defined. As a result, I have not configured it to do anything fancy: the full reference will be formatted just the same as with \textsf{oxnotes}, and citations will typically be title–year using parentheses in the usual way. I am open to suggestions for how to handle things better.
@@ -5848,7 +5887,7 @@ Since there is a family resemblence between the \emph{Oxford Guide to Style\slas
Use the \code{jurisdiction} entry type for citing cases.
-\tip{Use the \code{keyword} field to specify the jurisdiction. The following are recognized:
+\tip{Use the \code{keywords} field to specify the jurisdiction. The following are recognized:
\begin{itemize}
\item\val{gb}
United Kingdom
@@ -5972,6 +6011,26 @@ Use the \code{jurisdiction} entry type for citing cases.
\tip{Use the (non-standard) \code{neutralcite} or \code{number} field for the neutral citation or case number.}
\begin{bibexbox}
+<OSCOLA \S2.1.1>
+{corr08}
+\emph{Corr v IBC Vehicles Ltd} [2008] UKHL 13, [2008] 1 AC 884
+\tcblower
+\begin{Verbatim}
+%</n|m|a|y>
+@jurisdiction{corr08,
+ title = {Corr v. I.B.C. Vehicles Ltd.},
+ keywords = {gb},
+ date = {2008},
+ neutralcite = {[2008] UKHL 13},
+ journaltitle = {A.C.},
+ volume = {1},
+ pages = {884},
+ options = {year-essential}}
+%<*n|m|a|y>
+\end{Verbatim}
+\end{bibexbox}
+
+\begin{bibexbox}
<NHR \S13.4.1>
{rvg2004}
\emph{R v G} [2003] UKHL 50, [2004] 1 AC 1034
@@ -6088,23 +6147,40 @@ Both the \emph{Oxford Guide to Style} and \emph{New Hart's Rules} are inconsiste
\end{bibexbox}
\begin{bibexbox}
-<NHR \S13.4.1>
-{michael1976}
-\emph{Michael v Johnson}, 426 US 346 (1976)
+<OSCOLA \S2.2*>
+{hislop42}
+\emph{Hislop v Durham} (1842) 4 D 1168
\tcblower
\begin{Verbatim}
%</n|m|a|y>
-@jurisdiction{michael1976,
- title = {Michael v. Johnson},
- volume = {426},
- reporter = {U.S.},
- pages = {346},
- date = {1976},
- keywords = {us}}
+@jurisdiction{hislop42,
+ title = {Hislop v. Durham},
+ date = {1842},
+ volume = {4},
+ reporter = {D},
+ pages = {1168},
+ keywords = {sc}}
%<*n|m|a|y>
\end{Verbatim}
\end{bibexbox}
+\begin{bibexbox}
+<OSCOLA \S2.2*>
+{crofters02}
+\emph{Crofters Commission v Scottish Ministers}, 2002 SLT (Land Ct) 19
+\tcblower
+\begin{Verbatim}
+%</n|m|a|y>
+@jurisdiction{crofters02,
+ title = {Crofters Commission v. Scottish Ministers},
+ date = {2002},
+ reporter = {SLT},
+ series = {(Land Ct)},
+ pages = {19},
+ keywords = {sc}}
+%<*n|m|a|y>
+\end{Verbatim}
+\end{bibexbox}
\subsection{Unreported cases}
@@ -6141,6 +6217,23 @@ Both the \emph{Oxford Guide to Style} and \emph{New Hart's Rules} are inconsiste
\end{Verbatim}
\end{bibexbox}
+\tip{Unreported cases with a \code{neutralcite} or \code{number} do not show the date after the \code{institution}.}
+
+\begin{bibexbox}
+<OSCOLA \S2.1.4>
+{calvert02}
+\emph{Calvert v Gardiner} [2002] EWHC 1394 (QB)
+\tcblower
+\begin{Verbatim}
+%</n|m|a|y>
+@jurisdiction{calvert02,
+ title = {Calvert v. Gardiner},
+ neutralcite = {[2002] EWHC 1394},
+ institution = {QB},
+ date = {2002-01-01}}
+%<*n|m|a|y>
+\end{Verbatim}
+\end{bibexbox}
\subsection{European cases}
@@ -6176,7 +6269,35 @@ Case C–118/07 \emph{Commission of the European Communities v Finland} [2002] E
\end{Verbatim}
\end{bibexbox}
-\tip{Indicate Commission Decisions by putting \code{Commission} in the \code{institution} field. If a decision has a formal decision number, put this in the \code{number} field, and put the case number in the (non-standard) \code{casenumber} field or (\pkg{oscola}-supported) \code{userb} field. If wider portability is an issue, you can put the case number, including the word \enquote{Case} if needed, in the \code{titleaddon} field instead.}
+\begin{bibexbox}
+<OSCOLA \S2.6.2>
+{C430/93}
+Joined Cases C-430/93–C-431/93 \emph{Jereon van Schijndel v Stichting Pensioenfonds voor Fysiotherapeuten} [1998] ECR I–4705
+\tcblower
+\begin{Verbatim}
+%</n|m|a|y>
+@jurisdiction{C430/93,
+ keywords = {eu},
+ title = {Jereon van Schijndel v Stichting Pensioenfonds voor Fysiotherapeuten},
+ shorttitle = {van Schijndel},
+ number = {C-430/93--C-431/93},
+ institution = {ECJ},
+ journaltitle = {ECR},
+ volume = {I},
+ date = {1998},
+ pages = {4705},
+ hyphenation = {dutch}}
+%<*n|m|a|y>
+\end{Verbatim}
+\end{bibexbox}
+
+\tip{Indicate Commission Decisions by putting \code{Commission} in the \code{institution} field.
+ If a decision has a formal decision number, put this in the \code{number} field,
+ and put the case number in the (non-standard) \code{casenumber} field;
+ the \enquote{Case} prefix is added automatically in this case.
+ Alternatively, you can put the case number (including the word \enquote{Case} if needed)
+ in the \code{userb} field for compatibility with \pkg{oscola},
+ or in the \code{titleaddon} field for wider portability.}
\begin{bibexbox}
<OGS \S13.2.6>
@@ -6204,7 +6325,30 @@ Case C–118/07 \emph{Commission of the European Communities v Finland} [2002] E
\end{Verbatim}
\end{bibexbox}
-\tip{For ECHR cases, put the application number in the \code{number} field.}
+\begin{bibexbox}
+<OSCOLA \S2.6.3>
+{verkehrsorgani}
+\emph{Georg Verkehrsorgani v Ferrovie dello Stato} (Case COMP/37.685) Commission Decision 2004/33/EC [2004] OJ L11/17
+\tcblower
+\begin{Verbatim}
+%</n|m|a|y>
+@jurisdiction{verkehrsorgani,
+ keywords = {eu},
+ title = {Georg Verkehrsorgani v Ferrovie dello Stato},
+ userb = {Case COMP\slash 37.685},
+ number = {2004\slash 33\slash EC},
+ institution = {commission},
+ year = {2004},
+ journaltitle = {OJ},
+ series = {L},
+ issue = {11},
+ pages = {17}}
+%<*n|m|a|y>
+\end{Verbatim}
+\end{bibexbox}
+
+\tip{For ECHR cases, put the application number in the \code{number} field;
+unlike \emph{OSCOLA}, \emph{New Hart's Rules} puts parentheses around it.}
\begin{bibexbox}
<NHR \S13.4.5>
@@ -6225,6 +6369,23 @@ Case C–118/07 \emph{Commission of the European Communities v Finland} [2002] E
\end{Verbatim}
\end{bibexbox}
+\begin{bibexbox}
+<OSCOLA \S2.7.1>
+{balogh04}
+\emph{Balogh v Hungary} (App no 47940/99) (ECtHR, 20 July 2004)
+\tcblower
+\begin{Verbatim}
+%</n|m|a|y>
+@jurisdiction{balogh04,
+ title = {Balogh v. Hungary},
+ number = {47940/99},
+ date = {2004-07-20},
+ institution = {ECtHR},
+ keywords = {echr}}
+%<*n|m|a|y>
+\end{Verbatim}
+\end{bibexbox}
+
\tip{Special formatting is triggered if you specify \code{Series A} or \code{ECHR} as the \code{journaltitle} or \code{reporter}.}
\begin{bibexbox}
@@ -6265,6 +6426,313 @@ Case C–118/07 \emph{Commission of the European Communities v Finland} [2002] E
\end{Verbatim}
\end{bibexbox}
+\tip{For the older European Commission of Human Rights, the \code{institution}
+should be set to \code{Commission} but the information is effectively discarded
+if you give the \code{journltitle} as \code{CD} or \code{DR}.}
+
+\begin{bibexbox}
+<OSCOLA \S2.7.2>
+{x71}
+\emph{X v Netherlands} (1971) 38 CD 9
+\tcblower
+\begin{Verbatim}
+%</n|m|a|y>
+@jurisdiction{x71,
+ title = {X v. Netherlands},
+ date = {1971},
+ volume = {38},
+ journaltitle = {CD},
+ pages = {9},
+ institution = {Commission},
+ keywords = {echr}}
+%<*n|m|a|y>
+\end{Verbatim}
+\end{bibexbox}
+
+\begin{bibexbox}
+<OSCOLA \S2.7.2>
+{ccsu87}
+\emph{Council of Civil Service Unions v UK} (1987) 10 EHRR 269 (Commission Decision)
+\tcblower
+\begin{Verbatim}
+%</n|m|a|y>
+@jurisdiction{ccsu87,
+ title = {Council of Civil Service Unions v. UK},
+ date = {1987},
+ volume = {10},
+ journaltitle = {EHRR},
+ pages = {269},
+ institution = {Commission},
+ keywords = {echr}}
+%<*n|m|a|y>
+\end{Verbatim}
+\end{bibexbox}
+
+\begin{bibexbox}
+<OSCOLA \S2.7.2>
+{simpson86}
+\emph{Simpson v UK} (1989) 64 DR 188
+\tcblower
+\begin{Verbatim}
+%</n|m|a|y>
+@jurisdiction{simpson86,
+ title = {Simpson v. UK},
+ date = {1989},
+ volume = {64},
+ journaltitle = {DR},
+ pages = {188},
+ institution = {Commission},
+ keywords = {echr}}
+%<*n|m|a|y>
+\end{Verbatim}
+\end{bibexbox}
+
+\begin{bibexbox}
+<OSCOLA \S2.7.2*>
+{p.uk88}
+\emph{P v UK} (App no 13473/87) (Commission Decision, 11 July 1988)
+\tcblower
+\begin{Verbatim}
+%</n|m|a|y>
+@jurisdiction{p.uk88,
+ title = {P v. UK},
+ date = {1988-07-11},
+ number = {13473/87},
+ institution = {Commission},
+ keywords = {echr}}
+%<*n|m|a|y>
+\end{Verbatim}
+\end{bibexbox}
+
+\subsection{Cases from other jurisdictions}
+
+The \emph{Oxford Guide to Style}, \emph{New Hart's Rules}, and \emph{OSCOLA}
+provide only limited information on citing cases from other jurisdictions,
+deferring to other authorities I can't effectively support in
+\pkg[biblatex]{oxref}. The examples in this section demonstrate a few
+formats that can nevertheless be achieved.
+
+\subsubsection{Australia}
+
+\begin{bibexbox}
+<OSCOLA \S2.8.1>
+{waltons88}
+\emph{Waltons Stores (Interstate) Ltd v Maher} (1988) 164 CLR 387
+\tcblower
+\begin{Verbatim}
+%</n|m|a|y>
+@jurisdiction{waltons88,
+ title = {Waltons Stores (Interstate) Ltd v Maher},
+ date = {1988},
+ volume = {164},
+ reporter = {C.L.R.},
+ pages = {387},
+ keywords = {au}}
+%<*n|m|a|y>
+\end{Verbatim}
+\end{bibexbox}
+
+\begin{bibexbox}
+{bakker}
+\emph{Bakker v Stewart} [1980] VR 17
+\tcblower
+\begin{Verbatim}
+%</n|m|a|y>
+@jurisdiction{bakker,
+ title = {Bakker v. Stewart},
+ date = {1980},
+ reporter = {V.R.},
+ pages = {17},
+ keywords = {au}}
+%<*n|m|a|y>
+\end{Verbatim}
+\end{bibexbox}
+
+\subsubsection{Canada}
+
+\info{\emph{New Hart's Rules} prefers to put commas between case titles and bare
+numbers, but you can suppress this for Canadian cases with the following command:}
+\begin{tcblisting}{listing only,left skip=2em}
+\renewcommand*{\cacasetitlepunct}{\addspace}
+\end{tcblisting}
+
+\begin{bibexbox}
+{clearbrook}
+\emph{Clearbrook Ironworks Ltd v Letorneau}, 2006 FCA 42, 46 CPR (4th) 241
+\tcblower
+\begin{Verbatim}
+%</n|m|a|y>
+@jurisdiction{clearbrook,
+ title = {Clearbrook Ironworks Ltd. v. Letorneau},
+ number = {2006 FCA 42},
+ volume = {46},
+ reporter = {C.P.R.},
+ series = {4th},
+ pages = {241},
+ date = {2006},
+ pagination = {paragraph},
+ keywords = {ca}}
+%<*n|m|a|y>
+\end{Verbatim}
+\end{bibexbox}
+
+\subsubsection{United States of America}
+
+\info{\emph{New Hart's Rules} prefers to put commas between case titles and bare
+numbers, but you can suppress this for American cases with the following command:}
+\begin{tcblisting}{listing only,left skip=2em}
+\renewcommand*{\uscasetitlepunct}{\addspace}
+\end{tcblisting}
+
+\begin{bibexbox}
+<NHR \S13.4.1>
+{michael1976}
+\emph{Michael v Johnson}, 426 US 346 (1976)
+\tcblower
+\begin{Verbatim}
+%</n|m|a|y>
+@jurisdiction{michael1976,
+ title = {Michael v. Johnson},
+ volume = {426},
+ reporter = {U.S.},
+ pages = {346},
+ date = {1976},
+ keywords = {us}}
+%<*n|m|a|y>
+\end{Verbatim}
+\end{bibexbox}
+
+\begin{bibexbox}
+<OSCOLA \S2.8.1*>
+{henningsen60}
+\emph{Henningsen v Bloomfield Motors Inc}, 161 A 2d 69 (NJ 1960)
+\tcblower
+\begin{Verbatim}
+%</n|m|a|y>
+@jurisdiction{henningsen60,
+ title = {Henningsen v. Bloomfield Motors Inc.},
+ volume = {161},
+ reporter = {A.},
+ series = {2},
+ pages = {69},
+ location = {NJ},
+ date = {1960},
+ keywords = {us}}
+%<*n|m|a|y>
+\end{Verbatim}
+\end{bibexbox}
+
+\begin{bibexbox}
+<OSCOLA \S2.8.1*>
+{roe73}
+\emph{Roe v Wade}, 410 US 113, 163–64 (1973)
+\tcblower
+\begin{Verbatim}
+%</n|m|a|y>
+@jurisdiction{roe73,
+ title = {Roe v. Wade},
+ volume = {410},
+ reporter = {U.S.},
+ pages = {113, 163--64},
+ date = {1973},
+ keywords = {us}}
+%<*n|m|a|y>
+\end{Verbatim}
+\end{bibexbox}
+
+\begin{bibexbox}
+{operadora09}
+\emph{Re Operadora DB Mexico SA}, 6:09-cv-383-Orl 022GJK, 2009 WL 2423138 (MD Fla 2009)
+\tcblower
+\begin{Verbatim}
+%</n|m|a|y>
+@jurisdiction{operadora09,
+ title = {Re Operadora D.B. Mexico S.A.},
+ number = {6:09-cv-383-Orl 022GJK},
+ eprint = {2009 WL 2423138},
+ court = {M.D. Fla.},
+ date = {2009},
+ keywords = {us}}
+%<*n|m|a|y>
+\end{Verbatim}
+\end{bibexbox}
+
+\subsubsection{International}
+
+\begin{bibexbox}
+{corfu}
+\emph{Corfu Channel Case (UK v Albania)} (Merits) [1949] ICJ Rep 4
+\tcblower
+\begin{Verbatim}
+%</n|m|a|y>
+@jurisdiction{corfu,
+ title = {Corfu Channel Case},
+ subtitle = {UK v Albania},
+ titleaddon = {Merits},
+ date = {1949},
+ journaltitle = {ICJ Rep},
+ pages = {4},
+ keywords = {int}}
+%<*n|m|a|y>
+\end{Verbatim}
+\end{bibexbox}
+
+\begin{bibexbox}
+{nicaragua}
+\emph{Land, Island and Maritime Frontier Case (El Salvador/Honduras, Nicaragua intervening)} (Application for Intervention) [1994] ICJ Rep 92
+\tcblower
+\begin{Verbatim}
+%</n|m|a|y>
+@jurisdiction{nicaragua,
+ title = {Land, Island and Maritime Frontier Case},
+ subtitle = {El Salvador\slash Hon\-duras, Nicaragua intervening},
+ titleaddon = {Application for Intervention},
+ date = {1994},
+ journaltitle = {ICJ Rep},
+ pages = {92},
+ keywords = {int}}
+%<*n|m|a|y>
+\end{Verbatim}
+\end{bibexbox}
+
+\begin{bibexbox}
+{wall}
+\emph{Legal Consequences of the Construction of a Wall} (Advisory Opinion) (2004), \url{http://www.icj-cij.org/icjwww/imwp/imwpframe.htm}, accessed 21 July 2005
+\tcblower
+\begin{Verbatim}
+%</n|m|a|y>
+@jurisdiction{wall,
+ title = {Legal Consequences of the Construction of a Wall},
+ titleaddon = {Advisory Opinion},
+ date = {2004},
+ url = {http://www.icj-cij.org/icjwww/imwp/imwpframe.htm},
+ urldate = {2005-07-21},
+ pagination = {[]},
+ keywords = {int}}
+%<*n|m|a|y>
+\end{Verbatim}
+\end{bibexbox}
+
+\begin{bibexbox}
+{chorzow}
+\emph{Case Concerning the Factory at Chorzów (Germany v Poland)} (Merits) [1928] PCIJ Rep Series A No 17
+\tcblower
+\begin{Verbatim}
+%</n|m|a|y>
+@jurisdiction{chorzow,
+ title = {Case Concerning the Factory at Chorzów},
+ indextitle = {Chorzów Factory Case},
+ subtitle = {Germany v Poland},
+ titleaddon = {Merits},
+ journaltitle = {PCIJ Rep},
+ series = {A},
+ pages = {17},
+ date = {1928},
+ keywords = {int}}
+%<*n|m|a|y>
+\end{Verbatim}
+\end{bibexbox}
+
\section{Legislation}
Use the \code{legislation} entry type for citing Acts, Bills, Orders, Measures, and the like.
@@ -6293,6 +6761,78 @@ Factory and Workshop Act 1891
\end{Verbatim}
\end{bibexbox}
+\begin{bibexbox}
+<OSCOLA \S2.4.6>
+{learner08}
+Learner Travel (Wales) Measure 2008 (nawm 2)
+\tcblower
+\begin{Verbatim}
+%</n|m|a|y>
+@legislation{learner08,
+ title = {Learner Travel (Wales) Measure},
+ date = {2008},
+ number = {nawm 2},
+ keywords = {cy},
+ entrysubtype = {primary},
+ pagination = {section}}
+%<*n|m|a|y>
+\end{Verbatim}
+\end{bibexbox}
+
+\begin{bibexbox}
+<OSCOLA \S2.4.5>
+{confund}
+ Consolidated Fund HC Bill (2008–09) [5]
+\tcblower
+\begin{Verbatim}
+%</n|m|a|y>
+@legislation{confund,
+ title = {Consolidated Fund Bill},
+ date = {2008/2009},
+ institution = {HC},
+ number = {5},
+ keywords = {gb, draft},
+ entrysubtype = {primary},
+ pagination = {clause}}
+%<*n|m|a|y>
+\end{Verbatim}
+\end{bibexbox}
+
+\begin{bibexbox}
+<OSCOLA \S2.4.5>
+{academies}
+Academies HL Bill (2010–11) 1
+\tcblower
+\begin{Verbatim}
+%</n|m|a|y>
+@legislation{academies,
+ title = {Academies Bill},
+ date = {2010/2011},
+ institution = {HL},
+ number = {1},
+ keywords = {gb, draft},
+ entrysubtype = {primary},
+ pagination = {clause}}
+%<*n|m|a|y>
+\end{Verbatim}
+\end{bibexbox}
+
+\begin{bibexbox}
+<OSCOLA \S2.4.4>
+{charitiesnotes}
+Explanatory Notes on the Charities Act 2006
+\tcblower
+\begin{Verbatim}
+%</n|m|a|y>
+@legal{charitiesnotes,
+ title = {Explanatory Notes on the Charities Act 2006},
+ indextitle = {Charities Act 2006, Explanatory Note},
+ pagination = {paragraph},
+ entrysubtype = {explanatory note}}
+%<*n|m|a|y>
+\end{Verbatim}
+\end{bibexbox}
+
\tip{Specify an \code{entrysubtype} of \code{secondary} for secondary legislation.
The number is then printed as well.}
@@ -6314,22 +6854,38 @@ Local Authority Precepts Order 1897, SR~\&~O 1897/201
\end{bibexbox}
\begin{bibexbox}
-<NHR \S13.5.1>
-{ccsga1987}
-Community Charge Support Grant (Abolition) Order 1987, SI 1987/466
+<OSCOLA \S2.5.3>
+{eggs}
+Eggs and Chicks (England) Regulations 2009, SI 2009/2163
\tcblower
\begin{Verbatim}
%</n|m|a|y>
-@legislation{ccsga1987,
+@legislation{eggs,
entrysubtype = {secondary},
- title = {Community Charge Support Grant (Abolition) Order},
- date = {1987},
- number = {SI 1987\slash 466},
+ title = {Eggs and Chicks (England) Regulations},
+ date = {2009},
+ number = {SI 2009\slash 2163},
pagination = {regulation}}
%<*n|m|a|y>
\end{Verbatim}
\end{bibexbox}
+%<*n>
+\begin{egcite}{\emph{Eggs and Chicks (England) Regulations}, reg.~7(3)}
+\cite[\pno~7(3)]{eggs}
+\end{egcite}
+%</n>
+%<*m|a>
+\begin{egcite}{}
+\textcite[\pno~7(3)]{eggs}
+\end{egcite}
+%</m|a>
+%<*y>
+\begin{egcite}{}
+\parencite[\pno~7(3)]{eggs}
+\end{egcite}
+%</y>
+
\subsection{European legislation}
As with European cases, European legislation should be given the \val{eu} keyword.
@@ -6339,7 +6895,7 @@ According to both the \emph{Oxford Guide to Style} and \emph{New Hart's Rules},
you can provide an even sparser reference for primary European legislation.
%<*n>
-\begin{egcite}{EC Treaty (Treaty of Rome, as amended), art.\@ 3b}
+\begin{egcite}{EC Treaty (Treaty of Rome, as amended), art.~3b}
\cite[\pno~3b]{ECT:Rome}
\end{egcite}
%</n>
@@ -6375,6 +6931,28 @@ EC Treaty
If this seems scandalously short, you may prefer to provide a full reference (including the relevant entry in the OJ or OJ Spec Ed) for the bibliography and use, say, \cs{citetitle} for citations.
+\begin{bibexbox}
+<OSCOLA \S2.6.1>
+{teu}
+Consolidated Version of the Treaty on European Union [2008] OJ C115/13
+\tcblower
+\begin{Verbatim}
+%</n|m|a|y>
+@legislation{teu,
+ entrysubtype = {eu-treaty},
+ title = {Consolidated Version of the Treaty on European Union},
+ indextitle = {Treaty on European Union},
+ date = {2008},
+ journaltitle = {OJ},
+ series = {C},
+ volume = {115},
+ pages = {13},
+ pagination = {article},
+ keywords = {eu}}
+%<*n|m|a|y>
+\end{Verbatim}
+\end{bibexbox}
+
Secondary legislation should always have a full reference.
\begin{bibexbox}
@@ -6473,6 +7051,33 @@ Convention Relating to the Status of Refugees (adopted 28 July 1951, entered int
%</y>
+\begin{bibexbox}
+{echr:treaty}
+Convention for the Protection of Human Rights and Fundamental Freedoms (opened for signature 4 Nov.\@ 1950, entered into force 3 Sept.\@ 1953) 213 UNTS 221, as amended by Protocol No 14bis to the Convention for the Protection of Human Rights and Fundamental Freedoms (opened for signature 27 May 2009, entered into force 1 Sept.\@ 2009) CETS No. 204
+\tcblower
+\begin{Verbatim}
+%</n|m|a|y>
+@legal{echr:treaty,
+ entrysubtype = {piltreaty},
+ title = {Convention for the Protection of Human Rights and Fundamental Freedoms},
+ execution = {opened=1950-11-04 and inforce=1953-09-03},
+ volume = {213},
+ reporter = {UNTS},
+ pages = {221},
+ shorthand = {ECHR},
+ related = {echr:protocol},
+ relatedtype = {amendedby}}
+@legal{echr:protocol,
+ entrysubtype = {piltreaty},
+ title = {Protocol No 14bis to the Convention for the Protection of Human Rights
+ and Fundamental Freedoms},
+ execution = {opened=2009-05-27 and inforce=2009-09-01},
+ series = {CETS},
+ number = {204}}
+%<*n|m|a|y>
+\end{Verbatim}
+\end{bibexbox}
+
\section{Hansard}
References to Hansard use the \code{legal} entry type, with \code{parliamentary} as the \code{entrysubtype}.
@@ -6511,7 +7116,7 @@ Parl.\@ Deb.\@ (series 4) vol.\@ 24, col.\@ 234 (24 Mar.\@ 1895)
%</n|m|a|y>
@legal{pd4/24,
entrysubtype = {parliamentary},
- title = {Parl. Deb.},
+ title = {Parl\adddotspace Deb\adddot},
series = {4},
volume = {24},
pages = {234},
@@ -6571,8 +7176,8 @@ it provides the \code{commentary} entry type simply as an alias for \code{book}.
%<n|m><OGS \S15.8>
%<a|y><OGS \S15.8\textdagger>
{auden1990era}
-%<n|m>W. H. Auden, \enquote{Es regnet auf mir in den Schottische Lände} [\emph{sic}], in \enquote{The German Auden: Six Early Poems}, trans. David Constantine, in Katherine Bucknell and Nicholas Jenkins (eds.), \emph{W. H. Auden, \enquote{The Map of All my Youth}: Early Works, Friends, and Influences} (Auden Studies, 1; Oxford, 1990), 1--15 at 6.
-%<a|y>Auden, W. H. (n.d.), \enquote{Es regnet auf mir in den Schottische Lände} [\emph{sic}], in \enquote{The German Auden: Six Early Poems}, trans. D. Constantine, in K. Bucknell and N. Jenkins (eds.), \emph{W. H. Auden, \enquote{The Map of All my Youth}: Early Works, Friends, and Influences} (Auden Studies, 1; Oxford, 1990), 1--15 at 6.
+%<n|m>W. H. Auden, \enquote{Es regnet auf mir in den Schottische Lände} [\emph{sic}], in \enquote{The German Auden: Six Early Poems}, trans. David Constantine, in Katherine Bucknell and Nicholas Jenkins (eds.), \emph{W. H. Auden, \enquote{The Map of All my Youth}: Early Works, Friends, and Influences} (Auden Studies, 1; Oxford, 1990), 1–15 at 6.
+%<a|y>Auden, W. H. (n.d.), \enquote{Es regnet auf mir in den Schottische Lände} [\emph{sic}], in \enquote{The German Auden: Six Early Poems}, trans. D. Constantine, in K. Bucknell and N. Jenkins (eds.), \emph{W. H. Auden, \enquote{The Map of All my Youth}: Early Works, Friends, and Influences} (Auden Studies, 1; Oxford, 1990), 1–15 at 6.
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@@ -6606,8 +7211,8 @@ it provides the \code{commentary} entry type simply as an alias for \code{book}.
%<n|m><OGS \S15.8>
%<a|y><OGS \S15.8\textdagger>
{blois1993qff}
-%<n|m>William of Blois, \enquote{The Quarrel of the Flea and the Fly} (\emph{Pulicis et musce iurgia}), trans. in Jan M. Ziolkowski, \emph{Talking Animals: Medieval Latin Beast Poetry, 750-1150} (Middle Ages Series, ed. Edward Peters; Philadelphia: University of Pennsylvania Press, 1993), 274--8.
-%<a|y>William of Blois (n.d.), \enquote{The Quarrel of the Flea and the Fly} (\emph{Pulicis et musce iurgia}), trans. in Ziolkowski, J. M., \emph{Talking Animals: Medieval Latin Beast Poetry, 750-1150} (Middle Ages Series, ed. E. Peters; Philadelphia: University of Pennsylvania Press, 1993), 274--8.
+%<n|m>William of Blois, \enquote{The Quarrel of the Flea and the Fly} (\emph{Pulicis et musce iurgia}), trans. in Jan M. Ziolkowski, \emph{Talking Animals: Medieval Latin Beast Poetry, 750-1150} (Middle Ages Series, ed. Edward Peters; Philadelphia: University of Pennsylvania Press, 1993), 274–8.
+%<a|y>William of Blois (n.d.), \enquote{The Quarrel of the Flea and the Fly} (\emph{Pulicis et musce iurgia}), trans. in Ziolkowski, J. M., \emph{Talking Animals: Medieval Latin Beast Poetry, 750-1150} (Middle Ages Series, ed. E. Peters; Philadelphia: University of Pennsylvania Press, 1993), 274–8.
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@@ -6663,8 +7268,8 @@ If a poem is divided into cantos, the title is set in italics rather than quoted
%<n|m><OGS \S15.8*>
%<a|y><OGS \S15.8*\textdagger>
{spenser1965fq}%
-%<n|m>Edmund Spenser, \emph{The Faerie Queene} (Everyman's Library, 443--4; London: Dent, 1965–6) (originally pub. 1590–6).
-%<a|y>Spenser, E. (1590–6), \emph{The Faerie Queene} (Everyman's Library, 443--4; London: Dent, 1965–6).
+%<n|m>Edmund Spenser, \emph{The Faerie Queene} (Everyman's Library, 443–4; London: Dent, 1965–6) (originally pub. 1590–6).
+%<a|y>Spenser, E. (1590–6), \emph{The Faerie Queene} (Everyman's Library, 443–4; London: Dent, 1965–6).
\tcblower
\begin{Verbatim}
%</n|m|a|y>
@@ -6757,7 +7362,7 @@ The second uses the dedicated \code{manuscript} entry type from \textsf{biblatex
\tip{You can specify the layer of a palimpsest in the \code{layer} field. Use \code{inf} for the inferior layer and \code{sup} for the superior layer.}
-\tip{You can specify the writing support material in the \code{support} field. Three special keys – \code{papyrus}, \code{paper}, and \code{pergament} – are recognized and (potentially) translated, but other values will be printed as-is.}
+\tip{You can specify the writing support material in the \code{support} field. Three special keys – \code{papyrus}, \code{paper}, and \code{parchment} – are recognized and (potentially) translated, but other values will be printed as-is.}
\begin{bibexbox}
%<n|m><NHR 18.6.2>
@@ -6846,7 +7451,7 @@ The second uses the dedicated \code{manuscript} entry type from \textsf{biblatex
location = {Cambridge},
collection = {Add. Greek MS},
shelfmark = {4489},
- support = {pergament},
+ support = {parchment},
dating = {8th--9th c.},
pagetotal = {16},
columns = {1},
@@ -7004,7 +7609,7 @@ rather than \pkg[biblatex]{oxref}.}
% \end{itemize}
%
% \begin{macrocode}
- facsimile, revised, revisedenlarged, revisedreprint, suppto, equals, original,
+ facsimile, revised, revisedenlarged, revisedreprint, suppto, equals, original, amendedby,
% \end{macrocode}
%
% \begin{itemize}
@@ -7065,12 +7670,22 @@ rather than \pkg[biblatex]{oxref}.}
% \end{itemize}
%
% \begin{macrocode}
- 1column, 2column, inflayer, suplayer, paper, papyrus, pergament,
+ 1column, 2column, inflayer, suplayer, paper, papyrus, parchment,
eucase, eujoinedcases, commissiondecision, application,
order, bill, draft, opened, signed, adopted, inforce,
}
% \end{macrocode}
%
+% The \cs{blx@ox@langbibstring} utility is used to prefix a bibstring with one
+% or more language names, but since this only works in certain languages, by
+% default it discards the language names (first argument) and just prints the
+% bibstring (second argument). This is overridden in |english-oxref.lbx| and
+% friends.
+%
+% \begin{macrocode}
+\def\blx@ox@langbibstring#1#2{\bibstring{#2}}
+% \end{macrocode}
+%
% We base our styles on the standard on the principle of least surprise
% (and to aid with maintenance in the face of new \pkg{biblatex} versions).
% We set some defaults different to the standard ones, but the author can
@@ -7081,9 +7696,10 @@ rather than \pkg[biblatex]{oxref}.}
\ExecuteBibliographyOptions{urldate=comp,pagetracker,timezeros=false,time=12h,isbn=false}
% \end{macrocode}
%
-% Here are the new default punctuation conventions. The new \cs{relatedtypepunct}
-% is for before the |relatedtype| localization string, while \cs{recordseriespunct}
-% is used for audiovisual resources.
+% Here are the new default punctuation conventions. The new \cs{recordseriespunct}
+% is used for audiovisual resources, while \cs{cacasetitlepunct} and
+% \cs{uscasetitlepunct} are for punctuation following the case title in Canadian and
+% American cases respectively.
%
% \begin{macrocode}
\renewcommand*{\labelnamepunct}{\addcomma\space}
@@ -7092,7 +7708,8 @@ rather than \pkg[biblatex]{oxref}.}
\renewcommand*{\intitlepunct}{\nopunct\space}
\renewcommand*{\bibnamedash}{\resizebox{2em}{\height}{\textemdash}\addthinspace}
\newcommand*{\recordseriespunct}{\addcomma\space}
-\newcommand*{\relatedtypepunct}{\addsemicolon\space}
+\newcommand*{\cacasetitlepunct}{\addcomma\space}
+\newcommand*{\uscasetitlepunct}{\addcomma\space}
\renewcommand*{\relateddelim}{\addsemicolon\space}
\DeclareDelimFormat{revsdnamedelim}{\addcomma}
\DeclareDelimFormat{authortypedelim}{\addspace}
@@ -7171,14 +7788,14 @@ rather than \pkg[biblatex]{oxref}.}
and
test {\ifdefvoid{#2}}%
}{}{%
- \revsdnamepunct}%
+ \printdelim{revsdnamedelim}}%
\ifdefvoid{#5}{}{\iftoggle{blx@ox@nametitle}{\bibnamedelimd\mkbibnametitle{#5}\isdot}{}}%
\ifdefvoid{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}\isdot}%
}{%
\usebibmacro{name:delim}{#1}%
\usebibmacro{name:hook}{#1}%
\mkbibnamefamily{#1}\isdot
- \ifdefvoid{#4}{}{\bibnamedelimd\mkbibnamesuffix{#4}\isdot}%
+ \ifdefvoid{#4}{}{\ifnumeral{#4}{}{\addcomma}\bibnamedelimd\mkbibnamesuffix{#4}\isdot}%
\ifboolexpe{%
(test {\ifdefvoid{#5}} or not togl {blx@ox@nametitle})
and
@@ -7186,7 +7803,7 @@ rather than \pkg[biblatex]{oxref}.}
and
test {\ifdefvoid{#3}}%
}{}{%
- \revsdnamepunct}%
+ \printdelim{revsdnamedelim}}%
\ifdefvoid{#5}{}{\iftoggle{blx@ox@nametitle}{\bibnamedelimd\mkbibnametitle{#5}\isdot}{}}%
\ifdefvoid{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}\isdot}%
\ifdefvoid{#3}{}{\bibnamedelimd\mkbibnameprefix{#3}\isdot}}}
@@ -7195,7 +7812,7 @@ rather than \pkg[biblatex]{oxref}.}
% Oxford style (for the humanities) is to write author names surname first in
% the bibliography, but in natural order in citations. We implement this, along
% with the case changing option, in the following name format. We also add a
-% second hash for checking if names (e.g.\ |author| and |authoraddon|) are the
+% second hash for checking if names (e.g.\@ |author| and |authoraddon|) are the
% same.
%
% \begin{macrocode}
@@ -7242,6 +7859,14 @@ rather than \pkg[biblatex]{oxref}.}
\renewcommand*{\mkbibnamesuffix}[1]{##1}%
\renewcommand*{\mkbibnametitle}[1]{##1}%
}{}%
+ \ifboolexpe{%
+ test {\ifnumgreater{\value{listcount}}{1}}
+ or (
+ test {\ifdefvoid\namepartgiven}
+ and
+ test {\ifdefvoid\namepartprefix}
+ )
+ }{}{\usebibmacro{name:revsdelim}}%
}{%
\ifgiveninits{%
\usebibmacro{name:title-given-family}%
@@ -7328,6 +7953,14 @@ rather than \pkg[biblatex]{oxref}.}
\global\settoggle{blx@ox@variantname}{true}%
}{%
\global\settoggle{blx@ox@variantname}{false}}%
+ \ifboolexpe{%
+ test {\ifnumgreater{\value{listcount}}{1}}
+ or (
+ test {\ifdefvoid\namepartgiven}
+ and
+ test {\ifdefvoid\namepartprefix}
+ )
+ }{}{\usebibmacro{name:revsdelim}}%
\usebibmacro{name:andothers}}
% \end{macrocode}
%
@@ -7658,7 +8291,7 @@ rather than \pkg[biblatex]{oxref}.}
% We make the punctuation between a title and \enquote{by [author]} configurable.
%
% \begin{macrocode}
-\newcommand{\titlebyauthordelim}{\addspace}
+\newcommand{\titlebyauthordelim}{\addcomma\space}
% \end{macrocode}
%
% Following |authortitle| and |authoryear|, we redefine the |editor| and
@@ -7807,7 +8440,7 @@ rather than \pkg[biblatex]{oxref}.}
% native language translation of a foreign work, the original title is given
% in parentheses. If the cited work is foreign translation of a native language
% work, the original title is printed in square brackets, preceded by the name
-% of the foreign language and \enquote{translation of}.
+% of the foreign language (if appropriate) and \enquote{translation of}.
%
% \begin{macrocode}
\DeclareFieldFormat{origtitle}{\mkbibemph{#1}}
@@ -7817,8 +8450,7 @@ rather than \pkg[biblatex]{oxref}.}
\printtext[parens]{\printfield{origtitle}}%
}{%
\printtext[brackets]{%
- \printlist{language}\space
- \bibstring{translationof}\space
+ \blx@ox@langbibstring{\printlist{language}}{translationof}\addspace
\printfield{origtitle}}}}}
% \end{macrocode}
%
@@ -7858,6 +8490,20 @@ rather than \pkg[biblatex]{oxref}.}
\fi
% \end{macrocode}
%
+% In legal references, the truncated year is at least two digits.
+%
+% \begin{macrocode}
+ \ifboolexpr{
+ (
+ test {\ifentrytype{jurisdiction}}
+ or
+ test {\ifentrytype{legislation}}
+ )
+ and
+ test {\IfStrEq{\Result}{4}}
+ }{\def\Result{3}}{}%
+% \end{macrocode}
+%
% Since \cs{Result} is the number of digits to trim from the left hand side of
% the year, plus one, we provide an extra sacrificial zero before trimming.
%
@@ -7914,7 +8560,7 @@ rather than \pkg[biblatex]{oxref}.}
\ifboolexpr{
test {\iffieldundef{year}}
and
- test {\iffieldundef{season}}
+ test {\iffieldundef{yeardivision}}
and
test {\iffieldundef{month}}
and
@@ -7944,7 +8590,7 @@ rather than \pkg[biblatex]{oxref}.}
\ifboolexpr{
test {\iffieldundef{origyear}}
and
- test {\iffieldundef{origseason}}
+ test {\iffieldundef{origyeardivision}}
and
test {\iffieldundef{origmonth}}
and
@@ -8340,7 +8986,7 @@ rather than \pkg[biblatex]{oxref}.}
% approach.
%
% We provide an option for switching between the two approaches. If active
-% and an issue has no volume or issue numbers (first block), the season
+% and an issue has no volume or issue numbers (first block), the year division
% and date are printed bare. Otherwise (second block) they are printed
% in parentheses just as in the standard version of the macro.
%
@@ -8356,7 +9002,7 @@ rather than \pkg[biblatex]{oxref}.}
and
test {\iffieldundef{year}}
and
- test {\iffieldundef{season}}
+ test {\iffieldundef{yeardivision}}
and
test {\iffieldundef{month}}
}{}{%
@@ -8608,7 +9254,8 @@ reference,mvreference,inreference]{volume}{%
% \begin{macrocode}
\renewbibmacro*{in:}{%
\iffieldequalstr{entrysubtype}{yearbook}{}{%
- \printtext{\bibstring{in}\intitlepunct}}}
+ \bibstring{in}%
+ \printunit{\intitlepunct}}}
% \end{macrocode}
%
% Oxford style signifies formal publication by putting the relevant
@@ -8743,7 +9390,7 @@ reference,mvreference,inreference]{volume}{%
and
test {\iffieldundef{year}}
and
- test {\iffieldundef{season}}
+ test {\iffieldundef{yeardivision}}
and
test {\iffieldundef{month}}
}{}{%
@@ -8780,7 +9427,7 @@ reference,mvreference,inreference]{volume}{%
and
test {\iffieldundef{year}}
and
- test {\iffieldundef{season}}
+ test {\iffieldundef{yeardivision}}
and
test {\iffieldundef{month}}
}{}{%
@@ -9651,7 +10298,7 @@ reference,mvreference,inreference]{volume}{%
and
test {\iffieldundef{year}}
and
- test {\iffieldundef{season}}
+ test {\iffieldundef{yeardivision}}
and
test {\iffieldundef{month}}
}{}{%
@@ -9714,7 +10361,7 @@ reference,mvreference,inreference]{volume}{%
and
test {\iffieldundef{year}}
and
- test {\iffieldundef{season}}
+ test {\iffieldundef{yeardivision}}
and
test {\iffieldundef{month}}
}{}{%
@@ -9762,7 +10409,7 @@ reference,mvreference,inreference]{volume}{%
and
test {\iffieldundef{year}}
and
- test {\iffieldundef{season}}
+ test {\iffieldundef{yeardivision}}
and
test {\iffieldundef{month}}
}{}{%
@@ -9824,10 +10471,16 @@ reference,mvreference,inreference]{volume}{%
\usebibmacro{series+type+number}%
\setunit{\addspace}%
\usebibmacro{institution+location+date}%
- \iffieldequals{entrysubtype}{\legreport}
- {\setunit{\addspace}\nopunct}
- {\newunit\newblock}%
- \usebibmacro{chapter+pages}%
+ \iffieldequals{entrysubtype}{\legreport}{%
+ \setunit{\addspace}\nopunct
+ \let\origadddot\adddot
+ \def\adddot{}%
+ \usebibmacro{chapter+pages}%
+ \let\adddot\origadddot
+ }{%
+ \newunit\newblock
+ \usebibmacro{chapter+pages}%
+ }%
\newunit
\printfield{pagetotal}%
\newunit\newblock
@@ -10059,13 +10712,13 @@ reference,mvreference,inreference]{volume}{%
and
test {\iffieldundef{year}}
and
- test {\iffieldundef{season}}
+ test {\iffieldundef{yeardivision}}
and
test {\iffieldundef{month}}
and
test {\iffieldundef{origyear}}
and
- test {\iffieldundef{origseason}}
+ test {\iffieldundef{origyeardivision}}
and
test {\iffieldundef{origmonth}}
and
@@ -10617,6 +11270,15 @@ reference,mvreference,inreference]{volume}{%
\DeclareFieldFormat[jurisdiction]{titleaddon}{\mkbibparens{#1}}
\DeclareFieldFormat{romanvol}{\RN{#1}}
\DeclareListFormat[jurisdiction]{listb}{}
+\protected\def\mkusbibordinal#1{%
+ \begingroup
+ \@tempcnta0#1\relax\number\@tempcnta
+ \@whilenum\@tempcnta>100\do{\advance\@tempcnta-100\relax}%
+ \ifnum\@tempcnta>20
+ \@whilenum\@tempcnta>9\do{\advance\@tempcnta-10\relax}%
+ \fi
+ \ifcase\@tempcnta th\or st\or d\or d\else th\fi
+ \endgroup}%
\DeclareFieldFormat{usseries}{\ifinteger{#1}{\mkusbibordinal{#1}}{#1}}
\DeclareFieldFormat{verba}{#1}
@@ -10866,9 +11528,13 @@ reference,mvreference,inreference]{volume}{%
{\printfield{note}%
\toggletrue{blx@ox@nopostnotedelim}}}
\newbibmacro*{jurisdictionpages}{%
+ \let\origadddot\adddot
+ \def\adddot{}%
\iffieldequals{entrysubtype}{\subtypenewsp}{}{%
\setunit{\addspace}%
- \printfield{pages}}}
+ \printfield{pages}}%
+ \let\adddot\origadddot
+}
\newbibmacro{pcitenote}{%
\iffieldundef{parreporter}{}{%
\setunit{\addcomma\space}%
@@ -10908,6 +11574,8 @@ reference,mvreference,inreference]{volume}{%
test {\iffieldundef{journaltitle}}%
and
test {\iffieldundef{number}}%
+ and
+ test {\iffieldundef{neutralcite}}%
}{%
\setunit{\addcomma\space}%
\usebibmacro{date}%
@@ -11006,8 +11674,6 @@ reference,mvreference,inreference]{volume}{%
\printfield{number}}}%
}{%
\printtext[parens]{%
- \usebibmacro{eucasetype}%
- \setunit{\addnbspace}%
\printfield{userb}}%
\setunit{\addspace}%
\iffieldundef{number}{}{%
@@ -11161,6 +11827,8 @@ reference,mvreference,inreference]{volume}{%
\printfield{titleaddon}%
}
\newbibmacro*{int:jurisdictionpages}{%
+ \let\origaddot\adddot
+ \def\adddot{}%
\iffieldequals{journaltitle}{\pcijrep}{%
\printtext{\bibcpstring{number}\addspace}%
\iffieldundef{pages}{%
@@ -11168,16 +11836,18 @@ reference,mvreference,inreference]{volume}{%
}{%
\printfield{pages}}%
}{%
- \printfield{pages}}}
+ \printfield{pages}}%
+ \let\addot\origadddot
+}
% \end{macrocode}
%
% Here is the format for Canadian cases.
%
% \begin{macrocode}
-\newbibmacro{canjuriscitation}{%
+\newbibmacro{cajuriscitation}{%
\usebibmacro{title}%
- \setunit{\addspace}\newblock
+ \setunit{\cacasetitlepunct}\newblock
\printfield{number}%
\setunit{\addcomma\space}%
\iffieldundef{journaltitle}{}{%
@@ -11225,7 +11895,7 @@ reference,mvreference,inreference]{volume}{%
% \begin{macrocode}
\newbibmacro{usjuriscitation}{%
\usebibmacro{title}%
- \setunit{\addcomma\space}\newblock%
+ \setunit{\uscasetitlepunct}\newblock%
\iffieldundef{journaltitle}{%
\printfield{number}%
\setunit{\addcomma\space}%
@@ -11282,6 +11952,8 @@ reference,mvreference,inreference]{volume}{%
\newbibmacro{enjuriscitation}{%
\usebibmacro{title}%
\setunit{\addspace}\newblock
+ \printfield{neutralcite}%
+ \setunit*{\addcomma\space}%
\printfield{number}%
\setunit*{\addcomma\space}%
\iffieldundef{journaltitle}{}{%
@@ -11483,6 +12155,10 @@ reference,mvreference,inreference]{volume}{%
\setunit{\addcomma\space}\newblock
\printfield[default]{note}
\setunit{\addspace}\newblock
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
\setunit{\bibpagerefpunct}%
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -11533,10 +12209,20 @@ reference,mvreference,inreference]{volume}{%
\setunit{\addspace}%
\printfield{journaltitle}%
\setunit*{\addspace}%
- \iffieldundef{series}{}{%
- \setunit{\addspace}%
+ \iffieldundef{series}{%
+ \printfield{type}%
+ \setunit*{\addspace}%
+ }{%
\printfield{series}%
- \setunit{\addspace}}%
+ \iffieldundef{type}{%
+ \setunit{\addspace}%
+ \bibcpstring{number}
+ \setunit{\addspace}%
+ }{%
+ \setunit{\addcomma\space}%
+ }}
+ \printfield{number}
+ \setunit*{\addspace}%
\printfield{pages}}}%
\newbibmacro*{treaty:date}{%
\ifboolexpr{
@@ -11805,7 +12491,45 @@ reference,mvreference,inreference]{volume}{%
% The driver for letters is similar to the one for other unpublished materials.
%
% \begin{macrocode}
-\DeclareBibliographyAlias{letter}{unpublished}
+\DeclareBibliographyDriver{letter}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \iffieldundef{library}{\togglefalse{blx@ox@ms}}{\toggletrue{blx@ox@ms}}%
+ \usebibmacro{author}%
+ \setunit{\printdelim{nametitledelim}}\newblock
+ \usebibmacro{title}%
+ \setunit{\titlebyauthordelim}\newblock
+ \usebibmacro{byauthor}%
+ \newunit\newblock
+ \printfield{note}%
+ \iffieldundef{howpublished}{}{\nopunct\printfield{howpublished}}%
+ \newunit\newblock
+ \iftoggle{blx@ox@ms}{%
+ \usebibmacro{manuscript:date}%
+ \newunit\newblock
+ \usebibmacro{library+location+series+number}%
+ \newunit
+ \printfield{support}%
+ \newunit
+ \usebibmacro{dating}%
+ \setunit{\datingpagespunct}
+ \usebibmacro{manuscript:pages}
+ }{%
+ \usebibmacro{location+date}%
+ }%
+ \newunit\newblock
+ \iftoggle{bbx:url}
+ {\usebibmacro{url+urldate}}
+ {}%
+ \newunit\newblock
+ \usebibmacro{addendum+pubstate}%
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
+ \usebibmacro{finentry}}
\DeclareFieldFormat[letter]{title}{%
\def\currentfield{title}%
\iffieldannotation{descriptor}{#1}{\mkbibquote{#1\isdot}}%
@@ -11859,6 +12583,7 @@ reference,mvreference,inreference]{volume}{%
% We provide an option for setting the relatedtype punctuation.
%
% \begin{macrocode}
+\DeclareDelimFormat{begrelateddelimamendedby}{\addcomma\space}
\DeclareDelimFormat{begrelateddelimequals}{\addspace}
\DeclareDelimFormat{begrelateddelimin}{\addcomma\space}
\DeclareDelimFormat{begrelateddelimincludes}{\addcomma\space}
@@ -11895,6 +12620,7 @@ reference,mvreference,inreference]{volume}{%
\egroup
\iftoggle{blx@ox@success}{\ifstrequal{#1}{space}{%
\DeclareDelimFormat{begrelateddelim}{\addspace}%
+ \DeclareDelimFormat{begrelateddelimamendedby}{\addspace}
\DeclareDelimFormat{begrelateddelimequals}{\addspace}%
\DeclareDelimFormat{begrelateddelimin}{\addspace}%
\DeclareDelimFormat{begrelateddelimincludes}{\addspace}%
@@ -11904,6 +12630,7 @@ reference,mvreference,inreference]{volume}{%
\DeclareDelimFormat{begrelateddelimmultivolume}{\addspace}%
}{%
\DeclareDelimFormat{begrelateddelim}{\csuse{add#1}\space}%
+ \DeclareDelimFormat{begrelateddelimamendedby}{\csuse{add#1}\space}
\DeclareDelimFormat{begrelateddelimequals}{\csuse{add#1}\space}%
\DeclareDelimFormat{begrelateddelimin}{\csuse{add#1}\space}%
\DeclareDelimFormat{begrelateddelimincludes}{\csuse{add#1}\space}%
@@ -11929,12 +12656,14 @@ reference,mvreference,inreference]{volume}{%
\iftoggle{blx@ox@norelin}{%
\renewbibmacro*{in:}{%
\ifboolexpr{
- test {\ifnameundef{author}}
- and
- test {\ifnameundef{translator}}
- and
- test {\iffieldundef{title}}
- }{}{%
+ test {\iffieldequalstr{entrysubtype}{yearbook}}
+ or (
+ test {\ifnameundef{author}}
+ and
+ test {\ifnameundef{translator}}
+ and
+ test {\iffieldundef{title}}
+ )}{}{%
\bibstring{in}%
\printunit{\intitlepunct}%
}}}{}%
@@ -11944,8 +12673,8 @@ reference,mvreference,inreference]{volume}{%
%
% \subsubsection{Translations}
%
-% Where related item is the translation, the related string is prefaced with the
-% language.
+% Where the related item is the translation, the related string is (by default,
+% in English at least) prefaced with the language.
%
% \begin{macrocode}
\newbibmacro*{rellanguage}{%
@@ -11955,8 +12684,11 @@ reference,mvreference,inreference]{volume}{%
\docsvfield{related}%
}
\DeclareFieldFormat{relatedstring:translationof}{%
- \usebibmacro{rellanguage}\space
- \bibstring{original}\addcomma\space}
+ \iffieldundef{relatedstring}{%
+ \blx@ox@langbibstring{\usebibmacro{rellanguage}}{original}%
+ \printunit{\addcomma\space}
+ }{%
+ \thefield{relatedstring}\printunit{\relatedpunct}}}
\DeclareFieldFormat{related:translationof}{%
\mkbibbrackets{#1}}
@@ -12442,10 +13174,10 @@ reference,mvreference,inreference]{volume}{%
match=\regexp{(\D)\.(\d)},
replace=\regexp{$1 $2}]
\step[fieldsource=title,
- match=\regexp{\.(\D)},
+ match=\regexp{(?:\A|[^{])\K\.([^\d}])},
replace=\regexp{$1}]
\step [fieldsource=title,
- match=\regexp{(\D)\.},
+ match=\regexp{([^\d{])\.(?![}])},
replace=\regexp{$1}]
\step[fieldsource=shorttitle,
match=\regexp{(\d)\.(\d)},
@@ -12454,10 +13186,10 @@ reference,mvreference,inreference]{volume}{%
match=\regexp{(\D)\.(\d)},
replace=\regexp{$1 $2}]
\step[fieldsource=shorttitle,
- match=\regexp{\.(\D)},
+ match=\regexp{(?:\A|[^{])\K\.([^\d}])},
replace=\regexp{$1}]
\step [fieldsource=shorttitle,
- match=\regexp{(\D)\.},
+ match=\regexp{([^\d{])\.(?![}])},
replace=\regexp{$1}]
\step[fieldsource=parreporter,
match=\regexp{(\d)\.(\d)},
@@ -12466,10 +13198,10 @@ reference,mvreference,inreference]{volume}{%
match=\regexp{(\D)\.(\d)},
replace=\regexp{$1 $2}]
\step[fieldsource=parreporter,
- match=\regexp{\.(\D)},
+ match=\regexp{(?:\A|[^{])\K\.([^\d}])},
replace=\regexp{$1}]
\step [fieldsource=parreporter,
- match=\regexp{(\D)\.},
+ match=\regexp{([^\d{])\.(?![}])},
replace=\regexp{$1}]
\step[fieldsource=journaltitle,
match=\regexp{(\d)\.(\d)},
@@ -12478,10 +13210,10 @@ reference,mvreference,inreference]{volume}{%
match=\regexp{(\D)\.(\d)},
replace=\regexp{$1 $2}]
\step[fieldsource=journaltitle,
- match=\regexp{\.(\D)},
+ match=\regexp{(?:\A|[^{])\K\.([^\d}])},
replace=\regexp{$1}]
\step [fieldsource=journaltitle,
- match=\regexp{(\D)\.},
+ match=\regexp{([^\d{])\.(?![}])},
replace=\regexp{$1}]
\step[fieldsource=institution,
match=\regexp{(\d)\.(\d)},
@@ -12490,10 +13222,10 @@ reference,mvreference,inreference]{volume}{%
match=\regexp{(\D)\.(\d)},
replace=\regexp{$1 $2}]
\step[fieldsource=institution,
- match=\regexp{\.(\D)},
+ match=\regexp{(?:\A|[^{])\K\.([^\d}])},
replace=\regexp{$1}]
\step[fieldsource=institution,
- match=\regexp{(\D)\.},
+ match=\regexp{([^\d{])\.(?![}])},
replace=\regexp{$1}]
\step[fieldsource=publisher,
match=\regexp{(\d)\.(\d)},
@@ -12502,10 +13234,10 @@ reference,mvreference,inreference]{volume}{%
match=\regexp{(\D)\.(\d)},
replace=\regexp{$1 $2}]
\step[fieldsource=publisher,
- match=\regexp{\.(\D)},
+ match=\regexp{(?:\A|[^{])\K\.([^\d}])},
replace=\regexp{$1}]
\step [fieldsource=publisher,
- match=\regexp{(\D)\.},
+ match=\regexp{([^\d{])\.(?![}])},
replace=\regexp{$1}]
\step[fieldsource=location,
match=\regexp{(\d)\.(\d)},
@@ -12514,10 +13246,10 @@ reference,mvreference,inreference]{volume}{%
match=\regexp{(\D)\.(\d)},
replace=\regexp{$1 $2}]
\step[fieldsource=location,
- match=\regexp{\.(\D)},
+ match=\regexp{(?:\A|[^{])\K\.([^\d}])},
replace=\regexp{$1}]
\step [fieldsource=location,
- match=\regexp{(\D)\.},
+ match=\regexp{([^\d{])\.(?![}])},
replace=\regexp{$1}]
\step[fieldsource=series,
match=\regexp{(\d)\.(\d)},
@@ -12526,10 +13258,10 @@ reference,mvreference,inreference]{volume}{%
match=\regexp{(\D)\.(\d)},
replace=\regexp{$1 $2}]
\step[fieldsource=series,
- match=\regexp{\.(\D)},
+ match=\regexp{(?:\A|[^{])\K\.([^\d}])},
replace=\regexp{$1}]
\step [fieldsource=series,
- match=\regexp{(\D)\.},
+ match=\regexp{([^\d{])\.(?![}])},
replace=\regexp{$1}]
\step[fieldsource=indextitle,
match=\regexp{(\d)\.(\d)},
@@ -12538,10 +13270,10 @@ reference,mvreference,inreference]{volume}{%
match=\regexp{(\D)\.(\d)},
replace=\regexp{$1 $2}]
\step[fieldsource=indextitle,
- match=\regexp{\.(\D)},
+ match=\regexp{(?:\A|[^{])\K\.([^\d}])},
replace=\regexp{$1}]
\step [fieldsource=indextitle,
- match=\regexp{(\D)\.},
+ match=\regexp{([^\d{])\.(?![}])},
replace=\regexp{$1}]
}
% \end{macrocode}
@@ -12563,7 +13295,8 @@ reference,mvreference,inreference]{volume}{%
% \subsection{Sorting schemes}
%
% We adjust the sort order to take into account some other fields that might
-% end up at the front (library, collection, series).
+% end up at the front (library, collection, series). The `|nty|` scheme is used
+% by \textsf{oxnotes}.
%
% \begin{macrocode}
\DeclareSortingTemplate{nty}{
@@ -12602,7 +13335,11 @@ reference,mvreference,inreference]{volume}{%
\field{series}
}
}
-
+% \end{macrocode}
+%
+% The `|nyt|` scheme is used by \textsf{oxyear}.
+%
+% \begin{macrocode}
\DeclareSortingTemplate{nyt}{
\sort{
\field{presort}
@@ -12621,6 +13358,7 @@ reference,mvreference,inreference]{volume}{%
}
\sort{
\field{sortyear}
+ \field{labelyear}
\field{year}
}
\sort{
@@ -12639,7 +13377,11 @@ reference,mvreference,inreference]{volume}{%
\field{series}
}
}
-
+% \end{macrocode}
+%
+% The `|anyt|` scheme is used by \textsf{oxalph}.
+%
+% \begin{macrocode}
\DeclareSortingTemplate{anyt}{
\sort{
\field{presort}
@@ -12661,6 +13403,7 @@ reference,mvreference,inreference]{volume}{%
}
\sort{
\field{sortyear}
+ \field{labelyear}
\field{year}
}
\sort{
@@ -13052,13 +13795,13 @@ reference,mvreference,inreference]{volume}{%
\printfield{issue}\clearfield{issue}%
\setunit*{\addspace}%
\printdateextra}%
- \clearfield{year}\clearfield{season}\clearfield{month}\clearfield{day}%
+ \clearfield{year}\clearfield{yeardivision}\clearfield{month}\clearfield{day}%
}{%
\iflabeldateisanydate{%
\printtext[datelabel]{%
\csuse{print\thefield{labeldatesource}dateextra}}%
\clearfield{\thefield{labeldatesource}year}%
- \clearfield{\thefield{labeldatesource}season}%
+ \clearfield{\thefield{labeldatesource}yeardivision}%
\clearfield{\thefield{labeldatesource}month}%
\clearfield{\thefield{labeldatesource}day}%
}{%
@@ -13078,13 +13821,13 @@ reference,mvreference,inreference]{volume}{%
\iffieldundef{labelyear}{}{%
\iflabeldateisdate{%
\printtext[datelabel]{\printdateextra}%
- \clearfield{year}\clearfield{season}\clearfield{month}\clearfield{day}%
+ \clearfield{year}\clearfield{yeardivision}\clearfield{month}\clearfield{day}%
}{%
\iflabeldateisanydate{%
\printtext[datelabel]{%
\csuse{print\thefield{labeldatesource}dateextra}}%
\clearfield{\thefield{labeldatesource}year}%
- \clearfield{\thefield{labeldatesource}season}%
+ \clearfield{\thefield{labeldatesource}yeardivision}%
\clearfield{\thefield{labeldatesource}month}%
\clearfield{\thefield{labeldatesource}day}%
}{%
@@ -13206,26 +13949,26 @@ reference,mvreference,inreference]{volume}{%
% \begin{macrocode}
\newrobustcmd*{\mknoyeardaterangefull}[2]{%
\iffieldundef{#2month}{}{%
- \datecircaprint
- \printtext[#2date]{%
- \iffieldundef{#2season}{%
- \csuse{mkbibdate#1}{}{#2month}{#2day}%
- \blx@printtime{#2}{}%
- }{%
- \csuse{mkbibseasondate#1}{}{#2season}}%
- \dateuncertainprint
- \iffieldundef{#2endmonth}{}{%
- \iffieldequalstr{#2endmonth}{}{%
- \mbox{\bibdaterangesep}%
+ \printtext[{#2date}]{%
+ \datecircaprint
+ \iffieldundef{#2yeardivision}{%
+ \csuse{mkbibdate#1}{}{#2month}{#2day}%
+ \blx@printtime{#2}{}%
}{%
- \bibdaterangesep
- \enddatecircaprint
- \iffieldundef{#2season}{%
- \csuse{mkbibdate#1}{}{#2endmonth}{#2endday}%
- \blx@printtime{#2}{end}%
+ \csuse{mkbibyeardivisiondate#1}{}{#2yeardivision}}%
+ \dateuncertainprint
+ \iffieldundef{#2endmonth}{}{%
+ \iffieldequalstr{#2endmonth}{}{%
+ \mbox{\bibdaterangesep}%
}{%
- \csuse{mkbibseasondate#1}{}{#2endseason}}%
- \enddateuncertainprint}}}}}
+ \bibdaterangesep
+ \enddatecircaprint
+ \iffieldundef{#2yeardivision}{%
+ \csuse{mkbibdate#1}{}{#2endmonth}{#2endday}%
+ \blx@printtime{#2}{end}%
+ }{%
+ \csuse{mkbibyeardivisiondate#1}{}{#2endyeardivision}}%
+ \enddateuncertainprint}}}}}
% \end{macrocode}
%
% There is a potential problem for \cs{mknoyeardaterangetrunc}, in that if
@@ -13237,11 +13980,11 @@ reference,mvreference,inreference]{volume}{%
% \begin{macrocode}
\newrobustcmd*{\mknoyeardaterangetrunc}[2]{%
\iffieldundef{#2month}{}{%
- \datecircaprint
- \printtext[#2date]{%
- \iffieldundef{#2season}{%
+ \printtext[{#2date}]{%
+ \datecircaprint
+ \iffieldundef{#2yeardivision}{%
\ifboolexpr{
- test {\iffieldsequal{labelyear}{labelendyear}}
+ test {\ifdateyearsequal{label}{labelend}}
and
test {\iffieldsequal{#2month}{#2endmonth}}
}{%
@@ -13249,7 +13992,7 @@ reference,mvreference,inreference]{volume}{%
}{%
\csuse{mkbibdate#1}{}{#2month}{#2day}}%
}{%
- \csuse{mkbibseasondate#1}{}{#2season}}%
+ \csuse{mkbibyeardivisiondate#1}{}{#2yeardivision}}%
\dateuncertainprint
\iffieldundef{#2endmonth}{}{%
\iffieldequalstr{#2endmonth}{}{%
@@ -13257,10 +14000,10 @@ reference,mvreference,inreference]{volume}{%
}{%
\bibdaterangesep
\enddatecircaprint
- \iffieldundef{#2season}{%
+ \iffieldundef{#2yeardivision}{%
\csuse{mkbibdate#1}{}{#2endmonth}{#2endday}%
}{%
- \csuse{mkbibseasondate#1}{}{#2endseason}}%
+ \csuse{mkbibyeardivisiondate#1}{}{#2endyeardivision}}%
\enddateuncertainprint}}}}}
% \end{macrocode}
%
@@ -13560,7 +14303,7 @@ reference,mvreference,inreference]{volume}{%
\iffieldundef{year}%
}{%
\ifboolexpr{
- test {\iffieldundef{season}}
+ test {\iffieldundef{yeardivision}}
and
test {\iffieldundef{month}}
}%
@@ -14220,11 +14963,12 @@ reference,mvreference,inreference]{volume}{%
%
% \begin{macrocode}
\DeclareDatamodelFields[type=field,datatype=date]{pardate}
-\DeclareDatamodelFields[type=field,datatype=literal]{parreporter,parseries}
+\DeclareDatamodelFields[type=field,datatype=literal]{%
+ parreporter,parseries,neutralcite}
\DeclareDatamodelFields[type=field,datatype=integer]{parvolume}
\DeclareDatamodelFields[type=field,datatype=range]{parpages}
-\DeclareDatamodelEntryfields[jurisdiction]{pardate,parreporter,parseries,%
- parvolume,parpages}
+\DeclareDatamodelEntryfields[jurisdiction]{neutralcite,pardate,%
+ parreporter,parseries,parvolume,parpages}
% \end{macrocode}
%
% \iffalse %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -14243,20 +14987,17 @@ reference,mvreference,inreference]{volume}{%
% \setcounter{FancyVerbLine}{19}
%
% Here we set some language-specific punctuation and date formatting.
+% In particular, we set \cs{blx@ox@langbibstring} to use its first
+% argument.
%
% \begin{macrocode}
\InheritBibliographyExtras{english}
\DeclareBibliographyExtras{%
\def\finalandcomma{\addcomma}%
- \protected\def\mkusbibordinal#1{%
- \begingroup
- \@tempcnta0#1\relax\number\@tempcnta
- \@whilenum\@tempcnta>100\do{\advance\@tempcnta-100\relax}%
- \ifnum\@tempcnta>20
- \@whilenum\@tempcnta>9\do{\advance\@tempcnta-10\relax}%
- \fi
- \ifcase\@tempcnta th\or st\or d\or d\else th\fi
- \endgroup}%
+ \def\blx@ox@langbibstring#1#2{#1\addspace\bibstring{#2}}%
+}
+\UndeclareBibliographyExtras{%
+ \def\blx@ox@langbibstring#1#2{\bibstring{#2}}%
}
% \end{macrocode}
%
@@ -14317,6 +15058,7 @@ reference,mvreference,inreference]{volume}{%
suppto = {{Supplement to}{Supplement to}},
equals = {{=}{=}},
original = {{original}{orig\adddot}},
+ amendedby = {{as amended by}{as amended by}},
% \end{macrocode}
%
% \begin{itemize}
@@ -14431,7 +15173,7 @@ reference,mvreference,inreference]{volume}{%
suplayer = {{superior layer}{sup\adddotspace lay\adddot}},
paper = {{paper}{pap\adddot}},
papyrus = {{papyrus}{papy\adddot}},
- pergament = {{pergament}{perg\adddot}},
+ parchment = {{parchment}{parch\adddot}},
eucase = {{Case}{Case}},
eujoinedcases = {{Joined Cases}{Joined Cases}},
commissiondecision = {{Commission Decision}{Commission Decision}},
@@ -14655,11 +15397,16 @@ reference,mvreference,inreference]{volume}{%
% \end{macrocode}
%
% As you'd expect from an Oxford style, we use the Oxford comma, and use a
-% period as the time separator.
+% period as the time separator. The redefinition of \cs{blx@ox@langbibstring}
+% is given here as well.
%
% \begin{macrocode}
\def\finalandcomma{\addcomma}%
\def\bibtimesep{\addperiod}%
+ \def\blx@ox@langbibstring#1#2{#1\addspace\bibstring{#2}}%
+}
+\UndeclareBibliographyExtras{%
+ \def\blx@ox@langbibstring#1#2{\bibstring{#2}}%
}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.pdf
index 3daf20e3ce..64d0e7f5de 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxyear-doc.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxyear-doc.pdf
index 7492f2c4b1..a03712a1aa 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxyear-doc.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxyear-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/CHANGELOG.md b/macros/latex/contrib/l3kernel/CHANGELOG.md
index e4bea1dc23..8add0a64e9 100644
--- a/macros/latex/contrib/l3kernel/CHANGELOG.md
+++ b/macros/latex/contrib/l3kernel/CHANGELOG.md
@@ -7,6 +7,11 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
+## [2023-02-01]
+
+### Fixed
+- Allow for expressions within color `RGB`/`HSB` input
+
## [2023-01-24]
### Added
@@ -1274,7 +1279,8 @@ this project uses date-based 'snapshot' version identifiers.
- Step functions have been added for dim variables,
e.g. `\dim_step_inline:nnnn`
-[Unreleased]: https://github.com/latex3/latex3/compare/2023-01-24...HEAD
+[Unreleased]: https://github.com/latex3/latex3/compare/2023-02-01...HEAD
+[2023-02-01]: https://github.com/latex3/latex3/compare/2023-01-24...2023-02-01
[2023-01-24]: https://github.com/latex3/latex3/compare/2023-01-16...2023-01-24
[2023-01-16]: https://github.com/latex3/latex3/compare/2022-12-17...2023-01-16
[2022-12-17]: https://github.com/latex3/latex3/compare/2022-11-02...2022-12-17
diff --git a/macros/latex/contrib/l3kernel/README.md b/macros/latex/contrib/l3kernel/README.md
index e5354b3721..5b6a75e4b2 100644
--- a/macros/latex/contrib/l3kernel/README.md
+++ b/macros/latex/contrib/l3kernel/README.md
@@ -1,7 +1,7 @@
LaTeX3 Programming Conventions
==============================
-Release 2023-01-24
+Release 2023-02-01
Overview
--------
diff --git a/macros/latex/contrib/l3kernel/expl3.dtx b/macros/latex/contrib/l3kernel/expl3.dtx
index 20477df6ab..8a6c15f8d8 100644
--- a/macros/latex/contrib/l3kernel/expl3.dtx
+++ b/macros/latex/contrib/l3kernel/expl3.dtx
@@ -24,7 +24,7 @@
%
%<*driver|generic|package|2ekernel>
%</driver|generic|package|2ekernel>
-\def\ExplFileDate{2023-01-24}%
+\def\ExplFileDate{2023-02-01}%
%<*driver>
\documentclass[full]{l3doc}
\usepackage{graphicx}
@@ -51,7 +51,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/expl3.pdf b/macros/latex/contrib/l3kernel/expl3.pdf
index fbd84e6cbc..94df632a7b 100644
--- a/macros/latex/contrib/l3kernel/expl3.pdf
+++ b/macros/latex/contrib/l3kernel/expl3.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/interface3.pdf b/macros/latex/contrib/l3kernel/interface3.pdf
index 4036c88f84..7d61546402 100644
--- a/macros/latex/contrib/l3kernel/interface3.pdf
+++ b/macros/latex/contrib/l3kernel/interface3.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/interface3.tex b/macros/latex/contrib/l3kernel/interface3.tex
index 7608abd885..b035749e48 100644
--- a/macros/latex/contrib/l3kernel/interface3.tex
+++ b/macros/latex/contrib/l3kernel/interface3.tex
@@ -54,7 +54,7 @@ for those people who are interested.
{latex-team@latex-project.org}%
}%
}
-\date{Released 2023-01-24}
+\date{Released 2023-02-01}
\pagenumbering{roman}
\maketitle
diff --git a/macros/latex/contrib/l3kernel/l3basics.dtx b/macros/latex/contrib/l3kernel/l3basics.dtx
index a67333c13e..2cac0454f9 100644
--- a/macros/latex/contrib/l3kernel/l3basics.dtx
+++ b/macros/latex/contrib/l3kernel/l3basics.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3bootstrap.dtx b/macros/latex/contrib/l3kernel/l3bootstrap.dtx
index d0a82dd956..9aa9616eac 100644
--- a/macros/latex/contrib/l3kernel/l3bootstrap.dtx
+++ b/macros/latex/contrib/l3kernel/l3bootstrap.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3box.dtx b/macros/latex/contrib/l3kernel/l3box.dtx
index 64e7dfc921..ab7d9eb05a 100644
--- a/macros/latex/contrib/l3kernel/l3box.dtx
+++ b/macros/latex/contrib/l3kernel/l3box.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3candidates.dtx b/macros/latex/contrib/l3kernel/l3candidates.dtx
index 691215f2ec..922f70f9e0 100644
--- a/macros/latex/contrib/l3kernel/l3candidates.dtx
+++ b/macros/latex/contrib/l3kernel/l3candidates.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3cctab.dtx b/macros/latex/contrib/l3kernel/l3cctab.dtx
index 7fb9f6baa5..8849bb89f2 100644
--- a/macros/latex/contrib/l3kernel/l3cctab.dtx
+++ b/macros/latex/contrib/l3kernel/l3cctab.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3clist.dtx b/macros/latex/contrib/l3kernel/l3clist.dtx
index 9cbe851c27..89333e2e12 100644
--- a/macros/latex/contrib/l3kernel/l3clist.dtx
+++ b/macros/latex/contrib/l3kernel/l3clist.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3coffins.dtx b/macros/latex/contrib/l3kernel/l3coffins.dtx
index c14f49b957..95776f1c2c 100644
--- a/macros/latex/contrib/l3kernel/l3coffins.dtx
+++ b/macros/latex/contrib/l3kernel/l3coffins.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3color.dtx b/macros/latex/contrib/l3kernel/l3color.dtx
index 6cda94918c..cbc0016786 100644
--- a/macros/latex/contrib/l3kernel/l3color.dtx
+++ b/macros/latex/contrib/l3kernel/l3color.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
@@ -1150,7 +1150,7 @@
{ rgb }
{
\exp_args:Ne \@@_parse_model_hsb_aux:nnn
- { \fp_eval:n { 6 * #1 } } {#2} {#3}
+ { \fp_eval:n { 6 * (#1) } } {#2} {#3}
}
}
\cs_new:Npn \@@_parse_model_hsb_aux:nnn #1#2#3
@@ -1183,9 +1183,9 @@
\cs_new:Npn \@@_parse_model_HSB:w #1 , #2 , #3 , #4 \s_@@_stop
{
\exp_args:Neee \@@_parse_model_hsb:nnn
- { \fp_eval:n {#1 / 240} }
- { \fp_eval:n {#2 / 240} }
- { \fp_eval:n {#3 / 240} }
+ { \fp_eval:n { round((#1) / 240,5) } }
+ { \fp_eval:n { round((#2) / 240,5) } }
+ { \fp_eval:n { round((#3) / 240,5) } }
}
\cs_new:Npn \@@_parse_model_HTML:w #1 , #2 \s_@@_stop
{ \@@_parse_model_HTML_aux:w #1 0 0 0 0 0 0 \s_@@_stop }
@@ -1202,9 +1202,9 @@
{
{ rgb }
{
- \fp_eval:n { round(#1 / 255,5) } ~
- \fp_eval:n { round(#2 / 255,5) } ~
- \fp_eval:n { round(#3 / 255,5) }
+ \fp_eval:n { round((#1) / 255,5) } ~
+ \fp_eval:n { round((#2) / 255,5) } ~
+ \fp_eval:n { round((#3) / 255,5) }
}
}
% \end{macrocode}
diff --git a/macros/latex/contrib/l3kernel/l3debug.dtx b/macros/latex/contrib/l3kernel/l3debug.dtx
index 7064010a76..cb9f0eaef8 100644
--- a/macros/latex/contrib/l3kernel/l3debug.dtx
+++ b/macros/latex/contrib/l3kernel/l3debug.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3deprecation.dtx b/macros/latex/contrib/l3kernel/l3deprecation.dtx
index b2383fc2d6..4897c82ffd 100644
--- a/macros/latex/contrib/l3kernel/l3deprecation.dtx
+++ b/macros/latex/contrib/l3kernel/l3deprecation.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3doc.dtx b/macros/latex/contrib/l3kernel/l3doc.dtx
index fb79aabdab..92242c8ad0 100644
--- a/macros/latex/contrib/l3kernel/l3doc.dtx
+++ b/macros/latex/contrib/l3kernel/l3doc.dtx
@@ -85,7 +85,7 @@ and all files in that bundle must be distributed together.
% require you to do updates, if the class changes.}}
%
% \author{\Team}
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
% \maketitle
% \tableofcontents
%
diff --git a/macros/latex/contrib/l3kernel/l3doc.pdf b/macros/latex/contrib/l3kernel/l3doc.pdf
index 7f0751f545..1add24cba3 100644
--- a/macros/latex/contrib/l3kernel/l3doc.pdf
+++ b/macros/latex/contrib/l3kernel/l3doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3docstrip.dtx b/macros/latex/contrib/l3kernel/l3docstrip.dtx
index 162cafb650..f4b5db81d1 100644
--- a/macros/latex/contrib/l3kernel/l3docstrip.dtx
+++ b/macros/latex/contrib/l3kernel/l3docstrip.dtx
@@ -63,7 +63,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3docstrip.pdf b/macros/latex/contrib/l3kernel/l3docstrip.pdf
index 1de7fd29c2..3943532829 100644
--- a/macros/latex/contrib/l3kernel/l3docstrip.pdf
+++ b/macros/latex/contrib/l3kernel/l3docstrip.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3expan.dtx b/macros/latex/contrib/l3kernel/l3expan.dtx
index cb01da408f..7a770bf4de 100644
--- a/macros/latex/contrib/l3kernel/l3expan.dtx
+++ b/macros/latex/contrib/l3kernel/l3expan.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3file.dtx b/macros/latex/contrib/l3kernel/l3file.dtx
index de1af91fa6..0c7a282d66 100644
--- a/macros/latex/contrib/l3kernel/l3file.dtx
+++ b/macros/latex/contrib/l3kernel/l3file.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3flag.dtx b/macros/latex/contrib/l3kernel/l3flag.dtx
index 8dde6fe7a6..b7df2c8f76 100644
--- a/macros/latex/contrib/l3kernel/l3flag.dtx
+++ b/macros/latex/contrib/l3kernel/l3flag.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp-assign.dtx b/macros/latex/contrib/l3kernel/l3fp-assign.dtx
index 11326e5852..9bcd05e4b9 100644
--- a/macros/latex/contrib/l3kernel/l3fp-assign.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-assign.dtx
@@ -40,7 +40,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
% \maketitle
%
% \begin{documentation}
diff --git a/macros/latex/contrib/l3kernel/l3fp-aux.dtx b/macros/latex/contrib/l3kernel/l3fp-aux.dtx
index d9bca921ce..ce42026c3c 100644
--- a/macros/latex/contrib/l3kernel/l3fp-aux.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-aux.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp-basics.dtx b/macros/latex/contrib/l3kernel/l3fp-basics.dtx
index d6d6985101..b364be6203 100644
--- a/macros/latex/contrib/l3kernel/l3fp-basics.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-basics.dtx
@@ -40,7 +40,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp-convert.dtx b/macros/latex/contrib/l3kernel/l3fp-convert.dtx
index 2e7482ca85..d914f3dc1c 100644
--- a/macros/latex/contrib/l3kernel/l3fp-convert.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-convert.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp-expo.dtx b/macros/latex/contrib/l3kernel/l3fp-expo.dtx
index 91959a5766..8fe86e7038 100644
--- a/macros/latex/contrib/l3kernel/l3fp-expo.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-expo.dtx
@@ -40,7 +40,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp-extended.dtx b/macros/latex/contrib/l3kernel/l3fp-extended.dtx
index 009edc62a8..a7a9b8da47 100644
--- a/macros/latex/contrib/l3kernel/l3fp-extended.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-extended.dtx
@@ -40,7 +40,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp-logic.dtx b/macros/latex/contrib/l3kernel/l3fp-logic.dtx
index c6908c53e1..897d7c3bbf 100644
--- a/macros/latex/contrib/l3kernel/l3fp-logic.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-logic.dtx
@@ -40,7 +40,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp-parse.dtx b/macros/latex/contrib/l3kernel/l3fp-parse.dtx
index 86396c9d68..2913584e13 100644
--- a/macros/latex/contrib/l3kernel/l3fp-parse.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-parse.dtx
@@ -40,7 +40,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp-random.dtx b/macros/latex/contrib/l3kernel/l3fp-random.dtx
index 2c6a9bfa8c..8a954d4d02 100644
--- a/macros/latex/contrib/l3kernel/l3fp-random.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-random.dtx
@@ -40,7 +40,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp-round.dtx b/macros/latex/contrib/l3kernel/l3fp-round.dtx
index 8eae112b79..9a4b5405e7 100644
--- a/macros/latex/contrib/l3kernel/l3fp-round.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-round.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp-traps.dtx b/macros/latex/contrib/l3kernel/l3fp-traps.dtx
index 34a9a4afbf..c4c785f422 100644
--- a/macros/latex/contrib/l3kernel/l3fp-traps.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-traps.dtx
@@ -40,7 +40,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
% \maketitle
%
% \begin{documentation}
diff --git a/macros/latex/contrib/l3kernel/l3fp-trig.dtx b/macros/latex/contrib/l3kernel/l3fp-trig.dtx
index bc0d7aa98c..1957dd6778 100644
--- a/macros/latex/contrib/l3kernel/l3fp-trig.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-trig.dtx
@@ -40,7 +40,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp.dtx b/macros/latex/contrib/l3kernel/l3fp.dtx
index a8b506aa0a..c619c0cd6a 100644
--- a/macros/latex/contrib/l3kernel/l3fp.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp.dtx
@@ -49,7 +49,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fparray.dtx b/macros/latex/contrib/l3kernel/l3fparray.dtx
index db4697d6e6..a7e62de3c8 100644
--- a/macros/latex/contrib/l3kernel/l3fparray.dtx
+++ b/macros/latex/contrib/l3kernel/l3fparray.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3int.dtx b/macros/latex/contrib/l3kernel/l3int.dtx
index b208fc179d..319905e221 100644
--- a/macros/latex/contrib/l3kernel/l3int.dtx
+++ b/macros/latex/contrib/l3kernel/l3int.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3intarray.dtx b/macros/latex/contrib/l3kernel/l3intarray.dtx
index 51124f232b..fcbd4f505f 100644
--- a/macros/latex/contrib/l3kernel/l3intarray.dtx
+++ b/macros/latex/contrib/l3kernel/l3intarray.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3kernel-functions.dtx b/macros/latex/contrib/l3kernel/l3kernel-functions.dtx
index 3dbb07e618..aa543dc8ed 100644
--- a/macros/latex/contrib/l3kernel/l3kernel-functions.dtx
+++ b/macros/latex/contrib/l3kernel/l3kernel-functions.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3keys.dtx b/macros/latex/contrib/l3kernel/l3keys.dtx
index f4fbb8a73b..91c043c6b6 100644
--- a/macros/latex/contrib/l3kernel/l3keys.dtx
+++ b/macros/latex/contrib/l3kernel/l3keys.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3legacy.dtx b/macros/latex/contrib/l3kernel/l3legacy.dtx
index 02f5f0b84b..20c3706ede 100644
--- a/macros/latex/contrib/l3kernel/l3legacy.dtx
+++ b/macros/latex/contrib/l3kernel/l3legacy.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3luatex.dtx b/macros/latex/contrib/l3kernel/l3luatex.dtx
index 433d2a2573..5970ee2354 100644
--- a/macros/latex/contrib/l3kernel/l3luatex.dtx
+++ b/macros/latex/contrib/l3kernel/l3luatex.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3msg.dtx b/macros/latex/contrib/l3kernel/l3msg.dtx
index a8020d025d..28d0e56972 100644
--- a/macros/latex/contrib/l3kernel/l3msg.dtx
+++ b/macros/latex/contrib/l3kernel/l3msg.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3names.dtx b/macros/latex/contrib/l3kernel/l3names.dtx
index b3a30158f4..fca2466a9f 100644
--- a/macros/latex/contrib/l3kernel/l3names.dtx
+++ b/macros/latex/contrib/l3kernel/l3names.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3news.pdf b/macros/latex/contrib/l3kernel/l3news.pdf
index d34f4618a4..2c0fceb45e 100644
--- a/macros/latex/contrib/l3kernel/l3news.pdf
+++ b/macros/latex/contrib/l3kernel/l3news.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news01.pdf b/macros/latex/contrib/l3kernel/l3news01.pdf
index 8b51ee3664..d4a38db1e9 100644
--- a/macros/latex/contrib/l3kernel/l3news01.pdf
+++ b/macros/latex/contrib/l3kernel/l3news01.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news02.pdf b/macros/latex/contrib/l3kernel/l3news02.pdf
index 64f0bf8154..575ff85229 100644
--- a/macros/latex/contrib/l3kernel/l3news02.pdf
+++ b/macros/latex/contrib/l3kernel/l3news02.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news03.pdf b/macros/latex/contrib/l3kernel/l3news03.pdf
index f58f57ab86..d898cf453e 100644
--- a/macros/latex/contrib/l3kernel/l3news03.pdf
+++ b/macros/latex/contrib/l3kernel/l3news03.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news04.pdf b/macros/latex/contrib/l3kernel/l3news04.pdf
index 91f36ea7a5..74923e5b0e 100644
--- a/macros/latex/contrib/l3kernel/l3news04.pdf
+++ b/macros/latex/contrib/l3kernel/l3news04.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news05.pdf b/macros/latex/contrib/l3kernel/l3news05.pdf
index adda3bf11c..71725e6e97 100644
--- a/macros/latex/contrib/l3kernel/l3news05.pdf
+++ b/macros/latex/contrib/l3kernel/l3news05.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news06.pdf b/macros/latex/contrib/l3kernel/l3news06.pdf
index fe7fa91ee9..ee37c0638b 100644
--- a/macros/latex/contrib/l3kernel/l3news06.pdf
+++ b/macros/latex/contrib/l3kernel/l3news06.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news07.pdf b/macros/latex/contrib/l3kernel/l3news07.pdf
index 9619cb2c04..65b1ae9db7 100644
--- a/macros/latex/contrib/l3kernel/l3news07.pdf
+++ b/macros/latex/contrib/l3kernel/l3news07.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news08.pdf b/macros/latex/contrib/l3kernel/l3news08.pdf
index 113a54209c..dc806a6d8a 100644
--- a/macros/latex/contrib/l3kernel/l3news08.pdf
+++ b/macros/latex/contrib/l3kernel/l3news08.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news09.pdf b/macros/latex/contrib/l3kernel/l3news09.pdf
index a1f79e3f88..ff2aa73d49 100644
--- a/macros/latex/contrib/l3kernel/l3news09.pdf
+++ b/macros/latex/contrib/l3kernel/l3news09.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news10.pdf b/macros/latex/contrib/l3kernel/l3news10.pdf
index 347446613e..b5701d7e8f 100644
--- a/macros/latex/contrib/l3kernel/l3news10.pdf
+++ b/macros/latex/contrib/l3kernel/l3news10.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news11.pdf b/macros/latex/contrib/l3kernel/l3news11.pdf
index 5f6993d5f5..67aed46a9d 100644
--- a/macros/latex/contrib/l3kernel/l3news11.pdf
+++ b/macros/latex/contrib/l3kernel/l3news11.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news12.pdf b/macros/latex/contrib/l3kernel/l3news12.pdf
index b2d4c4d58f..15ea7573ea 100644
--- a/macros/latex/contrib/l3kernel/l3news12.pdf
+++ b/macros/latex/contrib/l3kernel/l3news12.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3pdf.dtx b/macros/latex/contrib/l3kernel/l3pdf.dtx
index be7c366ef5..f4261f3f39 100644
--- a/macros/latex/contrib/l3kernel/l3pdf.dtx
+++ b/macros/latex/contrib/l3kernel/l3pdf.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3prefixes.pdf b/macros/latex/contrib/l3kernel/l3prefixes.pdf
index 6528db5c18..737736e8a8 100644
--- a/macros/latex/contrib/l3kernel/l3prefixes.pdf
+++ b/macros/latex/contrib/l3kernel/l3prefixes.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3prg.dtx b/macros/latex/contrib/l3kernel/l3prg.dtx
index 752f1d8a34..67d853b49a 100644
--- a/macros/latex/contrib/l3kernel/l3prg.dtx
+++ b/macros/latex/contrib/l3kernel/l3prg.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3prop.dtx b/macros/latex/contrib/l3kernel/l3prop.dtx
index d672f16049..f46714ad13 100644
--- a/macros/latex/contrib/l3kernel/l3prop.dtx
+++ b/macros/latex/contrib/l3kernel/l3prop.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3quark.dtx b/macros/latex/contrib/l3kernel/l3quark.dtx
index 1179f0d0c4..e3c0f577b9 100644
--- a/macros/latex/contrib/l3kernel/l3quark.dtx
+++ b/macros/latex/contrib/l3kernel/l3quark.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3regex.dtx b/macros/latex/contrib/l3kernel/l3regex.dtx
index 15cacbe65c..f162557a98 100644
--- a/macros/latex/contrib/l3kernel/l3regex.dtx
+++ b/macros/latex/contrib/l3kernel/l3regex.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3seq.dtx b/macros/latex/contrib/l3kernel/l3seq.dtx
index c5c3762183..c987f18d26 100644
--- a/macros/latex/contrib/l3kernel/l3seq.dtx
+++ b/macros/latex/contrib/l3kernel/l3seq.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3skip.dtx b/macros/latex/contrib/l3kernel/l3skip.dtx
index ec8e13958d..84516eb0b7 100644
--- a/macros/latex/contrib/l3kernel/l3skip.dtx
+++ b/macros/latex/contrib/l3kernel/l3skip.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3sort.dtx b/macros/latex/contrib/l3kernel/l3sort.dtx
index 218355f679..74f16614dd 100644
--- a/macros/latex/contrib/l3kernel/l3sort.dtx
+++ b/macros/latex/contrib/l3kernel/l3sort.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3str-convert.dtx b/macros/latex/contrib/l3kernel/l3str-convert.dtx
index 2ae9043517..1ee624ee62 100644
--- a/macros/latex/contrib/l3kernel/l3str-convert.dtx
+++ b/macros/latex/contrib/l3kernel/l3str-convert.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3str.dtx b/macros/latex/contrib/l3kernel/l3str.dtx
index 8fd858e5ef..02f6d65df6 100644
--- a/macros/latex/contrib/l3kernel/l3str.dtx
+++ b/macros/latex/contrib/l3kernel/l3str.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3styleguide.pdf b/macros/latex/contrib/l3kernel/l3styleguide.pdf
index 88b1d321aa..792a2418eb 100644
--- a/macros/latex/contrib/l3kernel/l3styleguide.pdf
+++ b/macros/latex/contrib/l3kernel/l3styleguide.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3styleguide.tex b/macros/latex/contrib/l3kernel/l3styleguide.tex
index b1eeda0c9e..21ff9971a5 100644
--- a/macros/latex/contrib/l3kernel/l3styleguide.tex
+++ b/macros/latex/contrib/l3kernel/l3styleguide.tex
@@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN.
{latex-team@latex-project.org}%
}%
}
-\date{Released 2023-01-24}
+\date{Released 2023-02-01}
\begin{document}
diff --git a/macros/latex/contrib/l3kernel/l3syntax-changes.pdf b/macros/latex/contrib/l3kernel/l3syntax-changes.pdf
index d35865020d..be67eb0302 100644
--- a/macros/latex/contrib/l3kernel/l3syntax-changes.pdf
+++ b/macros/latex/contrib/l3kernel/l3syntax-changes.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3syntax-changes.tex b/macros/latex/contrib/l3kernel/l3syntax-changes.tex
index d72444c0a9..ddf696a1d5 100644
--- a/macros/latex/contrib/l3kernel/l3syntax-changes.tex
+++ b/macros/latex/contrib/l3kernel/l3syntax-changes.tex
@@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN.
{latex-team@latex-project.org}%
}%
}
-\date{Released 2023-01-24}
+\date{Released 2023-02-01}
\newcommand{\TF}{\textit{(TF)}}
diff --git a/macros/latex/contrib/l3kernel/l3sys.dtx b/macros/latex/contrib/l3kernel/l3sys.dtx
index 4820317747..3baec0bd4d 100644
--- a/macros/latex/contrib/l3kernel/l3sys.dtx
+++ b/macros/latex/contrib/l3kernel/l3sys.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3term-glossary.pdf b/macros/latex/contrib/l3kernel/l3term-glossary.pdf
index af5414dd9b..8df79c02d6 100644
--- a/macros/latex/contrib/l3kernel/l3term-glossary.pdf
+++ b/macros/latex/contrib/l3kernel/l3term-glossary.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3term-glossary.tex b/macros/latex/contrib/l3kernel/l3term-glossary.tex
index 26bdd5ddda..222b808d93 100644
--- a/macros/latex/contrib/l3kernel/l3term-glossary.tex
+++ b/macros/latex/contrib/l3kernel/l3term-glossary.tex
@@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN.
{latex-team@latex-project.org}%
}%
}
-\date{Released 2023-01-24}
+\date{Released 2023-02-01}
\newcommand{\TF}{\textit{(TF)}}
diff --git a/macros/latex/contrib/l3kernel/l3text-case.dtx b/macros/latex/contrib/l3kernel/l3text-case.dtx
index b405100b79..27e8395224 100644
--- a/macros/latex/contrib/l3kernel/l3text-case.dtx
+++ b/macros/latex/contrib/l3kernel/l3text-case.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
@@ -1368,7 +1368,6 @@
}
\cs_new:Npn \@@_change_case_boundary_upper_el:nnnN #1#2#3#4
{
- \MARJ
\bool_lazy_or:nnTF
{ \token_if_letter_p:N #4 }
{
diff --git a/macros/latex/contrib/l3kernel/l3text-map.dtx b/macros/latex/contrib/l3kernel/l3text-map.dtx
index 1d2c3a47e0..9f015a43cd 100644
--- a/macros/latex/contrib/l3kernel/l3text-map.dtx
+++ b/macros/latex/contrib/l3kernel/l3text-map.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3text-purify.dtx b/macros/latex/contrib/l3kernel/l3text-purify.dtx
index 9c6e391bf8..89c5022af5 100644
--- a/macros/latex/contrib/l3kernel/l3text-purify.dtx
+++ b/macros/latex/contrib/l3kernel/l3text-purify.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3text.dtx b/macros/latex/contrib/l3kernel/l3text.dtx
index adaf98274c..a5a50d569b 100644
--- a/macros/latex/contrib/l3kernel/l3text.dtx
+++ b/macros/latex/contrib/l3kernel/l3text.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3tl-analysis.dtx b/macros/latex/contrib/l3kernel/l3tl-analysis.dtx
index 2bc1938072..c5ef954995 100644
--- a/macros/latex/contrib/l3kernel/l3tl-analysis.dtx
+++ b/macros/latex/contrib/l3kernel/l3tl-analysis.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3tl.dtx b/macros/latex/contrib/l3kernel/l3tl.dtx
index 5bf059a678..c4e34f91e5 100644
--- a/macros/latex/contrib/l3kernel/l3tl.dtx
+++ b/macros/latex/contrib/l3kernel/l3tl.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3token.dtx b/macros/latex/contrib/l3kernel/l3token.dtx
index 8a1ca75599..654cf2d8f8 100644
--- a/macros/latex/contrib/l3kernel/l3token.dtx
+++ b/macros/latex/contrib/l3kernel/l3token.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3unicode.dtx b/macros/latex/contrib/l3kernel/l3unicode.dtx
index 27bf195fc6..3cc7f2d22e 100644
--- a/macros/latex/contrib/l3kernel/l3unicode.dtx
+++ b/macros/latex/contrib/l3kernel/l3unicode.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-24}
+% \date{Released 2023-02-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/source3.pdf b/macros/latex/contrib/l3kernel/source3.pdf
index e1e7603896..4574dd866e 100644
--- a/macros/latex/contrib/l3kernel/source3.pdf
+++ b/macros/latex/contrib/l3kernel/source3.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/source3.tex b/macros/latex/contrib/l3kernel/source3.tex
index 02c9a23511..042157365b 100644
--- a/macros/latex/contrib/l3kernel/source3.tex
+++ b/macros/latex/contrib/l3kernel/source3.tex
@@ -53,7 +53,7 @@ for those people who are interested.
{latex-team@latex-project.org}%
}%
}
-\date{Released 2023-01-24}
+\date{Released 2023-02-01}
\pagenumbering{roman}
\maketitle
diff --git a/macros/latex/contrib/l3packages/CHANGELOG.md b/macros/latex/contrib/l3packages/CHANGELOG.md
index 6ad508a7f3..6af289ef1e 100644
--- a/macros/latex/contrib/l3packages/CHANGELOG.md
+++ b/macros/latex/contrib/l3packages/CHANGELOG.md
@@ -7,6 +7,14 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
+## [2023-02-01]
+
+### Added
+- `\DeclareInstanceCopy`
+
+### Changes
+- Set only known keys in `\SetTemplateKeys`
+
## [2023-01-16]
### Fixed
@@ -214,7 +222,8 @@ this project uses date-based 'snapshot' version identifiers.
- Switch to ISO date format
- Improve cross-module use of internal functions
-[Unreleased]: https://github.com/latex3/latex3/compare/2023-01-16...HEAD
+[Unreleased]: https://github.com/latex3/latex3/compare/2023-02-01...HEAD
+[2023-02-01]: https://github.com/latex3/latex3/compare/2023-01-16...2023-02-01
[2023-01-16]: https://github.com/latex3/latex3/compare/2022-12-17...2023-01-16
[2022-12-17]: https://github.com/latex3/latex3/compare/2022-06-22...2022-12-17
[2022-06-22]: https://github.com/latex3/latex3/compare/2022-06-16...2022-06-22
diff --git a/macros/latex/contrib/l3packages/README.md b/macros/latex/contrib/l3packages/README.md
index bd73e2a0be..95e8deca21 100644
--- a/macros/latex/contrib/l3packages/README.md
+++ b/macros/latex/contrib/l3packages/README.md
@@ -1,7 +1,7 @@
LaTeX3 High-Level Concepts
==========================
-Release 2023-01-16
+Release 2023-02-01
Overview
--------
diff --git a/macros/latex/contrib/l3packages/l3keys2e.dtx b/macros/latex/contrib/l3packages/l3keys2e.dtx
index e72854c2f1..599f68f54f 100644
--- a/macros/latex/contrib/l3packages/l3keys2e.dtx
+++ b/macros/latex/contrib/l3packages/l3keys2e.dtx
@@ -62,7 +62,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-16}
+% \date{Released 2023-02-01}
%
% \maketitle
%
@@ -154,7 +154,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{l3keys2e}{2023-01-16}{}
+\ProvidesExplPackage{l3keys2e}{2023-02-01}{}
{LaTeX2e option processing using LaTeX3 keys}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/l3packages/l3keys2e.pdf b/macros/latex/contrib/l3packages/l3keys2e.pdf
index 9455410190..2b68217a40 100644
--- a/macros/latex/contrib/l3packages/l3keys2e.pdf
+++ b/macros/latex/contrib/l3packages/l3keys2e.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3packages/xfp.dtx b/macros/latex/contrib/l3packages/xfp.dtx
index 836c5e3b55..16c975e049 100644
--- a/macros/latex/contrib/l3packages/xfp.dtx
+++ b/macros/latex/contrib/l3packages/xfp.dtx
@@ -63,7 +63,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-16}
+% \date{Released 2023-02-01}
%
% \maketitle
%
@@ -171,7 +171,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{xfp}{2023-01-16}{}
+\ProvidesExplPackage{xfp}{2023-02-01}{}
{L3 Floating point unit}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/l3packages/xfp.pdf b/macros/latex/contrib/l3packages/xfp.pdf
index f33457d2d9..7c90dbe0a8 100644
--- a/macros/latex/contrib/l3packages/xfp.pdf
+++ b/macros/latex/contrib/l3packages/xfp.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3packages/xfrac.dtx b/macros/latex/contrib/l3packages/xfrac.dtx
index 596d639f4c..f09029f9ef 100644
--- a/macros/latex/contrib/l3packages/xfrac.dtx
+++ b/macros/latex/contrib/l3packages/xfrac.dtx
@@ -65,7 +65,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-16}
+% \date{Released 2023-02-01}
%
% \maketitle
%
@@ -535,7 +535,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{xfrac}{2023-01-16}{}
+\ProvidesExplPackage{xfrac}{2023-02-01}{}
{L3 Experimental split-level fractions}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/l3packages/xfrac.pdf b/macros/latex/contrib/l3packages/xfrac.pdf
index b61304d37e..d1995a4d6a 100644
--- a/macros/latex/contrib/l3packages/xfrac.pdf
+++ b/macros/latex/contrib/l3packages/xfrac.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3packages/xparse.dtx b/macros/latex/contrib/l3packages/xparse.dtx
index 97dd2f8fd9..15981e5210 100644
--- a/macros/latex/contrib/l3packages/xparse.dtx
+++ b/macros/latex/contrib/l3packages/xparse.dtx
@@ -67,7 +67,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-16}
+% \date{Released 2023-02-01}
%
% \maketitle
%
@@ -1064,7 +1064,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{xparse}{2023-01-16}{}
+\ProvidesExplPackage{xparse}{2023-02-01}{}
{L3 Experimental document command parser}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/l3packages/xparse.pdf b/macros/latex/contrib/l3packages/xparse.pdf
index f0cf92604c..16140647f9 100644
--- a/macros/latex/contrib/l3packages/xparse.pdf
+++ b/macros/latex/contrib/l3packages/xparse.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3packages/xtemplate.dtx b/macros/latex/contrib/l3packages/xtemplate.dtx
index eb9ae86e94..42d00c8657 100644
--- a/macros/latex/contrib/l3packages/xtemplate.dtx
+++ b/macros/latex/contrib/l3packages/xtemplate.dtx
@@ -63,7 +63,7 @@
% }^^A
% }
%
-% \date{Released 2023-01-16}
+% \date{Released 2023-02-01}
%
% \maketitle
%
@@ -475,6 +475,15 @@
% then inserts the appropriate code into the input stream.
% \end{function}
%
+% \begin{function}{\DeclareInstanceCopy}
+% \begin{syntax}
+% \cs{DeclareInstanceCopy}
+% ~~\Arg{object type} \Arg{instance1} \Arg{instance2}
+% \end{syntax}
+% Copies the \meta{values} for \meta{instance1} for an
+% \meta{object type} to \meta{instance2}.
+% \end{function}
+%
% \section{Document interface}
%
% After the instances have been chosen, document commands must be
@@ -702,7 +711,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{xtemplate}{2023-01-16}{}
+\ProvidesExplPackage{xtemplate}{2023-02-01}{}
{L3 Experimental prototype document functions}
% \end{macrocode}
%
@@ -1987,6 +1996,27 @@
% \end{macro}
% \end{macro}
%
+% \begin{macro}{\@@_copy_instance:nnnn}
+% Copy--paste an instance
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_copy_instance:nnnn #1#2#3#4
+ {
+ \@@_if_instance_exist:nnnTF {#1} {#2} {#3}
+ {
+ \@@_recover_values:n { #1 / #2 / #3 }
+ \@@_store_values:n { #1 / #2 / #4 }
+ \cs_set_eq:cc { \c_@@_instances_root_tl #1 / #2 / #4 }
+ { \c_@@_instances_root_tl #1 / #2 / #3 }
+ }
+ {
+ \msg_error:nnxx { xtemplate } { unknown-instance }
+ {#1} {#3}
+ }
+ }
+% \end{macrocode}
+% \end{macro}
+%
+%
% \begin{macro}{\@@_edit_instance:nnnn}
% \begin{macro}{\@@_edit_instance_aux:nnnnn}
% \begin{macro}{\@@_edit_instance_aux:nonnn}
@@ -1994,7 +2024,7 @@
% variation is the source of the values to use. When editing, they are
% recovered from the previous instance run.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_edit_instance:nnnn #1#2#3
+\cs_new_protected:Npn \@@_edit_instance:nnnn #1#2#3#4
{
\@@_if_instance_exist:nnnTF {#1} {#2} {#3}
{
@@ -2002,7 +2032,7 @@
\prop_get:NnN \l_@@_values_prop { from~template }
\l_@@_tmp_tl
\@@_edit_instance_aux:nonnn {#1} \l_@@_tmp_tl
- {#2} {#3}
+ {#2} {#3} {#4}
}
{
\msg_error:nnxx { xtemplate } { unknown-instance }
@@ -2783,6 +2813,7 @@
% \begin{macro}{\EditTemplateDefaults}
% \begin{macro}{\DeclareInstance}
% \begin{macro}{\DeclareCollectionInstance}
+% \begin{macro}{\DeclareInstanceCopy}
% \begin{macro}{\EditInstance}
% \begin{macro}{\EditCollectionInstance}
% \begin{macro}{\UseTemplate}
@@ -2803,6 +2834,8 @@
{ \@@_declare_instance:nnnnn {#1} {#3} { } {#2} {#4} }
\cs_new_protected:Npn \DeclareCollectionInstance #1#2#3#4#5
{ \@@_declare_instance:nnnnn {#2} {#4} {#1} {#3} {#5} }
+\cs_new_protected:Npn \DeclareInstanceCopy #1#2#3
+ { \@@_copy_instance:nnnn {#1} { } {#2} {#3} }
\cs_new_protected:Npn \EditTemplateDefaults #1#2#3
{ \@@_edit_defaults:nnn {#1} {#2} {#3} }
\cs_new_protected:Npn \EditInstance #1#2#3
@@ -2828,6 +2861,7 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
%
% \begin{macro}{\ShowTemplateCode}
% \begin{macro}{\ShowTemplateDefaults}
@@ -2888,7 +2922,7 @@
% A friendly wrapper
% \begin{macrocode}
\cs_new_protected:Npn \SetTemplateKeys #1#2#3
- { \keys_set:nn { template / #1 / #2 } {#3} }
+ { \keys_set_known:nnN { template / #1 / #2 } {#3} \l_@@_tmp_clist }
% \end{macrocode}
% \end{macro}
%
diff --git a/macros/latex/contrib/l3packages/xtemplate.pdf b/macros/latex/contrib/l3packages/xtemplate.pdf
index ce2f8a6227..eee7287443 100644
--- a/macros/latex/contrib/l3packages/xtemplate.pdf
+++ b/macros/latex/contrib/l3packages/xtemplate.pdf
Binary files differ
diff --git a/macros/xetex/latex/xduts/xduts.dtx b/macros/xetex/latex/xduts/xduts.dtx
index fb5170a008..015cd3da11 100644
--- a/macros/xetex/latex/xduts/xduts.dtx
+++ b/macros/xetex/latex/xduts/xduts.dtx
@@ -1,7 +1,7 @@
% \iffalse
%<*driver>
\ProvidesFile{xduts.dtx}
-[2023/01/28 v4.3.0.0 Xidian University TeX Suite]
+[2023/01/30 v4.3.0.2 Xidian University TeX Suite]
%</driver>
%<class|sty>\NeedsTeXFormat{LaTeX2e}
%<class|sty>\RequirePackage{expl3}
@@ -9,14 +9,18 @@
%<xduugtp>\ProvidesExplClass{xduugtp}
%<xdupgthesis>\ProvidesExplClass{xdupgthesis}
%<xduugthesis>\ProvidesExplClass{xduugthesis}
-%<class|sty> {2023/01/28}{4.3.0.0}
+%<class|sty> {2023/01/30}{4.3.0.2}
%<xdufont> {Xidian University Font package}
%<xduugtp> {Xidian University Undergraduate Thesis Proposal class}
%<xdupgthesis> {Xidian University Postgraduate Thesis document class}
%<xduugthesis> {Xidian University Undergraduate Thesis document class}
%<*driver>
\PassOptionsToPackage{AutoFakeBold=3}{xeCJK}
+\RequirePackage{silence}
+\WarningsOff[hyperref,tocloft,latexfont]
+\renewcommand{\message}[1]{}
\documentclass{ctxdoc}
+\changes{v4.3.0.2}{2023/01/30}{移除文档编译警告和消息}
\changes{v1.9.0.0}{2022/05/03}{支持中文选项默认值加粗}
\changes{v1.9.0.0}{2022/05/03}{增大function环境盒子宽度}
\addtolength{\marginparwidth}{5mm}
@@ -39,7 +43,6 @@
}
\setcounter{tocdepth}{5}
\ctexset{punct=quanjiao}
-\usepackage{hologo}
\usepackage{xurl}
\usepackage{xspace}
\xspaceaddexceptions{。?!,、;:“”‘’—….--~·《》<>_}
@@ -94,11 +97,8 @@
\changes{v4.1.1.1}{2023/01/21}{修正LOGO字形高度}
\newfontfamily{\ffmfamily}[Scale=MatchUppercase]{ffmb10.otf}
\newcommand{\xduts}{{\ffmfamily XDUTS}}
-\newcommand{\texlive}{\TeX{} Live}
-\newcommand{\mactex}{Mac\TeX{}}
-\newcommand{\miktex}{\xspace\hologo{MiKTeX}\xspace}
\newcommand{\bibtex}{\xspace\hologo{BibTeX}\xspace}
-\newcommand{\biber}{\xspace\hologo{biber}\xspace\xspace}
+\newcommand{\biblatex}{\xspace Bib\LaTeX\xspace}
% arguments list
\setlist[arguments]{label=\texttt{\#\arabic*}\,:}
% 浮动体默认设置
@@ -171,7 +171,7 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1}
% \begin{abstract}
% \xduts{}是面向西安电子科技大学本科生/研究生的\LaTeXiii{}文档类和宏包套装,
% 仅支持\XeLaTeX{},
-% 仅支持\texlive{}、\mactex{}、\miktex{},
+% 仅支持\TeXLive{}、Mac\TeX{}、\MiKTeX{},
% 支持Windows、macOS、GNU/Linux、Overleaf和TeXPage。
% \end{abstract}
% \renewcommand{\abstractname}{免责声明}
@@ -373,7 +373,7 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1}
% \changes{v1.13.5.1}{2022/05/08}{补充子图引用样式文档}
% 主要适配子图caption字体字号和子图引用样式,
% \changes{v1.4.1.1}{2022/04/27}{修正子图适配宏包名称}
-% 包括\pkgx{subfig}宏包和\pkgx{subcaption}宏包。
+% 包括\pkgx{subcaption}宏包和\pkgx{subfig}宏包。
% \subsection{表格}
% 主要适配表格内容字号,
% 包括所有使用\envx{table}浮动体的表格、
@@ -381,7 +381,7 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1}
% 和\pkgx{longtable}宏包提供的\envx{longtable}环境。
% \changes{v4.1.1.0}{2023/01/16}{适配子表样式}
% 以及适配子表caption字体字号和子表引用样式,
-% 包括\pkgx{subfig}宏包和\pkgx{subcaption}宏包。
+% 包括\pkgx{subcaption}宏包和\pkgx{subfig}宏包。
% \changes{v4.0.0.1}{2022/12/11}{增加使用建议}
% \section{使用建议}
% \label{使用建议}
@@ -391,7 +391,7 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1}
% 宏包方面,在\secrefx{兼容性说明}中提到已适配多种宏包。
% 但是,由于各种原因,部分宏包已不建议使用。
% 推荐使用\pkgx{algorithm}和\pkgx{algpseudocodex}宏包排版算法;
-% 推荐使用\pkgx{subcaption}宏包排版子图;
+% 推荐使用\pkgx{subcaption}宏包排版子图和子表;
% 推荐使用\pkgx{tabularray}宏包排版\textbf{所有的表格};
% 推荐使用\pkgx{siunitx}宏包排版单位;
% 推荐使用\pkgx{xurl}宏包实现链接自动折行。
@@ -412,12 +412,13 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1}
% \label{编译}
% \changes{v0.5.1.2}{2022/04/07}{增加编译说明}
% \LaTeX{}本身是命令行程序,通过不同的命令调用所需的编译引擎,编辑器提供的快捷按钮实际只是做了包装。
-% \xduts{}仅支持\XeLaTeX{},参考文献默认使用\biber{},也可以切换为\bibtex{}。
+% \xduts{}仅支持\XeLaTeX{},参考文献后端程序默认为\cmdx{biber},也可以切换为\cmdx{bibtex}。
% \subsection{参考文献引用}
% \label{参考文献引用}
+% \changes{v4.3.0.1}{2023/01/30}{修改文档中关于参考文献的描述}
% \xduts{}提供了两种参考文献处理方式,
-% 一种是\pkgx{natbib}和\pkgx{gbt7714}宏包组合,搭配\cmdx{bibtex}命令;
-% 另一种是\pkgx{biblatex}宏包,搭配\cmdx{biber}命令。
+% 一种是\pkgx{natbib}宏包搭配\pkgx{gbt7714}宏包,后端程序为\cmdx{bibtex};
+% 另一种是\pkgx{biblatex}宏包,后端程序为\cmdx{biber}。
% 引用参考文献时,\tnx{cite}为上标样式,\tnx{parencite}为非上标样式。
% \subsection{参数设置}
% \label{参数设置}
@@ -662,8 +663,8 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1}
% 设置参考文献支持方式。
% \end{function}
% \begin{optdesc}
-% \item[bibtex] 使用\bibtex{}处理文献,样式由\pkgx{natbib}宏包负责。
-% \item[biblatex] 使用\biber{}处理文献,样式由\pkgx{biblatex}宏包负责。
+% \item[bibtex] 使用\bibtex{}处理参考文献,后端程序为\cmdx{bibtex}。
+% \item[biblatex] 使用\biblatex{}处理参考文献,后端程序为\cmdx{biber}。
% \end{optdesc}
% \changes{v1.31.0.0}{2022/06/21}{修改\pkgx{biblatex}默认选项}
% \begin{function}[added=2022-06-21]{style/biblatex-option}
diff --git a/macros/xetex/latex/xduts/xduts.pdf b/macros/xetex/latex/xduts/xduts.pdf
index a280b00826..698c2bb59e 100644
--- a/macros/xetex/latex/xduts/xduts.pdf
+++ b/macros/xetex/latex/xduts/xduts.pdf
Binary files differ
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index 13616ce4d0..0d14aed00b 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -33,7 +33,6 @@ $mirrors = {
'https://mirror.unpad.ac.id/ctan/' => 1,
},
'Iran' => {
- 'http://ctan.yazd.ac.ir/' => 1,
'https://ctan.asis.sh/' => 1,
},
'Japan' => {
@@ -53,6 +52,9 @@ $mirrors = {
'Philippines' => {
'http://mirror.rise.ph/ctan/' => 1,
},
+ 'Singapore' => {
+ 'https://download.nus.edu.sg/mirror/ctan/' => 1,
+ },
'Thailand' => {
'https://mirror.kku.ac.th/CTAN/' => 1,
},
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index c4280e4082..6578c1339d 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
@@ -26,7 +26,7 @@ depend container_split_src_files/1
depend frozen/0
depend minrelease/2016
depend release/2022
-depend revision/65694
+depend revision/65700
name 00texlive.image
category TLCore
@@ -4700,7 +4700,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
name 00texlive.installer
category TLCore
-revision 65682
+revision 65696
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
@@ -34685,18 +34685,18 @@ catalogue-version 1.0
name beamerthemeamurmaple
category Package
-revision 64346
+revision 65698
shortdesc A new modern beamer theme
relocated 1
longdesc This Beamer theme is a suitable theme for my use of Beamer in
longdesc applied mathematics research. It meets my needs in my work.
longdesc However, if you like this theme, and if you want to ask for or
longdesc make improvements, don't hesitate to write to me!
-containersize 6028
-containerchecksum 66c91b00956623f61b8c20da8dd975d7ea3feaabd20e0bd978b42dadc76f6cacaf4d9fcdf0d86344ad32b6e637424aa28ef5dcea9452544e9e9b3a9ff72ce7e1
-doccontainersize 690552
-doccontainerchecksum 67f5a188ec848df624246fc283ee50949cf1e9d0f43338142d58615bd4905f8d83a780d968e7a90e1f78a356522a5e52e3dd98c8f2944928222fc12142758751
-docfiles size=445
+containersize 6304
+containerchecksum d3ca653e4d21c08077e6957d2a2ea56f988100aee0c443428328506bd5cee2a739045c99c7373a8870693d76f844dc5ea192a1a69bae197c09eee4ac212501cc
+doccontainersize 749444
+doccontainerchecksum 92c71d9ce3a124009ad3d72e4b46c8ccb3e49d4eeb193d53080a08f3917c065da44bbfe2ac1ec80fb9105cdf1e3a840e7df065a7b28151771fb5acd33ca66174
+docfiles size=446
RELOC/doc/latex/beamerthemeamurmaple/LICENSE
RELOC/doc/latex/beamerthemeamurmaple/README.md details="Readme"
RELOC/doc/latex/beamerthemeamurmaple/beamer-amurmaple-doc.pdf details="Package documentation"
@@ -34712,7 +34712,7 @@ catalogue-contact-repository https://plmlab.math.cnrs.fr/mchupin/mcbeamertheme
catalogue-ctan /macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple
catalogue-license lppl1.3
catalogue-topics presentation
-catalogue-version 1.1
+catalogue-version 1.2
name beamerthemejltree
category Package
@@ -297514,31 +297514,31 @@ catalogue-version 1.4
name tangramtikz
category Package
-revision 65643
+revision 65697
shortdesc Tangram puzzles, with TikZ
relocated 1
longdesc This package provides some commands (with English and French
longdesc keys) to work with tangram puzzles: \begin{EnvTangramTikz} and
longdesc \PieceTangram to position a piece, \TangramTikz to display a
longdesc predefined Tangram.
-containersize 3756
-containerchecksum 740f65218ddbc0a5076457a3333958aae46de4ddc80644fb79619cac2a9a47aaad0296a1fddc1afebe7e386bec8ff45696dc24993b90be77221d6cad44a3eb89
-doccontainersize 702924
-doccontainerchecksum cef4d130e1501069eb79f5914a5e30c9a72f3ef9eba841c06463a08bc77b70889ff1b3979389a119535d928ee9f3f95bf5bb4e0a2f4c8c00eeb1b6b14900ff38
-docfiles size=222
+containersize 4820
+containerchecksum fd11ad6f692d2578c644bb537089ee0533bcb404b7fe75779edf1081109a62027ffab49d2d16e48c69e512917355aa004083b8938f9a7293ef187f24b9018ac3
+doccontainersize 723896
+doccontainerchecksum 4e15154f9b05f689f015d2fe4c468d1ce079708009c7c04d0c5694761b53451caf5168a2a962fd8e6eebf49bbdb1b2301246861f65460f2af7cfade2d564edf3
+docfiles size=228
RELOC/doc/latex/tangramtikz/README.md details="Readme"
RELOC/doc/latex/tangramtikz/TangramTikz-doc-en.pdf details="Package documentation (English)"
RELOC/doc/latex/tangramtikz/TangramTikz-doc-en.tex
RELOC/doc/latex/tangramtikz/TangramTikz-doc-fr.pdf details="Package documentation (French)" language="fr"
RELOC/doc/latex/tangramtikz/TangramTikz-doc-fr.tex
-runfiles size=6
+runfiles size=10
RELOC/tex/latex/tangramtikz/TangramTikz.sty
catalogue-contact-bugs https://github.com/cpierquet/TangramTikz/issues
catalogue-contact-repository https://github.com/cpierquet/TangramTikz
catalogue-ctan /graphics/pgf/contrib/tangramtikz
catalogue-license lppl1.3c
catalogue-topics puzzle games pgf-tikz
-catalogue-version 0.1.1
+catalogue-version 0.1.2
name tap
category Package
@@ -311858,7 +311858,7 @@ docfiles size=376
name texlive-scripts
category TLCore
-revision 65682
+revision 65696
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.
@@ -311866,10 +311866,10 @@ depend texlive-scripts.ARCH
depend texlive.infra
execute addMap mathpple.map
postaction shortcut type=menu name="TeX Live command-line" cmd=TEXDIR/tlpkg/installer/tl-cmd.bat
-containersize 113684
-containerchecksum e54d89086556354dc2589bd63f610cc512daca8dfe704bf4ff18b9fe5d6649ce24f9182e1e1949b008b499a83022ab733008205ce5ba9a09f467c79581b5b5c7
-doccontainersize 424552
-doccontainerchecksum 3860a6521f9d899528e7ff32d0119a1796b8b954ce0c6a2421d98440a849791d25b98419c61cf486ae5a892d0b49fd62e68db66443786216e20767e14c3e903c
+containersize 113708
+containerchecksum 6eb2f932d0dace3d1878c6640987738b645491c36f6444d9d0443953cff6808e03bfe82418ee8339e860507608e156b376aba73f18688fceff770d98c8853202
+doccontainersize 424408
+doccontainerchecksum 47d6cec69fe98ad2952a1303cf7932efa906ea66ed48edc4526592f7440848b63c45d5d86e97dc79b44aa09084194c4e64cde4ea9efde66c3350bd2515333747
docfiles size=534
doc.html
texmf-dist/doc/man/man1/fmtutil-sys.1
@@ -327421,7 +327421,7 @@ catalogue-version 2.142
name todonotes
category Package
-revision 59465
+revision 65699
shortdesc Marking things to do in a LaTeX document
relocated 1
longdesc The package lets the user mark things to do later, in a simple
@@ -327431,11 +327431,11 @@ depend pgf
depend tools
depend xcolor
depend xkeyval
-containersize 4772
-containerchecksum 78f84bcaf613003f694dfaddff2631cfe34c081ec5aac576a267f99940abcca1c8c71dc801e8df295c585a4db06517e5cce4671aef4188b81feba4be1ed6eccb
-doccontainersize 443836
-doccontainerchecksum 89b61bb5630846a7cf739f39cc43a4e08890a4b0af06c884a60d9ac30068044c89cb99578aefe3b08c5761a412e524dacd79b028e69430d87ec17493b42ab7eb
-docfiles size=119
+containersize 4852
+containerchecksum c3430bf32562d19a9a9fcfacf5f61d10bdaa7cc00d6fc271338b9a962bb16ad372290c401da9b8428dc0528ba185f38d94e1a07cf096f34b3d835b4474729252
+doccontainersize 469396
+doccontainerchecksum 030972617d7a381c497ea074fb817e3f8d5ec4831579ee5ae632331a139a288a4d124ff2a98b563b78dbf79ad088773def2aa15a81435569a8f512682b358141
+docfiles size=125
RELOC/doc/latex/todonotes/README details="Readme"
RELOC/doc/latex/todonotes/examples/alterAppearenceOfListOfTodos.pdf
RELOC/doc/latex/todonotes/examples/alterAppearenceOfListOfTodos.tex
@@ -327443,10 +327443,11 @@ docfiles size=119
RELOC/doc/latex/todonotes/examples/externalize.tex
RELOC/doc/latex/todonotes/examples/saveColorByUsingLayers.pdf
RELOC/doc/latex/todonotes/examples/saveColorByUsingLayers.tex
+ RELOC/doc/latex/todonotes/img/AlteredAppearenceOfListOfTodos.png
RELOC/doc/latex/todonotes/todonotes.pdf details="Package documentation"
-srccontainersize 18812
-srccontainerchecksum e7bf0b61f1ce386b727f54288d1c6486fdb784fb7d7fe42e5a86f0815766df33881214579051c57325d6963fa7e073469ce488aeca816f7566275318e171fecc
-srcfiles size=21
+srccontainersize 19820
+srccontainerchecksum d63d3d5aaf3751fd7ed2a8c9f09fc10ff34753896ea8f3301acabfd038e84d06fd436e2665a2428beda20c77d385202df184fc39e7cf7eba5364d6d588abe1c7
+srcfiles size=22
RELOC/source/latex/todonotes/todonotes.dtx
RELOC/source/latex/todonotes/todonotes.ins
runfiles size=6
@@ -327457,7 +327458,7 @@ catalogue-contact-repository https://github.com/henrikmidtiby/todonotes
catalogue-ctan /macros/latex/contrib/todonotes
catalogue-license lppl1.3
catalogue-topics notes editorial
-catalogue-version 1.1.5
+catalogue-version 1.1.6
name tokcycle
category Package
@@ -348432,15 +348433,15 @@ catalogue-version 0.3
name writeongrid
category Package
-revision 65598
+revision 65700
shortdesc Write on grid lines
relocated 1
longdesc An environment to create grids (type 5x5 or Seyes or Ruled) and
longdesc commands to write texts "right" on the lines.
-containersize 3592
-containerchecksum b3f802afea227f9740d7f25952888f0a05cedd45b755a50f1774cbd7ff1c9773d0ce66617679e3ee5e13a8a7de1d43509ad4d8e593e7b9917fe79b485cfde8cd
-doccontainersize 939184
-doccontainerchecksum 4bdfbf274fcef4acd818ac5f3cfc7602fc767e80a4a558a376f6c5b1802f9c800bf5d4c4b395c96167e045cc1e8cbe68d9af8047cf71aa587ad67329bdc5f68a
+containersize 3760
+containerchecksum b65d0b5159fdf6c9f84318770c765507b832d70e9646eb85456f3917988ba0b8d67add019a993f7ac6e58276a06dff263155b0d2759de5bb04ee4982f2c14187
+doccontainersize 941472
+doccontainerchecksum d5ffefb363efb6736112a99db98a27aa4e7fd0ccc6168a0fe6413443d7854ae9e157e660973fc9deec074362e8faff4285f28bc89cad1d19c7e8d9a02814bc92
docfiles size=264
RELOC/doc/latex/writeongrid/README.md details="Readme"
RELOC/doc/latex/writeongrid/WriteOnGrid-doc-en.pdf details="Package documentation (English)"
@@ -348454,7 +348455,7 @@ catalogue-contact-repository https://github.com/cpierquet/WriteOnGrid
catalogue-ctan /macros/latex/contrib/writeongrid
catalogue-license lppl1.3c
catalogue-topics typeset-grid pgf-tikz
-catalogue-version 0.1.1
+catalogue-version 0.1.2
name wsemclassic
category Package
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index c7e2fdc20e..e3002abc79 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-864401783c83f017a9ad6d0b086bb723 texlive.tlpdb
+32869fa53f4a52aa39a5e772ea558bbe texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index afe6d80c0c..713490d4d7 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-3e71b4d92a856d2dd2d7ea74504c662e7d19c0e74886c8823d17849398041c26c9b2753fdc88286def85f98f4d290c2223e28c23cf65f6c9500160371169d17e texlive.tlpdb
+91ca368cfc7581ad810934c5860109b24c8bf59b586e41e2a5363bbce403c7843555690744ee700c31b391bdf87c3f8cff7bad20529c7a05d4e4f923cacaaebf texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index 267d956033..7fe69989b7 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-----
-iQEcBAEBCgAGBQJj2GZkAAoJEEzhh34ZQ4xwGacH/3Htlm2qSUXtAIDZRYlHvkmS
-05NhNmNtjjDawSElzbsmZbCnXsYyiWxqBKgwqpiM0N9wjMdtiYOvybZMLp/dJqsm
-A9hbqVEmNz4J2GTKQJ74rrqWHYZHlWPL7XVClDdKA38obMXXsvBPGhFOD7YKARZ/
-laPgouR/MTg7fm+Ob5vLqwuUOaxhElMBAfQv8ex173spjQ1KnfOtm4ilM51RQE1c
-jek6SWaEJlL3skzu7WZ4ZWX/hEW4SKUzyzX4d3NtM4tWWWu1rqBA2LdhD5YpeQZG
-//Mj+BZm9ZR5T8/MJ2Ec1xyh2njFBCzAHX4SUxWVorJwYKlGInD4yftk6kwupyA=
-=x2Pi
+iQEcBAEBCgAGBQJj2bmIAAoJEEzhh34ZQ4xwXccIAK/+asmSt14R7J+GPgMBEx4f
+DYLfSXMJrWH7KEKaFZe24gF0xvj32mMhEDbMWelgNpzU2a1dc/z1GkDK2IFffvbY
+xNiMUBPs5iQEFnH3J0iYD30CdAFZQIbLuBPRc2EQkLAdvcovnUgQHtDFYokVry84
+UuMQX4e628hVq11Vd9dDoXRBT8wW0AOfz33pGTO5iJKqm7ayNxG2jWfpNMWrgfaW
+mFQifUk5zdcrDGKSgy80/x9u/py/A0bbY0fo94Lolyjp0BWqbfXhk9vcUChxJYsk
+SAyjhswMoAnLMB1G0jBOMTP2AXn6tJX4IcHs20KAr7QiyoAejGLWOLQrqxAMJhM=
+=zMru
-----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index 8ea49fa961..35bc46daf1 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
Binary files differ
diff --git a/timestamp b/timestamp
index 4210b977fc..ac0145657f 100644
--- a/timestamp
+++ b/timestamp
@@ -2,4 +2,4 @@
# The source CTAN of this site's material:
dante.ctan.org
# The year-month-day-hour-minute of this site's material:
-2023-02-01-02-02
+2023-02-02-02-02