summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--FILES.byname602
-rw-r--r--FILES.byname.gzbin2234447 -> 2234515 bytes
-rw-r--r--FILES.last07days1001
-rw-r--r--language/greek/greek-fontenc/Makefile66
-rw-r--r--language/greek/greek-fontenc/README193
-rw-r--r--language/greek/greek-fontenc/alphabeta-doc.pdfbin429754 -> 435451 bytes
-rw-r--r--language/greek/greek-fontenc/alphabeta-doc.tex199
-rw-r--r--language/greek/greek-fontenc/alphabeta-lgr.def23
-rw-r--r--language/greek/greek-fontenc/alphabeta-lgr.def.html12
-rw-r--r--language/greek/greek-fontenc/alphabeta-tu.pdfbin0 -> 77624 bytes
-rw-r--r--language/greek/greek-fontenc/alphabeta-tuenc.def391
-rw-r--r--language/greek/greek-fontenc/alphabeta-tuenc.def.html400
-rw-r--r--language/greek/greek-fontenc/alphabeta-tuenc.html862
-rw-r--r--language/greek/greek-fontenc/alphabeta.sty17
-rw-r--r--language/greek/greek-fontenc/alphabeta.sty.html22
-rw-r--r--language/greek/greek-fontenc/diacritics.pdfbin307307 -> 285408 bytes
-rw-r--r--language/greek/greek-fontenc/diacritics.tex13
-rw-r--r--language/greek/greek-fontenc/greek-euenc.def8
-rw-r--r--language/greek/greek-fontenc/greek-fontenc.def96
-rw-r--r--language/greek/greek-fontenc/greek-fontenc.def.html99
-rw-r--r--language/greek/greek-fontenc/greek-fontenc.html260
-rw-r--r--language/greek/greek-fontenc/greekhyperref.pdfbin221120 -> 0 bytes
-rw-r--r--language/greek/greek-fontenc/greekhyperref.tex127
-rw-r--r--language/greek/greek-fontenc/hyperref-with-greek.pdfbin0 -> 284331 bytes
-rw-r--r--language/greek/greek-fontenc/hyperref-with-greek.tex509
-rw-r--r--language/greek/greek-fontenc/lgrenc-test.pdfbin318675 -> 0 bytes
-rw-r--r--language/greek/greek-fontenc/lgrenc.def51
-rw-r--r--language/greek/greek-fontenc/lgrenc.def.html46
-rw-r--r--language/greek/greek-fontenc/puenc-greek.def454
-rw-r--r--language/greek/greek-fontenc/puenc-greek.def.html1043
-rw-r--r--language/greek/greek-fontenc/test-inputenc.pdfbin0 -> 394312 bytes
-rw-r--r--language/greek/greek-fontenc/test-inputenc.tex674
-rw-r--r--language/greek/greek-fontenc/test-lgrenc.pdfbin0 -> 322666 bytes
-rw-r--r--language/greek/greek-fontenc/test-lgrenc.tex (renamed from language/greek/greek-fontenc/lgrenc-test.tex)250
-rw-r--r--language/greek/greek-fontenc/test-nameclashes.pdfbin116316 -> 0 bytes
-rw-r--r--language/greek/greek-fontenc/test-nameclashes.tex66
-rw-r--r--language/greek/greek-fontenc/test-tuenc-greek.pdfbin0 -> 88349 bytes
-rw-r--r--language/greek/greek-fontenc/test-tuenc-greek.tex (renamed from language/greek/greek-fontenc/tuenc-greek-doc.tex)314
-rw-r--r--language/greek/greek-fontenc/textalpha-doc.pdfbin473143 -> 493512 bytes
-rw-r--r--language/greek/greek-fontenc/textalpha-doc.tex281
-rw-r--r--language/greek/greek-fontenc/textalpha-tu.pdfbin0 -> 84661 bytes
-rw-r--r--language/greek/greek-fontenc/textalpha.sty129
-rw-r--r--language/greek/greek-fontenc/textalpha.sty.html134
-rw-r--r--language/greek/greek-fontenc/tuenc-greek-doc.pdfbin83201 -> 0 bytes
-rw-r--r--language/greek/greek-fontenc/tuenc-greek.def753
-rw-r--r--language/greek/greek-fontenc/tuenc-greek.def.html785
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-sbl/README.md2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-sbl/american-sbl.lbx1
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-examples.pdfbin340521 -> 343541 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-examples.tex8
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-ibid.pdfbin58351 -> 60288 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-ibid.tex58
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.bib11
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.def525
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.pdfbin158695 -> 164804 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.tex110
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-sbl/english-sbl.lbx3
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-sbl/german-sbl.lbx1
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl-paper.pdfbin78787 -> 78804 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl-paper.sty16
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl-paper.tex7
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl.bbx4
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl.cbx116
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl.dbx4
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-sbl/spanish-sbl.lbx3
-rw-r--r--macros/latex/contrib/fgruler/fgruler.dtx547
-rw-r--r--macros/latex/contrib/fgruler/fgruler.pdfbin283694 -> 421392 bytes
-rw-r--r--macros/latex/contrib/grant/LICENSE2
-rw-r--r--macros/latex/contrib/grant/VERSION1
-rw-r--r--macros/latex/contrib/grant/grant.dtx312
-rw-r--r--macros/latex/contrib/grant/grant.ins22
-rw-r--r--macros/latex/contrib/grant/grant.pdfbin115574 -> 115908 bytes
-rw-r--r--macros/latex/contrib/xltabular/Changes1
-rw-r--r--macros/latex/contrib/xltabular/xltabular-doc.pdfbin71437 -> 71248 bytes
-rw-r--r--macros/latex/contrib/xltabular/xltabular.sty18
-rw-r--r--macros/luatex/latex/ekdosis/Makefile2
-rw-r--r--macros/luatex/latex/ekdosis/README.md6
-rw-r--r--macros/luatex/latex/ekdosis/ekdosis.dtx2183
-rw-r--r--macros/luatex/latex/ekdosis/ekdosis.pdfbin600804 -> 707134 bytes
-rw-r--r--macros/luatex/latex/ekdosis/samples/Caesar_BG-6-13-1.pdfbin17992 -> 17992 bytes
-rwxr-xr-xsystems/texlive/tlnet/tlpkg/installer/config.guess15
-rw-r--r--systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl5
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb90
-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.xzbin2242020 -> 2242076 bytes
-rw-r--r--systems/win32/miktex/tm/packages/next/pr.ini8
-rw-r--r--systems/win32/miktex/tm/packages/pr.ini8
-rw-r--r--timestamp2
90 files changed, 9015 insertions, 4974 deletions
diff --git a/FILES.byname b/FILES.byname
index 96511857d8..0182387eb2 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -5020,7 +5020,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
-2020/11/03 | 168261 | FILES.last07days
+2020/11/04 | 155808 | FILES.last07days
2020/08/14 | 104065 | fonts/academicons/academicons.pdf
2020/08/14 | 17247 | fonts/academicons/academicons.sty
2020/08/14 | 6546 | fonts/academicons/academicons.tex
@@ -168296,7 +168296,7 @@
2020/09/02 | 1915770 | install/macros/luatex/generic/luaotfload.tds.zip
2015/10/04 | 277014 | install/macros/luatex/generic/luatexbase.tds.zip
2020/03/23 | 891718 | install/macros/luatex/latex/arabluatex.tds.zip
-2020/08/14 | 621285 | install/macros/luatex/latex/ekdosis.tds.zip
+2020/11/04 | 721353 | install/macros/luatex/latex/ekdosis.tds.zip
2020/06/27 | 1100787 | install/macros/luatex/latex/emoji.tds.zip
2013/09/26 | 155171 | install/macros/luatex/latex/luabibentry.tds.zip
2012/01/23 | 423265 | install/macros/luatex/latex/luacode.tds.zip
@@ -170877,42 +170877,45 @@
2009/04/27 | 15010 | language/greek/BibTeX.zip
2009/07/23 | 139204 | language/greek/doc/usage.pdf
2009/07/23 | 9828 | language/greek/doc/usage.tex
-2020/09/26 | 429754 | language/greek/greek-fontenc/alphabeta-doc.pdf
-2020/09/26 | 16716 | language/greek/greek-fontenc/alphabeta-doc.tex
-2020/09/26 | 10316 | language/greek/greek-fontenc/alphabeta-lgr.def
-2020/09/26 | 25723 | language/greek/greek-fontenc/alphabeta-lgr.def.html
-2020/09/26 | 15486 | language/greek/greek-fontenc/alphabeta.sty
-2020/09/26 | 34384 | language/greek/greek-fontenc/alphabeta.sty.html
-2020/09/26 | 13578 | language/greek/greek-fontenc/alphabeta-tuenc.def
-2020/09/26 | 29478 | language/greek/greek-fontenc/alphabeta-tuenc.def.html
-2020/09/25 | 29479 | language/greek/greek-fontenc/alphabeta-tuenc.html
-2020/09/26 | 307307 | language/greek/greek-fontenc/diacritics.pdf
-2020/09/26 | 6517 | language/greek/greek-fontenc/diacritics.tex
-2020/09/26 | 445 | language/greek/greek-fontenc/greek-euenc.def
-2020/09/26 | 18157 | language/greek/greek-fontenc/greek-fontenc.def
-2020/09/26 | 39052 | language/greek/greek-fontenc/greek-fontenc.def.html
-2020/09/27 | 52272 | language/greek/greek-fontenc/greek-fontenc.html
-2020/09/26 | 221120 | language/greek/greek-fontenc/greekhyperref.pdf
-2020/09/26 | 5263 | language/greek/greek-fontenc/greekhyperref.tex
-2020/09/26 | 4601 | language/greek/greek-fontenc/lgr2licr.lua
-2020/09/26 | 19666 | language/greek/greek-fontenc/lgr2licr.lua.html
-2020/09/26 | 40266 | language/greek/greek-fontenc/lgrenc.def
-2020/09/26 | 68994 | language/greek/greek-fontenc/lgrenc.def.html
-2020/09/26 | 318675 | language/greek/greek-fontenc/lgrenc-test.pdf
-2020/09/26 | 19112 | language/greek/greek-fontenc/lgrenc-test.tex
-2020/09/27 | 4163 | language/greek/greek-fontenc/Makefile
-2020/09/27 | 22119 | language/greek/greek-fontenc/README
-2020/09/26 | 116316 | language/greek/greek-fontenc/test-nameclashes.pdf
-2020/09/26 | 1917 | language/greek/greek-fontenc/test-nameclashes.tex
-2020/09/26 | 473143 | language/greek/greek-fontenc/textalpha-doc.pdf
-2020/09/26 | 15819 | language/greek/greek-fontenc/textalpha-doc.tex
-2020/09/26 | 21050 | language/greek/greek-fontenc/textalpha.sty
-2020/09/26 | 44579 | language/greek/greek-fontenc/textalpha.sty.html
-2020/09/26 | 43009 | language/greek/greek-fontenc/tuenc-greek.def
-2020/09/26 | 69919 | language/greek/greek-fontenc/tuenc-greek.def.html
-2020/09/26 | 83201 | language/greek/greek-fontenc/tuenc-greek-doc.pdf
-2020/09/26 | 28240 | language/greek/greek-fontenc/tuenc-greek-doc.tex
-2020/09/27 | 2120527 | language/greek/greek-fontenc.zip
+2020/11/04 | 435451 | language/greek/greek-fontenc/alphabeta-doc.pdf
+2020/11/04 | 17875 | language/greek/greek-fontenc/alphabeta-doc.tex
+2020/10/31 | 10378 | language/greek/greek-fontenc/alphabeta-lgr.def
+2020/10/31 | 25842 | language/greek/greek-fontenc/alphabeta-lgr.def.html
+2020/11/04 | 15693 | language/greek/greek-fontenc/alphabeta.sty
+2020/11/04 | 34745 | language/greek/greek-fontenc/alphabeta.sty.html
+2020/11/04 | 15289 | language/greek/greek-fontenc/alphabeta-tuenc.def
+2020/11/04 | 31345 | language/greek/greek-fontenc/alphabeta-tuenc.def.html
+2020/11/04 | 77624 | language/greek/greek-fontenc/alphabeta-tu.pdf
+2020/11/04 | 285408 | language/greek/greek-fontenc/diacritics.pdf
+2020/10/31 | 6102 | language/greek/greek-fontenc/diacritics.tex
+2020/11/04 | 625 | language/greek/greek-fontenc/greek-euenc.def
+2020/11/04 | 19298 | language/greek/greek-fontenc/greek-fontenc.def
+2020/11/04 | 40279 | language/greek/greek-fontenc/greek-fontenc.def.html
+2020/11/04 | 58188 | language/greek/greek-fontenc/greek-fontenc.html
+2020/11/04 | 284331 | language/greek/greek-fontenc/hyperref-with-greek.pdf
+2020/10/31 | 12844 | language/greek/greek-fontenc/hyperref-with-greek.tex
+2020/10/31 | 4601 | language/greek/greek-fontenc/lgr2licr.lua
+2020/10/31 | 19666 | language/greek/greek-fontenc/lgr2licr.lua.html
+2020/11/04 | 40808 | language/greek/greek-fontenc/lgrenc.def
+2020/11/04 | 69937 | language/greek/greek-fontenc/lgrenc.def.html
+2020/11/04 | 4724 | language/greek/greek-fontenc/Makefile
+2020/11/04 | 23889 | language/greek/greek-fontenc/puenc-greek.def
+2020/11/04 | 40944 | language/greek/greek-fontenc/puenc-greek.def.html
+2020/11/04 | 24164 | language/greek/greek-fontenc/README
+2020/11/04 | 394312 | language/greek/greek-fontenc/test-inputenc.pdf
+2020/11/04 | 18839 | language/greek/greek-fontenc/test-inputenc.tex
+2020/11/04 | 322666 | language/greek/greek-fontenc/test-lgrenc.pdf
+2020/11/04 | 21242 | language/greek/greek-fontenc/test-lgrenc.tex
+2020/11/04 | 88349 | language/greek/greek-fontenc/test-tuenc-greek.pdf
+2020/11/04 | 29514 | language/greek/greek-fontenc/test-tuenc-greek.tex
+2020/11/04 | 493512 | language/greek/greek-fontenc/textalpha-doc.pdf
+2020/11/04 | 19006 | language/greek/greek-fontenc/textalpha-doc.tex
+2020/11/04 | 21811 | language/greek/greek-fontenc/textalpha.sty
+2020/11/04 | 45685 | language/greek/greek-fontenc/textalpha.sty.html
+2020/11/04 | 84661 | language/greek/greek-fontenc/textalpha-tu.pdf
+2020/11/04 | 48096 | language/greek/greek-fontenc/tuenc-greek.def
+2020/11/04 | 76803 | language/greek/greek-fontenc/tuenc-greek.def.html
+2020/11/04 | 2652764 | language/greek/greek-fontenc.zip
2019/07/11 | 279760 | language/greek/greek-inputenc/greek-utf8-minimal.pdf
2019/07/11 | 18660 | language/greek/greek-inputenc/greek-utf8-minimal.tex
2019/07/11 | 329701 | language/greek/greek-inputenc/greek-utf8.pdf
@@ -187584,27 +187587,27 @@
2017/11/19 | 9802 | macros/latex/contrib/biblatex-contrib/biblatex-realauthor/realauthor.bbx
2017/11/19 | 812 | macros/latex/contrib/biblatex-contrib/biblatex-realauthor/realauthor.dbx
2017/11/20 | 97428 | macros/latex/contrib/biblatex-contrib/biblatex-realauthor.zip
-2018/12/16 | 797 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/american-sbl.lbx
-2018/12/16 | 35327 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.bib
-2018/12/16 | 76040 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.def
-2018/12/16 | 340521 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-examples.pdf
-2018/12/16 | 68441 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-examples.tex
-2018/12/16 | 58351 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-ibid.pdf
-2018/12/16 | 6425 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-ibid.tex
-2018/12/16 | 158695 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.pdf
-2018/12/16 | 41575 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.tex
-2018/12/16 | 1367 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/english-sbl.lbx
-2018/12/16 | 1473 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/german-sbl.lbx
-2018/12/16 | 2291 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/README.md
-2018/12/16 | 13268 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl.bbx
-2018/12/16 | 26468 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl.cbx
-2018/12/16 | 1052 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl.dbx
-2018/12/16 | 755 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl-paper-bibleref.ist
-2018/12/16 | 78787 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl-paper.pdf
-2018/12/16 | 17966 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl-paper.sty
-2018/12/16 | 8285 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl-paper.tex
-2018/12/16 | 1462 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/spanish-sbl.lbx
-2018/12/16 | 689361 | macros/latex/contrib/biblatex-contrib/biblatex-sbl.zip
+2020/11/04 | 837 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/american-sbl.lbx
+2020/11/04 | 35309 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.bib
+2020/11/04 | 80882 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.def
+2020/11/04 | 343541 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-examples.pdf
+2020/11/04 | 68316 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-examples.tex
+2020/11/04 | 60288 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-ibid.pdf
+2020/11/04 | 7174 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-ibid.tex
+2020/11/04 | 164804 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.pdf
+2020/11/04 | 43851 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.tex
+2020/11/04 | 1414 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/english-sbl.lbx
+2020/11/04 | 1519 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/german-sbl.lbx
+2020/11/04 | 2291 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/README.md
+2020/11/04 | 13333 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl.bbx
+2020/11/04 | 27890 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl.cbx
+2020/11/04 | 1107 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl.dbx
+2020/11/04 | 755 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl-paper-bibleref.ist
+2020/11/04 | 78804 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl-paper.pdf
+2020/11/04 | 18222 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl-paper.sty
+2020/11/04 | 8417 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl-paper.tex
+2020/11/04 | 1514 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/spanish-sbl.lbx
+2020/11/04 | 701402 | macros/latex/contrib/biblatex-contrib/biblatex-sbl.zip
2018/10/18 | 12347 | macros/latex/contrib/biblatex-contrib/biblatex-science/biblatex-science.bib
2018/10/18 | 350764 | macros/latex/contrib/biblatex-contrib/biblatex-science/biblatex-science.pdf
2018/10/18 | 4411 | macros/latex/contrib/biblatex-contrib/biblatex-science/biblatex-science.tex
@@ -193660,11 +193663,11 @@
2015/10/27 | 10838 | macros/latex/contrib/ffslides/tiny_example_1.pdf
2015/10/27 | 15273 | macros/latex/contrib/ffslides/tiny_example_2.pdf
2015/11/19 | 2848864 | macros/latex/contrib/ffslides.zip
-2020/10/26 | 76891 | macros/latex/contrib/fgruler/fgruler.dtx
+2020/11/04 | 84602 | macros/latex/contrib/fgruler/fgruler.dtx
2020/10/22 | 1210 | macros/latex/contrib/fgruler/fgruler.ins
-2020/10/26 | 283694 | macros/latex/contrib/fgruler/fgruler.pdf
+2020/11/04 | 421392 | macros/latex/contrib/fgruler/fgruler.pdf
2020/10/22 | 718 | macros/latex/contrib/fgruler/README
-2020/10/26 | 290329 | macros/latex/contrib/fgruler.zip
+2020/11/04 | 428715 | macros/latex/contrib/fgruler.zip
2014/03/24 | 1586 | macros/latex/contrib/fifo-stack/fifo-stack.cwl
2014/03/24 | 32521 | macros/latex/contrib/fifo-stack/fifo-stack.dtx
2014/03/24 | 1390 | macros/latex/contrib/fifo-stack/fifo-stack.ins
@@ -195492,13 +195495,12 @@
2015/11/12 | 2810 | macros/latex/contrib/gradstudentresume/gradstudentresume.cls
2015/11/12 | 1069 | macros/latex/contrib/gradstudentresume/README.txt
2015/11/12 | 4456 | macros/latex/contrib/gradstudentresume.zip
-2016/08/22 | 22727 | macros/latex/contrib/grant/grant.dtx
-2016/08/22 | 1633 | macros/latex/contrib/grant/grant.ins
-2016/08/22 | 115574 | macros/latex/contrib/grant/grant.pdf
-2016/08/22 | 1075 | macros/latex/contrib/grant/LICENSE
-2016/08/22 | 1740 | macros/latex/contrib/grant/README.md
-2016/08/22 | 5 | macros/latex/contrib/grant/VERSION
-2016/08/22 | 116220 | macros/latex/contrib/grant.zip
+2020/11/04 | 30904 | macros/latex/contrib/grant/grant.dtx
+2020/11/04 | 1776 | macros/latex/contrib/grant/grant.ins
+2020/11/04 | 115908 | macros/latex/contrib/grant/grant.pdf
+2020/11/04 | 1080 | macros/latex/contrib/grant/LICENSE
+2020/11/04 | 1740 | macros/latex/contrib/grant/README.md
+2020/11/04 | 117264 | macros/latex/contrib/grant.zip
2018/01/17 | 31017 | macros/latex/contrib/graphbox/graphbox.dtx
2018/01/06 | 1459 | macros/latex/contrib/graphbox/graphbox.ins
2018/01/17 | 283228 | macros/latex/contrib/graphbox/graphbox.pdf
@@ -211360,16 +211362,16 @@
2014/12/03 | 217683 | macros/latex/contrib/xkeyval/xkeyval.dtx
2014/12/03 | 492265 | macros/latex/contrib/xkeyval/xkeyval.pdf
2014/12/03 | 446525 | macros/latex/contrib/xkeyval.zip
-2020/06/15 | 473 | macros/latex/contrib/xltabular/Changes
+2020/11/04 | 537 | macros/latex/contrib/xltabular/Changes
2018/05/23 | 379 | macros/latex/contrib/xltabular/README.md
2017/10/23 | 657 | macros/latex/contrib/xltabular/xltabular-doc.bib
-2020/06/15 | 71437 | macros/latex/contrib/xltabular/xltabular-doc.pdf
+2020/11/04 | 71248 | macros/latex/contrib/xltabular/xltabular-doc.pdf
2017/10/24 | 11060 | macros/latex/contrib/xltabular/xltabular-doc.tex
2018/12/16 | 226 | macros/latex/contrib/xltabular/xltabular-example-hyp.tex
2018/12/16 | 1963 | macros/latex/contrib/xltabular/xltabular-example.inp
2018/12/16 | 204 | macros/latex/contrib/xltabular/xltabular-example.tex
-2020/06/15 | 3606 | macros/latex/contrib/xltabular/xltabular.sty
-2020/06/15 | 76008 | macros/latex/contrib/xltabular.zip
+2020/11/04 | 3623 | macros/latex/contrib/xltabular/xltabular.sty
+2020/11/04 | 75856 | macros/latex/contrib/xltabular.zip
2008/05/10 | 1307 | macros/latex/contrib/xmpincl/README
2008/05/10 | 16328 | macros/latex/contrib/xmpincl/xmpincl.dtx
2007/01/01 | 1679 | macros/latex/contrib/xmpincl/xmpincl.ins
@@ -213218,17 +213220,17 @@
2019/06/08 | 10433 | macros/luatex/latex/combofont/combofont.tex
2019/06/08 | 445 | macros/luatex/latex/combofont/README.md
2019/06/08 | 94990 | macros/luatex/latex/combofont.zip
-2020/08/14 | 300967 | macros/luatex/latex/ekdosis/ekdosis.dtx
-2020/08/14 | 4364 | macros/luatex/latex/ekdosis/ekdosis.el
-2020/08/14 | 1868 | macros/luatex/latex/ekdosis/ekdosis.ins
-2020/08/14 | 600804 | macros/luatex/latex/ekdosis/ekdosis.pdf
-2020/08/14 | 3427 | macros/luatex/latex/ekdosis/Makefile
-2020/08/14 | 4252 | macros/luatex/latex/ekdosis/README.md
-2020/08/14 | 17992 | macros/luatex/latex/ekdosis/samples/Caesar_BG-6-13-1.pdf
-2020/08/14 | 6851 | macros/luatex/latex/ekdosis/samples/Caesar_BG-6-13-1-tei.xml
-2020/08/14 | 3901 | macros/luatex/latex/ekdosis/samples/Caesar_BG-6-13-1.tex
-2020/08/14 | 853 | macros/luatex/latex/ekdosis/samples/Makefile
-2020/08/14 | 601150 | macros/luatex/latex/ekdosis.zip
+2020/11/04 | 354733 | macros/luatex/latex/ekdosis/ekdosis.dtx
+2020/11/04 | 4364 | macros/luatex/latex/ekdosis/ekdosis.el
+2020/11/04 | 1868 | macros/luatex/latex/ekdosis/ekdosis.ins
+2020/11/04 | 707134 | macros/luatex/latex/ekdosis/ekdosis.pdf
+2020/11/04 | 3595 | macros/luatex/latex/ekdosis/Makefile
+2020/11/04 | 4254 | macros/luatex/latex/ekdosis/README.md
+2020/11/04 | 17992 | macros/luatex/latex/ekdosis/samples/Caesar_BG-6-13-1.pdf
+2020/11/04 | 6851 | macros/luatex/latex/ekdosis/samples/Caesar_BG-6-13-1-tei.xml
+2020/11/04 | 3901 | macros/luatex/latex/ekdosis/samples/Caesar_BG-6-13-1.tex
+2020/11/04 | 853 | macros/luatex/latex/ekdosis/samples/Makefile
+2020/11/04 | 699605 | macros/luatex/latex/ekdosis.zip
2020/05/13 | 175991 | macros/luatex/latex/emojicite/emojicite-doc.pdf
2020/05/13 | 8411 | macros/luatex/latex/emojicite/emojicite-doc.tex
2020/05/13 | 3133 | macros/luatex/latex/emojicite/emojicite.sty
@@ -259599,9 +259601,9 @@
2019/02/28 | 41296 | systems/texlive/tlnet/archive/frederika2016.r42157.tar.xz
2019/02/28 | 142332 | systems/texlive/tlnet/archive/frege.doc.r27417.tar.xz
2019/02/28 | 4528 | systems/texlive/tlnet/archive/frege.r27417.tar.xz
-2019/05/23 | 477204 | systems/texlive/tlnet/archive/frenchmath.doc.r51192.tar.xz
-2019/05/23 | 1808 | systems/texlive/tlnet/archive/frenchmath.r51192.tar.xz
-2019/05/23 | 7948 | systems/texlive/tlnet/archive/frenchmath.source.r51192.tar.xz
+2020/11/04 | 478856 | systems/texlive/tlnet/archive/frenchmath.doc.r56847.tar.xz
+2020/11/04 | 1872 | systems/texlive/tlnet/archive/frenchmath.r56847.tar.xz
+2020/11/04 | 8276 | systems/texlive/tlnet/archive/frenchmath.source.r56847.tar.xz
2020/10/20 | 191432 | systems/texlive/tlnet/archive/frimurer.doc.r56704.tar.xz
2020/10/20 | 15456 | systems/texlive/tlnet/archive/frimurer.r56704.tar.xz
2020/10/20 | 4184 | systems/texlive/tlnet/archive/frimurer.source.r56704.tar.xz
@@ -260235,9 +260237,9 @@
2020/10/31 | 208372 | systems/texlive/tlnet/archive/hu-berlin-bundle.doc.r56808.tar.xz
2020/10/31 | 7984 | systems/texlive/tlnet/archive/hu-berlin-bundle.r56808.tar.xz
2020/10/31 | 17216 | systems/texlive/tlnet/archive/hu-berlin-bundle.source.r56808.tar.xz
-2019/02/28 | 146628 | systems/texlive/tlnet/archive/hulipsum.doc.r46803.tar.xz
-2019/02/28 | 54808 | systems/texlive/tlnet/archive/hulipsum.r46803.tar.xz
-2019/02/28 | 55956 | systems/texlive/tlnet/archive/hulipsum.source.r46803.tar.xz
+2020/11/04 | 146568 | systems/texlive/tlnet/archive/hulipsum.doc.r56848.tar.xz
+2020/11/04 | 55344 | systems/texlive/tlnet/archive/hulipsum.r56848.tar.xz
+2020/11/04 | 56600 | systems/texlive/tlnet/archive/hulipsum.source.r56848.tar.xz
2019/02/28 | 747152 | systems/texlive/tlnet/archive/hustthesis.doc.r42547.tar.xz
2019/02/28 | 57756 | systems/texlive/tlnet/archive/hustthesis.r42547.tar.xz
2019/02/28 | 24892 | systems/texlive/tlnet/archive/hustthesis.source.r42547.tar.xz
@@ -262126,8 +262128,8 @@
2019/02/28 | 1092 | systems/texlive/tlnet/archive/mceinleger.r15878.tar.xz
2019/02/28 | 241840 | systems/texlive/tlnet/archive/mcexam.doc.r46155.tar.xz
2019/02/28 | 11424 | systems/texlive/tlnet/archive/mcexam.r46155.tar.xz
-2020/08/31 | 1059444 | systems/texlive/tlnet/archive/mcf2graph.doc.r56217.tar.xz
-2020/08/31 | 21040 | systems/texlive/tlnet/archive/mcf2graph.r56217.tar.xz
+2020/11/04 | 1082312 | systems/texlive/tlnet/archive/mcf2graph.doc.r56846.tar.xz
+2020/11/04 | 21096 | systems/texlive/tlnet/archive/mcf2graph.r56846.tar.xz
2019/02/28 | 138716 | systems/texlive/tlnet/archive/mcite.doc.r18173.tar.xz
2019/02/28 | 391980 | systems/texlive/tlnet/archive/mciteplus.doc.r31648.tar.xz
2019/02/28 | 34344 | systems/texlive/tlnet/archive/mciteplus.r31648.tar.xz
@@ -262861,8 +262863,8 @@
2019/02/28 | 342164 | systems/texlive/tlnet/archive/newlfm.doc.r15878.tar.xz
2019/02/28 | 20156 | systems/texlive/tlnet/archive/newlfm.r15878.tar.xz
2019/02/28 | 48828 | systems/texlive/tlnet/archive/newlfm.source.r15878.tar.xz
-2020/06/22 | 442124 | systems/texlive/tlnet/archive/newpx.doc.r55619.tar.xz
-2020/06/22 | 1622456 | systems/texlive/tlnet/archive/newpx.r55619.tar.xz
+2020/11/04 | 444596 | systems/texlive/tlnet/archive/newpx.doc.r56845.tar.xz
+2020/11/04 | 1622608 | systems/texlive/tlnet/archive/newpx.r56845.tar.xz
2019/02/28 | 137580 | systems/texlive/tlnet/archive/newsletr.doc.r15878.tar.xz
2019/02/28 | 16788 | systems/texlive/tlnet/archive/newsletr.r15878.tar.xz
2019/02/28 | 196212 | systems/texlive/tlnet/archive/newspaper.doc.r15878.tar.xz
@@ -265925,8 +265927,8 @@
2020/03/24 | 280 | systems/texlive/tlnet/archive/texlive-cz.r54496.tar.xz
2020/03/29 | 1338300 | systems/texlive/tlnet/archive/texlive-de.doc.r54604.tar.xz
2020/03/29 | 272 | systems/texlive/tlnet/archive/texlive-de.r54604.tar.xz
-2020/11/01 | 169872 | systems/texlive/tlnet/archive/texlive-docindex.doc.r56818.tar.xz
-2020/11/01 | 388 | systems/texlive/tlnet/archive/texlive-docindex.r56818.tar.xz
+2020/11/04 | 169984 | systems/texlive/tlnet/archive/texlive-docindex.doc.r56844.tar.xz
+2020/11/04 | 392 | systems/texlive/tlnet/archive/texlive-docindex.r56844.tar.xz
2020/04/16 | 1891392 | systems/texlive/tlnet/archive/texlive-en.doc.r54755.tar.xz
2020/04/16 | 272 | systems/texlive/tlnet/archive/texlive-en.r54755.tar.xz
2020/03/22 | 3090144 | systems/texlive/tlnet/archive/texlive-es.doc.r54465.tar.xz
@@ -265982,7 +265984,7 @@
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.r55172.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.r55172.tar.xz
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.r55172.tar.xz
-2020/11/02 | 218656 | systems/texlive/tlnet/archive/texlive-scripts.doc.r56826.tar.xz
+2020/11/04 | 218656 | systems/texlive/tlnet/archive/texlive-scripts.doc.r56844.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
@@ -266006,7 +266008,7 @@
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r55172.tar.xz
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r55172.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r55172.tar.xz
-2020/11/02 | 132048 | systems/texlive/tlnet/archive/texlive-scripts.r56826.tar.xz
+2020/11/04 | 132068 | systems/texlive/tlnet/archive/texlive-scripts.r56844.tar.xz
2020/08/24 | 36336 | systems/texlive/tlnet/archive/texlive-scripts.win32.r56157.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r55172.tar.xz
2020/05/12 | 592 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-darwinlegacy.r55117.tar.xz
@@ -267665,25 +267667,25 @@
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
2020/06/13 | 105829 | systems/texlive/tlnet/install-tl
-2020/11/03 | 5500081 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2020/11/03 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2020/11/03 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2020/11/04 | 5501002 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2020/11/04 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2020/11/04 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2020/08/23 | 4889 | systems/texlive/tlnet/install-tl-windows.bat
-2020/11/03 | 19383263 | systems/texlive/tlnet/install-tl-windows.exe
-2020/11/03 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2020/11/03 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2020/11/03 | 24270028 | systems/texlive/tlnet/install-tl.zip
-2020/11/03 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2020/11/03 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2020/11/04 | 19386011 | systems/texlive/tlnet/install-tl-windows.exe
+2020/11/04 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2020/11/04 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2020/11/04 | 24270090 | systems/texlive/tlnet/install-tl.zip
+2020/11/04 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2020/11/04 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
2020/03/05 | 1215 | systems/texlive/tlnet/README.md
2020/04/06 | 5961 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
2016/04/12 | 600 | systems/texlive/tlnet/tlpkg/gpg/random_seed
2016/04/12 | 0 | systems/texlive/tlnet/tlpkg/gpg/secring.gpg
2020/05/15 | 1655 | systems/texlive/tlnet/tlpkg/gpg/tl-key-extension.txt
2020/04/06 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
-2020/10/24 | 48921 | systems/texlive/tlnet/tlpkg/installer/config.guess
+2020/11/03 | 48946 | systems/texlive/tlnet/tlpkg/installer/config.guess
2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2020/11/01 | 6439 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2020/11/03 | 6585 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2020/04/15 | 223687 | systems/texlive/tlnet/tlpkg/installer/curl/curl-ca-bundle.crt
2020/04/15 | 2606592 | systems/texlive/tlnet/tlpkg/installer/curl/curl.exe
2018/04/29 | 13647 | systems/texlive/tlnet/tlpkg/installer/DirSelect.pm
@@ -267730,12 +267732,12 @@
2020/05/17 | 20322 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
2020/05/03 | 4786 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
2020/09/22 | 27563 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2020/11/03 | 16641100 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2020/11/03 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2020/11/04 | 16641100 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2020/11/04 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2020/05/13 | 86417 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2020/11/03 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2020/11/03 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2020/11/03 | 2242020 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2020/11/04 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2020/11/04 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2020/11/04 | 2242076 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2020/04/15 | 58761 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
2020/03/20 | 41736 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
2020/05/11 | 15010 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -272247,7 +272249,7 @@
2020/10/03 | 318630 | systems/win32/miktex/tm/packages/filehook.tar.lzma
2012/12/04 | 924573 | systems/win32/miktex/tm/packages/fileinfo.tar.lzma
2011/09/21 | 281409 | systems/win32/miktex/tm/packages/filemod.tar.lzma
-2020/11/03 | 551544 | systems/win32/miktex/tm/packages/files.csv.lzma
+2020/11/04 | 551544 | systems/win32/miktex/tm/packages/files.csv.lzma
2001/05/14 | 5617 | systems/win32/miktex/tm/packages/finbib.tar.lzma
2015/10/20 | 44379 | systems/win32/miktex/tm/packages/findhyph.tar.lzma
2011/10/21 | 89323 | systems/win32/miktex/tm/packages/fink.tar.lzma
@@ -273423,9 +273425,9 @@
2018/01/12 | 157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma
2020/10/31 | 39333 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma
2020/10/31 | 43032 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma
-2020/11/03 | 204589 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2020/11/03 | 1229995 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2020/11/03 | 1147456 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2020/11/04 | 204566 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2020/11/04 | 1229125 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2020/11/04 | 1146386 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
2020/10/31 | 13300 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma
2020/10/31 | 14127 | systems/win32/miktex/tm/packages/miktex-zzip-bin-x64-2.9.tar.lzma
2016/07/15 | 35914 | systems/win32/miktex/tm/packages/mil3.tar.lzma
@@ -273580,187 +273582,187 @@
2018/04/09 | 400132 | systems/win32/miktex/tm/packages/newunicodechar.tar.lzma
2011/09/19 | 101312 | systems/win32/miktex/tm/packages/newvbtm.tar.lzma
2020/09/06 | 231669 | systems/win32/miktex/tm/packages/newverbs.tar.lzma
-2020/11/03 | 551236 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2020/11/03 | 50435 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2020/11/03 | 55968 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2020/11/03 | 965657 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2020/11/03 | 1076054 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2020/11/03 | 28604 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2020/11/03 | 30933 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2020/11/03 | 28916 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2020/11/03 | 34184 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2020/11/03 | 49817 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2020/11/03 | 57228 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2020/11/03 | 84909 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2020/11/03 | 93590 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2020/11/03 | 65769 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2020/11/03 | 73421 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2020/11/03 | 27007 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2020/11/03 | 30682 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2020/11/03 | 329622 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2020/11/03 | 392343 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2020/11/03 | 32339 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2020/11/03 | 36373 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2020/11/03 | 50511 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2020/11/03 | 55605 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2020/11/03 | 204242 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2020/11/03 | 224114 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2020/11/03 | 179400 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2020/11/03 | 195341 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2020/11/03 | 51964 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2020/11/03 | 58633 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2020/11/03 | 20817 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2020/11/03 | 23023 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2020/11/03 | 461748 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2020/11/03 | 45370 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2020/11/03 | 51117 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2020/11/03 | 279491 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2020/11/03 | 318788 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2020/11/03 | 40819 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2020/11/03 | 44980 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2020/11/03 | 115943 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2020/11/03 | 130320 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2020/11/03 | 1274540 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2020/11/03 | 1415727 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2020/11/03 | 86663 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2020/11/03 | 98596 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2020/11/03 | 42914 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2020/11/03 | 47678 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2020/11/03 | 24890 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2020/11/03 | 27759 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2020/11/03 | 55828 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2020/11/03 | 63011 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2020/11/03 | 133475 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2020/11/03 | 151810 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2020/11/03 | 72878 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2020/11/03 | 77235 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2020/11/03 | 71729 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2020/11/03 | 80690 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2020/11/03 | 258222 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2020/11/03 | 295370 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2020/11/03 | 21852 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
-2020/11/03 | 24842 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2020/11/03 | 99228 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2020/11/03 | 114398 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2020/11/03 | 63604 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2020/11/03 | 72708 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2020/11/03 | 94447 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2020/11/03 | 113869 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2020/11/03 | 37682 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2020/11/03 | 42237 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2020/11/03 | 482422 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2020/11/03 | 567104 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2020/11/03 | 146832 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2020/11/03 | 159524 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2020/11/03 | 94605 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2020/11/03 | 108946 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2020/11/03 | 15990 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
-2020/11/03 | 17628 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2020/11/03 | 27709 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2020/11/03 | 29731 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2020/11/03 | 623786 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2020/11/03 | 678093 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2020/11/03 | 531487 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2020/11/03 | 597317 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2020/11/03 | 557910 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2020/11/03 | 598220 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2020/11/03 | 93665 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2020/11/03 | 102883 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2020/11/03 | 1707143 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2020/11/03 | 1985297 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2020/11/03 | 67425 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2020/11/03 | 74048 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2020/11/03 | 27102 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2020/11/03 | 31216 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2020/11/03 | 7568 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2020/11/03 | 8591 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2020/11/03 | 194087 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2020/11/03 | 212027 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2020/11/03 | 249040 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2020/11/03 | 282447 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2020/11/03 | 96262 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2020/11/03 | 101591 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2020/11/03 | 58495 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
-2020/11/03 | 65970 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
-2020/11/03 | 118973 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
-2020/11/03 | 130508 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2020/11/03 | 144417 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2020/11/03 | 161076 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2020/11/03 | 199229 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2020/11/03 | 179938 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2020/11/03 | 64436 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2020/11/03 | 74256 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2020/11/03 | 31043 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2020/11/03 | 34786 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2020/11/03 | 36641 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2020/11/03 | 41054 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2020/11/03 | 42627 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2020/11/03 | 46533 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2020/11/03 | 45810 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2020/11/03 | 52199 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2020/11/03 | 192634 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
-2020/11/03 | 210215 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2020/11/03 | 35187 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2020/11/03 | 39309 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2020/11/03 | 738797 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2020/11/03 | 808894 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2020/11/03 | 197845 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2020/11/03 | 202420 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2020/11/03 | 207412 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2020/11/03 | 243099 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2020/11/03 | 78402 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2020/11/03 | 87398 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2020/11/03 | 1168163 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2020/11/03 | 1302292 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2020/11/03 | 19945 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2020/11/03 | 23635 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2020/11/03 | 31214 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2020/11/03 | 36927 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2020/11/03 | 63487 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2020/11/03 | 71620 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2020/11/03 | 42630 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2020/11/03 | 50855 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2020/11/03 | 1125036 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2020/11/03 | 1245395 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2020/11/03 | 42077 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2020/11/03 | 51475 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2020/11/03 | 56011 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2020/11/03 | 59550 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2020/11/03 | 26982 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2020/11/03 | 29154 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2020/11/03 | 16059 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2020/11/03 | 17716 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2020/11/03 | 63182 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2020/11/03 | 69713 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2020/11/03 | 151776 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2020/11/03 | 165516 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2020/11/03 | 56656 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2020/11/03 | 65273 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2020/11/03 | 97451 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2020/11/03 | 104488 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2020/11/03 | 2514450 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2020/11/03 | 2635855 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2020/11/03 | 54666 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2020/11/03 | 61835 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2020/11/03 | 33150 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2020/11/03 | 36957 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2020/11/03 | 27055 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2020/11/03 | 32921 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2020/11/03 | 65983 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2020/11/03 | 70118 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2020/11/03 | 250929 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2020/11/03 | 280104 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2020/11/03 | 580930 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2020/11/03 | 617437 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2020/11/03 | 39353 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2020/11/03 | 43082 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2020/11/03 | 204526 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2020/11/03 | 1229015 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2020/11/03 | 1147716 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2020/11/03 | 13283 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2020/11/03 | 14160 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2020/11/04 | 551236 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2020/11/04 | 50434 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2020/11/04 | 55968 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2020/11/04 | 965652 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2020/11/04 | 1076054 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2020/11/04 | 28606 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2020/11/04 | 30934 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2020/11/04 | 28916 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2020/11/04 | 34183 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2020/11/04 | 49816 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2020/11/04 | 57229 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2020/11/04 | 84909 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2020/11/04 | 93589 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2020/11/04 | 65768 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2020/11/04 | 73420 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2020/11/04 | 27008 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2020/11/04 | 30682 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2020/11/04 | 329621 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2020/11/04 | 392343 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2020/11/04 | 32337 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2020/11/04 | 36373 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2020/11/04 | 50513 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2020/11/04 | 55604 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2020/11/04 | 204242 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2020/11/04 | 224114 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2020/11/04 | 179399 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2020/11/04 | 195337 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2020/11/04 | 51963 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2020/11/04 | 58631 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2020/11/04 | 20817 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2020/11/04 | 23021 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2020/11/04 | 461746 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2020/11/04 | 45369 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2020/11/04 | 51115 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2020/11/04 | 279490 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2020/11/04 | 318789 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2020/11/04 | 40818 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2020/11/04 | 44979 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2020/11/04 | 115942 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2020/11/04 | 130319 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2020/11/04 | 1274538 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2020/11/04 | 1415726 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2020/11/04 | 86663 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2020/11/04 | 98597 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2020/11/04 | 42913 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2020/11/04 | 47678 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2020/11/04 | 24891 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2020/11/04 | 27759 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2020/11/04 | 55828 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2020/11/04 | 63011 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2020/11/04 | 133475 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2020/11/04 | 151810 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2020/11/04 | 72877 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2020/11/04 | 77236 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2020/11/04 | 71729 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2020/11/04 | 80690 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2020/11/04 | 258222 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2020/11/04 | 295366 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2020/11/04 | 21850 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2020/11/04 | 24839 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2020/11/04 | 99227 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2020/11/04 | 114399 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2020/11/04 | 63604 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2020/11/04 | 72711 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2020/11/04 | 94444 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2020/11/04 | 113869 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2020/11/04 | 37682 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2020/11/04 | 42236 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2020/11/04 | 482421 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2020/11/04 | 567104 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2020/11/04 | 146832 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2020/11/04 | 159524 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2020/11/04 | 94606 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2020/11/04 | 108943 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2020/11/04 | 15988 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2020/11/04 | 17628 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2020/11/04 | 27706 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2020/11/04 | 29731 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2020/11/04 | 623785 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2020/11/04 | 678090 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2020/11/04 | 531486 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2020/11/04 | 597317 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2020/11/04 | 557910 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2020/11/04 | 598217 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2020/11/04 | 93664 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2020/11/04 | 102881 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2020/11/04 | 1707142 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2020/11/04 | 1985298 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2020/11/04 | 67426 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2020/11/04 | 74048 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2020/11/04 | 27103 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2020/11/04 | 31216 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2020/11/04 | 7569 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2020/11/04 | 8591 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2020/11/04 | 194085 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2020/11/04 | 212028 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2020/11/04 | 249039 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2020/11/04 | 282449 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2020/11/04 | 96264 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2020/11/04 | 101591 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2020/11/04 | 58496 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2020/11/04 | 65968 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2020/11/04 | 118973 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2020/11/04 | 130510 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2020/11/04 | 144417 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2020/11/04 | 161077 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2020/11/04 | 199229 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2020/11/04 | 179938 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2020/11/04 | 64436 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2020/11/04 | 74258 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2020/11/04 | 31041 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2020/11/04 | 34788 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2020/11/04 | 36640 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2020/11/04 | 41053 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2020/11/04 | 42628 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2020/11/04 | 46532 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2020/11/04 | 45811 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2020/11/04 | 52199 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2020/11/04 | 192632 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2020/11/04 | 210214 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2020/11/04 | 35188 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2020/11/04 | 39308 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2020/11/04 | 738798 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2020/11/04 | 808895 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2020/11/04 | 197844 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2020/11/04 | 202420 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2020/11/04 | 207412 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2020/11/04 | 243099 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2020/11/04 | 78403 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2020/11/04 | 87399 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2020/11/04 | 1168166 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2020/11/04 | 1302294 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2020/11/04 | 19945 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2020/11/04 | 23637 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2020/11/04 | 31214 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2020/11/04 | 36928 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2020/11/04 | 63487 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2020/11/04 | 71622 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2020/11/04 | 42631 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2020/11/04 | 50856 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2020/11/04 | 1125037 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2020/11/04 | 1245394 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2020/11/04 | 42077 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2020/11/04 | 51473 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2020/11/04 | 56009 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2020/11/04 | 59550 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2020/11/04 | 26981 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2020/11/04 | 29155 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2020/11/04 | 16060 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2020/11/04 | 17715 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2020/11/04 | 63183 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2020/11/04 | 69713 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2020/11/04 | 151776 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2020/11/04 | 165515 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2020/11/04 | 56655 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2020/11/04 | 65272 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2020/11/04 | 97450 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2020/11/04 | 104488 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2020/11/04 | 2514453 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2020/11/04 | 2635855 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2020/11/04 | 54663 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2020/11/04 | 61834 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2020/11/04 | 33151 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2020/11/04 | 36957 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2020/11/04 | 27056 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2020/11/04 | 32921 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2020/11/04 | 65983 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2020/11/04 | 70118 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2020/11/04 | 250932 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2020/11/04 | 280104 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2020/11/04 | 580934 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2020/11/04 | 617436 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2020/11/04 | 39353 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2020/11/04 | 43081 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2020/11/04 | 204538 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2020/11/04 | 1227999 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2020/11/04 | 1147096 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2020/11/04 | 13287 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2020/11/04 | 14161 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
2019/03/12 | 1412 | systems/win32/miktex/tm/packages/nextpage.tar.lzma
-2020/11/03 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2020/11/04 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
2018/07/06 | 145915 | systems/win32/miktex/tm/packages/nexus-otf.tar.lzma
2017/03/30 | 191149 | systems/win32/miktex/tm/packages/nfssext-cfr.tar.lzma
2012/12/20 | 612251 | systems/win32/miktex/tm/packages/nicefilelist.tar.lzma
@@ -274083,7 +274085,7 @@
2020/10/20 | 342254 | systems/win32/miktex/tm/packages/preview.tar.lzma
2019/06/20 | 375963 | systems/win32/miktex/tm/packages/prftree.tar.lzma
2020/10/27 | 357822 | systems/win32/miktex/tm/packages/principia.tar.lzma
-2020/11/03 | 884 | systems/win32/miktex/tm/packages/pr.ini
+2020/11/04 | 884 | systems/win32/miktex/tm/packages/pr.ini
2010/09/27 | 248469 | systems/win32/miktex/tm/packages/printlen.tar.lzma
2008/06/17 | 77313 | systems/win32/miktex/tm/packages/proba.tar.lzma
2017/07/12 | 988486 | systems/win32/miktex/tm/packages/probsoln.tar.lzma
@@ -275466,7 +275468,7 @@
2004/06/04 | 404 | tds/tds.sed
2004/06/23 | 65418 | tds/tds.tex
2019/05/29 | 304264 | tds.zip
-2020/11/04 | 186 | timestamp
+2020/11/05 | 186 | timestamp
2002/08/26 | 61898 | usergrps/dante/antrag.pdf
2002/08/26 | 118217 | usergrps/dante/antrag.ps
2017/06/30 | 917 | usergrps/dante/dtk/doc/beispiel.bib
diff --git a/FILES.byname.gz b/FILES.byname.gz
index a4584166a7..2fc387dacb 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index 55ff3a8adf..0795979025 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,20 +1,298 @@
-2020/11/03 | 99228 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2020/11/03 | 98596 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2020/11/04 | 99227 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2020/11/04 | 98597 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2020/11/04 | 97450 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2020/11/04 | 965652 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2020/11/04 | 96264 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2020/11/04 | 94606 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2020/11/04 | 94444 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2020/11/04 | 93664 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2020/11/04 | 93589 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2020/11/04 | 884 | systems/win32/miktex/tm/packages/pr.ini
+2020/11/04 | 88349 | language/greek/greek-fontenc/test-tuenc-greek.pdf
+2020/11/04 | 87399 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2020/11/04 | 86663 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2020/11/04 | 8591 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2020/11/04 | 853 | macros/luatex/latex/ekdosis/samples/Makefile
+2020/11/04 | 84909 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2020/11/04 | 84661 | language/greek/greek-fontenc/textalpha-tu.pdf
+2020/11/04 | 84602 | macros/latex/contrib/fgruler/fgruler.dtx
+2020/11/04 | 8417 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl-paper.tex
+2020/11/04 | 837 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/american-sbl.lbx
+2020/11/04 | 8276 | systems/texlive/tlnet/archive/frenchmath.source.r56847.tar.xz
+2020/11/04 | 808895 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2020/11/04 | 80882 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.def
+2020/11/04 | 80690 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2020/11/04 | 78804 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl-paper.pdf
+2020/11/04 | 78403 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2020/11/04 | 77624 | language/greek/greek-fontenc/alphabeta-tu.pdf
+2020/11/04 | 77236 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2020/11/04 | 76803 | language/greek/greek-fontenc/tuenc-greek.def.html
+2020/11/04 | 75856 | macros/latex/contrib/xltabular.zip
+2020/11/04 | 7569 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2020/11/04 | 755 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl-paper-bibleref.ist
+2020/11/04 | 74258 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2020/11/04 | 74048 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2020/11/04 | 738798 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2020/11/04 | 73420 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2020/11/04 | 72877 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2020/11/04 | 72711 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2020/11/04 | 721353 | install/macros/luatex/latex/ekdosis.tds.zip
+2020/11/04 | 7174 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-ibid.tex
+2020/11/04 | 71729 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2020/11/04 | 71622 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2020/11/04 | 71248 | macros/latex/contrib/xltabular/xltabular-doc.pdf
+2020/11/04 | 707134 | macros/luatex/latex/ekdosis/ekdosis.pdf
+2020/11/04 | 701402 | macros/latex/contrib/biblatex-contrib/biblatex-sbl.zip
+2020/11/04 | 70118 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2020/11/04 | 699605 | macros/luatex/latex/ekdosis.zip
+2020/11/04 | 69937 | language/greek/greek-fontenc/lgrenc.def.html
+2020/11/04 | 69713 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2020/11/04 | 6851 | macros/luatex/latex/ekdosis/samples/Caesar_BG-6-13-1-tei.xml
+2020/11/04 | 68316 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-examples.tex
+2020/11/04 | 678090 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2020/11/04 | 67426 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2020/11/04 | 65983 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2020/11/04 | 65968 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2020/11/04 | 65768 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2020/11/04 | 65272 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2020/11/04 | 64436 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2020/11/04 | 63604 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2020/11/04 | 63487 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2020/11/04 | 63183 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2020/11/04 | 63011 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2020/11/04 | 625 | language/greek/greek-fontenc/greek-euenc.def
+2020/11/04 | 623785 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2020/11/04 | 61834 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2020/11/04 | 617436 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2020/11/04 | 60288 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-ibid.pdf
+2020/11/04 | 598217 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2020/11/04 | 597317 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2020/11/04 | 59550 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2020/11/04 | 58631 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2020/11/04 | 58496 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2020/11/04 | 58188 | language/greek/greek-fontenc/greek-fontenc.html
+2020/11/04 | 580934 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2020/11/04 | 57229 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2020/11/04 | 567104 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2020/11/04 | 56655 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2020/11/04 | 56600 | systems/texlive/tlnet/archive/hulipsum.source.r56848.tar.xz
+2020/11/04 | 56009 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2020/11/04 | 55968 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2020/11/04 | 55828 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2020/11/04 | 557910 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2020/11/04 | 55604 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2020/11/04 | 55344 | systems/texlive/tlnet/archive/hulipsum.r56848.tar.xz
+2020/11/04 | 551544 | systems/win32/miktex/tm/packages/files.csv.lzma
+2020/11/04 | 551236 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2020/11/04 | 5501002 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2020/11/04 | 54663 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2020/11/04 | 537 | macros/latex/contrib/xltabular/Changes
+2020/11/04 | 531486 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2020/11/04 | 52199 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2020/11/04 | 51963 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2020/11/04 | 51473 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2020/11/04 | 51115 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2020/11/04 | 50856 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2020/11/04 | 50513 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2020/11/04 | 50434 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2020/11/04 | 49816 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2020/11/04 | 493512 | language/greek/greek-fontenc/textalpha-doc.pdf
+2020/11/04 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2020/11/04 | 482421 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2020/11/04 | 48096 | language/greek/greek-fontenc/tuenc-greek.def
+2020/11/04 | 478856 | systems/texlive/tlnet/archive/frenchmath.doc.r56847.tar.xz
+2020/11/04 | 47678 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2020/11/04 | 4724 | language/greek/greek-fontenc/Makefile
+2020/11/04 | 46532 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2020/11/04 | 461746 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2020/11/04 | 45811 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2020/11/04 | 45685 | language/greek/greek-fontenc/textalpha.sty.html
+2020/11/04 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2020/11/04 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2020/11/04 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2020/11/04 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2020/11/04 | 45369 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2020/11/04 | 44979 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2020/11/04 | 444596 | systems/texlive/tlnet/archive/newpx.doc.r56845.tar.xz
+2020/11/04 | 43851 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.tex
+2020/11/04 | 4364 | macros/luatex/latex/ekdosis/ekdosis.el
+2020/11/04 | 435451 | language/greek/greek-fontenc/alphabeta-doc.pdf
+2020/11/04 | 43081 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2020/11/04 | 42913 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2020/11/04 | 428715 | macros/latex/contrib/fgruler.zip
+2020/11/04 | 42631 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2020/11/04 | 42628 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2020/11/04 | 4254 | macros/luatex/latex/ekdosis/README.md
+2020/11/04 | 42236 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2020/11/04 | 421392 | macros/latex/contrib/fgruler/fgruler.pdf
+2020/11/04 | 42077 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2020/11/04 | 41053 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2020/11/04 | 40944 | language/greek/greek-fontenc/puenc-greek.def.html
+2020/11/04 | 40818 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2020/11/04 | 40808 | language/greek/greek-fontenc/lgrenc.def
+2020/11/04 | 40279 | language/greek/greek-fontenc/greek-fontenc.def.html
+2020/11/04 | 394312 | language/greek/greek-fontenc/test-inputenc.pdf
+2020/11/04 | 39353 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2020/11/04 | 39308 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2020/11/04 | 392 | systems/texlive/tlnet/archive/texlive-docindex.r56844.tar.xz
+2020/11/04 | 392343 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2020/11/04 | 3901 | macros/luatex/latex/ekdosis/samples/Caesar_BG-6-13-1.tex
+2020/11/04 | 37682 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2020/11/04 | 36957 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2020/11/04 | 36928 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2020/11/04 | 36640 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2020/11/04 | 36373 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2020/11/04 | 3623 | macros/latex/contrib/xltabular/xltabular.sty
+2020/11/04 | 3595 | macros/luatex/latex/ekdosis/Makefile
+2020/11/04 | 354733 | macros/luatex/latex/ekdosis/ekdosis.dtx
+2020/11/04 | 35309 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.bib
+2020/11/04 | 35188 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2020/11/04 | 34788 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2020/11/04 | 34745 | language/greek/greek-fontenc/alphabeta.sty.html
+2020/11/04 | 343541 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-examples.pdf
+2020/11/04 | 34183 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2020/11/04 | 33151 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2020/11/04 | 329621 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2020/11/04 | 32921 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2020/11/04 | 32337 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2020/11/04 | 322666 | language/greek/greek-fontenc/test-lgrenc.pdf
+2020/11/04 | 318789 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2020/11/04 | 31345 | language/greek/greek-fontenc/alphabeta-tuenc.def.html
+2020/11/04 | 31216 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2020/11/04 | 31214 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2020/11/04 | 31041 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2020/11/04 | 30934 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2020/11/04 | 30904 | macros/latex/contrib/grant/grant.dtx
+2020/11/04 | 30682 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2020/11/04 | 29731 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2020/11/04 | 295366 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2020/11/04 | 29514 | language/greek/greek-fontenc/test-tuenc-greek.tex
+2020/11/04 | 29155 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2020/11/04 | 28916 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2020/11/04 | 28606 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2020/11/04 | 285408 | language/greek/greek-fontenc/diacritics.pdf
+2020/11/04 | 284331 | language/greek/greek-fontenc/hyperref-with-greek.pdf
+2020/11/04 | 282449 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2020/11/04 | 280104 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2020/11/04 | 279490 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2020/11/04 | 27890 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl.cbx
+2020/11/04 | 27759 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2020/11/04 | 27706 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2020/11/04 | 27103 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2020/11/04 | 27056 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2020/11/04 | 27008 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2020/11/04 | 26981 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2020/11/04 | 2652764 | language/greek/greek-fontenc.zip
+2020/11/04 | 2635855 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2020/11/04 | 258222 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2020/11/04 | 2514453 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2020/11/04 | 250932 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2020/11/04 | 249039 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2020/11/04 | 24891 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2020/11/04 | 24839 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2020/11/04 | 243099 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2020/11/04 | 24270090 | systems/texlive/tlnet/install-tl.zip
+2020/11/04 | 24164 | language/greek/greek-fontenc/README
+2020/11/04 | 23889 | language/greek/greek-fontenc/puenc-greek.def
+2020/11/04 | 23637 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2020/11/04 | 23021 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2020/11/04 | 2291 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/README.md
+2020/11/04 | 2242076 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2020/11/04 | 224114 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2020/11/04 | 218656 | systems/texlive/tlnet/archive/texlive-scripts.doc.r56844.tar.xz
+2020/11/04 | 21850 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2020/11/04 | 21811 | language/greek/greek-fontenc/textalpha.sty
+2020/11/04 | 21242 | language/greek/greek-fontenc/test-lgrenc.tex
+2020/11/04 | 212028 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2020/11/04 | 21096 | systems/texlive/tlnet/archive/mcf2graph.r56846.tar.xz
+2020/11/04 | 210214 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2020/11/04 | 20817 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2020/11/04 | 207412 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2020/11/04 | 204566 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2020/11/04 | 204538 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2020/11/04 | 204242 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2020/11/04 | 202420 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2020/11/04 | 19945 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2020/11/04 | 199229 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2020/11/04 | 1985298 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2020/11/04 | 197844 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2020/11/04 | 195337 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2020/11/04 | 194085 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2020/11/04 | 19386011 | systems/texlive/tlnet/install-tl-windows.exe
+2020/11/04 | 19298 | language/greek/greek-fontenc/greek-fontenc.def
+2020/11/04 | 192632 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2020/11/04 | 19006 | language/greek/greek-fontenc/textalpha-doc.tex
+2020/11/04 | 18839 | language/greek/greek-fontenc/test-inputenc.tex
+2020/11/04 | 1872 | systems/texlive/tlnet/archive/frenchmath.r56847.tar.xz
+2020/11/04 | 1868 | macros/luatex/latex/ekdosis/ekdosis.ins
+2020/11/04 | 18222 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl-paper.sty
+2020/11/04 | 179938 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2020/11/04 | 17992 | macros/luatex/latex/ekdosis/samples/Caesar_BG-6-13-1.pdf
+2020/11/04 | 179399 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2020/11/04 | 17875 | language/greek/greek-fontenc/alphabeta-doc.tex
+2020/11/04 | 1776 | macros/latex/contrib/grant/grant.ins
+2020/11/04 | 17715 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2020/11/04 | 17628 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2020/11/04 | 1740 | macros/latex/contrib/grant/README.md
+2020/11/04 | 1707142 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2020/11/04 | 169984 | systems/texlive/tlnet/archive/texlive-docindex.doc.r56844.tar.xz
+2020/11/04 | 16641100 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2020/11/04 | 165515 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2020/11/04 | 164804 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.pdf
+2020/11/04 | 1622608 | systems/texlive/tlnet/archive/newpx.r56845.tar.xz
+2020/11/04 | 161077 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2020/11/04 | 16060 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2020/11/04 | 15988 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2020/11/04 | 159524 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2020/11/04 | 15693 | language/greek/greek-fontenc/alphabeta.sty
+2020/11/04 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2020/11/04 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2020/11/04 | 15289 | language/greek/greek-fontenc/alphabeta-tuenc.def
+2020/11/04 | 1519 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/german-sbl.lbx
+2020/11/04 | 151810 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2020/11/04 | 151776 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2020/11/04 | 1514 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/spanish-sbl.lbx
+2020/11/04 | 146832 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2020/11/04 | 146568 | systems/texlive/tlnet/archive/hulipsum.doc.r56848.tar.xz
+2020/11/04 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2020/11/04 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2020/11/04 | 144417 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2020/11/04 | 14161 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2020/11/04 | 1415726 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2020/11/04 | 1414 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/english-sbl.lbx
+2020/11/04 | 133475 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2020/11/04 | 13333 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl.bbx
+2020/11/04 | 13287 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2020/11/04 | 132068 | systems/texlive/tlnet/archive/texlive-scripts.r56844.tar.xz
+2020/11/04 | 130510 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2020/11/04 | 130319 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2020/11/04 | 1302294 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2020/11/04 | 1274538 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2020/11/04 | 1245394 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2020/11/04 | 1229125 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2020/11/04 | 1227999 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2020/11/04 | 118973 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2020/11/04 | 117264 | macros/latex/contrib/grant.zip
+2020/11/04 | 1168166 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2020/11/04 | 115942 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2020/11/04 | 115908 | macros/latex/contrib/grant/grant.pdf
+2020/11/04 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2020/11/04 | 1147096 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2020/11/04 | 1146386 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2020/11/04 | 114399 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2020/11/04 | 113869 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2020/11/04 | 1125037 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2020/11/04 | 1107 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl.dbx
+2020/11/04 | 108943 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2020/11/04 | 1082312 | systems/texlive/tlnet/archive/mcf2graph.doc.r56846.tar.xz
+2020/11/04 | 1080 | macros/latex/contrib/grant/LICENSE
+2020/11/04 | 1076054 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2020/11/04 | 104488 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2020/11/04 | 102881 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2020/11/04 | 101591 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
2020/11/03 | 98196 | systems/texlive/tlnet/archive/spacingtricks.doc.r56840.tar.xz
-2020/11/03 | 97451 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2020/11/03 | 965657 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2020/11/03 | 96262 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2020/11/03 | 94605 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
2020/11/03 | 944 | fonts/newtx/tfm/ntx-Bold-lf-ot1.tfm
-2020/11/03 | 94447 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2020/11/03 | 93665 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2020/11/03 | 93590 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
2020/11/03 | 88992 | graphics/mcf2graph/mcf2graph.mf
-2020/11/03 | 884 | systems/win32/miktex/tm/packages/pr.ini
-2020/11/03 | 87398 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2020/11/03 | 86663 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2020/11/03 | 8591 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2020/11/03 | 84909 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
2020/11/03 | 8472 | systems/texlive/tlnet/archive/spacingtricks.source.r56840.tar.xz
2020/11/03 | 8344 | fonts/newtx/tfm/ntx-BoldItalic-lf-sc-ly1.tfm
2020/11/03 | 8340 | fonts/newtx/tfm/ntx-BoldItalic-osf-sc-ly1.tfm
@@ -30,14 +308,11 @@
2020/11/03 | 8100 | fonts/newtx/tfm/ntx-Italic-lf-sc-ly1.tfm
2020/11/03 | 8096 | fonts/newtx/tfm/ntx-Italic-lf-scl-ly1.tfm
2020/11/03 | 8088 | fonts/newtx/tfm/ntx-Italic-osf-sc-ly1.tfm
-2020/11/03 | 808894 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
2020/11/03 | 8084 | fonts/newtx/tfm/ntx-Italic-osf-scl-ly1.tfm
-2020/11/03 | 80690 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
2020/11/03 | 8052 | fonts/newtx/tfm/ntx-Italic-tosf-sc-ly1.tfm
2020/11/03 | 8052 | fonts/newtx/tfm/ntx-Italic-tlf-sc-ly1.tfm
2020/11/03 | 8048 | fonts/newtx/tfm/ntx-Italic-tosf-scl-ly1.tfm
2020/11/03 | 8048 | fonts/newtx/tfm/ntx-Italic-tlf-scl-ly1.tfm
-2020/11/03 | 78402 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
2020/11/03 | 7808 | fonts/newtx/tfm/ntx-Regular-lf-sc-ly1.tfm
2020/11/03 | 7804 | fonts/newtx/tfm/ntx-Regular-osf-sc-ly1.tfm
2020/11/03 | 7776 | fonts/newtx/tfm/ntx-Regular-tosf-sc-ly1.tfm
@@ -49,7 +324,6 @@
2020/11/03 | 7728 | fonts/newtx/tfm/ntx-Regular-tlf-scl-ly1.tfm
2020/11/03 | 7728 | fonts/newtx/tfm/ntx-Bold-lf-sc-ly1.tfm
2020/11/03 | 7724 | fonts/newtx/tfm/ntx-Bold-osf-sc-ly1.tfm
-2020/11/03 | 77235 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
2020/11/03 | 7696 | fonts/newtx/tfm/ntx-Bold-tosf-sc-ly1.tfm
2020/11/03 | 7696 | fonts/newtx/tfm/ntx-Bold-tlf-sc-ly1.tfm
2020/11/03 | 7676 | fonts/newtx/tfm/ntx-Bold-lf-scl-ly1.tfm
@@ -57,15 +331,8 @@
2020/11/03 | 7672 | fonts/newtx/tfm/ntx-Bold-osf-scl-ly1.tfm
2020/11/03 | 7644 | fonts/newtx/tfm/ntx-Bold-tosf-scl-ly1.tfm
2020/11/03 | 7644 | fonts/newtx/tfm/ntx-Bold-tlf-scl-ly1.tfm
-2020/11/03 | 7568 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2020/11/03 | 74256 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2020/11/03 | 74048 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2020/11/03 | 738797 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2020/11/03 | 73421 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2020/11/03 | 72878 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
2020/11/03 | 7276 | fonts/newtx/tfm/ntx-Regular-lf-ly1.tfm
2020/11/03 | 7272 | fonts/newtx/tfm/ntx-Regular-osf-ly1.tfm
-2020/11/03 | 72708 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
2020/11/03 | 7244 | fonts/newtx/tfm/ntx-Regular-tosf-ly1.tfm
2020/11/03 | 7244 | fonts/newtx/tfm/ntx-Regular-tlf-ly1.tfm
2020/11/03 | 7240 | fonts/newtx/tfm/ntx-Bold-lf-ly1.tfm
@@ -78,125 +345,52 @@
2020/11/03 | 7184 | fonts/newtx/tfm/ntx-BoldItalic-tlf-ly1.tfm
2020/11/03 | 7180 | fonts/newtx/tfm/ntx-Italic-osf-ly1.tfm
2020/11/03 | 7180 | fonts/newtx/tfm/ntx-BoldItalic-tosf-ly1.tfm
-2020/11/03 | 71729 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2020/11/03 | 71620 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
2020/11/03 | 7152 | fonts/newtx/tfm/ntx-Italic-osf-th-ly1.tfm
2020/11/03 | 7144 | fonts/newtx/tfm/ntx-Italic-tosf-ly1.tfm
2020/11/03 | 7144 | fonts/newtx/tfm/ntx-Italic-tlf-ly1.tfm
2020/11/03 | 7112 | fonts/newtx/tfm/ntx-Italic-tlf-th-ly1.tfm
-2020/11/03 | 70118 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2020/11/03 | 69713 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2020/11/03 | 678093 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2020/11/03 | 67425 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2020/11/03 | 65983 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2020/11/03 | 65970 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
-2020/11/03 | 65769 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2020/11/03 | 65273 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2020/11/03 | 64436 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2020/11/03 | 63604 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2020/11/03 | 63487 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2020/11/03 | 63182 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2020/11/03 | 63011 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2020/11/03 | 623786 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2020/11/03 | 6585 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2020/11/03 | 6208 | systems/texlive/tlnet/archive/collection-latexextra.r56841.tar.xz
-2020/11/03 | 61835 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2020/11/03 | 617437 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
2020/11/03 | 607345 | systems/win32/miktex/tm/packages/menukeys.tar.lzma
-2020/11/03 | 598220 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
2020/11/03 | 597534 | graphics/mcf2graph/mcf_manual.pdf
-2020/11/03 | 597317 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2020/11/03 | 59550 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2020/11/03 | 58633 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2020/11/03 | 58495 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
-2020/11/03 | 580930 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2020/11/03 | 57228 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2020/11/03 | 567104 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2020/11/03 | 56656 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2020/11/03 | 56011 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2020/11/03 | 55968 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2020/11/03 | 55828 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2020/11/03 | 557910 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2020/11/03 | 55605 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
2020/11/03 | 553267 | systems/win32/miktex/tm/packages/chessboard.tar.lzma
-2020/11/03 | 551544 | systems/win32/miktex/tm/packages/files.csv.lzma
-2020/11/03 | 551236 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2020/11/03 | 5500081 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2020/11/03 | 54666 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2020/11/03 | 531487 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2020/11/03 | 52199 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2020/11/03 | 51964 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
2020/11/03 | 515856 | systems/win32/miktex/tm/packages/yquant.tar.lzma
-2020/11/03 | 51475 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2020/11/03 | 51117 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
2020/11/03 | 5096818 | systems/win32/miktex/tm/packages/tikz-among-us.tar.lzma
-2020/11/03 | 50855 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
2020/11/03 | 507231 | fonts/newtx/afm/ztmbi.afm
-2020/11/03 | 50511 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2020/11/03 | 50435 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
2020/11/03 | 49872 | graphics/mcf2graph/mcf_manual.tex
-2020/11/03 | 49817 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
2020/11/03 | 496636 | systems/win32/miktex/tm/packages/biblatex-caspervector.tar.lzma
2020/11/03 | 493104 | systems/texlive/tlnet/archive/biblatex-caspervector.doc.r56837.tar.xz
2020/11/03 | 490419 | systems/win32/miktex/tm/packages/frenchmath.tar.lzma
2020/11/03 | 490381 | fonts/newtx/afm/ztmr.afm
-2020/11/03 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2020/11/03 | 48946 | systems/texlive/tlnet/tlpkg/installer/config.guess
2020/11/03 | 486912 | fonts/newtx/afm/ztmb.afm
2020/11/03 | 485788 | fonts/newtx/afm/ztmri.afm
-2020/11/03 | 482422 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2020/11/03 | 47678 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
2020/11/03 | 472542 | systems/win32/miktex/tm/packages/europasscv.tar.lzma
-2020/11/03 | 46533 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2020/11/03 | 461748 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2020/11/03 | 45810 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2020/11/03 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2020/11/03 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2020/11/03 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2020/11/03 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
-2020/11/03 | 45370 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2020/11/03 | 44980 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
2020/11/03 | 4396 | systems/texlive/tlnet/archive/biblatex-caspervector.r56837.tar.xz
2020/11/03 | 437733 | systems/win32/miktex/tm/packages/pkuthss.tar.lzma
-2020/11/03 | 43082 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2020/11/03 | 42914 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2020/11/03 | 42630 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2020/11/03 | 42627 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
2020/11/03 | 422744 | systems/texlive/tlnet/archive/pkuthss.doc.r56838.tar.xz
-2020/11/03 | 42237 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2020/11/03 | 42077 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2020/11/03 | 41054 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
2020/11/03 | 4092 | fonts/newtx/tfm/ntxsups-Italic-ly1.tfm
2020/11/03 | 4088 | fonts/newtx/tfm/ntxsups-Regular-ly1.tfm
-2020/11/03 | 40819 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
2020/11/03 | 4048 | fonts/newtx/tfm/ntxsups-BoldItalic-ly1.tfm
2020/11/03 | 4008 | fonts/newtx/tfm/ntxsups-Italic-t1.tfm
2020/11/03 | 4004 | fonts/newtx/tfm/ntxsups-Regular-t1.tfm
2020/11/03 | 3992 | fonts/newtx/tfm/ntxsups-Regular-ot1.tfm
2020/11/03 | 3968 | fonts/newtx/tfm/ntxsups-BoldItalic-t1.tfm
-2020/11/03 | 39353 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2020/11/03 | 39309 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2020/11/03 | 392343 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
2020/11/03 | 3812 | fonts/newtx/tfm/ntxsups-Bold-ly1.tfm
-2020/11/03 | 37682 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
2020/11/03 | 3760 | fonts/newtx/tfm/ntxsups-Italic.tfm
2020/11/03 | 3728 | fonts/newtx/tfm/ntxsups-Bold-t1.tfm
2020/11/03 | 3728 | fonts/newtx/tfm/ntxsups-BoldItalic.tfm
2020/11/03 | 3711 | graphics/mcf2graph/README
-2020/11/03 | 36957 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2020/11/03 | 36927 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
2020/11/03 | 3664 | fonts/newtx/tfm/ntxsups-Regular.tfm
-2020/11/03 | 36641 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
2020/11/03 | 36634 | graphics/mcf2graph/mcf_man_soc.mf
-2020/11/03 | 36373 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
2020/11/03 | 36282 | fonts/newtx/README
2020/11/03 | 3540 | fonts/newtx/tfm/ntxsups-Bold.tfm
-2020/11/03 | 35187 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
2020/11/03 | 3508 | fonts/newtx/tfm/ntx-Italic-lf-scl-ot1.tfm
2020/11/03 | 3508 | fonts/newtx/tfm/ntx-BoldItalic-lf-scl-ot1.tfm
2020/11/03 | 3504 | fonts/newtx/tfm/ntx-Italic-lf-sc-ot1.tfm
2020/11/03 | 3496 | fonts/newtx/tfm/ntx-BoldItalic-osf-scl-ot1.tfm
2020/11/03 | 3496 | fonts/newtx/tfm/ntx-BoldItalic-lf-sc-ot1.tfm
2020/11/03 | 3492 | fonts/newtx/tfm/ntx-BoldItalic-osf-sc-ot1.tfm
-2020/11/03 | 34786 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
2020/11/03 | 3476 | fonts/newtx/tfm/ntx-Italic-osf-sc-ot1.tfm
2020/11/03 | 3476 | fonts/newtx/tfm/ntx-Italic-osf-scl-ot1.tfm
2020/11/03 | 3472 | fonts/newtx/tfm/ntxsups-Italic-ot1.tfm
@@ -209,10 +403,6 @@
2020/11/03 | 3432 | fonts/newtx/tfm/ntx-Italic-tlf-scl-ot1.tfm
2020/11/03 | 3428 | fonts/newtx/tfm/ntx-Italic-tosf-sc-ot1.tfm
2020/11/03 | 3428 | fonts/newtx/tfm/ntx-Italic-tosf-scl-ot1.tfm
-2020/11/03 | 34184 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2020/11/03 | 33150 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2020/11/03 | 329622 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2020/11/03 | 32921 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
2020/11/03 | 3271 | fonts/newtx/enc/ntx-texnansi-tosf-sc.enc
2020/11/03 | 3271 | fonts/newtx/enc/ntx-texnansi-tosf-pc.enc
2020/11/03 | 3260 | fonts/newtx/enc/ntx-ec-tosf-sc.enc
@@ -221,7 +411,6 @@
2020/11/03 | 3247 | fonts/newtx/enc/ntx-ec-osf-pc.enc
2020/11/03 | 3240 | fonts/newtx/enc/ntx-texnansi-osf-sc.enc
2020/11/03 | 3240 | fonts/newtx/enc/ntx-texnansi-osf-pc.enc
-2020/11/03 | 32339 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
2020/11/03 | 3216 | fonts/newtx/tfm/ntx-Regular-lf-sc-ot1.tfm
2020/11/03 | 3214 | fonts/newtx/enc/ntx-ec-lf-sc.enc
2020/11/03 | 3214 | fonts/newtx/enc/ntx-ec-lf-pc.enc
@@ -229,7 +418,6 @@
2020/11/03 | 3212 | fonts/newtx/tfm/ntx-Regular-osf-sc-ot1.tfm
2020/11/03 | 3199 | fonts/newtx/enc/ntx-texnansi-lf-sc.enc
2020/11/03 | 3199 | fonts/newtx/enc/ntx-texnansi-lf-pc.enc
-2020/11/03 | 318788 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
2020/11/03 | 3180 | fonts/newtx/tfm/ntx-Regular-tosf-sc-ot1.tfm
2020/11/03 | 3180 | fonts/newtx/tfm/ntx-Regular-tlf-sc-ot1.tfm
2020/11/03 | 3180 | fonts/newtx/tfm/ntx-Bold-lf-sc-ot1.tfm
@@ -247,21 +435,16 @@
2020/11/03 | 3128 | fonts/newtx/tfm/ntx-Regular-tlf-scl-ot1.tfm
2020/11/03 | 3128 | fonts/newtx/tfm/ntx-Bold-lf-scl-ot1.tfm
2020/11/03 | 3124 | fonts/newtx/tfm/ntx-Bold-osf-scl-ot1.tfm
-2020/11/03 | 31216 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2020/11/03 | 31214 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
2020/11/03 | 3120 | fonts/newtx/tfm/ntx-Italic-osf-ot1.tfm
2020/11/03 | 3120 | fonts/newtx/enc/ntx-texnansi-tosf.enc
2020/11/03 | 3116 | fonts/newtx/tfm/ntx-BoldItalic-osf-ot1.tfm
2020/11/03 | 3112 | fonts/newtx/tfm/ntx-BoldItalic-lf-ot1.tfm
-2020/11/03 | 31043 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2020/11/03 | 30933 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
2020/11/03 | 3092 | fonts/newtx/tfm/ntx-Bold-tosf-scl-ot1.tfm
2020/11/03 | 3092 | fonts/newtx/tfm/ntx-Bold-tlf-scl-ot1.tfm
2020/11/03 | 3089 | fonts/newtx/enc/ntx-texnansi-osf.enc
2020/11/03 | 3084 | fonts/newtx/tfm/ntx-Italic-osf-th-ot1.tfm
2020/11/03 | 3080 | fonts/newtx/tfm/ntx-Italic-tlf-ot1.tfm
2020/11/03 | 3076 | fonts/newtx/tfm/ntx-Italic-tosf-ot1.tfm
-2020/11/03 | 30682 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
2020/11/03 | 306745 | graphics/mcf2graph/mcf_example.pdf
2020/11/03 | 3065 | fonts/newtx/enc/ntx-texnansi-th-tlf.enc
2020/11/03 | 3064 | fonts/newtx/tfm/ntx-BoldItalic-tlf-ot1.tfm
@@ -283,87 +466,21 @@
2020/11/03 | 2999 | fonts/newtx/enc/ntx-texnansi-tlf.enc
2020/11/03 | 2976 | fonts/newtx/tfm/ntx-Bold-tosf-ot1.tfm
2020/11/03 | 2976 | fonts/newtx/tfm/ntx-Bold-tlf-ot1.tfm
-2020/11/03 | 29731 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2020/11/03 | 295370 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
2020/11/03 | 2944 | systems/texlive/tlnet/archive/semesterplanner.source.r56841.tar.xz
2020/11/03 | 2917 | fonts/newtx/enc/ntx-ec-tlf.enc
-2020/11/03 | 29154 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2020/11/03 | 28916 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2020/11/03 | 28604 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2020/11/03 | 282447 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
2020/11/03 | 2822942 | systems/win32/miktex/tm/packages/hvfloat.tar.lzma
-2020/11/03 | 280104 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2020/11/03 | 279491 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2020/11/03 | 27759 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2020/11/03 | 27709 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2020/11/03 | 27102 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2020/11/03 | 27055 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2020/11/03 | 27007 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2020/11/03 | 26982 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2020/11/03 | 2635855 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2020/11/03 | 258222 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2020/11/03 | 2514450 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2020/11/03 | 250929 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2020/11/03 | 249040 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2020/11/03 | 24890 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2020/11/03 | 24842 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2020/11/03 | 243099 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2020/11/03 | 24270028 | systems/texlive/tlnet/install-tl.zip
-2020/11/03 | 23635 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2020/11/03 | 23023 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2020/11/03 | 2242020 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
-2020/11/03 | 224114 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2020/11/03 | 21852 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
-2020/11/03 | 212027 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2020/11/03 | 210215 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2020/11/03 | 20817 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
2020/11/03 | 20795 | graphics/mcf2graph/mcf_exa_soc.mf
2020/11/03 | 207607 | macros/latex/contrib/hulipsum.zip
-2020/11/03 | 207412 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
2020/11/03 | 2067103 | systems/win32/miktex/tm/packages/newpx.tar.lzma
-2020/11/03 | 204589 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2020/11/03 | 204526 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2020/11/03 | 204242 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2020/11/03 | 202420 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
2020/11/03 | 201981 | graphics/mcf2graph/mcf_mplib_exa.pdf
-2020/11/03 | 19945 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2020/11/03 | 199229 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2020/11/03 | 1985297 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2020/11/03 | 197845 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2020/11/03 | 195341 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2020/11/03 | 194087 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2020/11/03 | 19383263 | systems/texlive/tlnet/install-tl-windows.exe
-2020/11/03 | 192634 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
2020/11/03 | 1900 | systems/texlive/tlnet/archive/semesterplanner.r56841.tar.xz
-2020/11/03 | 179938 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2020/11/03 | 179400 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2020/11/03 | 17716 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2020/11/03 | 17628 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
2020/11/03 | 174943 | macros/latex/contrib/hulipsum/hulipsum.dtx
-2020/11/03 | 1707143 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
2020/11/03 | 16688 | graphics/mcf2graph/mcf_mplib_exa.tex
-2020/11/03 | 16641100 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2020/11/03 | 165516 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
2020/11/03 | 16415188 | systems/texlive/tlnet/archive/texworks.win32.r56836.tar.xz
2020/11/03 | 1628 | systems/texlive/tlnet/archive/spacingtricks.r56840.tar.xz
2020/11/03 | 16200 | systems/texlive/tlnet/archive/pkuthss.r56838.tar.xz
-2020/11/03 | 161076 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2020/11/03 | 16059 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2020/11/03 | 15990 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
-2020/11/03 | 159524 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
2020/11/03 | 155716 | systems/texlive/tlnet/archive/hyperxmp.source.r56839.tar.xz
-2020/11/03 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2020/11/03 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2020/11/03 | 151810 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2020/11/03 | 151776 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2020/11/03 | 146832 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2020/11/03 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
2020/11/03 | 145394 | macros/latex/contrib/hulipsum/hulipsum.pdf
-2020/11/03 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2020/11/03 | 144417 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2020/11/03 | 14160 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
-2020/11/03 | 1415727 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2020/11/03 | 133475 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
2020/11/03 | 13336 | fonts/newtx/tfm/ntx-BoldItalic-lf-scl-t1.tfm
2020/11/03 | 13332 | fonts/newtx/tfm/ntx-BoldItalic-lf-sc-t1.tfm
2020/11/03 | 13324 | fonts/newtx/tfm/ntx-BoldItalic-osf-sc-t1.tfm
@@ -371,14 +488,9 @@
2020/11/03 | 13288 | fonts/newtx/tfm/ntx-BoldItalic-tlf-sc-t1.tfm
2020/11/03 | 13284 | fonts/newtx/tfm/ntx-BoldItalic-tosf-scl-t1.tfm
2020/11/03 | 13284 | fonts/newtx/tfm/ntx-BoldItalic-tlf-scl-t1.tfm
-2020/11/03 | 13283 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
2020/11/03 | 13280 | fonts/newtx/tfm/ntx-BoldItalic-tosf-sc-t1.tfm
2020/11/03 | 1308495 | systems/win32/miktex/tm/packages/hyperxmp.tar.lzma
-2020/11/03 | 130508 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2020/11/03 | 130320 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2020/11/03 | 1302292 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
2020/11/03 | 12748 | systems/texlive/tlnet/archive/hyperxmp.r56839.tar.xz
-2020/11/03 | 1274540 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
2020/11/03 | 12608 | fonts/newtx/tfm/ntx-Italic-lf-sc-t1.tfm
2020/11/03 | 12604 | fonts/newtx/tfm/ntx-Italic-lf-scl-t1.tfm
2020/11/03 | 12596 | fonts/newtx/tfm/ntx-Italic-osf-sc-t1.tfm
@@ -387,15 +499,12 @@
2020/11/03 | 12552 | fonts/newtx/tfm/ntx-Italic-tosf-sc-t1.tfm
2020/11/03 | 12544 | fonts/newtx/tfm/ntx-Italic-tosf-scl-t1.tfm
2020/11/03 | 12544 | fonts/newtx/tfm/ntx-Italic-tlf-scl-t1.tfm
-2020/11/03 | 1245395 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
2020/11/03 | 12328 | fonts/newtx/tfm/ntx-Bold-lf-sc-t1.tfm
2020/11/03 | 12324 | fonts/newtx/tfm/ntx-Bold-osf-sc-t1.tfm
2020/11/03 | 12308 | fonts/newtx/tfm/ntx-Regular-lf-sc-t1.tfm
2020/11/03 | 12304 | fonts/newtx/tfm/ntx-Regular-osf-sc-t1.tfm
-2020/11/03 | 1229995 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
2020/11/03 | 12292 | fonts/newtx/tfm/ntx-Bold-tosf-sc-t1.tfm
2020/11/03 | 12292 | fonts/newtx/tfm/ntx-Bold-tlf-sc-t1.tfm
-2020/11/03 | 1229015 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
2020/11/03 | 12276 | fonts/newtx/tfm/ntx-Regular-tosf-sc-t1.tfm
2020/11/03 | 12276 | fonts/newtx/tfm/ntx-Regular-tlf-sc-t1.tfm
2020/11/03 | 12272 | fonts/newtx/tfm/ntx-Bold-lf-scl-t1.tfm
@@ -406,16 +515,8 @@
2020/11/03 | 12236 | fonts/newtx/tfm/ntx-Bold-tlf-scl-t1.tfm
2020/11/03 | 12228 | fonts/newtx/tfm/ntx-Regular-tosf-scl-t1.tfm
2020/11/03 | 12228 | fonts/newtx/tfm/ntx-Regular-tlf-scl-t1.tfm
-2020/11/03 | 118973 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
-2020/11/03 | 1168163 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2020/11/03 | 115943 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2020/11/03 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
-2020/11/03 | 1147716 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2020/11/03 | 1147456 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
-2020/11/03 | 114398 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
2020/11/03 | 1141540 | systems/texlive/tlnet/archive/hyperxmp.doc.r56839.tar.xz
2020/11/03 | 11388 | fonts/newtx/tfm/ntx-BoldItalic-lf-t1.tfm
-2020/11/03 | 113869 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
2020/11/03 | 11384 | fonts/newtx/tfm/ntx-BoldItalic-osf-t1.tfm
2020/11/03 | 11348 | fonts/newtx/tfm/ntx-Regular-lf-t1.tfm
2020/11/03 | 11344 | fonts/newtx/tfm/ntx-Regular-osf-t1.tfm
@@ -431,17 +532,11 @@
2020/11/03 | 11288 | fonts/newtx/tfm/ntx-Italic-osf-t1.tfm
2020/11/03 | 11252 | fonts/newtx/tfm/ntx-Italic-tosf-t1.tfm
2020/11/03 | 11252 | fonts/newtx/tfm/ntx-Italic-tlf-t1.tfm
-2020/11/03 | 1125036 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
2020/11/03 | 11220 | fonts/newtx/tfm/ntx-Italic-osf-th-t1.tfm
2020/11/03 | 11188 | fonts/newtx/tfm/ntx-Italic-tlf-th-t1.tfm
2020/11/03 | 1111570 | graphics/mcf2graph.zip
-2020/11/03 | 108946 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
2020/11/03 | 108166 | systems/win32/miktex/tm/packages/spacingtricks.tar.lzma
-2020/11/03 | 1076054 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
2020/11/03 | 10477 | graphics/mcf2graph/CHANGELOG
-2020/11/03 | 104488 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2020/11/03 | 102883 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2020/11/03 | 101591 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
2020/11/02 | 98319 | fonts/newpx/tex/newpxmath.sty
2020/11/02 | 9784 | systems/texlive/tlnet/archive/uptex-base.r56832.tar.xz
2020/11/02 | 86893700 | systems/win32/w32tex/pgfcontrib.tar.xz
@@ -485,7 +580,6 @@
2020/11/02 | 22600 | systems/texlive/tlnet/archive/chessboard.r56833.tar.xz
2020/11/02 | 2252 | macros/latex/contrib/hyperxmp/README
2020/11/02 | 21921 | macros/latex/contrib/frenchmath/frenchmath.dtx
-2020/11/02 | 218656 | systems/texlive/tlnet/archive/texlive-scripts.doc.r56826.tar.xz
2020/11/02 | 20904 | systems/texlive/tlnet/archive/chessboard.source.r56833.tar.xz
2020/11/02 | 2056 | fonts/newpx/tfm/zplbsy.tfm
2020/11/02 | 2034 | macros/latex/contrib/hyperxmp/hyperxmp.ins
@@ -502,7 +596,6 @@
2020/11/02 | 1466 | macros/luatex/latex/semesterplanner/semesterplanner.ins
2020/11/02 | 1369660 | install/macros/latex/contrib/hyperxmp.tds.zip
2020/11/02 | 1356976 | macros/latex/contrib/hyperxmp.zip
-2020/11/02 | 132048 | systems/texlive/tlnet/archive/texlive-scripts.r56826.tar.xz
2020/11/02 | 124789 | macros/latex/contrib/spacingtricks/spacingtricks.pdf
2020/11/02 | 11394 | macros/latex/contrib/hyperxmp/einstein-xmp.tex
2020/11/02 | 111022 | macros/luatex/latex/semesterplanner/semesterplanner.pdf
@@ -539,7 +632,6 @@
2020/11/01 | 6684 | systems/win32/miktex/setup/rpm/opensuse/15/repodata/09cd74342942974fe0d468bb144726a3504e7f75e01f64678ba93475b95d2904-filelists.sqlite.bz2
2020/11/01 | 665 | systems/win32/miktex/setup/rpm/fedora/28/repodata/d223743f08342e121f563712ae632d197b2828962661cd61dd7f32ca191a844a-other.xml.gz
2020/11/01 | 660 | systems/win32/miktex/setup/rpm/opensuse/15/repodata/011af98d1825333cae708a7bd881885d969fa8cb51bbae1fa1882ae5ab46ca77-other.xml.gz
-2020/11/01 | 6439 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2020/11/01 | 6328052 | systems/win32/w32tex/win64/pdftex-w64.tar.xz
2020/11/01 | 6280 | macros/latex/contrib/pkuthss/tex/pkuword.pdf
2020/11/01 | 5988 | systems/texlive/tlnet/archive/menukeys.r56822.tar.xz
@@ -578,7 +670,6 @@
2020/11/01 | 3965 | macros/latex/contrib/pkuthss/doc/example/thesis.tex
2020/11/01 | 39578 | macros/latex/contrib/europasscv/example/europasscv_en.pdf
2020/11/01 | 3941 | macros/latex/contrib/pkuthss/tex/pkulogo.eps
-2020/11/01 | 388 | systems/texlive/tlnet/archive/texlive-docindex.r56818.tar.xz
2020/11/01 | 380953 | macros/latex/contrib/europasscv/europasscv.pdf
2020/11/01 | 3750 | macros/latex/contrib/pkuthss/doc/example/chap/origin.tex
2020/11/01 | 3704 | systems/win32/miktex/setup/rpm/fedora/28/repodata/6da442436c6eb3e1c39743fedbd4966a96c77f51adac2423927863fb751b0f19-primary.xml.gz
@@ -687,7 +778,6 @@
2020/11/01 | 1749 | systems/win32/miktex/setup/deb/dists/bionic/universe/binary-amd64/Packages.bz2
2020/11/01 | 172785 | macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector-ay.pdf
2020/11/01 | 1704 | macros/latex/contrib/hulipsum/hulipsum.ins
-2020/11/01 | 169872 | systems/texlive/tlnet/archive/texlive-docindex.doc.r56818.tar.xz
2020/11/01 | 1669 | systems/win32/miktex/setup/deb/dists/focal/universe/Contents-amd64.gz
2020/11/01 | 1664 | macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector.cbx
2020/11/01 | 1552 | macros/latex/contrib/pkuthss/tex/pkuthss-utf8.def
@@ -799,6 +889,7 @@
2020/10/31 | 617939 | systems/win32/miktex/tm/packages/miktex-yap-bin-x64-2.9.tar.lzma
2020/10/31 | 61772 | systems/win32/miktex/tm/packages/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
2020/10/31 | 6115 | language/japanese/uptex-base/samples/bkmk-jis.tex
+2020/10/31 | 6102 | language/greek/greek-fontenc/diacritics.tex
2020/10/31 | 599268 | systems/win32/miktex/tm/packages/miktex-log4cxx-bin-x64-2.9.tar.lzma
2020/10/31 | 598060 | macros/latex/contrib/menukeys.zip
2020/10/31 | 597046 | systems/win32/miktex/tm/packages/miktex-libressl-bin-x64-2.9.tar.lzma
@@ -847,6 +938,7 @@
2020/10/31 | 471 | language/japanese/uptex-base/samples/area-utf8.mp
2020/10/31 | 46486 | systems/win32/miktex/tm/packages/miktex-mtprint-bin-x64-2.9.tar.lzma
2020/10/31 | 461323 | systems/win32/miktex/tm/packages/miktex-doc.tar.lzma
+2020/10/31 | 4601 | language/greek/greek-fontenc/lgr2licr.lua
2020/10/31 | 458 | language/japanese/uptex-base/samples/area-sjis.mp
2020/10/31 | 457 | language/japanese/uptex-base/samples/area-euc.mp
2020/10/31 | 45792 | systems/win32/miktex/tm/packages/miktex-m-tx-bin-2.9.tar.lzma
@@ -931,6 +1023,7 @@
2020/10/31 | 26548 | language/japanese/uptex-base/euptex.src
2020/10/31 | 2634414 | systems/win32/miktex/tm/packages/miktex-texworks-bin-x64-2.9.tar.lzma
2020/10/31 | 2613 | language/japanese/uptex-base/samples/simple-u-jis.tex
+2020/10/31 | 25842 | language/greek/greek-fontenc/alphabeta-lgr.def.html
2020/10/31 | 258150 | systems/win32/miktex/tm/packages/miktex-freetype2-bin-2.9.tar.lzma
2020/10/31 | 252396808 | systems/win32/miktex/setup/windows-x64/basic-miktex-20.11-x64.exe
2020/10/31 | 2512227 | systems/win32/miktex/tm/packages/miktex-texworks-bin-2.9.tar.lzma
@@ -978,6 +1071,7 @@
2020/10/31 | 19917 | systems/win32/miktex/tm/packages/miktex-popt-bin-2.9.tar.lzma
2020/10/31 | 199149 | systems/win32/miktex/tm/packages/miktex-mpfr-bin-2.9.tar.lzma
2020/10/31 | 197861 | systems/win32/miktex/tm/packages/miktex-pixman-bin-2.9.tar.lzma
+2020/10/31 | 19666 | language/greek/greek-fontenc/lgr2licr.lua.html
2020/10/31 | 1960819 | systems/win32/miktex/tm/packages/miktex-luatex-bin-x64-2.9.tar.lzma
2020/10/31 | 195392 | systems/win32/miktex/tm/packages/miktex-curl-bin-x64-2.9.tar.lzma
2020/10/31 | 194222 | systems/win32/miktex/tm/packages/miktex-metafont-bin-2.9.tar.lzma
@@ -1039,6 +1133,7 @@
2020/10/31 | 130295 | systems/win32/miktex/tm/packages/miktex-dvips-bin-x64-2.9.tar.lzma
2020/10/31 | 13007 | language/japanese/uptex-base/samples/cjk_babel.tex
2020/10/31 | 129283 | systems/win32/miktex/tm/packages/gitver.tar.lzma
+2020/10/31 | 12844 | language/greek/greek-fontenc/hyperref-with-greek.tex
2020/10/31 | 1275497 | systems/win32/miktex/tm/packages/miktex-dvisvgm-bin-2.9.tar.lzma
2020/10/31 | 1273037 | systems/win32/miktex/tm/packages/babelbib.tar.lzma
2020/10/31 | 126392 | systems/texlive/tlnet/archive/gitver.doc.r56810.tar.xz
@@ -1059,6 +1154,7 @@
2020/10/31 | 10588 | systems/win32/miktex/tm/packages/graphics-pln.tar.lzma
2020/10/31 | 10491 | language/japanese/uptex-base/samples/misc-check-v-utf8.tex
2020/10/31 | 104640 | systems/win32/miktex/tm/packages/miktex-texware-bin-x64-2.9.tar.lzma
+2020/10/31 | 10378 | language/greek/greek-fontenc/alphabeta-lgr.def
2020/10/31 | 102934 | systems/win32/miktex/tm/packages/miktex-lua53-bin-x64-2.9.tar.lzma
2020/10/31 | 1021434 | systems/win32/miktex/tm/packages/biblatex-gost.tar.lzma
2020/10/31 | 101433 | systems/win32/miktex/tm/packages/miktex-mfware-bin-x64-2.9.tar.lzma
@@ -1416,500 +1512,3 @@
2020/10/29 | 10724 | macros/latex/contrib/hagenberg-thesis/examples/HgbThesisTutorial/images/techniccenter-profile-dvi-26.png
2020/10/29 | 106 | macros/latex/contrib/hagenberg-thesis/examples/HgbThesisEN/chapters/mathematics.tex
2020/10/29 | 1028 | macros/latex/contrib/hagenberg-thesis/examples/HgbThesisTutorial/images/inkscape-template.pdf
-2020/10/28 | 993090 | macros/latex-dev/base/ltnews.pdf
-2020/10/28 | 98884 | systems/texlive/tlnet/archive/texinfo.r56777.tar.xz
-2020/10/28 | 9810 | macros/latex-dev/base/ltnews21.tex
-2020/10/28 | 9717 | macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo/demo-focus.jpg
-2020/10/28 | 957 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/french-gost.lbx
-2020/10/28 | 9562 | macros/latex-dev/base/ltcntrl.dtx
-2020/10/28 | 9494 | macros/latex-dev/required/tools/shellesc.dtx
-2020/10/28 | 9460 | macros/latex-dev/base/format.ins
-2020/10/28 | 9401 | macros/latex-dev/base/syntonly.dtx
-2020/10/28 | 9374 | macros/latex-dev/base/preload.dtx
-2020/10/28 | 934 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/german-gost.lbx
-2020/10/28 | 9202 | macros/latex-dev/required/amsmath/amsopn.dtx
-2020/10/28 | 91228 | systems/texlive/tlnet/archive/l3experimental.source.r56785.tar.xz
-2020/10/28 | 9068 | macros/latex-dev/base/lppl-1-0.txt
-2020/10/28 | 90413 | macros/latex-dev/base/fntguide.tex
-2020/10/28 | 901850 | macros/latex-dev/base/lthooks-code.pdf
-2020/10/28 | 8982 | macros/latex-dev/required/tools/rawfonts.dtx
-2020/10/28 | 89720 | macros/latex-dev/base/slides.dtx
-2020/10/28 | 89386 | macros/latex-dev/base/utf8ienc.dtx
-2020/10/28 | 8864 | macros/latex-dev/base/ltnews17.tex
-2020/10/28 | 88411 | macros/latex-dev/base/lttextcomp.dtx
-2020/10/28 | 8737 | macros/latex-dev/base/ltthm.dtx
-2020/10/28 | 8654 | macros/latex-dev/required/amsmath/amsbsy.dtx
-2020/10/28 | 8632 | macros/latex-dev/base/oldlfont.dtx
-2020/10/28 | 8584 | systems/texlive/tlnet/archive/marathi.source.r56781.tar.xz
-2020/10/28 | 85316 | macros/latex-dev/base/ltdefns.dtx
-2020/10/28 | 85087 | macros/latex-dev/required/amsmath/amsmath-2018-12-01.sty
-2020/10/28 | 8493 | macros/latex-dev/base/texpert.txt
-2020/10/28 | 82371 | macros/latex-dev/required/amsmath/testmath.tex
-2020/10/28 | 8100 | macros/latex-dev/base/ltnews.tex
-2020/10/28 | 804524 | systems/texlive/tlnet/archive/babel.doc.r56784.tar.xz
-2020/10/28 | 79110 | macros/latex-dev/base/ltfssbas.dtx
-2020/10/28 | 7526 | macros/latex-dev/base/ltxguide.cls
-2020/10/28 | 75114 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-standard.bbx
-2020/10/28 | 749381 | macros/latex-dev/base/ltshipout-code.pdf
-2020/10/28 | 74092 | macros/latex-dev/base/ltfssini.dtx
-2020/10/28 | 735387 | macros/latex-dev/base/ltfilehook-code.pdf
-2020/10/28 | 7326 | macros/latex-dev/base/ltnews20.tex
-2020/10/28 | 7222 | macros/latex-dev/base/exscale.dtx
-2020/10/28 | 72225 | macros/latex-dev/required/tools/longtable.dtx
-2020/10/28 | 72142 | macros/latex-dev/required/tools/verbatim.dtx
-2020/10/28 | 7200 | macros/latex-dev/base/sample2e.tex
-2020/10/28 | 69774 | macros/latex-dev/required/graphics/graphics.dtx
-2020/10/28 | 69720 | macros/latex-dev/required/amsmath/amstex.sty
-2020/10/28 | 6965729 | install/macros/latex-dev/required/latex-tools-dev.tds.zip
-2020/10/28 | 69051 | macros/latex-dev/base/clsguide.tex
-2020/10/28 | 68914 | macros/latex-dev/base/ltpictur.dtx
-2020/10/28 | 6884010 | macros/latex-dev/required/tools.zip
-2020/10/28 | 6872 | macros/latex-dev/base/ltnews13.tex
-2020/10/28 | 68428 | macros/latex-dev/base/usrguide.tex
-2020/10/28 | 68285 | macros/latex-dev/required/tools/tools-overview.pdf
-2020/10/28 | 6795 | macros/latex-dev/required/tools/delarray.dtx
-2020/10/28 | 6764 | macros/latex-dev/base/slides.ins
-2020/10/28 | 67333 | macros/latex-dev/base/ltfsstrc.dtx
-2020/10/28 | 6715 | macros/latex-dev/base/latexsym.dtx
-2020/10/28 | 671532 | systems/texlive/tlnet/archive/babel.source.r56784.tar.xz
-2020/10/28 | 66940 | systems/texlive/tlnet/archive/l3packages.source.r56785.tar.xz
-2020/10/28 | 6654 | macros/latex-dev/base/alltt.dtx
-2020/10/28 | 6515 | macros/latex-dev/required/amsmath/changes.txt
-2020/10/28 | 64482 | macros/latex-dev/base/ltluatex.dtx
-2020/10/28 | 6440 | macros/latex-dev/required/amsmath/subeqn.tex
-2020/10/28 | 6367 | macros/latex-dev/base/source2edoc.cls
-2020/10/28 | 6363 | macros/latex-dev/base/newlfont.dtx
-2020/10/28 | 634631 | macros/latex/contrib/biblatex-contrib/biblatex-gost/doc/biblatex-gost-examples.pdf
-2020/10/28 | 630914 | macros/latex-dev/base/doc.pdf
-2020/10/28 | 6274 | macros/latex-dev/base/ltnews14.tex
-2020/10/28 | 62436 | macros/latex-dev/base/letter.dtx
-2020/10/28 | 6224 | macros/latex-dev/required/tools/xr.dtx
-2020/10/28 | 621011 | macros/latex-dev/base/lthooks-doc.pdf
-2020/10/28 | 61221 | macros/latex-dev/base/ltfssdcl.dtx
-2020/10/28 | 60816 | macros/latex-dev/base/ltshipout.dtx
-2020/10/28 | 60334 | macros/latex-dev/base/fontdef.dtx
-2020/10/28 | 602 | macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo_bibliography.bib
-2020/10/28 | 59410 | macros/latex-dev/required/tools/bm.dtx
-2020/10/28 | 5865 | macros/latex-dev/base/ltidxglo.dtx
-2020/10/28 | 5860 | macros/latex-dev/required/amsmath/ams-internal.txt
-2020/10/28 | 5854 | macros/latex-dev/base/ltpar.dtx
-2020/10/28 | 5840 | macros/latex-dev/base/ltnews15.tex
-2020/10/28 | 5797 | macros/latex-dev/required/tools/somedefs.dtx
-2020/10/28 | 57942 | macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo/demo-titlepage-color.jpg
-2020/10/28 | 5777 | macros/latex-dev/base/ltnews16.tex
-2020/10/28 | 57734 | macros/latex-dev/required/tools/changes.txt
-2020/10/28 | 57665 | macros/latex-dev/base/ltmiscen.dtx
-2020/10/28 | 5716 | macros/latex-dev/base/inputenc.ins
-2020/10/28 | 5696 | macros/latex-dev/base/ltnews08.tex
-2020/10/28 | 5682 | macros/latex-dev/required/tools/tools.ins
-2020/10/28 | 5660 | macros/latex-dev/base/ltnews10.tex
-2020/10/28 | 5609 | macros/latex-dev/base/ltnews05.tex
-2020/10/28 | 5600 | macros/latex-dev/base/latexrelease.ins
-2020/10/28 | 5530 | macros/latex-dev/base/ltnews11.tex
-2020/10/28 | 5515 | macros/latex-dev/base/graphpap.dtx
-2020/10/28 | 5507 | macros/latex-dev/base/ltnews27.tex
-2020/10/28 | 5507 | macros/latex-dev/base/ltnews04.tex
-2020/10/28 | 5474 | macros/latex-dev/base/ltnews25.tex
-2020/10/28 | 545852 | systems/texlive/tlnet/archive/l3kernel.source.r56785.tar.xz
-2020/10/28 | 54391 | macros/latex-dev/base/ltfilehook.dtx
-2020/10/28 | 5426 | macros/latex-dev/base/ltnews07.tex
-2020/10/28 | 5418 | macros/latex-dev/base/ltnews12.tex
-2020/10/28 | 5391 | macros/latex-dev/base/ltnews06.tex
-2020/10/28 | 5323 | macros/latex-dev/required/amsmath/ams-external.txt
-2020/10/28 | 53174 | macros/latex-dev/required/tools/calc.dtx
-2020/10/28 | 5294 | macros/latex-dev/base/ltnews09.tex
-2020/10/28 | 5284 | macros/latex-dev/base/ltnews02.tex
-2020/10/28 | 52814 | macros/latex-dev/base/encguide.tex
-2020/10/28 | 5275 | macros/latex-dev/base/cmextra.ins
-2020/10/28 | 52648 | macros/latex-dev/base/ltfiles.dtx
-2020/10/28 | 52532 | macros/latex-dev/base/lb2.err
-2020/10/28 | 5239 | macros/latex-dev/base/ltnews01.tex
-2020/10/28 | 5225 | macros/latex/contrib/biblatex-contrib/biblatex-gost/doc/biblatex-gost-examples.tex
-2020/10/28 | 5213 | macros/latex-dev/required/tools/tools-overview.tex
-2020/10/28 | 520923 | macros/latex-dev/base/ltnews32.pdf
-2020/10/28 | 520851 | macros/latex-dev/base/classes.pdf
-2020/10/28 | 5201 | macros/latex-dev/base/ltnews03.tex
-2020/10/28 | 516316 | macros/latex-dev/base/ltfilehook-doc.pdf
-2020/10/28 | 51314 | macros/latex-dev/base/ltfloat.dtx
-2020/10/28 | 50759 | macros/latex-dev/required/graphics/drivers.dtx
-2020/10/28 | 507296 | macros/latex/contrib/beamer-contrib/themes/beamertheme-focus.zip
-2020/10/28 | 5044 | macros/latex-dev/base/latexsym.ins
-2020/10/28 | 503894 | macros/latex-dev/base/ltshipout-doc.pdf
-2020/10/28 | 500919 | macros/latex-dev/base/ltnews31.pdf
-2020/10/28 | 49967 | macros/latex-dev/base/ltfssaxes.dtx
-2020/10/28 | 4965 | macros/latex-dev/required/tools/fileerr.dtx
-2020/10/28 | 4952 | macros/latex-dev/base/lthyphen.dtx
-2020/10/28 | 491246 | macros/latex-dev/base/ltnews30.pdf
-2020/10/28 | 490903 | macros/latex-dev/required/tools/multicol.pdf
-2020/10/28 | 48645 | macros/latex-dev/base/ltplain.dtx
-2020/10/28 | 48354 | macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo/demo-typeset.jpg
-2020/10/28 | 483037 | macros/latex-dev/required/tools/array.pdf
-2020/10/28 | 479526 | macros/latex-dev/base/docstrip.pdf
-2020/10/28 | 4788 | systems/texlive/tlnet/archive/flippdf.source.r56782.tar.xz
-2020/10/28 | 47704 | macros/latex-dev/base/lttab.dtx
-2020/10/28 | 4762 | macros/latex-dev/base/ltlength.dtx
-2020/10/28 | 476032 | macros/latex-dev/required/amsmath/amsldoc.pdf
-2020/10/28 | 47139360 | systems/win32/w32tex/latex-dev.tar.xz
-2020/10/28 | 4683 | macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo.tex
-2020/10/28 | 4591 | macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerinnerthemefocus.sty
-2020/10/28 | 45246 | macros/latex-dev/base/ltspace.dtx
-2020/10/28 | 4492 | systems/texlive/tlnet/archive/marathi.r56781.tar.xz
-2020/10/28 | 4392 | macros/latex-dev/base/ec.ins
-2020/10/28 | 43637 | macros/latex-dev/base/cmfonts.fdd
-2020/10/28 | 4350850 | macros/latex-dev/base/source2e.pdf
-2020/10/28 | 43454 | macros/latex-dev/required/tools/theorem.dtx
-2020/10/28 | 4343 | macros/latex-dev/required/amsmath/amsxtra.dtx
-2020/10/28 | 433004 | macros/latex-dev/base/ltnews29.pdf
-2020/10/28 | 4326 | macros/latex-dev/base/cmfonts.ins
-2020/10/28 | 4304 | macros/latex-dev/base/ltalloc.dtx
-2020/10/28 | 429026 | macros/latex-dev/required/amsmath/testmath.pdf
-2020/10/28 | 42708 | macros/latex-dev/base/changes.old.txt
-2020/10/28 | 4256 | macros/latex-dev/base/newdc.ins
-2020/10/28 | 4223 | macros/latex-dev/base/docstrip.ins
-2020/10/28 | 4221 | macros/latex-dev/base/latex209.ins
-2020/10/28 | 419756 | systems/win32/w32tex/win64/tex4htk-w64.tar.xz
-2020/10/28 | 417861 | macros/latex-dev/base/fntguide.pdf
-2020/10/28 | 4171 | macros/latex-dev/base/ltnews19.tex
-2020/10/28 | 41587 | macros/latex-dev/base/ltboxes.dtx
-2020/10/28 | 4137 | macros/latex-dev/base/ltnews33.tex
-2020/10/28 | 4089 | macros/latex-dev/base/classes.ins
-2020/10/28 | 40877 | macros/latex-dev/base/ltfinal.dtx
-2020/10/28 | 4080 | macros/latex-dev/base/lablst.tex
-2020/10/28 | 4062 | macros/latex-dev/required/graphics/epsfig.dtx
-2020/10/28 | 4062 | macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-logo.pdf
-2020/10/28 | 399035 | macros/latex-dev/base/usrguide.pdf
-2020/10/28 | 39702 | macros/latex-dev/required/tools/ftnright.dtx
-2020/10/28 | 3962 | macros/latex-dev/base/olddc.ins
-2020/10/28 | 38948 | macros/latex-dev/base/ltmath.dtx
-2020/10/28 | 3893 | macros/latex/contrib/biblatex-contrib/biblatex-gost/doc/ltxdockit.cls
-2020/10/28 | 3886 | macros/latex-dev/required/graphics/lscape.dtx
-2020/10/28 | 38735 | macros/latex-dev/base/latex209.dtx
-2020/10/28 | 384171 | macros/latex-dev/required/amsmath/amsmath.pdf
-2020/10/28 | 37980 | macros/latex-dev/base/latexchanges.tex
-2020/10/28 | 37919 | macros/latex-dev/required/graphics/grfguide.tex
-2020/10/28 | 3783 | macros/latex-dev/base/tulm.ins
-2020/10/28 | 3731 | macros/latex-dev/base/ltlogos.dtx
-2020/10/28 | 372555 | macros/latex-dev/base/clsguide.pdf
-2020/10/28 | 369 | macros/latex-dev/required/amsmath/manifest.txt
-2020/10/28 | 368 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/icelandic-gost.lbx
-2020/10/28 | 368226 | macros/latex-dev/base/ltnews28.pdf
-2020/10/28 | 3641928 | systems/texlive/tlnet/archive/l3experimental.doc.r56785.tar.xz
-2020/10/28 | 363007 | macros/latex-dev/required/tools/varioref.pdf
-2020/10/28 | 362839 | macros/latex-dev/base/ltnews26.pdf
-2020/10/28 | 36154 | macros/latex-dev/base/ltlists.dtx
-2020/10/28 | 36005 | macros/latex-dev/base/ltnews18.pdf
-2020/10/28 | 359540 | macros/latex-dev/base/changes.txt
-2020/10/28 | 35881 | macros/latex-dev/required/tools/tabularx.dtx
-2020/10/28 | 35777 | macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo/demo-titlepage.jpg
-2020/10/28 | 35571 | macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo/demo-subsectionpage.jpg
-2020/10/28 | 35221 | macros/latex-dev/base/ltdirchk.dtx
-2020/10/28 | 351586 | macros/latex-dev/base/slides.pdf
-2020/10/28 | 3514 | macros/latex-dev/base/README.md
-2020/10/28 | 35149 | macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/LICENSE
-2020/10/28 | 349888 | macros/latex-dev/required/tools/longtable.pdf
-2020/10/28 | 3480 | macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/README.md
-2020/10/28 | 346 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/portuguese-gost.lbx
-2020/10/28 | 346 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/brazilian-gost.lbx
-2020/10/28 | 346513 | macros/latex-dev/required/tools/ftnright.pdf
-2020/10/28 | 3436 | macros/latex-dev/base/makeindx.ins
-2020/10/28 | 340889 | macros/latex-dev/required/tools/calc.pdf
-2020/10/28 | 3403 | macros/latex-dev/base/proc.ins
-2020/10/28 | 338 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/croatian-gost.lbx
-2020/10/28 | 33864 | macros/latex-dev/required/tools/varioref-2016-02-16.sty
-2020/10/28 | 338442 | macros/latex/contrib/biblatex-contrib/biblatex-gost/doc/biblatex-gost-examples.bib
-2020/10/28 | 3374 | macros/latex-dev/base/letter.ins
-2020/10/28 | 336 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/spanish-gost.lbx
-2020/10/28 | 336 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/catalan-gost.lbx
-2020/10/28 | 3369 | macros/latex-dev/base/ltoutenc.ins
-2020/10/28 | 3340 | macros/latex-dev/base/exscale.ins
-2020/10/28 | 33256 | macros/latex-dev/base/ltnews32.tex
-2020/10/28 | 33110 | macros/latex-dev/required/graphics/changes.txt
-2020/10/28 | 330 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/slovene-gost.lbx
-2020/10/28 | 330849 | macros/latex-dev/base/utf8ienc.pdf
-2020/10/28 | 3294 | macros/latex-dev/base/bugs.txt
-2020/10/28 | 3281 | macros/latex-dev/required/tools/manifest.txt
-2020/10/28 | 32647 | macros/latex-dev/base/ltsect.dtx
-2020/10/28 | 323050 | macros/latex-dev/required/tools/theorem.pdf
-2020/10/28 | 32164 | macros/latex-dev/base/latexrelease.dtx
-2020/10/28 | 32126 | macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo/demo-references.jpg
-2020/10/28 | 3182 | macros/latex-dev/base/unpack.ins
-2020/10/28 | 31608 | macros/latex-dev/required/graphics/color.dtx
-2020/10/28 | 310275 | macros/latex-dev/required/graphics/grfguide.pdf
-2020/10/28 | 30962 | macros/latex-dev/required/tools/layout.dtx
-2020/10/28 | 306728 | macros/latex-dev/required/tools/bm.pdf
-2020/10/28 | 305670 | macros/latex-dev/base/letter.pdf
-2020/10/28 | 305339 | macros/latex-dev/base/ltluatex.pdf
-2020/10/28 | 30457 | macros/latex-dev/base/ltnews31.tex
-2020/10/28 | 302925 | macros/latex-dev/required/tools/verbatim.pdf
-2020/10/28 | 302836 | macros/latex-dev/base/ltnews22.pdf
-2020/10/28 | 30075 | macros/latex-dev/required/graphics/graphicx.dtx
-2020/10/28 | 2994 | macros/latex-dev/required/graphics/graphics-drivers.ins
-2020/10/28 | 29714 | macros/latex-dev/required/tools/multicol-2017-04-11.sty
-2020/10/28 | 29571 | macros/latex-dev/required/tools/showkeys.dtx
-2020/10/28 | 294900 | macros/latex-dev/base/inputenc.pdf
-2020/10/28 | 293 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/galician-gost.lbx
-2020/10/28 | 292931 | macros/latex/contrib/biblatex-contrib/biblatex-gost/doc/biblatex-gost.pdf
-2020/10/28 | 29194 | macros/latex-dev/base/ltfntcmd.dtx
-2020/10/28 | 290 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-footnote-min.cbx
-2020/10/28 | 289 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/greek-gost.lbx
-2020/10/28 | 2898 | macros/latex-dev/base/syntonly.ins
-2020/10/28 | 2895 | macros/latex-dev/base/nfssfont.ins
-2020/10/28 | 2894 | macros/latex-dev/base/graphpap.ins
-2020/10/28 | 2894 | macros/latex-dev/base/fix-cm.ins
-2020/10/28 | 2892 | macros/latex-dev/base/alltt.ins
-2020/10/28 | 2890 | macros/latex-dev/base/ifthen.ins
-2020/10/28 | 286 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/italian-gost.lbx
-2020/10/28 | 286 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-inline-min.cbx
-2020/10/28 | 286071 | macros/latex-dev/required/graphics/graphics.pdf
-2020/10/28 | 28592 | systems/texlive/tlnet/archive/l3experimental.r56785.tar.xz
-2020/10/28 | 28576533 | install/macros/latex-dev/latex-base-dev.tds.zip
-2020/10/28 | 283318 | macros/latex-dev/base/ltnews20.pdf
-2020/10/28 | 28125178 | macros/latex-dev/base.zip
-2020/10/28 | 277 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-authoryear-min.bbx
-2020/10/28 | 277 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-alphabetic-min.bbx
-2020/10/28 | 274695 | macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo.pdf
-2020/10/28 | 274459 | macros/latex-dev/base/ltnews23.pdf
-2020/10/28 | 2738 | macros/latex-dev/base/tex2.txt
-2020/10/28 | 2733 | macros/latex-dev/base/ltpageno.dtx
-2020/10/28 | 2726 | macros/latex-dev/required/amsmath/README.md
-2020/10/28 | 271 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-numeric-min.bbx
-2020/10/28 | 27131 | macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo/demo-appendix.jpg
-2020/10/28 | 27124 | macros/latex-dev/base/ltxcheck.tex
-2020/10/28 | 2706 | macros/latex-dev/base/idx.tex
-2020/10/28 | 269 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-inline-min.bbx
-2020/10/28 | 2691 | macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamercolorthemefocus.sty
-2020/10/28 | 264505 | macros/latex-dev/base/cmfonts.pdf
-2020/10/28 | 2643533 | install/macros/latex-dev/required/latex-amsmath-dev.tds.zip
-2020/10/28 | 263 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-numeric.cbx
-2020/10/28 | 263761 | macros/latex-dev/required/graphics/drivers.pdf
-2020/10/28 | 262059 | macros/latex-dev/base/fix-cm.pdf
-2020/10/28 | 2613351 | macros/latex-dev/required/amsmath.zip
-2020/10/28 | 2586980 | systems/win32/w32tex/tex4htk-w32.tar.xz
-2020/10/28 | 2578 | macros/latex-dev/required/tools/multicol.ins
-2020/10/28 | 254169 | macros/latex-dev/required/tools/tabularx.pdf
-2020/10/28 | 2540 | macros/latex-dev/required/tools/longtable.ins
-2020/10/28 | 2540 | macros/latex-dev/required/tools/afterpage.ins
-2020/10/28 | 2537 | macros/latex-dev/required/tools/tabularx.ins
-2020/10/28 | 2533 | macros/latex-dev/required/tools/varioref.ins
-2020/10/28 | 2533746 | install/macros/latex-dev/required/latex-graphics-dev.tds.zip
-2020/10/28 | 2526 | macros/latex-dev/required/tools/bm.ins
-2020/10/28 | 252645 | macros/latex-dev/base/ltnews24.pdf
-2020/10/28 | 2500496 | macros/latex-dev/required/graphics.zip
-2020/10/28 | 246917 | macros/latex-dev/required/tools/layout.pdf
-2020/10/28 | 24649 | macros/latex-dev/required/tools/trace.dtx
-2020/10/28 | 246195 | macros/latex-dev/base/latexrelease.pdf
-2020/10/28 | 245612 | macros/latex-dev/required/graphics/rotating.pdf
-2020/10/28 | 242771 | macros/latex-dev/required/tools/showkeys.pdf
-2020/10/28 | 2416 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/biblatex-gost.dbx
-2020/10/28 | 24016 | macros/latex-dev/base/lterror.dtx
-2020/10/28 | 239758 | macros/latex-dev/base/ltnews27.pdf
-2020/10/28 | 2382 | macros/latex/contrib/biblatex-contrib/biblatex-gost/doc/ltxdockit.cfg
-2020/10/28 | 237978 | macros/latex-dev/required/tools/xspace.pdf
-2020/10/28 | 23652 | macros/latex-dev/base/ltnews30.tex
-2020/10/28 | 23521 | macros/latex-dev/base/fix-cm.dtx
-2020/10/28 | 235073 | macros/latex-dev/base/ltnews19.pdf
-2020/10/28 | 23386 | macros/latex-dev/base/lppl.tex
-2020/10/28 | 233492 | macros/latex-dev/base/ltnews21.pdf
-2020/10/28 | 232 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-authoryear-min.cbx
-2020/10/28 | 232 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-alphabetic-min.cbx
-2020/10/28 | 232390 | macros/latex-dev/base/latexchanges.pdf
-2020/10/28 | 231066 | macros/latex-dev/required/graphics/graphicx.pdf
-2020/10/28 | 229842 | macros/latex-dev/base/ltnews33.pdf
-2020/10/28 | 226 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-numeric-min.cbx
-2020/10/28 | 226 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-footnote.cbx
-2020/10/28 | 22676 | macros/latex-dev/base/ltcounts.dtx
-2020/10/28 | 22605 | macros/latex-dev/required/amsmath/diffs-m.txt
-2020/10/28 | 225887 | macros/latex-dev/required/amsmath/amsmath.dtx
-2020/10/28 | 22457 | macros/latex-dev/base/cfgguide.tex
-2020/10/28 | 2226 | macros/latex-dev/required/tools/indentfirst.dtx
-2020/10/28 | 222527 | macros/latex-dev/required/graphics/keyval.pdf
-2020/10/28 | 220388 | macros/latex-dev/base/modguide.pdf
-2020/10/28 | 220217 | macros/latex-dev/base/cfgguide.pdf
-2020/10/28 | 216997 | macros/latex-dev/base/cyrguide.pdf
-2020/10/28 | 216877 | macros/latex-dev/base/proc.pdf
-2020/10/28 | 215102 | macros/latex-dev/base/ltxdoc.pdf
-2020/10/28 | 214710 | macros/latex-dev/base/slifonts.pdf
-2020/10/28 | 212721 | macros/latex-dev/required/tools/trace.pdf
-2020/10/28 | 20994 | macros/latex-dev/required/graphics/rotating.dtx
-2020/10/28 | 2092 | macros/latex-dev/required/graphics/README.md
-2020/10/28 | 20700 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/russian-gost.lbx
-2020/10/28 | 20568 | systems/texlive/tlnet/archive/l3packages.r56785.tar.xz
-2020/10/28 | 205213 | macros/latex-dev/base/ifthen.pdf
-2020/10/28 | 2050458 | systems/win32/w32tex/texinstwin.zip
-2020/10/28 | 20471 | macros/latex-dev/base/ltnews.cls
-2020/10/28 | 2045 | macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerfontthemefocus.sty
-2020/10/28 | 20434 | macros/latex-dev/base/lgc2.err
-2020/10/28 | 204016 | macros/latex-dev/base/doc.dtx
-2020/10/28 | 202451 | macros/latex-dev/base/nfssfont.pdf
-2020/10/28 | 200892 | macros/latex-dev/required/graphics/color.pdf
-2020/10/28 | 1999 | macros/latex/contrib/biblatex-contrib/biblatex-gost/README.md
-2020/10/28 | 199218 | macros/latex-dev/required/tools/dcolumn.pdf
-2020/10/28 | 199047 | macros/latex-dev/required/tools/enumerate.pdf
-2020/10/28 | 196326 | macros/latex-dev/base/ltnews25.pdf
-2020/10/28 | 195877 | macros/latex-dev/base/exscale.pdf
-2020/10/28 | 194257 | macros/latex-dev/required/amsmath/amstext.pdf
-2020/10/28 | 1938 | macros/latex-dev/base/minimal.cls
-2020/10/28 | 1936 | macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerthemefocus.sty
-2020/10/28 | 192297 | macros/latex-dev/base/latexsym.pdf
-2020/10/28 | 191692 | macros/latex-dev/required/graphics/trig.pdf
-2020/10/28 | 191527 | macros/latex-dev/base/ltx3info.pdf
-2020/10/28 | 19064 | macros/latex-dev/base/ltxdoc.dtx
-2020/10/28 | 19040 | macros/latex-dev/base/lppl.txt
-2020/10/28 | 189 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-alphabetic.cbx
-2020/10/28 | 189846 | macros/latex-dev/required/tools/afterpage.pdf
-2020/10/28 | 18941 | macros/latex-dev/base/ltnews29.tex
-2020/10/28 | 18407 | macros/latex-dev/base/nfssfont.dtx
-2020/10/28 | 183426 | macros/latex-dev/required/tools/delarray.pdf
-2020/10/28 | 18305 | macros/latex-dev/base/ifthen.dtx
-2020/10/28 | 18300 | macros/latex-dev/base/ltx3info.tex
-2020/10/28 | 182355 | macros/latex-dev/required/tools/multicol.dtx
-2020/10/28 | 181372 | macros/latex-dev/base/syntonly.pdf
-2020/10/28 | 180 | macros/latex-dev/base/ltfilehook-doc.tex
-2020/10/28 | 179 | macros/latex-dev/base/ltshipout-doc.tex
-2020/10/28 | 179676 | macros/latex-dev/required/tools/fileerr.pdf
-2020/10/28 | 17862 | macros/latex-dev/required/tools/xspace.dtx
-2020/10/28 | 1781628 | systems/texlive/tlnet/archive/l3packages.doc.r56785.tar.xz
-2020/10/28 | 177 | macros/latex-dev/base/lthooks-doc.tex
-2020/10/28 | 175673 | macros/latex-dev/required/tools/hhline.pdf
-2020/10/28 | 175629 | macros/latex-dev/base/ltoutput.dtx
-2020/10/28 | 174 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-authoryear-min.dbx
-2020/10/28 | 174 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-alphabetic-min.dbx
-2020/10/28 | 17496 | macros/latex-dev/base/cyrguide.tex
-2020/10/28 | 173079 | macros/latex-dev/base/alltt.pdf
-2020/10/28 | 172 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-footnote-min.dbx
-2020/10/28 | 172216 | macros/latex-dev/base/tlc2.err
-2020/10/28 | 171 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-numeric-min.dbx
-2020/10/28 | 171724 | systems/texlive/tlnet/archive/babel.r56784.tar.xz
-2020/10/28 | 17106 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-inline.cbx
-2020/10/28 | 170 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-inline-min.dbx
-2020/10/28 | 170 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-authoryear.dbx
-2020/10/28 | 170 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-alphabetic.dbx
-2020/10/28 | 170214 | macros/latex-dev/base/docstrip.dtx
-2020/10/28 | 169765 | macros/latex-dev/required/tools/shellesc.pdf
-2020/10/28 | 1694 | macros/latex-dev/base/small2e.tex
-2020/10/28 | 168 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-footnote.dbx
-2020/10/28 | 167 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-numeric.dbx
-2020/10/28 | 166 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-inline.dbx
-2020/10/28 | 1666 | macros/latex-dev/required/tools/README.md
-2020/10/28 | 165745 | macros/latex-dev/required/amsmath/amscd.pdf
-2020/10/28 | 164972 | macros/latex/contrib/biblatex-contrib/biblatex-gost/doc/biblatex-gost.tex
-2020/10/28 | 164947 | macros/latex-dev/base/tlc2.pdf
-2020/10/28 | 164345 | macros/latex-dev/required/amsmath/amsgen.pdf
-2020/10/28 | 163607 | macros/latex-dev/required/tools/xr.pdf
-2020/10/28 | 16234 | macros/latex-dev/base/modguide.tex
-2020/10/28 | 162269 | macros/latex-dev/required/graphics/rotex.pdf
-2020/10/28 | 161324 | macros/latex-dev/required/amsmath/amsbsy.pdf
-2020/10/28 | 1612 | systems/texlive/tlnet/archive/flippdf.r56782.tar.xz
-2020/10/28 | 161065 | macros/latex-dev/base/ltnews13.pdf
-2020/10/28 | 1607 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-numeric.bbx
-2020/10/28 | 160667 | macros/latex-dev/base/makeindx.pdf
-2020/10/28 | 15737 | macros/latex-dev/required/graphics/cat.eps
-2020/10/28 | 157181 | macros/latex-dev/base/ltnews05.pdf
-2020/10/28 | 15701 | macros/latex-dev/base/slifonts.fdd
-2020/10/28 | 156546 | macros/latex-dev/base/tulm.pdf
-2020/10/28 | 156506 | macros/latex-dev/required/tools/somedefs.pdf
-2020/10/28 | 156277 | macros/latex-dev/base/graphpap.pdf
-2020/10/28 | 15623 | macros/latex-dev/base/ltxref.dtx
-2020/10/28 | 155735 | macros/latex-dev/base/classes.dtx
-2020/10/28 | 155732 | systems/texlive/tlnet/archive/l3kernel.r56785.tar.xz
-2020/10/28 | 154479 | macros/latex-dev/required/graphics/epsfig.pdf
-2020/10/28 | 15430 | macros/latex-dev/required/graphics/graphics-2017-06-25.sty
-2020/10/28 | 1532144 | macros/latex-dev/base/encguide.pdf
-2020/10/28 | 151347 | macros/latex-dev/base/manual.pdf
-2020/10/28 | 150907 | macros/latex-dev/base/ltnews14.pdf
-2020/10/28 | 150801 | macros/latex-dev/base/lthooks.dtx
-2020/10/28 | 150615 | macros/latex-dev/required/graphics/lscape.pdf
-2020/10/28 | 150020 | macros/latex-dev/base/ltnews01.pdf
-2020/10/28 | 149840 | systems/texlive/tlnet/archive/flippdf.doc.r56782.tar.xz
-2020/10/28 | 149838 | macros/latex-dev/base/ltnews17.pdf
-2020/10/28 | 14918 | macros/latex-dev/base/source2e.tex
-2020/10/28 | 14892 | macros/latex-dev/base/ltnews28.tex
-2020/10/28 | 1480 | macros/latex-dev/required/amsmath/amsmath.ins
-2020/10/28 | 147946 | macros/latex-dev/base/ltnews10.pdf
-2020/10/28 | 1468 | macros/latex-dev/required/amsmath/amsxtra.ins
-2020/10/28 | 1468 | macros/latex-dev/required/amsmath/amstext.ins
-2020/10/28 | 1466 | macros/latex-dev/required/amsmath/amsopn.ins
-2020/10/28 | 1466 | macros/latex-dev/required/amsmath/amsgen.ins
-2020/10/28 | 1466 | macros/latex-dev/required/amsmath/amsbsy.ins
-2020/10/28 | 1464 | macros/latex-dev/required/amsmath/amscd.ins
-2020/10/28 | 14575 | macros/latex-dev/required/graphics/rotex.tex
-2020/10/28 | 145163 | macros/latex-dev/base/ltoutenc.dtx
-2020/10/28 | 144 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-footnote-min.bbx
-2020/10/28 | 144779 | macros/latex-dev/required/tools/indentfirst.pdf
-2020/10/28 | 144482 | macros/latex-dev/base/ltnews08.pdf
-2020/10/28 | 14440 | macros/latex-dev/base/ltbibl.dtx
-2020/10/28 | 14421 | macros/latex-dev/base/lppl-1-2.txt
-2020/10/28 | 14341 | macros/latex-dev/base/lppl-1-1.txt
-2020/10/28 | 14078 | macros/latex-dev/required/tools/afterpage.dtx
-2020/10/28 | 138219 | macros/latex-dev/base/lb2.pdf
-2020/10/28 | 1381 | macros/latex-dev/base/legal.txt
-2020/10/28 | 138027 | macros/latex-dev/required/tools/fontsmpl.pdf
-2020/10/28 | 13799 | macros/latex-dev/required/graphics/keyval.dtx
-2020/10/28 | 137919 | macros/latex-dev/base/ltnews12.pdf
-2020/10/28 | 1370039 | fonts/algolrevived.zip
-2020/10/28 | 136 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-footnote.bbx
-2020/10/28 | 136159 | macros/latex-dev/base/webcomp.pdf
-2020/10/28 | 135688 | macros/latex-dev/required/tools/rawfonts.pdf
-2020/10/28 | 134751 | macros/latex-dev/base/ltnews02.pdf
-2020/10/28 | 134742 | macros/latex-dev/base/ltnews03.pdf
-2020/10/28 | 13449 | macros/latex-dev/required/amsmath/amsgen.dtx
-2020/10/28 | 1342 | macros/latex-dev/base/ltnews18.tex
-2020/10/28 | 133138 | macros/latex-dev/base/ltnews06.pdf
-2020/10/28 | 13305 | macros/latex-dev/base/proc.dtx
-2020/10/28 | 1327 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-inline.bbx
-2020/10/28 | 130687 | macros/latex-dev/base/ltnews16.pdf
-2020/10/28 | 130600 | macros/latex-dev/required/amsmath/technote.pdf
-2020/10/28 | 12946 | macros/latex-dev/base/manual.err
-2020/10/28 | 129155 | macros/latex-dev/required/amsmath/amsopn.pdf
-2020/10/28 | 128772 | macros/latex-dev/base/ltnews04.pdf
-2020/10/28 | 12715 | macros/latex-dev/required/tools/dcolumn.dtx
-2020/10/28 | 125830 | macros/latex-dev/base/lppl.pdf
-2020/10/28 | 125675 | macros/latex-dev/required/tools/array.dtx
-2020/10/28 | 12560 | macros/latex-dev/required/tools/array-2020-02-10.sty
-2020/10/28 | 12521 | macros/latex-dev/base/testpage.tex
-2020/10/28 | 124029 | macros/latex-dev/base/ltnews07.pdf
-2020/10/28 | 1226 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-alphabetic.bbx
-2020/10/28 | 122389 | macros/latex-dev/base/ltclass.dtx
-2020/10/28 | 12225 | macros/latex-dev/base/ltnews24.tex
-2020/10/28 | 122092 | macros/latex-dev/base/ltnews15.pdf
-2020/10/28 | 12120 | macros/latex-dev/base/tulm.fdd
-2020/10/28 | 12057 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/biblatex-gost.def
-2020/10/28 | 120222 | macros/latex-dev/base/ltnews09.pdf
-2020/10/28 | 12005 | macros/latex-dev/required/amsmath/technote.tex
-2020/10/28 | 119856 | systems/texlive/tlnet/archive/marathi.doc.r56781.tar.xz
-2020/10/28 | 11758 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-authoryear.bbx
-2020/10/28 | 11750 | macros/latex-dev/required/tools/array-2016-10-06.sty
-2020/10/28 | 11591 | macros/latex-dev/base/ltpage.dtx
-2020/10/28 | 11512 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-authoryear.cbx
-2020/10/28 | 114212 | macros/latex-dev/required/tools/varioref.dtx
-2020/10/28 | 11405 | macros/latex-dev/required/amsmath/amstext.dtx
-2020/10/28 | 1133 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/american-gost.lbx
-2020/10/28 | 11291 | macros/latex-dev/required/amsmath/amscd.dtx
-2020/10/28 | 1128 | macros/latex-dev/required/graphics/graphics.ins
-2020/10/28 | 11154 | macros/latex-dev/required/tools/hhline.dtx
-2020/10/28 | 1100 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/british-gost.lbx
-2020/10/28 | 1098 | macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/english-gost.lbx
-2020/10/28 | 10777 | macros/latex-dev/required/tools/fontsmpl.dtx
-2020/10/28 | 10698 | macros/latex-dev/base/ltnews26.tex
-2020/10/28 | 106914 | macros/latex-dev/base/inputenc.dtx
-2020/10/28 | 10690 | macros/latex-dev/base/manifest.txt
-2020/10/28 | 10688 | macros/latex-dev/base/ltnews23.tex
-2020/10/28 | 10669 | macros/latex-dev/base/ltnews22.tex
-2020/10/28 | 10651 | macros/latex-dev/required/graphics/trig.dtx
-2020/10/28 | 10650 | macros/latex-dev/required/tools/enumerate.dtx
-2020/10/28 | 10606 | macros/latex-dev/base/makeindx.dtx
-2020/10/28 | 1060432 | macros/latex/contrib/biblatex-contrib/biblatex-gost.zip
-2020/10/28 | 105 | macros/latex-dev/base/ltfilehook-code.tex
-2020/10/28 | 104 | macros/latex-dev/base/ltshipout-code.tex
-2020/10/28 | 104936 | macros/latex-dev/base/ltnews11.pdf
-2020/10/28 | 104677 | macros/latex-dev/required/amsmath/amsldoc.tex
-2020/10/28 | 104545 | macros/latex-dev/required/amsmath/amsxtra.pdf
-2020/10/28 | 10376 | macros/latex-dev/base/ltfsscmp.dtx
-2020/10/28 | 10364 | macros/latex-dev/base/ltvers.dtx
-2020/10/28 | 102 | macros/latex-dev/base/lthooks-code.tex
-2020/10/28 | 101343 | macros/latex-dev/base/lgc2.pdf
-2020/10/28 | 101293 | macros/latex-dev/required/amsmath/subeqn.pdf
-2020/10/28 | 10105100 | systems/texlive/tlnet/archive/l3kernel.doc.r56785.tar.xz
-2020/10/28 | 10053 | macros/latex-dev/base/webcomp.err
-2020/10/28 | 10045 | macros/latex-dev/base/ltexpl.dtx
-2020/10/28 | 10024 | macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerouterthemefocus.sty
diff --git a/language/greek/greek-fontenc/Makefile b/language/greek/greek-fontenc/Makefile
index 05fd97cdfd..5472c479a9 100644
--- a/language/greek/greek-fontenc/Makefile
+++ b/language/greek/greek-fontenc/Makefile
@@ -22,7 +22,7 @@ SH = sh
# programs
PYLIT = pylit # text <-> source converter for literal programming
RST2HTML = rst2html5 # text -> HTML converter, see docutils.sf.net
-RUBBER = rubber -f # wrapper around `latex`, run until references resolved
+RUBBER = rubber -f --pdf -m hyperref # wrapper around `latex`, run until references resolved
LATEX = pdflatex -interaction batchmode
# LaTeX source files
@@ -70,17 +70,14 @@ lgr2licr.lua: lgr2licr.lua.txt
doc: html pdf
-html: greek-fontenc.html tuenc-greek.def.html greek-fontenc.def.html \
- lgrenc.def.html textalpha.sty.html alphabeta.sty.html \
+html: greek-fontenc.html lgrenc.def.html puenc-greek.def.html \
+ tuenc-greek.def.html greek-fontenc.def.html \
+ textalpha.sty.html alphabeta.sty.html \
alphabeta-tuenc.def.html alphabeta-lgr.def.html lgr2licr.lua.html
greek-fontenc.html: README
$(RST2HTML) README greek-fontenc.html
-tuenc-greek.def.html: tuenc-greek.def
- $(PYLIT) tuenc-greek.def
- $(RST2HTML) tuenc-greek.def.txt tuenc-greek.def.html
-
greek-fontenc.def.html: greek-fontenc.def
$(PYLIT) greek-fontenc.def
$(RST2HTML) greek-fontenc.def.txt greek-fontenc.def.html
@@ -89,6 +86,14 @@ lgrenc.def.html: lgrenc.def
$(PYLIT) lgrenc.def
$(RST2HTML) lgrenc.def.txt lgrenc.def.html
+tuenc-greek.def.html: tuenc-greek.def
+ $(PYLIT) tuenc-greek.def
+ $(RST2HTML) tuenc-greek.def.txt tuenc-greek.def.html
+
+puenc-greek.def.html: puenc-greek.def
+ $(PYLIT) puenc-greek.def
+ $(RST2HTML) puenc-greek.def.txt puenc-greek.def.html
+
textalpha.sty.html: textalpha.sty
$(PYLIT) textalpha.sty
$(RST2HTML) textalpha.sty.txt textalpha.sty.html
@@ -112,34 +117,43 @@ lgr2licr.lua.html: lgr2licr.lua
# User documentation
# ==================
-pdf: alphabeta-doc.pdf diacritics.pdf tuenc-greek-doc.pdf greekhyperref.pdf \
- lgrenc-test.pdf textalpha-doc.pdf
+pdf: alphabeta-doc.pdf alphabeta-tu.pdf diacritics.pdf \
+ textalpha-doc.pdf textalpha-tu.pdf hyperref-with-greek.pdf \
+ test-inputenc.pdf test-lgrenc.pdf test-tuenc-greek.pdf
-TEXTALPHA = textalpha.sty greek-fontenc.def
+TEXTALPHA = textalpha.sty greek-fontenc.def lgrenc.def tuenc-greek.def puenc-greek.def
ALPHABETA = $(TEXTALPHA) alphabeta.sty
-lgrenc-test.pdf: lgrenc-test.tex lgrenc.def greek-fontenc.def
- $(LATEX) lgrenc-test.tex
-
-tuenc-greek-doc.pdf: tuenc-greek-doc.tex tuenc-greek.def greek-fontenc.def
- $(RUBBER) -m xelatex tuenc-greek-doc.tex
+alphabeta-doc.pdf: alphabeta-doc.tex $(ALPHABETA)
+ $(RUBBER) alphabeta-doc.tex
-textalpha-doc.pdf: textalpha-doc.tex lgrenc.def $(TEXTALPHA)
- $(LATEX) textalpha-doc.tex
+alphabeta-tu.pdf: alphabeta-doc.tex $(ALPHABETA)
+ $(RUBBER) -m xelatex --jobname=alphabeta-tu alphabeta-doc.tex
-alphabeta-doc.pdf: alphabeta-doc.tex $(ALPHABETA) lgrenc.def
- $(LATEX) alphabeta-doc.tex
+textalpha-doc.pdf: textalpha-doc.tex $(TEXTALPHA)
+ $(RUBBER) textalpha-doc.tex
-alphabeta-doc-tuenc.pdf: alphabeta-doc.tex $(ALPHABETA) tuenc-greek.def
- $(RUBBER) -m xelatex alphabeta-doc.tex
- mv alphabeta-doc.pdf alphabeta-doc-tuenc.pdf
-
-greekhyperref.pdf: greekhyperref.tex $(ALPHABETA) lgrenc.def
- $(LATEX) greekhyperref.tex
+textalpha-tu.pdf: textalpha-doc.tex lgrenc.def $(TEXTALPHA)
+ $(RUBBER) -m xelatex --jobname=textalpha-tu textalpha-doc.tex
diacritics.pdf: diacritics.tex lgrenc.def greek-fontenc.def
$(LATEX) diacritics.tex
+hyperref-with-greek.pdf: hyperref-with-greek.tex $(ALPHABETA)
+ $(RUBBER) hyperref-with-greek.tex
+
+test-lgrenc.pdf: test-lgrenc.tex lgrenc.def greek-fontenc.def
+ $(LATEX) test-lgrenc.tex
+
+test-tuenc-greek.pdf: test-tuenc-greek.tex tuenc-greek.def greek-fontenc.def
+ $(RUBBER) -m xelatex test-tuenc-greek.tex
+
+test-inputenc.pdf: test-inputenc.tex $(TEXTALPHA)
+ $(RUBBER) test-inputenc.tex
+
+test-inputenc-tu.pdf: test-inputenc.tex lgrenc.def $(TEXTALPHA)
+ $(RUBBER) -m lualatex --jobname=test-inputenc-tu test-inputenc.tex
+
# Installation
# ------------
@@ -164,5 +178,5 @@ install-doc: doc
.PHONY: clean
clean:
- rm -f *.aux *.log *.toc *~
+ rm -f *.aux *.log *.toc *.out *~
diff --git a/language/greek/greek-fontenc/README b/language/greek/greek-fontenc/README
index fe1ffd9a64..bd6c0ce0cd 100644
--- a/language/greek/greek-fontenc/README
+++ b/language/greek/greek-fontenc/README
@@ -14,24 +14,21 @@ Greek font encoding definition files
under both, 8-bit TeX and XeTeX/LuaTeX. Use cases are macro
definitions and generated text
- This package provides `Greek LICR macros`_ and encoding
- definition files for `Greek text font encodings`_ for use with
- fontenc_ (8-bit TeX) or fontspec_ (XeTeX/LuaTeX).
+ This bundle provides LICR macros for characters from the
+ Greek script and encoding definition files for
+ `Greek text font encodings`_ for use with fontenc_ (8-bit TeX)
+ or fontspec_ (XeTeX/LuaTeX).
Included are also the LaTeX packages textalpha_ and alphabeta_.
-.. note:: The LICR macro names for Greek symbols are chosen pending
- endorsement by the TeX community and related packages.
-
- Names for archaic characters, accents/diacritics, and
- punctuation may change in future versions.
+.. contents::
Changelog
=========
.. class:: borderless
-====== =========== ==========================================================
+====== =========== ===========================================================
0.9 2013-07-03 greek-fontenc.def_ "outsourced" from lgrxenc.def
.. experimental files xunicode-greek.sty and
greek-euenc.def: LICRs for XeTeX/LuaTeX.
@@ -73,7 +70,18 @@ Changelog
``\encodingdefault``.
.. ``\textKoppa`` as alias for ``\textkoppa`` in LGR.
.. Update URLs.
-====== =========== ==========================================================
+2.0 2020-10-30 Move common alias definitions to ``greek-fontenc.def``.
+.. `textalpha`_ loads TU with Xe/LuaTeX by default and
+ provides ``\textmicro`` and LICR macros for archaic
+ symbols from the Greek and Coptic Unicode block.
+.. Use ``\UnicodeEncodingName`` (by the LaTeX kernel) instead
+ of ``\UTFencname`` for the Unicode font encoding name.
+.. Replace utf8 literals in ``tuenc-greek.def``.
+.. New file puenc-greek.def: setup for PU encoding
+ (defined by hyperref_ for PDF strings).
+.. Don't use ``\textcompwordmark`` as base in accent commands.
+.. Documentation update.
+====== =========== ===========================================================
__ http://tex.stackexchange.com/questions/281631/greek-small-rho-with-dasia-and-also-psili-problem-with-accent-and-lgr-encodin
.. _ltxbugs 4399:
@@ -83,25 +91,33 @@ __ http://tex.stackexchange.com/questions/281631/greek-small-rho-with-dasia-and-
TeX files
=========
-`<greek-fontenc.def>`_
- `Common Greek font encoding definitions <greek-fontenc.def.html>`_.
-
-`<greek-euenc.def>`_
- Backwards compatibility file loading tuenc-greek_.
-
-.. _LGR font encoding definition file:
-
`<lgrenc.def>`_
`LGR Greek font encoding definitions <lgrenc.def.html>`_.
This file is the successor of the basic LGR encoding definition file which
comes with babel_'s Greek support and the now obsolete lgrx_ bundle.
+ .. _tuenc-greek:
+
+`<tuenc-greek.def>`_
+ `Font setup for Greek with XeTeX/LuaTeX <tuenc-greek.def.html>`_.
+
+`<puenc-greek.def>`_
+ `Greek LICR definitions for PDF strings <puenc-greek.def.html>`_.
+
+`<greek-fontenc.def>`_
+ `Common Greek font encoding definitions <greek-fontenc.def.html>`_.
+
+ .. _LGR font encoding definition file:
+
+`<greek-euenc.def>`_
+ Backwards compatibility file loading tuenc-greek_.
+
.. _textalpha:
`<textalpha.sty>`_
`Greek symbols in text <textalpha.sty.html>`_
-
+
Use ``\textalpha`` ... ``\textOmega`` independent of font encoding and TeX
engine.
@@ -109,18 +125,17 @@ TeX files
`<alphabeta.sty>`_
`Greek symbols in text and math <alphabeta.sty.html>`_.
-
+
Use ``\alpha`` ... ``\Omega`` independent of text/math mode, font
encoding, and TeX engine.
-
-`<alphabeta-tuenc.def>`_
- `Composite definitions with XeTeX/LuaTeX. <alphabeta-tuenc.def.html>`_.
- .. _tuenc-greek:
+ `<alphabeta-lgr.def>`_
+ `Composite definitions for 8-bit TeX. <alphabeta-lgr.def.html>`_.
+
+ `<alphabeta-tuenc.def>`_
+ `Composite definitions with XeTeX/LuaTeX. <alphabeta-tuenc.def.html>`_.
-`<tuenc-greek.def>`_
- `Font setup for Greek with XeTeX/LuaTeX <tuenc-greek.def.html>`_.
Literate source files were converted with PyLit_ to reStructuredText_ and
with Docutils_ to the HTML documentation.
@@ -129,23 +144,30 @@ with Docutils_ to the HTML documentation.
Documentation and test documents
================================
-`textalpha` package documentation:
- `<textalpha-doc.tex>`__, `<textalpha-doc.pdf>`_
+Overview:
+ `<README>`__, `<greek-fontenc.html>`_
+
+textalpha_ package documentation:
+ `<textalpha-doc.tex>`__, `<textalpha-doc.pdf>`_, `<textalpha-tu.pdf>`_
-`alphabeta` package documentation:
- `<alphabeta-doc.tex>`__ `<alphabeta-doc.pdf>`_
+alphabeta_ package documentation:
+ `<alphabeta-doc.tex>`__, `<alphabeta-doc.pdf>`_, `<alphabeta-tu.pdf>`_
-Test and usage example
- `<lgrenc-test.tex>`_, `<lgrenc-test.pdf>`_
+LGR test and usage example
+ `<test-lgrenc.tex>`_, `<test-lgrenc.pdf>`_
-Font setup for Greek with XeTeX/LuaTeX
- `<tuenc-greek-doc.tex>`_, `<tuenc-greek-doc.pdf>`_
+TU test and usage example
+ `<test-tuenc-greek.tex>`_, `<test-tuenc-greek.pdf>`_
-Greek script in PDF metadata
- `<greekhyperref.tex>`_, `<greekhyperref.pdf>`_
+Hyperref_ test and usage example
+ `<hyperref-with-greek.tex>`_, `<hyperref-with-greek.pdf>`_
+
+Test with input encodings other than utf-8
+ `<test-inputenc.tex>`_, `<test-inputenc.pdf>`_
+
+Greek diacritics with standard accent macros
+ `<diacritics.tex>`_, `<diacritics.pdf>`_
- The package hyperref_ defines the PU font encoding which also supports
- (monotonic) Greek.
Experimental files
==================
@@ -161,7 +183,7 @@ with other packages or removed in future versions:
Installation
============
-If possible, get this package from your distribution using its installation
+If possible, get the bundle from your distribution using its installation
manager.
Otherwise, make sure LaTeX can find the package and definition files:
@@ -186,18 +208,25 @@ Usage
=====
There are several alternatives to set up the support for a Greek font
-encoding provided by this package, e.g.:
+encoding provided by this bundle, e.g.:
+
+Babel:
+ Use the ``greek`` option with Babel_::
+
+ \usepackage[greek]{babel}
+
+ This automatically loads ``lgrenc.def`` with 8-bit TeX and
+ ``tuenc-greek.def`` with XeTeX/LuaTeX and provides localized auto-strings,
+ hyphenation and other localizations (see babel-greek_).
+
+ Babel can be used together with textalpha_ or alphabeta_.
textalpha_:
Ensure support for Greek characters in text mode::
\usepackage{textalpha}
- eventually with the normalize-symbols_ option to handle `symbol
- variants`_ ::
-
- \usepackage[normalize-symbols]{textalpha}
-
+ eventually with the normalize-symbols_ option to handle `symbol variants`_
and/or the keep-semicolon_ option to use the `semicolon as erotimatiko`_
also in LGR ::
@@ -206,7 +235,7 @@ textalpha_:
This sets up LICR macros for Greek text charactes under both, 8-bit TeX
and Xe-/LuaTeX.
For details see `<textalpha-doc.tex>`_ and `<textalpha-doc.pdf>`_ (8-bit
- TeX) as well as `<tuenc-greek-doc.tex>`_ and `<tuenc-greek-doc.pdf>`_
+ TeX) as well as `<test-tuenc-greek.tex>`_ and `<test-tuenc-greek.pdf>`_
(XeTeX/LuaTeX).
.. _normalize-symbols: textalpha.sty.html#normalize-symbols
@@ -221,17 +250,6 @@ alphabeta_:
For details see `<alphabeta-doc.tex>`_ and `<alphabeta-doc.pdf>`_.
-Babel:
- Use the ``greek`` option with Babel_::
-
- \usepackage[greek]{babel}
-
- This automatically loads ``lgrenc.def`` with 8-bit TeX and
- ``tuenc-greek.def`` with XeTeX/LuaTeX and provides localized auto-strings,
- hyphenation and other localizations (see babel-greek_).
-
- Babel can be used together with textalpha_ or alphabeta_.
-
fontenc:
Declare LGR via fontenc_. For example, specify T1 (8-bit
Latin) as default font encoding and LGR for Greek with ::
@@ -240,11 +258,11 @@ fontenc:
Note that without textalpha_ or alphabeta_, Greek text macros work
only if the current font encoding supports Greek. See [fntguide]_ for
- details and `<lgrenc-test.tex>`_ for an example.
+ details and `<test-lgrenc.tex>`_ for an example.
It is possible to use 8-bit Greek text fonts in the LGR TeX font encoding
also with XeTeX/LuaTeX, if the fontenc_ package is loaded before
- fontspec_ and textalpha_ or alphabeta_, e.g. ::
+ Babel, textalpha_, or alphabeta_, e.g. ::
\usepackage[LGR]{fontenc}
\usepackage{fontspec}
@@ -252,8 +270,8 @@ fontenc:
\setsansfont{Linux Biolinum O}
\usepackage{textalpha}
- See `<tuenc-greek-doc.tex>`_, `<tuenc-greek-doc.pdf>`_ and
- `<lgrenc-test.tex>`_, `<lgrenc-test.pdf>`_.
+ See `<test-tuenc-greek.tex>`_, `<test-tuenc-greek.pdf>`_ and
+ `<test-lgrenc.tex>`_, `<test-lgrenc.pdf>`_.
.. _arabi workaround:
@@ -281,7 +299,7 @@ Greek text font encodings
Greek TeX font encodings are the envisaged T7_, LGR_, and LGI_.
Greek letters and symbols are also defined in the Unicode-based font
-encodings TU_, `EU1, EU2`_, and PU (hyperref_).
+encodings TU_, and PU_.
T7
--
@@ -291,7 +309,6 @@ However, up to now, there is no agreement on an implementation because the
restrictions for general text encodings are too severe for typesetting
polytonic Greek.
-
LGR
---
@@ -332,8 +349,8 @@ TU
--
Standard Unicode font encoding for XeTeX and LuaTeX loaded by fontspec_
-(since v2.5a). `greek-fontenc` adds support for the Greek script (see
-tuenc-greek_).
+(since v2.5a) rsp. the LaTeX kernel since 2017/01/01 [LaTeX2e News Issue 26]_.
+`greek-fontenc` adds support for the Greek script (see tuenc-greek_).
Xe/LuaTeX works with any system-wide installed `OpenType font`_. Suitable
fonts supporting Greek include `CM Unicode`_, `Deja Vu`_, `EB Garamond`_,
@@ -342,17 +359,38 @@ Tempora_, and `UM Typewriter`_ (all available on CTAN) but also many commercial
fonts. Unfortunately, the fontspec_ default, `Latin Modern`_ misses most
Greek characters.
-EU1, EU2
---------
+XeTeX uses the Unicode NFC normalization, so that combining characters
+are merged with the base character if a pre-composed character exists. This
+results in better looking output for characters with multiple diacritics.
+Unfortunately, LuaTeX does not apply the NFC normalization. This leads to
+suboptimal placing of some diactritics, especially the sub-iota (becoming
+unintelligable in combination with small letter eta).
+
+TODO: The `lua-uni-algos`_ package may be helpfull to implement a NTC
+normalization to Greek text in LuaTeX.
+
+The legacy Unicode font encodings EU1 and EU2 for XeTeX and LuaTeX
+respectively were superseded by TU in the 2017 fontspec_ release.
+
+PU
+--
+
+The package hyperref_ defines the PU font encoding for use in PDF strings
+(ToC, bookmarks) which supports monotonic Greek. `greek-fontenc` adds
+support for polytonic Greek and some archaic characters also supported in
+LGR and TU (see `<hyperref-with-greek.tex>`_, `<hyperref-with-greek.pdf>`_).
-Legacy Unicode font encodings for XeTeX and LuaTeX respectively. Superseded
-by TU_.
+Selecting Greek LICR macro names
+================================
-Greek LICR macros
-=================
+.. note:: The LICR macro names for Greek symbols are chosen pending
+ endorsement by the TeX community and related packages.
-This package provides LaTeX internal character representations (LICR macros)
+ Names for archaic characters, accents/diacritics, and
+ punctuation may change in future versions.
+
+This bundle provides LaTeX internal character representations (LICR macros)
for Greek letters and diacritics. Macro names were selected based on the
following considerations:
@@ -493,7 +531,7 @@ characters:
References
-----------
+==========
An alternative, more complete set of short mnemonic character names is
the `XML Entity Definitions for Characters`_ W3C Recommendation from
@@ -506,11 +544,6 @@ Syropoulos and ``xl-lgr.enc`` from the libertine_ (legacy) package.
A full set of ``\text*`` symbol macros is defined in ``ucsencs.def``
from the ucs_ package.
-Aliases from ``puenc.def`` ensure that the hyperref_ package can convert
-Greek text in "LICR encoding" to a PDF-string (utf-8 encoded input is used
-as-is).
-
-
.. [fntguide] LaTeX3 Project Team, `LaTeX2ε font selection`, 2005.
http://mirror.ctan.org/macros/latex/base/fntguide.pdf
.. [encguide] Frank Mittelbach, Robin Fairbairns, Werner Lemberg,
@@ -524,7 +557,8 @@ as-is).
.. [teubner-doc] Claudio Beccari, ``teubner.sty``
`An extension to the greek option of the babel package`, 2011.
http://mirror.ctan.org/macros/latex/contrib/teubner/teubner-doc.pdf
-
+.. [LaTeX2e News Issue 26]
+ https://www.latex-project.org/news/latex2e-news/ltnews26.pdf
.. [babel-patch] Werner Lemberg, `Unicode support for the Greek LGR
encoding` Εὔτυπον, τεῦχος № 20, 2008.
http://www.eutypon.gr/eutypon/pdf/e2008-20/e20-a03.pdf
@@ -569,6 +603,7 @@ as-is).
.. _ibygrk: http://www.ctan.org/pkg/ibygrk
.. _lgrx: http://www.ctan.org/pkg/lgrx
.. _libertine: http://www.ctan.org/pkg/libertine-legacy
+.. _lua-uni-algos: https://ctan.org/pkg/lua-uni-algos
.. _substitutefont: http://www.ctan.org/pkg/substitutefont
.. _tempora: https://www.ctan.org/pkg/tempora
.. _teubner: http://www.ctan.org/pkg/teubner
diff --git a/language/greek/greek-fontenc/alphabeta-doc.pdf b/language/greek/greek-fontenc/alphabeta-doc.pdf
index a696c0ca3a..987bc06e23 100644
--- a/language/greek/greek-fontenc/alphabeta-doc.pdf
+++ b/language/greek/greek-fontenc/alphabeta-doc.pdf
Binary files differ
diff --git a/language/greek/greek-fontenc/alphabeta-doc.tex b/language/greek/greek-fontenc/alphabeta-doc.tex
index 4a69d5a464..618713a127 100644
--- a/language/greek/greek-fontenc/alphabeta-doc.tex
+++ b/language/greek/greek-fontenc/alphabeta-doc.tex
@@ -14,13 +14,20 @@
\documentclass{article}
\usepackage[unicode,colorlinks=true,linkcolor=blue]{hyperref}
-\usepackage{bookmark}
+% \usepackage{bookmark}
\hypersetup{colorlinks=true,linkcolor=blue,urlcolor=blue,pdfencoding=auto}
% \usepackage{parskip}
-\usepackage{amsmath}
+\usepackage{amssymb, amsmath}
\frenchspacing
-\newcommand{\setupUnicodeFonts}{
+\ifdefined \UnicodeEncodingName % set by LaTeX for Unicode-aware engines
+ \ifdefined\XeTeXrevision
+ \newcommand{\engine}{XeTeX}
+ \fi
+ \ifdefined\luatexversion
+ \newcommand{\engine}{LuaTeX}
+ \fi
+ % Setup for Unicode fonts (Xe-/LuaTeX)
\usepackage[no-math,tuenc]{fontspec}
\setmainfont{Linux Libertine O}
\setsansfont{Linux Biolinum O}
@@ -28,8 +35,10 @@
\usepackage[libertine,slantedGreek]{newtxmath}
% \usepackage{unicode-math} % package conflict
\newcommand{\fontset}{fontspec with Unicode fonts}
-}
-\newcommand{\setupTeXFonts}{
+\else
+ \newcommand{\engine}{8-bit TeX}
+ \usepackage[utf8]{inputenc}
+ \DeclareUnicodeCharacter{03DE}{\textKoppa} % in LGR mapped to \textkoppa
\usepackage[LGR,T1]{fontenc}
\usepackage{textcomp}
\usepackage{lmodern}
@@ -41,18 +50,7 @@
% \substitutefont{LGR}{\rmdefault}{artemisia}
\usepackage{isomath}
\newcommand{\fontset}{fontenc with TeX fonts}
-}
-\ifdefined\XeTeXrevision
- \newcommand{\engine}{XeTeX}
- \setupUnicodeFonts
-\else\ifdefined\luatexversion
- \newcommand{\engine}{LuaTeX}
- \setupUnicodeFonts
-\else
- \newcommand{\engine}{8-bit TeX}
- \usepackage[utf8]{inputenc}
- \setupTeXFonts
-\fi\fi
+\fi
% load alphabeta after math setup and encoding setup!
% \usepackage{alphabeta}[2015/08/08]
@@ -60,12 +58,13 @@
% Fallback macros:
+\newcommand*{\missing}{\ensuremath{\oslash}}
% varstigma only defined with 8-bit LGR fonts
-\providecommand*{\varstigma}{$\oslash$}
-% varkappa, only defined with newtxmath, other var... only with unicode-math
-\providecommand*{\varkappa}{\oslash}
-\providecommand*{\varbeta}{\oslash}
-\providecommand*{\varTheta}{\oslash}
+\ProvideTextCommandDefault{\textvarstigma}{\missing}
+% varkappa, only defined with newtxmath
+\providecommand*{\varkappa}{\missing}
+% varbeta and varTheta only defined with unicode-math
+\providecommand*{\varbeta}{\missing}
% print current font encoding:
\makeatletter
@@ -76,6 +75,7 @@
\title{The \emph{alphabeta} package}
\author{Günter Milde}
+\date{2020/10/30}
\maketitle
\begin{abstract}\noindent
@@ -87,11 +87,24 @@ the characters are taken from the text or math font.
With 8-bit TeX and
\emph{\href{http://www.ctan.org/pkg/greek-inputenc}{greek-inputenc}},
literal Unicode charactes can also be used in mathematical mode.
+\footnote{
+ This document was compiled using the \href{https://ctan.org/pkg/encguide}%
+ {font encoding} \encodingdefault{}
+ \ifdefined \UTFencname % defined by fontspec
+ (Unicode fonts).
+ For a version using 8-bit fonts, see
+ \href{alphabeta-doc.pdf}{alphabeta-doc.pdf}.
+ \else
+ (8-bit fonts).
+ For a version using Unicode fonts, see
+ \href{alphabeta-tu.pdf}{alphabeta-tu.pdf}.
+ \fi
+}
\end{abstract}
% \tableofcontents
-\section{Requirements}
+\section{Requirements and Conflicts}
The \emph{alphabeta} package depends on
\emph{\href{textalpha-doc.pdf}{textalpha}} (both are part of
@@ -143,14 +156,14 @@ usage example.
\subsection{options}
-Package options are passed to the \href{alphabeta-doc.pdf}{\emph{alphabeta}}
+Package options are passed to the \href{textalpha-doc.pdf}{\emph{textalpha}}
package. Example call with options:
\begin{verbatim}
\usepackage[normalize-symbols,keep-semicolon]{alphabeta}
\end{verbatim}
-\texttt{normalize-symbols} merges ``letters'' and ``symbol`` variants of
+\texttt{normalize-symbols} merges ``letter'' and ``symbol`` variants of
some Greek letters to the ``letter'' character:
\footnote{The normalize-symbols option was added in version 0.13 (2015-08-03).
Unicode input of the symbol variants requires at least version~1.6
@@ -165,8 +178,9 @@ symbol variants may be important (e.g. in a mathematical or scientific
context). Use XeTeX/LuaTeX with Unicode fonts or the respective characters
in mathematical mode (e.g. $\pi$ vs. $\varpi$).
-The option \texttt{keep-semicolon} prevents conversion of the semicolon to
-an \emph{ano teleia} (see \emph{\href{textalpha-doc.pdf}{textalpha-doc}}).
+The option \texttt{keep-semicolon} prevents conversion of the
+semicolon to an \emph{ano teleia} in 8-bit TeX
+(see \emph{\href{textalpha-doc.pdf}{textalpha-doc}}).
\subsection{symbol variants}
@@ -179,10 +193,10 @@ Unicode defines separate code points for the symbol variants. TeX supports
some of the variant shape symbols in mathematical mode, but its concept of
“standard” vs. “variant” symbols differs from the distinction between
“GREEK LETTER ...” vs. “GREEK ... SYMBOL” in the Unicode standard.
-See \href{tuenc-greek-doc.pdf}{tuenc-greek-doc}.
The \emph{alphabeta} package defines generic macros for these variants that
-are short forms of the set defined in \texttt{tuenc-greek.def}:
+are short forms of the set defined in \texttt{tuenc-greek.def}
+(cf. \href{test-tuenc-greek.pdf}{test-tuenc-greek}):
\begin{quote}
\verb|\<name>| selects the Unicode GREEK LETTER ... variant,
@@ -199,6 +213,9 @@ See Table \ref{tab:symbol-variant-macros} for the full list.
With 8-bit TeX, the limitations described in the
\href{textalpha-doc.pdf}{textalpha documentation} apply. See also the tests
in section \hyperref[sec:8-bit-limitations]{8 bit limitations}.
+These limitations are lifted, if the text language is switched to ``greek''
+with Babel, the text part is wrapped in \verb+\ensuregreek+, or the
+document is compiled with XeTeX/LuaTeX.
With XeTeX/LuaTeX and Unicode fonts, literal Unicode characters cannot be
used in formulas (the log file reports missing characters) This is a generic
@@ -213,7 +230,7 @@ However, \emph{unicode-math} conflicts with \emph{alphabeta}.
\subsection{Greek alphabet}
Greek letters via generic ``name'' macros without language/font-encoding
-switch:
+switch (active font encoding \encodingdefault):
\begin{quote}
\Alpha{} \Beta{} \Gamma{} \Delta{} \Epsilon{} \Zeta{} \Eta{} \Theta{}
@@ -225,19 +242,23 @@ switch:
\sigma{} \varsigma{} \tau{} \upsilon{} \phi{} \chi{} \psi{} \omega{}
\\
\digamma{} \Digamma{} \stigma{} \varstigma{}%
- \footnote{There is no separate Unicode code point for a stigma variant
- symbol, \texttt{\textbackslash varstigma} is not defined with
- Xe/LuaTeX and similar to \texttt{\textbackslash stigma} in some fonts.}
- \koppa{} \qoppa{} \Qoppa{}
- \Stigma{} \Sampi{} \sampi{}
+ \footnote{There is no separate Unicode code point for a stigma variant
+ symbol, \texttt{\textbackslash varstigma} is not defined with
+ Xe/LuaTeX and similar to \texttt{\textbackslash stigma} in some fonts.}
+ \koppa{} \Koppa{}%
+ \footnote{In LGR, there is no separate code point for Koppa as
+ typographical practice normally does not observe a
+ contrast between uppercase and lowercase forms for numeric koppa.}
+ % https://en.wikipedia.org/wiki/Koppa_(letter)
+ \qoppa{} \Qoppa{} \Stigma{} \Sampi{} \sampi{}
\end{quote}
%
-Greek letters via Unicode input without language/font-encoding switch:
+Greek letters via Unicode (active font encoding \encodingdefault):
\begin{quote}
Α Β Γ Δ Ε Ζ Η Θ Ι Κ Λ Μ Ν Ξ Ο Π Ρ Σ Τ Υ Φ Χ Ψ Ω\\
α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ ς τ υ φ χ ψ ω\\
- ϝ Ϝ ϛ ϟ ϙ Ϙ Ϛ Ϡ ϡ
+ ϝ Ϝ ϛ ϟ Ϟ ϙ Ϙ Ϛ Ϡ ϡ
\end{quote}
\subsection{Diacritics}
@@ -270,9 +291,9 @@ variants of some Greek letters to the ``letter'' character. It is ignored,
if the document uses Unicode fonts and is compiled with XeTeX or LuaTeX.
(This document is compiled using \engine.)
\begin{quote}
- This quote uses both variants for beta (β|ϐ), theta (θ|ϑ), phi (φ|ϕ), pi
- (π|ϖ), kappa (κ|ϰ), rho (ρ|ϱ), Theta (Θ|ϴ), and epsilon (ε|ϵ) in the LaTeX
- source.%
+ The source of this quote uses both variants for beta (β|ϐ),
+ epsilon (ε|ϵ), phi (φ|ϕ), kappa (κ|ϰ), pi (π|ϖ), rho (ρ|ϱ), theta (θ|ϑ),
+ and Theta (Θ|ϴ) in the LaTeX source.%
\end{quote}
@@ -284,22 +305,23 @@ With the alphabeta package, you get Greek letters in both, the document body
and PDF metadata generated by hyperref if the input uses Unicode literals or
macros. Wrapping in \verb+\ensuregreek+ ensures the right placement of the
accents and breathings (before, not above capital letters). With LICR input
-(accent macros + symbol macros), non-standard diacritics are missing in the
-PDF data, as hyperref's PU encoding currently does not support polytonic
-Greek. (Here, the dasia is dropped at the start of the word in parentheses in
-the PDF toc. The warning ``\texttt{Glyph not defined in PU encoding,
-removing `\textbackslash<' on input line 145.}'' is written to the log.)
+(accent macros as well as symbol macros), non-standard diacritics are
+missing in the PDF data, as hyperref's PU encoding currently does not
+support polytonic Greek. (Here, the dasia is dropped at the start of the
+word in parentheses in the PDF toc. The warning ``\texttt{Glyph not defined
+in PU encoding, removing `\textbackslash<' on input line 145.}'' is written
+to the log.)
-\subsection{Greek in math $\Gamma = \sin\alpha / \cos{\beta}$}
+\subsection{Greek in maths $\Gamma = \sin\alpha / \cos{\beta}$}
In the main document, Greek in math mode should work as usual:
\[\Gamma = \frac{\sin\alpha}{\cos{\beta}}.
\]
-
-Greek letters and symbols in math input as macro (there are no math macros
-for Greek letters wich exist with similar shape in the Latin alphabet):
+Greek letters and symbols in math input as macro:%
+\footnote{There are no math macros for Greek letters wich exist with similar
+shape in the Latin alphabet}
\begin{align*}
&
% \Alpha{} \Beta{}
@@ -327,7 +349,7 @@ for Greek letters wich exist with similar shape in the Latin alphabet):
\\&
\vartheta \varphi \varpi \digamma{} \varrho \varepsilon
\end{align*}
-
+%
PDF strings do not know math mode. The content of a formula or equation is
evaluated in text mode with non-valid commands discarded (and warnings
written to the log). This works resonably well for simple formulas (but not,
@@ -339,7 +361,7 @@ also for Greek letters.
With the \texttt{utf8} option of \emph{inputenc} and
\href{http://www.ctan.org/pkg/greek-inputenc}{\emph{greek-inputenc}},
literal Greek Unicode characters are supported also in
-mathematical mode:
+mathematical mode.
\ifdefined\DeclareUnicodeCharacter
\[
@@ -347,26 +369,22 @@ mathematical mode:
\]
Greek letters and symbols in math input as Unicode literals:
\begin{align*}
- & Γ ΔΘΛΞΠΣΥ ΦΨ Ω \\
+ & Γ ΔΘΛΞΠΣΥ ΦΨ Ω \\
& αβγδεζηθικλμνξπρσςτυφχψω \\
- & ϑϕϖϝϱϵ
+ & ϑϕϖϝϱϵ
\end{align*}
\fi
This does not work with XeTeX/LuaTeX (unless in 8-bit emulation mode).
-
-The ``normal'' vs. ``variant'' shape of phi and epsilon is inverted when using
-traditional makros or Unicode letter vs. symbol characters respectively.
-This is to keep backwards compatibility of the math macros as well
-as consistent input-output mapping for Unicode in text and math.
-It corresponds to the behaviour of
-\href{http://www.ctan.org/pkg/unicode-math}{\emph{unicode-math}}
-with the default option \texttt{vargreek-shape=TeX}.
+The ``normal'' vs. ``variant'' shape of letters is used so that the output
+matches the Unicode reference glyph (cf. Table
+\ref{tab:symbol-variant-macros}). This corresponds to the behaviour of
+\href{http://www.ctan.org/pkg/unicode-math}{\emph{unicode-math}}.
\subsection{8-bit limitations \label{sec:8-bit-limitations}}
-These limitations are lifted, if the document is compiled with XeTeX/LuaTeX.
+Certain limitations apply if Greek symbols are used in non-Greek context.
\begin{itemize}
@@ -390,16 +408,16 @@ These limitations are lifted, if the document is compiled with XeTeX/LuaTeX.
\item There is no kerning between Greek letters, if the font encoding does not
support Greek: compare \ensuregreek{\Alpha\Upsilon\Alpha{}
(\currentEncoding)} to \Alpha\Upsilon\Alpha{} (\currentEncoding).
- Because of this (and for proper hyphenation), use of the Babel package
- and correct language setting is recommended for Greek quotes.
-
\end{itemize}
-
+%
The \verb+\ensuregreek+ macro ensures that the argument is typeset with a
font encoding supporting Greek. This keeps kerning (if the kerning pair is
inside the argument, \ensuregreek{\Alpha\"\Upsilon\Alpha}), and allows
combining of accent macros where pre-composed characters are selected
(\ensuregreek{\<'\alpha}).
+Setting the corrct language for Greek quotes with the \emph{Babel} package
+additionally ensures correct hyphenation .
+
\begin{table}[bp]
\centering
@@ -407,17 +425,9 @@ combining of accent macros where pre-composed characters are selected
\hline
macro & text & math \\
\hline
- \verb$\pi$ & \pi & $\pi$ \\
- \verb$\varpi$ & \varpi & $\varpi$ \\
- \verb$\pisymbol$ & \pisymbol & $\pisymbol$ \\
- \hline
- \verb$\rho$ & \rho & $\rho$ \\
- \verb$\varrho$ & \varrho & $\varrho$ \\
- \verb$\rhosymbol$ & \rhosymbol & $\rhosymbol$ \\
- \hline
- \verb$\theta$ & \theta & $\theta$ \\
- \verb$\vartheta$ & \vartheta & $\vartheta$ \\
- \verb$\thetasymbol$ & \thetasymbol & $\thetasymbol$ \\
+ \verb$\beta$ & \beta & $\beta$ \\
+ \verb$\varbeta$ & \varbeta & $\varbeta$ \\
+ \verb$\betasymbol$ & \betasymbol & $\betasymbol$ \\
\hline
\verb$\epsilon$ & \epsilon & $\epsilon$ \\
\verb$\varepsilon$ & \varepsilon & $\varepsilon$ \\
@@ -427,23 +437,36 @@ combining of accent macros where pre-composed characters are selected
\verb$\varphi$ & \varphi & $\varphi$ \\
\verb$\phisymbol$ & \phisymbol & $\phisymbol$ \\
\hline
- \verb$\beta$ & \beta & $\beta$ \\
- \verb$\varbeta$ & \varbeta & $\varbeta$ \\
- \verb$\betasymbol$ & \betasymbol & $\betasymbol$ \\
- \hline
\verb$\kappa$ & \kappa & $\kappa$ \\
\verb$\varkappa$ & \varkappa & $\varkappa$ \\
- \verb$\kappasymbol$ & \kappasymbol & $\kappasymbol$\\
+ \verb$\kappasymbol$ & \kappasymbol & $\kappasymbol$ \\
+ \hline
+ \verb$\pi$ & \pi & $\pi$ \\
+ \verb$\varpi$ & \varpi & $\varpi$ \\
+ \verb$\pisymbol$ & \pisymbol & $\pisymbol$ \\
+ \hline
+ \verb$\rho$ & \rho & $\rho$ \\
+ \verb$\varrho$ & \varrho & $\varrho$ \\
+ \verb$\rhosymbol$ & \rhosymbol & $\rhosymbol$ \\
+ \hline
+ \verb$\sigma$ & \sigma & $\sigma$ \\
+ \verb$\varsigma$ & \varsigma & $\varsigma$ \\
+ \verb$\finalsigma$ & \finalsigma & $\finalsigma$ \\
+ \hline
+ \verb$\theta$ & \theta & $\theta$ \\
+ \verb$\vartheta$ & \vartheta & $\vartheta$ \\
+ \verb$\thetasymbol$ & \thetasymbol & $\thetasymbol$ \\
\hline
\verb$\Theta$ & \Theta & $\Theta$ \\
- \verb$\varTheta$ & & $\varTheta$ \\
- \verb$\Thetasymbol$ & \Thetasymbol & \\
+ \verb$\varTheta$ & \missing & $\varTheta$ \\
+ \verb$\Thetasymbol$ & \Thetasymbol & \missing \\
\hline
\end{tabular}
- \caption{Macros for Greek symbol variants ($\oslash$ = symbol missing).
- With 8-bit TeX and the \texttt{normalize-symbols} option, the output for
- both variants in text mode is the same (8-bit Greek text fonts contain
- only one symbol variant). \label{tab:symbol-variant-macros}}
+ \caption{Macros for Greek symbol variants (\missing = symbol only
+ available with additional packages).
+ With 8-bit TeX and the \texttt{normalize-symbols} option, the output for
+ both variants in text mode is the same (8-bit Greek text fonts contain
+ only one symbol variant). \label{tab:symbol-variant-macros}}
\end{table}
\end{document}
diff --git a/language/greek/greek-fontenc/alphabeta-lgr.def b/language/greek/greek-fontenc/alphabeta-lgr.def
index efdce493e0..e976eafd56 100644
--- a/language/greek/greek-fontenc/alphabeta-lgr.def
+++ b/language/greek/greek-fontenc/alphabeta-lgr.def
@@ -2,7 +2,7 @@
% ===================
% Composite definitions for 8-bit TeX
% ******************************************
-%
+%
% :Copyright: © 2014 Günter Milde
% :Licence: This work may be distributed and/or modified under the
% conditions of the `LaTeX Project Public License`_, either
@@ -11,27 +11,28 @@
% ::
\ProvidesFile{alphabeta-lgr}
-[2014/09/04 1.0 Composite definitions for 8-bit TeX]
+[2020/09/25 1.0 Composite definitions for 8-bit TeX]
% :Changelog:
% .. class:: borderless
-%
-% ========== ====== =======================================================
-% 2014-09-04 0.11.2 outsourced from ``alphabeta.sty``.
-% ========== ====== =======================================================
-%
+%
+% ====== ========== =====================================================
+% 0.11.2 2014-09-04 outsourced from ``alphabeta.sty``.
+% 1.0 2020-09-25 New package version. No changes in this file.
+% ====== ========== =====================================================
+%
% The alphabeta_ package re-defines the math macros for Greek letters to work
% in both, text and math mode, so that Greek letters can be specified with
% the established command names in text, too.
-%
+%
% The NFSS TextComposite mechanism looks for the next token without expanding
% it. In order to let compositions like ``\>"\alpha`` work as expected we
% define TextComposites with the `letter name commands`.
-%
+%
% This file expands the font encoding definitions in lgrenc.def_ with
% composite commands for use with 8-bit TeX fonts. It is sourced by
% alphabeta_ under 8-bit TeX (pdfTeX, eTeX, TeX).
-%
+%
% ::
\DeclareTextComposite{\accvaria}{LGR}{\alpha}{128}
@@ -182,7 +183,7 @@
% .. References
-%
+%
% .. _LaTeX Project Public License: http://www.latex-project.org/lppl.txt
% .. _alphabeta: alphabeta.sty.html
% .. _lgrenc.def: lgrenc.def.html
diff --git a/language/greek/greek-fontenc/alphabeta-lgr.def.html b/language/greek/greek-fontenc/alphabeta-lgr.def.html
index 4ce4aa4208..5aff2d5211 100644
--- a/language/greek/greek-fontenc/alphabeta-lgr.def.html
+++ b/language/greek/greek-fontenc/alphabeta-lgr.def.html
@@ -620,20 +620,24 @@ version 1.3 of this license or any later version.</p>
</dd>
<dt class="identification">Identification</dt>
<dd class="identification"><pre class="literal-block">\ProvidesFile{alphabeta-lgr}
-[2014/09/04 1.0 Composite definitions for 8-bit TeX]</pre>
+[2020/09/25 1.0 Composite definitions for 8-bit TeX]</pre>
</dd>
<dt class="changelog">Changelog</dt>
<dd class="changelog"><table class="borderless">
<colgroup>
+<col style="width: 9%" />
<col style="width: 14%" />
-<col style="width: 8%" />
<col style="width: 77%" />
</colgroup>
<tbody>
-<tr><td><p>2014-09-04</p></td>
-<td><p>0.11.2</p></td>
+<tr><td><p>0.11.2</p></td>
+<td><p>2014-09-04</p></td>
<td><p>outsourced from <span class="docutils literal">alphabeta.sty</span>.</p></td>
</tr>
+<tr><td><p>1.0</p></td>
+<td><p>2020-09-25</p></td>
+<td><p>New package version. No changes in this file.</p></td>
+</tr>
</tbody>
</table>
</dd>
diff --git a/language/greek/greek-fontenc/alphabeta-tu.pdf b/language/greek/greek-fontenc/alphabeta-tu.pdf
new file mode 100644
index 0000000000..2af317702c
--- /dev/null
+++ b/language/greek/greek-fontenc/alphabeta-tu.pdf
Binary files differ
diff --git a/language/greek/greek-fontenc/alphabeta-tuenc.def b/language/greek/greek-fontenc/alphabeta-tuenc.def
index 14305d563e..663f58c117 100644
--- a/language/greek/greek-fontenc/alphabeta-tuenc.def
+++ b/language/greek/greek-fontenc/alphabeta-tuenc.def
@@ -11,20 +11,23 @@
% ::
\ProvidesFile{alphabeta-tuenc}
-[2020/02/28 1.0 Composite definitions for XeTeX and LuaTeX]
+[2020/10/30 2.0 Composite definitions for XeTeX and LuaTeX]
% Composite definitions for ``alphabeta.sty`` with XeTeX and LuaTeX.
%
% Changelog:
% .. class:: borderless
%
-% ========== ====== ========================================================
-% 2013-09-12 0.1 initial version
-% 2013-10-01 0.1.1 remove clashing defs for legacy characters with oxia.
-% 2014-09-04 0.11.2 documentation update
-% 2020/02/28 0.14 rename to ``alphabeta-tuenc.def``,
-% use ``\UTFencname`` instead of ``\LastDeclaredEncoding``
-% ========== ====== ========================================================
+% ====== ========== ========================================================
+% 0.1 2013-09-12 initial version
+% 0.1.1 2013-10-01 remove clashing defs for legacy characters with oxia.
+% 0.11.2 2014-09-04 documentation update
+% 0.14 2020-02-28 rename to ``alphabeta-tuenc.def``,
+% use ``\UTFencname`` instead of ``\LastDeclaredEncoding``
+% 1.0 2020-09-25 New package version. No changes in this file.
+% 2.0 2020-10-30 Use ``\UnicodeEncodingName`` instead of ``\UTFencname``.
+% ====== ========== ========================================================
+%
%
% The alphabeta_ package re-defines the math macros for Greek letters to work
% in both, text and math mode, so that Greek letters can be specified with
@@ -42,28 +45,28 @@
% ~~~~~~~~~~~~~~~~
% ::
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\Alpha}{Ά}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\Epsilon}{Έ}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\Eta}{Ή}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\Iota}{Ί}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\Omicron}{Ό}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\Upsilon}{Ύ}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\Omega}{Ώ}
-\DeclareTextCompositeCommand{\accdialytikatonos}{\UTFencname}{\iota}{ΐ}
-
-\DeclareTextCompositeCommand{\"}{\UTFencname}{\Iota}{Ϊ}
-\DeclareTextCompositeCommand{\"}{\UTFencname}{\Upsilon}{Ϋ}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\alpha}{ά}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\epsilon}{έ}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\eta}{ή}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\iota}{ί}
-\DeclareTextCompositeCommand{\accdialytikatonos}{\UTFencname}{\upsilon}{ΰ}
-
-\DeclareTextCompositeCommand{\"}{\UTFencname}{\iota}{ϊ}
-\DeclareTextCompositeCommand{\"}{\UTFencname}{\upsilon}{ϋ}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\omicron}{ό}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\upsilon}{ύ}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\omega}{ώ}
+\DeclareTextCompositeCommand{\'}{\UnicodeEncodingName}{\Alpha}{Ά}
+\DeclareTextCompositeCommand{\'}{\UnicodeEncodingName}{\Epsilon}{Έ}
+\DeclareTextCompositeCommand{\'}{\UnicodeEncodingName}{\Eta}{Ή}
+\DeclareTextCompositeCommand{\'}{\UnicodeEncodingName}{\Iota}{Ί}
+\DeclareTextCompositeCommand{\'}{\UnicodeEncodingName}{\Omicron}{Ό}
+\DeclareTextCompositeCommand{\'}{\UnicodeEncodingName}{\Upsilon}{Ύ}
+\DeclareTextCompositeCommand{\'}{\UnicodeEncodingName}{\Omega}{Ώ}
+\DeclareTextCompositeCommand{\accdialytikatonos}{\UnicodeEncodingName}{\iota}{ΐ}
+
+\DeclareTextCompositeCommand{\"}{\UnicodeEncodingName}{\Iota}{Ϊ}
+\DeclareTextCompositeCommand{\"}{\UnicodeEncodingName}{\Upsilon}{Ϋ}
+\DeclareTextCompositeCommand{\'}{\UnicodeEncodingName}{\alpha}{ά}
+\DeclareTextCompositeCommand{\'}{\UnicodeEncodingName}{\epsilon}{έ}
+\DeclareTextCompositeCommand{\'}{\UnicodeEncodingName}{\eta}{ή}
+\DeclareTextCompositeCommand{\'}{\UnicodeEncodingName}{\iota}{ί}
+\DeclareTextCompositeCommand{\accdialytikatonos}{\UnicodeEncodingName}{\upsilon}{ΰ}
+
+\DeclareTextCompositeCommand{\"}{\UnicodeEncodingName}{\iota}{ϊ}
+\DeclareTextCompositeCommand{\"}{\UnicodeEncodingName}{\upsilon}{ϋ}
+\DeclareTextCompositeCommand{\'}{\UnicodeEncodingName}{\omicron}{ό}
+\DeclareTextCompositeCommand{\'}{\UnicodeEncodingName}{\upsilon}{ύ}
+\DeclareTextCompositeCommand{\'}{\UnicodeEncodingName}{\omega}{ώ}
% Greek Extended
@@ -71,170 +74,170 @@
% Postfix ypogegrammeni cannot be second part of composite defs.
% ::
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\alpha}{ἀ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\alpha}{ἁ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\alpha}{ἂ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\alpha}{ἃ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\alpha}{ἄ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\alpha}{ἅ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\alpha}{ἆ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\alpha}{ἇ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\Alpha}{Ἀ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\Alpha}{Ἁ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\Alpha}{Ἂ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\Alpha}{Ἃ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\Alpha}{Ἄ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\Alpha}{Ἅ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\Alpha}{Ἆ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\Alpha}{Ἇ}
-
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\epsilon}{ἐ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\epsilon}{ἑ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\epsilon}{ἒ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\epsilon}{ἓ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\epsilon}{ἔ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\epsilon}{ἕ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\Epsilon}{Ἐ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\Epsilon}{Ἑ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\Epsilon}{Ἒ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\Epsilon}{Ἓ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\Epsilon}{Ἔ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\Epsilon}{Ἕ}
-
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\eta}{ἠ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\eta}{ἡ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\eta}{ἢ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\eta}{ἣ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\eta}{ἤ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\eta}{ἥ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\eta}{ἦ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\eta}{ἧ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\Eta}{Ἠ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\Eta}{Ἡ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\Eta}{Ἢ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\Eta}{Ἣ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\Eta}{Ἤ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\Eta}{Ἥ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\Eta}{Ἦ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\Eta}{Ἧ}
-
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\iota}{ἰ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\iota}{ἱ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\iota}{ἲ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\iota}{ἳ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\iota}{ἴ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\iota}{ἵ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\iota}{ἶ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\iota}{ἷ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\Iota}{Ἰ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\Iota}{Ἱ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\Iota}{Ἲ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\Iota}{Ἳ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\Iota}{Ἴ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\Iota}{Ἵ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\Iota}{Ἶ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\Iota}{Ἷ}
-
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\omicron}{ὀ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\omicron}{ὁ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\omicron}{ὂ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\omicron}{ὃ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\omicron}{ὄ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\omicron}{ὅ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\Omicron}{Ὀ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\Omicron}{Ὁ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\Omicron}{Ὂ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\Omicron}{Ὃ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\Omicron}{Ὄ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\Omicron}{Ὅ}
-
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\upsilon}{ὐ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\upsilon}{ὑ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\upsilon}{ὒ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\upsilon}{ὓ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\upsilon}{ὔ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\upsilon}{ὕ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\upsilon}{ὖ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\upsilon}{ὗ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\Upsilon}{Ὑ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\Upsilon}{Ὓ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\Upsilon}{Ὕ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\Upsilon}{Ὗ}
-
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\omega}{ὠ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\omega}{ὡ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\omega}{ὢ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\omega}{ὣ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\omega}{ὤ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\omega}{ὥ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\omega}{ὦ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\omega}{ὧ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\Omega}{Ὠ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\Omega}{Ὡ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\Omega}{Ὢ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\Omega}{Ὣ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\Omega}{Ὤ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\Omega}{Ὥ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\Omega}{Ὦ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\Omega}{Ὧ}
-
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\alpha}{ὰ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\epsilon}{ὲ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\eta}{ὴ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\iota}{ὶ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\omicron}{ὸ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\upsilon}{ὺ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\omega}{ὼ}
-
-\DeclareTextCompositeCommand{\u}{\UTFencname}{\alpha}{ᾰ}
-\DeclareTextCompositeCommand{\=}{\UTFencname}{\alpha}{ᾱ}
-\DeclareTextCompositeCommand{\~}{\UTFencname}{\alpha}{ᾶ}
-\DeclareTextCompositeCommand{\accperispomeni}{\UTFencname}{\alpha}{ᾶ}
-\DeclareTextCompositeCommand{\u}{\UTFencname}{\Alpha}{Ᾰ}
-\DeclareTextCompositeCommand{\=}{\UTFencname}{\Alpha}{Ᾱ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\Alpha}{Ὰ}
-\DeclareTextCompositeCommand{\accvaria}{\UTFencname}{\Alpha}{Ὰ}
-
-\DeclareTextCompositeCommand{\~}{\UTFencname}{\eta}{ῆ}
-\DeclareTextCompositeCommand{\accperispomeni}{\UTFencname}{\eta}{ῆ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\Epsilon}{Ὲ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\Eta}{Ὴ}
-\DeclareTextCompositeCommand{\accvaria}{\UTFencname}{\Epsilon}{Ὲ}
-\DeclareTextCompositeCommand{\accvaria}{\UTFencname}{\Eta}{Ὴ}
-
-\DeclareTextCompositeCommand{\u}{\UTFencname}{\iota}{ῐ}
-\DeclareTextCompositeCommand{\=}{\UTFencname}{\iota}{ῑ}
-\DeclareTextCompositeCommand{\accdialytikavaria}{\UTFencname}{\iota}{ῒ}
-\DeclareTextCompositeCommand{\accdialytikaoxia}{\UTFencname}{\iota}{ΐ}
-\DeclareTextCompositeCommand{\~}{\UTFencname}{\iota}{ῖ}
-\DeclareTextCompositeCommand{\accperispomeni}{\UTFencname}{\iota}{ῖ}
-\DeclareTextCompositeCommand{\accdialytikaperispomeni}{\UTFencname}{\iota}{ῗ}
-\DeclareTextCompositeCommand{\u}{\UTFencname}{\Iota}{Ῐ}
-\DeclareTextCompositeCommand{\=}{\UTFencname}{\Iota}{Ῑ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\Iota}{Ὶ}
-\DeclareTextCompositeCommand{\accvaria}{\UTFencname}{\Iota}{Ὶ}
-
-\DeclareTextCompositeCommand{\u}{\UTFencname}{\upsilon}{ῠ}
-\DeclareTextCompositeCommand{\=}{\UTFencname}{\upsilon}{ῡ}
-\DeclareTextCompositeCommand{\accdialytikavaria}{\UTFencname}{\upsilon}{ῢ}
-\DeclareTextCompositeCommand{\accdialytikaoxia}{\UTFencname}{\upsilon}{ΰ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\rho}{ῤ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\rho}{ῥ}
-\DeclareTextCompositeCommand{\~}{\UTFencname}{\upsilon}{ῦ}
-\DeclareTextCompositeCommand{\accperispomeni}{\UTFencname}{\upsilon}{ῦ}
-\DeclareTextCompositeCommand{\accdialytikaperispomeni}{\UTFencname}{\upsilon}{ῧ}
-\DeclareTextCompositeCommand{\u}{\UTFencname}{\Upsilon}{Ῠ}
-\DeclareTextCompositeCommand{\=}{\UTFencname}{\Upsilon}{Ῡ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\Upsilon}{Ὺ}
-\DeclareTextCompositeCommand{\accvaria}{\UTFencname}{\Upsilon}{Ὺ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\Rho}{Ῥ}
-
-\DeclareTextCompositeCommand{\~}{\UTFencname}{\omega}{ῶ}
-\DeclareTextCompositeCommand{\accperispomeni}{\UTFencname}{\omega}{ῶ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\Omicron}{Ὸ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\Omega}{Ὼ}
-\DeclareTextCompositeCommand{\accvaria}{\UTFencname}{\Omicron}{Ὸ}
-\DeclareTextCompositeCommand{\accvaria}{\UTFencname}{\Omega}{Ὼ}
+\DeclareTextCompositeCommand{\accpsili}{\UnicodeEncodingName}{\alpha}{ἀ}
+\DeclareTextCompositeCommand{\accdasia}{\UnicodeEncodingName}{\alpha}{ἁ}
+\DeclareTextCompositeCommand{\accpsilivaria}{\UnicodeEncodingName}{\alpha}{ἂ}
+\DeclareTextCompositeCommand{\accdasiavaria}{\UnicodeEncodingName}{\alpha}{ἃ}
+\DeclareTextCompositeCommand{\accpsilioxia}{\UnicodeEncodingName}{\alpha}{ἄ}
+\DeclareTextCompositeCommand{\accdasiaoxia}{\UnicodeEncodingName}{\alpha}{ἅ}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UnicodeEncodingName}{\alpha}{ἆ}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UnicodeEncodingName}{\alpha}{ἇ}
+\DeclareTextCompositeCommand{\accpsili}{\UnicodeEncodingName}{\Alpha}{Ἀ}
+\DeclareTextCompositeCommand{\accdasia}{\UnicodeEncodingName}{\Alpha}{Ἁ}
+\DeclareTextCompositeCommand{\accpsilivaria}{\UnicodeEncodingName}{\Alpha}{Ἂ}
+\DeclareTextCompositeCommand{\accdasiavaria}{\UnicodeEncodingName}{\Alpha}{Ἃ}
+\DeclareTextCompositeCommand{\accpsilioxia}{\UnicodeEncodingName}{\Alpha}{Ἄ}
+\DeclareTextCompositeCommand{\accdasiaoxia}{\UnicodeEncodingName}{\Alpha}{Ἅ}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UnicodeEncodingName}{\Alpha}{Ἆ}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UnicodeEncodingName}{\Alpha}{Ἇ}
+
+\DeclareTextCompositeCommand{\accpsili}{\UnicodeEncodingName}{\epsilon}{ἐ}
+\DeclareTextCompositeCommand{\accdasia}{\UnicodeEncodingName}{\epsilon}{ἑ}
+\DeclareTextCompositeCommand{\accpsilivaria}{\UnicodeEncodingName}{\epsilon}{ἒ}
+\DeclareTextCompositeCommand{\accdasiavaria}{\UnicodeEncodingName}{\epsilon}{ἓ}
+\DeclareTextCompositeCommand{\accpsilioxia}{\UnicodeEncodingName}{\epsilon}{ἔ}
+\DeclareTextCompositeCommand{\accdasiaoxia}{\UnicodeEncodingName}{\epsilon}{ἕ}
+\DeclareTextCompositeCommand{\accpsili}{\UnicodeEncodingName}{\Epsilon}{Ἐ}
+\DeclareTextCompositeCommand{\accdasia}{\UnicodeEncodingName}{\Epsilon}{Ἑ}
+\DeclareTextCompositeCommand{\accpsilivaria}{\UnicodeEncodingName}{\Epsilon}{Ἒ}
+\DeclareTextCompositeCommand{\accdasiavaria}{\UnicodeEncodingName}{\Epsilon}{Ἓ}
+\DeclareTextCompositeCommand{\accpsilioxia}{\UnicodeEncodingName}{\Epsilon}{Ἔ}
+\DeclareTextCompositeCommand{\accdasiaoxia}{\UnicodeEncodingName}{\Epsilon}{Ἕ}
+
+\DeclareTextCompositeCommand{\accpsili}{\UnicodeEncodingName}{\eta}{ἠ}
+\DeclareTextCompositeCommand{\accdasia}{\UnicodeEncodingName}{\eta}{ἡ}
+\DeclareTextCompositeCommand{\accpsilivaria}{\UnicodeEncodingName}{\eta}{ἢ}
+\DeclareTextCompositeCommand{\accdasiavaria}{\UnicodeEncodingName}{\eta}{ἣ}
+\DeclareTextCompositeCommand{\accpsilioxia}{\UnicodeEncodingName}{\eta}{ἤ}
+\DeclareTextCompositeCommand{\accdasiaoxia}{\UnicodeEncodingName}{\eta}{ἥ}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UnicodeEncodingName}{\eta}{ἦ}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UnicodeEncodingName}{\eta}{ἧ}
+\DeclareTextCompositeCommand{\accpsili}{\UnicodeEncodingName}{\Eta}{Ἠ}
+\DeclareTextCompositeCommand{\accdasia}{\UnicodeEncodingName}{\Eta}{Ἡ}
+\DeclareTextCompositeCommand{\accpsilivaria}{\UnicodeEncodingName}{\Eta}{Ἢ}
+\DeclareTextCompositeCommand{\accdasiavaria}{\UnicodeEncodingName}{\Eta}{Ἣ}
+\DeclareTextCompositeCommand{\accpsilioxia}{\UnicodeEncodingName}{\Eta}{Ἤ}
+\DeclareTextCompositeCommand{\accdasiaoxia}{\UnicodeEncodingName}{\Eta}{Ἥ}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UnicodeEncodingName}{\Eta}{Ἦ}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UnicodeEncodingName}{\Eta}{Ἧ}
+
+\DeclareTextCompositeCommand{\accpsili}{\UnicodeEncodingName}{\iota}{ἰ}
+\DeclareTextCompositeCommand{\accdasia}{\UnicodeEncodingName}{\iota}{ἱ}
+\DeclareTextCompositeCommand{\accpsilivaria}{\UnicodeEncodingName}{\iota}{ἲ}
+\DeclareTextCompositeCommand{\accdasiavaria}{\UnicodeEncodingName}{\iota}{ἳ}
+\DeclareTextCompositeCommand{\accpsilioxia}{\UnicodeEncodingName}{\iota}{ἴ}
+\DeclareTextCompositeCommand{\accdasiaoxia}{\UnicodeEncodingName}{\iota}{ἵ}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UnicodeEncodingName}{\iota}{ἶ}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UnicodeEncodingName}{\iota}{ἷ}
+\DeclareTextCompositeCommand{\accpsili}{\UnicodeEncodingName}{\Iota}{Ἰ}
+\DeclareTextCompositeCommand{\accdasia}{\UnicodeEncodingName}{\Iota}{Ἱ}
+\DeclareTextCompositeCommand{\accpsilivaria}{\UnicodeEncodingName}{\Iota}{Ἲ}
+\DeclareTextCompositeCommand{\accdasiavaria}{\UnicodeEncodingName}{\Iota}{Ἳ}
+\DeclareTextCompositeCommand{\accpsilioxia}{\UnicodeEncodingName}{\Iota}{Ἴ}
+\DeclareTextCompositeCommand{\accdasiaoxia}{\UnicodeEncodingName}{\Iota}{Ἵ}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UnicodeEncodingName}{\Iota}{Ἶ}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UnicodeEncodingName}{\Iota}{Ἷ}
+
+\DeclareTextCompositeCommand{\accpsili}{\UnicodeEncodingName}{\omicron}{ὀ}
+\DeclareTextCompositeCommand{\accdasia}{\UnicodeEncodingName}{\omicron}{ὁ}
+\DeclareTextCompositeCommand{\accpsilivaria}{\UnicodeEncodingName}{\omicron}{ὂ}
+\DeclareTextCompositeCommand{\accdasiavaria}{\UnicodeEncodingName}{\omicron}{ὃ}
+\DeclareTextCompositeCommand{\accpsilioxia}{\UnicodeEncodingName}{\omicron}{ὄ}
+\DeclareTextCompositeCommand{\accdasiaoxia}{\UnicodeEncodingName}{\omicron}{ὅ}
+\DeclareTextCompositeCommand{\accpsili}{\UnicodeEncodingName}{\Omicron}{Ὀ}
+\DeclareTextCompositeCommand{\accdasia}{\UnicodeEncodingName}{\Omicron}{Ὁ}
+\DeclareTextCompositeCommand{\accpsilivaria}{\UnicodeEncodingName}{\Omicron}{Ὂ}
+\DeclareTextCompositeCommand{\accdasiavaria}{\UnicodeEncodingName}{\Omicron}{Ὃ}
+\DeclareTextCompositeCommand{\accpsilioxia}{\UnicodeEncodingName}{\Omicron}{Ὄ}
+\DeclareTextCompositeCommand{\accdasiaoxia}{\UnicodeEncodingName}{\Omicron}{Ὅ}
+
+\DeclareTextCompositeCommand{\accpsili}{\UnicodeEncodingName}{\upsilon}{ὐ}
+\DeclareTextCompositeCommand{\accdasia}{\UnicodeEncodingName}{\upsilon}{ὑ}
+\DeclareTextCompositeCommand{\accpsilivaria}{\UnicodeEncodingName}{\upsilon}{ὒ}
+\DeclareTextCompositeCommand{\accdasiavaria}{\UnicodeEncodingName}{\upsilon}{ὓ}
+\DeclareTextCompositeCommand{\accpsilioxia}{\UnicodeEncodingName}{\upsilon}{ὔ}
+\DeclareTextCompositeCommand{\accdasiaoxia}{\UnicodeEncodingName}{\upsilon}{ὕ}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UnicodeEncodingName}{\upsilon}{ὖ}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UnicodeEncodingName}{\upsilon}{ὗ}
+\DeclareTextCompositeCommand{\accdasia}{\UnicodeEncodingName}{\Upsilon}{Ὑ}
+\DeclareTextCompositeCommand{\accdasiavaria}{\UnicodeEncodingName}{\Upsilon}{Ὓ}
+\DeclareTextCompositeCommand{\accdasiaoxia}{\UnicodeEncodingName}{\Upsilon}{Ὕ}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UnicodeEncodingName}{\Upsilon}{Ὗ}
+
+\DeclareTextCompositeCommand{\accpsili}{\UnicodeEncodingName}{\omega}{ὠ}
+\DeclareTextCompositeCommand{\accdasia}{\UnicodeEncodingName}{\omega}{ὡ}
+\DeclareTextCompositeCommand{\accpsilivaria}{\UnicodeEncodingName}{\omega}{ὢ}
+\DeclareTextCompositeCommand{\accdasiavaria}{\UnicodeEncodingName}{\omega}{ὣ}
+\DeclareTextCompositeCommand{\accpsilioxia}{\UnicodeEncodingName}{\omega}{ὤ}
+\DeclareTextCompositeCommand{\accdasiaoxia}{\UnicodeEncodingName}{\omega}{ὥ}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UnicodeEncodingName}{\omega}{ὦ}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UnicodeEncodingName}{\omega}{ὧ}
+\DeclareTextCompositeCommand{\accpsili}{\UnicodeEncodingName}{\Omega}{Ὠ}
+\DeclareTextCompositeCommand{\accdasia}{\UnicodeEncodingName}{\Omega}{Ὡ}
+\DeclareTextCompositeCommand{\accpsilivaria}{\UnicodeEncodingName}{\Omega}{Ὢ}
+\DeclareTextCompositeCommand{\accdasiavaria}{\UnicodeEncodingName}{\Omega}{Ὣ}
+\DeclareTextCompositeCommand{\accpsilioxia}{\UnicodeEncodingName}{\Omega}{Ὤ}
+\DeclareTextCompositeCommand{\accdasiaoxia}{\UnicodeEncodingName}{\Omega}{Ὥ}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UnicodeEncodingName}{\Omega}{Ὦ}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UnicodeEncodingName}{\Omega}{Ὧ}
+
+\DeclareTextCompositeCommand{\`}{\UnicodeEncodingName}{\alpha}{ὰ}
+\DeclareTextCompositeCommand{\`}{\UnicodeEncodingName}{\epsilon}{ὲ}
+\DeclareTextCompositeCommand{\`}{\UnicodeEncodingName}{\eta}{ὴ}
+\DeclareTextCompositeCommand{\`}{\UnicodeEncodingName}{\iota}{ὶ}
+\DeclareTextCompositeCommand{\`}{\UnicodeEncodingName}{\omicron}{ὸ}
+\DeclareTextCompositeCommand{\`}{\UnicodeEncodingName}{\upsilon}{ὺ}
+\DeclareTextCompositeCommand{\`}{\UnicodeEncodingName}{\omega}{ὼ}
+
+\DeclareTextCompositeCommand{\u}{\UnicodeEncodingName}{\alpha}{ᾰ}
+\DeclareTextCompositeCommand{\=}{\UnicodeEncodingName}{\alpha}{ᾱ}
+\DeclareTextCompositeCommand{\~}{\UnicodeEncodingName}{\alpha}{ᾶ}
+\DeclareTextCompositeCommand{\accperispomeni}{\UnicodeEncodingName}{\alpha}{ᾶ}
+\DeclareTextCompositeCommand{\u}{\UnicodeEncodingName}{\Alpha}{Ᾰ}
+\DeclareTextCompositeCommand{\=}{\UnicodeEncodingName}{\Alpha}{Ᾱ}
+\DeclareTextCompositeCommand{\`}{\UnicodeEncodingName}{\Alpha}{Ὰ}
+\DeclareTextCompositeCommand{\accvaria}{\UnicodeEncodingName}{\Alpha}{Ὰ}
+
+\DeclareTextCompositeCommand{\~}{\UnicodeEncodingName}{\eta}{ῆ}
+\DeclareTextCompositeCommand{\accperispomeni}{\UnicodeEncodingName}{\eta}{ῆ}
+\DeclareTextCompositeCommand{\`}{\UnicodeEncodingName}{\Epsilon}{Ὲ}
+\DeclareTextCompositeCommand{\`}{\UnicodeEncodingName}{\Eta}{Ὴ}
+\DeclareTextCompositeCommand{\accvaria}{\UnicodeEncodingName}{\Epsilon}{Ὲ}
+\DeclareTextCompositeCommand{\accvaria}{\UnicodeEncodingName}{\Eta}{Ὴ}
+
+\DeclareTextCompositeCommand{\u}{\UnicodeEncodingName}{\iota}{ῐ}
+\DeclareTextCompositeCommand{\=}{\UnicodeEncodingName}{\iota}{ῑ}
+\DeclareTextCompositeCommand{\accdialytikavaria}{\UnicodeEncodingName}{\iota}{ῒ}
+\DeclareTextCompositeCommand{\accdialytikatonos}{\UnicodeEncodingName}{\iota}{ΐ}
+\DeclareTextCompositeCommand{\~}{\UnicodeEncodingName}{\iota}{ῖ}
+\DeclareTextCompositeCommand{\accperispomeni}{\UnicodeEncodingName}{\iota}{ῖ}
+\DeclareTextCompositeCommand{\accdialytikaperispomeni}{\UnicodeEncodingName}{\iota}{ῗ}
+\DeclareTextCompositeCommand{\u}{\UnicodeEncodingName}{\Iota}{Ῐ}
+\DeclareTextCompositeCommand{\=}{\UnicodeEncodingName}{\Iota}{Ῑ}
+\DeclareTextCompositeCommand{\`}{\UnicodeEncodingName}{\Iota}{Ὶ}
+\DeclareTextCompositeCommand{\accvaria}{\UnicodeEncodingName}{\Iota}{Ὶ}
+
+\DeclareTextCompositeCommand{\u}{\UnicodeEncodingName}{\upsilon}{ῠ}
+\DeclareTextCompositeCommand{\=}{\UnicodeEncodingName}{\upsilon}{ῡ}
+\DeclareTextCompositeCommand{\accdialytikavaria}{\UnicodeEncodingName}{\upsilon}{ῢ}
+\DeclareTextCompositeCommand{\accdialytikatonos}{\UnicodeEncodingName}{\upsilon}{ΰ}
+\DeclareTextCompositeCommand{\accpsili}{\UnicodeEncodingName}{\rho}{ῤ}
+\DeclareTextCompositeCommand{\accdasia}{\UnicodeEncodingName}{\rho}{ῥ}
+\DeclareTextCompositeCommand{\~}{\UnicodeEncodingName}{\upsilon}{ῦ}
+\DeclareTextCompositeCommand{\accperispomeni}{\UnicodeEncodingName}{\upsilon}{ῦ}
+\DeclareTextCompositeCommand{\accdialytikaperispomeni}{\UnicodeEncodingName}{\upsilon}{ῧ}
+\DeclareTextCompositeCommand{\u}{\UnicodeEncodingName}{\Upsilon}{Ῠ}
+\DeclareTextCompositeCommand{\=}{\UnicodeEncodingName}{\Upsilon}{Ῡ}
+\DeclareTextCompositeCommand{\`}{\UnicodeEncodingName}{\Upsilon}{Ὺ}
+\DeclareTextCompositeCommand{\accvaria}{\UnicodeEncodingName}{\Upsilon}{Ὺ}
+\DeclareTextCompositeCommand{\accdasia}{\UnicodeEncodingName}{\Rho}{Ῥ}
+
+\DeclareTextCompositeCommand{\~}{\UnicodeEncodingName}{\omega}{ῶ}
+\DeclareTextCompositeCommand{\accperispomeni}{\UnicodeEncodingName}{\omega}{ῶ}
+\DeclareTextCompositeCommand{\`}{\UnicodeEncodingName}{\Omicron}{Ὸ}
+\DeclareTextCompositeCommand{\`}{\UnicodeEncodingName}{\Omega}{Ὼ}
+\DeclareTextCompositeCommand{\accvaria}{\UnicodeEncodingName}{\Omicron}{Ὸ}
+\DeclareTextCompositeCommand{\accvaria}{\UnicodeEncodingName}{\Omega}{Ὼ}
% .. References
%
diff --git a/language/greek/greek-fontenc/alphabeta-tuenc.def.html b/language/greek/greek-fontenc/alphabeta-tuenc.def.html
index 9978e53b82..dfa7a48f5c 100644
--- a/language/greek/greek-fontenc/alphabeta-tuenc.def.html
+++ b/language/greek/greek-fontenc/alphabeta-tuenc.def.html
@@ -620,7 +620,7 @@ version 1.3 of this license or any later version.</p>
</dd>
<dt class="identification">Identification</dt>
<dd class="identification"><pre class="literal-block">\ProvidesFile{alphabeta-tuenc}
-[2020/02/28 1.0 Composite definitions for XeTeX and LuaTeX]</pre>
+[2020/10/30 2.0 Composite definitions for XeTeX and LuaTeX]</pre>
</dd>
</dl>
<p>Composite definitions for <span class="docutils literal">alphabeta.sty</span> with XeTeX and LuaTeX.</p>
@@ -628,28 +628,36 @@ version 1.3 of this license or any later version.</p>
<dt>Changelog:</dt>
<dd><table class="borderless">
<colgroup>
-<col style="width: 14%" />
<col style="width: 8%" />
+<col style="width: 14%" />
<col style="width: 78%" />
</colgroup>
<tbody>
-<tr><td><p>2013-09-12</p></td>
-<td><p>0.1</p></td>
+<tr><td><p>0.1</p></td>
+<td><p>2013-09-12</p></td>
<td><p>initial version</p></td>
</tr>
-<tr><td><p>2013-10-01</p></td>
-<td><p>0.1.1</p></td>
+<tr><td><p>0.1.1</p></td>
+<td><p>2013-10-01</p></td>
<td><p>remove clashing defs for legacy characters with oxia.</p></td>
</tr>
-<tr><td><p>2014-09-04</p></td>
-<td><p>0.11.2</p></td>
+<tr><td><p>0.11.2</p></td>
+<td><p>2014-09-04</p></td>
<td><p>documentation update</p></td>
</tr>
-<tr><td><p>2020/02/28</p></td>
-<td><p>0.14</p></td>
+<tr><td><p>0.14</p></td>
+<td><p>2020-02-28</p></td>
<td><p>rename to <span class="docutils literal"><span class="pre">alphabeta-tuenc.def</span></span>,
use <span class="docutils literal">\UTFencname</span> instead of <span class="docutils literal">\LastDeclaredEncoding</span></p></td>
</tr>
+<tr><td><p>1.0</p></td>
+<td><p>2020-09-25</p></td>
+<td><p>New package version. No changes in this file.</p></td>
+</tr>
+<tr><td><p>2.0</p></td>
+<td><p>2020-10-30</p></td>
+<td><p>Use <span class="docutils literal">\UnicodeEncodingName</span> instead of <span class="docutils literal">\UTFencname</span>.</p></td>
+</tr>
</tbody>
</table>
</dd>
@@ -665,196 +673,196 @@ composite commands for use with Unicode fonts. It is sourced by <a class="refere
under XeTeX/LuaTeX.</p>
<section id="greek-and-coptic">
<h2>Greek and Coptic</h2>
-<pre class="literal-block">\DeclareTextCompositeCommand{\'}{\UTFencname}{\Alpha}{Ά}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\Epsilon}{Έ}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\Eta}{Ή}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\Iota}{Ί}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\Omicron}{Ό}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\Upsilon}{Ύ}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\Omega}{Ώ}
-\DeclareTextCompositeCommand{\accdialytikatonos}{\UTFencname}{\iota}{ΐ}
-
-\DeclareTextCompositeCommand{\&quot;}{\UTFencname}{\Iota}{Ϊ}
-\DeclareTextCompositeCommand{\&quot;}{\UTFencname}{\Upsilon}{Ϋ}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\alpha}{ά}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\epsilon}{έ}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\eta}{ή}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\iota}{ί}
-\DeclareTextCompositeCommand{\accdialytikatonos}{\UTFencname}{\upsilon}{ΰ}
-
-\DeclareTextCompositeCommand{\&quot;}{\UTFencname}{\iota}{ϊ}
-\DeclareTextCompositeCommand{\&quot;}{\UTFencname}{\upsilon}{ϋ}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\omicron}{ό}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\upsilon}{ύ}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\omega}{ώ}</pre>
+<pre class="literal-block">\DeclareTextCompositeCommand{\'}{\UnicodeEncodingName}{\Alpha}{Ά}
+\DeclareTextCompositeCommand{\'}{\UnicodeEncodingName}{\Epsilon}{Έ}
+\DeclareTextCompositeCommand{\'}{\UnicodeEncodingName}{\Eta}{Ή}
+\DeclareTextCompositeCommand{\'}{\UnicodeEncodingName}{\Iota}{Ί}
+\DeclareTextCompositeCommand{\'}{\UnicodeEncodingName}{\Omicron}{Ό}
+\DeclareTextCompositeCommand{\'}{\UnicodeEncodingName}{\Upsilon}{Ύ}
+\DeclareTextCompositeCommand{\'}{\UnicodeEncodingName}{\Omega}{Ώ}
+\DeclareTextCompositeCommand{\accdialytikatonos}{\UnicodeEncodingName}{\iota}{ΐ}
+
+\DeclareTextCompositeCommand{\&quot;}{\UnicodeEncodingName}{\Iota}{Ϊ}
+\DeclareTextCompositeCommand{\&quot;}{\UnicodeEncodingName}{\Upsilon}{Ϋ}
+\DeclareTextCompositeCommand{\'}{\UnicodeEncodingName}{\alpha}{ά}
+\DeclareTextCompositeCommand{\'}{\UnicodeEncodingName}{\epsilon}{έ}
+\DeclareTextCompositeCommand{\'}{\UnicodeEncodingName}{\eta}{ή}
+\DeclareTextCompositeCommand{\'}{\UnicodeEncodingName}{\iota}{ί}
+\DeclareTextCompositeCommand{\accdialytikatonos}{\UnicodeEncodingName}{\upsilon}{ΰ}
+
+\DeclareTextCompositeCommand{\&quot;}{\UnicodeEncodingName}{\iota}{ϊ}
+\DeclareTextCompositeCommand{\&quot;}{\UnicodeEncodingName}{\upsilon}{ϋ}
+\DeclareTextCompositeCommand{\'}{\UnicodeEncodingName}{\omicron}{ό}
+\DeclareTextCompositeCommand{\'}{\UnicodeEncodingName}{\upsilon}{ύ}
+\DeclareTextCompositeCommand{\'}{\UnicodeEncodingName}{\omega}{ώ}</pre>
</section>
<section id="greek-extended">
<h2>Greek Extended</h2>
<p>Postfix ypogegrammeni cannot be second part of composite defs.</p>
-<pre class="literal-block">\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\alpha}{ἀ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\alpha}{ἁ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\alpha}{ἂ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\alpha}{ἃ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\alpha}{ἄ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\alpha}{ἅ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\alpha}{ἆ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\alpha}{ἇ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\Alpha}{Ἀ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\Alpha}{Ἁ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\Alpha}{Ἂ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\Alpha}{Ἃ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\Alpha}{Ἄ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\Alpha}{Ἅ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\Alpha}{Ἆ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\Alpha}{Ἇ}
-
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\epsilon}{ἐ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\epsilon}{ἑ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\epsilon}{ἒ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\epsilon}{ἓ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\epsilon}{ἔ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\epsilon}{ἕ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\Epsilon}{Ἐ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\Epsilon}{Ἑ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\Epsilon}{Ἒ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\Epsilon}{Ἓ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\Epsilon}{Ἔ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\Epsilon}{Ἕ}
-
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\eta}{ἠ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\eta}{ἡ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\eta}{ἢ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\eta}{ἣ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\eta}{ἤ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\eta}{ἥ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\eta}{ἦ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\eta}{ἧ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\Eta}{Ἠ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\Eta}{Ἡ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\Eta}{Ἢ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\Eta}{Ἣ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\Eta}{Ἤ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\Eta}{Ἥ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\Eta}{Ἦ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\Eta}{Ἧ}
-
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\iota}{ἰ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\iota}{ἱ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\iota}{ἲ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\iota}{ἳ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\iota}{ἴ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\iota}{ἵ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\iota}{ἶ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\iota}{ἷ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\Iota}{Ἰ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\Iota}{Ἱ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\Iota}{Ἲ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\Iota}{Ἳ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\Iota}{Ἴ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\Iota}{Ἵ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\Iota}{Ἶ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\Iota}{Ἷ}
-
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\omicron}{ὀ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\omicron}{ὁ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\omicron}{ὂ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\omicron}{ὃ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\omicron}{ὄ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\omicron}{ὅ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\Omicron}{Ὀ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\Omicron}{Ὁ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\Omicron}{Ὂ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\Omicron}{Ὃ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\Omicron}{Ὄ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\Omicron}{Ὅ}
-
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\upsilon}{ὐ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\upsilon}{ὑ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\upsilon}{ὒ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\upsilon}{ὓ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\upsilon}{ὔ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\upsilon}{ὕ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\upsilon}{ὖ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\upsilon}{ὗ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\Upsilon}{Ὑ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\Upsilon}{Ὓ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\Upsilon}{Ὕ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\Upsilon}{Ὗ}
-
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\omega}{ὠ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\omega}{ὡ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\omega}{ὢ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\omega}{ὣ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\omega}{ὤ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\omega}{ὥ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\omega}{ὦ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\omega}{ὧ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\Omega}{Ὠ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\Omega}{Ὡ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\Omega}{Ὢ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\Omega}{Ὣ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\Omega}{Ὤ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\Omega}{Ὥ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\Omega}{Ὦ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\Omega}{Ὧ}
-
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\alpha}{ὰ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\epsilon}{ὲ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\eta}{ὴ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\iota}{ὶ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\omicron}{ὸ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\upsilon}{ὺ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\omega}{ὼ}
-
-\DeclareTextCompositeCommand{\u}{\UTFencname}{\alpha}{ᾰ}
-\DeclareTextCompositeCommand{\=}{\UTFencname}{\alpha}{ᾱ}
-\DeclareTextCompositeCommand{\~}{\UTFencname}{\alpha}{ᾶ}
-\DeclareTextCompositeCommand{\accperispomeni}{\UTFencname}{\alpha}{ᾶ}
-\DeclareTextCompositeCommand{\u}{\UTFencname}{\Alpha}{Ᾰ}
-\DeclareTextCompositeCommand{\=}{\UTFencname}{\Alpha}{Ᾱ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\Alpha}{Ὰ}
-\DeclareTextCompositeCommand{\accvaria}{\UTFencname}{\Alpha}{Ὰ}
-
-\DeclareTextCompositeCommand{\~}{\UTFencname}{\eta}{ῆ}
-\DeclareTextCompositeCommand{\accperispomeni}{\UTFencname}{\eta}{ῆ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\Epsilon}{Ὲ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\Eta}{Ὴ}
-\DeclareTextCompositeCommand{\accvaria}{\UTFencname}{\Epsilon}{Ὲ}
-\DeclareTextCompositeCommand{\accvaria}{\UTFencname}{\Eta}{Ὴ}
-
-\DeclareTextCompositeCommand{\u}{\UTFencname}{\iota}{ῐ}
-\DeclareTextCompositeCommand{\=}{\UTFencname}{\iota}{ῑ}
-\DeclareTextCompositeCommand{\accdialytikavaria}{\UTFencname}{\iota}{ῒ}
-\DeclareTextCompositeCommand{\accdialytikaoxia}{\UTFencname}{\iota}{ΐ}
-\DeclareTextCompositeCommand{\~}{\UTFencname}{\iota}{ῖ}
-\DeclareTextCompositeCommand{\accperispomeni}{\UTFencname}{\iota}{ῖ}
-\DeclareTextCompositeCommand{\accdialytikaperispomeni}{\UTFencname}{\iota}{ῗ}
-\DeclareTextCompositeCommand{\u}{\UTFencname}{\Iota}{Ῐ}
-\DeclareTextCompositeCommand{\=}{\UTFencname}{\Iota}{Ῑ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\Iota}{Ὶ}
-\DeclareTextCompositeCommand{\accvaria}{\UTFencname}{\Iota}{Ὶ}
-
-\DeclareTextCompositeCommand{\u}{\UTFencname}{\upsilon}{ῠ}
-\DeclareTextCompositeCommand{\=}{\UTFencname}{\upsilon}{ῡ}
-\DeclareTextCompositeCommand{\accdialytikavaria}{\UTFencname}{\upsilon}{ῢ}
-\DeclareTextCompositeCommand{\accdialytikaoxia}{\UTFencname}{\upsilon}{ΰ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\rho}{ῤ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\rho}{ῥ}
-\DeclareTextCompositeCommand{\~}{\UTFencname}{\upsilon}{ῦ}
-\DeclareTextCompositeCommand{\accperispomeni}{\UTFencname}{\upsilon}{ῦ}
-\DeclareTextCompositeCommand{\accdialytikaperispomeni}{\UTFencname}{\upsilon}{ῧ}
-\DeclareTextCompositeCommand{\u}{\UTFencname}{\Upsilon}{Ῠ}
-\DeclareTextCompositeCommand{\=}{\UTFencname}{\Upsilon}{Ῡ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\Upsilon}{Ὺ}
-\DeclareTextCompositeCommand{\accvaria}{\UTFencname}{\Upsilon}{Ὺ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\Rho}{Ῥ}
-
-\DeclareTextCompositeCommand{\~}{\UTFencname}{\omega}{ῶ}
-\DeclareTextCompositeCommand{\accperispomeni}{\UTFencname}{\omega}{ῶ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\Omicron}{Ὸ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\Omega}{Ὼ}
-\DeclareTextCompositeCommand{\accvaria}{\UTFencname}{\Omicron}{Ὸ}
-\DeclareTextCompositeCommand{\accvaria}{\UTFencname}{\Omega}{Ὼ}</pre>
+<pre class="literal-block">\DeclareTextCompositeCommand{\accpsili}{\UnicodeEncodingName}{\alpha}{ἀ}
+\DeclareTextCompositeCommand{\accdasia}{\UnicodeEncodingName}{\alpha}{ἁ}
+\DeclareTextCompositeCommand{\accpsilivaria}{\UnicodeEncodingName}{\alpha}{ἂ}
+\DeclareTextCompositeCommand{\accdasiavaria}{\UnicodeEncodingName}{\alpha}{ἃ}
+\DeclareTextCompositeCommand{\accpsilioxia}{\UnicodeEncodingName}{\alpha}{ἄ}
+\DeclareTextCompositeCommand{\accdasiaoxia}{\UnicodeEncodingName}{\alpha}{ἅ}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UnicodeEncodingName}{\alpha}{ἆ}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UnicodeEncodingName}{\alpha}{ἇ}
+\DeclareTextCompositeCommand{\accpsili}{\UnicodeEncodingName}{\Alpha}{Ἀ}
+\DeclareTextCompositeCommand{\accdasia}{\UnicodeEncodingName}{\Alpha}{Ἁ}
+\DeclareTextCompositeCommand{\accpsilivaria}{\UnicodeEncodingName}{\Alpha}{Ἂ}
+\DeclareTextCompositeCommand{\accdasiavaria}{\UnicodeEncodingName}{\Alpha}{Ἃ}
+\DeclareTextCompositeCommand{\accpsilioxia}{\UnicodeEncodingName}{\Alpha}{Ἄ}
+\DeclareTextCompositeCommand{\accdasiaoxia}{\UnicodeEncodingName}{\Alpha}{Ἅ}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UnicodeEncodingName}{\Alpha}{Ἆ}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UnicodeEncodingName}{\Alpha}{Ἇ}
+
+\DeclareTextCompositeCommand{\accpsili}{\UnicodeEncodingName}{\epsilon}{ἐ}
+\DeclareTextCompositeCommand{\accdasia}{\UnicodeEncodingName}{\epsilon}{ἑ}
+\DeclareTextCompositeCommand{\accpsilivaria}{\UnicodeEncodingName}{\epsilon}{ἒ}
+\DeclareTextCompositeCommand{\accdasiavaria}{\UnicodeEncodingName}{\epsilon}{ἓ}
+\DeclareTextCompositeCommand{\accpsilioxia}{\UnicodeEncodingName}{\epsilon}{ἔ}
+\DeclareTextCompositeCommand{\accdasiaoxia}{\UnicodeEncodingName}{\epsilon}{ἕ}
+\DeclareTextCompositeCommand{\accpsili}{\UnicodeEncodingName}{\Epsilon}{Ἐ}
+\DeclareTextCompositeCommand{\accdasia}{\UnicodeEncodingName}{\Epsilon}{Ἑ}
+\DeclareTextCompositeCommand{\accpsilivaria}{\UnicodeEncodingName}{\Epsilon}{Ἒ}
+\DeclareTextCompositeCommand{\accdasiavaria}{\UnicodeEncodingName}{\Epsilon}{Ἓ}
+\DeclareTextCompositeCommand{\accpsilioxia}{\UnicodeEncodingName}{\Epsilon}{Ἔ}
+\DeclareTextCompositeCommand{\accdasiaoxia}{\UnicodeEncodingName}{\Epsilon}{Ἕ}
+
+\DeclareTextCompositeCommand{\accpsili}{\UnicodeEncodingName}{\eta}{ἠ}
+\DeclareTextCompositeCommand{\accdasia}{\UnicodeEncodingName}{\eta}{ἡ}
+\DeclareTextCompositeCommand{\accpsilivaria}{\UnicodeEncodingName}{\eta}{ἢ}
+\DeclareTextCompositeCommand{\accdasiavaria}{\UnicodeEncodingName}{\eta}{ἣ}
+\DeclareTextCompositeCommand{\accpsilioxia}{\UnicodeEncodingName}{\eta}{ἤ}
+\DeclareTextCompositeCommand{\accdasiaoxia}{\UnicodeEncodingName}{\eta}{ἥ}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UnicodeEncodingName}{\eta}{ἦ}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UnicodeEncodingName}{\eta}{ἧ}
+\DeclareTextCompositeCommand{\accpsili}{\UnicodeEncodingName}{\Eta}{Ἠ}
+\DeclareTextCompositeCommand{\accdasia}{\UnicodeEncodingName}{\Eta}{Ἡ}
+\DeclareTextCompositeCommand{\accpsilivaria}{\UnicodeEncodingName}{\Eta}{Ἢ}
+\DeclareTextCompositeCommand{\accdasiavaria}{\UnicodeEncodingName}{\Eta}{Ἣ}
+\DeclareTextCompositeCommand{\accpsilioxia}{\UnicodeEncodingName}{\Eta}{Ἤ}
+\DeclareTextCompositeCommand{\accdasiaoxia}{\UnicodeEncodingName}{\Eta}{Ἥ}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UnicodeEncodingName}{\Eta}{Ἦ}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UnicodeEncodingName}{\Eta}{Ἧ}
+
+\DeclareTextCompositeCommand{\accpsili}{\UnicodeEncodingName}{\iota}{ἰ}
+\DeclareTextCompositeCommand{\accdasia}{\UnicodeEncodingName}{\iota}{ἱ}
+\DeclareTextCompositeCommand{\accpsilivaria}{\UnicodeEncodingName}{\iota}{ἲ}
+\DeclareTextCompositeCommand{\accdasiavaria}{\UnicodeEncodingName}{\iota}{ἳ}
+\DeclareTextCompositeCommand{\accpsilioxia}{\UnicodeEncodingName}{\iota}{ἴ}
+\DeclareTextCompositeCommand{\accdasiaoxia}{\UnicodeEncodingName}{\iota}{ἵ}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UnicodeEncodingName}{\iota}{ἶ}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UnicodeEncodingName}{\iota}{ἷ}
+\DeclareTextCompositeCommand{\accpsili}{\UnicodeEncodingName}{\Iota}{Ἰ}
+\DeclareTextCompositeCommand{\accdasia}{\UnicodeEncodingName}{\Iota}{Ἱ}
+\DeclareTextCompositeCommand{\accpsilivaria}{\UnicodeEncodingName}{\Iota}{Ἲ}
+\DeclareTextCompositeCommand{\accdasiavaria}{\UnicodeEncodingName}{\Iota}{Ἳ}
+\DeclareTextCompositeCommand{\accpsilioxia}{\UnicodeEncodingName}{\Iota}{Ἴ}
+\DeclareTextCompositeCommand{\accdasiaoxia}{\UnicodeEncodingName}{\Iota}{Ἵ}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UnicodeEncodingName}{\Iota}{Ἶ}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UnicodeEncodingName}{\Iota}{Ἷ}
+
+\DeclareTextCompositeCommand{\accpsili}{\UnicodeEncodingName}{\omicron}{ὀ}
+\DeclareTextCompositeCommand{\accdasia}{\UnicodeEncodingName}{\omicron}{ὁ}
+\DeclareTextCompositeCommand{\accpsilivaria}{\UnicodeEncodingName}{\omicron}{ὂ}
+\DeclareTextCompositeCommand{\accdasiavaria}{\UnicodeEncodingName}{\omicron}{ὃ}
+\DeclareTextCompositeCommand{\accpsilioxia}{\UnicodeEncodingName}{\omicron}{ὄ}
+\DeclareTextCompositeCommand{\accdasiaoxia}{\UnicodeEncodingName}{\omicron}{ὅ}
+\DeclareTextCompositeCommand{\accpsili}{\UnicodeEncodingName}{\Omicron}{Ὀ}
+\DeclareTextCompositeCommand{\accdasia}{\UnicodeEncodingName}{\Omicron}{Ὁ}
+\DeclareTextCompositeCommand{\accpsilivaria}{\UnicodeEncodingName}{\Omicron}{Ὂ}
+\DeclareTextCompositeCommand{\accdasiavaria}{\UnicodeEncodingName}{\Omicron}{Ὃ}
+\DeclareTextCompositeCommand{\accpsilioxia}{\UnicodeEncodingName}{\Omicron}{Ὄ}
+\DeclareTextCompositeCommand{\accdasiaoxia}{\UnicodeEncodingName}{\Omicron}{Ὅ}
+
+\DeclareTextCompositeCommand{\accpsili}{\UnicodeEncodingName}{\upsilon}{ὐ}
+\DeclareTextCompositeCommand{\accdasia}{\UnicodeEncodingName}{\upsilon}{ὑ}
+\DeclareTextCompositeCommand{\accpsilivaria}{\UnicodeEncodingName}{\upsilon}{ὒ}
+\DeclareTextCompositeCommand{\accdasiavaria}{\UnicodeEncodingName}{\upsilon}{ὓ}
+\DeclareTextCompositeCommand{\accpsilioxia}{\UnicodeEncodingName}{\upsilon}{ὔ}
+\DeclareTextCompositeCommand{\accdasiaoxia}{\UnicodeEncodingName}{\upsilon}{ὕ}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UnicodeEncodingName}{\upsilon}{ὖ}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UnicodeEncodingName}{\upsilon}{ὗ}
+\DeclareTextCompositeCommand{\accdasia}{\UnicodeEncodingName}{\Upsilon}{Ὑ}
+\DeclareTextCompositeCommand{\accdasiavaria}{\UnicodeEncodingName}{\Upsilon}{Ὓ}
+\DeclareTextCompositeCommand{\accdasiaoxia}{\UnicodeEncodingName}{\Upsilon}{Ὕ}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UnicodeEncodingName}{\Upsilon}{Ὗ}
+
+\DeclareTextCompositeCommand{\accpsili}{\UnicodeEncodingName}{\omega}{ὠ}
+\DeclareTextCompositeCommand{\accdasia}{\UnicodeEncodingName}{\omega}{ὡ}
+\DeclareTextCompositeCommand{\accpsilivaria}{\UnicodeEncodingName}{\omega}{ὢ}
+\DeclareTextCompositeCommand{\accdasiavaria}{\UnicodeEncodingName}{\omega}{ὣ}
+\DeclareTextCompositeCommand{\accpsilioxia}{\UnicodeEncodingName}{\omega}{ὤ}
+\DeclareTextCompositeCommand{\accdasiaoxia}{\UnicodeEncodingName}{\omega}{ὥ}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UnicodeEncodingName}{\omega}{ὦ}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UnicodeEncodingName}{\omega}{ὧ}
+\DeclareTextCompositeCommand{\accpsili}{\UnicodeEncodingName}{\Omega}{Ὠ}
+\DeclareTextCompositeCommand{\accdasia}{\UnicodeEncodingName}{\Omega}{Ὡ}
+\DeclareTextCompositeCommand{\accpsilivaria}{\UnicodeEncodingName}{\Omega}{Ὢ}
+\DeclareTextCompositeCommand{\accdasiavaria}{\UnicodeEncodingName}{\Omega}{Ὣ}
+\DeclareTextCompositeCommand{\accpsilioxia}{\UnicodeEncodingName}{\Omega}{Ὤ}
+\DeclareTextCompositeCommand{\accdasiaoxia}{\UnicodeEncodingName}{\Omega}{Ὥ}
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UnicodeEncodingName}{\Omega}{Ὦ}
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UnicodeEncodingName}{\Omega}{Ὧ}
+
+\DeclareTextCompositeCommand{\`}{\UnicodeEncodingName}{\alpha}{ὰ}
+\DeclareTextCompositeCommand{\`}{\UnicodeEncodingName}{\epsilon}{ὲ}
+\DeclareTextCompositeCommand{\`}{\UnicodeEncodingName}{\eta}{ὴ}
+\DeclareTextCompositeCommand{\`}{\UnicodeEncodingName}{\iota}{ὶ}
+\DeclareTextCompositeCommand{\`}{\UnicodeEncodingName}{\omicron}{ὸ}
+\DeclareTextCompositeCommand{\`}{\UnicodeEncodingName}{\upsilon}{ὺ}
+\DeclareTextCompositeCommand{\`}{\UnicodeEncodingName}{\omega}{ὼ}
+
+\DeclareTextCompositeCommand{\u}{\UnicodeEncodingName}{\alpha}{ᾰ}
+\DeclareTextCompositeCommand{\=}{\UnicodeEncodingName}{\alpha}{ᾱ}
+\DeclareTextCompositeCommand{\~}{\UnicodeEncodingName}{\alpha}{ᾶ}
+\DeclareTextCompositeCommand{\accperispomeni}{\UnicodeEncodingName}{\alpha}{ᾶ}
+\DeclareTextCompositeCommand{\u}{\UnicodeEncodingName}{\Alpha}{Ᾰ}
+\DeclareTextCompositeCommand{\=}{\UnicodeEncodingName}{\Alpha}{Ᾱ}
+\DeclareTextCompositeCommand{\`}{\UnicodeEncodingName}{\Alpha}{Ὰ}
+\DeclareTextCompositeCommand{\accvaria}{\UnicodeEncodingName}{\Alpha}{Ὰ}
+
+\DeclareTextCompositeCommand{\~}{\UnicodeEncodingName}{\eta}{ῆ}
+\DeclareTextCompositeCommand{\accperispomeni}{\UnicodeEncodingName}{\eta}{ῆ}
+\DeclareTextCompositeCommand{\`}{\UnicodeEncodingName}{\Epsilon}{Ὲ}
+\DeclareTextCompositeCommand{\`}{\UnicodeEncodingName}{\Eta}{Ὴ}
+\DeclareTextCompositeCommand{\accvaria}{\UnicodeEncodingName}{\Epsilon}{Ὲ}
+\DeclareTextCompositeCommand{\accvaria}{\UnicodeEncodingName}{\Eta}{Ὴ}
+
+\DeclareTextCompositeCommand{\u}{\UnicodeEncodingName}{\iota}{ῐ}
+\DeclareTextCompositeCommand{\=}{\UnicodeEncodingName}{\iota}{ῑ}
+\DeclareTextCompositeCommand{\accdialytikavaria}{\UnicodeEncodingName}{\iota}{ῒ}
+\DeclareTextCompositeCommand{\accdialytikatonos}{\UnicodeEncodingName}{\iota}{ΐ}
+\DeclareTextCompositeCommand{\~}{\UnicodeEncodingName}{\iota}{ῖ}
+\DeclareTextCompositeCommand{\accperispomeni}{\UnicodeEncodingName}{\iota}{ῖ}
+\DeclareTextCompositeCommand{\accdialytikaperispomeni}{\UnicodeEncodingName}{\iota}{ῗ}
+\DeclareTextCompositeCommand{\u}{\UnicodeEncodingName}{\Iota}{Ῐ}
+\DeclareTextCompositeCommand{\=}{\UnicodeEncodingName}{\Iota}{Ῑ}
+\DeclareTextCompositeCommand{\`}{\UnicodeEncodingName}{\Iota}{Ὶ}
+\DeclareTextCompositeCommand{\accvaria}{\UnicodeEncodingName}{\Iota}{Ὶ}
+
+\DeclareTextCompositeCommand{\u}{\UnicodeEncodingName}{\upsilon}{ῠ}
+\DeclareTextCompositeCommand{\=}{\UnicodeEncodingName}{\upsilon}{ῡ}
+\DeclareTextCompositeCommand{\accdialytikavaria}{\UnicodeEncodingName}{\upsilon}{ῢ}
+\DeclareTextCompositeCommand{\accdialytikatonos}{\UnicodeEncodingName}{\upsilon}{ΰ}
+\DeclareTextCompositeCommand{\accpsili}{\UnicodeEncodingName}{\rho}{ῤ}
+\DeclareTextCompositeCommand{\accdasia}{\UnicodeEncodingName}{\rho}{ῥ}
+\DeclareTextCompositeCommand{\~}{\UnicodeEncodingName}{\upsilon}{ῦ}
+\DeclareTextCompositeCommand{\accperispomeni}{\UnicodeEncodingName}{\upsilon}{ῦ}
+\DeclareTextCompositeCommand{\accdialytikaperispomeni}{\UnicodeEncodingName}{\upsilon}{ῧ}
+\DeclareTextCompositeCommand{\u}{\UnicodeEncodingName}{\Upsilon}{Ῠ}
+\DeclareTextCompositeCommand{\=}{\UnicodeEncodingName}{\Upsilon}{Ῡ}
+\DeclareTextCompositeCommand{\`}{\UnicodeEncodingName}{\Upsilon}{Ὺ}
+\DeclareTextCompositeCommand{\accvaria}{\UnicodeEncodingName}{\Upsilon}{Ὺ}
+\DeclareTextCompositeCommand{\accdasia}{\UnicodeEncodingName}{\Rho}{Ῥ}
+
+\DeclareTextCompositeCommand{\~}{\UnicodeEncodingName}{\omega}{ῶ}
+\DeclareTextCompositeCommand{\accperispomeni}{\UnicodeEncodingName}{\omega}{ῶ}
+\DeclareTextCompositeCommand{\`}{\UnicodeEncodingName}{\Omicron}{Ὸ}
+\DeclareTextCompositeCommand{\`}{\UnicodeEncodingName}{\Omega}{Ὼ}
+\DeclareTextCompositeCommand{\accvaria}{\UnicodeEncodingName}{\Omicron}{Ὸ}
+\DeclareTextCompositeCommand{\accvaria}{\UnicodeEncodingName}{\Omega}{Ὼ}</pre>
<!-- References -->
</section>
</main>
diff --git a/language/greek/greek-fontenc/alphabeta-tuenc.html b/language/greek/greek-fontenc/alphabeta-tuenc.html
deleted file mode 100644
index 1e2857bca3..0000000000
--- a/language/greek/greek-fontenc/alphabeta-tuenc.html
+++ /dev/null
@@ -1,862 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta charset="utf-8"/>
-<meta name="generator" content="Docutils 0.17b.dev: http://docutils.sourceforge.net/" />
-<title>alphabeta-tuenc.def</title>
-<meta name="dcterms.rights" content="© 2013 Günter Milde" />
-<link rel="schema.dcterms" href="http://purl.org/dc/terms/"/>
-<style type="text/css">
-
-/* Minimal style sheet for the HTML output of Docutils. */
-/* */
-/* :Author: Günter Milde, based on html4css1.css by David Goodger */
-/* :Id: $Id$ */
-/* :Copyright: © 2015 Günter Milde. */
-/* :License: Released under the terms of the `2-Clause BSD license`_, */
-/* in short: */
-/* */
-/* Copying and distribution of this file, with or without modification, */
-/* are permitted in any medium without royalty provided the copyright */
-/* notice and this notice are preserved. */
-/* */
-/* This file is offered as-is, without any warranty. */
-/* */
-/* .. _2-Clause BSD license: http://www.spdx.org/licenses/BSD-2-Clause */
-
-/* This CSS2.1_ stylesheet defines rules for Docutils elements without */
-/* HTML equivalent. It is required to make the document semantic visible. */
-/* */
-/* .. _CSS2.1: http://www.w3.org/TR/CSS2 */
-/* .. _validates: http://jigsaw.w3.org/css-validator/validator$link */
-
-/* alignment of text and inline objects inside block objects*/
-.align-left { text-align: left; }
-.align-right { text-align: right; }
-.align-center { clear: both; text-align: center; }
-.align-top { vertical-align: top; }
-.align-middle { vertical-align: middle; }
-.align-bottom { vertical-align: bottom; }
-
-/* titles */
-h1.title, p.subtitle {
- text-align: center;
-}
-p.topic-title,
-p.sidebar-title,
-p.rubric,
-p.admonition-title,
-p.system-message-title {
- font-weight: bold;
-}
-h1 + p.subtitle,
-h2 + p.section-subtitle {
- font-size: 1.6em;
-}
-h3 + p.section-subtitle {
- font-size: 1.28em;
-}
-p.subtitle,
-p.section-subtitle,
-p.sidebar-subtitle {
- font-weight: bold;
- margin-top: -0.5em;
-}
-p.sidebar-title {
- font-size: larger;
-}
-p.rubric {
- font-size: larger;
- color: maroon;
-}
-a.toc-backref {
- color: black;
- text-decoration: none; }
-
-/* Warnings, Errors */
-div.system-messages h2,
-span.problematic,
-p.system-message-title {
- color: red;
-}
-
-/* inline literals */
-span.docutils.literal {
- font-family: monospace;
- white-space: pre-wrap;
-}
-/* do not wraph at hyphens and similar: */
-.literal > span.pre { white-space: nowrap; }
-
-/* Lists */
-
-/* compact and simple lists: no margin between items */
-.simple li, .compact li,
-.simple ul, .compact ul,
-.simple ol, .compact ol,
-.simple > li p, .compact > li p,
-dl.simple > dd, dl.compact > dd {
- margin-top: 0;
- margin-bottom: 0;
-}
-
-/* Table of Contents */
-div.topic.contents { margin: 0.5em 0; }
-div.topic.contents ul {
- list-style-type: none;
- padding-left: 1.5em;
-}
-
-/* Enumerated Lists */
-ol.arabic { list-style: decimal }
-ol.loweralpha { list-style: lower-alpha }
-ol.upperalpha { list-style: upper-alpha }
-ol.lowerroman { list-style: lower-roman }
-ol.upperroman { list-style: upper-roman }
-
-dt span.classifier { font-style: italic }
-dt span.classifier:before {
- font-style: normal;
- margin: 0.5em;
- content: ":";
-}
-
-/* Field Lists and drivatives */
-/* bold field name, content starts on the same line */
-dl.field-list > dt,
-dl.option-list > dt,
-dl.docinfo > dt,
-dl.footnote > dt,
-dl.citation > dt {
- font-weight: bold;
- clear: left;
- float: left;
- margin: 0;
- padding: 0;
- padding-right: 0.5em;
-}
-/* Offset for field content (corresponds to the --field-name-limit option) */
-dl.field-list > dd,
-dl.option-list > dd,
-dl.docinfo > dd {
- margin-left: 9em; /* ca. 14 chars in the test examples */
-}
-/* start field-body on a new line after long field names */
-dl.field-list > dd > *:first-child,
-dl.option-list > dd > *:first-child
-{
- display: inline-block;
- width: 100%;
- margin: 0;
-}
-/* field names followed by a colon */
-dl.field-list > dt:after,
-dl.docinfo > dt:after {
- content: ":";
-}
-
-/* Bibliographic Fields (docinfo) */
-pre.address { font: inherit; }
-dd.authors > p { margin: 0; }
-
-/* Option Lists */
-dl.option-list { margin-left: 1.5em; }
-dl.option-list > dt { font-weight: normal; }
-span.option { white-space: nowrap; }
-
-/* Footnotes and Citations */
-dl.footnote.superscript > dd {margin-left: 1em; }
-dl.footnote.brackets > dd {margin-left: 2em; }
-dl > dt.label { font-weight: normal; }
-a.footnote-reference.brackets:before,
-dt.label > span.brackets:before { content: "["; }
-a.footnote-reference.brackets:after,
-dt.label > span.brackets:after { content: "]"; }
-a.footnote-reference.superscript,
-dl.footnote.superscript > dt.label {
- vertical-align: super;
- font-size: smaller;
-}
-dt.label > span.fn-backref { margin-left: 0.2em; }
-dt.label > span.fn-backref > a { font-style: italic; }
-
-/* Line Blocks */
-div.line-block { display: block; }
-div.line-block div.line-block {
- margin-top: 0;
- margin-bottom: 0;
- margin-left: 40px;
-}
-
-/* Figures, Images, and Tables */
-.figure.align-left,
-figure.align-left,
-img.align-left,
-object.align-left,
-table.align-left {
- margin-right: auto;
-}
-.figure.align-center,
-figure.align-center,
-img.align-center,
-object.align-center,
-table.align-center {
- margin-left: auto;
- margin-right: auto;
-}
-.figure.align-right,
-figure.align-right,
-img.align-right,
-object.align-right,
-table.align-right {
- margin-left: auto;
-}
-img.align-center, img.align-right,
-object.align-center, object.align-right {
- display: block;
-}
-/* reset inner alignment in figures and tables */
-.figure.align-left, .figure.align-right,
-figure.align-left, figure.align-right,
-table.align-left, table.align-center, table.align-right {
- text-align: inherit;
-}
-
-/* Sidebar */
-aside.sidebar {
- width: 30%;
- max-width: 26em;
- float: right;
- clear: right;
-}
-
-/* Text Blocks */
-blockquote,
-div.topic,
-div.admonition,
-div.system-message,
-pre.literal-block,
-pre.doctest-block,
-pre.math,
-pre.code {
- margin-left: 1.5em;
- margin-right: 1.5em;
-}
-pre.code .ln { color: gray; } /* line numbers */
-
-/* Tables */
-table { border-collapse: collapse; }
-td, th {
- border-style: solid;
- border-color: silver;
- padding: 0 1ex;
- border-width: thin;
-}
-td > p:first-child, th > p:first-child { margin-top: 0; }
-td > p, th > p { margin-bottom: 0; }
-
-table > caption {
- text-align: left;
- margin-bottom: 0.25em
-}
-
-table.borderless td, table.borderless th {
- border: 0;
- padding: 0;
- padding-right: 0.5em /* separate table cells */
-}
-
-/* Document Header and Footer */
-header { border-bottom: 1px solid black; }
-footer { border-top: 1px solid black; }
-
-/* new HTML5 block elements: set display for older browsers */
-header, section, footer, aside, nav, main, article, figure {
- display: block;
-}
-
-</style>
-<style type="text/css">
-
-/* CSS31_ style sheet for the output of Docutils HTML writers. */
-/* Rules for easy reading and pre-defined style variants. */
-/* */
-/* :Author: Günter Milde, based on html4css1.css by David Goodger */
-/* :Id: $Id$ */
-/* :Copyright: © 2015 Günter Milde. */
-/* :License: Released under the terms of the `2-Clause BSD license`_, */
-/* in short: */
-/* */
-/* Copying and distribution of this file, with or without modification, */
-/* are permitted in any medium without royalty provided the copyright */
-/* notice and this notice are preserved. */
-/* */
-/* This file is offered as-is, without any warranty. */
-/* */
-/* .. _2-Clause BSD license: http://www.spdx.org/licenses/BSD-2-Clause */
-/* .. _CSS3: http://www.w3.org/TR/CSS3 */
-
-
-/* Document Structure */
-/* ****************** */
-
-/* "page layout" */
-body {
- margin: 0;
- background-color: #dbdbdb;
-}
-div.document,
-main {
- line-height:1.3;
- counter-reset: table figure;
- /* avoid long lines --> better reading */
- /* optimum is 45…75 characters/line <http://webtypography.net/2.1.2> */
- /* OTOH: lines should not be too short because of missing hyphenation, */
- max-width: 50em;
- padding: 1px 2%; /* 1px on top avoids grey bar above title (mozilla) */
- margin: auto;
- background-color: white;
-}
-
-/* Sections */
-
-/* Transitions */
-
-hr.docutils {
- width: 80%;
- margin-top: 1em;
- margin-bottom: 1em;
- clear: both;
-}
-
-/* Paragraphs */
-/* ========== */
-
-/* vertical space (parskip) */
-p, ol, ul, dl, li, dd,
-div.line-block,
-div.topic,
-table {
- margin-top: 0.5em;
- margin-bottom: 0.5em;
-}
-p:first-child { margin-top: 0; }
-/* (:last-child is new in CSS 3) */
-p:last-child { margin-bottom: 0; }
-
-h1, h2, h3, h4, h5, h6,
-dl > dd {
- margin-bottom: 0.5em;
-}
-
-/* Lists */
-/* ===== */
-
-/* Separate list entries in compound lists */
-dl > dd, ol > li,
-
-/* Definition Lists */
-/* Indent lists nested in definition lists */
-/* (:only-child is new in CSS 3) */
-dd > ul:only-child, dd > ol:only-child { padding-left: 1em; }
-
-/* Description Lists */
-/* styled like in most dictionaries, encyclopedias etc. */
-dl.description > dt {
- font-weight: bold;
- clear: left;
- float: left;
- margin: 0;
- padding: 0;
- padding-right: 0.5em;
-}
-
-/* Field Lists */
-
-/* example for custom field-name width */
-dl.field-list.narrow > dd {
- margin-left: 5em;
-}
-/* run-in: start field-body on same line after long field names */
-dl.field-list.run-in > dd p {
- display: block;
-}
-
-/* Bibliographic Fields */
-
-/* generally, bibliographic fields use special definition list dl.docinfo */
-/* but dedication and abstract are placed into "topic" divs */
-div.abstract p.topic-title {
- text-align: center;
-}
-div.dedication {
- margin: 2em 5em;
- text-align: center;
- font-style: italic;
-}
-div.dedication p.topic-title {
- font-style: normal;
-}
-
-/* Citations */
-dl.citation dt.label {
- font-weight: bold;
-}
-span.fn-backref {
- font-weight: normal;
-}
-
-/* Text Blocks */
-/* =========== */
-
-/* Literal Blocks */
-
-pre.literal-block,
-pre.doctest-block,
-pre.math,
-pre.code {
- font-family: monospace;
-}
-
-/* Block Quotes */
-
-blockquote > table,
-div.topic > table {
- margin-top: 0;
- margin-bottom: 0;
-}
-blockquote p.attribution,
-div.topic p.attribution {
- text-align: right;
- margin-left: 20%;
-}
-
-/* Tables */
-/* ====== */
-
-/* th { vertical-align: bottom; } */
-
-table tr { text-align: left; }
-
-/* "booktabs" style (no vertical lines) */
-table.booktabs {
- border: 0;
- border-top: 2px solid;
- border-bottom: 2px solid;
- border-collapse: collapse;
-}
-table.booktabs * {
- border: 0;
-}
-table.booktabs th {
- border-bottom: thin solid;
-}
-
-/* numbered tables (counter defined in div.document) */
-table.numbered > caption:before {
- counter-increment: table;
- content: "Table " counter(table) ": ";
- font-weight: bold;
-}
-
-/* Explicit Markup Blocks */
-/* ====================== */
-
-/* Footnotes and Citations */
-/* ----------------------- */
-
-/* line on the left */
-dl.footnote {
- padding-left: 1ex;
- border-left: solid;
- border-left-width: thin;
-}
-
-/* Directives */
-/* ---------- */
-
-/* Body Elements */
-/* ~~~~~~~~~~~~~ */
-
-/* Images and Figures */
-
-/* let content flow to the side of aligned images and figures */
-.figure.align-left,
-figure.align-left,
-img.align-left,
-object.align-left {
- display: block;
- clear: left;
- float: left;
- margin-right: 1em;
-}
-.figure.align-right,
-figure.align-right,
-img.align-right,
-object.align-right {
- display: block;
- clear: right;
- float: right;
- margin-left: 1em;
-}
-/* Stop floating sidebars, images and figures at section level 1,2,3 */
-h1, h2, h3, h4 { clear: both; }
-
-/* Numbered figures */
-figure.numbered > figcaption > p:before {
- counter-increment: figure;
- content: "Figure " counter(figure) ": ";
- font-weight: bold;
-}
-
-
-/* Admonitions and System Messages */
-
-div.admonition,
-div.system-message,
-aside.sidebar {
- border: medium outset;
- margin: 1em 1.5em;
- padding: 0.5em 1em;
-}
-
-div.caution p.admonition-title,
-div.attention p.admonition-title,
-div.danger p.admonition-title,
-div.error p.admonition-title,
-div.warning p.admonition-title,
-div.error {
- color: red;
-}
-
-
-/* Sidebar */
-
-/* Move right. In a layout with fixed margins, */
-/* it can be moved into the margin. */
-div.sidebar,
-aside.sidebar {
- width: 30%;
- max-width: 26em;
- margin-left: 1em;
- margin-right: -2%;
- background-color: #ffffee;
-}
-
-/* Code */
-
-pre.code { padding: 0.7ex }
-pre.code, code { background-color: #eeeeee }
-pre.code .ln { color: gray; } /* line numbers */
-/* basic highlighting: for a complete scheme, see */
-/* http://docutils.sourceforge.net/sandbox/stylesheets/ */
-pre.code .comment, code .comment { color: #5C6576 }
-pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
-pre.code .literal.string, code .literal.string { color: #0C5404 }
-pre.code .name.builtin, code .name.builtin { color: #352B84 }
-pre.code .deleted, code .deleted { background-color: #DEB0A1}
-pre.code .inserted, code .inserted { background-color: #A3D289}
-
-/* Math */
-/* styled separately (see math.css for math-output=HTML) */
-
-/* Epigraph */
-/* Highlights */
-/* Pull-Quote */
-/* Compound Paragraph */
-/* Container */
-
-/* Document Header and Footer */
-
-footer, header {
- font-size: smaller;
- clear: both;
- padding: 0.5em 2%;
- background-color: #ebebee;
- border: none;
-}
-
-/* Inline Markup */
-/* ============= */
-
-/* Emphasis */
-/* em */
-/* Strong Emphasis */
-/* strong */
-/* Interpreted Text */
-/* span.interpreted */
-/* Title Reference */
-/* cite */
-
-/* Inline Literals */
-/* possible values: normal, nowrap, pre, pre-wrap, pre-line */
-/* span.docutils.literal { white-space: pre-wrap; } */
-
-/* Hyperlink References */
-a { text-decoration: none; }
-
-/* External Targets */
-/* span.target.external */
-/* Internal Targets */
-/* span.target.internal */
-/* Footnote References */
-/* a.footnote-reference */
-/* Citation References */
-/* a.citation-reference */
-
-</style>
-</head>
-<body>
-<main id="alphabeta-tuenc-def">
-<h1 class="title">alphabeta-tuenc.def</h1>
-<p class="subtitle" id="composite-definitions-for-xetex-and-luatex">Composite definitions for XeTeX and LuaTeX</p>
-<dl class="docinfo">
-<dt class="copyright">Copyright</dt>
-<dd class="copyright">© 2013 Günter Milde</dd>
-<dt class="licence">Licence</dt>
-<dd class="licence"><p>This work may be distributed and/or modified under the
-conditions of the <a class="reference external" href="http://www.latex-project.org/lppl.txt">LaTeX Project Public License</a>, either
-version 1.3 of this license or any later version.</p>
-</dd>
-<dt class="identification">Identification</dt>
-<dd class="identification"><pre class="literal-block">\ProvidesFile{alphabeta-tuenc}
-[2020/02/28 0.14 Composite definitions for XeTeX and LuaTeX]</pre>
-</dd>
-</dl>
-<p>Composite definitions for <span class="docutils literal">alphabeta.sty</span> with XeTeX and LuaTeX.</p>
-<dl>
-<dt>Changelog:</dt>
-<dd><table class="borderless">
-<colgroup>
-<col style="width: 14%" />
-<col style="width: 8%" />
-<col style="width: 78%" />
-</colgroup>
-<tbody>
-<tr><td><p>2013-09-12</p></td>
-<td><p>0.1</p></td>
-<td><p>initial version</p></td>
-</tr>
-<tr><td><p>2013-10-01</p></td>
-<td><p>0.1.1</p></td>
-<td><p>remove clashing defs for legacy characters with oxia.</p></td>
-</tr>
-<tr><td><p>2014-09-04</p></td>
-<td><p>0.11.2</p></td>
-<td><p>documentation update</p></td>
-</tr>
-<tr><td><p>2020/02/28</p></td>
-<td><p>0.14</p></td>
-<td><p>rename to <span class="docutils literal"><span class="pre">alphabeta-tuenc.def</span></span>,
-use <span class="docutils literal">\UTFencname</span> instead of <span class="docutils literal">\LastDeclaredEncoding</span></p></td>
-</tr>
-</tbody>
-</table>
-</dd>
-</dl>
-<p>The <a class="reference external" href="alphabeta.sty.html">alphabeta</a> package re-defines the math macros for Greek letters to work
-in both, text and math mode, so that Greek letters can be specified with
-the established command names in text, too.</p>
-<p>The NFSS TextComposite mechanism looks for the next token without expanding
-it. In order to let compositions like <span class="docutils literal"><span class="pre">\&gt;&quot;\alpha</span></span> work as expected we
-define TextComposites with the <cite>letter name commands</cite>.</p>
-<p>This file expands the font encoding definitions in <a class="reference external" href="tuenc-greek.def.html">tuenc-greek.def</a> with
-composite commands for use with Unicode fonts. It is sourced by <a class="reference external" href="alphabeta.sty.html">alphabeta</a>
-under XeTeX/LuaTeX.</p>
-<section id="greek-and-coptic">
-<h2>Greek and Coptic</h2>
-<pre class="literal-block">\DeclareTextCompositeCommand{\'}{\UTFencname}{\Alpha}{Ά}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\Epsilon}{Έ}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\Eta}{Ή}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\Iota}{Ί}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\Omicron}{Ό}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\Upsilon}{Ύ}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\Omega}{Ώ}
-\DeclareTextCompositeCommand{\accdialytikatonos}{\UTFencname}{\iota}{ΐ}
-
-\DeclareTextCompositeCommand{\&quot;}{\UTFencname}{\Iota}{Ϊ}
-\DeclareTextCompositeCommand{\&quot;}{\UTFencname}{\Upsilon}{Ϋ}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\alpha}{ά}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\epsilon}{έ}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\eta}{ή}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\iota}{ί}
-\DeclareTextCompositeCommand{\accdialytikatonos}{\UTFencname}{\upsilon}{ΰ}
-
-\DeclareTextCompositeCommand{\&quot;}{\UTFencname}{\iota}{ϊ}
-\DeclareTextCompositeCommand{\&quot;}{\UTFencname}{\upsilon}{ϋ}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\omicron}{ό}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\upsilon}{ύ}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\omega}{ώ}</pre>
-</section>
-<section id="greek-extended">
-<h2>Greek Extended</h2>
-<p>Postfix ypogegrammeni cannot be second part of composite defs.</p>
-<pre class="literal-block">\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\alpha}{ἀ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\alpha}{ἁ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\alpha}{ἂ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\alpha}{ἃ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\alpha}{ἄ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\alpha}{ἅ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\alpha}{ἆ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\alpha}{ἇ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\Alpha}{Ἀ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\Alpha}{Ἁ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\Alpha}{Ἂ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\Alpha}{Ἃ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\Alpha}{Ἄ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\Alpha}{Ἅ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\Alpha}{Ἆ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\Alpha}{Ἇ}
-
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\epsilon}{ἐ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\epsilon}{ἑ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\epsilon}{ἒ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\epsilon}{ἓ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\epsilon}{ἔ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\epsilon}{ἕ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\Epsilon}{Ἐ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\Epsilon}{Ἑ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\Epsilon}{Ἒ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\Epsilon}{Ἓ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\Epsilon}{Ἔ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\Epsilon}{Ἕ}
-
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\eta}{ἠ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\eta}{ἡ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\eta}{ἢ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\eta}{ἣ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\eta}{ἤ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\eta}{ἥ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\eta}{ἦ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\eta}{ἧ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\Eta}{Ἠ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\Eta}{Ἡ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\Eta}{Ἢ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\Eta}{Ἣ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\Eta}{Ἤ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\Eta}{Ἥ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\Eta}{Ἦ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\Eta}{Ἧ}
-
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\iota}{ἰ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\iota}{ἱ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\iota}{ἲ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\iota}{ἳ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\iota}{ἴ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\iota}{ἵ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\iota}{ἶ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\iota}{ἷ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\Iota}{Ἰ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\Iota}{Ἱ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\Iota}{Ἲ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\Iota}{Ἳ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\Iota}{Ἴ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\Iota}{Ἵ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\Iota}{Ἶ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\Iota}{Ἷ}
-
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\omicron}{ὀ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\omicron}{ὁ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\omicron}{ὂ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\omicron}{ὃ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\omicron}{ὄ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\omicron}{ὅ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\Omicron}{Ὀ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\Omicron}{Ὁ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\Omicron}{Ὂ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\Omicron}{Ὃ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\Omicron}{Ὄ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\Omicron}{Ὅ}
-
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\upsilon}{ὐ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\upsilon}{ὑ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\upsilon}{ὒ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\upsilon}{ὓ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\upsilon}{ὔ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\upsilon}{ὕ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\upsilon}{ὖ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\upsilon}{ὗ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\Upsilon}{Ὑ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\Upsilon}{Ὓ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\Upsilon}{Ὕ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\Upsilon}{Ὗ}
-
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\omega}{ὠ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\omega}{ὡ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\omega}{ὢ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\omega}{ὣ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\omega}{ὤ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\omega}{ὥ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\omega}{ὦ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\omega}{ὧ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\Omega}{Ὠ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\Omega}{Ὡ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\Omega}{Ὢ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\Omega}{Ὣ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\Omega}{Ὤ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\Omega}{Ὥ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\Omega}{Ὦ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\Omega}{Ὧ}
-
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\alpha}{ὰ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\epsilon}{ὲ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\eta}{ὴ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\iota}{ὶ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\omicron}{ὸ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\upsilon}{ὺ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\omega}{ὼ}
-
-\DeclareTextCompositeCommand{\u}{\UTFencname}{\alpha}{ᾰ}
-\DeclareTextCompositeCommand{\=}{\UTFencname}{\alpha}{ᾱ}
-\DeclareTextCompositeCommand{\~}{\UTFencname}{\alpha}{ᾶ}
-\DeclareTextCompositeCommand{\accperispomeni}{\UTFencname}{\alpha}{ᾶ}
-\DeclareTextCompositeCommand{\u}{\UTFencname}{\Alpha}{Ᾰ}
-\DeclareTextCompositeCommand{\=}{\UTFencname}{\Alpha}{Ᾱ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\Alpha}{Ὰ}
-\DeclareTextCompositeCommand{\accvaria}{\UTFencname}{\Alpha}{Ὰ}
-
-\DeclareTextCompositeCommand{\~}{\UTFencname}{\eta}{ῆ}
-\DeclareTextCompositeCommand{\accperispomeni}{\UTFencname}{\eta}{ῆ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\Epsilon}{Ὲ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\Eta}{Ὴ}
-\DeclareTextCompositeCommand{\accvaria}{\UTFencname}{\Epsilon}{Ὲ}
-\DeclareTextCompositeCommand{\accvaria}{\UTFencname}{\Eta}{Ὴ}
-
-\DeclareTextCompositeCommand{\u}{\UTFencname}{\iota}{ῐ}
-\DeclareTextCompositeCommand{\=}{\UTFencname}{\iota}{ῑ}
-\DeclareTextCompositeCommand{\accdialytikavaria}{\UTFencname}{\iota}{ῒ}
-\DeclareTextCompositeCommand{\accdialytikaoxia}{\UTFencname}{\iota}{ΐ}
-\DeclareTextCompositeCommand{\~}{\UTFencname}{\iota}{ῖ}
-\DeclareTextCompositeCommand{\accperispomeni}{\UTFencname}{\iota}{ῖ}
-\DeclareTextCompositeCommand{\accdialytikaperispomeni}{\UTFencname}{\iota}{ῗ}
-\DeclareTextCompositeCommand{\u}{\UTFencname}{\Iota}{Ῐ}
-\DeclareTextCompositeCommand{\=}{\UTFencname}{\Iota}{Ῑ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\Iota}{Ὶ}
-\DeclareTextCompositeCommand{\accvaria}{\UTFencname}{\Iota}{Ὶ}
-
-\DeclareTextCompositeCommand{\u}{\UTFencname}{\upsilon}{ῠ}
-\DeclareTextCompositeCommand{\=}{\UTFencname}{\upsilon}{ῡ}
-\DeclareTextCompositeCommand{\accdialytikavaria}{\UTFencname}{\upsilon}{ῢ}
-\DeclareTextCompositeCommand{\accdialytikaoxia}{\UTFencname}{\upsilon}{ΰ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\rho}{ῤ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\rho}{ῥ}
-\DeclareTextCompositeCommand{\~}{\UTFencname}{\upsilon}{ῦ}
-\DeclareTextCompositeCommand{\accperispomeni}{\UTFencname}{\upsilon}{ῦ}
-\DeclareTextCompositeCommand{\accdialytikaperispomeni}{\UTFencname}{\upsilon}{ῧ}
-\DeclareTextCompositeCommand{\u}{\UTFencname}{\Upsilon}{Ῠ}
-\DeclareTextCompositeCommand{\=}{\UTFencname}{\Upsilon}{Ῡ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\Upsilon}{Ὺ}
-\DeclareTextCompositeCommand{\accvaria}{\UTFencname}{\Upsilon}{Ὺ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\Rho}{Ῥ}
-
-\DeclareTextCompositeCommand{\~}{\UTFencname}{\omega}{ῶ}
-\DeclareTextCompositeCommand{\accperispomeni}{\UTFencname}{\omega}{ῶ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\Omicron}{Ὸ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\Omega}{Ὼ}
-\DeclareTextCompositeCommand{\accvaria}{\UTFencname}{\Omicron}{Ὸ}
-\DeclareTextCompositeCommand{\accvaria}{\UTFencname}{\Omega}{Ὼ}</pre>
-<!-- References -->
-</section>
-</main>
-</body>
-</html>
diff --git a/language/greek/greek-fontenc/alphabeta.sty b/language/greek/greek-fontenc/alphabeta.sty
index 53027da0b9..ddc8df103a 100644
--- a/language/greek/greek-fontenc/alphabeta.sty
+++ b/language/greek/greek-fontenc/alphabeta.sty
@@ -14,7 +14,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{alphabeta}
- [2020/02/28 1.0 macros for Greek letters in text and math]
+ [2020/10/13 2.0 macros for Greek letters in text and math]
% Changelog:
% .. class:: borderless
@@ -30,6 +30,8 @@
% (new in fontspec v2.5a).
% 0.14 2020/02/28 rename ``alphabeta-euenc.def`` to
% ``alphabeta-tuenc.def``.
+% 1.0 2020/09/25 New package version. No changes in this file.
+% 2.0 2020/10/13 Provide ``\Koppa``.
% ====== ========== =========================================================
%
% Motivation
@@ -118,7 +120,7 @@
% Save math macros
% ----------------
%
-% Provide an alias for the standard math commands::
+% Map the standard math commands to maths-specific names::
\let\mathGamma\Gamma
\let\mathDelta\Delta
@@ -263,6 +265,7 @@
\providecommand*{\stigma}{\textstigma} % ϛ
\providecommand*{\varstigma}{\textvarstigma} % stigma variant (CB.enc, teubner)
\providecommand*{\koppa}{\textkoppa} % ϟ (greek small letter koppa)
+\providecommand*{\Koppa}{\textKoppa} % Ϟ (greek letter koppa)
\providecommand*{\qoppa}{\textqoppa} % ϙ (archaic koppa)
\providecommand*{\Qoppa}{\textQoppa} % Ϙ (archaic Koppa)
\providecommand*{\Stigma}{\textStigma} % Ϛ (in some fonts ϹΤ ligature)
@@ -274,7 +277,7 @@
%
% TeX’s concept of “standard” vs. “variant” math symbols does not map to the
% distinction between GREEK LETTER ... vs. GREEK ... SYMBOL in the Unicode
-% standard (see `<tuenc-greek-doc.pdf>`_).
+% standard (see `<test-tuenc-greek.pdf>`_).
%
% The ``\...symbol`` macros select the GREEK ... SYMBOL in both, text and
% math mode. For ``\epsilonsymbol`` and ``\phisymbol`` this is the default
@@ -319,12 +322,12 @@
% `letter name commands`. (Composition only works if the active font encoding
% is LGR). ::
-\ifdefined\UTFencname
+\@ifl@aded{def}{tuenc-greek}{
\input{alphabeta-tuenc.def}
-\else % 8-bit TeX
+}{}
+\@ifl@aded{def}{lgrenc}{
\input{alphabeta-lgr.def}
-\fi
-
+}{}
% Re-definition for Greek Unicode input in math mode
% --------------------------------------------------
diff --git a/language/greek/greek-fontenc/alphabeta.sty.html b/language/greek/greek-fontenc/alphabeta.sty.html
index 97581b7a0d..84a217a1d7 100644
--- a/language/greek/greek-fontenc/alphabeta.sty.html
+++ b/language/greek/greek-fontenc/alphabeta.sty.html
@@ -620,7 +620,7 @@ version 1.3 of this license or any later version.</p>
<dt class="identification">Identification</dt>
<dd class="identification"><pre class="literal-block">\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{alphabeta}
- [2020/02/28 1.0 macros for Greek letters in text and math]</pre>
+ [2020/10/13 2.0 macros for Greek letters in text and math]</pre>
</dd>
</dl>
<div class="abstract topic">
@@ -672,6 +672,14 @@ mode.</p>
<td><p>rename <span class="docutils literal"><span class="pre">alphabeta-euenc.def</span></span> to
<span class="docutils literal"><span class="pre">alphabeta-tuenc.def</span></span>.</p></td>
</tr>
+<tr><td><p>1.0</p></td>
+<td><p>2020/09/25</p></td>
+<td><p>New package version. No changes in this file.</p></td>
+</tr>
+<tr><td><p>2.0</p></td>
+<td><p>2020/10/13</p></td>
+<td><p>Provide <span class="docutils literal">\Koppa</span>.</p></td>
+</tr>
</tbody>
</table>
</dd>
@@ -735,7 +743,7 @@ the next steps until the start of the document body:</p>
</section>
<section id="save-math-macros">
<h3>Save math macros</h3>
-<p>Provide an alias for the standard math commands:</p>
+<p>Map the standard math commands to maths-specific names:</p>
<pre class="literal-block">\let\mathGamma\Gamma
\let\mathDelta\Delta
\let\mathTheta\Theta
@@ -867,6 +875,7 @@ in both, text and math mode.</p>
\providecommand*{\stigma}{\textstigma} % ϛ
\providecommand*{\varstigma}{\textvarstigma} % stigma variant (CB.enc, teubner)
\providecommand*{\koppa}{\textkoppa} % ϟ (greek small letter koppa)
+\providecommand*{\Koppa}{\textKoppa} % Ϟ (greek letter koppa)
\providecommand*{\qoppa}{\textqoppa} % ϙ (archaic koppa)
\providecommand*{\Qoppa}{\textQoppa} % Ϙ (archaic Koppa)
\providecommand*{\Stigma}{\textStigma} % Ϛ (in some fonts ϹΤ ligature)
@@ -877,7 +886,7 @@ in both, text and math mode.</p>
<h4>Variant shape symbols</h4>
<p>TeX’s concept of “standard” vs. “variant” math symbols does not map to the
distinction between GREEK LETTER … vs. GREEK … SYMBOL in the Unicode
-standard (see <a class="reference external" href="tuenc-greek-doc.pdf">tuenc-greek-doc.pdf</a>).</p>
+standard (see <a class="reference external" href="test-tuenc-greek.pdf">test-tuenc-greek.pdf</a>).</p>
<p>The <span class="docutils literal"><span class="pre">\...symbol</span></span> macros select the GREEK … SYMBOL in both, text and
math mode. For <span class="docutils literal">\epsilonsymbol</span> and <span class="docutils literal">\phisymbol</span> this is the default
shape in math mode. The <span class="docutils literal"><span class="pre">\var...</span></span> macros select the shape used by TeX
@@ -918,11 +927,12 @@ it. In order to let compositions like <span class="docutils literal"><span class
<span class="docutils literal"><span class="pre">\ensuregreek{\&gt;&quot;\alpha}</span></span> work as expected we define TextComposites with the
<cite>letter name commands</cite>. (Composition only works if the active font encoding
is LGR).</p>
-<pre class="literal-block">\ifdefined\UTFencname
+<pre class="literal-block">\&#64;ifl&#64;aded{def}{tuenc-greek}{
\input{alphabeta-tuenc.def}
-\else % 8-bit TeX
+}{}
+\&#64;ifl&#64;aded{def}{lgrenc}{
\input{alphabeta-lgr.def}
-\fi</pre>
+}{}</pre>
</section>
<section id="re-definition-for-greek-unicode-input-in-math-mode">
<h3>Re-definition for Greek Unicode input in math mode</h3>
diff --git a/language/greek/greek-fontenc/diacritics.pdf b/language/greek/greek-fontenc/diacritics.pdf
index 59e6183c97..e4d03b8b78 100644
--- a/language/greek/greek-fontenc/diacritics.pdf
+++ b/language/greek/greek-fontenc/diacritics.pdf
Binary files differ
diff --git a/language/greek/greek-fontenc/diacritics.tex b/language/greek/greek-fontenc/diacritics.tex
index b885c948f5..dddfbc2560 100644
--- a/language/greek/greek-fontenc/diacritics.tex
+++ b/language/greek/greek-fontenc/diacritics.tex
@@ -2,7 +2,7 @@
\documentclass[a4paper,polutonikogreek,british]{article}
\pagestyle{empty}
\usepackage[margin=2.9cm]{geometry}
-\usepackage{cmap} % fix search and cut-and-paste in Acrobat Reader
+% \usepackage{cmap} % fix search and cut-and-paste in Acrobat Reader
\usepackage%
{lmodern}
@@ -47,6 +47,7 @@
\title{Greek diacritics with standard accent macros}
\author{G\"unter Milde}
+\date{\filedate}
\maketitle
The font encoding definition file \texttt{lgrenc.def} defines LICR macros
@@ -90,15 +91,7 @@ Improvements over the ligature-based approach in LGR:
%
\begin{itemize}
-\item Accents can be placed on any character:%
- \footnote{In babel-greek versions < 1.4, Babel's \emph{polutonikogreek}
- option re-defined \textbackslash\textasciitilde (even for
- Latin with \textbackslash textlatin).
- This document reverted the babel definition in the preamble
- to make the tilde/perispomeni-accent work as usual in both,
- English (\textgreek{ni\~n\~o} ni\~n\~o) and Greek %
- % (\foreignlanguage{greek}{ni\~n\~o \textlatin{ni\~n\~o}}).
- .}
+\item Accents can be placed on any character:
\textgreek{\"k \`l \'m \~<n \<o \>'p \>9 \`\>-}
\item Kerning is preserved
diff --git a/language/greek/greek-fontenc/greek-euenc.def b/language/greek/greek-fontenc/greek-euenc.def
index 3835e17e5c..d5201ac8ff 100644
--- a/language/greek/greek-fontenc/greek-euenc.def
+++ b/language/greek/greek-fontenc/greek-euenc.def
@@ -9,6 +9,12 @@
% version 1.3 of this license or any later version.
\ProvidesFile{greek-euenc.def}
-[2020/02/28 1.0 Greek LICRs for XeTeX and LuaTeX]
+[2020/02/28 2.0 Greek LICRs for XeTeX and LuaTeX]
+
+% Just in case there is an old fontspec using EU1 or EU2::
+
+\ifdefined \UTFencname % set by fontspec
+ \providecommand*{\UnicodeEncodingName}{\UTFencname} % TU, EU1, or EU2
+\fi
\input{tuenc-greek.def}
diff --git a/language/greek/greek-fontenc/greek-fontenc.def b/language/greek/greek-fontenc/greek-fontenc.def
index 0af15b2cab..8f90f9362e 100644
--- a/language/greek/greek-fontenc/greek-fontenc.def
+++ b/language/greek/greek-fontenc/greek-fontenc.def
@@ -12,7 +12,7 @@
% ::
\ProvidesFile{greek-fontenc.def}
-[2020/09/25 1.0 Common Greek font encoding definitions]
+[2020/10/30 2.0 Common Greek font encoding definitions]
% :Abstract: This file provides definitions that are shared between
% font encodings providing Greek characters.
@@ -27,7 +27,8 @@
% 0.12 2014-12-12 Remove symbol macros for breathing accents.
% 0.13 2015-08-04 No @uclclist entry for ypogegrammeni/prosgegrammeni.
% 0.13.4 2019-07-10 ``@uclclist`` entry for ``\prosgegrammeni``.
-% 1.0 2020/09/25 ``\textKoppa`` as alias for ``\textkoppa`` in LGR.
+% 1.0 2020-09-25 ``\textKoppagreek`` and ``\textstigmagreek`` aliases.
+% 2.0 2020/10/30 Alias definitions matching mathematical variant symbols.
% ====== ============ =========================================================
%
% Usage
@@ -67,9 +68,25 @@
%
% Aliases are defined via `DeclareTextCommand` so that up/downcasing works
% without the need for additional uclclist_ entries.
-%
+
+
+% Names matching mathematical variant symbols::
+
+% \var... matching GREEK ... SYMBOL
+\DeclareTextCommand{\textvarbeta}{\LastDeclaredEncoding}{\textbetasymbol} % ϐ
+\DeclareTextCommand{\textvarkappa}{\LastDeclaredEncoding}{\textkappasymbol} % ϰ
+\DeclareTextCommand{\textvarTheta}{\LastDeclaredEncoding}{\textThetasymbol} % ϴ
+\DeclareTextCommand{\textvartheta}{\LastDeclaredEncoding}{\textthetasymbol} % ϑ
+\DeclareTextCommand{\textvarpi}{\LastDeclaredEncoding}{\textpisymbol} % ϖ
+\DeclareTextCommand{\textvarrho}{\LastDeclaredEncoding}{\textrhosymbol} % ϱ
+% \var... matching GREEK LETTER ...
+\DeclareTextCommand{\textvarepsilon}{\LastDeclaredEncoding}{\textepsilon} % ε
+\DeclareTextCommand{\textvarphi}{\LastDeclaredEncoding}{\textphi} % φ
+\DeclareTextCommand{\textvarsigma}{\LastDeclaredEncoding}{\textfinalsigma} % ς
+
% Compatibility aliases for hyperref_'s puenc.def::
+\DeclareTextCommand{\textmugreek}{\LastDeclaredEncoding}{\textmu}
\DeclareTextCommand{\textkoppagreek}{\LastDeclaredEncoding}{\textkoppa}
\DeclareTextCommand{\textKoppagreek}{\LastDeclaredEncoding}{\textKoppa}
\DeclareTextCommand{\textStigmagreek}{\LastDeclaredEncoding}{\textStigma}
@@ -92,6 +109,7 @@
% Two Unicode code points and names for one character::
\DeclareTextCommand{\accoxia}{\LastDeclaredEncoding}{\acctonos}
+\DeclareTextCommand{\accdialytikaoxia}{\LastDeclaredEncoding}{\accdialyikatonos}
\DeclareTextCommand{\acckoronis}{\LastDeclaredEncoding}{\accpsili}
% Symbol macros for the breathings:
@@ -129,6 +147,7 @@
%
% .. code:: latex
%
+% \accdialyticavaria\textalpha,
% \accdialytica\accvaria\textalpha,
% \"\'\textalpha,
% \"'\textalpha, or
@@ -249,7 +268,7 @@
%
% Based on the `babel patch`_ and ``fontenc.sty``.
%
-% The definition of an auxiliary, self-restting macro makes this idempotent
+% The definition of an auxiliary, self-resetting macro makes this idempotent
% (only the first use of this function will expand the ``@uclclist``).
% The second and third lines are TeX' way of writing ``uclclist += …``::
@@ -271,38 +290,38 @@
\accdialytikaperispomeni\LGR@accDialytika
\accperispomeni\LGR@accdropped
\LGR@ypogegrammeni\prosgegrammeni
- \textalpha \textAlpha
- \textbeta \textBeta
- \textgamma \textGamma
- \textdelta \textDelta
- \textepsilon \textEpsilon
- \textzeta \textZeta
- \texteta \textEta
- \texttheta \textTheta
- \textiota \textIota
- \textkappa \textKappa
- \textlambda \textLambda
- \textmu \textMu
- \textnu \textNu
- \textxi \textXi
- \textomicron \textOmicron
- \textpi \textPi
- \textrho \textRho
- \textvarsigma \textSigma
- \textsigma \textSigma
- \textautosigma \textSigma
- \texttau \textTau
- \textupsilon \textUpsilon
- \textphi \textPhi
- \textchi \textChi
- \textpsi \textPsi
- \textomega \textOmega
- \textkoppa \textKoppa
- \textqoppa \textQoppa
- \textvarstigma \textStigma
- \textstigma \textStigma
- \textsampi \textSampi
- \textdigamma \textDigamma
+ \textalpha \textAlpha
+ \textbeta \textBeta
+ \textgamma \textGamma
+ \textdelta \textDelta
+ \textepsilon \textEpsilon
+ \textzeta \textZeta
+ \texteta \textEta
+ \texttheta \textTheta
+ \textiota \textIota
+ \textkappa \textKappa
+ \textlambda \textLambda
+ \textmu \textMu
+ \textnu \textNu
+ \textxi \textXi
+ \textomicron \textOmicron
+ \textpi \textPi
+ \textrho \textRho
+ \textfinalsigma \textSigma
+ \textsigma \textSigma
+ \textautosigma \textSigma
+ \texttau \textTau
+ \textupsilon \textUpsilon
+ \textphi \textPhi
+ \textchi \textChi
+ \textpsi \textPsi
+ \textomega \textOmega
+ \textkoppa \textKoppa
+ \textqoppa \textQoppa
+ \textvarstigma \textStigma
+ \textstigma \textStigma
+ \textsampi \textSampi
+ \textdigamma \textDigamma
}%
\let\update@uclc@with@greek\relax
}
@@ -354,8 +373,8 @@
% Epsilon. As ``\@ifnextchar`` gobbles spaces the lookahead macro definition
% from ``amsgen.sty`` is used:
%
-% This macro is a new version of LaTeX’s ``\@ifnextchar``, macro
-% that does not skip over spaces.
+% This macro is a variant of LaTeX’s ``\@ifnextchar``, macro
+% that does not skip over spaces.
%
% ::
@@ -370,7 +389,6 @@
}
-
% .. References
% ----------
%
diff --git a/language/greek/greek-fontenc/greek-fontenc.def.html b/language/greek/greek-fontenc/greek-fontenc.def.html
index 1cc5050126..a7dd6dc910 100644
--- a/language/greek/greek-fontenc/greek-fontenc.def.html
+++ b/language/greek/greek-fontenc/greek-fontenc.def.html
@@ -620,7 +620,7 @@ version 1.3 of this license or any later version.</p>
</dd>
<dt class="identification">Identification</dt>
<dd class="identification"><pre class="literal-block">\ProvidesFile{greek-fontenc.def}
-[2020/09/25 1.0 Common Greek font encoding definitions]</pre>
+[2020/10/30 2.0 Common Greek font encoding definitions]</pre>
</dd>
</dl>
<div class="abstract topic">
@@ -662,8 +662,12 @@ font encodings providing Greek characters.</p>
<td><p><span class="docutils literal">&#64;uclclist</span> entry for <span class="docutils literal">\prosgegrammeni</span>.</p></td>
</tr>
<tr><td><p>1.0</p></td>
-<td><p>2020/09/25</p></td>
-<td><p><span class="docutils literal">\textKoppa</span> as alias for <span class="docutils literal">\textkoppa</span> in LGR.</p></td>
+<td><p>2020-09-25</p></td>
+<td><p><span class="docutils literal">\textKoppagreek</span> and <span class="docutils literal">\textstigmagreek</span> aliases.</p></td>
+</tr>
+<tr><td><p>2.0</p></td>
+<td><p>2020/10/30</p></td>
+<td><p>Alias definitions matching mathematical variant symbols.</p></td>
</tr>
</tbody>
</table>
@@ -697,8 +701,21 @@ the Greek script, if required. The following definition announces the
<h3>Aliases</h3>
<p>Aliases are defined via <cite>DeclareTextCommand</cite> so that up/downcasing works
without the need for additional <a class="reference internal" href="#uclclist">uclclist</a> entries.</p>
+<p>Names matching mathematical variant symbols:</p>
+<pre class="literal-block">% \var... matching GREEK ... SYMBOL
+\DeclareTextCommand{\textvarbeta}{\LastDeclaredEncoding}{\textbetasymbol} % ϐ
+\DeclareTextCommand{\textvarkappa}{\LastDeclaredEncoding}{\textkappasymbol} % ϰ
+\DeclareTextCommand{\textvarTheta}{\LastDeclaredEncoding}{\textThetasymbol} % ϴ
+\DeclareTextCommand{\textvartheta}{\LastDeclaredEncoding}{\textthetasymbol} % ϑ
+\DeclareTextCommand{\textvarpi}{\LastDeclaredEncoding}{\textpisymbol} % ϖ
+\DeclareTextCommand{\textvarrho}{\LastDeclaredEncoding}{\textrhosymbol} % ϱ
+% \var... matching GREEK LETTER ...
+\DeclareTextCommand{\textvarepsilon}{\LastDeclaredEncoding}{\textepsilon} % ε
+\DeclareTextCommand{\textvarphi}{\LastDeclaredEncoding}{\textphi} % φ
+\DeclareTextCommand{\textvarsigma}{\LastDeclaredEncoding}{\textfinalsigma} % ς</pre>
<p>Compatibility aliases for <a class="reference external" href="http://ctan.org/pkg/hyperref">hyperref</a>’s puenc.def:</p>
-<pre class="literal-block">\DeclareTextCommand{\textkoppagreek}{\LastDeclaredEncoding}{\textkoppa}
+<pre class="literal-block">\DeclareTextCommand{\textmugreek}{\LastDeclaredEncoding}{\textmu}
+\DeclareTextCommand{\textkoppagreek}{\LastDeclaredEncoding}{\textkoppa}
\DeclareTextCommand{\textKoppagreek}{\LastDeclaredEncoding}{\textKoppa}
\DeclareTextCommand{\textStigmagreek}{\LastDeclaredEncoding}{\textStigma}
\DeclareTextCommand{\textstigmagreek}{\LastDeclaredEncoding}{\textstigma}
@@ -714,6 +731,7 @@ without the need for additional <a class="reference internal" href="#uclclist">u
</span><span class="keyword">\DeclareTextCommand</span><span class="name builtin">{</span><span class="keyword">\katwtonos</span><span class="name builtin">}{</span><span class="keyword">\LastDeclaredEncoding</span><span class="name builtin">}{</span><span class="keyword">\textaristerikeraia</span><span class="name builtin">}</span> <span class="comment">% ͵</span></code></pre>
<p>Two Unicode code points and names for one character:</p>
<pre class="literal-block">\DeclareTextCommand{\accoxia}{\LastDeclaredEncoding}{\acctonos}
+\DeclareTextCommand{\accdialytikaoxia}{\LastDeclaredEncoding}{\accdialyikatonos}
\DeclareTextCommand{\acckoronis}{\LastDeclaredEncoding}{\accpsili}</pre>
<p>Symbol macros for the breathings:</p>
<p>Moved to <span class="docutils literal">textalpha.sty</span> to avoid clashes with local definitions
@@ -738,7 +756,8 @@ table, LCI encoding)?</p>
<p>Composite accents can be input as sequence of simple diacritics (in
arbitrary order) via named macro, symbol macro and “transcription
characters”, e.g. one of</p>
-<pre class="code latex literal-block"><code><span class="keyword">\accdialytica\accvaria\textalpha</span>,
+<pre class="code latex literal-block"><code><span class="keyword">\accdialyticavaria\textalpha</span>,
+<span class="keyword">\accdialytica\accvaria\textalpha</span>,
<span class="keyword">\&quot;\'\textalpha</span>,
<span class="keyword">\&quot;</span>'<span class="keyword">\textalpha</span>, or
<span class="keyword">\'</span>&quot;<span class="keyword">\textalpha</span>.</code></pre>
@@ -845,7 +864,7 @@ the CB Fonts, a small capital adscript iota is used.</p>
<section id="uclclist-extension">
<h4>&#64;uclclist extension</h4>
<p>Based on the <a class="reference external" href="http://www.eutypon.gr/eutypon/pdf/e2008-20/e20-a03.pdf">babel patch</a> and <span class="docutils literal">fontenc.sty</span>.</p>
-<p>The definition of an auxiliary, self-restting macro makes this idempotent
+<p>The definition of an auxiliary, self-resetting macro makes this idempotent
(only the first use of this function will expand the <span class="docutils literal">&#64;uclclist</span>).
The second and third lines are TeX’ way of writing <span class="docutils literal">uclclist += …</span>:</p>
<pre class="literal-block">\providecommand*\update&#64;uclc&#64;with&#64;greek{%
@@ -866,38 +885,38 @@ The second and third lines are TeX’ way of writing <span class="docutils liter
\accdialytikaperispomeni\LGR&#64;accDialytika
\accperispomeni\LGR&#64;accdropped
\LGR&#64;ypogegrammeni\prosgegrammeni
- \textalpha \textAlpha
- \textbeta \textBeta
- \textgamma \textGamma
- \textdelta \textDelta
- \textepsilon \textEpsilon
- \textzeta \textZeta
- \texteta \textEta
- \texttheta \textTheta
- \textiota \textIota
- \textkappa \textKappa
- \textlambda \textLambda
- \textmu \textMu
- \textnu \textNu
- \textxi \textXi
- \textomicron \textOmicron
- \textpi \textPi
- \textrho \textRho
- \textvarsigma \textSigma
- \textsigma \textSigma
- \textautosigma \textSigma
- \texttau \textTau
- \textupsilon \textUpsilon
- \textphi \textPhi
- \textchi \textChi
- \textpsi \textPsi
- \textomega \textOmega
- \textkoppa \textKoppa
- \textqoppa \textQoppa
- \textvarstigma \textStigma
- \textstigma \textStigma
- \textsampi \textSampi
- \textdigamma \textDigamma
+ \textalpha \textAlpha
+ \textbeta \textBeta
+ \textgamma \textGamma
+ \textdelta \textDelta
+ \textepsilon \textEpsilon
+ \textzeta \textZeta
+ \texteta \textEta
+ \texttheta \textTheta
+ \textiota \textIota
+ \textkappa \textKappa
+ \textlambda \textLambda
+ \textmu \textMu
+ \textnu \textNu
+ \textxi \textXi
+ \textomicron \textOmicron
+ \textpi \textPi
+ \textrho \textRho
+ \textfinalsigma \textSigma
+ \textsigma \textSigma
+ \textautosigma \textSigma
+ \texttau \textTau
+ \textupsilon \textUpsilon
+ \textphi \textPhi
+ \textchi \textChi
+ \textpsi \textPsi
+ \textomega \textOmega
+ \textkoppa \textKoppa
+ \textqoppa \textQoppa
+ \textvarstigma \textStigma
+ \textstigma \textStigma
+ \textsampi \textSampi
+ \textdigamma \textDigamma
}%
\let\update&#64;uclc&#64;with&#64;greek\relax
}</pre>
@@ -933,10 +952,8 @@ second vowel if they are dropped (άυλος → ΑΫΛΟΣ, μάινα → ΜΑ
<p>The following macro can be used to test if the next character is an Alpha or
Epsilon. As <span class="docutils literal">\&#64;ifnextchar</span> gobbles spaces the lookahead macro definition
from <span class="docutils literal">amsgen.sty</span> is used:</p>
-<blockquote>
-<p>This macro is a new version of LaTeX’s <span class="docutils literal">\&#64;ifnextchar</span>, macro
+<p>This macro is a variant of LaTeX’s <span class="docutils literal">\&#64;ifnextchar</span>, macro
that does not skip over spaces.</p>
-</blockquote>
<pre class="literal-block">\providecommand*{\LGR&#64;ifnextchar}[3]{%
\let\reserved&#64;d= #1%
\def\reserved&#64;a{#2}\def\reserved&#64;b{#3}%
diff --git a/language/greek/greek-fontenc/greek-fontenc.html b/language/greek/greek-fontenc/greek-fontenc.html
index e0e864507f..6b9caa68f7 100644
--- a/language/greek/greek-fontenc/greek-fontenc.html
+++ b/language/greek/greek-fontenc/greek-fontenc.html
@@ -628,25 +628,48 @@ version 1.3 of this license or any later version.</p>
verbose but failsafe 7-bit ASCII encoding that works unaltered
under both, 8-bit TeX and XeTeX/LuaTeX. Use cases are macro
definitions and generated text</p>
-<p>This package provides <a class="reference internal" href="#greek-licr-macros">Greek LICR macros</a> and encoding
-definition files for <a class="reference internal" href="#greek-text-font-encodings">Greek text font encodings</a> for use with
-<a class="reference external" href="http://www.ctan.org/pkg/fontenc">fontenc</a> (8-bit TeX) or <a class="reference external" href="http://www.ctan.org/pkg/fontspec">fontspec</a> (XeTeX/LuaTeX).</p>
+<p>This bundle provides LICR macros for characters from the
+Greek script and encoding definition files for
+<a class="reference internal" href="#greek-text-font-encodings">Greek text font encodings</a> for use with <a class="reference external" href="http://www.ctan.org/pkg/fontenc">fontenc</a> (8-bit TeX)
+or <a class="reference external" href="http://www.ctan.org/pkg/fontspec">fontspec</a> (XeTeX/LuaTeX).</p>
<p>Included are also the LaTeX packages <a class="reference internal" href="#textalpha">textalpha</a> and <a class="reference internal" href="#alphabeta">alphabeta</a>.</p>
</div>
-<div class="admonition note">
-<p class="admonition-title">Note</p>
-<p>The LICR macro names for Greek symbols are chosen pending
-endorsement by the TeX community and related packages.</p>
-<p>Names for archaic characters, accents/diacritics, and
-punctuation may change in future versions.</p>
+<div class="contents topic" id="contents">
+<p class="topic-title">Contents</p>
+<ul class="simple">
+<li><p><a class="reference internal" href="#changelog" id="id19">Changelog</a></p></li>
+<li><p><a class="reference internal" href="#tex-files" id="id20">TeX files</a></p></li>
+<li><p><a class="reference internal" href="#documentation-and-test-documents" id="id21">Documentation and test documents</a></p></li>
+<li><p><a class="reference internal" href="#experimental-files" id="id22">Experimental files</a></p></li>
+<li><p><a class="reference internal" href="#installation" id="id23">Installation</a></p></li>
+<li><p><a class="reference internal" href="#conflicts" id="id24">Conflicts</a></p></li>
+<li><p><a class="reference internal" href="#usage" id="id25">Usage</a></p></li>
+<li><p><a class="reference internal" href="#greek-text-font-encodings" id="id26">Greek text font encodings</a></p>
+<ul>
+<li><p><a class="reference internal" href="#t7" id="id27">T7</a></p></li>
+<li><p><a class="reference internal" href="#lgr" id="id28">LGR</a></p></li>
+<li><p><a class="reference internal" href="#lgi" id="id29">LGI</a></p></li>
+<li><p><a class="reference internal" href="#tu" id="id30">TU</a></p></li>
+<li><p><a class="reference internal" href="#pu" id="id31">PU</a></p></li>
+</ul>
+</li>
+<li><p><a class="reference internal" href="#selecting-greek-licr-macro-names" id="id32">Selecting Greek LICR macro names</a></p>
+<ul>
+<li><p><a class="reference internal" href="#letters-and-symbols" id="id33">letters and symbols</a></p></li>
+<li><p><a class="reference internal" href="#accent-macros" id="id34">accent macros</a></p></li>
+<li><p><a class="reference internal" href="#symbol-variants" id="id35">symbol variants</a></p></li>
+</ul>
+</li>
+<li><p><a class="reference internal" href="#references" id="id36">References</a></p></li>
+</ul>
</div>
<section id="changelog">
-<h2>Changelog</h2>
+<h2><a class="toc-backref" href="#id19">Changelog</a></h2>
<table class="borderless">
<colgroup>
<col style="width: 8%" />
-<col style="width: 15%" />
-<col style="width: 77%" />
+<col style="width: 14%" />
+<col style="width: 78%" />
</colgroup>
<tbody>
<tr><td><p>0.9</p></td>
@@ -796,25 +819,67 @@ Rename <span class="docutils literal"><span class="pre">greek-euenc</span></span
<td></td>
<td><p>Update URLs.</p></td>
</tr>
+<tr><td><p>2.0</p></td>
+<td><p>2020-10-30</p></td>
+<td><p>Move common alias definitions to <span class="docutils literal"><span class="pre">greek-fontenc.def</span></span>.</p></td>
+</tr>
+<tr><td><!-- -->
+</td>
+<td></td>
+<td><p><a class="reference internal" href="#textalpha">textalpha</a> loads TU with Xe/LuaTeX by default and
+provides <span class="docutils literal">\textmicro</span> and LICR macros for archaic
+symbols from the Greek and Coptic Unicode block.</p></td>
+</tr>
+<tr><td><!-- -->
+</td>
+<td></td>
+<td><p>Use <span class="docutils literal">\UnicodeEncodingName</span> (by the LaTeX kernel) instead
+of <span class="docutils literal">\UTFencname</span> for the Unicode font encoding name.</p></td>
+</tr>
+<tr><td><!-- -->
+</td>
+<td></td>
+<td><p>Replace utf8 literals in <span class="docutils literal"><span class="pre">tuenc-greek.def</span></span>.</p></td>
+</tr>
+<tr><td><!-- -->
+</td>
+<td></td>
+<td><p>New file puenc-greek.def: setup for PU encoding
+(defined by <a class="reference external" href="http://www.ctan.org/pkg/hyperref">hyperref</a> for PDF strings).</p></td>
+</tr>
+<tr><td><!-- -->
+</td>
+<td></td>
+<td><p>Don’t use <span class="docutils literal">\textcompwordmark</span> as base in accent commands.</p></td>
+</tr>
+<tr><td><!-- -->
+</td>
+<td></td>
+<td><p>Documentation update.</p></td>
+</tr>
</tbody>
</table>
</section>
<section id="tex-files">
-<h2>TeX files</h2>
-<dl class="simple">
-<dt><a class="reference external" href="greek-fontenc.def">greek-fontenc.def</a></dt>
-<dd><p><a class="reference external" href="greek-fontenc.def.html">Common Greek font encoding definitions</a>.</p>
-</dd>
-<dt><a class="reference external" href="greek-euenc.def">greek-euenc.def</a></dt>
-<dd><p>Backwards compatibility file loading <a class="reference internal" href="#tuenc-greek">tuenc-greek</a>.</p>
-</dd>
-</dl>
-<dl id="lgr-font-encoding-definition-file">
+<h2><a class="toc-backref" href="#id20">TeX files</a></h2>
+<dl>
<dt><a class="reference external" href="lgrenc.def">lgrenc.def</a></dt>
<dd><p><a class="reference external" href="lgrenc.def.html">LGR Greek font encoding definitions</a>.</p>
<p>This file is the successor of the basic LGR encoding definition file which
comes with <a class="reference external" href="http://www.ctan.org/pkg/babel">babel</a>’s Greek support and the now obsolete <a class="reference external" href="http://www.ctan.org/pkg/lgrx">lgrx</a> bundle.</p>
</dd>
+<dt id="tuenc-greek"><a class="reference external" href="tuenc-greek.def">tuenc-greek.def</a></dt>
+<dd><p><a class="reference external" href="tuenc-greek.def.html">Font setup for Greek with XeTeX/LuaTeX</a>.</p>
+</dd>
+<dt><a class="reference external" href="puenc-greek.def">puenc-greek.def</a></dt>
+<dd><p><a class="reference external" href="puenc-greek.def.html">Greek LICR definitions for PDF strings</a>.</p>
+</dd>
+<dt><a class="reference external" href="greek-fontenc.def">greek-fontenc.def</a></dt>
+<dd><p><a class="reference external" href="greek-fontenc.def.html">Common Greek font encoding definitions</a>.</p>
+</dd>
+<dt id="lgr-font-encoding-definition-file"><a class="reference external" href="greek-euenc.def">greek-euenc.def</a></dt>
+<dd><p>Backwards compatibility file loading <a class="reference internal" href="#tuenc-greek">tuenc-greek</a>.</p>
+</dd>
<dt id="textalpha"><a class="reference external" href="textalpha.sty">textalpha.sty</a></dt>
<dd><p><a class="reference external" href="textalpha.sty.html">Greek symbols in text</a></p>
<p>Use <span class="docutils literal">\textalpha</span> … <span class="docutils literal">\textOmega</span> independent of font encoding and TeX
@@ -824,41 +889,50 @@ engine.</p>
<dd><p><a class="reference external" href="alphabeta.sty.html">Greek symbols in text and math</a>.</p>
<p>Use <span class="docutils literal">\alpha</span> … <span class="docutils literal">\Omega</span> independent of text/math mode, font
encoding, and TeX engine.</p>
+<dl class="simple">
+<dt><a class="reference external" href="alphabeta-lgr.def">alphabeta-lgr.def</a></dt>
+<dd><p><a class="reference external" href="alphabeta-lgr.def.html">Composite definitions for 8-bit TeX.</a>.</p>
</dd>
<dt><a class="reference external" href="alphabeta-tuenc.def">alphabeta-tuenc.def</a></dt>
<dd><p><a class="reference external" href="alphabeta-tuenc.def.html">Composite definitions with XeTeX/LuaTeX.</a>.</p>
</dd>
-<dt id="tuenc-greek"><a class="reference external" href="tuenc-greek.def">tuenc-greek.def</a></dt>
-<dd><p><a class="reference external" href="tuenc-greek.def.html">Font setup for Greek with XeTeX/LuaTeX</a>.</p>
+</dl>
</dd>
</dl>
<p>Literate source files were converted with <a class="reference external" href="http://pypi.python.org/pypi/pylit">PyLit</a> to <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> and
with <a class="reference external" href="http://docutils.sourceforge.net/rst.html">Docutils</a> to the HTML documentation.</p>
</section>
<section id="documentation-and-test-documents">
-<h2>Documentation and test documents</h2>
-<dl>
-<dt><cite>textalpha</cite> package documentation:</dt>
-<dd><p><a class="reference external" href="textalpha-doc.tex">textalpha-doc.tex</a>, <a class="reference external" href="textalpha-doc.pdf">textalpha-doc.pdf</a></p>
+<h2><a class="toc-backref" href="#id21">Documentation and test documents</a></h2>
+<dl class="simple">
+<dt>Overview:</dt>
+<dd><p><a class="reference external" href="README">README</a>, <a class="reference external" href="greek-fontenc.html">greek-fontenc.html</a></p>
+</dd>
+<dt><a class="reference internal" href="#textalpha">textalpha</a> package documentation:</dt>
+<dd><p><a class="reference external" href="textalpha-doc.tex">textalpha-doc.tex</a>, <a class="reference external" href="textalpha-doc.pdf">textalpha-doc.pdf</a>, <a class="reference external" href="textalpha-tu.pdf">textalpha-tu.pdf</a></p>
+</dd>
+<dt><a class="reference internal" href="#alphabeta">alphabeta</a> package documentation:</dt>
+<dd><p><a class="reference external" href="alphabeta-doc.tex">alphabeta-doc.tex</a>, <a class="reference external" href="alphabeta-doc.pdf">alphabeta-doc.pdf</a>, <a class="reference external" href="alphabeta-tu.pdf">alphabeta-tu.pdf</a></p>
</dd>
-<dt><cite>alphabeta</cite> package documentation:</dt>
-<dd><p><a class="reference external" href="alphabeta-doc.tex">alphabeta-doc.tex</a> <a class="reference external" href="alphabeta-doc.pdf">alphabeta-doc.pdf</a></p>
+<dt>LGR test and usage example</dt>
+<dd><p><a class="reference external" href="test-lgrenc.tex">test-lgrenc.tex</a>, <a class="reference external" href="test-lgrenc.pdf">test-lgrenc.pdf</a></p>
</dd>
-<dt>Test and usage example</dt>
-<dd><p><a class="reference external" href="lgrenc-test.tex">lgrenc-test.tex</a>, <a class="reference external" href="lgrenc-test.pdf">lgrenc-test.pdf</a></p>
+<dt>TU test and usage example</dt>
+<dd><p><a class="reference external" href="test-tuenc-greek.tex">test-tuenc-greek.tex</a>, <a class="reference external" href="test-tuenc-greek.pdf">test-tuenc-greek.pdf</a></p>
</dd>
-<dt>Font setup for Greek with XeTeX/LuaTeX</dt>
-<dd><p><a class="reference external" href="tuenc-greek-doc.tex">tuenc-greek-doc.tex</a>, <a class="reference external" href="tuenc-greek-doc.pdf">tuenc-greek-doc.pdf</a></p>
+<dt><a class="reference external" href="http://www.ctan.org/pkg/hyperref">Hyperref</a> test and usage example</dt>
+<dd><p><a class="reference external" href="hyperref-with-greek.tex">hyperref-with-greek.tex</a>, <a class="reference external" href="hyperref-with-greek.pdf">hyperref-with-greek.pdf</a></p>
</dd>
-<dt>Greek script in PDF metadata</dt>
-<dd><p><a class="reference external" href="greekhyperref.tex">greekhyperref.tex</a>, <a class="reference external" href="greekhyperref.pdf">greekhyperref.pdf</a></p>
-<p>The package <a class="reference external" href="http://www.ctan.org/pkg/hyperref">hyperref</a> defines the PU font encoding which also supports
-(monotonic) Greek.</p>
+<dt>Test with input encodings other than utf-8</dt>
+<dd><p><a class="reference external" href="test-inputenc.tex">test-inputenc.tex</a>, <a class="reference external" href="test-inputenc.pdf">test-inputenc.pdf</a></p>
+</dd>
+<dt>Greek diacritics with standard accent macros</dt>
+<dd><p><a class="reference external" href="diacritics.tex">diacritics.tex</a>, <a class="reference external" href="diacritics.pdf">diacritics.pdf</a></p>
</dd>
</dl>
</section>
<section id="experimental-files">
-<h2>Experimental files</h2>
+<h2><a class="toc-backref" href="#id22">Experimental files</a></h2>
<p>These files are still in development and will eventually be moved to/merged
with other packages or removed in future versions:</p>
<dl class="simple">
@@ -868,8 +942,8 @@ with other packages or removed in future versions:</p>
</dl>
</section>
<section id="installation">
-<h2>Installation</h2>
-<p>If possible, get this package from your distribution using its installation
+<h2><a class="toc-backref" href="#id23">Installation</a></h2>
+<p>If possible, get the bundle from your distribution using its installation
manager.</p>
<p>Otherwise, make sure LaTeX can find the package and definition files:</p>
<ul class="simple">
@@ -880,30 +954,36 @@ the current working directory (e.g. for testing).</p></li>
</ul>
</section>
<section id="conflicts">
-<h2>Conflicts</h2>
+<h2><a class="toc-backref" href="#id24">Conflicts</a></h2>
<p>The <a class="reference external" href="https://www.ctan.org/pkg/arabi">arabi</a> package provides the Babel <span class="docutils literal">arabic</span> option which loads
<span class="docutils literal">arabicfnt.sty</span> for font setup. This package overwrites the LICR macros
<span class="docutils literal">\omega</span> and <span class="docutils literal">\textomega</span> with font selecting commands. See the report
for Debian <a class="reference external" href="https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=858987">bug 858987</a> for details and the <a class="reference internal" href="#arabi-workaround">arabi workaround</a> below.</p>
</section>
<section id="usage">
-<h2>Usage</h2>
+<h2><a class="toc-backref" href="#id25">Usage</a></h2>
<p>There are several alternatives to set up the support for a Greek font
-encoding provided by this package, e.g.:</p>
+encoding provided by this bundle, e.g.:</p>
<dl>
+<dt>Babel:</dt>
+<dd><p>Use the <span class="docutils literal">greek</span> option with <a class="reference external" href="http://www.ctan.org/pkg/babel">Babel</a>:</p>
+<pre class="literal-block">\usepackage[greek]{babel}</pre>
+<p>This automatically loads <span class="docutils literal">lgrenc.def</span> with 8-bit TeX and
+<span class="docutils literal"><span class="pre">tuenc-greek.def</span></span> with XeTeX/LuaTeX and provides localized auto-strings,
+hyphenation and other localizations (see <a class="reference external" href="http://www.ctan.org/pkg/babel-greek">babel-greek</a>).</p>
+<p>Babel can be used together with <a class="reference internal" href="#textalpha">textalpha</a> or <a class="reference internal" href="#alphabeta">alphabeta</a>.</p>
+</dd>
<dt><a class="reference internal" href="#textalpha">textalpha</a>:</dt>
<dd><p>Ensure support for Greek characters in text mode:</p>
<pre class="literal-block">\usepackage{textalpha}</pre>
-<p>eventually with the <a class="reference external" href="textalpha.sty.html#normalize-symbols">normalize-symbols</a> option to handle <a class="reference internal" href="#symbol-variants">symbol
-variants</a></p>
-<pre class="literal-block">\usepackage[normalize-symbols]{textalpha}</pre>
-<p>and/or the <a class="reference external" href="textalpha.sty.html#keep-semicolon">keep-semicolon</a> option to use the <a class="reference external" href="textalpha.sty.html#semicolon-as-erotimatiko">semicolon as erotimatiko</a>
+<p>eventually with the <a class="reference external" href="textalpha.sty.html#normalize-symbols">normalize-symbols</a> option to handle <a class="reference internal" href="#symbol-variants">symbol variants</a>
+and/or the <a class="reference external" href="textalpha.sty.html#keep-semicolon">keep-semicolon</a> option to use the <a class="reference external" href="textalpha.sty.html#semicolon-as-erotimatiko">semicolon as erotimatiko</a>
also in LGR</p>
<pre class="literal-block">\usepackage[normalize-symbols,keep-semicolon]{textalpha}</pre>
<p>This sets up LICR macros for Greek text charactes under both, 8-bit TeX
and Xe-/LuaTeX.
For details see <a class="reference external" href="textalpha-doc.tex">textalpha-doc.tex</a> and <a class="reference external" href="textalpha-doc.pdf">textalpha-doc.pdf</a> (8-bit
-TeX) as well as <a class="reference external" href="tuenc-greek-doc.tex">tuenc-greek-doc.tex</a> and <a class="reference external" href="tuenc-greek-doc.pdf">tuenc-greek-doc.pdf</a>
+TeX) as well as <a class="reference external" href="test-tuenc-greek.tex">test-tuenc-greek.tex</a> and <a class="reference external" href="test-tuenc-greek.pdf">test-tuenc-greek.pdf</a>
(XeTeX/LuaTeX).</p>
</dd>
<dt><a class="reference internal" href="#alphabeta">alphabeta</a>:</dt>
@@ -912,31 +992,23 @@ mode in both, text and math mode, write</p>
<pre class="literal-block">\usepackage{alphabeta}</pre>
<p>For details see <a class="reference external" href="alphabeta-doc.tex">alphabeta-doc.tex</a> and <a class="reference external" href="alphabeta-doc.pdf">alphabeta-doc.pdf</a>.</p>
</dd>
-<dt>Babel:</dt>
-<dd><p>Use the <span class="docutils literal">greek</span> option with <a class="reference external" href="http://www.ctan.org/pkg/babel">Babel</a>:</p>
-<pre class="literal-block">\usepackage[greek]{babel}</pre>
-<p>This automatically loads <span class="docutils literal">lgrenc.def</span> with 8-bit TeX and
-<span class="docutils literal"><span class="pre">tuenc-greek.def</span></span> with XeTeX/LuaTeX and provides localized auto-strings,
-hyphenation and other localizations (see <a class="reference external" href="http://www.ctan.org/pkg/babel-greek">babel-greek</a>).</p>
-<p>Babel can be used together with <a class="reference internal" href="#textalpha">textalpha</a> or <a class="reference internal" href="#alphabeta">alphabeta</a>.</p>
-</dd>
<dt>fontenc:</dt>
<dd><p>Declare LGR via <a class="reference external" href="http://www.ctan.org/pkg/fontenc">fontenc</a>. For example, specify T1 (8-bit
Latin) as default font encoding and LGR for Greek with</p>
<pre class="literal-block">\usepackage[LGR,T1]{fontenc}</pre>
<p>Note that without <a class="reference internal" href="#textalpha">textalpha</a> or <a class="reference internal" href="#alphabeta">alphabeta</a>, Greek text macros work
only if the current font encoding supports Greek. See <a class="citation-reference" href="#fntguide" id="id6">[fntguide]</a> for
-details and <a class="reference external" href="lgrenc-test.tex">lgrenc-test.tex</a> for an example.</p>
+details and <a class="reference external" href="test-lgrenc.tex">test-lgrenc.tex</a> for an example.</p>
<p>It is possible to use 8-bit Greek text fonts in the LGR TeX font encoding
also with XeTeX/LuaTeX, if the <a class="reference external" href="http://www.ctan.org/pkg/fontenc">fontenc</a> package is loaded before
-<a class="reference external" href="http://www.ctan.org/pkg/fontspec">fontspec</a> and <a class="reference internal" href="#textalpha">textalpha</a> or <a class="reference internal" href="#alphabeta">alphabeta</a>, e.g.</p>
+Babel, <a class="reference internal" href="#textalpha">textalpha</a>, or <a class="reference internal" href="#alphabeta">alphabeta</a>, e.g.</p>
<pre class="literal-block">\usepackage[LGR]{fontenc}
\usepackage{fontspec}
\setmainfont{Linux Libertine O} % Latin Modern does not support Greek
\setsansfont{Linux Biolinum O}
\usepackage{textalpha}</pre>
-<p>See <a class="reference external" href="tuenc-greek-doc.tex">tuenc-greek-doc.tex</a>, <a class="reference external" href="tuenc-greek-doc.pdf">tuenc-greek-doc.pdf</a> and
-<a class="reference external" href="lgrenc-test.tex">lgrenc-test.tex</a>, <a class="reference external" href="lgrenc-test.pdf">lgrenc-test.pdf</a>.</p>
+<p>See <a class="reference external" href="test-tuenc-greek.tex">test-tuenc-greek.tex</a>, <a class="reference external" href="test-tuenc-greek.pdf">test-tuenc-greek.pdf</a> and
+<a class="reference external" href="test-lgrenc.tex">test-lgrenc.tex</a>, <a class="reference external" href="test-lgrenc.pdf">test-lgrenc.pdf</a>.</p>
</dd>
</dl>
<p id="arabi-workaround">To work around the conflict with <a class="reference external" href="https://www.ctan.org/pkg/arabi">arabi</a>, it may suffice to ensure <span class="docutils literal">greek</span>
@@ -955,19 +1027,19 @@ is loaded after <span class="docutils literal">arabic</span>:</p>
\renewcommand{\omega}{\mathomega}</pre>
</section>
<section id="greek-text-font-encodings">
-<h2>Greek text font encodings</h2>
+<h2><a class="toc-backref" href="#id26">Greek text font encodings</a></h2>
<p>Greek TeX font encodings are the envisaged <a class="reference internal" href="#t7">T7</a>, <a class="reference internal" href="#lgr">LGR</a>, and <a class="reference internal" href="#lgi">LGI</a>.
Greek letters and symbols are also defined in the Unicode-based font
-encodings <a class="reference internal" href="#tu">TU</a>, <a class="reference internal" href="#eu1-eu2">EU1, EU2</a>, and PU (<a class="reference external" href="http://www.ctan.org/pkg/hyperref">hyperref</a>).</p>
+encodings <a class="reference internal" href="#tu">TU</a>, and <a class="reference internal" href="#pu">PU</a>.</p>
<section id="t7">
-<h3>T7</h3>
+<h3><a class="toc-backref" href="#id27">T7</a></h3>
<p>The <a class="citation-reference" href="#encguide" id="id12">[encguide]</a> reserves the name T7 for a Greek <cite>standard font encoding</cite>.
However, up to now, there is no agreement on an implementation because the
restrictions for general text encodings are too severe for typesetting
polytonic Greek.</p>
</section>
<section id="lgr">
-<h3>LGR</h3>
+<h3><a class="toc-backref" href="#id28">LGR</a></h3>
<p>The LGR font encoding is the de-facto standard for typesetting Greek with
(8-bit) LaTeX. <cite>greek-fontenc</cite> provides a comprehensive <a class="reference internal" href="#lgr-font-encoding-definition-file">LGR font
encoding definition file</a>.</p>
@@ -988,7 +1060,7 @@ font-encoding comprising Latin and Greek like the envisaged <a class="reference
Unicode (with XeTeX or LuaTeX).</p>
</section>
<section id="lgi">
-<h3>LGI</h3>
+<h3><a class="toc-backref" href="#id29">LGI</a></h3>
<p>The ‘Ibycus’ fonts from the package <a class="reference external" href="http://www.ctan.org/pkg/ibygrk">ibygrk</a> implement an alternative
transliteration scheme (also explained in <a class="citation-reference" href="#babel-patch" id="id16">[babel-patch]</a>).
It is currently not supported by <cite>greek-fontenc</cite>.</p>
@@ -996,30 +1068,49 @@ It is currently not supported by <cite>greek-fontenc</cite>.</p>
setup (without any LICR macros or composite definitions).</p>
</section>
<section id="tu">
-<h3>TU</h3>
+<h3><a class="toc-backref" href="#id30">TU</a></h3>
<p>Standard Unicode font encoding for XeTeX and LuaTeX loaded by <a class="reference external" href="http://www.ctan.org/pkg/fontspec">fontspec</a>
-(since v2.5a). <cite>greek-fontenc</cite> adds support for the Greek script (see
-<a class="reference internal" href="#tuenc-greek">tuenc-greek</a>).</p>
+(since v2.5a) rsp. the LaTeX kernel since 2017/01/01 [LaTeX2e News Issue 26]_.
+<cite>greek-fontenc</cite> adds support for the Greek script (see <a class="reference internal" href="#tuenc-greek">tuenc-greek</a>).</p>
<p>Xe/LuaTeX works with any system-wide installed <a class="reference external" href="https://ctan.org/topic/font-otf">OpenType font</a>. Suitable
fonts supporting Greek include <a class="reference external" href="https://www.ctan.org/pkg/cm-unicode">CM Unicode</a>, <a class="reference external" href="http://dejavu-fonts.org">Deja Vu</a>, <a class="reference external" href="https://ctan.org/pkg/ebgaramond">EB Garamond</a>,
the <a class="reference external" href="http://www.ctan.org/pkg/gfs">GFS fonts</a>, <a class="reference external" href="http://www.ctan.org/pkg/libertineotf">Libertine OTF</a>, <a class="reference external" href="https://ctan.org/pkg/libertinus">Libertinus</a>, <a class="reference external" href="https://ctan.org/pkg/oldstandard">Old Standard</a>,
<a class="reference external" href="https://www.ctan.org/pkg/tempora">Tempora</a>, and <a class="reference external" href="https://www.ctan.org/pkg/umtypewriter">UM Typewriter</a> (all available on CTAN) but also many commercial
fonts. Unfortunately, the <a class="reference external" href="http://www.ctan.org/pkg/fontspec">fontspec</a> default, <a class="reference external" href="http://www.gust.org.pl/projects/e-foundry/latin-modern">Latin Modern</a> misses most
Greek characters.</p>
+<p>XeTeX uses the Unicode NFC normalization, so that combining characters
+are merged with the base character if a pre-composed character exists. This
+results in better looking output for characters with multiple diacritics.
+Unfortunately, LuaTeX does not apply the NFC normalization. This leads to
+suboptimal placing of some diactritics, especially the sub-iota (becoming
+unintelligable in combination with small letter eta).</p>
+<p>TODO: The <a class="reference external" href="https://ctan.org/pkg/lua-uni-algos">lua-uni-algos</a> package may be helpfull to implement a NTC
+normalization to Greek text in LuaTeX.</p>
+<p>The legacy Unicode font encodings EU1 and EU2 for XeTeX and LuaTeX
+respectively were superseded by TU in the 2017 <a class="reference external" href="http://www.ctan.org/pkg/fontspec">fontspec</a> release.</p>
</section>
-<section id="eu1-eu2">
-<h3>EU1, EU2</h3>
-<p>Legacy Unicode font encodings for XeTeX and LuaTeX respectively. Superseded
-by <a class="reference internal" href="#tu">TU</a>.</p>
+<section id="pu">
+<h3><a class="toc-backref" href="#id31">PU</a></h3>
+<p>The package <a class="reference external" href="http://www.ctan.org/pkg/hyperref">hyperref</a> defines the PU font encoding for use in PDF strings
+(ToC, bookmarks) which supports monotonic Greek. <cite>greek-fontenc</cite> adds
+support for polytonic Greek and some archaic characters also supported in
+LGR and TU (see <a class="reference external" href="hyperref-with-greek.tex">hyperref-with-greek.tex</a>, <a class="reference external" href="hyperref-with-greek.pdf">hyperref-with-greek.pdf</a>).</p>
</section>
</section>
-<section id="greek-licr-macros">
-<h2>Greek LICR macros</h2>
-<p>This package provides LaTeX internal character representations (LICR macros)
+<section id="selecting-greek-licr-macro-names">
+<h2><a class="toc-backref" href="#id32">Selecting Greek LICR macro names</a></h2>
+<div class="admonition note">
+<p class="admonition-title">Note</p>
+<p>The LICR macro names for Greek symbols are chosen pending
+endorsement by the TeX community and related packages.</p>
+<p>Names for archaic characters, accents/diacritics, and
+punctuation may change in future versions.</p>
+</div>
+<p>This bundle provides LaTeX internal character representations (LICR macros)
for Greek letters and diacritics. Macro names were selected based on the
following considerations:</p>
<section id="letters-and-symbols">
-<h3>letters and symbols</h3>
+<h3><a class="toc-backref" href="#id33">letters and symbols</a></h3>
<ul>
<li><p>The <a class="reference internal" href="#fntguide">fntguide</a> (section 6.4 Naming conventions) recommends:</p>
<blockquote>
@@ -1107,7 +1198,7 @@ additional packages (e.g. <a class="reference external" href="alphabeta.sty">alp
</ul>
</section>
<section id="accent-macros">
-<h3>accent macros</h3>
+<h3><a class="toc-backref" href="#id34">accent macros</a></h3>
<ul>
<li><p>standard accent macros (<span class="docutils literal">\DeclareTextAccent</span> definitions in
<span class="docutils literal"><span class="pre">latex/base/...</span></span>) are one-symbol macros (<span class="docutils literal">\' \&quot; ... \u \v ...</span>) .</p></li>
@@ -1131,7 +1222,7 @@ provided. (The non-standard macros <span class="docutils literal">\&lt;</span> a
<a class="reference internal" href="#textalpha">textalpha</a> or <a class="reference internal" href="#alphabeta">alphabeta</a>.)</p>
</section>
<section id="symbol-variants">
-<h3>symbol variants</h3>
+<h3><a class="toc-backref" href="#id35">symbol variants</a></h3>
<p>See also <a class="reference external" href="http://en.wikipedia.org/wiki/Greek_alphabet#Glyph_variants">http://en.wikipedia.org/wiki/Greek_alphabet#Glyph_variants</a></p>
<p>Mathematical notation distinguishes variant shapes for beta (β|ϐ), theta
(θ|ϑ), phi (φ|ϕ), pi (π|ϖ), kappa (κ|ϰ), rho (ρ|ϱ), Theta (Θ|ϴ), and epsilon
@@ -1158,8 +1249,9 @@ the corresponding letter with the <span class="docutils literal"><span class="pr
variants).</p></li>
</ul>
</section>
+</section>
<section id="references">
-<h3>References</h3>
+<h2><a class="toc-backref" href="#id36">References</a></h2>
<p>An alternative, more complete set of short mnemonic character names is
the <a class="reference external" href="http://www.w3.org/TR/xml-entity-names/">XML Entity Definitions for Characters</a> W3C Recommendation from
01 April 2010.</p>
@@ -1168,9 +1260,6 @@ Syropoulos and <span class="docutils literal"><span class="pre">xl-lgr.enc</span
<span class="docutils literal">lgr.cmap</span> provides a mapping to Unicode characters.</p>
<p>A full set of <span class="docutils literal">\text*</span> symbol macros is defined in <span class="docutils literal">ucsencs.def</span>
from the <a class="reference external" href="http://www.ctan.org/pkg/unicode">ucs</a> package.</p>
-<p>Aliases from <span class="docutils literal">puenc.def</span> ensure that the <a class="reference external" href="http://www.ctan.org/pkg/hyperref">hyperref</a> package can convert
-Greek text in “LICR encoding” to a PDF-string (utf-8 encoded input is used
-as-is).</p>
<dl class="citation">
<dt class="label" id="fntguide"><span class="brackets"><a class="fn-backref" href="#id6">fntguide</a></span></dt>
<dd><p>LaTeX3 Project Team, <cite>LaTeX2ε font selection</cite>, 2005.
@@ -1195,6 +1284,10 @@ of the babel package</cite>, 1997.
<cite>An extension to the greek option of the babel package</cite>, 2011.
<a class="reference external" href="http://mirror.ctan.org/macros/latex/contrib/teubner/teubner-doc.pdf">http://mirror.ctan.org/macros/latex/contrib/teubner/teubner-doc.pdf</a></p>
</dd>
+</dl>
+<!-- [LaTeX2e News Issue 26]
+https://www.latex-project.org/news/latex2e-news/ltnews26.pdf -->
+<dl class="citation">
<dt class="label" id="babel-patch"><span class="brackets"><a class="fn-backref" href="#id16">babel-patch</a></span></dt>
<dd><p>Werner Lemberg, <cite>Unicode support for the Greek LGR
encoding</cite> Εὔτυπον, τεῦχος № 20, 2008.
@@ -1202,7 +1295,6 @@ encoding</cite> Εὔτυπον, τεῦχος № 20, 2008.
</dd>
</dl>
</section>
-</section>
</main>
</body>
</html>
diff --git a/language/greek/greek-fontenc/greekhyperref.pdf b/language/greek/greek-fontenc/greekhyperref.pdf
deleted file mode 100644
index 3d5f049461..0000000000
--- a/language/greek/greek-fontenc/greekhyperref.pdf
+++ /dev/null
Binary files differ
diff --git a/language/greek/greek-fontenc/greekhyperref.tex b/language/greek/greek-fontenc/greekhyperref.tex
deleted file mode 100644
index ed3c8b5cb3..0000000000
--- a/language/greek/greek-fontenc/greekhyperref.tex
+++ /dev/null
@@ -1,127 +0,0 @@
-\documentclass{article}
-\usepackage{fixltx2e} % LaTeX patches, \textsubscript
-\usepackage{cmap} % fix search and cut-and-paste in Acrobat
-\usepackage[LGR,T1]{fontenc}
-\usepackage{lmodern}
-
-\usepackage[unicode,colorlinks=true,linkcolor=blue]{hyperref}
-\usepackage{bookmark}
-
-\usepackage[greek,english]{babel}
-\usepackage{alphabeta}
-\usepackage[utf8]{inputenc}
-
-
-% \pagestyle{headings}
-
-\begin{document}
-
-\title{Greek and hyperref}
-\maketitle
-
-\noindent
-On 2010-11-05, Heiko Oberdiek wrote in comp.text.tex:
-%
-\begin{quote}
- \textbackslash pdfstringdef (converting TeX code to PDF strings for
- bookmarks) supports NFSS2 and needs active characters. Encoding
- stuff based on the internal font machinery of TeX (letters with
- catcode 11 or 12, ligatures) does not work, because the strings
- don't reach TeX's stomach.
-\end{quote}
-%
-The \emph{greek-fontenc} package allows input of Greek characters in a way
-that ``reaches TeX's stomach'' and hence works in both, the main document as
-well as in PDF strings (e.g. bookmarks). Hyperref's ``puenc.def`` font
-encoding file defines LICR macros for monotonic Greek (Greek characters of
-the ``Greek and Coptic'' unicode block).
-
-All utf8-encoded literal Unicode characters work in PDF strings. With
-\emph{greek-fontenc} and \emph{greek-inputenc}, this enables use of all
-Greek character in text and PDF strings.
-
-\section{Transcription: \ensuregreek{logos}, \foreignlanguage{greek}{logos}}
-
-\textbackslash{}textgreek + LGR transcription or
-Greek language (babel) + LGR transcription:
-In the PDF-bookmark are Latin letters instead of Greek ones.
-
-
-\section{Macros:
- \textlambda\textomicron\textgamma\textomicron\textvarsigma{},
- \lambda\omicron\gamma\omicron\varsigma{},
- λογος}
-
-textalpha package with \textbackslash{}textgreek* macros,
-alphabeta package with \textbackslash{}alpha ... \textbackslash{}Omega macros,
-and literal Greek Unicode characters.
-
-Works, if the ``unicode'' or ``pdfencoding=auto'' option is given to hyperref.
-(With the ``xpdf'' viewer, Greek letters are not shown in PDF bookmarks.)
-
-The generic short macros from the \emph{alphabeta} package result in
-hyperref warnings. See ``alphabeta-doc.tex`` and ``alphabeta-doc.pdf``
-from the `lgrx` package for details an workarounds.
-
-
-\section{LGR + Macros: \foreignlanguage{greek}{
- \textlambda\textomicron\textgamma\textomicron\textvarsigma{}}}
-
-LICR-macro input works also if the font encoding is LGR.
-
-\section{%
- Kerning: \textAlpha\textUpsilon\textLambda{}
- \ensuregreek{\textAlpha\textUpsilon\textLambda}
- \foreignlanguage{greek}{\textAlpha\textUpsilon\textLambda}%
-}
-
-Kerning is impossible if the font encoding is switched for every single
-character. Wrap the Greek part in a command switching to LGR font encoding
-to fix this, either \verb+\ensuregreek{...}+ (with package textalpha) or
-\verb+\foreignlanguage{greek}{...}+ (with babel).
-
-% letters of the Greek and Coptic Unicode Block supported by LGR:
-\newcommand{\GreekAndCoptic}{ʹ͵ͺ; ΄ ΅ Ά·ΈΉΊΌΎΏΐΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩΪΫϘϚϜϠ}
-\newcommand{\greekandcoptic}{άέήίΰαβγδεζηθικλμνξοπρςστυφχψωϊϋόύώϙϛϝϟϡ}
-
-\section{Literal Unicode input}
-The following subsection headings contain all characters from the ``Greek
-and Coptic'' and ``Greek Extended'' Unicode Blocks that are supported by the
-LGR font encoding as literal Unicode characters.
-\subsection{\GreekAndCoptic}
-\subsection{\greekandcoptic}
-\subsection{ἀἁἂἃἄἅἆἇἈἉἊἋἌἍἎἏ ἐἑἒἓἔἕἘἙἚἛἜἝ}
-\subsection{ἠἡἢἣἤἥἦἧἨἩἪἫἬἭἮἯ ἰἱἲἳἴἵἶἷἸἹἺἻἼἽἾἿ}
-\subsection{ὀὁὂὃὄὅὈὉὊὋὌὍ ὐὑὒὓὔὕὖὗὙὛὝὟ}
-\subsection{ὠὡὢὣὤὥὦὧὨὩὪὫὬὭὮὯ ὰάὲέὴήὶίὸόὺύὼώ}
-\subsection{ᾀᾁᾂᾃᾄᾅᾆᾇᾈᾉᾊᾋᾌᾍᾎᾏ ᾐᾑᾒᾓᾔᾕᾖᾗᾘᾙᾚᾛᾜᾝᾞᾟ}
-\subsection{ᾠᾡᾢᾣᾤᾥᾦᾧᾨᾩᾪᾫᾬᾭᾮᾯ ᾰᾱᾲᾳᾴᾶᾷᾸᾹᾺΆᾼ᾽ι᾿}
-\subsection{῀῁ῂῃῄῆῇῈΈῊΉῌ῍῎῏ ῐῑῒΐῖῗῘῙῚΊ῝῞῟}
-\subsection{ῠῡῢΰῤῥῦῧῨῩῪΎῬ῭΅` ῲῳῴῶῷῸΌῺΏῼ´῾}
-
-\section{non-standard and combined diacritics:
- \ensuregreek{\>\textalpha \'"\textalpha}}
-
-Currently, there is no hyperref support for LICR input with non-standard
-accents or combined diacritics characters. Input as literal precomposed
-Unicode character works fine.
-
-\section{Makeuppercase}
-
-According to Greek typesetting conventions,
-diacritics (except the dialytika) are dropped in ALL CAPS.
-
-However, \verb|\Makeuppercase| is not supported in PDF-strings, so we
-do not need to care for this.
-
-\section{Conclusion}
-
-For Greek text parts in section headers use either literal Unicode
-characters or macros. For multi-accented letters or non-standard accents,
-use literal pre-composed Unicode characters. (Combining Unicode characters
-do not work with inputenc and 8-bit LaTeX. This is a general restriction.)
-
-For proper kerning in the main document, combine this with the
-\verb+\textgreek+ or \verb+\foreignlanguage{greek}+ macros.
-
-\end{document}
diff --git a/language/greek/greek-fontenc/hyperref-with-greek.pdf b/language/greek/greek-fontenc/hyperref-with-greek.pdf
new file mode 100644
index 0000000000..f187a8d635
--- /dev/null
+++ b/language/greek/greek-fontenc/hyperref-with-greek.pdf
Binary files differ
diff --git a/language/greek/greek-fontenc/hyperref-with-greek.tex b/language/greek/greek-fontenc/hyperref-with-greek.tex
new file mode 100644
index 0000000000..e0c8d94b15
--- /dev/null
+++ b/language/greek/greek-fontenc/hyperref-with-greek.tex
@@ -0,0 +1,509 @@
+\documentclass{article}
+\usepackage[LGR,T1]{fontenc}
+\usepackage{lmodern}
+
+\usepackage[unicode,colorlinks=true,linkcolor=blue]{hyperref}
+% \usepackage{bookmark}
+
+\usepackage[greek,english]{babel}
+\usepackage[normalize-symbols]{alphabeta}
+\usepackage[utf8]{inputenc}
+
+% \pagestyle{headings}
+
+\begin{document}
+
+\title{Greek and hyperref}
+\author{Günter Milde}
+\date{2020/10/30}
+\maketitle
+
+\noindent
+On 2010-11-05, Heiko Oberdiek wrote in comp.text.tex:
+%
+\begin{quote}
+ \textbackslash pdfstringdef (converting TeX code to PDF strings for
+ bookmarks) supports NFSS2 and needs active characters. Encoding
+ stuff based on the internal font machinery of TeX (letters with
+ catcode 11 or 12, ligatures) does not work, because the strings
+ don't reach TeX's stomach.
+\end{quote}
+%
+The \emph{greek-fontenc} package allows input of Greek characters in a way
+that ``reaches TeX's stomach'' and hence works in both, the main document as
+well as in PDF strings (e.g. bookmarks). Hyperref's ``puenc.def`` font
+encoding file defines LICR macros for monotonic Greek (Greek characters of
+the ``Greek and Coptic'' unicode block).
+
+All utf8-encoded literal Unicode characters work in PDF strings. With
+\emph{greek-fontenc} and \emph{greek-inputenc}, this enables use of all
+Greek character in text and PDF strings.
+
+\section{Transcription: \ensuregreek{logos}, \foreignlanguage{greek}{logos}}
+
+\textbackslash{}textgreek + LGR transcription or
+Greek language (babel) + LGR transcription:
+In the PDF-bookmark are Latin letters instead of Greek ones.
+
+
+\section{Macros:
+ \textlambda\textomicron\textgamma\textomicron\textvarsigma{},
+ \lambda\omicron\gamma\omicron\varsigma{},
+ λογος}
+
+\emph{textalpha} package with \textbackslash{}textalpha \ldots
+\textbackslash{}textomega macros or \emph{alphabeta} package with
+\textbackslash{}alpha \ldots \textbackslash{}Omega macros. With 8-bit TeX
+engines (pdflatex), literal Greek Unicode characters are converted to LICR
+Macros, too.
+
+Works, if the \texttt{unicode} or \texttt{pdfencoding=auto} option is given
+to \emph{hyperref}.%
+\footnote{With the ``xpdf'' viewer, Greek letters are not shown
+ in PDF bookmarks.}
+
+The generic short macros from the \emph{alphabeta} package result in
+hyperref warnings. See \href{alphabeta-doc.pdf}{alphabeta-doc.pdf} and
+\href{alphabeta-doc.tex}{alphabeta-doc.tex}
+for details and workarounds.
+
+
+\section{LGR + Macros: \foreignlanguage{greek}{
+ \textlambda\textomicron\textgamma\textomicron\textvarsigma{}}}
+
+LICR-macro input works also if the font encoding is LGR.
+
+\section{%
+ Kerning: \textAlpha\textUpsilon\textLambda{}
+ \ensuregreek{\textAlpha\textUpsilon\textLambda}
+ \foreignlanguage{greek}{\textAlpha\textUpsilon\textLambda}%
+}
+
+Kerning is impossible if the font encoding is switched for every single
+character. To fix this, wrap the Greek part in a command switching to a font
+encoding supporting Greek, either \verb+\ensuregreek{...}+ (with package
+\emph{textalpha} or \emph{Babel}) or \verb+\foreignlanguage{greek}{...}+
+(with \emph{Babel}).
+
+\section{Literal Unicode input}
+The following subsection headings contain all characters from the ``Greek
+and Coptic'' and ``Greek Extended'' Unicode Blocks that are supported by the
+LGR font encoding.
+\subsection{ʹ͵ͺ; ΄ ΅ Ά·ΈΉΊΌΎΏΐΑΒΓΔΕΖΗΘΙΚΛΜΝ}
+\subsection{ΞΟΠΡΣΤΥΦΧΨΩΪΫϘϚϜϠ}
+Greek and Coptic Unicode block: punctuation and uppercase letters
+
+\subsection{άέήίΰαβγδεζηθικλμν}
+\subsection{ξοπρςστυφχψωϊϋόύώϐϑϕϖϘϙϛϝϟϡ}
+
+Greek and Coptic Unicode block: lowercase letters
+
+\subsection{ἀἁἂἃἄἅἆἇἈἉἊἋἌἍἎἏ}
+\subsection{ἐἑἒἓἔἕἘἙἚἛἜἝ}
+\subsection{ἠἡἢἣἤἥἦἧἨἩἪἫἬἭἮἯ}
+\subsection{ἰἱἲἳἴἵἶἷἸἹἺἻἼἽἾἿ}
+\subsection{ὀὁὂὃὄὅὈὉὊὋὌὍ}
+\subsection{ὐὑὒὓὔὕὖὗὙὛὝὟ}
+\subsection{ὠὡὢὣὤὥὦὧὨὩὪὫὬὭὮὯ}
+\subsection{ὰάὲέὴήὶίὸόὺύὼώ}
+\subsection{ᾀᾁᾂᾃᾄᾅᾆᾇᾈᾉᾊᾋᾌᾍᾎᾏ}
+\subsection{ᾐᾑᾒᾓᾔᾕᾖᾗᾘᾙᾚᾛᾜᾝᾞᾟ}
+\subsection{ᾠᾡᾢᾣᾤᾥᾦᾧᾨᾩᾪᾫᾬᾭᾮᾯ}
+\subsection{ᾰᾱᾲᾳᾴᾶᾷᾸᾹᾺΆᾼ᾽ι᾿}
+\subsection{῀῁ῂῃῄῆῇῈΈῊΉῌ῍῎῏}
+\subsection{ῐῑῒΐῖῗῘῙῚΊ῝῞῟}
+\subsection{ῠῡῢΰῤῥῦῧῨῩῪΎῬ῭΅`}
+\subsection{ῲῳῴῶῷῸΌῺΏῼ´῾}
+
+Greek Extended Unicode block: Input as literal precomposed Unicode character
+works fine.
+
+\section{LICR command input}
+
+\subsection{\ensuregreek{
+ \textnumeralsigngreek
+ \textnumeralsignlowergreek
+ { }\ypogegrammeni
+ \texterotimatiko
+ \acctonos{ }
+ \"'{ }
+ \'\textAlpha
+ \textanoteleia
+ \'\textEpsilon
+ \'\textEta
+ \'\textIota
+ \'\textOmicron
+ \'\textUpsilon
+ \'\textOmega
+ \'"\textiota
+ \textAlpha
+ \textBeta
+ \textGamma
+ \textDelta
+ \textEpsilon
+ \textZeta
+ \textEta
+ \textTheta
+ \textIota
+ \textKappa
+ \textLambda
+ \textMu
+ \textNu}}
+\subsection{\ensuregreek{
+ \textXi
+ \textOmicron
+ \textPi
+ \textRho
+ \textSigma
+ \textTau
+ \textUpsilon
+ \textPhi
+ \textChi
+ \textPsi
+ \textOmega
+ \"\textIota
+ \"\textUpsilon
+}}
+
+\subsection{\ensuregreek{
+ \'\textalpha
+ \'\textepsilon
+ \'\texteta
+ \'\textiota
+ \"'\textupsilon
+ \textalpha
+ \textbeta
+ \textgamma
+ \textdelta
+ \textepsilon
+ \textzeta
+ \texteta
+ \texttheta
+ \textiota
+ \textkappa
+ \textlambda
+ \textmu
+ \textnu}}
+\subsection{\ensuregreek{
+ \textxi
+ \textomicron
+ \textpi
+ \textrho
+ \textvarsigma
+ \textsigma
+ \texttau
+ \textupsilon
+ \textphi
+ \textchi
+ \textpsi
+ \textomega
+ \"\textiota
+ \"\textupsilon
+ \'\textomicron
+ \'\textupsilon
+ \'\textomega
+ \textbetasymbol
+ \textthetasymbol
+ \textphisymbol
+ \textpisymbol
+ \textQoppa
+ \textqoppa
+ \textStigma
+ \textstigma
+ \textDigamma
+ \textdigamma
+ \textKoppa
+ \textkoppa
+ \textSampi
+ \textsampi
+}}
+
+
+Currently, there is no hyperref support for LICR input with non-standard
+accents or combined diacritics characters.
+
+\subsection{\ensuregreek{
+ \accpsili\textalpha
+ \accdasia\textalpha
+ \accpsili`\textalpha
+ \accdasia`\textalpha
+ \accpsili'\textalpha
+ \accdasia'\textalpha
+ \~>\textalpha
+ \~<\textalpha
+ \accpsili\textAlpha
+ \accdasia\textAlpha
+ \accpsili`\textAlpha
+ \accdasia`\textAlpha
+ \accpsili'\textAlpha
+ \accdasia'\textAlpha
+ \~>\textAlpha
+ \~<\textAlpha
+}}
+\subsection{\ensuregreek{
+ \accpsili\textepsilon
+ \accdasia\textepsilon
+ \accpsili`\textepsilon
+ \accdasia`\textepsilon
+ \accpsili'\textepsilon
+ \accdasia'\textepsilon
+ \accpsili\textEpsilon
+ \accdasia\textEpsilon
+ \accpsili`\textEpsilon
+ \accdasia`\textEpsilon
+ \accpsili'\textEpsilon
+ \accdasia'\textEpsilon
+}}
+\subsection{\ensuregreek{
+ \accpsili\texteta
+ \accdasia\texteta
+ \accpsili`\texteta
+ \accdasia`\texteta
+ \accpsili'\texteta
+ \accdasia'\texteta
+ \~>\texteta
+ \~<\texteta
+ \accpsili\textEta
+ \accdasia\textEta
+ \accpsili`\textEta
+ \accdasia`\textEta
+ \accpsili'\textEta
+ \accdasia'\textEta
+ \~>\textEta
+ \~<\textEta
+}}
+\subsection{\ensuregreek{
+ \accpsili\textiota
+ \accdasia\textiota
+ \accpsili`\textiota
+ \accdasia`\textiota
+ \accpsili'\textiota
+ \accdasia'\textiota
+ \~>\textiota
+ \~<\textiota
+ \accpsili\textIota
+ \accdasia\textIota
+ \accpsili`\textIota
+ \accdasia`\textIota
+ \accpsili'\textIota
+ \accdasia'\textIota
+ \~>\textIota
+ \~<\textIota
+}}
+\subsection{\ensuregreek{
+ \accpsili\textomicron
+ \accdasia\textomicron
+ \accpsili`\textomicron
+ \accdasia`\textomicron
+ \accpsili'\textomicron
+ \accdasia'\textomicron
+ \accpsili\textOmicron
+ \accdasia\textOmicron
+ \accpsili`\textOmicron
+ \accdasia`\textOmicron
+ \accpsili'\textOmicron
+ \accdasia'\textOmicron
+}}
+\subsection{\ensuregreek{
+ \accpsili\textupsilon
+ \accdasia\textupsilon
+ \accpsili`\textupsilon
+ \accdasia`\textupsilon
+ \accpsili'\textupsilon
+ \accdasia'\textupsilon
+ \~>\textupsilon
+ \~<\textupsilon
+ \accdasia\textUpsilon
+ \accdasia`\textUpsilon
+ \accdasia'\textUpsilon
+ \~<\textUpsilon
+}}
+\subsection{\ensuregreek{
+ \accpsili\textomega
+ \accdasia\textomega
+ \accpsili`\textomega
+ \accdasia`\textomega
+ \accpsili'\textomega
+ \accdasia'\textomega
+ \~>\textomega
+ \~<\textomega
+ \accpsili\textOmega
+ \accdasia\textOmega
+ \accpsili`\textOmega
+ \accdasia`\textOmega
+ \accpsili'\textOmega
+ \accdasia'\textOmega
+ \~>\textOmega
+ \~<\textOmega
+}}
+\subsection{\ensuregreek{
+ \accvaria\textalpha
+ \accoxia\textalpha
+ \accvaria\textepsilon
+ \accoxia\textepsilon
+ \accvaria\texteta
+ \accoxia\texteta
+ \accvaria\textiota
+ \accoxia\textiota
+ \accvaria\textomicron
+ \accoxia\textomicron
+ \accvaria\textupsilon
+ \accoxia\textupsilon
+ \accvaria\textomega
+ \accoxia\textomega
+}}
+\subsection{\ensuregreek{
+ \accpsili\textalpha\ypogegrammeni
+ \accdasia\textalpha\ypogegrammeni
+ \accpsili`\textalpha\ypogegrammeni
+ \accdasia`\textalpha\ypogegrammeni
+ \accpsili'\textalpha\ypogegrammeni
+ \accdasia'\textalpha\ypogegrammeni
+ \~>\textalpha\ypogegrammeni
+ \~<\textalpha\ypogegrammeni
+ \accpsili\textAlpha\ypogegrammeni
+ \accdasia\textAlpha\ypogegrammeni
+ \accpsili`\textAlpha\ypogegrammeni
+ \accdasia`\textAlpha\ypogegrammeni
+ \accpsili'\textAlpha\ypogegrammeni
+ \accdasia'\textAlpha\ypogegrammeni
+ \~>\textAlpha\ypogegrammeni
+ \~<\textAlpha\ypogegrammeni
+}}
+\subsection{\ensuregreek{
+ \accpsili\texteta\ypogegrammeni
+ \accdasia\texteta\ypogegrammeni
+ \accpsili`\texteta\ypogegrammeni
+ \accdasia`\texteta\ypogegrammeni
+ \accpsili'\texteta\ypogegrammeni
+ \accdasia'\texteta\ypogegrammeni
+ \~>\texteta\ypogegrammeni
+ \~<\texteta\ypogegrammeni
+ \accpsili\textEta\ypogegrammeni
+ \accdasia\textEta\ypogegrammeni
+ \accpsili`\textEta\ypogegrammeni
+ \accdasia`\textEta\ypogegrammeni
+ \accpsili'\textEta\ypogegrammeni
+ \accdasia'\textEta\ypogegrammeni
+ \~>\textEta\ypogegrammeni
+ \~<\textEta\ypogegrammeni
+}}
+\subsection{\ensuregreek{
+ \accpsili\textomega\ypogegrammeni
+ \accdasia\textomega\ypogegrammeni
+ \accpsili`\textomega\ypogegrammeni
+ \accdasia`\textomega\ypogegrammeni
+ \accpsili'\textomega\ypogegrammeni
+ \accdasia'\textomega\ypogegrammeni
+ \~>\textomega\ypogegrammeni
+ \~<\textomega\ypogegrammeni
+ \accpsili\textOmega\ypogegrammeni
+ \accdasia\textOmega\ypogegrammeni
+ \accpsili`\textOmega\ypogegrammeni
+ \accdasia`\textOmega\ypogegrammeni
+ \accpsili'\textOmega\ypogegrammeni
+ \accdasia'\textOmega\ypogegrammeni
+ \~>\textOmega\ypogegrammeni
+ \~<\textOmega\ypogegrammeni
+}}
+\subsection{\ensuregreek{
+ \u\textalpha
+ \=\textalpha
+ \accvaria\textalpha\ypogegrammeni
+ \textalpha\ypogegrammeni
+ \accoxia\textalpha\ypogegrammeni
+ \~\textalpha
+ \~\textalpha\ypogegrammeni
+ \u\textAlpha
+ \=\textAlpha
+ \accvaria\textAlpha
+ \accoxia\textAlpha
+ \textAlpha\ypogegrammeni
+ \accpsili{ }
+ { }\prosgegrammeni
+ \accpsili{ }
+}}
+\subsection{\ensuregreek{
+ \accperispomeni\textcompwordmark
+ \"\~{ }
+ \accvaria\texteta\ypogegrammeni
+ \texteta\ypogegrammeni
+ \accoxia\texteta\ypogegrammeni
+ \~\texteta
+ \~\texteta\ypogegrammeni
+ \accvaria\textEpsilon
+ \accoxia\textEpsilon
+ \accvaria\textEta
+ \accoxia\textEta
+ \textEta\ypogegrammeni
+ \accpsili`{ }
+ \accpsili'{ }
+ \~>{ }
+}}
+\subsection{\ensuregreek{
+ \u\textiota
+ \=\textiota
+ \`"\textiota
+ \'"\textiota
+ \~\textiota
+ \~"\textiota
+ \u\textIota
+ \=\textIota
+ \accvaria\textIota
+ \accoxia\textIota
+ \accdasia`{ }
+ \accpsili'{ }
+ \~<{ }
+}}
+\subsection{\ensuregreek{
+ \u\textupsilon
+ \=\textupsilon
+ \`"\textupsilon
+ \'"\textupsilon
+ \accpsili\textrho
+ \accdasia\textrho
+ \~\textupsilon
+ \~"\textupsilon
+ \u\textUpsilon
+ \=\textUpsilon
+ \accvaria\textUpsilon
+ \accoxia\textUpsilon
+ \accdasia\textRho
+ \`"{ }
+ \'"{ }
+ \accvaria{ }
+}}
+\subsection{\ensuregreek{
+ \accvaria\textomega\ypogegrammeni
+ \textomega\ypogegrammeni
+ \accoxia\textomega\ypogegrammeni
+ \~\textomega
+ \~\textomega\ypogegrammeni
+ \accvaria\textOmicron
+ \accoxia\textOmicron
+ \accvaria\textOmega
+ \accoxia\textOmega
+ \textOmega\ypogegrammeni
+ \accoxia{ }
+ \accdasia{ }
+}}
+
+\section{Makeuppercase}
+
+According to Greek typesetting conventions,
+diacritics (except the dialytika) are dropped in ALL CAPS.
+
+However, \verb|\Makeuppercase| is not supported in PDF-strings, so we
+do not need to care for this.
+
+\section{Conclusion}
+
+For Greek text parts in section headers use either literal Unicode
+characters%
+\footnote{Pre-composed Unicode characters must be used for multi-accented
+letters or non-standard accents. Combining Unicode characters do not work
+with inputenc and 8-bit LaTeX – this is a general restriction.} or macros.
+For proper kerning in the main document, combine this with the
+\verb+\textgreek+ or \verb+\foreignlanguage{greek}+ macros.
+
+\end{document}
diff --git a/language/greek/greek-fontenc/lgrenc-test.pdf b/language/greek/greek-fontenc/lgrenc-test.pdf
deleted file mode 100644
index 48be697a74..0000000000
--- a/language/greek/greek-fontenc/lgrenc-test.pdf
+++ /dev/null
Binary files differ
diff --git a/language/greek/greek-fontenc/lgrenc.def b/language/greek/greek-fontenc/lgrenc.def
index 3834be2e55..a5a9e9d315 100644
--- a/language/greek/greek-fontenc/lgrenc.def
+++ b/language/greek/greek-fontenc/lgrenc.def
@@ -17,7 +17,6 @@
%
% .. contents::
%
-%
% Changelog
% ---------
%
@@ -55,8 +54,9 @@
% 0.13 2015-08-04 Support for symbol variants.
% 0.13.1 2015-12-07 Fix `rho with dasia bug` (Linus Romer).
% 0.13.3 2019-07-09 Drop error font declaration (cf. `ltxbugs 4399`_).
-% 1.0 2020/09/25 ``\textKoppa`` as alias for ``\textkoppa``
+% 1.0 2020-09-25 ``\textKoppa`` as alias for ``\textkoppa``
% (there is no capital Koppa in LGR).
+% 2.0 2020-10-13 Move common alias definitions to ``greek-fontenc.def``.
% ====== ============ ========================================================
%
% Usage
@@ -91,13 +91,12 @@
\expandafter\endinput % "return"
}
-
% Identification
% ~~~~~~~~~~~~~~
% ::
\ProvidesFile{lgrenc.def}
-[2020/09/25 1.0 LGR Greek font encoding definitions]
+[2020/10/13 2.0 LGR Greek font encoding definitions]
% Copyright © 2010 Günter Milde
% This file is part of the "greek-fontenc" package.
% It may be distributed and/or modified under the
@@ -182,8 +181,7 @@
\DeclareTextSymbol{\textpi}{LGR}{112}
\DeclareTextSymbol{\textrho}{LGR}{114}
\DeclareTextCommand{\textsigma}{LGR}{s\noboundary} % σ
-\DeclareTextSymbol{\textvarsigma}{LGR}{99} % ς final sigma
-\DeclareTextCommand{\textfinalsigma}{LGR}{\textvarsigma} % ς final sigma
+\DeclareTextSymbol{\textfinalsigma}{LGR}{99} % ς final sigma
\DeclareTextSymbol{\textautosigma}{LGR}{115} % σ (ς at end of word)
\DeclareTextSymbol{\texttau}{LGR}{116}
\DeclareTextSymbol{\textupsilon}{LGR}{117}
@@ -210,14 +208,19 @@
% Archaic letters
% '''''''''''''''
-% Names after teubner_ and ucs_::
+% Names after teubner_ and ucs_.
+%
+% ϟ (capital numeral koppa) not distinct in LGR but required for
+% ``\Greeknumeral`` in babel-greek_
+% (defining as alias command calling ``\textkoppa`` leads to an infinte loop
+% with ``\MakeUppercase``)::
\DeclareTextSymbol{\textstigma}{LGR}{6} % ϛ
\DeclareTextSymbol{\textvarstigma}{LGR}{7} % stigma variant (CB.enc, teubner)
-\DeclareTextSymbol{\textkoppa}{LGR}{18} % ϟ (greek small letter koppa)
-\DeclareTextSymbol{\textKoppa}{LGR}{18} % ϟ (capital numerical koppa) not distinct in LGR
-\DeclareTextSymbol{\textqoppa}{LGR}{19} % ϙ (archaic koppa)
-\DeclareTextSymbol{\textQoppa}{LGR}{21} % Ϙ (archaic Koppa)
+\DeclareTextSymbol{\textKoppa}{LGR}{18} % Ϟ Greek letter Koppa
+\DeclareTextSymbol{\textkoppa}{LGR}{18} % ϟ Greek small letter koppa
+\DeclareTextSymbol{\textqoppa}{LGR}{19} % ϙ archaic koppa
+\DeclareTextSymbol{\textQoppa}{LGR}{21} % Ϙ archaic Koppa
\DeclareTextSymbol{\textStigma}{LGR}{22} % Ϛ in some fonts ϹΤ ligature
\DeclareTextSymbol{\textSampi}{LGR}{23} % Ϡ
\DeclareTextSymbol{\textsampi}{LGR}{27} % ϡ
@@ -226,7 +229,6 @@
\DeclareTextSymbol{\textdigamma}{LGR}{147} % ϝ (ucs) \digamma used by amsmath for math-macro
\DeclareTextSymbol{\textDigamma}{LGR}{195} % Ϝ (ucs)
-
% Numeral signs
% '''''''''''''
% See also http://en.wikipedia.org/wiki/Greek_numerals
@@ -266,15 +268,15 @@
Press <return> to proceed (dropping the symbol from the document).}
}
-\ProvideTextCommand{\textbetasymbol} {LGR}{\LGR@TextSymbolUnavailable{ϐ beta symbol}}
-\ProvideTextCommand{\textkappasymbol}{LGR}{\LGR@TextSymbolUnavailable{ϰ kappa symbol}}
-\ProvideTextCommand{\textThetasymbol}{LGR}{\LGR@TextSymbolUnavailable{ϴ Theta symbol}}
+\ProvideTextCommand{\textbetasymbol} {LGR}{\LGR@TextSymbolUnavailable{beta symbol}} % ϐ
+\ProvideTextCommand{\textkappasymbol}{LGR}{\LGR@TextSymbolUnavailable{kappa symbol}} % ϰ
+\ProvideTextCommand{\textThetasymbol}{LGR}{\LGR@TextSymbolUnavailable{Theta symbol}} % ϴ
-\ProvideTextCommand{\textthetasymbol} {LGR}{\LGR@TextSymbolOnlyMath{ϑ theta symbol}{$\vartheta$}}
-\ProvideTextCommand{\textphisymbol} {LGR}{\LGR@TextSymbolOnlyMath{ϕ phi symbol}{$\phi$}}
-\ProvideTextCommand{\textpisymbol} {LGR}{\LGR@TextSymbolOnlyMath{ϖ pi symbol}{$\varpi$}}
-\ProvideTextCommand{\textrhosymbol} {LGR}{\LGR@TextSymbolOnlyMath{ϱ rho symbol}{$\varrho$}}
-\ProvideTextCommand{\textepsilonsymbol}{LGR}{\LGR@TextSymbolOnlyMath{ϵ lunate epsilon symbol}{$\epsilon$}}
+\ProvideTextCommand{\textthetasymbol} {LGR}{\LGR@TextSymbolOnlyMath{theta symbol}{$\vartheta$}} % ϑ
+\ProvideTextCommand{\textphisymbol} {LGR}{\LGR@TextSymbolOnlyMath{phi symbol}{$\phi$}} % ϕ
+\ProvideTextCommand{\textpisymbol} {LGR}{\LGR@TextSymbolOnlyMath{pi symbol}{$\varpi$}} % ϖ
+\ProvideTextCommand{\textrhosymbol} {LGR}{\LGR@TextSymbolOnlyMath{rho symbol}{$\varrho$}} % ϱ
+\ProvideTextCommand{\textepsilonsymbol}{LGR}{\LGR@TextSymbolOnlyMath{lunate epsilon symbol}{$\epsilon$}} % ϵ
% Other
% """""
@@ -312,6 +314,13 @@
\DeclareTextSymbol{\textpercent}{LGR}{37} % %
\DeclareTextSymbol{\textperthousand}{LGR}{25} % ‰ \permill in greek.ldf
+% The micro sign 00B5 is defined in TS1 (textcomp) and PU (hyperref)
+% as ``\textmu``. LGR uses ``\textmu`` for the similar looking
+% small Greek letter mu.
+% The alias ``\textmicro`` prints in a micro sign and does not upcase::
+
+\DeclareTextSymbol{\textmicro}{LGR}{109} % µ
+
% T3 (tipa)::
\DeclareTextSymbol{\textschwa}{LGR}{26} % ə
@@ -909,6 +918,7 @@
% .. _alphabeta: alphabeta.sty.html
% .. _athnum: http://ctan.org/pkg/athnum
% .. _Babel: http://ctan.org/pkg/babel
+% .. _babel-greek: http://ctan.org/pkg/babel-greek
% .. _babel patch: http://www.eutypon.gr/eutypon/pdf/e2008-20/e20-a03.pdf
% .. _fntguide: http://mirror.ctan.org/macros/latex/base/fntguide.pdf
% .. _fontenc: http://ctan.org/pkg/fontenc
@@ -925,4 +935,3 @@
% .. _xunicode: http://ctan.org/pkg/xunicode
% .. _ltxbugs 4399:
% https://www.latex-project.org/cgi-bin/ltxbugs2html?pr=latex%2F4399&search=
-%
diff --git a/language/greek/greek-fontenc/lgrenc.def.html b/language/greek/greek-fontenc/lgrenc.def.html
index 0cc5230663..d9d95697cb 100644
--- a/language/greek/greek-fontenc/lgrenc.def.html
+++ b/language/greek/greek-fontenc/lgrenc.def.html
@@ -806,10 +806,14 @@ package.</p>
<td><p>Drop error font declaration (cf. <a class="reference external" href="https://www.latex-project.org/cgi-bin/ltxbugs2html?pr=latex%2F4399&amp;search=">ltxbugs 4399</a>).</p></td>
</tr>
<tr><td><p>1.0</p></td>
-<td><p>2020/09/25</p></td>
+<td><p>2020-09-25</p></td>
<td><p><span class="docutils literal">\textKoppa</span> as alias for <span class="docutils literal">\textkoppa</span>
(there is no capital Koppa in LGR).</p></td>
</tr>
+<tr><td><p>2.0</p></td>
+<td><p>2020-10-13</p></td>
+<td><p>Move common alias definitions to <span class="docutils literal"><span class="pre">greek-fontenc.def</span></span>.</p></td>
+</tr>
</tbody>
</table>
</section>
@@ -848,7 +852,7 @@ anyway.</p>
<section id="identification">
<h3><a class="toc-backref" href="#id6">Identification</a></h3>
<pre class="literal-block">\ProvidesFile{lgrenc.def}
-[2020/09/25 1.0 LGR Greek font encoding definitions]
+[2020/10/13 2.0 LGR Greek font encoding definitions]
% Copyright © 2010 Günter Milde
% This file is part of the &quot;greek-fontenc&quot; package.
% It may be distributed and/or modified under the
@@ -920,8 +924,7 @@ encoding.</p>
\DeclareTextSymbol{\textpi}{LGR}{112}
\DeclareTextSymbol{\textrho}{LGR}{114}
\DeclareTextCommand{\textsigma}{LGR}{s\noboundary} % σ
-\DeclareTextSymbol{\textvarsigma}{LGR}{99} % ς final sigma
-\DeclareTextCommand{\textfinalsigma}{LGR}{\textvarsigma} % ς final sigma
+\DeclareTextSymbol{\textfinalsigma}{LGR}{99} % ς final sigma
\DeclareTextSymbol{\textautosigma}{LGR}{115} % σ (ς at end of word)
\DeclareTextSymbol{\texttau}{LGR}{116}
\DeclareTextSymbol{\textupsilon}{LGR}{117}
@@ -943,13 +946,17 @@ encoding.</p>
</section>
<section id="archaic-letters">
<h5><a class="toc-backref" href="#id12">Archaic letters</a></h5>
-<p>Names after <a class="reference external" href="http://ctan.org/pkg/teubner">teubner</a> and <a class="reference external" href="http://ctan.org/pkg/unicode">ucs</a>:</p>
+<p>Names after <a class="reference external" href="http://ctan.org/pkg/teubner">teubner</a> and <a class="reference external" href="http://ctan.org/pkg/unicode">ucs</a>.</p>
+<p>ϟ (capital numeral koppa) not distinct in LGR but required for
+<span class="docutils literal">\Greeknumeral</span> in <a class="reference external" href="http://ctan.org/pkg/babel-greek">babel-greek</a>
+(defining as alias command calling <span class="docutils literal">\textkoppa</span> leads to an infinte loop
+with <span class="docutils literal">\MakeUppercase</span>):</p>
<pre class="literal-block">\DeclareTextSymbol{\textstigma}{LGR}{6} % ϛ
\DeclareTextSymbol{\textvarstigma}{LGR}{7} % stigma variant (CB.enc, teubner)
-\DeclareTextSymbol{\textkoppa}{LGR}{18} % ϟ (greek small letter koppa)
-\DeclareTextSymbol{\textKoppa}{LGR}{18} % ϟ (capital numerical koppa) not distinct in LGR
-\DeclareTextSymbol{\textqoppa}{LGR}{19} % ϙ (archaic koppa)
-\DeclareTextSymbol{\textQoppa}{LGR}{21} % Ϙ (archaic Koppa)
+\DeclareTextSymbol{\textKoppa}{LGR}{18} % Ϟ Greek letter Koppa
+\DeclareTextSymbol{\textkoppa}{LGR}{18} % ϟ Greek small letter koppa
+\DeclareTextSymbol{\textqoppa}{LGR}{19} % ϙ archaic koppa
+\DeclareTextSymbol{\textQoppa}{LGR}{21} % Ϙ archaic Koppa
\DeclareTextSymbol{\textStigma}{LGR}{22} % Ϛ in some fonts ϹΤ ligature
\DeclareTextSymbol{\textSampi}{LGR}{23} % Ϡ
\DeclareTextSymbol{\textsampi}{LGR}{27} % ϡ
@@ -992,15 +999,15 @@ provide fallback LICR macros with detailed error reporting:</p>
Press &lt;return&gt; to proceed (dropping the symbol from the document).}
}
-\ProvideTextCommand{\textbetasymbol} {LGR}{\LGR&#64;TextSymbolUnavailable{ϐ beta symbol}}
-\ProvideTextCommand{\textkappasymbol}{LGR}{\LGR&#64;TextSymbolUnavailable{ϰ kappa symbol}}
-\ProvideTextCommand{\textThetasymbol}{LGR}{\LGR&#64;TextSymbolUnavailable{ϴ Theta symbol}}
+\ProvideTextCommand{\textbetasymbol} {LGR}{\LGR&#64;TextSymbolUnavailable{beta symbol}} % ϐ
+\ProvideTextCommand{\textkappasymbol}{LGR}{\LGR&#64;TextSymbolUnavailable{kappa symbol}} % ϰ
+\ProvideTextCommand{\textThetasymbol}{LGR}{\LGR&#64;TextSymbolUnavailable{Theta symbol}} % ϴ
-\ProvideTextCommand{\textthetasymbol} {LGR}{\LGR&#64;TextSymbolOnlyMath{ϑ theta symbol}{$\vartheta$}}
-\ProvideTextCommand{\textphisymbol} {LGR}{\LGR&#64;TextSymbolOnlyMath{ϕ phi symbol}{$\phi$}}
-\ProvideTextCommand{\textpisymbol} {LGR}{\LGR&#64;TextSymbolOnlyMath{ϖ pi symbol}{$\varpi$}}
-\ProvideTextCommand{\textrhosymbol} {LGR}{\LGR&#64;TextSymbolOnlyMath{ϱ rho symbol}{$\varrho$}}
-\ProvideTextCommand{\textepsilonsymbol}{LGR}{\LGR&#64;TextSymbolOnlyMath{ϵ lunate epsilon symbol}{$\epsilon$}}</pre>
+\ProvideTextCommand{\textthetasymbol} {LGR}{\LGR&#64;TextSymbolOnlyMath{theta symbol}{$\vartheta$}} % ϑ
+\ProvideTextCommand{\textphisymbol} {LGR}{\LGR&#64;TextSymbolOnlyMath{phi symbol}{$\phi$}} % ϕ
+\ProvideTextCommand{\textpisymbol} {LGR}{\LGR&#64;TextSymbolOnlyMath{pi symbol}{$\varpi$}} % ϖ
+\ProvideTextCommand{\textrhosymbol} {LGR}{\LGR&#64;TextSymbolOnlyMath{rho symbol}{$\varrho$}} % ϱ
+\ProvideTextCommand{\textepsilonsymbol}{LGR}{\LGR&#64;TextSymbolOnlyMath{lunate epsilon symbol}{$\epsilon$}} % ϵ</pre>
</section>
</section>
<section id="other">
@@ -1032,6 +1039,11 @@ provide fallback LICR macros with detailed error reporting:</p>
\DeclareTextSymbol{\texteuro}{LGR}{24} % € \euro in greek.ldf
\DeclareTextSymbol{\textpercent}{LGR}{37} % %
\DeclareTextSymbol{\textperthousand}{LGR}{25} % ‰ \permill in greek.ldf</pre>
+<p>The micro sign 00B5 is defined in TS1 (textcomp) and PU (hyperref)
+as <span class="docutils literal">\textmu</span>. LGR uses <span class="docutils literal">\textmu</span> for the similar looking
+small Greek letter mu.
+The alias <span class="docutils literal">\textmicro</span> prints in a micro sign and does not upcase:</p>
+<pre class="literal-block">\DeclareTextSymbol{\textmicro}{LGR}{109} % µ</pre>
<p>T3 (tipa):</p>
<pre class="literal-block">\DeclareTextSymbol{\textschwa}{LGR}{26} % ə</pre>
<p>T3 also defines some greek letters as well as Latin characters with Greek
diff --git a/language/greek/greek-fontenc/puenc-greek.def b/language/greek/greek-fontenc/puenc-greek.def
new file mode 100644
index 0000000000..997e9e6635
--- /dev/null
+++ b/language/greek/greek-fontenc/puenc-greek.def
@@ -0,0 +1,454 @@
+% puenc-greek.def
+% +++++++++++++++
+% Greek LICR definitions for PDF strings (hyperref)
+% *************************************************
+%
+% :Copyright: © 2020 Günter Milde
+% :Licence: This work may be distributed and/or modified under the
+% conditions of the `LaTeX Project Public License`_, either
+% version 1.3 of this license or any later version.
+% :Identification:
+% ::
+
+\ProvidesFile{puenc-greek.def}
+[2020/10/18 2.0 Greek LICRs for PDF strings]
+
+% :abstract:
+% Support for Greek LICR macros in PDF bookmarks. Extends puenc.def_.
+% Used by babel-greek_ and textalpha_.
+%
+% **History**:
+% .. class:: borderless
+%
+% ====== ========== ========================================================
+% 2.0 2020-10-18 initial version
+% ====== ========== ========================================================
+%
+% Diacritics
+% ==========
+%
+% Greek alias names for standard accents (without tabacckludge)::
+
+\DeclareTextCommand{\acctonos}{PU}{\'}
+\DeclareTextCommand{\accvaria}{PU}{\`}
+\DeclareTextCommand{\accdialytika}{PU}{\"}
+
+% Use combining characters when no pre-composed character is available:
+%
+% Breathings and perispomeni::
+
+\DeclareTextCommand{\accpsili}{PU}[1]{#1\83\023} % ψιλή spiritus lenis (smooth breathing)
+\DeclareTextCommand{\accdasia}{PU}[1]{#1\83\024} % δασεῖα spiritus asper (rough breathing)
+\DeclareTextCommand{\accperispomeni}{PU}[1]{#1\83\102} % COMBINING GREEK PERISPOMENI
+
+% Sub-iota (``\ypogegrammeni``) is a postfix accent (ligature in LGR) ::
+
+\DeclareTextCommand{\ypogegrammeni}{PU}{\83\105} % COMBINING GREEK YPOGEGRAMMENI
+
+% Combined diacritics::
+
+\DeclareTextCommand{\accdialytikavaria}{PU}[1]{#1\83\010\83\000}
+\DeclareTextCommand{\accdialytikatonos}{PU}[1]{#1\83\010\83\001}
+\DeclareTextCommand{\accdialytikaperispomeni}{PU}[1]{#1\83\102\83\010}
+
+\DeclareTextCommand{\accdasiavaria}{PU}[1]{#1\83\024\83\000}
+\DeclareTextCommand{\accdasiaoxia}{PU}[1]{#1\83\024\83\001}
+\DeclareTextCommand{\accdasiaperispomeni}{PU}[1]{#1\83\024\83\102}
+
+\DeclareTextCommand{\accpsilivaria}{PU}[1]{#1\83\000\83\023}
+\DeclareTextCommand{\accpsilioxia}{PU}[1]{#1\83\001\83\023}
+\DeclareTextCommand{\accpsiliperispomeni}{PU}[1]{#1\83\102\83\023}
+
+% Common Definitions
+% ==================
+%
+% Use the common `Greek font encoding definitions`.
+%
+% Set the ``\LastDeclaredEncoding`` to PU and read definitions
+% from greek-fontenc.def_::
+
+\renewcommand*{\LastDeclaredEncoding}{PU}
+\input{greek-fontenc.def}
+
+% Character Definitions
+% =====================
+%
+% Compatibility defs with LGR
+% ---------------------------
+%
+% Basic Latin::
+
+\DeclareTextCommand{\textsemicolon}{PU}{;} % "003B
+
+% Latin 1 Supplement:
+% Distinguish MICRO SIGN from letter mu::
+
+\DeclareTextCommand{\textmicro}{PU}{\83\274} % "00B5 MICRO SIGN
+
+
+% Greek and Coptic
+% ----------------
+%
+% ::
+
+% NR Unicode Name % babel name, PU name
+% 0370 GREEK CAPITAL LETTER HETA % Ͱ
+% 0371 GREEK SMALL LETTER HETA % ͱ
+% 0372 GREEK CAPITAL LETTER ARCHAIC SAMPI % Ͳ
+% 0373 GREEK SMALL LETTER ARCHAIC SAMPI % ͳ
+\DeclareTextCommand{\textdexiakeraia}{PU}{\83\164} % ʹ \anwtonos, \textnumeralsigngreek
+\DeclareTextCommand{\textaristerikeraia}{PU}{\83\165} % ͵ \katwtonos, \textnumeralsignlowergreek
+% 0376 GREEK CAPITAL LETTER PAMPHYLIAN DIGAMMA % Ͷ
+% 0377 GREEK SMALL LETTER PAMPHYLIAN DIGAMMA % ͷ
+
+% 037A GREEK YPOGEGRAMMENI (use \textcompwordmark\ypogegrammeni) % ͺ
+% 037B GREEK SMALL REVERSED LUNATE SIGMA SYMBOL
+% 037C GREEK SMALL DOTTED LUNATE SIGMA SYMBOL
+% 037D GREEK SMALL REVERSED DOTTED LUNATE SIGMA SYMBOL
+
+% Erotimatiko: use 003B SEMICOLON, not 037E GREEK QUESTION MARK; dont use the
+% literal char, as it is active with textalpha's "keep-semicolon" option::
+
+\DeclareTextCommand{\texterotimatiko}{PU}{\80\073}
+
+\DeclareTextCompositeCommand{\'}{PU}{\@empty}{\83\204} % ΄ 0384 GREEK TONOS
+\DeclareTextCompositeCommand{\'}{PU}{\ }{\83\204} % ΄ 0384 GREEK TONOS
+\DeclareTextCompositeCommand{\accdialytikatonos}{PU}{\@empty}{\83\205}
+\DeclareTextCompositeCommand{\accdialytikatonos}{PU}{\ }{\83\205}
+\DeclareTextCompositeCommand{\'}{PU}{\textAlpha}{\83\206} % Ά
+\DeclareTextCommand{\textanoteleia}{PU}{\80\267} % use 00B7 MIDDLE DOT, not 0387 GREEK ANO TELEIA
+\DeclareTextCompositeCommand{\'}{PU}{\textEpsilon}{\83\210} % Έ
+\DeclareTextCompositeCommand{\'}{PU}{\textEta}{\83\211} % Ή
+\DeclareTextCompositeCommand{\'}{PU}{\textIota}{\83\212} % Ί
+\DeclareTextCompositeCommand{\'}{PU}{\textOmicron}{\83\214} % Ό
+\DeclareTextCompositeCommand{\'}{PU}{\textUpsilon}{\83\216} % Ύ
+\DeclareTextCompositeCommand{\'}{PU}{\textOmega}{\83\217} % Ώ
+\DeclareTextCompositeCommand{\accdialytikatonos}{PU}{\textiota}{\83\220} % ΐ
+\DeclareTextCommand{\textAlpha}{PU}{\83\221} % Α "0391
+\DeclareTextCommand{\textBeta}{PU}{\83\222} % Β "0392
+\DeclareTextCommand{\textGamma}{PU}{\83\223} % Γ "0393
+\DeclareTextCommand{\textDelta}{PU}{\83\224} % Δ "0394
+\DeclareTextCommand{\textEpsilon}{PU}{\83\225} % Ε "0395
+\DeclareTextCommand{\textZeta}{PU}{\83\226} % Ζ "0396
+\DeclareTextCommand{\textEta}{PU}{\83\227} % Η "0397
+\DeclareTextCommand{\textTheta}{PU}{\83\230} % Θ "0398
+\DeclareTextCommand{\textIota}{PU}{\83\231} % Ι "0399
+\DeclareTextCommand{\textKappa}{PU}{\83\232} % Κ "039A
+\DeclareTextCommand{\textLambda}{PU}{\83\233} % Λ "039B
+\DeclareTextCommand{\textMu}{PU}{\83\234} % Μ "039C
+\DeclareTextCommand{\textNu}{PU}{\83\235} % Ν "039D
+\DeclareTextCommand{\textXi}{PU}{\83\236} % Ξ "039E
+\DeclareTextCommand{\textOmicron}{PU}{\83\237} % Ο "039F
+\DeclareTextCommand{\textPi}{PU}{\83\240} % Π "03A0
+\DeclareTextCommand{\textRho}{PU}{\83\241} % Ρ "03A1
+\DeclareTextCommand{\textSigma}{PU}{\83\243} % Σ "03A3
+\DeclareTextCommand{\textTau}{PU}{\83\244} % Τ "03A4
+\DeclareTextCommand{\textUpsilon}{PU}{\83\245} % Υ "03A5
+\DeclareTextCommand{\textPhi}{PU}{\83\246} % Φ "03A6
+\DeclareTextCommand{\textChi}{PU}{\83\247} % Χ "03A7
+\DeclareTextCommand{\textPsi}{PU}{\83\250} % Ψ "03A8
+\DeclareTextCommand{\textOmega}{PU}{\83\251} % Ω "03A9
+\DeclareTextCompositeCommand{\"}{PU}{\textIota}{\83\252} % Ϊ "03AA
+\DeclareTextCompositeCommand{\"}{PU}{\textUpsilon}{\83\253} % Ϋ "03AB
+\DeclareTextCompositeCommand{\'}{PU}{\textalpha}{\83\254} % ά "03AC
+\DeclareTextCompositeCommand{\'}{PU}{\textepsilon}{\83\255} % έ "03AD
+\DeclareTextCompositeCommand{\'}{PU}{\texteta}{\83\256} % ή "03AE
+\DeclareTextCompositeCommand{\'}{PU}{\textiota}{\83\257} % ί "03AF
+\DeclareTextCompositeCommand{\accdialytikatonos}{PU}{\textupsilon}{\83\260} % ΰ "03B0
+\DeclareTextCommand{\textalpha}{PU}{\83\261} % α "03B1
+\DeclareTextCommand{\textbeta}{PU}{\83\262} % β "03B2
+\DeclareTextCommand{\textgamma}{PU}{\83\263} % γ "03B3
+\DeclareTextCommand{\textdelta}{PU}{\83\264} % δ "03B4
+\DeclareTextCommand{\textepsilon}{PU}{\83\265} % ε "03B5
+\DeclareTextCommand{\textzeta}{PU}{\83\266} % ζ "03B6
+\DeclareTextCommand{\texteta}{PU}{\83\267} % η "03B7
+\DeclareTextCommand{\texttheta}{PU}{\83\270} % θ "03B8
+\DeclareTextCommand{\textiota}{PU}{\83\271} % ι "03B9
+\DeclareTextCommand{\textkappa}{PU}{\83\272} % κ "03BA
+\DeclareTextCommand{\textlambda}{PU}{\83\273} % λ "03BB
+\DeclareTextCommand{\textmu}{PU}{\83\274} % μ "03BC \textmugreek
+\DeclareTextCommand{\textnu}{PU}{\83\275} % ν "03BD
+\DeclareTextCommand{\textxi}{PU}{\83\276} % ξ "03BE
+\DeclareTextCommand{\textomicron}{PU}{\83\277} % ο "03BF
+\DeclareTextCommand{\textpi}{PU}{\83\300} % π "03C0
+\DeclareTextCommand{\textrho}{PU}{\83\301} % ρ "03C1
+\DeclareTextCommand{\textfinalsigma}{PU}{\83\302} % ς "03C2 final sigma
+\DeclareTextCommand{\textsigma}{PU}{\83\303} % σ "03C3
+\DeclareTextCommand{\texttau}{PU}{\83\304} % τ "03C4
+\DeclareTextCommand{\textupsilon}{PU}{\83\305} % υ "03C5
+\DeclareTextCommand{\textphi}{PU}{\83\306} % φ "03C6
+\DeclareTextCommand{\textchi}{PU}{\83\307} % χ "03C7
+\DeclareTextCommand{\textpsi}{PU}{\83\310} % ψ "03C8
+\DeclareTextCommand{\textomega}{PU}{\83\311} % ω "03C9
+
+\DeclareTextCompositeCommand{\"}{PU}{\textiota}{\83\312}% ϊ "03CA
+\DeclareTextCompositeCommand{\"}{PU}{\textupsilon}{\83\313}% ϋ "03CB
+\DeclareTextCompositeCommand{\'}{PU}{\textomicron}{\83\314}% ό "03CC
+\DeclareTextCompositeCommand{\'}{PU}{\textupsilon}{\83\315}% ύ "03CD
+\DeclareTextCompositeCommand{\'}{PU}{\textomega}{\83\316}% ώ "03CE
+
+% Archaic letters (still used in Greek numerals)
+% and symbol variants::
+
+\DeclareTextCommand{\textbetasymbol}{PU}{\83\320} % ϐ "03D0
+\DeclareTextCommand{\textthetasymbol}{PU}{\83\321} % ϑ "03D1
+
+\DeclareTextCommand{\textphisymbol}{PU}{\83\325} % ϕ "03D5
+\DeclareTextCommand{\textpisymbol}{PU}{\83\326} % ϖ "03D6
+
+\DeclareTextCommand{\textQoppa}{PU}{\83\330} % Ϙ "03D8
+\DeclareTextCommand{\textqoppa}{PU}{\83\331} % ϙ "03D9
+\DeclareTextCommand{\textStigma}{PU}{\83\332} % Ϛ "03DA
+\DeclareTextCommand{\textstigma}{PU}{\83\333} % ϛ "03DB
+\DeclareTextCommand{\textDigamma}{PU}{\83\334} % Ϝ "03DC
+\DeclareTextCommand{\textdigamma}{PU}{\83\335} % ϝ "03DD
+\DeclareTextCommand{\textKoppa}{PU}{\83\336} % Ϟ "03DE in LGR identic to \textkoppa
+\DeclareTextCommand{\textkoppa}{PU}{\83\337} % ϟ "03DF \koppa, \textqoppa [sic!]
+\DeclareTextCommand{\textSampi}{PU}{\83\340} % Ϡ "03E0
+\DeclareTextCommand{\textsampi}{PU}{\83\341} % ϡ "03E1
+
+\DeclareTextCommand{\textkappasymbol}{PU}{\83\360} % ϰ "03F0
+\DeclareTextCommand{\textrhosymbol}{PU}{\83\361} % ϱ "03F1
+
+\DeclareTextCommand{\textThetasymbol}{PU}{\83\364} % ϴ "03F4
+\DeclareTextCommand{\textepsilonsymbol}{PU}{\83\365} % ϵ "03F5
+
+% Dummy definition (\textautosigma is lowercase of \textSigma)
+% TODO: implement autosigma for PU and TU::
+
+\ProvideTextCommand{\textautosigma}{PU}{\textsigma}
+
+
+% Greek Extended
+% --------------
+%
+% We skip definitions for characters "... WITH OXIA", because they would
+% overwrite the defintions for "... WITH TONOS" in the `Greek and Coptic`
+% block.
+%
+% ::
+
+\DeclareTextCompositeCommand{\accpsili}{PU}{\textalpha}{\9037\000} % ἀ
+\DeclareTextCompositeCommand{\accdasia}{PU}{\textalpha}{\9037\001} % ἁ
+\DeclareTextCompositeCommand{\accpsilivaria}{PU}{\textalpha}{\9037\002} % ἂ
+\DeclareTextCompositeCommand{\accdasiavaria}{PU}{\textalpha}{\9037\003} % ἃ
+\DeclareTextCompositeCommand{\accpsilioxia}{PU}{\textalpha}{\9037\004} % ἄ
+\DeclareTextCompositeCommand{\accdasiaoxia}{PU}{\textalpha}{\9037\005} % ἅ
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{PU}{\textalpha}{\9037\006} % ἆ
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{PU}{\textalpha}{\9037\007} % ἇ
+\DeclareTextCompositeCommand{\accpsili}{PU}{\textAlpha}{\9037\010} % Ἀ
+\DeclareTextCompositeCommand{\accdasia}{PU}{\textAlpha}{\9037\011} % Ἁ
+\DeclareTextCompositeCommand{\accpsilivaria}{PU}{\textAlpha}{\9037\012} % Ἂ
+\DeclareTextCompositeCommand{\accdasiavaria}{PU}{\textAlpha}{\9037\013} % Ἃ
+\DeclareTextCompositeCommand{\accpsilioxia}{PU}{\textAlpha}{\9037\014} % Ἄ
+\DeclareTextCompositeCommand{\accdasiaoxia}{PU}{\textAlpha}{\9037\015} % Ἅ
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{PU}{\textAlpha}{\9037\016} % Ἆ
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{PU}{\textAlpha}{\9037\017} % Ἇ
+
+\DeclareTextCompositeCommand{\accpsili}{PU}{\textepsilon}{\9037\020} % ἐ
+\DeclareTextCompositeCommand{\accdasia}{PU}{\textepsilon}{\9037\021} % ἑ
+\DeclareTextCompositeCommand{\accpsilivaria}{PU}{\textepsilon}{\9037\022} % ἒ
+\DeclareTextCompositeCommand{\accdasiavaria}{PU}{\textepsilon}{\9037\023} % ἓ
+\DeclareTextCompositeCommand{\accpsilioxia}{PU}{\textepsilon}{\9037\024} % ἔ
+\DeclareTextCompositeCommand{\accdasiaoxia}{PU}{\textepsilon}{\9037\025} % ἕ
+\DeclareTextCompositeCommand{\accpsili}{PU}{\textEpsilon}{\9037\030} % Ἐ
+\DeclareTextCompositeCommand{\accdasia}{PU}{\textEpsilon}{\9037\031} % Ἑ
+\DeclareTextCompositeCommand{\accpsilivaria}{PU}{\textEpsilon}{\9037\032} % Ἒ
+\DeclareTextCompositeCommand{\accdasiavaria}{PU}{\textEpsilon}{\9037\033} % Ἓ
+\DeclareTextCompositeCommand{\accpsilioxia}{PU}{\textEpsilon}{\9037\034} % Ἔ
+\DeclareTextCompositeCommand{\accdasiaoxia}{PU}{\textEpsilon}{\9037\035} % Ἕ
+
+\DeclareTextCompositeCommand{\accpsili}{PU}{\texteta}{\9037\040} % ἠ
+\DeclareTextCompositeCommand{\accdasia}{PU}{\texteta}{\9037\041} % ἡ
+\DeclareTextCompositeCommand{\accpsilivaria}{PU}{\texteta}{\9037\042} % ἢ
+\DeclareTextCompositeCommand{\accdasiavaria}{PU}{\texteta}{\9037\043} % ἣ
+\DeclareTextCompositeCommand{\accpsilioxia}{PU}{\texteta}{\9037\044} % ἤ
+\DeclareTextCompositeCommand{\accdasiaoxia}{PU}{\texteta}{\9037\045} % ἥ
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{PU}{\texteta}{\9037\046} % ἦ
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{PU}{\texteta}{\9037\047} % ἧ
+\DeclareTextCompositeCommand{\accpsili}{PU}{\textEta}{\9037\050} % Ἠ
+\DeclareTextCompositeCommand{\accdasia}{PU}{\textEta}{\9037\051} % Ἡ
+\DeclareTextCompositeCommand{\accpsilivaria}{PU}{\textEta}{\9037\052} % Ἢ
+\DeclareTextCompositeCommand{\accdasiavaria}{PU}{\textEta}{\9037\053} % Ἣ
+\DeclareTextCompositeCommand{\accpsilioxia}{PU}{\textEta}{\9037\054} % Ἤ
+\DeclareTextCompositeCommand{\accdasiaoxia}{PU}{\textEta}{\9037\055} % Ἥ
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{PU}{\textEta}{\9037\056} % Ἦ
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{PU}{\textEta}{\9037\057} % Ἧ
+
+\DeclareTextCompositeCommand{\accpsili}{PU}{\textiota}{\9037\060} % ἰ
+\DeclareTextCompositeCommand{\accdasia}{PU}{\textiota}{\9037\061} % ἱ
+\DeclareTextCompositeCommand{\accpsilivaria}{PU}{\textiota}{\9037\062} % ἲ
+\DeclareTextCompositeCommand{\accdasiavaria}{PU}{\textiota}{\9037\063} % ἳ
+\DeclareTextCompositeCommand{\accpsilioxia}{PU}{\textiota}{\9037\064} % ἴ
+\DeclareTextCompositeCommand{\accdasiaoxia}{PU}{\textiota}{\9037\065} % ἵ
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{PU}{\textiota}{\9037\066} % ἶ
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{PU}{\textiota}{\9037\067} % ἷ
+\DeclareTextCompositeCommand{\accpsili}{PU}{\textIota}{\9037\070} % Ἰ
+\DeclareTextCompositeCommand{\accdasia}{PU}{\textIota}{\9037\071} % Ἱ
+\DeclareTextCompositeCommand{\accpsilivaria}{PU}{\textIota}{\9037\072} % Ἲ
+\DeclareTextCompositeCommand{\accdasiavaria}{PU}{\textIota}{\9037\073} % Ἳ
+\DeclareTextCompositeCommand{\accpsilioxia}{PU}{\textIota}{\9037\074} % Ἴ
+\DeclareTextCompositeCommand{\accdasiaoxia}{PU}{\textIota}{\9037\075} % Ἵ
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{PU}{\textIota}{\9037\076} % Ἶ
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{PU}{\textIota}{\9037\077} % Ἷ
+
+\DeclareTextCompositeCommand{\accpsili}{PU}{\textomicron}{\9037\100} % ὀ
+\DeclareTextCompositeCommand{\accdasia}{PU}{\textomicron}{\9037\101} % ὁ
+\DeclareTextCompositeCommand{\accpsilivaria}{PU}{\textomicron}{\9037\102} % ὂ
+\DeclareTextCompositeCommand{\accdasiavaria}{PU}{\textomicron}{\9037\103} % ὃ
+\DeclareTextCompositeCommand{\accpsilioxia}{PU}{\textomicron}{\9037\104} % ὄ
+\DeclareTextCompositeCommand{\accdasiaoxia}{PU}{\textomicron}{\9037\105} % ὅ
+\DeclareTextCompositeCommand{\accpsili}{PU}{\textOmicron}{\9037\110} % Ὀ
+\DeclareTextCompositeCommand{\accdasia}{PU}{\textOmicron}{\9037\111} % Ὁ
+\DeclareTextCompositeCommand{\accpsilivaria}{PU}{\textOmicron}{\9037\112} % Ὂ
+\DeclareTextCompositeCommand{\accdasiavaria}{PU}{\textOmicron}{\9037\113} % Ὃ
+\DeclareTextCompositeCommand{\accpsilioxia}{PU}{\textOmicron}{\9037\114} % Ὄ
+\DeclareTextCompositeCommand{\accdasiaoxia}{PU}{\textOmicron}{\9037\115} % Ὅ
+
+\DeclareTextCompositeCommand{\accpsili}{PU}{\textupsilon}{\9037\120} % ὐ
+\DeclareTextCompositeCommand{\accdasia}{PU}{\textupsilon}{\9037\121} % ὑ
+\DeclareTextCompositeCommand{\accpsilivaria}{PU}{\textupsilon}{\9037\122} % ὒ
+\DeclareTextCompositeCommand{\accdasiavaria}{PU}{\textupsilon}{\9037\123} % ὓ
+\DeclareTextCompositeCommand{\accpsilioxia}{PU}{\textupsilon}{\9037\124} % ὔ
+\DeclareTextCompositeCommand{\accdasiaoxia}{PU}{\textupsilon}{\9037\125} % ὕ
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{PU}{\textupsilon}{\9037\126} % ὖ
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{PU}{\textupsilon}{\9037\127} % ὗ
+\DeclareTextCompositeCommand{\accdasia}{PU}{\textUpsilon}{\9037\131} % Ὑ
+\DeclareTextCompositeCommand{\accdasiavaria}{PU}{\textUpsilon}{\9037\133} % Ὓ
+\DeclareTextCompositeCommand{\accdasiaoxia}{PU}{\textUpsilon}{\9037\135} % Ὕ
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{PU}{\textUpsilon}{\9037\137} % Ὗ
+
+\DeclareTextCompositeCommand{\accpsili}{PU}{\textomega}{\9037\140} % ὠ
+\DeclareTextCompositeCommand{\accdasia}{PU}{\textomega}{\9037\141} % ὡ
+\DeclareTextCompositeCommand{\accpsilivaria}{PU}{\textomega}{\9037\142} % ὢ
+\DeclareTextCompositeCommand{\accdasiavaria}{PU}{\textomega}{\9037\143} % ὣ
+\DeclareTextCompositeCommand{\accpsilioxia}{PU}{\textomega}{\9037\144} % ὤ
+\DeclareTextCompositeCommand{\accdasiaoxia}{PU}{\textomega}{\9037\145} % ὥ
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{PU}{\textomega}{\9037\146} % ὦ
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{PU}{\textomega}{\9037\147} % ὧ
+\DeclareTextCompositeCommand{\accpsili}{PU}{\textOmega}{\9037\150} % Ὠ
+\DeclareTextCompositeCommand{\accdasia}{PU}{\textOmega}{\9037\151} % Ὡ
+\DeclareTextCompositeCommand{\accpsilivaria}{PU}{\textOmega}{\9037\152} % Ὢ
+\DeclareTextCompositeCommand{\accdasiavaria}{PU}{\textOmega}{\9037\153} % Ὣ
+\DeclareTextCompositeCommand{\accpsilioxia}{PU}{\textOmega}{\9037\154} % Ὤ
+\DeclareTextCompositeCommand{\accdasiaoxia}{PU}{\textOmega}{\9037\155} % Ὥ
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{PU}{\textOmega}{\9037\156} % Ὦ
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{PU}{\textOmega}{\9037\157} % Ὧ
+
+\DeclareTextCompositeCommand{\`}{PU}{\textalpha}{\9037\160} % ὰ
+\DeclareTextCompositeCommand{\`}{PU}{\textepsilon}{\9037\162} % ὲ
+\DeclareTextCompositeCommand{\`}{PU}{\texteta}{\9037\164} % ὴ
+\DeclareTextCompositeCommand{\`}{PU}{\textiota}{\9037\166} % ὶ
+\DeclareTextCompositeCommand{\`}{PU}{\textomicron}{\9037\170} % ὸ
+\DeclareTextCompositeCommand{\`}{PU}{\textupsilon}{\9037\172} % ὺ
+\DeclareTextCompositeCommand{\`}{PU}{\textomega}{\9037\174} % ὼ
+
+\DeclareTextCompositeCommand{\u}{PU}{\textalpha}{\9037\260} % ᾰ
+\DeclareTextCompositeCommand{\=}{PU}{\textalpha}{\9037\261} % ᾱ
+% ᾲ
+% ᾳ
+% ᾴ
+\DeclareTextCompositeCommand{\~}{PU}{\textalpha}{\9037\266} % ᾶ
+\DeclareTextCompositeCommand{\accperispomeni}{PU}{\textalpha}{\9037\267} % ᾶ
+% ᾷ
+\DeclareTextCompositeCommand{\u}{PU}{\textAlpha}{\9037\270} % Ᾰ
+\DeclareTextCompositeCommand{\=}{PU}{\textAlpha}{\9037\271} % Ᾱ
+\DeclareTextCompositeCommand{\`}{PU}{\textAlpha}{\9037\272} % Ὰ
+% Ά
+% ᾼ
+\DeclareTextCompositeCommand{\accpsili}{PU}{\@empty}{\9037\275} % ᾽
+\DeclareTextCompositeCommand{\accpsili}{PU}{\ }{\9037\275} % ᾽
+\DeclareTextCommand{\prosgegrammeni}{PU}{\9037\276} % ι
+\DeclareTextCompositeCommand{\accpsili}{PU}{\@empty}{\9037\277} % ᾿
+\DeclareTextCompositeCommand{\accpsili}{PU}{\ }{\9037\277} % ᾿
+
+\DeclareTextCompositeCommand{\accperispomeni}{PU}{\@empty}{\9037\300} % ῀
+\DeclareTextCompositeCommand{\accperispomeni}{PU}{\ }{\9037\300} % ῀
+\DeclareTextCompositeCommand{\accdialytikaperispomeni}{PU}{\@empty}{\9037\301} % ῁
+\DeclareTextCompositeCommand{\accdialytikaperispomeni}{PU}{\ }{\9037\301} % ῁
+% ῂ
+% ῃ
+% ῄ
+\DeclareTextCompositeCommand{\~}{PU}{\texteta}{\9037\307} % ῆ
+\DeclareTextCompositeCommand{\accperispomeni}{PU}{\texteta}{\9037\307} % ῆ
+% ῇ
+\DeclareTextCompositeCommand{\`}{PU}{\textEpsilon}{\9037\310} % Ὲ
+\DeclareTextCompositeCommand{\`}{PU}{\textEta}{\9037\312} % Ὴ
+% ῌ
+\DeclareTextCompositeCommand{\accpsilivaria}{PU}{\@empty}{\9037\315} % ῍
+\DeclareTextCompositeCommand{\accpsilivaria}{PU}{\ }{\9037\315} % ῍
+\DeclareTextCompositeCommand{\accpsilioxia}{PU}{\@empty}{\9037\316} % ῎
+\DeclareTextCompositeCommand{\accpsilioxia}{PU}{\ }{\9037\316} % ῎
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{PU}{\@empty}{\9037\317} % ῏
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{PU}{\ }{\9037\317} % ῏
+
+\DeclareTextCompositeCommand{\u}{PU}{\textiota}{\9037\320} % ῐ
+\DeclareTextCompositeCommand{\=}{PU}{\textiota}{\9037\321} % ῑ
+\DeclareTextCompositeCommand{\accdialytikavaria}{PU}{\textiota}{\9037\322} % ῒ
+\DeclareTextCompositeCommand{\accdialytikaoxia}{PU}{\textiota}{\9037\323} % ΐ
+\DeclareTextCompositeCommand{\~}{PU}{\textiota}{\9037\326} % ῖ
+\DeclareTextCompositeCommand{\accperispomeni}{PU}{\textiota}{\9037\326} % ῖ
+\DeclareTextCompositeCommand{\accdialytikaperispomeni}{PU}{\textiota}{\9037\327} % ῗ
+\DeclareTextCompositeCommand{\u}{PU}{\textIota}{\9037\330} % Ῐ
+\DeclareTextCompositeCommand{\=}{PU}{\textIota}{\9037\331} % Ῑ
+\DeclareTextCompositeCommand{\`}{PU}{\textIota}{\9037\332} % Ὶ
+\DeclareTextCompositeCommand{\accdasiavaria}{PU}{\@empty}{\9037\335} % ῝
+\DeclareTextCompositeCommand{\accdasiavaria}{PU}{\ }{\9037\335} % ῝
+\DeclareTextCompositeCommand{\accdasiaoxia}{PU}{\@empty}{\9037\336} % ῞
+\DeclareTextCompositeCommand{\accdasiaoxia}{PU}{\ }{\9037\336} % ῞
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{PU}{\@empty}{\9037\337} % ῟
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{PU}{\ }{\9037\337} % ῟
+
+\DeclareTextCompositeCommand{\u}{PU}{\textupsilon}{\9037\340} % ῠ
+\DeclareTextCompositeCommand{\=}{PU}{\textupsilon}{\9037\341} % ῡ
+\DeclareTextCompositeCommand{\accdialytikavaria}{PU}{\textupsilon}{\9037\342} % ῢ
+\DeclareTextCompositeCommand{\accdialytikaoxia}{PU}{\textupsilon}{\9037\343} % ΰ
+\DeclareTextCompositeCommand{\accpsili}{PU}{\textrho}{\9037\344} % ῤ
+\DeclareTextCompositeCommand{\accdasia}{PU}{\textrho}{\9037\345} % ῥ
+\DeclareTextCompositeCommand{\~}{PU}{\textupsilon}{\9037\346} % ῦ
+\DeclareTextCompositeCommand{\accperispomeni}{PU}{\textupsilon}{\9037\346} % ῦ
+\DeclareTextCompositeCommand{\accdialytikaperispomeni}{PU}{\textupsilon}{\9037\347} % ῧ
+\DeclareTextCompositeCommand{\u}{PU}{\textUpsilon}{\9037\350} % Ῠ
+\DeclareTextCompositeCommand{\=}{PU}{\textUpsilon}{\9037\351} % Ῡ
+\DeclareTextCompositeCommand{\`}{PU}{\textUpsilon}{\9037\352} % Ὺ
+\DeclareTextCompositeCommand{\accdasia}{PU}{\textRho}{\9037\354} % Ῥ
+\DeclareTextCompositeCommand{\accdialytikavaria}{PU}{\@empty}{\9037\355} % ῭
+\DeclareTextCompositeCommand{\accdialytikavaria}{PU}{\ }{\9037\355} % ῭
+\DeclareTextCompositeCommand{\accdialytikaoxia}{PU}{\@empty}{\9037\356} % ΅
+\DeclareTextCompositeCommand{\accdialytikaoxia}{PU}{\ }{\9037\356} % ΅
+% `
+
+% ῲ
+% ῳ
+% ῴ
+\DeclareTextCompositeCommand{\~}{PU}{\textomega}{\9037\366} % ῶ
+\DeclareTextCompositeCommand{\accperispomeni}{PU}{\textomega}{\9037\366} % ῶ
+% ῷ
+\DeclareTextCompositeCommand{\`}{PU}{\textOmicron}{\9037\370} % Ὸ
+\DeclareTextCompositeCommand{\`}{PU}{\textOmega}{\9037\372} % Ὼ
+% ῼ
+\DeclareTextCompositeCommand{\accoxia}{PU}{\@empty}{\9037\375} % ´
+\DeclareTextCompositeCommand{\accoxia}{PU}{\ }{\9037\375} % ´
+\DeclareTextCompositeCommand{\accdasia}{PU}{\@empty}{\9037\376} % ῾
+\DeclareTextCompositeCommand{\accdasia}{PU}{\ }{\9037\376} % ῾
+
+% Letterlike Symbols
+% ------------------
+% ::
+
+\DeclareTextCommand{\textohm}{PU}{\83\251} % "03A9 OHM SIGN, use 03A9 Omega
+
+% Ancient Greek Numbers
+% ---------------------
+% TODO: map other chars to corresponding Greek letters.
+% See also the grnumalt_ package.
+%
+% Definition with literal Unicode characters, because the code-point has 5
+% hexadecimal digits:
+%
+% ::
+
+\DeclareTextCommand{\textpentedeka}{PU}{𐅄} % "10144 GREEK ACROPHONIC ATTIC FIFTY
+\DeclareTextCommand{\textpentehekaton}{PU}{𐅅} % "10145 GREEK ACROPHONIC ATTIC FIVE HUNDRED
+\DeclareTextCommand{\textpenteqilioi}{PU}{𐅆} % "10146 GREEK ACROPHONIC ATTIC FIVE THOUSAND
+\DeclareTextCommand{\textpentemuria}{PU}{𐅇} % "10147 GREEK ACROPHONIC ATTIC FIFTY THOUSAND
diff --git a/language/greek/greek-fontenc/puenc-greek.def.html b/language/greek/greek-fontenc/puenc-greek.def.html
new file mode 100644
index 0000000000..9b9cef6b30
--- /dev/null
+++ b/language/greek/greek-fontenc/puenc-greek.def.html
@@ -0,0 +1,1043 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta charset="utf-8"/>
+<meta name="generator" content="Docutils 0.17b.dev: http://docutils.sourceforge.net/" />
+<title>puenc-greek.def</title>
+<meta name="dcterms.rights" content="© 2020 Günter Milde" />
+<link rel="schema.dcterms" href="http://purl.org/dc/terms/"/>
+<style type="text/css">
+
+/* Minimal style sheet for the HTML output of Docutils. */
+/* */
+/* :Author: Günter Milde, based on html4css1.css by David Goodger */
+/* :Id: $Id$ */
+/* :Copyright: © 2015 Günter Milde. */
+/* :License: Released under the terms of the `2-Clause BSD license`_, */
+/* in short: */
+/* */
+/* Copying and distribution of this file, with or without modification, */
+/* are permitted in any medium without royalty provided the copyright */
+/* notice and this notice are preserved. */
+/* */
+/* This file is offered as-is, without any warranty. */
+/* */
+/* .. _2-Clause BSD license: http://www.spdx.org/licenses/BSD-2-Clause */
+
+/* This CSS2.1_ stylesheet defines rules for Docutils elements without */
+/* HTML equivalent. It is required to make the document semantic visible. */
+/* */
+/* .. _CSS2.1: http://www.w3.org/TR/CSS2 */
+/* .. _validates: http://jigsaw.w3.org/css-validator/validator$link */
+
+/* alignment of text and inline objects inside block objects*/
+.align-left { text-align: left; }
+.align-right { text-align: right; }
+.align-center { clear: both; text-align: center; }
+.align-top { vertical-align: top; }
+.align-middle { vertical-align: middle; }
+.align-bottom { vertical-align: bottom; }
+
+/* titles */
+h1.title, p.subtitle {
+ text-align: center;
+}
+p.topic-title,
+p.sidebar-title,
+p.rubric,
+p.admonition-title,
+p.system-message-title {
+ font-weight: bold;
+}
+h1 + p.subtitle,
+h2 + p.section-subtitle {
+ font-size: 1.6em;
+}
+h3 + p.section-subtitle {
+ font-size: 1.28em;
+}
+p.subtitle,
+p.section-subtitle,
+p.sidebar-subtitle {
+ font-weight: bold;
+ margin-top: -0.5em;
+}
+p.sidebar-title {
+ font-size: larger;
+}
+p.rubric {
+ font-size: larger;
+ color: maroon;
+}
+a.toc-backref {
+ color: black;
+ text-decoration: none; }
+
+/* Warnings, Errors */
+div.system-messages h2,
+span.problematic,
+p.system-message-title {
+ color: red;
+}
+
+/* inline literals */
+span.docutils.literal {
+ font-family: monospace;
+ white-space: pre-wrap;
+}
+/* do not wraph at hyphens and similar: */
+.literal > span.pre { white-space: nowrap; }
+
+/* Lists */
+
+/* compact and simple lists: no margin between items */
+.simple li, .compact li,
+.simple ul, .compact ul,
+.simple ol, .compact ol,
+.simple > li p, .compact > li p,
+dl.simple > dd, dl.compact > dd {
+ margin-top: 0;
+ margin-bottom: 0;
+}
+
+/* Table of Contents */
+div.topic.contents { margin: 0.5em 0; }
+div.topic.contents ul {
+ list-style-type: none;
+ padding-left: 1.5em;
+}
+
+/* Enumerated Lists */
+ol.arabic { list-style: decimal }
+ol.loweralpha { list-style: lower-alpha }
+ol.upperalpha { list-style: upper-alpha }
+ol.lowerroman { list-style: lower-roman }
+ol.upperroman { list-style: upper-roman }
+
+dt span.classifier { font-style: italic }
+dt span.classifier:before {
+ font-style: normal;
+ margin: 0.5em;
+ content: ":";
+}
+
+/* Field Lists and drivatives */
+/* bold field name, content starts on the same line */
+dl.field-list > dt,
+dl.option-list > dt,
+dl.docinfo > dt,
+dl.footnote > dt,
+dl.citation > dt {
+ font-weight: bold;
+ clear: left;
+ float: left;
+ margin: 0;
+ padding: 0;
+ padding-right: 0.5em;
+}
+/* Offset for field content (corresponds to the --field-name-limit option) */
+dl.field-list > dd,
+dl.option-list > dd,
+dl.docinfo > dd {
+ margin-left: 9em; /* ca. 14 chars in the test examples */
+}
+/* start field-body on a new line after long field names */
+dl.field-list > dd > *:first-child,
+dl.option-list > dd > *:first-child
+{
+ display: inline-block;
+ width: 100%;
+ margin: 0;
+}
+/* field names followed by a colon */
+dl.field-list > dt:after,
+dl.docinfo > dt:after {
+ content: ":";
+}
+
+/* Bibliographic Fields (docinfo) */
+pre.address { font: inherit; }
+dd.authors > p { margin: 0; }
+
+/* Option Lists */
+dl.option-list { margin-left: 1.5em; }
+dl.option-list > dt { font-weight: normal; }
+span.option { white-space: nowrap; }
+
+/* Footnotes and Citations */
+dl.footnote.superscript > dd {margin-left: 1em; }
+dl.footnote.brackets > dd {margin-left: 2em; }
+dl > dt.label { font-weight: normal; }
+a.footnote-reference.brackets:before,
+dt.label > span.brackets:before { content: "["; }
+a.footnote-reference.brackets:after,
+dt.label > span.brackets:after { content: "]"; }
+a.footnote-reference.superscript,
+dl.footnote.superscript > dt.label {
+ vertical-align: super;
+ font-size: smaller;
+}
+dt.label > span.fn-backref { margin-left: 0.2em; }
+dt.label > span.fn-backref > a { font-style: italic; }
+
+/* Line Blocks */
+div.line-block { display: block; }
+div.line-block div.line-block {
+ margin-top: 0;
+ margin-bottom: 0;
+ margin-left: 40px;
+}
+
+/* Figures, Images, and Tables */
+.figure.align-left,
+figure.align-left,
+img.align-left,
+object.align-left,
+table.align-left {
+ margin-right: auto;
+}
+.figure.align-center,
+figure.align-center,
+img.align-center,
+object.align-center,
+table.align-center {
+ margin-left: auto;
+ margin-right: auto;
+}
+.figure.align-right,
+figure.align-right,
+img.align-right,
+object.align-right,
+table.align-right {
+ margin-left: auto;
+}
+img.align-center, img.align-right,
+object.align-center, object.align-right {
+ display: block;
+}
+/* reset inner alignment in figures and tables */
+.figure.align-left, .figure.align-right,
+figure.align-left, figure.align-right,
+table.align-left, table.align-center, table.align-right {
+ text-align: inherit;
+}
+
+/* Sidebar */
+aside.sidebar {
+ width: 30%;
+ max-width: 26em;
+ float: right;
+ clear: right;
+}
+
+/* Text Blocks */
+blockquote,
+div.topic,
+div.admonition,
+div.system-message,
+pre.literal-block,
+pre.doctest-block,
+pre.math,
+pre.code {
+ margin-left: 1.5em;
+ margin-right: 1.5em;
+}
+pre.code .ln { color: gray; } /* line numbers */
+
+/* Tables */
+table { border-collapse: collapse; }
+td, th {
+ border-style: solid;
+ border-color: silver;
+ padding: 0 1ex;
+ border-width: thin;
+}
+td > p:first-child, th > p:first-child { margin-top: 0; }
+td > p, th > p { margin-bottom: 0; }
+
+table > caption {
+ text-align: left;
+ margin-bottom: 0.25em
+}
+
+table.borderless td, table.borderless th {
+ border: 0;
+ padding: 0;
+ padding-right: 0.5em /* separate table cells */
+}
+
+/* Document Header and Footer */
+header { border-bottom: 1px solid black; }
+footer { border-top: 1px solid black; }
+
+/* new HTML5 block elements: set display for older browsers */
+header, section, footer, aside, nav, main, article, figure {
+ display: block;
+}
+
+</style>
+<style type="text/css">
+
+/* CSS31_ style sheet for the output of Docutils HTML writers. */
+/* Rules for easy reading and pre-defined style variants. */
+/* */
+/* :Author: Günter Milde, based on html4css1.css by David Goodger */
+/* :Id: $Id$ */
+/* :Copyright: © 2015 Günter Milde. */
+/* :License: Released under the terms of the `2-Clause BSD license`_, */
+/* in short: */
+/* */
+/* Copying and distribution of this file, with or without modification, */
+/* are permitted in any medium without royalty provided the copyright */
+/* notice and this notice are preserved. */
+/* */
+/* This file is offered as-is, without any warranty. */
+/* */
+/* .. _2-Clause BSD license: http://www.spdx.org/licenses/BSD-2-Clause */
+/* .. _CSS3: http://www.w3.org/TR/CSS3 */
+
+
+/* Document Structure */
+/* ****************** */
+
+/* "page layout" */
+body {
+ margin: 0;
+ background-color: #dbdbdb;
+}
+div.document,
+main {
+ line-height:1.3;
+ counter-reset: table figure;
+ /* avoid long lines --> better reading */
+ /* optimum is 45…75 characters/line <http://webtypography.net/2.1.2> */
+ /* OTOH: lines should not be too short because of missing hyphenation, */
+ max-width: 50em;
+ padding: 1px 2%; /* 1px on top avoids grey bar above title (mozilla) */
+ margin: auto;
+ background-color: white;
+}
+
+/* Sections */
+
+/* Transitions */
+
+hr.docutils {
+ width: 80%;
+ margin-top: 1em;
+ margin-bottom: 1em;
+ clear: both;
+}
+
+/* Paragraphs */
+/* ========== */
+
+/* vertical space (parskip) */
+p, ol, ul, dl, li, dd,
+div.line-block,
+div.topic,
+table {
+ margin-top: 0.5em;
+ margin-bottom: 0.5em;
+}
+p:first-child { margin-top: 0; }
+/* (:last-child is new in CSS 3) */
+p:last-child { margin-bottom: 0; }
+
+h1, h2, h3, h4, h5, h6,
+dl > dd {
+ margin-bottom: 0.5em;
+}
+
+/* Lists */
+/* ===== */
+
+/* Separate list entries in compound lists */
+dl > dd, ol > li,
+
+/* Definition Lists */
+/* Indent lists nested in definition lists */
+/* (:only-child is new in CSS 3) */
+dd > ul:only-child, dd > ol:only-child { padding-left: 1em; }
+
+/* Description Lists */
+/* styled like in most dictionaries, encyclopedias etc. */
+dl.description > dt {
+ font-weight: bold;
+ clear: left;
+ float: left;
+ margin: 0;
+ padding: 0;
+ padding-right: 0.5em;
+}
+
+/* Field Lists */
+
+/* example for custom field-name width */
+dl.field-list.narrow > dd {
+ margin-left: 5em;
+}
+/* run-in: start field-body on same line after long field names */
+dl.field-list.run-in > dd p {
+ display: block;
+}
+
+/* Bibliographic Fields */
+
+/* generally, bibliographic fields use special definition list dl.docinfo */
+/* but dedication and abstract are placed into "topic" divs */
+div.abstract p.topic-title {
+ text-align: center;
+}
+div.dedication {
+ margin: 2em 5em;
+ text-align: center;
+ font-style: italic;
+}
+div.dedication p.topic-title {
+ font-style: normal;
+}
+
+/* Citations */
+dl.citation dt.label {
+ font-weight: bold;
+}
+span.fn-backref {
+ font-weight: normal;
+}
+
+/* Text Blocks */
+/* =========== */
+
+/* Literal Blocks */
+
+pre.literal-block,
+pre.doctest-block,
+pre.math,
+pre.code {
+ font-family: monospace;
+}
+
+/* Block Quotes */
+
+blockquote > table,
+div.topic > table {
+ margin-top: 0;
+ margin-bottom: 0;
+}
+blockquote p.attribution,
+div.topic p.attribution {
+ text-align: right;
+ margin-left: 20%;
+}
+
+/* Tables */
+/* ====== */
+
+/* th { vertical-align: bottom; } */
+
+table tr { text-align: left; }
+
+/* "booktabs" style (no vertical lines) */
+table.booktabs {
+ border: 0;
+ border-top: 2px solid;
+ border-bottom: 2px solid;
+ border-collapse: collapse;
+}
+table.booktabs * {
+ border: 0;
+}
+table.booktabs th {
+ border-bottom: thin solid;
+}
+
+/* numbered tables (counter defined in div.document) */
+table.numbered > caption:before {
+ counter-increment: table;
+ content: "Table " counter(table) ": ";
+ font-weight: bold;
+}
+
+/* Explicit Markup Blocks */
+/* ====================== */
+
+/* Footnotes and Citations */
+/* ----------------------- */
+
+/* line on the left */
+dl.footnote {
+ padding-left: 1ex;
+ border-left: solid;
+ border-left-width: thin;
+}
+
+/* Directives */
+/* ---------- */
+
+/* Body Elements */
+/* ~~~~~~~~~~~~~ */
+
+/* Images and Figures */
+
+/* let content flow to the side of aligned images and figures */
+.figure.align-left,
+figure.align-left,
+img.align-left,
+object.align-left {
+ display: block;
+ clear: left;
+ float: left;
+ margin-right: 1em;
+}
+.figure.align-right,
+figure.align-right,
+img.align-right,
+object.align-right {
+ display: block;
+ clear: right;
+ float: right;
+ margin-left: 1em;
+}
+/* Stop floating sidebars, images and figures at section level 1,2,3 */
+h1, h2, h3, h4 { clear: both; }
+
+/* Numbered figures */
+figure.numbered > figcaption > p:before {
+ counter-increment: figure;
+ content: "Figure " counter(figure) ": ";
+ font-weight: bold;
+}
+
+
+/* Admonitions and System Messages */
+
+div.admonition,
+div.system-message,
+aside.sidebar {
+ border: medium outset;
+ margin: 1em 1.5em;
+ padding: 0.5em 1em;
+}
+
+div.caution p.admonition-title,
+div.attention p.admonition-title,
+div.danger p.admonition-title,
+div.error p.admonition-title,
+div.warning p.admonition-title,
+div.error {
+ color: red;
+}
+
+
+/* Sidebar */
+
+/* Move right. In a layout with fixed margins, */
+/* it can be moved into the margin. */
+div.sidebar,
+aside.sidebar {
+ width: 30%;
+ max-width: 26em;
+ margin-left: 1em;
+ margin-right: -2%;
+ background-color: #ffffee;
+}
+
+/* Code */
+
+pre.code { padding: 0.7ex }
+pre.code, code { background-color: #eeeeee }
+pre.code .ln { color: gray; } /* line numbers */
+/* basic highlighting: for a complete scheme, see */
+/* http://docutils.sourceforge.net/sandbox/stylesheets/ */
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+/* Math */
+/* styled separately (see math.css for math-output=HTML) */
+
+/* Epigraph */
+/* Highlights */
+/* Pull-Quote */
+/* Compound Paragraph */
+/* Container */
+
+/* Document Header and Footer */
+
+footer, header {
+ font-size: smaller;
+ clear: both;
+ padding: 0.5em 2%;
+ background-color: #ebebee;
+ border: none;
+}
+
+/* Inline Markup */
+/* ============= */
+
+/* Emphasis */
+/* em */
+/* Strong Emphasis */
+/* strong */
+/* Interpreted Text */
+/* span.interpreted */
+/* Title Reference */
+/* cite */
+
+/* Inline Literals */
+/* possible values: normal, nowrap, pre, pre-wrap, pre-line */
+/* span.docutils.literal { white-space: pre-wrap; } */
+
+/* Hyperlink References */
+a { text-decoration: none; }
+
+/* External Targets */
+/* span.target.external */
+/* Internal Targets */
+/* span.target.internal */
+/* Footnote References */
+/* a.footnote-reference */
+/* Citation References */
+/* a.citation-reference */
+
+</style>
+</head>
+<body>
+<main id="puenc-greek-def">
+<h1 class="title">puenc-greek.def</h1>
+<p class="subtitle" id="greek-licr-definitions-for-pdf-strings-hyperref">Greek LICR definitions for PDF strings (hyperref)</p>
+<dl class="docinfo">
+<dt class="copyright">Copyright</dt>
+<dd class="copyright">© 2020 Günter Milde</dd>
+<dt class="licence">Licence</dt>
+<dd class="licence"><p>This work may be distributed and/or modified under the
+conditions of the <a class="reference external" href="http://www.latex-project.org/lppl.txt">LaTeX Project Public License</a>, either
+version 1.3 of this license or any later version.</p>
+</dd>
+<dt class="identification">Identification</dt>
+<dd class="identification"><pre class="literal-block">\ProvidesFile{puenc-greek.def}
+[2020/10/18 2.0 Greek LICRs for PDF strings]</pre>
+</dd>
+</dl>
+<div class="abstract topic">
+<p class="topic-title">Abstract</p>
+<p>Support for Greek LICR macros in PDF bookmarks. Extends <span class="docutils literal">puenc.def</span>
+from the <a class="reference external" href="https://ctan.org/pkg/hyperref">hyperref</a> package.
+Used by <a class="reference external" href="http://ctan.org/pkg/babel-greek">babel-greek</a> and <a class="reference external" href="textalpha.sty.html">textalpha</a>.</p>
+</div>
+<dl>
+<dt><strong>History</strong>:</dt>
+<dd><table class="borderless">
+<colgroup>
+<col style="width: 8%" />
+<col style="width: 14%" />
+<col style="width: 78%" />
+</colgroup>
+<tbody>
+<tr><td><p>2.0</p></td>
+<td><p>2020-10-18</p></td>
+<td><p>initial version</p></td>
+</tr>
+</tbody>
+</table>
+</dd>
+</dl>
+<section id="diacritics">
+<h2>Diacritics</h2>
+<p>Greek alias names for standard accents (without tabacckludge):</p>
+<pre class="literal-block">\DeclareTextCommand{\acctonos}{PU}{\'}
+\DeclareTextCommand{\accvaria}{PU}{\`}
+\DeclareTextCommand{\accdialytika}{PU}{\&quot;}</pre>
+<p>Use combining characters when no pre-composed character is available:</p>
+<p>Breathings and perispomeni:</p>
+<pre class="literal-block">\DeclareTextCommand{\accpsili}{PU}[1]{#1\83\023} % ψιλή spiritus lenis (smooth breathing)
+\DeclareTextCommand{\accdasia}{PU}[1]{#1\83\024} % δασεῖα spiritus asper (rough breathing)
+\DeclareTextCommand{\accperispomeni}{PU}[1]{#1\83\102} % COMBINING GREEK PERISPOMENI</pre>
+<p>Sub-iota (<span class="docutils literal">\ypogegrammeni</span>) is a postfix accent (ligature in LGR)</p>
+<pre class="literal-block">\DeclareTextCommand{\ypogegrammeni}{PU}{\83\105} % COMBINING GREEK YPOGEGRAMMENI</pre>
+<p>Combined diacritics:</p>
+<pre class="literal-block">\DeclareTextCommand{\accdialytikavaria}{PU}[1]{#1\83\010\83\000}
+\DeclareTextCommand{\accdialytikatonos}{PU}[1]{#1\83\010\83\001}
+\DeclareTextCommand{\accdialytikaperispomeni}{PU}[1]{#1\83\102\83\010}
+
+\DeclareTextCommand{\accdasiavaria}{PU}[1]{#1\83\024\83\000}
+\DeclareTextCommand{\accdasiaoxia}{PU}[1]{#1\83\024\83\001}
+\DeclareTextCommand{\accdasiaperispomeni}{PU}[1]{#1\83\024\83\102}
+
+\DeclareTextCommand{\accpsilivaria}{PU}[1]{#1\83\000\83\023}
+\DeclareTextCommand{\accpsilioxia}{PU}[1]{#1\83\001\83\023}
+\DeclareTextCommand{\accpsiliperispomeni}{PU}[1]{#1\83\102\83\023}</pre>
+</section>
+<section id="common-definitions">
+<h2>Common Definitions</h2>
+<p>Use the common <cite>Greek font encoding definitions</cite>.</p>
+<p>Set the <span class="docutils literal">\LastDeclaredEncoding</span> to PU and read definitions
+from <a class="reference external" href="greek-fontenc.def.html">greek-fontenc.def</a>:</p>
+<pre class="literal-block">\renewcommand*{\LastDeclaredEncoding}{PU}
+\input{greek-fontenc.def}</pre>
+</section>
+<section id="character-definitions">
+<h2>Character Definitions</h2>
+<section id="compatibility-defs-with-lgr">
+<h3>Compatibility defs with LGR</h3>
+<p>Basic Latin:</p>
+<pre class="literal-block">\DeclareTextCommand{\textsemicolon}{PU}{;} % &quot;003B</pre>
+<p>Latin 1 Supplement:
+Distinguish MICRO SIGN from letter mu:</p>
+<pre class="literal-block">\DeclareTextCommand{\textmicro}{PU}{\83\274} % &quot;00B5 MICRO SIGN</pre>
+</section>
+<section id="greek-and-coptic">
+<h3>Greek and Coptic</h3>
+<pre class="literal-block">% NR Unicode Name % babel name, PU name
+% 0370 GREEK CAPITAL LETTER HETA % Ͱ
+% 0371 GREEK SMALL LETTER HETA % ͱ
+% 0372 GREEK CAPITAL LETTER ARCHAIC SAMPI % Ͳ
+% 0373 GREEK SMALL LETTER ARCHAIC SAMPI % ͳ
+\DeclareTextCommand{\textdexiakeraia}{PU}{\83\164} % ʹ \anwtonos, \textnumeralsigngreek
+\DeclareTextCommand{\textaristerikeraia}{PU}{\83\165} % ͵ \katwtonos, \textnumeralsignlowergreek
+% 0376 GREEK CAPITAL LETTER PAMPHYLIAN DIGAMMA % Ͷ
+% 0377 GREEK SMALL LETTER PAMPHYLIAN DIGAMMA % ͷ</pre>
+<p>037A GREEK YPOGEGRAMMENI (use textcompwordmarkypogegrammeni) % ͺ
+037B GREEK SMALL REVERSED LUNATE SIGMA SYMBOL
+037C GREEK SMALL DOTTED LUNATE SIGMA SYMBOL
+037D GREEK SMALL REVERSED DOTTED LUNATE SIGMA SYMBOL</p>
+<p>Erotimatiko: use 003B SEMICOLON, not 037E GREEK QUESTION MARK; dont use the
+literal char, as it is active with textalpha’s “keep-semicolon” option:</p>
+<pre class="literal-block">\DeclareTextCommand{\texterotimatiko}{PU}{\80\073}
+
+\DeclareTextCompositeCommand{\'}{PU}{\&#64;empty}{\83\204} % ΄ 0384 GREEK TONOS
+\DeclareTextCompositeCommand{\'}{PU}{\ }{\83\204} % ΄ 0384 GREEK TONOS
+\DeclareTextCompositeCommand{\accdialytikatonos}{PU}{\&#64;empty}{\83\205}
+\DeclareTextCompositeCommand{\accdialytikatonos}{PU}{\ }{\83\205}
+\DeclareTextCompositeCommand{\'}{PU}{\textAlpha}{\83\206} % Ά
+\DeclareTextCommand{\textanoteleia}{PU}{\80\267} % use 00B7 MIDDLE DOT, not 0387 GREEK ANO TELEIA
+\DeclareTextCompositeCommand{\'}{PU}{\textEpsilon}{\83\210} % Έ
+\DeclareTextCompositeCommand{\'}{PU}{\textEta}{\83\211} % Ή
+\DeclareTextCompositeCommand{\'}{PU}{\textIota}{\83\212} % Ί
+\DeclareTextCompositeCommand{\'}{PU}{\textOmicron}{\83\214} % Ό
+\DeclareTextCompositeCommand{\'}{PU}{\textUpsilon}{\83\216} % Ύ
+\DeclareTextCompositeCommand{\'}{PU}{\textOmega}{\83\217} % Ώ
+\DeclareTextCompositeCommand{\accdialytikatonos}{PU}{\textiota}{\83\220} % ΐ
+\DeclareTextCommand{\textAlpha}{PU}{\83\221} % Α &quot;0391
+\DeclareTextCommand{\textBeta}{PU}{\83\222} % Β &quot;0392
+\DeclareTextCommand{\textGamma}{PU}{\83\223} % Γ &quot;0393
+\DeclareTextCommand{\textDelta}{PU}{\83\224} % Δ &quot;0394
+\DeclareTextCommand{\textEpsilon}{PU}{\83\225} % Ε &quot;0395
+\DeclareTextCommand{\textZeta}{PU}{\83\226} % Ζ &quot;0396
+\DeclareTextCommand{\textEta}{PU}{\83\227} % Η &quot;0397
+\DeclareTextCommand{\textTheta}{PU}{\83\230} % Θ &quot;0398
+\DeclareTextCommand{\textIota}{PU}{\83\231} % Ι &quot;0399
+\DeclareTextCommand{\textKappa}{PU}{\83\232} % Κ &quot;039A
+\DeclareTextCommand{\textLambda}{PU}{\83\233} % Λ &quot;039B
+\DeclareTextCommand{\textMu}{PU}{\83\234} % Μ &quot;039C
+\DeclareTextCommand{\textNu}{PU}{\83\235} % Ν &quot;039D
+\DeclareTextCommand{\textXi}{PU}{\83\236} % Ξ &quot;039E
+\DeclareTextCommand{\textOmicron}{PU}{\83\237} % Ο &quot;039F
+\DeclareTextCommand{\textPi}{PU}{\83\240} % Π &quot;03A0
+\DeclareTextCommand{\textRho}{PU}{\83\241} % Ρ &quot;03A1
+\DeclareTextCommand{\textSigma}{PU}{\83\243} % Σ &quot;03A3
+\DeclareTextCommand{\textTau}{PU}{\83\244} % Τ &quot;03A4
+\DeclareTextCommand{\textUpsilon}{PU}{\83\245} % Υ &quot;03A5
+\DeclareTextCommand{\textPhi}{PU}{\83\246} % Φ &quot;03A6
+\DeclareTextCommand{\textChi}{PU}{\83\247} % Χ &quot;03A7
+\DeclareTextCommand{\textPsi}{PU}{\83\250} % Ψ &quot;03A8
+\DeclareTextCommand{\textOmega}{PU}{\83\251} % Ω &quot;03A9
+\DeclareTextCompositeCommand{\&quot;}{PU}{\textIota}{\83\252} % Ϊ &quot;03AA
+\DeclareTextCompositeCommand{\&quot;}{PU}{\textUpsilon}{\83\253} % Ϋ &quot;03AB
+\DeclareTextCompositeCommand{\'}{PU}{\textalpha}{\83\254} % ά &quot;03AC
+\DeclareTextCompositeCommand{\'}{PU}{\textepsilon}{\83\255} % έ &quot;03AD
+\DeclareTextCompositeCommand{\'}{PU}{\texteta}{\83\256} % ή &quot;03AE
+\DeclareTextCompositeCommand{\'}{PU}{\textiota}{\83\257} % ί &quot;03AF
+\DeclareTextCompositeCommand{\accdialytikatonos}{PU}{\textupsilon}{\83\260} % ΰ &quot;03B0
+\DeclareTextCommand{\textalpha}{PU}{\83\261} % α &quot;03B1
+\DeclareTextCommand{\textbeta}{PU}{\83\262} % β &quot;03B2
+\DeclareTextCommand{\textgamma}{PU}{\83\263} % γ &quot;03B3
+\DeclareTextCommand{\textdelta}{PU}{\83\264} % δ &quot;03B4
+\DeclareTextCommand{\textepsilon}{PU}{\83\265} % ε &quot;03B5
+\DeclareTextCommand{\textzeta}{PU}{\83\266} % ζ &quot;03B6
+\DeclareTextCommand{\texteta}{PU}{\83\267} % η &quot;03B7
+\DeclareTextCommand{\texttheta}{PU}{\83\270} % θ &quot;03B8
+\DeclareTextCommand{\textiota}{PU}{\83\271} % ι &quot;03B9
+\DeclareTextCommand{\textkappa}{PU}{\83\272} % κ &quot;03BA
+\DeclareTextCommand{\textlambda}{PU}{\83\273} % λ &quot;03BB
+\DeclareTextCommand{\textmu}{PU}{\83\274} % μ &quot;03BC \textmugreek
+\DeclareTextCommand{\textnu}{PU}{\83\275} % ν &quot;03BD
+\DeclareTextCommand{\textxi}{PU}{\83\276} % ξ &quot;03BE
+\DeclareTextCommand{\textomicron}{PU}{\83\277} % ο &quot;03BF
+\DeclareTextCommand{\textpi}{PU}{\83\300} % π &quot;03C0
+\DeclareTextCommand{\textrho}{PU}{\83\301} % ρ &quot;03C1
+\DeclareTextCommand{\textfinalsigma}{PU}{\83\302} % ς &quot;03C2 final sigma
+\DeclareTextCommand{\textsigma}{PU}{\83\303} % σ &quot;03C3
+\DeclareTextCommand{\texttau}{PU}{\83\304} % τ &quot;03C4
+\DeclareTextCommand{\textupsilon}{PU}{\83\305} % υ &quot;03C5
+\DeclareTextCommand{\textphi}{PU}{\83\306} % φ &quot;03C6
+\DeclareTextCommand{\textchi}{PU}{\83\307} % χ &quot;03C7
+\DeclareTextCommand{\textpsi}{PU}{\83\310} % ψ &quot;03C8
+\DeclareTextCommand{\textomega}{PU}{\83\311} % ω &quot;03C9
+
+\DeclareTextCompositeCommand{\&quot;}{PU}{\textiota}{\83\312}% ϊ &quot;03CA
+\DeclareTextCompositeCommand{\&quot;}{PU}{\textupsilon}{\83\313}% ϋ &quot;03CB
+\DeclareTextCompositeCommand{\'}{PU}{\textomicron}{\83\314}% ό &quot;03CC
+\DeclareTextCompositeCommand{\'}{PU}{\textupsilon}{\83\315}% ύ &quot;03CD
+\DeclareTextCompositeCommand{\'}{PU}{\textomega}{\83\316}% ώ &quot;03CE</pre>
+<p>Archaic letters (still used in Greek numerals)
+and symbol variants:</p>
+<pre class="literal-block">\DeclareTextCommand{\textbetasymbol}{PU}{\83\320} % ϐ &quot;03D0
+\DeclareTextCommand{\textthetasymbol}{PU}{\83\321} % ϑ &quot;03D1
+
+\DeclareTextCommand{\textphisymbol}{PU}{\83\325} % ϕ &quot;03D5
+\DeclareTextCommand{\textpisymbol}{PU}{\83\326} % ϖ &quot;03D6
+
+\DeclareTextCommand{\textQoppa}{PU}{\83\330} % Ϙ &quot;03D8
+\DeclareTextCommand{\textqoppa}{PU}{\83\331} % ϙ &quot;03D9
+\DeclareTextCommand{\textStigma}{PU}{\83\332} % Ϛ &quot;03DA
+\DeclareTextCommand{\textstigma}{PU}{\83\333} % ϛ &quot;03DB
+\DeclareTextCommand{\textDigamma}{PU}{\83\334} % Ϝ &quot;03DC
+\DeclareTextCommand{\textdigamma}{PU}{\83\335} % ϝ &quot;03DD
+\DeclareTextCommand{\textKoppa}{PU}{\83\336} % Ϟ &quot;03DE in LGR identic to \textkoppa
+\DeclareTextCommand{\textkoppa}{PU}{\83\337} % ϟ &quot;03DF \koppa, \textqoppa [sic!]
+\DeclareTextCommand{\textSampi}{PU}{\83\340} % Ϡ &quot;03E0
+\DeclareTextCommand{\textsampi}{PU}{\83\341} % ϡ &quot;03E1
+
+\DeclareTextCommand{\textkappasymbol}{PU}{\83\360} % ϰ &quot;03F0
+\DeclareTextCommand{\textrhosymbol}{PU}{\83\361} % ϱ &quot;03F1
+
+\DeclareTextCommand{\textThetasymbol}{PU}{\83\364} % ϴ &quot;03F4
+\DeclareTextCommand{\textepsilonsymbol}{PU}{\83\365} % ϵ &quot;03F5</pre>
+<p>Dummy definition (textautosigma is lowercase of textSigma)
+TODO: implement autosigma for PU and TU:</p>
+<pre class="literal-block">\ProvideTextCommand{\textautosigma}{PU}{\textsigma}</pre>
+</section>
+<section id="greek-extended">
+<h3>Greek Extended</h3>
+<p>We skip definitions for characters “… WITH OXIA”, because they would
+overwrite the defintions for “… WITH TONOS” in the <cite>Greek and Coptic</cite>
+block.</p>
+<pre class="literal-block">\DeclareTextCompositeCommand{\accpsili}{PU}{\textalpha}{\9037\000} % ἀ
+\DeclareTextCompositeCommand{\accdasia}{PU}{\textalpha}{\9037\001} % ἁ
+\DeclareTextCompositeCommand{\accpsilivaria}{PU}{\textalpha}{\9037\002} % ἂ
+\DeclareTextCompositeCommand{\accdasiavaria}{PU}{\textalpha}{\9037\003} % ἃ
+\DeclareTextCompositeCommand{\accpsilioxia}{PU}{\textalpha}{\9037\004} % ἄ
+\DeclareTextCompositeCommand{\accdasiaoxia}{PU}{\textalpha}{\9037\005} % ἅ
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{PU}{\textalpha}{\9037\006} % ἆ
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{PU}{\textalpha}{\9037\007} % ἇ
+\DeclareTextCompositeCommand{\accpsili}{PU}{\textAlpha}{\9037\010} % Ἀ
+\DeclareTextCompositeCommand{\accdasia}{PU}{\textAlpha}{\9037\011} % Ἁ
+\DeclareTextCompositeCommand{\accpsilivaria}{PU}{\textAlpha}{\9037\012} % Ἂ
+\DeclareTextCompositeCommand{\accdasiavaria}{PU}{\textAlpha}{\9037\013} % Ἃ
+\DeclareTextCompositeCommand{\accpsilioxia}{PU}{\textAlpha}{\9037\014} % Ἄ
+\DeclareTextCompositeCommand{\accdasiaoxia}{PU}{\textAlpha}{\9037\015} % Ἅ
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{PU}{\textAlpha}{\9037\016} % Ἆ
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{PU}{\textAlpha}{\9037\017} % Ἇ
+
+\DeclareTextCompositeCommand{\accpsili}{PU}{\textepsilon}{\9037\020} % ἐ
+\DeclareTextCompositeCommand{\accdasia}{PU}{\textepsilon}{\9037\021} % ἑ
+\DeclareTextCompositeCommand{\accpsilivaria}{PU}{\textepsilon}{\9037\022} % ἒ
+\DeclareTextCompositeCommand{\accdasiavaria}{PU}{\textepsilon}{\9037\023} % ἓ
+\DeclareTextCompositeCommand{\accpsilioxia}{PU}{\textepsilon}{\9037\024} % ἔ
+\DeclareTextCompositeCommand{\accdasiaoxia}{PU}{\textepsilon}{\9037\025} % ἕ
+\DeclareTextCompositeCommand{\accpsili}{PU}{\textEpsilon}{\9037\030} % Ἐ
+\DeclareTextCompositeCommand{\accdasia}{PU}{\textEpsilon}{\9037\031} % Ἑ
+\DeclareTextCompositeCommand{\accpsilivaria}{PU}{\textEpsilon}{\9037\032} % Ἒ
+\DeclareTextCompositeCommand{\accdasiavaria}{PU}{\textEpsilon}{\9037\033} % Ἓ
+\DeclareTextCompositeCommand{\accpsilioxia}{PU}{\textEpsilon}{\9037\034} % Ἔ
+\DeclareTextCompositeCommand{\accdasiaoxia}{PU}{\textEpsilon}{\9037\035} % Ἕ
+
+\DeclareTextCompositeCommand{\accpsili}{PU}{\texteta}{\9037\040} % ἠ
+\DeclareTextCompositeCommand{\accdasia}{PU}{\texteta}{\9037\041} % ἡ
+\DeclareTextCompositeCommand{\accpsilivaria}{PU}{\texteta}{\9037\042} % ἢ
+\DeclareTextCompositeCommand{\accdasiavaria}{PU}{\texteta}{\9037\043} % ἣ
+\DeclareTextCompositeCommand{\accpsilioxia}{PU}{\texteta}{\9037\044} % ἤ
+\DeclareTextCompositeCommand{\accdasiaoxia}{PU}{\texteta}{\9037\045} % ἥ
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{PU}{\texteta}{\9037\046} % ἦ
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{PU}{\texteta}{\9037\047} % ἧ
+\DeclareTextCompositeCommand{\accpsili}{PU}{\textEta}{\9037\050} % Ἠ
+\DeclareTextCompositeCommand{\accdasia}{PU}{\textEta}{\9037\051} % Ἡ
+\DeclareTextCompositeCommand{\accpsilivaria}{PU}{\textEta}{\9037\052} % Ἢ
+\DeclareTextCompositeCommand{\accdasiavaria}{PU}{\textEta}{\9037\053} % Ἣ
+\DeclareTextCompositeCommand{\accpsilioxia}{PU}{\textEta}{\9037\054} % Ἤ
+\DeclareTextCompositeCommand{\accdasiaoxia}{PU}{\textEta}{\9037\055} % Ἥ
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{PU}{\textEta}{\9037\056} % Ἦ
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{PU}{\textEta}{\9037\057} % Ἧ
+
+\DeclareTextCompositeCommand{\accpsili}{PU}{\textiota}{\9037\060} % ἰ
+\DeclareTextCompositeCommand{\accdasia}{PU}{\textiota}{\9037\061} % ἱ
+\DeclareTextCompositeCommand{\accpsilivaria}{PU}{\textiota}{\9037\062} % ἲ
+\DeclareTextCompositeCommand{\accdasiavaria}{PU}{\textiota}{\9037\063} % ἳ
+\DeclareTextCompositeCommand{\accpsilioxia}{PU}{\textiota}{\9037\064} % ἴ
+\DeclareTextCompositeCommand{\accdasiaoxia}{PU}{\textiota}{\9037\065} % ἵ
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{PU}{\textiota}{\9037\066} % ἶ
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{PU}{\textiota}{\9037\067} % ἷ
+\DeclareTextCompositeCommand{\accpsili}{PU}{\textIota}{\9037\070} % Ἰ
+\DeclareTextCompositeCommand{\accdasia}{PU}{\textIota}{\9037\071} % Ἱ
+\DeclareTextCompositeCommand{\accpsilivaria}{PU}{\textIota}{\9037\072} % Ἲ
+\DeclareTextCompositeCommand{\accdasiavaria}{PU}{\textIota}{\9037\073} % Ἳ
+\DeclareTextCompositeCommand{\accpsilioxia}{PU}{\textIota}{\9037\074} % Ἴ
+\DeclareTextCompositeCommand{\accdasiaoxia}{PU}{\textIota}{\9037\075} % Ἵ
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{PU}{\textIota}{\9037\076} % Ἶ
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{PU}{\textIota}{\9037\077} % Ἷ
+
+\DeclareTextCompositeCommand{\accpsili}{PU}{\textomicron}{\9037\100} % ὀ
+\DeclareTextCompositeCommand{\accdasia}{PU}{\textomicron}{\9037\101} % ὁ
+\DeclareTextCompositeCommand{\accpsilivaria}{PU}{\textomicron}{\9037\102} % ὂ
+\DeclareTextCompositeCommand{\accdasiavaria}{PU}{\textomicron}{\9037\103} % ὃ
+\DeclareTextCompositeCommand{\accpsilioxia}{PU}{\textomicron}{\9037\104} % ὄ
+\DeclareTextCompositeCommand{\accdasiaoxia}{PU}{\textomicron}{\9037\105} % ὅ
+\DeclareTextCompositeCommand{\accpsili}{PU}{\textOmicron}{\9037\110} % Ὀ
+\DeclareTextCompositeCommand{\accdasia}{PU}{\textOmicron}{\9037\111} % Ὁ
+\DeclareTextCompositeCommand{\accpsilivaria}{PU}{\textOmicron}{\9037\112} % Ὂ
+\DeclareTextCompositeCommand{\accdasiavaria}{PU}{\textOmicron}{\9037\113} % Ὃ
+\DeclareTextCompositeCommand{\accpsilioxia}{PU}{\textOmicron}{\9037\114} % Ὄ
+\DeclareTextCompositeCommand{\accdasiaoxia}{PU}{\textOmicron}{\9037\115} % Ὅ
+
+\DeclareTextCompositeCommand{\accpsili}{PU}{\textupsilon}{\9037\120} % ὐ
+\DeclareTextCompositeCommand{\accdasia}{PU}{\textupsilon}{\9037\121} % ὑ
+\DeclareTextCompositeCommand{\accpsilivaria}{PU}{\textupsilon}{\9037\122} % ὒ
+\DeclareTextCompositeCommand{\accdasiavaria}{PU}{\textupsilon}{\9037\123} % ὓ
+\DeclareTextCompositeCommand{\accpsilioxia}{PU}{\textupsilon}{\9037\124} % ὔ
+\DeclareTextCompositeCommand{\accdasiaoxia}{PU}{\textupsilon}{\9037\125} % ὕ
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{PU}{\textupsilon}{\9037\126} % ὖ
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{PU}{\textupsilon}{\9037\127} % ὗ
+\DeclareTextCompositeCommand{\accdasia}{PU}{\textUpsilon}{\9037\131} % Ὑ
+\DeclareTextCompositeCommand{\accdasiavaria}{PU}{\textUpsilon}{\9037\133} % Ὓ
+\DeclareTextCompositeCommand{\accdasiaoxia}{PU}{\textUpsilon}{\9037\135} % Ὕ
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{PU}{\textUpsilon}{\9037\137} % Ὗ
+
+\DeclareTextCompositeCommand{\accpsili}{PU}{\textomega}{\9037\140} % ὠ
+\DeclareTextCompositeCommand{\accdasia}{PU}{\textomega}{\9037\141} % ὡ
+\DeclareTextCompositeCommand{\accpsilivaria}{PU}{\textomega}{\9037\142} % ὢ
+\DeclareTextCompositeCommand{\accdasiavaria}{PU}{\textomega}{\9037\143} % ὣ
+\DeclareTextCompositeCommand{\accpsilioxia}{PU}{\textomega}{\9037\144} % ὤ
+\DeclareTextCompositeCommand{\accdasiaoxia}{PU}{\textomega}{\9037\145} % ὥ
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{PU}{\textomega}{\9037\146} % ὦ
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{PU}{\textomega}{\9037\147} % ὧ
+\DeclareTextCompositeCommand{\accpsili}{PU}{\textOmega}{\9037\150} % Ὠ
+\DeclareTextCompositeCommand{\accdasia}{PU}{\textOmega}{\9037\151} % Ὡ
+\DeclareTextCompositeCommand{\accpsilivaria}{PU}{\textOmega}{\9037\152} % Ὢ
+\DeclareTextCompositeCommand{\accdasiavaria}{PU}{\textOmega}{\9037\153} % Ὣ
+\DeclareTextCompositeCommand{\accpsilioxia}{PU}{\textOmega}{\9037\154} % Ὤ
+\DeclareTextCompositeCommand{\accdasiaoxia}{PU}{\textOmega}{\9037\155} % Ὥ
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{PU}{\textOmega}{\9037\156} % Ὦ
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{PU}{\textOmega}{\9037\157} % Ὧ
+
+\DeclareTextCompositeCommand{\`}{PU}{\textalpha}{\9037\160} % ὰ
+\DeclareTextCompositeCommand{\`}{PU}{\textepsilon}{\9037\162} % ὲ
+\DeclareTextCompositeCommand{\`}{PU}{\texteta}{\9037\164} % ὴ
+\DeclareTextCompositeCommand{\`}{PU}{\textiota}{\9037\166} % ὶ
+\DeclareTextCompositeCommand{\`}{PU}{\textomicron}{\9037\170} % ὸ
+\DeclareTextCompositeCommand{\`}{PU}{\textupsilon}{\9037\172} % ὺ
+\DeclareTextCompositeCommand{\`}{PU}{\textomega}{\9037\174} % ὼ
+
+\DeclareTextCompositeCommand{\u}{PU}{\textalpha}{\9037\260} % ᾰ
+\DeclareTextCompositeCommand{\=}{PU}{\textalpha}{\9037\261} % ᾱ
+% ᾲ
+% ᾳ
+% ᾴ
+\DeclareTextCompositeCommand{\~}{PU}{\textalpha}{\9037\266} % ᾶ
+\DeclareTextCompositeCommand{\accperispomeni}{PU}{\textalpha}{\9037\267} % ᾶ
+% ᾷ
+\DeclareTextCompositeCommand{\u}{PU}{\textAlpha}{\9037\270} % Ᾰ
+\DeclareTextCompositeCommand{\=}{PU}{\textAlpha}{\9037\271} % Ᾱ
+\DeclareTextCompositeCommand{\`}{PU}{\textAlpha}{\9037\272} % Ὰ
+% Ά
+% ᾼ
+\DeclareTextCompositeCommand{\accpsili}{PU}{\&#64;empty}{\9037\275} % ᾽
+\DeclareTextCompositeCommand{\accpsili}{PU}{\ }{\9037\275} % ᾽
+\DeclareTextCommand{\prosgegrammeni}{PU}{\9037\276} % ι
+\DeclareTextCompositeCommand{\accpsili}{PU}{\&#64;empty}{\9037\277} % ᾿
+\DeclareTextCompositeCommand{\accpsili}{PU}{\ }{\9037\277} % ᾿
+
+\DeclareTextCompositeCommand{\accperispomeni}{PU}{\&#64;empty}{\9037\300} % ῀
+\DeclareTextCompositeCommand{\accperispomeni}{PU}{\ }{\9037\300} % ῀
+\DeclareTextCompositeCommand{\accdialytikaperispomeni}{PU}{\&#64;empty}{\9037\301} % ῁
+\DeclareTextCompositeCommand{\accdialytikaperispomeni}{PU}{\ }{\9037\301} % ῁
+% ῂ
+% ῃ
+% ῄ
+\DeclareTextCompositeCommand{\~}{PU}{\texteta}{\9037\307} % ῆ
+\DeclareTextCompositeCommand{\accperispomeni}{PU}{\texteta}{\9037\307} % ῆ
+% ῇ
+\DeclareTextCompositeCommand{\`}{PU}{\textEpsilon}{\9037\310} % Ὲ
+\DeclareTextCompositeCommand{\`}{PU}{\textEta}{\9037\312} % Ὴ
+% ῌ
+\DeclareTextCompositeCommand{\accpsilivaria}{PU}{\&#64;empty}{\9037\315} % ῍
+\DeclareTextCompositeCommand{\accpsilivaria}{PU}{\ }{\9037\315} % ῍
+\DeclareTextCompositeCommand{\accpsilioxia}{PU}{\&#64;empty}{\9037\316} % ῎
+\DeclareTextCompositeCommand{\accpsilioxia}{PU}{\ }{\9037\316} % ῎
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{PU}{\&#64;empty}{\9037\317} % ῏
+\DeclareTextCompositeCommand{\accpsiliperispomeni}{PU}{\ }{\9037\317} % ῏
+
+\DeclareTextCompositeCommand{\u}{PU}{\textiota}{\9037\320} % ῐ
+\DeclareTextCompositeCommand{\=}{PU}{\textiota}{\9037\321} % ῑ
+\DeclareTextCompositeCommand{\accdialytikavaria}{PU}{\textiota}{\9037\322} % ῒ
+\DeclareTextCompositeCommand{\accdialytikaoxia}{PU}{\textiota}{\9037\323} % ΐ
+\DeclareTextCompositeCommand{\~}{PU}{\textiota}{\9037\326} % ῖ
+\DeclareTextCompositeCommand{\accperispomeni}{PU}{\textiota}{\9037\326} % ῖ
+\DeclareTextCompositeCommand{\accdialytikaperispomeni}{PU}{\textiota}{\9037\327} % ῗ
+\DeclareTextCompositeCommand{\u}{PU}{\textIota}{\9037\330} % Ῐ
+\DeclareTextCompositeCommand{\=}{PU}{\textIota}{\9037\331} % Ῑ
+\DeclareTextCompositeCommand{\`}{PU}{\textIota}{\9037\332} % Ὶ
+\DeclareTextCompositeCommand{\accdasiavaria}{PU}{\&#64;empty}{\9037\335} % ῝
+\DeclareTextCompositeCommand{\accdasiavaria}{PU}{\ }{\9037\335} % ῝
+\DeclareTextCompositeCommand{\accdasiaoxia}{PU}{\&#64;empty}{\9037\336} % ῞
+\DeclareTextCompositeCommand{\accdasiaoxia}{PU}{\ }{\9037\336} % ῞
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{PU}{\&#64;empty}{\9037\337} % ῟
+\DeclareTextCompositeCommand{\accdasiaperispomeni}{PU}{\ }{\9037\337} % ῟
+
+\DeclareTextCompositeCommand{\u}{PU}{\textupsilon}{\9037\340} % ῠ
+\DeclareTextCompositeCommand{\=}{PU}{\textupsilon}{\9037\341} % ῡ
+\DeclareTextCompositeCommand{\accdialytikavaria}{PU}{\textupsilon}{\9037\342} % ῢ
+\DeclareTextCompositeCommand{\accdialytikaoxia}{PU}{\textupsilon}{\9037\343} % ΰ
+\DeclareTextCompositeCommand{\accpsili}{PU}{\textrho}{\9037\344} % ῤ
+\DeclareTextCompositeCommand{\accdasia}{PU}{\textrho}{\9037\345} % ῥ
+\DeclareTextCompositeCommand{\~}{PU}{\textupsilon}{\9037\346} % ῦ
+\DeclareTextCompositeCommand{\accperispomeni}{PU}{\textupsilon}{\9037\346} % ῦ
+\DeclareTextCompositeCommand{\accdialytikaperispomeni}{PU}{\textupsilon}{\9037\347} % ῧ
+\DeclareTextCompositeCommand{\u}{PU}{\textUpsilon}{\9037\350} % Ῠ
+\DeclareTextCompositeCommand{\=}{PU}{\textUpsilon}{\9037\351} % Ῡ
+\DeclareTextCompositeCommand{\`}{PU}{\textUpsilon}{\9037\352} % Ὺ
+\DeclareTextCompositeCommand{\accdasia}{PU}{\textRho}{\9037\354} % Ῥ
+\DeclareTextCompositeCommand{\accdialytikavaria}{PU}{\&#64;empty}{\9037\355} % ῭
+\DeclareTextCompositeCommand{\accdialytikavaria}{PU}{\ }{\9037\355} % ῭
+\DeclareTextCompositeCommand{\accdialytikaoxia}{PU}{\&#64;empty}{\9037\356} % ΅
+\DeclareTextCompositeCommand{\accdialytikaoxia}{PU}{\ }{\9037\356} % ΅
+% `
+
+% ῲ
+% ῳ
+% ῴ
+\DeclareTextCompositeCommand{\~}{PU}{\textomega}{\9037\366} % ῶ
+\DeclareTextCompositeCommand{\accperispomeni}{PU}{\textomega}{\9037\366} % ῶ
+% ῷ
+\DeclareTextCompositeCommand{\`}{PU}{\textOmicron}{\9037\370} % Ὸ
+\DeclareTextCompositeCommand{\`}{PU}{\textOmega}{\9037\372} % Ὼ
+% ῼ
+\DeclareTextCompositeCommand{\accoxia}{PU}{\&#64;empty}{\9037\375} % ´
+\DeclareTextCompositeCommand{\accoxia}{PU}{\ }{\9037\375} % ´
+\DeclareTextCompositeCommand{\accdasia}{PU}{\&#64;empty}{\9037\376} % ῾
+\DeclareTextCompositeCommand{\accdasia}{PU}{\ }{\9037\376} % ῾</pre>
+</section>
+<section id="letterlike-symbols">
+<h3>Letterlike Symbols</h3>
+<pre class="literal-block">\DeclareTextCommand{\textohm}{PU}{\83\251} % &quot;03A9 OHM SIGN, use 03A9 Omega</pre>
+</section>
+<section id="ancient-greek-numbers">
+<h3>Ancient Greek Numbers</h3>
+<p>TODO: map other chars to corresponding Greek letters.
+See also the <a class="reference external" href="http://ctan.org/pkg/grnumalt">grnumalt</a> package.</p>
+<p>Definition with literal Unicode characters, because the code-point has 5
+hexadecimal digits:</p>
+<pre class="literal-block">\DeclareTextCommand{\textpentedeka}{PU}{𐅄} % &quot;10144 GREEK ACROPHONIC ATTIC FIFTY
+\DeclareTextCommand{\textpentehekaton}{PU}{𐅅} % &quot;10145 GREEK ACROPHONIC ATTIC FIVE HUNDRED
+\DeclareTextCommand{\textpenteqilioi}{PU}{𐅆} % &quot;10146 GREEK ACROPHONIC ATTIC FIVE THOUSAND
+\DeclareTextCommand{\textpentemuria}{PU}{𐅇} % &quot;10147 GREEK ACROPHONIC ATTIC FIFTY THOUSAND</pre>
+<!-- References -->
+</section>
+</section>
+</main>
+</body>
+</html>
diff --git a/language/greek/greek-fontenc/test-inputenc.pdf b/language/greek/greek-fontenc/test-inputenc.pdf
new file mode 100644
index 0000000000..ab04aa6c89
--- /dev/null
+++ b/language/greek/greek-fontenc/test-inputenc.pdf
Binary files differ
diff --git a/language/greek/greek-fontenc/test-inputenc.tex b/language/greek/greek-fontenc/test-inputenc.tex
new file mode 100644
index 0000000000..7242256de8
--- /dev/null
+++ b/language/greek/greek-fontenc/test-inputenc.tex
@@ -0,0 +1,674 @@
+\documentclass[a4paper]{article}
+% \usepackage{textcomp}
+\usepackage[unicode,colorlinks=true,linkcolor=blue]{hyperref}
+% \usepackage{bookmark}
+% \usepackage{parskip}
+\usepackage{amssymb}
+
+% This file uses only ASCII input but we test the result of "inputenc" on
+% the Greek font setup for TU and PU:
+
+% test with different input encoding (before Greek font setup)
+\usepackage[latin1]{luainputenc}
+% -> errors with LuaTeX:
+% ! Missing \endcsname inserted.
+% <to be read again>
+% \pm
+% l.118 ...and{\~}{\UnicodeEncodingName}{α}{ᾶ}
+% ...
+
+
+\ifdefined \UnicodeEncodingName % set by LaTeX for Unicode-aware engines
+ % Unicode font setup:
+ \usepackage{fontspec}
+ % \setmainfont{DejaVu Serif} # no YPOGEGRAMMENI
+ % \setsansfont{DejaVu Sans}
+ % \setmainfont{cmunrm.otf} % CMU Serif % many missing characters :(
+ % \setmainfont{FreeSerif}
+ \setmainfont{Linux Libertine O}
+ \setsansfont{Linux Biolinum O}
+\else
+ \usepackage[LGR,T1]{fontenc}
+ \usepackage{lmodern}
+\fi
+
+% Declare the font encoding and Greek LICR definitions:
+% \makeatletter
+% \input{puenc-greek.def}
+% \makeatother
+\usepackage[normalize-symbols]{textalpha}
+
+
+\ProvideTextCommandDefault{\textvarpi}{missing}
+\ProvideTextCommandDefault{\textvarrho}{missing}
+\ProvideTextCommandDefault{\textvartheta}{missing}
+\ProvideTextCommandDefault{\textvarTheta}{missing}
+\ProvideTextCommandDefault{\textvarepsilon}{missing}
+\ProvideTextCommandDefault{\textvarphi}{missing}
+\ProvideTextCommandDefault{\textvarbeta}{missing}
+\ProvideTextCommandDefault{\textvarkappa}{missing}
+\DeclareTextSymbolDefault{\textschwa}{LGR}
+
+\ProvideTextCommandDefault{\textmicro}{\textmu}
+
+% test with different input encoding (after Greek font setup)
+% \usepackage[latin1]{luainputenc}
+
+\begin{document}
+
+% place the hypersetup after the document start if extra Greek
+% characters are required:
+\hypersetup{pdfauthor=\textTau\'<\textepsilon\textsigma\textthetasymbol}
+
+\title{Test font setup for Greek with inputenc/luainputenc}
+\author{G\"unter Milde}
+\date{2020/10/30}
+\maketitle
+
+\tableofcontents
+
+
+\section{LICR input%
+ \label{licr}}
+
+The LaTeX internal character representation (LICR) is a verbose,
+fail-safe 7-bit ASCII encoding that can be used unaltered under both, 8-bit
+TeX and XeTeX/LuaTeX. Use cases are macro definitions and generated text.
+
+See the source of this document,
+\texttt{test-inputenc.tex} for the input used
+in the examples below.
+
+
+\subsection{Greek alphabet}
+
+Greek letters via LICR macros:
+\begin{quote}
+ \textAlpha{} \textBeta{} \textGamma{} \textDelta{} \textEpsilon{}
+ \textZeta{} \textEta{} \textTheta{} \textIota{} \textKappa{}
+ \textLambda{} \textMu{} \textNu{} \textXi{} \textOmicron{} \textPi{}
+ \textRho{} \textSigma{} \textTau{} \textUpsilon{} \textPhi{}
+ \textChi{} \textPsi{} \textOmega{}
+
+ \textalpha{} \textbeta{} \textgamma{} \textdelta{} \textepsilon{}
+ \textzeta{} \texteta{} \texttheta{} \textiota{} \textkappa{}
+ \textlambda{} \textmu{} \textnu{} \textxi{} \textomicron{} \textpi{}
+ \textrho{} \textsigma{} \texttau{} \textupsilon{}
+ \textphi{} \textchi{} \textpsi{} \textomega{}
+\end{quote}
+The small sigma is set with a different
+glyph if it ends a word:
+\begin{quote}
+ \textsigma{} \verb|textsigma|\\
+ \textfinalsigma{} \verb|textfinalsigma| or \verb|textvarsigma|
+\end{quote}
+The \verb|\textautosigma| macro, which automatically chooses the
+glyph according to the position, is not implemented for Unicode fonts.
+
+\subsection{Diacritics}
+
+Greek accents are
+tonos = oxia, varia, psili, dasia, dialytika, and perispomeni.
+
+Greek diacritics can be input by named macro or symbol macro:
+\begin{quote}
+ \acctonos\textalpha \'\textalpha{} \acctonos x\'x
+ \accvaria\textalpha \`\textalpha{} \accvaria x\`x
+ \accdialytika\textiota{} \"\textiota{} \accdialytika x\"x
+ \accperispomeni\textalpha \~\textalpha{} \accperispomeni x\~x
+ \accpsili\textalpha \>\textalpha{} \accpsili x\>x
+ \accdasia\textalpha \<\textalpha{} \accdasia x\<x
+\end{quote}
+%
+Diacritics as spacing characters:
+
+with empty argument:
+\ensuregreek{
+\acctonos{} \accoxia{} \accvaria{}
+\accpsili{} \accdasia{}
+\accdialytika{} \accperispomeni{}
+\accdialytikatonos{} \accdialytikavaria{} \accdialytikaperispomeni{}
+\accdasiaoxia{} \accdasiavaria{} \accdasiaperispomeni{}
+\accpsilioxia{} \accpsilivaria{} \accpsiliperispomeni{}
+}
+
+with space as argument:
+\ensuregreek{
+\acctonos{ } \accoxia{ } \accvaria{ }
+\accpsili{ } \accdasia{ }
+\accdialytika{ } \accperispomeni{ }
+\accdialytikatonos{ } \accdialytikavaria{ } \accdialytikaperispomeni{ }
+\accdasiaoxia{ } \accdasiavaria{ } \accdasiaperispomeni{ }
+\accpsilioxia{ } \accpsilivaria{ } \accpsiliperispomeni{ }
+}
+
+with protected space:
+\ensuregreek{
+\acctonos{\ } \accoxia{\ } \accvaria{\ }
+\accpsili{\ } \accdasia{\ }
+\accdialytika{\ } \accperispomeni{\ }
+\accdialytikatonos{\ }\ \accdialytikavaria{\ }\ \accdialytikaperispomeni{\ }\
+\accdasiaoxia{\ }\ \accdasiavaria{\ }\ \accdasiaperispomeni{\ }\
+\accpsilioxia{\ }\ \accpsilivaria{\ }\ \accpsiliperispomeni{\ }
+}
+
+with nobreakspace:
+\ensuregreek{
+\acctonos{\nobreakspace} \accoxia{\nobreakspace} \accvaria{\nobreakspace}
+\accpsili{\nobreakspace} \accdasia{\nobreakspace}
+\accdialytika{\nobreakspace} \accperispomeni{\nobreakspace}
+\accdialytikatonos{\nobreakspace}\ \accdialytikavaria{\nobreakspace}\
+\accdialytikaperispomeni{\nobreakspace}\ \accdasiaoxia{\nobreakspace}\
+\accdasiavaria{\nobreakspace}\ \accdasiaperispomeni{\nobreakspace}\
+\accpsilioxia{\nobreakspace}\ \accpsilivaria{\nobreakspace}\
+\accpsiliperispomeni{\nobreakspace}
+}
+
+\subsubsection{sub-iota}
+
+The sub-iota is input after the base letter.
+
+\begin{itemize}
+\item \verb|\prosgegrammeni| sets a spacing GREEK PROSGEGRAMMENI
+ (\prosgegrammeni): \textAlpha\prosgegrammeni{} K\prosgegrammeni{}.
+
+\item \verb|\ypogegrammeni| sets a COMBINING GREEK YPOGEGRAMMENI
+ (\ \ypogegrammeni{}): \textalpha\ypogegrammeni{} k\ypogegrammeni{}.
+
+ A Greek capital letter followed by COMBINING GREEK YPOGEGRAMMENI is
+ normalized to the corresponding Greek capital letter WITH [... AND]
+ PROSGEGRAMMENI, if a mapping exists in the Unicode standard:
+ \textAlpha\ypogegrammeni{} but K\ypogegrammeni{}.
+\end{itemize}
+
+\textAlpha\ypogegrammeni \textAlpha\prosgegrammeni
+\MakeLowercase{\textAlpha\ypogegrammeni \textAlpha\prosgegrammeni}
+\MakeUppercase{\textAlpha\ypogegrammeni \textAlpha\prosgegrammeni}
+
+\textLambda\ypogegrammeni \textLambda\prosgegrammeni
+\MakeLowercase{\textLambda\ypogegrammeni \textLambda\prosgegrammeni}
+\MakeUppercase{\textLambda\ypogegrammeni \textLambda\prosgegrammeni}
+
+\textalpha\ypogegrammeni \textalpha\prosgegrammeni
+\MakeLowercase{\textalpha\ypogegrammeni \textalpha\prosgegrammeni}
+\MakeUppercase{\textalpha\ypogegrammeni \textalpha\prosgegrammeni}
+
+
+\subsection{Additional Greek symbols}
+
+\subsubsection{symbols for Greek numbers}
+
+\begin{quote}
+\textkoppa{} textkoppa \\ % ϟ
+\textKoppa{} textKoppa \\ % Ϟ
+\textqoppa{} textqoppa (archaic koppa) \\ % ϙ
+\textQoppa{} textQoppa (archaic Koppa) \\ % Ϙ
+\textstigma{} textstigma \\ % ϛ
+% \textvarstigma{} textvarstigma \\ % no separate Unicode character
+\textStigma{} textStigma (Sigma-Tau-Ligature in CB-fonts)%
+\footnote{the name ``stigma'' originally applied to a medieval sigma-tau
+ ligature, whose shape was confusingly similar to the cursive
+ digamma} \\ % Ϛ
+\textsampi{} textsampi \\ % ϡ
+\textSampi{} textSampi \\ % Ϡ
+\textdigamma{} textdigamma \\ % ϝ (\digamma used by amsmath!)
+\textDigamma{} textDigamma \\ % Ϝ
+% numeral signs: http://en.wikipedia.org/wiki/Greek_numerals
+\textdexiakeraia{} textdexiakeraia \\ % ʹ
+\textaristerikeraia{} textaristerikeraia \\ % ͵
+\end{quote}
+
+
+\begin{table}[tbp]
+ \centering
+ \begin{tabular}{lclc}
+ \hline
+ \multicolumn{2}{c}{text} & \multicolumn{2}{c}{mathematics} \\
+ macro & output & macro & output \\
+ \hline
+ \verb$\textpi$ & \textpi & \verb$\pi$ & $\pi$ \\
+ \verb$\textvarpi$ & \textvarpi & \verb$\varpi$ & $\varpi$ \\
+ \verb$\textpisymbol$ & \textpisymbol & & \\
+ \hline
+ \verb$\textrho$ & \textrho & \verb$\rho$ & $\rho$ \\
+ \verb$\textvarrho$ & \textvarrho & \verb$\varrho$ & $\varrho$ \\
+ \verb$\textrhosymbol$ & \textrhosymbol & & \\
+ \hline
+ \verb$\texttheta$ & \texttheta & \verb$\theta$ & $\theta$ \\
+ \verb$\textvartheta$ & \textvartheta & \verb$\vartheta$ & $\vartheta$ \\
+ \verb$\textthetasymbol$ & \textthetasymbol & & \\
+ \hline
+ \verb$\textepsilon$ & \textepsilon & \verb$\epsilon$ & $\epsilon$ \\
+ \verb$\textvarepsilon$ & \textvarepsilon & \verb$\varepsilon$ & $\varepsilon$ \\
+ \verb$\textepsilonsymbol$ & \textepsilonsymbol & & \\
+ \hline
+ \verb$\textphi$ & \textphi & \verb$\phi$ & $\phi$ \\
+ \verb$\textvarphi$ & \textvarphi & \verb$\varphi$ & $\varphi$ \\
+ \verb$\textphisymbol$ & \textphisymbol & & \\
+ \hline
+ \verb$\textbeta$ & \textbeta & \verb$\beta$ & $\beta$ \\
+ \verb$\textvarbeta$ & \textvarbeta & \emph{missing} & \\
+ \verb$\textbetasymbol$ & \textbetasymbol & & \\
+ \hline
+ \verb$\textkappa$ & \textkappa & \verb$\kappa$ & $\kappa$ \\
+ \verb$\textvarkappa$ & \textvarkappa & \verb$\varkappa$ & $\varkappa$ \\
+ \verb$\textkappasymbol$ & \textkappasymbol & & \\
+ \hline
+ \verb$\textTheta$ & \textTheta & \verb$\Theta$ & $\Theta$ \\
+ \verb$\textvarTheta$ & \textvarTheta & \emph{missing} & \\
+ \verb$\textThetasymbol$ & \textThetasymbol & & \\
+ \hline
+ \end{tabular}
+ \caption{Macros for Greek symbol variants}
+ \label{tab:symbol-variant-macros}
+\end{table}
+
+% \subsubsection{Ancient Greek Numbers}
+%
+% Ancient Greek Numbers are missing in most fonts (including Libertine and
+% Deja Vu). The “FreeSerif” font works fine:
+% \begin{quote}
+% \textpentedeka % GREEK ACROPHONIC ATTIC FIFTY
+% \textpentehekaton % GREEK ACROPHONIC ATTIC FIVE HUNDRED
+% \textpenteqilioi % GREEK ACROPHONIC ATTIC FIVE THOUSAND
+% \textpentemuria % GREEK ACROPHONIC ATTIC FIFTY THOUSAND
+% \end{quote}
+
+\subsubsection{generic text symbols}
+
+LICR macros for some symbols from the 8-bit font encoding LGR that are not
+confined to Greek but not defined in \texttt{tuenc.def} [2018/08/11 v2.0j].
+
+\begin{quote}
+ \textsemicolon{} textsemicolon\\
+ \textmicro{} textmicro \\
+ \textschwa{} textschwa
+\end{quote}
+The SI unit prefix MICRO SIGN is not upcased with MakeUppercase:
+
+\begin{quote}
+ textmu: \textmu{} $\mapsto$ \MakeUppercase{\textmu} but
+ textmicro: \textmicro{} $\mapsto$ \MakeUppercase{\textmicro}.
+\end{quote}
+
+\section{LICR command input}
+
+\subsection{\ensuregreek{0374
+ \textnumeralsigngreek{}
+ \textnumeralsignlowergreek{}
+ \ \ypogegrammeni{}
+ \texterotimatiko{}
+ \acctonos{}
+ \"'{}
+ \'\textAlpha
+ \textanoteleia
+ \'\textEpsilon
+ \'\textEta
+ \'\textIota
+ \'\textOmicron
+ \'\textUpsilon
+ \'\textOmega
+ \'"\textiota
+}}
+\subsection{\ensuregreek{0391
+ \textAlpha
+ \textBeta
+ \textGamma
+ \textDelta
+ \textEpsilon
+ \textZeta
+ \textEta
+ \textTheta
+ \textIota
+ \textKappa
+ \textLambda
+ \textMu
+ \textNu
+ \textXi
+ \textOmicron
+ \textPi
+ \textRho
+ \textSigma
+ \textTau
+ \textUpsilon
+ \textPhi
+ \textChi
+ \textPsi
+ \textOmega
+}}
+\subsection{\ensuregreek{03AA
+ \"\textIota
+ \"\textUpsilon
+ \'\textalpha
+ \'\textepsilon
+ \'\texteta
+ \'\textiota
+ \"'\textupsilon
+}}
+\subsection{\ensuregreek{03B1
+ \textalpha
+ \textbeta
+ \textgamma
+ \textdelta
+ \textepsilon
+ \textzeta
+ \texteta
+ \texttheta
+ \textiota
+ \textkappa
+ \textlambda
+ \textmu
+ \textnu
+ \textxi
+ \textomicron
+ \textpi
+ \textrho
+ \textvarsigma
+ \textsigma
+ \texttau
+ \textupsilon
+ \textphi
+ \textchi
+ \textpsi
+ \textomega
+}}
+\subsection{\ensuregreek{03CA
+ \"\textiota
+ \"\textupsilon
+ \'\textomicron
+ \'\textupsilon
+ \'\textomega
+ \textbetasymbol
+ \textthetasymbol
+ \textphisymbol
+ \textpisymbol
+ \textQoppa
+ \textqoppa
+ \textStigma
+ \textstigma
+ \textDigamma
+ \textdigamma
+ \textKoppa
+ \textkoppa
+ \textSampi
+ \textsampi
+ \textkappasymbol
+ \textrhosymbol
+ \textThetasymbol
+ \textepsilonsymbol
+}}
+
+
+Currently, there is no hyperref support for LICR input with non-standard
+accents or combined diacritics characters.
+
+\subsection{\ensuregreek{1F00
+ \accpsili\textalpha
+ \accdasia\textalpha
+ \accpsili`\textalpha
+ \accdasia`\textalpha
+ \accpsili'\textalpha
+ \accdasia'\textalpha
+ \~>\textalpha
+ \~<\textalpha
+ \accpsili\textAlpha
+ \accdasia\textAlpha
+ \accpsili`\textAlpha
+ \accdasia`\textAlpha
+ \accpsili'\textAlpha
+ \accdasia'\textAlpha
+ \~>\textAlpha
+ \~<\textAlpha
+}}
+\subsection{\ensuregreek{1F10
+ \accpsili\textepsilon
+ \accdasia\textepsilon
+ \accpsili`\textepsilon
+ \accdasia`\textepsilon
+ \accpsili'\textepsilon
+ \accdasia'\textepsilon
+ \accpsili\textEpsilon
+ \accdasia\textEpsilon
+ \accpsili`\textEpsilon
+ \accdasia`\textEpsilon
+ \accpsili'\textEpsilon
+ \accdasia'\textEpsilon
+}}
+\subsection{\ensuregreek{1F20
+ \accpsili\texteta
+ \accdasia\texteta
+ \accpsili`\texteta
+ \accdasia`\texteta
+ \accpsili'\texteta
+ \accdasia'\texteta
+ \~>\texteta
+ \~<\texteta
+ \accpsili\textEta
+ \accdasia\textEta
+ \accpsili`\textEta
+ \accdasia`\textEta
+ \accpsili'\textEta
+ \accdasia'\textEta
+ \~>\textEta
+ \~<\textEta
+}}
+\subsection{\ensuregreek{1F30
+ \accpsili\textiota
+ \accdasia\textiota
+ \accpsili`\textiota
+ \accdasia`\textiota
+ \accpsili'\textiota
+ \accdasia'\textiota
+ \~>\textiota
+ \~<\textiota
+ \accpsili\textIota
+ \accdasia\textIota
+ \accpsili`\textIota
+ \accdasia`\textIota
+ \accpsili'\textIota
+ \accdasia'\textIota
+ \~>\textIota
+ \~<\textIota
+}}
+\subsection{\ensuregreek{1F40
+ \accpsili\textomicron
+ \accdasia\textomicron
+ \accpsili`\textomicron
+ \accdasia`\textomicron
+ \accpsili'\textomicron
+ \accdasia'\textomicron
+ \accpsili\textOmicron
+ \accdasia\textOmicron
+ \accpsili`\textOmicron
+ \accdasia`\textOmicron
+ \accpsili'\textOmicron
+ \accdasia'\textOmicron
+}}
+\subsection{\ensuregreek{1F50
+ \accpsili\textupsilon
+ \accdasia\textupsilon
+ \accpsili`\textupsilon
+ \accdasia`\textupsilon
+ \accpsili'\textupsilon
+ \accdasia'\textupsilon
+ \~>\textupsilon
+ \~<\textupsilon
+ \accdasia\textUpsilon
+ \accdasia`\textUpsilon
+ \accdasia'\textUpsilon
+ \~<\textUpsilon
+}}
+\subsection{\ensuregreek{1F60
+ \accpsili\textomega
+ \accdasia\textomega
+ \accpsili`\textomega
+ \accdasia`\textomega
+ \accpsili'\textomega
+ \accdasia'\textomega
+ \~>\textomega
+ \~<\textomega
+ \accpsili\textOmega
+ \accdasia\textOmega
+ \accpsili`\textOmega
+ \accdasia`\textOmega
+ \accpsili'\textOmega
+ \accdasia'\textOmega
+ \~>\textOmega
+ \~<\textOmega
+}}
+\subsection{\ensuregreek{1F70
+ \accvaria\textalpha
+ \accoxia\textalpha
+ \accvaria\textepsilon
+ \accoxia\textepsilon
+ \accvaria\texteta
+ \accoxia\texteta
+ \accvaria\textiota
+ \accoxia\textiota
+ \accvaria\textomicron
+ \accoxia\textomicron
+ \accvaria\textupsilon
+ \accoxia\textupsilon
+ \accvaria\textomega
+ \accoxia\textomega
+}}
+\subsection{\ensuregreek{1F80
+ \accpsili\textalpha\ypogegrammeni
+ \accdasia\textalpha\ypogegrammeni
+ \accpsili`\textalpha\ypogegrammeni
+ \accdasia`\textalpha\ypogegrammeni
+ \accpsili'\textalpha\ypogegrammeni
+ \accdasia'\textalpha\ypogegrammeni
+ \~>\textalpha\ypogegrammeni
+ \~<\textalpha\ypogegrammeni
+ \accpsili\textAlpha\ypogegrammeni
+ \accdasia\textAlpha\ypogegrammeni
+ \accpsili`\textAlpha\ypogegrammeni
+ \accdasia`\textAlpha\ypogegrammeni
+ \accpsili'\textAlpha\ypogegrammeni
+ \accdasia'\textAlpha\ypogegrammeni
+ \~>\textAlpha\ypogegrammeni
+ \~<\textAlpha\ypogegrammeni
+}}
+\subsection{\ensuregreek{1F90
+ \accpsili\texteta\ypogegrammeni
+ \accdasia\texteta\ypogegrammeni
+ \accpsili`\texteta\ypogegrammeni
+ \accdasia`\texteta\ypogegrammeni
+ \accpsili'\texteta\ypogegrammeni
+ \accdasia'\texteta\ypogegrammeni
+ \~>\texteta\ypogegrammeni
+ \~<\texteta\ypogegrammeni
+ \accpsili\textEta\ypogegrammeni
+ \accdasia\textEta\ypogegrammeni
+ \accpsili`\textEta\ypogegrammeni
+ \accdasia`\textEta\ypogegrammeni
+ \accpsili'\textEta\ypogegrammeni
+ \accdasia'\textEta\ypogegrammeni
+ \~>\textEta\ypogegrammeni
+ \~<\textEta\ypogegrammeni
+}}
+\subsection{\ensuregreek{1FA0
+ \accpsili\textomega\ypogegrammeni
+ \accdasia\textomega\ypogegrammeni
+ \accpsili`\textomega\ypogegrammeni
+ \accdasia`\textomega\ypogegrammeni
+ \accpsili'\textomega\ypogegrammeni
+ \accdasia'\textomega\ypogegrammeni
+ \~>\textomega\ypogegrammeni
+ \~<\textomega\ypogegrammeni
+ \accpsili\textOmega\ypogegrammeni
+ \accdasia\textOmega\ypogegrammeni
+ \accpsili`\textOmega\ypogegrammeni
+ \accdasia`\textOmega\ypogegrammeni
+ \accpsili'\textOmega\ypogegrammeni
+ \accdasia'\textOmega\ypogegrammeni
+ \~>\textOmega\ypogegrammeni
+ \~<\textOmega\ypogegrammeni
+}}
+\subsection{\ensuregreek{1FB0
+ \u\textalpha
+ \=\textalpha
+ \accvaria\textalpha\ypogegrammeni
+ \textalpha\ypogegrammeni
+ \accoxia\textalpha\ypogegrammeni
+ \~\textalpha
+ \~\textalpha\ypogegrammeni
+ \u\textAlpha
+ \=\textAlpha
+ \accvaria\textAlpha
+ \accoxia\textAlpha
+ \textAlpha\ypogegrammeni
+ \accpsili{ }
+ \prosgegrammeni
+ \accpsili{ }
+}}
+
+\subsection{\ensuregreek{1FC0
+ \accperispomeni{ }
+ \"\~{ }
+ \accvaria\texteta\ypogegrammeni
+ \texteta\ypogegrammeni
+ \accoxia\texteta\ypogegrammeni
+ \~\texteta
+ \~\texteta\ypogegrammeni
+ \accvaria\textEpsilon
+ \accoxia\textEpsilon
+ \accvaria\textEta
+ \accoxia\textEta
+ \textEta\ypogegrammeni
+ \accpsili`{ }
+ \accpsili'{ }
+ \~>{ }
+}}
+
+\subsection{\ensuregreek{1FD0
+ \u\textiota
+ \=\textiota
+ \`"\textiota
+ \'"\textiota
+ \~\textiota
+ \~"\textiota
+ \u\textIota
+ \=\textIota
+ \accvaria\textIota
+ \accoxia\textIota
+ \accdasia`{ }
+ \accpsili'{ }
+ \~<{ }
+}}
+\subsection{\ensuregreek{1FE0
+ \u\textupsilon
+ \=\textupsilon
+ \`"\textupsilon
+ \'"\textupsilon
+ \accpsili\textrho
+ \accdasia\textrho
+ \~\textupsilon
+ \~"\textupsilon
+ \u\textUpsilon
+ \=\textUpsilon
+ \accvaria\textUpsilon
+ \accoxia\textUpsilon
+ \accdasia\textRho
+ \`"{ }
+ \'"{ }
+ \accvaria{ }
+}}
+\subsection{\ensuregreek{1FF0
+ \accvaria\textomega\ypogegrammeni
+ \textomega\ypogegrammeni
+ \accoxia\textomega\ypogegrammeni
+ \~\textomega
+ \~\textomega\ypogegrammeni
+ \accvaria\textOmicron
+ \accoxia\textOmicron
+ \accvaria\textOmega
+ \accoxia\textOmega
+ \textOmega\ypogegrammeni
+ \accoxia{ }
+ \accdasia{ }
+}}
+
+
+\end{document}
diff --git a/language/greek/greek-fontenc/test-lgrenc.pdf b/language/greek/greek-fontenc/test-lgrenc.pdf
new file mode 100644
index 0000000000..ecb9e81e92
--- /dev/null
+++ b/language/greek/greek-fontenc/test-lgrenc.pdf
Binary files differ
diff --git a/language/greek/greek-fontenc/lgrenc-test.tex b/language/greek/greek-fontenc/test-lgrenc.tex
index 861c981c61..1606bfcb6f 100644
--- a/language/greek/greek-fontenc/lgrenc-test.tex
+++ b/language/greek/greek-fontenc/test-lgrenc.tex
@@ -39,19 +39,13 @@
% With XeTeX/LuaTeX, use Unicode for Latin script:
% This is experimental. The general advise is not to mix fontenc and fontspec.
-% Problems:
+% Problems:
% * Letter µ missing in Latin Modern
% * xunicode makes \nobreakspace font encoding specific -> provide default:
-\ifdefined\luatexversion
+\ifdefined \UnicodeEncodingName % set by LaTeX for Unicode-aware engines
\usepackage{fontspec}
- \DeclareTextCommand{\textmu}{EU2}{µ} % use MICRO SIGN
\else
- \ifdefined\XeTeXrevision
- \usepackage{fontspec}
- \DeclareTextCommand{\textmu}{EU1}{µ} % use MICRO SIGN
- \else
- \usepackage[utf8]{inputenc}
- \fi
+ \usepackage[utf8]{inputenc}
\fi
\DeclareTextCommandDefault{\nobreakspace}{\leavevmode\nobreak\ }
@@ -64,11 +58,14 @@
\newcommand{\LGR}{\fontencoding{LGR}\selectfont}
\newcommand{\Latin}{\fontencoding{\encodingdefault}\selectfont}
+\newcommand{\cs}[1]{\texttt{\textbackslash#1}}
+\newcommand{\cssample}[1]{\LGR\csname#1\endcsname{} \Latin \cs{#1}}
+
\begin{document}
\title{Test LGR font encoding definitions}
\author{Günter Milde}
-% \date{}
+\date{2020/10/30}
\maketitle
The file lgrenc.def provides a comprehensive set of macros to typeset Greek
@@ -105,25 +102,33 @@ used to access the symbols.
\subsection{Generic text symbols}
Latin:
-+ - = < > -- --- \textbraceleft{} [ () ] \textbraceright{}
++ - = < > -- --- [ () ]
%
+\textbraceleft{}
+\textbraceright{}
\textbackslash{}
\textbar{}
\textperthousand{}
\textpertenthousand{}
\textvisiblespace{}
-LGR:
-\LGR
-+ - = \textless{} \textgreater{} -- ---
-\textbraceleft{} [ () ] \textbraceright{}
-%
-\textbackslash{} \textbar{}
-\textperthousand{}
-% \textpertenthousand{}
-\textvisiblespace{}
-\Latin (Per-mille symbol is missing in LGR.)
+LGR: \LGR
++ - = -- --- [ () ]
+\Latin
+\begin{quote}
+ \cssample{textless} \\
+ \cssample{textgreater} \\
+ \cssample{textbraceleft} \\
+ \cssample{textbraceright} \\
+ %
+ \cssample{textbackslash} \\
+ \cssample{textbar} \\
+ \cssample{textperthousand} (Per-mille symbol is missing in LGR.) \\
+ % \textpertenthousand{}
+ \cssample{textvisiblespace} \\
+\end{quote}
+%
Quotes:\footnote{%
Single quotes need special attention to prevent conversion to accents.
Test the input conventions:
@@ -147,7 +152,8 @@ Single guillemots and base-quotes
\quotesinglbase{}a\textquoteright{})
are missing in LGR.
-Ligature break up: AY fi \LGR AU "i $\mapsto$
+Ligature break up with \verb|\textcompwordmark|:
+AY fi \LGR AU "i $\mapsto$
\Latin A\textcompwordmark Y f\textcompwordmark i
\LGR A\textcompwordmark U "\textcompwordmark i
@@ -175,23 +181,39 @@ Ligature break up: AY fi \LGR AU "i $\mapsto$
\Latin \textasciigrave a
\LGR \textasciigrave a \textasciigrave i
-\Latin Symbols for SI-units:
-\Latin 5\,\textmu{}m, 5\,k\textohm{};
-\LGR 5\,\textmu{}{\Latin m}, 5\,{\Latin k}\textohm
-\Latin ; but never italic: 5\,$\mu$m
-
\Latin Letter schwa and Euro symbol: % \textschwa (needs e.g. T3)
-\LGR \textschwa{}, \texteuro{}
+\cssample{textschwa}, \cssample{texteuro}
+
+
+Some ASCII symbols are replaced by different symbols in LGR encoding
+other symbols are composed from Latin letters and show Greek letters in LGR.
+\emph{babel-greek} redefines some with \verb|\latintext|, however this
+cannot be done in a font encoding definition file.
+
+Beware that \texttt{"\#\&';<>?@} becomes
+\LGR \texttt{"\#\&';<>?@}.
\Latin
+The \emph{textcomp} package provides pre-composed coyright \textcopyright{},
+registered \textregistered{} and trademark \texttrademark{} symbols that
+work in all font encodings.
+In LGR (%
+\ifdefined \textcompsubstdefault
+ with
+\else
+ without
+\fi
+textcomp), they come out as: \cssample{textcopyright},
+\cssample{textregistered}, \cssample{texttrademark}.
-Some ASCII symbols are replaced by other symbols in LGR encoding:
-\emph{babel-greek} redefines some with \verb|\latintext|, however this macro
-is not guaranteed to be defined, so it cannot be used in a font encoding
-definition file.
+\emph{textcomp} also provides the upright MICRO SIGN and OHM SIGN for SI
+units: R = 5\,\textmu\textohm
-Avoid: \texttt{"\#\&';<>?@} because it becomes
-\LGR \ \texttt{"\#\&';<>?@}.
+In LGR, \cs{textmicro} and \cs{textohm} are aliases to \cs{textmu} and
+\cs{textOmega} that do not change case:
+\LGR Αντίσταση = 5\,\textmu\textohm{},
+ \MakeUppercase{αντίσταση = 5\,\textmicro \textohm{}},
+ \MakeLowercase{αντίσταση = 5\,\textmicro \textohm{}}.
\Latin
@@ -203,7 +225,7 @@ Greek letters via Latin transcription and LICR macros:
\LGR
\MakeUppercase{a b g d e z h j i k l m n x o p r s t u f q y w}
- a b g d e z h j i k l m n x o p r sv t u f q y w
+ a b g d e z h j i k l m n x o p r sv s t u f q y w
\textAlpha{} \textBeta{} \textGamma{} \textDelta{} \textEpsilon{}
\textZeta{} \textEta{} \textTheta{} \textIota{} \textKappa{}
@@ -214,73 +236,137 @@ Greek letters via Latin transcription and LICR macros:
\textalpha{} \textbeta{} \textgamma{} \textdelta{} \textepsilon{}
\textzeta{} \texteta{} \texttheta{} \textiota{} \textkappa{}
\textlambda{} \textmu{} \textnu{} \textxi{} \textomicron{} \textpi{}
- \textrho{} \textsigma{} \texttau{} \textupsilon{}
+ \textrho{} \textsigma{} \textfinalsigma{} \texttau{} \textupsilon{}
\textphi{} \textchi{} \textpsi{} \textomega{}
\end{quote}
The small sigma is set with a different glyph if it ends a word:
\begin{quote}
- \LGR \textsigma{} \Latin textsigma \\
- \LGR \textfinalsigma{} \Latin textfinalsigma or textvarsigma
+ \cssample{textsigma} \\
+ \cssample{textfinalsigma}
\end{quote}
In the Latin transcription, the letter `s' stands for \verb|\textautosigma|
which automatically chooses the glyph according to the position.
-The textcomp.sty package provides coyright, registered, and trademark
-symbols for use with any font encodings. (Like any other Latin character,
-the ``sharp s'' (\ss) is not save to use when LGR is the active font
-encoding.)
-
-Latin:
-\textcopyright{}
-\textregistered{}
-\texttrademark{}
-\SS{} (uppercase of \ss).
-
-LGR (with textcomp):
-\LGR
-\textcopyright{}
-\textregistered{}
-\texttrademark{}
-\SS{} (\Latin uppercase of \LGR \ss).
-\Latin
-
-\subsection{Additional Greek symbols}
+\subsection{additional Greek symbols}
\begin{quote}
- \LGR \textkoppa{} \Latin textkoppa (numeral koppa = 90) \\ % ϟ
- \LGR \textKoppa{} \Latin textKoppa (numeral Koppa = 90)%
+ \cssample{textkoppa} (numeral koppa = 90) \\ % ϟ
+ \cssample{textKoppa} (numeral Koppa = 90)% % Ϟ
\footnote{Modern typographical practice normally does not observe a
contrast between uppercase and lowercase forms for numeric koppa.
% https://en.wikipedia.org/wiki/Koppa_(letter)
- In LGR, there is ony one slot for Koppa and koppa.} \\ % Ϟ
- \LGR \textqoppa{} \Latin textqoppa (archaic koppa) \\ % ϙ
- \LGR \textQoppa{} \Latin textQoppa (archaic Koppa) \\ % Ϙ
- \LGR \textstigma{} \Latin textstigma \\ % ϛ
- \LGR \textvarstigma{} \Latin textvarstigma \\ % no separate Unicode character
- \LGR \textStigma{} \Latin textStigma (Sigma-Tau-Ligature in CB-fonts)%
+ In LGR, there is no separate code point for Koppa.} \\
+ \cssample{textqoppa} (archaic koppa) \\ % ϙ
+ \cssample{textQoppa} (archaic Koppa) \\ % Ϙ
+ \cssample{textstigma} \\ % ϛ
+ \cssample{textvarstigma} \\ % no separate Unicode character
+ \cssample{textStigma} (Sigma-Tau-Ligature in CB-fonts)%
\footnote{the name ``stigma'' originally applied to a medieval sigma-tau
ligature, whose shape was confusingly similar to the cursive
digamma} \\ % Ϛ
- \LGR \textsampi{} \Latin textsampi \\ % ϡ
- \LGR \textSampi{} \Latin textSampi \\ % Ϡ
- \LGR \textdigamma{} \Latin textdigamma \\ % ϝ (\digamma used by amsmath!)
- \LGR \textDigamma{} \Latin textDigamma \\ % Ϝ
+ \cssample{textsampi} \\ % ϡ
+ \cssample{textSampi} \\ % Ϡ
+ \cssample{textdigamma} \\ % ϝ (\digamma used by amsmath!)
+ \cssample{textDigamma} \\ % Ϝ
% numeral signs: http://en.wikipedia.org/wiki/Greek_numerals
- \LGR \textdexiakeraia{} \Latin textdexiakeraia | % ʹ
- \LGR \textnumeralsigngreek{} \Latin textnumeralsigngreek (Dexia keraia)\\ % ʹ
- \LGR \textaristerikeraia{} \Latin textaristerikeraia | % ͵
- \LGR \textnumeralsignlowergreek{} \Latin textnumeralsignlowergreek
- (Aristeri keraia)\\ % ͵
+ \cssample{textdexiakeraia} (Dexia keraia)\\ % ʹ
+ \cssample{textaristerikeraia} (Aristeri keraia)\\ % ͵
+
+\end{quote}
+
+Up/Downcasing of the additional Symbols from the Greek And Coptic Unicode
+block:
+
+% see test-tuenc-greek.tex
+\newcommand{\greekandcoptic}{
+\textnumeralsigngreek{}
+\textnumeralsignlowergreek{}
+{ }\ypogegrammeni{}
+\texterotimatiko{}
+\acctonos{ }{}
+\"'{ }{}
+\'\textAlpha{}
+\textanoteleia{}
+\'\textEpsilon{}
+\'\textEta{}
+\'\textIota{}
+\'\textOmicron{}
+\'\textUpsilon{}
+\'\textOmega{}
+\'"\textiota{}
+\"\textIota{}
+\"\textUpsilon{}
+\'\textalpha{}
+\'\textepsilon{}
+\'\texteta{}
+\'\textiota{}
+\"'\textupsilon{}
+\"\textiota{}
+\"\textupsilon{}
+\'\textomicron{}
+\'\textupsilon{}
+\'\textomega{}
+\textQoppa{}
+\textqoppa{}
+\textStigma{}
+\textstigma{}
+\textDigamma{}
+\textdigamma{}
+\textKoppa{}
+\textkoppa{}
+\textSampi{}
+\textsampi{}
+}
+
+\LGR \greekandcoptic \Latin
+
+MakeUppercase: \\
+\LGR \MakeUppercase{\greekandcoptic} \Latin
+
+MakeLowercase: \\
+\LGR \MakeLowercase{\greekandcoptic} \Latin
+
+
+\subsection{aliases}
+
+Aliases are defined in the included file
+\href{greek-fontenc.def.html}{greek-fontenc.def}.
+
+Names matching mathematical variant symbols:
+
+\begin{quote}
+ \cssample{textvarepsilon} = \cssample{textepsilon} \\ % ε
+ \cssample{textvarphi} = \cssample{textphi} \\ % φ
+ \cssample{textvarsigma} = \cssample{textfinalsigma} \\ % ς
+\end{quote}
+Compatibility aliases for hyperref’s puenc.def:
+\begin{quote}
+ \cssample{textmugreek} = \cssample{textmu} \\
+ \cssample{textkoppagreek} = \cssample{textkoppa} \\
+ \cssample{textKoppagreek} = \cssample{textKoppa} \\
+ \cssample{textStigmagreek} = \cssample{textStigma} \\
+ \cssample{textstigmagreek} = \cssample{textstigma} \\
+ \cssample{textSampigreek} = \cssample{textSampi} \\
+ \cssample{textsampigreek} = \cssample{textsampi} \\
+ \cssample{textdigammagreek} = \cssample{textdigamma} \\
+ \cssample{textDigammagreek} = \cssample{textDigamma} \\
+ \cssample{textnumeralsigngreek} = \cssample{textdexiakeraia} \\
+ \cssample{textnumeralsignlowergreek} = \cssample{textaristerikeraia}
+\end{quote}
+Two Unicode code points and names for one character:
+\begin{quote}
+ \cssample{accoxia} = \cssample{acctonos} \\
+ \cssample{acckoronis} = \cssample{accpsili}
\end{quote}
\subsection{symbol variants}
Mathematical notation distinguishes variant shapes for pi ($\pi|\varpi$),
-rho ($\rho|\varrho$), theta ($\theta|\vartheta$), beta, and kappa
-(characters for the latter two symbols are not included in TeX's math
+rho ($\rho|\varrho$), theta ($\theta|\vartheta$), beta, and kappa
+(characters for the last two symbols are not included in TeX's standard math
fonts). These variations have no syntactic meaning in Greek text and are not
given code-points in the LGR encoding. Greek text fonts use the shape
variants interchangeabely.
@@ -312,7 +398,7 @@ is not defined in LGR.}
\`{a} \'{a} \~{a} \"{a} \^{a} \={a} \H{a} \.{a} \r{a} \u{a} \v{a}
\b{a} \c{a} \d{a} \k{a}
}
-
+
\LGR
\`{a} \'{a} \~{a} \"{a} \^{a} \={a} \H{a} \.{a} \r{a} \u{a} \v{a}
\b{a} \c{a} \d{a}
@@ -358,7 +444,7 @@ $\mapsto$ UPPERCASE)
\>\~u \~>u, \~<u \<\~u, \~"u \"\~u,
\>w, \<w, \>\~w \~>w, \~<w \<\~w,
a| a\ypogegrammeni{}
-
+
\MakeUppercase{
\~>a \>\~a \~\>{a}, \~<a \<\~a \<~a \~\<a \~<a,
\>\~{h} \~>h \>~h \>\~h \~>h \~>h|, \~<h \<\~h,
@@ -369,6 +455,7 @@ a| a\ypogegrammeni{}
}
\<{\textalpha} \>{\textepsilon} \"'{\textiota} \`>\texteta{}
+\accvaria\accpsili\texteta{}
\'<{\textomicron} \~<{\textupsilon} \~>{\textomega}
\<{\textAlpha} \>{\textEpsilon} \"{\textIota} \`>\textEta{}
\'<{\textOmicron} \~<{\textUpsilon} \~>{\textOmega},
@@ -376,6 +463,7 @@ a| a\ypogegrammeni{}
\\
\MakeUppercase{%
\<{\textalpha} \>{\textepsilon} \"'{\textiota} \`\>\texteta{}
+ \accvaria\accpsili\texteta{}
\'<{\textomicron} \~<{\textupsilon} \~>{\textomega}
\<{\textAlpha} \>{\textEpsilon} \"{\textIota} \`>\textEta{}
\'<{\textOmicron} \~<{\textUpsilon} \~>{\textOmega},
@@ -431,7 +519,7 @@ A| A\ypogegrammeni{} A\prosgegrammeni{}.
The tilde character can be used in combined accents.
However, in documents not defining the Babel language \emph{greek} or
-\emph{polutonikogreek}, better use the tilde-accent macro, as
+\emph{polutonikogreek}, better use the tilde-accent macro, as
the tilde produces a no-break space if converted with \verb|\MakeUppercase|
or \verb|\MakeLowercase|:
\begin{quote}
@@ -440,7 +528,7 @@ or \verb|\MakeLowercase|:
\LGR \MakeUppercase{\"~i \<~i \"~u \<~u \`>u}\\
\LGR \"~I \<~I \"~U \<~U \`>U $\mapsto$
\LGR \MakeLowercase{\"~I \<~I \"~U \<~U \`>U}
-
+
\Latin combined accent with tilde-accent macro:\\
\LGR \"\~i \~"u $\mapsto$ \MakeUppercase{\"\~i \~"u}\\
\LGR \"\~I \~"U $\mapsto$ \MakeLowercase{\"\~I \~"U}
diff --git a/language/greek/greek-fontenc/test-nameclashes.pdf b/language/greek/greek-fontenc/test-nameclashes.pdf
deleted file mode 100644
index f03cf0c932..0000000000
--- a/language/greek/greek-fontenc/test-nameclashes.pdf
+++ /dev/null
Binary files differ
diff --git a/language/greek/greek-fontenc/test-nameclashes.tex b/language/greek/greek-fontenc/test-nameclashes.tex
deleted file mode 100644
index 035a597f1c..0000000000
--- a/language/greek/greek-fontenc/test-nameclashes.tex
+++ /dev/null
@@ -1,66 +0,0 @@
-\documentclass[]{article}
-
-% PROBLEM
-% \(re)newcommand gets overwritten for Accents \< and \>:
-
-\newcommand{\<}{\emph{first definition of <-accent}}
-\renewcommand{\>}{\emph{early redefinition of >-accent}}
-
-% WORKAROUNDS
-
-% save original definition and overwrite later
-\let\MyLessThanSaved\<
-
-% define as TextDefault (can be done before or after loading fontenc):
-\DeclareTextCommandDefault{\>}{\emph{TextDefault of >-accent}}
-
-
-\usepackage{lmodern}
-\usepackage[LGR,T1]{fontenc}
-\usepackage{textalpha}
-% font encoding switch declarations:
-\newcommand{\LGR}{\fontencoding{LGR}\selectfont}
-\newcommand{\Latin}{\fontencoding{\encodingdefault}\selectfont}
-
-
-% RESTORING
-% restoring as "normal" macro results in problems in Greek text
-% \renewcommand{\<}{\MyLessThanSaved}
-% restore as "TextCommandDefault" (for all font encodings except LGR):
-\DeclareTextCommandDefault{\<}{\MyLessThanSaved}
-
-
-\begin{document}
-
-\section*{Test accent macro name clashes}
-
-The LGR font encoding defined until version 0.12 from 2014-12-12 the
-\verb+\<+ and \verb+\>+ shortcuts for Greek dasia and psili accents as
-``TextAccent'' macros (see fntguide.pdf).
-
-This definition moved to ``textalpha.sty'' wich also
-makes LGR the default encoding for these accents.
-
-This means that with \verb+\usepackage{textalpha}+, the accent macros
-are undefined in all other font encodings and can be given another definition.
-However, due to the internal working of \verb+\DeclareTextAccent+, earlier
-definitions of these macros are overwritten.
-
-Test: macro defined before fontenc loading: \<
-
-Test: macro (re)defined after fontenc loading: \>a
-
-Test: accent macro kept in LGR: \LGR \<h \Latin
-
-Test: accent macro overwritten also in LGR: \LGR \>h \Latin
-
-Test: TextCommandDefault at end of group: \texttt{\<}
-
-Test: Tab accent kludge: \a<
-
-\section*{LGR Transkription und Makros}
-
-\LGR 'a `a "u <a >a \\
- \'a \`a \"u \<a \>a \~a
-
-\end{document}
diff --git a/language/greek/greek-fontenc/test-tuenc-greek.pdf b/language/greek/greek-fontenc/test-tuenc-greek.pdf
new file mode 100644
index 0000000000..d9c51eb8b6
--- /dev/null
+++ b/language/greek/greek-fontenc/test-tuenc-greek.pdf
Binary files differ
diff --git a/language/greek/greek-fontenc/tuenc-greek-doc.tex b/language/greek/greek-fontenc/test-tuenc-greek.tex
index efd1f3e53c..9d34e76ddb 100644
--- a/language/greek/greek-fontenc/tuenc-greek-doc.tex
+++ b/language/greek/greek-fontenc/test-tuenc-greek.tex
@@ -1,7 +1,7 @@
\documentclass[a4paper]{article}
% \usepackage{textcomp}
\usepackage[unicode,colorlinks=true,linkcolor=blue]{hyperref}
-\usepackage{bookmark}
+% \usepackage{bookmark}
% \usepackage{parskip}
\usepackage{booktabs}
\usepackage{amssymb}
@@ -12,12 +12,13 @@
\usepackage[LGR]{fontenc}
% Unicode font setup:
-\usepackage[tuenc]{fontspec}
+\usepackage{fontspec}
% \setmainfont{DejaVu Serif}
% \setsansfont{DejaVu Sans}
% \usepackage{libertineotf}
\setmainfont{Linux Libertine O}
\setsansfont{Linux Biolinum O}
+% \setmainfont{cmunrm.otf} % CMU Serif % many missing characters :(
% \setmainfont{FreeSerif}%
% \setmainfont{Droid Sans}
@@ -28,13 +29,14 @@
\title{Font setup for Greek with XeTeX/LuaTeX}
\author{Günter Milde}
+\date{2020/10/30}
\maketitle
\noindent The file \href{tuenc-greek.def.html}{tuenc-greek.def} provides
support for Greek \hyperref[licr]{LICR} macros and upcasing of text with
-XeTeX and LuaTeX. It is automatically loaded by the
-\href{textalpha-doc.pdf}{\emph{textalpha}} and
-\href{alphabeta-doc.pdf}{\emph{alphabeta}} packages as well as
+XeTeX and LuaTeX. It is loaded automatically by
+\href{textalpha-doc.pdf}{\emph{textalpha}},
+\href{alphabeta-doc.pdf}{\emph{alphabeta}}, and
\href{http://www.ctan.org/pkg/babel-greek}{\emph{babel-greek}} when used
with Unicode fonts (LuaTeX or XeTeX with
\href{http://www.ctan.org/pkg/fontspec}{\emph{fontspec}}).
@@ -43,21 +45,20 @@ with Unicode fonts (LuaTeX or XeTeX with
\section{Requirements}
-\subsection{fontspec}
- The \href{http://www.ctan.org/pkg/fontspec}{\emph{fontspec}} package sets
- up the TU Unicode font encoding for XeTeX and LuaTeX. However, it does
- not provide Greek character names (\hyperref[licr]{LICR} macros).
+\subsection{\emph{fontspec} and suitable Unicode fonts}
-\subsection{suitable Unicode fonts}
-With the XeTeX or LuaTeX engines, the user must ensure that the selected
-font contains Greek glyphs (the default Latin Modern fonts have only capital
-Greek letters).
-There are no errors for missing glyphs, just warnings in the log file (but
-not the console output) and empty spaces in the output document.
+LaTeX sets up the TU Unicode text font encoding if it detects the XeTeX or
+LuaTeX engiges. The user must ensure that the selected font contains Greek
+glyphs (the default Latin Modern fonts have only capital Greek letters).
+\textbf{There are no errors for missing glyphs, just warnings in the log
+file (but not in the console output) and empty spaces in the output
+document.}
-Examples for suitable fonts are given in the
-\href{http://mirrors.ctan.org/language/greek/greek-fontenc/README.html#TU}
-{greek-fontenc README}.
+The \href{http://www.ctan.org/pkg/fontspec}{\emph{fontspec}} package is the
+standard tool to select fonts in Xe/LuaLaTeX. Examples for suitable fonts
+are given in the
+\href{http://mirrors.ctan.org/language/greek/greek-fontenc/greek-fontenc.html#TU}
+{greek-fontenc documentation}.
\section{Usage}
@@ -66,19 +67,19 @@ Examples for suitable fonts are given in the
\href{textalpha-doc.pdf}{\emph{textalpha}},
\href{alphabeta-doc.pdf}{\emph{alphabeta}}, or \emph{Babel} (with the
language option \href{http://www.ctan.org/pkg/babel-greek}{greek}). If these
-packages are loaded after
-\href{http://www.ctan.org/pkg/fontspec}{\emph{fontspec}}, Unicode font setup
-is amended for use of the Greek script.
+packages are used with Unicode-aware TeX engines (XeTeX or LuaTeX), Unicode
+font setup is amended for use of the Greek script.
+
\section{LICR input%
- \label{licr}}
+ \label{licr}}
The LaTeX internal character representation (LICR) is a verbose,
fail-safe 7-bit ASCII encoding that can be used unaltered under both, 8-bit
TeX and XeTeX/LuaTeX. Use cases are macro definitions and generated text.
See the source of this document,
-\href{tuenc-greek-doc.tex}{\texttt{tuenc-greek-doc.tex}} for the input used
+\href{test-tuenc-greek.tex}{\texttt{test-tuenc-greek.tex}} for the input used
in the examples below.
\subsection{Greek alphabet}
@@ -117,9 +118,10 @@ Greek diacritics can be input by named macro or symbol macro:
\accpsili\textalpha \>\textalpha{} \accpsili x\>x
\accdasia\textalpha \<\textalpha{} \accdasia x\<x
\end{quote}
-Up-to-date Xe/LuaTeX normalizes base letter and combining diacritics to the
+%
+XeTeX normalizes base letter and combining diacritics to the
corresponding pre-composed character if such a mapping is defined in the
-Unicode standard:
+Unicode standard.
\begin{quote}
% άάὰὰϊϊᾶᾶἀἀἁἁ
@@ -177,38 +179,55 @@ Combined accents are defined using combining diacritical characters.
Composite diacritics overlap when they are not normalized to a pre-composed
character. However, this is not a major problem in normal use as
pre-composed characters exist in Unicode for all letters that are
-used with diacritics in (ancient, polytonic or monotonoc) Greek.
-
+used with diacritics in (ancient, polytonic or monotonic) Greek.
\subsubsection{sub-iota}
-The sub-iota (ypogegrammeni/prosgegrammeni) is input after the base letter.
+The sub-iota is input after the base letter.
\begin{itemize}
+\item
+ \verb|\ypogegrammeni| sets a COMBINING GREEK YPOGEGRAMMENI:
+ \textalpha\ypogegrammeni{} k\ypogegrammeni{}.
+
+ A Greek capital letter followed by COMBINING GREEK YPOGEGRAMMENI is
+ normalized to the corresponding Greek capital letter WITH [... AND]
+ PROSGEGRAMMENI, if a mapping exists in the Unicode standard (by XeTeX but
+ not by LuaTeX)
+
\item \verb|\prosgegrammeni| sets a spacing GREEK PROSGEGRAMMENI:
\textAlpha\prosgegrammeni{} K\prosgegrammeni{}.
-\item \verb|\ypogegrammeni| sets a COMBINING GREEK YPOGEGRAMMENI:
- \textalpha\ypogegrammeni{} k\ypogegrammeni{}.
-A Greek capital letter followed by COMBINING GREEK YPOGEGRAMMENI is
-normalized to the corresponding Greek capital letter WITH [.. AND]
-PROSGEGRAMMENI, if a mapping exists in the Unicode standard:
- \textAlpha\ypogegrammeni{} but
- K\ypogegrammeni{}.
+ Spacing is better with the pre-composed characters for Greek capital
+ letters \ldots{} WITH PROSGEGRAMMENI.
+
+ Compare Αι (small letter iota) vs. Αι (spacing prosgegrammeni) vs. ᾼ
+ (pre-composed).
+
+
\end{itemize}
+%
+Test letters with ypogegrammeni and prosgegrammeni (literal/LICR):
+
+\begin{quote}
+\begin{tabbing}
+
+ unchanged \quad\= make lowercase\quad\= make uppercase. \\
-\textAlpha\ypogegrammeni \textAlpha\prosgegrammeni
-\MakeLowercase{\textAlpha\ypogegrammeni \textAlpha\prosgegrammeni}
-\MakeUppercase{\textAlpha\ypogegrammeni \textAlpha\prosgegrammeni}
+ ᾳαι/\textalpha\ypogegrammeni \textalpha\prosgegrammeni{} \>
+ \MakeLowercase{ᾳαι/\textalpha\ypogegrammeni \textalpha\prosgegrammeni} \>
+ \MakeUppercase{ᾳαι/\textalpha\ypogegrammeni \textalpha\prosgegrammeni} \\
-\textLambda\ypogegrammeni \textLambda\prosgegrammeni
-\MakeLowercase{\textLambda\ypogegrammeni \textLambda\prosgegrammeni}
-\MakeUppercase{\textLambda\ypogegrammeni \textLambda\prosgegrammeni}
+ ᾼΑι/\textAlpha\ypogegrammeni \textAlpha\prosgegrammeni{} \>
+ \MakeLowercase{ᾼΑι/\textAlpha\ypogegrammeni \textAlpha\prosgegrammeni} \>
+ \MakeUppercase{ᾼΑι/\textAlpha\ypogegrammeni \textAlpha\prosgegrammeni} \\
-\textalpha\ypogegrammeni \textalpha\prosgegrammeni
-\MakeLowercase{\textalpha\ypogegrammeni \textalpha\prosgegrammeni}
-\MakeUppercase{\textalpha\ypogegrammeni \textalpha\prosgegrammeni}
+ ΛͅΛι/\textLambda\ypogegrammeni \textLambda\prosgegrammeni{} \>
+ \MakeLowercase{ΛͅΛι/\textLambda\ypogegrammeni \textLambda\prosgegrammeni} \>
+ \MakeUppercase{ΛͅΛι/\textLambda\ypogegrammeni \textLambda\prosgegrammeni}
+\end{tabbing}
+\end{quote}
\subsection{Additional Greek symbols}
@@ -355,6 +374,26 @@ defines the \verb|\textgreek| command for this purpose.
}
\end{quote}
+
+\subsubsection{generic text symbols}
+
+There are some LICR macros for some symbols from the 8-bit font encoding LGR
+that are not confined to Greek but not defined in
+\texttt{tuenc.def} [2018/08/11 v2.0j].
+
+\begin{quote}
+ \textsemicolon{} textsemicolon\\
+ \textmicro{} textmicro \\
+ \textschwa{} textschwa
+\end{quote}
+The SI unit prefix MICRO SIGN is not upcased with MakeUppercase:
+
+\begin{quote}
+ textmu: \textmu{} $\mapsto$ \MakeUppercase{\textmu} but
+ textmicro: \textmicro{} $\mapsto$ \MakeUppercase{\textmicro}.
+\end{quote}
+
+
\section{Latin transcription}
The Latin transcription known from LGR encoded 8-bit fonts%
@@ -365,7 +404,7 @@ description.}
does not work with Unicode fonts.
It is possible to set up LGR encoded fonts parallel to Unicode fonts (see
-the preamble of the source file \url{tuenc-greek-doc.tex} for an example).
+the preamble of the source file \url{test-tuenc-greek.tex} for an example).
The \verb|\textgreek| macro can then be used for the input of Greek letters
via the \emph{Latin transcription}, e.g. «logos» becomes «\textgreek{logos}»
and «\verb|\>aupn\'ia|» becomes «\textgreek{\>aupn\'ia}».
@@ -457,7 +496,7 @@ LICR macro is followed by the corresponding literal Unicode character.
\subsection{Greek and Coptic Unicode block}
Seldom used characters that are not part of LGR encoded TeX fonts have no
-LICR definition:
+LICR definition.
\newcommand{\greekandcoptic}{
% NR Unicode Name % babel name, UCS name
@@ -475,8 +514,8 @@ LICR definition:
% 037D GREEK SMALL REVERSED DOTTED LUNATE SIGMA SYMBOL %
\texterotimatiko ; % \textquestion
-\acctonos{ } % ΄
-\"'{ } % ΅
+\acctonos{ } ΄
+\"'{ } ΅
\'\textAlpha Ά
\textanoteleia · % \anoteleia
\'\textEpsilon Έ
@@ -572,18 +611,22 @@ LICR definition:
% Ϣ ϣ Ϥ ϥ Ϧ ϧ Ϩ ϩ Ϫ ϫ Ϭ ϭ Ϯ ϯ
-ϰ ϱ ϲ
+\textkappasymbol ϰ
+\textrhosymbol ϱ
+% ϲ
% ϳ
-ϴ ϵ ϶
+\textThetasymbol ϴ
+\textepsilonsymbol ϵ
+% ϶
% Ϸ ϸ
+% Ϲ
% Ϻ ϻ ϼ
-Ͻ Ͼ Ͽ
+% Ͻ Ͼ Ͽ
}
\greekandcoptic
-\noindent MakeUppercase:
+\noindent MakeUppercase (note: standard accents not dropped):
\MakeUppercase{\greekandcoptic}
@@ -599,6 +642,7 @@ The lowercase of Ϛ (GREEK LETTER STIGMA) is ϛ (GREEK SMALL LETTER STIGMA).
\subsection{Greek Extended Unicode block}
Note: There are no LICR definitions for spacing diacritical characters.
+Use the corresponding accent macro with an empty argument or a space.
% \accvaria\textalpha ὰ
% \accoxia\textalpha ά
@@ -713,29 +757,29 @@ Note: There are no LICR definitions for spacing diacritical characters.
\~>\textOmega Ὦ
\~<\textOmega Ὧ
-\accvaria\textalpha ὰ
+\accvaria\textalpha ὰ
\accoxia\textalpha ά
-\accvaria\textepsilon ὲ
+\accvaria\textepsilon ὲ
\accoxia\textepsilon έ
-\accvaria\texteta ὴ
+\accvaria\texteta ὴ
\accoxia\texteta ή
-\accvaria\textiota ὶ
+\accvaria\textiota ὶ
\accoxia\textiota ί
-\accvaria\textomicron ὸ
+\accvaria\textomicron ὸ
\accoxia\textomicron ό
-\accvaria\textupsilon ὺ
+\accvaria\textupsilon ὺ
\accoxia\textupsilon ύ
-\accvaria\textomega ὼ
+\accvaria\textomega ὼ
\accoxia\textomega ώ
-\>\textalpha\ypogegrammeni ᾀ
-\<\textalpha\ypogegrammeni ᾁ
-\>`\textalpha\ypogegrammeni ᾂ
-\<`\textalpha\ypogegrammeni ᾃ
-\>'\textalpha\ypogegrammeni ᾄ
-\<'\textalpha\ypogegrammeni ᾅ
-\~>\textalpha\ypogegrammeni ᾆ
-\~<\textalpha\ypogegrammeni ᾇ
+\>\textalpha\ypogegrammeni ᾀ
+\<\textalpha\ypogegrammeni ᾁ
+\>`\textalpha\ypogegrammeni ᾂ
+\<`\textalpha\ypogegrammeni ᾃ
+\>'\textalpha\ypogegrammeni ᾄ
+\<'\textalpha\ypogegrammeni ᾅ
+\~>\textalpha\ypogegrammeni ᾆ
+\~<\textalpha\ypogegrammeni ᾇ
\>\textAlpha\ypogegrammeni ᾈ
\<\textAlpha\ypogegrammeni ᾉ
\>`\textAlpha\ypogegrammeni ᾊ
@@ -745,31 +789,31 @@ Note: There are no LICR definitions for spacing diacritical characters.
\~>\textAlpha\ypogegrammeni ᾎ
\~<\textAlpha\ypogegrammeni ᾏ
-\>\texteta\ypogegrammeni ᾐ
-\<\texteta\ypogegrammeni ᾑ
-\>`\texteta\ypogegrammeni ᾒ
-\<`\texteta\ypogegrammeni ᾓ
-\>'\texteta\ypogegrammeni ᾔ
-\<'\texteta\ypogegrammeni ᾕ
-\~>\texteta\ypogegrammeni ᾖ
-\~<\texteta\ypogegrammeni ᾗ
-\>\textEta\ypogegrammeni ᾘ
-\<\textEta\ypogegrammeni ᾙ
-\>`\textEta\ypogegrammeni ᾚ
-\<`\textEta\ypogegrammeni ᾛ
-\>'\textEta\ypogegrammeni ᾜ
-\<'\textEta\ypogegrammeni ᾝ
-\~>\textEta\ypogegrammeni ᾞ
-\~<\textEta\ypogegrammeni ᾟ
-
-\>\textomega\ypogegrammeni ᾠ
-\<\textomega\ypogegrammeni ᾡ
-\>`\textomega\ypogegrammeni ᾢ
-\<`\textomega\ypogegrammeni ᾣ
-\>'\textomega\ypogegrammeni ᾤ
-\<'\textomega\ypogegrammeni ᾥ
-\~>\textomega\ypogegrammeni ᾦ
-\~<\textomega\ypogegrammeni ᾧ
+\>\texteta\ypogegrammeni ᾐ
+\<\texteta\ypogegrammeni ᾑ
+\>`\texteta\ypogegrammeni ᾒ
+\<`\texteta\ypogegrammeni ᾓ
+\>'\texteta\ypogegrammeni ᾔ
+\<'\texteta\ypogegrammeni ᾕ
+\~>\texteta\ypogegrammeni ᾖ
+\~<\texteta\ypogegrammeni ᾗ
+\>\textEta\ypogegrammeni ᾘ
+\<\textEta\ypogegrammeni ᾙ
+\>`\textEta\ypogegrammeni ᾚ
+\<`\textEta\ypogegrammeni ᾛ
+\>'\textEta\ypogegrammeni ᾜ
+\<'\textEta\ypogegrammeni ᾝ
+\~>\textEta\ypogegrammeni ᾞ
+\~<\textEta\ypogegrammeni ᾟ
+
+\>\textomega\ypogegrammeni ᾠ
+\<\textomega\ypogegrammeni ᾡ
+\>`\textomega\ypogegrammeni ᾢ
+\<`\textomega\ypogegrammeni ᾣ
+\>'\textomega\ypogegrammeni ᾤ
+\<'\textomega\ypogegrammeni ᾥ
+\~>\textomega\ypogegrammeni ᾦ
+\~<\textomega\ypogegrammeni ᾧ
\>\textOmega\ypogegrammeni ᾨ
\<\textOmega\ypogegrammeni ᾩ
\>`\textOmega\ypogegrammeni ᾪ
@@ -781,49 +825,49 @@ Note: There are no LICR definitions for spacing diacritical characters.
\u\textalpha ᾰ
\=\textalpha ᾱ
-\accvaria\textalpha\ypogegrammeni ᾲ
+\accvaria\textalpha\ypogegrammeni ᾲ
\textalpha\ypogegrammeni ᾳ
-\accoxia\textalpha\ypogegrammeni ᾴ
-\~\textalpha ᾶ
-\~\textalpha\ypogegrammeni ᾷ
+\accoxia\textalpha\ypogegrammeni ᾴ
+\accperispomeni\textalpha ᾶ
+\accperispomeni\textalpha\ypogegrammeni ᾷ
\u\textAlpha Ᾰ
\=\textAlpha Ᾱ
-\accvaria\textAlpha Ὰ
-\accoxia\textAlpha Ά
+\accvaria\textAlpha Ὰ
+\accoxia\textAlpha Ά
\textAlpha\ypogegrammeni ᾼ
\>{ } ᾽
{ }\prosgegrammeni ι
\>{ } ᾿
-\accperispomeni\textcompwordmark ῀
+\accperispomeni{ } ῀
\"\~{ } ῁
-\accvaria\texteta\ypogegrammeni ῂ
+\accvaria\texteta\ypogegrammeni ῂ
\texteta\ypogegrammeni ῃ
-\accoxia\texteta\ypogegrammeni ῄ
-\~\texteta ῆ
-\~\texteta\ypogegrammeni ῇ
-\accvaria\textEpsilon Ὲ
-\accoxia\textEpsilon Έ
-\accvaria\textEta Ὴ
-\accoxia\textEta Ή
+\accoxia\texteta\ypogegrammeni ῄ
+\accperispomeni\texteta ῆ
+\accperispomeni\texteta\ypogegrammeni ῇ
+\accvaria\textEpsilon Ὲ
+\accoxia\textEpsilon Έ
+\accvaria\textEta Ὴ
+\accoxia\textEta Ή
\textEta\ypogegrammeni ῌ
-\>`{ } ῍
-\>'{ } ῎
-\~>{ } ῏
+\>`{ } ῍
+\>'{ } ῎
+\~>{ } ῏
\u\textiota ῐ
\=\textiota ῑ
\`"\textiota ῒ
\'"\textiota ΐ
-\~\textiota ῖ
-\~"\textiota ῗ
+\accperispomeni\textiota ῖ
+\accperispomeni"\textiota ῗ
\u\textIota Ῐ
\=\textIota Ῑ
-\accvaria\textIota Ὶ
-\accoxia\textIota Ί
-\<`{ } ῝
-\>'{ } ῞
-\~<{ } ῟
+\accvaria\textIota Ὶ
+\accoxia\textIota Ί
+ \<`{ } ῝
+\>'{ } ῞
+\~<{ } ῟
\u\textupsilon ῠ
\=\textupsilon ῡ
@@ -831,29 +875,29 @@ Note: There are no LICR definitions for spacing diacritical characters.
\'"\textupsilon ΰ
\>\textrho ῤ
\<\textrho ῥ
-\~\textupsilon ῦ
-\~"\textupsilon ῧ
+\accperispomeni\textupsilon ῦ
+\accperispomeni"\textupsilon ῧ
\u\textUpsilon Ῠ
\=\textUpsilon Ῡ
-\accvaria\textUpsilon Ὺ
-\accoxia\textUpsilon Ύ
+\accvaria\textUpsilon Ὺ
+\accoxia\textUpsilon Ύ
\<\textRho Ῥ
-\`"{ } ῭
-\'"{ } ΅
-\accvaria{ } `
+\`"{ } ῭
+\'"{ } ΅
+\accvaria{ } `
-\accvaria\textomega\ypogegrammeni ῲ
+\accvaria\textomega\ypogegrammeni ῲ
\textomega\ypogegrammeni ῳ
-\accoxia\textomega\ypogegrammeni ῴ
-\~\textomega ῶ
-\~\textomega\ypogegrammeni ῷ
-\accvaria\textOmicron Ὸ
-\accoxia\textOmicron Ό
-\accvaria\textOmega Ὼ
-\accoxia\textOmega Ώ
+\accoxia\textomega\ypogegrammeni ῴ
+\accperispomeni\textomega ῶ
+\accperispomeni\textomega\ypogegrammeni ῷ
+\accvaria\textOmicron Ὸ
+\accoxia\textOmicron Ό
+\accvaria\textOmega Ὼ
+\accoxia\textOmega Ώ
\textOmega\ypogegrammeni ῼ
-\accoxia{ } ´
-\<{ } ῾
+\accoxia{ } ´
+\<{ } ῾
}
\greekextended
diff --git a/language/greek/greek-fontenc/textalpha-doc.pdf b/language/greek/greek-fontenc/textalpha-doc.pdf
index 940651d0e2..3967a2b8f3 100644
--- a/language/greek/greek-fontenc/textalpha-doc.pdf
+++ b/language/greek/greek-fontenc/textalpha-doc.pdf
Binary files differ
diff --git a/language/greek/greek-fontenc/textalpha-doc.tex b/language/greek/greek-fontenc/textalpha-doc.tex
index 00163fdc15..38c1d2e67e 100644
--- a/language/greek/greek-fontenc/textalpha-doc.tex
+++ b/language/greek/greek-fontenc/textalpha-doc.tex
@@ -2,73 +2,116 @@
\usepackage{parskip}
\usepackage{booktabs}
-\usepackage{lmodern}
-\usepackage{textcomp}
-\usepackage[LGR,T1]{fontenc}
+\ifdefined \UnicodeEncodingName % set by LaTeX for Unicode-aware engines
+ % Setup for Unicode fonts (Xe-/LuaTeX)
+ \usepackage{fontspec}
+ \setmainfont{Linux Libertine O}
+ \setsansfont{Linux Biolinum O}
+ \newcommand*{\greekfontencoding}{TU}
+\else
+ % Setup for 8-bit fonts (pdfTeX/LuaTeX)
+ % (XeTeX in compatibility mode would require inputenc hacks and is not
+ % reliable.)
+ \usepackage{lmodern}
+ \usepackage{textcomp}
+ \usepackage[LGR,T1]{fontenc}
+ \newcommand*{\greekfontencoding}{LGR}
+ \newcommand*{\latinencoding}{T1}
+ % UTF8 input encoding for pdfTeX or LuaTeX in 8-bit compatibility mode:
+ \usepackage[utf8]{luainputenc}
+\fi
-% UTF8 input encoding for pdfTeX or LuaTeX in 8-bit compatibility mode:
-% (XeTeX in compatibility mode would require xetex-inputenc.sty, which is
-% not at CTAN but on https://github.com/wspr/xetex-inputenc)
-\usepackage[utf8]{luainputenc}
\usepackage[pdfencoding=auto,colorlinks=true,linkcolor=blue]{hyperref}
-\usepackage{bookmark}
-% hyperrefs PU encoding supports Greek LICR macros
-\DeclareTextCommand{\ensuregreek}{PU}[1]{#1}
+% \usepackage{bookmark}
+\makeatletter
+\providecommand*{\href}{\@secondoftwo}
+\providecommand*{\url}{\texttt}
+\makeatother
\usepackage[normalize-symbols, % comment option out to test error reporting
keep-semicolon%
]{textalpha}
+% compatibility defs:
+\ProvideTextCommandDefault{\textvarstigma}{$\oslash$%
+ \message{Character textvarstigma not defined.}}
+\ProvideTextCommand{\textvarstigma}{PU}{⌀}
+\providecommand*{\accinvertedbrevebelow}{$\oslash$%
+ \message{Character accinvertedbrevebelow not defined.}}
+\providecommand*{\accbrevebelow}{$\oslash$%
+ \message{Character accbrevebelow not defined.}}
+
+
+
\begin{document}
\title{The \emph{textalpha} package}
\author{Günter Milde}
+\date{2020/10/30}
+
\maketitle
\abstract{\noindent
The \emph{textalpha} package enables the use of Greek characters
-in text independent of font encoding or TeX engine. Input is possible via
-text commands (\verb|\textalpha| \ldots
+in text independent of font encoding or TeX engine.%
+\footnote{
+ This document was compiled using
+ \ifdefined \UTFencname % defined by fontspec
+ Unicode fonts (font encoding \latinencoding).
+ For a version using 8-bit fonts, see
+ \href{textalpha-doc.pdf}{textalpha-doc.pdf}.
+ \else
+ 8-bit fonts (font encoding \latinencoding).
+ For a version using Unicode fonts, see
+ \href{textalpha-tu.pdf}{textalpha-tu.pdf}.
+ \fi
+}
+Input is possible via text commands (\verb|\textalpha| \ldots
\verb|\textOmega|) or Unicode literals\footnote{%
Requires \emph{\href{http://www.ctan.org/pkg/greek-inputenc}{greek-inputenc}}
or XeTeX/LuaTeX.}.
}
+
\tableofcontents
+
\section{Usage}
Load this package in the preamble of your document with
\begin{verbatim}
- \usepackage{textalpha}
+ \usepackage[<options>]{textalpha}
\end{verbatim}
-eventually with options \texttt{normalize-symbols} and/or
-\texttt{keep-semicolon}.
-
-If \emph{textalpha} is loaded after the setup of Unicode fonts with the
-\href{http://www.ctan.org/pkg/fontspec}{\emph{fontspec}} package under
-LuaTeX and XeTeX, it provides a compatible interface for Greek in text mode.
-
+to get a unified interface for Greek letters and symbols that works in all
+text font encodings, with both, Unicode fonts and the
+\href{http://www.ctan.org/pkg/fontspec}{\emph{fontspec}} package or 8-bit
+fonts and the \href{http://www.ctan.org/pkg/fontenc}{\emph{fontenc}}
+package.
See the source of this document \url{textalpha-doc.tex} for a setup and
usage example, the literate source of the package
\href{textalpha.sty.html}{textalpha.sty} for the implementation, and
-\href{tuenc-greek-doc.pdf}{tuenc-greek-doc.pdf} for
+\href{test-tuenc-greek.pdf}{test-tuenc-greek.pdf} for
\emph{Font setup for Greek with XeTeX/LuaTeX}.
-\subsection{option \texttt{normalize-symbols}}
+\subsection{Options}
+\subsubsection{\texttt{normalize-symbols}}
Mathematical notation uses variant shapes of some Greek letters as
additional symbols. There are separate code points for the symbol variants
in Unicode. TeX supports some of the variant shape symbols in mathematical
-mode ($\theta|\vartheta, \phi|\varphi, \pi|\varpi, \rho|\varrho,
-\epsilon|\varepsilon$) but not in the LGR font encoding used for Greek in
-8-bit TeX.
+mode
+\[
+ \theta|\vartheta, \phi|\varphi, \pi|\varpi, \rho|\varrho,
+ \epsilon|\varepsilon
+\]
+but not in the LGR font encoding used for Greek text
+in 8-bit TeX.
The variations have no syntactic meaning in Greek text and text fonts may
use the variant shapes in place of the “regular” ones as a stylistic choice.
-However, some Greek texts use these GREEK ... SYMBOL characters in place of
+However, some Greek texts use these GREEK ... SYMBOL Unicode literals in place of
the corresponding GREEK LETTER ... characters.
The \texttt{normalize-symbols} option merges letters and symbols to Greek
@@ -76,29 +119,26 @@ letters.
This way, text copied from external sources can be compiled without
errors even if it contains GREEK SYMBOL characters in place of GREEK LETTERS:
\begin{quote}
- This text uses both variants for beta (β|ϐ), theta (θ|ϑ), phi (φ|ϕ), pi
- (π|ϖ), kappa (κ|ϰ), rho (ρ|ϱ), Theta (Θ|ϴ), and epsilon (ε|ϵ) in the LaTeX
- source.
-
- \greekscript
- This text uses both variants for beta (β|ϐ), theta (θ|ϑ), phi (φ|ϕ), pi
- (π|ϖ), kappa (κ|ϰ), rho (ρ|ϱ), Theta (Θ|ϴ), and epsilon (ε|ϵ) in the LaTeX
- source.
+ The source of this text uses both variants for beta (β|ϐ), theta (θ|ϑ),
+ phi (φ|ϕ), pi (π|ϖ), kappa (κ|ϰ), rho (ρ|ϱ), Theta (Θ|ϴ), and epsilon
+ (ε|ϵ) in the LaTeX source.
\end{quote}
+%
+This option is ignored with Unicode fonts.
-\textbf{Attention}: Do not use this option in cases where the distinction
+\begin{description}
+ \item [Attention:] Do not use this option in cases where the distinction
between the symbol variants may be important (e.g. in a mathematical or
-scientific context). Try the \emph{alphabeta} package with the
-respective characters in math mode or use XeTeX/LuaTeX with Unicode fonts in
-these cases.
+scientific context). Try the \href{alphabeta-doc.pdf}{alphabeta} package
+with the respective characters in mathematical mode or use XeTeX/LuaTeX with
+Unicode fonts in these cases.
+\end{description}
-This option is ignored with Unicode fonts.
+\subsubsection{\texttt{keep-semicolon}}
-\subsection{\texttt{keep-semicolon}}
-
-LGR is no ``standard font encoding''. Latin characters and some other ASCII
-symbols are mapped to Greek ``equivalents'' if LGR is the active font
-encoding. (See
+LGR is no \href{http://mirrors.ctan.org/macros/latex/base/encguide.pdf}{standard text font encoding}.
+Latin characters and some other ASCII symbols are mapped to Greek
+``equivalents'' if LGR is the active font encoding. (See
\href{http://mirrors.ctan.org/language/babel/contrib/greek/usage.pdf}{usage.pdf}
for a description of this Latin-Greek transliteration.)
@@ -106,7 +146,7 @@ Special care is required with the question mark characters: The LGR font
encoding uses the Latin question mark as input for the \emph{erotimatiko}
and maps the semicolon to a middle dot (\emph{ano teleia}).
As a result, Unicode-encoded texts that use the semicolon as
-\emph{erotimatiko} end up with an \emph{ano teleia} in its place!
+\emph{erotimatiko} end up with an \emph{ano teleia} in its place!
Without special care, only the deprecated character 037E GREEK QUESTION MARK%
\footnote{The Unicode standard provides the code point 037E GREEK QUESTION MARK
but says character 003B SEMICOLON and not 037E is the preferred
@@ -116,8 +156,8 @@ works with both, Xe/LuaTeX and 8-bit TeX.
The \verb|\textsemicolon| command inserts an \emph{erotimatiko} in LGR and a
semicolon else (i.e. always a character that looks like a semicolon):
\begin{quote}
- Latin (T1) a\textsemicolon{} b,
- Greek (LGR) \ensuregreek{a\textsemicolon{} b}
+ Latin (\latinencoding) a\textsemicolon{} b,
+ Greek (\greekfontencoding) \ensuregreek{a\textsemicolon{} b}
\end{quote}
With the \texttt{keep-semicolon} option, character 003B SEMICOLON can be used
@@ -125,7 +165,7 @@ for the \emph{erotimatiko} also with LGR encoded fonts:
\begin{center}
\begin{tabular}{lll}
- Latin (T1) & Greek (LGR) & question mark character \\
+ Latin (\latinencoding) & Greek (\greekfontencoding) & question mark character \\
\midrule
Τί φήις; & \ensuregreek{Τί φήις;} & 037E GREEK QUESTION MARK \\
Τί φήις; & \ensuregreek{Τί φήις;} & 003B SEMICOLON \\
@@ -133,7 +173,8 @@ for the \emph{erotimatiko} also with LGR encoded fonts:
\end{tabular}
\end{center}
-This option is ignored with Unicode fonts.
+This option is ignored with Unicode fonts (where the SEMICOLON literal
+always prints a semicolon character).
\section{Limitations \label{sec:limitations}}
@@ -156,17 +197,24 @@ or XeTeX/LuaTeX with Unicode fonts.
\subsection{Diacritics}
+Accent macros do not work with Unicode literals as base character
+under 8-bit LaTeX engines. Use the Latin transcription or LICR commands.
+
Composition of diacritics (like \verb|\accdasia\acctonos| or \verb|\<\'|)
fails in other font encodings. Long names (like \verb|\accdasiaoxia|) work.
-With LGR, pre-composed glyphs are chosen if available. In other font
+With LGR and TU, pre-composed glyphs are chosen if available. In other font
encodings, accent macros do not select pre-composed characters. (The
difference is a sub-optimal placement of the accent and becomes obvious if
you drag-and-drop text from the PDF version of this document.):
\begin{quote}
- \ensuregreek{\<'a \accdasia\acctonos a \accdasiaoxia a
- \accdasiaoxia\textalpha} (LGR) vs. \accdasiaoxia\textalpha{} (T1).
+ \ensuregreek{\<'\textalpha
+ \accdasia\acctonos\textalpha
+ \accdasiaoxia\textalpha
+ \accdasiaoxia\textalpha
+ } (\greekfontencoding)
+ vs. \accdasiaoxia\textalpha{} (\latinencoding).
\end{quote}
According to Greek typographical tradition, diacritics (except the
@@ -192,9 +240,9 @@ This fails for accent macros if the active font encoding does not support
Greek. Pre-composed literal Unicode characters are handled correctly:
\begin{quote}
\begin{tabular}{ccc}
- & LICR & Unicode \\ \hline
- LGR & \ensuregreek{\'\textAlpha} & \ensuregreek{Ά} \\
- T1 & \'\textAlpha & Ά \\
+ & LICR & Unicode \\ \hline
+ \greekfontencoding & \ensuregreek{\'\textAlpha} & \ensuregreek{Ά} \\
+ \latinencoding & \'\textAlpha & Ά \\
\end{tabular}
\end{quote}
@@ -206,26 +254,32 @@ auto-hiatus feature works in LGR and TU font encodings only:
\acctonos\textalpha\textupsilon{}, \acctonos\textepsilon\textiota{} $\mapsto$
\MakeUppercase{\ensuregreek{
\acctonos\textalpha\textupsilon{}, \acctonos\textepsilon\textiota{}
- }} (LGR) vs.
+ }} (\greekfontencoding) vs.
\MakeUppercase{
\acctonos\textalpha\textupsilon{}, \acctonos\textepsilon\textiota{}%
- } (T1)
+ } (\latinencoding)
\end{quote}
-Currently, the second vowel of the diphthong must be given as macro, not
-Unicode literal if the auto-hiatus feature should work:
+Currently, the auto-hiatus feature should works only reliably with
+LICR commands, not Unicode literals:
\begin{quote}
\ensuregreek{ἀ\textupsilon{}πνία} $\mapsto$
-\ensuregreek{\MakeUppercase{\ensuregreek{ἀ\textupsilon{}πνία}}} (LGR) vs.
-\ensuregreek{\MakeUppercase{\ensuregreek{ἀυπνία}}} (T1).
+\ensuregreek{\MakeUppercase{\ensuregreek{\accpsili{\textalpha}\textupsilon{}πνία}}}
+(OK)
+
+\ensuregreek{ἀ\textupsilon{}πνία} $\mapsto$
+\ensuregreek{\MakeUppercase{\ensuregreek{ἀ\textupsilon{}πνία}}} (OK with LGR)
+
+\ensuregreek{ἀ\textupsilon{}πνία} $\mapsto$
+\ensuregreek{\MakeUppercase{\ensuregreek{ἀυπνία}}} (fail)
\end{quote}
\subsection{Kerning}
-No kerning occurs between Greek characters in non-Greek text due to the
-internal font encoding switch: compare
-\ensuregreek{\textAlpha\textUpsilon\textAlpha} (LGR) to
-\textAlpha\textUpsilon\textAlpha (T1).
+With 8-bit fonts, no kerning occurs between Greek characters in non-Greek
+text due to the internal font encoding switch: compare
+\ensuregreek{\textAlpha\textUpsilon\textAlpha} (\greekfontencoding) to
+\textAlpha\textUpsilon\textAlpha{} (\latinencoding).
Compiling with LuaTeX provides kerning also on font encoding boundaries.
@@ -233,52 +287,55 @@ Compiling with LuaTeX provides kerning also on font encoding boundaries.
\subsection{Greek alphabet}
-Greek letters via Latin transcription in LGR font encoding:
+Greek letters via Latin transcription (works only in LGR font encoding):
\begin{quote}
- \ensuregreek{A B G D E Z H J I K L M N X O P R S T U F Q Y W}\\
\ensuregreek{a b g d e z h j i k l m n x o p r sv c t u f q y w}
-\end{quote}
-\smallskip\noindent
-Greek letters via default macros in other font encoding (here T1):
+ \ensuregreek{A B G D E Z H J I K L M N X O P R S T U F Q Y W}
+\end{quote}
+%
+Greek letters via default macros in the font for Latin script
+(here \latinencoding):
-\begin{quote}
+\newcommand*{\greekAlphabetsample}{
\textAlpha{} \textBeta{} \textGamma{} \textDelta{} \textEpsilon{}
\textZeta{} \textEta{} \textTheta{} \textIota{} \textKappa{}
\textLambda{} \textMu{} \textNu{} \textXi{} \textOmicron{} \textPi{}
\textRho{} \textSigma{} \textTau{} \textUpsilon{} \textPhi{}
\textChi{} \textPsi{} \textOmega{}
- \\
+ }
+\newcommand*{\greekalphabetsample}{
\textalpha{} \textbeta{} \textgamma{} \textdelta{} \textepsilon{}
\textzeta{} \texteta{} \texttheta{} \textiota{} \textkappa{}
\textlambda{} \textmu{} \textnu{} \textxi{} \textomicron{} \textpi{}
\textrho{} \textsigma{} \textvarsigma{} \texttau{} \textupsilon{}
\textphi{} \textchi{} \textpsi{} \textomega{}
-\end{quote}
+}
+\begin{quote}
+ \greekalphabetsample
-\smallskip\noindent
+ \greekAlphabetsample
+\end{quote}
+%
Archaic Greek letters and Greek punctuation
+\newcommand*{\archaicgreeksample}{
+ \textdigamma \textDigamma{}
+ \textkoppa \textKoppa{}
+ \textqoppa \textQoppa{}
+ \textsampi \textSampi{}
+ \textstigma \textvarstigma \textStigma{}
+ \textanoteleia{}
+ \texterotimatiko{}
+ \textdexiakeraia{}
+ \textaristerikeraia{}
+}
+
\begin{quote}
- \textDigamma
- \textanoteleia
- \textQoppa
- \textSampi
- \textStigma
- \textnumeralsigngreek
- \texterotimatiko
- \\
- \textdigamma
- \textkoppa
- \textqoppa
- \textsampi
- \textstigma
- \textnumeralsignlowergreek
- \textvarstigma
+ \archaicgreeksample
\end{quote}
-
-\smallskip\noindent
+%
Diacritics
\begin{quote}
@@ -308,10 +365,10 @@ Diacritics
\accpsilioxia{}
\accpsilivaria{}
%
+ Only in LGR:
\accinvertedbrevebelow{} % == \textsubarch{}
\accbrevebelow{}
-
\end{quote}
\medskip\noindent
@@ -328,6 +385,33 @@ This also works for the new-defined Dasia and Psili shortcuts:
\end{tabbing}
\end{quote}
+\subsubsection{Sigma}
+
+The lower Sigma comes in two variants: \verb|\textsigma| \textsigma{} is
+used inside a word and \verb|\textfinalsigma| \textfinalsigma{} (or
+\verb|\textvarsigma| \textvarsigma{}) at the end of words.
+
+In LGR, the Latin letter \verb|s| and the command \verb|\textautosigma|
+print the ``normal'' sigma if followed by another letter and the final sigma
+if followed by space or punctuation. This is implemented via the font
+ligature mechanism and works only in LGR:
+\ensuregreek{\textautosigma\textautosigma} (\greekfontencoding) and
+\textautosigma{}\textautosigma{} (\latinencoding).
+
+The upper case of both sigma variants is \verb|\textSigma|, the lower case
+of Sigma is \verb|\textautosigma|.
+
+Test: (Unicode literal and \verb|\text...| commands in \greekfontencoding)
+
+σ \textsigma{} ς \textvarsigma{} \textfinalsigma{} \textautosigma{} lowercase
+
+\MakeUppercase{
+σ \textsigma{} ς \textvarsigma{} \textfinalsigma{} \textautosigma{}} MakeUppercase
+
+\ensuregreek{ΣΣ \textSigma\textSigma{}} uppercase
+
+\MakeLowercase{\ensuregreek{ΣΣ \textSigma\textSigma{}}} MakeLowercase
+
\subsection{Greek Unicode characters in non-Greek text}
@@ -337,7 +421,8 @@ encoding \texttt{utf8}, Greek Unicode characters can be used in text with
any font encoding. See Tables \ref{tab:greek-and-coptic} and
\ref{tab:greek-extended}.
-Kerning is preserved if the font encoding is LGR: \ensuregreek{AΫA}
+Kerning is preserved if the active font encoding supports Greek:
+\ensuregreek{AΫA}
\begin{table}[tbp]
\centerline{
@@ -358,7 +443,8 @@ Kerning is preserved if the font encoding is LGR: \ensuregreek{AΫA}
\end{tabular}
} % end centerline
\caption{Greek and Coptic Unicode Block, input as literal Unicode
- characters in T1 font encoding (legend: ◦ glyph missing in LGR).}
+ characters in \latinencoding{} font encoding
+ (legend: ◦ glyph missing in LGR).}
\label{tab:greek-and-coptic}
\end{table}
@@ -389,13 +475,14 @@ Kerning is preserved if the font encoding is LGR: \ensuregreek{AΫA}
\end{tabular}
} % end centerline
\caption{Greek Extended Unicode Block, input as literal Unicode
-characters in T1 font encoding.}
+characters in \latinencoding{} font encoding.}
\label{tab:greek-extended}
\end{table}
Combined Diacritics work ᾅ, diacritics (except diaeresis) are dropped with
MakeUppercase (μαΐστρος $\mapsto$ \MakeUppercase{μαΐστρος}).
+
\subsection{PDF strings}
With \emph{textalpha} and
@@ -411,4 +498,8 @@ transcription for the Greek word \ensuregreek{logos}. Check the table of
contents in the PDF viewer: LICR macros and Unicode literals work fine, the
Latin transcription remains Latin in the PDF metadata.
+\subsubsection{\greekalphabetsample}
+\subsubsection{\greekAlphabetsample}
+\subsubsection{\archaicgreeksample}
+
\end{document}
diff --git a/language/greek/greek-fontenc/textalpha-tu.pdf b/language/greek/greek-fontenc/textalpha-tu.pdf
new file mode 100644
index 0000000000..04ecaa1d01
--- /dev/null
+++ b/language/greek/greek-fontenc/textalpha-tu.pdf
Binary files differ
diff --git a/language/greek/greek-fontenc/textalpha.sty b/language/greek/greek-fontenc/textalpha.sty
index 9bf8fa2a12..e7ac61e763 100644
--- a/language/greek/greek-fontenc/textalpha.sty
+++ b/language/greek/greek-fontenc/textalpha.sty
@@ -16,7 +16,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{textalpha}
-[2020/09/25 1.0 macros for Greek letters in text]
+[2020/10/30 2.0 macros for Greek letters in text]
% .. note::
%
@@ -47,6 +47,8 @@
% Rename ``greek-euenc`` to ``tuenc-greek``.
% Don't use ``\LastDeclaredEncoding``.
% 1.0 2020-09-25 Also set ``\encodingdefault`` with ``\greekscript``.
+% 2.0 2020-10-30 Load ``tuenc-greek.def`` with Xe/LuaTeX by default.
+% .. Load ``puenc-greek.def`` if used with `hyperref`_.
% ====== ========== =========================================================
%
% .. contents::
@@ -85,7 +87,7 @@
%
% If 8-bit font encodings like LGR are used alongside Unicode fonts, text
% input can be done via the Latin transcription or LICR but *not via
-% literal Unicode characters* (see tuenc-greek-doc.tex_).
+% literal Unicode characters* (see test-tuenc-greek.tex_).
%
% .. Attention:: The macros work well in any font encoding for single symbols.
% However, with 8-bit TeX engines, the automatic font-encoding switches
@@ -127,11 +129,11 @@
%
% For detailled examples see `<textalpha-doc.tex>`_ and `<textalpha-doc.pdf>`_
% (8-bit TeX and XeTeX/LuaTeX in 8-bit compatibility mode) as well as
-% `<tuenc-greek-doc.tex>`_ and `<tuenc-greek-doc.pdf>`_ (XeTeX/LuaTeX with
+% `<test-tuenc-greek.tex>`_ and `<test-tuenc-greek.pdf>`_ (XeTeX/LuaTeX with
% Unicode fonts).
%
% With XeTeX or LuaTex, Unicode fonts and LGR encoded 8-bit fonts can be used
-% in the same document (see tuenc-greek-doc.tex_).
+% in the same document (see test-tuenc-greek.tex_).
%
%
% Implementation
@@ -191,18 +193,36 @@
% .. _font encoding:
%
+% Symbol macros for breathings
+% ----------------------------
+%
+% In the Latin transcription provided by LGR, breathing accents (Dasia and
+% Psili) are input as < and >. Provide the corresponding NFSS macro accents.
+% (Used below for LGR, TU, and PU, if these font encodings are defined)::
+
+\newcommand{\textalpha@define@breathings}[1]{
+ \DeclareTextCommand{\<}{#1}{\accdasia}
+ \DeclareTextCommand{\>}{#1}{\accpsili}
+ % Composite accents starting with the new-defined shortcuts:
+ \DeclareTextCompositeCommand{\>}{#1}{'}{\accpsilioxia}
+ \DeclareTextCompositeCommand{\>}{#1}{`}{\accpsilivaria}
+ \DeclareTextCompositeCommand{\>}{#1}{~}{\accpsiliperispomeni}
+ \DeclareTextCompositeCommand{\<}{#1}{'}{\accdasiaoxia}
+ \DeclareTextCompositeCommand{\<}{#1}{`}{\accdasiavaria}
+ \DeclareTextCompositeCommand{\<}{#1}{~}{\accdasiaperispomeni}
+}
+
% Font encodings
% --------------
%
% With 8-bit LaTeX, the `LGR font encoding`_ is used for Greek characters. If
-% no Greek-supporting font encoding (TU, EU1, EU2, or LGR) is declared, LGR is
+% no Greek-supporting font encoding (TU or LGR) is declared, LGR is
% loaded and set up as default Greek font encoding by this package.
%
% With XeTeX or LuaTeX, there is one common input and font encoding --
% Unicode. 8-bit TeX font encodings are only used in compatibility mode or for
% fonts not available otherwise. For compatibility with the LaTeX font
-% selection system, fontspec_ defines the TU font encoding or the (pseudo)
-% font encodings EU1 and EU2 for XeTeX and LuaTeX respectively. However
+% selection system, fontspec_ defines the TU font encoding. However
% `fontspec` does not define Greek LICR macros. We therefore explicitely
% load Greek LICR definitions for XeTeX/LuaTeX from `tuenc-greek.def
% <tuenc-greek.def.html>`_ which in turn includes `greek-fontenc.def
@@ -213,55 +233,29 @@
% Ensure a Greek-supporting font encoding exists and supports Greek LICR
% macros:
%
-% * Load the Greek LICR definitions for Unicode if the font encoding TU, EU1,
-% or EU2 is detected.
-% * If none of TU, EU1, EU2, or LGR is declared, load ``lgrenc.def``.
+% * Load the Greek LICR definitions for Unicode if the font encoding TU
+% is detected.
+% * If none of TU or LGR is declared, load ``tuenc.def`` with
+% Xe/LuaTeX and ``lgrenc.def`` else.
%
% ::
-\ifdefined \UTFencname % set by "fontspec.sty"
+\ifdefined \UnicodeEncodingName % set by LaTeX for Unicode-aware engines
\input{tuenc-greek.def}
+ \textalpha@define@breathings{\UnicodeEncodingName}
\else
- \@ifl@aded{def}{lgrenc}{
- % LGR already declared and set up
- }{
+ \@ifl@aded{def}{lgrenc}{}{% else
\input{lgrenc.def}
}
+ \textalpha@define@breathings{LGR}
+ % Hiatus feature (see greek-fontenc.def and babel-greek (greek.ldf))
+ \DeclareTextCompositeCommand{\<}{LGR}{^^9f}{\LGR@hiatus}
+ \DeclareTextCompositeCommand{\>}{LGR}{^^9f}{\LGR@hiatus}
\fi
-% The package hyperref_ defines the PU font encoding which also supports
-% (monotonic) Greek. It currently misses polytonic greek and the
-% ``\greekscript`` and ``\ensuregreek`` TextCommands::
-
-\@ifl@aded{def}{puenc}
- {\ProvideTextCommand{\greekscript}{PU}{}
- \ProvideTextCommand{\ensuregreek}{PU}[1]{#1}
- \pdfstringdefDisableCommands{\let\TextOrMath\@firstoftwo}
- }
- {}
-
-
-% Symbol macros for breathings
-% ----------------------------
-%
-% In the Latin transcription provided by LGR, breathing accents (Dasia and
-% Psili) are input as < and >. We provide the corresponding NFSS macro accents
-% (moved here from `greek-fontenc.def`_).
-%
-% As Xe/LuaTeX may use LGR in combination with TU, we define the
-% macros twice, for LGR and Unicode font encodings (if they are defined)::
-
-\newcommand{\textalpha@define@breathings}[1]{
- \DeclareTextCommand{\<}{#1}{\accdasia}
- \DeclareTextCommand{\>}{#1}{\accpsili}
- % Composite accents starting with the new-defined shortcuts:
- \DeclareTextCompositeCommand{\>}{#1}{'}{\accpsilioxia}
- \DeclareTextCompositeCommand{\>}{#1}{`}{\accpsilivaria}
- \DeclareTextCompositeCommand{\>}{#1}{~}{\accpsiliperispomeni}
- \DeclareTextCompositeCommand{\<}{#1}{'}{\accdasiaoxia}
- \DeclareTextCompositeCommand{\<}{#1}{`}{\accdasiavaria}
- \DeclareTextCompositeCommand{\<}{#1}{~}{\accdasiaperispomeni}
-}
+% LGR may also be used in a document compiled with Xe/LuaTeX
+% (enables use of 8-bit TeX fonts and input via the Latin transcription).
+% Add setup for breathings::
\@ifl@aded{def}{lgrenc}{
\textalpha@define@breathings{LGR}
@@ -270,10 +264,29 @@
\DeclareTextCompositeCommand{\>}{LGR}{^^9f}{\LGR@hiatus}
}{}
-\@ifl@aded{def}{tuenc-greek}{ % XeTeX or LuaTeX with Unicode fonts
- \textalpha@define@breathings{\UTFencname}
-}{}
+% The package hyperref_ defines the PU font encoding which also supports
+% (monotonic) Greek. It currently misses polytonic greek, archaic symbols,
+% and the ``\greekscript`` and ``\ensuregreek`` TextCommands::
+
+\AtBeginDocument{
+ \@ifl@aded{def}{puenc}{
+ \makeatletter % required inside \AtBeginDocument
+ \input{puenc-greek.def}
+ \textalpha@define@breathings{PU}
+ \pdfstringdefDisableCommands{\let\TextOrMath\@firstoftwo}
+ \makeatother
+ }{}
+}
+% The package textcomp defines the TS1 font encoding with the MICRO SIGN
+% named ``\texmu``. Provide the alias ``\textmicro``::
+
+\AtBeginDocument{
+ \@ifl@aded{def}{ts1enc}{
+ \DeclareTextSymbol{\textmicro}{TS1}{181} % micro sign
+ \DeclareTextSymbolDefault{\textmicro}{TS1}
+ }{}
+}
% Default declarations
% --------------------
@@ -282,10 +295,9 @@
% anywhere in the document also with 8-bit TeX by declaring LGR as their
% default font encoding. Abort here, if the LGR font encoding is not defined::
-\@ifl@aded{def}{lgrenc}
- {}
-% else return:
- {\expandafter\endinput}
+\@ifl@aded{def}{lgrenc}{}{ % else return:
+ \expandafter\endinput
+}
% greekscript, ensuregreek
@@ -322,8 +334,8 @@
%
% ``! You can't use a prefix with `end-group character }'.``
%
-% Eventually, all font encodings supporting Greek script (e.g. LGI, PU, TU,
-% EU1, EU2) will declare ``\ensuregreek`` as text command that passes the
+% Eventually, all font encodings supporting Greek script (e.g. LGI, PU, TU)
+% will declare ``\ensuregreek`` as text command that passes the
% argument unchanged. This way, kerning and selection of precomposed glyphs
% would work also for cases like ``\ensuregreek{\'A}U``.
%
@@ -402,9 +414,10 @@
\DeclareTextSymbolDefault{\textstigma}{LGR} % ϛ
\DeclareTextSymbolDefault{\textstigmagreek}{LGR} % ϛ (puenc.def)
-\DeclareTextSymbolDefault{\textvarstigma}{LGR} % stigma variant
-\DeclareTextSymbolDefault{\textkoppa}{LGR} % ϟ (greek small letter koppa)
+\DeclareTextSymbolDefault{\textvarstigma}{LGR} % stigma variant (no separate Unicode character)
+\DeclareTextSymbolDefault{\textkoppa}{LGR} % ϟ Greek small letter koppa
\DeclareTextSymbolDefault{\textkoppagreek}{LGR} % ϟ (puenc.def)
+\DeclareTextSymbolDefault{\textKoppa}{LGR} % ϟ Greek letter koppa (numeral koppa)
\DeclareTextSymbolDefault{\textqoppa}{LGR} % ϙ (archaic koppa)
\DeclareTextSymbolDefault{\textQoppa}{LGR} % Ϙ (archaic Koppa)
\DeclareTextSymbolDefault{\textStigma}{LGR} % Ϛ ϹΤ ligature in some fonts
diff --git a/language/greek/greek-fontenc/textalpha.sty.html b/language/greek/greek-fontenc/textalpha.sty.html
index 48021df494..3ff75859bd 100644
--- a/language/greek/greek-fontenc/textalpha.sty.html
+++ b/language/greek/greek-fontenc/textalpha.sty.html
@@ -621,7 +621,7 @@ version 1.3 of this license or any later version.</p>
<dt class="identification">Identification</dt>
<dd class="identification"><pre class="literal-block">\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{textalpha}
-[2020/09/25 1.0 macros for Greek letters in text]</pre>
+[2020/10/30 2.0 macros for Greek letters in text]</pre>
</dd>
</dl>
<div class="abstract topic">
@@ -700,6 +700,12 @@ Don’t use <span class="docutils literal">\LastDeclaredEncoding</span>.</p></td
<td><p>2020-09-25</p></td>
<td><p>Also set <span class="docutils literal">\encodingdefault</span> with <span class="docutils literal">\greekscript</span>.</p></td>
</tr>
+<tr><td><p>2.0</p></td>
+<td><p>2020-10-30
+..</p></td>
+<td><p>Load <span class="docutils literal"><span class="pre">tuenc-greek.def</span></span> with Xe/LuaTeX by default.
+Load <span class="docutils literal"><span class="pre">puenc-greek.def</span></span> if used with <a class="reference external" href="http://ctan.org/pkg/hyperref">hyperref</a>.</p></td>
+</tr>
</tbody>
</table>
</dd>
@@ -717,8 +723,8 @@ Don’t use <span class="docutils literal">\LastDeclaredEncoding</span>.</p></td
<li><p><a class="reference internal" href="#keep-semicolon" id="id6">keep-semicolon</a></p></li>
</ul>
</li>
-<li><p><a class="reference internal" href="#font-encodings" id="id7">Font encodings</a></p></li>
-<li><p><a class="reference internal" href="#symbol-macros-for-breathings" id="id8">Symbol macros for breathings</a></p></li>
+<li><p><a class="reference internal" href="#symbol-macros-for-breathings" id="id7">Symbol macros for breathings</a></p></li>
+<li><p><a class="reference internal" href="#font-encodings" id="id8">Font encodings</a></p></li>
<li><p><a class="reference internal" href="#default-declarations" id="id9">Default declarations</a></p>
<ul>
<li><p><a class="reference internal" href="#greekscript-ensuregreek" id="id10">greekscript, ensuregreek</a></p></li>
@@ -765,7 +771,7 @@ mode in any font encoding (see <a class="reference external" href="textalpha-doc
<li><p>natively by XeTeX/LuaTeX for Unicode fonts.</p>
<p>If 8-bit font encodings like LGR are used alongside Unicode fonts, text
input can be done via the Latin transcription or LICR but <em>not via
-literal Unicode characters</em> (see <a class="reference external" href="tuenc-greek-doc.tex">tuenc-greek-doc.tex</a>).</p>
+literal Unicode characters</em> (see <a class="reference external" href="test-tuenc-greek.tex">test-tuenc-greek.tex</a>).</p>
</li>
</ul>
</li>
@@ -794,10 +800,10 @@ to ensure correct hyphenation of Greek text.</p>
are used, load it after <a class="reference external" href="http://ctan.org/pkg/fontspec">fontspec</a> and/or <a class="reference external" href="http://ctan.org/pkg/fontenc">fontenc</a>.</p>
<p>For detailled examples see <a class="reference external" href="textalpha-doc.tex">textalpha-doc.tex</a> and <a class="reference external" href="textalpha-doc.pdf">textalpha-doc.pdf</a>
(8-bit TeX and XeTeX/LuaTeX in 8-bit compatibility mode) as well as
-<a class="reference external" href="tuenc-greek-doc.tex">tuenc-greek-doc.tex</a> and <a class="reference external" href="tuenc-greek-doc.pdf">tuenc-greek-doc.pdf</a> (XeTeX/LuaTeX with
+<a class="reference external" href="test-tuenc-greek.tex">test-tuenc-greek.tex</a> and <a class="reference external" href="test-tuenc-greek.pdf">test-tuenc-greek.pdf</a> (XeTeX/LuaTeX with
Unicode fonts).</p>
<p>With XeTeX or LuaTex, Unicode fonts and LGR encoded 8-bit fonts can be used
-in the same document (see <a class="reference external" href="tuenc-greek-doc.tex">tuenc-greek-doc.tex</a>).</p>
+in the same document (see <a class="reference external" href="test-tuenc-greek.tex">test-tuenc-greek.tex</a>).</p>
</section>
<section id="implementation">
<h2><a class="toc-backref" href="#id3">Implementation</a></h2>
@@ -845,83 +851,92 @@ With XeTeX/LuaTeX and Unicode fonts, this option is ignored.</p>
\ProcessOptions\relax</pre>
</section>
</section>
+<section id="symbol-macros-for-breathings">
+<span id="font-encoding"></span><h3><a class="toc-backref" href="#id7">Symbol macros for breathings</a></h3>
+<p>In the Latin transcription provided by LGR, breathing accents (Dasia and
+Psili) are input as &lt; and &gt;. Provide the corresponding NFSS macro accents.
+(Used below for LGR, TU, and PU, if these font encodings are defined):</p>
+<pre class="literal-block">\newcommand{\textalpha&#64;define&#64;breathings}[1]{
+ \DeclareTextCommand{\&lt;}{#1}{\accdasia}
+ \DeclareTextCommand{\&gt;}{#1}{\accpsili}
+ % Composite accents starting with the new-defined shortcuts:
+ \DeclareTextCompositeCommand{\&gt;}{#1}{'}{\accpsilioxia}
+ \DeclareTextCompositeCommand{\&gt;}{#1}{`}{\accpsilivaria}
+ \DeclareTextCompositeCommand{\&gt;}{#1}{~}{\accpsiliperispomeni}
+ \DeclareTextCompositeCommand{\&lt;}{#1}{'}{\accdasiaoxia}
+ \DeclareTextCompositeCommand{\&lt;}{#1}{`}{\accdasiavaria}
+ \DeclareTextCompositeCommand{\&lt;}{#1}{~}{\accdasiaperispomeni}
+}</pre>
+</section>
<section id="font-encodings">
-<span id="font-encoding"></span><h3><a class="toc-backref" href="#id7">Font encodings</a></h3>
+<h3><a class="toc-backref" href="#id8">Font encodings</a></h3>
<p>With 8-bit LaTeX, the <a class="reference external" href="README.html#lgr">LGR font encoding</a> is used for Greek characters. If
-no Greek-supporting font encoding (TU, EU1, EU2, or LGR) is declared, LGR is
+no Greek-supporting font encoding (TU or LGR) is declared, LGR is
loaded and set up as default Greek font encoding by this package.</p>
<p>With XeTeX or LuaTeX, there is one common input and font encoding –
Unicode. 8-bit TeX font encodings are only used in compatibility mode or for
fonts not available otherwise. For compatibility with the LaTeX font
-selection system, <a class="reference external" href="http://ctan.org/pkg/fontspec">fontspec</a> defines the TU font encoding or the (pseudo)
-font encodings EU1 and EU2 for XeTeX and LuaTeX respectively. However
+selection system, <a class="reference external" href="http://ctan.org/pkg/fontspec">fontspec</a> defines the TU font encoding. However
<cite>fontspec</cite> does not define Greek LICR macros. We therefore explicitely
load Greek LICR definitions for XeTeX/LuaTeX from <a class="reference external" href="tuenc-greek.def.html">tuenc-greek.def</a> which in turn includes <a class="reference external" href="greek-fontenc.def.html">greek-fontenc.def</a>.</p>
<p>Ensure a Greek-supporting font encoding exists and supports Greek LICR
macros:</p>
<ul class="simple">
-<li><p>Load the Greek LICR definitions for Unicode if the font encoding TU, EU1,
-or EU2 is detected.</p></li>
-<li><p>If none of TU, EU1, EU2, or LGR is declared, load <span class="docutils literal">lgrenc.def</span>.</p></li>
+<li><p>Load the Greek LICR definitions for Unicode if the font encoding TU
+is detected.</p></li>
+<li><p>If none of TU or LGR is declared, load <span class="docutils literal">tuenc.def</span> with
+Xe/LuaTeX and <span class="docutils literal">lgrenc.def</span> else.</p></li>
</ul>
-<pre class="literal-block">\ifdefined \UTFencname % set by &quot;fontspec.sty&quot;
+<pre class="literal-block">\ifdefined \UnicodeEncodingName % set by LaTeX for Unicode-aware engines
\input{tuenc-greek.def}
+ \textalpha&#64;define&#64;breathings{\UnicodeEncodingName}
\else
- \&#64;ifl&#64;aded{def}{lgrenc}{
- % LGR already declared and set up
- }{
+ \&#64;ifl&#64;aded{def}{lgrenc}{}{% else
\input{lgrenc.def}
}
+ \textalpha&#64;define&#64;breathings{LGR}
+ % Hiatus feature (see greek-fontenc.def and babel-greek (greek.ldf))
+ \DeclareTextCompositeCommand{\&lt;}{LGR}{^^9f}{\LGR&#64;hiatus}
+ \DeclareTextCompositeCommand{\&gt;}{LGR}{^^9f}{\LGR&#64;hiatus}
\fi</pre>
-<p>The package <a class="reference external" href="http://ctan.org/pkg/hyperref">hyperref</a> defines the PU font encoding which also supports
-(monotonic) Greek. It currently misses polytonic greek and the
-<span class="docutils literal">\greekscript</span> and <span class="docutils literal">\ensuregreek</span> TextCommands:</p>
-<pre class="literal-block">\&#64;ifl&#64;aded{def}{puenc}
- {\ProvideTextCommand{\greekscript}{PU}{}
- \ProvideTextCommand{\ensuregreek}{PU}[1]{#1}
- \pdfstringdefDisableCommands{\let\TextOrMath\&#64;firstoftwo}
- }
- {}</pre>
-</section>
-<section id="symbol-macros-for-breathings">
-<h3><a class="toc-backref" href="#id8">Symbol macros for breathings</a></h3>
-<p>In the Latin transcription provided by LGR, breathing accents (Dasia and
-Psili) are input as &lt; and &gt;. We provide the corresponding NFSS macro accents
-(moved here from <a class="reference external" href="greek-fontenc.def.html">greek-fontenc.def</a>).</p>
-<p>As Xe/LuaTeX may use LGR in combination with TU, we define the
-macros twice, for LGR and Unicode font encodings (if they are defined):</p>
-<pre class="literal-block">\newcommand{\textalpha&#64;define&#64;breathings}[1]{
- \DeclareTextCommand{\&lt;}{#1}{\accdasia}
- \DeclareTextCommand{\&gt;}{#1}{\accpsili}
- % Composite accents starting with the new-defined shortcuts:
- \DeclareTextCompositeCommand{\&gt;}{#1}{'}{\accpsilioxia}
- \DeclareTextCompositeCommand{\&gt;}{#1}{`}{\accpsilivaria}
- \DeclareTextCompositeCommand{\&gt;}{#1}{~}{\accpsiliperispomeni}
- \DeclareTextCompositeCommand{\&lt;}{#1}{'}{\accdasiaoxia}
- \DeclareTextCompositeCommand{\&lt;}{#1}{`}{\accdasiavaria}
- \DeclareTextCompositeCommand{\&lt;}{#1}{~}{\accdasiaperispomeni}
-}
-
-\&#64;ifl&#64;aded{def}{lgrenc}{
+<p>LGR may also be used in a document compiled with Xe/LuaTeX
+(enables use of 8-bit TeX fonts and input via the Latin transcription).
+Add setup for breathings:</p>
+<pre class="literal-block">\&#64;ifl&#64;aded{def}{lgrenc}{
\textalpha&#64;define&#64;breathings{LGR}
% Hiatus feature (see greek-fontenc.def and babel-greek (greek.ldf))
\DeclareTextCompositeCommand{\&lt;}{LGR}{^^9f}{\LGR&#64;hiatus}
\DeclareTextCompositeCommand{\&gt;}{LGR}{^^9f}{\LGR&#64;hiatus}
-}{}
-
-\&#64;ifl&#64;aded{def}{tuenc-greek}{ % XeTeX or LuaTeX with Unicode fonts
- \textalpha&#64;define&#64;breathings{\UTFencname}
}{}</pre>
+<p>The package <a class="reference external" href="http://ctan.org/pkg/hyperref">hyperref</a> defines the PU font encoding which also supports
+(monotonic) Greek. It currently misses polytonic greek, archaic symbols,
+and the <span class="docutils literal">\greekscript</span> and <span class="docutils literal">\ensuregreek</span> TextCommands:</p>
+<pre class="literal-block">\AtBeginDocument{
+ \&#64;ifl&#64;aded{def}{puenc}{
+ \makeatletter % required inside \AtBeginDocument
+ \input{puenc-greek.def}
+ \textalpha&#64;define&#64;breathings{PU}
+ \pdfstringdefDisableCommands{\let\TextOrMath\&#64;firstoftwo}
+ \makeatother
+ }{}
+}</pre>
+<p>The package textcomp defines the TS1 font encoding with the MICRO SIGN
+named <span class="docutils literal">\texmu</span>. Provide the alias <span class="docutils literal">\textmicro</span>:</p>
+<pre class="literal-block">\AtBeginDocument{
+ \&#64;ifl&#64;aded{def}{ts1enc}{
+ \DeclareTextSymbol{\textmicro}{TS1}{181} % micro sign
+ \DeclareTextSymbolDefault{\textmicro}{TS1}
+ }{}
+}</pre>
</section>
<section id="default-declarations">
<h3><a class="toc-backref" href="#id9">Default declarations</a></h3>
<p>The following definitions ensure that the Greek LICR macros can be used
anywhere in the document also with 8-bit TeX by declaring LGR as their
default font encoding. Abort here, if the LGR font encoding is not defined:</p>
-<pre class="literal-block">\&#64;ifl&#64;aded{def}{lgrenc}
- {}
-% else return:
- {\expandafter\endinput}</pre>
+<pre class="literal-block">\&#64;ifl&#64;aded{def}{lgrenc}{}{ % else return:
+ \expandafter\endinput
+}</pre>
<section id="greekscript-ensuregreek">
<h4><a class="toc-backref" href="#id10">greekscript, ensuregreek</a></h4>
<p>The <span class="docutils literal">\greekscript</span> declaration ensures the current font encoding supports
@@ -947,8 +962,8 @@ However, the simpler alternative
Unicode characters in the test document `<textalpha-doc.tex>`__:
``! You can't use a prefix with `end-group character }'.`` -->
-<p>Eventually, all font encodings supporting Greek script (e.g. LGI, PU, TU,
-EU1, EU2) will declare <span class="docutils literal">\ensuregreek</span> as text command that passes the
+<p>Eventually, all font encodings supporting Greek script (e.g. LGI, PU, TU)
+will declare <span class="docutils literal">\ensuregreek</span> as text command that passes the
argument unchanged. This way, kerning and selection of precomposed glyphs
would work also for cases like <span class="docutils literal"><span class="pre">\ensuregreek{\'A}U</span></span>.</p>
</section>
@@ -1019,9 +1034,10 @@ would work also for cases like <span class="docutils literal"><span class="pre">
<p>Archaic letters:</p>
<pre class="literal-block">\DeclareTextSymbolDefault{\textstigma}{LGR} % ϛ
\DeclareTextSymbolDefault{\textstigmagreek}{LGR} % ϛ (puenc.def)
-\DeclareTextSymbolDefault{\textvarstigma}{LGR} % stigma variant
-\DeclareTextSymbolDefault{\textkoppa}{LGR} % ϟ (greek small letter koppa)
+\DeclareTextSymbolDefault{\textvarstigma}{LGR} % stigma variant (no separate Unicode character)
+\DeclareTextSymbolDefault{\textkoppa}{LGR} % ϟ Greek small letter koppa
\DeclareTextSymbolDefault{\textkoppagreek}{LGR} % ϟ (puenc.def)
+\DeclareTextSymbolDefault{\textKoppa}{LGR} % ϟ Greek letter koppa (numeral koppa)
\DeclareTextSymbolDefault{\textqoppa}{LGR} % ϙ (archaic koppa)
\DeclareTextSymbolDefault{\textQoppa}{LGR} % Ϙ (archaic Koppa)
\DeclareTextSymbolDefault{\textStigma}{LGR} % Ϛ ϹΤ ligature in some fonts
diff --git a/language/greek/greek-fontenc/tuenc-greek-doc.pdf b/language/greek/greek-fontenc/tuenc-greek-doc.pdf
deleted file mode 100644
index 5883ad163b..0000000000
--- a/language/greek/greek-fontenc/tuenc-greek-doc.pdf
+++ /dev/null
Binary files differ
diff --git a/language/greek/greek-fontenc/tuenc-greek.def b/language/greek/greek-fontenc/tuenc-greek.def
index dcc9b0b672..5e2967c2d7 100644
--- a/language/greek/greek-fontenc/tuenc-greek.def
+++ b/language/greek/greek-fontenc/tuenc-greek.def
@@ -11,11 +11,12 @@
% ::
\ProvidesFile{tuenc-greek.def}
-[2020/09/25 1.0 Greek LICRs for XeTeX and LuaTeX]
+[2020/10/13 2.0 Greek LICRs for XeTeX and LuaTeX]
% :abstract:
-% Experimental support for Greek LICR macros with XeTeX and LuaTeX.
-% Extends tuenc_. Used by babel-greek_ and textalpha_.
+% Support for Greek LICR macros and upcasing of text
+% with XeTeX and LuaTeX. Extends tuenc.def_.
+% Used by babel-greek_ and textalpha_.
%
% **History**:
% .. class:: borderless
@@ -36,7 +37,12 @@
% .. LICR macros for symbol variants.
% 0.13.3 2018-01-06 Documentation update.
% 0.14 2020-02-28 Rename to ``tuenc-greek.def``. Use ``\UTFencname``.
-% 1.0 2020/09/25 ``\textKoppa`` as alias for ``\textkoppa`` in LGR.
+% 1.0 2020-09-25 New package version. No changes in this file.
+% 2.0 2020-10-13 Move common alias definitions to ``greek-fontenc.def``.
+% .. New compatiblity definitions.
+% .. Use ``\UnicodeEncodingName`` instead of ``\UTFencname``.
+% .. Make the file encoding-independent (required for input
+% in other encodings with `luainputenc`).
% ====== ========== ========================================================
%
% .. contents::
@@ -44,7 +50,7 @@
% Motivation
% ==========
%
-% LICR macro definitions for the Greek script are missing in tuenc_ (as well
+% LICR macro definitions for the Greek script are missing in tuenc.def_ (as well
% as the predecessors xunicode_, euenc_).
%
% This file defines `LaTeX Internal Character Representaction` (LICR) macros
@@ -54,9 +60,11 @@
% Requirements
% ============
%
-% Requires XeTeX or LuaTeX, fontspec_, and a font with Greek characters.
+% Requires XeTeX or LuaTeX (usually with fontspec_), the `LaTeX base`_
+% file _`tuenc.def` that sets up the `font encoding`_ TU, and a font with
+% Greek characters.
%
-% See `<tuenc-greek-doc.tex>`_ and `<tuenc-greek-doc.pdf>`_ for setup and
+% See `<test-tuenc-greek.tex>`_ and `<test-tuenc-greek.pdf>`_ for setup and
% usage examples.
%
%
@@ -73,44 +81,46 @@
%
% Greek alias names for standard accents::
-\DeclareTextCommand{\acctonos}{\UTFencname}{\@tabacckludge'}
-\DeclareTextCommand{\accvaria}{\UTFencname}{\@tabacckludge`}
-\DeclareTextCommand{\accdialytika}{\UTFencname}{\@tabacckludge"}
+\DeclareUnicodeAccent{\accvaria} \UnicodeEncodingName{"0300}
+\DeclareUnicodeAccent{\acctonos} \UnicodeEncodingName{"0301}
+\DeclareUnicodeAccent{\accdialytika}\UnicodeEncodingName{"0308}
% The combining perispomeni character is normalized with Greek base letters,
% while the (standard) combining tilde is not::
-\DeclareTextCommand{\accperispomeni}{\UTFencname}[1]{#1\char"0342 }
+\DeclareUnicodeAccent{\accperispomeni}\UnicodeEncodingName{"0342} % COMBINING GREEK PERISPOMENI
% Breathings:
%
-% (The COMBINING GREEK KORONIS is a legacy character, discarded in favour of
-% COMBINING COMMA ABOVE) ::
+% ``\accpsili = \acckoronis`` but the COMBINING GREEK KORONIS is a legacy
+% character, discarded in favour of COMBINING COMMA ABOVE. ::
-\DeclareTextCommand{\accpsili}{\UTFencname}[1]{#1\char"0313 } % ψιλή spiritus lenis (smooth breathing)
-\DeclareTextCommand{\accdasia}{\UTFencname}[1]{#1\char"0314 } % δασεῖα spiritus asper (rough breathing)
+\DeclareUnicodeAccent{\accpsili}\UnicodeEncodingName{"0313} % ψιλή spiritus lenis (smooth breathing)
+\DeclareUnicodeAccent{\accdasia}\UnicodeEncodingName{"0314} % δασεῖα spiritus asper (rough breathing)
-
-% Sub-iota:
+% Sub-iotas:
%
+% ``\prosgegrammeni`` is a standard character (see below).
% ``\ypogegrammeni`` is a postfix accent (ligature in LGR) ::
-\DeclareTextSymbol{\ypogegrammeni}{\UTFencname}{0837} % COMBINING GREEK YPOGEGRAMMENI
+\DeclareTextSymbol{\ypogegrammeni}{\UnicodeEncodingName}{0837} % COMBINING GREEK YPOGEGRAMMENI
-% Combined diacritics::
+% Combined diacritics:
+%
+% ``\DeclareUnicodeAccent`` does not work with more than one argument::
% The COMBINING DIALYTIKA TONOS is discarded and not well supported by fonts:
-\DeclareTextCommand{\accdialytikatonos}{\UTFencname}[1]{#1\char"0308 \char"0301 }
-\DeclareTextCommand{\accdialytikavaria}{\UTFencname}[1]{#1\char"0308 \char"0300 }
-\DeclareTextCommand{\accdialytikaperispomeni}{\UTFencname}[1]{#1\char"0342 \char"0308 }
+\DeclareTextCommand{\accdialytikatonos}{\UnicodeEncodingName}[1]{#1\char"0308\char"0301}
+\DeclareTextCommand{\accdialytikavaria}{\UnicodeEncodingName}[1]{#1\char"0308\char"0300}
+\DeclareTextCommand{\accdialytikaperispomeni}{\UnicodeEncodingName}[1]{#1\char"0342\char"0308}
-\DeclareTextCommand{\accdasiaoxia}{\UTFencname}[1]{#1\char"0314 \char"0301 }
-\DeclareTextCommand{\accdasiavaria}{\UTFencname}[1]{#1\char"0314 \char"0300 }
-\DeclareTextCommand{\accdasiaperispomeni}{\UTFencname}[1]{#1\char"0314 \char"0342 }
+\DeclareTextCommand{\accdasiaoxia}{\UnicodeEncodingName}[1]{#1\char"0314\char"0301}
+\DeclareTextCommand{\accdasiavaria}{\UnicodeEncodingName}[1]{#1\char"0314\char"0300}
+\DeclareTextCommand{\accdasiaperispomeni}{\UnicodeEncodingName}[1]{#1\char"0314\char"0342}
-\DeclareTextCommand{\accpsilioxia}{\UTFencname}[1]{#1\char"0301 \char"0313 }
-\DeclareTextCommand{\accpsilivaria}{\UTFencname}[1]{#1\char"0300 \char"0313 }
-\DeclareTextCommand{\accpsiliperispomeni}{\UTFencname}[1]{#1\char"0342 \char"0313 }
+\DeclareTextCommand{\accpsilioxia}{\UnicodeEncodingName}[1]{#1\char"0301\char"0313}
+\DeclareTextCommand{\accpsilivaria}{\UnicodeEncodingName}[1]{#1\char"0300\char"0313}
+\DeclareTextCommand{\accpsiliperispomeni}{\UnicodeEncodingName}[1]{#1\char"0342\char"0313}
% Common Definitions
@@ -118,359 +128,416 @@
%
% Use the `common Greek font encoding definitions`_::
-\renewcommand*{\LastDeclaredEncoding}{\UTFencname}
+\renewcommand*{\LastDeclaredEncoding}{\UnicodeEncodingName}
\input{greek-fontenc.def}
-
% Character Definitions
% =====================
%
-% General Punctuation
-% ~~~~~~~~~~~~~~~~~~~
+% Basic Latin
+% ~~~~~~~~~~~
+%
+% Compatibility def with LGR::
+
+\DeclareTextSymbol{\textsemicolon}\UnicodeEncodingName{"003B} % ;
+
+% Latin 1 Supplement
+% ~~~~~~~~~~~~~~~~~~
+%
+% Distinguish MICRO SIGN from letter mu::
+
+\DeclareTextSymbol{\textmicro}\UnicodeEncodingName{"00B5} % µ MICRO SIGN
+
+% IPA Extensions
+% ~~~~~~~~~~~~~~
%
-% Ligature break up with ZERO WIDTH NON-JOINER::
+% ::
-\DeclareTextCommand{\textcompwordmark}{\UTFencname}{\char"200C}
+\DeclareTextSymbol{\textschwa}\UnicodeEncodingName{"0259} % ə
% Greek and Coptic
% ~~~~~~~~~~~~~~~~
%
% ::
-% NR Unicode Name % babel name, % PU name
-% 0370 GREEK CAPITAL LETTER HETA % Ͱ
-% 0371 GREEK SMALL LETTER HETA % ͱ
-% 0372 GREEK CAPITAL LETTER ARCHAIC SAMPI % Ͳ
-% 0373 GREEK SMALL LETTER ARCHAIC SAMPI % ͳ
-\DeclareTextCommand{\textdexiakeraia}{\UTFencname}{ʹ} % \anwtonos, \textnumeralsigngreek
-\DeclareTextCommand{\textaristerikeraia}{\UTFencname}{͵} % \katwtonos, \textnumeralsignlowergreek
-% 0376 GREEK CAPITAL LETTER PAMPHYLIAN DIGAMMA % Ͷ
-% 0377 GREEK SMALL LETTER PAMPHYLIAN DIGAMMA % ͷ
-
-% 037A GREEK YPOGEGRAMMENI (use \textcompwordmark\ypogegrammeni) % ͺ
+% NR Unicode Name % babel name, % PU name
+% 0370 GREEK CAPITAL LETTER HETA % Ͱ
+% 0371 GREEK SMALL LETTER HETA % ͱ
+% 0372 GREEK CAPITAL LETTER ARCHAIC SAMPI % Ͳ
+% 0373 GREEK SMALL LETTER ARCHAIC SAMPI % ͳ
+\DeclareTextSymbol{\textdexiakeraia}\UnicodeEncodingName{"0374} % ʹ \anwtonos, \textnumeralsigngreek
+\DeclareTextSymbol{\textaristerikeraia}\UnicodeEncodingName{"0375} % ͵\katwtonos, \textnumeralsignlowergreek
+% 0376 GREEK CAPITAL LETTER PAMPHYLIAN DIGAMMA % Ͷ
+% 0377 GREEK SMALL LETTER PAMPHYLIAN DIGAMMA % ͷ
+
+% \DeclareTextCompositeCommand{\@emty}\UnicodeEncodingName{\ypogegrammeni}{ͺ} % 037A GREEK YPOGEGRAMMENI
+% \DeclareTextCompositeCommand{\textcompwordmark}\UnicodeEncodingName{\ypogegrammeni}{ͺ} % 037A GREEK YPOGEGRAMMENI
% 037B GREEK SMALL REVERSED LUNATE SIGMA SYMBOL
% 037C GREEK SMALL DOTTED LUNATE SIGMA SYMBOL
% 037D GREEK SMALL REVERSED DOTTED LUNATE SIGMA SYMBOL
-\DeclareTextCommand{\texterotimatiko}{\UTFencname}{;} % 037E GREEK QUESTION MARK
-
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\textcompwordmark}{΄}
-\DeclareTextCompositeCommand{\accdialytikatonos}{\UTFencname}{\textcompwordmark}{΅}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\textAlpha}{Ά}
-\DeclareTextCommand{\textanoteleia}{\UTFencname}{·} % \anoteleia
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\textEpsilon}{Έ}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\textEta}{Ή}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\textIota}{Ί}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\textOmicron}{Ό}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\textUpsilon}{Ύ}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\textOmega}{Ώ}
-\DeclareTextCompositeCommand{\accdialytikatonos}{\UTFencname}{\textiota}{ΐ}
-
-\DeclareTextCommand{\textAlpha}{\UTFencname}{Α}
-\DeclareTextCommand{\textBeta}{\UTFencname}{Β}
-\DeclareTextCommand{\textGamma}{\UTFencname}{Γ}
-\DeclareTextCommand{\textDelta}{\UTFencname}{Δ}
-\DeclareTextCommand{\textEpsilon}{\UTFencname}{Ε}
-\DeclareTextCommand{\textZeta}{\UTFencname}{Ζ}
-\DeclareTextCommand{\textEta}{\UTFencname}{Η}
-\DeclareTextCommand{\textTheta}{\UTFencname}{Θ}
-\DeclareTextCommand{\textIota}{\UTFencname}{Ι}
-\DeclareTextCommand{\textKappa}{\UTFencname}{Κ}
-\DeclareTextCommand{\textLambda}{\UTFencname}{Λ}
-\DeclareTextCommand{\textMu}{\UTFencname}{Μ}
-\DeclareTextCommand{\textNu}{\UTFencname}{Ν}
-\DeclareTextCommand{\textXi}{\UTFencname}{Ξ}
-\DeclareTextCommand{\textOmicron}{\UTFencname}{Ο}
-\DeclareTextCommand{\textPi}{\UTFencname}{Π}
-\DeclareTextCommand{\textRho}{\UTFencname}{Ρ}
-\DeclareTextCommand{\textSigma}{\UTFencname}{Σ}
-\DeclareTextCommand{\textTau}{\UTFencname}{Τ}
-\DeclareTextCommand{\textUpsilon}{\UTFencname}{Υ}
-\DeclareTextCommand{\textPhi}{\UTFencname}{Φ}
-\DeclareTextCommand{\textChi}{\UTFencname}{Χ}
-\DeclareTextCommand{\textPsi}{\UTFencname}{Ψ}
-\DeclareTextCommand{\textOmega}{\UTFencname}{Ω}
-
-\DeclareTextCompositeCommand{\"}{\UTFencname}{\textIota}{Ϊ}
-\DeclareTextCompositeCommand{\"}{\UTFencname}{\textUpsilon}{Ϋ}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\textalpha}{ά}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\textepsilon}{έ}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\texteta}{ή}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\textiota}{ί}
-\DeclareTextCompositeCommand{\accdialytikatonos}{\UTFencname}{\textupsilon}{ΰ}
-
-\DeclareTextCommand{\textalpha}{\UTFencname}{α}
-\DeclareTextCommand{\textbeta}{\UTFencname}{β}
-\DeclareTextCommand{\textgamma}{\UTFencname}{γ}
-\DeclareTextCommand{\textdelta}{\UTFencname}{δ}
-\DeclareTextCommand{\textepsilon}{\UTFencname}{ε}
-\DeclareTextCommand{\textvarepsilon}{\UTFencname}{ε} % cf. $\varepsiolon$
-\DeclareTextCommand{\textzeta}{\UTFencname}{ζ}
-\DeclareTextCommand{\texteta}{\UTFencname}{η}
-\DeclareTextCommand{\texttheta}{\UTFencname}{θ}
-\DeclareTextCommand{\textiota}{\UTFencname}{ι}
-\DeclareTextCommand{\textkappa}{\UTFencname}{κ}
-\DeclareTextCommand{\textlambda}{\UTFencname}{λ}
-\DeclareTextCommand{\textmu}{\UTFencname}{μ} % \textmugreek
-\DeclareTextCommand{\textnu}{\UTFencname}{ν}
-\DeclareTextCommand{\textxi}{\UTFencname}{ξ}
-\DeclareTextCommand{\textomicron}{\UTFencname}{ο}
-\DeclareTextCommand{\textpi}{\UTFencname}{π}
-\DeclareTextCommand{\textrho}{\UTFencname}{ρ}
-\DeclareTextCommand{\textvarsigma}{\UTFencname}{ς} % final sigma
-\DeclareTextCommand{\textfinalsigma}{\UTFencname}{\textvarsigma}
-\DeclareTextCommand{\textsigma}{\UTFencname}{σ}
-% Dummy definition (\textautosigma is lowercase of \textSigma):
-\ProvideTextCommand{\textautosigma}{\UTFencname}{\textsigma}
-\DeclareTextCommand{\texttau}{\UTFencname}{τ}
-\DeclareTextCommand{\textupsilon}{\UTFencname}{υ}
-\DeclareTextCommand{\textphi}{\UTFencname}{φ}
-\DeclareTextCommand{\textvarphi}{\UTFencname}{φ} % cf. $\varphi$
-\DeclareTextCommand{\textchi}{\UTFencname}{χ}
-\DeclareTextCommand{\textpsi}{\UTFencname}{ψ}
-\DeclareTextCommand{\textomega}{\UTFencname}{ω}
-
-\DeclareTextCompositeCommand{\"}{\UTFencname}{\textiota}{ϊ}
-\DeclareTextCompositeCommand{\"}{\UTFencname}{\textupsilon}{ϋ}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\textomicron}{ό}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\textupsilon}{ύ}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\textomega}{ώ}
-
-\DeclareTextCommand{\textQoppa}{\UTFencname}{Ϙ}
-\DeclareTextCommand{\textqoppa}{\UTFencname}{ϙ}
-\DeclareTextCommand{\textStigma}{\UTFencname}{Ϛ}
-\DeclareTextCommand{\textstigma}{\UTFencname}{ϛ}
-\DeclareTextCommand{\textDigamma}{\UTFencname}{Ϝ}
-\DeclareTextCommand{\textdigamma}{\UTFencname}{ϝ}
-\DeclareTextCommand{\textKoppa}{\UTFencname}{Ϟ} % in LGR identic to \textkoppa
-\DeclareTextCommand{\textkoppa}{\UTFencname}{ϟ} % \koppa, \textqoppa [sic!]
-\DeclareTextCommand{\textSampi}{\UTFencname}{Ϡ}
-\DeclareTextCommand{\textsampi}{\UTFencname}{ϡ}
-
-% Symbol variants
-\DeclareTextCommand{\textbetasymbol}{\UTFencname}{ϐ}
-\DeclareTextCommand{\textkappasymbol}{\UTFencname}{ϰ}
-\DeclareTextCommand{\textThetasymbol}{\UTFencname}{ϴ}
-\DeclareTextCommand{\textthetasymbol}{\UTFencname}{ϑ}
-\DeclareTextCommand{\textphisymbol}{\UTFencname}{ϕ}
-\DeclareTextCommand{\textpisymbol}{\UTFencname}{ϖ}
-\DeclareTextCommand{\textrhosymbol}{\UTFencname}{ϱ}
-\DeclareTextCommand{\textepsilonsymbol}{\UTFencname}{ϵ}
-% math compatibility aliases
-% $\varphi$ and $\varepsilon$ refer to the letter characters (see above)!
-\DeclareTextCommand{\textvarbeta}{\UTFencname}{\textbetasymbol}
-\DeclareTextCommand{\textvarkappa}{\UTFencname}{ϰ}
-\DeclareTextCommand{\textvarTheta}{\UTFencname}{ϴ}
-\DeclareTextCommand{\textvartheta}{\UTFencname}{ϑ}
-\DeclareTextCommand{\textvarpi}{\UTFencname}{ϖ}
-\DeclareTextCommand{\textvarrho}{\UTFencname}{ϱ}
+\DeclareTextSymbol{\texterotimatiko}\UnicodeEncodingName{"003B} % use SEMICOLON, not 037E GREEK QUESTION MARK
+
+\DeclareUnicodeComposite{\acctonos} {} {"0384} % ΄ GREEK TONOS
+\DeclareUnicodeComposite{\accdialytikatonos}{} {"0385} % ΅ GREEK DIALYTIKA TONOS
+\DeclareUnicodeComposite{\'} {\textAlpha} {"0386} % Ά
+\DeclareTextSymbol{\textanoteleia} \UnicodeEncodingName{"00B7} % use MIDDLE DOT, not 0387 GREEK ANO TELEIA
+\DeclareUnicodeComposite{\'} {\textEpsilon}{"0388} % Έ
+\DeclareUnicodeComposite{\'} {\textEta} {"0389} % Ή
+\DeclareUnicodeComposite{\'} {\textIota} {"038A} % Ί
+\DeclareUnicodeComposite{\'} {\textOmicron}{"038C} % Ό
+\DeclareUnicodeComposite{\'} {\textUpsilon}{"038E} % Ύ
+\DeclareUnicodeComposite{\'} {\textOmega} {"038F} % Ώ
+% repeat with named accents (LuaTeX does not normalize to pre-composed chars):
+\DeclareUnicodeComposite{\acctonos} {\textAlpha} {"0386} % Ά
+\DeclareUnicodeComposite{\acctonos} {\textEpsilon}{"0388} % Έ
+\DeclareUnicodeComposite{\acctonos} {\textEta} {"0389} % Ή
+\DeclareUnicodeComposite{\acctonos} {\textIota} {"038A} % Ί
+\DeclareUnicodeComposite{\acctonos} {\textOmicron}{"038C} % Ό
+\DeclareUnicodeComposite{\acctonos} {\textUpsilon}{"038E} % Ύ
+\DeclareUnicodeComposite{\acctonos} {\textOmega} {"038F} % Ώ
+\DeclareUnicodeComposite{\accdialytikatonos}{\textiota} {"0390} % ΐ
+
+\DeclareTextSymbol{\textAlpha }\UnicodeEncodingName{"0391} % Α
+\DeclareTextSymbol{\textBeta }\UnicodeEncodingName{"0392} % Β
+\DeclareTextSymbol{\textGamma }\UnicodeEncodingName{"0393} % Γ
+\DeclareTextSymbol{\textDelta }\UnicodeEncodingName{"0394} % Δ
+\DeclareTextSymbol{\textEpsilon}\UnicodeEncodingName{"0395} % Ε
+\DeclareTextSymbol{\textZeta }\UnicodeEncodingName{"0396} % Ζ
+\DeclareTextSymbol{\textEta }\UnicodeEncodingName{"0397} % Η
+\DeclareTextSymbol{\textTheta }\UnicodeEncodingName{"0398} % Θ
+\DeclareTextSymbol{\textIota }\UnicodeEncodingName{"0399} % Ι
+\DeclareTextSymbol{\textKappa }\UnicodeEncodingName{"039A} % Κ
+\DeclareTextSymbol{\textLambda }\UnicodeEncodingName{"039B} % Λ
+\DeclareTextSymbol{\textMu }\UnicodeEncodingName{"039C} % Μ
+\DeclareTextSymbol{\textNu }\UnicodeEncodingName{"039D} % Ν
+\DeclareTextSymbol{\textXi }\UnicodeEncodingName{"039E} % Ξ
+\DeclareTextSymbol{\textOmicron}\UnicodeEncodingName{"039F} % Ο
+\DeclareTextSymbol{\textPi }\UnicodeEncodingName{"03A0} % Π
+\DeclareTextSymbol{\textRho }\UnicodeEncodingName{"03A1} % Ρ
+\DeclareTextSymbol{\textSigma }\UnicodeEncodingName{"03A3} % Σ
+\DeclareTextSymbol{\textTau }\UnicodeEncodingName{"03A4} % Τ
+\DeclareTextSymbol{\textUpsilon}\UnicodeEncodingName{"03A5} % Υ
+\DeclareTextSymbol{\textPhi }\UnicodeEncodingName{"03A6} % Φ
+\DeclareTextSymbol{\textChi }\UnicodeEncodingName{"03A7} % Χ
+\DeclareTextSymbol{\textPsi }\UnicodeEncodingName{"03A8} % Ψ
+\DeclareTextSymbol{\textOmega }\UnicodeEncodingName{"03A9} % Ω
+
+\DeclareUnicodeComposite{\"} {\textIota} {"03AA} % Ϊ
+\DeclareUnicodeComposite{\"} {\textIota} {"03AA} % Ϊ
+\DeclareUnicodeComposite{\"} {\textUpsilon}{"03AB} % Ϋ
+\DeclareUnicodeComposite{\'} {\textalpha} {"03AC} % ά
+\DeclareUnicodeComposite{\'} {\textepsilon}{"03AD} % έ
+\DeclareUnicodeComposite{\'} {\texteta} {"03AE} % ή
+\DeclareUnicodeComposite{\'} {\textiota} {"03AF} % ί
+% repeat with named accents (LuaTeX does not normalize to pre-composed chars):
+\DeclareUnicodeComposite{\accdialytika} {\textIota} {"03AA} % Ϊ
+\DeclareUnicodeComposite{\accdialytika} {\textIota} {"03AA} % Ϊ
+\DeclareUnicodeComposite{\accdialytika} {\textUpsilon}{"03AB} % Ϋ
+\DeclareUnicodeComposite{\acctonos} {\textalpha} {"03AC} % ά
+\DeclareUnicodeComposite{\acctonos} {\textepsilon}{"03AD} % έ
+\DeclareUnicodeComposite{\acctonos} {\texteta} {"03AE} % ή
+\DeclareUnicodeComposite{\acctonos} {\textiota} {"03AF} % ί
+\DeclareUnicodeComposite{\accdialytikatonos}{\textupsilon}{"03B0} % ΰ
+
+\DeclareTextSymbol{\textalpha }\UnicodeEncodingName{"03B1} % α
+\DeclareTextSymbol{\textbeta }\UnicodeEncodingName{"03B2} % β
+\DeclareTextSymbol{\textgamma }\UnicodeEncodingName{"03B3} % γ
+\DeclareTextSymbol{\textdelta }\UnicodeEncodingName{"03B4} % δ
+\DeclareTextSymbol{\textepsilon }\UnicodeEncodingName{"03B5} % ε
+\DeclareTextSymbol{\textzeta }\UnicodeEncodingName{"03B6} % ζ
+\DeclareTextSymbol{\texteta }\UnicodeEncodingName{"03B7} % η
+\DeclareTextSymbol{\texttheta }\UnicodeEncodingName{"03B8} % θ
+\DeclareTextSymbol{\textiota }\UnicodeEncodingName{"03B9} % ι
+\DeclareTextSymbol{\textkappa }\UnicodeEncodingName{"03BA} % κ
+\DeclareTextSymbol{\textlambda }\UnicodeEncodingName{"03BB} % λ
+\DeclareTextSymbol{\textmu }\UnicodeEncodingName{"03BC} % μ % \textmugreek
+\DeclareTextSymbol{\textnu }\UnicodeEncodingName{"03BD} % ν
+\DeclareTextSymbol{\textxi }\UnicodeEncodingName{"03BE} % ξ
+\DeclareTextSymbol{\textomicron }\UnicodeEncodingName{"03BF} % ο
+\DeclareTextSymbol{\textpi }\UnicodeEncodingName{"03C0} % π
+\DeclareTextSymbol{\textrho }\UnicodeEncodingName{"03C1} % ρ
+\DeclareTextSymbol{\textfinalsigma}\UnicodeEncodingName{"03C2} % ς % final sigma
+\DeclareTextSymbol{\textsigma }\UnicodeEncodingName{"03C3} % σ
+\DeclareTextSymbol{\texttau }\UnicodeEncodingName{"03C4} % τ
+\DeclareTextSymbol{\textupsilon }\UnicodeEncodingName{"03C5} % υ
+\DeclareTextSymbol{\textphi }\UnicodeEncodingName{"03C6} % φ
+\DeclareTextSymbol{\textchi }\UnicodeEncodingName{"03C7} % χ
+\DeclareTextSymbol{\textpsi }\UnicodeEncodingName{"03C8} % ψ
+\DeclareTextSymbol{\textomega }\UnicodeEncodingName{"03C9} % ω
+
+\DeclareUnicodeComposite{\"}{\textiota}{"03CA} % ϊ
+\DeclareUnicodeComposite{\"}{\textupsilon}{"03CB} % ϋ
+\DeclareUnicodeComposite{\'}{\textomicron}{"03CC} % ό
+\DeclareUnicodeComposite{\'}{\textupsilon}{"03CD} % ύ
+\DeclareUnicodeComposite{\'}{\textomega}{"03CE} % ώ
+\DeclareUnicodeComposite{\accdialytika}{\textiota}{"03CA} % ϊ
+\DeclareUnicodeComposite{\accdialytika}{\textupsilon}{"03CB} % ϋ
+\DeclareUnicodeComposite{\acctonos}{\textomicron}{"03CC} % ό
+\DeclareUnicodeComposite{\acctonos}{\textupsilon}{"03CD} % ύ
+\DeclareUnicodeComposite{\acctonos}{\textomega}{"03CE} % ώ
+
+% Archaic letters (still used in Greek numerals)::
+
+\DeclareTextSymbol{\textQoppa }\UnicodeEncodingName{"03D8} % Ϙ
+\DeclareTextSymbol{\textqoppa }\UnicodeEncodingName{"03D9} % ϙ
+\DeclareTextSymbol{\textStigma }\UnicodeEncodingName{"03DA} % Ϛ
+\DeclareTextSymbol{\textstigma }\UnicodeEncodingName{"03DB} % ϛ
+\DeclareTextSymbol{\textDigamma }\UnicodeEncodingName{"03DC} % Ϝ
+\DeclareTextSymbol{\textdigamma }\UnicodeEncodingName{"03DD} % ϝ
+\DeclareTextSymbol{\textKoppa }\UnicodeEncodingName{"03DE} % Ϟ in LGR identic to \textkoppa
+\DeclareTextSymbol{\textkoppa }\UnicodeEncodingName{"03DF} % ϟ \koppa, \textqoppa [sic!]
+\DeclareTextSymbol{\textSampi }\UnicodeEncodingName{"03E0} % Ϡ
+\DeclareTextSymbol{\textsampi }\UnicodeEncodingName{"03E1} % ϡ
+
+% Symbol variants::
+
+\DeclareTextSymbol{\textbetasymbol }\UnicodeEncodingName{"03D0} % ϐ
+\DeclareTextSymbol{\textkappasymbol }\UnicodeEncodingName{"03F0} % ϰ
+\DeclareTextSymbol{\textThetasymbol }\UnicodeEncodingName{"03F4} % ϴ
+\DeclareTextSymbol{\textthetasymbol }\UnicodeEncodingName{"03D1} % ϑ
+\DeclareTextSymbol{\textphisymbol }\UnicodeEncodingName{"03D5} % ϕ
+\DeclareTextSymbol{\textpisymbol }\UnicodeEncodingName{"03D6} % ϖ
+\DeclareTextSymbol{\textrhosymbol }\UnicodeEncodingName{"03F1} % ϱ
+\DeclareTextSymbol{\textepsilonsymbol}\UnicodeEncodingName{"03F5} % ϵ
+
+% Dummy definition (\textautosigma is lowercase of \textSigma)
+% TODO: implement autosigma for TU::
+
+\ProvideTextCommand{\textautosigma }\UnicodeEncodingName{\textsigma}
+
% Greek Extended
% ~~~~~~~~~~~~~~
%
% We skip definitions for characters "... WITH OXIA", because they would
-% overwrite the defintions for "... WITH TONOS" in the `Greek and Coptic`
+% overwrite the definitions for "... WITH TONOS" in the `Greek and Coptic`
% block.
%
% ::
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\textalpha}{ἀ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textalpha}{ἁ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\textalpha}{ἂ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\textalpha}{ἃ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\textalpha}{ἄ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\textalpha}{ἅ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\textalpha}{ἆ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\textalpha}{ἇ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\textAlpha}{Ἀ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textAlpha}{Ἁ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\textAlpha}{Ἂ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\textAlpha}{Ἃ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\textAlpha}{Ἄ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\textAlpha}{Ἅ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\textAlpha}{Ἆ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\textAlpha}{Ἇ}
-
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\textepsilon}{ἐ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textepsilon}{ἑ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\textepsilon}{ἒ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\textepsilon}{ἓ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\textepsilon}{ἔ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\textepsilon}{ἕ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\textEpsilon}{Ἐ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textEpsilon}{Ἑ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\textEpsilon}{Ἒ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\textEpsilon}{Ἓ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\textEpsilon}{Ἔ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\textEpsilon}{Ἕ}
-
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\texteta}{ἠ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\texteta}{ἡ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\texteta}{ἢ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\texteta}{ἣ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\texteta}{ἤ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\texteta}{ἥ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\texteta}{ἦ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\texteta}{ἧ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\textEta}{Ἠ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textEta}{Ἡ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\textEta}{Ἢ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\textEta}{Ἣ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\textEta}{Ἤ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\textEta}{Ἥ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\textEta}{Ἦ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\textEta}{Ἧ}
-
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\textiota}{ἰ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textiota}{ἱ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\textiota}{ἲ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\textiota}{ἳ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\textiota}{ἴ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\textiota}{ἵ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\textiota}{ἶ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\textiota}{ἷ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\textIota}{Ἰ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textIota}{Ἱ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\textIota}{Ἲ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\textIota}{Ἳ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\textIota}{Ἴ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\textIota}{Ἵ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\textIota}{Ἶ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\textIota}{Ἷ}
-
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\textomicron}{ὀ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textomicron}{ὁ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\textomicron}{ὂ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\textomicron}{ὃ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\textomicron}{ὄ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\textomicron}{ὅ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\textOmicron}{Ὀ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textOmicron}{Ὁ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\textOmicron}{Ὂ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\textOmicron}{Ὃ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\textOmicron}{Ὄ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\textOmicron}{Ὅ}
-
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\textupsilon}{ὐ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textupsilon}{ὑ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\textupsilon}{ὒ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\textupsilon}{ὓ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\textupsilon}{ὔ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\textupsilon}{ὕ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\textupsilon}{ὖ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\textupsilon}{ὗ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textUpsilon}{Ὑ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\textUpsilon}{Ὓ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\textUpsilon}{Ὕ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\textUpsilon}{Ὗ}
-
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\textomega}{ὠ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textomega}{ὡ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\textomega}{ὢ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\textomega}{ὣ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\textomega}{ὤ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\textomega}{ὥ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\textomega}{ὦ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\textomega}{ὧ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\textOmega}{Ὠ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textOmega}{Ὡ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\textOmega}{Ὢ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\textOmega}{Ὣ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\textOmega}{Ὤ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\textOmega}{Ὥ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\textOmega}{Ὦ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\textOmega}{Ὧ}
-
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\textalpha}{ὰ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\textepsilon}{ὲ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\texteta}{ὴ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\textiota}{ὶ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\textomicron}{ὸ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\textupsilon}{ὺ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\textomega}{ὼ}
-
-\DeclareTextCompositeCommand{\u}{\UTFencname}{\textalpha}{ᾰ}
-\DeclareTextCompositeCommand{\=}{\UTFencname}{\textalpha}{ᾱ}
+\DeclareUnicodeComposite{\accpsili }{\textalpha}{"1F00} % ἀ
+\DeclareUnicodeComposite{\accdasia }{\textalpha}{"1F01} % ἁ
+\DeclareUnicodeComposite{\accpsilivaria }{\textalpha}{"1F02} % ἂ
+\DeclareUnicodeComposite{\accdasiavaria }{\textalpha}{"1F03} % ἃ
+\DeclareUnicodeComposite{\accpsilioxia }{\textalpha}{"1F04} % ἄ
+\DeclareUnicodeComposite{\accdasiaoxia }{\textalpha}{"1F05} % ἅ
+\DeclareUnicodeComposite{\accpsiliperispomeni}{\textalpha}{"1F06} % ἆ
+\DeclareUnicodeComposite{\accdasiaperispomeni}{\textalpha}{"1F07} % ἇ
+\DeclareUnicodeComposite{\accpsili }{\textAlpha}{"1F08} % Ἀ
+\DeclareUnicodeComposite{\accdasia }{\textAlpha}{"1F09} % Ἁ
+\DeclareUnicodeComposite{\accpsilivaria }{\textAlpha}{"1F0A} % Ἂ
+\DeclareUnicodeComposite{\accdasiavaria }{\textAlpha}{"1F0B} % Ἃ
+\DeclareUnicodeComposite{\accpsilioxia }{\textAlpha}{"1F0C} % Ἄ
+\DeclareUnicodeComposite{\accdasiaoxia }{\textAlpha}{"1F0D} % Ἅ
+\DeclareUnicodeComposite{\accpsiliperispomeni}{\textAlpha}{"1F0E} % Ἆ
+\DeclareUnicodeComposite{\accdasiaperispomeni}{\textAlpha}{"1F0F} % Ἇ
+
+\DeclareUnicodeComposite{\accpsili }{\textepsilon}{"1F10} % ἐ
+\DeclareUnicodeComposite{\accdasia }{\textepsilon}{"1F11} % ἑ
+\DeclareUnicodeComposite{\accpsilivaria }{\textepsilon}{"1F12} % ἒ
+\DeclareUnicodeComposite{\accdasiavaria }{\textepsilon}{"1F13} % ἓ
+\DeclareUnicodeComposite{\accpsilioxia }{\textepsilon}{"1F14} % ἔ
+\DeclareUnicodeComposite{\accdasiaoxia }{\textepsilon}{"1F15} % ἕ
+\DeclareUnicodeComposite{\accpsili }{\textEpsilon}{"1F18} % Ἐ
+\DeclareUnicodeComposite{\accdasia }{\textEpsilon}{"1F19} % Ἑ
+\DeclareUnicodeComposite{\accpsilivaria }{\textEpsilon}{"1F1A} % Ἒ
+\DeclareUnicodeComposite{\accdasiavaria }{\textEpsilon}{"1F1B} % Ἓ
+\DeclareUnicodeComposite{\accpsilioxia }{\textEpsilon}{"1F1C} % Ἔ
+\DeclareUnicodeComposite{\accdasiaoxia }{\textEpsilon}{"1F1D} % Ἕ
+
+\DeclareUnicodeComposite{\accpsili }{\texteta}{"1F20} % ἠ
+\DeclareUnicodeComposite{\accdasia }{\texteta}{"1F21} % ἡ
+\DeclareUnicodeComposite{\accpsilivaria }{\texteta}{"1F22} % ἢ
+\DeclareUnicodeComposite{\accdasiavaria }{\texteta}{"1F23} % ἣ
+\DeclareUnicodeComposite{\accpsilioxia }{\texteta}{"1F24} % ἤ
+\DeclareUnicodeComposite{\accdasiaoxia }{\texteta}{"1F25} % ἥ
+\DeclareUnicodeComposite{\accpsiliperispomeni}{\texteta}{"1F26} % ἦ
+\DeclareUnicodeComposite{\accdasiaperispomeni}{\texteta}{"1F27} % ἧ
+\DeclareUnicodeComposite{\accpsili }{\textEta}{"1F28} % Ἠ
+\DeclareUnicodeComposite{\accdasia }{\textEta}{"1F29} % Ἡ
+\DeclareUnicodeComposite{\accpsilivaria }{\textEta}{"1F2A} % Ἢ
+\DeclareUnicodeComposite{\accdasiavaria }{\textEta}{"1F2B} % Ἣ
+\DeclareUnicodeComposite{\accpsilioxia }{\textEta}{"1F2C} % Ἤ
+\DeclareUnicodeComposite{\accdasiaoxia }{\textEta}{"1F2D} % Ἥ
+\DeclareUnicodeComposite{\accpsiliperispomeni}{\textEta}{"1F2E} % Ἦ
+\DeclareUnicodeComposite{\accdasiaperispomeni}{\textEta}{"1F2F} % Ἧ
+
+\DeclareUnicodeComposite{\accpsili }{\textiota}{"1F30} % ἰ
+\DeclareUnicodeComposite{\accdasia }{\textiota}{"1F31} % ἱ
+\DeclareUnicodeComposite{\accpsilivaria }{\textiota}{"1F32} % ἲ
+\DeclareUnicodeComposite{\accdasiavaria }{\textiota}{"1F33} % ἳ
+\DeclareUnicodeComposite{\accpsilioxia }{\textiota}{"1F34} % ἴ
+\DeclareUnicodeComposite{\accdasiaoxia }{\textiota}{"1F35} % ἵ
+\DeclareUnicodeComposite{\accpsiliperispomeni}{\textiota}{"1F36} % ἶ
+\DeclareUnicodeComposite{\accdasiaperispomeni}{\textiota}{"1F37} % ἷ
+\DeclareUnicodeComposite{\accpsili }{\textIota}{"1F38} % Ἰ
+\DeclareUnicodeComposite{\accdasia }{\textIota}{"1F39} % Ἱ
+\DeclareUnicodeComposite{\accpsilivaria }{\textIota}{"1F3A} % Ἲ
+\DeclareUnicodeComposite{\accdasiavaria }{\textIota}{"1F3B} % Ἳ
+\DeclareUnicodeComposite{\accpsilioxia }{\textIota}{"1F3C} % Ἴ
+\DeclareUnicodeComposite{\accdasiaoxia }{\textIota}{"1F3D} % Ἵ
+\DeclareUnicodeComposite{\accpsiliperispomeni}{\textIota}{"1F3E} % Ἶ
+\DeclareUnicodeComposite{\accdasiaperispomeni}{\textIota}{"1F3F} % Ἷ
+
+\DeclareUnicodeComposite{\accpsili }{\textomicron}{"1F40} % ὀ
+\DeclareUnicodeComposite{\accdasia }{\textomicron}{"1F41} % ὁ
+\DeclareUnicodeComposite{\accpsilivaria }{\textomicron}{"1F42} % ὂ
+\DeclareUnicodeComposite{\accdasiavaria }{\textomicron}{"1F43} % ὃ
+\DeclareUnicodeComposite{\accpsilioxia }{\textomicron}{"1F44} % ὄ
+\DeclareUnicodeComposite{\accdasiaoxia }{\textomicron}{"1F45} % ὅ
+\DeclareUnicodeComposite{\accpsili }{\textOmicron}{"1F48} % Ὀ
+\DeclareUnicodeComposite{\accdasia }{\textOmicron}{"1F49} % Ὁ
+\DeclareUnicodeComposite{\accpsilivaria }{\textOmicron}{"1F4A} % Ὂ
+\DeclareUnicodeComposite{\accdasiavaria }{\textOmicron}{"1F4B} % Ὃ
+\DeclareUnicodeComposite{\accpsilioxia }{\textOmicron}{"1F4C} % Ὄ
+\DeclareUnicodeComposite{\accdasiaoxia }{\textOmicron}{"1F4D} % Ὅ
+
+\DeclareUnicodeComposite{\accpsili }{\textupsilon}{"1F50} % ὐ
+\DeclareUnicodeComposite{\accdasia }{\textupsilon}{"1F51} % ὑ
+\DeclareUnicodeComposite{\accpsilivaria }{\textupsilon}{"1F52} % ὒ
+\DeclareUnicodeComposite{\accdasiavaria }{\textupsilon}{"1F53} % ὓ
+\DeclareUnicodeComposite{\accpsilioxia }{\textupsilon}{"1F54} % ὔ
+\DeclareUnicodeComposite{\accdasiaoxia }{\textupsilon}{"1F55} % ὕ
+\DeclareUnicodeComposite{\accpsiliperispomeni}{\textupsilon}{"1F56} % ὖ
+\DeclareUnicodeComposite{\accdasiaperispomeni}{\textupsilon}{"1F57} % ὗ
+\DeclareUnicodeComposite{\accdasia }{\textUpsilon}{"1F59} % Ὑ
+\DeclareUnicodeComposite{\accdasiavaria }{\textUpsilon}{"1F5B} % Ὓ
+\DeclareUnicodeComposite{\accdasiaoxia }{\textUpsilon}{"1F5D} % Ὕ
+\DeclareUnicodeComposite{\accdasiaperispomeni}{\textUpsilon}{"1F5F} % Ὗ
+
+\DeclareUnicodeComposite{\accpsili }{\textomega}{"1F60} % ὠ
+\DeclareUnicodeComposite{\accdasia }{\textomega}{"1F61} % ὡ
+\DeclareUnicodeComposite{\accpsilivaria }{\textomega}{"1F62} % ὢ
+\DeclareUnicodeComposite{\accdasiavaria }{\textomega}{"1F63} % ὣ
+\DeclareUnicodeComposite{\accpsilioxia }{\textomega}{"1F64} % ὤ
+\DeclareUnicodeComposite{\accdasiaoxia }{\textomega}{"1F65} % ὥ
+\DeclareUnicodeComposite{\accpsiliperispomeni}{\textomega}{"1F66} % ὦ
+\DeclareUnicodeComposite{\accdasiaperispomeni}{\textomega}{"1F67} % ὧ
+\DeclareUnicodeComposite{\accpsili }{\textOmega}{"1F68} % Ὠ
+\DeclareUnicodeComposite{\accdasia }{\textOmega}{"1F69} % Ὡ
+\DeclareUnicodeComposite{\accpsilivaria }{\textOmega}{"1F6A} % Ὢ
+\DeclareUnicodeComposite{\accdasiavaria }{\textOmega}{"1F6B} % Ὣ
+\DeclareUnicodeComposite{\accpsilioxia }{\textOmega}{"1F6C} % Ὤ
+\DeclareUnicodeComposite{\accdasiaoxia }{\textOmega}{"1F6D} % Ὥ
+\DeclareUnicodeComposite{\accpsiliperispomeni}{\textOmega}{"1F6E} % Ὦ
+\DeclareUnicodeComposite{\accdasiaperispomeni}{\textOmega}{"1F6F} % Ὧ
+
+\DeclareUnicodeComposite{\`} {\textalpha} {"1F70} % ὰ
+\DeclareUnicodeComposite{\`} {\textepsilon}{"1F72} % ὲ
+\DeclareUnicodeComposite{\`} {\texteta} {"1F74} % ὴ
+\DeclareUnicodeComposite{\`} {\textiota} {"1F76} % ὶ
+\DeclareUnicodeComposite{\`} {\textomicron}{"1F78} % ὸ
+\DeclareUnicodeComposite{\`} {\textupsilon}{"1F7A} % ὺ
+\DeclareUnicodeComposite{\`} {\textomega} {"1F7C} % ὼ
+% repeat with named accents (LuaTeX does not normalize to pre-composed chars):
+\DeclareUnicodeComposite{\accvaria} {\textalpha} {"1F70} % ὰ
+\DeclareUnicodeComposite{\accvaria} {\textepsilon}{"1F72} % ὲ
+\DeclareUnicodeComposite{\accvaria} {\texteta} {"1F74} % ὴ
+\DeclareUnicodeComposite{\accvaria} {\textiota} {"1F76} % ὶ
+\DeclareUnicodeComposite{\accvaria} {\textomicron}{"1F78} % ὸ
+\DeclareUnicodeComposite{\accvaria} {\textupsilon}{"1F7A} % ὺ
+\DeclareUnicodeComposite{\accvaria} {\textomega} {"1F7C} % ὼ
+
+
+% Skipping pre-composed characters with sub-iota (ypogegrammeni/prosgegrammeni).
+
+\DeclareUnicodeComposite{\u} {\textalpha}{"1FB0} % ᾰ
+\DeclareUnicodeComposite{\=} {\textalpha}{"1FB1} % ᾱ
% ᾲ
% ᾳ
% ᾴ
-\DeclareTextCompositeCommand{\~}{\UTFencname}{\textalpha}{ᾶ}
-\DeclareTextCompositeCommand{\~}{\UTFencname}{α}{ᾶ}
-\DeclareTextCompositeCommand{\accperispomeni}{\UTFencname}{\textalpha}{ᾶ}
+\DeclareUnicodeComposite{\accperispomeni} {\textalpha}{"1FB6} % ᾶ
+\DeclareUnicodeComposite{\~} {\textalpha}{"1FB6} % ᾶ
% ᾷ
-\DeclareTextCompositeCommand{\u}{\UTFencname}{\textAlpha}{Ᾰ}
-\DeclareTextCompositeCommand{\=}{\UTFencname}{\textAlpha}{Ᾱ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\textAlpha}{Ὰ}
+\DeclareUnicodeComposite{\u} {\textAlpha}{"1FB8} % Ᾰ
+\DeclareUnicodeComposite{\=} {\textAlpha}{"1FB9} % Ᾱ
+\DeclareUnicodeComposite{\`} {\textAlpha}{"1FBA} % Ὰ
+\DeclareUnicodeComposite{\accvaria} {\textAlpha}{"1FBA} % Ὰ
% ᾼ
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\textcompwordmark}{᾽}
-\DeclareTextCommand{\prosgegrammeni}{\UTFencname}{ι}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\textcompwordmark}{᾿}
+\DeclareUnicodeComposite{\accpsili} {} {"1FBD} % ᾽
+\DeclareTextSymbol{\prosgegrammeni}\UnicodeEncodingName {"1FBE} % ι
+\DeclareUnicodeComposite{\accpsili} {} {"1FBF} % ᾿
-\DeclareTextCompositeCommand{\accperispomeni}{\UTFencname}{\textcompwordmark}{῀}
-\DeclareTextCompositeCommand{\accdialytikaperispomeni}{\UTFencname}{\textcompwordmark}{῁}
+\DeclareUnicodeComposite{\accperispomeni} {} {"1FC0} % ῀
+\DeclareUnicodeComposite{\accdialytikaperispomeni}{} {"1FC1} % ῁
% ῂ
% ῃ
% ῄ
-\DeclareTextCompositeCommand{\~}{\UTFencname}{\texteta}{ῆ}
-\DeclareTextCompositeCommand{\~}{\UTFencname}{η}{ῆ}
-\DeclareTextCompositeCommand{\accperispomeni}{\UTFencname}{\texteta}{ῆ}
+\DeclareUnicodeComposite{\accperispomeni} {\texteta} {"1FC6} % ῆ
+\DeclareUnicodeComposite{\~} {\texteta} {"1FC6} % ῆ
% ῇ
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\textEpsilon}{Ὲ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\textEta}{Ὴ}
+\DeclareUnicodeComposite{\`} {\textEpsilon}{"1FC8} % Ὲ
+\DeclareUnicodeComposite{\accvaria} {\textEpsilon}{"1FC8} % Ὲ
+\DeclareUnicodeComposite{\`} {\textEta} {"1FCA} % Ὴ
+\DeclareUnicodeComposite{\accvaria} {\textEta} {"1FCA} % Ὴ
% ῌ
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\textcompwordmark}{῍}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\textcompwordmark}{῎}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\textcompwordmark}{῏}
-
-\DeclareTextCompositeCommand{\u}{\UTFencname}{\textiota}{ῐ}
-\DeclareTextCompositeCommand{\=}{\UTFencname}{\textiota}{ῑ}
-\DeclareTextCompositeCommand{\accdialytikavaria}{\UTFencname}{\textiota}{ῒ}
-\DeclareTextCompositeCommand{\accdialytikaoxia}{\UTFencname}{\textiota}{ΐ}
-\DeclareTextCompositeCommand{\~}{\UTFencname}{\textiota}{ῖ}
-\DeclareTextCompositeCommand{\~}{\UTFencname}{ι}{ῖ}
-\DeclareTextCompositeCommand{\accperispomeni}{\UTFencname}{\textiota}{ῖ}
-\DeclareTextCompositeCommand{\accdialytikaperispomeni}{\UTFencname}{\textiota}{ῗ}
-\DeclareTextCompositeCommand{\u}{\UTFencname}{\textIota}{Ῐ}
-\DeclareTextCompositeCommand{\=}{\UTFencname}{\textIota}{Ῑ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\textIota}{Ὶ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\textcompwordmark}{῝}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\textcompwordmark}{῞}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\textcompwordmark}{῟}
-
-\DeclareTextCompositeCommand{\u}{\UTFencname}{\textupsilon}{ῠ}
-\DeclareTextCompositeCommand{\=}{\UTFencname}{\textupsilon}{ῡ}
-\DeclareTextCompositeCommand{\accdialytikavaria}{\UTFencname}{\textupsilon}{ῢ}
-\DeclareTextCompositeCommand{\accdialytikaoxia}{\UTFencname}{\textupsilon}{ΰ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\textrho}{ῤ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textrho}{ῥ}
-\DeclareTextCompositeCommand{\~}{\UTFencname}{\textupsilon}{ῦ}
-\DeclareTextCompositeCommand{\~}{\UTFencname}{υ}{ῦ}
-\DeclareTextCompositeCommand{\accperispomeni}{\UTFencname}{\textupsilon}{ῦ}
-\DeclareTextCompositeCommand{\accdialytikaperispomeni}{\UTFencname}{\textupsilon}{ῧ}
-\DeclareTextCompositeCommand{\u}{\UTFencname}{\textUpsilon}{Ῠ}
-\DeclareTextCompositeCommand{\=}{\UTFencname}{\textUpsilon}{Ῡ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\textUpsilon}{Ὺ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textRho}{Ῥ}
-\DeclareTextCompositeCommand{\accdialytikavaria}{\UTFencname}{\textcompwordmark}{῭}
-\DeclareTextCompositeCommand{\accdialytikaoxia}{\UTFencname}{\textcompwordmark}{΅}
+\DeclareUnicodeComposite{\accpsilivaria} {} {"1FCD} % ῍
+\DeclareUnicodeComposite{\accpsilioxia} {} {"1FCE} % ῎
+\DeclareUnicodeComposite{\accpsiliperispomeni} {} {"1FCF} % ῏
+
+\DeclareUnicodeComposite{\u} {\textiota} {"1FD0} % ῐ
+\DeclareUnicodeComposite{\=} {\textiota} {"1FD1} % ῑ
+\DeclareUnicodeComposite{\accdialytikavaria} {\textiota} {"1FD2} % ῒ
+\DeclareUnicodeComposite{\accdialytikaoxia} {\textiota} {"1FD3} % ΐ
+\DeclareUnicodeComposite{\accperispomeni} {\textiota} {"1FD6} % ῖ
+\DeclareUnicodeComposite{\~} {\textiota} {"1FD6} % ῖ
+\DeclareUnicodeComposite{\~} {ι} {"1FD6} % ῖ
+\DeclareUnicodeComposite{\accdialytikaperispomeni}{\textiota} {"1FD7} % ῗ
+\DeclareUnicodeComposite{\u} {\textIota} {"1FD8} % Ῐ
+\DeclareUnicodeComposite{\=} {\textIota} {"1FD9} % Ῑ
+\DeclareUnicodeComposite{\`} {\textIota} {"1FDA} % Ὶ
+\DeclareUnicodeComposite{\accvaria} {\textIota} {"1FDA} % Ὶ
+\DeclareUnicodeComposite{\accdasiavaria} {} {"1FDD} % ῝
+\DeclareUnicodeComposite{\accdasiaoxia} {} {"1FDE} % ῞
+\DeclareUnicodeComposite{\accdasiaperispomeni} {} {"1FDF} % ῟
+
+\DeclareUnicodeComposite{\u} {\textupsilon}{"1FE0} % ῠ
+\DeclareUnicodeComposite{\=} {\textupsilon}{"1FE1} % ῡ
+\DeclareUnicodeComposite{\accdialytikavaria} {\textupsilon}{"1FE2} % ῢ
+\DeclareUnicodeComposite{\accdialytikaoxia} {\textupsilon}{"1FE3} % ΰ
+\DeclareUnicodeComposite{\accpsili} {\textrho} {"1FE4} % ῤ
+\DeclareUnicodeComposite{\accdasia} {\textrho} {"1FE5} % ῥ
+\DeclareUnicodeComposite{\~} {\textupsilon}{"1FE6} % ῦ
+\DeclareUnicodeComposite{\accperispomeni} {\textupsilon}{"1FE6} % ῦ
+\DeclareUnicodeComposite{\accdialytikaperispomeni}{\textupsilon}{"1FE7} % ῧ
+\DeclareUnicodeComposite{\u} {\textUpsilon}{"1FE8} % Ῠ
+\DeclareUnicodeComposite{\=} {\textUpsilon}{"1FE9} % Ῡ
+\DeclareUnicodeComposite{\`} {\textUpsilon}{"1FEA} % Ὺ
+\DeclareUnicodeComposite{\accvaria} {\textUpsilon}{"1FEA} % Ὺ
+% Ύ
+\DeclareUnicodeComposite{\accdasia} {\textRho} {"1FEC} % Ῥ
+\DeclareUnicodeComposite{\accdialytikavaria} {} {"1FED} % ῭
+\DeclareUnicodeComposite{\accdialytikaoxia} {} {"1FEE} % ΅
+% `
% ῲ
% ῳ
% ῴ
-\DeclareTextCompositeCommand{\~}{\UTFencname}{\textomega}{ῶ}
-\DeclareTextCompositeCommand{\~}{\UTFencname}{ω}{ῶ}
-\DeclareTextCompositeCommand{\accperispomeni}{\UTFencname}{\textomega}{ῶ}
+\DeclareUnicodeComposite{\accperispomeni} {\textomega} {"1FF6} % ῶ
+\DeclareUnicodeComposite{\~} {\textomega} {"1FF6} % ῶ
% ῷ
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\textOmicron}{Ὸ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\textOmega}{Ὼ}
+\DeclareUnicodeComposite{\`} {\textOmicron}{"1FF8} % Ὸ
+\DeclareUnicodeComposite{\accvaria} {\textOmicron}{"1FF8} % Ὸ
+\DeclareUnicodeComposite{\`} {\textOmega} {"1FFA} % Ὼ
+\DeclareUnicodeComposite{\accvaria} {\textOmega} {"1FFA} % Ὼ
% ῼ
-\DeclareTextCompositeCommand{\accoxia}{\UTFencname}{\textcompwordmark}{´}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textcompwordmark}{῾}
+\DeclareUnicodeComposite{\accoxia} {} {"1FFD} % ´
+\DeclareUnicodeComposite{\accdasia} {} {"1FFE} % ῾
+
+
+% Diacritics on literal Unicode characters::
+
+% \DeclareUnicodeComposite{\~}{α}{"1FB6} % ᾶ
+% \DeclareUnicodeComposite{\~}{η}{"1FC6} % ῆ
+% \DeclareUnicodeComposite{\~}{υ}{"1FE6} % ῦ
+% \DeclareUnicodeComposite{\~}{ω}{"1FF6} % ῶ
+
% Letterlike Symbols
% ~~~~~~~~~~~~~~~~~~
% ::
-\DeclareTextCommand{\textohm}{\UTFencname}{Ω} % OHM SIGN
+\DeclareTextSymbol{\textohm}\UnicodeEncodingName{"03A9} % OHM SIGN, use 03A9 Omega
% Ancient Greek Numbers
% ~~~~~~~~~~~~~~~~~~~~~
@@ -482,10 +549,10 @@
%
% ::
-\DeclareTextCommand{\textpentedeka}{\UTFencname}{𐅄} % GREEK ACROPHONIC ATTIC FIFTY
-\DeclareTextCommand{\textpentehekaton}{\UTFencname}{𐅅} % GREEK ACROPHONIC ATTIC FIVE HUNDRED
-\DeclareTextCommand{\textpenteqilioi}{\UTFencname}{𐅆} % GREEK ACROPHONIC ATTIC FIVE THOUSAND
-\DeclareTextCommand{\textpentemuria}{\UTFencname}{𐅇} % GREEK ACROPHONIC ATTIC FIFTY THOUSAND
+\DeclareTextSymbol{\textpentedeka }\UnicodeEncodingName{"10144} % GREEK ACROPHONIC ATTIC FIFTY
+\DeclareTextSymbol{\textpentehekaton}\UnicodeEncodingName{"10145} % GREEK ACROPHONIC ATTIC FIVE HUNDRED
+\DeclareTextSymbol{\textpenteqilioi }\UnicodeEncodingName{"10146} % GREEK ACROPHONIC ATTIC FIVE THOUSAND
+\DeclareTextSymbol{\textpentemuria }\UnicodeEncodingName{"10147} % GREEK ACROPHONIC ATTIC FIFTY THOUSAND
% UPPERCASE
@@ -822,13 +889,13 @@
% ~~~~~~~~
%
% The common Greek font encoding definitions in greek-fontenc.def_ extend the
-% `uclclist` with Greek LICR macros. Here, we add Unicode-specific "hiatus_"
+% `uclclist` with Greek LICR macros. Here, we add Unicode-specific "hiatus_"
% handling (copied from lgrenc.def_ and changed
% Latin transcription to Unicode literals).
-%
+%
% The hiatus definition modifications::
-\DeclareTextCommand{\LGR@A@hiatus}{\UTFencname}{%
+\DeclareTextCommand{\LGR@A@hiatus}{\UnicodeEncodingName}{%
\LGR@ifnextchar{Ι}{\textAlpha\"}{%
\LGR@ifnextchar{Υ}{\textAlpha\"}{%
\LGR@ifnextchar{\textIota}{\textAlpha\"}{%
@@ -837,7 +904,7 @@
}%
}%
}
-\DeclareTextCommand{\LGR@E@hiatus}{\UTFencname}{%
+\DeclareTextCommand{\LGR@E@hiatus}{\UnicodeEncodingName}{%
\LGR@ifnextchar{Ι}{\textEpsilon\"}{%
\LGR@ifnextchar{Υ}{\textEpsilon\"}{%
\LGR@ifnextchar{\textIota}{\textEpsilon\"}{%
@@ -860,6 +927,8 @@
% .. _xgreek: http://ctan.org/pkg/xgreek
% .. _xunicode: http://ctan.org/pkg/xunicode
%
+% .. _latex base: http://ctan.org/pkg/latex-base
+% .. _font encoding: http://ctan.org/pkg/encguide
% .. _LaTeX2e font selection:
% http://mirror.ctan.org/macros/latex/base/fntguide.pdf
% .. _common Greek font encoding definitions:
diff --git a/language/greek/greek-fontenc/tuenc-greek.def.html b/language/greek/greek-fontenc/tuenc-greek.def.html
index d34d5cda23..f621c681c4 100644
--- a/language/greek/greek-fontenc/tuenc-greek.def.html
+++ b/language/greek/greek-fontenc/tuenc-greek.def.html
@@ -620,13 +620,14 @@ version 1.3 of this license or any later version.</p>
</dd>
<dt class="identification">Identification</dt>
<dd class="identification"><pre class="literal-block">\ProvidesFile{tuenc-greek.def}
-[2020/09/25 1.0 Greek LICRs for XeTeX and LuaTeX]</pre>
+[2020/10/13 2.0 Greek LICRs for XeTeX and LuaTeX]</pre>
</dd>
</dl>
<div class="abstract topic">
<p class="topic-title">Abstract</p>
-<p>Experimental support for Greek LICR macros with XeTeX and LuaTeX.
-Extends <a href="#id14"><span class="problematic" id="id15">tuenc_</span></a>. Used by <a class="reference external" href="http://ctan.org/pkg/babel-greek">babel-greek</a> and <a class="reference external" href="textalpha.sty.html">textalpha</a>.</p>
+<p>Support for Greek LICR macros and upcasing of text
+with XeTeX and LuaTeX. Extends <a class="reference internal" href="#tuenc-def">tuenc.def</a>.
+Used by <a class="reference external" href="http://ctan.org/pkg/babel-greek">babel-greek</a> and <a class="reference external" href="textalpha.sty.html">textalpha</a>.</p>
</div>
<dl>
<dt><strong>History</strong>:</dt>
@@ -696,8 +697,28 @@ fix upcasing of <span class="docutils literal">\finalsigma</span>.</p></td>
<td><p>Rename to <span class="docutils literal"><span class="pre">tuenc-greek.def</span></span>. Use <span class="docutils literal">\UTFencname</span>.</p></td>
</tr>
<tr><td><p>1.0</p></td>
-<td><p>2020/09/25</p></td>
-<td><p><span class="docutils literal">\textKoppa</span> as alias for <span class="docutils literal">\textkoppa</span> in LGR.</p></td>
+<td><p>2020-09-25</p></td>
+<td><p>New package version. No changes in this file.</p></td>
+</tr>
+<tr><td><p>2.0</p></td>
+<td><p>2020-10-13</p></td>
+<td><p>Move common alias definitions to <span class="docutils literal"><span class="pre">greek-fontenc.def</span></span>.</p></td>
+</tr>
+<tr><td><!-- -->
+</td>
+<td></td>
+<td><p>New compatiblity definitions.</p></td>
+</tr>
+<tr><td><!-- -->
+</td>
+<td></td>
+<td><p>Use <span class="docutils literal">\UnicodeEncodingName</span> instead of <span class="docutils literal">\UTFencname</span>.</p></td>
+</tr>
+<tr><td><!-- -->
+</td>
+<td></td>
+<td><p>Make the file encoding-independent (required for input
+in other encodings with <cite>luainputenc</cite>).</p></td>
</tr>
</tbody>
</table>
@@ -712,24 +733,26 @@ fix upcasing of <span class="docutils literal">\finalsigma</span>.</p></td>
<li><p><a class="reference internal" href="#common-definitions" id="id4">Common Definitions</a></p></li>
<li><p><a class="reference internal" href="#character-definitions" id="id5">Character Definitions</a></p>
<ul>
-<li><p><a class="reference internal" href="#general-punctuation" id="id6">General Punctuation</a></p></li>
-<li><p><a class="reference internal" href="#greek-and-coptic" id="id7">Greek and Coptic</a></p></li>
-<li><p><a class="reference internal" href="#greek-extended" id="id8">Greek Extended</a></p></li>
-<li><p><a class="reference internal" href="#letterlike-symbols" id="id9">Letterlike Symbols</a></p></li>
-<li><p><a class="reference internal" href="#ancient-greek-numbers" id="id10">Ancient Greek Numbers</a></p></li>
+<li><p><a class="reference internal" href="#basic-latin" id="id6">Basic Latin</a></p></li>
+<li><p><a class="reference internal" href="#latin-1-supplement" id="id7">Latin 1 Supplement</a></p></li>
+<li><p><a class="reference internal" href="#ipa-extensions" id="id8">IPA Extensions</a></p></li>
+<li><p><a class="reference internal" href="#greek-and-coptic" id="id9">Greek and Coptic</a></p></li>
+<li><p><a class="reference internal" href="#greek-extended" id="id10">Greek Extended</a></p></li>
+<li><p><a class="reference internal" href="#letterlike-symbols" id="id11">Letterlike Symbols</a></p></li>
+<li><p><a class="reference internal" href="#ancient-greek-numbers" id="id12">Ancient Greek Numbers</a></p></li>
</ul>
</li>
-<li><p><a class="reference internal" href="#uppercase" id="id11">UPPERCASE</a></p>
+<li><p><a class="reference internal" href="#uppercase" id="id13">UPPERCASE</a></p>
<ul>
-<li><p><a class="reference internal" href="#uc-lc-values" id="id12">uc/lc values</a></p></li>
-<li><p><a class="reference internal" href="#uclclist" id="id13">uclclist</a></p></li>
+<li><p><a class="reference internal" href="#uc-lc-values" id="id14">uc/lc values</a></p></li>
+<li><p><a class="reference internal" href="#uclclist" id="id15">uclclist</a></p></li>
</ul>
</li>
</ul>
</div>
<section id="motivation">
<h2><a class="toc-backref" href="#id1">Motivation</a></h2>
-<p>LICR macro definitions for the Greek script are missing in <a href="#id16"><span class="problematic" id="id17">tuenc_</span></a> (as well
+<p>LICR macro definitions for the Greek script are missing in <a class="reference internal" href="#tuenc-def">tuenc.def</a> (as well
as the predecessors <a class="reference external" href="http://ctan.org/pkg/xunicode">xunicode</a>, <a class="reference external" href="http://ctan.org/pkg/euenc">euenc</a>).</p>
<p>This file defines <cite>LaTeX Internal Character Representaction</cite> (LICR) macros
for Greek letters and symbols. It works independed of <a class="reference external" href="http://ctan.org/pkg/xunicode">xunicode</a> using the
@@ -737,8 +760,10 @@ standard commands for <a class="reference external" href="http://mirror.ctan.org
</section>
<section id="requirements">
<h2><a class="toc-backref" href="#id2">Requirements</a></h2>
-<p>Requires XeTeX or LuaTeX, <a class="reference external" href="http://ctan.org/pkg/fontspec">fontspec</a>, and a font with Greek characters.</p>
-<p>See <a class="reference external" href="tuenc-greek-doc.tex">tuenc-greek-doc.tex</a> and <a class="reference external" href="tuenc-greek-doc.pdf">tuenc-greek-doc.pdf</a> for setup and
+<p>Requires XeTeX or LuaTeX (usually with <a class="reference external" href="http://ctan.org/pkg/fontspec">fontspec</a>), the <a class="reference external" href="http://ctan.org/pkg/latex-base">LaTeX base</a>
+file <span class="target" id="tuenc-def">tuenc.def</span> that sets up the <a class="reference external" href="http://ctan.org/pkg/encguide">font encoding</a> TU, and a font with
+Greek characters.</p>
+<p>See <a class="reference external" href="test-tuenc-greek.tex">test-tuenc-greek.tex</a> and <a class="reference external" href="test-tuenc-greek.pdf">test-tuenc-greek.pdf</a> for setup and
usage examples.</p>
</section>
<section id="greek-diacritics">
@@ -751,395 +776,436 @@ to-LaTeX converters to ensure working also inside the tabbing environment.</p></
conventions and in the definition of composite commands.</p></li>
</ul>
<p>Greek alias names for standard accents:</p>
-<pre class="literal-block">\DeclareTextCommand{\acctonos}{\UTFencname}{\&#64;tabacckludge'}
-\DeclareTextCommand{\accvaria}{\UTFencname}{\&#64;tabacckludge`}
-\DeclareTextCommand{\accdialytika}{\UTFencname}{\&#64;tabacckludge&quot;}</pre>
+<pre class="literal-block">\DeclareUnicodeAccent{\accvaria} \UnicodeEncodingName{&quot;0300}
+\DeclareUnicodeAccent{\acctonos} \UnicodeEncodingName{&quot;0301}
+\DeclareUnicodeAccent{\accdialytika}\UnicodeEncodingName{&quot;0308}</pre>
<p>The combining perispomeni character is normalized with Greek base letters,
while the (standard) combining tilde is not:</p>
-<pre class="literal-block">\DeclareTextCommand{\accperispomeni}{\UTFencname}[1]{#1\char&quot;0342 }</pre>
+<pre class="literal-block">\DeclareUnicodeAccent{\accperispomeni}\UnicodeEncodingName{&quot;0342} % COMBINING GREEK PERISPOMENI</pre>
<p>Breathings:</p>
-<p>(The COMBINING GREEK KORONIS is a legacy character, discarded in favour of
-COMBINING COMMA ABOVE)</p>
-<pre class="literal-block">\DeclareTextCommand{\accpsili}{\UTFencname}[1]{#1\char&quot;0313 } % ψιλή spiritus lenis (smooth breathing)
-\DeclareTextCommand{\accdasia}{\UTFencname}[1]{#1\char&quot;0314 } % δασεῖα spiritus asper (rough breathing)</pre>
-<p>Sub-iota:</p>
-<p><span class="docutils literal">\ypogegrammeni</span> is a postfix accent (ligature in LGR)</p>
-<pre class="literal-block">\DeclareTextSymbol{\ypogegrammeni}{\UTFencname}{0837} % COMBINING GREEK YPOGEGRAMMENI</pre>
+<p><span class="docutils literal">\accpsili = \acckoronis</span> but the COMBINING GREEK KORONIS is a legacy
+character, discarded in favour of COMBINING COMMA ABOVE.</p>
+<pre class="literal-block">\DeclareUnicodeAccent{\accpsili}\UnicodeEncodingName{&quot;0313} % ψιλή spiritus lenis (smooth breathing)
+\DeclareUnicodeAccent{\accdasia}\UnicodeEncodingName{&quot;0314} % δασεῖα spiritus asper (rough breathing)</pre>
+<p>Sub-iotas:</p>
+<p><span class="docutils literal">\prosgegrammeni</span> is a standard character (see below).
+<span class="docutils literal">\ypogegrammeni</span> is a postfix accent (ligature in LGR)</p>
+<pre class="literal-block">\DeclareTextSymbol{\ypogegrammeni}{\UnicodeEncodingName}{0837} % COMBINING GREEK YPOGEGRAMMENI</pre>
<p>Combined diacritics:</p>
+<p><span class="docutils literal">\DeclareUnicodeAccent</span> does not work with more than one argument:</p>
<pre class="literal-block">% The COMBINING DIALYTIKA TONOS is discarded and not well supported by fonts:
-\DeclareTextCommand{\accdialytikatonos}{\UTFencname}[1]{#1\char&quot;0308 \char&quot;0301 }
-\DeclareTextCommand{\accdialytikavaria}{\UTFencname}[1]{#1\char&quot;0308 \char&quot;0300 }
-\DeclareTextCommand{\accdialytikaperispomeni}{\UTFencname}[1]{#1\char&quot;0342 \char&quot;0308 }
+\DeclareTextCommand{\accdialytikatonos}{\UnicodeEncodingName}[1]{#1\char&quot;0308\char&quot;0301}
+\DeclareTextCommand{\accdialytikavaria}{\UnicodeEncodingName}[1]{#1\char&quot;0308\char&quot;0300}
+\DeclareTextCommand{\accdialytikaperispomeni}{\UnicodeEncodingName}[1]{#1\char&quot;0342\char&quot;0308}
-\DeclareTextCommand{\accdasiaoxia}{\UTFencname}[1]{#1\char&quot;0314 \char&quot;0301 }
-\DeclareTextCommand{\accdasiavaria}{\UTFencname}[1]{#1\char&quot;0314 \char&quot;0300 }
-\DeclareTextCommand{\accdasiaperispomeni}{\UTFencname}[1]{#1\char&quot;0314 \char&quot;0342 }
+\DeclareTextCommand{\accdasiaoxia}{\UnicodeEncodingName}[1]{#1\char&quot;0314\char&quot;0301}
+\DeclareTextCommand{\accdasiavaria}{\UnicodeEncodingName}[1]{#1\char&quot;0314\char&quot;0300}
+\DeclareTextCommand{\accdasiaperispomeni}{\UnicodeEncodingName}[1]{#1\char&quot;0314\char&quot;0342}
-\DeclareTextCommand{\accpsilioxia}{\UTFencname}[1]{#1\char&quot;0301 \char&quot;0313 }
-\DeclareTextCommand{\accpsilivaria}{\UTFencname}[1]{#1\char&quot;0300 \char&quot;0313 }
-\DeclareTextCommand{\accpsiliperispomeni}{\UTFencname}[1]{#1\char&quot;0342 \char&quot;0313 }</pre>
+\DeclareTextCommand{\accpsilioxia}{\UnicodeEncodingName}[1]{#1\char&quot;0301\char&quot;0313}
+\DeclareTextCommand{\accpsilivaria}{\UnicodeEncodingName}[1]{#1\char&quot;0300\char&quot;0313}
+\DeclareTextCommand{\accpsiliperispomeni}{\UnicodeEncodingName}[1]{#1\char&quot;0342\char&quot;0313}</pre>
</section>
<section id="common-definitions">
<h2><a class="toc-backref" href="#id4">Common Definitions</a></h2>
<p>Use the <a class="reference external" href="greek-fontenc.def.html">common Greek font encoding definitions</a>:</p>
-<pre class="literal-block">\renewcommand*{\LastDeclaredEncoding}{\UTFencname}
+<pre class="literal-block">\renewcommand*{\LastDeclaredEncoding}{\UnicodeEncodingName}
\input{greek-fontenc.def}</pre>
</section>
<section id="character-definitions">
<h2><a class="toc-backref" href="#id5">Character Definitions</a></h2>
-<section id="general-punctuation">
-<h3><a class="toc-backref" href="#id6">General Punctuation</a></h3>
-<p>Ligature break up with ZERO WIDTH NON-JOINER:</p>
-<pre class="literal-block">\DeclareTextCommand{\textcompwordmark}{\UTFencname}{\char&quot;200C}</pre>
+<section id="basic-latin">
+<h3><a class="toc-backref" href="#id6">Basic Latin</a></h3>
+<p>Compatibility def with LGR:</p>
+<pre class="literal-block">\DeclareTextSymbol{\textsemicolon}\UnicodeEncodingName{&quot;003B} % ;</pre>
+</section>
+<section id="latin-1-supplement">
+<h3><a class="toc-backref" href="#id7">Latin 1 Supplement</a></h3>
+<p>Distinguish MICRO SIGN from letter mu:</p>
+<pre class="literal-block">\DeclareTextSymbol{\textmicro}\UnicodeEncodingName{&quot;00B5} % µ MICRO SIGN</pre>
+</section>
+<section id="ipa-extensions">
+<h3><a class="toc-backref" href="#id8">IPA Extensions</a></h3>
+<pre class="literal-block">\DeclareTextSymbol{\textschwa}\UnicodeEncodingName{&quot;0259} % ə</pre>
</section>
<section id="greek-and-coptic">
-<h3><a class="toc-backref" href="#id7">Greek and Coptic</a></h3>
-<pre class="literal-block">% NR Unicode Name % babel name, % PU name
-% 0370 GREEK CAPITAL LETTER HETA % Ͱ
-% 0371 GREEK SMALL LETTER HETA % ͱ
-% 0372 GREEK CAPITAL LETTER ARCHAIC SAMPI % Ͳ
-% 0373 GREEK SMALL LETTER ARCHAIC SAMPI % ͳ
-\DeclareTextCommand{\textdexiakeraia}{\UTFencname}{ʹ} % \anwtonos, \textnumeralsigngreek
-\DeclareTextCommand{\textaristerikeraia}{\UTFencname}{͵} % \katwtonos, \textnumeralsignlowergreek
-% 0376 GREEK CAPITAL LETTER PAMPHYLIAN DIGAMMA % Ͷ
-% 0377 GREEK SMALL LETTER PAMPHYLIAN DIGAMMA % ͷ
-
-% 037A GREEK YPOGEGRAMMENI (use \textcompwordmark\ypogegrammeni) % ͺ
+<h3><a class="toc-backref" href="#id9">Greek and Coptic</a></h3>
+<pre class="literal-block">% NR Unicode Name % babel name, % PU name
+% 0370 GREEK CAPITAL LETTER HETA % Ͱ
+% 0371 GREEK SMALL LETTER HETA % ͱ
+% 0372 GREEK CAPITAL LETTER ARCHAIC SAMPI % Ͳ
+% 0373 GREEK SMALL LETTER ARCHAIC SAMPI % ͳ
+\DeclareTextSymbol{\textdexiakeraia}\UnicodeEncodingName{&quot;0374} % ʹ \anwtonos, \textnumeralsigngreek
+\DeclareTextSymbol{\textaristerikeraia}\UnicodeEncodingName{&quot;0375} % ͵\katwtonos, \textnumeralsignlowergreek
+% 0376 GREEK CAPITAL LETTER PAMPHYLIAN DIGAMMA % Ͷ
+% 0377 GREEK SMALL LETTER PAMPHYLIAN DIGAMMA % ͷ
+
+% \DeclareTextCompositeCommand{\&#64;emty}\UnicodeEncodingName{\ypogegrammeni}{ͺ} % 037A GREEK YPOGEGRAMMENI
+% \DeclareTextCompositeCommand{\textcompwordmark}\UnicodeEncodingName{\ypogegrammeni}{ͺ} % 037A GREEK YPOGEGRAMMENI
% 037B GREEK SMALL REVERSED LUNATE SIGMA SYMBOL
% 037C GREEK SMALL DOTTED LUNATE SIGMA SYMBOL
% 037D GREEK SMALL REVERSED DOTTED LUNATE SIGMA SYMBOL
-\DeclareTextCommand{\texterotimatiko}{\UTFencname}{;} % 037E GREEK QUESTION MARK
-
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\textcompwordmark}{΄}
-\DeclareTextCompositeCommand{\accdialytikatonos}{\UTFencname}{\textcompwordmark}{΅}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\textAlpha}{Ά}
-\DeclareTextCommand{\textanoteleia}{\UTFencname}{·} % \anoteleia
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\textEpsilon}{Έ}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\textEta}{Ή}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\textIota}{Ί}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\textOmicron}{Ό}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\textUpsilon}{Ύ}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\textOmega}{Ώ}
-\DeclareTextCompositeCommand{\accdialytikatonos}{\UTFencname}{\textiota}{ΐ}
-
-\DeclareTextCommand{\textAlpha}{\UTFencname}{Α}
-\DeclareTextCommand{\textBeta}{\UTFencname}{Β}
-\DeclareTextCommand{\textGamma}{\UTFencname}{Γ}
-\DeclareTextCommand{\textDelta}{\UTFencname}{Δ}
-\DeclareTextCommand{\textEpsilon}{\UTFencname}{Ε}
-\DeclareTextCommand{\textZeta}{\UTFencname}{Ζ}
-\DeclareTextCommand{\textEta}{\UTFencname}{Η}
-\DeclareTextCommand{\textTheta}{\UTFencname}{Θ}
-\DeclareTextCommand{\textIota}{\UTFencname}{Ι}
-\DeclareTextCommand{\textKappa}{\UTFencname}{Κ}
-\DeclareTextCommand{\textLambda}{\UTFencname}{Λ}
-\DeclareTextCommand{\textMu}{\UTFencname}{Μ}
-\DeclareTextCommand{\textNu}{\UTFencname}{Ν}
-\DeclareTextCommand{\textXi}{\UTFencname}{Ξ}
-\DeclareTextCommand{\textOmicron}{\UTFencname}{Ο}
-\DeclareTextCommand{\textPi}{\UTFencname}{Π}
-\DeclareTextCommand{\textRho}{\UTFencname}{Ρ}
-\DeclareTextCommand{\textSigma}{\UTFencname}{Σ}
-\DeclareTextCommand{\textTau}{\UTFencname}{Τ}
-\DeclareTextCommand{\textUpsilon}{\UTFencname}{Υ}
-\DeclareTextCommand{\textPhi}{\UTFencname}{Φ}
-\DeclareTextCommand{\textChi}{\UTFencname}{Χ}
-\DeclareTextCommand{\textPsi}{\UTFencname}{Ψ}
-\DeclareTextCommand{\textOmega}{\UTFencname}{Ω}
-
-\DeclareTextCompositeCommand{\&quot;}{\UTFencname}{\textIota}{Ϊ}
-\DeclareTextCompositeCommand{\&quot;}{\UTFencname}{\textUpsilon}{Ϋ}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\textalpha}{ά}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\textepsilon}{έ}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\texteta}{ή}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\textiota}{ί}
-\DeclareTextCompositeCommand{\accdialytikatonos}{\UTFencname}{\textupsilon}{ΰ}
-
-\DeclareTextCommand{\textalpha}{\UTFencname}{α}
-\DeclareTextCommand{\textbeta}{\UTFencname}{β}
-\DeclareTextCommand{\textgamma}{\UTFencname}{γ}
-\DeclareTextCommand{\textdelta}{\UTFencname}{δ}
-\DeclareTextCommand{\textepsilon}{\UTFencname}{ε}
-\DeclareTextCommand{\textvarepsilon}{\UTFencname}{ε} % cf. $\varepsiolon$
-\DeclareTextCommand{\textzeta}{\UTFencname}{ζ}
-\DeclareTextCommand{\texteta}{\UTFencname}{η}
-\DeclareTextCommand{\texttheta}{\UTFencname}{θ}
-\DeclareTextCommand{\textiota}{\UTFencname}{ι}
-\DeclareTextCommand{\textkappa}{\UTFencname}{κ}
-\DeclareTextCommand{\textlambda}{\UTFencname}{λ}
-\DeclareTextCommand{\textmu}{\UTFencname}{μ} % \textmugreek
-\DeclareTextCommand{\textnu}{\UTFencname}{ν}
-\DeclareTextCommand{\textxi}{\UTFencname}{ξ}
-\DeclareTextCommand{\textomicron}{\UTFencname}{ο}
-\DeclareTextCommand{\textpi}{\UTFencname}{π}
-\DeclareTextCommand{\textrho}{\UTFencname}{ρ}
-\DeclareTextCommand{\textvarsigma}{\UTFencname}{ς} % final sigma
-\DeclareTextCommand{\textfinalsigma}{\UTFencname}{\textvarsigma}
-\DeclareTextCommand{\textsigma}{\UTFencname}{σ}
-% Dummy definition (\textautosigma is lowercase of \textSigma):
-\ProvideTextCommand{\textautosigma}{\UTFencname}{\textsigma}
-\DeclareTextCommand{\texttau}{\UTFencname}{τ}
-\DeclareTextCommand{\textupsilon}{\UTFencname}{υ}
-\DeclareTextCommand{\textphi}{\UTFencname}{φ}
-\DeclareTextCommand{\textvarphi}{\UTFencname}{φ} % cf. $\varphi$
-\DeclareTextCommand{\textchi}{\UTFencname}{χ}
-\DeclareTextCommand{\textpsi}{\UTFencname}{ψ}
-\DeclareTextCommand{\textomega}{\UTFencname}{ω}
-
-\DeclareTextCompositeCommand{\&quot;}{\UTFencname}{\textiota}{ϊ}
-\DeclareTextCompositeCommand{\&quot;}{\UTFencname}{\textupsilon}{ϋ}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\textomicron}{ό}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\textupsilon}{ύ}
-\DeclareTextCompositeCommand{\'}{\UTFencname}{\textomega}{ώ}
-
-\DeclareTextCommand{\textQoppa}{\UTFencname}{Ϙ}
-\DeclareTextCommand{\textqoppa}{\UTFencname}{ϙ}
-\DeclareTextCommand{\textStigma}{\UTFencname}{Ϛ}
-\DeclareTextCommand{\textstigma}{\UTFencname}{ϛ}
-\DeclareTextCommand{\textDigamma}{\UTFencname}{Ϝ}
-\DeclareTextCommand{\textdigamma}{\UTFencname}{ϝ}
-\DeclareTextCommand{\textKoppa}{\UTFencname}{Ϟ} % in LGR identic to \textkoppa
-\DeclareTextCommand{\textkoppa}{\UTFencname}{ϟ} % \koppa, \textqoppa [sic!]
-\DeclareTextCommand{\textSampi}{\UTFencname}{Ϡ}
-\DeclareTextCommand{\textsampi}{\UTFencname}{ϡ}
-
-% Symbol variants
-\DeclareTextCommand{\textbetasymbol}{\UTFencname}{ϐ}
-\DeclareTextCommand{\textkappasymbol}{\UTFencname}{ϰ}
-\DeclareTextCommand{\textThetasymbol}{\UTFencname}{ϴ}
-\DeclareTextCommand{\textthetasymbol}{\UTFencname}{ϑ}
-\DeclareTextCommand{\textphisymbol}{\UTFencname}{ϕ}
-\DeclareTextCommand{\textpisymbol}{\UTFencname}{ϖ}
-\DeclareTextCommand{\textrhosymbol}{\UTFencname}{ϱ}
-\DeclareTextCommand{\textepsilonsymbol}{\UTFencname}{ϵ}
-% math compatibility aliases
-% $\varphi$ and $\varepsilon$ refer to the letter characters (see above)!
-\DeclareTextCommand{\textvarbeta}{\UTFencname}{\textbetasymbol}
-\DeclareTextCommand{\textvarkappa}{\UTFencname}{ϰ}
-\DeclareTextCommand{\textvarTheta}{\UTFencname}{ϴ}
-\DeclareTextCommand{\textvartheta}{\UTFencname}{ϑ}
-\DeclareTextCommand{\textvarpi}{\UTFencname}{ϖ}
-\DeclareTextCommand{\textvarrho}{\UTFencname}{ϱ}</pre>
+\DeclareTextSymbol{\texterotimatiko}\UnicodeEncodingName{&quot;003B} % use SEMICOLON, not 037E GREEK QUESTION MARK
+
+\DeclareUnicodeComposite{\acctonos} {} {&quot;0384} % ΄ GREEK TONOS
+\DeclareUnicodeComposite{\accdialytikatonos}{} {&quot;0385} % ΅ GREEK DIALYTIKA TONOS
+\DeclareUnicodeComposite{\'} {\textAlpha} {&quot;0386} % Ά
+\DeclareTextSymbol{\textanoteleia} \UnicodeEncodingName{&quot;00B7} % use MIDDLE DOT, not 0387 GREEK ANO TELEIA
+\DeclareUnicodeComposite{\'} {\textEpsilon}{&quot;0388} % Έ
+\DeclareUnicodeComposite{\'} {\textEta} {&quot;0389} % Ή
+\DeclareUnicodeComposite{\'} {\textIota} {&quot;038A} % Ί
+\DeclareUnicodeComposite{\'} {\textOmicron}{&quot;038C} % Ό
+\DeclareUnicodeComposite{\'} {\textUpsilon}{&quot;038E} % Ύ
+\DeclareUnicodeComposite{\'} {\textOmega} {&quot;038F} % Ώ
+% repeat with named accents (LuaTeX does not normalize to pre-composed chars):
+\DeclareUnicodeComposite{\acctonos} {\textAlpha} {&quot;0386} % Ά
+\DeclareUnicodeComposite{\acctonos} {\textEpsilon}{&quot;0388} % Έ
+\DeclareUnicodeComposite{\acctonos} {\textEta} {&quot;0389} % Ή
+\DeclareUnicodeComposite{\acctonos} {\textIota} {&quot;038A} % Ί
+\DeclareUnicodeComposite{\acctonos} {\textOmicron}{&quot;038C} % Ό
+\DeclareUnicodeComposite{\acctonos} {\textUpsilon}{&quot;038E} % Ύ
+\DeclareUnicodeComposite{\acctonos} {\textOmega} {&quot;038F} % Ώ
+\DeclareUnicodeComposite{\accdialytikatonos}{\textiota} {&quot;0390} % ΐ
+
+\DeclareTextSymbol{\textAlpha }\UnicodeEncodingName{&quot;0391} % Α
+\DeclareTextSymbol{\textBeta }\UnicodeEncodingName{&quot;0392} % Β
+\DeclareTextSymbol{\textGamma }\UnicodeEncodingName{&quot;0393} % Γ
+\DeclareTextSymbol{\textDelta }\UnicodeEncodingName{&quot;0394} % Δ
+\DeclareTextSymbol{\textEpsilon}\UnicodeEncodingName{&quot;0395} % Ε
+\DeclareTextSymbol{\textZeta }\UnicodeEncodingName{&quot;0396} % Ζ
+\DeclareTextSymbol{\textEta }\UnicodeEncodingName{&quot;0397} % Η
+\DeclareTextSymbol{\textTheta }\UnicodeEncodingName{&quot;0398} % Θ
+\DeclareTextSymbol{\textIota }\UnicodeEncodingName{&quot;0399} % Ι
+\DeclareTextSymbol{\textKappa }\UnicodeEncodingName{&quot;039A} % Κ
+\DeclareTextSymbol{\textLambda }\UnicodeEncodingName{&quot;039B} % Λ
+\DeclareTextSymbol{\textMu }\UnicodeEncodingName{&quot;039C} % Μ
+\DeclareTextSymbol{\textNu }\UnicodeEncodingName{&quot;039D} % Ν
+\DeclareTextSymbol{\textXi }\UnicodeEncodingName{&quot;039E} % Ξ
+\DeclareTextSymbol{\textOmicron}\UnicodeEncodingName{&quot;039F} % Ο
+\DeclareTextSymbol{\textPi }\UnicodeEncodingName{&quot;03A0} % Π
+\DeclareTextSymbol{\textRho }\UnicodeEncodingName{&quot;03A1} % Ρ
+\DeclareTextSymbol{\textSigma }\UnicodeEncodingName{&quot;03A3} % Σ
+\DeclareTextSymbol{\textTau }\UnicodeEncodingName{&quot;03A4} % Τ
+\DeclareTextSymbol{\textUpsilon}\UnicodeEncodingName{&quot;03A5} % Υ
+\DeclareTextSymbol{\textPhi }\UnicodeEncodingName{&quot;03A6} % Φ
+\DeclareTextSymbol{\textChi }\UnicodeEncodingName{&quot;03A7} % Χ
+\DeclareTextSymbol{\textPsi }\UnicodeEncodingName{&quot;03A8} % Ψ
+\DeclareTextSymbol{\textOmega }\UnicodeEncodingName{&quot;03A9} % Ω
+
+\DeclareUnicodeComposite{\&quot;} {\textIota} {&quot;03AA} % Ϊ
+\DeclareUnicodeComposite{\&quot;} {\textIota} {&quot;03AA} % Ϊ
+\DeclareUnicodeComposite{\&quot;} {\textUpsilon}{&quot;03AB} % Ϋ
+\DeclareUnicodeComposite{\'} {\textalpha} {&quot;03AC} % ά
+\DeclareUnicodeComposite{\'} {\textepsilon}{&quot;03AD} % έ
+\DeclareUnicodeComposite{\'} {\texteta} {&quot;03AE} % ή
+\DeclareUnicodeComposite{\'} {\textiota} {&quot;03AF} % ί
+% repeat with named accents (LuaTeX does not normalize to pre-composed chars):
+\DeclareUnicodeComposite{\accdialytika} {\textIota} {&quot;03AA} % Ϊ
+\DeclareUnicodeComposite{\accdialytika} {\textIota} {&quot;03AA} % Ϊ
+\DeclareUnicodeComposite{\accdialytika} {\textUpsilon}{&quot;03AB} % Ϋ
+\DeclareUnicodeComposite{\acctonos} {\textalpha} {&quot;03AC} % ά
+\DeclareUnicodeComposite{\acctonos} {\textepsilon}{&quot;03AD} % έ
+\DeclareUnicodeComposite{\acctonos} {\texteta} {&quot;03AE} % ή
+\DeclareUnicodeComposite{\acctonos} {\textiota} {&quot;03AF} % ί
+\DeclareUnicodeComposite{\accdialytikatonos}{\textupsilon}{&quot;03B0} % ΰ
+
+\DeclareTextSymbol{\textalpha }\UnicodeEncodingName{&quot;03B1} % α
+\DeclareTextSymbol{\textbeta }\UnicodeEncodingName{&quot;03B2} % β
+\DeclareTextSymbol{\textgamma }\UnicodeEncodingName{&quot;03B3} % γ
+\DeclareTextSymbol{\textdelta }\UnicodeEncodingName{&quot;03B4} % δ
+\DeclareTextSymbol{\textepsilon }\UnicodeEncodingName{&quot;03B5} % ε
+\DeclareTextSymbol{\textzeta }\UnicodeEncodingName{&quot;03B6} % ζ
+\DeclareTextSymbol{\texteta }\UnicodeEncodingName{&quot;03B7} % η
+\DeclareTextSymbol{\texttheta }\UnicodeEncodingName{&quot;03B8} % θ
+\DeclareTextSymbol{\textiota }\UnicodeEncodingName{&quot;03B9} % ι
+\DeclareTextSymbol{\textkappa }\UnicodeEncodingName{&quot;03BA} % κ
+\DeclareTextSymbol{\textlambda }\UnicodeEncodingName{&quot;03BB} % λ
+\DeclareTextSymbol{\textmu }\UnicodeEncodingName{&quot;03BC} % μ % \textmugreek
+\DeclareTextSymbol{\textnu }\UnicodeEncodingName{&quot;03BD} % ν
+\DeclareTextSymbol{\textxi }\UnicodeEncodingName{&quot;03BE} % ξ
+\DeclareTextSymbol{\textomicron }\UnicodeEncodingName{&quot;03BF} % ο
+\DeclareTextSymbol{\textpi }\UnicodeEncodingName{&quot;03C0} % π
+\DeclareTextSymbol{\textrho }\UnicodeEncodingName{&quot;03C1} % ρ
+\DeclareTextSymbol{\textfinalsigma}\UnicodeEncodingName{&quot;03C2} % ς % final sigma
+\DeclareTextSymbol{\textsigma }\UnicodeEncodingName{&quot;03C3} % σ
+\DeclareTextSymbol{\texttau }\UnicodeEncodingName{&quot;03C4} % τ
+\DeclareTextSymbol{\textupsilon }\UnicodeEncodingName{&quot;03C5} % υ
+\DeclareTextSymbol{\textphi }\UnicodeEncodingName{&quot;03C6} % φ
+\DeclareTextSymbol{\textchi }\UnicodeEncodingName{&quot;03C7} % χ
+\DeclareTextSymbol{\textpsi }\UnicodeEncodingName{&quot;03C8} % ψ
+\DeclareTextSymbol{\textomega }\UnicodeEncodingName{&quot;03C9} % ω
+
+\DeclareUnicodeComposite{\&quot;}{\textiota}{&quot;03CA} % ϊ
+\DeclareUnicodeComposite{\&quot;}{\textupsilon}{&quot;03CB} % ϋ
+\DeclareUnicodeComposite{\'}{\textomicron}{&quot;03CC} % ό
+\DeclareUnicodeComposite{\'}{\textupsilon}{&quot;03CD} % ύ
+\DeclareUnicodeComposite{\'}{\textomega}{&quot;03CE} % ώ
+\DeclareUnicodeComposite{\accdialytika}{\textiota}{&quot;03CA} % ϊ
+\DeclareUnicodeComposite{\accdialytika}{\textupsilon}{&quot;03CB} % ϋ
+\DeclareUnicodeComposite{\acctonos}{\textomicron}{&quot;03CC} % ό
+\DeclareUnicodeComposite{\acctonos}{\textupsilon}{&quot;03CD} % ύ
+\DeclareUnicodeComposite{\acctonos}{\textomega}{&quot;03CE} % ώ</pre>
+<p>Archaic letters (still used in Greek numerals):</p>
+<pre class="literal-block">\DeclareTextSymbol{\textQoppa }\UnicodeEncodingName{&quot;03D8} % Ϙ
+\DeclareTextSymbol{\textqoppa }\UnicodeEncodingName{&quot;03D9} % ϙ
+\DeclareTextSymbol{\textStigma }\UnicodeEncodingName{&quot;03DA} % Ϛ
+\DeclareTextSymbol{\textstigma }\UnicodeEncodingName{&quot;03DB} % ϛ
+\DeclareTextSymbol{\textDigamma }\UnicodeEncodingName{&quot;03DC} % Ϝ
+\DeclareTextSymbol{\textdigamma }\UnicodeEncodingName{&quot;03DD} % ϝ
+\DeclareTextSymbol{\textKoppa }\UnicodeEncodingName{&quot;03DE} % Ϟ in LGR identic to \textkoppa
+\DeclareTextSymbol{\textkoppa }\UnicodeEncodingName{&quot;03DF} % ϟ \koppa, \textqoppa [sic!]
+\DeclareTextSymbol{\textSampi }\UnicodeEncodingName{&quot;03E0} % Ϡ
+\DeclareTextSymbol{\textsampi }\UnicodeEncodingName{&quot;03E1} % ϡ</pre>
+<p>Symbol variants:</p>
+<pre class="literal-block">\DeclareTextSymbol{\textbetasymbol }\UnicodeEncodingName{&quot;03D0} % ϐ
+\DeclareTextSymbol{\textkappasymbol }\UnicodeEncodingName{&quot;03F0} % ϰ
+\DeclareTextSymbol{\textThetasymbol }\UnicodeEncodingName{&quot;03F4} % ϴ
+\DeclareTextSymbol{\textthetasymbol }\UnicodeEncodingName{&quot;03D1} % ϑ
+\DeclareTextSymbol{\textphisymbol }\UnicodeEncodingName{&quot;03D5} % ϕ
+\DeclareTextSymbol{\textpisymbol }\UnicodeEncodingName{&quot;03D6} % ϖ
+\DeclareTextSymbol{\textrhosymbol }\UnicodeEncodingName{&quot;03F1} % ϱ
+\DeclareTextSymbol{\textepsilonsymbol}\UnicodeEncodingName{&quot;03F5} % ϵ</pre>
+<p>Dummy definition (textautosigma is lowercase of textSigma)
+TODO: implement autosigma for TU:</p>
+<pre class="literal-block">\ProvideTextCommand{\textautosigma }\UnicodeEncodingName{\textsigma}</pre>
</section>
<section id="greek-extended">
-<h3><a class="toc-backref" href="#id8">Greek Extended</a></h3>
+<h3><a class="toc-backref" href="#id10">Greek Extended</a></h3>
<p>We skip definitions for characters “… WITH OXIA”, because they would
-overwrite the defintions for “… WITH TONOS” in the <cite>Greek and Coptic</cite>
+overwrite the definitions for “… WITH TONOS” in the <cite>Greek and Coptic</cite>
block.</p>
-<pre class="literal-block">\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\textalpha}{ἀ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textalpha}{ἁ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\textalpha}{ἂ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\textalpha}{ἃ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\textalpha}{ἄ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\textalpha}{ἅ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\textalpha}{ἆ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\textalpha}{ἇ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\textAlpha}{Ἀ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textAlpha}{Ἁ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\textAlpha}{Ἂ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\textAlpha}{Ἃ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\textAlpha}{Ἄ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\textAlpha}{Ἅ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\textAlpha}{Ἆ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\textAlpha}{Ἇ}
-
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\textepsilon}{ἐ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textepsilon}{ἑ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\textepsilon}{ἒ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\textepsilon}{ἓ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\textepsilon}{ἔ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\textepsilon}{ἕ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\textEpsilon}{Ἐ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textEpsilon}{Ἑ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\textEpsilon}{Ἒ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\textEpsilon}{Ἓ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\textEpsilon}{Ἔ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\textEpsilon}{Ἕ}
-
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\texteta}{ἠ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\texteta}{ἡ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\texteta}{ἢ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\texteta}{ἣ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\texteta}{ἤ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\texteta}{ἥ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\texteta}{ἦ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\texteta}{ἧ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\textEta}{Ἠ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textEta}{Ἡ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\textEta}{Ἢ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\textEta}{Ἣ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\textEta}{Ἤ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\textEta}{Ἥ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\textEta}{Ἦ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\textEta}{Ἧ}
-
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\textiota}{ἰ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textiota}{ἱ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\textiota}{ἲ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\textiota}{ἳ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\textiota}{ἴ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\textiota}{ἵ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\textiota}{ἶ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\textiota}{ἷ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\textIota}{Ἰ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textIota}{Ἱ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\textIota}{Ἲ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\textIota}{Ἳ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\textIota}{Ἴ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\textIota}{Ἵ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\textIota}{Ἶ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\textIota}{Ἷ}
-
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\textomicron}{ὀ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textomicron}{ὁ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\textomicron}{ὂ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\textomicron}{ὃ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\textomicron}{ὄ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\textomicron}{ὅ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\textOmicron}{Ὀ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textOmicron}{Ὁ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\textOmicron}{Ὂ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\textOmicron}{Ὃ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\textOmicron}{Ὄ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\textOmicron}{Ὅ}
-
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\textupsilon}{ὐ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textupsilon}{ὑ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\textupsilon}{ὒ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\textupsilon}{ὓ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\textupsilon}{ὔ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\textupsilon}{ὕ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\textupsilon}{ὖ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\textupsilon}{ὗ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textUpsilon}{Ὑ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\textUpsilon}{Ὓ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\textUpsilon}{Ὕ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\textUpsilon}{Ὗ}
-
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\textomega}{ὠ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textomega}{ὡ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\textomega}{ὢ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\textomega}{ὣ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\textomega}{ὤ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\textomega}{ὥ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\textomega}{ὦ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\textomega}{ὧ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\textOmega}{Ὠ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textOmega}{Ὡ}
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\textOmega}{Ὢ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\textOmega}{Ὣ}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\textOmega}{Ὤ}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\textOmega}{Ὥ}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\textOmega}{Ὦ}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\textOmega}{Ὧ}
-
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\textalpha}{ὰ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\textepsilon}{ὲ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\texteta}{ὴ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\textiota}{ὶ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\textomicron}{ὸ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\textupsilon}{ὺ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\textomega}{ὼ}
-
-\DeclareTextCompositeCommand{\u}{\UTFencname}{\textalpha}{ᾰ}
-\DeclareTextCompositeCommand{\=}{\UTFencname}{\textalpha}{ᾱ}
+<pre class="literal-block">\DeclareUnicodeComposite{\accpsili }{\textalpha}{&quot;1F00} % ἀ
+\DeclareUnicodeComposite{\accdasia }{\textalpha}{&quot;1F01} % ἁ
+\DeclareUnicodeComposite{\accpsilivaria }{\textalpha}{&quot;1F02} % ἂ
+\DeclareUnicodeComposite{\accdasiavaria }{\textalpha}{&quot;1F03} % ἃ
+\DeclareUnicodeComposite{\accpsilioxia }{\textalpha}{&quot;1F04} % ἄ
+\DeclareUnicodeComposite{\accdasiaoxia }{\textalpha}{&quot;1F05} % ἅ
+\DeclareUnicodeComposite{\accpsiliperispomeni}{\textalpha}{&quot;1F06} % ἆ
+\DeclareUnicodeComposite{\accdasiaperispomeni}{\textalpha}{&quot;1F07} % ἇ
+\DeclareUnicodeComposite{\accpsili }{\textAlpha}{&quot;1F08} % Ἀ
+\DeclareUnicodeComposite{\accdasia }{\textAlpha}{&quot;1F09} % Ἁ
+\DeclareUnicodeComposite{\accpsilivaria }{\textAlpha}{&quot;1F0A} % Ἂ
+\DeclareUnicodeComposite{\accdasiavaria }{\textAlpha}{&quot;1F0B} % Ἃ
+\DeclareUnicodeComposite{\accpsilioxia }{\textAlpha}{&quot;1F0C} % Ἄ
+\DeclareUnicodeComposite{\accdasiaoxia }{\textAlpha}{&quot;1F0D} % Ἅ
+\DeclareUnicodeComposite{\accpsiliperispomeni}{\textAlpha}{&quot;1F0E} % Ἆ
+\DeclareUnicodeComposite{\accdasiaperispomeni}{\textAlpha}{&quot;1F0F} % Ἇ
+
+\DeclareUnicodeComposite{\accpsili }{\textepsilon}{&quot;1F10} % ἐ
+\DeclareUnicodeComposite{\accdasia }{\textepsilon}{&quot;1F11} % ἑ
+\DeclareUnicodeComposite{\accpsilivaria }{\textepsilon}{&quot;1F12} % ἒ
+\DeclareUnicodeComposite{\accdasiavaria }{\textepsilon}{&quot;1F13} % ἓ
+\DeclareUnicodeComposite{\accpsilioxia }{\textepsilon}{&quot;1F14} % ἔ
+\DeclareUnicodeComposite{\accdasiaoxia }{\textepsilon}{&quot;1F15} % ἕ
+\DeclareUnicodeComposite{\accpsili }{\textEpsilon}{&quot;1F18} % Ἐ
+\DeclareUnicodeComposite{\accdasia }{\textEpsilon}{&quot;1F19} % Ἑ
+\DeclareUnicodeComposite{\accpsilivaria }{\textEpsilon}{&quot;1F1A} % Ἒ
+\DeclareUnicodeComposite{\accdasiavaria }{\textEpsilon}{&quot;1F1B} % Ἓ
+\DeclareUnicodeComposite{\accpsilioxia }{\textEpsilon}{&quot;1F1C} % Ἔ
+\DeclareUnicodeComposite{\accdasiaoxia }{\textEpsilon}{&quot;1F1D} % Ἕ
+
+\DeclareUnicodeComposite{\accpsili }{\texteta}{&quot;1F20} % ἠ
+\DeclareUnicodeComposite{\accdasia }{\texteta}{&quot;1F21} % ἡ
+\DeclareUnicodeComposite{\accpsilivaria }{\texteta}{&quot;1F22} % ἢ
+\DeclareUnicodeComposite{\accdasiavaria }{\texteta}{&quot;1F23} % ἣ
+\DeclareUnicodeComposite{\accpsilioxia }{\texteta}{&quot;1F24} % ἤ
+\DeclareUnicodeComposite{\accdasiaoxia }{\texteta}{&quot;1F25} % ἥ
+\DeclareUnicodeComposite{\accpsiliperispomeni}{\texteta}{&quot;1F26} % ἦ
+\DeclareUnicodeComposite{\accdasiaperispomeni}{\texteta}{&quot;1F27} % ἧ
+\DeclareUnicodeComposite{\accpsili }{\textEta}{&quot;1F28} % Ἠ
+\DeclareUnicodeComposite{\accdasia }{\textEta}{&quot;1F29} % Ἡ
+\DeclareUnicodeComposite{\accpsilivaria }{\textEta}{&quot;1F2A} % Ἢ
+\DeclareUnicodeComposite{\accdasiavaria }{\textEta}{&quot;1F2B} % Ἣ
+\DeclareUnicodeComposite{\accpsilioxia }{\textEta}{&quot;1F2C} % Ἤ
+\DeclareUnicodeComposite{\accdasiaoxia }{\textEta}{&quot;1F2D} % Ἥ
+\DeclareUnicodeComposite{\accpsiliperispomeni}{\textEta}{&quot;1F2E} % Ἦ
+\DeclareUnicodeComposite{\accdasiaperispomeni}{\textEta}{&quot;1F2F} % Ἧ
+
+\DeclareUnicodeComposite{\accpsili }{\textiota}{&quot;1F30} % ἰ
+\DeclareUnicodeComposite{\accdasia }{\textiota}{&quot;1F31} % ἱ
+\DeclareUnicodeComposite{\accpsilivaria }{\textiota}{&quot;1F32} % ἲ
+\DeclareUnicodeComposite{\accdasiavaria }{\textiota}{&quot;1F33} % ἳ
+\DeclareUnicodeComposite{\accpsilioxia }{\textiota}{&quot;1F34} % ἴ
+\DeclareUnicodeComposite{\accdasiaoxia }{\textiota}{&quot;1F35} % ἵ
+\DeclareUnicodeComposite{\accpsiliperispomeni}{\textiota}{&quot;1F36} % ἶ
+\DeclareUnicodeComposite{\accdasiaperispomeni}{\textiota}{&quot;1F37} % ἷ
+\DeclareUnicodeComposite{\accpsili }{\textIota}{&quot;1F38} % Ἰ
+\DeclareUnicodeComposite{\accdasia }{\textIota}{&quot;1F39} % Ἱ
+\DeclareUnicodeComposite{\accpsilivaria }{\textIota}{&quot;1F3A} % Ἲ
+\DeclareUnicodeComposite{\accdasiavaria }{\textIota}{&quot;1F3B} % Ἳ
+\DeclareUnicodeComposite{\accpsilioxia }{\textIota}{&quot;1F3C} % Ἴ
+\DeclareUnicodeComposite{\accdasiaoxia }{\textIota}{&quot;1F3D} % Ἵ
+\DeclareUnicodeComposite{\accpsiliperispomeni}{\textIota}{&quot;1F3E} % Ἶ
+\DeclareUnicodeComposite{\accdasiaperispomeni}{\textIota}{&quot;1F3F} % Ἷ
+
+\DeclareUnicodeComposite{\accpsili }{\textomicron}{&quot;1F40} % ὀ
+\DeclareUnicodeComposite{\accdasia }{\textomicron}{&quot;1F41} % ὁ
+\DeclareUnicodeComposite{\accpsilivaria }{\textomicron}{&quot;1F42} % ὂ
+\DeclareUnicodeComposite{\accdasiavaria }{\textomicron}{&quot;1F43} % ὃ
+\DeclareUnicodeComposite{\accpsilioxia }{\textomicron}{&quot;1F44} % ὄ
+\DeclareUnicodeComposite{\accdasiaoxia }{\textomicron}{&quot;1F45} % ὅ
+\DeclareUnicodeComposite{\accpsili }{\textOmicron}{&quot;1F48} % Ὀ
+\DeclareUnicodeComposite{\accdasia }{\textOmicron}{&quot;1F49} % Ὁ
+\DeclareUnicodeComposite{\accpsilivaria }{\textOmicron}{&quot;1F4A} % Ὂ
+\DeclareUnicodeComposite{\accdasiavaria }{\textOmicron}{&quot;1F4B} % Ὃ
+\DeclareUnicodeComposite{\accpsilioxia }{\textOmicron}{&quot;1F4C} % Ὄ
+\DeclareUnicodeComposite{\accdasiaoxia }{\textOmicron}{&quot;1F4D} % Ὅ
+
+\DeclareUnicodeComposite{\accpsili }{\textupsilon}{&quot;1F50} % ὐ
+\DeclareUnicodeComposite{\accdasia }{\textupsilon}{&quot;1F51} % ὑ
+\DeclareUnicodeComposite{\accpsilivaria }{\textupsilon}{&quot;1F52} % ὒ
+\DeclareUnicodeComposite{\accdasiavaria }{\textupsilon}{&quot;1F53} % ὓ
+\DeclareUnicodeComposite{\accpsilioxia }{\textupsilon}{&quot;1F54} % ὔ
+\DeclareUnicodeComposite{\accdasiaoxia }{\textupsilon}{&quot;1F55} % ὕ
+\DeclareUnicodeComposite{\accpsiliperispomeni}{\textupsilon}{&quot;1F56} % ὖ
+\DeclareUnicodeComposite{\accdasiaperispomeni}{\textupsilon}{&quot;1F57} % ὗ
+\DeclareUnicodeComposite{\accdasia }{\textUpsilon}{&quot;1F59} % Ὑ
+\DeclareUnicodeComposite{\accdasiavaria }{\textUpsilon}{&quot;1F5B} % Ὓ
+\DeclareUnicodeComposite{\accdasiaoxia }{\textUpsilon}{&quot;1F5D} % Ὕ
+\DeclareUnicodeComposite{\accdasiaperispomeni}{\textUpsilon}{&quot;1F5F} % Ὗ
+
+\DeclareUnicodeComposite{\accpsili }{\textomega}{&quot;1F60} % ὠ
+\DeclareUnicodeComposite{\accdasia }{\textomega}{&quot;1F61} % ὡ
+\DeclareUnicodeComposite{\accpsilivaria }{\textomega}{&quot;1F62} % ὢ
+\DeclareUnicodeComposite{\accdasiavaria }{\textomega}{&quot;1F63} % ὣ
+\DeclareUnicodeComposite{\accpsilioxia }{\textomega}{&quot;1F64} % ὤ
+\DeclareUnicodeComposite{\accdasiaoxia }{\textomega}{&quot;1F65} % ὥ
+\DeclareUnicodeComposite{\accpsiliperispomeni}{\textomega}{&quot;1F66} % ὦ
+\DeclareUnicodeComposite{\accdasiaperispomeni}{\textomega}{&quot;1F67} % ὧ
+\DeclareUnicodeComposite{\accpsili }{\textOmega}{&quot;1F68} % Ὠ
+\DeclareUnicodeComposite{\accdasia }{\textOmega}{&quot;1F69} % Ὡ
+\DeclareUnicodeComposite{\accpsilivaria }{\textOmega}{&quot;1F6A} % Ὢ
+\DeclareUnicodeComposite{\accdasiavaria }{\textOmega}{&quot;1F6B} % Ὣ
+\DeclareUnicodeComposite{\accpsilioxia }{\textOmega}{&quot;1F6C} % Ὤ
+\DeclareUnicodeComposite{\accdasiaoxia }{\textOmega}{&quot;1F6D} % Ὥ
+\DeclareUnicodeComposite{\accpsiliperispomeni}{\textOmega}{&quot;1F6E} % Ὦ
+\DeclareUnicodeComposite{\accdasiaperispomeni}{\textOmega}{&quot;1F6F} % Ὧ
+
+\DeclareUnicodeComposite{\`} {\textalpha} {&quot;1F70} % ὰ
+\DeclareUnicodeComposite{\`} {\textepsilon}{&quot;1F72} % ὲ
+\DeclareUnicodeComposite{\`} {\texteta} {&quot;1F74} % ὴ
+\DeclareUnicodeComposite{\`} {\textiota} {&quot;1F76} % ὶ
+\DeclareUnicodeComposite{\`} {\textomicron}{&quot;1F78} % ὸ
+\DeclareUnicodeComposite{\`} {\textupsilon}{&quot;1F7A} % ὺ
+\DeclareUnicodeComposite{\`} {\textomega} {&quot;1F7C} % ὼ
+% repeat with named accents (LuaTeX does not normalize to pre-composed chars):
+\DeclareUnicodeComposite{\accvaria} {\textalpha} {&quot;1F70} % ὰ
+\DeclareUnicodeComposite{\accvaria} {\textepsilon}{&quot;1F72} % ὲ
+\DeclareUnicodeComposite{\accvaria} {\texteta} {&quot;1F74} % ὴ
+\DeclareUnicodeComposite{\accvaria} {\textiota} {&quot;1F76} % ὶ
+\DeclareUnicodeComposite{\accvaria} {\textomicron}{&quot;1F78} % ὸ
+\DeclareUnicodeComposite{\accvaria} {\textupsilon}{&quot;1F7A} % ὺ
+\DeclareUnicodeComposite{\accvaria} {\textomega} {&quot;1F7C} % ὼ</pre>
+<p>Skipping pre-composed characters with sub-iota (ypogegrammeni/prosgegrammeni).</p>
+<pre class="literal-block">\DeclareUnicodeComposite{\u} {\textalpha}{&quot;1FB0} % ᾰ
+\DeclareUnicodeComposite{\=} {\textalpha}{&quot;1FB1} % ᾱ
% ᾲ
% ᾳ
% ᾴ
-\DeclareTextCompositeCommand{\~}{\UTFencname}{\textalpha}{ᾶ}
-\DeclareTextCompositeCommand{\~}{\UTFencname}{α}{ᾶ}
-\DeclareTextCompositeCommand{\accperispomeni}{\UTFencname}{\textalpha}{ᾶ}
+\DeclareUnicodeComposite{\accperispomeni} {\textalpha}{&quot;1FB6} % ᾶ
+\DeclareUnicodeComposite{\~} {\textalpha}{&quot;1FB6} % ᾶ
% ᾷ
-\DeclareTextCompositeCommand{\u}{\UTFencname}{\textAlpha}{Ᾰ}
-\DeclareTextCompositeCommand{\=}{\UTFencname}{\textAlpha}{Ᾱ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\textAlpha}{Ὰ}
+\DeclareUnicodeComposite{\u} {\textAlpha}{&quot;1FB8} % Ᾰ
+\DeclareUnicodeComposite{\=} {\textAlpha}{&quot;1FB9} % Ᾱ
+\DeclareUnicodeComposite{\`} {\textAlpha}{&quot;1FBA} % Ὰ
+\DeclareUnicodeComposite{\accvaria} {\textAlpha}{&quot;1FBA} % Ὰ
% ᾼ
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\textcompwordmark}{᾽}
-\DeclareTextCommand{\prosgegrammeni}{\UTFencname}{ι}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\textcompwordmark}{᾿}
+\DeclareUnicodeComposite{\accpsili} {} {&quot;1FBD} % ᾽
+\DeclareTextSymbol{\prosgegrammeni}\UnicodeEncodingName {&quot;1FBE} % ι
+\DeclareUnicodeComposite{\accpsili} {} {&quot;1FBF} % ᾿
-\DeclareTextCompositeCommand{\accperispomeni}{\UTFencname}{\textcompwordmark}{῀}
-\DeclareTextCompositeCommand{\accdialytikaperispomeni}{\UTFencname}{\textcompwordmark}{῁}
+\DeclareUnicodeComposite{\accperispomeni} {} {&quot;1FC0} % ῀
+\DeclareUnicodeComposite{\accdialytikaperispomeni}{} {&quot;1FC1} % ῁
% ῂ
% ῃ
% ῄ
-\DeclareTextCompositeCommand{\~}{\UTFencname}{\texteta}{ῆ}
-\DeclareTextCompositeCommand{\~}{\UTFencname}{η}{ῆ}
-\DeclareTextCompositeCommand{\accperispomeni}{\UTFencname}{\texteta}{ῆ}
+\DeclareUnicodeComposite{\accperispomeni} {\texteta} {&quot;1FC6} % ῆ
+\DeclareUnicodeComposite{\~} {\texteta} {&quot;1FC6} % ῆ
% ῇ
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\textEpsilon}{Ὲ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\textEta}{Ὴ}
+\DeclareUnicodeComposite{\`} {\textEpsilon}{&quot;1FC8} % Ὲ
+\DeclareUnicodeComposite{\accvaria} {\textEpsilon}{&quot;1FC8} % Ὲ
+\DeclareUnicodeComposite{\`} {\textEta} {&quot;1FCA} % Ὴ
+\DeclareUnicodeComposite{\accvaria} {\textEta} {&quot;1FCA} % Ὴ
% ῌ
-\DeclareTextCompositeCommand{\accpsilivaria}{\UTFencname}{\textcompwordmark}{῍}
-\DeclareTextCompositeCommand{\accpsilioxia}{\UTFencname}{\textcompwordmark}{῎}
-\DeclareTextCompositeCommand{\accpsiliperispomeni}{\UTFencname}{\textcompwordmark}{῏}
-
-\DeclareTextCompositeCommand{\u}{\UTFencname}{\textiota}{ῐ}
-\DeclareTextCompositeCommand{\=}{\UTFencname}{\textiota}{ῑ}
-\DeclareTextCompositeCommand{\accdialytikavaria}{\UTFencname}{\textiota}{ῒ}
-\DeclareTextCompositeCommand{\accdialytikaoxia}{\UTFencname}{\textiota}{ΐ}
-\DeclareTextCompositeCommand{\~}{\UTFencname}{\textiota}{ῖ}
-\DeclareTextCompositeCommand{\~}{\UTFencname}{ι}{ῖ}
-\DeclareTextCompositeCommand{\accperispomeni}{\UTFencname}{\textiota}{ῖ}
-\DeclareTextCompositeCommand{\accdialytikaperispomeni}{\UTFencname}{\textiota}{ῗ}
-\DeclareTextCompositeCommand{\u}{\UTFencname}{\textIota}{Ῐ}
-\DeclareTextCompositeCommand{\=}{\UTFencname}{\textIota}{Ῑ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\textIota}{Ὶ}
-\DeclareTextCompositeCommand{\accdasiavaria}{\UTFencname}{\textcompwordmark}{῝}
-\DeclareTextCompositeCommand{\accdasiaoxia}{\UTFencname}{\textcompwordmark}{῞}
-\DeclareTextCompositeCommand{\accdasiaperispomeni}{\UTFencname}{\textcompwordmark}{῟}
-
-\DeclareTextCompositeCommand{\u}{\UTFencname}{\textupsilon}{ῠ}
-\DeclareTextCompositeCommand{\=}{\UTFencname}{\textupsilon}{ῡ}
-\DeclareTextCompositeCommand{\accdialytikavaria}{\UTFencname}{\textupsilon}{ῢ}
-\DeclareTextCompositeCommand{\accdialytikaoxia}{\UTFencname}{\textupsilon}{ΰ}
-\DeclareTextCompositeCommand{\accpsili}{\UTFencname}{\textrho}{ῤ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textrho}{ῥ}
-\DeclareTextCompositeCommand{\~}{\UTFencname}{\textupsilon}{ῦ}
-\DeclareTextCompositeCommand{\~}{\UTFencname}{υ}{ῦ}
-\DeclareTextCompositeCommand{\accperispomeni}{\UTFencname}{\textupsilon}{ῦ}
-\DeclareTextCompositeCommand{\accdialytikaperispomeni}{\UTFencname}{\textupsilon}{ῧ}
-\DeclareTextCompositeCommand{\u}{\UTFencname}{\textUpsilon}{Ῠ}
-\DeclareTextCompositeCommand{\=}{\UTFencname}{\textUpsilon}{Ῡ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\textUpsilon}{Ὺ}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textRho}{Ῥ}
-\DeclareTextCompositeCommand{\accdialytikavaria}{\UTFencname}{\textcompwordmark}{῭}
-\DeclareTextCompositeCommand{\accdialytikaoxia}{\UTFencname}{\textcompwordmark}{΅}
+\DeclareUnicodeComposite{\accpsilivaria} {} {&quot;1FCD} % ῍
+\DeclareUnicodeComposite{\accpsilioxia} {} {&quot;1FCE} % ῎
+\DeclareUnicodeComposite{\accpsiliperispomeni} {} {&quot;1FCF} % ῏
+
+\DeclareUnicodeComposite{\u} {\textiota} {&quot;1FD0} % ῐ
+\DeclareUnicodeComposite{\=} {\textiota} {&quot;1FD1} % ῑ
+\DeclareUnicodeComposite{\accdialytikavaria} {\textiota} {&quot;1FD2} % ῒ
+\DeclareUnicodeComposite{\accdialytikaoxia} {\textiota} {&quot;1FD3} % ΐ
+\DeclareUnicodeComposite{\accperispomeni} {\textiota} {&quot;1FD6} % ῖ
+\DeclareUnicodeComposite{\~} {\textiota} {&quot;1FD6} % ῖ
+\DeclareUnicodeComposite{\~} {ι} {&quot;1FD6} % ῖ
+\DeclareUnicodeComposite{\accdialytikaperispomeni}{\textiota} {&quot;1FD7} % ῗ
+\DeclareUnicodeComposite{\u} {\textIota} {&quot;1FD8} % Ῐ
+\DeclareUnicodeComposite{\=} {\textIota} {&quot;1FD9} % Ῑ
+\DeclareUnicodeComposite{\`} {\textIota} {&quot;1FDA} % Ὶ
+\DeclareUnicodeComposite{\accvaria} {\textIota} {&quot;1FDA} % Ὶ
+\DeclareUnicodeComposite{\accdasiavaria} {} {&quot;1FDD} % ῝
+\DeclareUnicodeComposite{\accdasiaoxia} {} {&quot;1FDE} % ῞
+\DeclareUnicodeComposite{\accdasiaperispomeni} {} {&quot;1FDF} % ῟
+
+\DeclareUnicodeComposite{\u} {\textupsilon}{&quot;1FE0} % ῠ
+\DeclareUnicodeComposite{\=} {\textupsilon}{&quot;1FE1} % ῡ
+\DeclareUnicodeComposite{\accdialytikavaria} {\textupsilon}{&quot;1FE2} % ῢ
+\DeclareUnicodeComposite{\accdialytikaoxia} {\textupsilon}{&quot;1FE3} % ΰ
+\DeclareUnicodeComposite{\accpsili} {\textrho} {&quot;1FE4} % ῤ
+\DeclareUnicodeComposite{\accdasia} {\textrho} {&quot;1FE5} % ῥ
+\DeclareUnicodeComposite{\~} {\textupsilon}{&quot;1FE6} % ῦ
+\DeclareUnicodeComposite{\accperispomeni} {\textupsilon}{&quot;1FE6} % ῦ
+\DeclareUnicodeComposite{\accdialytikaperispomeni}{\textupsilon}{&quot;1FE7} % ῧ
+\DeclareUnicodeComposite{\u} {\textUpsilon}{&quot;1FE8} % Ῠ
+\DeclareUnicodeComposite{\=} {\textUpsilon}{&quot;1FE9} % Ῡ
+\DeclareUnicodeComposite{\`} {\textUpsilon}{&quot;1FEA} % Ὺ
+\DeclareUnicodeComposite{\accvaria} {\textUpsilon}{&quot;1FEA} % Ὺ
+% Ύ
+\DeclareUnicodeComposite{\accdasia} {\textRho} {&quot;1FEC} % Ῥ
+\DeclareUnicodeComposite{\accdialytikavaria} {} {&quot;1FED} % ῭
+\DeclareUnicodeComposite{\accdialytikaoxia} {} {&quot;1FEE} % ΅
+% `
% ῲ
% ῳ
% ῴ
-\DeclareTextCompositeCommand{\~}{\UTFencname}{\textomega}{ῶ}
-\DeclareTextCompositeCommand{\~}{\UTFencname}{ω}{ῶ}
-\DeclareTextCompositeCommand{\accperispomeni}{\UTFencname}{\textomega}{ῶ}
+\DeclareUnicodeComposite{\accperispomeni} {\textomega} {&quot;1FF6} % ῶ
+\DeclareUnicodeComposite{\~} {\textomega} {&quot;1FF6} % ῶ
% ῷ
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\textOmicron}{Ὸ}
-\DeclareTextCompositeCommand{\`}{\UTFencname}{\textOmega}{Ὼ}
+\DeclareUnicodeComposite{\`} {\textOmicron}{&quot;1FF8} % Ὸ
+\DeclareUnicodeComposite{\accvaria} {\textOmicron}{&quot;1FF8} % Ὸ
+\DeclareUnicodeComposite{\`} {\textOmega} {&quot;1FFA} % Ὼ
+\DeclareUnicodeComposite{\accvaria} {\textOmega} {&quot;1FFA} % Ὼ
% ῼ
-\DeclareTextCompositeCommand{\accoxia}{\UTFencname}{\textcompwordmark}{´}
-\DeclareTextCompositeCommand{\accdasia}{\UTFencname}{\textcompwordmark}{῾}</pre>
+\DeclareUnicodeComposite{\accoxia} {} {&quot;1FFD} % ´
+\DeclareUnicodeComposite{\accdasia} {} {&quot;1FFE} % ῾</pre>
+<p>Diacritics on literal Unicode characters:</p>
+<pre class="literal-block">\DeclareUnicodeComposite{\~}{α}{&quot;1FB6} % ᾶ
+\DeclareUnicodeComposite{\~}{η}{&quot;1FC6} % ῆ
+\DeclareUnicodeComposite{\~}{υ}{&quot;1FE6} % ῦ
+\DeclareUnicodeComposite{\~}{ω}{&quot;1FF6} % ῶ</pre>
</section>
<section id="letterlike-symbols">
-<h3><a class="toc-backref" href="#id9">Letterlike Symbols</a></h3>
-<pre class="literal-block">\DeclareTextCommand{\textohm}{\UTFencname}{Ω} % OHM SIGN</pre>
+<h3><a class="toc-backref" href="#id11">Letterlike Symbols</a></h3>
+<pre class="literal-block">\DeclareTextSymbol{\textohm}\UnicodeEncodingName{&quot;03A9} % OHM SIGN, use 03A9 Omega</pre>
</section>
<section id="ancient-greek-numbers">
-<h3><a class="toc-backref" href="#id10">Ancient Greek Numbers</a></h3>
+<h3><a class="toc-backref" href="#id12">Ancient Greek Numbers</a></h3>
<p>TODO: map other chars to corresponding Greek letters.
See also the <a class="reference external" href="http://ctan.org/pkg/grnumalt">grnumalt</a> package.</p>
<p>Definition with literal Unicode characters, because the code-point has 5
hexadecimal digits:</p>
-<pre class="literal-block">\DeclareTextCommand{\textpentedeka}{\UTFencname}{𐅄} % GREEK ACROPHONIC ATTIC FIFTY
-\DeclareTextCommand{\textpentehekaton}{\UTFencname}{𐅅} % GREEK ACROPHONIC ATTIC FIVE HUNDRED
-\DeclareTextCommand{\textpenteqilioi}{\UTFencname}{𐅆} % GREEK ACROPHONIC ATTIC FIVE THOUSAND
-\DeclareTextCommand{\textpentemuria}{\UTFencname}{𐅇} % GREEK ACROPHONIC ATTIC FIFTY THOUSAND</pre>
+<pre class="literal-block">\DeclareTextSymbol{\textpentedeka }\UnicodeEncodingName{&quot;10144} % GREEK ACROPHONIC ATTIC FIFTY
+\DeclareTextSymbol{\textpentehekaton}\UnicodeEncodingName{&quot;10145} % GREEK ACROPHONIC ATTIC FIVE HUNDRED
+\DeclareTextSymbol{\textpenteqilioi }\UnicodeEncodingName{&quot;10146} % GREEK ACROPHONIC ATTIC FIVE THOUSAND
+\DeclareTextSymbol{\textpentemuria }\UnicodeEncodingName{&quot;10147} % GREEK ACROPHONIC ATTIC FIFTY THOUSAND</pre>
</section>
</section>
<section id="uppercase">
-<h2><a class="toc-backref" href="#id11">UPPERCASE</a></h2>
+<h2><a class="toc-backref" href="#id13">UPPERCASE</a></h2>
<p>Greek letters drop diacritics (eccept dialytika and sub-iota) in UPPERCASE.</p>
<section id="uc-lc-values">
-<h3><a class="toc-backref" href="#id12">uc/lc values</a></h3>
+<h3><a class="toc-backref" href="#id14">uc/lc values</a></h3>
<p><span class="docutils literal">\lccode</span> and <span class="docutils literal">\uccode</span> corrections from the <a class="reference external" href="http://ctan.org/pkg/xgreek">xgreek</a> package by Apostolos Syropoulos:</p>
<pre class="literal-block">\global\lccode&quot;0370=&quot;0371 \global\uccode&quot;0370=&quot;0370
\global\lccode&quot;0371=&quot;0371 \global\uccode&quot;0371=&quot;0370
@@ -1461,13 +1527,13 @@ hexadecimal digits:</p>
\global\lccode&quot;1FFC=&quot;1FF3 \global\uccode&quot;1FFC=&quot;1FFC</pre>
</section>
<section id="uclclist">
-<h3><a class="toc-backref" href="#id13">uclclist</a></h3>
+<h3><a class="toc-backref" href="#id15">uclclist</a></h3>
<p>The common Greek font encoding definitions in <a class="reference external" href="greek-fontenc.def.html">greek-fontenc.def</a> extend the
<cite>uclclist</cite> with Greek LICR macros. Here, we add Unicode-specific “<a class="reference external" href="greek-fontenc.def.html#mark-hiatus">hiatus</a>”
handling (copied from <a class="reference external" href="lgrenc.def.html">lgrenc.def</a> and changed
Latin transcription to Unicode literals).</p>
<p>The hiatus definition modifications:</p>
-<pre class="literal-block">\DeclareTextCommand{\LGR&#64;A&#64;hiatus}{\UTFencname}{%
+<pre class="literal-block">\DeclareTextCommand{\LGR&#64;A&#64;hiatus}{\UnicodeEncodingName}{%
\LGR&#64;ifnextchar{Ι}{\textAlpha\&quot;}{%
\LGR&#64;ifnextchar{Υ}{\textAlpha\&quot;}{%
\LGR&#64;ifnextchar{\textIota}{\textAlpha\&quot;}{%
@@ -1476,7 +1542,7 @@ Latin transcription to Unicode literals).</p>
}%
}%
}
-\DeclareTextCommand{\LGR&#64;E&#64;hiatus}{\UTFencname}{%
+\DeclareTextCommand{\LGR&#64;E&#64;hiatus}{\UnicodeEncodingName}{%
\LGR&#64;ifnextchar{Ι}{\textEpsilon\&quot;}{%
\LGR&#64;ifnextchar{Υ}{\textEpsilon\&quot;}{%
\LGR&#64;ifnextchar{\textIota}{\textEpsilon\&quot;}{%
@@ -1488,17 +1554,6 @@ Latin transcription to Unicode literals).</p>
<!-- References -->
</section>
</section>
-<section class="system-messages">
-<h2>Docutils System Messages</h2>
-<div class="system-message" id="id14">
-<p class="system-message-title">System Message: ERROR/3 (<span class="docutils literal">tuenc-greek.def.txt</span>, line 17); <em><a href="#id15">backlink</a></em></p>
-<p>Unknown target name: &quot;tuenc&quot;.</p>
-</div>
-<div class="system-message" id="id16">
-<p class="system-message-title">System Message: ERROR/3 (<span class="docutils literal">tuenc-greek.def.txt</span>, line 47); <em><a href="#id17">backlink</a></em></p>
-<p>Unknown target name: &quot;tuenc&quot;.</p>
-</div>
-</section>
</main>
</body>
</html>
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/README.md b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/README.md
index 71a40a6784..fefcb07149 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/README.md
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/README.md
@@ -50,7 +50,7 @@ The following packages are required:
## Licence
```
-Copyright 2015-2018 David Purton
+Copyright 2015-2020 David Purton
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/american-sbl.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/american-sbl.lbx
index 95f47d3d09..bdb38b9a6a 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/american-sbl.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/american-sbl.lbx
@@ -25,4 +25,5 @@
\iffieldbibstring{#1}
{\bibstring{\thefield{#1}}}
{\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}%
+ \DeclarePunctuationPairs{comma}{*!?}%
}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-examples.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-examples.pdf
index 08429afbd5..00501af9d4 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-examples.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-examples.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-examples.tex b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-examples.tex
index d9fad6d8ab..c7cbc4bcd4 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-examples.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-examples.tex
@@ -11,7 +11,7 @@
\usepackage{listings}
\usepackage{imakeidx}
\makeindex[title=Author Index,intoc,options=-q]
-\usepackage[style=sbl,indexing=cite,idemtracker=false,ibidtracker=false]{biblatex}
+\usepackage[style=sbl,indexing=cite]{biblatex}
\usepackage{hyperref}
\addbibresource{biblatex-sbl.bib}
@@ -176,7 +176,7 @@
revdauthor,revdtitle,revdeditor,institution,type,shorthand,xref,%
note,eprintdate,volumes,shortmaintitle,options,eprintclass,relatedoptions,%
editortype,crossref,editora,editorb,editorc,editoratype,editorbtyle,%
- editorctype,entrysubtype,sortkey,titleaddon,witheditor,witheditortype,%
+ editorctype,entrysubtype,sorttitle,titleaddon,witheditor,witheditortype,%
withtranslator,withtranslatortype,eventtitle,venue,eventdate,shortauthor%
},
sensitive=false,
@@ -2117,7 +2117,6 @@ Than the Author}
date = {1994},
shorthand = {ANF},
options = {useeditor=false,skipbiblist},
- sortkey = {Ante-Nicene Fathers},
xref = {ANF:abbreviation}
}
@@ -2155,7 +2154,6 @@ Than the Author}
date = {1994},
shorthand = {NPNF\textsuperscript{1}},
options = {useeditor=false,skipbiblist},
- sortkey = {Nicene and Post-Nicene Fathers, Series 1},
xref = {NPNF1:abbreviation}
}
@@ -2193,7 +2191,7 @@ Than the Author}
editor = {Migne, J.-P.},
volumes = {217},
location = {Paris},
- date = {1844/1864},
+ date = {1844/1855},
shorthand = {PL}
}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-ibid.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-ibid.pdf
index 95b796a2ea..62d82711bd 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-ibid.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-ibid.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-ibid.tex b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-ibid.tex
index 011d44dba7..11c969e09a 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-ibid.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-ibid.tex
@@ -9,7 +9,7 @@
\usepackage{imakeidx}
\makeindex[title=Author Index,intoc,options=-q]
\usepackage{hyperref}
-\usepackage[style=sbl,indexing=cite]{biblatex}
+\usepackage[style=sbl,indexing=cite,ibidtracker=constrict,idemtracker=citation]{biblatex}
\addbibresource{biblatex-sbl.bib}
\setmonofont{DejaVu Sans Mono}[Scale=MatchLowercase]
@@ -147,16 +147,25 @@
\maketitle
This file tests the behaviour of the various options related to using
-\emph{ibidem} and \emph{idem} in Biblatex-SBL.
+\emph{ibidem} and \emph{idem} in Biblatex-SBL. By default neither
+\emph{ibidem} nor \emph{idem} are used.\footnote{See
+\url{https://sblhs2.com/2018/02/01/cms-update-ibid/}.} When referencing
+multiple works by the same author within a footnote, subsequent references use
+only the family name of the author.\footnote{See
+\url{https://sblhs2.com/2016/10/11/placement-citations-traditional/}.} This
+corresponds to the \verb|biblatex| option \verb|idemtracker=sbl|.
-\section*{Default \emph{ibidem} tracking}
+\section*{Using \emph{ibidem}}
By default ibid.\@ is not used across page breaks and \emph{ibidem} is taken
-to mean ‘same author + same title’. See \texttt{biblatex-sbl.pdf} for a
-description of the options \texttt{ibidtracker} can take.
+to mean ‘same author + same title + same page’.\footnote{See
+\url{https://sblhs2.com/2017/01/05/subsequent-bibliographic-references/}.} See
+\texttt{biblatex-sbl.pdf} for a description of the options
+\texttt{ibidtracker} can take. It is recommended to use
+\verb|ibidtracker=constrict| for SBL compliance.
\begin{biboutput}
- \samplemacro{\textbackslash usepackage[style=sbl]\{biblatex\}}
+ \samplemacro{\textbackslash usepackage[style=sbl,ibidtracker=constrict]\{biblatex\}}
\samplecite{1}[127]{talbert:1992}
\samplecite{2}[22]{talbert:1992}
\samplecite{3}[22]{talbert:1992}
@@ -167,17 +176,15 @@ description of the options \texttt{ibidtracker} can take.
\samplecite{6}[22]{talbert:1992}
\end{biboutput}
-\section*{Not tracking \emph{ibidem} across pages}
+\section*{Using \emph{ibidem} across pages}
-\boolfalse{pagetracker}
-
-Set the \texttt{pagetracker} option to \texttt{false} to allow that the first
+Set the \texttt{pagetracker} option to \texttt{false} to allow the first
citation on a page to be ibid.
\boolfalse{pagetracker}
\begin{biboutput}
- \samplemacro{\textbackslash usepackage[style=sbl,pagetracker=false]\{biblatex\}}
+ \samplemacro{\textbackslash usepackage[style=sbl,ibidtracker=constrict,pagetracker=false]\{biblatex\}}
\samplecite{7}[53]{scott+etal:1993}
\samplecite{8}[42]{scott+etal:1993}
\samplemacro{\textbackslash clearpage}
@@ -185,43 +192,44 @@ citation on a page to be ibid.
\samplecite{9}[42]{scott+etal:1993}
\end{biboutput}
-\section*{\emph{Ibidem} meaning ‘same author + same title + same page’}
+\section*{\emph{Ibidem} meaning ‘same author + same title’}
-Turn on the \texttt{ibidpage} option to indicate that \emph{ibidem} should
-mean ‘same author + same title + same page’.
+Turn off the \texttt{ibidpage} option to indicate that \emph{ibidem} should
+mean ‘same author + same title’.
\makeatletter
-\let\blx@imc@ifloccit\blx@ifloccit@global
-\let\blx@loccittracker\blx@loccittracker@global
-\let\blx@loccitreset\blx@loccitreset@global
+\blx@opt@loccittracker@false
\makeatother
\begin{biboutput}
- \samplemacro{\textbackslash usepackage[style=sbl,ibidpage]\{biblatex\}}
+ \samplemacro{\textbackslash usepackage[style=sbl,ibidtracker=constrict,ibidpage=false]\{biblatex\}}
\samplecite{10}[28]{egger:1996}
\samplecite{11}[28]{egger:1996}
\samplecite{12}[291]{egger:1996}
\end{biboutput}
-\section*{Default \emph{idem} tracking}
+\section*{Using \emph{idem}}
-By default \emph{idem} is used. \emph{Idem} tracking is controlled using the
-\texttt{idemtracker} option. See \texttt{biblatex-sbl.pdf} for a description
-of the options \texttt{idemtracker} can take.
+By default \emph{idem} is not used. Rather only the family name of the author
+is given for subsequent references when works by the same author are cited
+within a single footnote. \emph{Idem} tracking is controlled using
+the \texttt{idemtracker} option. See \texttt{biblatex-sbl.pdf} for a
+description of the options \texttt{idemtracker} can take. To comply with SBL
+style, \verb|idemtracker=citation| should be used.\footnote{See
+\url{https://sblhs2.com/2017/01/10/idem/}.}
\begin{biboutput}
- \samplemacro{\textbackslash usepackage[style=sbl]\{biblatex\}}
- \makeatletter\blx@opt@idemtracker@constrict\makeatother
+ \samplemacro{\textbackslash usepackage[style=sbl,idemtracker=citation]\{biblatex\}}
\samplemacro{\textbackslash autocites[35]\{vanseters:1997\}\{vanseters:1995\}}
\color{biblatex-colour}
\hspace*{\bibindent}13.~\cites[35]{vanseters:1997}{vanseters:1995}.
\color{black}
\samplemacro{\textbackslash
autocites[35]\{vanseters:1997\}[222]\{vanseters:1995\}}
- \makeatletter\blx@idemreset\makeatother
\color{biblatex-colour}
\hspace*{\bibindent}14.~\cites[35]{vanseters:1997}[222]{vanseters:1995}.
\color{black}
+ \samplecite{15}[35]{vanseters:1997}
\end{biboutput}
\printbibliography
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.bib b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.bib
index cbd2ccb6ae..da2353e554 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.bib
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.bib
@@ -976,7 +976,6 @@
date = {1994},
shorthand = {ANF},
options = {useeditor=false,skipbiblist},
- sortkey = {Ante-Nicene Fathers},
xref = {ANF:abbreviation}
}
@@ -1004,7 +1003,6 @@
date = {1994},
shorthand = {NPNF\textsuperscript{1}},
options = {useeditor=false,skipbiblist},
- sortkey = {Nicene and Post-Nicene Fathers, Series 1},
xref = {NPNF1:abbreviation}
}
@@ -1032,7 +1030,7 @@
editor = {Migne, J.-P.},
volumes = {217},
location = {Paris},
- date = {1844/1864},
+ date = {1844/1855},
shorthand = {PL}
}
@@ -1330,7 +1328,12 @@
date = {2015-02},
url = {https://www.sbl-site.org/assets/pdfs/pubs/SBLHSsupp2015-02.pdf},
options = {useauthor=false,useeditor=false},
- sortkey = {Student Supplement for the SBL Handbook of Style, Second Edition}
+}
+
+@periodical{sblhs2.com,
+ title = {SBL Handbook of Style},
+ subtitle = {Explanations, Clarifications, and Expansions},
+ url = {https://sblhs2.com}
}
@mvbook{sasson:2000,
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.def b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.def
index aa7301d280..0f8ece1b0d 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.def
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.def
@@ -15,8 +15,8 @@
% VERSION STRINGS
% ------------------------------------------------------------------
-\def\sbl@abx@date{2018/12/13}
-\def\sbl@abx@version{0.11}
+\def\sbl@abx@date{2020/11/04}
+\def\sbl@abx@version{0.12}
\def\sbl@abx@bbxid{\sbl@abx@date\space v\sbl@abx@version\space biblatex-sbl bibliography style (DCP)}
\def\sbl@abx@cbxid{\sbl@abx@date\space v\sbl@abx@version\space biblatex-sbl citation style (DCP)}
\def\sbl@abx@lbxid{\sbl@abx@date\space v\sbl@abx@version\space biblatex-sbl localization (DCP)}
@@ -52,7 +52,12 @@
\NumCheckSetup{\def\mkbibparens#1{#1}}
-\renewbibmacro*{postnote}{}
+\renewbibmacro*{postnote}{%
+ \iftoggle{blx@unit}
+ {}
+ {\newunit}%
+ \printfield{postnote}}
+
\newbibmacro*{pages}{}
\DeclareBibliographyOption[string]{citepages}[permit]{%
@@ -62,7 +67,6 @@
{Invalid option 'citepages=#1'}
{Valid values are 'sbl', 'permit', 'omit', 'separate'.}}}
-\providebibmacro*{postnote}{}
\providebibmacro*{pages}{}
\def\cbx@opt@citepages@sbl{%
@@ -82,17 +86,7 @@
{\iffieldpages{postnote}
{}
{\setunit{\addspace}%
- \printtext[parens]{\printfield{postnote}}}}}}%
- \renewbibmacro*{postnote}{%
- \iffieldundef{postnote}
- {\printfield{pages}}
- {\iffieldpages{postnote}
- {\printfield{postnote}}
- {\iffieldundef{pages}
- {\printfield{postnote}}
- {\printfield{pages}%
- \setunit{\addspace}%
- \printtext[parens]{\printfield{postnote}}}}}}}
+ \printtext[parens]{\printfield{postnote}}}}}}}
\def\cbx@opt@citepages@permit{%
\renewbibmacro*{pages}{%
@@ -109,18 +103,7 @@
}
{}
{\setunit{\addspace}%
- \printtext[parens]{\printfield{postnote}}}}}%
- \renewbibmacro*{postnote}{%
- \iffieldundef{postnote}
- {\printfield{pages}}
- {\iffieldpages{postnote}
- {\printfield{postnote}}
- {\iffieldundef{pages}
- {\newunit
- \printfield{postnote}}
- {\printfield{pages}%
- \setunit*{\addspace}%
- \printtext[parens]{\printfield{postnote}}}}}}}
+ \printtext[parens]{\printfield{postnote}}}}}}
\def\cbx@opt@citepages@omit{%
\renewbibmacro*{pages}{%
@@ -139,23 +122,12 @@
{\printfield{postnote}}
{\printfield{pages}%
\setunit*{\addspace}%
- \printtext[parens]{\printfield{postnote}}}}}}%
- \renewbibmacro*{postnote}{%
- \iffieldundef{postnote}
- {\printfield{pages}}
- {\iffieldpages{postnote}
- {\printfield{postnote}}
- {\iffieldundef{pages}
- {\newunit
- \printfield{postnote}}
- {\printfield{pages}%
- \setunit*{\addspace}%
\printtext[parens]{\printfield{postnote}}}}}}}
\def\cbx@opt@citepages@separate{%
\renewbibmacro*{pages}{%
\iffieldundef{pages}
- {\ifool{bx@inset}
+ {\ifbool{bbx@inset}
{}
{\printfield{postnote}%
\global\booltrue{suppresspostnote}}}
@@ -172,34 +144,57 @@
{\bibstring{thiscite}%
\setunit{\addspace}}
{}%
- \printfield{postnote}}}}}%
- \renewbibmacro*{postnote}{%
- \iffieldundef{postnote}
- {\printfield{pages}}
- {\iffieldpages{postnote}
- {\printfield{postnote}}
- {\iffieldundef{pages}
- {\printfield{postnote}}
- {\printfield{pages}%
- \setunit*{\addspace}%
- \printtext[parens]{%
- \iffieldpages{postnote}
- {\bibstring{thiscite}%
- \setunit{\addspace}}
- {}%
- \printfield{postnote}}}}}}}
+ \printfield{postnote}}}}}}
% ------------------------------------------------------------------
% IDEM MACROS
% ------------------------------------------------------------------
+\def\blx@opt@idemtracker@citation{%
+ \let\blx@imc@ifciteidem\blx@ifciteidem@citation
+ \let\blx@idemtracker\blx@idemtracker@constrict
+ \let\blx@idemreset\blx@idemreset@context
+ \booltrue{citetracker}}
+
+\def\blx@opt@idemtracker@sbl{%
+ \let\blx@imc@ifciteidem\blx@ifciteidem@sbl
+ \let\blx@idemtracker\blx@idemtracker@constrict
+ \let\blx@idemreset\blx@idemreset@context
+ \booltrue{citetracker}}
+
+\def\blx@ifciteidem@citation{%
+ \ifbool{citetracker}
+ {\iftoggle{blx@footnote}
+ {\blx@ifmpfncheckidem
+ {\blx@imc@iffieldequals{fullhash}\blx@lasthash@foot}
+ {\@secondoftwo}}
+ {\iffirstcitekey
+ {\@secondoftwo}
+ {\blx@imc@iffieldequals{fullhash}\blx@lasthash@text}}}
+ {\@secondoftwo}}
+
+\def\blx@ifciteidem@sbl{%
+ \blx@ifciteidem@citation}
+
+\def\blx@ifmpfncheckidem{%
+ \ifnum\numexpr\value\@mpfn-\blx@lastmpfn<\@ne
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi}
+
+\def\ifciteidemsbl{%
+ \ifdefequal{\blx@imc@ifciteidem}{\blx@ifciteidem@sbl}}
+
\newbibmacro*{ifidemused}{%
\ifboolexpr{
test {\ifciteidem}
and
not test {\iffirstonpage}
}
- {\bibstring[\mkibid]{idem\thefield{gender}}%
+ {\ifciteidemsbl
+ {\printnames{labelname}}
+ {\bibstring[\mkibid]{idem\thefield{gender}}}%
\@firstoftwo}
{\@secondoftwo}}
@@ -310,7 +305,6 @@
\ExecuteBibliographyOptions{%
citetracker,
- punctfont,
alldates=comp,
eprintdate=comp,
dateabbrev=false,
@@ -320,9 +314,9 @@
minxrefs=1,
isbn=false,
pagetracker,
- idemtracker=constrict,
- ibidtracker=constrict,
- ibidpage=false,
+ idemtracker=sbl,
+ ibidtracker=false,
+ ibidpage=true,
maxbibnames=99,
maxcitenames=3,
citepages=sbl,
@@ -363,6 +357,7 @@
\NewBibliographyString{paperpresented}
\NewBibliographyString{patentfiled}
\NewBibliographyString{released}
+\NewBibliographyString{article}
\DeclareLanguageMappingSuffix{-sbl}
@@ -404,6 +399,7 @@
\ifinteger{#1}
{\mkbibordedition{#1}~\bibsstring{edition}}
{\ifcapital{\MakeCapital{#1}}{#1}\isdot}}
+\DeclareFieldFormat{eid}{\bibsstring{article}~#1}
\DeclareFieldFormat{eprint:ebook}{#1 \biblstring{edition}}
\DeclareFieldFormat{eprint}{%
\iffieldundef{eprinttype}
@@ -453,7 +449,10 @@
\DeclareFieldFormat{volcitepages}{\mkcomprange{#1}}
\DeclareFieldFormat{part}{#1}
\DeclareFieldFormat{pt}{\bibstring{part}~#1}
-\DeclareFieldFormat{postnote}{\mkcomprange{#1}}
+\DeclareFieldFormat{postnote}{%
+ \iffieldundef{eid}
+ {\mkcomprange{#1}}
+ {\mkpageprefix[pagination][\mkcomprange]{#1}}}
\DeclareFieldFormat{multipostnote}{#1}
\DeclareFieldFormat{byauthor}{\bibstring{byauthor} #1}
\DeclareFieldFormat{revdtitle}{\biblstring{reviewof} \mkbibemph{#1}}
@@ -472,8 +471,8 @@
\DeclareFieldFormat{isrn}{ISRN\addcolon\space #1}
\DeclareFieldFormat{issn}{ISSN\addcolon\space #1}
\DeclareFieldFormat{pages}{\mkcomprange{#1}}
-\DeclareFieldFormat{pagepages}{\mkcomprange[\mkpageprefix]{#1}}
-\DeclareFieldFormat{pagesin}{\mkcomprange[\mkpageprefix]{#1} \usebibmacro{in}}
+\DeclareFieldFormat{pagepages}{\mkpageprefix[pagination][\mkcomprange]{#1}}
+\DeclareFieldFormat{pagesin}{\mkpageprefix[pagination][\mkcomprange]{#1} \usebibmacro{in}}
\DeclareFieldFormat{chapter}{\bibsstring{chapter}~#1}
\DeclareFieldFormat{chapterin}{\bibsstring{chapter}~#1 \usebibmacro{in}}
\DeclareFieldFormat{volume}{#1}
@@ -515,13 +514,15 @@
\DeclareFieldFormat[incommentary,inreference,inlexicon,online,review,seminarpaper,conferencepaper]{title}{\mkbibquote{#1}}
\DeclareFieldFormat[incommentary,inreference,inlexicon,online,review,seminarpaper,conferencepaper]{shorttitle}{\mkbibquote{#1}}
\DeclareFieldFormat[suppperiodical]{title}{\mkbibquote{#1}}
-\DeclareFieldFormat{issuetitle}{\mkbibquote{#1}}
-\DeclareFieldFormat{issuesubtitle}{\mkbibquote{#1}}
-\DeclareFieldFormat{shortissuetitle}{\mkbibquote{#1}}
+\DeclareFieldFormat{issuetitle}{\mkbibemph{#1}}
+\DeclareFieldFormat{issuesubtitle}{\mkbibemph{#1}}
+\DeclareFieldFormat{shortissuetitle}{\mkbibemph{#1}}
\DeclareFieldFormat{howpublished}{\ifbibstring{#1}{\bibstring{#1}}{#1}}
\DeclareFieldFormat[patent]{title}{#1}
\DeclareFieldFormat[ancienttext]{title}{%
\ifboolexpr{
+ test {\iffieldequalstr{entrysubtype}{primarysource}}
+ or
test {\iffieldequalstr{entrysubtype}{inscription}}
or
test {\iffieldequalstr{entrysubtype}{chronicle}}
@@ -532,6 +533,8 @@
{\mkbibquote{#1}}}}
\DeclareFieldFormat[ancienttext]{shorttitle}{%
\ifboolexpr{
+ test {\iffieldequalstr{entrysubtype}{primarysource}}
+ or
test {\iffieldequalstr{entrysubtype}{inscription}}
or
test {\iffieldequalstr{entrysubtype}{chronicle}}
@@ -561,6 +564,18 @@
\iffieldundef{type}
{#1}
{\mkbibemph{#1}}}
+\DeclareFieldFormat[classictext]{title}{%
+ \ifnameundef{author}
+ {#1}
+ {\mkbibemph{#1}}}
+\DeclareFieldFormat[classictext]{subtitle}{%
+ \ifnameundef{author}
+ {#1}
+ {\mkbibemph{#1}}}
+\DeclareFieldFormat[classictext]{shorttitle}{%
+ \ifnameundef{author}
+ {#1}
+ {\mkbibemph{#1}}}
\DeclareBibliographyAlias{cite:mvbook}{cite:book}
\DeclareBibliographyAlias{cite:mvcollection}{cite:collection}
@@ -675,6 +690,13 @@
% LIST OF ABBREVIATIONS
% ------------------------------------------------------------------
+\DeclareFieldFormat{shorttitlewidth}{%
+ \ifentrytype{classictext}
+ {\iffieldequalstr{entrysubtype}{churchfather}
+ {}
+ {\mkbibemph{#1}}}
+ {}}
+
\newtoggle{blx@abbrevcite}
\newlength{\abbrevwidth}
@@ -686,16 +708,30 @@
}
\defbibenvironment{abbreviations}
- {\list
+ {\setlength{\abbrevwidth}{0pt}%
+ \list
{\printfield[shorthandwidth]{shortjournal}%
- \iffieldundef{shorthand}
- {\printfield[shorthandwidth]{shortseries}}
- {\iffieldsequal{shorthand}{shorttitle}
- {\printtext{\mkbibemph{\printfield[shorthandwidth]{shorthand}}}}
- {\printfield[shorthandwidth]{shorthand}}}}
+ \iffieldsequal{shorthand}{shorttitle}
+ {\printtext{\mkbibemph{\printfield[shorthandwidth]{shorthand}}}}
+ {\printfield[shorthandwidth]{shorthand}}%
+ \ifentrytype{classictext}
+ {\printfield{shorttitle}}
+ {}%
+ \ifboolexpr{
+ not test {\iffieldundef{shorthand}}
+ or
+ (
+ test {\ifentrytype{classictext}}
+ and
+ not test {\iffieldundef{shorttitle}}
+ )
+ }
+ {}
+ {\printfield{shortseries}}}
{\setmaxlength{\abbrevwidth}{\shorthandwidth}%
\setmaxlength{\abbrevwidth}{\shortserieswidth}%
\setmaxlength{\abbrevwidth}{\shortjournalwidth}%
+ \setmaxlength{\abbrevwidth}{\shorttitlewidth}%
\addtolength{\abbrevwidth}{\biblabelsep}%
\setlength{\labelwidth}{\abbrevwidth}%
\setlength{\leftmargin}{\labelwidth}%
@@ -721,15 +757,38 @@
{\setunit{\subtitlepunct}%
\printfield{journalsubtitle}}}%
\iffieldundef{shorthand}
- {\iffieldundef{shortseries}
- {}
- {\bibhypertarget{\strfield{shortseries}}{}%
- \printfield{series}}}
+ {}
{\bibhypertarget{\strfield{shorthand}}{}%
\iffieldsequal{shorthand}{shorttitle}
{\toggletrue{blx@abbrevcite}}
{}%
\usebibmacro{bibentrycite}}%
+ \ifentrytype{classictext}
+ {\iffieldundef{shorttitle}
+ {}
+ {\bibhypertarget{\strfield{shorttitle}\strname{author}}{}%
+ \ifnameundef{author}
+ {}
+ {\usebibmacro{author}%
+ \newunit}%
+ \printfield{title}%
+ \setunit*{\subtitlepunct}%
+ \printfield{subtitle}}}
+ {}%
+ \ifboolexpr{
+ not test {\iffieldundef{shorthand}}
+ or
+ (
+ test {\ifentrytype{classictext}}
+ and
+ not test {\iffieldundef{shorttitle}}
+ )
+ }
+ {}
+ {\iffieldundef{shortseries}
+ {}
+ {\bibhypertarget{\strfield{shortseries}}{}%
+ \printfield{series}}}%
\usebibmacro{finentry}}
\DeclareBiblistFilter{abbreviations}{
@@ -737,6 +796,26 @@
\filter[type=field,filter=shorthand]
\filter[type=field,filter=shortjournal]
\filter[type=field,filter=shortseries]
+ \filter[type=field,filter=shorttitle]
+ }
+}
+
+\DeclareBiblistFilter{primary}{
+ \filteror{
+ \filter[type=subtype,filter=primarysource]
+ \filter[type=type,filter=classictext]
+ }
+ \filteror{
+ \filter[type=field,filter=shorthand]
+ \filter[type=field,filter=shorttitle]
+ }
+}
+
+\DeclareBiblistFilter{secondary}{
+ \filteror{
+ \filter[type=field,filter=shorthand]
+ \filter[type=field,filter=shortjournal]
+ \filter[type=field,filter=shortseries]
}
}
@@ -752,25 +831,65 @@
{}
{\iffieldundef{shortjournal}
{}
- {\ifcsdef{sbl\therefsection\strfield{shortjournal}=\strfield{journaltitle}}
+ {\ifcsdef{\therefsection-\strfield{shortjournal}=\strfield{journaltitle}}
{\skipentry}
- {\savefieldcs{journaltitle}{sbl\therefsection\strfield{shortjournal}=\strfield{journaltitle}}}}%
+ {\savefieldcs{journaltitle}{\therefsection-\strfield{shortjournal}=\strfield{journaltitle}}}}%
\iffieldundef{shorthand}
- {\iffieldundef{shortseries}
+ {}
+ {\ifcsdef{\therefsection-\strfield{shorthand}=\strfield{shorttitle}}
+ {\skipentry}
+ {\savefieldcs{shorthand}{\therefsection-\strfield{shorthand}=\strfield{shorttitle}}}}%
+ \ifentrytype{classictext}
+ {\iffieldundef{shorttitle}
{}
- {\ifcsdef{sbl\therefsection\strfield{shortseries}=\strfield{series}}
+ {\ifcsdef{\therefsection-\strfield{shorttitle}=\strname{author}\strfield{title}}
{\skipentry}
- {\savefieldcs{series}{sbl\therefsection\strfield{shortseries}=\strfield{series}}}}}
- {\ifcsdef{sbl\therefsection\strfield{shorthand}=\strfield{title}}
+ {\savefieldcs{shorttitle}{\therefsection-\strfield{shorttitle}=\strname{author}\strfield{title}}}}}
+ {}%
+ \ifboolexpr{
+ not test {\iffieldundef{shorthand}}
+ or
+ (
+ test {\ifentrytype{classictext}}
+ and
+ not test {\iffieldundef{shorttitle}}
+ )
+ }
+ {}
+ {\ifcsdef{\therefsection-\strfield{shortseries}=\strfield{series}}
{\skipentry}
- {\savefieldcs{shorthand}{sbl\therefsection\strfield{shorthand}=\strfield{title}}}}}}
-
-\DeclareSortingTemplate{abbreviations}{%
- \sort{%
- \field{shorthand}%
- \field{shortjournal}%
- \field{shortseries}%
- }%
+ {\savefieldcs{series}{\therefsection-\strfield{shortseries}=\strfield{series}}}}%
+ \iffieldequalstr{entrysubtype}{churchfather}
+ {\skipentry}
+ {}%
+ \ifboolexpr{
+ not test {\ifentrytype{classictext}}
+ and
+ not test {\iffieldundef{shorttitle}}
+ and
+ test {\iffieldundef{shortjournal}}
+ and
+ test {\iffieldundef{shorthand}}
+ and
+ test {\iffieldundef{shortseries}}
+ }
+ {\skipentry}
+ {}}}
+
+\DeclareSortingTemplate{abbreviations}{
+ \sort{
+ \field{sortshorthand}
+ \field{shorthand}
+ \field{shortjournal}
+ \field{shortseries}
+ \field{shorttitle}
+ }
+ \sort{
+ \field{journaltitle}
+ \field{author}
+ \field{title}
+ \field{series}
+ }
}
% ------------------------------------------------------------------
@@ -787,13 +906,14 @@
\step[fieldset=shorttitle, fieldvalue={$1}]
}
\map{
- \step[fieldsource=journaltitle, match=\regexp{(.*?):}, final]
- \step[fieldset=shortjournal, fieldvalue={$1}]
- }
- \map{
\step[fieldsource=revdtitle, match=\regexp{(.*?):}, final]
\step[fieldset=revdshorttitle, fieldvalue={$1}]
}
+ \map[overwrite=true]{
+ \step[notfield=sorttitle, final]
+ \step[fieldsource=title, match=\regexp{^(A|An|The)\s+(.+)}, final]
+ \step[fieldset=sorttitle, fieldvalue={$2}]
+ }
\map{
\pertype{suppbook}
\pertype{suppcollection}
@@ -826,16 +946,6 @@
\step[fieldset=journalsubtitle, origfieldval]
}
\map{
- \pertype{periodical}
- \step[fieldsource=shorttitle, final]
- \step[fieldset=shortjournal, origfieldval]
- }
- \map{
- \step[fieldsource=journalsubtitle, final]
- \step[fieldsource=journaltitle, final]
- \step[fieldset=shortjournal, origfieldval]
- }
- \map{
\step[fieldsource=entrysubtype, match=\regexp{ANRW}, final]
\step[fieldset=options, fieldvalue={skipbib=false}]
}
@@ -857,17 +967,32 @@
\pertype{ancienttext}
\pertype{classictext}
\step[fieldsource=related, final]
- \step[fieldset=relatedtype, fieldvalue=ancienttext]
\step[fieldsource=relatedoptions, match=\regexp{(.*)}]
\step[fieldset=relatedoptions, fieldvalue={skipbib=false,skipbiblist=false,}]
\step[fieldset=relatedoptions, fieldvalue={$1}, append]
+ \step[notfield=relatedtype, final]
+ \step[fieldset=relatedtype, fieldvalue=ancienttext]
}
\map[overwrite]{
\step[fieldsource=shortseries, final]
\step[fieldsource=shorthand, final]
\step[fieldsource=entrykey, match=\regexp{(.*)}]
\step[fieldset=xref, fieldvalue=series-$1]
- \step[entrynew=series-$1, entrynewtype=misc]
+ \step[entrynew=series-$1, entrynewtype=series]
+ \step[fieldsource=shortseries]
+ \step[fieldset=shortseries, origfieldval, entrytarget=series-$1]
+ \step[fieldsource=series]
+ \step[fieldset=series, origfieldval, entrytarget=series-$1]
+ \step[fieldset=options, fieldvalue={skipbib}, entrytarget=series-$1]
+ }
+ \map[overwrite]{
+ \pertype{classictext}
+ \step[fieldsource=shortseries, final]
+ \step[fieldsource=shorttitle, final]
+ \step[fieldset=sortshorthand, origfieldval]
+ \step[fieldsource=entrykey, match=\regexp{(.*)}]
+ \step[fieldset=xref, fieldvalue=series-$1]
+ \step[entrynew=series-$1, entrynewtype=series]
\step[fieldsource=shortseries]
\step[fieldset=shortseries, origfieldval, entrytarget=series-$1]
\step[fieldsource=series]
@@ -959,10 +1084,28 @@
{#2}}
\ExplSyntaxOn
-\cs_new_protected:Nn \sbl_ifinstringt:nnn {
- \tl_if_in:nnT {#2}{#1}{#3}}
-\cs_generate_variant:Nn \sbl_ifinstringt:nnn { non }
-\cs_new_eq:NN \IfInStringT \sbl_ifinstringt:non
+\cs_new_protected:Nn \sbl_ifinstringtf:nnnn {
+ \tl_if_in:nnTF {#2}{#1}{#3}{#4}}
+\cs_generate_variant:Nn \sbl_ifinstringtf:nnnn { nonn }
+\cs_new_eq:NN \IfInStringTF \sbl_ifinstringtf:nonn
+
+\DeclareExpandableDocumentCommand \iffirstcharsec { m m m }
+ {
+ \exp_args:Nnf \IfInStringTF { § } { \tl_use:N \tl_head:f { #1 } }
+ { #2 }
+ {
+ \exp_args:Nnf \IfInStringTF { \textsection } { \tl_use:N \tl_head:f { #1 } }
+ { #2 }
+ { #3 }
+ }
+ }
+
+\DeclareExpandableDocumentCommand \iffirstcharnum { m m m }
+ {
+ \exp_args:Nf \ifnumeral { \tl_use:N \tl_head:f { #1 } }
+ { #2 }
+ { #3 }
+ }
\ExplSyntaxOff
\newbibmacro*{setpostnotedelim}{%
@@ -971,38 +1114,52 @@
{}%
\iffieldundef{postnote}
{}
- {\IfInStringT{.}{\abx@field@postnote}
- {\renewcommand*{\postnotedelim}{\addspace}}%
- \IfInStringT{:}{\abx@field@postnote}
- {\renewcommand*{\postnotedelim}{\addspace}}%
- \IfInStringT{§}{\abx@field@postnote}
- {\renewcommand*{\postnotedelim}{\addspace}}%
- \IfInStringT{\textsection}{\abx@field@postnote}
- {\renewcommand*{\postnotedelim}{\addspace}}}}
+ {\iffirstcharnum{\abx@field@postnote}
+ {\ifboolexpr{
+ test {\ifentrytype{ancienttext}}
+ and
+ test {\usebibmacro{ifuseshorthand}}
+ }
+ {\renewcommand*{\postnotedelim}{\addspace}}
+ {}%
+ \ifboolexpr{
+ test {\ifentrytype{classictext}}
+ and
+ not test {\iffieldundef{shorttitle}}
+ }
+ {\renewcommand*{\postnotedelim}{\addspace}}
+ {}%
+ \IfInStringTF{.}{\abx@field@postnote}
+ {\renewcommand*{\postnotedelim}{\addspace}}{}%
+ \IfInStringTF{:}{\abx@field@postnote}
+ {\renewcommand*{\postnotedelim}{\addspace}}{}}
+ {\iffirstcharsec{\abx@field@postnote}
+ {\renewcommand*{\postnotedelim}{\addspace}}
+ {}}}}
\newbibmacro*{setaltpostnotedelim}{%
\iffieldundef{altpostnote}
{}
- {\IfInStringT{.}{\abx@field@altpostnote}
- {\renewcommand*{\postnotedelim}{\addspace}}%
- \IfInStringT{:}{\abx@field@altpostnote}
- {\renewcommand*{\postnotedelim}{\addspace}}%
- \IfInStringT{§}{\abx@field@altpostnote}
- {\renewcommand*{\postnotedelim}{\addspace}}%
- \IfInStringT{\textsection}{\abx@field@altpostnote}
- {\renewcommand*{\postnotedelim}{\addspace}}}}
+ {\IfInStringTF{.}{\abx@field@altpostnote}
+ {\renewcommand*{\postnotedelim}{\addspace}}{}%
+ \IfInStringTF{:}{\abx@field@altpostnote}
+ {\renewcommand*{\postnotedelim}{\addspace}}{}%
+ \IfInStringTF{§}{\abx@field@altpostnote}
+ {\renewcommand*{\postnotedelim}{\addspace}}{}%
+ \IfInStringTF{\textsection}{\abx@field@altpostnote}
+ {\renewcommand*{\postnotedelim}{\addspace}}{}}}
\newbibmacro*{setpagesdelim}{%
\iffieldundef{pages}
{}
- {\IfInStringT{.}{\abx@field@pages}
- {\setunit{\addspace}}%
- \IfInStringT{:}{\abx@field@pages}
- {\setunit{\addspace}}%
- \IfInStringT{§}{\abx@field@pages}
- {\setunit{\addspace}}%
- \IfInStringT{\textsection}{\abx@field@pages}
- {\setunit{\addspace}}}}
+ {\IfInStringTF{.}{\abx@field@pages}
+ {\setunit{\addspace}}{}%
+ \IfInStringTF{:}{\abx@field@pages}
+ {\setunit{\addspace}}{}%
+ \IfInStringTF{§}{\abx@field@pages}
+ {\setunit{\addspace}}{}%
+ \IfInStringTF{\textsection}{\abx@field@pages}
+ {\setunit{\addspace}}{}}}
% ------------------------------------------------------------------
% JOINING WORD MACROS
@@ -1123,6 +1280,24 @@
{\printtext[maintitle]{\printfield[titlecase]{shortmaintitle}}}%
\newunit}
+\newbibmacro*{classictexttitle}{%
+ \ifboolexpr{%
+ not togl {blx@useshorttitle}
+ or
+ test {\iffieldundef{shorttitle}}
+ }
+ {\iffieldundef{title}
+ {}
+ {\printtext[title]{%
+ \printfield[titlecase]{title}%
+ \setunit{\subtitlepunct}%
+ \printfield[titlecase]{subtitle}}%
+ \newunit
+ \printfield{titleaddon}%
+ \usebibmacro{language}}}
+ {\printtext[shorttitle]{%
+ \bibhyperlink{\strfield{shorttitle}\strname{author}}{\thefield{shorttitle}}}}}
+
\renewbibmacro*{title}{%
\ifciteseen
{\usebibmacro{shorttitle}}
@@ -1226,14 +1401,17 @@
\newbibmacro*{shortjournal}{%
\iffieldundef{shortjournal}
- {\printfield{journaltitle}}
+ {\printtext[journaltitle]{%
+ \printfield[titlecase]{journaltitle}%
+ \setunit*{\subtitlepunct}%
+ \printfield[titlecase]{journalsubtitle}}}
{\printtext[shortjournal]{%
\bibhyperlink{\strfield{shortjournal}}{\thefield{shortjournal}}}}}
\newbibmacro*{shortjournal+issue}{%
\usebibmacro{shortjournal}%
\setunit{\addspace}%
- \usebibmacro{series+volume+number+eid}%
+ \usebibmacro{series+volume+number}%
\ifboolexpr{
not test {\ifnameundef{editor}}
or
@@ -1262,7 +1440,8 @@
test {\iffieldundef{date}}
}
{\usebibmacro{setpagesdelim}}
- {}}
+ {}%
+ \usebibmacro{eid}}
\renewbibmacro*{issue+date}{%
\ifboolexpr{
@@ -1296,7 +1475,7 @@
\usebibmacro{date}}}%
\setunit{\addcolon\space}}}}
-\newbibmacro*{series+volume+number+eid}{%
+\newbibmacro*{series+volume+number}{%
\iffieldundef{series}
{}
{\newunit
@@ -1304,9 +1483,7 @@
\newunit}%
\printfield{volume}%
\setunit*{\addperiod}%
- \printfield{number}%
- \setunit{\addcomma\space}%
- \printfield{eid}}
+ \printfield{number}}
\newbibmacro{inissuetitle}{%
\iffieldundef{issuetitle}
@@ -1325,7 +1502,7 @@
{\printtext[issuetitle]{\printfield[titlecase]{shortissuetitle}}}%
\newunit}
-\newbibmacro{issuetitle}{%
+\newbibmacro*{issuetitle}{%
\iffieldundef{issuetitle}
{}
{\ifciteseen
@@ -1335,6 +1512,10 @@
\setunit*{\subtitlepunct}%
\printfield[titlecase]{issuesubtitle}}}}}
+\newbibmacro*{eid}{%
+ \printfield{eid}%
+ \setunit*{\addcomma\space}}
+
% ------------------------------------------------------------------
% NAME MACROS
% ------------------------------------------------------------------
@@ -1699,15 +1880,13 @@
{}}
\newbibmacro*{byauthor/byeditor+others/bytranslator+others}{%
- \iffieldundef{title}
- {}
- {\usebibmacro{byauthor}%
+ \usebibmacro{byauthor}%
+ \newunit
+ \usebibmacro{ifbooktitleormaintitle}
+ {\usebibmacro{byeditor/bytranslator}}
+ {\usebibmacro{byeditor+others}%
\newunit
- \usebibmacro{ifbooktitleormaintitle}
- {\usebibmacro{byeditor/bytranslator}}
- {\usebibmacro{byeditor+others}%
- \newunit
- \usebibmacro{bytranslator+others}}}}
+ \usebibmacro{bytranslator+others}}}
\newbibmacro*{bybookeditor}{%
\ifnameundef{bookeditor}
@@ -2386,10 +2565,11 @@
\usedriver
{\renewbibmacro*{related:init}{}%
\ifbibliography
- {\renewbibmacro*{parens+publisher+location+date}{%
- \newunit
- \usebibmacro{publisher+location+date}}}
- {}}
+ {}
+ {\renewcommand*{\newunitpunct}{\addsemicolon\space}}%
+ \renewbibmacro*{parens+publisher+location+date}{%
+ \newunit
+ \usebibmacro{publisher+location+date}}}
{\ifbibliography
{\thefield{entrytype}}
{cite:\thefield{entrytype}}}}}
@@ -2421,23 +2601,27 @@
\newtoggle{blx@testpostnotedelim}
\newbibmacro*{volume+part+postnote}{%
- \usebibmacro{volume}%
- \iffieldundef{part}
- {}
- {\setunit{\addperiod}%
- \printfield{part}}%
- \iftoggle{blx@testpostnotedelim}{\usebibmacro{setpostnotedelim}}{}%
- \ifbool{usevolpostnotedelim}
- {\setunit{\volpostnotedelim}}
- {\setunit{\postnotedelim}}%
\ifboolexpr{
test {\ifciteseen}
- or
- test {\iffieldundef{pages}}
+ and
+ test {\iffieldundef{postnote}}
}
- {\printfield{postnote}}
- {\usebibmacro{pages}}%
- \global\booltrue{suppresspostnote}}
+ {}
+ {\usebibmacro{volume}%
+ \iffieldundef{part}
+ {}
+ {\setunit{\addperiod}%
+ \printfield{part}}%
+ \iftoggle{blx@testpostnotedelim}{\usebibmacro{setpostnotedelim}}{}%
+ \ifbool{usevolpostnotedelim}
+ {\setunit{\volpostnotedelim}}
+ {\setunit{\postnotedelim}}%
+ \ifciteseen
+ {\printfield{postnote}}
+ {\iffieldundef{pages}
+ {\printfield{postnote}}
+ {\usebibmacro{pages}}}%
+ \global\booltrue{suppresspostnote}}}
\newbibmacro*{classic:translator+series}{%
\ifnameundef{translator}
@@ -2448,7 +2632,10 @@
\iftoggle{blx@useseries}
{\newunit
\usebibmacro{shortseries}}
- {}}}}
+ {}%
+ \usebibmacro{setaltpostnotedelim}%
+ \setunit{\postnotedelim}%
+ \printfield{altpostnote}}}}
% ------------------------------------------------------------------
% ALTERNATE POSTNOTE MACROS
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.pdf
index 3f2859021f..2d7f40a15e 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.tex b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.tex
index 02ea67f292..35caf8365a 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl.tex
@@ -11,7 +11,7 @@
\usepackage{framed}
\usepackage{enumitem}
-\usepackage[style=sbl,indexing=cite,idemtracker=false,ibidtracker=false]{biblatex}
+\usepackage[style=sbl,indexing=cite]{biblatex}
\addbibresource{biblatex-sbl.bib}
\hypersetup{colorlinks,citecolor=spot}
@@ -143,15 +143,16 @@
\biblatexsbl provides support to \biblatex and LaTeX for citations,
bibliography, and a list of abbreviations in the style recommended by the
Society of Biblical Literature (\citeshorthand{SBL}). The style conforms to
-the second edition of the \cite{SBLHS}.
-
-The style supports all examples given in the handbook (see
-\sty{biblatex-sbl-examples.pdf}). Shorthand citations and a list of
-abbreviations containing journals, series, and shorthands are handled
-automatically. Repeated authors in the bibliography are replaced by a
-horizontal line. \emph{Ibidem} and \emph{idem} is enabled by default. Indexing
-of names is supported, but not enabled by default. Only note style citations,
-not Author-Date citations are supported. Primary sources can be cited in
+the second edition of the \cite{SBLHS} and includes updates from the
+\citetitle*{sblhs2.com} blog \autocite{sblhs2.com}.
+
+The style supports all examples given in the handbook and any relevant updates
+given on the Blog (see \sty{biblatex-sbl-examples.pdf}). Shorthand citations
+and a list of abbreviations containing journals, series, and shorthands are
+handled automatically. Repeated authors in the bibliography are replaced by a
+horizontal line. \emph{Ibidem}, \emph{idem} and indexing of names are
+supported, but not enabled by default. Only note style citations,
+not Author-Date citations, are supported. Primary sources can be cited in
parentheses. \biblatexsbl is compatible with \biblatex's support for
\sty{hyperref}.
@@ -211,7 +212,7 @@ and Hebrew usage with \sty{babel}.
\begin{quote}
\begin{lstlisting}[style=latex]{}
-\usepackage[nil,bidi=default]{babel}
+\usepackage[nil,bidi=default]{babel}% consider bidi=basic for lualatex
\usepackage{csquotes}
\babelprovide[import=en-US,main]{american}
\babelprovide[import=he]{hebrew}
@@ -275,17 +276,35 @@ e.g.,
\sampleparencite[2.233-235]{josephus:ant}
\end{snugshade}
-\cmditem{journalcite}{key}
-\cmditem{seriescite}{key}
-\cmditem{shorthandcite}{key}
-
-\cmd{journalcite}, \cmd{seriescite}, and \cmd{shorthandcite} inserts the
+\cmditem{citefullauthor}[prenote][postnote]{key}
+\cmditem{citefullauthor*}[prenote][postnote]{key}
+\cmditem{Citefullauthor}[prenote][postnote]{key}
+\cmditem{Citefullauthor*}[prenote][postnote]{key}
+
+These commands print the full names of the authors. Strictly speaking, it
+prints the \bibfield{labelname} list in the format of a first citation, which
+may be the \bibfield{author}, the \bibfield{editor}, or the
+\bibfield{translator}. \cmd{Citefullauthor} is similar to \cmd{citefullauthor}
+but capitalizes the name prefix of the first name in the citation if the
+\opt{useprefix} option is enabled, provided that there is a name prefix. The
+starred variants effectively force \opt{maxcitenames} to 1 for just this
+command on so only print the first name in the \bibfield{labelname} list
+(potentially followed by the “et al” string if there are more names). This
+allows more natural textual flow when referring to a paper in the singular
+when otherwise \cmd{citefullauthor} would generate a (naturally plural) list
+of names.
+
+\cmditem{citejournal}{key}
+\cmditem{citeseries}{key}
+\cmditem{citeshorthand}{key}
+
+\cmd{citejournal}, \cmd{citeseries}, and \cmd{citeshorthand} inserts the
respective abbreviation into the text and also adds it to the list of
abbreviations. The abbreviation is hyperlinked to the list of abbreviations if
the \sty{hyperref} package is loaded.
-These commands ignore the \bibfield{prenote} and \bibfield{postnote} fields,
-so can safely be used anywhere within a database entry.
+These commands do not take a \bibfield{prenote} or \bibfield{postnote} field,
+and can safely be used nested within a citation.
\cmditem{printbiblist}
@@ -316,8 +335,8 @@ custom ones outlined below.
\optitem[false]{accessdate}{\opt{true}, \opt{false}}
The \cite{SBLHS} discourages the use of access
-dates.\autocite[See][§6.1.6, 84]{SBLHS} If they are required this option can be
-passed to \biblatex.
+dates \autocite[See][§6.1.6, 84]{SBLHS}. If they are required this option can
+be passed to \biblatex.
\optitem[sbl]{citepages}{\opt{sbl}, \opt{permit}, \opt{omit}, \opt{separate}}
@@ -341,7 +360,7 @@ the first time an entry is cited.
The one exception to this is the \bibtype{incommentary} entry type which
always sets \opt{citepages} to \opt{omit} (see below) when \bibfield{volume}
- is defined.\autocite[See][§1.3.3.2]{SBLHS:studentsupp}
+ is defined \autocite[See][§1.3.3.2]{SBLHS:studentsupp}.
\item[permit] The \bibfield{postnote} is printed in parentheses after the
\bibfield{pages} field. e.g.,
@@ -397,7 +416,7 @@ controls the format of the \bibfield{eprintdate}.
The \emph{Student Supplement for the} \cite{SBLHS} permits two styles for the
bibliography entry for Bible dictionaries, encyclopaedias, and multivolume
commentaries for the entire Bible by multiple
-authors.\autocite[4–5]{SBLHS:studentsupp}
+authors \autocite[4–5]{SBLHS:studentsupp}.
This option applies to \bibtype{inreference} and \bibtype{incommentary}
entry types.
@@ -419,7 +438,7 @@ entry types.
\end{snugshade}
\end{valuelist}
-\optitem[constrict]{ibidtracker}{\opt{true}, \opt{false}, \opt{context},
+\optitem[false]{ibidtracker}{\opt{true}, \opt{false}, \opt{context},
\opt{strict}, \opt{constrict}}
This option controls the \emph{ibidem} tracker. The possible choices are:
@@ -444,17 +463,19 @@ This option controls the \emph{ibidem} tracker. The possible choices are:
the same footnote or in immediately consecutive footnotes.
\end{valuelist}
-\boolitem[false]{ibidpage}
+\boolitem[true]{ibidpage}
The scholarly abbreviation \emph{ibidem} is sometimes taken to mean both ‘same
author + same title’ and ‘same author + same title + same page’ in traditional
-citation schemes. By default, this is not the case with this style because it
-may lead to ambiguous citations. If you prefer the wider interpretation of
-\emph{ibidem}, set the package option \opt{ibidpage=true} or simply
-\opt{ibidpage} in the preamble. The default setting is \opt{ibidpage=false}.
+citation schemes. In line with SBL recommendations, this style uses the
+latter.\footnote{See
+\url{https://sblhs2.com/2017/01/05/subsequent-bibliographic-references/}.} If
+you prefer the narrower interpretation of \emph{ibidem}, set the package
+option \opt{ibidpage=false} in the preamble. The default setting is
+\opt{ibidpage=true}.
-\optitem[constrict]{idemtracker}{\opt{true}, \opt{false}, \opt{context},
-\opt{strict}, \opt{constrict}}
+\optitem[sbl]{idemtracker}{\opt{true}, \opt{false}, \opt{context},
+\opt{strict}, \opt{constrict}, \opt{citation}, \opt{sbl}}
This option controls the \emph{idem} tracker. The possible choices are:
@@ -470,7 +491,12 @@ This option controls the \emph{idem} tracker. The possible choices are:
\item[constrict] This mode is similar to \opt{context} with one additional
condition: a reference in a footnote will only be considered as unambiguous
if the current citation and the previous citation are given in the same
- footnote.
+ footnote or in immediately consecutive footnotes.
+\item[citation] This option only allows \emph{idem} within a citation or
+ footnote. This is the preferred option if you intend to use \emph{idem}.
+\item[sbl] This option is similar to \opt{citation}, but does not actually
+ use \emph{idem}. Rather, it uses the author family name in subsequent
+ citations. This is the default option to comply with SBL style.
\end{valuelist}
\optitem[true]{pagetracker}{\opt{true}, \opt{false}}
@@ -886,6 +912,10 @@ This field holds the month component of the \bibfield{eprintdate} field.
This field holds the year component of the \bibfield{eprintdate} field.
+\listitem{mainauthor}{name}
+
+The author(s) of the \bibfield{maintitle}.
+
\listitem{maineditor}{name}
The editor(s) of the \bibfield{maintitle}.
@@ -966,6 +996,14 @@ automatically inserted into the list of abbreviations.
The \bibfield{title} in abridged form. This is printed instead of the full
title on subsequent citations.
+\fielditem{sorttitle}{literal}
+
+A field used to modify the sorting order of the bibliography. If present, this
+field is used instead of the title field when sorting the bibliography. This
+field is automatically populated if it doesn't exist and the \bibfield{title}
+field begins with `A', `An', or `The' so that these articles do not affect
+sorting.
+
\listitem{withauthor}{name}
The author(s) who assist the \bibfield{author}. See \bibfield{witheditortype},
@@ -1251,6 +1289,14 @@ e.g.,
\section{Important Changes}
+\subsection*{0.12\quad 2020-11-04}
+
+\begin{itemize}
+ \item Ibid.\@ and idem are no longer used by default.
+ \item Only the author family name is printed for subsequent citations of a
+ different work by the same author within a footnote or citation.
+\end{itemize}
+
\subsection*{0.11\quad 2018-12-13}
\begin{itemize}
@@ -1269,7 +1315,7 @@ e.g.,
\begin{itemize}[itemsep=0pt]
\item Support and require \biblatex 3.11.
- \item Use ibid and idem by default.
+ \item Use ibid.\@ and idem by default.
\item \sty{polyglossia} is no longer supported. You should use \sty{babel}
instead.
\end{itemize}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/english-sbl.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/english-sbl.lbx
index e56c07368a..88b94e5bbe 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/english-sbl.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/english-sbl.lbx
@@ -26,7 +26,8 @@
commonera = {{CE}{CE}},
beforecommonera = {{BCE}{BCE}},
annodomini = {{AD}{AD}},
- beforechrist = {{BC}{BC}}
+ beforechrist = {{BC}{BC}},
+ article = {{article}{art\adddot}},
}
\DeclareBibliographyExtras{%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/german-sbl.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/german-sbl.lbx
index cb98da0185..a6d6fe8b09 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/german-sbl.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/german-sbl.lbx
@@ -25,4 +25,5 @@
beforecommonera = {{v\adddotspace u\adddotspace Z\adddot}{v\adddotspace u\adddotspace Z\adddot}},
annodomini = {{n\adddotspace Chr\adddot}{n\adddotspace Chr\adddot}},
beforechrist = {{v\adddotspace Chr\adddot}{v\adddotspace Chr\adddot}},
+ article = {{artikel}{art\adddot}},
}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl-paper.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl-paper.pdf
index a297d85e2e..91e1112207 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl-paper.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl-paper.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl-paper.sty b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl-paper.sty
index 65a1884b92..2a44292b3e 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl-paper.sty
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl-paper.sty
@@ -1,4 +1,4 @@
-%Copyright 2015-2018 David Purton
+%Copyright 2015-2020 David Purton
%
%This work may be distributed and/or modified under the
%conditions of the LaTeX Project Public License, either version 1.3
@@ -13,7 +13,7 @@
%The Current Maintainer of this work is David Purton.
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{sbl-paper}
- [2018/05/24 Society of Bibilical Literature Paper Style (DCP)]
+ [2020/11/04 Society of Bibilical Literature Paper Style (DCP)]
% Load required packages
@@ -565,7 +565,7 @@
\biblerefmap{Timothy2}{02@\br@newtestament !16}
\biblerefmap{Titus}{02@\br@newtestament !17}
\biblerefmap{Phlm}{02@\br@newtestament !18}
-\biblerefmap{Phlemon}{02@\br@newtestament !18}
+\biblerefmap{Philemon}{02@\br@newtestament !18}
\biblerefmap{Heb}{02@\br@newtestament !19}
\biblerefmap{Hebrews}{02@\br@newtestament !19}
\biblerefmap{Jas}{02@\br@newtestament !20}
@@ -581,4 +581,14 @@
\biblerefmap{Rev}{02@\br@newtestament !27}
\biblerefmap{Revelation}{02@\br@newtestament !27}
+
+% Style Options
+
+\DeclareOption{jblstyle}{%
+ \renewcommand\@makefntext[1]{%
+ \parindent\footnotemargin\normalsize\@thefnmark.\@\space\footnotelayout #1}
+ \renewcommand{\footnotelayout}{\raggedright\normalsize\doublespacing}}
+
+\ProcessOptions\relax
+
\endinput
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl-paper.tex b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl-paper.tex
index 633965f8bd..f099fbca63 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl-paper.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl-paper.tex
@@ -21,7 +21,11 @@
% Language and font set up
% Note: Polyglossia is *not* well supported
\ifxetexorluatex
- \usepackage[nil,bidi=default]{babel}
+ \ifluatex
+ \usepackage[nil,bidi=basic]{babel}
+ \else
+ \usepackage[nil,bidi=default]{babel}
+ \fi
\babelprovide[import=en-US,main]{american}
\babelprovide[import=he]{hebrew}
\babelprovide[import=el]{polutonikogreek}
@@ -42,6 +46,7 @@
% Load main style
% Pass indexing=cite to biblatex (if you want author indexing)
\PassOptionsToPackage{indexing=cite}{biblatex}
+% Pass jblstyle to sbl-paper if you want double spaced footnotes
\usepackage{sbl-paper}
% Add your bib resource here
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl.bbx
index 4c9ee7f50d..3afa6beffc 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl.bbx
@@ -65,7 +65,9 @@
\usebibmacro{bymaintranslator+others}}%
\usebibmacro{publisher+location+date}%
\newunit}
- {\DeclareFieldFormat[ancienttext]{title}{\mkbibemph{##1}}%
+ {\iffieldequalstr{entrysubtype}{primarysource}
+ {}
+ {\DeclareFieldFormat[ancienttext]{title}{\mkbibemph{##1}}}%
\clearfield{related}%
\usedriver{}{book}}%
\usebibmacro{finentry}%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl.cbx
index bb745ef0b8..6e67fb24f4 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl.cbx
@@ -130,11 +130,23 @@
\sloppy
\hangindent 6em\rlap
{\printfield[shorthandwidth]{shortjournal}%
- \iffieldundef{shorthand}
- {\printfield[shorthandwidth]{shortseries}}
- {\iffieldsequal{shorthand}{shorttitle}
- {\printtext{\mkbibemph{\printfield[shorthandwidth]{shorthand}}}}
- {\printfield[shorthandwidth]{shorthand}}}}%
+ \iffieldsequal{shorthand}{shorttitle}
+ {\printtext{\mkbibemph{\printfield[shorthandwidth]{shorthand}}}}
+ {\printfield[shorthandwidth]{shorthand}}%
+ \ifentrytype{classictext}
+ {\printfield{shorttitle}}
+ {}%
+ \ifboolexpr{
+ not test {\iffieldundef{shorthand}}
+ or
+ (
+ test {\ifentrytype{classictext}}
+ and
+ not test {\iffieldundef{shorttitle}}
+ )
+ }
+ {}
+ {\printfield{shortseries}}}%
\renewcommand*{\bibhypertarget}[2]{##2}%
\hskip 6em \setunit{}\usedriver{}{abbreviations}\par
}
@@ -294,23 +306,50 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\citeseries}
- {}
+\newrobustcmd*{\Citefullauthor}{%
+ \@ifstar{\bibsentence\citefullauthor*}{\bibsentence\citefullauthor}}
+
+\DeclareCiteCommand{\citefullauthor}
+ {\boolfalse{citetracker}%
+ \boolfalse{pagetracker}%
+ \usebibmacro{prenote}}
+ {\ifciteindex
+ {\indexnames{labelname}}
+ {}%
+ \printnames[given-family]{labelname}}
+ {\multicitedelim}
+ {\usebibmacro{postnote}}
+
+\DeclareCiteCommand*{\citefullauthor}
+ {\boolfalse{citetracker}%
+ \boolfalse{pagetracker}%
+ \usebibmacro{prenote}}
+ {\ifciteindex
+ {\indexnames{labelname}}
+ {}%
+ \printnames[given-family][1-1]{labelname}}
+ {\multicitedelim}
+ {\usebibmacro{postnote}}
+
+% Thanks to @moewe (https://tex.stackexchange.com/a/497548/87678)
+\newcommand*{\DeclareNestableCiteCommand}[2]{%
+ \newcommand*{#1}[1]{%
+ \blx@xsanitizeafter\blx@nocite@do{##1}%
+ \blx@ifdata{##1}
+ {\begingroup
+ \blx@blxinit
+ \entrydata{##1}{#2}%
+ \endgroup}
+ {\abx@missing@entry{##1}}}}
+
+\DeclareNestableCiteCommand{\citeseries}
{\usebibmacro{shortseries}}
- {}
- {}
-\DeclareCiteCommand{\citejournal}
- {}
+\DeclareNestableCiteCommand{\citejournal}
{\usebibmacro{shortjournal}}
- {}
- {}
-\DeclareCiteCommand{\citeshorthand}
- {}
+\DeclareNestableCiteCommand{\citeshorthand}
{\usebibmacro{shorthand}}
- {}
- {}
\newbibmacro*{textcite}{%
\ifnameundef{labelname}
@@ -457,9 +496,9 @@
{\let\ifciteseen\@firstoftwo}%
\usebibmacro{author}%
\newunit
- \usebibmacro{shorttitlenohyperlink}%
\iffieldequalstr{entrysubtype}{churchfather}
- {\setunit{\addspace}%
+ {\usebibmacro{shorttitlenohyperlink}%
+ \setunit{\addspace}%
\printfield{altpostnote}%
\DeclareFieldFormat{related}{\mkbibparens{##1}}%
\renewcommand*{\begrelateddelim}{\addspace}%
@@ -467,7 +506,8 @@
\usebibmacro{related:init}%
\usebibmacro{related}%
\global\toggletrue{relatedseen}}
- {\clearfield{pages}%
+ {\usebibmacro{classictexttitle}%
+ \clearfield{pages}%
\usebibmacro{volume+part+postnote}%
\usebibmacro{classic:translator+series}}%
\usebibmacro{finentry}}
@@ -663,11 +703,13 @@
{\usebibmacro{xrefshortmaintitle}%
\iffieldundef{volume}
{}
- {\setunit{\addspace}%
- \printfield{volume}%
- \setunit*{\addperiod}%
- \printfield{part}%
- \global\booltrue{usevolpostnotedelim}}}
+ {\iffieldpages{postnote}
+ {\setunit{\addspace}%
+ \printfield{volume}%
+ \setunit*{\addperiod}%
+ \printfield{part}%
+ \global\booltrue{usevolpostnotedelim}}
+ {}}}
{\printfield{note}%
\newunit
\usebibmacro{xrefshortmaintitle}%
@@ -743,11 +785,13 @@
{\usebibmacro{xrefshortmaintitle+xrefshortbooktitle}%
\iffieldundef{volume}
{}
- {\setunit{\addspace}%
- \printfield{volume}%
- \setunit*{\addperiod}%
- \printfield{part}%
- \global\booltrue{usevolpostnotedelim}}}
+ {\iffieldpages{postnote}
+ {\setunit{\addspace}%
+ \printfield{volume}%
+ \setunit*{\addperiod}%
+ \printfield{part}%
+ \global\booltrue{usevolpostnotedelim}}
+ {}}}
{\usebibmacro{title}%
\newunit
\printfield{note}%
@@ -773,11 +817,13 @@
{\newunit
\iffieldundef{volume}
{}
- {\newunit
- \global\booltrue{usevolpostnotedelim}%
- \printfield{volume}%
- \setunit*{\addperiod}%
- \printfield{part}}}
+ {\iffieldpages{postnote}
+ {\newunit
+ \global\booltrue{usevolpostnotedelim}%
+ \printfield{volume}%
+ \setunit*{\addperiod}%
+ \printfield{part}}
+ {}}}
{\newunit
\printfield{note}%
\newunit
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl.dbx
index 02f0b2ed21..53ff00bc0f 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl.dbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/sbl.dbx
@@ -2,8 +2,12 @@
\DeclareDatamodelEntrytypes{
ancienttext,
+ classictext,
conferencepaper,
+ mvcommentary,
incommentary,
+ lexicon,
+ mvlexicon,
inlexicon,
review,
seminarpaper}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/spanish-sbl.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/spanish-sbl.lbx
index e6a8345dfa..d41cf64e04 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-sbl/spanish-sbl.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-sbl/spanish-sbl.lbx
@@ -25,5 +25,6 @@
commonera = {{e\adddotspace c\adddot}{e\adddotspace c\adddot}},
beforecommonera = {{a\adddotspace e\adddotspace c\adddot}{a\adddotspace e\adddotspace c\adddot}},
annodomini = {{d\adddotspace C\adddot}{d\adddotspace C\adddot}},
- beforechrist = {{a\adddotspace C\adddot}{a\adddotspace C\adddot}}
+ beforechrist = {{a\adddotspace C\adddot}{a\adddotspace C\adddot}},
+ article = {{art{\'i}culo}{art\adddot}},
}
diff --git a/macros/latex/contrib/fgruler/fgruler.dtx b/macros/latex/contrib/fgruler/fgruler.dtx
index 385795b7a8..855e1411a6 100644
--- a/macros/latex/contrib/fgruler/fgruler.dtx
+++ b/macros/latex/contrib/fgruler/fgruler.dtx
@@ -21,13 +21,15 @@
\ProvidesFile{fgruler.dtx}
%</driver>
%<package>\NeedsTeXFormat{LaTeX2e}[2020/10/01]
-%<package>\ProvidesPackage{fgruler}[2020/10/26 v1.2 Package for drawing rulers on the foreground or in the text]
+%<package>\ProvidesPackage{fgruler}[2020/11/04 v1.3 Package for drawing rulers on the foreground or in the text]
%
%<*driver>
\documentclass{ltxdoc}
\OnlyDescription
\usepackage[a4paper,margin=25mm,marginparwidth=19mm,marginparsep=5mm,headsep=5mm,headheight=4mm,footskip=10mm]{geometry}
\usepackage[pdfstartview=FitH,colorlinks,allcolors=black,bookmarksnumbered,hyperfootnotes=false]{hyperref}
+\usepackage[T1]{fontenc}
+\usepackage{lmodern}
\usepackage[english]{babel}
\usepackage{listings,fontawesome,fancyvrb}
\usepackage[type=none,color=red!80!black]{fgruler}
@@ -64,7 +66,7 @@ keepspaces]}
%
% \GetFileInfo{fgruler.sty}
%
-% \title{The {\bfseries\sffamily fgruler} package\\{\large v1.2 (2020/10/26)}}
+% \title{The {\bfseries\sffamily fgruler} package\\{\large v1.3 (2020/11/04)}}
% \author{Tibor T\'{o}m\'{a}cs\\{\normalsize\url{tomacs.tibor@uni-eszterhazy.hu}}}
% \date{}
% \maketitle
@@ -102,57 +104,59 @@ keepspaces]}
% By default, the \texttt{fgruler} package draws a square ruler on the foreground of every page. The following package options set the parameters of these rulers.
% \begin{description}
% \item\commandinline|unit=!<unit>!|\\
-% Ruler unit.
+% Ruler unit. The \commandinline|!<unit>!| legal values:
% \begin{description}
-% \item\commandinline|!<unit>!| values:\\
-% \commandinline|cm| Metric ruler (centimeter). Default value.\\
-% \commandinline|in| English ruler (inch).
+% \item\commandinline|cm| Metric ruler (centimeter). Default value.
+% \item\commandinline|in| English ruler (inch).
% \end{description}
%
% \item\commandinline|type=!<type name>!|\\
-% Origin and directions.
+% Origin, directions and lengths of the ruler. The \commandinline|!<type name>!| legal values:
% \begin{description}
-% \item\commandinline|!<type name>!| values:\\
-% \commandinline|upperleft | Origin: upper left corner. Directions: down and right. Default value.\\
-% \commandinline|upperright| Origin: upper right corner. Directions: down and left.\\
-% \commandinline|lowerleft | Origin: lower left corner. Directions: up and right.\\
-% \commandinline|lowerright| Origin: lower right corner. Directions: up and left.\\
-% \commandinline|none | Not drawing ruler.\\
-% \commandinline|user | Each \commandinline|!<unit>!|--\commandinline|!<type name>!| pair activates an \commandinline|\fgruler@!<unit>!@!<type name>!@fg| command. You can control the effect of this option by redefining the \commandinline|\fgruler@!<unit>!@user@fg| commands, which are empty in the default case. (See \ref{example:user1}, \ref{example:user2} and \ref{example:user3} examples.)
+% \item\commandinline|upperleft | Default value. Origin: upper left corner of the paper. Directions: down and right. Lengths: paper sizes.
+% \item\commandinline|upperright | Origin: upper right corner of the paper. Directions: down and left. Lengths: paper sizes.
+% \item\commandinline|lowerleft | Origin: lower left corner of the paper. Directions: up and right. Lengths: paper sizes.
+% \item\commandinline|lowerright | Origin: lower right corner of the paper. Directions: up and left. Lengths: paper sizes.
+% \item\commandinline|upperleftT | Origin: upper left corner of the text area. Directions: down and right. Lengths: text area sizes.
+% \item\commandinline|upperrightT| Origin: upper right corner of the text area. Directions: down and left. Lengths: text area sizes.
+% \item\commandinline|lowerleftT | Origin: lower left corner of the text area. Directions: up and right. Lengths: text area sizes.
+% \item\commandinline|lowerrightT| Origin: lower right corner of the text area. Directions: up and left. Lengths: text area sizes.
+% \item\commandinline|none| Not drawing ruler.
+% \item\commandinline|user| Each \commandinline|!<unit>!|--\commandinline|!<type name>!| pair activates an \commandinline|\fgruler@!<unit>!@!<type name>!@fg| command, which is equivalent to \commandinline|\fgrulertype{!<unit>!}{!<type name>!}|.\\
+% You can control the effect of this option by redefining the \commandinline|\fgruler@!<unit>!@user@fg| commands, which are empty in the default case.\\
+% \commandinline|\def\fgruler@cm@user@fg{!<code>!}| is equivalent to \commandinline|\fgrulerdefusercm{!<code>!}|.\\
+% Similarly, \commandinline|\def\fgruler@in@user@fg{!<code>!}| is equivalent to \commandinline|\fgrulerdefuserin{!<code>!}|.\\
+% See \ref{example:user-first}--\ref{example:user-last} examples.
% \end{description}
%
% \item\commandinline|hshift=!<length>!|\\
-% Horizontal shift.
-% The shift direction is right, if the \commandinline|!<type name>!| is \verb|upperleft| or \verb|lowerleft|, otherwise it is left.\\
-% Default: \verb|hshift=0cm|.\\ The \commandinline|!<length>!| is saved in \commandinline|\fgruler@hshift|.
+% Horizontal shift of the ruler, if the \commandinline|!<type name>!| is \verb|upperleft|, \verb|lowerleft|, \verb|upperright| or \verb|lowerright|.
+% The shift direction is right, if the \commandinline|!<type name>!| is \verb|upperleft| or \verb|lowerleft|.
+% The shift direction is left, if the \commandinline|!<type name>!| is \verb|upperright| or \verb|lowerright|.
+% Default: \verb|hshift=0cm|.
%
% \item\commandinline|vshift=!<length>!|\\
-% Vertical shift.
-% The shift direction is down, if the \commandinline|!<type name>!| is \verb|upperleft| or \verb|upperright|, otherwise it is up.\\
-% Default: \verb|vshift=0cm|.\\ The \commandinline|!<length>!| is saved in \commandinline|\fgruler@vshift|.
+% Vertical shift of the ruler, if the \commandinline|!<type name>!| is \verb|upperleft|, \verb|lowerleft|, \verb|upperright| or \verb|lowerright|.
+% The shift direction is down, if the \commandinline|!<type name>!| is \verb|upperleft| or \verb|upperright|.
+% The shift direction is up, if the \commandinline|!<type name>!| is \verb|lowerleft| or \verb|lowerright|.
+% Default: \verb|vshift=0cm|.
%
% \item\commandinline|color=!<color name>!|\\
-% Ruler color (see \texttt{xcolor} package).\\
-% Default: \verb|color=black|.\\ The \commandinline|!<color name>!| is saved in \commandinline|\fgruler@color|.
+% Ruler color (see \texttt{xcolor} package). Default: \verb|color=black|.
%
% \item\commandinline|numsep=!<length>!|\\
-% Separation between number and ruler.\\
-% Default: \verb|numsep=3pt|.\\ The \commandinline|!<length>!| is saved in \commandinline|\fgruler@numsep|.
+% Separation between number and ruler. Default: \verb|numsep=3pt|.
%
% \item\commandinline|markthick=!<length>!|\\
-% Mark thickness.\\
-% Default: \verb|markthick=0.4pt|.\\ The \commandinline|!<length>!| is saved in \commandinline|\fgruler@markthick|.
+% Mark thickness. Default: \verb|markthick=0.4pt|.
%
% \item\commandinline|marklength=!<length>!|\\
-% Mark length at integer units:
-% {\fgrulernoborderline\fgrulercaptioncm{}\fgrulerthickcm{}{}{1pt}\fgrulercolorcm{}{}{red}\ruler{rightup}{3cm}}\\
-% Default: \verb|marklength=2mm|.\\ The \commandinline|!<length>!| is saved in \commandinline|\fgruler@marklength|.\\
-% See the length of the other marks in Section \ref{sec:additional}.
+% Mark length at integer units (see the red marks):
+% {\fgrulernoborderline\fgrulercaptioncm{}\fgrulerthickcm{}{}{1pt}\fgrulercolorcm{}{}{red}\ruler{rightup}{3cm}}
+% Default: \verb|marklength=2mm|. See the length of the other marks in Section \ref{sec:additional}.
%
% \item\commandinline|numfont=!<font type>!|\\
-% Number font type.\\
-% You can use this option only in \verb|\setfgruler| command.\\
-% Default: \verb|numfont=\scriptsize\sffamily|.\\ The \commandinline|!<font type>!| is saved in \commandinline|\fgruler@numfont|.
+% Number font type. Default: \verb|numfont=\scriptsize\sffamily|. You can use this option only in \verb|\setfgruler| command.
%
% \item\commandinline|showframe| or \commandinline|showframe=true|\\
% It draws visible frames for the text and margin area, and lines for the head and foot.
@@ -297,15 +301,15 @@ keepspaces]}
% \item For example, \verb|\rulerparams{}{}{red}{}{}| changes the ruler color to red.
% \end{description}
%
+% \item\commandinline|\rulerparamsfromfg|\\
+% It sets the ruler parameters from the actual foreground ruler parameters.
+%
% \item\commandinline|\rulernorotatenum|\\
% By default, the numbers of the vertical rulers (which were generated by \verb|\ruler| or \verb|\squareruler|) are rotated by 90$^\circ$.
% It kills this action.
% This command is usable only in \texttt{document} environment.
%
-% Example: \verb|\ruler{upright}{1cm}| \ruler{upright}{1cm}\\
-% but
-% \verb|{\rulernorotatenum\ruler{upright}{1cm}}|
-% {\rulernorotatenum\ruler{upright}{1cm}}
+% Example: \verb|{\rulernorotatenum\ruler{upright}{1cm}}| {\rulernorotatenum\ruler{upright}{1cm}}
%
% \item\commandinline|\rulerrotatenum|\\
% After \verb|\rulernorotatenum|, it reactivates the number rotating.
@@ -316,19 +320,28 @@ keepspaces]}
% The following commands can work on all of the rulers, which are drawn by \texttt{fgruler} package.
% \begin{description}
% \item\commandinline|\fgrulerstartnum{!<num>!}|\\
-% The \commandinline|!<num>!| is a nonnegative integer, which will be the starting number on the ruler.
+% The \commandinline|!<num>!| is a nonnegative integer, which will be the starting number on the horizontal and vertical rulers.
% Default: \verb|\fgrulerstartnum{0}|
%
-% Example: \verb|{\fgrulerstartnum{5}\ruler{rightup}{3cm}}| {\fgrulerstartnum{5}\ruler{rightup}{3cm}}
+% Example: \verb|{\fgrulerstartnum{5}\squareruler{lowerleft}{3cm}{1cm}}| {\fgrulerstartnum{5}\squareruler{lowerleft}{3cm}{1cm}}
+%
+% \item\commandinline|\fgrulerstartnumh{!<num>!}|\\
+% The \commandinline|!<num>!| is a nonnegative integer, which will be the starting number on the horizontal rulers.
+% Default: \verb|\fgrulerstartnumh{0}|
+%
+% Example: \verb|{\fgrulerstartnumh{5}\squareruler{lowerleft}{3cm}{1cm}}| {\fgrulerstartnumh{5}\squareruler{lowerleft}{3cm}{1cm}}
+%
+% \item\commandinline|\fgrulerstartnumv{!<num>!}|\\
+% The \commandinline|!<num>!| is a nonnegative integer, which will be the starting number on the vertical rulers.
+% Default: \verb|\fgrulerstartnumv{0}|
+%
+% Example: \verb|{\fgrulerstartnumv{5}\squareruler{lowerleft}{3cm}{1cm}}| {\fgrulerstartnumv{5}\squareruler{lowerleft}{3cm}{1cm}}
%
% \item\commandinline|\fgrulernoborderline|\\
% By default, there is a borderline on one side of the ruler.
% It disappears by this command.
%
-% Example: \verb|\ruler{rightup}{3cm}| \ruler{rightup}{3cm}\\
-% but
-% \verb|{\fgrulernoborderline\ruler{rightup}{3cm}}|
-% {\fgrulernoborderline\ruler{rightup}{3cm}}
+% Example: \verb|{\fgrulernoborderline\ruler{rightup}{3cm}}| {\fgrulernoborderline\ruler{rightup}{3cm}}
%
% \item\commandinline|\fgrulerborderline|\\
% After \verb|\fgrulernoborderline|, it reactivates the previous default effect.
@@ -337,10 +350,7 @@ keepspaces]}
% Unit caption in metric ruler.
% Default: \verb|\fgrulercaptioncm{cm}|
%
-% Example: \verb|\ruler{rightup}{3cm}| \ruler{rightup}{3cm}\\
-% but
-% \verb|{\fgrulercaptioncm{}\ruler{rightup}{3cm}}|
-% {\fgrulercaptioncm{}\ruler{rightup}{3cm}}
+% Example: \verb|{\fgrulercaptioncm{}\ruler{rightup}{3cm}}| {\fgrulercaptioncm{}\ruler{rightup}{3cm}}
%
% \item\commandinline|\fgrulercaptionin{!<caption>!}|\\
% Unit caption in English ruler.
@@ -351,9 +361,7 @@ keepspaces]}
% Its current value is printed by the \commandinline|\thefgrulernum|.
% Its default definition is \verb|\def\thefgrulernum{\arabic{fgrulernum}}|, which is equivalent to \verb|\fgrulerdefnum{\arabic{fgrulernum}}|.
%
-% Example:\\
-% \verb|{\fgrulerdefnum{}\fgrulercaptioncm{}\ruler{rightdown}{2cm}}|
-% {\fgrulerdefnum{}\fgrulercaptioncm{}\ruler{rightdown}{2cm}}
+% Example: \verb|{\fgrulerdefnum{}\fgrulercaptioncm{}\ruler{rightdown}{2cm}}| {\fgrulerdefnum{}\fgrulercaptioncm{}\ruler{rightdown}{2cm}}
%
% \item\commandinline|\fgrulerratiocm{!<ratio1>!}{!<ratio2>!}|\\
% Mark length ratios in metric rulers.
@@ -516,12 +524,12 @@ keepspaces]}
% \end{description}
%
% \medskip\noindent\textcolor{red}{\faWarning}
-% All setting commands\footnote{Namely \verb|\setfgruler|, \verb|\rulerparams|, \verb|\rulernorotatenum|, \verb|\rulerrotatenum|, furthermore all commands in this section.} obey the normal scoping rules, i.e.\ if you use them inside a group, then the changing of the parameters is not valid outside the group.
+% All setting commands obey the normal scoping rules, i.e.\ if you use them inside a group, then the changing of the parameters is not valid outside the group.
%
% \newpage\fgrulerreset
% \section{Examples}
% \subsection{Deafult case}
-% The output of the following code is the ruler in this page. It is the default case.
+% The output of the following example is the ruler in this page. It is the default case.
% \begin{examplelst}
% \documentclass{article}
% \usepackage{fgruler}
@@ -531,7 +539,7 @@ keepspaces]}
% \end{examplelst}
%
% \newpage\fgrulerreset
-% \subsection{The `showframe' option}
+% \subsection{The \texttt{showframe} and \texttt{color} options}
% \setfgruler{color=red,showframe}
% \begin{examplelst}
% \documentclass{article}
@@ -542,7 +550,7 @@ keepspaces]}
% \end{examplelst}
%
% \newpage\fgrulerreset
-% \subsection{Shifting in default case}
+% \subsection{Shift in default case}
% \setfgruler{hshift=1cm,vshift=2cm}
% \begin{examplelst}
% \documentclass{article}
@@ -553,7 +561,7 @@ keepspaces]}
% \end{examplelst}
%
% \newpage\fgrulerreset
-% \subsection{Shifting in case `type=upperright' option}
+% \subsection{Shift in case \texttt{type=upperright} option}
% \setfgruler{type=upperright,hshift=1cm,vshift=2cm}
% \begin{examplelst}
% \documentclass{article}
@@ -564,7 +572,7 @@ keepspaces]}
% \end{examplelst}
%
% \newpage\fgrulerreset
-% \subsection{Shifting in case `type=lowerleft' option}
+% \subsection{Shift in case \texttt{type=lowerleft} option}
% \setfgruler{type=lowerleft,hshift=1cm,vshift=2cm}
% \begin{examplelst}
% \documentclass{article}
@@ -575,7 +583,7 @@ keepspaces]}
% \end{examplelst}
%
% \newpage\fgrulerreset
-% \subsection{Shifting in case `type=lowerright' option}
+% \subsection{Shift in case \texttt{type=lowerright} option}
% \setfgruler{type=lowerright,hshift=1cm,vshift=2cm}
% \begin{examplelst}
% \documentclass{article}
@@ -586,104 +594,132 @@ keepspaces]}
% \end{examplelst}
%
% \newpage\fgrulerreset
-% \subsection{An example for the `type=user' option}\label{example:user1}
+% \subsection{The \texttt{type=upperleftT} option}
+% \setfgruler{type=upperleftT}
+% \begin{examplelst}
+% \documentclass{article}
+% \usepackage[type=upperleftT]{fgruler}
+% \begin{document}
+% ...
+% \end{document}
+% \end{examplelst}
+%
+% \newpage\fgrulerreset
+% \subsection{Setting the \texttt{type=user} option}\label{example:user-first}
+% In the next example the \texttt{type=user} option activates \texttt{type=upperright} or \texttt{type=upperleft}, depending on the page number is odd or even.
% \setfgruler{type=none}
% \begin{examplelst}
% \documentclass{article}
% \usepackage[type=user]{fgruler}
-% \makeatletter
-% \def\fgruler@cm@user@fg{%
-% \ifodd\value{page}\fgruler@cm@upperright@fg%
-% \else\fgruler@cm@upperleft@fg\fi}
-% \def\fgruler@in@user@fg{%
-% \ifodd\value{page}\fgruler@in@upperright@fg%
-% \else\fgruler@in@upperleft@fg\fi}
-% \makeatother
+% \fgrulerdefusercm{%
+% \ifodd\value{page}\fgrulertype{cm}{upperright}%
+% \else\fgrulertype{cm}{upperleft}\fi}
+% \fgrulerdefuserin{%
+% \ifodd\value{page}\fgrulertype{in}{upperright}%
+% \else\fgrulertype{in}{upperleft}\fi}
% \begin{document}
% ...
% \end{document}
% \end{examplelst}
-% In this case the \texttt{type=upperright} option will be activated, if the page number is odd. Otherwise \texttt{type=upperleft} will be activated.
%
% \newpage\fgrulerreset
-% \subsection{An other example for the `type=user' option}\label{example:user2}
-% \setfgruler{type=user,color=red}
-%\makeatletter
-%\newlength{\fgruler@tempdim}
-%\renewcommand{\fgruler@cm@user@fg}{\AtTextLowerLeft{\ignorespaces%
-%\settowidth{\fgruler@tempdim}{\ruler{downleft}{\textheight}}%
-%\rulerparams{}{}{\fgruler@color}{}{}%
-%\put(-\fgruler@tempdim,0){\ignorespaces%
-%\rulernorotatenum\fgrulercaptioncm{}\ruler{downleft}{\textheight}}%
-%\put(0,\textheight){\ignorespaces\ruler{rightup}{\textwidth}}}}
-%\makeatother
+% \subsection{Setting the \texttt{type=user} option}
+% In the next example the \texttt{type=user} option combines the effect of \texttt{type=upperleft} and \texttt{type=upperleftT}.
+% \setfgruler{type=user}
+% \fgrulerdefusercm{\fgrulertype{cm}{upperleft}\fgrulertype{cm}{upperleftT}}
% \begin{examplelst}
% \documentclass{article}
-% \usepackage[type=user,color=red]{fgruler}
-% \makeatletter
-% \newlength{\fgruler@tempdim}
-% \newcommand{\fgruler@user}[1]{%
-% \AtTextLowerLeft{% See eso-pic package!
-% \rulerparams{\fgruler@markthick}{\fgruler@numfont}{\fgruler@color}%
-% {\fgruler@marklength}{\fgruler@numsep}%
-% \settowidth{\fgruler@tempdim}{\ruler[#1]{downleft}{\textheight}}%
-% \put(-\fgruler@tempdim,0){%
-% \rulernorotatenum%
-% \fgrulercaptioncm{}%
-% \fgrulercaptionin{}%
-% \ruler[#1]{downleft}{\textheight}%
-% }%
-% \put(0,\textheight){%
-% \ruler[#1]{rightup}{\textwidth}%
+% \usepackage[type=user]{fgruler}
+% \fgrulerdefusercm{\fgrulertype{cm}{upperleft}\fgrulertype{cm}{upperleftT}}
+% \fgrulerdefuserin{\fgrulertype{in}{upperleft}\fgrulertype{in}{upperleftT}}
+% \begin{document}
+% ...
+% \end{document}
+% \end{examplelst}
+%
+% \newpage\fgrulerreset
+% \subsection{Setting the \texttt{type=user} option}
+% In this example the \texttt{type=user} option combines the effect of \texttt{type=upperleftT} and \texttt{type=lowerrightT}.
+% \setfgruler{type=user}
+% \fgrulerdefusercm{\fgrulertype{cm}{upperleftT}\fgrulertype{cm}{lowerrightT}}
+% \begin{examplelst}
+% \documentclass{article}
+% \usepackage[type=user]{fgruler}
+% \fgrulerdefusercm{\fgrulertype{cm}{upperleftT}\fgrulertype{cm}{lowerrightT}}
+% \fgrulerdefuserin{\fgrulertype{in}{upperleftT}\fgrulertype{in}{lowerrightT}}
+% \begin{document}
+% ...
+% \end{document}
+% \end{examplelst}
+%
+% \newpage\fgrulerreset
+% \subsection{Setting the \texttt{type=user} option}
+% In the next example the \texttt{type=user} option places a vertical ruler at the left border of the text area.
+% \setfgruler{type=user}
+%\fgrulerdefusercm{\AtTextLowerLeft{\ignorespaces\rulerparamsfromfg\llap{\ruler{downleft}{\textheight}}}}
+% \begin{examplelst}
+% \documentclass{article}
+% \usepackage[type=user]{fgruler}
+% \newcommand{\fgruleruser}[1]{%
+% \AtTextLowerLeft{% See eso-pic package!
+% \rulerparamsfromfg%
+% \llap{\ruler[#1]{downleft}{\textheight}}%
% }%
-% }%
% }
-% \renewcommand{\fgruler@cm@user@fg}{\fgruler@user{cm}}
-% \renewcommand{\fgruler@in@user@fg}{\fgruler@user{in}}
-% \makeatother
+% \fgrulerdefusercm{\fgruleruser{cm}}
+% \fgrulerdefuserin{\fgruleruser{in}}
% \begin{document}
% ...
% \end{document}
% \end{examplelst}
-% This code places rulers at the left and the top border of the body. In this case the \texttt{hshift} and \texttt{vshift} options don't work.
%
% \newpage\fgrulerreset
-% \subsection{The third example for the `type=user' option}\label{example:user3}
-% \setfgruler{type=user,color=blue}
-%\makeatletter
-%\renewcommand{\fgruler@cm@user@fg}{\fgruler@cm@upperleft@fg\AtTextLowerLeft{\ignorespaces%
-%\rulerparams{}{}{\fgruler@color}{}{}%
-%\put(\textwidth,0){\ignorespaces%
-%\rulernorotatenum\fgrulercaptioncm{}\ruler{downright}{\textheight}}%
-%\put(0,\textheight){\ignorespaces\ruler{rightup}{\textwidth}}}}
-%\makeatother
+% \subsection{Setting the \texttt{type=user} option}
+% In the next example the \texttt{type=user} option places rulers at the right and bottom borders of the text area.
+% \setfgruler{type=user}
+%\fgrulerdefusercm{\AtTextLowerLeft{\ignorespaces\rulerparamsfromfg\rulernorotatenum\llap{\ruler{downleft}{\textheight}}\ruler*{rightdown}{\textwidth}}}
% \begin{examplelst}
% \documentclass{article}
-% \usepackage[type=user,color=blue]{fgruler}
-% \makeatletter
-% \newcommand{\fgruler@user}[1]{%
-% \AtTextLowerLeft{% See eso-pic package!
-% \rulerparams{\fgruler@markthick}{\fgruler@numfont}{\fgruler@color}%
-% {\fgruler@marklength}{\fgruler@numsep}%
-% \put(\textwidth,0){%
-% \rulernorotatenum%
-% \fgrulercaptioncm{}%
-% \fgrulercaptionin{}%
-% \ruler[#1]{downright}{\textheight}%
+% \usepackage[type=user]{fgruler}
+% \newcommand{\fgruleruser}[1]{%
+% \AtTextLowerLeft{% See eso-pic package!
+% \rulerparamsfromfg%
+% \rulernorotatenum%
+% \llap{\ruler[#1]{downleft}{\textheight}}%
+% \ruler*[#1]{rightdown}{\textwidth}%
% }%
-% \put(0,\textheight){%
-% \ruler[#1]{rightup}{\textwidth}%
+% }
+% \fgrulerdefusercm{\fgruleruser{cm}}
+% \fgrulerdefuserin{\fgruleruser{in}}
+% \begin{document}
+% ...
+% \end{document}
+% \end{examplelst}
+%
+% \newpage\fgrulerreset
+% \subsection{Setting the \texttt{type=user} option}\label{example:user-last}
+% In the next example the \texttt{type=user} option places rulers at the right and top borders of the text area.
+% \setfgruler{type=user}
+%\fgrulerdefusercm{\AtTextUpperLeft{\ignorespaces%
+%\rulerparamsfromfg\ruler{rightup}{\textwidth}\ignorespaces%
+%\rulernorotatenum\fgrulercaptioncm{}\ignorespaces\ruler*{downright}{\textheight}}}
+% \begin{examplelst}
+% \documentclass{article}
+% \usepackage[type=user]{fgruler}
+% \newcommand{\fgruleruser}[1]{%
+% \AtTextUpperLeft{% See eso-pic package!
+% \rulerparamsfromfg%
+% \ruler[#1]{rightup}{\textwidth}%
+% \rulernorotatenum\fgrulercaptioncm{}\fgrulercaptionin{}%
+% \ruler*[#1]{downright}{\textheight}%
% }%
-% }%
% }
-% \renewcommand{\fgruler@cm@user@fg}{\fgruler@cm@upperleft@fg\fgruler@user{cm}}
-% \renewcommand{\fgruler@in@user@fg}{\fgruler@in@upperleft@fg\fgruler@user{in}}
-% \makeatother
+% \fgrulerdefusercm{\fgruleruser{cm}}
+% \fgrulerdefuserin{\fgruleruser{in}}
% \begin{document}
% ...
% \end{document}
% \end{examplelst}
-% In this code the effect of \texttt{type=user} is similar to \texttt{type=upperleft}, but it places further rulers at the right and the top border of the body.
%
% \newpage\fgrulerreset
% \subsection{Rulers on the foreground of a given page, and in text}
@@ -711,10 +747,10 @@ keepspaces]}
% text
% \ruler*{rightdown}{3cm}
% text
-% \rotatebox[origin=tl]{30}{\ruler*{rightdown}{3cm}}
+% \rotatebox[origin=tl]{30}{\ruler*{rightdown}{3cm}}
+% % \rotatebox is defined in graphicx package
% \end{document}
% \end{examplelst}
-% \emph{Remark.} The \verb|\rotatebox| command is defined in the \texttt{graphicx} package!
%
% \newpage\fgrulerreset
% \subsection{Ruler types in text}
@@ -874,31 +910,18 @@ keepspaces]}
% \end{examplelst}
%
% \newpage\fgrulerreset
-% \subsection{A new square ruler}
+% \subsection{A new square ruler type}
% \setfgruler{type=none}
-%
-% \makeatletter
-% \newcommand{\usersquareruler}[2]{
-% \begin{picture}(#1+1em+\fgruler@marklength,#2+1em+\fgruler@marklength)
-% {\fgrulercaptioncm{}
-% \ruler{downleft}{#2}}
-% \put(0,#2){\ruler{rightup}{#1}}
-% \end{picture}}
-% \makeatother
-% \usersquareruler{3cm}{5cm}
+% {\rulernorotatenum\fgrulercaptioncm{}\ruler*{downleft}{5cm}}\ruler{rightup}{3cm}
%
% \bigskip
% \begin{examplelst}
% \documentclass{article}
% \usepackage[type=none]{fgruler}
-% \makeatletter
% \newcommand{\usersquareruler}[2]{%
-% \begin{picture}(#1+1em+\fgruler@marklength,#2+1em+\fgruler@marklength)%
-% {\fgrulercaptioncm{}%
-% \ruler{downleft}{#2}}%
-% \put(0,#2){\ruler{rightup}{#1}}%
-% \end{picture}}
-% \makeatother
+% {\rulernorotatenum\fgrulercaptioncm{}\ruler*{downleft}{#2}}%
+% \ruler{rightup}{#1}%
+% }
% \begin{document}
% \usersquareruler{3cm}{5cm}
% \end{document}
@@ -953,6 +976,8 @@ keepspaces]}
\rulerparams{.4pt}{\scriptsize\sffamily}{black}{2mm}{3pt}
+\def\rulerparamsfromfg{\rulerparams{\fgruler@markthick}{\fgruler@numfont}{\fgruler@color}{\fgruler@marklength}{\fgruler@numsep}}
+
\def\fgruler@fgsetting{%
\fgruler@set{\fgruler@markthick}{\fgruler@numfont}{\fgruler@color}{\fgruler@marklength}{\fgruler@numsep}%
\rulernorotatenum}
@@ -963,14 +988,24 @@ keepspaces]}
\def\fgruler@activate@type{%
\def\fgruler@check{cm}\ifx\fgruler@unit\fgruler@check\else%
\def\fgruler@check{in}\ifx\fgruler@unit\fgruler@check\else%
-\@latexerr{Undefined unit: \fgruler@unit\space(Defined units: cm, in)}{}\fi\fi%
+\PackageError{fgruler}{\fgruler@unit\space is invalid unit}{Valid units: cm, in}%
+\fi\fi%
\def\fgruler@check{upperleft}\ifx\fgruler@type\fgruler@check\else%
\def\fgruler@check{upperright}\ifx\fgruler@type\fgruler@check\else%
\def\fgruler@check{lowerleft}\ifx\fgruler@type\fgruler@check\else%
\def\fgruler@check{lowerright}\ifx\fgruler@type\fgruler@check\else%
+\def\fgruler@check{upperleftT}\ifx\fgruler@type\fgruler@check\else%
+\def\fgruler@check{upperrightT}\ifx\fgruler@type\fgruler@check\else%
+\def\fgruler@check{lowerleftT}\ifx\fgruler@type\fgruler@check\else%
+\def\fgruler@check{lowerrightT}\ifx\fgruler@type\fgruler@check\else%
\def\fgruler@check{none}\ifx\fgruler@type\fgruler@check\else%
\def\fgruler@check{user}\ifx\fgruler@type\fgruler@check\else%
-\@latexerr{Undefined type: \fgruler@type\space(Defined types: upperleft, upperright, lowerleft, lowerright, user, none)}{}\fi\fi\fi\fi\fi\fi%
+\PackageError{fgruler}{\fgruler@type\space is invalid type}%
+{Valid types:\MessageBreak
+upperleft, upperright, lowerleft, lowerright,\MessageBreak
+upperleftT, upperrightT, lowerleftT, lowerrightT,\MessageBreak
+user, none}%
+\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi%
\def\fgruler@output{\csname fgruler@\fgruler@unit @\fgruler@type @fg\endcsname}}
\def\fgrulerratiocm#1#2{%
@@ -1051,7 +1086,7 @@ keepspaces]}
\def\fgruler@param{#1}%
\def\fgruler@check{cm}\ifx\fgruler@param\fgruler@check\else%
\def\fgruler@check{in}\ifx\fgruler@param\fgruler@check\else%
-\@latexerr{Invalid parameter: \fgruler@param\space(Defined parameters: cm, in)}{}%
+\PackageError{fgruler}{\fgruler@param\space is invalid parameter}{Valid parameters: cm, in}%
\fi\fi%
\def\fgruler@param{#2}%
\def\fgruler@check{rightdown}\ifx\fgruler@param\fgruler@check\else%
@@ -1062,21 +1097,26 @@ keepspaces]}
\def\fgruler@check{downleft}\ifx\fgruler@param\fgruler@check\else%
\def\fgruler@check{upright}\ifx\fgruler@param\fgruler@check\else%
\def\fgruler@check{upleft}\ifx\fgruler@param\fgruler@check\else%
-\@latexerr{Invalid parameter: \fgruler@param\space(Defined parameters: rightdown, rightup, leftdown, leftup, downright, downleft, upright, upleft)}{}%
+\PackageError{fgruler}{\fgruler@param\space is invalid parameter}%
+{Valid parameters:\MessageBreak
+rightdown, rightup, leftdown, leftup,\MessageBreak
+downright, downleft, upright, upleft}%
\fi\fi\fi\fi\fi\fi\fi\fi}
\def\fgruler@check@param@#1#2{%
\def\fgruler@param{#1}%
\def\fgruler@check{cm}\ifx\fgruler@param\fgruler@check\else%
\def\fgruler@check{in}\ifx\fgruler@param\fgruler@check\else%
-\@latexerr{Invalid parameter: \fgruler@param\space(Defined parameters: cm, in)}{}%
+\PackageError{fgruler}{\fgruler@param\space is invalid parameter}{Valid parameters: cm, in}%
\fi\fi%
\def\fgruler@param{#2}%
\def\fgruler@check{upperleft}\ifx\fgruler@param\fgruler@check\else%
\def\fgruler@check{upperright}\ifx\fgruler@param\fgruler@check\else%
\def\fgruler@check{lowerleft}\ifx\fgruler@param\fgruler@check\else%
\def\fgruler@check{lowerright}\ifx\fgruler@param\fgruler@check\else%
-\@latexerr{Invalid parameter: \fgruler@param\space(Defined parameters: upperleft, upperright, lowerleft, lowerright)}{}%
+\PackageError{fgruler}{\fgruler@param\space is invalid parameter}%
+{Valid parameters:\MessageBreak
+upperleft, upperright, lowerleft, lowerright}%
\fi\fi\fi\fi}
\newcommand{\fgruler@ruler}[3][cm]{\fgruler@check@param{#1}{#2}\fgruler@intextsetting\csname fgruler@#1@#2@\endcsname{#3}}
@@ -1110,8 +1150,11 @@ keepspaces]}
\def\fgruler@ifodd#1{\ifodd\value{fgrulernum}#1\fi\stepcounter{fgrulernum}}
-\def\fgrulerstartnum#1{\def\fgruler@startnum{#1}\ignorespaces}
-\def\fgruler@startnum{0}
+\def\fgrulerstartnum#1{\def\fgruler@startnumh{#1}\def\fgruler@startnumv{#1}\ignorespaces}
+\def\fgrulerstartnumh#1{\def\fgruler@startnumh{#1}\ignorespaces}
+\def\fgrulerstartnumv#1{\def\fgruler@startnumv{#1}\ignorespaces}
+\def\fgruler@startnumh{0}
+\def\fgruler@startnumv{0}
\def\fgrulerdefnum#1{\def\thefgrulernum{#1}\ignorespaces}
@@ -1120,13 +1163,13 @@ keepspaces]}
\def\rulernorotatenum{%
\ifx\@onlypreamble\@notprerr%
\def\fgruler@rotatebox##1##2{##2}%
-\else\@latexerr{Don't use \protect\rulernorotatenum\space in preamble!}{}\fi%
+\else\PackageError{fgruler}{Don't use \protect\rulernorotatenum\space in preamble!}{}\fi%
\ignorespaces}
\def\rulerrotatenum{%
\ifx\@onlypreamble\@notprerr%
\def\fgruler@rotatebox##1##2{\rotatebox{##1}{##2}}%
-\else\@latexerr{Don't use \protect\rulerrotatenum\space in preamble!}{}\fi%
+\else\PackageError{fgruler}{Don't use \protect\rulerrotatenum\space in preamble!}{}\fi%
\ignorespaces}
\def\fgrulerreset{%
@@ -1171,10 +1214,11 @@ keepspaces]}
\def\thefgrulernum{\arabic{fgrulernum}}%
\def\fgruler@caption@cm{cm}%
\def\fgruler@caption@in{inch}%
-\def\fgruler@startnum{0}%
+\def\fgruler@startnumh{0}%
+\def\fgruler@startnumv{0}%
\fgruler@borderlinetrue%
\fgruler@showframefalse%
-\else\@latexerr{Don't use \protect\fgrulerreset\space in preamble!}{}\fi%
+\else\PackageError{fgruler}{Don't use \protect\fgrulerreset\space in preamble!}{}\fi%
\ignorespaces}
\AtEndPreamble{
@@ -1261,14 +1305,14 @@ keepspaces]}
\fgruler@div{#1}{10}%
\multiput(0,0)(10,0){\@tempcnta}{\fgruler@cm@thick@iii\fgruler@cm@color@iii\line(0,-1){\fgruler@marklth}}%
\iffgruler@borderline\put(0,0){\line(1,0){#1}}\fi%
-\setcounter{fgrulernum}{\fgruler@startnum}\stepcounter{fgrulernum}%
+\setcounter{fgrulernum}{\fgruler@startnumh}\stepcounter{fgrulernum}%
\multiput(10,-\fgruler@sep)(10,0){\fgruler@tempdima}{\makebox(0,0)[t]{\fgruler@font@\thefgrulernum\stepcounter{fgrulernum}}}}
\def\fgruler@cm@rightdown@#1{%
\setlength{\unitlength}{1mm}%
\begin{picture}(#1,\fgruler@width)(0,-\fgruler@width)%
\fgruler@cm@rightdown{#1}%
-\setcounter{fgrulernum}{\fgruler@startnum}%
+\setcounter{fgrulernum}{\fgruler@startnumh}%
\put(0,-\fgruler@sep){\makebox(0,0)[t]{\fgruler@font@\thefgrulernum}}%
\ifdim#1>.5cm\put(5,-\fgruler@sep){\makebox(0,0)[t]{\fgruler@font@\fgruler@caption@cm}}\fi%
\end{picture}}
@@ -1294,14 +1338,14 @@ keepspaces]}
\fgruler@div{#1}{16}%
\multiput(0,0)(16,0){\@tempcnta}{\fgruler@in@thick@v\fgruler@in@color@v\line(0,-1){\fgruler@marklth}}%
\iffgruler@borderline\put(0,0){\line(1,0){#1}}\fi%
-\setcounter{fgrulernum}{\fgruler@startnum}\stepcounter{fgrulernum}%
+\setcounter{fgrulernum}{\fgruler@startnumh}\stepcounter{fgrulernum}%
\multiput(16,-\fgruler@sep)(16,0){\fgruler@tempdima}{\makebox(0,0)[t]{\fgruler@font@\thefgrulernum\stepcounter{fgrulernum}}}}
\def\fgruler@in@rightdown@#1{%
\setlength{\unitlength}{.0625in}%
\begin{picture}(#1,\fgruler@width)(0,-\fgruler@width)%
\fgruler@in@rightdown{#1}%
-\setcounter{fgrulernum}{\fgruler@startnum}%
+\setcounter{fgrulernum}{\fgruler@startnumh}%
\put(0,-\fgruler@sep){\makebox(0,0)[t]{\fgruler@font@\thefgrulernum}}%
\ifdim#1>.5in\put(8,-\fgruler@sep){\makebox(0,0)[t]{\fgruler@font@\fgruler@caption@in}}\fi%
\end{picture}}
@@ -1321,14 +1365,14 @@ keepspaces]}
\fgruler@div{#1}{10}%
\multiput(0,0)(10,0){\@tempcnta}{\fgruler@cm@thick@iii\fgruler@cm@color@iii\line(0,1){\fgruler@marklth}}%
\iffgruler@borderline\put(0,0){\line(1,0){#1}}\fi%
-\setcounter{fgrulernum}{\fgruler@startnum}\stepcounter{fgrulernum}%
+\setcounter{fgrulernum}{\fgruler@startnumh}\stepcounter{fgrulernum}%
\multiput(10,\fgruler@sep)(10,0){\fgruler@tempdima}{\makebox(0,0)[b]{\fgruler@font@\thefgrulernum\stepcounter{fgrulernum}}}}
\def\fgruler@cm@rightup@#1{%
\setlength{\unitlength}{1mm}%
\begin{picture}(#1,\fgruler@width)%
\fgruler@cm@rightup{#1}%
-\setcounter{fgrulernum}{\fgruler@startnum}%
+\setcounter{fgrulernum}{\fgruler@startnumh}%
\put(0,\fgruler@sep){\makebox(0,0)[b]{\fgruler@font@\thefgrulernum}}%
\ifdim#1>.5cm\put(5,\fgruler@sep){\makebox(0,0)[b]{\fgruler@font@\fgruler@caption@cm}}\fi%
\end{picture}}
@@ -1354,14 +1398,14 @@ keepspaces]}
\fgruler@div{#1}{16}%
\multiput(0,0)(16,0){\@tempcnta}{\fgruler@in@thick@v\fgruler@in@color@v\line(0,1){\fgruler@marklth}}%
\iffgruler@borderline\put(0,0){\line(1,0){#1}}\fi%
-\setcounter{fgrulernum}{\fgruler@startnum}\stepcounter{fgrulernum}%
+\setcounter{fgrulernum}{\fgruler@startnumh}\stepcounter{fgrulernum}%
\multiput(16,\fgruler@sep)(16,0){\fgruler@tempdima}{\makebox(0,0)[b]{\fgruler@font@\thefgrulernum\stepcounter{fgrulernum}}}}
\def\fgruler@in@rightup@#1{%
\setlength{\unitlength}{.0625in}%
\begin{picture}(#1,\fgruler@width)%
\fgruler@in@rightup{#1}%
-\setcounter{fgrulernum}{\fgruler@startnum}%
+\setcounter{fgrulernum}{\fgruler@startnumh}%
\put(0,\fgruler@sep){\makebox(0,0)[b]{\fgruler@font@\thefgrulernum}}%
\ifdim#1>.5in\put(8,\fgruler@sep){\makebox(0,0)[b]{\fgruler@font@\fgruler@caption@in}}\fi%
\end{picture}}
@@ -1381,14 +1425,14 @@ keepspaces]}
\fgruler@div{#1}{10}%
\multiput(0,0)(-10,0){\@tempcnta}{\fgruler@cm@thick@iii\fgruler@cm@color@iii\line(0,-1){\fgruler@marklth}}%
\iffgruler@borderline\put(0,0){\line(-1,0){#1}}\fi%
-\setcounter{fgrulernum}{\fgruler@startnum}\stepcounter{fgrulernum}%
+\setcounter{fgrulernum}{\fgruler@startnumh}\stepcounter{fgrulernum}%
\multiput(-10,-\fgruler@sep)(-10,0){\fgruler@tempdima}{\makebox(0,0)[t]{\fgruler@font@\thefgrulernum\stepcounter{fgrulernum}}}}
\def\fgruler@cm@leftdown@#1{%
\setlength{\unitlength}{1mm}%
\begin{picture}(#1,\fgruler@width)(-#1,-\fgruler@width)%
\fgruler@cm@leftdown{#1}%
-\setcounter{fgrulernum}{\fgruler@startnum}%
+\setcounter{fgrulernum}{\fgruler@startnumh}%
\put(0,-\fgruler@sep){\makebox(0,0)[t]{\fgruler@font@\thefgrulernum}}%
\ifdim#1>.5cm\put(-5,-\fgruler@sep){\makebox(0,0)[t]{\fgruler@font@\fgruler@caption@cm}}\fi%
\end{picture}}
@@ -1414,14 +1458,14 @@ keepspaces]}
\fgruler@div{#1}{16}%
\multiput(0,0)(-16,0){\@tempcnta}{\fgruler@in@thick@v\fgruler@in@color@v\line(0,-1){\fgruler@marklth}}%
\iffgruler@borderline\put(0,0){\line(-1,0){#1}}\fi%
-\setcounter{fgrulernum}{\fgruler@startnum}\stepcounter{fgrulernum}%
+\setcounter{fgrulernum}{\fgruler@startnumh}\stepcounter{fgrulernum}%
\multiput(-16,-\fgruler@sep)(-16,0){\fgruler@tempdima}{\makebox(0,0)[t]{\fgruler@font@\thefgrulernum\stepcounter{fgrulernum}}}}
\def\fgruler@in@leftdown@#1{%
\setlength{\unitlength}{.0625in}%
\begin{picture}(#1,\fgruler@width)(-#1,-\fgruler@width)%
\fgruler@in@leftdown{#1}%
-\setcounter{fgrulernum}{\fgruler@startnum}%
+\setcounter{fgrulernum}{\fgruler@startnumh}%
\put(0,-\fgruler@sep){\makebox(0,0)[t]{\fgruler@font@\thefgrulernum}}%
\ifdim#1>.5in\put(-8,-\fgruler@sep){\makebox(0,0)[t]{\fgruler@font@\fgruler@caption@in}}\fi%
\end{picture}}
@@ -1441,14 +1485,14 @@ keepspaces]}
\fgruler@div{#1}{10}%
\multiput(0,0)(-10,0){\@tempcnta}{\fgruler@cm@thick@iii\fgruler@cm@color@iii\line(0,1){\fgruler@marklth}}%
\iffgruler@borderline\put(0,0){\line(-1,0){#1}}\fi%
-\setcounter{fgrulernum}{\fgruler@startnum}\stepcounter{fgrulernum}%
+\setcounter{fgrulernum}{\fgruler@startnumh}\stepcounter{fgrulernum}%
\multiput(-10,\fgruler@sep)(-10,0){\fgruler@tempdima}{\makebox(0,0)[b]{\fgruler@font@\thefgrulernum\stepcounter{fgrulernum}}}}
\def\fgruler@cm@leftup@#1{%
\setlength{\unitlength}{1mm}%
\begin{picture}(#1,\fgruler@width)(-#1,0)%
\fgruler@cm@leftup{#1}%
-\setcounter{fgrulernum}{\fgruler@startnum}%
+\setcounter{fgrulernum}{\fgruler@startnumh}%
\put(0,\fgruler@sep){\makebox(0,0)[b]{\fgruler@font@\thefgrulernum}}%
\ifdim#1>.5cm\put(-5,\fgruler@sep){\makebox(0,0)[b]{\fgruler@font@\fgruler@caption@cm}}\fi%
\end{picture}}
@@ -1474,14 +1518,14 @@ keepspaces]}
\fgruler@div{#1}{16}%
\multiput(0,0)(-16,0){\@tempcnta}{\fgruler@in@thick@v\fgruler@in@color@v\line(0,1){\fgruler@marklth}}%
\iffgruler@borderline\put(0,0){\line(-1,0){#1}}\fi%
-\setcounter{fgrulernum}{\fgruler@startnum}\stepcounter{fgrulernum}%
+\setcounter{fgrulernum}{\fgruler@startnumh}\stepcounter{fgrulernum}%
\multiput(-16,\fgruler@sep)(-16,0){\fgruler@tempdima}{\makebox(0,0)[b]{\fgruler@font@\thefgrulernum\stepcounter{fgrulernum}}}}
\def\fgruler@in@leftup@#1{%
\setlength{\unitlength}{.0625in}%
\begin{picture}(#1,\fgruler@width)(-#1,0)%
\fgruler@in@leftup{#1}%
-\setcounter{fgrulernum}{\fgruler@startnum}%
+\setcounter{fgrulernum}{\fgruler@startnumh}%
\put(0,\fgruler@sep){\makebox(0,0)[b]{\fgruler@font@\thefgrulernum}}%
\ifdim#1>.5in\put(-8,\fgruler@sep){\makebox(0,0)[b]{\fgruler@font@\fgruler@caption@in}}\fi%
\end{picture}}
@@ -1501,14 +1545,14 @@ keepspaces]}
\fgruler@div{#1}{10}%
\multiput(0,0)(0,-10){\@tempcnta}{\fgruler@cm@thick@iii\fgruler@cm@color@iii\line(1,0){\fgruler@marklth}}%
\iffgruler@borderline\put(0,0){\line(0,-1){#1}}\fi%
-\setcounter{fgrulernum}{\fgruler@startnum}\stepcounter{fgrulernum}%
+\setcounter{fgrulernum}{\fgruler@startnumv}\stepcounter{fgrulernum}%
\multiput(\fgruler@sep,-10)(0,-10){\fgruler@tempdima}{\makebox(0,0)[l]{\fgruler@rotatebox{90}{\fgruler@font@\thefgrulernum\stepcounter{fgrulernum}}}}}
\def\fgruler@cm@downright@#1{%
\setlength{\unitlength}{1mm}%
\begin{picture}(\fgruler@width,#1)(0,-#1)%
\fgruler@cm@downright{#1}%
-\setcounter{fgrulernum}{\fgruler@startnum}%
+\setcounter{fgrulernum}{\fgruler@startnumv}%
\put(\fgruler@sep,0){\makebox(0,0)[l]{\fgruler@rotatebox{90}{\fgruler@font@\thefgrulernum}}}%
\ifdim#1>.5cm\put(\fgruler@sep,-5){\makebox(0,0)[l]{\fgruler@rotatebox{90}{\fgruler@font@\fgruler@caption@cm}}}\fi%
\end{picture}}
@@ -1534,14 +1578,14 @@ keepspaces]}
\fgruler@div{#1}{16}%
\multiput(0,0)(0,-16){\@tempcnta}{\fgruler@in@thick@v\fgruler@in@color@v\line(1,0){\fgruler@marklth}}%
\iffgruler@borderline\put(0,0){\line(0,-1){#1}}\fi%
-\setcounter{fgrulernum}{\fgruler@startnum}\stepcounter{fgrulernum}%
+\setcounter{fgrulernum}{\fgruler@startnumv}\stepcounter{fgrulernum}%
\multiput(\fgruler@sep,-16)(0,-16){\fgruler@tempdima}{\makebox(0,0)[l]{\fgruler@rotatebox{90}{\fgruler@font@\thefgrulernum\stepcounter{fgrulernum}}}}}
\def\fgruler@in@downright@#1{%
\setlength{\unitlength}{.0625in}%
\begin{picture}(\fgruler@width,#1)(0,-#1)%
\fgruler@in@downright{#1}%
-\setcounter{fgrulernum}{\fgruler@startnum}%
+\setcounter{fgrulernum}{\fgruler@startnumv}%
\put(\fgruler@sep,0){\makebox(0,0)[l]{\fgruler@rotatebox{90}{\fgruler@font@\thefgrulernum}}}%
\ifdim#1>.5in\put(\fgruler@sep,-8){\makebox(0,0)[l]{\fgruler@rotatebox{90}{\fgruler@font@\fgruler@caption@in}}}\fi%
\end{picture}}
@@ -1561,14 +1605,14 @@ keepspaces]}
\fgruler@div{#1}{10}%
\multiput(0,0)(0,-10){\@tempcnta}{\fgruler@cm@thick@iii\fgruler@cm@color@iii\line(-1,0){\fgruler@marklth}}%
\iffgruler@borderline\put(0,0){\line(0,-1){#1}}\fi%
-\setcounter{fgrulernum}{\fgruler@startnum}\stepcounter{fgrulernum}%
+\setcounter{fgrulernum}{\fgruler@startnumv}\stepcounter{fgrulernum}%
\multiput(-\fgruler@sep,-10)(0,-10){\fgruler@tempdima}{\makebox(0,0)[r]{\fgruler@rotatebox{-90}{\fgruler@font@\thefgrulernum\stepcounter{fgrulernum}}}}}
\def\fgruler@cm@downleft@#1{%
\setlength{\unitlength}{1mm}%
\begin{picture}(\fgruler@width,#1)(-\fgruler@width,-#1)%
\fgruler@cm@downleft{#1}%
-\setcounter{fgrulernum}{\fgruler@startnum}%
+\setcounter{fgrulernum}{\fgruler@startnumv}%
\put(-\fgruler@sep,0){\makebox(0,0)[r]{\fgruler@rotatebox{-90}{\fgruler@font@\thefgrulernum}}}%
\ifdim#1>.5cm\put(-\fgruler@sep,-5){\makebox(0,0)[r]{\fgruler@rotatebox{-90}{\fgruler@font@\fgruler@caption@cm}}}\fi%
\end{picture}}
@@ -1594,14 +1638,14 @@ keepspaces]}
\fgruler@div{#1}{16}%
\multiput(0,0)(0,-16){\@tempcnta}{\fgruler@in@thick@v\fgruler@in@color@v\line(-1,0){\fgruler@marklth}}%
\iffgruler@borderline\put(0,0){\line(0,-1){#1}}\fi%
-\setcounter{fgrulernum}{\fgruler@startnum}\stepcounter{fgrulernum}%
+\setcounter{fgrulernum}{\fgruler@startnumv}\stepcounter{fgrulernum}%
\multiput(-\fgruler@sep,-16)(0,-16){\fgruler@tempdima}{\makebox(0,0)[r]{\fgruler@rotatebox{-90}{\fgruler@font@\thefgrulernum\stepcounter{fgrulernum}}}}}
\def\fgruler@in@downleft@#1{%
\setlength{\unitlength}{.0625in}%
\begin{picture}(\fgruler@width,#1)(-\fgruler@width,-#1)%
\fgruler@in@downleft{#1}%
-\setcounter{fgrulernum}{\fgruler@startnum}%
+\setcounter{fgrulernum}{\fgruler@startnumv}%
\put(-\fgruler@sep,0){\makebox(0,0)[r]{\fgruler@rotatebox{-90}{\fgruler@font@\thefgrulernum}}}%
\ifdim#1>.5in\put(-\fgruler@sep,-8){\makebox(0,0)[r]{\fgruler@rotatebox{-90}{\fgruler@font@\fgruler@caption@in}}}\fi%
\end{picture}}
@@ -1621,14 +1665,14 @@ keepspaces]}
\fgruler@div{#1}{10}%
\multiput(0,0)(0,10){\@tempcnta}{\fgruler@cm@thick@iii\fgruler@cm@color@iii\line(1,0){\fgruler@marklth}}%
\iffgruler@borderline\put(0,0){\line(0,1){#1}}\fi%
-\setcounter{fgrulernum}{\fgruler@startnum}\stepcounter{fgrulernum}%
+\setcounter{fgrulernum}{\fgruler@startnumv}\stepcounter{fgrulernum}%
\multiput(\fgruler@sep,10)(0,10){\fgruler@tempdima}{\makebox(0,0)[l]{\fgruler@rotatebox{90}{\fgruler@font@\thefgrulernum\stepcounter{fgrulernum}}}}}
\def\fgruler@cm@upright@#1{%
\setlength{\unitlength}{1mm}%
\begin{picture}(\fgruler@width,#1)%
\fgruler@cm@upright{#1}%
-\setcounter{fgrulernum}{\fgruler@startnum}%
+\setcounter{fgrulernum}{\fgruler@startnumv}%
\put(\fgruler@sep,0){\makebox(0,0)[l]{\fgruler@rotatebox{90}{\fgruler@font@\thefgrulernum}}}%
\ifdim#1>.5cm\put(\fgruler@sep,5){\makebox(0,0)[l]{\fgruler@rotatebox{90}{\fgruler@font@\fgruler@caption@cm}}}\fi%
\end{picture}}
@@ -1654,14 +1698,14 @@ keepspaces]}
\fgruler@div{#1}{16}%
\multiput(0,0)(0,16){\@tempcnta}{\fgruler@in@thick@v\fgruler@in@color@v\line(1,0){\fgruler@marklth}}%
\iffgruler@borderline\put(0,0){\line(0,1){#1}}\fi%
-\setcounter{fgrulernum}{\fgruler@startnum}\stepcounter{fgrulernum}%
+\setcounter{fgrulernum}{\fgruler@startnumv}\stepcounter{fgrulernum}%
\multiput(\fgruler@sep,16)(0,16){\fgruler@tempdima}{\makebox(0,0)[l]{\fgruler@rotatebox{90}{\fgruler@font@\thefgrulernum\stepcounter{fgrulernum}}}}}
\def\fgruler@in@upright@#1{%
\setlength{\unitlength}{.0625in}%
\begin{picture}(\fgruler@width,#1)%
\fgruler@in@upright{#1}%
-\setcounter{fgrulernum}{\fgruler@startnum}%
+\setcounter{fgrulernum}{\fgruler@startnumv}%
\put(\fgruler@sep,0){\makebox(0,0)[l]{\fgruler@rotatebox{90}{\fgruler@font@\thefgrulernum}}}%
\ifdim#1>.5in\put(\fgruler@sep,8){\makebox(0,0)[l]{\fgruler@rotatebox{90}{\fgruler@font@\fgruler@caption@in}}}\fi%
\end{picture}}
@@ -1681,14 +1725,14 @@ keepspaces]}
\fgruler@div{#1}{10}%
\multiput(0,0)(0,10){\@tempcnta}{\fgruler@cm@thick@iii\fgruler@cm@color@iii\line(-1,0){\fgruler@marklth}}%
\iffgruler@borderline\put(0,0){\line(0,1){#1}}\fi%
-\setcounter{fgrulernum}{\fgruler@startnum}\stepcounter{fgrulernum}%
+\setcounter{fgrulernum}{\fgruler@startnumv}\stepcounter{fgrulernum}%
\multiput(-\fgruler@sep,10)(0,10){\fgruler@tempdima}{\makebox(0,0)[r]{\fgruler@rotatebox{-90}{\fgruler@font@\thefgrulernum\stepcounter{fgrulernum}}}}}
\def\fgruler@cm@upleft@#1{%
\setlength{\unitlength}{1mm}%
\begin{picture}(\fgruler@width,#1)(-\fgruler@width,0)%
\fgruler@cm@upleft{#1}%
-\setcounter{fgrulernum}{\fgruler@startnum}%
+\setcounter{fgrulernum}{\fgruler@startnumv}%
\put(-\fgruler@sep,0){\makebox(0,0)[r]{\fgruler@rotatebox{-90}{\fgruler@font@\thefgrulernum}}}%
\ifdim#1>.5cm\put(-\fgruler@sep,5){\makebox(0,0)[r]{\fgruler@rotatebox{-90}{\fgruler@font@\fgruler@caption@cm}}}\fi%
\end{picture}}
@@ -1714,14 +1758,14 @@ keepspaces]}
\fgruler@div{#1}{16}%
\multiput(0,0)(0,16){\@tempcnta}{\fgruler@in@thick@v\fgruler@in@color@v\line(-1,0){\fgruler@marklth}}%
\iffgruler@borderline\put(0,0){\line(0,1){#1}}\fi%
-\setcounter{fgrulernum}{\fgruler@startnum}\stepcounter{fgrulernum}%
+\setcounter{fgrulernum}{\fgruler@startnumv}\stepcounter{fgrulernum}%
\multiput(-\fgruler@sep,16)(0,16){\fgruler@tempdima}{\makebox(0,0)[r]{\fgruler@rotatebox{-90}{\fgruler@font@\thefgrulernum\stepcounter{fgrulernum}}}}}
\def\fgruler@in@upleft@#1{%
\setlength{\unitlength}{.0625in}%
\begin{picture}(\fgruler@width,#1)(-\fgruler@width,0)%
\fgruler@in@upleft{#1}%
-\setcounter{fgrulernum}{\fgruler@startnum}%
+\setcounter{fgrulernum}{\fgruler@startnumv}%
\put(-\fgruler@sep,0){\makebox(0,0)[r]{\fgruler@rotatebox{-90}{\fgruler@font@\thefgrulernum}}}%
\ifdim#1>.5in\put(-\fgruler@sep,8){\makebox(0,0)[r]{\fgruler@rotatebox{-90}{\fgruler@font@\fgruler@caption@in}}}\fi%
\end{picture}}
@@ -1918,9 +1962,132 @@ keepspaces]}
\def\fgruler@in@lowerright@fg{\fgruler@in@lowerright@fg@{\fgruler@hshift}{\fgruler@vshift}}
+%% UPPERLEFTT CM
+\def\fgruler@cm@upperleftT@fg{%
+\AtTextLowerLeft{%
+\setlength{\unitlength}{1mm}%
+\fgruler@fgsetting%
+\begin{picture}(\textwidth,\textheight)(0,-\textheight)%
+\fgruler@cm@rightup{\textwidth}%
+\fgruler@cm@downleft{\textheight}%
+\put(5,\fgruler@sep){\makebox(0,0)[b]{\fgruler@font@\fgruler@caption@cm}}%
+\setcounter{fgrulernum}{\fgruler@startnumh}%
+\put(0,\fgruler@sep){\makebox(0,0)[b]{\fgruler@font@\thefgrulernum}}%
+\setcounter{fgrulernum}{\fgruler@startnumv}%
+\put(-\fgruler@sep,0){\makebox(0,0)[r]{\fgruler@font@\thefgrulernum}}%
+\end{picture}}}
+
+%% UPPERLEFTT IN
+\def\fgruler@in@upperleftT@fg{%
+\AtTextLowerLeft{%
+\setlength{\unitlength}{.0625in}%
+\fgruler@fgsetting%
+\begin{picture}(\textwidth,\textheight)(0,-\textheight)%
+\fgruler@in@rightup{\textwidth}%
+\fgruler@in@downleft{\textheight}%
+\put(8,\fgruler@sep){\makebox(0,0)[b]{\fgruler@font@\fgruler@caption@in}}%
+\setcounter{fgrulernum}{\fgruler@startnumh}%
+\put(0,\fgruler@sep){\makebox(0,0)[b]{\fgruler@font@\thefgrulernum}}%
+\setcounter{fgrulernum}{\fgruler@startnumv}%
+\put(-\fgruler@sep,0){\makebox(0,0)[r]{\fgruler@font@\thefgrulernum}}%
+\end{picture}}}
+
+%% UPPERRIGHTT CM
+\def\fgruler@cm@upperrightT@fg{%
+\AtTextLowerLeft{%
+\setlength{\unitlength}{1mm}%
+\fgruler@fgsetting%
+\begin{picture}(\textwidth,\textheight)(-\textwidth,-\textheight)%
+\fgruler@cm@leftup{\textwidth}%
+\fgruler@cm@downright{\textheight}%
+\put(-5,\fgruler@sep){\makebox(0,0)[b]{\fgruler@font@\fgruler@caption@cm}}%
+\setcounter{fgrulernum}{\fgruler@startnumh}%
+\put(0,\fgruler@sep){\makebox(0,0)[b]{\fgruler@font@\thefgrulernum}}%
+\setcounter{fgrulernum}{\fgruler@startnumv}%
+\put(\fgruler@sep,0){\makebox(0,0)[l]{\fgruler@font@\thefgrulernum}}%
+\end{picture}}}
+
+%% UPPERRIGHTT IN
+\def\fgruler@in@upperrightT@fg{%
+\AtTextLowerLeft{%
+\setlength{\unitlength}{.0625in}%
+\fgruler@fgsetting%
+\begin{picture}(\textwidth,\textheight)(-\textwidth,-\textheight)%
+\fgruler@in@leftup{\textwidth}%
+\fgruler@in@downright{\textheight}%
+\put(-8,\fgruler@sep){\makebox(0,0)[b]{\fgruler@font@\fgruler@caption@in}}%
+\setcounter{fgrulernum}{\fgruler@startnumh}%
+\put(0,\fgruler@sep){\makebox(0,0)[b]{\fgruler@font@\thefgrulernum}}%
+\setcounter{fgrulernum}{\fgruler@startnumv}%
+\put(\fgruler@sep,0){\makebox(0,0)[l]{\fgruler@font@\thefgrulernum}}%
+\end{picture}}}
+
+%% LOWERLEFTT CM
+\def\fgruler@cm@lowerleftT@fg{%
+\AtTextLowerLeft{%
+\setlength{\unitlength}{1mm}%
+\fgruler@fgsetting%
+\begin{picture}(\textwidth,\textheight)(0,0)%
+\fgruler@cm@rightdown{\textwidth}%
+\fgruler@cm@upleft{\textheight}%
+\put(5,-\fgruler@sep){\makebox(0,0)[t]{\fgruler@font@\fgruler@caption@cm}}%
+\setcounter{fgrulernum}{\fgruler@startnumh}%
+\put(0,-\fgruler@sep){\makebox(0,0)[t]{\fgruler@font@\thefgrulernum}}%
+\setcounter{fgrulernum}{\fgruler@startnumv}%
+\put(-\fgruler@sep,0){\makebox(0,0)[r]{\fgruler@font@\thefgrulernum}}%
+\end{picture}}}
+
+%% LOWERLEFTT IN
+\def\fgruler@in@lowerleftT@fg{%
+\AtTextLowerLeft{%
+\setlength{\unitlength}{.0625in}%
+\fgruler@fgsetting%
+\begin{picture}(\textwidth,\textheight)(0,0)%
+\fgruler@in@rightdown{\textwidth}%
+\fgruler@in@upleft{\textheight}%
+\put(8,-\fgruler@sep){\makebox(0,0)[t]{\fgruler@font@\fgruler@caption@in}}%
+\setcounter{fgrulernum}{\fgruler@startnumh}%
+\put(0,-\fgruler@sep){\makebox(0,0)[t]{\fgruler@font@\thefgrulernum}}%
+\setcounter{fgrulernum}{\fgruler@startnumv}%
+\put(-\fgruler@sep,0){\makebox(0,0)[r]{\fgruler@font@\thefgrulernum}}%
+\end{picture}}}
+
+%% LOWERRIGHTT CM
+\def\fgruler@cm@lowerrightT@fg{%
+\AtTextLowerLeft{%
+\setlength{\unitlength}{1mm}%
+\fgruler@fgsetting%
+\begin{picture}(\textwidth,\textheight)(-\textwidth,0)%
+\fgruler@cm@leftdown{\textwidth}%
+\fgruler@cm@upright{\textheight}%
+\put(-5,-\fgruler@sep){\makebox(0,0)[t]{\fgruler@font@\fgruler@caption@cm}}%
+\setcounter{fgrulernum}{\fgruler@startnumh}%
+\put(0,-\fgruler@sep){\makebox(0,0)[t]{\fgruler@font@\thefgrulernum}}%
+\setcounter{fgrulernum}{\fgruler@startnumv}%
+\put(\fgruler@sep,0){\makebox(0,0)[l]{\fgruler@font@\thefgrulernum}}%
+\end{picture}}}
+
+%% LOWERRIGHTT IN
+\def\fgruler@in@lowerrightT@fg{%
+\AtTextLowerLeft{%
+\setlength{\unitlength}{.0625in}%
+\fgruler@fgsetting%
+\begin{picture}(\textwidth,\textheight)(-\textwidth,0)%
+\fgruler@in@leftdown{\textwidth}%
+\fgruler@in@upright{\textheight}%
+\put(-8,-\fgruler@sep){\makebox(0,0)[t]{\fgruler@font@\fgruler@caption@in}}%
+\setcounter{fgrulernum}{\fgruler@startnumh}%
+\put(0,-\fgruler@sep){\makebox(0,0)[t]{\fgruler@font@\thefgrulernum}}%
+\setcounter{fgrulernum}{\fgruler@startnumv}%
+\put(\fgruler@sep,0){\makebox(0,0)[l]{\fgruler@font@\thefgrulernum}}%
+\end{picture}}}
+
%% USER
\def\fgruler@cm@user@fg{}
\def\fgruler@in@user@fg{}
+\def\fgrulertype#1#2{\csname fgruler@#1@#2@fg\endcsname}
+\def\fgrulerdefusercm#1{\def\fgruler@cm@user@fg{#1}}
+\def\fgrulerdefuserin#1{\def\fgruler@in@user@fg{#1}}
% \end{macrocode}
% \Finale
\endinput \ No newline at end of file
diff --git a/macros/latex/contrib/fgruler/fgruler.pdf b/macros/latex/contrib/fgruler/fgruler.pdf
index cd1989fa8f..a823e23c5a 100644
--- a/macros/latex/contrib/fgruler/fgruler.pdf
+++ b/macros/latex/contrib/fgruler/fgruler.pdf
Binary files differ
diff --git a/macros/latex/contrib/grant/LICENSE b/macros/latex/contrib/grant/LICENSE
index 1e5a099765..f72ac7c28c 100644
--- a/macros/latex/contrib/grant/LICENSE
+++ b/macros/latex/contrib/grant/LICENSE
@@ -1,6 +1,6 @@
The MIT License (MIT)
-Copyright (c) 2016 Karr Lab
+Copyright (c) 2016-2019 Karr Lab
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/macros/latex/contrib/grant/VERSION b/macros/latex/contrib/grant/VERSION
deleted file mode 100644
index 6812f8122e..0000000000
--- a/macros/latex/contrib/grant/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-0.0.3 \ No newline at end of file
diff --git a/macros/latex/contrib/grant/grant.dtx b/macros/latex/contrib/grant/grant.dtx
index 6c8a96d5f4..153a3d780e 100644
--- a/macros/latex/contrib/grant/grant.dtx
+++ b/macros/latex/contrib/grant/grant.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2016 Jonathan Karr <karr@mssm.edu>
+% Copyright (C) 2016-2019 Jonathan Karr <karr@mssm.edu>
% -----------------------------------------------------------
%
% This file may be distributed and/or modified under the conditions of
@@ -18,7 +18,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}[2003/12/01]
%<package>\ProvidesPackage{grant}
%<*package>
- [2016/08/22 v0.0.3 Grant package for formatting federal grant applications]
+ [2019/02/26 v0.0.5 Grant package for formatting federal grant applications]
%</package>
%
%
@@ -53,7 +53,11 @@
%% Right brace \} Tilde \~}
-% \changes{v0.0.2}{2016/08/17}{Initial version}
+% \changes{v0.0.5}{2019/02/26}{Adding examples}
+% \changes{v0.0.4}{2016/09/26}{Debugging class renaming and .dtx file for pdf compilation}
+% \changes{v0.0.3}{2016/08/22}{Rename classes to grant-*.cls}
+% \changes{v0.0.2}{2016/08/17}{Packaging with ins, dtx files}
+% \changes{v0.0.1}{2016/08/17}{Initial version}
%
% \GetFileInfo{grant.dtx}
%
@@ -69,7 +73,8 @@
%
% This package provides LaTeX classes to format grant applications for the following federal agencies:
% \begin{description}[labelindent=0.25in]
-% \item[\texttt{grant-arl}]: Army Research Laboratory
+% \item[\texttt{grant-afosr}]: Air Force Office of Scientific Research
+% \item[\texttt{grant-aro}]: Army Research Office
% \item[\texttt{grant-darpa}]: Defense Advanced Research Projects Agency
% \item[\texttt{grant-doe}]: Department of Energy
% \item[\texttt{grant-nih}]: National Institutes of Health
@@ -109,7 +114,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{grant}[2016/01/12 grant class]
+\ProvidesClass{grant}[2019/02/26 grant class]
%%%%%%%%%%%%%%%%%%%%%%
%% options
@@ -128,14 +133,21 @@
{\booltrue{isdraft}}
\DeclareOption{isnotdraft}
{\boolfalse{isdraft}}
-
+
+\newbool{iswhitepaper}
+\boolfalse{iswhitepaper}
+\DeclareOption{iswhitepaper}
+ {\booltrue{iswhitepaper}}
+\DeclareOption{isnotwhitepaper}
+ {\boolfalse{iswhitepaper}}
+
\newbool{issectioncompact}
\boolfalse{issectioncompact}
\DeclareOption{issectioncompact}
{\booltrue{issectioncompact}}
\DeclareOption{isnotsectioncompact}
{\boolfalse{issectioncompact}}
-
+
\newbool{isbibcompact}
\boolfalse{isbibcompact}
\DeclareOption{isbibcompact}
@@ -143,7 +155,7 @@
\DeclareOption{isnotbibcompact}
{\boolfalse{isbibcompact}}
-\ExecuteOptions{isdraft, isnotdraft, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
+\ExecuteOptions{isdraft, isnotdraft, iswhitepaper, isnotwhitepaper, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
\ProcessOptions
%%%%%%%%%%%%%%%%%%%%%%
@@ -165,6 +177,16 @@
%underline
\usepackage[normalem]{ulem}
\usepackage{soul}
+\soulregister\cite7
+
+%highlighting
+\usepackage{xcolor}
+\usepackage{framed}
+\definecolor{hlcolor}{rgb}{1, 1, 0}
+\sethlcolor{hlcolor}
+\colorlet{shadecolor}{hlcolor}
+\setlength{\fboxsep}{0.05ex}
+\setlength{\OuterFrameSep}{-\fboxsep}
%spacing
\usepackage{setspace}
@@ -241,13 +263,18 @@
\subsubsection*{#2}%
}
+\ifbool{iswhitepaper}{
+ \titleformat{\section}[runin]{\bfseries}{\uline{\thesection.~}}{0ex}{\uline{#1}}[:]
+}{
+ \usepackage[auto]{chappg}
+}
+
\ifbool{issectioncompact}{
\titleformat{\section}[runin]{\bfseries}{\uline{\thesection.~}}{0ex}{\uline{#1}}[.]
\titlespacing*{\section}{0pt}{*0.0}{*0.5}
}{}
%page numbering
-\usepackage[auto]{chappg}
%header/footer
\usepackage{fancyhdr}
@@ -262,6 +289,12 @@
\rfoot{\small\thepage}
}{}
+\ifbool{iswhitepaper}{
+ \lfoot{}
+ \rfoot{}
+ \cfoot{\small\thepage}
+}{}
+
%lists
\usepackage{paralist}
\usepackage{enumitem}
@@ -314,10 +347,17 @@
\renewcommand{\bibfont}{\footnotesize}
\ExecuteBibliographyOptions{maxbibnames=1,minbibnames=1}
+
\DeclareFieldFormat[article]{title}{}
\DeclareFieldFormat[article]{pages}{}
\DeclareFieldFormat[article]{volume}{}
\DeclareFieldFormat[article]{number}{}
+
+ \DeclareFieldFormat[inproceedings]{title}{}
+ \DeclareFieldFormat[inproceedings]{pages}{}
+ \DeclareFieldFormat[inproceedings]{volume}{}
+ \DeclareFieldFormat[inproceedings]{number}{}
+
\DeclareFieldFormat[online]{url}{}
\DeclareFieldFormat[online]{urldate}{}
@@ -474,6 +514,8 @@
\newcommand{\PoEmail}{}
\newcommand{\PoPhone}{}
+\newcommand{\FundingIdTitle}{\FundingId\ifdefempty{\FundingTitle}{}{: \FundingTitle}}
+
\newcommand{\makecoverpage}{
{\LARGE\bfseries
@@ -483,7 +525,7 @@
\vskip1ex
\uline{Funding opportunity}
\\\FundingAgency
- \\{\FundingTitle} (\href{\FundingUrl}{\FundingId})
+ \\\FundingIdTitle (\href{\FundingUrl}{\FundingId})
\\\FundingDeadline
\uline{Applicant}
@@ -503,12 +545,36 @@
\\\PoPhone
}
+\newcommand{\AbstractName}{Abstract}
+\newcommand{\AbstractOtherPersonnelName}{Other key personnel and primary subcontractors}
+\providetoggle{AbstractIsCentered}
+\providetoggle{AbstractShowAdminPOC}
+\providetoggle{AbstractShowLeadOrg}
+\providetoggle{AbstractShowOtherPersonnel}
+\providetoggle{AbstractShowDuration}
+\providetoggle{AbstractShowCost}
+\settoggle{AbstractIsCentered}{false}
+\settoggle{AbstractShowAdminPOC}{true}
+\settoggle{AbstractShowLeadOrg}{true}
+\settoggle{AbstractShowOtherPersonnel}{true}
+\settoggle{AbstractShowDuration}{true}
+\settoggle{AbstractShowCost}{true}
+
+
\newcommand{\makeabstractcoverpage}{
- \begin{center}\LARGE\textbf{
- ABSTRACT\\[0.5ex]
- \FundingId: \FundingTitle\\[0.5ex]
- \ProposalTitle
+ {\setlength{\parskip}{12pt}
+
+ \iftoggle{AbstractIsCentered}{
+ \centering
+ }{}
+
+ \begin{center}\textbf{
+ \LARGE{\MakeUppercase{\AbstractName}}\\[18pt]
+ \LARGE{\FundingId}\\
+ \large{\FundingTitle}\\[18pt]
+ \LARGE{\ProposalTitle}
}\end{center}
+ \vskip-8pt
\textbf{Technical point of contact: \PiName}\\
\PiTitle\\
@@ -517,25 +583,32 @@
\PiAddress\\
Tel: \PiPhone, Fax: \PiFax, Email: \href{mailto:\PiEmail}{\PiEmail}, Web: \href{http://www.\PiUrl}{\PiUrl}
+ \iftoggle{AbstractShowAdminPOC}{
\textbf{Administrative point of contact: \AdminName}\\
\AdminTitle\\
\AdminAddress\\
\AdminInstitution\\
Tel: \AdminPhone, Fax: \AdminFax, Email: \href{mailto:\AdminEmail}{\AdminEmail}
+ }{}
+ \iftoggle{AbstractShowLeadOrg}{
\textbf{Lead organization: \LeadOrganizationName}\\
\LeadOrganizationAddress\\
DUNS number: \LeadOrganizationDUNS\\
Taxpayer identification number: \LeadOrganizationTIN\\
CAGE code: \LeadOrganizationCAGE
+ }{}
- \textbf{Other key personnel and primary subcontractors}\\
+ \iftoggle{AbstractShowOtherPersonnel}{
+ \textbf{\AbstractOtherPersonnelName}\\
\OtherKeyPersonnel
+ }{}
- \textbf{Duration: {\ProposalDurationInYears} years}
+ \iftoggle{AbstractShowDuration}{\textbf{Duration: {\ProposalDurationInYears} years}}{}
- \textbf{Estimated cost: \${\ProposalCostInMillions} million in total costs}
+ \iftoggle{AbstractShowCost}{\textbf{Estimated cost: \${\ProposalCostInMillions} million in total costs}}{}
+ }
\clearpage
}
@@ -544,18 +617,88 @@
%</grant>
% \end{macrocode}
+% \begin{macrocode}
+%<*grant-afosr>
+% \end{macrocode}
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesClass{grant-afosr}[2019/02/26 AFOSR class]
+
+\newcommand{\draftstatus}{isnotdraft}
+\DeclareOption{isdraft}{\renewcommand{\draftstatus}{isdraft}}
+\DeclareOption{isnotdraft}{\renewcommand{\draftstatus}{isnotdraft}}
+
+\newcommand{\whitepaperstatus}{isnotwhitepaper}
+\DeclareOption{iswhitepaper}{\renewcommand{\whitepaperstatus}{iswhitepaper}}
+\DeclareOption{isnotwhitepaper}{\renewcommand{\whitepaperstatus}{isnotwhitepaper}}
+
+\newcommand{\sectioncompactstatus}{isnotsectioncompact}
+\DeclareOption{issectioncompact}{\renewcommand{\sectioncompactstatus}{issectioncompact}}
+\DeclareOption{isnotsectioncompact}{\renewcommand{\sectioncompactstatus}{isnotsectioncompact}}
+
+\newcommand{\bibcompactstatus}{isnotbibcompact}
+\DeclareOption{isbibcompact}{\renewcommand{\bibcompactstatus}{isbibcompact}}
+\DeclareOption{isnotbibcompact}{\renewcommand{\bibcompactstatus}{isnotbibcompact}}
+
+\ExecuteOptions{isdraft, isnotdraft, iswhitepaper, isnotwhitepaper, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
+\ProcessOptions
+
+\LoadClass[12pt, \draftstatus, \whitepaperstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
+
+%%%%%%%%%%%%%%%%%%%%%%
+%% formatting
+%%%%%%%%%%%%%%%%%%%%%%
+
+%geometry
+\geometry{margin=1in}
+
+%font
+\usepackage{times}
+\renewcommand{\familydefault}{\rmdefault}
+
+%paragraph skip
+\setlength{\parskip}{4pt}
+
+%%%%%%%%%%%%%%%%%%%%%%
+%% abstract
+%%%%%%%%%%%%%%%%%%%%%%
+\renewcommand{\AbstractName}{White paper}
+\settoggle{AbstractIsCentered}{true}
+\settoggle{AbstractShowAdminPOC}{false}
+\settoggle{AbstractShowLeadOrg}{false}
+\settoggle{AbstractShowOtherPersonnel}{false}
+\settoggle{AbstractShowDuration}{false}
+\settoggle{AbstractShowCost}{false}
+
+\ifbool{iswhitepaper}{
+ \titleformat{\section}[block]{\bfseries}{\uline{\thesection.~}}{0ex}{\uline{#1}}[]
+ \titleformat{\subsection}[runin]{\bfseries}{\thesubsection.~}{0ex}{#1}[.]
+ \titleformat{\subsubsection}[runin]{}{\uline{\thesubsubsection.~}}{0ex}{\uline{#1}}[.]
+
+ \titlespacing*{\section}{0pt}{*0.0}{*-1}
+
+ \renewcommand{\bibfont}{\normalsize}
+}{}
+
% \begin{macrocode}
-%<*grant-arl>
+%</grant-afosr>
% \end{macrocode}
+
+% \begin{macrocode}
+%<*grant-aro>
+% \end{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{grant-arl}[2016/01/19 ARL class]
+\ProvidesClass{grant-aro}[2019/02/26 ARO class]
\newcommand{\draftstatus}{isnotdraft}
\DeclareOption{isdraft}{\renewcommand{\draftstatus}{isdraft}}
\DeclareOption{isnotdraft}{\renewcommand{\draftstatus}{isnotdraft}}
+\newcommand{\whitepaperstatus}{isnotwhitepaper}
+\DeclareOption{iswhitepaper}{\renewcommand{\whitepaperstatus}{iswhitepaper}}
+\DeclareOption{isnotwhitepaper}{\renewcommand{\whitepaperstatus}{isnotwhitepaper}}
+
\newcommand{\sectioncompactstatus}{isnotsectioncompact}
\DeclareOption{issectioncompact}{\renewcommand{\sectioncompactstatus}{issectioncompact}}
\DeclareOption{isnotsectioncompact}{\renewcommand{\sectioncompactstatus}{isnotsectioncompact}}
@@ -564,10 +707,10 @@
\DeclareOption{isbibcompact}{\renewcommand{\bibcompactstatus}{isbibcompact}}
\DeclareOption{isnotbibcompact}{\renewcommand{\bibcompactstatus}{isnotbibcompact}}
-\ExecuteOptions{isdraft, isnotdraft, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
+\ExecuteOptions{isdraft, isnotdraft, iswhitepaper, isnotwhitepaper, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
\ProcessOptions
-\LoadClass[12pt, \draftstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
+\LoadClass[12pt, \draftstatus, \whitepaperstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
%%%%%%%%%%%%%%%%%%%%%%
%% formatting
@@ -583,8 +726,30 @@
%paragraph skip
\setlength{\parskip}{4pt}
+%%%%%%%%%%%%%%%%%%%%%%
+%% abstract
+%%%%%%%%%%%%%%%%%%%%%%
+\renewcommand{\AbstractName}{White paper}
+\settoggle{AbstractIsCentered}{true}
+\settoggle{AbstractShowAdminPOC}{true}
+\settoggle{AbstractShowLeadOrg}{true}
+\settoggle{AbstractShowOtherPersonnel}{true}
+\settoggle{AbstractShowDuration}{false}
+\settoggle{AbstractShowCost}{false}
+
+\ifbool{iswhitepaper}{
+ \titleformat{\section}[block]{\bfseries}{\uline{\thesection.~}}{0ex}{\uline{#1}}[]
+ \titleformat{\subsection}[runin]{\bfseries}{\thesubsection.~}{0ex}{#1}[.]
+ \titleformat{\subsubsection}[runin]{}{\uline{\thesubsubsection.~}}{0ex}{\uline{#1}}[.]
+
+ \titlespacing*{\section}{0pt}{*0.0}{*-1}
+
+ \renewcommand{\bibfont}{\normalsize}
+}{}
+
+
% \begin{macrocode}
-%</grant-arl>
+%</grant-aro>
% \end{macrocode}
@@ -592,12 +757,16 @@
%<*grant-darpa>
% \end{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{grant-darpa}[2016/01/12 DARPA class]
+\ProvidesClass{grant-darpa}[2019/02/26 DARPA class]
\newcommand{\draftstatus}{isnotdraft}
\DeclareOption{isdraft}{\renewcommand{\draftstatus}{isdraft}}
\DeclareOption{isnotdraft}{\renewcommand{\draftstatus}{isnotdraft}}
+\newcommand{\whitepaperstatus}{isnotwhitepaper}
+\DeclareOption{iswhitepaper}{\renewcommand{\whitepaperstatus}{iswhitepaper}}
+\DeclareOption{isnotwhitepaper}{\renewcommand{\whitepaperstatus}{isnotwhitepaper}}
+
\newcommand{\sectioncompactstatus}{isnotsectioncompact}
\DeclareOption{issectioncompact}{\renewcommand{\sectioncompactstatus}{issectioncompact}}
\DeclareOption{isnotsectioncompact}{\renewcommand{\sectioncompactstatus}{isnotsectioncompact}}
@@ -606,10 +775,10 @@
\DeclareOption{isbibcompact}{\renewcommand{\bibcompactstatus}{isbibcompact}}
\DeclareOption{isnotbibcompact}{\renewcommand{\bibcompactstatus}{isnotbibcompact}}
-\ExecuteOptions{isdraft, isnotdraft, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
+\ExecuteOptions{isdraft, isnotdraft, iswhitepaper, isnotwhitepaper, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
\ProcessOptions
-\LoadClass[12pt, \draftstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
+\LoadClass[12pt, \draftstatus, \whitepaperstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
%%%%%%%%%%%%%%%%%%%%%%
%% formatting
@@ -633,12 +802,16 @@
%<*grant-doe>
% \end{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{grant-doe}[2016/01/12 DOE class]
+\ProvidesClass{grant-doe}[2019/02/26 DOE class]
\newcommand{\draftstatus}{isnotdraft}
\DeclareOption{isdraft}{\renewcommand{\draftstatus}{isdraft}}
\DeclareOption{isnotdraft}{\renewcommand{\draftstatus}{isnotdraft}}
+\newcommand{\whitepaperstatus}{isnotwhitepaper}
+\DeclareOption{iswhitepaper}{\renewcommand{\whitepaperstatus}{iswhitepaper}}
+\DeclareOption{isnotwhitepaper}{\renewcommand{\whitepaperstatus}{isnotwhitepaper}}
+
\newcommand{\sectioncompactstatus}{isnotsectioncompact}
\DeclareOption{issectioncompact}{\renewcommand{\sectioncompactstatus}{issectioncompact}}
\DeclareOption{isnotsectioncompact}{\renewcommand{\sectioncompactstatus}{isnotsectioncompact}}
@@ -647,10 +820,10 @@
\DeclareOption{isbibcompact}{\renewcommand{\bibcompactstatus}{isbibcompact}}
\DeclareOption{isnotbibcompact}{\renewcommand{\bibcompactstatus}{isnotbibcompact}}
-\ExecuteOptions{isdraft, isnotdraft, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
+\ExecuteOptions{isdraft, isnotdraft, iswhitepaper, isnotwhitepaper, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
\ProcessOptions
-\LoadClass[\draftstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
+\LoadClass[11pt, \draftstatus, \whitepaperstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
%%%%%%%%%%%%%%%%%%%%%%
%% formatting
@@ -658,6 +831,26 @@
%geometry
\geometry{margin=1in}
+
+%font
+\usepackage{times}
+\renewcommand{\familydefault}{\rmdefault}
+
+%%%%%%%%%%%%%%%%%%%%%
+%% cover page
+%%%%%%%%%%%%%%%%%%%%%
+\renewcommand{\makeabstractcoverpage}{
+ \titlespacing*{\chapter}{0pt}{-4.4ex}{*-1}
+ {\centering
+ \chapter*{\centerline{\ProposalTitle}}
+ \PiName, \PiTitle\\
+ \PiDepartment, \PiInstitution\\
+ \PiPhone, \href{mailto:\PiEmail}{\PiEmail}, \href{http://www.\PiUrl}{\PiUrl}\\
+ DOE/Office of Science Program Office\\
+ Funding Opportunity Announcement Number: \FundingId\\
+ }
+}
+
% \begin{macrocode}
%</grant-doe>
% \end{macrocode}
@@ -667,12 +860,16 @@
%<*grant-nih>
% \end{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{grant-nih}[2016/01/12 NIH class]
+\ProvidesClass{grant-nih}[2019/02/26 NIH class]
\newcommand{\draftstatus}{isnotdraft}
\DeclareOption{isdraft}{\renewcommand{\draftstatus}{isdraft}}
\DeclareOption{isnotdraft}{\renewcommand{\draftstatus}{isnotdraft}}
+\newcommand{\whitepaperstatus}{isnotwhitepaper}
+\DeclareOption{iswhitepaper}{\renewcommand{\whitepaperstatus}{iswhitepaper}}
+\DeclareOption{isnotwhitepaper}{\renewcommand{\whitepaperstatus}{isnotwhitepaper}}
+
\newcommand{\sectioncompactstatus}{isnotsectioncompact}
\DeclareOption{issectioncompact}{\renewcommand{\sectioncompactstatus}{issectioncompact}}
\DeclareOption{isnotsectioncompact}{\renewcommand{\sectioncompactstatus}{isnotsectioncompact}}
@@ -681,10 +878,10 @@
\DeclareOption{isbibcompact}{\renewcommand{\bibcompactstatus}{isbibcompact}}
\DeclareOption{isnotbibcompact}{\renewcommand{\bibcompactstatus}{isnotbibcompact}}
-\ExecuteOptions{isdraft, isnotdraft, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
+\ExecuteOptions{isdraft, isnotdraft, iswhitepaper, isnotwhitepaper, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
\ProcessOptions
-\LoadClass[\draftstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
+\LoadClass[\draftstatus, \whitepaperstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
%%%%%%%%%%%%%%%%%%%%%%
%% formatting
@@ -702,12 +899,16 @@
%<*grant-nrl>
% \end{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{grant-nrl}[2016/01/19 NRL class]
+\ProvidesClass{grant-nrl}[2019/02/26 NRL class]
\newcommand{\draftstatus}{isnotdraft}
\DeclareOption{isdraft}{\renewcommand{\draftstatus}{isdraft}}
\DeclareOption{isnotdraft}{\renewcommand{\draftstatus}{isnotdraft}}
+\newcommand{\whitepaperstatus}{isnotwhitepaper}
+\DeclareOption{iswhitepaper}{\renewcommand{\whitepaperstatus}{iswhitepaper}}
+\DeclareOption{isnotwhitepaper}{\renewcommand{\whitepaperstatus}{isnotwhitepaper}}
+
\newcommand{\sectioncompactstatus}{isnotsectioncompact}
\DeclareOption{issectioncompact}{\renewcommand{\sectioncompactstatus}{issectioncompact}}
\DeclareOption{isnotsectioncompact}{\renewcommand{\sectioncompactstatus}{isnotsectioncompact}}
@@ -716,10 +917,10 @@
\DeclareOption{isbibcompact}{\renewcommand{\bibcompactstatus}{isbibcompact}}
\DeclareOption{isnotbibcompact}{\renewcommand{\bibcompactstatus}{isnotbibcompact}}
-\ExecuteOptions{isdraft, isnotdraft, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
+\ExecuteOptions{isdraft, isnotdraft, iswhitepaper, isnotwhitepaper, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
\ProcessOptions
-\LoadClass[12pt, \draftstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
+\LoadClass[12pt, \draftstatus, \whitepaperstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
%%%%%%%%%%%%%%%%%%%%%%
%% formatting
@@ -743,12 +944,16 @@
%<*grant-nsf>
% \end{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{grant-nsf}[2016/01/12 NSF class]
+\ProvidesClass{grant-nsf}[2019/02/26 NSF class]
\newcommand{\draftstatus}{isnotdraft}
\DeclareOption{isdraft}{\renewcommand{\draftstatus}{isdraft}}
\DeclareOption{isnotdraft}{\renewcommand{\draftstatus}{isnotdraft}}
+\newcommand{\whitepaperstatus}{isnotwhitepaper}
+\DeclareOption{iswhitepaper}{\renewcommand{\whitepaperstatus}{iswhitepaper}}
+\DeclareOption{isnotwhitepaper}{\renewcommand{\whitepaperstatus}{isnotwhitepaper}}
+
\newcommand{\sectioncompactstatus}{isnotsectioncompact}
\DeclareOption{issectioncompact}{\renewcommand{\sectioncompactstatus}{issectioncompact}}
\DeclareOption{isnotsectioncompact}{\renewcommand{\sectioncompactstatus}{isnotsectioncompact}}
@@ -757,10 +962,10 @@
\DeclareOption{isbibcompact}{\renewcommand{\bibcompactstatus}{isbibcompact}}
\DeclareOption{isnotbibcompact}{\renewcommand{\bibcompactstatus}{isnotbibcompact}}
-\ExecuteOptions{isdraft, isnotdraft, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
+\ExecuteOptions{isdraft, isnotdraft, iswhitepaper, isnotwhitepaper, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
\ProcessOptions
-\LoadClass[10pt, \draftstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
+\LoadClass[10pt, \draftstatus, \whitepaperstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
%%%%%%%%%%%%%%%%%%%%%%
%% formatting
@@ -777,12 +982,16 @@
%<*grant-onr>
% \end{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{grant-onr}[2016/01/19 ONR class]
+\ProvidesClass{grant-onr}[2019/02/26 ONR class]
\newcommand{\draftstatus}{isnotdraft}
\DeclareOption{isdraft}{\renewcommand{\draftstatus}{isdraft}}
\DeclareOption{isnotdraft}{\renewcommand{\draftstatus}{isnotdraft}}
+\newcommand{\whitepaperstatus}{isnotwhitepaper}
+\DeclareOption{iswhitepaper}{\renewcommand{\whitepaperstatus}{iswhitepaper}}
+\DeclareOption{isnotwhitepaper}{\renewcommand{\whitepaperstatus}{isnotwhitepaper}}
+
\newcommand{\sectioncompactstatus}{isnotsectioncompact}
\DeclareOption{issectioncompact}{\renewcommand{\sectioncompactstatus}{issectioncompact}}
\DeclareOption{isnotsectioncompact}{\renewcommand{\sectioncompactstatus}{isnotsectioncompact}}
@@ -791,10 +1000,10 @@
\DeclareOption{isbibcompact}{\renewcommand{\bibcompactstatus}{isbibcompact}}
\DeclareOption{isnotbibcompact}{\renewcommand{\bibcompactstatus}{isnotbibcompact}}
-\ExecuteOptions{isdraft, isnotdraft, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
+\ExecuteOptions{isdraft, isnotdraft, iswhitepaper, isnotwhitepaper, issectioncompact, isnotsectioncompact, isbibcompact, isnotbibcompact}
\ProcessOptions
-\LoadClass[12pt, \draftstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
+\LoadClass[12pt, \draftstatus, \whitepaperstatus, \sectioncompactstatus, \bibcompactstatus]{grant}
%%%%%%%%%%%%%%%%%%%%%%
%% formatting
@@ -809,6 +1018,29 @@
%paragraph skip
\setlength{\parskip}{4pt}
+
+%%%%%%%%%%%%%%%%%%%%%%
+%% abstract
+%%%%%%%%%%%%%%%%%%%%%%
+\renewcommand{\AbstractName}{White paper}
+\settoggle{AbstractIsCentered}{true}
+\settoggle{AbstractShowAdminPOC}{false}
+\settoggle{AbstractShowLeadOrg}{false}
+\settoggle{AbstractShowOtherPersonnel}{false}
+\settoggle{AbstractShowDuration}{false}
+\settoggle{AbstractShowCost}{false}
+
+\ifbool{iswhitepaper}{
+ \titleformat{\section}[block]{\bfseries}{\uline{\thesection.~}}{0ex}{\uline{#1}}[]
+ \titleformat{\subsection}[runin]{\bfseries}{\thesubsection.~}{0ex}{#1}[.]
+ \titleformat{\subsubsection}[runin]{}{\uline{\thesubsubsection.~}}{0ex}{\uline{#1}}[.]
+
+ \titlespacing*{\section}{0pt}{*0.0}{*-1}
+
+ \renewcommand{\bibfont}{\normalsize}
+}{}
+
+
% \begin{macrocode}
%</grant-onr>
% \end{macrocode}
diff --git a/macros/latex/contrib/grant/grant.ins b/macros/latex/contrib/grant/grant.ins
index 74f5035994..a726dbff3a 100644
--- a/macros/latex/contrib/grant/grant.ins
+++ b/macros/latex/contrib/grant/grant.ins
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2016 Jonathan Karr <karr@mssm.edu>
+%% Copyright (C) 2016-2019 Jonathan Karr <karr@mssm.edu>
%%
%% This file may be distributed and/or modified under the conditions of
%% the MIT License. The latest version of this license is in:
@@ -16,7 +16,7 @@
This is a generated file.
-Copyright (C) 2016 Jonathan Karr <karr@mssm.edu>
+Copyright (C) 2016-2019 Jonathan Karr <karr@mssm.edu>
This file may be distributed and/or modified under the conditions of
the MIT License. The latest version of this license is in:
@@ -26,13 +26,14 @@ the MIT License. The latest version of this license is in:
\endpreamble
\generate{\file{grant.cls}{\from{grant.dtx}{grant}}}
-\generate{\file{grant-arl.cls}{\from{grant.dtx}{arl}}}
-\generate{\file{grant-darpa.cls}{\from{grant.dtx}{darpa}}}
-\generate{\file{grant-doe.cls}{\from{grant.dtx}{doe}}}
-\generate{\file{grant-nih.cls}{\from{grant.dtx}{nih}}}
-\generate{\file{grant-nrl.cls}{\from{grant.dtx}{nrl}}}
-\generate{\file{grant-nsf.cls}{\from{grant.dtx}{nsf}}}
-\generate{\file{grant-onr.cls}{\from{grant.dtx}{onr}}}
+\generate{\file{grant-afosr.cls}{\from{grant.dtx}{grant-afosr}}}
+\generate{\file{grant-aro.cls}{\from{grant.dtx}{grant-aro}}}
+\generate{\file{grant-darpa.cls}{\from{grant.dtx}{grant-darpa}}}
+\generate{\file{grant-doe.cls}{\from{grant.dtx}{grant-doe}}}
+\generate{\file{grant-nih.cls}{\from{grant.dtx}{grant-nih}}}
+\generate{\file{grant-nrl.cls}{\from{grant.dtx}{grant-nrl}}}
+\generate{\file{grant-nsf.cls}{\from{grant.dtx}{grant-nsf}}}
+\generate{\file{grant-onr.cls}{\from{grant.dtx}{grant-onr}}}
\obeyspaces
\Msg{*************************************************************}
@@ -41,7 +42,8 @@ the MIT License. The latest version of this license is in:
\Msg{* files into a directory searched by TeX: *}
\Msg{* *}
\Msg{* grant.cls *}
-\Msg{* grant-arl.cls *}
+\Msg{* grant-afosr.cls *}
+\Msg{* grant-aro.cls *}
\Msg{* grant-darpa.cls *}
\Msg{* grant-doe.cls *}
\Msg{* grant-nih.cls *}
diff --git a/macros/latex/contrib/grant/grant.pdf b/macros/latex/contrib/grant/grant.pdf
index 73387da30b..d3b7416192 100644
--- a/macros/latex/contrib/grant/grant.pdf
+++ b/macros/latex/contrib/grant/grant.pdf
Binary files differ
diff --git a/macros/latex/contrib/xltabular/Changes b/macros/latex/contrib/xltabular/Changes
index d29caef556..4863998012 100644
--- a/macros/latex/contrib/xltabular/Changes
+++ b/macros/latex/contrib/xltabular/Changes
@@ -1,3 +1,4 @@
+2.0e 2020/11/04 - insert a \par at the beginning of xltabular
2.0c 2020/03/20 - restore of original longtable more robust
2.0a 2018/12/16 - better hyperref support; example files
1.0a 2018/05/23 - restore original tabularx must not be statically
diff --git a/macros/latex/contrib/xltabular/xltabular-doc.pdf b/macros/latex/contrib/xltabular/xltabular-doc.pdf
index 99ae7edd82..31763a2549 100644
--- a/macros/latex/contrib/xltabular/xltabular-doc.pdf
+++ b/macros/latex/contrib/xltabular/xltabular-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/xltabular/xltabular.sty b/macros/latex/contrib/xltabular/xltabular.sty
index 9b76de8875..6752047c5e 100644
--- a/macros/latex/contrib/xltabular/xltabular.sty
+++ b/macros/latex/contrib/xltabular/xltabular.sty
@@ -6,7 +6,7 @@
% Copyright 2018-2020 Herbert Voss <hvoss@tug.org>
% Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
%%
-\ProvidesPackage{xltabular}[2020/06/14 v0.2d `xltabular' package (hv,RN)]
+\ProvidesPackage{xltabular}[2020/11/04 v0.2e `xltabular' package (hv,RN)]
\RequirePackage{tabularx}
\let\XLT@i@tabularx=\tabularx
\let\XLT@i@endtabularx=\endtabularx
@@ -35,16 +35,18 @@
% define a new tabularx like the one from "ltablex"
%
\newenvironment{xltabular}[1][x]%
-{\if l#1%
+{%
+ \par
+ \if l#1%
\LTleft\z@ \LTright\fill
- \else\if r#1%
+ \else\if r#1%
\LTleft\fill \LTright\z@
- \else\if c#1%
+ \else\if c#1%
\LTleft\fill \LTright\fill
- \fi\fi\fi
- \let\TX@endtabularx=\XLT@ii@TX@endtabularx
- \let\endtabularx\endxltabular
- \XLT@ii@tabularx}
+ \fi\fi\fi
+ \let\TX@endtabularx=\XLT@ii@TX@endtabularx
+ \let\endtabularx\endxltabular
+ \XLT@ii@tabularx}
{\def\@currenvir{tabularx}}
\def\LT@caption{%
diff --git a/macros/luatex/latex/ekdosis/Makefile b/macros/luatex/latex/ekdosis/Makefile
index 550ae95d12..694b884d81 100644
--- a/macros/luatex/latex/ekdosis/Makefile
+++ b/macros/luatex/latex/ekdosis/Makefile
@@ -34,6 +34,8 @@ $(NAME).pdf: testsamples $(NAME).dtx
if [ -f $(NAME).glo ]; then makeindex -q -s gglo.ist -o $(NAME).gls $(NAME).glo; fi
if [ -f $(NAME).idx ]; then makeindex -q -s gind.ist -o $(NAME).ind $(NAME).idx; fi
$(CMP) --shell-escape --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
+ $(CMP) --shell-escape --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
+ $(CMP) --shell-escape --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
samples: clean sty
$(MAKE) --directory=$(SAMPLES)
diff --git a/macros/luatex/latex/ekdosis/README.md b/macros/luatex/latex/ekdosis/README.md
index 8b54b9dc96..9d9e5d0605 100644
--- a/macros/luatex/latex/ekdosis/README.md
+++ b/macros/luatex/latex/ekdosis/README.md
@@ -12,7 +12,7 @@ critical notes in any direction accepted by LuaTeX. Texts can be
arranged in running paragraphs or on facing pages, in any number of
columns which in turn can be synchronized or not. In addition to
printed texts, `ekdosis` can convert `.tex` source files so as to
-produce `TEI xml` compliant critical editions. Database-driven
+produce `TEI xml`-compliant critical editions. Database-driven
encoding under LaTeX then allows extraction of texts entered segment
by segment according to various criteria: main edited text, variant
readings, translations or annotated borrowings between texts. It is
@@ -21,7 +21,7 @@ version 3.
License and Disclamer
=====================
-ekdosis – Typesetting TEI xml Compliant Critical Editions
+ekdosis – Typesetting TEI xml-Compliant Critical Editions
Copyright ⓒ 2020 Robert Alessi
@@ -81,7 +81,7 @@ Installation
`ekdosis.lua` files.
2. To finish the installation you have to move the `ekdosis.sty` and
- `ekdosis.lua` files into a directory where LaTeX can find it. See
+ `ekdosis.lua` files into a directory where LaTeX can find them. See
the FAQ on `texfaq.org` at <https://texfaq.org/FAQ-inst-wlcf> for
more on this.
diff --git a/macros/luatex/latex/ekdosis/ekdosis.dtx b/macros/luatex/latex/ekdosis/ekdosis.dtx
index 5eb4844caa..10400c8396 100644
--- a/macros/luatex/latex/ekdosis/ekdosis.dtx
+++ b/macros/luatex/latex/ekdosis/ekdosis.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% ekdosis -- Typesetting TEI xml compliant critical editions
+% ekdosis -- Typesetting TEI xml-compliant critical editions
% Copyright (C) 2020 Robert Alessi
%
% Please send error reports and suggestions for improvements to Robert
@@ -27,7 +27,7 @@
--[[
This file is part of the `ekdosis' package
-ekdosis -- Typesetting TEI xml compliant critical editions
+ekdosis -- Typesetting TEI xml-compliant critical editions
Copyright (C) 2020 Robert Alessi
Please send error reports and suggestions for improvements to Robert
@@ -61,11 +61,11 @@ along with this program. If not, see
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{ekdosis}
%<*package>
- [2020/08/14 v1.0 Typesetting TEI xml compliant critical editions]
+ [2020/11/04 v1.1 Typesetting TEI xml-compliant critical editions]
%</package>
%<*driver>
\begin{filecontents}[noheader,overwrite]{bibdata.xml}
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<listBibl xmlns="http://www.tei-c.org/ns/1.0">
<biblStruct type="book" xml:id="ReynoldsWilson1991">
<monogr>
@@ -86,13 +86,31 @@ along with this program. If not, see
</imprint>
</monogr>
</biblStruct>
+ <biblStruct type="book" xml:id="sDrak">
+ <monogr>
+ <title level="m">Punicorum libri septemdecim</title>
+ <author>
+ <forename>Tiberius Catius</forename>
+ <surname>Silius Italicus</surname>
+ </author>
+ <editor>
+ <forename>Arnold</forename>
+ <surname>Drakenborch</surname>
+ </editor>
+ <edition>Trajecti ad Rhenum</edition>
+ <imprint>
+ <pubPlace>Utrecht</pubPlace>
+ <date>1717</date>
+ </imprint>
+ </monogr>
+ </biblStruct>
</listBibl>
\end{filecontents}
\begin{filecontents}[overwrite]{\jobname.bib}
@Article{Alessi2020,
author = {Alessi, Robert},
title = {ekdosis: Using Lua\LaTeX{} for Producing \texttt{TEI
- xml} Compliant Critical Editions and Highlighting
+ xml}-Compliant Critical Editions and Highlighting
Parallel Writings},
journaltitle = {Journal of Data Mining and Digital Humanities},
date = 2020,
@@ -139,6 +157,15 @@ along with this program. If not, see
location = {Oxford}
}
+@Book{West1973,
+ author = {West, Martin L.},
+ title = {Textual Criticism and Editorial Technique},
+ date = 1973,
+ titleaddon = {Applicable to Greek and Latin Texts},
+ publisher = {B. G. Teubner},
+ location = {Stuttgart}
+}
+
@Online{DLL-TC,
author = {{Digital Latin Library}},
title = {Textual Criticism},
@@ -165,6 +192,15 @@ along with this program. If not, see
url = {http://www.teibyexample.org}
}
+@Software{fnpos,
+ title = {The Fnpos package},
+ titleaddon = {Control the position of footnotes on the page},
+ author = {Nakashima, Hiroshi},
+ url = {http://www.ctan.org/pkg/fnpos},
+ date = {2018-09-03},
+ version = {1.0}
+}
+
@Software{lineno,
title = {The Lineno package},
titleaddon = {Line numbers on paragraphs},
@@ -174,6 +210,15 @@ along with this program. If not, see
version = {4.41}
}
+@Software{paracol,
+ title = {The Paracol package},
+ titleaddon = {Multiple columns with texts “in parallel”},
+ author = {Nakashima, Hiroshi},
+ url = {http://www.ctan.org/pkg/paracol},
+ date = {2018-12-31},
+ version = {1.35}
+}
+
@Software{polyglossia,
title = {The Polyglossia package},
titleaddon = {An alternative to babel for XeLaTeX and LuaLaTeX},
@@ -222,13 +267,12 @@ along with this program. If not, see
\end{filecontents}
\begin{filecontents}[overwrite]{\jobname-cfg.tex}
\footnotelayout{m}
+\EnvtoTEI{ancientgreek}{p}[xml:lang="grc"]
\DeclareApparatus{fontium}[
delim=\hskip0.75em,
- bhook=\textbf{Sources:},
- ehook=.]
+ bhook=\textbf{Sources:}]
\DeclareApparatus{default}[
- delim=\hskip0.75em,
- ehook=.]
+ delim=\hskip0.75em]
\DeclareApparatus{ltr}[
delim=\hskip0.75em]
\DeclareApparatus{rtl}[
@@ -246,6 +290,7 @@ along with this program. If not, see
% Peter and John Story:
\DeclareWitness{pjA}{A}{Manuscript A Call No 123}
\DeclareWitness{pjB}{B}{Manuscript B Call No 456}
+\DeclareWitness{pjC}{C}{Manuscript C Call No 789}
% Caesar's Gallic War:
\DeclareWitness{cA}{A}{\emph{Bongarsianus} 81}[
msName=Bongarsianus,
@@ -280,8 +325,21 @@ along with this program. If not, see
% Hippocrates Epidemics, Book 2:
\DeclareWitness{hV}{V}{\emph{Vaticanus Gr.} 276}
\DeclareWitness{hI}{I}{\emph{Parisinus Gr.} 2140}
+\DeclareHand{hIac}{hI}{I\textsuperscript{ac}}[Lectio ante correctionem]
+\DeclareHand{hIpc}{hI}{I\textsuperscript{pc}}[Lectio post correctionem]
\DeclareWitness{hR}{R}{\emph{Vaticanus Gr.} 277}
\DeclareWitness{hH}{H}{\emph{Parisinus Gr.} 2142}
+\DeclareSource{Lit}{Littré}
+\DeclareSource{Erm}{Ermerins}
+\DeclareSource{Sm}{Smith}
+\DeclareSource{Gal}{Gal.}
+\DeclareScholar{ego}{ego}[
+ forename=Robert,
+ surname=Alessi]
+\DeclareShorthand{egomute}{\unskip}{ego}
+\DeclareShorthand{hcodd}{codd.}{hV,hI,hR,hH}
+\DeclareShorthand{hedd}{edd.}{Lit,Erm,Sm}
+\DeclareShorthand{hegoscr}{\emph{scripsi}}{ego}
% Silius Italicus' Punica, IX, 30--2:
\DeclareWitness{sL}{L}{Laurentianus, plut, XXXVII, cod. 16}[
origDate=s. XV]
@@ -291,7 +349,7 @@ along with this program. If not, see
origDate=s. XV]
\DeclareWitness{sV}{V}{Vaticanus lat. 1652}[
origDate=s. XV]
-\DeclareScholar{sDrak}{\emph{Drakenborch}}
+\DeclareSource{sDrak}{\emph{Drakenborch}}
\end{filecontents}
\documentclass{ltxdoc}
%\usepackage[letterpaper,margin=25mm,left=50mm,nohead]{geometry}
@@ -320,9 +378,9 @@ along with this program. If not, see
\def\sg#1{\textancientgreek{#1}}
\usepackage[Old Standard]{mathfont}
\usepackage{arabluatex}
-\usepackage[parnotes=roman,teiexport=tidy]{ekdosis}
+\usepackage[parnotes=roman,teiexport=tidy,verse]{ekdosis}
\input{ekdosis-cfg}
-\SetxmlBibResource{bibdata}
+\AddxmlBibResource{bibdata.xml}
\usepackage{booktabs}
\usepackage{xltabular}
\usepackage[prevent-all]{widows-and-orphans}
@@ -369,8 +427,6 @@ along with this program. If not, see
\labelformat{subsection}{sect.~#1}
\labelformat{subsubsection}{sect.~#1}
\labelformat{figure}{fig.~#1}
-\newcounter{dummy}
-\newcommand{\dummy}{\refstepcounter{dummy}}
\usepackage[defaultindex=none,citecmd=autocite]{icite}
\bibinput{ekdosis}
\usepackage[nospace,american]{varioref}
@@ -385,8 +441,8 @@ along with this program. If not, see
}
\ifbool{nocolordoc}
{
- \usepackage{fontawesome}
- \def\oasymbol{\faUnlock}
+ \usepackage{academicons}
+ \def\oasymbol{\aiOpenAccess}
\usepackage{biblatex-ext-oa}
}
{\usepackage[symbolpackage=tikz]{biblatex-ext-oa}}
@@ -422,9 +478,9 @@ along with this program. If not, see
\metaset{title}{ἔκδοσις}
\metaset{date}{\filedate}
\metaset{draft}{\fileversion}
-\metaset{subject}{TEI xml compliant critical editions}
-\metaset{subtitle}{Typesetting TEI xml Compliant Critical Editions}
-\metaset[print]{subtitle}{Typesetting \texttt{TEI xml} Compliant
+\metaset{subject}{TEI xml-compliant critical editions}
+\metaset{subtitle}{Typesetting TEI xml-Compliant Critical Editions}
+\metaset[print]{subtitle}{Typesetting \texttt{TEI xml}-Compliant
Critical Editions}
\metaset{author}{Robert Alessi}
\metaset{keywords}{LaTeX, Lua, TEI xml, multilingual critical
@@ -496,8 +552,7 @@ along with this program. If not, see
\ifbool{nocolordoc}{\usemintedstyle{bw}}{}
\setminted{bgcolor=ekdcolor,linenos, fontsize=\small}
\newminted[ekdlua]{lua}{bgcolor={}, linenos, fontsize=\relsize{-0.5},
- xleftmargin=12pt, breaklines, numberblanklines=false, numbersep=3pt,
- firstnumber=last}
+ xleftmargin=12pt, breaklines, numberblanklines=false, numbersep=3pt}
\renewcommand{\theFancyVerbLine}{\normalfont\smaller\arabic{FancyVerbLine}}
\usepackage[contents]{colordoc}
\newcommand{\pkg}[1]{\textsf{#1}\index{#1=#1 (package)}}
@@ -513,6 +568,13 @@ along with this program. If not, see
\captionof{#1}{#2}%
#3%
\egroup}
+\NewDocumentCommand{\newfeature}{o}{%
+ \leavevmode
+ \IfNoValueTF{#1}
+ {\marginpar{\hfill\emph{New feature}}}
+ {\marginpar{\hfill\emph{New feature} #1}}%
+ \ignorespaces
+}
% \usepackage{etoc}
% \etocsettocdepth{paragraph}
% \newcommand{\ekdtableofcontents}{%
@@ -538,14 +600,14 @@ along with this program. If not, see
\RecordChanges
%\OnlyDescription
\begin{document}
- \DocInput{\jobname.dtx}
- \PrintChanges
- \PrintIndex
+\DocInput{\jobname.dtx}
+\PrintChanges
+\PrintIndex
\end{document}
%</driver>
% \fi
%
-% \CheckSum{1669}
+% \CheckSum{1893}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -587,6 +649,7 @@ along with this program. If not, see
%
% \changes{v0.99a}{2020/07/08}{First public release (documentation in
% progress)}
+% \changes{v1.0}{2020/08/14}{Documentation complete}
%
% \begin{abstract}
% \pkg{ekdosis} is a Lua\LaTeX{} package designed for
@@ -596,7 +659,7 @@ along with this program. If not, see
% facing pages, in any number of columns which in turn can be
% synchronized or not. In addition to printed texts,
% \pkg{ekdosis} can convert \texttt{.tex} source files so as to
-% produce \texttt{TEI xml} compliant critical
+% produce \texttt{TEI xml}-compliant critical
% editions. Database-driven encoding under \LaTeX{} then allows
% extraction of texts entered segment by segment according to
% various criteria: main edited text, variant readings, translations
@@ -802,9 +865,10 @@ along with this program. If not, see
%</example>
% \fi
%
-% \needspace{5\baselineskip}
% PDF output:---
% \medskip
+%
+% \needspace{7\baselineskip}
% \begin{alignment}[flush,tcols=1,texts=specimen,apparatus=specimen]
% \begin{specimen}
% I
@@ -850,7 +914,7 @@ along with this program. If not, see
% the first lemma above spans several lines whereas the second one is
% written in sequence without spaces.
%
-% In the PDF ouput, the edition text is printed in the upper part of
+% In the PDF output, the edition text is printed in the upper part of
% the page, above the line, and naturally shows the accepted
% readings. The margins are used for numeration. In the apparatus
% criticus, below the line, reference to the text is made by
@@ -956,14 +1020,28 @@ along with this program. If not, see
%</example>
% \fi
%
-% \subsection{Witnesses, Hands, Shorthands \& Scholars}
+% \subsection{Witnesses, Hands, Sources, Scholars \& Shorthands}
% \label{sec:declarations}
+% \paragraph{Terminology}
+% \label{sec:terminology}
+% Strictly speaking, the term \enquote{witness} should apply to any
+% manuscript evidence dating back to the Middle Ages used by the
+% editor to establish the edition text. That said, editors often
+% consult many other types of documents, such as modern editions,
+% articles, notes, correspondence and the like, all of which fall into
+% the category of \enquote{sources}. Furthermore, unpublished
+% conjectures are also taken into account, not to mention the
+% corrections and emendations that are proposed in many places by the
+% editor of the text. As it is necessary to refer to scholars as
+% individuals, \enquote{scholars} naturally emerges as a third
+% category.
+%
% Any reference that is to be used in the apparatus criticus must be
% \enquote{declared} in the preamble beforehand, namely: manuscript
% sigla (either for single manuscripts or manuscript families, primary
-% or later hands, \emph{\&c.}) or abbreviated last names of scholars.
-% To that effect, \pkg{ekdosis} provides the following preamble-only
-% commands:---
+% or later hands, \emph{\&c.}), abbreviated last names of sources
+% and scholars. To that effect, \pkg{ekdosis} provides the following
+% preamble-only commands:---
%
% \paragraph{Witnesses}
% \DescribeMacro{\DeclareWitness} \cs{DeclareWitness}\marg{unique
@@ -1008,8 +1086,10 @@ along with this program. If not, see
% \label{ref:marcianus-b}
% To take here one example, a witness such as the \emph{Marcianus
% Graecus}~269, referred to as manuscript \enquote*{M} in the
-% editions, which contains sixty treatises from Hippocrates, could be
-% declared as follows:--- \iffalse
+% editions, which contains sixty treatises transmitted under the name
+% of Hippocrates, could be declared as follows:---
+%
+%\iffalse
%<*example>
% \fi
\begin{minted}[linenos=false]{latex}
@@ -1034,7 +1114,7 @@ along with this program. If not, see
% \item The unique identifier of the hand to be used both in the
% |.tex| source file and as an |xml:id| in the \texttt{TEI xml} output
% if any.
-% \item The unique idendifier of the witness the hand is related
+% \item The unique identifier of the witness the hand is related
% to. Of course, this witness must have been declared beforehand.
% \item The rendition to be used in the printed apparatus criticus,
% which also will be found within the |<handNote>| element of the
@@ -1061,7 +1141,7 @@ along with this program. If not, see
% source file will be printed as \getsiglum{M}, \getsiglum{M1} and
% \getsiglum{M2} respectively. Not only the code gains legibility, but
% also flexibility for simply changing any declared rendition will
-% update corresponding sigla thoughout the entire edition.
+% update corresponding sigla throughout the entire edition.
%
% As a final example, here is how \pkg{ekdosis} would encode
% information as declared above for the \emph{Marcianus Gr.}~269
@@ -1081,7 +1161,7 @@ along with this program. If not, see
<institution>Marciana Library</institution>
<idno>269</idno>
<msName>
- <emph>Marcianus Gr.</emph>
+ Marcianus Gr.
</msName>
</msIdentifier>
<physDesc>
@@ -1112,9 +1192,91 @@ along with this program. If not, see
% \fi
% \label{ref:marcianus-e}
%
+% \paragraph{Sources}
+% \label{ref:declare-source}
+% \DescribeMacro{\DeclareSource} \cs{DeclareSource}\marg{unique
+% label}\marg{rendition}\newfeature[v1.1]\\
+% The \emph{Conspectus Siglorum} that is placed ahead of the edition
+% text is traditionally divided into two parts: a)~\emph{Codices},
+% which provides the list of sigla used in the apparatus,
+% b)~\emph{Editiones uel Studia}, which provides references to
+% sources, either published or unpublished, which contain conjectures
+% used in the apparatus criticus. \cs{DeclareSource} takes two
+% mandatory arguments used to specify consecutively:---
+% \begin{enumerate}
+% \item A unique label used in the |.tex| source file to refer to the
+% work where the conjecture is found.
+% \item The rendition to be used in the printed apparatus criticus.
+% \end{enumerate}
+%
+% \danger As \pkg{ekdosis} can include and use \texttt{TEI
+% xml}-compliant lists of references,\footnote{See below
+% \vref{sec:references-cited-works}.} it is advisable to use
+% Bib\hologo{(La)TeX} labels in the first argument of
+% \cs{DeclareSource}. Otherwise, the unique label used to declare the
+% source would point to no |xml:id| and the \texttt{TEI xml} would not
+% be valid. Likewise, shorthands fields from the bibliographical
+% database can be recalled from within the second argument of
+% \cs{DeclareSource}:---
+%
+% \iffalse
+%<*example>
+% \fi
+\begin{minted}[linenos=false]{latex}
+\DeclareSource{Wil}{Wilamowitz}
+% or for example:
+\DeclareSource{Wil}{\citename{Wil}{shorteditor}}
+\end{minted}
+% \iffalse
+%</example>
+% \fi
+% \label{sec:declarations-end}
+%
+% \paragraph{Scholars}
+% \label{ref:declare-scholar}
+% \DescribeMacro{\DeclareScholar}\cs{DeclareScholar}\marg{unique
+% id}\marg{rendition}\oarg{options}\newfeature[v1.1]\\
+% Occasionally, it is necessary to refer to a scholar as a person. For
+% example, corrections and conjectures are commonly inserted as
+% self-references to the editor of the text in the apparatus criticus
+% in print with such words as \emph{scripsi}, \emph{addidi},
+% \emph{correxi} and the like. Other examples come from unpublished
+% conjectures of other scholars found in private
+% libraries. \cs{DeclareScholar} takes two mandatory arguments to
+% specify consecutively:---
+% \begin{enumerate}
+% \item The unique identifier of the scholar to be used both in the
+% |.tex| source file and as an |xml:id| in the \texttt{TEI xml} output
+% if any.
+% \item The rendition to be used in the apparatus criticus in print,
+% which also will be found within the |<sourceDesc>| element of the
+% \texttt{TEI} header where the description of the persons cited
+% occurs, within an |<abbr type="siglum">| element.
+% \end{enumerate}
+% Finally, the optional argument of \cs{DeclareScholar} accepts the
+% following comma-separated list of |key-value| arguments:---\\
+% \DescribeOption{rawname}|rawname|$=$\meta{name}\\
+% |rawname| refers to a name that is not to be dissected into name
+% part components such as forename, surname and the like. If |rawname|
+% be used, then \pkg{ekdosis} will ignore the following three optional
+% arguments: |forename|, |surname| and |addname|.\\
+% \DescribeOption{forename}|forename|$=$\meta{forename}\\
+% |forename| refers to first and middle names or initials.\\
+% \DescribeOption{surname}|surname|$=$\meta{surname}\\
+% |surname| stores the last name.\\
+% \DescribeOption{addname} |addname|$=$\meta{additional name}\\
+% |addname| refers to an additional or alternate name by which the
+% scholar is known viz.\ a Latinized form of the name, a nickname, an
+% epithet or alias.\\
+% \DescribeOption{note} |note|$=$\meta{note}\\
+% |note| may hold any relevant information about the material used by
+% the editor. For example, a note may specify that this material has
+% been found as marginal notes by the hand of the scholar in some
+% edition in print.
+%
% \paragraph{Shorthands}
% \DescribeMacro{\DeclareShorthand} \cs{DeclareShorthand}\marg{unique
-% id}\marg{rendition}\marg{csv list of witnesses}\\
+% id}\marg{rendition}\marg{csv list of identifiers}\\
% This command provides a convenient way to declare \emph{families} of
% witnesses. It takes three mandatory arguments used to specify
% consecutively:---
@@ -1147,50 +1309,39 @@ along with this program. If not, see
% Then, symbols |a| and |b| can be used in the |.tex| source file in
% place of manuscripts that belong to either family.
%
-% \paragraph{Scholars}
-% \label{ref:declare-scholar}
-% \DescribeMacro{\DeclareScholar} \cs{DeclareScholar}\marg{unique
-% label}\marg{rendition}\\
-% The \emph{Conspectus Siglorum} that is placed ahead of the edition
-% text is traditionally divided into two parts: a)~\emph{Codices},
-% which provides the list of sigla used in the apparatus,
-% b)~\emph{Editiones uel Studia}, which provides references to
-% scholars whose published or unpublished works contain conjectures
-% used in the apparatus criticus. \cs{DeclareScholar} takes two
-% mandatory arguments used to specify consecutively:---
-% \begin{enumerate}
-% \item A unique label used in the |.tex| source file to refer to the
-% work where the conjecture is found.
-% \item The rendition to be used in the printed apparatus criticus.
-% \end{enumerate}
+% That said, \cs{DeclareShorthand} is not meant to be restricted to
+% declared witnesses. On the contrary, it also applies to any declared
+% sources and scholars by means of \cs{DeclareSource} and
+% \cs{DeclareScholar}. As an example, assuming that a self-reference
+% to the person responsible for the edition has been set in the
+% preamble, an associated shorthand can be defined like so:---
%
-% As \pkg{ekdosis} can include and use \texttt{TEI xml} compliant
-% lists of references,\footnote{See below
-% \vref{sec:references-cited-works}.} it is avisable to use
-% Bib\hologo{(La)TeX} labels in the first argument of
-% \cs{DeclareScholar}. Likewise, shorthands fields from the
-% bibliographical database can be recalled from within the second
-% argument of \cs{DeclareScholar}:---
-%
% \iffalse
%<*example>
% \fi
-\begin{minted}[linenos=false]{latex}
-\DeclareScholar{Wil}{Wilamowitz}
-% or for example:
-\DeclareScholar{Wil}{\citename{Wil}{shorteditor}}
+\begin{minted}{latex}
+\DeclareScholar{ego}{ego}[
+ forename=John,
+ surname=Smith,
+ note=Main editor of the text]
+\DeclareShorthand{egoscr}{\emph{scripsi}}{ego}
\end{minted}
% \iffalse
%</example>
% \fi
-% \label{sec:declarations-end}
+%
+% Then, the shorthand |egoscr| (l.~5) can be used to print in the
+% apparatus criticus the technical term \emph{scripsi} and use at the
+% same time the pointer |#ego| that is expected in the \texttt{TEI
+% xml} output file. Detailed examples of this technique will be
+% provided below in \vref{sec:emendations-conjectures}.
%
% \subsubsection{Printing Formatted Witnesses
% --- Conspectus Siglorum}
% \label{sec:print-witnesses}
-% Once witnesses, hands and scholars have been declared, \pkg{ekdosis}
-% provides two commands to have them printed as declared from their
-% indentifiers.
+% Once witnesses, hands, scholars and sources have been declared,
+% \pkg{ekdosis} provides two commands to have them printed as declared
+% from their identifiers.
%
% \DescribeMacro{\getsiglum} \cs{getsiglum}\marg{csv list of witnesses
% or single witness} behaves exactly as the |wit| optional argument of
@@ -1254,12 +1405,12 @@ along with this program. If not, see
% \SigLine{cl}\\
% \end{xltabular}
%
-% \subsection{Editing a Single Text With No Translation}
+% \subsection{Editing a Single Text}
% \label{sec:single-text-editing}
% \DescribeEnv{ekdosis}
% Running paragraphs of one single text to be edited should be
-% inserted in the \env{ekdosis} environment, like so:---\footnote{See
-% above \vref{lst:pj1}.}
+% inserted in the \env{ekdosis} environment, like so:\footnote{See
+% above \vref{lst:pj1}.}---
% \iffalse
%<*example>
% \fi
@@ -1323,7 +1474,11 @@ yesterday.
% \emph{reading}, which contains deviant readings rejected by the
% editor.
%
-% \paragraph{Lemmata} \DescribeMacro{\lem}
+% \danger What follows refers to the notions of \enquote{witness},
+% \enquote{source} and \enquote{scholar} as defined above
+% \vpageref{sec:terminology}.
+%
+% \paragraph{Lemmata} \label{ref:lemmata}\DescribeMacro{\lem}
% \cs{lem}\oarg{options}\marg{lemma text}\\
% As \meta{lemma text} is a word or a phrase judged by the editor to
% be authentic or authoritative, \cs{lem} prints it by default both in
@@ -1338,18 +1493,38 @@ yesterday.
% While a single witness may be recorded as in |wit=A|,
% comma-separated lists of multiple witnesses must obviously be
% enclosed in curly braces, like so:
-% |wit={A,B,C}|. \label{ref:mss-sep-families}It must be noted
-% that witnesses can be grouped by using spaces as separators, like
-% so: \verb*|wit={A,B,C, D,E,F}|.\\
+% |wit={A,B,C}|. \label{ref:mss-sep-families}It must be noted that
+% witnesses can be grouped by using spaces as separators, like so:
+% \verb*|wit={A,B,C, D,E,F}|. Although any unique identifiers or
+% labels used to \enquote{declare} sources and scholars as described
+% above \vpagerefrange{ref:declare-source}{ref:declare-scholar} can
+% also be used as values of the |wit| optional argument, it is
+% recommended to use |sources| and |resp| to refer to either category
+% respectively as described below.\\
+% \DescribeOption{source} |source|$=$\meta{csv list of
+% sources}\label{ref:lem-source}\newfeature[v1.1]\\
+% A \enquote{source} refers to any type of document consulted by the
+% editor to establish the edition text. Most commonly, corrections and
+% emendations from previous editions are cited in the apparatus
+% criticus.\footnote{For edition texts used as sources, see examples
+% below in \vref{sec:emendations-conjectures} and
+% \vref{sec:references-cited-works}.}\\
+% \DescribeOption{resp} |resp|$=$\meta{csv list of
+% scholars}\label{ref:lem-resp}\newfeature[v1.1]\\
+% |resp| refers to scholars responsible for the emendations,
+% conjectures and corrections that are cited in the apparatus
+% criticus.\footnote{See detailed examples in
+% \vref{sec:emendations-conjectures}.}\\
% \DescribeOption{alt} |alt|$=$\meta{alternate lemma}\\
% While the mandatory argument of \cs{lem}, \meta{lemma text}, is
% always used to print the edition text in the upper part of the page,
% \meta{alternate lemma}, if specified, supersedes what is printed in
-% the related entry of the apparatus criticus. This mechanism is useful
-% in more than one respect. For instance, it can be used to insert
-% abbreviated lemmata in the apparatus criticus, or to introduce an
-% alternate way of writing entries with Latin technical terms in the
-% apparatus criticus as will be demonstrated below in the example
+% the related entry of the apparatus criticus. This mechanism is
+% useful in more than one respect. For instance, it can be used to
+% insert abbreviated lemmata in the apparatus criticus, or to
+% introduce an alternate way of writing entries with Latin technical
+% terms in the apparatus criticus as will be demonstrated below in the
+% example
% provided by \vref{lst:pj2}.\\
% \DescribeOption{sep} |sep|$=$\meta{separator}\\
% |sep| allows to change the symbol used to separate the lemma text
@@ -1357,8 +1532,17 @@ yesterday.
% bracket (|]|)\\
% \DescribeOption{nosep} |nosep|$=$\verb+true|false+\\
% This named argument does not need a value as it defaults to |true|
-% if it is used. Obviously, |nosep| removes the separator mentioned
-% above.\\
+% if it is used. |nosep| removes the separator mentioned
+% above. Obviously, |nosep| must be used when for some reason no
+% \cs{rdg} command follows a \cs{lem} command that has just been
+% used, as shown below in \vref{lst:emend-coni-corr}, l.~7.
+% \danger \DescribeMacro{\ekdsep} If |nosep| has been used so as to
+% insert an explanatory note after the lemma text with the \cs{note}
+% command described below \vpageref{ref:editorial-notes}, then
+% \cs{ekdsep} can be used\---for instance as value of the |post|
+% optional argument of the note\---to put back in the separator. This
+% technique is demonstrated below in
+% \vref{lst:emend-coni-corr}, ll.~23--5.\\
% \DescribeOption{nolem} |nolem|$=$\verb+true|false+\\
% This named argument does not need a value as it defaults to |true|
% if it is used. |nolem| completely removes the lemma text from the
@@ -1366,10 +1550,12 @@ yesterday.
% entry in the apparatus criticus.\\
% \DescribeOption{type} |type|$=$\meta{value}\\
% This named argument has no effect on the apparatus criticus of the
-% edition in print, but it is used in the \texttt{TEI xml} ouput to
+% edition in print, but it is used in the \texttt{TEI xml} output to
% classify the variation recorded in the entry according to some
% convenient typology. Categories such as lexical, morphological,
-% orthographical and the like may apply.
+% orthographical and the like may apply. Obviously, |type=emendation|
+% should be restricted to lemma texts and |type=conjecture| to variant
+% readings recorded by means of \cs{rdg} described below.
%
% \needspace{11\baselineskip}
% Finally, four named arguments can be used to insert words at the
@@ -1404,19 +1590,24 @@ yesterday.
% more detailed information:---\\
% \DescribeOption{wit} |wit|$=$\meta{csv list of
% witnesses}\label{ref:rdg-wit}\\
+% \DescribeOption{source} |source|$=$\meta{csv list of sources}\\
+% \DescribeOption{resp} |resp|$=$\meta{csv list of scholars}\\
% \DescribeOption{alt} |alt|$=$\meta{alternate reading}\\
% \DescribeOption{nordg} |nordg|$=$\verb+true|false+\\
% This named argument does not need a value as it defaults to |true|
% if it is used. |nordg| completely removes the variant reading from
% the related entry in the apparatus criticus.\\
% \DescribeOption{type} |type|$=$\meta{value}\\
+% Obviously, |type=conjecture| should be restricted to variant
+% readings and |type=emendation| to lemma texts recorded by means of
+% \cs{lem} described above.\\
% \DescribeOption{pre} |pre|$=$\meta{words}\\
% \DescribeOption{post} |post|$=$\meta{words}\\
% \DescribeOption{prewit} |prewit|$=$\meta{words}\\
% \DescribeOption{postwit} |postwit|$=$\meta{words}\\
%
% \paragraph{Notes}
-% \DescribeMacro{\note}\DescribeMacro{\note*}
+% \DescribeMacro{\note}\label{ref:notes-b}\DescribeMacro{\note*}
% \cs{note}\oarg{options}\marg{text} or
% \cs{note*}\oarg{options}\marg{text}\label{ref:editorial-notes}\\
% It may happen that editorial notes be needed to record short
@@ -1485,6 +1676,8 @@ yesterday.
% \iffalse
%</example>
% \fi
+%
+% \needspace{7\baselineskip}
% \resetlinenumber
% \begin{alignment}[flush,tcols=1,texts=specimen,apparatus=specimen]
% \begin{specimen}
@@ -1566,6 +1759,580 @@ yesterday.
% \iffalse
%</example>
% \fi
+% \label{ref:notes-e}
+%
+% \subsection{Indicating Subvariation in Apparatus Entries}
+% \label{sec:indic-subv-appar}
+% It must be noted that grouping readings so as to keep emphasis on
+% subvariation, regardless of its cause, is entirely optional.
+% Furthermore, the applicability of this technique is limited to the
+% \texttt{TEI xml} output as it helps the machines to understand a
+% grouping otherwise immediately accessible to human mind from the
+% information that is available in well-written
+% apparatus. \pkg{ekdosis} provides two ways of expressing
+% subvariation.
+%
+% \subsubsection{Implicit Grouping}
+% \label{sec:implicit-grouping}
+% Because apparatus entries may nest recursively, the \cs{app} command
+% can be used to group similar readings.
+%
+% \danger However, for nesting to work, the |alt| optional argument
+% must be used in every \cs{lem} and \cs{rdg} command involved in the
+% nesting. This rule applies to both parent and child commands, as
+% demonstrated in the following example:---
+%
+% \iffalse
+%<*example>
+% \fi
+\begin{minted}[linenos=false]{latex}
+As I was walking home through Times Square, I saw my friend
+\app{
+ \lem[wit={A,B}, alt={Peter\---Street}]{Peter at the
+ \app{
+ \lem[wit=A, alt=station]{station}
+ \rdg[wit=B, alt=bookstore]{bookstore}
+ }
+ on 42nd Street}
+ \rdg[wit=C, alt={John on Broadway}]{John on Broadway}
+}.
+\end{minted}
+% \iffalse
+%</example>
+% \fi
+%
+% PDF output:---
+% \medskip
+%
+% \needspace{7\baselineskip}
+% \resetlinenumber
+% \begin{alignment}[flush,tcols=1,texts=specimen,apparatus=specimen]
+% \begin{specimen}
+% As I was walking home through Times Square, I saw my friend
+% \app{
+% \lem[wit={pjA,pjB}, alt={Peter\---Street}]{Peter at the
+% \app{
+% \lem[wit=pjA, alt=station]{station}
+% \rdg[wit=pjB, alt=bookstore]{bookstore}}
+% on 42nd Street}
+% \rdg[wit=pjC, alt={John on Broadway}]{John on Broadway}}.
+% \end{specimen}
+% \end{alignment}
+%
+% \begin{remarks}
+% \item[\textsc{Rem.}] Two \cs{app} commands naturally insert two
+% entries in the apparatus criticus. As the subvariation comes
+% first, what ms.\ C reads is only mentioned in the subsequent
+% entry.
+% \end{remarks}
+%
+% \texttt{TEI xml} output:---
+%
+% \iffalse
+%<*example>
+% \fi
+\begin{minted}[linenos=false]{xml}
+<p>As I was walking home through Times Square, I saw my
+friend
+<app>
+ <lem wit="#A #B">Peter at the
+ <app>
+ <lem wit="#A">station</lem>
+ <rdg wit="#B">bookstore</rdg>
+ </app>on 42nd Street</lem>
+ <rdg wit="#C">John on Broadway</rdg>
+</app>.</p>
+\end{minted}
+% \iffalse
+%</example>
+% \fi
+%
+% \subsubsection{Explicit Grouping}
+% \label{sec:explicit-grouping}
+% \DescribeMacro{\rdgGrp} \cs{rdgGrp}\oarg{options}\marg{lemma text
+% \textbar\ readings}\newfeature[v1.1]\\
+% Explicit grouping of readings can be achieved by means of the
+% \cs{rdgGrp} command. It takes as mandatory argument the commands
+% used for inserting lemma texts, readings and notes that are
+% described \vpagerefrange{ref:lemmata}{ref:notes-e}, viz.\ \cs{lem},
+% \cs{rdg} and \cs{note}. \cs{rdgGrp} accepts one further optional
+% argument:---\\
+% \DescribeOption{type} |type|$=$\meta{value}\\
+% This named argument is used in the \texttt{TEI xml} output to
+% define an attribute common to all elements representing the
+% variation.
+%
+% Here follows how the technique of explicit grouping would apply to
+% the same passage as above:---
+%
+% \iffalse
+%<*example>
+% \fi
+\begin{minted}[linenos=false]{latex}
+As I was walking home through Times Square, I saw my friend
+\app{
+ \rdgGrp[type=subvariation]{
+ \lem[wit=A, alt={Peter\---Street}]{Peter at the station
+ on 42nd Street}
+ \rdg[wit=B, alt={bookstore \emph{pro} station}]{Peter at the
+ bookstore on 42nd Street}
+ }
+ \rdg[wit=C]{John on Broadway}
+}.
+\end{minted}
+% \iffalse
+%</example>
+% \fi
+%
+% PDF output:---
+% \medskip
+%
+% \needspace{7\baselineskip}
+% \resetlinenumber
+% \begin{alignment}[flush,tcols=1,texts=specimen,apparatus=specimen]
+% \begin{specimen}
+% As I was walking home through Times Square, I saw my friend
+% \app{
+% \rdgGrp[type=subvariation]{
+% \lem[wit=pjA, alt={Peter\---Street}]{Peter at the station
+% on 42nd Street}
+% \rdg[wit=pjB, alt={bookstore \emph{pro} station}]{Peter at the
+% bookstore on 42nd Street}
+% }
+% \rdg[wit=pjC]{John on Broadway}
+% }.
+% \end{specimen}
+% \end{alignment}
+%
+% \begin{remarks}
+% \item[\textsc{Rem.}] In this example, the subvariation is emphasized
+% with a Latin technical term and may be expressed in one single
+% entry in a more economical manner.
+% \end{remarks}
+%
+% \texttt{TEI xml} output:---
+%
+% \iffalse
+%<*example>
+% \fi
+\begin{minted}[linenos=false]{xml}
+<p>As I was walking home through Times Square, I saw my
+friend
+<app>
+ <rdgGrp type="subvariation">
+ <lem wit="#A">Peter at the station on 42nd
+ Street</lem>
+ <rdg wit="#B">Peter at the bookstore on 42nd
+ Street</rdg>
+ </rdgGrp>
+ <rdg wit="#C">John on Broadway</rdg>
+</app>.</p>
+\end{minted}
+% \iffalse
+%</example>
+% \fi
+%
+% \section{Emendations and Conjectures}
+% \label{sec:emendations-conjectures}
+% From a technical standpoint, \enquote{conjectures} are readings that
+% are not supported by manuscript evidence, but are instead proposed
+% by scholars to be taken into consideration for establishing the
+% edition text. A conjecture is called an \enquote{emendation} if it
+% is adopted in place of what is provided by or missing from the text
+% provided by the manuscripts. Emendations and conjectures are
+% therefore readings and as such expected to be found within |<lem>|
+% or |<rdg>| elements. However, as both come from editions or
+% scholars, not from manuscripts, they are naturally associated with
+% |source| or |resp| attributes as described above
+% \vpagerefrange{ref:lem-source}{ref:lem-resp},\footnote{See also
+% \vpagerefrange{ref:declare-source}{ref:declare-scholar}.} and can be
+% distinguished from one another by the |type| attribute, eg.\ either
+% |emendation| or |conjecture|.
+%
+% As an example, the representation of witnesses, editors and
+% shorthands of Hippocrates' \emph{Epidemics}, Book~2 could be
+% summarized as follows:---
+%
+% \iffalse
+%<*example>
+% \fi
+\begin{minted}{latex}
+% Witnesses:
+\DeclareWitness{V}{V}{\emph{Vaticanus Gr.} 276}
+\DeclareWitness{I}{I}{\emph{Parisinus Gr.} 2140}
+\DeclareHand{Iac}{I}{I\textsuperscript{ac}}[Lectio ante correctionem]
+\DeclareHand{Ipc}{I}{I\textsuperscript{pc}}[Lectio post correctionem]
+\DeclareWitness{R}{R}{\emph{Vaticanus Gr.} 277}
+\DeclareWitness{H}{H}{\emph{Parisinus Gr.} 2142}
+% Sources (the first arguments below must refer to biblatex labels and
+% an xml bibliographical database must be supplied):
+\DeclareSource{Lit}{Littré}
+\DeclareSource{Erm}{Ermerins}
+\DeclareSource{Sm}{Smith}
+% Persons:
+\DeclareScholar{ego}{ego}[
+ forename=Robert,
+ surname=Alessi]
+% Useful shorthands:
+\DeclareShorthand{codd}{codd.}{V,I,R,H}
+\DeclareShorthand{edd}{edd.}{Lit,Erm,Sm}
+\DeclareShorthand{egoscr}{\emph{scripsi}}{ego}
+\end{minted}
+% \iffalse
+%</example>
+% \fi
+%
+% As can be seen from lines~18--20, three useful shorthands have been
+% defined: |codd| prints \enquote{codd.} for Latin pl.\ \emph{codices}
+% viz.\ \enquote{all manuscripts} and refers to the three \texttt{xml}
+% identifiers |V|, |I|, |R| and |H| declared at ll.~2--3 and 6--7;
+% |edd| prints \enquote{edd.} for Latin pl.\ \emph{editores} viz.\
+% \enquote{all editors} and refers to the three \texttt{xml}
+% identifiers |Lit|, |Erm| and |Sm| declared at
+% ll.~10--12;\footnote{For detailed information on how to use
+% \cs{DeclareSource} and insert references to cited works, the reader
+% is invited to refer to \vref{sec:references-cited-works}.} finally,
+% |egoscr| (l.~20) is used to print the technical Latin term
+% \enquote{\emph{scripsi}}, \enquote{I wrote}, to denote a personal
+% conjecture. Then, the |.tex| source file can be structured as
+% follows:---
+%
+% \iffalse
+%<*example>
+% \fi
+\begin{minted}{latex}
+\begin{ekdosis}
+ καὶ ἐγίνετο μᾶλλον \app{
+ \lem[wit={V, Ipc,R,H}]{νότῳ}
+ \rdg[wit=Iac]{νότου}
+ \rdg[source=Erm, type=conjecture]{ἐν νώτῳ}}· [...] % conjecture
+
+ εἰ
+ \app{
+ \lem[resp=egoscr, type=emendation]{μὲν} % emendation
+ \rdg[wit=codd, source=edd]{μὴ}
+ } εἴη διὰ ταῦτα [...]
+\end{ekdosis}
+\end{minted}
+% \iffalse
+%</example>
+% \fi
+%
+% \begin{remarks}
+% \item Line~5 introduces a \emph{conjecture} which has been annotated
+% with |type=conjecture| to facilitate its identification. Other
+% optional arguments could have been used, such as
+% |prewit=|\texttt{coni.} or |prewit=|\texttt{falso coni.}, to print
+% explanatory words in the apparatus criticus before the abridged
+% name of the scholar.
+% \item \label{it:egomute}Conversely, line~9 introduces an
+% \emph{emendation} for which the shorthand |egoscr| has been used
+% to print the exact term \emph{scripsi} in the apparatus criticus
+% while keeping |ego| as an |xml:id| for the \texttt{TEI xml} output
+% file. Other strategies could have been used. For example, one
+% could have defined a specific shorthand to print nothing in place
+% of |ego| and leave the insertion of technical terms to the |post|
+% optional argument of \cs{lem}, like so:---
+% \iffalse
+%<*example>
+% \fi
+\begin{minted}[linenos=false]{latex}
+% Preamble:
+% (\unskip is for removing the space left by the empty 2nd argument
+% below.)
+\DeclareShorthand{egomute}{\unskip}{ego}
+
+% Document:
+ \app{
+ \lem[resp=egomute, post=\emph{scripsi}, type=emendation]{μὲν}
+ \rdg[wit=codd, source=edd]{μὴ}
+ } εἴη διὰ ταῦτα [...]
+\end{minted}
+% \iffalse
+%</example>
+% \fi
+% \end{remarks}
+%
+% PDF output:---
+% \medskip
+%
+% \needspace{7\baselineskip}
+% \resetlinenumber
+% \begin{alignment}[flush,tcols=1,texts=specimen,apparatus=specimen]
+% \begin{specimen}
+% \begin{ancientgreek}
+% καὶ ἐγίνετο μᾶλλον \app{
+% \lem[wit={hV, hIpc,hR,hH}]{νότῳ}
+% \rdg[wit=hIac]{νότου}
+% \rdg[source=Erm, type=conjecture]{ἐν νώτῳ}}· [...]
+%
+% εἰ \app{
+% \lem[resp=hegoscr, type=emendation]{μὲν}
+% \rdg[wit=hcodd, source=hedd]{μὴ}
+% } εἴη διὰ ταῦτα [...]
+% \end{ancientgreek}
+% \end{specimen}
+% \end{alignment}
+%
+% \texttt{TEI xml} output:---
+%
+% \iffalse
+%<*example>
+% \fi
+\begin{minted}[linenos=false]{xml}
+<p xml:lang="grc">καὶ ἐγίνετο μᾶλλον
+<app>
+ <lem wit="#V #Ipc #R #H">νότῳ</lem>
+ <rdg wit="#Iac">νότου</rdg>
+ <rdg source="#Erm" type="conjecture">ἐν νώτῳ</rdg>
+</app>· [...]</p>
+<p>εἰ
+<app>
+ <lem resp="#ego" type="emendation">μὲν</lem>
+ <rdg wit="#V #I #R #H" source="#Lit #Erm #Sm">
+ μὴ</rdg>
+</app>εἴη διὰ ταῦτα [...]</p>
+\end{minted}
+% \iffalse
+%</example>
+% \fi
+%
+% \subsection{Editorial Addition and Deletion}
+% \label{sec:editorial-add-del}
+% \pkg{ekdosis} provides a set of commands to indicate that text has
+% been supplied or removed by conjecture. As regards critical
+% symbols conventionally used for representing emendations, lacunae,
+% omissions, gaps, editorial deletions or additions and the like,
+% \pkg{ekdosis} follows the standards as described by
+% \textcite[80--82]{West1973}:---
+% \begin{description}[font=\ttfamily]
+% \item[<>] text added by conjecture or from a parallel source.
+% \item[***] lacuna in the whole textual tradition.
+% \item[<***>] conjectured lacuna.
+% \item[\{\}] editorial deletion.
+% \item[\dag\dag] text judged by the editor to be corrupt. Note that if
+% only one word is suspect, only one crux is needed.
+% \end{description}
+%
+% \DescribeMacro{\SetCritSymbols}\newfeature[v1.1]
+% \cs{SetCritSymbols}\marg{csv list of options} can be used to change
+% the critical symbols described above. This command accepts the
+% following list of |key-value|
+% optional arguments:---\\
+% \DescribeOption{suppbegin}|suppbegin|$=$\meta{symbol}
+% \hfill\tcboxverb{Default: <}\\
+% The opening symbol used to mark the text that is supplied.\\
+% \DescribeOption{suppend}|suppend|$=$\meta{symbol}
+% \hfill\tcboxverb{Default: >}\\
+% The closing symbol used to mark the text that is supplied.\\
+% \DescribeOption{delbegin}|delbegin|$=$\meta{symbol}
+% \hfill\tcboxverb|Default: {|\\
+% The opening symbol used to mark the text that is deleted.\\
+% \DescribeOption{delend}|delend|$=$\meta{symbol}
+% \hfill\tcboxverb|Default: }|\\
+% The closing symbol used to mark the text that is deleted.\\
+% \DescribeOption{sicbegin}|sicbegin|$=$\meta{symbol}
+% \hfill\tcboxverb{Default: †}\\
+% The opening symbol used to mark the text that is deemed to be
+% suspect.\\
+% \DescribeOption{sicend}|sicend|$=$\meta{symbol}
+% \hfill\tcboxverb{Default: †}\\
+% The closing symbol used to mark the text that is deemed to be
+% suspect.\\
+% \DescribeOption{gapmark}|gapmark|$=$\meta{symbols}
+% \hfill\tcboxverb{Default: ***}\\
+% The symbols used to mark lacunae.\\
+%
+% As an example, what follows sets |[]| for deletions and |...| for
+% lacunae:---
+%
+% \iffalse
+%<*example>
+% \fi
+\begin{minted}[linenos=false]{latex}
+\SetCritSymbols{
+ delbegin = [,
+ delend = ],
+ gapmark = \dots
+}
+\end{minted}
+% \iffalse
+%</example>
+% \fi
+%
+% \danger If modified, brackets can be adapted to languages that are
+% written from right to left. To that effect, \pkg{ekdosis} provides a
+% boolean expression |al@rlmode| which is evaluated as |true| if the
+% writing direction is set from right to left and as |false|
+% otherwise. As the \pkg{etoolbox} package is loaded by \pkg{ekdosis},
+% \cs{ifboolean}|{al@rlmode}|\marg{rtl symbol}\marg{ltr symbol} can be
+% used to perform the test.
+%
+% \paragraph{Editorial Addition}
+% \DescribeMacro{\supplied}\newfeature[v1.1]\cs{supplied}\marg{text}
+% is used to mark \meta{text} that is by definition missing from the
+% tradition as supplied by the editor or some other scholar. This
+% command is normally expected in \cs{lem}|{}| or \cs{rdg}|{}|.
+%
+% \paragraph{Editorial Deletion}
+% \DescribeMacro{\surplus}\newfeature[v1.1] \cs{surplus}\marg{text}
+% is used to mark \meta{text} that is deemed to be inauthentic, but
+% nevertheless retained between braces in the edition text as it is
+% transmitted by all witnesses. This command is normally expected in
+% \cs{lem}|{}| or \cs{rdg}|{}|.
+%
+% \paragraph{Crux}
+% \DescribeMacro{\sic}\newfeature[v1.1] \cs{sic}\marg{text} takes as
+% mandatory argument the text deemed by the editor to be readable but
+% not understandable. \cs{sic} inserts \meta{text} between cruces
+% while \cs{sic*} prints only one crux before \meta{text}.
+%
+% \paragraph{Lacuna}
+% \DescribeMacro{\gap}\newfeature[v1.1] \cs{gap}\marg{csv list of
+% options} indicates that some amount of text has fallen away from the
+% entire tradition. It takes as mandatory argument a comma-separated
+% list of options that can be used to further specify the reason for
+% omission, the unit of measurement, the quantity or the extent, as
+% follows:---\\
+% \DescribeOption{reason}|reason|$=$\meta{reason}\\
+% |reason| gives the reason for omission.\\
+% \DescribeOption{unit} |unit|$=$\meta{unit}\\
+% |unit| provides some regularized measurement, such as |character|,
+% |word|, |line| and the like.
+% \DescribeOption{quantity} |quantity|$=$\meta{n}\\
+% |quantity| specifies the number of the given unit that comprise the
+% measurement.\\
+% \DescribeOption{extent} |extent|$=$\meta{description}\\
+% |extent| describes the size, including quantity and unit in a single
+% string of words.
+%
+% \paragraph{Conjectured Lacuna}
+% Assumably, the conjectured lacuna should be enclosed by
+% \cs{supplied} and as such contained by \cs{lem} with
+% |type=emendation| to indicate that the lacuna has been accepted by
+% the editor.
+%
+% Examples follow:\footnote{On the use of \texttt{egomute} (l.~2), see
+% above \vref{it:egomute}.}---
+%
+% \captof{Emendations, conjectures and
+% corrections}[\label{lst:emend-coni-corr}]
+% \iffalse
+%<*example>
+% \fi
+\begin{minted}{latex}
+% Preamble:
+\DeclareShorthand{egomute}{\unskip}{ego}
+
+% Document:
+\begin{ekdosis}
+ σχεδὸν \app{
+ \lem[resp=egomute, nosep, post={post σχεδὸν quattuor uerba
+ excidisse uid.}, type=emendation]{\supplied{\gap{reason=lost,
+ unit=word, quantity=4}}}
+ } οὗτοι
+
+ subsidiis magnis \sic*{epicuri} constabilitas
+
+ declinare quis est qui \sic{possit cernere sese}.
+
+ \app{
+ \lem[resp=egomute, type=emendation, nosep, post={ante
+ ὑπογίν.}]{\surplus{καὶ}}
+ \note{deleui e Gal.P}
+ } ὑπογίνονται
+
+ Πάντων δὲ \app{
+ \lem[resp=egomute, type=emendation, nosep]{\supplied{τῶν πυρετῶν}}
+ \note[post=\ekdsep]{addidi (\arb{^gamI`a 'l-.hummayAti}
+ \getsiglum{Gal})}
+ \rdg[nordg, source=Gal]{\arb{^gamI`a 'l-.hummayAti}}
+ \rdg[wit=codd, source=edd, alt=om.]{}
+ },
+\end{ekdosis}
+\end{minted}
+% \iffalse
+%</example>
+% \fi
+%
+% PDF output:---
+% \medskip
+%
+% \needspace{7\baselineskip}
+% \resetlinenumber
+% \begin{alignment}[flush,tcols=1,texts=specimen,apparatus=specimen]
+% \begin{specimen}
+% σχεδὸν \app{
+% \lem[resp=egomute, nosep, post={post σχεδὸν quattuor uerba
+% excidisse uid.}, type=emendation]{\supplied{\gap{reason=lost,
+% unit=word, quantity=4}}}
+% } οὗτοι
+%
+% subsidiis magnis \sic*{epicuri} constabilitas
+%
+% declinare quis est qui \sic{possit cernere sese}.
+%
+% \app{
+% \lem[resp=egomute, type=emendation, nosep, post={ante
+% ὑπογίν.}]{\surplus{καὶ}}
+% \note{deleui e Gal.P}
+% } ὑπογίνονται
+%
+%
+% Πάντων δὲ \app{
+% \lem[resp=egomute, type=emendation, nosep]{\supplied{τῶν πυρετῶν}}
+% \note[post=\ekdsep]{addidi (\arb{^gamI`a 'l-.hummayAti}
+% \getsiglum{Gal})}
+% \rdg[nordg, source=Gal]{\arb{^gamI`a 'l-.hummayAti}}
+% \rdg[wit=hcodd, source=hedd, alt=om.]{}
+% },
+% \end{specimen}
+% \end{alignment}
+%
+% \texttt{TEI xml} output:---
+%
+% \iffalse
+%<*example>
+% \fi
+\begin{minted}[linenos=false]{xml}
+<p>σχεδὸν
+<app>
+ <lem resp="#ego" type="emendation">
+ <supplied>
+ <gap reason="lost" unit="word" quantity="4" />
+ </supplied>
+ </lem>
+</app>οὗτοι</p>
+<p>subsidiis magnis
+<sic>epicuri</sic> constabilitas</p>
+<p>declinare quis est qui
+<sic>possit cernere sese</sic>.</p>
+<p>
+<app>
+ <lem resp="#ego" type="emendation">
+ <surplus>καὶ</surplus>
+ </lem>
+ <note>deleui e Gal.P</note>
+</app>ὑπογίνονται</p>
+<p>Πάντων δὲ
+<app>
+ <lem resp="#ego" type="emendation">
+ <supplied>τῶν πυρετῶν</supplied>
+ </lem>
+ <note>addidi (
+ <foreign xml:lang="ar-Latn" type="transliterated"
+ subtype="arabtex">^gamI`a 'l-.hummayAti</foreign>
+ <ref target="#Gal">Gal.</ref>)</note>
+ <rdg source="#Gal">
+ <foreign xml:lang="ar-Latn" type="transliterated"
+ subtype="arabtex">^gamI`a 'l-.hummayAti</foreign>
+ </rdg>
+ <rdg wit="#V #I #R #H" source="#Lit #Erm #Sm" />
+</app>,</p>
+\end{minted}
+% \iffalse
+%</example>
+% \fi
%
% \section{Alignment of Parallel Texts}
% \label{sec:alignment-basic}
@@ -1578,7 +2345,7 @@ yesterday.
% accompanied by a translation into a modern language on the facing
% page. One can also imagine an edition of two classical texts or two
% different recensions of the same text, each of which provides
-% variants recorded in separate apparatus crititus, laid out on the
+% variants recorded in separate apparatus criticus, laid out on the
% left-hand pages, with one or more translations on the corresponding
% right-hand pages, and so forth.
%
@@ -1645,10 +2412,12 @@ yesterday.
% manuscripts and manuscript families above
% \vpageref{ref:caesar-bg-sigla}. As this document is not set for
% duplex printing, both texts have been put together on the same
-% page. However, the reader will find the full |.tex| source file
-% in \vref{sec:caesar-gw-tex} and \texttt{TEI xml} output in
+% page. However, the reader will find the full |.tex| source file in
+% \vref{sec:caesar-gw-tex} and \texttt{TEI xml} output in
% \vref{sec:caesar-gw-tei}. The corresponding PDF output is available
-% in \href{samples/Caesar_BG-6-13-1.pdf}{a separate file}:---
+% in \href{samples/Caesar_BG-6-13-1.pdf}{a separate file}:\footnote{On
+% the use of \cs{ekddiv} (ll.~3 and 20), see below
+% \vref{sec:ekddiv}.}---
%
% \captof{Caesar's \emph{Gallic War}, VI, 13.1}[\label{lst:caesar-bg}]
% \iffalse
@@ -1686,6 +2455,7 @@ yesterday.
%</example>
% \fi
%
+% \needspace{7\baselineskip}
% \resetlinenumber
% \FormatDiv{2}{}{.}
% \begin{alignment}[flush,lcols=2,
@@ -1820,11 +2590,10 @@ yesterday.
% \item[\dbend] The colon at the end of line~3 closes the whole
% value of |text| and acts as a higher level separator.
% \end{enumerate}
-% \item Each name may be followed by a \enquote*{suboptional} argument
-% between square brackets which will then be used to insert
-% \texttt{TEI xml} attributes in the corresponding |<div>|
-% element. For example,
-% \iffalse
+% \item \label{it:lang-subopt} Each name may be followed by a
+% \enquote*{suboptional} argument between square brackets which will
+% then be used to insert \texttt{TEI xml} attributes in the
+% corresponding |<div>| element. For example, \iffalse
%<*example>
% \fi
\begin{minted}[escapeinside=++]{latex}
@@ -1959,12 +2728,11 @@ texts=latin[xml:lang="la"]+\textcolor{red}{;}+
% \label{sec:alignment-hooks}
% \DescribeMacro{\AtBeginEnvironment} Once environments corresponding
% to texts to be aligned have been defined, it is advisable to use the
-% \cs{AtBeginEnvironment}\marg{environment}\marg{code} command that is
-% provided by the \pkg{etoolbox} package\footnote{This package is
-% loaded by \pkg{ekdosis}.} to further adjust languages, hyphenation
-% rules, and/or fonts to be applied in each environment. To return to
-% the example provided above, once \cs{SetAlignment} has been
-% used, the languages can be set as follows:---
+% \cs{AtBeginEnvironment}\marg{environment}\marg{code} command to
+% further adjust languages, hyphenation rules, and/or fonts to be
+% applied in each environment. To return to the example provided
+% above, once \cs{SetAlignment} has been used, the languages can be
+% set as follows:---
%
% \iffalse
%<*example>
@@ -1978,7 +2746,135 @@ texts=latin[xml:lang="la"]+\textcolor{red}{;}+
%</example>
% \fi
%
-% \section{Laying Out the Apparatus Criticus }
+% \subsection{Laying Out Parallel Texts}
+% \label{sec:laying-out-parallel}
+% As \pkg{ekdosis} uses the \pkg{paracol} package for the layout of
+% parallel texts, most of the commands provided by this package
+% apply. In this respect, quite useful are the commands described in
+% sections 7.3 to 7.6 on pp.~15--21 of the documentation of this
+% package.\footcite{paracol}
+%
+% \danger It must be noted that all these commands are to be inserted
+% \emph{before} the \env{alignment} environments on which they are
+% supposed to operate.
+%
+% \subsubsection{Columns and Gutters}
+% \label{sec:columns-gutters}
+%
+% \paragraph{Column Ratio on Single Pages}
+% \DescribeMacro{\columnratio}
+% \cs{columnratio}\marg{r\textsubscript{1}, r\textsubscript{2}, \dots\
+% , r\textsubscript{n}}, where \emph{r\textsubscript{1}} refers to the
+% leftmost column, can be used to set the ratio of the columns in
+% relation to each other. Depending on the total number of columns on
+% which one wishes to operate, a comma-separated list of decimal
+% numbers is expected. As an example, \cs{columnratio}|{0.6}| will
+% instruct \pkg{ekdosis} to have the first column spread over 60~\% of
+% the total width of the text block, minus the total width of
+% intercolumnar gutters.
+%
+% \paragraph{Column Ratio on Facing Pages}
+% \cs{columnratio} accepts an optional argument which can be used as
+% described above to set the ratio of columns to be printed on
+% right-hand pages, like so: \cs{columnratio}\marg{r\textsubscript{1},
+% r\textsubscript{2}, \dots\ ,
+% r\textsubscript{n}}\oarg{r\textsubscript{1}, r\textsubscript{2},
+% \dots\ , r\textsubscript{n}}.
+%
+% \paragraph{Column Width on Single Pages}
+% \DescribeMacro{\setcolumnwidth}
+% \cs{setcolumnwidth}\marg{w\textsubscript{1}, w\textsubscript{2},
+% \dots\ , w\textsubscript{n}} operates the same way as
+% \cs{columnratio} described above, except that dimensions are
+% expected instead of ratios. As an example,
+% \cs{setcolumnwidth}|{1in}| will have the width of the first column
+% set to \unit[1]{in}.
+%
+% \paragraph{Gutter Width}
+% Each value accepted by \cs{setcolumnwidth} can be expressed as a
+% pair as in
+% \cs{setcolumnwidth}\marg{w\textsubscript{1}/g\textsubscript{1},
+% w\textsubscript{2}/g\textsubscript{2}, \dots\ ,
+% w\textsubscript{n}/g\textsubscript{n}} where the character |/| acts
+% as a separator, in which case \emph{g\textsubscript{x}} is used to
+% set the width of the gutter that follows the
+% \emph{x}\textsuperscript{th} column. As an example,
+% \cs{setcolumnwidth}|{1in/0.25in}| will print a
+% \unit[1]{in} first column, followed by a \unit[0.25]{in} gutter.
+%
+% \paragraph{Automatically Computed Values}
+% Widths of columns and widths of gutters can be replaced with
+% \cs{fill} and \cs{columnsep} respectively. As an example,
+% \cs{setcolumnwidth}|{\fill/0.25|\allowbreak|in}| will only operate
+% on the width that follows the first column, all remaining values
+% being computed automatically.
+%
+% \paragraph{Column and Gutter Width on Facing Pages}
+% Just like \cs{columnratio}, \cs{setcolumnwidth} accepts an optional
+% argument which can be used to set the width of columns and gutters
+% to be printed on right-hand pages, like so:
+% \cs{setcolumnwidth}\marg{w\textsubscript{1}, w\textsubscript{2},
+% \dots\ , w\textsubscript{n}}\oarg{w\textsubscript{1},
+% w\textsubscript{2}, \dots\ , w\textsubscript{n}} for columns only,
+% and \cs{setcolumnwidth}\marg{w\textsubscript{1}/g\textsubscript{1},
+% w\textsubscript{2}/g\textsubscript{2}, \dots\ ,
+% w\textsubscript{n}/g\textsubscript{n}}%
+% \oarg{w\textsubscript{1}/g\textsubscript{1},
+% w\textsubscript{2}/g\textsubscript{2}, \dots\ ,
+% w\textsubscript{n}/g\textsubscript{n}} for columns and gutters.
+%
+% \paragraph{Vertical Rules}
+% Vertical rules between columns can be drawn by setting the length of
+% the \LaTeX\ \cs{columnseprule} register to a non-zero value, like
+% so:---
+%
+% \iffalse
+%<*example>
+% \fi
+\begin{minted}[linenos=false]{latex}
+\setlength{\columnseprule}{0.4pt}
+\end{minted}
+% \iffalse
+%</example>
+% \fi
+%
+% \subsubsection{Marginal Notes}
+% \label{sec:marginal-notes}
+% By default, marginal notes that refer to the first column are
+% printed in the left margin, while notes that refer to subsequent
+% columns are printed in the right margin.
+%
+% \DescribeMacro{\marginparthreshold} \cs{marginparthreshold}\marg{n},
+% where \emph{n} is an integer, can be used to change the default
+% settings. This command instructs \pkg{ekdosis} that columns of text,
+% up to the \emph{n}\textsuperscript{th} column included, shall have
+% their marginal notes printed to the left. As a result, to take an
+% example, \cs{marginparthreshold}|{0}| will have all marginal notes
+% printed in the right margin. \cs{marginparthreshold} also accepts an
+% optional argument, namely
+% \cs{marginparthreshold}\allowbreak\marg{n}\oarg{n'}, that can be
+% used to set the threshold for columns printed in right-hand pages.
+%
+% \subsubsection{Regular Footnotes}
+% \label{sec:regular-footnotes}
+% \DescribeMacro{\footnotelayout} By default, regular footnotes are
+% printed at the bottom of the column on which they are
+% called. \cs{footnotelayout}\marg{key-letter} can be used to change
+% this setting. This command accepts as mandatory argument a
+% key-letter which can be either |c|, |p| or |m|. |c| means
+% \emph{column-wise} footnotes, which is the default value. |p| means
+% \emph{page-wise}: footnotes from all columns are gathered in a
+% single spanning block at the bottom of the page. Finally, |m| stands
+% for \emph{merge}, which means that all footnotes that are called on
+% a given page, including notes that are called outside the
+% \env{alignment} environment, are printed in a single spanning block
+% at the bottom of the page.
+%
+% \danger Regular footnotes are printed above the block of critical
+% notes. Places can be interchanged by just loading the \pkg{fnpos}
+% package in the preamble.\footcite{fnpos}
+%
+% \section{Laying Out the Apparatus Criticus}
% \label{sec:apparatus-layout}
%
% \subsection{General Hooks}
@@ -2041,11 +2937,14 @@ texts=latin[xml:lang="la"]+\textcolor{red}{;}+
% indentation of one em.
%
% \DescribeMacro{\SetEndApparatus}
+% \label{ref:setendapparatus}
% \cs{SetEndApparatus}\marg{characters} can be used to append
% \meta{characters} at the end of the apparatus block. By default,
-% nothing is appended. As an example of use, |\SetEndApparatus{.}|
-% will have a period printed at the end of the apparatus as it is
-% customary in some editions.
+% nothing is appended. \label{ref:ending-dot}As an example of use,
+% |\SetEndApparatus{.}| will have a period printed at the end of the
+% apparatus as it is customary in some
+% editions.\footnote{\label{fn:rm-dots}See also below
+% \vpageref{sec:superfluous-dots} on how to remove superfluous dots.}
%
% \DescribeMacro{\SetUnitDelimiter}
% \cs{SetUnitDelimiter}\marg{delimiter} can be used to set the
@@ -2086,7 +2985,8 @@ texts=latin[xml:lang="la"]+\textcolor{red}{;}+
% apparatus block.\\
% \DescribeOption{ehook} |ehook|$=$\meta{characters}
% \hfill\tcboxverb{Default: empty}\\
-% The characters to be appended at the end of the apparatus block.\\
+% The characters to be appended at the end of the apparatus
+% block.\footnote{See also n.~\vref{fn:rm-dots}.}\\
% \DescribeOption{rule} |rule|$=$\meta{command}\verb+|+|none|
% \hfill\tcboxverb{Default: \rule{0.4\columnwidth}{0.4pt}}\\
% As described above, |rule| is used to draw the separating line
@@ -2145,8 +3045,8 @@ texts=latin[xml:lang="la"]+\textcolor{red}{;}+
% preamble, this |default| layer must be included in the list of
% declared layers.\\
% \DescribeMacro{\SetDefaultApparatus}\label{ref:ekd-default-app}
-% \cs{SetDefaultApparatus}\marg{name} can be used at any point of
-% the document to change the default name that is used by
+% \cs{SetDefaultApparatus}\marg{name} can be used at any point of the
+% document to change the name to be used as the default one by
% \pkg{ekdosis}.
%
% \subsubsection{Declaring Additional Layers}
@@ -2189,7 +3089,7 @@ texts=latin[xml:lang="la"]+\textcolor{red}{;}+
% \DescribeOption{ehook}
% \DescribeOption{rule}
% \DescribeOption{norule}
-% With regard to layout, any declared layer inherits the defaut values
+% With regard to layout, any declared layer inherits the default values
% described above in \vref{sec:single-layer-app}. That said, as the
% optional argument of \cs{DeclareApparatus} accepts the exact same
% |key-value| options as \cs{SetApparatus} described
@@ -2322,9 +3222,9 @@ Some \app[type=rec2]{
%</example>
% \fi
%
-% At any rate, |type=default| or |type=rec1|, depending on what has
-% been chosen, must be used if the editor wishes to retain that
-% information in the \texttt{TEI xml} output file.
+% \danger At any rate, |type=default| or |type=rec1|, depending on
+% what has been chosen, must be used if the editor wishes to retain
+% that information in the \texttt{TEI xml} output file.
%
% \subsection{Other Notes for Comments, Sources or Testimonia}
% \label{ref:type-note}
@@ -2406,21 +3306,22 @@ Some \app[type=rec2]{
Asia; a language, copious, elastic, inviting self-explaining
combinations and independent development; lending itself alike to
daily life and imagination, to description and abstract thought.
- \note[type=fontium, labelb=61e, labele=62a, lem={They
+ \note[type=fontium, labelb=B61e, labele=B62a, lem={They
had... slave}]{Waitz, \emph{Deutsche Verfassungs Geschichte},
i. 86} They had a class of nobles, but their tongue knew no word
- for slave.\linelabel{62a}\footnote{George Bancroft, \emph{History of
- the United States from the Discovery of the American Continent},
- II.61--2.}
+ for slave.\linelabel{B62a}\footnote{George Bancroft, \emph{History
+ of the United States from the Discovery of the American
+ Continent}, II.61--2.}
\end{ekdosis}
\end{minted}
% \iffalse
%</example>
% \fi
%
-% \needspace{5\baselineskip}
% PDF output:---
% \medskip
+%
+% \needspace{7\baselineskip}
% \resetlinenumber
% \begin{alignment}[flush,tcols=1,texts=specimen,apparatus=specimen]
% \begin{specimen}
@@ -2430,10 +3331,10 @@ Some \app[type=rec2]{
% self-explaining combinations and independent development;
% lending itself alike to daily life and imagination, to
% description and abstract thought. \note[type=fontium,
-% labelb=61e, labele=62a, lem={They had... slave}]{Waitz,
+% labelb=B61e, labele=B62a, lem={They had... slave}]{Waitz,
% \emph{Deutsche Verfassungs Geschichte}, i. 86} They had a class
% of nobles, but their tongue knew no word for
-% slave.\linelabel{62a}\footnote{George Bancroft, \emph{History of
+% slave.\linelabel{B62a}\footnote{George Bancroft, \emph{History of
% the United States from the Discovery of the American Continent},
% II.61--2.}
% \end{specimen}
@@ -2451,11 +3352,11 @@ travels from central Asia; a language, copious, elastic,
inviting self-explaining combinations and independent
development; lending itself alike to daily life and
imagination, to description and abstract thought.
-<note type="fontium" target="#range(right(61e),left(62a))">Waitz,
+<note type="fontium" target="#range(right(B61e),left(B62a))">Waitz,
<emph>Deutsche Verfassungs Geschichte</emph>, i. 86</note>
-<anchor xml:id="61e" />They had a class of nobles, but
+<anchor xml:id="B61e" />They had a class of nobles, but
their tongue knew no word for slave.
-<anchor xml:id="#62a" />
+<anchor xml:id="B62a" />
<note place="bottom">George Bancroft,
<emph>History of the United States from the Discovery of
the American Continent</emph>, II.61--2.</note></p>
@@ -2488,9 +3389,10 @@ text to demonstrate how to insert a note in the argument of the
%</example>
% \fi
%
-% \needspace{5\baselineskip}
% PDF output:---
% \medskip
+%
+% \needspace{7\baselineskip}
% \resetlinenumber
% \begin{alignment}[flush,tcols=1,texts=specimen,apparatus=specimen]
% \begin{specimen}
@@ -2641,7 +3543,7 @@ argument of the
% apparatus, as described in \vref{sec:single-layer-app}, can be
% typeset within the Arabic environment that is provided by
% \pkg{polyglossia}. Unfortunately, the same cannot be said for
-% multi-layer apparatus.
+% multiple-layer apparatus.
%
% Whether \pkg{babel} or \pkg{polyglossia} is used, \pkg{ekdosis}
% automatically applies the current language to the entries of the
@@ -2650,7 +3552,9 @@ argument of the
% \pkg{polyglossia} can use the same language switching commands as
% \pkg{babel},\footcite[See][3.2 \pno~14]{polyglossia} the general
% advice given above in \vref{sec:alignment-hooks} applies in all
-% cases.
+% cases. As regards setting languages in the \texttt{TEI xml} output
+% file, the reader is invited to refer to point \vref{it:lang-subopt}
+% and \vref{sec:teixml-output}.
%
% \subsection{Languages Written From Right to Left}
% \label{sec:rtl-languages}
@@ -2808,9 +3712,10 @@ argument of the
% \vref{sec:multilayer-apparatus} (multiple-layer apparatus
% criticus).}
%
-% \needspace{5\baselineskip}
% The PDF output with left-to-right apparatus criticus follows:---
% \medskip
+%
+% \needspace{7\baselineskip}
% \resetlinenumber
% \begin{alignment}[flush,tcols=1,texts=specimen,apparatus=specimen]
% \begin{specimen}
@@ -2826,7 +3731,10 @@ argument of the
% \needspace{5\baselineskip}
% And here follows the PDF output with right-to-left apparatus
% criticus:---
-% \medskip \resetlinenumber
+% \medskip
+%
+% \needspace{7\baselineskip}
+% \resetlinenumber
% \begin{alignment}[flush,tcols=1,texts=specimen,apparatus=specimen]
% \begin{specimen}
% \begin{arab}[fullvoc]
@@ -2867,7 +3775,7 @@ argument of the
% Preamble:
% load ekdosis and ask for TEI xml output:
\usepackage[teiexport]{ekdosis}
-% load arabluatex and request a LaTeX ouput with Unicode Arabic:
+% load arabluatex and request a LaTeX output with Unicode Arabic:
\usepackage[export,fullvoc]{arabluatex}
% document:
@@ -2888,9 +3796,11 @@ argument of the
%</example>
% \fi
%
-% \needspace{7\baselineskip}
% The PDF output with left-to-right apparatus criticus is of course
% the same as above:---
+% \medskip
+%
+% \needspace{7\baselineskip}
% \resetlinenumber
% \begin{alignment}[flush,tcols=1,texts=specimen,apparatus=specimen]
% \begin{specimen}
@@ -3015,12 +3925,13 @@ subtype="arabtex">'inna 'abI kAna mina
% Variant readings can be inserted in headings. In this case, the
% optional argument of the \LaTeX\ sectional command must naturally be
% used to prevent variants from going into headers, footers or the
-% table of contents, like so:---
+% table of contents, like so:\footnote{On the use of \texttt{egomute}
+% (l.~13), see above \vref{it:egomute}.}---
%
% \iffalse
%<*example>
% \fi
-\begin{minted}[linenos=false]{latex}
+\begin{minted}{latex}
% Preamble:
\usepackage[teiexport=tidy, divs=latex]{ekdosis}
\MkBodyDivs{chapter}{section}{}{}{}{}
@@ -3031,7 +3942,11 @@ subtype="arabtex">'inna 'abI kAna mina
\lem[wit={I,R,H}]{βιβλίον δεύτερον}
\rdg[wit=V]{λόγος β’}}}
-\section{<Τμῆμα πρῶτον>}
+\section[Τμῆμα πρῶτον]{
+ \app{
+ \lem[resp=egomute, type=emendation, nosep,
+ post=suppleui]{\supplied{Τμῆμα πρῶτον}}
+ }}
Ἄνθρακες θερινοὶ ἐν Κραννῶνι· [...]
\end{minted}
% \iffalse
@@ -3051,7 +3966,12 @@ subtype="arabtex">'inna 'abI kAna mina
<rdg wit="#V">λόγος β’</rdg>
</app></head>
<div2 type="section">
- <head>&lt;Τμῆμα πρῶτον&gt;</head>
+ <head>
+ <app>
+ <lem><supplied resp="#ego" type="emendation">Τμῆμα
+ πρῶτον</supplied></lem>
+ </app>
+ </head>
<p>Ἄνθρακες θερινοὶ ἐν Κραννῶνι· [...]</p>
</div2>
</div1>
@@ -3104,7 +4024,7 @@ subtype="arabtex">'inna 'abI kAna mina
% indicate the depth of the division within the hierarchy, the largest
% being |1| and the smallest being |9|.\\
% \DescribeOption{toc}
-% |toc|$=$\verb+|book|part|chapter|section|subsection|subsubsection|paragraph+\\
+% |toc|$=$\verb+book|part|chapter|section|subsection|subsubsection|paragraph|+\\
% |subparagraph|\hfill\tcboxverb{Default: not set}\\
% If |toc| be set, the title of the division goes into the table of
% contents at the hierarchic level that is specified as value.
@@ -3134,7 +4054,7 @@ subtype="arabtex">'inna 'abI kAna mina
% To elaborate on the example provided above in \vref{sec:latex-divs},
% here follows how the first three hierarchical levels could be
% formatted as un-numbered divisions:---
-%
+%
% \iffalse
%<*example>
% \fi
@@ -3157,7 +4077,10 @@ subtype="arabtex">'inna 'abI kAna mina
}
\ekddiv{
- head={<Τμῆμα πρῶτον>},
+ head={\app{
+ \lem[resp=egomute, post=suppleui,
+ type=emendation]{\supplied{Τμῆμα πρῶτον}}
+ \rdg[wit=codd, alt=om.]{}}},
type=section,
depth=2,
n=II.1
@@ -3171,10 +4094,10 @@ subtype="arabtex">'inna 'abI kAna mina
%</example>
% \fi
%
-% \needspace{5\baselineskip}
% PDF output:---
% \medskip
%
+% \needspace{7\baselineskip}
% \resetlinenumber
% \FormatDiv{1}{\begin{center}\Large}{\end{center}}
% \FormatDiv{2}{\begin{center}\large}{\end{center}}
@@ -3194,7 +4117,15 @@ subtype="arabtex">'inna 'abI kAna mina
% depth=1,
% n=II}
%
-% \ekddiv{head={<Τμῆμα πρῶτον>}, type=section, depth=2, n=II.1}
+% \ekddiv{
+% head={\app{
+% \lem[resp=egomute, post=suppleui,
+% type=emendation]{\supplied{Τμῆμα πρῶτον}}
+% \rdg[wit=hcodd, alt=om.]{}}},
+% type=section,
+% depth=2,
+% n=II.1
+% }
%
% \ekddiv{head=1, type=paragraph, depth=3, n=II.1.1} Ἄνθρακες
% θερινοὶ ἐν Κραννῶνι· [...]
@@ -3215,7 +4146,14 @@ subtype="arabtex">'inna 'abI kAna mina
<rdg wit="#V">λόγος β’</rdg>
</app></head>
<div type="section" n="II.1">
- <head>&lt;Τμῆμα πρῶτον&gt;</head>
+ <head>
+ <app>
+ <lem resp="#ego" type="emendation">
+ <supplied>Τμῆμα πρῶτον</supplied>
+ </lem>
+ <rdg wit="#V #I #R #H" />
+ </app>
+ </head>
<div type="paragraph" n="II.1.1">
<head>1</head>
<p>Ἄνθρακες θερινοὶ ἐν Κραννῶνι· [...]</p>
@@ -3237,11 +4175,11 @@ subtype="arabtex">'inna 'abI kAna mina
% the apparatus criticus does not show. Instead, \pkg{ekdosis}
% produces an auxiliary file named \cs{jobname}|.ekd| in which all the
% entries of the apparatus criticus are collected. Then, on the second
-% run a test is performed on this auxliary file to determine whether
+% run a test is performed on this auxiliary file to determine whether
% there are entries\---and if so, which ones\---to be printed on the
% current page. At the same time, references to the line numbers are
-% updated if necessary. Then, on the third run, the apparatus criticus
-% is printed.
+% updated if necessary. Finally, on the third run, the apparatus
+% criticus is printed.
%
% Of course, every change made to the input may similarly require
% \hologo{LuaLaTeX} to be run three more times to get everything to
@@ -3269,7 +4207,7 @@ subtype="arabtex">'inna 'abI kAna mina
% a good way to get out of the vicious circle. And surely, if only a
% few pages are at stake, this is the way to go. However,
% \cs{pagebreak} commands should only be inserted when the whole
-% edition text is ready for any subtantial change in the preceding
+% edition text is ready for any substantial change in the preceding
% pages may result in pages that break just after they begin.
%
% Another way\---should the edition text fall into the vicious circle
@@ -3277,16 +4215,16 @@ subtype="arabtex">'inna 'abI kAna mina
% layer of apparatus criticus may accept as described above
% \vpageref{ref:maxentries}. As a result, \pkg{ekdosis} will take care
% of inserting automatic breakpoints between pages whenever the number
-% of entries on a given page reaches the value set as |maxnumber|.
+% of entries on a given page reaches the value set as |maxentries|.
%
-% |maxnumber| must not be too small: otherwise offensive to look at
+% |maxentries| must not be too small: otherwise offensive to look at
% vertical spaces may come between the edition text and the apparatus
-% criticus. Conversely, |maxnumber| must not be too big: otherwise,
+% criticus. Conversely, |maxentries| must not be too big: otherwise,
% should entries overflow on a given page, the edition text and the
-% apparatus criticus may clash. As said above, a couple of clashes can
-% be managed with a couple of manually inserted page breaks. But if
-% there are too many ot them, it is a good indication that the
-% selected value of |maxentries| is too to high.
+% apparatus criticus may clash again. As said above, a couple of
+% clashes can be managed with a couple of manually inserted page
+% breaks. But if there are too many of them, it is a good indication
+% that the selected value of |maxentries| is too to high.
%
% Complex edition texts do have a magic number. An advisable way to
% figure it out would be to start from a sample of only a few pages,
@@ -3294,6 +4232,124 @@ subtype="arabtex">'inna 'abI kAna mina
% pages would need to be compiled, the magic number should emerge
% quite rapidly.
%
+% \paragraph{Adding and Removing Entries}
+% \DescribeMacro{\addentries} \cs{addentries}\oarg{layer}\marg{n}
+% \newfeature[v1.1]\\
+% If |maxentries| be set for a given layer of critical notes,
+% \cs{addentries}\oarg{layer}\marg{n}, where \meta{n} is an integer,
+% can be used to add \meta{n} to\---or remove it from if \meta{n} be
+% negative\---the number of accepted entries on the current
+% page. \cs{addentries} operates on the default layer of notes, but
+% any other declared layer can be specified in the optional argument
+% of the command.
+%
+% \danger Of course, \cs{addentries} must be issued before the
+% number of entries on a given page has reached the value set as
+% |maxentries|.
+%
+% Once a sensible value for |maxentries| has been found,
+% \cs{addentries} can further be used with a positive integer to allow
+% for more entries and more lines on some pages so that offending
+% vertical spaces are decreased. Conversely, \cs{addentries} with a
+% negative integer will remove entries on pages where there are too
+% many of them and \pkg{ekdosis} still oscillates between different
+% sets of page decisions.
+%
+% \subsection{Variae Quaestiones}
+% \label{sec:variae-quaestiones}
+% This section is about issues that are not strictly speaking part of
+% the documentation of \pkg{ekdosis} but may nevertheless
+% circumstantially arise.
+%
+% \paragraph{Superfluous Dots}
+% \label{sec:superfluous-dots}
+% As said above \vpageref{ref:ending-dot}, it is customary in some
+% editions to have a full stop printed at the end of the apparatus
+% criticus. \pkg{ekdosis} provides specific commands to achieve this
+% in a straightforward way, such as \cs{SetEndApparatus} and the
+% |ehook| optional argument of \cs{SetApparatus} and
+% \cs{DeclareApparatus}.\footnote{See above
+% \vpagerefrange{ref:setendapparatus}{sec:declaring-layers}.} However,
+% if the last word of the apparatus criticus on a given page be an
+% abbreviation followed by a dot, such a setting will have two dots
+% printed at the end of the apparatus instead of one. The solution is
+% to define a command to have a dot printed only if it is not followed
+% by a dot, and append this command to the abbreviated form of the
+% word, like so:---
+%
+% \iffalse
+%<*example>
+% \fi
+\begin{minted}{latex}
+% Preamble:
+\usepackage{xspace}
+\usepackage{ekdosis}
+
+\makeatletter
+\newcommand{\ekddot}{%
+ \ltx@ifnextchar{.}{\xspace}{.\xspace}}
+\makeatother
+
+\DeclareApparatus{default}[ehook=.]
+\DeclareScholar{Erm}{Erm\ekddot}
+\end{minted}
+% \iffalse
+%</example>
+% \fi
+%
+% \begin{remarks}
+% \item Line~2: The \pkg{xspace} package is needed for \cs{xspace} is
+% used by the \cs{ekddot} command that is defined at l.~6.
+% \item Line~7: \cs{ltx@ifnextchar} is part of the \pkg{ltxcmds}
+% package which is loaded by \pkg{ekdosis}. As this command uses a
+% private control sequence, it must be found within
+% \cs{makeatletter} \dots\ \cs{makeatother}.
+% \item Line~10: \cs{ekddot} will only work with multiple-layer
+% apparatus criticus. Therefore, \cs{DeclareAppa{\allowbreak}ratus}
+% must be used even if only one layer of critical notes is needed.
+% \end{remarks}
+%
+% \paragraph{Backup of Essential Files}
+% Each time the |.tex| source file is compiled, \pkg{ekdosis} reads
+% the |.aux| corresponding \LaTeX\ auxiliary file and its own |.ekd|
+% auxiliary file so as to process labels and collect entries of the
+% apparatus criticus. If for whatever reason\---e.g.\ some unknown
+% command has been inserted\---the compilation freezes and so must be
+% aborted, it may happen that most of the edition text has to be
+% reconstructed page after page. For large and complex editions, this
+% makes advisable to have current versions of those files backed up
+% each time a new compilation begins, which can be achieved by
+% inserting the following lines before the line that loads the
+% document class:---
+%
+% \iffalse
+%<*example>
+% \fi
+\begin{minted}[linenos=false]{latex}
+\RequirePackage{verbatimcopy}
+\IfFileExists{\jobname.aux}{%
+ \OldVerbatimCopy{\jobname.aux}{\jobname.aux.bak}}{}
+\IfFileExists{\jobname.ekd}{%
+ \OldVerbatimCopy{\jobname.ekd}{\jobname.ekd.bak}}{}
+\documentclass{book}
+\end{minted}
+% \iffalse
+%</example>
+% \fi
+%
+% This way, both |.aux| and |.ekd| files can be recovered from
+% |.aux.bak| and |.ekd.bak| just after the compilation has been
+% aborted. Should this be needed, one must proceed carefully as
+% follows:---
+% \begin{enumerate}
+% \item Just after the compilation has been aborted, move both
+% |aux.bak| and |ekd.bak| files to a safe place.
+% \item Remove or correct the offending command or lines that broke
+% the compilation and make sure that the issue is solved.
+% \item Restore the |.aux| and |.ekd| files from |aux.bak| and
+% |.ekd.bak| and resume work where it was left off.
+% \end{enumerate}
+%
% \section{\texttt{TEI xml} Output}
% \label{sec:teixml-output}
% Several examples of \texttt{TEI xml} output have been provided
@@ -3311,10 +4367,10 @@ subtype="arabtex">'inna 'abI kAna mina
% language (Latin, English and French) is to be found in two different
% places, namely for \texttt{TEI xml} output (ll.~21--3) and for PDF
% output through \LaTeX\ (ll.~27--9). Finally, it provides examples of
-% declaring witnesses, hands, scholars and shorthands (ll.~31--60). As
-% to the document itself, it shows how to lay out a conspectus
-% siglorum in a table (ll.~64--80), before giving detailed examples of
-% how the edition text is entered (ll.~85--101) and sectional commands
+% declaring witnesses, hands and shorthands (ll.~31--60). As to the
+% document itself, it shows how to lay out a conspectus siglorum in a
+% table (ll.~64--80), before giving detailed examples of how the
+% edition text is entered (ll.~85--101) and sectional commands
% provided by \pkg{ekdosis} are used (ll.~86, 103 and
% 110).\footnote{The PDF output is available as
% \href{samples/Caesar_BG-6-13-1.pdf}{a separate file}.}
@@ -3356,7 +4412,7 @@ subtype="arabtex">'inna 'abI kAna mina
% The \texttt{TEI} validator is here:
% \url{http://teibyexample.com/xquery/TBEvalidator.xq}.} As for
% \pkg{ekdosis}, it is designed to produce on request, in addition to
-% an edition in print, a \texttt{TEI xml} compliant output file. That
+% an edition in print, a \texttt{TEI xml}-compliant output file. That
% said, one must keep in mind that the \LaTeX\ packages that are part
% of {\TeX}Live can be counted in thousands, and the commands they
% provide in tens of thousands. There may even be grounds in asserting
@@ -3383,7 +4439,7 @@ subtype="arabtex">'inna 'abI kAna mina
% are marked in \LaTeX\ with \enquote{open} commands such as
% \cs{chapter} or \cs{section} with no clear indication where the
% closure of divisions occurs, contrary to \texttt{TEI xml} markup
-% with numered or un-numbered |<div>| elements allowed to nest
+% with numbered or un-numbered |<div>| elements allowed to nest
% recursively. As regards running paragraphs of text, the situation is
% even worse than in the latter case, as the following simple example
% shows:---
@@ -3434,29 +4490,6 @@ subtype="arabtex">'inna 'abI kAna mina
% \textsf{Lua} functions which involve string matching (both forward
% and reverse matching) and recursions.
%
-% \paragraph{The \texttt{xml:id} Attribute}
-% As a general rule, the |xml:id| global attribute must be unique for
-% the element that bears the attribute. Furthermore, it must begin
-% with a letter or an underscore and contain no characters other that
-% letters, digits, hyphens underscores and full stops. \pkg{ekdosis}
-% issues a warning when it finds that any \meta{unique id} of
-% \meta{unique label} expected in the first argument of
-% \cs{DeclareWitness}, \cs{DeclareHand} or \cs{DeclareScholar} is not
-% unique or breaks the rules just described, but does not prevent the
-% |.tex| source file from compiling. Instead, it prints the string
-% |<??>| in place of the expected formatted siglum so that the error
-% in the |.tex| source file can be easily spotted and corrected.
-%
-% \danger As the \meta{unique id} declared with \cs{DeclareShorthand}
-% is not to be exported in the \texttt{TEI xml} outputfile,
-% \pkg{ekdosis} checks neither its uniqueness nor its validness.
-%
-% \danger It must be noted that \LaTeX\ labels that are provided in
-% commands such as \cs{label}, \cs{cite} and the like must also be
-% unique in the document. As \LaTeX\ will issue warnings if it finds
-% duplicates, \cs{ekdosis} does not check their uniqueness but will
-% issue warnings if such labels contain invalid strings.
-%
% \paragraph{\texttt{TEI xml} Export Settings}
% \label{ref:setteixmlexport}
% \DescribeMacro{\SetTEIxmlExport} \cs{SetTEIxmlExport}\marg{csv list
@@ -3488,6 +4521,30 @@ subtype="arabtex">'inna 'abI kAna mina
% paragraphs within |<p>| elements when |autopar| has been set to
% |false| by means of \cs{SetTEIxmlExport} described above.
%
+% \paragraph{The \texttt{xml:id} Attribute}
+% As a general rule, the |xml:id| global attribute must be unique for
+% the element that bears the attribute. Furthermore, it must begin
+% with a letter or an underscore and contain no characters other that
+% letters, digits, hyphens, underscores and full stops. \pkg{ekdosis}
+% issues a warning when it finds that any \meta{unique id} of
+% \meta{unique label} expected in the first argument of
+% \cs{DeclareWitness}, \cs{DeclareHand}, \cs{DeclareSource} or
+% \cs{DeclareScholar} is not unique or breaks the rules just
+% described, but does not prevent the |.tex| source file from
+% compiling. Instead, it prints the string |<??>| in place of the
+% expected formatted siglum so that the error in the |.tex| source
+% file can be easily spotted and corrected.
+%
+% \danger As the \meta{unique id} declared with \cs{DeclareShorthand}
+% is not to be exported in the \texttt{TEI xml} output file,
+% \pkg{ekdosis} checks neither its uniqueness nor its validness.
+%
+% \danger It must be noted that \LaTeX\ labels that are provided in
+% commands such as \cs{label}, \cs{cite} and the like must also be
+% unique in the document. As \LaTeX\ will issue warnings if it finds
+% duplicates, \cs{ekdosis} does not check their uniqueness but will
+% issue warnings if such labels contain invalid strings.
+%
% \subsection{Routine \LaTeX\ Commands and Environments}
% \label{sec:routine-cmds}
% The list of \LaTeX\ commands known by \pkg{ekdosis} at the time of
@@ -3509,6 +4566,7 @@ subtype="arabtex">'inna 'abI kAna mina
% \cs{textsc}|{}| & |<hi rend="smallcaps"></hi>| \\
% \cs{textsf}|{}| & |<hi rend="sf"></hi>| \\
% \cs{footnote}|{}| & |<note place="bottom"></note>| \\
+% \cs{marginpar}|{}| & |<note place="margin"></note>| \\
% \cs{enquote}\meta{*}|{}| & |<quote></quote>| \\
% \cs{label}|{label}| & |<anchor xml:id="label"/>| \\
% \cs{linelabel}|{label}| & |<anchor xml:id="label"/>| \\
@@ -3517,7 +4575,7 @@ subtype="arabtex">'inna 'abI kAna mina
% \cs{vref}|{label}| & |<ptr ="#label"/>| \\
% \cs{vpageref}|{label}| & |<ptr ="#label"/>| \\
% \cs{pagebreak}\meta{\oarg{1-4}} & no output \\
-% \cs{mbox}|{}| & no output \\
+% \cs{mbox}\marg{text} & \meta{text} \\
% \bottomrule
% \end{xltabular}
%
@@ -3610,7 +4668,7 @@ many mathematical writings and to the sense of
% \texttt{TEI} element it is to be converted into and any additional
% \texttt{xml} attributes to be appended to the opening \texttt{TEI}
% element. For example, the \cs{sidenote} command that is provided by
-% the \cs{sidenotes} package can be processed like so:---
+% the \pkg{sidenotes} package can be processed like so:---
%
% \iffalse
%<*example>
@@ -3650,13 +4708,16 @@ many mathematical writings and to the sense of
%
% Even more subtly, provided that the code |#STC| points to some more
% information identifying the agency concerned:\footnote{At the time
-% of writing, \enquote*{scholars} can be declared with
-% \cs{DeclareScholar} as described above
-% \vpageref{ref:declare-scholar}. Then the unique ID used in the first
-% argument of this command can point to the list of references
-% inserted by \pkg{ekdosis} in the back matter section of the
-% \texttt{TEI} ouput file. See below \vref{sec:references-cited-works}
-% for more information on how to do this.}---
+% of writing, \enquote*{sources} can be declared with
+% \cs{DeclareSource} as described above
+% \vpageref{ref:declare-source}. Then the unique identifier used in
+% the first argument of this command can point to the list of
+% references inserted by \pkg{ekdosis} in the back matter section of
+% the \texttt{TEI} output file. See below
+% \vref{sec:references-cited-works} for more information on how to do
+% this. Scholars can also be referred to as individuals by means of
+% the \cs{DeclareScholar} command. See above
+% \vpageref{ref:declare-source}.}---
%
% \iffalse
%<*example>
@@ -3754,8 +4815,8 @@ many mathematical writings and to the sense of
%</example>
% \fi
%
-% \DescribeMacro{\TeXtoTEIPatt}
-% \cs{TeXtoTEIPatt}\marg{\TeX\ pattern}\marg{TEI pattern}\\
+% \DescribeMacro{\TeXtoTEIPat}
+% \cs{TeXtoTEIPat}\marg{\TeX\ pattern}\marg{TEI pattern}\\
% Finally, this more flexible\---and more delicate to
% handle\---command uses pattern matching to instruct \pkg{ekdosis}
% how to convert \hologo{(La)TeX} commands into \texttt{TEI}
@@ -3780,7 +4841,7 @@ many mathematical writings and to the sense of
%<*example>
% \fi
\begin{minted}[linenos=false]{latex}
-\TeXtoTEIPatt{\textcolor {#1}{#2}}{<hi rend="#1">#2</hi>}
+\TeXtoTEIPat{\textcolor␣{#1}{#2}}{<hi rend="#1">#2</hi>}
Sample text with a \textcolor{red}{word} in red.
\end{minted}
@@ -3841,12 +4902,12 @@ Sample text with a \textcolor{red}{word} in red.
%
% \begin{remarks}
% \item Lines~2--3 define a basic environment meant to contain
-% indivivual speeches and a command to hold the name of the
+% individual speeches and a command to hold the name of the
% speaker. This name is printed in bold face and followed by a new
% paragraph in the PDF output.
% \item Line~4 instructs \pkg{ekdosis} to convert \env{speech} \LaTeX\
% environments into |<sp>| \texttt{TEI xml} elements.
-% \item Line~6 disables the |autopar| algorithm that \cs{ekdosis}
+% \item Line~6 disables the |autopar| algorithm that \pkg{ekdosis}
% provides by default for running paragraphs of text. As a
% consequence, \env{ekdpar} is used to mark the paragraphs.
% \end{remarks}
@@ -3854,6 +4915,7 @@ Sample text with a \textcolor{red}{word} in red.
% PDF output:---
% \medskip
%
+% \needspace{7\baselineskip}
% \SetTEIxmlExport{autopar=false}
% \begingroup
% \newenvironment{speech}{\par\selectlanguage{greek}}{\par}
@@ -3911,18 +4973,19 @@ Sample text with a \textcolor{red}{word} in red.
% the |<listWit>| element of the \texttt{TEI} header, whereas the
% latter is to be found within the |<listBibl>| element.
%
-% \DescribeMacro{\SetxmlBibResource}
-% \cs{SetxmlBibResource}\marg{basename} is a preamble-only command. If
-% a base name for a \texttt{TEI xml} compliant bibliographical
-% database be provided, \pkg{ekdosis} will use it and insert formatted
-% data in the back matter section of its own \texttt{TEI xml} output
-% file, as |<biblStruct>| elements within a |listBibl| section.
+% \DescribeMacro{\AddxmlBibResource}
+% \cs{AddxmlBibResource}\marg{basename or name.xml} is a preamble-only
+% command. If a base name (either suffixed with |.xml| or not) for a
+% \texttt{TEI xml}-compliant bibliographical database be provided,
+% \pkg{ekdosis} will use it and insert formatted data in the back
+% matter section of its own \texttt{TEI xml} output file, as
+% |<biblStruct>| elements within a |listBibl| section.
%
% As an example, the following Bib\hologo{(La)TeX} entry and its
-% \texttt{TEI} equivalent follow:\footnote{\label{fn:zotero}To the
-% author's knowledge, \textsf{Zotero} (\url{https://www.zotero.org})
-% provides excellent \texttt{TEI xml} output from Bib\hologo{(La)TeX}
-% input files.}---
+% \texttt{TEI} equivalent are provided:\footnote{\label{fn:zotero}To
+% the author's knowledge, \textsf{Zotero}
+% (\url{https://www.zotero.org}) provides excellent \texttt{TEI xml}
+% output from Bib\hologo{(La)TeX} input files.}---
%
% \iffalse
%<*example>
@@ -3975,7 +5038,7 @@ Sample text with a \textcolor{red}{word} in red.
% the Bib\hologo{(La)TeX} file (l.~1) and an |xml:id| in the
% \texttt{TEI} file (l.~3). This same label must be used again in the
% preamble of the |.tex| source file to declare Arnold Drakenborch as a
-% scholar,\footnote{See above \vpageref{ref:declare-scholar}.} like
+% source,\footnote{See above \vpageref{ref:declare-source}.} like
% so:---
%
% \iffalse
@@ -3983,10 +5046,10 @@ Sample text with a \textcolor{red}{word} in red.
% \fi
\begin{minted}{latex}
% Use 'bibl.xml' as a TEI xml bibliographical database:
-\SetxmlBibResource{bibl} % 'bibl' is the basename of 'bibl.xml'
+\AddxmlBibResource{bibdata.xml}
-% Declare A. Drakenborch as scholar:
-\DeclareScholar{Drak}{\emph{Drakenborch}}
+% Declare A. Drakenborch as source:
+\DeclareSource{Drak}{\emph{Drakenborch}}
\end{minted}
% \iffalse
%</example>
@@ -4002,19 +5065,24 @@ Sample text with a \textcolor{red}{word} in red.
% \fi
\begin{minted}{latex}
% Preamble:
+\usepackage[style=oxnotes]{biblatex}
+\addbibresource{bibdata.bib}
+
\usepackage[teiexport=tidy]{ekdosis}
+% basename of the .xml bibliographical database:
+\AddxmlBibResource{bibdata.xml}
+
% Witnesses:
\DeclareWitness{L}{L}{Laurentianus, plut, XXXVII, cod. 16}[
origDate=s. XV]
% Other witnesses [...]
-% Scholars:
-\DeclareScholar{Drak}{\emph{Drakenborch}}
-% Other scholars [...]
-
-% basename of the .xml bibliographical database:
-\SetxmlBibResource{bibl}
+% Sources:
+\DeclareSource{Drak}{\emph{Drakenborch}}
+% Alternatively, use BibLaTeX for the rendition:
+% \DeclareSource{Drak}{\citename{Drak}{editor}}
+% Other sources [...]
% Document:
\begin{ekdosis}
@@ -4022,10 +5090,10 @@ Sample text with a \textcolor{red}{word} in red.
Sed uos, quorum oculos atque ora humentia uidi,\\
uertere cum consul terga et remeare iuberet,\\
\app{
- \lem[wit=Drak]{ne morem}
+ \lem[source=Drak, type=emendation]{ne morem}
\rdg[wit={L, F}]{me morem}
\rdg[wit={O, V}]{memorem}
- } et pugnae signum exspectate petendae:
+ } et pugnae signum exspectate petendae:\\
\end{ekdverse}
\end{ekdosis}
\end{minted}
@@ -4033,22 +5101,22 @@ Sample text with a \textcolor{red}{word} in red.
%</example>
% \fi
%
-% \needspace{7\baselineskip}
% PDF output:---
% \medskip
%
+% \needspace{7\baselineskip}
% \begin{alignment}[flush,tcols=1,texts=specimen,apparatus=specimen]
-% \resetlinenumber[30]\rightlinenumbers
-% \setlength{\linenumbersep}{-1.5in}
+% \setverselinenums{30}{0}
+% \setlength{\vrightskip}{-1.5in}
% \begin{specimen}
% \begin{ekdverse}
% Sed uos, quorum oculos atque ora humentia uidi,\\
% uertere cum consul terga et remeare iuberet,\\
% \app{
-% \lem[wit=sDrak]{ne morem}
+% \lem[source=sDrak, type=emendation]{ne morem}
% \rdg[wit={sL, sF}]{me morem}
% \rdg[wit={sO, sV}]{memorem}
-% } et pugnae signum exspectate petendae:
+% } et pugnae signum exspectate petendae:\\
% \end{ekdverse}
% \end{specimen}
% \end{alignment}
@@ -4067,7 +5135,7 @@ Sample text with a \textcolor{red}{word} in red.
<l>uertere cum consul terga et remeare iuberet,</l>
<l>
<app>
- <lem wit="#Drak">ne morem</lem>
+ <lem source="#Drak" type="emendation">ne morem</lem>
<rdg wit="#L #F">me morem</rdg>
<rdg wit="#O #V">memorem</rdg>
</app>et pugnae signum exspectate petendae:</l>
@@ -4106,18 +5174,18 @@ Sample text with a \textcolor{red}{word} in red.
% \pkg{ekdosis} can also convert into \texttt{TEI xml} references to
% cited works. Depending on the optional arguments used in the
% citation command, references will be converted into |<ptr>| or
-% |<ref>| elements with the appropriate ID supplied by means of the
-% |target| attribute.
+% |<ref>| elements with the appropriate identifier supplied by means
+% of the |target| attribute.
%
% Of course, for this mechanism to work, Bib\TeX\ or Bib\LaTeX\ must
% be used and connected to some |.bib| bibliographical database
% file. Additionally, this |.bib| file must have been converted into a
-% \texttt{TEI xml} compliant file where all the Bib\hologo{(La)TeX}
+% \texttt{TEI xml}-compliant file where all the Bib\hologo{(La)TeX}
% entries that are used in the document are found within
% |<biblStruct>| elements.\footnote{See above n.~\vref{fn:zotero} for
% information on how to do this.} Finally, this |.xml| bibliographical
% database must have been connected to the |.tex| source file by means
-% of \cs{SetxmlBibResource} described above in
+% of \cs{AddxmlBibResource} described above in
% \vref{sec:references-cited-works}.
%
% As an example, the following |sample.bib| file is used:---
@@ -4175,7 +5243,7 @@ Sample text with a \textcolor{red}{word} in red.
% \fi
%
% Once both files have been prepared, inserting references and
-% exporting them into the \texttt{TEI xml} ouput file can be achieved
+% exporting them into the \texttt{TEI xml} output file can be achieved
% in a straightforward way. (The full |sample.tex| is provided
% below.)---
%
@@ -4186,8 +5254,7 @@ Sample text with a \textcolor{red}{word} in red.
\documentclass{article}
\usepackage[teiexport=tidy]{ekdosis}
-\SetxmlBibResource{sample} % base name supplied here, without the
- % extension
+\AddxmlBibResource{sample.xml}
\usepackage[style=oxnotes]{biblatex}
\addbibresource{sample.bib}
@@ -4205,6 +5272,7 @@ Sample text with a \textcolor{red}{word} in red.
% PDF output:---
% \medskip
%
+% \needspace{7\baselineskip}
% \resetlinenumber
% \begin{alignment}[flush,tcols=1,texts=specimen,apparatus=specimen]
% \begin{specimen}
@@ -4213,7 +5281,7 @@ Sample text with a \textcolor{red}{word} in red.
% \end{alignment}
%
% \medskip
-% \texttt{TEI xml} ouput narrowed down to the contents of the |<text>|
+% \texttt{TEI xml} output narrowed down to the contents of the |<text>|
% element:---
%
% \iffalse
@@ -4284,14 +5352,18 @@ Sample text with a \textcolor{red}{word} in red.
%
% \section{Future Work}
% \label{sec:future-work}
-% A short, uncommented list of what is planned in the versions of
+% A short, un-commented list of what is planned in the versions of
% \pkg{ekdosis} to come follows:---
% \begin{enumerate}
% \item Very short-term (weeks):---
% \begin{enumerate}
-% \item Editorial changes, for inserting corrections and
-% conjectures.
% \item Text structure: milestone elements.
+% \item Marginal edition texts: It may happen that the marginalia of
+% manuscripts contain texts worth editing in addition to and along
+% the main text to which they are linked by reference
+% signs.
+% \item Headers and footers: \cs{ekddiv} will provide top and bottom
+% marks to be used in headers and footers.
% \end{enumerate}
% \item Short-term (months):---
% \begin{enumerate}
@@ -4896,7 +5968,7 @@ Sample text with a \textcolor{red}{word} in red.
% instruct ekdosis to output TEI xml (arabic-sample-tei.xml):
\usepackage[teiexport=tidy]{ekdosis}
-% instruct arabluatex to ouput sample-arabic_out.tex with Unicode
+% instruct arabluatex to output sample-arabic_out.tex with Unicode
% Arabic strings in place of arabtex ASCII scheme:
\usepackage[fullvoc,export]{arabluatex}
@@ -4961,7 +6033,8 @@ Sample text with a \textcolor{red}{word} in red.
\AtBeginDocument{\luadirect{ekdosis.setekddivsfalse()}}}},
initial divs = ekdosis,
unknown-choice divs = \PackageError{ekdosis}{unknown divs=#1}{`divs'
- must be either `ekdosis' or `latex'.},
+ must be either `ekdosis' or `latex'.},
+ bool verse = \if@pkg@verse,
choice parnotes = {false = {},
true = {\@pkg@parnotestrue},
roman = {\@pkg@parnotestrue\@parnotesromantrue}},
@@ -4992,7 +6065,6 @@ Sample text with a \textcolor{red}{word} in red.
% \RequirePackage{expkv-def} % already loaded above
\RequirePackage{luacode}
\RequirePackage{paracol}
-\RequirePackage{xparse}
\RequirePackage{etoolbox}
\RequirePackage{lineno}
\RequirePackage{keyfloat}
@@ -5000,8 +6072,11 @@ Sample text with a \textcolor{red}{word} in red.
\RequirePackage{zref-user}
\RequirePackage{zref-abspage}
\RequirePackage{ltxcmds}
-\RequirePackage{atbegshi}
+\RequirePackage{pdftexcmds}
\RequirePackage{ifoddpage}
+\if@pkg@verse
+ \RequirePackage{verse}
+\fi
\if@pkg@parnotes
\RequirePackage{parnotes}
\fi
@@ -5070,11 +6145,11 @@ Sample text with a \textcolor{red}{word} in red.
% \end{macrocode}
% \end{macro}
% \begin{macro}{\DeclareHand} As \cs{DeclareWitness}, \cs{DeclareHand}
-% is a preamble-only command meant to collect data and store them in
-% |Lua| tables. It takes three mandatory arguments and one optional
-% argument. The second argument is used to connect the hand to a
-% declared witness it is related to. Then the table in which this
-% witness is recorded can be fed with new data.
+% is a preamble-only command meant to collect data and store them in
+% |Lua| tables. It takes three mandatory arguments and one optional
+% argument. The second argument is used to connect the hand to a
+% declared witness it is related to. Then the table in which this
+% witness is recorded can be fed with new data.
% \begin{macrocode}
\NewDocumentCommand{\DeclareHand}{m m m +O{}}{
\luadirect{ekdosis.newhand(\luastringN{#1},
@@ -5085,20 +6160,57 @@ Sample text with a \textcolor{red}{word} in red.
\@onlypreamble\DeclareHand
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\DeclareScholar} There is also a table in which are
-% collected data related to scholars' names to be used in the
-% apparatus criticus. \cs{DeclareScholar} is a preamble-only command
-% and takes two mandatory arguments: a unique id and a shorthand to
-% be used in the apparatus criticus which can be extracted from a
-% bibliographic database.
+% Build and process the list of scholars:---
% \begin{macrocode}
-\NewDocumentCommand{\DeclareScholar}{m m}{
- \luadirect{ekdosis.newscholar(\luastringN{#1},
- \luastringN{#2})}
+\ekvdefinekeys{ekd@scholar}{
+ store rawname = \rawname@value,
+ store forename = \forename@value,
+ store surname = \surname@value,
+ store addname = \addname@value,
+ store note = \note@value
}
+% \end{macrocode}
+% \begin{macro}{\DeclareScholar}
+% \changes{v1.1}{2020/11/04}{nows builds a list of persons}
+% \cs{DeclareScholar} is used to build a list of persons within the
+% |<listPerson>| element. It takes two mandatory arguments to specify
+% consecutively a unique identifier and the rendition to be used in
+% the apparatus criticus in print, and one optional argument used to
+% collect the name parts components and further items of information
+% from |key-value| \enquote*{named} arguments.
+% \begin{macrocode}
+\NewDocumentCommand{\DeclareScholar}{m m O{}}{%
+ \bgroup
+ \ekvset{ekd@scholar}{#3}
+ \luadirect{ekdosis.newscholar(
+ \luastringN{#1},
+ \luastringN{#2},
+ \luastringO{\rawname@value},
+ \luastringO{\forename@value},
+ \luastringO{\surname@value},
+ \luastringO{\addname@value},
+ \luastringO{\note@value})}
+ \egroup
+ }
\@onlypreamble\DeclareScholar
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\DeclareSource}
+% \changes{v1.1}{2020/11/04}{new command added}There is also a table in
+% which are collected data related to sources to be used in the
+% apparatus criticus. \cs{DeclareSource} is a preamble-only
+% command and takes two mandatory arguments: a unique id and a
+% shorthand (preferably a Bib\hologo{(La)TeX} label) to be used in
+% the apparatus criticus which can be extracted from a bibliographic
+% database.
+% \begin{macrocode}
+\NewDocumentCommand{\DeclareSource}{m m}{
+ \luadirect{ekdosis.newsource(\luastringN{#1},
+ \luastringN{#2})}
+}
+\@onlypreamble\DeclareSource
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\DeclareShorthand} \cs{DeclareShorthand} is a
% preamble-only command that can be used to record manuscript
% families or any kind of shorthand to be used to refer to
@@ -5118,7 +6230,7 @@ Sample text with a \textcolor{red}{word} in red.
% \begin{macro}{\getsiglum}
% \cs{getsiglum}\marg{csv list} takes a comma-separated list of
% declared ids by means of \cs{DeclareWitness}, \cs{DeclareHand},
-% \cs{DeclareShorthand} or \cs{DeclareScholar} and returns their
+% \cs{DeclareShorthand} or \cs{DeclareSource} and returns their
% respective renditions.
% \begin{macrocode}
\NewDocumentCommand{\getsiglum}{m}{%
@@ -5207,14 +6319,15 @@ Sample text with a \textcolor{red}{word} in red.
% \end{macrocode}
% \end{macro}
% \end{macro}
-% \begin{macro}{\TeXtoTEIPatt}
+% \begin{macro}{\TeXtoTEIPat}
+% \changes{v1.1}{2020/11/04}{renamed, formerly \cs{TeXtoTEIPatt}}
% Finally, the more flexible\---and more delicate to
-% handle\---\cs{TeXtoTEIPatt}\marg{\TeX\
+% handle\---\cs{TeXtoTEIPat}\marg{\TeX\
% pattern}\allowbreak\marg{\texttt{TEI} pattern} uses pattern matching
% to instruct \pkg{ekdosis} how to convert \hologo{(La)TeX} commands
% into \texttt{TEI} equivalents.
% \begin{macrocode}
-\NewDocumentCommand{\TeXtoTEIPatt}{m m}{%
+\NewDocumentCommand{\TeXtoTEIPat}{m m}{%
\luadirect{ekdosis.newpatttotag(\luastringN{#1}, \luastringN{#2})}
}
% \end{macrocode}
@@ -5230,22 +6343,22 @@ Sample text with a \textcolor{red}{word} in red.
\@onlypreamble\SetTEIFileName
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\SetxmlBibResource} This is a preamble-only command.
-% If a base name for a \texttt{TEI xml} compliant bibliographical
-% database file is provided with
-% \cs{SetxmlBibResource}\marg{basename}, \pkg{ekdosis} will use it
-% and insert formatted data in the back matter section of its own
-% \texttt{TEI xml} output file, as |<biblStruct>| elements within a
-% |<listBibl>| section.
+% \begin{macro}{\AddxmlBibResource} This is a preamble-only command.
+% If a base name (either suffixed with |.xml| or not) for a
+% \texttt{TEI xml}-compliant bibliographical database file be
+% provided with \cs{AddxmlBibResource}\marg{basename or name.xml},
+% \pkg{ekdosis} will use it and insert formatted data in the back
+% matter section of its own \texttt{TEI xml} output file, as
+% |<biblStruct>| elements within a |<listBibl>| section.
% \begin{macrocode}
-\NewDocumentCommand{\SetxmlBibResource}{m}{
- \luadirect{ekdosis.setxmlbibresource(\luastringN{#1})}
+\NewDocumentCommand{\AddxmlBibResource}{m}{
+ \luadirect{ekdosis.addxmlbibresource(\luastringN{#1})}
}
-\@onlypreamble\SetxmlBibResource
+\@onlypreamble\AddxmlBibResource
% \end{macrocode}
% \end{macro}
%
-%\paragraph{Multi-layer apparatuses}
+%\paragraph{Multiple-layer apparatuses}
% \pkg{ekdosis} must know if an entry is to be processed in a single-
% or multiple-layer context:---
% \begin{macrocode}
@@ -5302,6 +6415,23 @@ Sample text with a \textcolor{red}{word} in red.
}
\@onlypreamble\DeclareApparatus
% \end{macrocode}
+% \begin{macro}{\addentries}
+% \changes{v1.1}{2020/11/04}{modifies the number of accepted entries
+% on the current page.}
+% If |maxentries| be set for a given layer of critical notes,
+% \cs{addentries}\oarg{layer}\marg{n}, where \meta{n} is an integer,
+% can be used to add \meta{n} to\---or remove it from if \meta{n} be
+% negative\---the number of accepted entries on the current
+% page. \cs{addentries} operates on the default layer of notes, but
+% any other declared layer can be specified in the optional argument
+% of the command.
+% \begin{macrocode}
+\NewDocumentCommand{\addentries}{O{\ekdan@type} m}{%
+ \luadirect{ekdosis.addto_bagunits(\luastringO{#1}, \luastringN{#2})}%
+ \ignorespaces
+}
+% \end{macrocode}
+% \end{macro}
% \end{macro}
% Apparatus-related settings and functions. Some booleans to check if
% an apparatus should be inserted and what is the current environment.
@@ -5505,8 +6635,11 @@ Sample text with a \textcolor{red}{word} in red.
% \end{macrocode}
% \cs{add@@apparatus} inserts the apparatus block on a given page
% either in the footnote floating block or in a float of its own,
-% depending on the value set in the |layout| global option.
+% depending on the value set in the |layout| global option. As some
+% commands need to know whether they are called from inside the
+% apparatus criticus, a conditional is first defined.
% \begin{macrocode}
+\newif\ifekd@inside@app
\def\add@@apparatus{%
\if@pkg@parnotes\parnotes\else\fi%
\if@pkg@footins%
@@ -5517,8 +6650,10 @@ Sample text with a \textcolor{red}{word} in red.
\if@parnotesroman%
\renewcommand*{\theparnotemark}{\roman{parnotemark}}\else\fi%
\parnoteclear\else\fi%
+ \ekd@inside@apptrue
\footnotesize\apparatus\unless\ifekd@mapps\ekd@end@apparatus\fi%
- \if@pkg@parnotes\parnotes\parnotereset\else\fi%
+ \ekd@inside@appfalse
+ \if@pkg@parnotes\parnotes\parnotereset\else\fi
}%
\egroup%
\fi%
@@ -5528,7 +6663,9 @@ Sample text with a \textcolor{red}{word} in red.
\if@parnotesroman%
\renewcommand*{\theparnotemark}{\roman{parnotemark}}\else\fi%
\parnoteclear\else\fi%
+ \ekd@inside@apptrue
\ekd@appfontsize\apparatus\unless\ifekd@mapps\ekd@end@apparatus\fi%
+ \ekd@inside@appfalse
\if@pkg@parnotes\parnotes\parnotereset\else\fi%
}%
\fi%
@@ -5605,7 +6742,7 @@ Sample text with a \textcolor{red}{word} in red.
\NewDocumentCommand{\ekdatbegshihook}{}{%
\ifekd@pagelineation\resetlinenumber\fi
}
-\AtBeginShipout{\ekdatbegshihook}
+\AddToHook{shipout/before}{\ekdatbegshihook}
\newif\ifekd@elidednumbers
\ekvdefinekeys{ekd@lineation}{
choice lineation = {page = \ekd@pagelineationtrue,
@@ -5614,6 +6751,9 @@ Sample text with a \textcolor{red}{word} in red.
lineation=#1}{`lineation' must be either `page' or `document'.},
code modulonum = \chardef\c@linenumbermodulo#1\relax,
noval modulo = \modulolinenumbers,
+ code vmodulonum = \if@pkg@verse\poemlines{#1}\fi,
+ initial vmodulonum = 1,
+ noval vmodulo = \if@pkg@verse\poemlines{5}\fi,
choice numbers = {elided = \ekd@elidednumberstrue,
full = \ekd@elidednumbersfalse},
unknown-choice numbers = \PackageError{ekdosis}{unknown
@@ -5664,6 +6804,7 @@ Sample text with a \textcolor{red}{word} in red.
% \cs{rdg} or \cs{note}\meta{*}:---
% \begin{macrocode}
\NewDocumentCommand{\app}{O{} > { \TrimSpaces } +m}{%
+ \leavevmode
\begingroup
\ekvset{appnote}{#1}%
\ekd@isinapptrue%
@@ -5685,9 +6826,9 @@ Sample text with a \textcolor{red}{word} in red.
\def\current@ref@arg#1#2{{%\textdir TLT%
\unexpanded\expandafter{\ekd@refnumstyle}%
\ifnum%
- \getpagerefnumber{#1}
+ \pdf@strcmp{\getpagerefnumber{#1}}{\getpagerefnumber{#2}}
=
- \getpagerefnumber{#2}
+ 0
\ifnum%
\getrefnumber{#1}
=
@@ -5744,9 +6885,11 @@ Sample text with a \textcolor{red}{word} in red.
\def\current@ref{{%\textdir TLT%
\unexpanded\expandafter{\ekd@refnumstyle}%
\ifnum%
- \getpagerefnumber{\luadirect{tex.sprint(ekdosis.getlnlab())}-b}
+ \pdf@strcmp{%
+ \getpagerefnumber{\luadirect{tex.sprint(ekdosis.getlnlab())}-b}}%
+ {\getpagerefnumber{\luadirect{tex.sprint(ekdosis.getlnlab())}-e}}
=
- \getpagerefnumber{\luadirect{tex.sprint(ekdosis.getlnlab())}-e}
+ 0
\ifnum%
\getrefnumber{\luadirect{tex.sprint(ekdosis.getlnlab())}-b}
=
@@ -5801,6 +6944,8 @@ Sample text with a \textcolor{red}{word} in red.
% \begin{macrocode}
\ekvdefinekeys{lem}{
code wit = \def\ekdlr@wit{#1},
+ code source = \def\ekdlr@source{#1},
+ code resp = \def\ekdlr@resp{#1},
code alt = \def\ekdlr@alt{#1},
code pre = \def\ekdlr@pre{#1},
code post = \def\ekdlr@post{#1},
@@ -5814,6 +6959,8 @@ Sample text with a \textcolor{red}{word} in red.
}
\ekvdefinekeys{rdg}{
code wit = \def\ekdlr@wit{#1},
+ code source = \def\ekdlr@source{#1},
+ code resp = \def\ekdlr@resp{#1},
code alt = \def\ekdlr@alt{#1},
code pre = \def\ekdlr@pre{#1},
code post = \def\ekdlr@post{#1},
@@ -5823,6 +6970,20 @@ Sample text with a \textcolor{red}{word} in red.
bool nordg = \ifekdr@nordg
}
% \end{macrocode}
+% \begin{macro}{\rdgGrp}
+% \changes{v1.1}{2020/11/04}{new macro for grouping readings}
+% \cs{rdgGrp}\oarg{option}\marg{lemma and/or readings} may be used to
+% group readings so as to indicate subvariation in apparatus
+% entries. This command is expected inside \cs{app}|{}|, and takes as
+% argument readings to be grouped introduced by means of \cs{lem}
+% and/or \cs{rdg} commands. It further accepts |type| as an optional
+% key-value argument to describe the type of grouping.
+% \begin{macrocode}
+\NewDocumentCommand{\rdgGrp}{O{} > {\TrimSpaces } m}{%
+ \luadirect{tex.sprint(ekdosis.removesp(\luastringN{#2}))}%
+}
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\lem}
% \cs{lem}\oarg{options}\marg{lemma text} inserts \meta{lemma text}
% both in the edition text and in the apparatus criticus by default,
@@ -5882,6 +7043,8 @@ Sample text with a \textcolor{red}{word} in red.
\fi
\ifdefined\ekdlr@postwit%
\space\unexpanded\expandafter{\ekdlr@postwit}\else\fi
+ \ifdefined\ekdlr@resp\space\getsiglum{\ekdlr@resp}\else\fi
+ \ifdefined\ekdlr@source\space\getsiglum{\ekdlr@source}\else\fi
\ifdefined\ekdlr@wit\space\getsiglum{\ekdlr@wit}\else\fi
\ifdefined\ekdlr@prewit%
\space\unexpanded\expandafter{\ekdlr@prewit}\space\else\fi
@@ -5919,6 +7082,8 @@ Sample text with a \textcolor{red}{word} in red.
\ifdefined\ekdlr@prewit%
\space\unexpanded\expandafter{\ekdlr@prewit}\space\else\fi
\ifdefined\ekdlr@wit\space\getsiglum{\ekdlr@wit}\else\fi
+ \ifdefined\ekdlr@source\space\getsiglum{\ekdlr@source}\else\fi
+ \ifdefined\ekdlr@resp\space\getsiglum{\ekdlr@resp}\else\fi
\ifdefined\ekdlr@postwit%
\space\unexpanded\expandafter{\ekdlr@postwit}\else\fi
\ifekdl@nosep\else\unexpanded\expandafter{\ekdl@sep}\fi
@@ -5972,6 +7137,8 @@ Sample text with a \textcolor{red}{word} in red.
\fi
\ifdefined\ekdlr@postwit%
\space\unexpanded\expandafter{\ekdlr@postwit}\else\fi
+ \ifdefined\ekdlr@resp\space\getsiglum{\ekdlr@resp}\else\fi
+ \ifdefined\ekdlr@source\space\getsiglum{\ekdlr@source}\else\fi
\ifdefined\ekdlr@wit\space\getsiglum{\ekdlr@wit}\else\fi
\ifdefined\ekdlr@prewit%
\space\unexpanded\expandafter{\ekdlr@prewit}\space\else\fi
@@ -6000,6 +7167,8 @@ Sample text with a \textcolor{red}{word} in red.
\ifdefined\ekdlr@prewit%
\space\unexpanded\expandafter{\ekdlr@prewit}\space\else\fi
\ifdefined\ekdlr@wit\space\getsiglum{\ekdlr@wit}\else\fi
+ \ifdefined\ekdlr@source\space\getsiglum{\ekdlr@source}\else\fi
+ \ifdefined\ekdlr@resp\space\getsiglum{\ekdlr@resp}\else\fi
\ifdefined\ekdlr@postwit%
\space\unexpanded\expandafter{\ekdlr@postwit}\else\fi
}%
@@ -6037,7 +7206,7 @@ Sample text with a \textcolor{red}{word} in red.
% specified; otherwise \pkg{ekdosis} will issue an error message.
% \begin{macrocode}
\NewDocumentCommand{\note@noapp}{O{} +m}{%
- \null
+ \leavevmode
\bgroup%
\ekvset{note}{#1}%
\stepcounter{ekd@lab}%
@@ -6128,10 +7297,10 @@ Sample text with a \textcolor{red}{word} in red.
\bgroup%
\ekvset{ekd@note}{#1}%
\edef\note@contents{%
- \ekvifdefinedNoVal{note}{pre}{}{%
+ \ekvifdefinedNoVal{ekd@note}{pre}{}{%
\unexpanded\expandafter{\pre@value}}%
{\unexpanded{#2}}%
- \ekvifdefinedNoVal{note}{post}{}{%
+ \ekvifdefinedNoVal{ekd@note}{post}{}{%
\unexpanded\expandafter{\post@value}}%
}%
\append@app{\note@contents}%
@@ -6142,10 +7311,10 @@ Sample text with a \textcolor{red}{word} in red.
\bgroup%
\ekvset{ekd@note}{#1}%
\edef\note@contents{%
- \ekvifdefinedNoVal{note}{pre}{}{%
+ \ekvifdefinedNoVal{ekd@note}{pre}{}{%
\unexpanded\expandafter{\pre@value}}%
\unskip\noexpand\parnote{\unexpanded{#2}}%
- \ekvifdefinedNoVal{note}{post}{}{%
+ \ekvifdefinedNoVal{ekd@note}{post}{}{%
\unexpanded\expandafter{\post@value}}%
}%
\append@app{\note@contents}%
@@ -6186,6 +7355,101 @@ Sample text with a \textcolor{red}{word} in red.
}
% \end{macrocode}
% \end{macro}
+% \paragraph{Emendations and Conjectures}
+% Here follows the |key-value| options to be used by
+% \cs{SetCritSymbols} below:---
+% \begin{macrocode}
+\ekvdefinekeys{ekd@corr}{
+ store suppbegin = \suppb@value,
+ store suppend = \suppe@value,
+ store delbegin = \delb@value,
+ store delend = \dele@value,
+ store sicbegin = \sicb@value,
+ store sicend = \sice@value,
+ store gapmark = \gapm@value,
+ initial suppbegin = \ifbool{al@rlmode}{>}{<},
+ initial suppend = \ifbool{al@rlmode}{<}{>},
+ initial delbegin = \ifbool{al@rlmode}{\}}{\{},
+ initial delend = \ifbool{al@rlmode}{\{}{\}},
+ initial sicbegin = \dag,
+ initial sicend = \dag,
+ initial gapmark = ***
+}
+% \end{macrocode}
+% \begin{macro}{\supplied}
+% \changes{v1.1}{2020/11/04}{new macro for editorial additions}
+% \cs{supplied}\marg{text} takes as mandatory argument the text added
+% or supplied by conjecture.
+% \begin{macrocode}
+\NewDocumentCommand{\supplied}{m}{%
+ \ifekd@inside@app
+ #1%
+ \else
+ \suppb@value #1\suppe@value
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\surplus}
+% \changes{v1.1}{2020/11/04}{new macro for editorial deletions}
+% \cs{surplus}\marg{text} takes as mandatory argument the text
+% considered by the editor to be inauthentic, but nevertheless
+% retained between braces in the edition text as it is transmitted by
+% all witnesses.
+% \begin{macrocode}
+\NewDocumentCommand{\surplus}{m}{%
+ \ifekd@inside@app
+ #1%
+ \else
+ \delb@value #1\dele@value
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\sic}
+% \changes{v1.1}{2020/11/04}{new macro for text deemed to be not
+% understandable}
+% \cs{sic}\marg{text} takes as mandatory argument the text deemed by
+% the editor to be readable but not understandable. \cs{sic} insert
+% \meta{text} between cruces while \cs{sic*} prints only one crux
+% before \meta{text}.
+% \begin{macrocode}
+\NewDocumentCommand{\sic}{s m}{%
+ \ifekd@inside@app
+ #2%
+ \else
+ \IfBooleanTF{#1}
+ {\sicb@value #2}
+ {\sicb@value #2\sice@value}%
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\gap}
+% \changes{v1.1}{2020/11/04}{new macro for lacunae}
+% \cs{gap}\marg{options} indicates that some amount of text has fallen
+% away from the entire tradition. It takes as mandatory argument a
+% comma-separated list of options that can be used to further specify
+% the reason for omission, the unit of measurement, the quantity and
+% extent.
+% \begin{macrocode}
+\NewDocumentCommand{\gap}{m}{%
+ \gapm@value
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\SetCritSymbols}
+% \changes{v1.1}{2020/11/04}{new macro to set the symbols to be
+% used to mark the corrections} \cs{SetCritSymbols}\marg{csv list of
+% options} is used to change the symbols that \pkg{ekdosis} uses by
+% default for representing emendations, lacunae, omissions, gaps and
+% editorial deletions.
+% \begin{macrocode}
+\NewDocumentCommand{\SetCritSymbols}{m}{
+ \ekvset{ekd@corr}{#1}
+}
+% \end{macrocode}
+% \end{macro}
% \cs{apparatus} is used internally by \pkg{ekdosis} to print the
% apparatus at the bottom of pages. Therefore, it is not documented,
% but this may change in the future for it will be possible to have
@@ -6457,12 +7721,45 @@ Sample text with a \textcolor{red}{word} in red.
}
% \end{macrocode}
% \end{macro}
-% A very basic and provisional implementation of poetry lines
-% follows:---
+% \begin{environment}{ekdverse}
+% \env{ekdverse} provides an implementation of poetry lines. It is
+% set to use either the \pkg{lineno} or the \pkg{verse} package
+% depending on the value that is passed to the global option
+% |verse|:---
% \begin{macrocode}
+\if@pkg@verse
+\verselinenumfont{\normalfont\footnotesize}
+\setcounter{poemline}{1}
+\NewDocumentEnvironment{ekdverse}{O{\linewidth}}{%
+ \nolinenumbers
+ \let\linelabel\label
+ \stepcounter{verse@envctr}%
+ \addtocounter{poemline}{-1}\refstepcounter{poemline}%
+ \setcounter{vslineno}{1}%
+ \let\\=\@vscentercr
+ \list{}{\itemsep \z@
+ \itemindent -\vindent%
+ \listparindent\itemindent
+ \parsep \stanzaskip
+ \setlength{\itemsep}{0pt}%
+ \setlength{\topsep}{0pt}%
+ \setlength{\partopsep}{0pt}%
+ \ifdim #1 < \linewidth
+ \rightmargin \z@
+ \setlength{\leftmargin}{\linewidth}%
+ \addtolength{\leftmargin}{-#1}%
+ \addtolength{\leftmargin}{-0.5\leftmargin}%
+ \else
+ \rightmargin \leftmargin
+ \fi
+ \addtolength{\leftmargin}{\vindent}}%
+ \item[]%
+}
+{\endlist}
+\else
\newlength{\ekdverseindentlength}
\setlength{\ekdverseindentlength}{\parindent}
-\newenvironment*{ekdverse}[1][\ekdverseindentlength]{
+\NewDocumentEnvironment{ekdverse}{O{\ekdverseindentlength}}{
\begin{list}{}{%
\setlength{\leftmargin}{#1}
\setlength{\itemsep}{0pt}
@@ -6471,7 +7768,9 @@ Sample text with a \textcolor{red}{word} in red.
}
\item[]
}{\end{list}}
+\fi
% \end{macrocode}
+% \end{environment}
% \begin{environment}{ekdpar}
% When |autopar| is set to |false| by means of \cs{SetTEIxmlExport},
% \env{ekdpar}\---or any other environment set to be inserted within
@@ -6560,7 +7859,8 @@ local citecmds = lpeg.Cs(lpeg.P("icite")
local next = next
-- General
-xmlids = {}
+local xmlids = {}
+table.insert(xmlids, {xmlid = "scholars"} )
local function xmlidfound(element)
for i = 1,#xmlids do
@@ -6582,9 +7882,12 @@ local function checkxmlid(str)
end
-- Witnesses
-listWit = {}
-idsRend = {}
-shorthands = {}
+local listWit = {}
+-- Persons/Scholars
+local listPerson = {}
+
+local idsRend = {}
+local shorthands = {}
local function isfound(table, value)
for i = 1,#table do
@@ -6727,14 +8030,67 @@ function ekdosis.newshorthand(id, rend, xmlids)
return true
end
+function ekdosis.newscholar(id,
+ siglum,
+ rawname,
+ Forename,
+ Surname,
+ AddName,
+ Note)
+ if xmlidfound(id)
+ then
+ tex.print("\\unexpanded{\\PackageWarning{ekdosis}{\""
+ ..id..
+ "\" already exists as an xml:id. "
+ ..
+ "Please pick another id.}}")
+ elseif not checkxmlid(id)
+ then
+ tex.print("\\unexpanded{\\PackageWarning{ekdosis}{\""
+ ..id..
+ "\" is not a valid xml:id. \\MessageBreak "
+ ..
+ "Please pick another id.}}")
+ else
+ table.insert(xmlids, {xmlid = id})
+ table.sort(xmlids, function(a ,b) return(#a.xmlid > #b.xmlid) end)
+ table.insert(idsRend, {xmlid = id, abbr = siglum})
+ table.sort(idsRend, function(a ,b) return(#a.xmlid > #b.xmlid) end)
+ if rawname ~= ""
+ then
+ table.insert(listPerson, {xmlid = id,
+ abbr = siglum,
+ note = Note,
+ persName = {
+ name = rawname}
+ })
+ else
+ table.insert(listPerson, {xmlid = id,
+ abbr = siglum,
+ note = Note,
+ persName = {
+ forename = Forename,
+ surname = Surname,
+ addName = AddName}
+ })
+ end
+ end
+ return true
+end
+
local xmlbibresource = nil
-function ekdosis.setxmlbibresource(str)
- xmlbibresource = str..".xml"
+function ekdosis.addxmlbibresource(str)
+ if string.find(str, "%.xml$")
+ then
+ xmlbibresource = str
+ else
+ xmlbibresource = str..".xml"
+ end
return true
end
-function ekdosis.newscholar(id, siglum)
+function ekdosis.newsource(id, siglum)
if xmlidfound(id)
then
tex.print("\\unexpanded{\\PackageWarning{ekdosis}{\""
@@ -6796,6 +8152,7 @@ local cmdtotags = {
{a="LRfootnote", b="note", c=" place=\"bottom\""},
{a="RLfootnote", b="note", c=" place=\"bottom\""},
{a="enquote *", b="quote", c=""},
+ {a="marginpar", b="note", c=" place=\"margin\""},
{a="footnote", b="note", c=" place=\"bottom\""},
{a="enquote", b="quote", c=""},
{a="txtrans", b="s", c=" xml:lang=\"ar-Latn\" type=\"transliterated\""},
@@ -6805,15 +8162,21 @@ local cmdtotags = {
{a="textsf", b="hi", c=" rend=\"sf\""},
{a="arbup", b="hi", c=" rend=\"sup\""},
{a="txarb", b="s", c=" xml:lang=\"arb\""},
- {a="mbox", b="", c=""},
{a="arb", b="foreign",
c=" xml:lang=\"ar-Latn\" type=\"transliterated\" subtype=\"arabtex\""}
}
local texpatttotags = {
+ {a="\\addentries%s+%[(.-)%]{(.-)}", b=""},
+ {a="\\addentries%s+{(.-)}", b=""},
+ {a="\\setverselinenums%s+{(.-)}{(.-)}", b=""},
+ {a="\\resetlinenumber%s+%[(.-)%]", b=""},
+ {a="\\resetlinenumber%s+", b=""},
+ {a="\\poemlines%s+{(.-)}", b=""},
{a="\\pagebreak%s+%[[1-4]%]", b=""},
{a="\\pagebreak%s+", b=""},
{a="\\altrfont%s+", b=""},
+ {a="\\mbox%s+{(.-)}", b="%1"},
{a="\\LR%s+{(.-)}", b="%1"},
{a="\\RL%s+{(.-)}", b="%1"}
}
@@ -6890,6 +8253,10 @@ end
-- Get values of attributes
local function get_attr_value(str, attr)
str = str..","
+ str = string.gsub(str, "%b{}", function(body)
+ body = string.gsub(body, attr, attr.."@ekd")
+ return string.format("%s", body)
+ end)
local attrval = string.match(str, "%f[%w]"..attr.."%s?%=%s?%b{}")
or string.match(str, "%f[%w]"..attr.."%s?%=%s?.-%,")
or ""
@@ -6898,6 +8265,7 @@ local function get_attr_value(str, attr)
return string.format("%s", bbraces)
end)
attrval = string.gsub(attrval, attr.."%s?%=%s?(.-)%s?%,", "%1")
+ str = string.gsub(str, attr.."@ekd", attr)
return attrval
end
@@ -6922,16 +8290,21 @@ local function note_totei(str)
if teitype ~= "" then teitype = " type=\""..teitype.."\"" else end
right = get_attr_value(opt, "labelb")
left = get_attr_value(opt, "labele")
- if left ~= ""
- then
- return string.format(
- "<%s%s target=\"#range(right(%s),left(%s))\">%s</%s><anchor xml:id=\"%s\"/>",
- cmd, teitype, right, left, arg, cmd, right)
- elseif left == ""
+ if right == ""
then
- return string.format(
- "<%s%s target=\"#right(%s)\">%s</%s><anchor xml:id=\"%s\"/>",
- cmd, teitype, right, arg, cmd, right)
+ return string.format("<%s>%s</%s>", cmd, arg, cmd)
+ else
+ if left ~= ""
+ then
+ return string.format(
+ "<%s%s target=\"#range(right(%s),left(%s))\">%s</%s><anchor xml:id=\"%s\"/>",
+ cmd, teitype, right, left, arg, cmd, right)
+ elseif left == ""
+ then
+ return string.format(
+ "<%s%s target=\"#right(%s)\">%s</%s><anchor xml:id=\"%s\"/>",
+ cmd, teitype, right, arg, cmd, right)
+ end
end
end)
return str
@@ -6956,6 +8329,31 @@ local function app_totei(str)
return str
end
+local function rdgGrp_totei(str)
+ str = gsub(str,
+ dblbkslash *
+ lpeg.Cs("rdgGrp") *
+ spcenc^-1 *
+ bsqbrackets *
+ bcbraces *
+ spcenc^-1,
+ function(bkslash, cmd, opt, arg)
+ opt = string.sub(opt, 2, -2)
+ arg = string.sub(arg, 2, -2)
+ teitype = get_attr_value(opt, "type")
+ if teitype ~= "" then teitype = " type=\""..teitype.."\"" else end
+ if opt == ""
+ then
+ return rdgGrp_totei(string.format("<%s>%s</%s>",
+ cmd, arg, cmd))
+ else
+ return rdgGrp_totei(string.format("<%s%s>%s</%s>",
+ cmd, teitype, arg, cmd))
+ end
+ end)
+ return str
+end
+
local function lem_rdg_totei(str)
str = gsub(str,
spcenc^-1 *
@@ -6972,6 +8370,10 @@ local function lem_rdg_totei(str)
--
teiwit = get_attr_value(opt, "wit")
if teiwit ~= "" then teiwit = " wit=\""..ekdosis.getsiglum(teiwit, "tei").."\"" else end
+ teisource = get_attr_value(opt, "source")
+ if teisource ~= "" then teisource = " source=\""..ekdosis.getsiglum(teisource, "tei").."\"" else end
+ teiresp = get_attr_value(opt, "resp")
+ if teiresp ~= "" then teiresp = " resp=\""..ekdosis.getsiglum(teiresp, "tei").."\"" else end
teitype = get_attr_value(opt, "type")
if teitype ~= "" then teitype = " type=\""..teitype.."\"" else end
--
@@ -6981,8 +8383,8 @@ local function lem_rdg_totei(str)
cmd, arg, cmd))
else
-- opt = ekdosis.getsiglum(opt, "tei")
- return lem_rdg_totei(string.format("<%s%s%s>%s</%s>",
- cmd, teiwit, teitype, arg, cmd))
+ return lem_rdg_totei(string.format("<%s%s%s%s%s>%s</%s>",
+ cmd, teiwit, teisource, teiresp, teitype, arg, cmd))
end
end)
str = gsub(str, spcenc^-0 * dblbkslash * lemrdg * spcenc^-1 * bcbraces * spcenc^-1,
@@ -7000,7 +8402,7 @@ end
local function linestotei(str)
-- str = "\n<l>"..str
- str = string.gsub(str, "^%s?(.-)%s?$", "\n<l>%1</l>\n")
+ str = string.gsub(str, "^%s?(.-)\\\\[%!%*]?%s?$", "\n<l>%1</l>\n")
-- str = gsub(str, endpoem, "</l>\n")
str = gsub(str, poemline * spcenc^-1 * lpeg.P("&gt;"), "\n<lb/>")
str = gsub(str, poemline * spcenc^-1, "</l>\n<l>")
@@ -7087,7 +8489,7 @@ local function icitetotei(str)
* bsqbrackets
* bsqbrackets
* bcbraces
- * bsqbrackets^-1,
+ * (bsqbrackets + bcbraces)^-1,
function(cmd, pre, post, body, opt)
pre = string.sub(pre, 2, -2)
post = string.sub(post, 2, -2)
@@ -7108,7 +8510,7 @@ local function icitetotei(str)
* spcenc^-1
* bsqbrackets
* bcbraces
- * bsqbrackets^-1,
+ * (bsqbrackets + bcbraces)^-1,
function(cmd, post, body, opt)
post = string.sub(post, 2, -2)
body = string.sub(body, 2, -2)
@@ -7127,7 +8529,7 @@ local function icitetotei(str)
* citecmds
* spcenc^-1
* bcbraces
- * bsqbrackets^-1,
+ * (bsqbrackets + bcbraces)^-1,
function(cmd, body, opt)
body = string.sub(body, 2, -2)
if not checkxmlid(body)
@@ -7179,6 +8581,19 @@ local function cmdtotei(str)
return string.format("<ref target=\"%s\">%s</ref>",
teisiglum, printsiglum)
end)
+ str = string.gsub(str, "\\(gap)%s?(%b{})",
+ function(cmd, body)
+ body = string.sub(body, 2, -2)
+ teireason = get_attr_value(body, "reason")
+ if teireason ~= "" then teireason = " reason=\""..teireason.."\"" else end
+ teiunit = get_attr_value(body, "unit")
+ if teiunit ~= "" then teiunit = " unit=\""..teiunit.."\"" else end
+ teiquantity = get_attr_value(body, "quantity")
+ if teiquantity ~= "" then teiquantity = " quantity=\""..teiquantity.."\"" else end
+ teiextent = get_attr_value(body, "extent")
+ if teiextent ~= "" then teiextent = " extent=\""..teiextent.."\"" else end
+ return string.format("<gap%s%s%s%s/>", teireason, teiunit, teiquantity, teiextent)
+ end)
str = gsub(str, lpeg.P("\\") * labelrefcmds * spcenc^-1 * bcbraces,
function(cmd, body)
body = string.sub(body, 2, -2)
@@ -7542,6 +8957,7 @@ local function textotei(str)
str = texpatttotei(str)
str = note_totei(str)
str = app_totei(str)
+ str = rdgGrp_totei(str)
str = lem_rdg_totei(str)
str = relocate_notes(str)
str = versetotei(str)
@@ -7587,68 +9003,113 @@ function ekdosis.openteistream()
f:write("<distributor><!-- Distributor name --></distributor>", "\n")
f:write("</publicationStmt>", "\n")
f:write("<sourceDesc>", "\n")
- f:write("<listWit>", "\n")
- for i = 1,#listWit do
- f:write('<witness xml:id=\"', listWit[i].xmlid, "\">", "\n")
- f:write('<abbr type="siglum">', textotei(listWit[i].abbr), "</abbr>", "\n")
- f:write(textotei(listWit[i].detailsDesc), "\n")
- f:write("<msDesc>", "\n")
- if listWit[i].msIdentifier.settlement == ""
- and listWit[i].msIdentifier.institution == ""
- and listWit[i].msIdentifier.repository == ""
- and listWit[i].msIdentifier.collection == ""
- and listWit[i].msIdentifier.idno == ""
- and listWit[i].msIdentifier.msName == ""
+ if next(listWit) == nil and next(listPerson) == nil
+ then
+ f:write("<p>No source, born digital</p>", "\n")
+ else
+ if next(listWit) ~= nil
then
- f:write("<msIdentifier/>", "\n")
- else
- f:write("<msIdentifier>", "\n")
- if listWit[i].msIdentifier.settlement ~= "" then
- f:write("<settlement>", textotei(listWit[i].msIdentifier.settlement), "</settlement>", "\n")
+ f:write("<listWit>", "\n")
+ for i = 1,#listWit do
+ f:write('<witness xml:id=\"', listWit[i].xmlid, "\">", "\n")
+ f:write('<abbr type="siglum">', textotei(listWit[i].abbr), "</abbr>", "\n")
+ f:write(textotei(listWit[i].detailsDesc), "\n")
+ f:write("<msDesc>", "\n")
+ if listWit[i].msIdentifier.settlement == ""
+ and listWit[i].msIdentifier.institution == ""
+ and listWit[i].msIdentifier.repository == ""
+ and listWit[i].msIdentifier.collection == ""
+ and listWit[i].msIdentifier.idno == ""
+ and listWit[i].msIdentifier.msName == ""
+ then
+ f:write("<msIdentifier/>", "\n")
+ else
+ f:write("<msIdentifier>", "\n")
+ if listWit[i].msIdentifier.settlement ~= "" then
+ f:write("<settlement>", textotei(listWit[i].msIdentifier.settlement), "</settlement>", "\n")
else end
- if listWit[i].msIdentifier.institution ~= "" then
- f:write("<institution>", textotei(listWit[i].msIdentifier.institution), "</institution>", "\n")
+ if listWit[i].msIdentifier.institution ~= "" then
+ f:write("<institution>", textotei(listWit[i].msIdentifier.institution), "</institution>", "\n")
else end
- if listWit[i].msIdentifier.repository ~= "" then
- f:write("<repository>", textotei(listWit[i].msIdentifier.repository), "</repository>", "\n")
+ if listWit[i].msIdentifier.repository ~= "" then
+ f:write("<repository>", textotei(listWit[i].msIdentifier.repository), "</repository>", "\n")
else end
- if listWit[i].msIdentifier.collection ~= "" then
- f:write("<collection>", textotei(listWit[i].msIdentifier.collection), "</collection>", "\n")
+ if listWit[i].msIdentifier.collection ~= "" then
+ f:write("<collection>", textotei(listWit[i].msIdentifier.collection), "</collection>", "\n")
else end
- if listWit[i].msIdentifier.idno ~= "" then
- f:write("<idno>", textotei(listWit[i].msIdentifier.idno), "</idno>", "\n")
+ if listWit[i].msIdentifier.idno ~= "" then
+ f:write("<idno>", textotei(listWit[i].msIdentifier.idno), "</idno>", "\n")
else end
- if listWit[i].msIdentifier.msName ~= "" then
- f:write("<msName>", textotei(listWit[i].msIdentifier.msName), "</msName>", "\n")
+ if listWit[i].msIdentifier.msName ~= "" then
+ f:write("<msName>", textotei(listWit[i].msIdentifier.msName), "</msName>", "\n")
else end
- f:write("</msIdentifier>", "\n")
+ f:write("</msIdentifier>", "\n")
+ end
+ if listWit[i].handDesc ~= nil then
+ f:write("<physDesc>", "\n")
+ f:write("<handDesc hands=\"", #listWit[i].handDesc, "\">", "\n")
+ local j = 1
+ while listWit[i].handDesc[j]
+ do
+ f:write("<handNote xml:id=\"", listWit[i].handDesc[j].xmlid, "\">", "\n")
+ f:write('<abbr type="siglum">', textotei(listWit[i].handDesc[j].abbr), "</abbr>", "\n")
+ f:write("<p>", textotei(listWit[i].handDesc[j].detailsDesc), "</p>", "\n")
+ f:write("</handNote>", "\n")
+ j = j + 1
+ end
+ f:write("</handDesc>", "\n")
+ f:write("</physDesc>", "\n")
+ else end
+ if listWit[i].history ~= nil then
+ f:write("<history>", "\n")
+ f:write("<origin>", "\n")
+ f:write("<origDate>", textotei(listWit[i].history.origin.origDate), "</origDate>", "\n")
+ f:write("</origin>", "\n")
+ f:write("</history>", "\n")
+ end
+ f:write("</msDesc>", "\n")
+ f:write("</witness>", "\n")
+ end
+ f:write("</listWit>", "\n")
end
- if listWit[i].handDesc ~= nil then
- f:write("<physDesc>", "\n")
- f:write("<handDesc hands=\"", #listWit[i].handDesc, "\">", "\n")
- local j = 1
- while listWit[i].handDesc[j]
- do
- f:write("<handNote xml:id=\"", listWit[i].handDesc[j].xmlid, "\">", "\n")
- f:write('<abbr type="siglum">', textotei(listWit[i].handDesc[j].abbr), "</abbr>", "\n")
- f:write("<p>", textotei(listWit[i].handDesc[j].detailsDesc), "</p>", "\n")
- f:write("</handNote>", "\n")
- j = j + 1
+ if next(listPerson) ~= nil
+ then
+ f:write("<listPerson xml:id=\"scholars\">", "\n")
+ for i = 1,#listPerson do
+ f:write('<person xml:id=\"', listPerson[i].xmlid, "\">", "\n")
+ f:write('<persName>', "\n")
+ f:write('<abbr type="siglum">', textotei(listPerson[i].abbr), "</abbr>", "\n")
+ if listPerson[i].persName.name ~= nil
+ then
+ f:write(textotei(listPerson[i].persName.name))
+ else
+ if listPerson[i].persName.forename ~= ""
+ then
+ f:write("<forename>", textotei(listPerson[i].persName.forename), "</forename>", "\n")
+ else
+ f:write("<forename><!-- forename --></forename>", "\n")
+ end
+ if textotei(listPerson[i].persName.surname) ~= ""
+ then
+ f:write("<surname>", textotei(listPerson[i].persName.surname), "</surname>", "\n")
+ else
+ f:write("<surname><!-- surname --></surname>", "\n")
+ end
+ if textotei(listPerson[i].persName.addName) ~= ""
+ then
+ f:write("<addName>", textotei(listPerson[i].persName.addName), "</addName>", "\n")
+ end
+ end
+ if listPerson[i].note ~= ""
+ then
+ f:write("<note>", textotei(listPerson[i].note), "</note>", "\n")
+ end
+ f:write('</persName>', "\n")
+ f:write('</person>', "\n")
end
- f:write("</handDesc>", "\n")
- f:write("</physDesc>", "\n")
- else end
- if listWit[i].history ~= nil then
- f:write("<history>", "\n")
- f:write("<origin>", "\n")
- f:write("<origDate>", textotei(listWit[i].history.origin.origDate), "</origDate>", "\n")
- f:write("</origin>", "\n")
- f:write("</history>", "\n")
+ f:write("</listPerson>", "\n")
end
- f:write("</msDesc>", "\n")
- f:write("</witness>", "\n")
end
- f:write("</listWit>", "\n")
f:write("</sourceDesc>", "\n")
f:write("</fileDesc>", "\n")
f:write("<encodingDesc>", "\n")
@@ -8052,10 +9513,10 @@ function ekdosis.get_bagunits(teitype)
return bagunits[teitype]
end
-local function getapplimit(str)
+local function getapplimit(teitype)
for i = 1,#apparatuses
do
- if apparatuses[i].a == str then
+ if apparatuses[i].a == teitype then
limitfound = apparatuses[i].limit
break
end
@@ -8084,6 +9545,14 @@ function ekdosis.limit_bagunits(teitype)
end
end
+function ekdosis.addto_bagunits(teitype, n)
+ if tonumber(getapplimit(teitype)) ~= 0
+ then
+ n = tonumber(n)
+ bagunits[teitype] = bagunits[teitype] - n
+ end
+end
+
function ekdosis.increment_bagunits(teitype)
bagunits[teitype] = (bagunits[teitype] or 0) + 1
end
diff --git a/macros/luatex/latex/ekdosis/ekdosis.pdf b/macros/luatex/latex/ekdosis/ekdosis.pdf
index a13dd5b571..588e219534 100644
--- a/macros/luatex/latex/ekdosis/ekdosis.pdf
+++ b/macros/luatex/latex/ekdosis/ekdosis.pdf
Binary files differ
diff --git a/macros/luatex/latex/ekdosis/samples/Caesar_BG-6-13-1.pdf b/macros/luatex/latex/ekdosis/samples/Caesar_BG-6-13-1.pdf
index 3e394efb86..4ffd23516b 100644
--- a/macros/luatex/latex/ekdosis/samples/Caesar_BG-6-13-1.pdf
+++ b/macros/luatex/latex/ekdosis/samples/Caesar_BG-6-13-1.pdf
Binary files differ
diff --git a/systems/texlive/tlnet/tlpkg/installer/config.guess b/systems/texlive/tlnet/tlpkg/installer/config.guess
index 12dd5b4245..9aff91cfd0 100755
--- a/systems/texlive/tlnet/tlpkg/installer/config.guess
+++ b/systems/texlive/tlnet/tlpkg/installer/config.guess
@@ -2,7 +2,7 @@
# Attempt to guess a canonical system name.
# Copyright 1992-2020 Free Software Foundation, Inc.
-timestamp='2020-10-22'
+timestamp='2020-08-17'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -150,15 +150,17 @@ Linux|GNU|GNU/*)
#elif defined(__dietlibc__)
LIBC=dietlibc
#else
- #include <stdarg.h>
- #ifdef __DEFINED_va_list
- LIBC=musl
- #else
LIBC=gnu
#endif
- #endif
EOF
eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
+
+ # If ldd exists, use it to detect musl libc.
+ if command -v ldd >/dev/null && \
+ ldd --version 2>&1 | grep -q ^musl
+ then
+ LIBC=musl
+ fi
;;
esac
@@ -182,7 +184,6 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
"/usr/sbin/$sysctl" 2>/dev/null || \
echo unknown)`
case "$UNAME_MACHINE_ARCH" in
- aarch64eb) machine=aarch64_be-unknown ;;
armeb) machine=armeb-unknown ;;
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index 773a9aff18..c8d65e1e87 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -45,7 +45,10 @@ $mirrors = {
'https://ftp.yz.yamagata-u.ac.jp/pub/CTAN/' => 1,
},
'Korea' => {
+ 'http://ftp.kaist.ac.kr/pub/tex-archive/' => 1,
+ 'http://ftp.ktug.org/tex-archive/' => 1,
'http://mirror.kakao.com/CTAN/' => 1,
+ 'https://cran.asia/tex/' => 1,
'https://ftp.harukasan.org/CTAN/' => 1,
'https://mirror.navercorp.com/CTAN/' => 1,
'https://mirror.yongbok.net/ctan/' => 1,
@@ -79,7 +82,6 @@ $mirrors = {
'https://ctan.gutenberg.eu.org/' => 1,
'https://ctan.tetaneutral.net/' => 1,
'https://distrib-coffee.ipsl.jussieu.fr/pub/mirrors/ctan/' => 1,
- 'https://mirror.ibcp.fr/pub/CTAN/' => 1,
'https://mirrors.chevalier.io/CTAN/' => 1,
'https://mirrors.ircam.fr/pub/CTAN/' => 1,
},
@@ -102,6 +104,7 @@ $mirrors = {
'https://mirror.clientvps.com/CTAN/' => 1,
'https://mirror.dogado.de/tex-archive/' => 1,
'https://mirror.informatik.hs-fulda.de/tex-archive/' => 1,
+ 'https://packages.oth-regensburg.de/ctan/' => 1,
},
'Greece' => {
'http://ftp.ntua.gr/mirror/ctan/' => 1,
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 626b75bc60..267df50dc1 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/2020
-depend revision/56842
+depend revision/56849
name 00texlive.image
category TLCore
@@ -4292,7 +4292,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
name 00texlive.installer
category TLCore
-revision 56826
+revision 56849
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
@@ -121307,7 +121307,7 @@ catalogue-version 1.3
name frenchmath
category Package
-revision 51192
+revision 56847
shortdesc Typesetting mathematics according to French rules
relocated 1
longdesc The package provides: capital letters in upright shape for
@@ -121316,24 +121316,24 @@ longdesc correct spacing after commas and before a semicolon in math
longdesc mode, some useful macros and aliases for symbols used in
longdesc France: \infeg, \supeg, \paral, ... several macros for writing
longdesc french operator names like pgcd, ppcm, Card, rg, Vect, ...
-containersize 1808
-containerchecksum 1102ab998250a36d6d93aac7c673628eacf8b1abd203d91989922599ec6dae58439ec2700e40eade5b0ee1666a68a30d94f89d3a225082a6273ccd63f61fb586
-doccontainersize 477204
-doccontainerchecksum 622cbf8f1149c53f240036e2cf2d6245d6870ea24f9af6e1883e7fed2f1001f38227176156e8a33c9d9c07414b1accf1a924fbf7248e91903d764fb85d277bdb
+containersize 1872
+containerchecksum 9f05e3391576e8f37d00852a4d5c9c961369f0fa838d6942594e8b729391d41080d1bca55b258c24ed784788f5b52bb5f1ad4e0d33303676a2811c3804740d09
+doccontainersize 478856
+doccontainerchecksum d1e39e879de7f2cc5307970b7bf2c5535aeafc67e4d79b01d217e33f32d75c482716b07539c7f58981cb581fda61d5310f9f4d23ce9c96e7f1d151cd91a6dc7e
docfiles size=118
RELOC/doc/latex/frenchmath/README.md details="Readme"
RELOC/doc/latex/frenchmath/frenchmath.pdf details="Package documentation" language="fr"
-srccontainersize 7948
-srccontainerchecksum f41712d3bd58290fbe205001e9fb531a147debea4b93aeac3b9831cb3bc8edfc7d1364bee575c750aacfe1db8632c357a36fc5afb003a7c895108146a1ab3b7e
-srcfiles size=6
+srccontainersize 8276
+srccontainerchecksum d2af7f5fd3f45964d851c038b533b99e6c2a813fa382a9b34333246b044c9b18db6252ebc8c997527211ddc8ce20ec3a816d11b49e1a3e185d7356dd141967fd
+srcfiles size=7
RELOC/source/latex/frenchmath/frenchmath.dtx
RELOC/source/latex/frenchmath/frenchmath.ins
-runfiles size=1
+runfiles size=2
RELOC/tex/latex/frenchmath/frenchmath.sty
catalogue-ctan /macros/latex/contrib/frenchmath
catalogue-license lppl1.3
catalogue-topics maths french
-catalogue-version 1.4
+catalogue-version 1.5
name frimurer
category Package
@@ -133261,7 +133261,7 @@ catalogue-version 1.0.8
name hulipsum
category Package
-revision 46803
+revision 56848
shortdesc Hungarian dummy text (Lorum ipse)
relocated 1
longdesc Lorem ipsum is an improper Latin filler dummy text, cf. the
@@ -133273,24 +133273,24 @@ longdesc this package you can typeset 150 paragraphs of Lorum ipse. All
longdesc paragraphs are taken with permission from
longdesc http://www.lorumipse.hu. Thanks to Lorum Ipse Lab (Viktor Nagy
longdesc and David Takacs) for their work.
-containersize 54808
-containerchecksum c43867cb608e955254f2c597d3fd9938fe815c1683c9d61dcd1cfff29608b5c391d7374a740646dd915fdcf282d9adb8f83d3dcb6781fbe547b685de81f67143
-doccontainersize 146628
-doccontainerchecksum 43dcdd731116bd1eac309b1213b3c961dd189f861b8732d73127ba6b4c20d3ea3584f03340ff5973b4aab11744e61069edfe6736d389e1487587d0372591e343
+containersize 55344
+containerchecksum 32e981937f3077fb1310205f17bd10c93ae20c98e098f766b0a90218d81c7708071aa4ca605bfc55da1614116cbd8299f9cf1853426dae04a99669839b2d5c83
+doccontainersize 146568
+doccontainerchecksum 862a91b902cc8bb0d71efe3933bd0a1b0f3aba1023586595d57cd45e15a0b961cc3c56a59315eee02337f89d35582497dd6894bf3ead060d2863823765211e1f
docfiles size=37
RELOC/doc/latex/hulipsum/README details="Readme"
RELOC/doc/latex/hulipsum/hulipsum.pdf details="Package documentation"
-srccontainersize 55956
-srccontainerchecksum e1290087087ab8d63d2e2de72cbf641ec71ae362a64faca2e362cccfb05890abc9cd970a2eca1b1c10cdd95760dd82e8bc90fe0e8ef4d99df6cbabba24c80be0
-srcfiles size=43
+srccontainersize 56600
+srccontainerchecksum 6de61158c97297d4c76691f6aa2686d8ff88317de0dcc951a23e6aa93c63a4fecfdcabb74629e2e12ed7878a8a74987834f36faeae3c5fd661bacf99aa7f7962
+srcfiles size=44
RELOC/source/latex/hulipsum/hulipsum.dtx
RELOC/source/latex/hulipsum/hulipsum.ins
-runfiles size=41
+runfiles size=42
RELOC/tex/latex/hulipsum/hulipsum.sty
catalogue-ctan /macros/latex/contrib/hulipsum
catalogue-license lppl1.3
catalogue-topics dummy-gen macro-supp hungarian
-catalogue-version 1.0
+catalogue-version 1.1
name hustthesis
category Package
@@ -185727,17 +185727,17 @@ catalogue-version 0.4
name mcf2graph
category Package
-revision 56217
+revision 56846
shortdesc Draw chemical structure diagrams with Metafont/MetaPost
relocated 1
longdesc The Molecular Coding Format (MCF) is a linear notation for
longdesc describing chemical structure diagrams. This package converts
longdesc MCF to graphic files using Metafont / MetaPost.
-containersize 21040
-containerchecksum 4905ad4033c29884811f0ef2da7da18be259904f41fda3f6d3145c7dca3f490ee317faffcac30a643ee04465ce3180025e8687dc878c713fc1623e341e95934b
-doccontainersize 1059444
-doccontainerchecksum 65759a94b05106edb4cf8453b47694c8baf4bfd68b7165bbbd57979881384e7a0862d4d14b8d3650e7a2dafaf46744059ee9a393f53f67565b75396a7b532209
-docfiles size=303
+containersize 21096
+containerchecksum a95de14b3f5ba295efb98bd6e2cb9f299475f888728d7320545f223623076a1c7807701d7e4339dad51c09c939f134b50bf0325ca939b73c16400879d0ddbf5f
+doccontainersize 1082312
+doccontainerchecksum 2800afb29b8ee956e19f9ab9870f086b0589103df533e3311ab3334ff7750cf2b57b6e29b450dde75ad83d774e3bb984e3a5af1e9b3e3692fa34a3254040f6fb
+docfiles size=309
RELOC/doc/metapost/mcf2graph/CHANGELOG
RELOC/doc/metapost/mcf2graph/README details="Readme"
RELOC/doc/metapost/mcf2graph/mcf_exa_soc.mf
@@ -185754,7 +185754,7 @@ runfiles size=23
catalogue-ctan /graphics/mcf2graph
catalogue-license mit
catalogue-topics graphics graphics-mpost chemistry
-catalogue-version 4.52
+catalogue-version 4.53
name mcite
category Package
@@ -204687,7 +204687,7 @@ catalogue-version 9.4
name newpx
category Package
-revision 55619
+revision 56845
shortdesc Alternative uses of the PX fonts, with improved metrics
relocated 1
longdesc This package, initially based on pxfonts, provides many fixes
@@ -204698,10 +204698,10 @@ longdesc options. For proper operation, the packages require that the
longdesc packages newtxmath, pxfonts, and TeXGyrePagella be installed
longdesc and their map files enabled.
execute addMap newpx.map
-containersize 1622456
-containerchecksum 4f2b5dad4cbf34e4f836b9a1c5a4c639e8ef7815894ba6299fe9da1718000ecd3f6802d434efe86f2d5e0b00523b0f32305adb965af79813e0aa2cae95b89348
-doccontainersize 442124
-doccontainerchecksum 1a438ebc99bf20ac2d4776e1b60ef0545dd6c1c74e568bbf2d89ae3d8e115060fed467db92305f7086764efd38a7c97b71a52b8e855b174b14c2e85a37f09254
+containersize 1622608
+containerchecksum 7dbbfd4e3e32b0c5a303ecfeb776793c1b1eeaa13b934e9e02ffbce49ca6d6409f5b920dac798a3abd52ddc87eab7ec9937060f3ddcbff5023005a6cce363899
+doccontainersize 444596
+doccontainerchecksum 49e38fe4adf7291e3c174c9bf91f1f48ebe22639c542cd4fc707bce846e6fbb38a8bd0ed8a459c5dd61de314cb1a8a24aece5efc1f3febd5b0ac467c3051e3fe
docfiles size=216
RELOC/doc/fonts/newpx/ChangesInV1.4.txt
RELOC/doc/fonts/newpx/MANIFEST-newpx.txt
@@ -204710,7 +204710,7 @@ docfiles size=216
RELOC/doc/fonts/newpx/newpxdoc.tex
RELOC/doc/fonts/newpx/newpxeg-crop.pdf
RELOC/doc/fonts/newpx/pxfontseg-crop.pdf
-runfiles size=1785
+runfiles size=1786
RELOC/fonts/afm/public/newpx/NewPXBMI.afm
RELOC/fonts/afm/public/newpx/NewPXBMI_gnu.afm
RELOC/fonts/afm/public/newpx/NewPXMI.afm
@@ -205065,7 +205065,7 @@ catalogue-also pxfonts
catalogue-ctan /fonts/newpx
catalogue-license lppl
catalogue-topics font font-body font-maths font-serif font-proportional font-type1 font-otf font-supp font-t1enc
-catalogue-version 1.413
+catalogue-version 1.414
name newsletr
category Package
@@ -289655,15 +289655,15 @@ docfiles size=592
name texlive-docindex
category TLCore
-revision 56818
+revision 56844
shortdesc top-level TeX Live doc.html, etc.
longdesc These files are regenerated as needed, which is often, so we
longdesc make them a separate package. See the tl-update-auto script for
longdesc the process.
-containersize 388
-containerchecksum 7622639c8feb1b0793e07366409f7455ff73d5b25f2c9202fd563a500b7f76a3bbc257175d0a29f9ee417fac6cd1faed864f3091a92bf34e5bf0985d748a6f25
-doccontainersize 169872
-doccontainerchecksum a68a79b9bf4350634a06d4ab94b8c47e87503eed0b3423f83d48d6f2d3ccadf50621c8af01f841418aad44358ae2f05c41e35c25bc77173b7d34ed3720b0248e
+containersize 392
+containerchecksum 6815d08539ec7fc35410a0c3a598d8cd0e34d1fdd91a41d8a0e9539012a95f5d6ae2927a9cee8e855e11bfdd32211901c85ce9d3a4bc64fc5bd71f24776079dc
+doccontainersize 169984
+doccontainerchecksum cfbc1770ef0cfac3e848484609ba0a29b782381bf42da4c80901a2a94adf6ff41a1bdea825e4a3787bba843433552ae7ea6d0bb683a03bc1e6c6a5d73aee27cb
docfiles size=337
doc.html
@@ -289885,7 +289885,7 @@ docfiles size=368
name texlive-scripts
category TLCore
-revision 56826
+revision 56844
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.
@@ -289893,10 +289893,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 132048
-containerchecksum dfacafd07b26222def5c97b54fb0213f96d6e4db7d3f28d000e064e9b6804aca9a62c845a394e5ae459073b6c11ba5927b022a591b76fcbea7dd2a561445b469
+containersize 132068
+containerchecksum 949257e5da347f2d8c2a56e0c4cca398f6ee3a109d2aa034c2b2ce96feb8c6135dbb6d4a4a3fba24f59cbe69098f82fc45f82a466aac78db3d115937e9d0c266
doccontainersize 218656
-doccontainerchecksum 1aa475bc13b01d213159da8c98853f03b948f16cb80a9ae77e42daeab700050545ee5b1c80ddd8f3598c84f7c74aba29970efebbe047631f582b1b06f9fa169e
+doccontainerchecksum 9c7c5966bb939f25b5c4efa097480d4a8b8ad4c6b4385284d6dce16d255ccc28a0e263f50242072177735a97edba9c14f4a09a6e2a1aa2280cb5ba0df28a6e0c
docfiles size=141
texmf-dist/doc/man/man1/fmtutil-sys.1
texmf-dist/doc/man/man1/fmtutil-sys.man1.pdf
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 4bbf390736..0e255704ec 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-74559ebe9ea74d6f20a3546739c55e21 texlive.tlpdb
+f29a9a7d28bb0bec2722bac84777c4b4 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index 9a72cb7594..ec777f4ea0 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-b9b5fc7d1fe485b95dc1b20c7ad9efdec2a387c5ade8a94a78f5758061a055e79007c85c257fe833981b7ab8e685bf7036d72747ea8b65bed4215c1ec6ec28c7 texlive.tlpdb
+765442970c1ad633613f6b797816dee4120e6938a8f675f1e1daa13fb5282fb5b183a74e516a015675a1687d7016c7dad55476357f0c97fb9f967ce4eada44d4 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index 10f25dd816..3e0b327a19 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-----
-iQEcBAEBCgAGBQJfoKr2AAoJEEzhh34ZQ4xw6FAIAJwAbIkp8C4u1eWGneL5c7Mc
-/feSh/BSFhHdCI5QV5vwDCsT/vQrTvdwOsnShe3GA7+XhueioIi6cz+wykNY3kUp
-vJoM3SiQ82tjPO6MbUN9LsEioWmq+6Uz017q10qKtWBy9848rjhPktbwssk4plc5
-B3VoM2VVPOZqxJ4+v22qMw4674q70WvZ02/W28AOsWZWpzT0PHu0iJyHue2DOLmm
-Dipf+djxx47ajTDbpeTS0nbUqFJXI75LAdX4JAnI6l3ThpFhWERgCpD6nxrRXkPr
-fJep3QI9LXQ0c9u3myHqqsrPn/xlzRVTIOC6OcC6IZfJ5L4LOTSuGXaJZgKZuP8=
-=flra
+iQEcBAEBCgAGBQJfofxsAAoJEEzhh34ZQ4xwEZ8IAKeOpjzinFQ7xjXz6edcFoJZ
+/+c6Y3aTUM1IxrsQEZD499lboBufI/RNiCHcQ4g1SuKIjQoWCl5fFBiOMa3dTsPa
+zL9T8kQHCyhD5K+xHCeaXRY9/sh+9M2bR2mRrC7Ik5+YjI2gsdmM3ZSyv7QODSrJ
+wQdgoM2WX3L84Lridd9ppaFJ+MBgo+nKZMWefdjU0cszE/y3aYlT8jcJOyKbcEdZ
+UIMrQR1/53/GMBVJAczySCDspAArjxo7ThuFukCGXrmTnX/Ehxo2jtzyLl0981Go
+hYkUKBkdD579J787WwOXjgTpjaCtaFvrURQtp/DqMUYx1PQyBoNcGBAJZUPtSLM=
+=NNTO
-----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index f6b47eff51..c9e9fc8535 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
Binary files differ
diff --git a/systems/win32/miktex/tm/packages/next/pr.ini b/systems/win32/miktex/tm/packages/next/pr.ini
index 555104dd36..ccd3d33208 100644
--- a/systems/win32/miktex/tm/packages/next/pr.ini
+++ b/systems/win32/miktex/tm/packages/next/pr.ini
@@ -1,13 +1,13 @@
[repository]
-date=1604438078
+date=1604524444
lastupd=miktex-arctrl-bin-2.9 miktex-arctrl-bin-x64-2.9 miktex-asymptote-bin-2.9 miktex-asymptote-bin-x64-2.9 miktex-autosp-bin-2.9 miktex-autosp-bin-x64-2.9 miktex-axohelp-bin-2.9 miktex-axohelp-bin-x64-2.9 miktex-bibarts-bin-2.9 miktex-bibarts-bin-x64-2.9 miktex-bibtex-bin-2.9 miktex-bibtex-bin-x64-2.9 miktex-bibtex8bit-bin-2.9 miktex-bibtex8bit-bin-x64-2.9 miktex-bzip2-bin-2.9 miktex-bzip2-bin-x64-2.9 miktex-cairo-bin-2.9 miktex-cairo-bin-x64-2.9 miktex-chktex-bin-2.9 miktex-chktex-bin-x64-2.9
-lstdigest=a04ffabe6ff8725f22d5519d7c476959
+lstdigest=6559660406fc76e1d13f5c678a8b4394
numpkg=4002
relstate=next
-version=7612
+version=7613
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: GJEpei9scvt2MwX5po811x8SzIXjmY6YI0GUAIy3qoOHD0bbIJ/L34kWAkX+iCOF8KTVvdZLenEK/RjteKAUPUDWqQ9cwfjfQrkW3yuRFU1uK1gmc2PlajnFG2EA1PEEph5OCG3YbffpyWFpov8Au4TVLjqEjup0dQ7mgqAcbIlp01/zEVt2aKRKANFl7+ffOWxeJfZ2Z4sNZBjtle5t3CaBwPDGU6p/rS3oe+iMq/zMKEOadB9qEy7P6OJWrftkcaypwJMVKVzTF4GHSR5MT81ir9ku9pT6wYWGf9fbTyhkM1jhq4XVXZc7UmTkoXHitL3CVDHOU+N4nLud0ifU4Q==
+;;;; signature/miktex: c4AtYieaweiz/r3B8XPiLN1NSEC/6jc2QKaxwKsj02vulBUGytB8+qeGLA1OVJiHmpekdgI7Gxxx8bS1XJxRPuoEkL7H8K+20qzgLcc8Jc7ySsZkCEHAouC4oVsyVgCQ8nck9v6JEhRu4EIZEHa8gJ8AhvKR7n9FXvn+czoNKuRuW69voTi+a5wLgYOzjJPzMqIXt4zzEKT5vAtK+hsAsqDFOwzqBVSj1VfGIuPfyZKd92lPE4FxxL6cCASq2FToTunYmrmnsAhl6hQGMmNOlrNX+nqbX6JIyrOAVcJlifdhd67Kj9Grm1QgfX8G0zHPfho/j9OI73SOA2KOsKl8FA==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini
index 4fe0ea7c60..7c06da9ec6 100644
--- a/systems/win32/miktex/tm/packages/pr.ini
+++ b/systems/win32/miktex/tm/packages/pr.ini
@@ -1,13 +1,13 @@
[repository]
-date=1604437877
+date=1604524265
lastupd=biblatex-caspervector bytefield chessboard europasscv frenchmath hvfloat hyperxmp menukeys newpx pkuthss semesterplanner spacingtricks tikz-among-us yquant carlisle algolrevived babel babel-dutch babelbib beamertheme-focus
-lstdigest=c375a787eb5e3159e7dd1bb07248041f
+lstdigest=1475d71c79e6787dfaedbc5b6c7577f6
numpkg=4002
relstate=stable
-version=7612
+version=7613
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: ZpNkVcsBLRtAXiIg6ESP4+HYvvvmfJPY6KHDuO/1DJWtQ69oYCGNxFwiPYkBHGyTXISLyjkeDbmkBVSddVIoBr0hYaIsZA/l9vlFhuJ9Q5aL02gQYRJKsFmLZPq+xQg7lTHGjr8jA+o7WgBZOcYlzzrZs1J5KpEG5qcKiFtWOHY0HwdIQcm+tmrBzb7UwHLQQTo4I2WDOQaYGJ9gjFobANgsTsEyKSXlObpqVDXTFDpzpSaWqTMCySJ3IVb9mkhTFOgOeQbC8r3C+yyinql4JI3Ti6Ri/LvGZbRXMsqdf4/RP2/P7ePKZtS3YFA+r4BbUFHsFgta0bxkca7LNfBzcg==
+;;;; signature/miktex: W6RfkD4ggVpQEnl1Qq2o6EEeZQI0EiNhSjcHmuCgXINc7ov2BHUW27dBy+CGh+hy7UZWB8rFyxDos6dCjkDsUVoynJnFOJcXNxC8lsxAJC1+MjjZ4ZR1Ghyhc1PG3BwnVPSbY7ULh+CDCFcsLo2REJxVRfsmnRAP8tvyi79P/1K7mj50id69AC8eBkl4dDWYRQRNGRu6Vj+kae/njK5kpvUK4T4zc6JcbXxjLphrIxKUAtATRM6yQjv1UpQHyLWhaYYhT84bVl830C2zpd74P54d4GVV1PTLqeZBmH6vdS1ZhG2ZoxZDNbjBlGSmA+bJjYOPeTL5ed3RCkCWjtKR1g==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/timestamp b/timestamp
index 834d63dd9a..aa2ca92ba7 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:
-2020-11-04-02-02
+2020-11-05-02-02