summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--FILES.byname206
-rw-r--r--FILES.byname.gzbin2558620 -> 2558848 bytes
-rw-r--r--FILES.last07days214
-rw-r--r--biblio/bibtex/contrib/iran-bibtex/README.md33
-rw-r--r--biblio/bibtex/contrib/iran-bibtex/iran-bibtex-cp1256fa.csf124
-rw-r--r--biblio/bibtex/contrib/iran-bibtex/iran-bibtex.sty113
-rw-r--r--biblio/bibtex/contrib/iran-bibtex/iran-structure.pdfbin0 -> 61876 bytes
-rw-r--r--biblio/bibtex/contrib/iran-bibtex/iran-structure.tex181
-rw-r--r--biblio/bibtex/contrib/iran-bibtex/iran.bst3239
-rw-r--r--biblio/ctan-bibdata/ctan.bib24
-rw-r--r--fonts/greek/gfs/gfsdidot/README2
-rw-r--r--fonts/greek/gfs/gfsdidot/opentype/GFSOlgaGrDidotItEn.otfbin0 -> 103140 bytes
-rw-r--r--fonts/greek/gfs/gfsdidot/tex/gfsdidot.sty2
-rw-r--r--fonts/modes/ChangeLog5
-rw-r--r--fonts/modes/GNUmakefile6
-rw-r--r--fonts/modes/modelist.txt1
-rw-r--r--fonts/modes/modenames.txt1
-rw-r--r--fonts/modes/modes.mf32
-rw-r--r--fonts/modes/modes.pdfbin267460 -> 268137 bytes
-rw-r--r--macros/latex/contrib/l3build/CHANGELOG.md11
-rw-r--r--macros/latex/contrib/l3build/README.md2
-rw-r--r--macros/latex/contrib/l3build/l3build-check.lua7
-rw-r--r--macros/latex/contrib/l3build/l3build.12
-rw-r--r--macros/latex/contrib/l3build/l3build.dtx2
-rwxr-xr-xmacros/latex/contrib/l3build/l3build.lua4
-rw-r--r--macros/latex/contrib/l3build/l3build.pdfbin747893 -> 747895 bytes
-rw-r--r--macros/latex/contrib/litesolution/README.md3
-rw-r--r--macros/latex/contrib/litesolution/doc/litesolution-demo.tex430
-rw-r--r--macros/latex/contrib/litesolution/doc/litesolution-doc.tex90
-rw-r--r--macros/latex/contrib/litesolution/doc/litesolution-gauge.tex65
-rw-r--r--macros/latex/contrib/litesolution/doc/litesolution.pdfbin699357 -> 910052 bytes
-rw-r--r--macros/latex/contrib/litesolution/doc/litesolution.tex26
-rw-r--r--macros/latex/contrib/litesolution/tex/litesolution.cls378
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-code.dtx44
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-code.pdfbin972770 -> 0 bytes
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-french.pdfbin598788 -> 596600 bytes
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-french.tex14
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix.pdfbin614351 -> 612159 bytes
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix.tex12
-rw-r--r--support/TeX4ht/source/ChangeLog21
-rw-r--r--support/TeX4ht/source/Makefile34
-rw-r--r--support/TeX4ht/source/mktex4ht-cnf.tex3
-rw-r--r--support/TeX4ht/source/tex4ht-4ht.tex21
-rw-r--r--support/TeX4ht/source/tex4ht-html4.tex42
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb305
-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.asc16
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.xzbin2491972 -> 2493060 bytes
-rw-r--r--timestamp2
50 files changed, 4984 insertions, 737 deletions
diff --git a/FILES.byname b/FILES.byname
index 712628a952..c2ea2dc81c 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -914,6 +914,13 @@
2009/01/23 | 7199 | biblio/bibtex/contrib/iopart-num/iopart-num.tex
2009/01/23 | 849 | biblio/bibtex/contrib/iopart-num/README
2009/01/27 | 72604 | biblio/bibtex/contrib/iopart-num.zip
+2023/12/08 | 1916 | biblio/bibtex/contrib/iran-bibtex/iran-bibtex-cp1256fa.csf
+2023/12/12 | 2428 | biblio/bibtex/contrib/iran-bibtex/iran-bibtex.sty
+2023/12/12 | 56650 | biblio/bibtex/contrib/iran-bibtex/iran.bst
+2023/12/12 | 61876 | biblio/bibtex/contrib/iran-bibtex/iran-structure.pdf
+2023/12/12 | 14785 | biblio/bibtex/contrib/iran-bibtex/iran-structure.tex
+2023/12/12 | 2383 | biblio/bibtex/contrib/iran-bibtex/README.md
+2023/12/13 | 74740 | biblio/bibtex/contrib/iran-bibtex.zip
1999/04/08 | 37425 | biblio/bibtex/contrib/is-bst/is-abbrv.bst
1999/04/08 | 41225 | biblio/bibtex/contrib/is-bst/is-alpha.bst
1999/04/08 | 37711 | biblio/bibtex/contrib/is-bst/is-plain.bst
@@ -2063,12 +2070,12 @@
2023/10/05 | 1710 | biblio/citation-style-language/README.md
2023/10/05 | 12878 | biblio/citation-style-language/vancouver.csl
2023/10/05 | 4531754 | biblio/citation-style-language.zip
-2023/12/12 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2023/12/13 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
2022/10/08 | 127 | biblio/ctan-bibdata/biblatex-ctan/ctan.cbx
-2023/12/12 | 2831734 | biblio/ctan-bibdata/ctan.bib
-2023/12/12 | 3708800 | biblio/ctan-bibdata/ctan.pdf
+2023/12/13 | 2831737 | biblio/ctan-bibdata/ctan.bib
+2023/12/13 | 3708800 | biblio/ctan-bibdata/ctan.pdf
2023/01/16 | 1489 | biblio/ctan-bibdata/README
-2023/12/12 | 4113947 | biblio/ctan-bibdata.zip
+2023/12/13 | 4113941 | biblio/ctan-bibdata.zip
2023/02/23 | 3126 | biblio/pbibtex/pbibtex-base/cpp.awk
2023/02/23 | 1009 | biblio/pbibtex/pbibtex-base/generate.sh
2023/02/23 | 22362 | biblio/pbibtex/pbibtex-base/jabbrv.bst
@@ -5429,7 +5436,7 @@
1990/10/02 | 5440 | dviware/vutex/vaxvms.hlp
1990/10/02 | 812 | dviware/vutex/vaxvms.ins
1990/10/02 | 127576 | dviware/vutex/vutex.web
-2023/12/12 | 75224 | FILES.last07days
+2023/12/13 | 129253 | FILES.last07days
2021/07/24 | 1139410 | fonts/aboensis/Aboensis.glyphs
2021/07/24 | 18907382 | fonts/aboensis/aboensis.pdf
2021/07/24 | 137860 | fonts/aboensis/Aboensis-Regular.otf
@@ -52683,9 +52690,10 @@
2017/12/09 | 99164 | fonts/greek/gfs/gfsdidot/opentype/GFSDidotBold.otf
2017/12/09 | 142668 | fonts/greek/gfs/gfsdidot/opentype/GFSDidotItalic.otf
2017/12/09 | 166580 | fonts/greek/gfs/gfsdidot/opentype/GFSDidot.otf
+2023/12/13 | 103140 | fonts/greek/gfs/gfsdidot/opentype/GFSOlgaGrDidotItEn.otf
2017/12/09 | 31008 | fonts/greek/gfs/gfsdidot/opentype/GFSOlga.otf
-2018/01/11 | 235 | fonts/greek/gfs/gfsdidot/README
-2018/01/09 | 13737 | fonts/greek/gfs/gfsdidot/tex/gfsdidot.sty
+2023/12/13 | 235 | fonts/greek/gfs/gfsdidot/README
+2023/12/13 | 13737 | fonts/greek/gfs/gfsdidot/tex/gfsdidot.sty
2017/12/09 | 1134 | fonts/greek/gfs/gfsdidot/tex/lgrudidot.fd
2017/12/09 | 289 | fonts/greek/gfs/gfsdidot/tex/omludidot.fd
2017/12/17 | 1329 | fonts/greek/gfs/gfsdidot/tex/ot1udidot.fd
@@ -52871,7 +52879,7 @@
2017/12/27 | 18330 | fonts/greek/gfs/gfsdidot/vpl/ts1-gfsdidoto.vpl
2017/12/27 | 16962 | fonts/greek/gfs/gfsdidot/vpl/ts1-gfsdidotr.vpl
2017/12/27 | 18158 | fonts/greek/gfs/gfsdidot/vpl/ts1-gfsdidotui.vpl
-2018/01/14 | 3917792 | fonts/greek/gfs/gfsdidot.zip
+2023/12/13 | 3987491 | fonts/greek/gfs/gfsdidot.zip
2013/05/23 | 50632 | fonts/greek/gfs/gfsneohellenic/afm/GFSNeohellenic-Bold.afm
2013/05/23 | 52072 | fonts/greek/gfs/gfsneohellenic/afm/GFSNeohellenic-BoldItalic.afm
2013/05/23 | 60578 | fonts/greek/gfs/gfsneohellenic/afm/GFSNeohellenic-Italic.afm
@@ -77699,15 +77707,15 @@
2007/01/11 | 792 | fonts/mnsymbol/tfm/MnSymbolS-Bold8.tfm
2007/01/11 | 792 | fonts/mnsymbol/tfm/MnSymbolS-Bold9.tfm
2007/01/23 | 5980922 | fonts/mnsymbol.zip
-2020/09/09 | 15546 | fonts/modes/ChangeLog
-2020/09/09 | 4310 | fonts/modes/GNUmakefile
+2023/12/12 | 15675 | fonts/modes/ChangeLog
+2023/12/12 | 4309 | fonts/modes/GNUmakefile
2020/01/28 | 764 | fonts/modes/modedpicheck
-2020/09/09 | 10821 | fonts/modes/modelist.txt
-2020/09/09 | 1238 | fonts/modes/modenames.txt
-2020/09/09 | 97582 | fonts/modes/modes.mf
-2020/09/09 | 267460 | fonts/modes/modes.pdf
+2023/12/12 | 10879 | fonts/modes/modelist.txt
+2023/12/12 | 1246 | fonts/modes/modenames.txt
+2023/12/12 | 97995 | fonts/modes/modes.mf
+2023/12/12 | 268137 | fonts/modes/modes.pdf
2020/01/28 | 854 | fonts/modes/README
-2020/09/09 | 305313 | fonts/modes.zip
+2023/12/13 | 306101 | fonts/modes.zip
2017/01/28 | 186 | fonts/montserrat/doc/FONTLOG.txt
2019/11/08 | 470234 | fonts/montserrat/doc/montserrat-doc.pdf
2019/11/08 | 7615 | fonts/montserrat/doc/montserrat-doc.tex
@@ -194653,7 +194661,7 @@
2015/12/09 | 171418 | install/macros/latex/contrib/ksp-thesis.tds.zip
2019/12/19 | 302191 | install/macros/latex/contrib/kvdefinekeys.tds.zip
2023/11/09 | 973431 | install/macros/latex/contrib/l3backend.tds.zip
-2023/12/12 | 825442 | install/macros/latex/contrib/l3build.tds.zip
+2023/12/13 | 825519 | install/macros/latex/contrib/l3build.tds.zip
2023/12/08 | 4060567 | install/macros/latex/contrib/l3experimental.tds.zip
2023/12/11 | 14227153 | install/macros/latex/contrib/l3kernel.tds.zip
2023/10/10 | 2257270 | install/macros/latex/contrib/l3packages.tds.zip
@@ -228465,31 +228473,31 @@
2023/11/09 | 50952 | macros/latex/contrib/l3backend/l3backend-pdf.dtx
2023/11/09 | 549 | macros/latex/contrib/l3backend/README.md
2023/11/09 | 935225 | macros/latex/contrib/l3backend.zip
-2023/12/12 | 22243 | macros/latex/contrib/l3build/CHANGELOG.md
-2023/12/12 | 1816 | macros/latex/contrib/l3build/l3build.1
-2023/12/12 | 7805 | macros/latex/contrib/l3build/l3build-arguments.lua
-2023/12/12 | 6313 | macros/latex/contrib/l3build/l3build-aux.lua
-2023/12/12 | 38477 | macros/latex/contrib/l3build/l3build-check.lua
-2023/12/12 | 2149 | macros/latex/contrib/l3build/l3build-clean.lua
-2023/12/12 | 4972 | macros/latex/contrib/l3build/l3build-ctan.lua
-2023/12/12 | 113480 | macros/latex/contrib/l3build/l3build.dtx
-2023/12/12 | 12611 | macros/latex/contrib/l3build/l3build-file-functions.lua
-2023/12/12 | 2473 | macros/latex/contrib/l3build/l3build-help.lua
-2023/12/12 | 1540 | macros/latex/contrib/l3build/l3build.ins
-2023/12/12 | 11105 | macros/latex/contrib/l3build/l3build-install.lua
-2023/12/12 | 7131 | macros/latex/contrib/l3build/l3build.lua
-2023/12/12 | 7206 | macros/latex/contrib/l3build/l3build-manifest.lua
-2023/12/12 | 10786 | macros/latex/contrib/l3build/l3build-manifest-setup.lua
-2023/12/12 | 747893 | macros/latex/contrib/l3build/l3build.pdf
-2023/12/12 | 4338 | macros/latex/contrib/l3build/l3build-stdmain.lua
-2023/12/12 | 2285 | macros/latex/contrib/l3build/l3build-tagging.lua
-2023/12/12 | 6151 | macros/latex/contrib/l3build/l3build-typesetting.lua
-2023/12/12 | 2745 | macros/latex/contrib/l3build/l3build-unpack.lua
-2023/12/12 | 13211 | macros/latex/contrib/l3build/l3build-upload.lua
-2023/12/12 | 8092 | macros/latex/contrib/l3build/l3build-variables.lua
-2023/12/12 | 4150 | macros/latex/contrib/l3build/l3build-zip.lua
-2023/12/12 | 1019 | macros/latex/contrib/l3build/README.md
-2023/12/12 | 821567 | macros/latex/contrib/l3build.zip
+2023/12/13 | 22506 | macros/latex/contrib/l3build/CHANGELOG.md
+2023/12/13 | 1818 | macros/latex/contrib/l3build/l3build.1
+2023/12/13 | 7805 | macros/latex/contrib/l3build/l3build-arguments.lua
+2023/12/13 | 6313 | macros/latex/contrib/l3build/l3build-aux.lua
+2023/12/13 | 38462 | macros/latex/contrib/l3build/l3build-check.lua
+2023/12/13 | 2149 | macros/latex/contrib/l3build/l3build-clean.lua
+2023/12/13 | 4972 | macros/latex/contrib/l3build/l3build-ctan.lua
+2023/12/13 | 113482 | macros/latex/contrib/l3build/l3build.dtx
+2023/12/13 | 12611 | macros/latex/contrib/l3build/l3build-file-functions.lua
+2023/12/13 | 2473 | macros/latex/contrib/l3build/l3build-help.lua
+2023/12/13 | 1540 | macros/latex/contrib/l3build/l3build.ins
+2023/12/13 | 11105 | macros/latex/contrib/l3build/l3build-install.lua
+2023/12/13 | 7156 | macros/latex/contrib/l3build/l3build.lua
+2023/12/13 | 7206 | macros/latex/contrib/l3build/l3build-manifest.lua
+2023/12/13 | 10786 | macros/latex/contrib/l3build/l3build-manifest-setup.lua
+2023/12/13 | 747895 | macros/latex/contrib/l3build/l3build.pdf
+2023/12/13 | 4338 | macros/latex/contrib/l3build/l3build-stdmain.lua
+2023/12/13 | 2285 | macros/latex/contrib/l3build/l3build-tagging.lua
+2023/12/13 | 6151 | macros/latex/contrib/l3build/l3build-typesetting.lua
+2023/12/13 | 2745 | macros/latex/contrib/l3build/l3build-unpack.lua
+2023/12/13 | 13211 | macros/latex/contrib/l3build/l3build-upload.lua
+2023/12/13 | 8092 | macros/latex/contrib/l3build/l3build-variables.lua
+2023/12/13 | 4150 | macros/latex/contrib/l3build/l3build-zip.lua
+2023/12/13 | 1021 | macros/latex/contrib/l3build/README.md
+2023/12/13 | 821646 | macros/latex/contrib/l3build.zip
2023/12/08 | 8897 | macros/latex/contrib/l3experimental/CHANGELOG.md
2023/12/08 | 16498 | macros/latex/contrib/l3experimental/l3benchmark.dtx
2023/12/08 | 1558 | macros/latex/contrib/l3experimental/l3benchmark.ins
@@ -229393,15 +229401,16 @@
2003/08/12 | 1279 | macros/latex/contrib/listofsymbols/README
2009/11/22 | 60068 | macros/latex/contrib/listofsymbols.zip
2023/11/11 | 481466 | macros/latex/contrib/litesolution/doc/figures/cover1.png
-2023/11/12 | 22462 | macros/latex/contrib/litesolution/doc/figures/HDU.pdf
-2023/11/14 | 4776 | macros/latex/contrib/litesolution/doc/litesolution-demo.tex
-2023/11/14 | 13096 | macros/latex/contrib/litesolution/doc/litesolution-doc.tex
-2023/11/15 | 699357 | macros/latex/contrib/litesolution/doc/litesolution.pdf
-2023/11/15 | 997 | macros/latex/contrib/litesolution/doc/litesolution.tex
-2023/11/10 | 19101 | macros/latex/contrib/litesolution/License
-2023/11/10 | 550 | macros/latex/contrib/litesolution/README.md
-2023/11/14 | 15349 | macros/latex/contrib/litesolution/tex/litesolution.cls
-2023/11/14 | 1205922 | macros/latex/contrib/litesolution.zip
+2023/11/11 | 22462 | macros/latex/contrib/litesolution/doc/figures/HDU.pdf
+2023/12/13 | 22231 | macros/latex/contrib/litesolution/doc/litesolution-demo.tex
+2023/12/13 | 15256 | macros/latex/contrib/litesolution/doc/litesolution-doc.tex
+2023/12/13 | 3401 | macros/latex/contrib/litesolution/doc/litesolution-gauge.tex
+2023/12/13 | 910052 | macros/latex/contrib/litesolution/doc/litesolution.pdf
+2023/12/13 | 221 | macros/latex/contrib/litesolution/doc/litesolution.tex
+2023/11/09 | 19101 | macros/latex/contrib/litesolution/License
+2023/11/14 | 1019 | macros/latex/contrib/litesolution/README.md
+2023/12/13 | 17696 | macros/latex/contrib/litesolution/tex/litesolution.cls
+2023/12/13 | 1421214 | macros/latex/contrib/litesolution.zip
2023/11/05 | 30108 | macros/latex/contrib/litetable/doc/litetable-demo.pdf
2023/11/05 | 1903 | macros/latex/contrib/litetable/doc/litetable-demo.tex
2023/11/05 | 79686 | macros/latex/contrib/litetable/doc/litetable-doc.pdf
@@ -231827,15 +231836,14 @@
1996/03/22 | 18862 | macros/latex/contrib/niceframe/umrandb.mf
2015/01/17 | 1370 | macros/latex/contrib/niceframe/umrand.mf
2015/01/17 | 287910 | macros/latex/contrib/niceframe.zip
-2023/12/04 | 594121 | macros/latex/contrib/nicematrix/nicematrix-code.dtx
-2023/12/04 | 972770 | macros/latex/contrib/nicematrix/nicematrix-code.pdf
-2023/12/04 | 598788 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
-2023/12/03 | 249849 | macros/latex/contrib/nicematrix/nicematrix-french.tex
+2023/12/13 | 594500 | macros/latex/contrib/nicematrix/nicematrix-code.dtx
+2023/12/13 | 596600 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
+2023/12/04 | 249928 | macros/latex/contrib/nicematrix/nicematrix-french.tex
2023/08/14 | 1428 | macros/latex/contrib/nicematrix/nicematrix.ins
-2023/12/04 | 614351 | macros/latex/contrib/nicematrix/nicematrix.pdf
-2023/12/02 | 259852 | macros/latex/contrib/nicematrix/nicematrix.tex
+2023/12/13 | 612159 | macros/latex/contrib/nicematrix/nicematrix.pdf
+2023/12/04 | 259933 | macros/latex/contrib/nicematrix/nicematrix.tex
2023/05/15 | 1028 | macros/latex/contrib/nicematrix/README.md
-2023/12/04 | 2366196 | macros/latex/contrib/nicematrix.zip
+2023/12/13 | 1417944 | macros/latex/contrib/nicematrix.zip
2015/11/21 | 217 | macros/latex/contrib/nicetext/ANNOUNCE.txt
2012/03/18 | 254582 | macros/latex/contrib/nicetext/demo/arseneau.pdf
2011/09/14 | 10 | macros/latex/contrib/nicetext/demo/iso.txt
@@ -287286,19 +287294,19 @@
2021/05/03 | 629 | support/TeX4ht/doc/README
2020/08/24 | 358454 | support/TeX4ht/doc/TeX4ht-doc.tex
2021/05/11 | 262 | support/TeX4ht/README
-2023/12/11 | 238870 | support/TeX4ht/source/ChangeLog
+2023/12/12 | 239609 | support/TeX4ht/source/ChangeLog
2021/05/03 | 1375 | support/TeX4ht/source/checklog.lua
2021/05/03 | 1189 | support/TeX4ht/source/common-code.tex
2021/05/03 | 2727 | support/TeX4ht/source/common-info.tex
2021/05/03 | 1569 | support/TeX4ht/source/common.tex
2021/05/06 | 15 | support/TeX4ht/source/extra-bin/vcss
2021/05/06 | 15 | support/TeX4ht/source/extra-bin/xmllint
-2023/02/12 | 28067 | support/TeX4ht/source/Makefile
-2023/11/20 | 8754 | support/TeX4ht/source/mktex4ht-cnf.tex
+2023/12/12 | 28548 | support/TeX4ht/source/Makefile
+2023/12/12 | 8778 | support/TeX4ht/source/mktex4ht-cnf.tex
2021/05/03 | 1121 | support/TeX4ht/source/README
2021/05/03 | 1744 | support/TeX4ht/source/t1fontmake.lua
2021/05/03 | 297 | support/TeX4ht/source/t1fontsample.tex
-2023/12/11 | 1171775 | support/TeX4ht/source/tex4ht-4ht.tex
+2023/12/12 | 1172200 | support/TeX4ht/source/tex4ht-4ht.tex
2021/05/03 | 7127 | support/TeX4ht/source/tex4ht-auto-script.tex
2021/05/16 | 1539 | support/TeX4ht/source/tex4ht-bibtex2.tex
2023/10/16 | 21307 | support/TeX4ht/source/tex4ht-cond4ht.tex
@@ -287327,7 +287335,7 @@
2021/05/03 | 14218 | support/TeX4ht/source/tex4ht-htcmd.tex
2021/05/03 | 70683 | support/TeX4ht/source/tex4ht-html0.tex
2021/05/03 | 164748 | support/TeX4ht/source/tex4ht-html32.tex
-2023/11/11 | 623162 | support/TeX4ht/source/tex4ht-html4.tex
+2023/12/12 | 624009 | support/TeX4ht/source/tex4ht-html4.tex
2023/10/09 | 12034 | support/TeX4ht/source/tex4ht-html5.tex
2021/06/17 | 648233 | support/TeX4ht/source/tex4ht-html-speech.tex
2021/05/03 | 59483 | support/TeX4ht/source/tex4ht-html-speech-xtpipes.tex
@@ -295130,8 +295138,8 @@
2019/02/28 | 72980 | systems/texlive/tlnet/archive/etaremune.doc.r15878.tar.xz
2019/02/28 | 1816 | systems/texlive/tlnet/archive/etaremune.r15878.tar.xz
2019/02/28 | 6716 | systems/texlive/tlnet/archive/etaremune.source.r15878.tar.xz
-2022/02/05 | 357012 | systems/texlive/tlnet/archive/etbb.doc.r61872.tar.xz
-2022/02/05 | 1054288 | systems/texlive/tlnet/archive/etbb.r61872.tar.xz
+2023/12/13 | 357152 | systems/texlive/tlnet/archive/etbb.doc.r69098.tar.xz
+2023/12/13 | 1052228 | systems/texlive/tlnet/archive/etbb.r69098.tar.xz
2019/02/28 | 1019908 | systems/texlive/tlnet/archive/etdipa.doc.r36354.tar.xz
2019/02/28 | 556 | systems/texlive/tlnet/archive/etdipa.r36354.tar.xz
2019/12/18 | 300584 | systems/texlive/tlnet/archive/etexcmds.doc.r53171.tar.xz
@@ -297331,13 +297339,13 @@
2019/02/28 | 344 | systems/texlive/tlnet/archive/l3build.amd64-freebsd.r46894.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/l3build.amd64-netbsd.r46894.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/l3build.armhf-linux.r46894.tar.xz
-2023/11/02 | 748296 | systems/texlive/tlnet/archive/l3build.doc.r68720.tar.xz
+2023/12/13 | 749604 | systems/texlive/tlnet/archive/l3build.doc.r69100.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/l3build.i386-freebsd.r46894.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/l3build.i386-linux.r46894.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/l3build.i386-netbsd.r46894.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/l3build.i386-solaris.r46894.tar.xz
-2023/11/02 | 36608 | systems/texlive/tlnet/archive/l3build.r68720.tar.xz
-2023/11/02 | 31692 | systems/texlive/tlnet/archive/l3build.source.r68720.tar.xz
+2023/12/13 | 36804 | systems/texlive/tlnet/archive/l3build.r69100.tar.xz
+2023/12/13 | 31720 | systems/texlive/tlnet/archive/l3build.source.r69100.tar.xz
2021/02/25 | 340 | systems/texlive/tlnet/archive/l3build.universal-darwin.r57908.tar.xz
2023/02/20 | 2308 | systems/texlive/tlnet/archive/l3build.windows.r65891.tar.xz
2019/02/28 | 344 | systems/texlive/tlnet/archive/l3build.x86_64-cygwin.r46894.tar.xz
@@ -297395,9 +297403,9 @@
2019/02/28 | 313268 | systems/texlive/tlnet/archive/langcode.doc.r27764.tar.xz
2019/02/28 | 3032 | systems/texlive/tlnet/archive/langcode.r27764.tar.xz
2019/02/28 | 2064 | systems/texlive/tlnet/archive/langcode.source.r27764.tar.xz
-2023/01/10 | 107712 | systems/texlive/tlnet/archive/langnames.doc.r65502.tar.xz
-2023/01/10 | 137972 | systems/texlive/tlnet/archive/langnames.r65502.tar.xz
-2023/01/10 | 6120 | systems/texlive/tlnet/archive/langnames.source.r65502.tar.xz
+2023/12/13 | 107500 | systems/texlive/tlnet/archive/langnames.doc.r69101.tar.xz
+2023/12/13 | 125060 | systems/texlive/tlnet/archive/langnames.r69101.tar.xz
+2023/12/13 | 6136 | systems/texlive/tlnet/archive/langnames.source.r69101.tar.xz
2023/02/22 | 156860 | systems/texlive/tlnet/archive/langsci-avm.doc.r66016.tar.xz
2023/02/22 | 4412 | systems/texlive/tlnet/archive/langsci-avm.r66016.tar.xz
2023/02/22 | 14200 | systems/texlive/tlnet/archive/langsci-avm.source.r66016.tar.xz
@@ -299123,8 +299131,8 @@
2020/06/12 | 186684 | systems/texlive/tlnet/archive/moderntimeline.doc.r55518.tar.xz
2020/06/12 | 2516 | systems/texlive/tlnet/archive/moderntimeline.r55518.tar.xz
2020/06/12 | 6460 | systems/texlive/tlnet/archive/moderntimeline.source.r55518.tar.xz
-2022/01/24 | 275952 | systems/texlive/tlnet/archive/modes.doc.r61719.tar.xz
-2022/01/24 | 27320 | systems/texlive/tlnet/archive/modes.r61719.tar.xz
+2023/12/13 | 275952 | systems/texlive/tlnet/archive/modes.doc.r69105.tar.xz
+2023/12/13 | 27440 | systems/texlive/tlnet/archive/modes.r69105.tar.xz
2020/11/10 | 546580 | systems/texlive/tlnet/archive/modiagram.doc.r56886.tar.xz
2020/11/10 | 8876 | systems/texlive/tlnet/archive/modiagram.r56886.tar.xz
2019/02/28 | 148376 | systems/texlive/tlnet/archive/modref.doc.r15878.tar.xz
@@ -299464,8 +299472,8 @@
2022/03/21 | 6560 | systems/texlive/tlnet/archive/newcastle-bst.r62856.tar.xz
2019/02/28 | 407624 | systems/texlive/tlnet/archive/newcommand.doc.r18704.tar.xz
2019/02/28 | 496 | systems/texlive/tlnet/archive/newcommand.r18704.tar.xz
-2023/12/06 | 15535876 | systems/texlive/tlnet/archive/newcomputermodern.doc.r69039.tar.xz
-2023/12/06 | 6183796 | systems/texlive/tlnet/archive/newcomputermodern.r69039.tar.xz
+2023/12/13 | 15538836 | systems/texlive/tlnet/archive/newcomputermodern.doc.r69099.tar.xz
+2023/12/13 | 6197960 | systems/texlive/tlnet/archive/newcomputermodern.r69099.tar.xz
2019/02/28 | 1632 | systems/texlive/tlnet/archive/newenviron.doc.r29331.tar.xz
2019/02/28 | 2488 | systems/texlive/tlnet/archive/newenviron.r29331.tar.xz
2019/02/28 | 147644 | systems/texlive/tlnet/archive/newfile.doc.r15878.tar.xz
@@ -300671,9 +300679,9 @@
2019/02/28 | 3152 | systems/texlive/tlnet/archive/poster-mac.r18305.tar.xz
2023/06/13 | 873692 | systems/texlive/tlnet/archive/postit.doc.r67344.tar.xz
2023/06/13 | 4552 | systems/texlive/tlnet/archive/postit.r67344.tar.xz
-2023/11/15 | 1004116 | systems/texlive/tlnet/archive/postnotes.doc.r68840.tar.xz
-2023/11/15 | 7396 | systems/texlive/tlnet/archive/postnotes.r68840.tar.xz
-2023/11/15 | 22524 | systems/texlive/tlnet/archive/postnotes.source.r68840.tar.xz
+2023/12/13 | 1004252 | systems/texlive/tlnet/archive/postnotes.doc.r69102.tar.xz
+2023/12/13 | 7404 | systems/texlive/tlnet/archive/postnotes.r69102.tar.xz
+2023/12/13 | 22544 | systems/texlive/tlnet/archive/postnotes.source.r69102.tar.xz
2021/05/20 | 948160 | systems/texlive/tlnet/archive/powerdot.doc.r59272.tar.xz
2019/11/26 | 280080 | systems/texlive/tlnet/archive/powerdot-fuberlin.doc.r52922.tar.xz
2019/11/26 | 2704 | systems/texlive/tlnet/archive/powerdot-fuberlin.r52922.tar.xz
@@ -302672,13 +302680,13 @@
2023/08/16 | 108860 | systems/texlive/tlnet/archive/tex4ht.amd64-freebsd.r67940.tar.xz
2023/08/16 | 87320 | systems/texlive/tlnet/archive/tex4ht.amd64-netbsd.r67940.tar.xz
2023/08/16 | 69948 | systems/texlive/tlnet/archive/tex4ht.armhf-linux.r67940.tar.xz
-2023/12/12 | 136384 | systems/texlive/tlnet/archive/tex4ht.doc.r69095.tar.xz
+2023/12/13 | 136384 | systems/texlive/tlnet/archive/tex4ht.doc.r69104.tar.xz
2023/08/16 | 93764 | systems/texlive/tlnet/archive/tex4ht.i386-freebsd.r67940.tar.xz
2023/08/16 | 91236 | systems/texlive/tlnet/archive/tex4ht.i386-linux.r67940.tar.xz
2023/08/16 | 76184 | systems/texlive/tlnet/archive/tex4ht.i386-netbsd.r67940.tar.xz
2023/08/16 | 83936 | systems/texlive/tlnet/archive/tex4ht.i386-solaris.r67940.tar.xz
-2023/12/12 | 1108536 | systems/texlive/tlnet/archive/tex4ht.r69095.tar.xz
-2023/12/12 | 1459284 | systems/texlive/tlnet/archive/tex4ht.source.r69095.tar.xz
+2023/12/13 | 1108672 | systems/texlive/tlnet/archive/tex4ht.r69104.tar.xz
+2023/12/13 | 1461268 | systems/texlive/tlnet/archive/tex4ht.source.r69104.tar.xz
2023/08/16 | 184636 | systems/texlive/tlnet/archive/tex4ht.universal-darwin.r67940.tar.xz
2023/10/23 | 62056 | systems/texlive/tlnet/archive/tex4ht.windows.r68621.tar.xz
2023/08/16 | 57992 | systems/texlive/tlnet/archive/tex4ht.x86_64-cygwin.r67940.tar.xz
@@ -302956,7 +302964,7 @@
2022/09/13 | 600 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.r64356.tar.xz
2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.r64356.tar.xz
2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.r64356.tar.xz
-2023/12/12 | 430688 | systems/texlive/tlnet/archive/texlive-scripts.doc.r69088.tar.xz
+2023/12/13 | 430620 | systems/texlive/tlnet/archive/texlive-scripts.doc.r69097.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
@@ -302978,7 +302986,7 @@
2022/09/13 | 592 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r64356.tar.xz
2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r64356.tar.xz
2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r64356.tar.xz
-2023/12/12 | 114260 | systems/texlive/tlnet/archive/texlive-scripts.r69088.tar.xz
+2023/12/13 | 114264 | systems/texlive/tlnet/archive/texlive-scripts.r69097.tar.xz
2022/09/13 | 580 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r64356.tar.xz
2023/05/14 | 60312 | systems/texlive/tlnet/archive/texlive-scripts.windows.r67095.tar.xz
2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r64356.tar.xz
@@ -303709,8 +303717,8 @@
2019/02/28 | 254104 | systems/texlive/tlnet/archive/tucv.doc.r20680.tar.xz
2019/02/28 | 1860 | systems/texlive/tlnet/archive/tucv.r20680.tar.xz
2019/02/28 | 4996 | systems/texlive/tlnet/archive/tucv.source.r20680.tar.xz
-2023/07/14 | 1132920 | systems/texlive/tlnet/archive/tuda-ci.doc.r67622.tar.xz
-2023/07/14 | 44264 | systems/texlive/tlnet/archive/tuda-ci.r67622.tar.xz
+2023/12/13 | 1165436 | systems/texlive/tlnet/archive/tuda-ci.doc.r69103.tar.xz
+2023/12/13 | 47948 | systems/texlive/tlnet/archive/tuda-ci.r69103.tar.xz
2022/08/10 | 3971388 | systems/texlive/tlnet/archive/tudscr.doc.r64085.tar.xz
2022/08/10 | 164240 | systems/texlive/tlnet/archive/tudscr.r64085.tar.xz
2022/08/10 | 325572 | systems/texlive/tlnet/archive/tudscr.source.r64085.tar.xz
@@ -304866,16 +304874,16 @@
2020/07/18 | 47816 | systems/texlive/tlnet/archive/zztex.doc.r55862.tar.xz
2020/07/18 | 101724 | systems/texlive/tlnet/archive/zztex.r55862.tar.xz
2023/08/07 | 125713 | systems/texlive/tlnet/install-tl
-2023/12/12 | 5743870 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2023/12/12 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2023/12/12 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2023/12/13 | 5743997 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2023/12/13 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2023/12/13 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2023/05/13 | 5083 | systems/texlive/tlnet/install-tl-windows.bat
-2023/12/12 | 21035714 | systems/texlive/tlnet/install-tl-windows.exe
-2023/12/12 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2023/12/12 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2023/12/12 | 26029657 | systems/texlive/tlnet/install-tl.zip
-2023/12/12 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2023/12/12 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2023/12/13 | 21035766 | systems/texlive/tlnet/install-tl-windows.exe
+2023/12/13 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2023/12/13 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2023/12/13 | 26029657 | systems/texlive/tlnet/install-tl.zip
+2023/12/13 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2023/12/13 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
2023/03/19 | 1229 | systems/texlive/tlnet/README.md
2023/03/19 | 0 | systems/texlive/tlnet/TEXLIVE_2023
2023/01/17 | 8401 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
@@ -304927,12 +304935,12 @@
2023/02/21 | 20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
2021/12/21 | 5429 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
2023/04/08 | 28167 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2023/12/12 | 18381206 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2023/12/12 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2023/12/13 | 18377414 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2023/12/13 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2023/10/16 | 87924 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2023/12/12 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2023/12/12 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2023/12/12 | 2491972 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2023/12/13 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2023/12/13 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2023/12/13 | 2493060 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2023/02/20 | 58928 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
2023/06/11 | 42749 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
2023/02/21 | 16138 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -315933,7 +315941,7 @@
2014/07/05 | 611 | systems/win32/yandy/README
2014/07/05 | 1004628 | systems/win32/yandy/yandy-src.tar.xz
2014/07/05 | 1012416 | systems/win32/yandy.zip
-2023/12/13 | 186 | timestamp
+2023/12/14 | 186 | timestamp
2002/08/26 | 61898 | usergrps/dante/antrag.pdf
2002/08/26 | 118217 | usergrps/dante/antrag.ps
2021/11/11 | 917 | usergrps/dante/dtk/doc/beispiel.bib
diff --git a/FILES.byname.gz b/FILES.byname.gz
index fb7a67cee1..4752b76046 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index c099a6ab7c..54e5c470c9 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,37 +1,104 @@
+2023/12/13 | 910052 | macros/latex/contrib/litesolution/doc/litesolution.pdf
+2023/12/13 | 825519 | install/macros/latex/contrib/l3build.tds.zip
+2023/12/13 | 821646 | macros/latex/contrib/l3build.zip
+2023/12/13 | 8092 | macros/latex/contrib/l3build/l3build-variables.lua
+2023/12/13 | 7805 | macros/latex/contrib/l3build/l3build-arguments.lua
+2023/12/13 | 749604 | systems/texlive/tlnet/archive/l3build.doc.r69100.tar.xz
+2023/12/13 | 747895 | macros/latex/contrib/l3build/l3build.pdf
+2023/12/13 | 74740 | biblio/bibtex/contrib/iran-bibtex.zip
+2023/12/13 | 7404 | systems/texlive/tlnet/archive/postnotes.r69102.tar.xz
+2023/12/13 | 7206 | macros/latex/contrib/l3build/l3build-manifest.lua
+2023/12/13 | 7156 | macros/latex/contrib/l3build/l3build.lua
+2023/12/13 | 6313 | macros/latex/contrib/l3build/l3build-aux.lua
+2023/12/13 | 6197960 | systems/texlive/tlnet/archive/newcomputermodern.r69099.tar.xz
+2023/12/13 | 6151 | macros/latex/contrib/l3build/l3build-typesetting.lua
+2023/12/13 | 6136 | systems/texlive/tlnet/archive/langnames.source.r69101.tar.xz
+2023/12/13 | 612159 | macros/latex/contrib/nicematrix/nicematrix.pdf
+2023/12/13 | 596600 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
+2023/12/13 | 594500 | macros/latex/contrib/nicematrix/nicematrix-code.dtx
+2023/12/13 | 5743997 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2023/12/13 | 4972 | macros/latex/contrib/l3build/l3build-ctan.lua
+2023/12/13 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2023/12/13 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2023/12/13 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2023/12/13 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2023/12/13 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2023/12/13 | 47948 | systems/texlive/tlnet/archive/tuda-ci.r69103.tar.xz
+2023/12/13 | 4338 | macros/latex/contrib/l3build/l3build-stdmain.lua
+2023/12/13 | 430620 | systems/texlive/tlnet/archive/texlive-scripts.doc.r69097.tar.xz
+2023/12/13 | 4150 | macros/latex/contrib/l3build/l3build-zip.lua
+2023/12/13 | 4113941 | biblio/ctan-bibdata.zip
+2023/12/13 | 3987491 | fonts/greek/gfs/gfsdidot.zip
+2023/12/13 | 38462 | macros/latex/contrib/l3build/l3build-check.lua
+2023/12/13 | 3708800 | biblio/ctan-bibdata/ctan.pdf
+2023/12/13 | 36804 | systems/texlive/tlnet/archive/l3build.r69100.tar.xz
+2023/12/13 | 357152 | systems/texlive/tlnet/archive/etbb.doc.r69098.tar.xz
+2023/12/13 | 3401 | macros/latex/contrib/litesolution/doc/litesolution-gauge.tex
+2023/12/13 | 31720 | systems/texlive/tlnet/archive/l3build.source.r69100.tar.xz
+2023/12/13 | 306101 | fonts/modes.zip
+2023/12/13 | 2831737 | biblio/ctan-bibdata/ctan.bib
+2023/12/13 | 275952 | systems/texlive/tlnet/archive/modes.doc.r69105.tar.xz
+2023/12/13 | 2745 | macros/latex/contrib/l3build/l3build-unpack.lua
+2023/12/13 | 27440 | systems/texlive/tlnet/archive/modes.r69105.tar.xz
+2023/12/13 | 26029657 | systems/texlive/tlnet/install-tl.zip
+2023/12/13 | 2493060 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2023/12/13 | 2473 | macros/latex/contrib/l3build/l3build-help.lua
+2023/12/13 | 235 | fonts/greek/gfs/gfsdidot/README
+2023/12/13 | 2285 | macros/latex/contrib/l3build/l3build-tagging.lua
+2023/12/13 | 22544 | systems/texlive/tlnet/archive/postnotes.source.r69102.tar.xz
+2023/12/13 | 22506 | macros/latex/contrib/l3build/CHANGELOG.md
+2023/12/13 | 22231 | macros/latex/contrib/litesolution/doc/litesolution-demo.tex
+2023/12/13 | 221 | macros/latex/contrib/litesolution/doc/litesolution.tex
+2023/12/13 | 2149 | macros/latex/contrib/l3build/l3build-clean.lua
+2023/12/13 | 21035766 | systems/texlive/tlnet/install-tl-windows.exe
+2023/12/13 | 18377414 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2023/12/13 | 1818 | macros/latex/contrib/l3build/l3build.1
+2023/12/13 | 17696 | macros/latex/contrib/litesolution/tex/litesolution.cls
+2023/12/13 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2023/12/13 | 15538836 | systems/texlive/tlnet/archive/newcomputermodern.doc.r69099.tar.xz
+2023/12/13 | 1540 | macros/latex/contrib/l3build/l3build.ins
+2023/12/13 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2023/12/13 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2023/12/13 | 15256 | macros/latex/contrib/litesolution/doc/litesolution-doc.tex
+2023/12/13 | 1461268 | systems/texlive/tlnet/archive/tex4ht.source.r69104.tar.xz
+2023/12/13 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2023/12/13 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2023/12/13 | 1421214 | macros/latex/contrib/litesolution.zip
+2023/12/13 | 1417944 | macros/latex/contrib/nicematrix.zip
+2023/12/13 | 13737 | fonts/greek/gfs/gfsdidot/tex/gfsdidot.sty
+2023/12/13 | 136384 | systems/texlive/tlnet/archive/tex4ht.doc.r69104.tar.xz
+2023/12/13 | 13211 | macros/latex/contrib/l3build/l3build-upload.lua
+2023/12/13 | 12611 | macros/latex/contrib/l3build/l3build-file-functions.lua
+2023/12/13 | 125060 | systems/texlive/tlnet/archive/langnames.r69101.tar.xz
+2023/12/13 | 1165436 | systems/texlive/tlnet/archive/tuda-ci.doc.r69103.tar.xz
+2023/12/13 | 114264 | systems/texlive/tlnet/archive/texlive-scripts.r69097.tar.xz
+2023/12/13 | 113482 | macros/latex/contrib/l3build/l3build.dtx
+2023/12/13 | 11105 | macros/latex/contrib/l3build/l3build-install.lua
+2023/12/13 | 1108672 | systems/texlive/tlnet/archive/tex4ht.r69104.tar.xz
+2023/12/13 | 10786 | macros/latex/contrib/l3build/l3build-manifest-setup.lua
+2023/12/13 | 107500 | systems/texlive/tlnet/archive/langnames.doc.r69101.tar.xz
+2023/12/13 | 1052228 | systems/texlive/tlnet/archive/etbb.r69098.tar.xz
+2023/12/13 | 103140 | fonts/greek/gfs/gfsdidot/opentype/GFSOlgaGrDidotItEn.otf
+2023/12/13 | 1021 | macros/latex/contrib/l3build/README.md
+2023/12/13 | 1004252 | systems/texlive/tlnet/archive/postnotes.doc.r69102.tar.xz
+2023/12/12 | 97995 | fonts/modes/modes.mf
2023/12/12 | 95988 | systems/texlive/tlnet/archive/parsimatn.doc.r69090.tar.xz
+2023/12/12 | 8778 | support/TeX4ht/source/mktex4ht-cnf.tex
2023/12/12 | 865 | macros/latex/contrib/postnotes/README.md
-2023/12/12 | 825442 | install/macros/latex/contrib/l3build.tds.zip
-2023/12/12 | 821567 | macros/latex/contrib/l3build.zip
2023/12/12 | 819243 | macros/latex/contrib/postnotes/postnotes-code.pdf
2023/12/12 | 815268 | systems/texlive/tlnet/archive/polyglossia.doc.r69093.tar.xz
-2023/12/12 | 8092 | macros/latex/contrib/l3build/l3build-variables.lua
-2023/12/12 | 7805 | macros/latex/contrib/l3build/l3build-arguments.lua
-2023/12/12 | 747893 | macros/latex/contrib/l3build/l3build.pdf
-2023/12/12 | 7206 | macros/latex/contrib/l3build/l3build-manifest.lua
-2023/12/12 | 7131 | macros/latex/contrib/l3build/l3build.lua
2023/12/12 | 7014941 | macros/latex/contrib/tuda-ci.zip
2023/12/12 | 672 | macros/latex/contrib/langnames/README.md
-2023/12/12 | 6313 | macros/latex/contrib/l3build/l3build-aux.lua
-2023/12/12 | 6151 | macros/latex/contrib/l3build/l3build-typesetting.lua
+2023/12/12 | 624009 | support/TeX4ht/source/tex4ht-html4.tex
+2023/12/12 | 61876 | biblio/bibtex/contrib/iran-bibtex/iran-structure.pdf
2023/12/12 | 610580 | systems/texlive/tlnet/archive/l3kernel.source.r69092.tar.xz
2023/12/12 | 577756 | systems/texlive/tlnet/archive/covington.doc.r69091.tar.xz
-2023/12/12 | 5743870 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2023/12/12 | 4972 | macros/latex/contrib/l3build/l3build-ctan.lua
-2023/12/12 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
-2023/12/12 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2023/12/12 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2023/12/12 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2023/12/12 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2023/12/12 | 56650 | biblio/bibtex/contrib/iran-bibtex/iran.bst
2023/12/12 | 46297 | fonts/newcomputermodern/doc/newcm-doc.tex
2023/12/12 | 45504 | macros/latex/contrib/postnotes/postnotes-doc.tex
2023/12/12 | 4381 | macros/latex/contrib/postnotes/CHANGELOG.md
-2023/12/12 | 4338 | macros/latex/contrib/l3build/l3build-stdmain.lua
-2023/12/12 | 430688 | systems/texlive/tlnet/archive/texlive-scripts.doc.r69088.tar.xz
-2023/12/12 | 4150 | macros/latex/contrib/l3build/l3build-zip.lua
-2023/12/12 | 4113947 | biblio/ctan-bibdata.zip
+2023/12/12 | 4309 | fonts/modes/GNUmakefile
2023/12/12 | 385364 | systems/texlive/tlnet/archive/parsimatn.r69090.tar.xz
-2023/12/12 | 38477 | macros/latex/contrib/l3build/l3build-check.lua
-2023/12/12 | 3708800 | biblio/ctan-bibdata/ctan.pdf
2023/12/12 | 358249 | macros/latex/contrib/langnames/ln_fams_glot.tex
2023/12/12 | 356692 | systems/texlive/tlnet/archive/jnuexam.doc.r69089.tar.xz
2023/12/12 | 345296 | macros/latex/contrib/langnames/ln_langs_glot.tex
@@ -40,56 +107,39 @@
2023/12/12 | 322810 | macros/latex/contrib/langnames/ln_fams_wals.tex
2023/12/12 | 310002 | macros/latex/contrib/langnames/ln_langs_wals.tex
2023/12/12 | 306266 | macros/latex/contrib/langnames.zip
-2023/12/12 | 2831734 | biblio/ctan-bibdata/ctan.bib
-2023/12/12 | 2745 | macros/latex/contrib/l3build/l3build-unpack.lua
-2023/12/12 | 26029657 | systems/texlive/tlnet/install-tl.zip
+2023/12/12 | 28548 | support/TeX4ht/source/Makefile
+2023/12/12 | 268137 | fonts/modes/modes.pdf
2023/12/12 | 2556 | macros/latex/contrib/postnotes/postnotes.ins
2023/12/12 | 255068 | fonts/newcomputermodern/doc/newcm-doc.pdf
2023/12/12 | 25201725 | fonts/newcomputermodern.zip
-2023/12/12 | 2491972 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
-2023/12/12 | 2473 | macros/latex/contrib/l3build/l3build-help.lua
-2023/12/12 | 2285 | macros/latex/contrib/l3build/l3build-tagging.lua
-2023/12/12 | 22243 | macros/latex/contrib/l3build/CHANGELOG.md
-2023/12/12 | 2149 | macros/latex/contrib/l3build/l3build-clean.lua
-2023/12/12 | 21035714 | systems/texlive/tlnet/install-tl-windows.exe
+2023/12/12 | 2428 | biblio/bibtex/contrib/iran-bibtex/iran-bibtex.sty
+2023/12/12 | 239609 | support/TeX4ht/source/ChangeLog
+2023/12/12 | 2383 | biblio/bibtex/contrib/iran-bibtex/README.md
2023/12/12 | 203385 | macros/latex/contrib/postnotes/postnotes-doc.pdf
2023/12/12 | 18628 | macros/latex/contrib/langnames/langnames.dtx
-2023/12/12 | 18381206 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2023/12/12 | 1816 | macros/latex/contrib/l3build/l3build.1
2023/12/12 | 177748 | systems/texlive/tlnet/archive/l3kernel.r69092.tar.xz
2023/12/12 | 169816 | systems/texlive/tlnet/archive/polyglossia.source.r69093.tar.xz
-2023/12/12 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
2023/12/12 | 165142 | macros/latex/contrib/langnames/langnames.pdf
2023/12/12 | 163 | macros/latex/contrib/langnames/ln_langs_wals_native.tex
2023/12/12 | 163 | macros/latex/contrib/langnames/ln_langs_glot_native.tex
-2023/12/12 | 1540 | macros/latex/contrib/l3build/l3build.ins
-2023/12/12 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2023/12/12 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2023/12/12 | 15675 | fonts/modes/ChangeLog
2023/12/12 | 14 | macros/latex/contrib/postnotes/DEPENDS.txt
2023/12/12 | 1493 | macros/latex/contrib/langnames/langnames.ins
-2023/12/12 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2023/12/12 | 1459284 | systems/texlive/tlnet/archive/tex4ht.source.r69095.tar.xz
-2023/12/12 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2023/12/12 | 14785 | biblio/bibtex/contrib/iran-bibtex/iran-structure.tex
2023/12/12 | 1425 | macros/latex/contrib/postnotes/postnotes-code.tex
2023/12/12 | 13816568 | fonts/newcomputermodern/source.txz
-2023/12/12 | 136384 | systems/texlive/tlnet/archive/tex4ht.doc.r69095.tar.xz
2023/12/12 | 13223 | fonts/newcomputermodern/README
-2023/12/12 | 13211 | macros/latex/contrib/l3build/l3build-upload.lua
2023/12/12 | 126768 | systems/texlive/tlnet/archive/polyglossia.r69093.tar.xz
-2023/12/12 | 12611 | macros/latex/contrib/l3build/l3build-file-functions.lua
+2023/12/12 | 1246 | fonts/modes/modenames.txt
2023/12/12 | 12364 | systems/texlive/tlnet/archive/covington.r69091.tar.xz
2023/12/12 | 12284 | systems/texlive/tlnet/archive/jnuexam.r69089.tar.xz
2023/12/12 | 1223184 | fonts/newcomputermodern/otf/NewCMMath-Book.otf
2023/12/12 | 12220536 | systems/texlive/tlnet/archive/l3kernel.doc.r69092.tar.xz
-2023/12/12 | 114260 | systems/texlive/tlnet/archive/texlive-scripts.r69088.tar.xz
-2023/12/12 | 113480 | macros/latex/contrib/l3build/l3build.dtx
-2023/12/12 | 11105 | macros/latex/contrib/l3build/l3build-install.lua
-2023/12/12 | 1108536 | systems/texlive/tlnet/archive/tex4ht.r69095.tar.xz
+2023/12/12 | 1172200 | support/TeX4ht/source/tex4ht-4ht.tex
2023/12/12 | 1101016 | fonts/newcomputermodern/otf/NewCMMath-Regular.otf
-2023/12/12 | 10786 | macros/latex/contrib/l3build/l3build-manifest-setup.lua
+2023/12/12 | 10879 | fonts/modes/modelist.txt
2023/12/12 | 1029442 | macros/latex/contrib/postnotes.zip
2023/12/12 | 102847 | macros/latex/contrib/postnotes/postnotes.dtx
-2023/12/12 | 1019 | macros/latex/contrib/l3build/README.md
2023/12/11 | 9999 | macros/latex/contrib/l3kernel/l3news10.tex
2023/12/11 | 99920 | fonts/etbb/opentype/ETbb-BoldItalic.otf
2023/12/11 | 98917 | macros/latex/contrib/l3kernel/l3seq.dtx
@@ -496,7 +546,6 @@
2023/12/11 | 24068 | fonts/etbb/tfm/ETbb-Italic-tlf-t1.tfm
2023/12/11 | 24052 | fonts/etbb/tfm/Etbb1-Italic-tosf-t1.tfm
2023/12/11 | 24052 | fonts/etbb/tfm/Etbb1-Italic-tlf-t1.tfm
-2023/12/11 | 238870 | support/TeX4ht/source/ChangeLog
2023/12/11 | 2385 | macros/latex/contrib/l3kernel/l3docstrip.dtx
2023/12/11 | 23829 | macros/latex/contrib/l3kernel/l3luatex.dtx
2023/12/11 | 23816 | fonts/etbb/tfm/ETbb-Bold-lf-t1.tfm
@@ -1055,7 +1104,6 @@
2023/12/11 | 11884 | macros/latex/contrib/l3kernel/l3styleguide.tex
2023/12/11 | 11779 | macros/latex/contrib/l3kernel/l3fparray.dtx
2023/12/11 | 117208 | fonts/etbb/opentype/ETbb-Regular.otf
-2023/12/11 | 1171775 | support/TeX4ht/source/tex4ht-4ht.tex
2023/12/11 | 116349 | macros/latex/contrib/l3kernel/l3token.dtx
2023/12/11 | 114869 | fonts/etbb/type1/ETbb-Italic.pfb
2023/12/11 | 114754 | macros/latex/contrib/l3kernel/l3news04.pdf
@@ -1573,6 +1621,7 @@
2023/12/08 | 202441 | install/macros/luatex/generic/luamplib.tds.zip
2023/12/08 | 1984 | macros/latex/contrib/onedown/Examples/ExpertQuiz.tex
2023/12/08 | 1968 | macros/latex/contrib/onedown/onedown.ins
+2023/12/08 | 1916 | biblio/bibtex/contrib/iran-bibtex/iran-bibtex-cp1256fa.csf
2023/12/08 | 19106 | fonts/inconsolata-nerd-font/LICENSE.txt
2023/12/08 | 1906 | macros/latex/contrib/l3experimental/l3draw.ins
2023/12/08 | 1896 | macros/latex/contrib/onedown/Examples/CardSymbols.tex
@@ -1691,66 +1740,3 @@
2023/12/07 | 12367 | support/texlogsieve/texlogsieve.1
2023/12/07 | 1088 | macros/luatex/generic/blopentype/LICENSE
2023/12/07 | 1012 | systems/texlive/tlnet/archive/collection-luatex.r69052.tar.xz
-2023/12/06 | 9817 | usergrps/usergrps/de.html
-2023/12/06 | 9763 | usergrps/usergrps/pl.html
-2023/12/06 | 9756 | usergrps/usergrps/hu.html
-2023/12/06 | 9700 | usergrps/usergrps/cz.html
-2023/12/06 | 9596 | usergrps/usergrps/kr.html
-2023/12/06 | 9579 | usergrps/usergrps/fr.html
-2023/12/06 | 9575 | usergrps/usergrps/bg.html
-2023/12/06 | 9537 | usergrps/usergrps/cn.html
-2023/12/06 | 9534 | usergrps/usergrps/nl.html
-2023/12/06 | 9481 | usergrps/usergrps/it.html
-2023/12/06 | 9476 | usergrps/usergrps/es.html
-2023/12/06 | 9364 | usergrps/usergrps/us.html
-2023/12/06 | 9354 | usergrps/usergrps/gr.html
-2023/12/06 | 9330 | usergrps/usergrps/ct.html
-2023/12/06 | 9325 | usergrps/usergrps/pt.html
-2023/12/06 | 9318 | usergrps/usergrps/vn.html
-2023/12/06 | 9297 | usergrps/usergrps/no.html
-2023/12/06 | 9296 | usergrps/usergrps/is.html
-2023/12/06 | 9263 | usergrps/usergrps/ie.html
-2023/12/06 | 9257 | usergrps/usergrps/za.html
-2023/12/06 | 9246 | usergrps/usergrps/uy.html
-2023/12/06 | 9245 | usergrps/usergrps/lt.html
-2023/12/06 | 9244 | usergrps/usergrps/br.html
-2023/12/06 | 9208 | usergrps/usergrps/kh.html
-2023/12/06 | 9197 | usergrps/usergrps/mx.html
-2023/12/06 | 9188 | usergrps/usergrps/dk.html
-2023/12/06 | 9117 | usergrps/usergrps/ee.html
-2023/12/06 | 9098 | usergrps/usergrps/tw.html
-2023/12/06 | 88992 | macros/latex/contrib/decimalcomma/decimalcomma.pdf
-2023/12/06 | 8469 | macros/latex/contrib/proflycee/tex/ProfLycee.sty
-2023/12/06 | 8259 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-rectangle.tex
-2023/12/06 | 7770012 | systems/texlive/tlnet/archive/oberdiek.doc.r69038.tar.xz
-2023/12/06 | 6968 | macros/latex/contrib/decimalcomma/decimalcomma.dtx
-2023/12/06 | 6370 | usergrps/usergrps/index.html
-2023/12/06 | 6183796 | systems/texlive/tlnet/archive/newcomputermodern.r69039.tar.xz
-2023/12/06 | 538480 | systems/texlive/tlnet/archive/ufrgscca.doc.r69042.tar.xz
-2023/12/06 | 5215 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex
-2023/12/06 | 49888 | systems/texlive/tlnet/archive/fbox.doc.r69041.tar.xz
-2023/12/06 | 47421 | usergrps/usergrps/lugs.pdf
-2023/12/06 | 37089 | macros/latex/contrib/spacingtricks/spacingtricks.dtx
-2023/12/06 | 37060 | systems/texlive/tlnet/archive/oberdiek.r69038.tar.xz
-2023/12/06 | 32856 | usergrps/usergrps/lugs.html
-2023/12/06 | 3210869 | macros/latex/contrib/proflycee.zip
-2023/12/06 | 302939 | macros/latex/contrib/thermodynamics.zip
-2023/12/06 | 30120 | macros/latex/contrib/proflycee/tex/proflycee-tools-stats.tex
-2023/12/06 | 270368 | macros/latex/contrib/thermodynamics/thermodynamics.pdf
-2023/12/06 | 24188 | systems/texlive/tlnet/archive/ufrgscca.r69042.tar.xz
-2023/12/06 | 21139 | usergrps/usergrps/lugs.tex
-2023/12/06 | 2105 | usergrps/usergrps/labels.tex
-2023/12/06 | 1992 | macros/latex/contrib/decimalcomma/decimalcomma.ins
-2023/12/06 | 1904 | systems/texlive/tlnet/archive/fbox.r69041.tar.xz
-2023/12/06 | 182798 | macros/latex/contrib/spacingtricks/spacingtricks.pdf
-2023/12/06 | 172257 | macros/latex/contrib/spacingtricks.zip
-2023/12/06 | 169270 | macros/latex/contrib/thermodynamics/thermodynamics.dtx
-2023/12/06 | 1642767 | macros/latex/contrib/proflycee/doc/ProfLycee-docctan.zip
-2023/12/06 | 15535876 | systems/texlive/tlnet/archive/newcomputermodern.doc.r69039.tar.xz
-2023/12/06 | 15492 | systems/texlive/tlnet/archive/wheelchart.r69040.tar.xz
-2023/12/06 | 1444492 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf
-2023/12/06 | 1324454 | macros/unicodetex/latex/njuthesis.zip
-2023/12/06 | 1087704 | systems/texlive/tlnet/archive/wheelchart.doc.r69040.tar.xz
-2023/12/06 | 10649 | usergrps/usergrps/labels.pdf
-2023/12/06 | 1014 | macros/latex/contrib/decimalcomma/README.md
-2023/12/06 | 100772 | systems/texlive/tlnet/archive/oberdiek.source.r69038.tar.xz
diff --git a/biblio/bibtex/contrib/iran-bibtex/README.md b/biblio/bibtex/contrib/iran-bibtex/README.md
new file mode 100644
index 0000000000..9acac96926
--- /dev/null
+++ b/biblio/bibtex/contrib/iran-bibtex/README.md
@@ -0,0 +1,33 @@
+# iran-bibtex — Iran Manual of Style Citation Guide for BibTeX
+The iran-bibtex package is a LaTeX package that provides a BibTeX style based on the [Iran Manual of Style](https://imos.irandoc.ac.ir) (1st edn., 2016) guide to Persian, and English information sources.
+
+Numerous examples of the use of this package have been prepared and are available in [the package's GitHub repository](https://github.com/farshadrasuli/iran-bibtex).
+
+The bibliography style produced by `makebst` program ([custom-bib](https://ctan.org/pkg/custom-bib) package), then modified to implement Persian/Farsi language and be compatible with the Iran Manual of Style guidelines. A file named `iran-bibtex-cp1256fa.csf` is prepared (based on the [ascii.csf](https://ctan.org/tex-archive/biblio/bibtex/bibtex-x/csf/ascii.csf) file) for this package to sort references alphabetically (Persian/Farsi, then English).
+
+**Important note:** If you want the references to be sorted in alphabetical order, where Persian/Farsi is placed first and then English/Latin, you must run `bibtex8 -W -c iran-bibtex-cp1256fa` for compilation, and your bibliography database file (*.bib) must be encoded in `utf8` encryption. If you want to place English/Latin first, run `bibtex` for compilation and there is no need `utf8` encryption for the `bib` file.
+
+This package relies on [natbib](https://ctan.org/pkg/natbib) package and works only with [xepersian](https://ctan.org/pkg/xepersian) package.
+
+
+## Copyright
+Copyright (c) 2023 Farshad Rasuli (farshad.rasuli@gmail.com).
+
+This package distributed under the LaTeX Project Public License. It may be distributed and/or modified under the LaTeX Project Public License, version 1.3c or higher. The latest version of this license is at: http://www.latex-project.org/lppl.txt
+
+This work is “author-maintained” (as per LPPL maintenance status)
+by Farshad Rasuli.
+
+The repository for the package is located at: https://github.com/farshadrasuli/iran-bibtex
+
+
+## Reporting issues
+If you want to report any bugs or issues, please use [the issue tracker](https://github.com/farshadrasuli/iran-bibtex/issues). In doing so, please always explain your issue well enough and always include a minimal working example showing the issue.
+
+
+## Change log
+First version release date: 2023/12/12.
+
+v0.1.0 (2023/12/12)
+ 1. First release on CTAN, and GitHub.
+ 2. Support `@book` entry only \ No newline at end of file
diff --git a/biblio/bibtex/contrib/iran-bibtex/iran-bibtex-cp1256fa.csf b/biblio/bibtex/contrib/iran-bibtex/iran-bibtex-cp1256fa.csf
new file mode 100644
index 0000000000..33455ae16b
--- /dev/null
+++ b/biblio/bibtex/contrib/iran-bibtex/iran-bibtex-cp1256fa.csf
@@ -0,0 +1,124 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% FILE: $RCSfile: cp1256fa.csf,v $
+%% $Revision: 1.0 $
+%% $Date: 2023/12/8 $
+%%
+%% AUTHOR: Farshad Rasuli <farshad.rasuli@gmail.com>
+%%
+%% CHARACTER SET: ASCII + Persian/Farsi (Code Page 1256)
+%%
+%%
+%% SORTING ORDER: Persian-English
+%%
+%%
+%% WARNING
+%%
+%% This is a BibTeX Codepage and Sort definition file (CSF). It is
+%% used to define the 8-bit character set used by BibTeX and the
+%% order in which those characters should be sorted.
+%%
+%% This file will only work with the 8-bit implementation of BibTeX
+%% written by Niel Kempson and Alejandro Aguilar-Sierra.
+%%
+%%
+%% CHANGE LOG
+%%
+%% $Log: cp1256fa.csf,v $
+%%
+%% Revision 1.0 2023/12/8 rasuli
+%% Initial release
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%
+%% SORTING ORDER
+%%
+%% The sorting order defined is the Persian language sorting order then the
+%% natural English language sorting order (i.e. 0..9AaBb..YyZz). Any other
+%% characters will be sorted after the characters in the \order section.
+%%
+\order{
+ ۰
+ ۱
+ ۲
+ ۳
+ ۴
+ ۵
+ ۶
+ ۷
+ ۸
+ ۹
+ ء أ إ ئ ؤ
+ آ
+ ا
+ ب
+ پ
+ ت ة
+ ث
+ ج
+ چ
+ ح
+ خ
+ د
+ ذ
+ ر
+ ز
+ ژ
+ س
+ ش
+ ص
+ ض
+ ط
+ ظ
+ ع
+ غ
+ ف
+ ق
+ ک ك
+ گ
+ ل
+ م
+ ن
+ و
+ ه
+ ی ي
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ A a
+ B b
+ C c
+ D d
+ E e
+ F f
+ G g
+ H h
+ I i
+ J j
+ K k
+ L l
+ M m
+ N n
+ O o
+ P p
+ Q q
+ R r
+ S s
+ T t
+ U u
+ V v
+ W w
+ X x
+ Y y
+ Z z
+}
diff --git a/biblio/bibtex/contrib/iran-bibtex/iran-bibtex.sty b/biblio/bibtex/contrib/iran-bibtex/iran-bibtex.sty
new file mode 100644
index 0000000000..4ace41b7e7
--- /dev/null
+++ b/biblio/bibtex/contrib/iran-bibtex/iran-bibtex.sty
@@ -0,0 +1,113 @@
+%%
+%% This is file “iran-bibtex.sty”,
+%%
+%% __________________________________________________
+%% Copyright (c) 2023 Farshad Rasuli
+%%
+%% It may be distributed and/or modified under the LaTeX Project
+%% Public License version 1.3c or higher. The latest version of the
+%% Lisense is at: http://www.latex-project.org/lppl.txt
+%%
+%% This work is “author-maintained” (as per LPPL maintenance status)
+%% by Farshad Rasuli.
+%%
+%% Location on CTAN: /macros/xetex/latex/iran-bibtex
+%%
+%% Homepage: http://github.com/farshadrasuli/iran-bibtex
+%%
+%% Issue tracker: https://github.com/farshadrasuli/iran-bibtex/issues
+%%
+%%
+
+
+
+% === Package structure: Identification
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{iran-bibtex}
+\def\iranbibtex@version{0.1}
+\def\iranbibtexdate{2023/12/12} % December 12th, 2023
+\def\iranbibtexfirstrelease{2023/12/12} % December 12th, 2023
+\edef\@iranbibtex@info{%
+****************************************************^^J%
+* ^^J%
+* iran-bibtex package^^J%
+* ^^J%
+* Description: This package is an implementation of^^J%
+* the Iran Manual of Style (1st edition, 2016)^^J%
+* citation guide to Persian and English information^^J%
+* sources in BibTeX.^^J%
+* ^^J%
+* Copyright (c) 2023 Farshad Rasuli^^J%
+* ^^J%
+****************************************************^^J%
+}
+
+
+% === Package structure: Preliminary declarations
+
+\RequirePackage{natbib}
+
+
+
+% === Package structures: Options
+
+%% iran bibliography style: author-year style, ordered by authors' name
+\DeclareOption{iran}
+{%
+ \setcitestyle{authoryear,% citation mode
+ round,% braces
+ aysep={},% between author and year
+ }%
+ \bibliographystyle{iran}%
+}
+
+
+%% iran bibliography style: author-year style, ordered by year
+\DeclareOption{iran-year}
+{%
+ \setcitestyle{authoryear,% citation mode
+ round,% braces
+ aysep={},% between author and year
+ }%
+ \bibliographystyle{iran}%
+}
+
+
+
+
+\ProcessOptions\relax
+
+
+
+
+
+% === Package structure: Provide commands
+
+%% provide command for bibliography environment
+\newcommand{\enquote}[1]{``#1''}
+\newcommand{\faquote}[1]{«#1»}
+\providecommand{\url}[1]{{\tt #1}}
+\providecommand{\doi}[1]{{\tt #1‏}}
+
+
+
+
+
+% === Package structure: Change extra label (2000a, b, ...) to persian harfi
+
+\providecommand{\natexlaben}[1]{#1}
+
+\providecommand{\natexlabfa}[1]{#1}
+
+
+
+
+
+
+
+
+
+
+\endinput
+%%
+%% End of file “iran-bibtex.sty”. \ No newline at end of file
diff --git a/biblio/bibtex/contrib/iran-bibtex/iran-structure.pdf b/biblio/bibtex/contrib/iran-bibtex/iran-structure.pdf
new file mode 100644
index 0000000000..2b9a1f0a9f
--- /dev/null
+++ b/biblio/bibtex/contrib/iran-bibtex/iran-structure.pdf
Binary files differ
diff --git a/biblio/bibtex/contrib/iran-bibtex/iran-structure.tex b/biblio/bibtex/contrib/iran-bibtex/iran-structure.tex
new file mode 100644
index 0000000000..ef3bea05a4
--- /dev/null
+++ b/biblio/bibtex/contrib/iran-bibtex/iran-structure.tex
@@ -0,0 +1,181 @@
+\documentclass[a4paper,11pt]{article}
+
+\usepackage{enumitem}
+\usepackage{hyperref}
+
+\usepackage[localise,perpagefootnote=on,computeautoilg=on]{xepersian}
+\settextfont{Parsi Nevis}
+\setpersianmonofont{Vazir Code}
+\setlatintextfont{Parsi Nevis}
+
+\SepMark{-}
+
+\eqcommand{چ‌ر}{lr}
+
+\begin{document}
+\title{خلاصه‌ای از ساختار چیدمان مشخصه‌ها در شیوه‌ی استاددهی {\tt iran.bst}}
+\author{فرشاد رسولی\thanks{رایانامه: \url{farshad.rasuli@gmail.com}}}
+\date{نسخه‌ی ۰٫۱ --- ۲۱ آذر ۱۴۰۲}
+\maketitle
+
+
+\begin{description}
+\item[مدخل (\lr{entry}):] به هر اثری که اطلاعات شناسنامه‌ای آن برای استناددهی در نوشتار وارد میگردد گفته میشود. مدخل میتواند از نوع \verb|@book|، \verb|@incollection|، \verb|@article|، \verb|@inproceeding|، \verb|@masterthesis|، \verb|@phdthesis|، \verb|@misc|، و غیره باشد.
+\item[مشخصه (\lr{field}):] به هر یک از مشخصه‌های شناسنامه‌ای مدخل مانند \lr{\tt author}، \lr{\tt title}، \lr{\tt year}، و غیره گفته میشود.
+\end{description}
+
+
+
+
+
+
+
+
+
+
+\section{کتاب}
+در این بخش، طرح چیدمان مشخصه‌های مدخل کتاب (\verb|@book|) ارائه شده است.
+
+
+
+
+
+\subsection{کتابهایی که زیر نام نویسنده مرتب میشوند}
+اگر برای مدخل کتاب، مشخصه‌ی \verb|author| وارد گردد، زیر نام نویسنده مرتب میشود.
+
+\subsubsection*{کتابهای ترجمه نشده}
+مدخل کتابی که مشخصه‌ی \verb|translator| آن خالی باشد، به صورت زیر فهرست میشود.
+
+\begin{itemize}[nosep]
+\begin{latin}
+\item[] []
+{\tt author}. {\tt year}. {\tt title}. {\tt edition} edn. {\tt impression} imp. by {\tt by}. {\tt volume volumes series number}. In collaboration with {\tt collaboration}. Commented by {\tt commentator}. Compiled by {\tt compiler}. Edited by {\tt editor}. Introduction by {\tt introduction}. Preface by {\tt preface}. Afterwords by {\tt afterword}. {\tt address}:{\tt publisher}. {\tt note}. ISBN: {\tt isbn}. DOI: {\tt doi}. Retrieved {\tt urldate}. URL: {\tt url}.
+\end{latin}
+
+\item[] []
+{\persianttfamily نویسنده}. {\persianttfamily تاریخ}. {\persianttfamily عنوان}. ویرایش {\persianttfamily …}. چاپ {\persianttfamily …}. نوشته‌ی {\persianttfamily …}. {\persianttfamily جلد فروست}. با همکاری {\persianttfamily …}. با یادداشت {\persianttfamily …}. گردآوری {\persianttfamily …}. ویراسته‌ی {\persianttfamily …}. با مقدمه‌ی {\persianttfamily …}. با پیش‌گفتار {\persianttfamily …}. با پس‌گفتار {\persianttfamily …}. {\persianttfamily محل نشر}:{\persianttfamily ناشر}. شابک: {\persianttfamily …}. شناسه‌ی دیجیتال: {\persianttfamily …}. دسترسی در {\persianttfamily …}. تارنما: {\persianttfamily …}.
+\end{itemize}
+
+
+
+\subsubsection*{کتابهای ترجمه شده}
+مدخل کتابی که مشخصه‌ی \verb|translator| آن وارد شود به صورت زیر فهرست میشود.
+
+\begin{itemize}[nosep]
+\begin{latin}
+\item[] []
+{\tt author}. {\tt year}. {\tt title}. {\tt edition} edn. {\tt impression} imp. by {\tt by}. Translated by {\tt translator}. {\tt translateyear}. {\tt volume volumes series number}. In collaboration with {\tt collaboration}. Commented by {\tt commentator}. Compiled by {\tt compiler}. Edited by {\tt editor}. Introduction by {\tt introduction}. Preface by {\tt preface}. Afterwords by {\tt afterword}. {\tt address}:{\tt publisher}. {\tt note}. ISBN: {\tt isbn}. DOI: {\tt doi}. Retrieved {\tt urldate}. URL: {\tt url}.
+\end{latin}
+
+\item[] []
+{\persianttfamily نویسنده}. {\persianttfamily تاریخ}. {\persianttfamily عنوان}. ویرایش {\persianttfamily …}. چاپ {\persianttfamily …}. نوشته‌ی {\persianttfamily …}. ترجمه‌ی {\persianttfamily …}. {\persianttfamily تاریخ ترجمه}. {\persianttfamily جلد فروست}. با همکاری {\persianttfamily …}. با یادداشت {\persianttfamily …}. گردآوری {\persianttfamily …}. ویراسته‌ی {\persianttfamily …}. با مقدمه‌ی {\persianttfamily …}. با پیش‌گفتار {\persianttfamily …}. با پس‌گفتار {\persianttfamily …}. {\persianttfamily محل نشر}:{\persianttfamily ناشر}. شابک: {\persianttfamily …}. شناسه‌ی دیجیتال: {\persianttfamily …}. دسترسی در {\persianttfamily …}. تارنما: {\persianttfamily …}.
+\end{itemize}
+
+
+
+
+
+\subsection{کتابهایی که زیر نام گردآورده مرتب میشوند}
+اگر برای مدخل کتاب، مشخصه‌ی \verb|author| وارد نشود، در صورت وجود مشخصه‌ی \verb|compiler|، زیر نام گردآونده مرتب میشود.
+
+\subsubsection*{کتابهای ترجمه نشده}
+مدخل کتابی که مشخصه‌ی \verb|translator| آن خالی باشد، به صورت زیر فهرست میشود.
+
+\begin{itemize}[nosep]
+\begin{latin}
+\item[] []
+{\tt compiler}, comp(s). {\tt year}. {\tt title}. {\tt edition} edn. {\tt impression} imp. by {\tt by}. {\tt volume volumes series number}. In collaboration with {\tt collaboration}. Commented by {\tt commentator}. Edited by {\tt editor}. Introduction by {\tt introduction}. Preface by {\tt preface}. Afterwords by {\tt afterword}. {\tt address}:{\tt publisher}. {\tt note}. ISBN: {\tt isbn}. DOI: {\tt doi}. Retrieved {\tt urldate}. URL: {\tt url}.
+\end{latin}
+
+\item[] []
+{\persianttfamily گردآورنده}، گردآورنده‌‌‌‌(گان). {\persianttfamily تاریخ}. {\persianttfamily عنوان}. ویرایش {\persianttfamily …}. چاپ {\persianttfamily …}. نوشته‌ی {\persianttfamily …}. {\persianttfamily جلد فروست}. با همکاری {\persianttfamily …}. با یادداشت {\persianttfamily …}. ویراسته‌ی {\persianttfamily …}. با مقدمه‌ی {\persianttfamily …}. با پیش‌گفتار {\persianttfamily …}. با پس‌گفتار {\persianttfamily …}. {\persianttfamily محل نشر}:{\persianttfamily ناشر}. شابک: {\persianttfamily …}. شناسه‌ی دیجیتال: {\persianttfamily …}. دسترسی در {\persianttfamily …}. تارنما: {\persianttfamily …}.
+\end{itemize}
+
+
+
+\subsubsection*{کتابهای ترجمه شده}
+مدخل کتابی که مشخصه‌ی \verb|translator| آن وارد شود به صورت زیر فهرست میشود.
+
+\begin{itemize}[nosep]
+\begin{latin}
+\item[] []
+{\tt compiler}, comp(s). {\tt year}. {\tt title}. {\tt edition} edn. {\tt impression} imp. by {\tt by}. Translated by {\tt translator}. {\tt translateyear}. {\tt volume volumes series number}. In collaboration with {\tt collaboration}. Commented by {\tt commentator}. Edited by {\tt editor}. Introduction by {\tt introduction}. Preface by {\tt preface}. Afterwords by {\tt afterword}. {\tt address}:{\tt publisher}. {\tt note}. ISBN: {\tt isbn}. DOI: {\tt doi}. Retrieved {\tt urldate}. URL: {\tt url}.
+\end{latin}
+
+\item[] []
+{\persianttfamily گردآورنده}، گردآورنده‌‌‌‌(گان). {\persianttfamily تاریخ}. {\persianttfamily عنوان}. ویرایش {\persianttfamily …}. چاپ {\persianttfamily …}. نوشته‌ی {\persianttfamily …}. ترجمه‌ی {\persianttfamily …}. {\persianttfamily تاریخ ترجمه}. {\persianttfamily جلد فروست}. با همکاری {\persianttfamily …}. با یادداشت {\persianttfamily …}. ویراسته‌ی {\persianttfamily …}. با مقدمه‌ی {\persianttfamily …}. با پیش‌گفتار {\persianttfamily …}. با پس‌گفتار {\persianttfamily …}. {\persianttfamily محل نشر}:{\persianttfamily ناشر}. شابک: {\persianttfamily …}. شناسه‌ی دیجیتال: {\persianttfamily …}. دسترسی در {\persianttfamily …}. تارنما: {\persianttfamily …}.
+\end{itemize}
+
+
+
+
+
+\subsection{کتابهایی که زیر نام ویراستار مرتب میشوند}
+اگر برای مدخل کتاب، مشخصه‌های \verb|author|، و \verb|compiler| وارد نشوند، در صورت وجود مشخصه‌ی \verb|editor|، زیر نام ویراستار مرتب میشود.
+
+\subsubsection*{کتابهای ترجمه نشده}
+مدخل کتابی که مشخصه‌ی \verb|translator| آن خالی باشد، به صورت زیر فهرست میشود.
+
+\begin{itemize}[nosep]
+\begin{latin}
+\item[] []
+{\tt editor}, ed(s). {\tt year}. {\tt title}. {\tt edition} edn. {\tt impression} imp. by {\tt by}. {\tt volume volumes series number}. In collaboration with {\tt collaboration}. Commented by {\tt commentator}. Introduction by {\tt introduction}. Preface by {\tt preface}. Afterwords by {\tt afterword}. {\tt address}:{\tt publisher}. {\tt note}. ISBN: {\tt isbn}. DOI: {\tt doi}. Retrieved {\tt urldate}. URL: {\tt url}.
+\end{latin}
+
+\item[] []
+{\persianttfamily ویراستار}، ویراستار(ان). {\persianttfamily تاریخ}. {\persianttfamily عنوان}. ویرایش {\persianttfamily …}. چاپ {\persianttfamily …}. نوشته‌ی {\persianttfamily …}. {\persianttfamily جلد فروست}. با همکاری {\persianttfamily …}. با یادداشت {\persianttfamily …}. با مقدمه‌ی {\persianttfamily …}. با پیش‌گفتار {\persianttfamily …}. با پس‌گفتار {\persianttfamily …}. {\persianttfamily محل نشر}:{\persianttfamily ناشر}. شابک: {\persianttfamily …}. شناسه‌ی دیجیتال: {\persianttfamily …}. دسترسی در {\persianttfamily …}. تارنما: {\persianttfamily …}.
+\end{itemize}
+
+
+
+\subsubsection*{کتابهای ترجمه شده}
+مدخل کتابی که مشخصه‌ی \verb|translator| آن وارد شود به صورت زیر فهرست میشود.
+
+\begin{itemize}[nosep]
+\begin{latin}
+\item[] []
+{\tt editor}, ed(s). {\tt year}. {\tt title}. {\tt edition} edn. {\tt impression} imp. by {\tt by}. Translated by {\tt translator}. {\tt translateyear}. {\tt volume volumes series number}. In collaboration with {\tt collaboration}. Commented by {\tt commentator}. Introduction by {\tt introduction}. Preface by {\tt preface}. Afterwords by {\tt afterword}. {\tt address}:{\tt publisher}. {\tt note}. ISBN: {\tt isbn}. DOI: {\tt doi}. Retrieved {\tt urldate}. URL: {\tt url}.
+\end{latin}
+
+\item[] []
+{\persianttfamily ویراستار}، ویراستار(ان). {\persianttfamily تاریخ}. {\persianttfamily عنوان}. ویرایش {\persianttfamily …}. چاپ {\persianttfamily …}. نوشته‌ی {\persianttfamily …}. ترجمه‌ی {\persianttfamily …}. {\persianttfamily تاریخ ترجمه}. {\persianttfamily جلد فروست}. با همکاری {\persianttfamily …}. با یادداشت {\persianttfamily …}. ویراسته‌ی {\persianttfamily …}. با مقدمه‌ی {\persianttfamily …}. با پیش‌گفتار {\persianttfamily …}. با پس‌گفتار {\persianttfamily …}. {\persianttfamily محل نشر}:{\persianttfamily ناشر}. شابک: {\persianttfamily …}. شناسه‌ی دیجیتال: {\persianttfamily …}. دسترسی در {\persianttfamily …}. تارنما: {\persianttfamily …}.
+\end{itemize}
+
+
+
+
+
+\subsection{کتابهایی که زیر نام مترجم مرتب میشوند}
+اگر برای مدخل کتاب، مشخصه‌های \verb|author|، \verb|compiler|، و \verb|editor| وارد نشوند، در صورت وجود مشخصه‌ی \verb|translator|، زیر نام مترجم مرتب میشود.
+
+\begin{itemize}[nosep]
+\begin{latin}
+\item[] []
+{\tt translator}, tran(s). {\tt translateyear}. {\tt title}. {\tt edition} edn. {\tt impression} imp. by {\tt by}. {\tt year}. {\tt volume volumes series number}. In collaboration with {\tt collaboration}. Commented by {\tt commentator}. Introduction by {\tt introduction}. Preface by {\tt preface}. Afterwords by {\tt afterword}. {\tt address}:{\tt publisher}. {\tt note}. ISBN: {\tt isbn}. DOI: {\tt doi}. Retrieved {\tt urldate}. URL: {\tt url}.
+\end{latin}
+
+\item[] []
+{\persianttfamily مترجم}، مترجم(‍ان). {\persianttfamily تاریخ ترجمه}. {\persianttfamily عنوان}. ویرایش {\persianttfamily …}. چاپ {\persianttfamily …}. نوشته‌ی {\persianttfamily …}. {\persianttfamily تاریخ}. {\persianttfamily جلد فروست}. با همکاری {\persianttfamily …}. با یادداشت {\persianttfamily …}. ویراسته‌ی {\persianttfamily …}. با مقدمه‌ی {\persianttfamily …}. با پیش‌گفتار {\persianttfamily …}. با پس‌گفتار {\persianttfamily …}. {\persianttfamily محل نشر}:{\persianttfamily ناشر}. شابک: {\persianttfamily …}. شناسه‌ی دیجیتال: {\persianttfamily …}. دسترسی در {\persianttfamily …}. تارنما: {\persianttfamily …}.
+\end{itemize}
+
+
+
+
+
+\subsection{کتابهایی که زیر عنوان مرتب میشوند}
+اگر برای مدخل کتاب، مشخصه‌های \verb|author|، \verb|compiler|، \verb|editor|، و \verb|translator| وارد نشوند، باید مشخصه‌ی \verb|key| آن مدخل برابر با مشخصه‌ی \verb|title| وارد شود که زیر عنوان مرتب گردد.
+
+\begin{itemize}[nosep]
+\begin{latin}
+\item[] []
+{\tt title}. {\tt year}. {\tt edition} edn. {\tt impression} imp. by {\tt by}. {\tt volume volumes series number}. In collaboration with {\tt collaboration}. Commented by {\tt commentator}. Introduction by {\tt introduction}. Preface by {\tt preface}. Afterwords by {\tt afterword}. {\tt address}:{\tt publisher}. {\tt note}. ISBN: {\tt isbn}. DOI: {\tt doi}. Retrieved {\tt urldate}. URL: {\tt url}.
+\end{latin}
+
+\item[] []
+{\persianttfamily عنوان}. {\persianttfamily تاریخ}. ویرایش {\persianttfamily …}. چاپ {\persianttfamily …}. نوشته‌ی {\persianttfamily …}. {\persianttfamily جلد فروست}. با همکاری {\persianttfamily …}. با یادداشت {\persianttfamily …}. ویراسته‌ی {\persianttfamily …}. با مقدمه‌ی {\persianttfamily …}. با پیش‌گفتار {\persianttfamily …}. با پس‌گفتار {\persianttfamily …}. {\persianttfamily محل نشر}:{\persianttfamily ناشر}. شابک: {\persianttfamily …}. شناسه‌ی دیجیتال: {\persianttfamily …}. دسترسی در {\persianttfamily …}. تارنما: {\persianttfamily …}.
+\end{itemize}
+
+
+
+
+\end{document} \ No newline at end of file
diff --git a/biblio/bibtex/contrib/iran-bibtex/iran.bst b/biblio/bibtex/contrib/iran-bibtex/iran.bst
new file mode 100644
index 0000000000..d830b9f3b0
--- /dev/null
+++ b/biblio/bibtex/contrib/iran-bibtex/iran.bst
@@ -0,0 +1,3239 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% This file is “iran.bst”,
+%% generated with the DOCSTRIP utility and then modified to support
+%% bilingual (English/Latin, and Persian).
+%%
+%% Bibliography style for BibTeX base on “Iran Manual of Style”.
+%%
+%% Created, and maintained by
+%% Copyright (c) 2023 Farshad Rasuli <farshad.rasuli@gmail.com>
+%%
+%%
+%% This bibliography style (bst) is part of the “iran-bibtex” package.
+%%
+%% CTAN: https://ctan.org/pkg/iran-bibtex
+%% Homepage: https://github.com/farshadrasuli/iran-bibtex
+%% Bug tracker: https://github.com/farshadrasuli/iran-bibtex/issues
+%%
+%%
+%%
+%% This file can be redistributed and/or modified under the terms
+%% of the LaTeX Project Public License version 1.3c, or any later version.
+%% The latest version of the License is at: latex-project.org/lppl.txt
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+%------------------------------------------------------------------------------
+% This bibliography style file is intended for texts in ENGLISH, and Persian.
+% This is an author-year citation style bibliography. This style file is based
+% on natbib.sty package by Patrick W. Daly.
+% The form of the \bibitem entries is
+% \bibitem[Jones et al.(1990)]{key}...
+% \bibitem[Jones et al.(1990)Jones, Baker, and Smith]{key}...
+% The essential feature is that the label (the part in brackets) consists
+% of the author names, as they should appear in the citation, with the year
+% in parentheses following. There must be no space before the opening
+% parenthesis!
+%
+% The \cite command functions as follows:
+% \cite{key} => (Jones et al. 1990)
+% \citet{key} => Jones et al. (1990)
+% \citet*{key} => Jones, Baker, and Smith (1990)
+% \citep{key} => (Jones et al., 1990)
+% \citep*{key} => (Jones, Baker, and Smith, 1990)
+% \citep[chap. 2]{key} => (Jones et al., 1990, chap. 2)
+% \citep[e.g.][]{key} => (e.g. Jones et al., 1990)
+% \citep[e.g.][p. 32]{key} => (e.g. Jones et al., 1990, p. 32)
+% \citeauthor{key} => Jones et al.
+% \citeauthor*{key} => Jones, Baker, and Smith
+% \citeyear{key} => 1990
+%------------------------------------------------------------------------------
+
+
+
+ENTRY
+{
+ address
+ afterword % the added field
+ archive
+ author
+ authorfa % the added field
+ booktitle
+ by % the added field
+ chapter
+ collaboration
+ commentator % the added field
+ compiler % the added field
+ doi
+ edition
+ editor
+ eid
+ eprint
+ foreword % the added field
+ howpublished
+ impression % the added field
+ institution
+ introduction % the added field
+ isbn
+ issn
+ journal
+ key
+ language
+ month
+ note
+ number
+ numpages
+ organization
+ pages
+ preface % the added field
+ publisher
+ school
+ series
+ title
+ translator % the added field
+ translateyear % the added field
+ type
+ url
+ urldate % the added field
+ volume
+ volumes % the added field
+ year
+}
+{}
+{
+ label
+ extra.label
+ sort.label
+ short.list
+}
+
+
+
+
+
+% Basic boolean functions
+
+FUNCTION {not}
+{
+ { #0 }
+ { #1 }
+ if$
+}
+
+FUNCTION {and}
+{
+ 'skip$
+ { pop$ #0 }
+ if$
+}
+
+FUNCTION {or}
+{
+ { pop$ #1 }
+ 'skip$
+ if$
+}
+
+
+
+
+
+
+% check for language of entry
+
+FUNCTION {is.language.persian}
+{
+ language missing$
+ {#0}
+ { language "l" change.case$ "persian" = }
+ if$
+}
+
+
+
+
+
+% Here are the language-specific definitions for explicit words.
+% Each function has a name bbl.xxx where xxx is the English word.
+
+FUNCTION {bbl.afterwordby}
+{
+ is.language.persian
+ {"با پس‌گفتار"}
+ {"afterword by"}
+ if$
+}
+
+FUNCTION {bbl.and}
+{
+ is.language.persian
+ {"و"}
+ {"and"}
+ if$
+}
+
+FUNCTION {bbl.annotator}
+{
+ is.language.persian
+ {"حاشیه‌نویس"}
+ {"ann."}
+ if$
+}
+
+FUNCTION {bbl.annotatedby}
+{
+ is.language.persian
+ {"با حاشیه‌ی"}
+ {"annotated by"}
+ if$
+}
+
+FUNCTION {bbl.andothers}
+{
+ is.language.persian
+ {"و~دیگران"}
+ {"and~others"}
+ if$
+}
+
+FUNCTION {bbl.by}
+{
+ is.language.persian
+ {"نوشته‌ی"}
+ {"by"}
+ if$
+}
+
+FUNCTION {bbl.chapter}
+{
+ is.language.persian
+ {"فصل"}
+ {"chapter"}
+ if$
+}
+
+FUNCTION {bbl.collaboration}
+{
+ is.language.persian
+ {"همکار"}
+ {"coll."}
+ if$
+}
+
+FUNCTION {bbl.comma}
+{
+ is.language.persian
+ {"،"}
+ {","}
+ if$
+}
+
+FUNCTION {bbl.commentator}
+{
+ is.language.persian
+ {"یادداشت‌نویس"}
+ {"comm."}
+ if$
+}
+
+FUNCTION {bbl.commentatedby}
+{
+ is.language.persian
+ {"با یادداشت"}
+ {"commentated by"}
+ if$
+}
+
+FUNCTION {bbl.compiler}
+{
+ is.language.persian
+ {"گردآورنده"}
+ {"comp."}
+ if$
+}
+
+FUNCTION {bbl.compilers}
+{
+ is.language.persian
+ {"گردآورندگان"}
+ {"comps."}
+ if$
+}
+
+FUNCTION {bbl.compiledby}
+{
+ is.language.persian
+ {"گردآوری"}
+ {"compiled by"}
+ if$
+}
+
+FUNCTION {bbl.doi}
+{
+ is.language.persian
+ {"شناسه‌ی دیجیتال"}
+ {"doi"}
+ if$
+}
+
+FUNCTION {bbl.dquote}
+{
+ is.language.persian
+ {"\faquote{" swap$ * add.period$ "}" *}
+ {"\enquote{" swap$ * add.period$ "}" *}
+ if$
+}
+
+FUNCTION {bbl.editor}
+{
+ is.language.persian
+ {"ویراستار"}
+ {"ed."}
+ if$
+}
+
+FUNCTION {bbl.editors}
+{
+ is.language.persian
+ {"ویراستاران"}
+ {"eds."}
+ if$
+}
+
+FUNCTION {bbl.edby}
+{
+ is.language.persian
+ {"ویراسته‌ی"}
+ {"edited by"}
+ if$
+}
+
+FUNCTION {bbl.edition}
+{
+ is.language.persian
+ {"ویرایش"}
+ {"edn."}
+ if$
+}
+
+FUNCTION {bbl.eidpp}
+{
+ is.language.persian
+ {"صص"}
+ {"pages"}
+ if$
+}
+
+FUNCTION {bbl.etal}
+{
+ is.language.persian
+ {"و~همکاران"}
+ {"et~al."}
+ if$
+
+}
+
+FUNCTION {bbl.forewordby}
+{
+ is.language.persian
+ {"با پیش‌گفتار"}
+ {"forword by"}
+ if$
+}
+
+FUNCTION {bbl.impression}
+{
+ is.language.persian
+ {"چاپ"}
+ {"imp."}
+ if$
+}
+
+FUNCTION {bbl.in}
+{
+ is.language.persian
+ {"در"}
+ {"in"}
+ if$
+}
+
+FUNCTION {bbl.incollaborationwith}
+{
+ is.language.persian
+ {"با همکاری"}
+ {"in collaboration with"}
+ if$
+}
+
+FUNCTION {bbl.introby}
+{
+ is.language.persian
+ {"با مقدمه‌ی"}
+ {"introduction by"}
+ if$
+}
+
+FUNCTION {bbl.isbn}
+{
+ is.language.persian
+ {"شابک"}
+ {"isbn"}
+ if$
+}
+
+FUNCTION {bbl.issn}
+{
+ is.language.persian
+ {"شاپا"}
+ {"issn"}
+ if$
+}
+
+FUNCTION {bbl.mthesis}
+{
+ is.language.persian
+ {"پایان‌نامه‌ی کارشناسی‌ارشد"}
+ {"Master's thesis"}
+ if$
+}
+
+FUNCTION {bbl.number}
+{
+ is.language.persian
+ {"ش."}
+ {"no."}
+ if$
+}
+
+FUNCTION {bbl.nr}
+{
+ is.language.persian
+ {"ش."}
+ {"no."}
+ if$
+}
+
+FUNCTION {bbl.of}
+{
+ is.language.persian
+ {"از"}
+ {"of"}
+ if$
+}
+
+FUNCTION {bbl.page}
+{
+ is.language.persian
+ {""}
+ {""}
+ if$
+}
+
+FUNCTION {bbl.pages}
+{
+ is.language.persian
+ {""}
+ {""}
+ if$
+}
+
+FUNCTION {bbl.prefaceby}
+{
+ is.language.persian
+ {"با پیش‌گفتار"}
+ {"preface by"}
+ if$
+}
+
+FUNCTION {bbl.phdthesis}
+{
+ is.language.persian
+ {"رساله‌ی دکتری"}
+ {"PhD dissertation"}
+ if$
+}
+
+FUNCTION {bbl.retrieved}
+{
+ is.language.persian
+ {"دسترسی در"}
+ {"retrieved"}
+ if$
+}
+
+FUNCTION {bbl.semicolon}
+{
+ is.language.persian
+ {"؛"}
+ {";"}
+ if$
+}
+
+FUNCTION {bbl.techrep}
+{
+ is.language.persian
+ {""}
+ {""}
+ if$
+}
+
+FUNCTION {bbl.translator}
+{
+ is.language.persian
+ {"مترجم"}
+ {"tran."}
+ if$
+}
+
+FUNCTION {bbl.translators}
+{
+ is.language.persian
+ {"مترجمان"}
+ {"trans."}
+ if$
+}
+
+FUNCTION {bbl.translatedby}
+{
+ is.language.persian
+ {"ترجمه‌ی"}
+ {"translated by"}
+ if$
+}
+
+FUNCTION {bbl.url}
+{
+ is.language.persian
+ {"تارنما"}
+ {"url"}
+ if$
+}
+
+FUNCTION {bbl.volume}
+{
+ is.language.persian
+ {"ج."}
+ {"vol."}
+ if$
+}
+
+FUNCTION {bbl.volumes}
+{
+ is.language.persian
+ {"ج."}
+ {"vols."}
+ if$
+}
+
+
+
+
+
+% Functions to declare position
+
+INTEGERS { output.state before.all mid.sentence after.sentence after.block }
+
+FUNCTION {init.state.consts}
+{
+ #0 'before.all :=
+ #1 'mid.sentence :=
+ #2 'after.sentence :=
+ #3 'after.block :=
+}
+
+
+
+% Functions to print output
+
+STRINGS { s t }
+
+FUNCTION {output.nonnull}
+{
+ 's :=
+ output.state mid.sentence =
+ { bbl.comma * " " * write$ }
+ {
+ output.state after.block =
+ {
+ add.period$ write$
+ newline$
+ "\newblock " write$
+ }
+ {
+ output.state before.all =
+ 'write$
+ { add.period$ " " * write$ }
+ if$
+ }
+ if$
+ mid.sentence 'output.state :=
+ }
+ if$
+ s
+}
+
+FUNCTION {output}
+{
+ duplicate$ empty$
+ 'pop$
+ 'output.nonnull
+ if$
+}
+
+FUNCTION {output.check}
+{
+ 't :=
+ duplicate$ empty$
+ { pop$ "empty " t * " in " * cite$ * warning$ }
+ 'output.nonnull
+ if$
+}
+
+
+
+
+
+% Functions to control format of entry
+
+FUNCTION {new.block}
+{
+ output.state before.all =
+ 'skip$
+ { after.block 'output.state := }
+ if$
+}
+
+FUNCTION {new.sentence}
+{
+ output.state after.block =
+ 'skip$
+ {
+ output.state before.all =
+ 'skip$
+ { after.sentence 'output.state := }
+ if$
+ }
+ if$
+}
+
+
+
+FUNCTION {add.blank}
+{
+ " " * before.all 'output.state :=
+}
+
+
+
+FUNCTION {no.blank.or.punct}
+{
+ "\hspace{0pt}" * before.all 'output.state :=
+}
+
+
+
+FUNCTION {date.block}
+{
+ new.block
+}
+
+
+
+FUNCTION {non.stop}
+{
+ duplicate$
+ "}" * add.period$
+ #-1 #1 substring$ "." =
+}
+
+
+
+STRINGS {z}
+
+FUNCTION {remove.dots}
+{
+ 'z :=
+ ""
+ {
+ z empty$ not
+ }
+ {
+ z #1 #2 substring$
+ duplicate$ "\." =
+ {
+ z #3 global.max$ substring$ 'z := *
+ }
+ {
+ pop$
+ z #1 #1 substring$
+ z #2 global.max$ substring$ 'z :=
+ duplicate$ "." =
+ 'pop$
+ { * }
+ if$
+ }
+ if$
+ }
+ while$
+}
+
+
+
+FUNCTION {new.block.checkb}
+{
+ empty$
+ swap$ empty$
+ and
+ 'skip$
+ 'new.block
+ if$
+}
+
+
+
+FUNCTION {field.or.null}
+{
+ duplicate$ empty$
+ { pop$ "" }
+ 'skip$
+ if$
+}
+
+
+
+FUNCTION {emphasize}
+{
+ duplicate$ empty$
+ { pop$ "" }
+ { "{\it " swap$ * "}" * }
+ if$
+}
+
+
+
+FUNCTION {tie.or.space.prefix}
+{
+ duplicate$ text.length$ #3 <
+ { "~" }
+ { " " }
+ if$
+ swap$
+}
+
+
+
+FUNCTION {capitalize}
+{ "u" change.case$ "t" change.case$ }
+
+
+
+FUNCTION {space.word}
+{ " " swap$ * " " * }
+
+
+
+FUNCTION {separate.by.space}
+{ " " swap$ * " " * }
+
+
+
+
+
+% Macro for abbreviation of month
+
+MACRO {jan} {"Jan"}
+
+MACRO {feb} {"Feb"}
+
+MACRO {mar} {"Mar"}
+
+MACRO {apr} {"Apr"}
+
+MACRO {may} {"May"}
+
+MACRO {jun} {"Jun"}
+
+MACRO {jul} {"Jul"}
+
+MACRO {aug} {"Aug"}
+
+MACRO {sep} {"Sep"}
+
+MACRO {oct} {"Oct"}
+
+MACRO {nov} {"Nov"}
+
+MACRO {dec} {"Dec"}
+
+
+
+
+
+% Functions to check and warn bibinfo
+
+FUNCTION {bibinfo.check}
+{
+ swap$
+ duplicate$ missing$
+ {
+ pop$ pop$
+ ""
+ }
+ {
+ duplicate$ empty$
+ {
+ swap$ pop$
+ }
+ {
+ swap$
+ pop$
+ }
+ if$
+ }
+ if$
+}
+
+
+FUNCTION {bibinfo.warn}
+{
+ swap$
+ duplicate$ missing$
+ {
+ swap$ "missing " swap$ * " in " * cite$ * warning$ pop$
+ ""
+ }
+ {
+ duplicate$ empty$
+ {
+ swap$ "empty " swap$ * " in " * cite$ * warning$
+ }
+ {
+ swap$
+ pop$
+ }
+ if$
+ }
+ if$
+}
+
+
+
+
+
+% Functions to format fields
+
+INTEGERS { nameptr namesleft numnames }
+
+STRINGS { bibinfo}
+
+FUNCTION {format.names}
+{
+ 'bibinfo :=
+ duplicate$ empty$
+ 'skip$
+ {
+ 's :=
+ "" 't :=
+ #1 'nameptr :=
+ s num.names$ 'numnames :=
+ numnames 'namesleft :=
+ {
+ namesleft #0 >
+ }
+ {
+ s nameptr
+ duplicate$ #1 >
+ { "{ff~}{vv~}{ll}{, jj}" }
+ { "{vv~}{ll}{, ff}{, jj}" }
+ if$
+ format.name$
+ bibinfo bibinfo.check
+ 't :=
+ nameptr #1 >
+ {
+ namesleft #1 >
+ {
+ bbl.comma * " " * t *
+ }
+ {
+ s nameptr "{ll}" format.name$ duplicate$ "others" =
+ { 't := }
+ { pop$ }
+ if$
+ bbl.comma *
+ t "others" =
+ {
+ " " * bbl.etal *
+ }
+ {
+ bbl.and
+ separate.by.space * t *
+ }
+ if$
+ }
+ if$
+ }
+ 't
+ if$
+ nameptr #1 + 'nameptr :=
+ namesleft #1 - 'namesleft :=
+ }
+ while$
+ }
+ if$
+}
+
+
+
+FUNCTION {format.names.ed}
+{
+ 'bibinfo :=
+ duplicate$ empty$
+ 'skip$
+ {
+ 's :=
+ "" 't :=
+ #1 'nameptr :=
+ s num.names$ 'numnames :=
+ numnames 'namesleft :=
+ {
+ namesleft #0 >
+ }
+ {
+ s nameptr
+ "{ff~}{vv~}{ll}{, jj}"
+ format.name$
+ bibinfo bibinfo.check
+ 't :=
+ nameptr #1 >
+ {
+ namesleft #1 >
+ {
+ bbl.comma * " " * t *
+ }
+ {
+ s nameptr "{ll}" format.name$
+ duplicate$ "others" =
+ { 't := }
+ { pop$ }
+ if$
+ bbl.comma *
+ t "others" =
+ {
+
+ " " * bbl.etal *
+ }
+ {
+ bbl.and
+ separate.by.space * t *
+ }
+ if$
+ }
+ if$
+ }
+ 't
+ if$
+ nameptr #1 + 'nameptr :=
+ namesleft #1 - 'namesleft :=
+ }
+ while$
+ }
+ if$
+}
+
+
+
+FUNCTION {format.key}
+{
+ empty$
+ { key field.or.null }
+ { "" }
+ if$
+}
+
+
+
+FUNCTION {format.authors}
+{ author "author" format.names }
+
+
+
+FUNCTION {get.bbl.editor}
+{
+ editor num.names$ #1 >
+ 'bbl.editors
+ 'bbl.editor
+ if$
+}
+
+FUNCTION {format.editors}
+{
+ editor "editor" format.names
+ duplicate$ empty$
+ 'skip$
+ {
+ bbl.comma * " " * get.bbl.editor *
+ }
+ if$
+}
+
+
+
+FUNCTION {get.bbl.compiler}
+{
+ compiler num.names$ #1 >
+ 'bbl.compilers
+ 'bbl.compiler
+ if$
+}
+
+FUNCTION {format.compilers}
+{
+ compiler "compiler" format.names
+ duplicate$ empty$
+ 'skip$
+ {
+ bbl.comma * " " * get.bbl.compiler *
+ }
+ if$
+}
+
+
+
+FUNCTION {get.bbl.translator}
+{
+ translator num.names$ #1 >
+ 'bbl.translators
+ 'bbl.translator
+ if$
+}
+
+FUNCTION {format.translators}
+{
+ translator "translator" format.names
+ duplicate$ empty$
+ 'skip$
+ {
+ bbl.comma * " " * get.bbl.translator *
+ }
+ if$
+}
+
+
+
+FUNCTION {format.eprint}
+{
+ eprint duplicate$ empty$
+ 'skip$
+ {
+ "\eprint"
+ archive empty$
+ 'skip$
+ { "[" * archive * "]" * }
+ if$
+ "{" * swap$ * "}" *
+ }
+ if$
+}
+
+
+
+FUNCTION {format.url}
+{
+ url duplicate$ empty$
+ { pop$ "" }
+ {
+ bbl.url "u" change.case$ ": \url{" * swap$ * "}" *
+ }
+ if$
+}
+
+
+
+FUNCTION {format.urldate}
+{
+ urldate duplicate$ empty$
+ { pop$ "" }
+ { bbl.retrieved capitalize " " * swap$ * }
+ if$
+}
+
+
+
+FUNCTION {format.isbn}
+{
+ isbn "isbn" bibinfo.check
+ duplicate$ empty$
+ 'skip$
+ {
+ bbl.isbn "u" change.case$ ": " * swap$ *
+ }
+ if$
+}
+
+
+
+FUNCTION {format.issn}
+{
+ issn "issn" bibinfo.check
+ duplicate$ empty$
+ 'skip$
+ {
+ bbl.issn "u" change.case$ ": " * swap$ *
+ }
+ if$
+}
+
+FUNCTION {format.doi}
+{
+ doi empty$
+ { "" }
+ {
+ bbl.doi "u" change.case$ ": \doi{" * doi * "}" *
+ }
+ if$
+}
+
+
+
+FUNCTION {format.note}
+{
+ note empty$ not
+ {
+ note #1 #1 substring$
+ duplicate$ "{" =
+ 'skip$
+ {
+ output.state mid.sentence =
+ { "l" }
+ { "u" }
+ if$
+ change.case$
+ }
+ if$
+ note #2 global.max$ substring$ * "note" bibinfo.check
+ }
+ { "" }
+ if$
+}
+
+
+
+FUNCTION {format.title}
+{
+ title
+ duplicate$ empty$
+ 'skip$
+ { "t" change.case$ }
+ if$
+ "title" bibinfo.check
+ duplicate$ empty$
+ 'skip$
+ {
+ bbl.dquote
+ }
+ if$
+}
+
+
+
+FUNCTION {format.full.names}
+{
+ 's :=
+ "" 't :=
+ #1 'nameptr :=
+ s num.names$ 'numnames :=
+ numnames 'namesleft :=
+ {
+ namesleft #0 >
+ }
+ {
+ s nameptr
+ "{vv~}{ll}" format.name$
+ 't :=
+ nameptr #1 >
+ {
+ namesleft #1 >
+ {
+ bbl.comma * " " * t *
+ }
+ {
+ s nameptr "{ll}" format.name$
+ duplicate$ "others" =
+ { 't := }
+ { pop$ }
+ if$
+ t "others" =
+ {
+ " " * bbl.etal *
+ }
+ {
+ numnames #2 >
+ { bbl.comma * }
+ 'skip$
+ if$
+ bbl.and
+ separate.by.space * t *
+ }
+ if$
+ }
+ if$
+ }
+ 't
+ if$
+ nameptr #1 + 'nameptr :=
+ namesleft #1 - 'namesleft :=
+ }
+ while$
+}
+
+
+FUNCTION {author.editor.key.full}
+{
+ author empty$
+ {
+ editor empty$
+ {
+ key empty$
+ { cite$ #1 #3 substring$ }
+ 'key
+ if$
+ }
+ {
+ editor format.full.names
+ }
+ if$
+ }
+ {
+ author format.full.names
+ }
+ if$
+}
+
+
+
+FUNCTION {author.key.full}
+{
+ author empty$
+ {
+ key empty$
+ { cite$ #1 #3 substring$ }
+ 'key
+ if$
+ }
+ {
+ author format.full.names
+ }
+ if$
+}
+
+
+
+FUNCTION {editor.key.full}
+{
+ editor empty$
+ {
+ key empty$
+ { cite$ #1 #3 substring$ }
+ 'key
+ if$
+ }
+ {
+ editor format.full.names
+ }
+ if$
+}
+
+
+
+FUNCTION {make.full.names}
+{
+ type$ "book" =
+ type$ "inbook" =
+ or
+ 'author.editor.key.full
+ {
+ type$ "proceedings" =
+ 'editor.key.full
+ 'author.key.full
+ if$
+ }
+ if$
+}
+
+
+
+FUNCTION {n.dashify}
+{
+ 't :=
+ ""
+ {
+ t empty$ not
+ }
+ {
+ t #1 #1 substring$
+ "-" =
+ {
+ t #1 #2 substring$
+ "--" = not
+ {
+ "--" *
+ t #2 global.max$ substring$ 't :=
+ }
+ {
+ {
+ t #1 #1 substring$ "-" =
+ }
+ {
+ "-" *
+ t #2 global.max$ substring$ 't :=
+ }
+ while$
+ }
+ if$
+ }
+ {
+ t #1 #1 substring$ *
+ t #2 global.max$ substring$ 't :=
+ }
+ if$
+ }
+ while$
+}
+
+
+
+FUNCTION {word.in}
+{
+ bbl.in capitalize " " *
+}
+
+
+
+FUNCTION {format.date}
+{
+ year "year" bibinfo.check
+ duplicate$ empty$
+ {
+ }
+ 'skip$
+ if$
+ extra.label *
+ before.all 'output.state :=
+ after.sentence 'output.state :=
+}
+
+
+
+FUNCTION {format.btitle}
+{
+ title "title" bibinfo.check
+ duplicate$ empty$
+ 'skip$
+ {
+ emphasize
+ }
+ if$
+}
+
+
+
+FUNCTION {either.or.check}
+{
+ empty$
+ 'pop$
+ { "can't use both " swap$ * " fields in " * cite$ * warning$ }
+ if$
+}
+
+
+FUNCTION {format.bvolume}
+{
+ volume empty$ not
+ {
+ volumes empty$ not
+ {
+ bbl.volume volume "~" swap$ * *
+ bbl.of separate.by.space volumes *
+ *
+ }
+ {
+ bbl.volume volume "~" swap$ * *
+ }
+ if$
+ }
+ {
+ volumes empty$ not
+ {
+ volumes bbl.volumes "~" swap$ * *
+ }
+ { "" }
+ if$
+ }
+ if$
+}
+
+
+FUNCTION {format.number.series}
+{
+ series empty$ not
+ {
+ number empty$ not
+ {
+ series " " * number *
+ }
+ { series field.or.null }
+ if$
+ }
+ {
+ number empty$ not
+ {
+ output.state mid.sentence =
+ { bbl.number }
+ { bbl.number capitalize }
+ if$
+ number "~" swap$ * *
+ }
+ { "" }
+ if$
+ }
+ if$
+}
+
+
+
+FUNCTION {format.bvolume.series.number}
+{
+ volume empty$ not
+ {
+ volumes empty$ not
+ {
+ series empty$ not
+ {
+ number empty$ not
+ {
+ bbl.volume "~" * volume *
+ " " * bbl.of * " " * volumes * add.period$
+ " " * series emphasize *
+ " " * number *
+ }
+ {
+ bbl.volume "~" * volume *
+ " " * bbl.of * " " * volumes * add.period$
+ " " * series emphasize *
+ }
+ if$
+ }
+ {
+ number empty$ not
+ {
+ bbl.volume "~" * volume *
+ " " * bbl.of * " " * volumes * add.period$
+ " " * bbl.number * "~" * number *
+ }
+ {
+ bbl.volume "~" * volume *
+ " " * bbl.of * " " * volumes *
+ }
+ if$
+ }
+ if$
+ }
+ {
+ series empty$ not
+ {
+ number empty$ not
+ {
+ bbl.volume "~" * volume *
+ " " * bbl.of * " " * series emphasize *
+ " " * number *
+ }
+ {
+ bbl.volume "~" * volume *
+ " " * bbl.of * " " * series emphasize *
+ }
+ if$
+ }
+ {
+ number empty$ not
+ {
+ bbl.volume "~" * volume * add.period$
+ " " * bbl.number * "~" * number *
+ }
+ {
+ bbl.volume "~" * volume * add.period$
+ }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ {
+ volumes empty$ not
+ {
+ series empty$ not
+ {
+ number empty$ not
+ {
+ volumes "~" * bbl.volumes * add.period$
+ " " * series *
+ " " * number *
+ }
+ {
+ volumes "~" * bbl.volumes * add.period$
+ " " * series *
+ }
+ if$
+ }
+ {
+ number empty$ not
+ {
+ volumes "~" * bbl.volumes * add.period$
+ " " * bbl.number * "~" * number *
+ }
+ {
+ volumes "~" * bbl.volumes * add.period$
+ }
+ if$
+ }
+ if$
+ }
+ {
+ series empty$ not
+ {
+ number empty$ not
+ {
+ series
+ " " * number *
+ }
+ {
+ series
+ }
+ if$
+ }
+ {
+ number empty$ not
+ {
+ bbl.number "~" * number *
+ }
+ {
+ ""
+ }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+
+
+FUNCTION {format.edition}
+{
+ edition duplicate$ empty$
+ 'skip$
+ {
+ output.state mid.sentence =
+ { "l" }
+ { "t" }
+ if$
+ change.case$
+ "edition" bibinfo.check
+ is.language.persian
+ { bbl.edition " " * swap$ * }
+ { " " * bbl.edition * }
+ if$
+ }
+ if$
+}
+
+
+
+FUNCTION {format.impression}
+{
+ impression duplicate$ empty$ not
+ {
+ output.state mid.sentence =
+ { "l" }
+ { "t" }
+ if$
+ change.case$
+ is.language.persian
+ { bbl.impression " " * swap$ * }
+ { " " * bbl.impression * }
+ if$
+ }
+ 'skip$
+ if$
+}
+
+
+
+INTEGERS { multiresult }
+
+FUNCTION {multi.page.check}
+{
+ 't :=
+ #0 'multiresult :=
+ {
+ multiresult not
+ t empty$ not
+ and
+ }
+ {
+ t #1 #1 substring$
+ duplicate$ "-" =
+ swap$ duplicate$ "," =
+ swap$ "+" =
+ or or
+ { #1 'multiresult := }
+ { t #2 global.max$ substring$ 't := }
+ if$
+ }
+ while$
+ multiresult
+}
+
+
+
+FUNCTION {format.pages}
+{
+ pages duplicate$ empty$
+ 'skip$
+ {
+ duplicate$ multi.page.check
+ {
+ n.dashify
+ }
+ {
+ }
+ if$
+ "pages" bibinfo.check
+ }
+ if$
+}
+
+
+
+FUNCTION {format.journal.pages}
+{
+ pages duplicate$ empty$ 'pop$
+ {
+ swap$ duplicate$ empty$
+ {
+ pop$ pop$ format.pages
+ }
+ {
+ ": " *
+ swap$
+ n.dashify
+ "pages" bibinfo.check
+ *
+ }
+ if$
+ }
+ if$
+}
+
+
+
+FUNCTION {format.journal.eid}
+{
+ eid "eid" bibinfo.check
+ duplicate$ empty$
+ 'pop$
+ {
+ swap$
+ duplicate$ empty$
+ 'skip$
+ {
+ ": " *
+ }
+ if$
+ swap$ *
+ numpages empty$
+ 'skip$
+ {
+ bbl.eidpp numpages tie.or.space.prefix
+ "numpages" bibinfo.check * *
+ " (" swap$ * ")" * *
+ }
+ if$
+ }
+ if$
+}
+
+
+
+FUNCTION {format.vol.num.pages}
+{
+ volume field.or.null
+ duplicate$ empty$
+ 'skip$
+ {
+ "volume" bibinfo.check
+ }
+ if$
+ number "number" bibinfo.check
+ duplicate$ empty$
+ 'skip$
+ {
+ swap$
+ duplicate$ empty$
+ { "there's a number but no volume in " cite$ * warning$ }
+ 'skip$
+ if$
+ swap$
+ "~(" swap$ * ")" *
+ }
+ if$
+ *
+ eid empty$
+ { format.journal.pages }
+ { format.journal.eid }
+ if$
+}
+
+
+
+FUNCTION {format.chapter.pages}
+{
+ chapter empty$
+ 'format.pages
+ {
+ type empty$
+ { bbl.chapter }
+ {
+ type "l" change.case$
+ "type" bibinfo.check
+ }
+ if$
+ chapter tie.or.space.prefix
+ "chapter" bibinfo.check
+ * *
+ pages empty$
+ 'skip$
+ { bbl.comma * " " * format.pages * }
+ if$
+ }
+ if$
+}
+
+
+
+FUNCTION {format.booktitle}
+{
+ booktitle "booktitle" bibinfo.check
+ emphasize
+}
+
+
+
+FUNCTION {format.in.ed.booktitle}
+{
+ format.booktitle
+ duplicate$ empty$
+ 'skip$
+ {
+ format.bvolume
+ duplicate$ empty$
+ 'pop$
+ { bbl.comma " " * swap$ * * }
+ if$
+ editor "editor" format.names.ed
+ duplicate$ empty$
+ 'pop$
+ {
+ bbl.edby capitalize " " * swap$ *
+ swap$
+ add.period$ " " * swap$ *
+ }
+ if$
+ word.in swap$ *
+ }
+ if$
+}
+
+
+
+FUNCTION {format.by}
+{
+ by empty$ not
+ {
+ by "by" format.names.ed
+ bbl.by " " * swap$ *
+ }
+ { "" }
+ if$
+}
+
+
+
+FUNCTION {format.incollaborationwith}
+{
+ collaboration empty$ not
+ {
+ collaboration "collaboration" format.names.ed
+ bbl.incollaborationwith capitalize " " * swap$ *
+ }
+ { "" }
+ if$
+}
+
+
+
+FUNCTION {format.commentatedby}
+{
+ commentator empty$ not
+ {
+ commentator "commentator" format.names.ed
+ bbl.commentatedby capitalize " " * swap$ *
+ }
+ { "" }
+ if$
+}
+
+
+
+FUNCTION {format.compiledby}
+{
+ compiler empty$ not
+ {
+ compiler "compiler" format.names.ed
+ bbl.compiledby capitalize " " * swap$ *
+ }
+ { "" }
+ if$
+}
+
+
+
+FUNCTION {format.edby}
+{
+ editor empty$ not
+ {
+ editor "editor" format.names.ed
+ bbl.edby capitalize " " * swap$ *
+ }
+ { "" }
+ if$
+}
+
+
+
+FUNCTION {format.translatedby}
+{
+ translator empty$ not
+ {
+ translator "translator" format.names.ed
+ bbl.translatedby capitalize " " * swap$ *
+ }
+ { "" }
+ if$
+}
+
+
+FUNCTION {format.translateyear}
+{
+ translateyear empty$ not
+ {
+ translateyear
+ }
+ { "" }
+ if$
+ before.all 'output.state :=
+ after.sentence 'output.state :=
+}
+
+
+
+FUNCTION {format.introby}
+{
+ introduction empty$ not
+ {
+ introduction "introduction" format.names.ed
+ bbl.introby capitalize " " * swap$ *
+ }
+ { "" }
+ if$
+}
+
+
+
+FUNCTION {format.prefaceby}
+{
+ preface empty$ not
+ {
+ preface "preface" format.names.ed
+ bbl.prefaceby capitalize " " * swap$ *
+ }
+ { "" }
+ if$
+}
+
+
+
+FUNCTION {format.afterwordby}
+{
+ afterword empty$ not
+ {
+ afterword "afterword" format.names.ed
+ bbl.afterwordby capitalize " " * swap$ *
+ }
+ { "" }
+ if$
+}
+
+
+
+FUNCTION {format.thesis.type}
+{
+ type duplicate$ empty$
+ 'pop$
+ {
+ swap$ pop$
+ "t" change.case$ "type" bibinfo.check
+ }
+ if$
+}
+
+
+
+FUNCTION {format.tr.number}
+{
+ number "number" bibinfo.check
+ type duplicate$ empty$
+ { pop$ bbl.techrep }
+ 'skip$
+ if$
+ "type" bibinfo.check
+ swap$ duplicate$ empty$
+ { pop$ "t" change.case$ }
+ { tie.or.space.prefix * * }
+ if$
+}
+
+
+
+FUNCTION {format.article.crossref}
+{
+ word.in
+ " \cite{" * crossref * "}" *
+}
+
+
+
+FUNCTION {format.book.crossref}
+{
+ volume duplicate$ empty$
+ {
+ "empty volume in " cite$ * "'s crossref of " * crossref * warning$
+ pop$ word.in
+ }
+ {
+ bbl.volume
+ capitalize
+ swap$ tie.or.space.prefix "volume" bibinfo.check * * bbl.of separate.by.space *
+ }
+ if$
+ " \cite{" * crossref * "}" *
+}
+
+
+
+FUNCTION {format.incoll.inproc.crossref}
+{
+ word.in
+ " \cite{" * crossref * "}" *
+}
+
+
+
+FUNCTION {format.org.or.pub}
+{
+ 't :=
+ ""
+ address empty$ t empty$ and
+ 'skip$
+ {
+ address "address" bibinfo.check *
+ t empty$
+ 'skip$
+ {
+ address empty$
+ 'skip$
+ { ": " * }
+ if$
+ t *
+ }
+ if$
+ }
+ if$
+}
+
+
+
+FUNCTION {format.publisher.address}
+{
+ publisher "publisher" bibinfo.check format.org.or.pub
+}
+
+
+
+FUNCTION {format.organization.address}
+{
+ organization "organization" bibinfo.check format.org.or.pub
+}
+
+
+
+STRINGS {oldname}
+
+FUNCTION {name.or.dash}
+{
+ 's :=
+ oldname empty$
+ { s 'oldname := s }
+ {
+ s oldname =
+ { "---{}---{}---" }
+ { s 'oldname := s }
+ if$
+ }
+ if$
+}
+
+
+
+
+
+% Functions to open, and close the bibitem
+
+INTEGERS { is.authorfa.exist }
+
+FUNCTION {begin.bibitem}
+{
+ #0 'is.authorfa.exist :=
+ newline$
+ is.language.persian
+ {
+ "\bibitem[{" write$
+ label write$
+ ")" make.full.names
+ duplicate$ short.list =
+ { pop$ }
+ { * }
+ if$
+ "}]{" * write$
+ cite$ write$
+ "}" write$
+ newline$
+ }
+ {
+ "\begin{LTRbibitems}" write$
+ "\resetlatinfont" write$
+ newline$
+ "\bibitem[{" write$
+ label write$
+ ")" make.full.names
+ duplicate$ short.list =
+ { pop$ }
+ { * }
+ if$
+ "}]{" * write$
+ cite$ write$
+ "}" write$
+ newline$
+ }
+ if$
+ ""
+ before.all 'output.state :=
+}
+
+
+
+FUNCTION {finish.entry}
+{
+ add.period$ write$
+ newline$
+ is.language.persian
+ 'skip$
+ {
+ "\end{LTRbibitems}" write$
+ newline$
+ }
+ if$
+}
+
+
+
+
+
+% Function to format entries
+
+FUNCTION {article}
+{ begin.bibitem
+ format.authors "author" output.check
+ author format.key output
+ name.or.dash
+ format.date "year" output.check
+ date.block
+ format.title "title" output.check
+ new.block
+ crossref missing$
+ {
+ journal
+ remove.dots
+ "journal" bibinfo.check
+ emphasize
+ "journal" output.check
+ add.blank
+ format.vol.num.pages output
+ }
+ { format.article.crossref output.nonnull
+ format.pages output
+ }
+ if$
+ new.block format.issn output
+ new.block format.doi output
+ new.block
+ format.note output
+ new.block format.eprint output
+ new.block format.url output
+ finish.entry
+}
+
+
+
+FUNCTION {book}
+{
+ begin.bibitem
+ author empty$ not
+ {
+ format.authors output.nonnull
+ name.or.dash
+ format.date "year" output.check
+ new.block format.btitle "title" output.check
+ translator empty$
+ {
+ crossref missing$
+ {
+ new.sentence format.edition output
+ new.sentence format.impression output
+ new.sentence format.by output
+ new.sentence format.bvolume.series.number output
+ new.sentence format.incollaborationwith output
+ new.sentence format.commentatedby output
+ new.sentence format.compiledby output
+ new.sentence format.edby output
+ new.sentence format.introby output
+ new.sentence format.prefaceby output
+ new.sentence format.afterwordby output
+ new.sentence format.publisher.address output
+ new.sentence format.note output
+ new.sentence format.isbn output
+ new.sentence format.doi output
+ new.sentence format.urldate output
+ new.sentence format.url output
+ }
+ {
+ new.block format.book.crossref output.nonnull
+ }
+ if$
+ }
+ {
+ new.sentence format.edition output
+ new.sentence format.impression output
+ new.sentence format.by output
+ new.sentence format.translatedby output
+ new.sentence format.translateyear output
+ new.sentence format.bvolume.series.number output
+ new.sentence format.incollaborationwith output
+ new.sentence format.commentatedby output
+ new.sentence format.compiledby output
+ new.sentence format.edby output
+ new.sentence format.introby output
+ new.sentence format.prefaceby output
+ new.sentence format.afterwordby output
+ new.sentence format.publisher.address output
+ new.sentence format.note output
+ new.sentence format.isbn output
+ new.sentence format.doi output
+ new.sentence format.urldate output
+ new.sentence format.url output
+ }
+ if$
+ }
+ { %%% if author field is empty, proceed with compiler
+ compiler empty$ not
+ {
+ format.compilers output.nonnull
+ name.or.dash
+ format.date "year" output.check
+ new.block format.btitle "title" output.check
+ translator empty$
+ {
+ crossref missing$
+ {
+ new.sentence format.edition output
+ new.sentence format.impression output
+ new.sentence format.by output
+ new.sentence format.bvolume.series.number output
+ new.sentence format.incollaborationwith output
+ new.sentence format.commentatedby output
+ new.sentence format.edby output
+ new.sentence format.introby output
+ new.sentence format.prefaceby output
+ new.sentence format.afterwordby output
+ new.sentence format.publisher.address output
+ new.sentence format.note output
+ new.sentence format.isbn output
+ new.sentence format.doi output
+ new.sentence format.urldate output
+ new.sentence format.url output
+ }
+ {
+ new.block format.book.crossref output.nonnull
+ }
+ if$
+ }
+ {
+ new.sentence format.edition output
+ new.sentence format.impression output
+ new.sentence format.by output
+ new.sentence format.translatedby output
+ new.sentence format.translateyear output
+ new.sentence format.bvolume.series.number output
+ new.sentence format.incollaborationwith output
+ new.sentence format.commentatedby output
+ new.sentence format.edby output
+ new.sentence format.introby output
+ new.sentence format.prefaceby output
+ new.sentence format.afterwordby output
+ new.sentence format.publisher.address output
+ new.sentence format.note output
+ new.sentence format.isbn output
+ new.sentence format.doi output
+ new.sentence format.urldate output
+ new.sentence format.url output
+ }
+ if$
+ }
+ { %%% if author, and compiler fields are empty, proceed with editor
+ editor empty$ not
+ {
+ format.editors output.nonnull
+ name.or.dash
+ format.date "year" output.check
+ new.block format.btitle "title" output.check
+ translator empty$
+ {
+ crossref missing$
+ {
+ new.sentence format.edition output
+ new.sentence format.impression output
+ new.sentence format.by output
+ new.sentence format.bvolume.series.number output
+ new.sentence format.incollaborationwith output
+ new.sentence format.commentatedby output
+ new.sentence format.introby output
+ new.sentence format.prefaceby output
+ new.sentence format.afterwordby output
+ new.sentence format.publisher.address output
+ new.sentence format.note output
+ new.sentence format.isbn output
+ new.sentence format.doi output
+ new.sentence format.urldate output
+ new.sentence format.url output
+ }
+ {
+ new.block format.book.crossref output.nonnull
+ }
+ if$
+ }
+ {
+ new.sentence format.edition output
+ new.sentence format.impression output
+ new.sentence format.by output
+ new.sentence format.translatedby output
+ new.sentence format.translateyear output
+ new.sentence format.bvolume.series.number output
+ new.sentence format.incollaborationwith output
+ new.sentence format.commentatedby output
+ new.sentence format.introby output
+ new.sentence format.prefaceby output
+ new.sentence format.afterwordby output
+ new.sentence format.publisher.address output
+ new.sentence format.note output
+ new.sentence format.isbn output
+ new.sentence format.doi output
+ new.sentence format.urldate output
+ new.sentence format.url output
+ }
+ if$
+ }
+ { %%% if author, compiler, and editor fields are empty, proceed translator
+ translator empty$ not
+ {
+ format.translators output.nonnull
+ name.or.dash
+ new.sentence format.translateyear output
+ new.block format.btitle "title" output.check
+ new.sentence format.edition output
+ new.sentence format.impression output
+ new.sentence format.by output
+ new.sentence format.date output
+ new.sentence format.bvolume.series.number output
+ new.sentence format.incollaborationwith output
+ new.sentence format.commentatedby output
+ new.sentence format.introby output
+ new.sentence format.prefaceby output
+ new.sentence format.afterwordby output
+ new.sentence format.publisher.address output
+ new.sentence format.note output
+ new.sentence format.isbn output
+ new.sentence format.doi output
+ new.sentence format.urldate output
+ new.sentence format.url output
+ }
+ { %%% if author, compiler, editor, and translator fields are empty, proceed key
+ key empty$ not
+ {
+ format.btitle "title" output.check
+ format.date "year" output.check
+ crossref missing$
+ {
+ new.sentence format.edition output
+ new.sentence format.impression output
+ new.sentence format.by output
+ new.sentence format.bvolume.series.number output
+ new.sentence format.incollaborationwith output
+ new.sentence format.commentatedby output
+ new.sentence format.introby output
+ new.sentence format.prefaceby output
+ new.sentence format.afterwordby output
+ new.sentence format.publisher.address output
+ new.sentence format.note output
+ new.sentence format.isbn output
+ new.sentence format.doi output
+ new.sentence format.urldate output
+ new.sentence format.url output
+ }
+ {
+ new.block format.book.crossref output.nonnull
+ }
+ if$
+ }
+ {
+ "author, compiler, editor, translator, and key" output.check
+ }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ if$
+ finish.entry
+}
+
+
+
+FUNCTION {booklet}
+{ begin.bibitem
+ format.authors output
+ author format.key output
+ name.or.dash
+ format.date "year" output.check
+ date.block
+ format.title "title" output.check
+ new.block
+ howpublished "howpublished" bibinfo.check output
+ address "address" bibinfo.check output
+ format.isbn output
+ format.doi output
+ new.block
+ format.note output
+ format.eprint output
+ format.url output
+ finish.entry
+}
+
+
+
+FUNCTION {inbook}
+{ begin.bibitem
+ author empty$
+ { format.editors "author and editor" output.check
+ editor format.key output
+ name.or.dash
+ }
+ { format.authors output.nonnull
+ name.or.dash
+ crossref missing$
+ { "author and editor" editor either.or.check }
+ 'skip$
+ if$
+ }
+ if$
+ format.date "year" output.check
+ date.block
+ format.btitle "title" output.check
+ crossref missing$
+ {
+ format.bvolume output
+ format.chapter.pages "chapter and pages" output.check
+ new.block
+ format.number.series output
+ format.edition output
+ new.sentence
+ format.publisher.address output
+ }
+ {
+ format.chapter.pages "chapter and pages" output.check
+ new.block
+ format.book.crossref output.nonnull
+ }
+ if$
+ crossref missing$
+ { format.isbn output }
+ 'skip$
+ if$
+ format.doi output
+ new.block
+ format.note output
+ format.eprint output
+ format.url output
+ finish.entry
+}
+
+
+
+FUNCTION {incollection}
+{
+ begin.bibitem
+ format.authors "author" output.check
+ author format.key output
+ name.or.dash
+ format.date "year" output.check
+ date.block
+ format.title "title" output.check
+ new.block
+ crossref missing$
+ {
+ format.in.ed.booktitle "booktitle" output.check
+ format.number.series output
+ format.edition output
+ format.chapter.pages output
+ new.sentence
+ format.publisher.address output
+ format.isbn output
+ }
+ {
+ format.incoll.inproc.crossref output.nonnull
+ format.chapter.pages output
+ }
+ if$
+ format.doi output
+ new.block
+ format.note output
+ format.eprint output
+ format.url output
+ finish.entry
+}
+
+
+
+FUNCTION {inproceedings}
+{ begin.bibitem
+ format.authors "author" output.check
+ author format.key output
+ name.or.dash
+ format.date "year" output.check
+ date.block
+ format.title "title" output.check
+ new.block
+ crossref missing$
+ { format.in.ed.booktitle "booktitle" output.check
+ format.number.series output
+ format.pages output
+ new.sentence
+ publisher empty$
+ { format.organization.address output }
+ { organization "organization" bibinfo.check output
+ format.publisher.address output
+ }
+ if$
+ format.isbn output
+ format.issn output
+ }
+ { format.incoll.inproc.crossref output.nonnull
+ format.pages output
+ }
+ if$
+ format.doi output
+ new.block
+ format.note output
+ format.eprint output
+ format.url output
+ finish.entry
+}
+
+
+
+FUNCTION {conference} { inproceedings }
+
+
+
+FUNCTION {manual}
+{ begin.bibitem
+ format.authors output
+ author format.key output
+ name.or.dash
+ format.date "year" output.check
+ date.block
+ format.btitle "title" output.check
+ organization address new.block.checkb
+ organization "organization" bibinfo.check output
+ address "address" bibinfo.check output
+ format.edition output
+ format.doi output
+ new.block
+ format.note output
+ format.eprint output
+ format.url output
+ finish.entry
+}
+
+
+
+FUNCTION {mastersthesis}
+{ begin.bibitem
+ format.authors "author" output.check
+ author format.key output
+ name.or.dash
+ format.date "year" output.check
+ date.block
+ format.title
+ "title" output.check
+ new.block
+ bbl.mthesis format.thesis.type output.nonnull
+ school "school" bibinfo.warn output
+ address "address" bibinfo.check output
+ format.doi output
+ new.block
+ format.note output
+ format.eprint output
+ format.url output
+ finish.entry
+}
+
+
+
+FUNCTION {misc}
+{ begin.bibitem
+ format.authors output
+ author format.key output
+ name.or.dash
+ format.date "year" output.check
+ date.block
+ format.title output
+ new.block
+ howpublished "howpublished" bibinfo.check output
+ format.doi output
+ new.block
+ format.note output
+ format.eprint output
+ format.url output
+ finish.entry
+}
+
+
+
+FUNCTION {phdthesis}
+{ begin.bibitem
+ format.authors "author" output.check
+ author format.key output
+ name.or.dash
+ format.date "year" output.check
+ date.block
+ format.title
+ "title" output.check
+ new.block
+ bbl.phdthesis format.thesis.type output.nonnull
+ school "school" bibinfo.warn output
+ address "address" bibinfo.check output
+ format.doi output
+ new.block
+ format.note output
+ format.eprint output
+ format.url output
+ finish.entry
+}
+
+
+
+FUNCTION {proceedings}
+{ begin.bibitem
+ format.editors output
+ editor format.key output
+ name.or.dash
+ format.date "year" output.check
+ date.block
+ format.btitle "title" output.check
+ format.bvolume output
+ format.number.series output
+ new.sentence
+ publisher empty$
+ { format.organization.address output }
+ { organization "organization" bibinfo.check output
+ format.publisher.address output
+ }
+ if$
+ format.isbn output
+ format.issn output
+ format.doi output
+ new.block
+ format.note output
+ format.eprint output
+ format.url output
+ finish.entry
+}
+
+
+
+FUNCTION {techreport}
+{ begin.bibitem
+ format.authors "author" output.check
+ author format.key output
+ name.or.dash
+ format.date "year" output.check
+ date.block
+ format.btitle
+ "title" output.check
+ new.block
+ format.tr.number output.nonnull
+ institution "institution" bibinfo.warn output
+ address "address" bibinfo.check output
+ format.doi output
+ new.block
+ format.note output
+ format.eprint output
+ format.url output
+ finish.entry
+}
+
+
+
+FUNCTION {unpublished}
+{ begin.bibitem
+ format.authors "author" output.check
+ author format.key output
+ name.or.dash
+ format.date "year" output.check
+ date.block
+ format.title "title" output.check
+ format.doi output
+ new.block
+ format.note "note" output.check
+ format.eprint output
+ format.url output
+ finish.entry
+}
+
+
+
+FUNCTION {default.type} { misc }
+
+
+
+
+
+% Reading bibliography database (.bib) file
+
+READ
+
+
+
+FUNCTION {sortify}
+{
+ purify$
+ "l" change.case$
+}
+
+
+
+% Length of the label
+
+INTEGERS { len }
+
+FUNCTION {chop.word}
+{
+ 's :=
+ 'len :=
+ s #1 len substring$ =
+ { s len #1 + global.max$ substring$ }
+ 's
+ if$
+}
+
+
+
+% Format the label name
+
+FUNCTION {label.and}
+{
+ is.language.persian
+ { "و" }
+ {
+ authorfa missing$
+ { "and" }
+ { "و" }
+ if$
+ }
+ if$
+}
+
+FUNCTION {label.etal}
+{
+ is.language.persian
+ { "و~همکاران" }
+ {
+ authorfa missing$
+ { "et~al." }
+ { "و~همکاران" }
+ if$
+ }
+ if$
+}
+
+
+
+FUNCTION {format.lab.names}
+{
+ 's :=
+ authorfa empty$
+ {
+ #0 'is.authorfa.exist :=
+ }
+ {
+ authorfa 's :=
+ #1 'is.authorfa.exist :=
+ }
+ if$
+ "" 't :=
+ s #1 "{vv~}{ll}" format.name$
+ s num.names$ #3 >
+ {
+ " " * label.etal *
+ }
+ {
+ s num.names$ #2 <
+ 'skip$
+ {
+ s num.names$ #3 <
+ {
+ s #2 "{ff }{vv }{ll}{ jj}" format.name$ "others" =
+ {
+ " " * label.etal *
+ }
+ {
+ label.and separate.by.space * s #2 "{vv~}{ll}" format.name$ *
+ }
+ if$
+ }
+ {
+ s #3 "{ff }{vv }{ll}{ jj}" format.name$ "others" =
+ {
+ " " * label.etal *
+ }
+ {
+ bbl.comma * " " * s #2 "{vv~}{ll}" format.name$ *
+ bbl.comma * " " * label.and separate.by.space * s #3 "{vv~}{ll}" format.name$ *
+ }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ if$
+ #0 'is.authorfa.exist :=
+}
+
+
+
+FUNCTION {author.key.label}
+{
+ author empty$
+ {
+ key empty$
+ { cite$ #1 #3 substring$ }
+ 'key
+ if$
+ }
+ {
+ author format.lab.names
+ }
+ if$
+}
+
+
+
+FUNCTION {author.editor.key.label}
+{
+ author empty$ not
+ {
+ author format.lab.names
+ }
+ {
+ compiler empty$ not
+ {
+ compiler format.lab.names
+ }
+ {
+ editor empty$ not
+ {
+ editor format.lab.names
+ }
+ {
+ translator empty$ not
+ {
+ translator format.lab.names
+ }
+ {
+ key empty$ not
+ 'key
+ { cite$ #1 #3 substring$ }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+
+
+FUNCTION {editor.key.label}
+{
+ editor empty$
+ {
+ key empty$
+ { cite$ #1 #3 substring$ }
+ 'key
+ if$
+ }
+ {
+ editor format.lab.names
+ }
+ if$
+}
+
+
+
+FUNCTION {calc.short.authors}
+{
+ type$ "book" =
+ type$ "inbook" =
+ or
+ 'author.editor.key.label
+ {
+ type$ "proceedings" =
+ 'editor.key.label
+ 'author.key.label
+ if$
+ }
+ if$
+ 'short.list :=
+}
+
+
+
+FUNCTION {calc.label}
+{
+ calc.short.authors
+ short.list
+ "("
+ *
+ author empty$ not
+ {
+ year duplicate$ empty$
+ { pop$ "" }
+ 'skip$
+ if$
+ }
+ {
+ compiler empty$ not
+ {
+ year duplicate$ empty$
+ { pop$ "" }
+ 'skip$
+ if$
+ }
+ {
+ editor empty$ not
+ {
+ year duplicate$ empty$
+ { pop$ "" }
+ 'skip$
+ if$
+ }
+ {
+ translator empty$ not
+ {
+ translateyear duplicate$ empty$
+ { pop$ "" }
+ 'skip$
+ if$
+ }
+ {
+ year duplicate$ empty$
+ { pop$ "" }
+ 'skip$
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ if$
+ *
+ 'label :=
+}
+
+
+
+
+
+% Functions for sort
+
+FUNCTION {sort.format.names}
+{
+ 's :=
+ #1 'nameptr :=
+ ""
+ s num.names$ 'numnames :=
+ numnames 'namesleft :=
+ {
+ namesleft #0 >
+ }
+ {
+ s nameptr
+ "{vv{ } }{ll{ }}{ ff{ }}{ jj{ }}" format.name$
+ 't :=
+ nameptr #1 >
+ {
+ " " *
+ namesleft #1 =
+ t "others" =
+ and
+ { "zzzzz" 't := }
+ 'skip$
+ if$
+ t sortify *
+ }
+ {
+ t sortify *
+ }
+ if$
+ nameptr #1 + 'nameptr :=
+ namesleft #1 - 'namesleft :=
+ }
+ while$
+}
+
+
+
+FUNCTION {sort.format.title}
+{
+ 't :=
+ "A " #2
+ "An " #3
+ "The " #4 t chop.word
+ chop.word
+ chop.word
+ sortify
+ #1 global.max$ substring$
+}
+
+
+
+FUNCTION {author.sort}
+{
+ author empty$
+ {
+ key empty$
+ {
+ "to sort, need author or key in " cite$ * warning$
+ ""
+ }
+ { key sortify }
+ if$
+ }
+ {
+ author sort.format.names
+ }
+ if$
+}
+
+
+
+FUNCTION {author.editor.sort}
+{
+ author empty$ not
+ {
+ author sort.format.names
+ }
+ {
+ compiler empty$ not
+ {
+ compiler sort.format.names
+ }
+ {
+ editor empty$ not
+ {
+ editor sort.format.names
+ }
+ {
+ translator empty$ not
+ {
+ translator sort.format.names
+ }
+ {
+ key empty$ not
+ {
+ key sortify
+ }
+ {
+ "to sort, need author, compiler, editor, translator, or key in " cite$ * warning$
+ ""
+ }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+
+
+FUNCTION {editor.sort}
+{
+ editor empty$
+ {
+ key empty$
+ {
+ "to sort, need editor or key in " cite$ * warning$
+ ""
+ }
+ {
+ key sortify
+ }
+ if$
+ }
+ {
+ editor sort.format.names
+ }
+ if$
+}
+
+
+
+FUNCTION {presort}
+{
+ calc.label
+ label sortify
+ " "
+ *
+ type$ "book" =
+ type$ "inbook" =
+ or
+ 'author.editor.sort
+ {
+ type$ "proceedings" =
+ 'editor.sort
+ 'author.sort
+ if$
+ }
+ if$
+ #1 entry.max$ substring$
+ 'sort.label :=
+ sort.label
+ *
+ " "
+ *
+ title field.or.null
+ sort.format.title
+ *
+ #1 entry.max$ substring$
+ 'sort.key$ :=
+}
+
+
+
+ITERATE {presort}
+
+SORT
+
+STRINGS { last.label next.extra }
+
+INTEGERS { last.extra.num last.extra.num.extended last.extra.num.blank number.label }
+
+FUNCTION {initialize.extra.label.stuff}
+{
+ #0 int.to.chr$ 'last.label :=
+ "" 'next.extra :=
+ #0 'last.extra.num :=
+ "a" chr.to.int$ #1 - 'last.extra.num.blank :=
+ last.extra.num.blank 'last.extra.num.extended :=
+ #0 'number.label :=
+}
+
+
+
+FUNCTION {forward.pass}
+{
+ last.label label =
+ {
+ last.extra.num #1 + 'last.extra.num :=
+ last.extra.num "z" chr.to.int$ >
+ {
+ "a" chr.to.int$ 'last.extra.num :=
+ last.extra.num.extended #1 + 'last.extra.num.extended :=
+ }
+ 'skip$
+ if$
+ last.extra.num.extended last.extra.num.blank >
+ {
+ last.extra.num.extended int.to.chr$
+ last.extra.num int.to.chr$
+ * 'extra.label :=
+ }
+ {
+ last.extra.num int.to.chr$ 'extra.label :=
+ }
+ if$
+ }
+ {
+ "a" chr.to.int$ 'last.extra.num :=
+ "" 'extra.label :=
+ label 'last.label :=
+ }
+ if$
+ number.label #1 + 'number.label :=
+}
+
+
+
+FUNCTION {reverse.pass}
+{
+ next.extra "b" =
+ { "a" 'extra.label := }
+ 'skip$
+ if$
+ extra.label 'next.extra :=
+ extra.label duplicate$ empty$
+ 'skip$
+ {
+ is.language.persian
+ { "{\natexlabfa{" swap$ * "}}" * }
+ { "{\natexlaben{" swap$ * "}}" * }
+ if$
+ }
+ if$
+ 'extra.label :=
+ label extra.label * 'label :=
+}
+
+
+EXECUTE {initialize.extra.label.stuff}
+
+ITERATE {forward.pass}
+
+REVERSE {reverse.pass}
+
+FUNCTION {bib.sort.order}
+{
+ sort.label
+ " "
+ *
+ year field.or.null sortify
+ *
+ " "
+ *
+ title field.or.null
+ sort.format.title
+ *
+ #1 entry.max$ substring$
+ 'sort.key$ :=
+}
+
+
+ITERATE {bib.sort.order}
+
+SORT
+
+
+FUNCTION {begin.bib}
+{
+ preamble$ empty$
+ 'skip$
+ { preamble$ write$ newline$ }
+ if$
+ "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%" write$
+ newline$
+ "% generated by iran.bst," write$
+ newline$
+ "% this bibliography style is part of the `iran-bib` package." write$
+ newline$
+ "% copyright (c) 2023 Farshad Rasuli <farshad.rasuli@gmail.com>" write$
+ newline$
+ "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%" write$
+ newline$
+ newline$
+ newline$
+ "\begin{thebibliography}{" number.label int.to.str$ * "}" * write$
+ newline$
+}
+
+
+EXECUTE {begin.bib}
+
+
+EXECUTE {init.state.consts}
+
+
+ITERATE {call.type$}
+
+
+FUNCTION {end.bib}
+{
+ newline$
+ "\end{thebibliography}" write$
+ newline$
+}
+
+
+EXECUTE {end.bib}
+
+
+
+%%
+%% End of file `iran.bst'. \ No newline at end of file
diff --git a/biblio/ctan-bibdata/ctan.bib b/biblio/ctan-bibdata/ctan.bib
index 4270dc4a16..b23fab424e 100644
--- a/biblio/ctan-bibdata/ctan.bib
+++ b/biblio/ctan-bibdata/ctan.bib
@@ -1,7 +1,7 @@
%% bib file of all CTAN packages
%% (C) Herbert Voß
%%
-%% created at 12-12-2023, 02:00:03
+%% created at 13-12-2023, 02:00:03
%%
%% This file is provided under the terms of the LPPL v1.3 or
@@ -23283,8 +23283,8 @@
title = {The \texttt{ETbb} package},
subtitle = {An expansion of Edward Tufte’s ET-Bembo family},
author = {Michael Sharpe},
- date = {2022-02-04},
- version = {1.056},
+ date = {2023-12-12},
+ version = {1.057},
license = {mit,lppl1.3},
mirror = {https://mirror.ctan.org/fonts/etbb},
url = {https://ctan.org/pkg/etbb},
@@ -37127,7 +37127,7 @@
title = {The \texttt{l3build} package},
subtitle = {A testing and building system for (La)TeX},
author = {{The LaTeX Project Team}},
- date = {2023-11-01},
+ date = {2023-12-12},
version = {},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/l3build},
@@ -37490,8 +37490,8 @@
title = {The \texttt{langnames} package},
subtitle = {Name languages and their genetic affiliations consistently},
author = {Alejandro García Matarredona and {Unknown}},
- date = {2023-01-09},
- version = {2.1},
+ date = {2023-12-12},
+ version = {3.0.0},
license = {lppl1.3},
mirror = {https://mirror.ctan.org/macros/latex/contrib/langnames},
url = {https://ctan.org/pkg/langnames},
@@ -48526,8 +48526,8 @@
title = {The \texttt{NewComputerModern} package},
subtitle = {Computer Modern fonts including matching non-latin alphabets},
author = {Antonis Tsolomitis},
- date = {2023-12-05},
- version = {5.0},
+ date = {2023-12-12},
+ version = {5.01},
license = {gfl},
mirror = {https://mirror.ctan.org/fonts/newcomputermodern},
url = {https://ctan.org/pkg/newcomputermodern},
@@ -54803,8 +54803,8 @@
title = {The \texttt{postnotes} package},
subtitle = {Endnotes for \LaTeX{}},
author = {{Unknown}},
- date = {2023-11-14},
- version = {0.2.7},
+ date = {2023-12-12},
+ version = {0.2.8},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/postnotes},
url = {https://ctan.org/pkg/postnotes},
@@ -72637,8 +72637,8 @@
title = {The \texttt{tuda-ci} package},
subtitle = {LaTeX templates of Technische Universität Darmstadt},
author = {Marei Peischl},
- date = {2023-07-13},
- version = {3.34},
+ date = {2023-12-12},
+ version = {3.35},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/tuda-ci},
url = {https://ctan.org/pkg/tuda-ci},
diff --git a/fonts/greek/gfs/gfsdidot/README b/fonts/greek/gfs/gfsdidot/README
index 0ed32eb467..28fdf760e3 100644
--- a/fonts/greek/gfs/gfsdidot/README
+++ b/fonts/greek/gfs/gfsdidot/README
@@ -1,7 +1,7 @@
-------- GFS Didot & GFS Olga for LaTeX -------------
-Version: 2018-01-11
+Version: 2023-12-13
A. Tsolomitis
diff --git a/fonts/greek/gfs/gfsdidot/opentype/GFSOlgaGrDidotItEn.otf b/fonts/greek/gfs/gfsdidot/opentype/GFSOlgaGrDidotItEn.otf
new file mode 100644
index 0000000000..fa2096df31
--- /dev/null
+++ b/fonts/greek/gfs/gfsdidot/opentype/GFSOlgaGrDidotItEn.otf
Binary files differ
diff --git a/fonts/greek/gfs/gfsdidot/tex/gfsdidot.sty b/fonts/greek/gfs/gfsdidot/tex/gfsdidot.sty
index c175f2ab8c..593e7f526d 100644
--- a/fonts/greek/gfs/gfsdidot/tex/gfsdidot.sty
+++ b/fonts/greek/gfs/gfsdidot/tex/gfsdidot.sty
@@ -23,7 +23,7 @@
%% atsol@aegean.gr
%%
\ProvidesFile{gfsdidot.sty}
-[2018/01/02 v1.1 Package `gfsdidot.sty']
+[2023/12/13 v1.1 Package `gfsdidot.sty']
\NeedsTeXFormat{LaTeX2e}
%The following command create a line with space characters
diff --git a/fonts/modes/ChangeLog b/fonts/modes/ChangeLog
index c648c272ff..da81120062 100644
--- a/fonts/modes/ChangeLog
+++ b/fonts/modes/ChangeLog
@@ -1,3 +1,8 @@
+2023-12-12 Karl Berry <karl@freefriends.org>
+
+ * GNUmakefile (version): 4.3.
+ * modes.mf (potrace): new mode for hans/mikael.
+
2020-09-08 Karl Berry <karl@freefriends.org>
* version 4.2.
diff --git a/fonts/modes/GNUmakefile b/fonts/modes/GNUmakefile
index 6afbdd60d3..a953017ffb 100644
--- a/fonts/modes/GNUmakefile
+++ b/fonts/modes/GNUmakefile
@@ -1,7 +1,7 @@
-# $Id: GNUmakefile,v 1.6 2020/09/08 22:13:43 karl Exp $
+# $Id: GNUmakefile,v 1.7 2023/12/12 22:47:56 karl Exp $
# Makefile for the mode_def collection. Public domain.
-version = 4.2
+version = 4.3
default: check
@@ -100,7 +100,7 @@ check-mktextfm:
# xerox info if requested:
tftopl ./logo10.tfm | fgrep CODING
# This will fail unless the new mktextfm is in PATH, and
-# unless the correct modes.mf is compiled into mf.base,.
+# unless the correct modes.mf is compiled into mf.base.
# It seems like overkill to have a new option to mktextfm so we can
# specify a fake mf, something like "inimf \input plain \input modes ...".
# We'll just test after installation.
diff --git a/fonts/modes/modelist.txt b/fonts/modes/modelist.txt
index 6dfa648b5b..18398c75c5 100644
--- a/fonts/modes/modelist.txt
+++ b/fonts/modes/modelist.txt
@@ -133,6 +133,7 @@ mode_def phaserfs = % Tektronix Phaser 560 (1200dpi)
mode_def phasertf = % Tektronix Phaser 350 (600x300dpi)
mode_def phasertl = % Tektronix Phaser 350 landscape (300x600)
mode_def pixpt = % one pixel per point (72.27dpi)
+mode_def potrace = % potrace use in LMTX
mode_def prntware = % Printware 720IQ (1200dpi)
mode_def qms = % QMS (Xerox engine) (300dpi)
mode_def qmsostf = % QMS 1725 (600dpi)
diff --git a/fonts/modes/modenames.txt b/fonts/modes/modenames.txt
index d627af77b7..c3e4cfbb89 100644
--- a/fonts/modes/modenames.txt
+++ b/fonts/modes/modenames.txt
@@ -133,6 +133,7 @@ phaserfs
phasertf
phasertl
pixpt
+potrace
prntware
qms
qmsostf
diff --git a/fonts/modes/modes.mf b/fonts/modes/modes.mf
index f4d72a29af..6c9a2b7518 100644
--- a/fonts/modes/modes.mf
+++ b/fonts/modes/modes.mf
@@ -1,4 +1,4 @@
-% {\tt\catcode`\$=12 $Id: modes.mf,v 1.29 2020/09/08 22:12:43 karl Exp $ }
+% {\tt\catcode`\$=12 $Id: modes.mf,v 1.31 2023/12/12 22:49:08 karl Exp $ }
%%\font\tenlogosl=logosl10
%%\def\logofont{\ifdim\fontdimen1\font>0pt \tenlogosl\else\tenlogo\fi}
%%\def\MF{{\logofont META}\-{\logofont FONT}}
@@ -24,12 +24,15 @@
% be used freely. You can retrieve the latest version from {\tt
% https://ctan.org/pkg/modes}, among other places.
%
+% For bug reports, discussion, or to submit a new |mode_def|, please
+% send it to {\tt tex-k@tug.org} (explanations below).
+%
+% For general discussion about \MF, the mailing list {\tt
+% tex-fonts@math.utah.edu} is a good place.
+%
% Feel free to change the definitions of |localfont|, |screen_cols|,
% and |screen_rows| at the end of file (see explanations below).
%
-% If you make a new |mode_def|, please send it to
-% {\tt tex-fonts@math.utah.edu} (explanations below also).
-%
% The mode definitions start at `Here are the modes', several hundred
% lines down. The companion files {\tt modelist.txt} and {\tt
% modenames.txt} list the modes one per line, with and without comments.
@@ -48,11 +51,11 @@
%%\begingroup \tt \catcode`\{=12 \catcode`\}=12 \obeyspaces
% @mffile{
% author = "The Metafont community",
-% version = "4.2",
-% date = "Tue Sep 8 15:13:58 PDT 2020"
+% version = "4.3",
+% date = "Tue Dec 12 14:49:12 PST 2023"
% filename = "modes.mf",
-% email = "tex-fonts@math.utah.edu"
-% checksum = "2662 13333 97582",
+% email = "tex-k@tug.org"
+% checksum = "2674 13389 97995",
% codetable = "ISO/ASCII",
% supported = "yes",
% docstring = "
@@ -431,10 +434,10 @@
% Don't let ourselves be processed twice.
if known modes_mf: endinput; fi;
-modes_mf := 4.2;
+modes_mf := 4.3;
% Identify ourselves in the format file.
-base_version := base_version & "/modes 4.2";
+base_version := base_version & "/modes 4.3";
% Here are useful macros (also called definitions) we use throughout.
@@ -2224,6 +2227,15 @@ mode_def pixpt = %\[ one pixel per point (72.27dpi)
mode_common_setup_;
enddef;
+% For Hans Hagen and Mikael Sundqvist's use of bitmaps, December 2023.
+mode_def potrace = %\[ potrace use in LMTX
+ mode_param (pixels_per_inch, 2 * 3600);
+ mode_param (blacker, 0);
+ mode_param (fillin, 0);
+ mode_param (o_correction, 1);
+ mode_common_setup_;
+enddef;
+
% This is a write-white PostScript laser-setter, made by a Xerox
% subsidiary. Its true aspect ratio is 1200$\,$dpi horizontally and
% 600$\,$dpi vertically, but {\tt mis@apsedoff.bitnet} says that the
diff --git a/fonts/modes/modes.pdf b/fonts/modes/modes.pdf
index 80710a0354..ec1c8b86d1 100644
--- a/fonts/modes/modes.pdf
+++ b/fonts/modes/modes.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3build/CHANGELOG.md b/macros/latex/contrib/l3build/CHANGELOG.md
index ba6b1deae5..71d207d19e 100644
--- a/macros/latex/contrib/l3build/CHANGELOG.md
+++ b/macros/latex/contrib/l3build/CHANGELOG.md
@@ -7,6 +7,13 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
+## [2023-12-13-2]
+
+## [2023-12-13]
+
+### Fixed
+- Syntax warning on Windows with some test setups
+
## [2023-12-12]
### Changed
@@ -732,7 +739,9 @@ this project uses date-based 'snapshot' version identifiers.
- Rationalise short option names: removed `-d`, `-E`, `-r`
- Target `cmdcheck`: specific to LaTeX kernel work
-[Unreleased]: https://github.com/latex3/l3build/compare/2023-12-12...HEAD
+[Unreleased]: https://github.com/latex3/l3build/compare/2023-12-13-2...HEAD
+[2023-12-13-2]: https://github.com/latex3/l3build/compare/2023-12-13...2023-12-13-2
+[2023-12-13]: https://github.com/latex3/l3build/compare/2023-12-12...2023-12-13
[2023-12-12]: https://github.com/latex3/l3build/compare/2023-11-01...2023-12-12
[2023-11-01]: https://github.com/latex3/l3build/compare/2023-09-13...2023-11-01
[2023-09-13]: https://github.com/latex3/l3build/compare/2023-09-07...2023-09-13
diff --git a/macros/latex/contrib/l3build/README.md b/macros/latex/contrib/l3build/README.md
index 55b22f6808..137b87d5ac 100644
--- a/macros/latex/contrib/l3build/README.md
+++ b/macros/latex/contrib/l3build/README.md
@@ -1,7 +1,7 @@
l3build: a testing and building system for LaTeX
=================================================
-Release 2023-12-12
+Release 2023-12-13-2
Overview
--------
diff --git a/macros/latex/contrib/l3build/l3build-check.lua b/macros/latex/contrib/l3build/l3build-check.lua
index 75e2fc2bcf..3718d172dd 100644
--- a/macros/latex/contrib/l3build/l3build-check.lua
+++ b/macros/latex/contrib/l3build/l3build-check.lua
@@ -822,12 +822,11 @@ function runtest(name, engine, hide, ext, test_type, breakout)
.. (hide and (" > " .. os_null) or ""),
testdir
)
- -- On Windows, concatenting here will suppress any non-zero errorlevel
+ -- On Windows, concatenating here will suppress any non-zero errorlevel
-- from the main run, so we split into two parts.
- if errlevels[i] == 0 then
+ if errlevels[i] == 0 and runtest_tasks("X",0) ~= "" then
local errorlevel =
- runcmd(preamble .. runtest_tasks(jobname(lvtfile),i)
- .. (hide and (" > " .. os_null) or ""),testdir)
+ runcmd(preamble .. runtest_tasks(jobname(lvtfile),i),testdir)
if errorlevel ~= 0 then errlevels[i] = errorlevel end
end
-- Break the loop if the result is stable
diff --git a/macros/latex/contrib/l3build/l3build.1 b/macros/latex/contrib/l3build/l3build.1
index da81ed4d26..9464982ab4 100644
--- a/macros/latex/contrib/l3build/l3build.1
+++ b/macros/latex/contrib/l3build/l3build.1
@@ -1,4 +1,4 @@
-.TH l3build 1 "2023-12-12"
+.TH l3build 1 "2023-12-13-2"
.SH NAME
l3build \- Checking and building packages
.SH SYNOPSIS
diff --git a/macros/latex/contrib/l3build/l3build.dtx b/macros/latex/contrib/l3build/l3build.dtx
index 444f6f8679..9405bc4b1c 100644
--- a/macros/latex/contrib/l3build/l3build.dtx
+++ b/macros/latex/contrib/l3build/l3build.dtx
@@ -251,7 +251,7 @@
% }^^A
% }
%
-% \date{Released 2023-12-12}
+% \date{Released 2023-12-13-2}
%
% \maketitle
% \tableofcontents
diff --git a/macros/latex/contrib/l3build/l3build.lua b/macros/latex/contrib/l3build/l3build.lua
index 4919d9377f..e0cf232aa4 100755
--- a/macros/latex/contrib/l3build/l3build.lua
+++ b/macros/latex/contrib/l3build/l3build.lua
@@ -1,3 +1,5 @@
+#!/usr/bin/env texlua
+
--[[
File l3build.lua Copyright (C) 2014-2022 The LaTeX Project
@@ -23,7 +25,7 @@ for those people who are interested.
--]]
-- Version information
-release_date = "2023-12-12"
+release_date = "2023-12-13-2"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")
diff --git a/macros/latex/contrib/l3build/l3build.pdf b/macros/latex/contrib/l3build/l3build.pdf
index e6d9b9f1a4..7546587a99 100644
--- a/macros/latex/contrib/l3build/l3build.pdf
+++ b/macros/latex/contrib/l3build/l3build.pdf
Binary files differ
diff --git a/macros/latex/contrib/litesolution/README.md b/macros/latex/contrib/litesolution/README.md
index a5120787f3..a099ca4c3c 100644
--- a/macros/latex/contrib/litesolution/README.md
+++ b/macros/latex/contrib/litesolution/README.md
@@ -1,5 +1,8 @@
# The `LiteSolution` document
+This template provides a light and fresh template, mainly used for typesetting solutions of final, textbook and other exercises.
+
+The template has been developed based on [ElegantBook](https://ctan.org/pkg/elegantbook) and [VividBooK](https://github.com/Azure1210/VividBooK) and has ported and improved the chapter design module code of the [Legrand Orange Book Template](https://www.overleaf.com/latex/templates/the-legrand-orange-book-template-english/jtctyfmnpppc).
Modules of `LiteSolution` provide the following supports:
diff --git a/macros/latex/contrib/litesolution/doc/litesolution-demo.tex b/macros/latex/contrib/litesolution/doc/litesolution-demo.tex
index 8b9552eb9f..ce9319cace 100644
--- a/macros/latex/contrib/litesolution/doc/litesolution-demo.tex
+++ b/macros/latex/contrib/litesolution/doc/litesolution-demo.tex
@@ -1,85 +1,417 @@
\chapter{A Sample for \pkg{LiteSolution} Template}
-\fancyhead[L]{\color{H6}\kaishu\faIcon{atom}\;2022年\titlelogo{https://sci.hdu.edu.cn}{HDU}「普通物理2」期中试题解析}
+\fancyhead[L]{\color{H6}\kaishu\faIcon{atom}\;2023年\titlelogo{https://sci.hdu.edu.cn}{HDU}「大学物理2」期中模拟}
\fancyhead[R]{\color{H6}\kaishu\rightmark\,}
-\section{选填题(共15分)}
-\begin{choice}{D}[波的能量]
- 一平面简谐波在弹性媒介中传播,在媒质质元从最大位移处回到平衡位置的过程中
+\date{2023年12月3日}{大学物理教学团队}{A0715012}
+{\href{https://qm.qq.com/q/UPbGudx8cK}{\textbf{物理問題作}}}
+{https://ctan.org/pkg/litesolution}{CTAN}
+{https://github.com/xiamyphys/LiteSolution}{GitHub}
+
+\section{选择题(每题3分,共36分)}
+\begin{choice}{D}[弹簧振子]
+ 一劲度系数为$k$的轻弹簧,下端挂一质量为$m$的物体,系统的振动周期为$T_1$. 若将此弹簧截去一半的长度,下端挂一质量为$m/2$的物体,则系统振动周期$T_2$等于
+\begin{tasks}(4)
+ \task $2T_1$
+ \task $T_1$
+ \task $\frac{T_1}{\sqrt2}$
+ \task $\frac{T_1}{2}$
+\end{tasks}
+\end{choice}
+\begin{solution}*
+ 弹簧的劲度系数与长度成反比,所以剪断一半后劲度系数变为$2k$;根据弹簧振子的周期表达式$T=2\pi\sqrt{\frac mk}$可知此时的周期$T_2=2\pi\sqrt{\frac{m/2}{2k}}=\frac{T_1}{2}$.\sokka{D}
+\end{solution}
+
+\begin{choice}{B}[单摆]
+ 把单摆摆球从平衡位置向位移正方向拉开,使摆线与竖直方向成一微小角度$\theta$,然后由静止放手任其振动,从放手时开始计时.若用余弦函数表示其运动方程,则该单摆振动的初相为
+ \begin{tasks}(4)
+ \task $\theta$
+ \task $0$
+ \task $\frac\pi2$
+ \task $-\pi$
+ \end{tasks}
+\end{choice}
+
+\vskip-2ex
+\begin{paracol}{2}
+\begin{choice}{A}[平面简谐波的波函数]
+ 一平面简谐波,波速$u=5\mathrm{m/s}$,$t=3\mathrm{s}$时波形曲线如图,则$x=0$处质点的振动方程可能为
+\begin{tasks}(2)
+ \task $y=2\ee{-2}\cos\ab(\frac12\pi t-\frac12\pi)$
+ \task $y=2\ee{-2}\cos\ab(\frac12\pi t+\frac12\pi)$
+ \task $y=2\ee{-2}\cos(\pi t+\pi)$
+ \task $y=2\ee{-2}\cos\ab(\pi t-\frac32\pi)$
+\end{tasks}
+\end{choice}
+\switchcolumn\centering
+\vfill
+\begin{tikzpicture}
+ \draw [->,thick] (-1.2,0) -- (4.8,0) node [anchor=south] {$x(\mathrm{m})$};
+ \draw [->,thick] (0,-1.8) -- (0,1.8) node [anchor=west] {$y(\mathrm{m})$};
+ \draw [very thick] (-.8,0) sin (0,-1) node [anchor=north west] {$-2\ee{-2}$} cos (.8,0) sin (1.6,1) cos (2.4,0) sin (3.2,-1) cos (4,0) sin (4.8,1);
+ \draw [thick,->] (1.6,1.2) -- (2.4,1.2) node [midway,anchor=south] {$u$};
+ \foreach \a in {5,10,...,25}
+ \node [anchor=north,xshift=0.16*\a cm] at (0,0) {\a};
+\end{tikzpicture}
+\vfill
+\end{paracol}
+\vspace{-.75em}
+\begin{solution}*
+ 由图可知$A=0.02\mathrm{m},\ \omega=\frac{2\pi u}{\lambda}=\frac12\pi$.由于原点处$v>0$,所以初相$\varphi=-\frac\pi2$.\sokka{A}
+\end{solution}
+
+\begin{choice}{A}[增透膜]
+ 一艘油船行经我国台湾岛东部海域时发生石油泄漏,在海面上形成大片油膜,太阳光在头顶正射时,救授人员乘直升飞机从上往下看,发现油膜对$552\mathrm{nm}$波长的可见光反射形成干涉相长而最亮,则可以推测该区域油膜厚度可能为多少?(设石油折射率$n=1.2$,海水折射率$n=1.3$)
+\begin{tasks}(4)
+ \task $460\mathrm{nm}$
+ \task $552\mathrm{nm}$
+ \task $345\mathrm{nm}$
+ \task $425\mathrm{nm}$
+\end{tasks}
+\end{choice}
+\begin{solution}
+ \begin{itemize}
+ \item 由于$n_{\text{空}}>n_{\text{海}}>n_{\text{油}}$,所以石油两个表面反射光光程差为$\delta=2ne$.
+ \item 使反射光干涉相长,即$2ne=k\lambda$. A选项刚好满足$k=2$时,$e_{\min}=2\cdot\frac{\lambda}{2n}=460\mathrm{nm}$.
+ \end{itemize}
+\end{solution}
+
+\begin{choice}{C}[光程和光程差]
+ 在相同的时间内,一束波长为$\lambda$的单色光在空气中和在玻璃中
\begin{tasks}(2)
- \task 它的势能转换成动能
- \task 它的动能转换成势能
- \task 它从相邻的一段质元获得能量,其能量逐渐增加
- \task 它把能量传给相邻的一段质元,其能量逐渐减小
+ \task 传播的路程相等,走过的光程相等
+ \task 传播的路程相等,走过的光程不相等
+ \task 传播的路程不相等,走过的光程相等
+ \task 传播的路程不相等,走过的光程不相等
\end{tasks}
\end{choice}
\begin{solution}*
- 波在传播过程中介质质元振动的动能和势能同时变化.\sokka{C}
+ 光程的定义:在相同时间内光线在真空中传播的距离.题目中光传播时间相同,故光程相等;又因为光在两种介质中的传播速度不同,所以在相同的时间内传播的路程不相等.\sokka{C}
\end{solution}
-\begin{choice}{D}[双缝干涉]
- 在双缝干涉实验中,两缝间距离为$d$,双缝与屏幕之间的距离为$D$($D\gg d$).波长为$\lambda$的平行单色光垂直照射到双缝上,屏幕上干涉条纹中相邻暗纹之间的距离是
- \begin{tasks}(4)
- \task $\frac{2\lambda D}{d}$
- \task $\frac{\lambda d}{D}$
- \task $\frac{dD}{\lambda}$
- \task $\frac{\lambda D}{d}$
+\begin{choice}{C}[多普勒效应]
+ 一观察者站在铁路旁,一火车以$30\mathrm{m/s}$的速度向他驶来并发出频率为$440\mathrm{Hz}$的汽笛声. 已知空气中声速为$330\mathrm{m/s}$,问观察者听到的火车频率为
+\begin{tasks}(4)
+ \task $403\mathrm{Hz}$
+ \task $480\mathrm{Hz}$
+ \task $484\mathrm{Hz}$
+ \task $528\mathrm{Hz}$
+\end{tasks}
+\end{choice}
+\begin{solution}
+ 已知多普勒效应观察者(Observer)和发射源(Source)的的频率关系为
+ \[\nu=\frac{u\pm v_o}{u\mp v_s}\nu_0\]
+
+ $v_o$为观察者速度,接近为$+$,远离为$-$;$v_s$为发射源速度,接近为$-$,远离为$+$.观察者静止,其所听频率为
+ \[\nu=\frac{330}{330-30}\times 440\mathrm{Hz}=484\mathrm{Hz}\]
+
+ \sokka{C}
+\end{solution}
+
+\vskip-2ex
+\begin{paracol}{2}
+\begin{choice}{C}[弗琅禾费衍射]
+ 在如图所示的单缝弗琅禾费衍射实验中,若将单缝沿透镜光轴方向向透镜平移,则屏幕上的衍射条纹
+\begin{tasks}(5)
+ \task 间距变大\!
+ \task 间距变小\!
+ \task 不变化
+ \task* 间距不变,明暗纹交替
+\end{tasks}
+\end{choice}
+\switchcolumn\centering
+\vfill
+\begin{tikzpicture}
+ \filldraw [fill=gray] (0,1.5) rectangle (0.2,0.5);
+ \filldraw [fill=gray] (0,-1.5) rectangle (0.2,-0.5);
+ \draw [thick,densely dashed] (-1.2,0)--(3,0);
+ \draw [thick] (3,1.5)--(3,-1.5);
+ \filldraw [fill=white] (1.5,0) ellipse (0.1 and 1.2);
+ \foreach \y in {0.5,-0.5}
+ \draw [thick,->,yshift=\y cm] (-1,0)--(0,0);
+ \length{(1.5,-1.4)}{(3,-1.4)}{$f$}{(0.25,0)}
+ \node [anchor=south] at (-1.2,0.5) {$\lambda$};
+ \node [anchor=south] at (1.5,1.2) {$L$};
+ \node [anchor=west] at (3,1.5) {Screen};
+\end{tikzpicture}
+\vfill
+\end{paracol}
+\vspace{-.75em}
+\begin{solution}*
+ 条纹间距只与波长、焦距、缝宽有关,入射光方向不变,所以条纹间距、位置不变. \sokka{C}
+\end{solution}
+
+\begin{choice}{A}[牛顿环]
+ 牛顿环干涉装置上平凸透镜在垂直于平板玻璃的方向上,逐渐向下平移(靠近玻璃板)时,反射光形成的干涉条纹的变化情况是
+ \begin{tasks}(2)
+ \task 环纹向边缘扩散,环数不变
+ \task 环纹向边缘扩散,环数增加
+ \task 环纹向中心靠拢,环数不变
+ \task 环纹向中心靠拢,环数增加
\end{tasks}
\end{choice}
\begin{solution}*
- 由明纹公式$x=k\lambda D/d$得暗纹间距$\Delta x=\lambda D/d$.\sokka{D}
+ 对于某条环,其光程差是确定的,所以环数不变;向边缘扩散光程差增大,可抵消透镜下移时导致的光程差减小.\sokka{A}
\end{solution}
-\begin{problem}[简谐振动的合成][3]
- 一个质点同时参与两个在同一直线上的简谐振动:$x_1=4\cos{\ab(2t+\frac{\pi}{6})},\ x_2=2\cos{\ab(2t-\frac{\pi}{6})}$.该质点合振动的振幅大小为\ans{$2\sqrt{7}$}.
+\begin{choice}{B}[最大分辨力]
+ 假设用FAST装置探测波长为$20\mathrm{cm}$的宇宙射电信号,FAST望远镜的镜面直径为$500\mathrm{m}$,则装置的最小分辨角为
+\begin{tasks}(4)
+ \task $9.76\ee{-4}$
+ \task $4.88\ee{-4}$
+ \task $2.44\ee{-4}$
+ \task $4.00\ee{-4}$
+\end{tasks}
+\end{choice}
+\begin{solution}*
+ $\theta=\frac{1.22\lambda}{D}=4.88\ee{-4}\mathrm{rad}$.\sokka{B}
+\end{solution}
+
+\vskip-2ex
+\begin{paracol}{2}
+ \begin{choice}{B}[双缝干涉]
+ 在双缝干涉实验中,屏幕$E$上的$P$点是明纹.若将缝$S_2$盖住,并在$S_1S_2$连线的垂直平分面处放一高折射率反射面$M$,如图所示.则此时$P$点
+ \begin{tasks}(2)
+ \task $P$点仍为明条纹
+ \task $P$点为暗条纹
+ \task 不能确定$P$点是明纹还是暗纹
+ \task 无干涉条纹
+ \end{tasks}
+ \end{choice}
+ \switchcolumn\centering
+ \vfill
+ \begin{tikzpicture}[decoration={markings,mark=between positions .2 and .8 step 18mm with {\arrow{stealth}}}]
+ \draw [very thick] (0,1.5)--(0,-1.5);
+ \draw [thick,postaction=decorate] (-1,0)--(0,0.5)--(2,0.8);
+ \draw [thick] (0,0.5)--(0.8,0);
+ \draw [thick,postaction=decorate] (-1,0)--(0,-0.5)--(2,0.8);
+ \draw [very thick] (0,0)--(1.8,0);
+ \draw [very thick] (2,1.8)--(2,-1.8);
+ \fill [pattern=north west lines] (0,0) rectangle (1.8,-0.2);
+ \fill [pattern=north east lines] (2,1.8) rectangle (2.2,-1.8);
+ \node [anchor=east] at (-1,0) {$S$} node [anchor=south east] at (0,0.5) {$S_1$} node [anchor=north east] at (0,-0.5) {$S_2$};
+ \node [anchor=north] at (0.8,-0.2) {$M$} node [anchor=west] at (2.2,0.8) {$P$} node [anchor=north] at (2.1,-1.8) {$E$};
+ \node at (-1,0) {$\times$};
+ \end{tikzpicture}
+ \vfill
+\end{paracol}
+\vspace{-.75em}
+\begin{solution}*
+ $S_1MP$、$S_2MP$长度相等,但平面镜使在反射中一条光路发生半波损失,两条光路的相位差变化$\pi$,所以$P$点由原来的明纹变为暗纹.\sokka{B}
+\end{solution}
+
+\begin{choice}{A}[迈克尔逊干涉仪]
+ 如果使迈克尔逊干涉仪的动镜移动$0.233\mathrm{mm}$,观察到$792$个条纹的移动,则所用照明单色光源的波长是多少?
+\begin{tasks}(4)
+ \task $588\mathrm{nm}$
+ \task $294\mathrm{nm}$
+ \task $442\mathrm{nm}$
+ \task $552\mathrm{nm}$
+\end{tasks}
+\end{choice}
+\begin{solution}*
+ 移动带来的光程差满足$\delta=2d=N\lambda$,由此得$\lambda=\frac{2d}{N}=588.38\mathrm{mm}$.\sokka{A}
+\end{solution}
+
+\begin{choice}{B}[光栅]
+ 某元素的特征光谱中含有波长分别为$\lambda_1=450\mathrm{nm},\ \lambda_2=750\mathrm{nm}$的谱线,在光栅光谱中这两种波长的谱线有重合现象,重叠处$\lambda_2$的谱线级数将是
+\begin{tasks}(4)
+ \task $2,\ 4,\ 6,\ 8,\cdots$
+ \task $3,\ 6,\ 9,\ 12,\cdots$
+ \task $4,\ 8,\ 12,\ 16,\cdots$
+ \task $5,\ 10,\ 15,\ 20,\cdots$
+\end{tasks}
+\end{choice}
+\begin{solution}*
+ 由光栅方程$d\sin\theta=k_1\lambda_1=k_2\lambda_2$得$k_2=\frac{k_1\lambda_1}{\lambda_2}$,取整值得$k_2=3,6,9,12,\cdots$.
+\end{solution}
+
+\section{填空题(共18分)}
+\begin{problem}[弹簧振子][3]
+ 当弹簧振子以频率$f$做简谐振动时,它的动能的变化频率为\ans{$2f$}.
\end{problem}
\begin{solution}*
- $A=\sqrt{A_1^2+A_2^2+2A_1A_2\cos{\Delta\varphi}}=2\sqrt{7}$.
+ 动能和势能变化趋势相反,所以二者变化频率相同. 势能$E_p\propto x^2$,由于$x$是周期为$T$的余弦函数,所以$x^2$的周期为$\frac T2$,即势能的变化频率等于动能的变化频率等于$2f$.
+\end{solution}
+
+\begin{problem}[驻波][3]
+ 在均匀介质中,一列余弦波沿$Ox$轴传播,波动方程为$y_1=A\cos\ab(2\pi t+\frac{2\pi x}3)$ (SI),在$x=1\mathrm{m}$处反射,反射点为固定端,则反射波和入射波产生的驻波表达式为\ans{$2A\cos{\ab(2\pi t+\frac{7\pi}6)}\cos{\ab(\frac{2\pi x}{3}-\frac{7\pi}{6})}$}.
+\end{problem}
+\begin{solution}
+\begin{itemize}
+ \item 考虑反射带来的半波损失,$x=1\mathrm{m}$处反射波的振动方程为$y_{10}=A\cos\ab(2\pi t+\frac{2\pi}{3}+\pi)$.
+ \item 反射后传播方向改变,考虑以$x=1$处为参考点需坐标变换$x'=x-1$,所以反射波的表达式为
+ \[y_2=A\cos\ab(2\pi t+\frac{2\pi}{3}-\frac{2\pi(x-1)}3+\pi)=A\cos\ab(2\pi t-\frac{2\pi x}{3}+\frac{7\pi}3)\]
+ \item 驻波表达式$y=y_1+y_2=2A\cos{\ab(2\pi t+\frac{7\pi}6)}\cos{\ab(\frac{2\pi x}{3}-\frac{7\pi}{6})}$.
+\end{itemize}
\end{solution}
-\begin{problem}[多普勒效应][6]
- 一辆运动的警车发出警铃声音频率为$f_s=1400\mathrm{Hz}$,从左向右移动,速度大小为$70\mathrm{m/s}$. 一个观察者从右向左移动,速度大小为$10\mathrm{m/s}$,空气中的声速$u=340\mathrm{m/s}$.观察者与警车相遇前后,听到警铃的频率分别为\ans{$1814.8\mathrm{Hz}$,$1126.8\mathrm{Hz}$}.
+\begin{problem}[双缝干涉][6]
+ 如图所示,在双缝干涉实验中,若把一厚度为$e$、折射率为$n$的薄云母片覆盖在$S_1$缝上,中央明条纹将向\ans{上}移动;覆盖云母片后,两束相干光至原中央明纹$O$处的光程差为\ans{$(n-1)e$}.
\end{problem}
\begin{solution}*
- $f_1=\frac{340+10}{340-70}\times 1400\mathrm{Hz}\approx 1814.8\mathrm{Hz},\ f_2=\frac{340-10}{340+70}\times 1400\mathrm{Hz}\approx 1126.8\mathrm{Hz}$.
+ 覆盖云母片后,通过$S_1$的光路光程差变大,为抵消这一变化中央明纹需上移使通过$S_2$的光路变长;原光程差为零,现光程差即云母片带来的光程差$\delta=ne-e=(n-1)e$.
\end{solution}
-\section{计算题(共20分)}
-\begin{problem}[简谐振动][10]
- 一个质量为$1\mathrm{kg}$的物块沿$x$轴做简谐振动,振幅为$10\mathrm{cm}$,最大速度$2\times 10^{-2}\mathrm{m/s}$.在时间$t=4\mathrm{s}$时,物块位于$5\mathrm{cm}$.求
- \begin{enumerate}
- \item 简谐运动的周期和最大加速度.
- \item 简谐运动的位移方程.
- \end{enumerate}
+\begin{problem}[牛顿环][3]
+ 若把牛顿环装置(都是用折射率为$1.52$的玻璃制成的)由空气搬入折射率为$1.33$的水中,则干涉条纹\ans{变密}(变疏/变密).
+\end{problem}
+\begin{solution}*
+ 放入水中后每条条纹的光程差变大,为抵消这一变化条纹需向中心收缩,所以干涉条纹变密.
+\end{solution}
+
+\begin{problem}[弗琅禾费衍射][3]
+ 在单缝夫琅禾费衍射实验中,波长为$\lambda$的单色光垂直入射在宽度为$a=6\lambda$的单缝上,对应于衍射角为$30^\circ$的方向,单缝处波阵面可分成的半波带数目为\ans{6}.
+\end{problem}
+\begin{solution}*
+ 由衍射公式$a\sin{\theta}=k\lambda$得$k=3$,可分成的半波带数目为$2k=6$.
+\end{solution}
+
+\section{计算题(共46分)}
+\begin{paracol}{2}
+\begin{problem}[平面简谐波的波函数][10]
+ 一列平面简谐波在媒质中以波速$u=5\mathrm{m/s}$沿$x$轴正向传播,原点$O$处质元的振动曲线如图所示.
+\begin{enumerate}
+ \item 求解$x=25\mathrm{m}$处质元的振动方程并画出该点振动曲线.
+ \item 求解波动方程,并画出$t=3\mathrm{s}$时的波形曲线.
+\end{enumerate}
\end{problem}
+\switchcolumn\centering
+ \vfill
+ \begin{tikzpicture}
+ \draw [->,thick] (-0.5,0)--(4,0) node [anchor=south] {$t(\mathrm{s})$} node [anchor=north] {\textcolor{H6}{$x(\mathrm{cm})$}};
+ \draw [->,thick] (0,-1.5)--(0,1.5) node [anchor=west] {$y(\mathrm{cm})$};
+ \draw[thick,H1] (0,0) sin (0.6,1) cos (1.2,0) sin (1.8,-1) cos (2.4,0) sin (3.0,1) cos (3.6,0);
+ \draw [densely dashed] (0,1)--(.6,1) node [anchor=east,at start] {$2$};
+ \node [anchor=north east] at (0,0) {$O$} node [anchor=south west] at (1.2,0) {$2$} node [anchor=south east] at (2.4,0) {$4$};
+ \draw [very thick,H2,dotted,line cap=round] (0,-1) cos (0.6,0) sin (1.2,1) cos (1.8,0) sin (2.4,-1) cos (3,0) sin (3.6,1);
+ \draw [very thick,H6,densely dashed,line cap=round] (-.8,0) sin (0,-1) cos (.8,0) sin (1.6,1) cos (2.4,0) sin (3.2,-1) cos (4,0);
+ \node [anchor=north] at (.8,0) {\textcolor{H6}{5}} node [anchor=north] at (2.4,0) {\textcolor{H6}{15}};
+ \end{tikzpicture}
+ \vfill
+\end{paracol}
+\vspace{-.75em}
\begin{solution}
\begin{enumerate}
- \item 由$v_{\max}=\omega,\ T=\frac{2\pi}{\omega}$得$T=10\pi\mathrm{s},\ \omega=0.2\mathrm{s}^{-1},\ a_{\max}=\omega^2A=4\times 10^{-3}\mathrm{m/s}^2$.\point{4}
- \item $t=4\mathrm{s}$时$x=\frac{1}{2}A,\ v<0$,所以此时相位$\varphi=\frac{\pi}{3}$.故位移方程为\point{2}
- \[x=0.1\cos{\ab[0.2\ab(t-4)]+\frac{\pi}{3}}=0.1\cos{\ab(0.2t+0.079\pi)}\eqno\point{4}\]
+ \item 由图知振幅$A=0.02\mathrm{m}$,角频率$\omega=\frac{2\pi}{T}=0.5\pi\mathrm{s}$. $t=0$时,$y=0,\ v>0$,初相$\varphi=-\frac\pi2$. 波动方程为\point{2}
+ \[y=0.02\cos{\ab[\frac\pi2\ab(t-\frac{x}{5})-\frac\pi2]}\eqno\point{2}\]
+ $x=25\mathrm{m}$处质元的振动方程为$y(x_0,t)=0.02\cos\ab(\frac\pi2t-\pi)$.\point{2}
+ \item 波动方程见上问. $t=3\mathrm{s}$时的波形方程为
+ \[y(x,t_0)=0.02\cos\ab(-\frac{\pi}{10}x+\pi)\eqno\point{2}\]
\end{enumerate}
\end{solution}
-\begin{problem}[牛顿环][10]
- 空气中,使用波长为$480\mathrm{nm}$平行单色光观察牛顿环.在反射光中测得某一明环的直径为$4.74\mathrm{mm}$,在它外面第$10$个明环的直径为$7.24\mathrm{mm}$.求
-\begin{enumerate}
- \item 平凸透镜的曲率半径.
- \item 直径为$4.74\mathrm{mm}$明环的条纹级数$k$.
- \item 假设把整个装置放入水中($n=1.33$),原直径为$4.74\mathrm{mm}$明环的新直径.
-\end{enumerate}
+\vskip-2ex
+\begin{paracol}{2}
+\begin{problem}[光程和光程差][8]\footnote{\kaishu 选自37th CPhO预赛试题第10题,原题未并提供参考图片.}
+ 一艘船(如图中$S$)在$25\mathrm{m}$高的桅杆($SS'$)上装有一天线(如图中$S''$),不断发射某种波长的无线电波,已知波长在$2-4\mathrm{m}$范围内,在高出海平面$150\mathrm{m}$的悬崖顶($OP$)上有一接收站$P$能收到这无线电波,但当那艘船驶至离悬崖底部$OS=2\mathrm{km}$时,接收站就收不到无线电波.设海平面完全反射这无线电波,求所用无线电波的波长.
\end{problem}
+\switchcolumn\centering
+\vfill
+\begin{tikzpicture}[scale=0.8]
+ \coordinate [label=below left:{$S$}] (S) at (0,0);
+ \coordinate [label=above left:{$S'$}] (S') at (0,1);
+ \coordinate [label=below left:{$S''$}] (S'') at (0,-1);
+ \coordinate [label=below:{$M$}] (M) at (1.5,0);
+ \coordinate [label=above:{$P$}] (P) at (6,3);
+ \coordinate [label=below:{$O$}] (O) at (6,0);
+ \draw [thick,line join=round,line cap=round] (P) -- (O) -- (S) -- (S');
+ \draw [thick,dashed,line join=round] (P) -- (S) -- (S'') -- (M);
+ \draw [very thick,line cap=round,densely dashed,H1] (S') -- (P);
+ \draw [very thick,line cap=round,dotted,H1] (S') -- (M) -- (P);
+ \length{(-.25,0)}{(-.25,1)}{$a$}{(0,0.25)}
+ \pic ["$\theta$", draw, thick, angle radius=5mm, angle eccentricity=1.5] {angle=O--S--P};
+ \pic ["$\theta'$", draw, thick, angle radius=5mm, angle eccentricity=1.5] {angle=O--M--P};
+ \pic ["$\Delta\theta$", draw, thick, angle radius=10mm, angle eccentricity=1.5] {angle=S--P--M};
+ \draw [thick] (S') -- (0.75,-0.5) coordinate [label=below:$K$] (foot);
+ \pic ["$\theta$", draw, thick, angle radius=3mm, angle eccentricity=2] {angle=S''--S'--foot};
+ \length{($(S'')+({0.5*sin(atan(2/3))},{-0.5*cos(atan(2/3))})$)}{($(foot)+({0.5*sin(atan(2/3))},{-0.5*cos(atan(2/3))})$)}{$\scriptstyle 2a\sin\theta$}{({0.5*cos(atan(2/3))},{0.5*sin(atan(2/3))})}
+ \length{($(S)-(0,2)$)}{($(O)-(0,2)$)}{$2\mathrm{km}$}{(1.5,0)}
+ \length{($(O)+(0.5,0)$)}{($(P)+(0.5,0)$)}{$150\mathrm{m}$}{(0,0.5)}
+ \draw [dashed,H4] (S') --++ (6,0) -- (P);
+ \draw [dashed,H6] (S'') --++ (6,0) -- (P);
+\end{tikzpicture}
+\vfill
+\end{paracol}
+\vspace{-.75em}
\begin{solution}
-\begin{enumerate}
- \item $R=\ab(r_{k+10}^2-r_k^2)/10\lambda=1.56\mathrm{m}$.\point{4}
- \item 由$r_k=\sqrt{\frac{2k-1}{2}\lambda R}$得$k=\frac{r_k^2}{\lambda R}+\frac{1}{2}=8$.\point{3}
- \item 由于光在介质中的波长与折射率成反比,所以此时$d_k^{\prime}=\frac{d_k}{\sqrt{n}}=4.11\mathrm{mm}$.\point{3}
-\end{enumerate}
+ 考虑半波损失,经海平面反射的光波与直达$P$点的光波之间的光程差为
+ \[\delta=2a\sin\theta+\frac\lambda2\eqno\point{3}\]
+ 由几何关系$\sin\theta=\sin\arctan\ab(\frac{150}{2000})=0.075$. 利用干涉相消条件得无线电波长为\point{2}
+ \[\delta=\frac{2k+1}{2}\lambda,\ \lambda=\frac{2a\sin\theta}{k}\xlongequal[2<\lambda<4]{k=1}3.74\mathrm{m}\eqno\point{3}\]
+ \textbf{本题中$\Delta\theta$不可忽略,不得认为$\theta=\angle PMO$! 否则会得到$k=2.18$.}
+ \vskip1ex\hrule\vskip1ex
+ 另一种更精确的解法是直接计算两条光路的长度之差\footnote{值得一提的是,因上一种解法近似认为$S'K\bot S''K$,相对于这种解法有$7.73\ee{-3}\%$的误差(小数点第四位及以后不同).}
+ \[\begin{aligned}
+ \delta&=\overline{S''P}-\overline{S'P}+\frac\lambda2=\sqrt{\ab(\overline{SO})^2+\ab(\overline{OP}+\overline{SS''})^2}-\sqrt{\ab(\overline{SO})^2+\ab(\overline{OP}-\overline{SS''})^2}+\frac\lambda2\\
+ &=\sqrt{2000^2+(150+25)^2}-\sqrt{2000^2+(150-25)^2}+\frac\lambda2=\frac{2k+1}{2}\lambda
+ \end{aligned}\]
+
+ 解得$\lambda\xlongequal{k=1}3.74\mathrm{m}$.
\end{solution}
-\section{计算题\! $^\dagger$(共15分)}
+\begin{problem}[薄膜干涉][10]
+波长为$\lambda=500\mathrm{nm}$的单色光垂直入射到\textbf{置于空气中}的上下表面平行的薄膜上,已知膜的折射率$n=1.25$,求反射光、透射光最强时膜的最小厚度.
+\end{problem}
+\begin{solution}*
+ 两个表面反射光光程差为$\delta=2ne+\frac\lambda2$. 分别由反射光干涉相长$\delta=k\lambda$和相消$\delta=\frac{2k+1}{2}\lambda$得\point{4}
+ \[e_{\min_1}=\frac{\lambda}{4n}=100\mathrm{nm},\ e_{\min_2}=\frac{\lambda}{2n}=200\mathrm{nm}\eqno\point{4}\]
+\begin{itemize}
+ \item 反射光干涉相长时,反射光最强,膜的最小厚度为$e_{\min_1}=100\mathrm{nm}$.\point{1}
+ \item 反射光干涉相消时,透射光最强,膜的最小厚度为$e_{\min_2}=200\mathrm{nm}$.\point{1}
+\end{itemize}
+\end{solution}
-\begin{problem}[弹簧振子][15]
- 一个质量为$m=1\mathrm{kg}$的盘子刚性连接竖直悬挂的轻弹簧下端,弹簧的劲度系数为$k=90\mathrm{N/m}$.盘子在竖直方向做简谐运动,振幅$A=10.0\mathrm{cm}$.现有一个质量$m_2=1\mathrm{kg}$的物体自由落下掉在盘上,没有反弹.当\textbf{盘子位于向上最大位移处},盘子与物体发生碰撞,物体从开始自由自由落体发生处,距离为$h=20\mathrm{cm}$,假设碰撞瞬间完成.求碰撞后盘子和物体组成的系统,它的振动周期、振幅和振动能量.
+\vskip-2ex
+\begin{paracol}{2}
+\begin{problem}[光栅][12]
+ 如右图所示,$AB$之间的虚线为一透射式光栅,该光栅在$1\mathrm{mm}$内刻画有$500$条狭缝,单条狭缝的缝宽为$a=0.5\mu\mathrm{m}$,一波长为$\lambda=500\mathrm{nm}$的单色平行光斜入射在该光栅上,入射角$\theta=30^\circ$(从光栅光轴下方入射),在光栅后放置凸透镜和观察屏(屏位于透镜的焦平面处),问屏上能看到哪几级谱线?
\end{problem}
+\switchcolumn\centering
+\vfill
+\begin{tikzpicture}[decoration={markings,mark=between positions .25 and .8 step 20mm with {\arrow{stealth}}}]
+ \filldraw [thick,fill=gray] (0,1.6) rectangle (0.15,0.5);
+ \draw [densely dashed,thick] (0,0.5)--(0,-0.5);
+ \filldraw [thick,fill=gray] (0,-1.6) rectangle (0.15,-0.5);
+ \draw [densely dashed,thick] (-1.5,0)--(2,0);
+ \coordinate (b) at (-1.5,0);
+ \coordinate (a) at (0,0);
+ \coordinate (c) at (-1,-0.4);
+ \coordinate (d) at (1.5,0.2);
+ \coordinate (e) at (2,0);
+ \foreach \a in {-0.5,-0.25,0,0.25,0.5}
+ \draw [yshift=\a cm,thick,postaction=decorate,->] (-1,-0.4)--(0,0)--(1.5,0.2);
+ \pic["$\theta$", draw=black, very thick, angle
+ eccentricity=1.35, angle radius=24]{angle=b--a--c};
+ \pic["$\varphi$", draw=black, very thick, angle
+ eccentricity=1.35, angle radius=36]{angle=e--a--d};
+ \node[anchor=east] at (0,0.6) {$A$} node[anchor=east] at (0,-0.6) {$B$};
+\end{tikzpicture}
+\vfill
+\end{paracol}
+\vspace{-.75em}
\begin{solution}*
- Answer omitted.
+ 光栅常数$d=\frac{1\ee{-3}}{500}=2\mu\mathrm{m}$. 由于光栅方程\point{2}
+ \[d(\sin\varphi-\sin\theta)=k\lambda\eqno\point{2}\]
+\begin{itemize}
+ \item 令$\varphi=\pm 90^\circ$得$k_{\min}=-6,\ k_{\max}=2$. 由缺级条件得$k'=\frac{d}{a}=\pm 4$,第$-4$级缺级.\point{4}
+ \item 由于$\varphi$无法取到$\pm 90^\circ$,所以屏上可见主极大级次为$k=0,\ \pm 1,\ -2,\ -3,\ -5$.\point{4}
+\end{itemize}
+\end{solution}
+
+\begin{problem}[驻波][6]
+ 由振动频率为$400\mathrm{Hz}$的音叉在两端固定拉紧的弦线上建立驻波.这个驻波共有三个波腹,其振幅为$0.30\mathrm{cm}$,波在弦上的速度为$320\mathrm{m/s}$.
+\begin{enumerate}
+ \item 求此弦线的长度.
+ \item 若以弦的中点为坐标原点,试写出弦线上驻波的表达式.
+\end{enumerate}
+\end{problem}
+\begin{solution}
+\begin{enumerate}
+ \item 由题意得弦长为$1.5$个波长,即$l=1.5\lambda=1.5\frac{u}{f}=1.2\mathrm{m}$.\point{2}
+ \item 驻波的角频率$\omega=2\pi f=800\pi$,波矢$k=\frac{2\pi}{\lambda}=\frac{5}{2}\pi$. 设驻波的表达式为
+ \[y=3\ee{-3}\cos\ab(800\pi t+\phi)\cos\ab(\frac52\pi x+\varphi)\eqno\point{2}\]
+ 中点$x=0$处是波腹,所以$\cos\varphi=1,\ \varphi=0\ \text{or}\ \pi$. 所以驻波的表达式为
+ \[y=\pm 3\ee{-3}\cos\ab(800\pi t+\phi)\cos\ab(\frac52\pi x)\eqno\point{2}\]
+ 符号$\pm$对应$\varphi$的两个解,$\phi$由初始条件决定.
+\end{enumerate}
\end{solution} \ No newline at end of file
diff --git a/macros/latex/contrib/litesolution/doc/litesolution-doc.tex b/macros/latex/contrib/litesolution/doc/litesolution-doc.tex
index 304406769f..c358895d8e 100644
--- a/macros/latex/contrib/litesolution/doc/litesolution-doc.tex
+++ b/macros/latex/contrib/litesolution/doc/litesolution-doc.tex
@@ -3,9 +3,9 @@
\fancyhead[R]{\color{H7}\rightmark\,}
\centerline{Xia Mingyu, \href{https://www.hdu.edu.cn}{Hangzhou Dianzi University}}
-\ddmmyyyydate
+\yyyymmdddate
\centerline{\mailto{xiamyphys@gmail.com}}
-\centerline{\today,\quad Version 1.0a}
+\centerline{\today,\quad Version 1.2a}
This is the document for \pkg{LiteSolution} template, which provides a lite design of the solution of test paper.
@@ -13,7 +13,7 @@ Some designs of this template currently only support \textbf{Simplified Chinese
\section{Introduction}
\subsection{The purpose of this template}
-This template provides a lite and fresh template, and mainly used for typesetting solutions of final, textbooks' and other exercises. This template is developed based on \href{https://www.ctan.org/pkg/elegantbook}{\pkg*{ElegantBook}} and \href{https://github.com/Azure1210/VividBooK}{\pkg*{VividBooK}}, ported and improved the chapter design module code of \href{https://www.overleaf.com/latex/templates/the-legrand-orange-book-template-english/jtctyfmnpppc}{The Legrand Orange Book}. I'd like to express my gratitude to the template authors above for their previous work.
+This template provides a lite and fresh template, and mainly used for typesetting solutions of mid-term or final exam, textbooks and other exercises. This template is developed based on \pkg{ElegantBook} and \href{https://github.com/Azure1210/VividBooK}{\pkg*{VividBooK}}, ported and improved the chapter design module code of \href{https://www.overleaf.com/latex/templates/the-legrand-orange-book-template-english/jtctyfmnpppc}{\pkg*{The Legrand Orange Book}}. I'd like to express my gratitude to the template authors above for their previous work.
If you meet bugs when using this template, or you have better suggestions or ideas, or you want to participate in the development of the template or other templates by me, welcome to contact via email \href{mailto:xiamyphys@gmail.com}{xiamyphys@gmail.com}.
@@ -21,10 +21,8 @@ Also, you can join my \textsf\LaTeX{} Template Discussion \href{https://qm.qq.co
\subsection{Loading \pkg{LiteSolution} and its modes}
-Update all the packages to the latest version or switch to portable version instead by implementing the commands
+You should update all the packages to the latest version or switch to portable version instead by implementing the commands
\begin{verbatim}
- tlmgr update --self
- tlmgr update --all
tlmgr update --self --all --reinstall-forcibly-removed
\end{verbatim}
@@ -36,7 +34,7 @@ The template provides 3 modes, \mode{answer}, \mode{mtpro2} and \mode{counter}.
\section{Modes of \pkg{LiteSolution}}
\subsection{The \mode{answer} mode}
-This mode has two options, \mode{ans} and \mode{noans}, which can show and hide answers respectively. After you choose the \mode{noans}, the contents in the environment \cmd{solution}, the command \cmd{ans} and the answers in the multiple choice questions will all become the same color as the pagecolor. So the area that originally contained the answer will be replaced by an area of the same blank size. You can generate exams without answers and solutions by enabling \mode{noans}.
+This mode has two options, \mode{ans} and \mode{noans}, which can show and hide answers respectively. After you choose the \mode{noans}, the contents in the environment \cmd{solution}, the command \cmd{ans} and the answers in the multiple choice questions will all disappear. So the area that originally contained the answer will be replaced by an area of the same blank size. You can generate exams without answers and solutions by enabling \mode{noans}.
\subsection{The \mode{mtpro2} mode}
If you've installed the \emph{Mathtime Pro 2 Lite} font in your computer, then you can use this mode to change the math font.
@@ -44,21 +42,34 @@ If you've installed the \emph{Mathtime Pro 2 Lite} font in your computer, then y
\subsection{The \mode{counter}}
This mode has two options, \mode{separate} and \mode{continuous}, which can make the page counter between chapters be remaked or continuous.The page numbers between each test question will be continuous when you use the \mode{continuous} mode or the page number of each test question will start from 1 when you use the \mode{separate}.
-
\section{Commands of \pkg{LiteSolution}}
\subsection{The \cmd{chapterimage} command}
\begin{verbatim}
\chapterimage{cover1.png}
\end{verbatim}
+
This command can assign the title background image for each subsequent chapter.
\subsection{The \cmd{chapterfont} command}
+\begin{verbatim}
+ \chapterfont{PingFang HK} \chapterfont*{PingFang HK}
+\end{verbatim}
+
This command can assign the title font for each subsequent chapter, if you do not use this command, the title font will be \emph{songti} in Chinese and \emph{Libertinus} in English.
+If a star (*) is added after the \verb|\chapterfont|, then \TeX Live will call the font file from the current path, note from the system. And the file in the current path only support the \verb|.ttf| format.
+
\subsection{The \cmd{ans} command}
-This command can underlines the answer and changes the color of the answer to \textcolor{1号色}{Blue Sapphire}.
+This command can underlines the answer and changes the color of the answer to \textcolor{H5}{Blue Sapphire}.
+
+If mode \mode{noans} is enabled, the answer will disappear, leaving only a horizontal line the same width as the answer.
-\paragraph{If mode \mode{noans} is enabled, the answer will disappear, leaving only a horizontal line the same width as the answer.}
+\subsection{The \cmd{solute} command}
+\begin{verbatim}
+ \solute{3} % create a solution box with the height of 3em.
+\end{verbatim}
+
+This command can create a fixable solution box when the mode \mode{noans} is enabled.
\subsection{The \cmd{watermark} command}
\begin{verbatim}
@@ -78,6 +89,10 @@ In order to facilitate input, the following commands are scheduled. You can add
\verb|\titlelogo{#1}{#2}| & Add emoji with link in text & \verb|\point{#1}| & Add score & \verb|\i| & $\mathrm{i}$\\
\hline
\verb|\sokka{#1}| & 故本题选择\#1项 & \verb|\d| & $\mathrm{d}$ & \verb|\e| & $\mathrm{e}$\\
+ \hline
+ \verb|\xSim[#1]{#2}| & $\xSim[r_1\times2]{r_2+r_1}$ & \verb|\ee{#1}| & $\ee{-34}$ & \verb|\mat{#1}^\T| & $\mat{A}^\T$\\
+ \hline
+ \verb|\rank{#1}| & $\rank{\mat{AB}}$ & \verb|\QED| & \QED & \verb|$5\unit{kg}$| & $5\unit{kg}$\\
\bottomrule
\end{tabular}
\end{center}
@@ -94,12 +109,6 @@ If you want to add choice and keywords.
\task This is choice C \task This is choice D
\end{tasks}
\end{choice}
-\begin{choice}{D}
-If you want to add choice only.
-\begin{tasks}(4) % 4 choices per line
- \task Chc A \task Chc B \task Chc C \task Chc D
-\end{tasks}
-\end{choice}
\end{tcblisting}
\begin{paracol}{2}
@@ -125,6 +134,7 @@ If you want to add choice only.
\end{tikzpicture}
\vfill
\end{paracol}
+\begin{tcolorbox}
\begin{verbatim}
\begin{paracol}{2}
\begin{choice}{D}[Gaussian theory]
@@ -137,6 +147,7 @@ If you want to add choice only.
\switchcolumn\centering\vfill\tikz{...}\vfill
\end{paracol}
\end{verbatim}
+\end{tcolorbox}
\subsection{The \cmd{problem} environment}
Sightly different from the cmd{choice} environment: the two variables are points and keywords, and the question number counter is shared with the multiple-choice question number counter.
@@ -157,7 +168,7 @@ Sightly different from the cmd{choice} environment: the two variables are points
\begin{paracol}{2}
\begin{problem}[Gaussian theory \& Field strength][6]
- 一均匀带电直导线长为$d$,电荷线密度为$+\lambda$.过导线中点$O$作一半径为$R$($R>\frac{d}{2}$)的球面$S$,$P$为带电直导线的延长线与球面$S$的交点. 则通过该球面的电场强度通量$\Phi_e=$\ans{$\frac{\lambda d}{\varepsilon_0}$},带电直线的延长线与球面交点$P$处的电场强度的大小为\ans{$\frac{\lambda d}{4\pi\varepsilon_0(R^2-d^2/4)}$},方向\ans{沿矢径$\boldsymbol{OP}$}.
+ 一均匀带电直导线长为$d$,电荷线密度为$+\lambda$.过导线中点$O$作一半径为$R$($R>\frac{d}{2}$)的球面$S$,$P$为带电直导线的延长线与球面$S$的交点. 则通过该球面的电场强度通量$\Phi_e=$\ans{$\frac{\lambda d}{\varepsilon_0}$},带电直线的延长线与球面交点$P$处的电场强度的大小为\ans{$\frac{\lambda d}{4\pi\varepsilon_0(R^2-d^2/4)}$},方向\ans{沿矢径$\vv{OP}$}.
\end{problem}
\switchcolumn\centering
\vfill
@@ -174,6 +185,7 @@ Sightly different from the cmd{choice} environment: the two variables are points
\end{tikzpicture}
\vfill
\end{paracol}
+\begin{tcolorbox}
\begin{verbatim}
\begin{paracol}{2}
\begin{problem}[Gaussian theory \& Field strength][6]
@@ -183,6 +195,7 @@ Sightly different from the cmd{choice} environment: the two variables are points
\switchcolumn\centering\vfill\tikz{...}\vfill
\end{paracol}
\end{verbatim}
+\end{tcolorbox}
\subsection{The \cmd{note} environment}
\begin{tcblisting}{sidebyside}
@@ -191,6 +204,20 @@ Sightly different from the cmd{choice} environment: the two variables are points
\end{note}
\end{tcblisting}
+\subsection{The \cmd{proof} environment}
+\begin{tcblisting}{sidebyside}
+\begin{proof}
+ Due to \emph{Langrange's Thorem}...
+\end{proof}
+\end{tcblisting}
+
+If a star (*) is added after the \verb|\begin{solution}|, then the content will follow the
+\begin{tcblisting}{sidebyside}
+\begin{proof}*
+ Due to \emph{Langrange's Thorem}...
+\end{proof}
+\end{tcblisting}
+
\subsection{The \cmd{solution} environment}
\begin{tcblisting}{sidebyside}
\begin{solution}
@@ -205,11 +232,13 @@ If a star (*) is added after the \verb|\begin{solution}|, then the content will
\end{solution}
\end{tcblisting}
-\paragraph{If mode \mode{noans} is enabled, the solution will disappear, leaving only a blank box with the same height as the solution, and the name of the box will change to \emph{\textcolor{1号色}{\textbf{\faIcon{ban} 答案隐藏}}}.}
+If mode \mode{noans} is enabled, the solution will disappear, leaving only a blank box with the same height as the solution, and the name of the box will change to \emph{\textcolor{1号色}{\textbf{\faIcon{pen-square} 答题区域}}}.
+
+\section{Known Issues}
+\TeX Live will return errors when you enable the mode \mode{noans} and use the \cmd{solution} environment in \cmd{paracol} environment.
-\newpage
\section{Version History}
-This template is used to type the mid-term and final exam solutions of \emph{College Physics}. Initially, I used the \href{https://www.ctan.org/pkg/elegantbook}{ElegantBook} template for layout, however, it's no longer be maintained since January 1st, 2023, so I trun to use the \href{https://github.com/Azure1210/VividBooK}{\pkg*{VividBooK}} instead. But this template is too bloated and some functions \& designs need to be redesigned, so I started developing \pkg{LiteSolution}.
+This template is used to type the mid-term and final exam solutions of \emph{College Physics}. Initially, I used the \href{https://www.ctan.org/pkg/elegantbook}{ElegantBook} template for layout, however, it's no longer be maintained since January 1st, 2023, so I turn to use the \href{https://github.com/Azure1210/VividBooK}{\pkg*{VividBooK}} instead. But this template is too bloated and some functions \& designs need to be redesigned, so I started developing \pkg{LiteSolution}.
\textsf{\bfseries Version 0.1a} was finished developing on 29 June, 2023 and released on \href{https://mp.weixin.qq.com/s/kd4StYk3XybhNQZkAfoY6A}{\faIcon{weixin} WeChat Public Account: 物理问题作} with the name \emph{FreshSolution}. This version redesigned the \cmd{exercise} environment and the \cmd{solution} environment in terms of designs and functions, and improvements have been made to the design of the chapterimage part.
@@ -217,13 +246,17 @@ This template is used to type the mid-term and final exam solutions of \emph{Col
\textsf{\bfseries Version 1.0a} was finished developing on 15 November, 2023. This version has redesigned the \cmd{chapterimage} part, \cmd{choice} and replaced the \cmd{exercise} environment with the \cmd{problem} environment.
-\datechange{06/07/2023}{Version 0.1b}
+\textsf{\bfseries Version 1.2a} was finished developing on \textcolor{H1}{13 November, 2023}. This version has integrated the chapter design of \href{https://www.ctan.org/pkg/elegantbook}{\pkg*{ElegantBook}} into the star (*) key value of this template \cmd{chapter}. And some commands friendly for matrices typesetting were added in. The command \cmd{chapterfont} was redesigned that it can call the font in the local path or call system font with(out) a star (*) after it. Also, the environment \cmd{proof} was redesigned, and the mode \mode{noans} in this version supports hide the solution box and replace it with a fixable solution box. Today (\textcolor{H1}{2023/12/13}) is \emph{The National public memorial day of Nanjing Massacre}. Hope for world peace.
+
+\newpage
+\subsection*{Update Announcements}
+\datechange{2023/07/06}{Version 0.1b}
\begin{itemize}
\item Support page number remaking between chapters.
\item Added \cmd{watermark} command.
\end{itemize}
-\datechange{15/11/2023}{Version 1.0a}
+\datechange{2023/11/15}{Version 1.0a}
\begin{itemize}
\item Redesigned the \cmd{chapterimage} part, include the layout and the code.
\item Redesigned the \cmd{choice} and \cmd{solution} environment, keywords become optional and supports star (*) key.
@@ -231,10 +264,19 @@ This template is used to type the mid-term and final exam solutions of \emph{Col
\item Added the \cmd{note} environment and some customer commands.
\end{itemize}
+\datechange{\today}{Version 1.2a}
+\begin{itemize}
+ \item Fixed the bug that the gap around the chapter image.
+ \item Added some commands for matrices.
+ \item Redesigned the \cmd{chapterfont} command.
+ \item Redesigned the \cmd{proof} environment.
+ \item Supports to adjust the height of solution box when output the exam paper without answer.
+ \item Add the \emph{排版规范} in \emph{中文(简体)} after the package document.
+ \item Fixed the bug that warnings of the packages \pkg{xeCJK} and \pkg{fontspec}.
+\end{itemize}
+
\subsection*{Future Plans}
\begin{itemize}
- \item Plan to integrate the color management of \href{https://www.ctan.org/pkg/elegantbook}{\pkg*{ElegantBook}}.
- \item Plan to integrate the chapter design of \href{https://www.ctan.org/pkg/elegantbook}{\pkg*{ElegantBook}} into the star (*) key value of this template \cmd{chapter}.
\item Plan to add the \mode{dark} mode to this template to make the text color light while make the page color dark to protect eyesight.
\item Plan to change the \verb|*.cls| file to a block code design to make it easier for subsequent developers to maintain or modify.
\item ......
diff --git a/macros/latex/contrib/litesolution/doc/litesolution-gauge.tex b/macros/latex/contrib/litesolution/doc/litesolution-gauge.tex
new file mode 100644
index 0000000000..dc99ae2b17
--- /dev/null
+++ b/macros/latex/contrib/litesolution/doc/litesolution-gauge.tex
@@ -0,0 +1,65 @@
+\chapter*{\pkg{LiteSolution}~试卷解析模板排版规范}% standard
+\fancyhead[L]{\,\color{1号色}\kaishu\href{http://weixin.qq.com/r/hR1SSofEIdpercMp90iX}{物理問題作}}
+\fancyhead[R]{\color{1号色}\ttfamily\mailto{xiamyphys@gmail.com}\,}
+
+
+\centerline{夏明宇, \href{https://www.hdu.edu.cn}{杭州电子科技大学}}
+\yyyymmdddate
+\centerline{\mailto{xiamyphys@gmail.com}}
+
+\section{模板介绍}
+本模板用于高校期中 \& 期末试卷排版,支持一键输出无答案试卷.
+
+\section{数学公式}
+\subsection{正体问题}
+\begin{enumerate}
+ \item 微分算符要使用正体:\verb|\d|.
+ \item 自然对数要使用正体:\verb|\e|.
+ \item 三角函数、exp正体:\verb|\function|
+ \item 撇\verb|'|和\verb|^\prime|的作用相同:\href{https://tex.stackexchange.com/a/538413/299948}{TeX Stackexchange}.
+\end{enumerate}
+
+\subsection{行内 \& 行间公式}
+\begin{enumerate}
+ \item 行内公式:要\verb|$ ... $|不要\verb|\( ... \)|
+ \item 行间公式:要\verb|\[ ... \]|不要\verb|$$ ... $$|
+\end{enumerate}
+至于为何,“不要”的命令在\LaTeX 中属于「脆弱」命令,这里不做详解.
+
+\href{https://www.zhihu.com/question/27589739}{\LaTeX 中的「要」和「不要」 - 知乎}
+
+\subsection{选填题}
+\begin{enumerate}
+ \item 使用tasks环境判断高度
+ \begin{verbatim}
+ \begin{tasks}(一行选项个数,自己掂量)
+ \task 选项1 \task 选项2
+ \task 选项3 \task 选项4
+ \end{tasks}
+ \end{verbatim}
+
+ 不要使用\verb|tabular|制作选择题选项,选项不是画表格!
+ \item 答案不要擅自使用\verb|\underline{}|命令,而是使用\verb|\ans{}|命令,否则制作空白无答案版时答案将无法隐藏.
+\end{enumerate}
+
+\subsection{等高括号}
+\begin{enumerate}
+ \item 凡是你觉得很高的都需做等高括号处理:\verb|\ab( ), \ab[ ], \ab\{ \}|
+ \item 但也不要所有括号都做等高处理,比如\verb|f\ab(x)|和\verb|f(x)|的效果是一样的,多一个\verb|\ab|判断高度只会徒增编译时间.
+\end{enumerate}
+
+\section{偷懒技巧}
+以\verb|\frac{}{}|为例
+\begin{enumerate}
+ \item \verb|\frac12 == \frac{1}{2}, \frac\pi2 == \frac{\pi}{2}, \frac yx == \frac{y}{x}|
+ \item \verb|frac{}{}|后跟两个键值,如果未使用\verb|{}|界定作用域,则默认scan到第1个char或宏(如\verb|\alpha|)时将其放入第一个键值,scan到第2个char或宏(如\verb|\alpha|)时将其放入第2个键值.
+ \item 不会用的话别乱用,老实儿使用\verb|{}|界定作用域,不要出现诸如\verb|\frac x'2|: $\frac x'2$(事实你要写的是$\frac{x'}{2}$).
+\end{enumerate}
+
+\section{排版美观}
+\begin{enumerate}
+ \item 尽量不要(甚至杜绝)题目在上一页,答案在下一页的情况(\emph{\textbf{六级完形文章和题目不在一页的痛你应该经历过}}).
+ \item 杜绝出现题目/解答盒子断开跨页的情况,这很不美观. 如果一个题目解析实在过长,请尝试缩句,或者使用分栏\verb|multicols|环境以节省空间.
+ \item 如果因第$n+1$页开头的题目盒子高度小于第$n$页末尾剩余了空间而导致了空间浪费,请试着将后文中高度与第$n$页最后一道题目+剩余空间相当的题目位置与其交换.
+ \item 最完美的排版:除非遇到下一个\verb|section|,每一页从头到尾都恰好填满了题目与解析.
+\end{enumerate} \ No newline at end of file
diff --git a/macros/latex/contrib/litesolution/doc/litesolution.pdf b/macros/latex/contrib/litesolution/doc/litesolution.pdf
index e0e1069c47..bf3764ef56 100644
--- a/macros/latex/contrib/litesolution/doc/litesolution.pdf
+++ b/macros/latex/contrib/litesolution/doc/litesolution.pdf
Binary files differ
diff --git a/macros/latex/contrib/litesolution/doc/litesolution.tex b/macros/latex/contrib/litesolution/doc/litesolution.tex
index fa923440ad..ba99681a2f 100644
--- a/macros/latex/contrib/litesolution/doc/litesolution.tex
+++ b/macros/latex/contrib/litesolution/doc/litesolution.tex
@@ -1,29 +1,11 @@
-\documentclass{litesolution}
-\usepackage[level]{datetime}
-
-% document setup
-\makeatletter
-\def\@pkg#1{\texorpdfstring{\href{https://www.ctan.org/pkg/#1}{\textcolor{pkgcolor}{\textsf{#1}}}}{“#1”}}
-\def\s@pkg#1{\texorpdfstring{\textcolor{pkgcolor}{\textsf{#1}}}{“#1”}}
-\DeclareRobustCommand\pkg{\@ifstar\s@pkg\@pkg}
-\def\mode#1{\texorpdfstring{\textcolor{moducolor}{\textsf{#1}}}{“#1”}}
-\def\cmd#1{\texorpdfstring{\textcolor{cmdcolor}{\textsf{#1}}}{“#1”}}
-\def\datechange#1#2{%
- \noindent{\makebox[\textwidth][r]{\color{H7}\rule{1.15\textwidth}{.4pt}}}
- \noindent\makebox[0pt][r]{\makebox[-3em][r]{\small\textbf{\textcolor{H7}{#1}}}\;\;}{\sffamily Update: \ignorespaces#2}}
-\makeatother
-\setmainfont{Libertinus Serif}
-\setsansfont{Libertinus Sans}
-\setmonofont{NotoSansMono}[
- Scale=MatchLowercase,
- Extension=.ttf,
- UprightFont=*-Light,
- BoldFont=*-Medium
-]
+\documentclass[ans,continuous]{litesolution}
\begin{document}
\chapterimage{cover1.png}
\input{litesolution-doc.tex}
\input{litesolution-demo.tex}
+\chapterfont{PingFang HK}
+\input{litesolution-gauge.tex}
+
\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/litesolution/tex/litesolution.cls b/macros/latex/contrib/litesolution/tex/litesolution.cls
index e5db1b85fa..232fc496a8 100644
--- a/macros/latex/contrib/litesolution/tex/litesolution.cls
+++ b/macros/latex/contrib/litesolution/tex/litesolution.cls
@@ -14,15 +14,21 @@
%% ************************************************************************************************************
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{litesolution}[15/11/2023 v1.0a LiteSolution document class]
+\PassOptionsToPackage{quiet}{xeCJK}
+\PassOptionsToPackage{quiet}{fontspec}
+\PassOptionsToPackage{no-math}{fontspec}
+
+\ProvidesClass{litesolution}[2023/12/13 v1.2a LiteSolution document class]
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
\SetupKeyvalOptions{family=LITE, prefix=LITE@, setkeys=\kvsetkeys}
\newcommand{\ekv}[1]{\kvsetkeys{LITE}{#1}}
+
% ---- 全局选项
\DeclareStringOption[ans]{answer}
\DeclareVoidOption{ans}{\ekv{answer=ans}}
\DeclareVoidOption{noans}{\ekv{answer=noans}}
+\DeclareVoidOption{preprint}{\ekv{answer=preprint}}
\DeclareStringOption[separate]{counter}
\DeclareVoidOption{separate}{\ekv{counter=separate}}
@@ -34,24 +40,31 @@
% ----- Default Options -----
\DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{book}}
\ProcessKeyvalOptions*\relax
-% \ProcessOptions*\relax
\LoadClass[a4paper,oneside]{book}
+\RequirePackage[letterpaper,margin=0.75in,headheight=0.25in,headsep=0.2in,footskip=0.2in]{geometry}
+\usepackage[level]{datetime}
\RequirePackage{extarrows}% 长等号
-\RequirePackage{fixdif,derivative}% 微分算子修复
\RequirePackage{physics2}
\usephysicsmodule{ab,ab.legacy,braket,nabla.legacy}
-\RequirePackage{qrcode}
-\qrset{link, height=4em}
-
+\RequirePackage{amsmath,amssymb}
+\usepackage{nicematrix}
+\RequirePackage{bm}
+\RequirePackage{esint}
\RequirePackage[e]{esvect}% 矢量箭头
-\RequirePackage{setspace}
\RequirePackage{bbm}% 花体字
\RequirePackage{dutchcal}% 花体字2
\RequirePackage{mathrsfs}% 花体字3
\RequirePackage{csquotes}% 引号
\RequirePackage{tasks}% 选择题
-\settasks{label=\color{normalcolor}\Alph*.}
+\settasks{label=\Alph*.}
+\RequirePackage{setspace}
+\setstretch{1.5}
+\AtBeginDocument{
+ \everymath{\displaystyle}
+ \setlength{\abovedisplayskip}{3pt}
+ \setlength{\belowdisplayskip}{3pt}
+}
\definecolor{pkgcolor}{Hsb}{103,.8,.5}
\definecolor{moducolor}{Hsb}{290,.8,.5}
@@ -67,91 +80,70 @@
\RequirePackage{hyperref}
\hypersetup{colorlinks,urlcolor=H1,linkcolor=H2,filecolor=filecolor,pdfstartview=FitH,pdfview=FitH,pdfcreator=XeTeX output}
-\RequirePackage[letterpaper,margin=0.75in,headheight=0.25in,headsep=0.2in,footskip=0.2in]{geometry}
-
\RequirePackage{indentfirst,comment}
% fontsetting
\ifdefstring{\LITE@math}{mtpro2}{
\let\Bbbk\relax
\RequirePackage[lite]{mtpro2}
}{\relax}
-
\RequirePackage[UTF8,scheme=plain]{ctex}
-\def\chapterfont#1{
- \setCJKfamilyfont{chapterfont}{#1}[Extension =.ttf]
- \gdef\@chapterfont{#1}
+\RequirePackage{xeCJK}
+\RequirePackage[no-math]{fontspec}
+\RequirePackage{fixdif,derivative}
+\NewDocumentCommand\chapterfont{s m}{
+ \IfBooleanTF{#1}{
+ \setCJKfamilyfont{chapterfont}{#2}[Extension =.ttf]
+ }
+ {
+ \setCJKfamilyfont{chapterfont}{#2}
+ }
+ \gdef\@chapterfont{#2}
}
+\setmainfont{Libertinus Serif}
+\setsansfont{Libertinus Sans}
\setcounter{tocdepth}{1}
-
-\PassOptionsToPackage{no-math}{fontspec}
-\PassOptionsToPackage{quiet}{fontspec}
-\RequirePackage[no-math]{fontspec}
-
\AfterEndPreamble{
- \setlength\parindent{2\ccwd}}
+ \setlength\parindent{2\ccwd}}{\relax}
-%% 章节以及页脚图形
+%% 章节
\RequirePackage{xcolor}
\RequirePackage{silence}
+\RequirePackage[center,pagestyles]{titlesec}
+\RequirePackage[title,titletoc,header]{appendix}
- \definecolor{backgroundcolor}{HTML}{F8F7E9}
- \definecolor{headrulecolor}{HTML}{640125}
- \pagecolor{backgroundcolor!20}
- \definecolor{1号色}{HTML}{4D5AAF} %
- \definecolor{2号色}{HTML}{006E54} %
+% ----- box -----
+\definecolor{headrulecolor}{HTML}{640125}
+\definecolor{1号色}{HTML}{4D5AAF} %
+\definecolor{2号色}{HTML}{006E54} %
- \ifdefstring{\LITE@answer}{ans}{
+\ifdefstring{\LITE@answer}{ans}{
\definecolor{solutioncolor}{HTML}{0F2350} %
- \newcommand{\solutionname}{\faIcon{check-square} 分析与解}
+ \def\solutionname{\faIcon{check-square} 分析与解}
+ \def\ans#1{\underline{\color{solutioncolor}\ #1\ }}
+ \def\choiceans#1{{\color{solutioncolor}\ #1\ }}
+ \definecolor{backgroundcolor}{HTML}{F8F7E9}
+ \def\solute#1{\relax}
+ \def\hidesolution{\relax}
}{\relax}
+
\ifdefstring{\LITE@answer}{noans}{
\definecolor{solutioncolor}{HTML}{FEFEFB} %
- \definecolor{solutionbg}{RGB}{130,73,71} %
- \newcommand{\solutionname}{\faIcon{ban} 答案隐藏}
+ \def\solutionname{\faIcon{pen-square} 答题区域}
+ \def\ans#1{\underline{\phantom{\color{solutioncolor}#1}}}
+ \def\choiceans#1{\phantom{\color{solutioncolor}}}
+ \definecolor{backgroundcolor}{HTML}{FFFFFF}
+ \def\solute#1{\begin{draft}\vspace{#1em}\end{draft}}
+ \def\hidesolution{
+ \excludecomment{solution}
+ \let\endsolution\relax
+ }
}{\relax}
- \definecolor{normalcolor}{HTML}{000000} %
-
-% ----- box -----
-%% 章节设置
-\RequirePackage[center,pagestyles]{titlesec}
-\RequirePackage[title,titletoc,header]{appendix}
-
-\newcommand{\notename}{\faIcon{snowflake} 注意}
-\renewcommand*{\proofname}{证明}
-\newcommand{\problemname}{\faIcon{pen-square} 题目} % 题目=习题
-
-\newcommand{\remarkname}{注}
-\renewcommand*{\date}[8]{
- \vspace{-0.5em}\color{normalcolor}
- \begin{minipage}{0.64\textwidth}
- \begin{multicols}{2}
- \textbf{考试时间}:\kaishu #1
-
- \textbf{\songti 课程编号}:\kaishu #3
-
- \textbf{\songti 任课教师}:\kaishu #2
-
- \textbf{\songti 解析制作}:\kaishu #4
- \end{multicols}
- \end{minipage}
- \hfill
- \begin{minipage}{0.15\textwidth}
- \centering
- #5
-
- \vskip1ex\scriptsize\textbf{#6}
- \end{minipage}
- \hfill
- \begin{minipage}{0.15\textwidth}
- \centering
- #7
-
- \vskip1ex\scriptsize\textbf{#8}
- \end{minipage}
- \vspace{-0.5em}
-}
+\pagecolor{backgroundcolor!20}
+\def\notename{\faIcon{info-circle} 注意}
+\def\proofname{证明.}
+\def\problemname{\faIcon{pen-square} 题目} % 题目=习题
\RequirePackage[most]{tcolorbox}
\tcbuselibrary{breakable}
@@ -176,22 +168,18 @@
\begin{tcolorbox}[
common,
borderline west={1.5pt}{0mm}{2号色},
- title=\bfseries\color{2号色}{\problemname}\theprob\hfill【\quad\color{solutioncolor} #1 \color{2号色}\quad 】,
- coltitle=2号色,
- colupper=normalcolor,
- collower=normalcolor
+ title=\color{2号色}{\problemname}\theprob\hfill【\quad \choiceans#1 \color{2号色}\quad 】,
+ coltitle=2号色
]
}{
\begin{tcolorbox}[
common,
borderline west={1.5pt}{0mm}{2号色},
- title=\bfseries\color{2号色}{\problemname}\theprob\hfill\color{2号色}\faIcon{tag}~#2\qquad【\quad\color{solutioncolor} #1 \color{2号色}\quad 】,
- coltitle=2号色,
- colupper=normalcolor,
- collower=normalcolor
+ title=\color{2号色}{\problemname}\theprob\hfill\color{2号色}\faIcon{tag}~#2\qquad【\quad \choiceans#1 \color{2号色}\quad 】,
+ coltitle=2号色
]
}
- \rmfamily\color{normalcolor}}{\end{tcolorbox}}
+ \rmfamily}{\end{tcolorbox}}
\NewDocumentEnvironment{problem}{s o o}{
\refstepcounter{prob}
@@ -207,8 +195,6 @@
borderline west={1.5pt}{0mm}{2号色},
title=\color{2号色}{\problemname} \theprob,
coltitle=2号色,
- colupper=normalcolor,
- collower=normalcolor
]
}{
\begin{tcolorbox}[
@@ -216,8 +202,6 @@
borderline west={1.5pt}{0mm}{2号色},
title=\color{2号色}{\problemname} \theprob\tagname~#2,
coltitle=2号色,
- colupper=normalcolor,
- collower=normalcolor
]
}
}{
@@ -227,8 +211,6 @@
borderline west={1.5pt}{0mm}{2号色},
title=\color{2号色}{\problemname} \theprob(本题#3分),
coltitle=2号色,
- colupper=normalcolor,
- collower=normalcolor
]
}{
\begin{tcolorbox}[
@@ -236,37 +218,24 @@
borderline west={1.5pt}{0mm}{2号色},
title=\color{2号色}{\problemname} \theprob(本题#3分)\tagname~#2,
coltitle=2号色,
- colupper=normalcolor,
- collower=normalcolor
]
}
}
- \rmfamily\color{normalcolor}}{\end{tcolorbox}}
-
-\newcommand{\noting}[1]{
- \begin{tcolorbox}[
- common,
- borderline west={1.5pt}{0mm}{orange},
- coltitle=orange,
- ]%
- {\textbf{\color{orange}\notename}}
- \kaishu\color{normalcolor}#1\end{tcolorbox}}
+ \rmfamily}{\end{tcolorbox}}
\newenvironment{note}{
\begin{tcolorbox}[
common,
- borderline west={1.5pt}{0mm}{orange},
- title=\textbf{\color{orange}\notename},
- coltitle=2号色,
+ borderline west={1.5pt}{0mm}{H1},
+ title=\color{H1}\notename,
+ coltitle=H1
]
- \kaishu\color{normalcolor}}{\end{tcolorbox}}
+ \kaishu}{\end{tcolorbox}}
-\definecolor{second}{RGB}{226,106,106} %
-\newenvironment{proof}{
- \par\noindent\bfseries\songti{\color{second}\proofname\;}
- \color{black!90}\fangsong}{
- \hfill\ensuremath{\square}
- \par}
+\NewDocumentEnvironment{proof}{s}{
+ \par\noindent\songti{\color{H1}\proofname\;}
+ \color{solutioncolor!90}\fangsong
+}{\IfBooleanTF{#1}{\relax}{\QED}}
\NewDocumentEnvironment{solution}{s}{
\IfBooleanTF{#1}{
@@ -275,19 +244,29 @@
borderline west={1.5pt}{0mm}{1号色},
coltitle=1号色
]
- \textcolor{1号色}{\textbf{\solutionname}}
+ \color{1号色}\textbf{\solutionname}
}
{
\begin{tcolorbox}[
common,
borderline west={1.5pt}{0mm}{1号色},
- title=\textcolor{1号色}{\textbf{\solutionname}},
+ title=\color{1号色}\solutionname,
coltitle=1号色,
colupper=solutioncolor,
collower=solutioncolor
]}%
\kaishu\color{solutioncolor}}{\end{tcolorbox}}
+\newenvironment{draft}{
+\begin{tcolorbox}[
+ common,
+ borderline west={1.5pt}{0mm}{1号色},
+ coltitle=1号色
+ ]
+ \color{1号色}\bfseries\solutionname
+ }
+{\end{tcolorbox}}
+
\RequirePackage{enumerate}
% list/itemize/enumerate setting
\RequirePackage[shortlabels,inline]{enumitem}
@@ -295,17 +274,13 @@
\RequirePackage{graphicx}
\graphicspath{{./figure/}{./figures/}{./image/}{./images/}{./graphics/}{./graphic/}{./pictures/}{./picture/}}
-\RequirePackage{bm}% 数学加粗
\RequirePackage{pdfpages}
-\RequirePackage{esint}% 面积分
\RequirePackage{wrapstuff}% 图文绕排
\RequirePackage{booktabs}
\RequirePackage{paracol}
\columnratio{0.67}
\RequirePackage{multicol,multirow}
-
\RequirePackage{fancyvrb}
-%%中文结构名字
%绘图
\RequirePackage{tikz} %% load tikz without tikz
@@ -313,7 +288,6 @@
\tikzset{>=stealth,line cap=round,line join=round}
\RequirePackage{pgfplots}
\pgfplotsset{compat=1.9}
-%电路图绘制
\RequirePackage{circuitikz}
\ctikzset{logic ports=ieee,logic ports/scale=0.6,fill=backgroundcolor}
@@ -328,6 +302,9 @@
\setlist[itemize,2]{label={\eitemii}}
\setlist[itemize,3]{label={\eitemiii}}
+\titleformat{\chapter}[hang]{\bfseries}{
+ \filcenter\LARGE\enspace\bfseries}{1pt}{
+ \LARGE\bfseries\color{1号色}\filcenter}[]
\def\thesection{\arabic{section}}
\titleformat{\section}[hang]{\bfseries}{
\Large\bfseries\heiti{\color{1号色}\thesection.}\enspace}{1pt}{%
@@ -344,78 +321,58 @@
\def\chapterimage{\gdef\@chapterimage}
\def\@makechapterhead#1{%
\begin{tikzpicture}[remember picture,overlay]
- \fill [fill=backgroundcolor,opacity=0.2] (current page.north west) rectangle +(\paperwidth,-\paperwidth/13*6);
- \node[scope fading=south,anchor=north,inner sep=0pt] at (current page.north) {\includegraphics[width=\paperwidth]{\@chapterimage}};
- \draw [line width=2pt,2号色!40] ($(current page.north west)-(0,3.5/13*\paperwidth)$) -- ($(current page.north east)-(0,3.5/13*\paperwidth)$);
- \draw [line width=2pt,2号色!40] ($(current page.north west)-(0,4.5/13*\paperwidth)$) -- ($(current page.north east)-(0,4.5/13*\paperwidth)$);
- \fill [backgroundcolor!40,opacity=0.5] ($(current page.north west)-(0,3.5/13*\paperwidth)$) rectangle +(\paperwidth,-\paperwidth/13);
- \node at ($(current page.north west)-(-0.5*\paperwidth,4/13*\paperwidth)$) {\ifcsname @chapterfont\endcsname\CJKfamily{chapterfont}\fi\huge\bfseries\color{normalcolor}#1~\color{2号色}\faIcon{feather-alt}};
+ \node[scope fading=south,anchor=north,inner sep=0pt,outer sep=0pt] at (current page.north) {\includegraphics[width=\paperwidth]{\@chapterimage}}; % 图片
+ \draw [line width=2pt,2号色!40] ($(current page.north west)-(0,3.5/13*\paperwidth)$) -- ($(current page.north east)-(0,3.5/13*\paperwidth)$); % 上线
+ \draw [line width=2pt,2号色!40] ($(current page.north west)-(0,4.5/13*\paperwidth)$) -- ($(current page.north east)-(0,4.5/13*\paperwidth)$); % 下线
+ \fill [backgroundcolor!40,opacity=0.5] ($(current page.north west)-(0,3.5/13*\paperwidth)$) rectangle +(\paperwidth,-\paperwidth/13); % 中间
+ \node at ($(current page.north west)-(-0.5*\paperwidth,4/13*\paperwidth)$) {\ifcsname @chapterfont\endcsname\CJKfamily{chapterfont}\fi\huge\bfseries#1~\color{2号色}\faIcon{feather-alt}}; % 标题
\end{tikzpicture}\par
\vspace{3.5\paperwidth/13}
\thispagestyle{plain}
\fancypagestyle{plain}{
\fancyhead{} % 页眉清空
- \def\headrulewidth{0pt} % 去页眉线
+ \renewcommand{\headrule}{} % 首页去页眉线
}
\ifdefstring{\LITE@counter}{separate}{
\setcounter{page}{1}
}{\relax}
}
\def\@makeschapterhead#1{
- \centering
- \ifcsname @chapterfont\endcsname\CJKfamily{chapterfont}\fi\huge\bfseries\color{normalcolor}#1\normalsize
- \thispagestyle{plain}
+ {\parindent \z@ \raggedright
+ \normalfont
+ \interlinepenalty\@M
+ \centering \ifcsname @chapterfont\endcsname\CJKfamily{chapterfont}\fi \huge \bfseries \color{1号色!80!2号色!80!black} #1\par\nobreak
+ \vspace*{1em}
+ }
+ \thispagestyle{plain}
\fancypagestyle{plain}{
\fancyhead{} % 页眉清空
- \def\headrulewidth{0pt} % 去页眉线
+ \renewcommand{\headrule}{} % 首页去页眉线
}
\ifdefstring{\LITE@counter}{separate}{
\setcounter{page}{1}
}{\relax}
+ \setcounter{section}{0}
+ \setcounter{prob}{0}
}
%%%%%%%%%%%chapter图片定制结束%%%%%%%%%%%%%%%
-\newcommand{\watermark}[1]{\RequirePackage{wallpaper}\CenterWallPaper{0.5}{#1}}
+\def\watermark#1{\RequirePackage{wallpaper}\CenterWallPaper{0.5}{#1}}
%%%%%%%%%%%%%%%%%%%%%%%
\RequirePackage{ulem}
\RequirePackage{fancyhdr}
\RequirePackage{fontawesome5}
-
\fancyhf{}
-
-\fancyfoot[C]{\color{1号色}\sout{\hbox to 0.4\textwidth{}}\quad\faIcon{chevron-left}\;第~\color{normalcolor}{\sffamily\thepage}\color{1号色}~页\;\faIcon{chevron-right}\quad\sout{\hbox to 0.4\textwidth{}}}
+\fancyfoot[C]{\color{1号色}\sout{\hbox to 0.4\textwidth{}}\quad\faIcon{chevron-left}\;第~{\sffamily\thepage}\color{1号色}~页\;\faIcon{chevron-right}\quad\sout{\hbox to 0.4\textwidth{}}}
\fancyfoot[L]{\color{1号色}{$\boldsymbol{\cdot}$}}
\fancyfoot[R]{\color{1号色}{$\boldsymbol{\cdot}$}}
-
\renewcommand{\headrule}{\color{headrulecolor}\hrule width\textwidth}
-\pagestyle{fancy}
+\pagestyle{fancy}
\renewcommand{\sectionmark}[1]{\markright{#1}{}}
\renewcommand{\chaptermark}[1]{\markboth{#1}{}}
%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%[第三方定制]%%%%%%%%%%%%%%%%%%%%%
-\def\e{\mathrm{e}}
-\def\i{\mathrm{i}}
-\newcommand\mailto[1]{\href{mailto:#1}{\nolinkurl{#1}}}
-\newcommand\sokka[1]{故本题选择 \textbf{#1} 项.}
-\newcommand\ans[1]{\underline{\color{solutioncolor}\ #1\ }}
-\newcommand\length[4]{
-\node (a) at ($0.5*($#2+#1$)$) {#3};
-\draw [->|] ($0.5*($#2+#1+#4$)$) -- #2;
-\draw [->|] ($0.5*($#2+#1-#4$)$) -- #1;}
-\newcommand\cdotfill{\leavevmode\cleaders\hb@xt@.44em{\hss$\cdot$\hss}\hfill\kern\z@}
-\newcommand{\point}[1]{\cdotfill\texttt{(#1pt)}}
-\setstretch{1.5}
-\AtBeginDocument{\everymath{\displaystyle}}
-
-\makeatletter
-\protected\def\titlelogo#1#2{
- \leavevmode@ifvmode
- \lower\dimexpr\f@size\p@*1/10\hbox{\href{#1}{\includegraphics[height={\f@size\p@}]{#2}}}
- }
-\makeatother
-
\usepackage{listings,dirtree}
\lstdefinestyle{TeX}{
language = [LaTeX]TeX,
@@ -429,4 +386,115 @@
commentstyle = \color{darkgray},
tabsize = 2,
keywords = {chapter,choice,problem,solution,enumerate}
-} \ No newline at end of file
+}
+
+% document setup
+\def\e{\mathrm{e}}
+\def\i{\mathrm{i}}
+\def\ee#1{\times 10^{#1}}
+\def\T{\mathsf{T}}
+\def\unit#1{\,\mathrm{#1}}
+\def\mat#1{\mathbf{#1}}
+\def\rank#1{\text{R}({#1})}
+\def\QED{\hfill\sffamily Q.E.D. }
+\def\mailto#1{\href{mailto:#1}{\nolinkurl{#1}}}
+\def\sokka#1{故本题选择 \textbf{#1} 项.}
+\def\length#1#2#3#4{
+\node (a) at ($0.5*($#2+#1$)$) {#3};
+\draw [->|] ($0.5*($#2+#1+#4$)$) -- #2;
+\draw [->|] ($0.5*($#2+#1-#4$)$) -- #1;
+}
+\def\point#1{\leavevmode\cleaders\hb@xt@.44em{\hss$\cdot$\hss}\hfill\kern\z@\texttt{(#1pt)}}
+\makeatletter
+\pdfstringdefDisableCommands{%
+ \def\pkg#1{<#1>}%
+ \def\mode#1{<#1>}%
+ \def\titlelogo#1#2{<#1#2>}%
+}
+\def\@pkg#1{\texorpdfstring{\href{https://www.ctan.org/pkg/#1}{\textcolor{pkgcolor}{\textsf{#1}}}}{“#1”}}
+\def\s@pkg#1{\texorpdfstring{\textcolor{pkgcolor}{\textsf{#1}}}{“#1”}}
+\DeclareRobustCommand\pkg{\@ifstar\s@pkg\@pkg}
+\def\mode#1{\texorpdfstring{\textcolor{moducolor}{\textsf{#1}}}{“#1”}}
+\def\cmd#1{\texorpdfstring{\textcolor{cmdcolor}{\textsf{#1}}}{“#1”}}
+\def\datechange#1#2{%
+ \noindent{\makebox[\textwidth][r]{\color{H7}\rule{1.15\textwidth}{.4pt}}}
+ \noindent\makebox[0pt][r]{\makebox[-3em][r]{\small\textbf{\textcolor{H7}{#1}}}\;\;}{\sffamily Update: \ignorespaces#2}}
+\protected\def\@titlelogo#1#2{
+ \leavevmode@ifvmode
+ \lower\dimexpr\f@size\p@*1/10\hbox{\href{#1}{\includegraphics[height={\f@size\p@}]{#2}}}
+ }
+\protected\def\s@titlelogo#1#2{
+ \leavevmode@ifvmode
+ \lower\dimexpr\f@size\p@*1/10\hbox{\includegraphics[height={\f@size\p@}]{#1}}
+ }
+\DeclareRobustCommand\titlelogo{\@ifstar\s@titlelogo\@titlelogo}
+
+\RequirePackage{qrcode}
+\qrset{link, height=4em}
+
+\renewcommand*{\date}[8]{
+ \vspace{-0.5em}
+ \begin{minipage}{0.64\textwidth}
+ \begin{multicols}{2}
+ \textbf{考试时间}:\kaishu #1
+
+ \textbf{\songti 课程编号}:\kaishu #3
+
+ \textbf{\songti 任课教师}:\kaishu #2
+
+ \textbf{\songti 解析制作}:\kaishu #4
+ \end{multicols}
+ \end{minipage}
+ \hfill
+ \begin{minipage}{0.15\textwidth}
+ \centering
+ \qrcode{#5}
+
+ \vskip1ex\scriptsize\textbf{\href{#5}{#6}}
+ \end{minipage}
+ \hfill
+ \begin{minipage}{0.15\textwidth}
+ \centering
+ \qrcode{#7}
+
+ \vskip1ex\scriptsize\textbf{\href{#7}{#8}}
+ \end{minipage}
+ \vspace{-0.5em}
+}
+
+\def\sim@x@scale{.15}
+\def\sim@y@scale{.05}
+\def\sim@y@thick{.02}
+\newsavebox\sim@upper
+\newsavebox\sim@lower
+% extensible sim symbol
+\NewDocumentCommand{\xSim}{ O{} m }{%
+ \TextOrMath{%
+ \PackageError{TEST}{`\string\xSim` is valid in math mode only.}{}%
+ }{
+ % math mode only, hence no need to eliminate spaces
+ \sbox\sim@upper{$\scriptstyle #2$}
+ \sbox\sim@lower{$\scriptstyle #1$}
+ \pgfmathparse{min(max(\wd\sim@upper/1em, \wd\sim@lower/1em, 1.0), 1.5)}
+ \edef\sim@ratio{\pgfmathresult}
+ \def\sim@x {\sim@x@scale * \sim@ratio}
+ \def\sim@y {\sim@y@scale * \sim@ratio}
+ \def\sim@@y{\sim@y@thick * \sim@ratio}
+ \pgfmathparse{floor(max(\wd\sim@upper/1em, \wd\sim@lower/1em)) + 1}
+ \edef\sim@wd{\pgfmathresult em}
+ \mathrel{
+ \begin{tikzpicture}[baseline=-.7ex]
+ \filldraw[line width=.2pt]
+ (0, 0)
+ .. controls +(\sim@x, \sim@y+\sim@@y) and +(-\sim@x, -\sim@y) ..
+ +(\sim@wd, 0)
+ node[midway, above] {\usebox\sim@upper}
+ node[midway, below] {\usebox\sim@lower}
+ .. controls +(-\sim@x, -\sim@y-\sim@@y) and +(\sim@x, \sim@y) ..
+ (0, 0);
+ \end{tikzpicture}
+ }
+ }%
+}
+\makeatother
+\hidesolution \ No newline at end of file
diff --git a/macros/latex/contrib/nicematrix/nicematrix-code.dtx b/macros/latex/contrib/nicematrix/nicematrix-code.dtx
index 3683787bcf..cfb0eb00d0 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-code.dtx
+++ b/macros/latex/contrib/nicematrix/nicematrix-code.dtx
@@ -17,8 +17,8 @@
%
% \fi
% \iffalse
-\def\myfileversion{6.26a}
-\def\myfiledate{2023/12/04}
+\def\myfileversion{6.26b}
+\def\myfiledate{2023/12/13}
%
%
%<*batchfile>
@@ -1186,6 +1186,11 @@ version 2005/12/01 or later.
\tl_new:N \g_@@_com_or_env_str
\tl_gset:Nn \g_@@_com_or_env_str { environment }
% \end{macrocode}
+%
+% \bigskip
+% \begin{macrocode}
+\bool_new:N \l_@@_bold_row_style_bool
+% \end{macrocode}
%
% \bigskip
% The following command will be able to reconstruct the full name of the current
@@ -2556,6 +2561,10 @@ version 2005/12/01 or later.
% \begin{macrocode}
\keys_define:nn { NiceMatrix / Global }
{
+ no-cell-nodes .code:n =
+ \cs_set_protected:Npn \@@_node_for_cell:
+ { \box_use_drop:N \l_@@_cell_box } ,
+ no-cell-nodes .value_forbidden:n = true ,
rounded-corners .dim_set:N = \l_@@_tab_rounded_corners_dim ,
rounded-corners .default:n = 4 pt ,
custom-line .code:n = \@@_custom_line:n { #1 } ,
@@ -3318,8 +3327,7 @@ version 2005/12/01 or later.
\bool_if:NTF \g_@@_empty_cell_bool
{ \box_use_drop:N \l_@@_cell_box }
{
- \bool_if:NTF
- \g_@@_not_empty_cell_bool
+ \bool_if:NTF \g_@@_not_empty_cell_bool
\@@_node_for_cell:
{
\dim_compare:nNnTF { \box_wd:N \l_@@_cell_box } > \c_zero_dim
@@ -3364,10 +3372,7 @@ version 2005/12/01 or later.
}
% \end{macrocode}
%
-%
% \bigskip
-% The following command creates the \textsc{pgf} name of the node with, of
-% course, |\l_@@_cell_box| as the content.
% \begin{macrocode}
\pgfset
{
@@ -3377,6 +3382,12 @@ version 2005/12/01 or later.
minimum~width = \c_zero_dim
}
}
+% \end{macrocode}
+%
+% \bigskip
+% The following command creates the \textsc{pgf} name of the node with, of
+% course, |\l_@@_cell_box| as the content.
+% \begin{macrocode}
\cs_new_protected:Npn \@@_node_for_cell:
{
\pgfpicture
@@ -7092,11 +7103,11 @@ version 2005/12/01 or later.
% The two following lines have been added on 2021-12-15 to solve a bug
% mentionned by Joao Luis Soares by mail.
% \begin{macrocode}
- \int_compare:nNnT \g_@@_col_total_int = \c_one_int
+ \int_if_zero:nT \g_@@_col_total_int
{ \skip_gset:Nn \g_tmpa_skip { 0 pt~plus 1 fill } }
\skip_horizontal:N \g_tmpa_skip
\int_gincr:N \g_tmpa_int
- \bool_lazy_any:nT
+ \bool_lazy_any:nF % modified 2023/12/13
{
\g_@@_delims_bool
\l_@@_tabular_bool
@@ -10061,9 +10072,8 @@ version 2005/12/01 or later.
} ,
color .tl_set:N = \l_@@_color_tl ,
color .value_required:n = true ,
- bold .bool_set:N = \l_tmpa_bool ,
+ bold .bool_set:N = \l_@@_bold_row_style_bool ,
bold .default:n = true ,
- bold .initial:n = false ,
nb-rows .code:n =
\str_if_eq:nnTF { #1 } { * }
{ \int_set:Nn \l_@@_key_nb_rows_int { 500 } }
@@ -10076,6 +10086,7 @@ version 2005/12/01 or later.
}
% \end{macrocode}
%
+%
% \bigskip
% \begin{macrocode}
\NewDocumentCommand \@@_RowStyle:n { O { } m }
@@ -10083,7 +10094,7 @@ version 2005/12/01 or later.
\group_begin:
\tl_clear:N \l_tmpa_tl % value of \rowcolor
\tl_clear:N \l_@@_color_tl
- \int_set:Nn \l_@@_key_nb_rows_int 1
+ \int_set_eq:NN \l_@@_key_nb_rows_int \c_one_int
\keys_set:nn { NiceMatrix / RowStyle } { #1 }
% \end{macrocode}
% If the key |rowcolor| has been used.
@@ -10165,9 +10176,9 @@ version 2005/12/01 or later.
}
}
% \end{macrocode}
-% |\l_tmpa_bool| is the value of the key |bold|.
+% |\l_@@_bold_row_style_bool| is the value of the key |bold|.
% \begin{macrocode}
- \bool_if:NT \l_tmpa_bool
+ \bool_if:NT \l_@@_bold_row_style_bool
{
\@@_put_in_row_style:n
{
@@ -13604,7 +13615,10 @@ version 2005/12/01 or later.
{
\bool_lazy_and:nnTF
\l_@@_preamble_bool
- { \int_compare_p:nNnF \l_@@_last_col_int > \g_@@_static_num_of_col_int }
+ {
+ \int_compare_p:n
+ { \l_@@_last_col_int <= \g_@@_static_num_of_col_int }
+ }
{
\msg_error:nnnn { nicematrix } { Block~too~large~2 } { #1 } { #2 }
\@@_msg_redirect_name:nn { Block~too~large~2 } { none }
diff --git a/macros/latex/contrib/nicematrix/nicematrix-code.pdf b/macros/latex/contrib/nicematrix/nicematrix-code.pdf
deleted file mode 100644
index d35a38c358..0000000000
--- a/macros/latex/contrib/nicematrix/nicematrix-code.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.pdf b/macros/latex/contrib/nicematrix/nicematrix-french.pdf
index a2a0d2e235..456c820b75 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-french.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix-french.pdf
Binary files differ
diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.tex b/macros/latex/contrib/nicematrix/nicematrix-french.tex
index d11b8c8d1c..64ac62e240 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-french.tex
+++ b/macros/latex/contrib/nicematrix/nicematrix-french.tex
@@ -6669,7 +6669,8 @@ avec l'environnement |{NiceMatrixBlock}| et l'option |auto-columns-width|.
light-syntax,
last-col, code-for-last-col = \color{blue}\scriptstyle,
vlines = 5 ,
- matrix/columns-type = r
+ matrix/columns-type = r ,
+ no-cell-nodes
}
\setlength{\extrarowheight}{1mm}
@@ -6711,7 +6712,8 @@ avec l'environnement |{NiceMatrixBlock}| et l'option |auto-columns-width|.
light-syntax,
last-col, code-for-last-col = \color{blue}\scriptstyle,
vlines = 5 ,
- matrix/columns-type = r
+ matrix/columns-type = r ,
+ no-cell-nodes
}
\setlength{\extrarowheight}{1mm}
@@ -6764,7 +6766,8 @@ avec leur largeur maximale grâce à la clé booléenne |delimiters/max-width|.
light-syntax,
last-col, code-for-last-col = \color{blue}\scriptstyle,
vlines = 5 ,
- matrix/columns-type = r
+ matrix/columns-type = r ,
+ no-cell-nodes
}
\setlength{\extrarowheight}{1mm}
@@ -6786,7 +6789,8 @@ avec leur largeur maximale grâce à la clé booléenne |delimiters/max-width|.
light-syntax,
last-col, code-for-last-col = \color{blue}\scriptstyle,
vlines = 5 ,
- matrix/columns-type = r
+ matrix/columns-type = r ,
+ no-cell-nodes
}
\setlength{\extrarowheight}{1mm}
@@ -6859,7 +6863,7 @@ Bien sûr, ce tableau ne pourra pas être coupé par un saut de page.
\begin{scope}
\setlength{\extrarowheight}{1mm}
\[\begin{NiceMatrix}%
- [ r, last-col=6, code-for-last-col = \scriptstyle \color{blue} ]
+ [ r, last-col=6, code-for-last-col = \scriptstyle \color{blue}]
12 & -8 & 7 & 5 & 3 \\
3 & -18 & 12 & 1 & 4 \\
-3 & -46 & 29 &-2 &-15 \\
diff --git a/macros/latex/contrib/nicematrix/nicematrix.pdf b/macros/latex/contrib/nicematrix/nicematrix.pdf
index 144a5986d0..cc1afcb859 100644
--- a/macros/latex/contrib/nicematrix/nicematrix.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix.pdf
Binary files differ
diff --git a/macros/latex/contrib/nicematrix/nicematrix.tex b/macros/latex/contrib/nicematrix/nicematrix.tex
index 71ab7c036d..10dd6c789a 100644
--- a/macros/latex/contrib/nicematrix/nicematrix.tex
+++ b/macros/latex/contrib/nicematrix/nicematrix.tex
@@ -6536,7 +6536,8 @@ with the environment |{NiceMatrixBlock}| and its option |auto-columns-width|.
light-syntax,
last-col, code-for-last-col = \color{blue}\scriptstyle,
vlines = 5 ,
- matrix/columns-type = r
+ matrix/columns-type = r ,
+ no-cell-nodes
}
\setlength{\extrarowheight}{1mm}
@@ -6578,7 +6579,8 @@ with the environment |{NiceMatrixBlock}| and its option |auto-columns-width|.
light-syntax,
last-col, code-for-last-col = \color{blue}\scriptstyle,
vlines = 5 ,
- matrix/columns-type = r
+ matrix/columns-type = r ,
+ no-cell-nodes
}
\setlength{\extrarowheight}{1mm}
@@ -6631,7 +6633,8 @@ composed with the maximal width, thanks to the boolean key
light-syntax,
last-col, code-for-last-col = \color{blue}\scriptstyle,
vlines = 5 ,
- matrix/columns-type = r
+ matrix/columns-type = r ,
+ no-cell-nodes
}
\setlength{\extrarowheight}{1mm}
@@ -6653,7 +6656,8 @@ composed with the maximal width, thanks to the boolean key
light-syntax,
last-col, code-for-last-col = \color{blue}\scriptstyle,
vlines = 5 ,
- matrix/columns-type = r
+ matrix/columns-type = r ,
+ no-cell-nodes
}
\setlength{\extrarowheight}{1mm}
diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog
index e0e7610e47..452fb44ffc 100644
--- a/support/TeX4ht/source/ChangeLog
+++ b/support/TeX4ht/source/ChangeLog
@@ -1,3 +1,24 @@
+2023-12-12 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-html4.tex (html4.4ht): close paragraph before end of \fbox.
+ https://tex.stackexchange.com/a/703823/2891
+
+ * tex4ht-html4.tex (html4.4ht): removed spurious blank lines in
+ files included using \VerbatimInput from the fancyvrb package.
+ https://puszcza.gnu.org.ua/bugs/?617
+
+ * tex4ht-4ht.tex (marginnote.4ht),
+ * tex4ht-html4.tex (html4.4ht): added support for the \marginnote
+ command.
+
+2023-12-11 Karl Berry <karl@freefriends.org>
+
+ * tex4ht-env.tex: copyright 2023, leading comments.
+ * Makefile (diff-env, update-env): new targets to handle
+ tex4ht.env[-*] files.
+ (update-env, update): rename these never-used
+ and non-working targets to dev-update-env and dev-update.
+
2023-12-11 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-4ht.tex (biblatex.4ht): declare the \BibFileName in the aux
diff --git a/support/TeX4ht/source/Makefile b/support/TeX4ht/source/Makefile
index 0d330dd3d5..b783b5d458 100644
--- a/support/TeX4ht/source/Makefile
+++ b/support/TeX4ht/source/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 1296 2023-02-12 22:24:09Z karl $
+# $Id: Makefile 1419 2023-12-11 23:23:52Z karl $
# This file is public domain. Originally written 2010, Karl Berry.
# Assumes GNU make.
@@ -616,12 +616,12 @@ dest_java = $(dest_src)/java
update = cp -pr
mkdir = install -d
#
-update-env:
+dev-update-env:
$(mkdir) $(dest_base)/unix $(dest_base)/win32
$(update) tex4ht.env-unix $(dest_base)/unix/tex4ht.env
$(update) tex4ht.env-win32 $(dest_base)/win32/tex4ht.env
-update: all
+dev-update: all
$(update) $(tex4ht_bibtex2_derived) $(dest_src)/
#
$(update) $(tex4ht_c_derived) $(dest_src)/
@@ -633,7 +633,7 @@ update: all
#
$(update) $(tex4ht_docbook_derived) $(dest_texmf)/
#
- $(MAKE) update-env
+ $(MAKE) dev-update-env
#
$(update) $(tex4ht_html_speech_xtpipes_derived) $(dest_texmf)/
#
@@ -758,6 +758,11 @@ inst_dir_all = $(inst_dir_4ht) $(inst_dir_top) $(inst_dir_scripts) \
# (Other methods are also used.)
install_data = cp -p
+# svn status of installed tree.
+svnstatus st:
+ svn status $(inst_dir_all) | sed s,$(texmf),, # reduce output
+ @echo $(inst_dir_all)
+
# Diff and install the *.unix and *.bat scripts.
# The suffix changes from .unix in development to .sh in TL,
# and many of the scripts are not installed at all;
@@ -817,10 +822,21 @@ update-htfonts:
./update-htfonts update $(ht_fonts_devdir) $(ht_fonts_instdir) | tee /tmp/htupd
.PHONY: update-htfonts
-# svn status of results.
-svnstatus st:
- svn status $(inst_dir_all) | sed s,$(texmf),, # reduce output
- @echo $(inst_dir_all)
+#
+# Checking and updating tex4ht.env files.
+
+# Where they are in the installed tree.
+env_instdir = $(inst_dir_top)/base
+
+# Compare only.
+diff-env: $(tex4ht_env_derived)
+ -$(diff) $(env_instdir)/unix/tex4ht.env tex4ht.env-unix
+ -$(diff) $(env_instdir)/win32/tex4ht.env tex4ht.env-win32
+
+# Compare and update.
+update-env:
+ $(install_data) tex4ht.env-unix $(env_instdir)/unix/tex4ht.env
+ $(install_data) tex4ht.env-win32 $(env_instdir)/win32/tex4ht.env
#
# diff all files in the main TeX Live installation directory against
@@ -832,7 +848,7 @@ svnstatus st:
#
# The diff-scripts output is usually empty, so we can run that;
# but diff-htfonts is too verbose to run every time.
-diff-all: diff-src diff-scripts diff-htfonts
+diff-all: diff-src diff-scripts diff-htfonts diff-env
@echo; echo '>>> $@'
-for f in $(inst_dir_4ht)/*; do $(diff) $$f .; done \
| tee /tmp/u | egrep -v '^ *[-+]%|^@@ |^- *$$|-1.version' \
diff --git a/support/TeX4ht/source/mktex4ht-cnf.tex b/support/TeX4ht/source/mktex4ht-cnf.tex
index 894e50b7c1..8d30dfd490 100644
--- a/support/TeX4ht/source/mktex4ht-cnf.tex
+++ b/support/TeX4ht/source/mktex4ht-cnf.tex
@@ -1,4 +1,4 @@
-% $Id: mktex4ht-cnf.tex 1412 2023-11-20 10:08:03Z michal_h21 $
+% $Id: mktex4ht-cnf.tex 1420 2023-12-12 15:53:16Z michal_h21 $
% Manually-maintained file, listing *.4ht files created by tex4ht-4ht.tex.
% Read by tex4ht-cond4ht.
%
@@ -322,6 +322,7 @@
\AddFile{9}{th4}
\AddFile{9}{footmisc}
\AddFile{9}{tablefootnote}
+\AddFile{9}{marginnote}
\AddFile{9}{writer}
\AddFile{9}{mdwlist}
\AddFile{9}{sverb}
diff --git a/support/TeX4ht/source/tex4ht-4ht.tex b/support/TeX4ht/source/tex4ht-4ht.tex
index 12c6bfd8f9..e896969c1e 100644
--- a/support/TeX4ht/source/tex4ht-4ht.tex
+++ b/support/TeX4ht/source/tex4ht-4ht.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1418 2023-12-11 13:44:02Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1420 2023-12-12 15:53:16Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2023 TeX Users Group
@@ -37226,6 +37226,25 @@ instead.
%%%%%%%%%%%%%%%
+\Section{marginnote}
+%%%%%%%%%%%%%%%%%
+
+\<marginnote.4ht\><<<
+% marginnote.4ht (|version), generated from |jobname.tex
+% Copyright 2023 TeX Users Group
+|<TeX4ht license text|>
+|<config marginnote|>
+\Hinput{marginnote}
+\endinput
+>>> \AddFile{9}{marginnote}
+
+\<config marginnote\><<<
+\NewConfigure{marginnote}{2}
+\long\def\:tempa[#1]#2[#3]{\a:marginnote#2\b:marginnote}
+\HLet\@mn@@@marginnote\:tempa
+>>>
+
+%%%%%%%%%%%%%%%
\Section{Other}
%%%%%%%%%%%%%%%%%
diff --git a/support/TeX4ht/source/tex4ht-html4.tex b/support/TeX4ht/source/tex4ht-html4.tex
index 39c1fea16e..51e3f909f2 100644
--- a/support/TeX4ht/source/tex4ht-html4.tex
+++ b/support/TeX4ht/source/tex4ht-html4.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-html4.tex 1408 2023-11-10 14:51:19Z michal_h21 $
+% $Id: tex4ht-html4.tex 1422 2023-12-12 16:44:24Z michal_h21 $
% Compile 4 times: latex tex4ht-html4
% Copy html4.4ht into the work directory before all but the last compilation.
%
@@ -5626,6 +5626,33 @@ An alternative css-based approach:
>>>
%%%%%%%%%%%%%%%%
+\subsection{marginnote}
+%%%%%%%%%%%%%%%%
+
+This configuration will put marginnote into right margin if there is sufficient ammount of space.
+Otherwise, it will display it as a italic text.
+
+\<configure html4 marginnote\><<<
+\Configure{marginnote}{\HCode{<span class="marginnote">}}{\HCode{</span>}}
+
+\Css{.marginnote{
+ font-style: italic;}
+}
+
+\Css{
+ @media (min-width: 104ch){
+ .marginnote{
+ display: block;
+ float: right;
+ width: 12ch;
+ margin-right: -14ch;
+ font-style: normal;
+ }}
+}
+
+>>>
+
+%%%%%%%%%%%%%%%%
\section{Floats}
%%%%%%%%%%%%%%%%
@@ -7933,7 +7960,7 @@ tag possibly missing.
\Configure{fbox}
{\ifvmode \IgnorePar\EndP
\HCode{<div class="fbox">}%
- \def\end:bx{\HCode{</div>}\par}%
+ \def\end:bx{\ifvmode\IgnorePar\fi\EndP\HCode{</div>}\par}%
\else
\HCode{<span class="fbox">}%
\def\end:bx{\HCode{</span>}}%
@@ -15242,18 +15269,21 @@ imported from aux or another file.
\subsection{fancyvrb}
%%%%%%%%%%%%%%%%%%%
+We need to use special instructions to prevent extra blank lines that
+are comming from fancyvrb somehow. "x" before closing tag for "pre"
+is necessary because the last newline was not deleted otherwise.
\<configure html4 fancyvrb\><<<
\HAssign\fancyvrbNo|=0
\Configure{fancyvrb}
{\IgnorePar \EndP \gHAdvance\fancyvrbNo by 1
\gHAssign\fancyvrb:cnt0
- \HCode{<pre class="fancyvrb" id="fancyvrb\fancyvrbNo">}}
- {\EndP\HCode{</pre>}}
- {\gHAdvance\fancyvrb:cnt by 1
+ \HCode{<pre class="fancyvrb" id="fancyvrb\fancyvrbNo">}\ht:special{t4ht@[}}
+ {x\ht:special{t4ht@]}\EndP\HCode{</pre>}}
+ {\ht:special{t4ht@]}\gHAdvance\fancyvrb:cnt by 1
\ifnum \fancyvrb:cnt>1
\HCode{\Hnewline}\fi} {}
- {}{}
+ {}{\ht:special{t4ht@[}}
\Css{pre.fancyvrb {white-space: pre-wrap; margin:0em;font-family:monospace,monospace;}}
>>>
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 4bf0b3f517..0155d3555e 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/2023
-depend revision/69095
+depend revision/69105
name 00texlive.image
category TLCore
@@ -114964,7 +114964,7 @@ catalogue-version 1.2
name etbb
category Package
-revision 61872
+revision 69098
shortdesc An expansion of Edward Tufte's ET-Bembo family
relocated 1
longdesc Based on Daniel Benjamin Miller's XETBook, which expanded
@@ -114975,16 +114975,16 @@ longdesc superior letters and figures, inferior figures, a new capital
longdesc Sharp S with small caps version, along with macros to activate
longdesc these features in LaTeX. Both otf and pfb are provided.
execute addMap ETbb.map
-containersize 1054288
-containerchecksum 986a063266a6081571e9a9db60674f1cc795f15b32eaa954214b4620b29cb43043b6ba6cdc9cb02f20f809a65939dcfb157590bfcf867d999299ae34520f9f8b
-doccontainersize 357012
-doccontainerchecksum 1278c7281a247416f4439b9f034d2acab7bd03e47c63038d8a4ac12793968e2508cf562940d0a0b510abc9ceec3517dcfb277cc365c9d3998797237610936613
+containersize 1052228
+containerchecksum e034a9a750043f459b8682229bf01c08b341b4494fd6fc6669e1065652ae9154e0eef74038f1e5f16c2d57390ebfa70056198d563f3e454ee3e4806971a707d5
+doccontainersize 357152
+doccontainerchecksum cc4ebfcb831cdd9f02c93248d5083b81a69c59163fec85d469a17841607affb51310858b022ea819055c6bdade821d330599c97838ab9f92de7b8fa4d8f8f0a8
docfiles size=96
RELOC/doc/fonts/etbb/ETbb-doc.pdf details="Font samples"
RELOC/doc/fonts/etbb/ETbb-doc.tex
RELOC/doc/fonts/etbb/LICENSE
RELOC/doc/fonts/etbb/README details="Readme"
-runfiles size=2462
+runfiles size=2385
RELOC/fonts/afm/public/etbb/ETbb-Bold.afm
RELOC/fonts/afm/public/etbb/ETbb-BoldItalic.afm
RELOC/fonts/afm/public/etbb/ETbb-Italic.afm
@@ -114993,128 +114993,116 @@ runfiles size=2462
RELOC/fonts/enc/dvips/etbb/etbb1_3ggaku.enc
RELOC/fonts/enc/dvips/etbb/etbb1_6bhqsy.enc
RELOC/fonts/enc/dvips/etbb/etbb1_6dkfmm.enc
- RELOC/fonts/enc/dvips/etbb/etbb1_d63baf.enc
- RELOC/fonts/enc/dvips/etbb/etbb1_dpvwoq.enc
RELOC/fonts/enc/dvips/etbb/etbb1_eqc2ac.enc
- RELOC/fonts/enc/dvips/etbb/etbb1_frcze6.enc
RELOC/fonts/enc/dvips/etbb/etbb1_hah5or.enc
- RELOC/fonts/enc/dvips/etbb/etbb1_mfrons.enc
RELOC/fonts/enc/dvips/etbb/etbb1_mgm6re.enc
RELOC/fonts/enc/dvips/etbb/etbb1_pvrda3.enc
RELOC/fonts/enc/dvips/etbb/etbb1_sb7odk.enc
RELOC/fonts/enc/dvips/etbb/etbb1_vtabip.enc
RELOC/fonts/enc/dvips/etbb/etbb1_xaqh3v.enc
RELOC/fonts/enc/dvips/etbb/etbb1_yziesh.enc
- RELOC/fonts/enc/dvips/etbb/etbb_242knm.enc
- RELOC/fonts/enc/dvips/etbb/etbb_2jmcdk.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_2evihr.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_2jcuij.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_2pvdgb.enc
RELOC/fonts/enc/dvips/etbb/etbb_2ynk4h.enc
- RELOC/fonts/enc/dvips/etbb/etbb_33mftd.enc
RELOC/fonts/enc/dvips/etbb/etbb_3ccbvp.enc
RELOC/fonts/enc/dvips/etbb/etbb_3ggaku.enc
RELOC/fonts/enc/dvips/etbb/etbb_3obh62.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_3oxvdm.enc
RELOC/fonts/enc/dvips/etbb/etbb_3pymqv.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_3wz3qz.enc
RELOC/fonts/enc/dvips/etbb/etbb_3ygfa2.enc
RELOC/fonts/enc/dvips/etbb/etbb_42bwpg.enc
- RELOC/fonts/enc/dvips/etbb/etbb_4hpi45.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_43bfhj.enc
RELOC/fonts/enc/dvips/etbb/etbb_4o3pf4.enc
RELOC/fonts/enc/dvips/etbb/etbb_4sxvu4.enc
RELOC/fonts/enc/dvips/etbb/etbb_4xv7ax.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_5ckwl5.enc
RELOC/fonts/enc/dvips/etbb/etbb_5drz2o.enc
- RELOC/fonts/enc/dvips/etbb/etbb_5iollt.enc
- RELOC/fonts/enc/dvips/etbb/etbb_5um4so.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_5e3mdj.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_5kr4wb.enc
RELOC/fonts/enc/dvips/etbb/etbb_65swoa.enc
RELOC/fonts/enc/dvips/etbb/etbb_6bhqsy.enc
RELOC/fonts/enc/dvips/etbb/etbb_6dkfmm.enc
RELOC/fonts/enc/dvips/etbb/etbb_6z6nrw.enc
RELOC/fonts/enc/dvips/etbb/etbb_7dlbn4.enc
RELOC/fonts/enc/dvips/etbb/etbb_7ipmvr.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_7kk2uu.enc
RELOC/fonts/enc/dvips/etbb/etbb_7pzsmk.enc
RELOC/fonts/enc/dvips/etbb/etbb_7t4ywj.enc
RELOC/fonts/enc/dvips/etbb/etbb_7tqudy.enc
RELOC/fonts/enc/dvips/etbb/etbb_7uz5xh.enc
RELOC/fonts/enc/dvips/etbb/etbb_atf2m5.enc
- RELOC/fonts/enc/dvips/etbb/etbb_b3flk2.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_b2o2dl.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_b2vu4i.enc
RELOC/fonts/enc/dvips/etbb/etbb_bb5xlm.enc
- RELOC/fonts/enc/dvips/etbb/etbb_boj3jd.enc
- RELOC/fonts/enc/dvips/etbb/etbb_cq6xx2.enc
- RELOC/fonts/enc/dvips/etbb/etbb_cxbogn.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_bldwqe.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_bphtu4.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_cdb5sw.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_cyo6pa.enc
RELOC/fonts/enc/dvips/etbb/etbb_cyp5f5.enc
- RELOC/fonts/enc/dvips/etbb/etbb_cyyszv.enc
- RELOC/fonts/enc/dvips/etbb/etbb_d63baf.enc
RELOC/fonts/enc/dvips/etbb/etbb_dkuysn.enc
- RELOC/fonts/enc/dvips/etbb/etbb_dpvwoq.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_dsxhqj.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_dwljvi.enc
RELOC/fonts/enc/dvips/etbb/etbb_e7zo2o.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_ebvn3n.enc
RELOC/fonts/enc/dvips/etbb/etbb_ehl4wc.enc
- RELOC/fonts/enc/dvips/etbb/etbb_elsw3h.enc
RELOC/fonts/enc/dvips/etbb/etbb_eqc2ac.enc
RELOC/fonts/enc/dvips/etbb/etbb_eqlboo.enc
- RELOC/fonts/enc/dvips/etbb/etbb_f55msl.enc
- RELOC/fonts/enc/dvips/etbb/etbb_fpvlkw.enc
- RELOC/fonts/enc/dvips/etbb/etbb_frcze6.enc
- RELOC/fonts/enc/dvips/etbb/etbb_fveuju.enc
- RELOC/fonts/enc/dvips/etbb/etbb_fwcdph.enc
- RELOC/fonts/enc/dvips/etbb/etbb_fyek6u.enc
- RELOC/fonts/enc/dvips/etbb/etbb_g2yynh.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_gqyyyo.enc
RELOC/fonts/enc/dvips/etbb/etbb_gteq3q.enc
- RELOC/fonts/enc/dvips/etbb/etbb_gtqfg2.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_gyqlcl.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_gyyqg5.enc
RELOC/fonts/enc/dvips/etbb/etbb_hah5or.enc
RELOC/fonts/enc/dvips/etbb/etbb_hdnox5.enc
RELOC/fonts/enc/dvips/etbb/etbb_hn62ay.enc
RELOC/fonts/enc/dvips/etbb/etbb_i2z4ax.enc
- RELOC/fonts/enc/dvips/etbb/etbb_i5ezvi.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_ieilg7.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_ikqcds.enc
RELOC/fonts/enc/dvips/etbb/etbb_izxro2.enc
RELOC/fonts/enc/dvips/etbb/etbb_j43iwo.enc
- RELOC/fonts/enc/dvips/etbb/etbb_j4gzyc.enc
- RELOC/fonts/enc/dvips/etbb/etbb_j7myeh.enc
- RELOC/fonts/enc/dvips/etbb/etbb_jjhcst.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_jzyw2l.enc
RELOC/fonts/enc/dvips/etbb/etbb_kvzzr3.enc
- RELOC/fonts/enc/dvips/etbb/etbb_ladhhj.enc
- RELOC/fonts/enc/dvips/etbb/etbb_m5kdwt.enc
- RELOC/fonts/enc/dvips/etbb/etbb_mfrons.enc
RELOC/fonts/enc/dvips/etbb/etbb_mgm6re.enc
RELOC/fonts/enc/dvips/etbb/etbb_mpvq56.enc
- RELOC/fonts/enc/dvips/etbb/etbb_n73bzf.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_nlcvfz.enc
RELOC/fonts/enc/dvips/etbb/etbb_num7wi.enc
RELOC/fonts/enc/dvips/etbb/etbb_nvfc5y.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_nwvjis.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_nxs5xb.enc
RELOC/fonts/enc/dvips/etbb/etbb_oe3mzn.enc
- RELOC/fonts/enc/dvips/etbb/etbb_ohc25e.enc
- RELOC/fonts/enc/dvips/etbb/etbb_olodrh.enc
- RELOC/fonts/enc/dvips/etbb/etbb_onypnl.enc
- RELOC/fonts/enc/dvips/etbb/etbb_ooqfsa.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_of7vre.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_oftnmv.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_on6j27.enc
RELOC/fonts/enc/dvips/etbb/etbb_ow4ien.enc
RELOC/fonts/enc/dvips/etbb/etbb_oynaqb.enc
- RELOC/fonts/enc/dvips/etbb/etbb_p6ehom.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_pdqx2z.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_pmy6fd.enc
RELOC/fonts/enc/dvips/etbb/etbb_pqh27d.enc
RELOC/fonts/enc/dvips/etbb/etbb_pvrda3.enc
- RELOC/fonts/enc/dvips/etbb/etbb_q62n24.enc
- RELOC/fonts/enc/dvips/etbb/etbb_rgl4wj.enc
- RELOC/fonts/enc/dvips/etbb/etbb_riohwx.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_pw624q.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_qs5ujs.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_rp26cd.enc
RELOC/fonts/enc/dvips/etbb/etbb_rzlqzq.enc
RELOC/fonts/enc/dvips/etbb/etbb_sb7odk.enc
RELOC/fonts/enc/dvips/etbb/etbb_sjtq2a.enc
- RELOC/fonts/enc/dvips/etbb/etbb_skushq.enc
- RELOC/fonts/enc/dvips/etbb/etbb_t4d6nl.enc
- RELOC/fonts/enc/dvips/etbb/etbb_tbmtgo.enc
- RELOC/fonts/enc/dvips/etbb/etbb_tunzhv.enc
RELOC/fonts/enc/dvips/etbb/etbb_ujzbb6.enc
- RELOC/fonts/enc/dvips/etbb/etbb_v6nho7.enc
- RELOC/fonts/enc/dvips/etbb/etbb_vazzz3.enc
- RELOC/fonts/enc/dvips/etbb/etbb_veuqiz.enc
- RELOC/fonts/enc/dvips/etbb/etbb_vmilsn.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_v2vezk.enc
RELOC/fonts/enc/dvips/etbb/etbb_vqghpl.enc
RELOC/fonts/enc/dvips/etbb/etbb_vtabip.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_whwnxi.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_wozstu.enc
RELOC/fonts/enc/dvips/etbb/etbb_xaqh3v.enc
- RELOC/fonts/enc/dvips/etbb/etbb_xe5wuh.enc
- RELOC/fonts/enc/dvips/etbb/etbb_xmn5et.enc
- RELOC/fonts/enc/dvips/etbb/etbb_xwgzeq.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_xch2ue.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_xnvkfi.enc
RELOC/fonts/enc/dvips/etbb/etbb_y6dqd4.enc
RELOC/fonts/enc/dvips/etbb/etbb_yadlkl.enc
- RELOC/fonts/enc/dvips/etbb/etbb_ybjyd4.enc
RELOC/fonts/enc/dvips/etbb/etbb_yiqwpu.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_ys5ff2.enc
RELOC/fonts/enc/dvips/etbb/etbb_ytzykv.enc
RELOC/fonts/enc/dvips/etbb/etbb_yziesh.enc
RELOC/fonts/enc/dvips/etbb/etbb_yzoycr.enc
- RELOC/fonts/enc/dvips/etbb/etbb_zpkt7y.enc
+ RELOC/fonts/enc/dvips/etbb/etbb_zmodpr.enc
RELOC/fonts/map/dvips/etbb/ETbb.map
RELOC/fonts/opentype/public/etbb/ETbb-Bold.otf
RELOC/fonts/opentype/public/etbb/ETbb-BoldItalic.otf
@@ -115122,19 +115110,16 @@ runfiles size=2462
RELOC/fonts/opentype/public/etbb/ETbb-Regular.otf
RELOC/fonts/tfm/public/etbb/ETbb-Bold-dnom-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-dnom-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-Bold-dnom-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-dnom-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-dnom-t1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-dnom-t1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-inf-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-inf-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-Bold-inf-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-inf-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-inf-t1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-inf-t1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-lf-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-lf-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-Bold-lf-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-lf-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-lf-sc-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-lf-sc-ly1.tfm
@@ -115144,7 +115129,6 @@ runfiles size=2462
RELOC/fonts/tfm/public/etbb/ETbb-Bold-lf-sc-t1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-lf-swash-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-lf-swash-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-Bold-lf-swash-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-lf-swash-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-lf-swash-t1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-lf-swash-t1.tfm
@@ -115154,7 +115138,6 @@ runfiles size=2462
RELOC/fonts/tfm/public/etbb/ETbb-Bold-lf-ts1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-osf-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-osf-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-Bold-osf-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-osf-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-osf-sc-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-osf-sc-ly1.tfm
@@ -115164,7 +115147,6 @@ runfiles size=2462
RELOC/fonts/tfm/public/etbb/ETbb-Bold-osf-sc-t1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-osf-swash-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-osf-swash-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-Bold-osf-swash-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-osf-swash-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-osf-swash-t1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-osf-swash-t1.tfm
@@ -115174,13 +115156,11 @@ runfiles size=2462
RELOC/fonts/tfm/public/etbb/ETbb-Bold-osf-ts1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-sup-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-sup-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-Bold-sup-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-sup-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-sup-t1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-sup-t1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-tlf-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-tlf-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-Bold-tlf-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-tlf-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-tlf-sc-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-tlf-sc-ly1.tfm
@@ -115190,7 +115170,6 @@ runfiles size=2462
RELOC/fonts/tfm/public/etbb/ETbb-Bold-tlf-sc-t1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-tlf-swash-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-tlf-swash-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-Bold-tlf-swash-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-tlf-swash-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-tlf-swash-t1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-tlf-swash-t1.tfm
@@ -115200,7 +115179,6 @@ runfiles size=2462
RELOC/fonts/tfm/public/etbb/ETbb-Bold-tlf-ts1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-tosf-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-tosf-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-Bold-tosf-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-tosf-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-tosf-sc-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-tosf-sc-ly1.tfm
@@ -115210,7 +115188,6 @@ runfiles size=2462
RELOC/fonts/tfm/public/etbb/ETbb-Bold-tosf-sc-t1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-tosf-swash-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-tosf-swash-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-Bold-tosf-swash-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-tosf-swash-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-tosf-swash-t1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Bold-tosf-swash-t1.tfm
@@ -115220,19 +115197,16 @@ runfiles size=2462
RELOC/fonts/tfm/public/etbb/ETbb-Bold-tosf-ts1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-dnom-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-dnom-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-dnom-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-dnom-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-dnom-t1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-dnom-t1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-inf-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-inf-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-inf-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-inf-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-inf-t1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-inf-t1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-sc-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-sc-ly1.tfm
@@ -115242,7 +115216,6 @@ runfiles size=2462
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-sc-t1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-swash-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-swash-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-swash-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-swash-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-swash-t1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-swash-t1.tfm
@@ -115252,7 +115225,6 @@ runfiles size=2462
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-ts1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-sc-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-sc-ly1.tfm
@@ -115262,7 +115234,6 @@ runfiles size=2462
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-sc-t1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-swash-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-swash-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-swash-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-swash-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-swash-t1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-swash-t1.tfm
@@ -115272,13 +115243,11 @@ runfiles size=2462
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-ts1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-sup-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-sup-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-sup-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-sup-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-sup-t1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-sup-t1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-sc-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-sc-ly1.tfm
@@ -115288,7 +115257,6 @@ runfiles size=2462
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-sc-t1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-swash-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-swash-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-swash-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-swash-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-swash-t1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-swash-t1.tfm
@@ -115298,7 +115266,6 @@ runfiles size=2462
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-ts1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-sc-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-sc-ly1.tfm
@@ -115308,7 +115275,6 @@ runfiles size=2462
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-sc-t1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-swash-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-swash-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-swash-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-swash-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-swash-t1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-swash-t1.tfm
@@ -115318,19 +115284,16 @@ runfiles size=2462
RELOC/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-ts1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-dnom-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-dnom-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-Italic-dnom-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-dnom-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-dnom-t1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-dnom-t1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-inf-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-inf-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-Italic-inf-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-inf-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-inf-t1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-inf-t1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-lf-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-lf-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-Italic-lf-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-lf-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-lf-sc-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-lf-sc-ly1.tfm
@@ -115340,7 +115303,6 @@ runfiles size=2462
RELOC/fonts/tfm/public/etbb/ETbb-Italic-lf-sc-t1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-lf-swash-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-lf-swash-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-Italic-lf-swash-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-lf-swash-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-lf-swash-t1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-lf-swash-t1.tfm
@@ -115350,7 +115312,6 @@ runfiles size=2462
RELOC/fonts/tfm/public/etbb/ETbb-Italic-lf-ts1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-osf-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-osf-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-Italic-osf-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-osf-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-osf-sc-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-osf-sc-ly1.tfm
@@ -115360,7 +115321,6 @@ runfiles size=2462
RELOC/fonts/tfm/public/etbb/ETbb-Italic-osf-sc-t1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-osf-swash-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-osf-swash-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-Italic-osf-swash-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-osf-swash-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-osf-swash-t1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-osf-swash-t1.tfm
@@ -115370,13 +115330,11 @@ runfiles size=2462
RELOC/fonts/tfm/public/etbb/ETbb-Italic-osf-ts1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-sup-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-sup-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-Italic-sup-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-sup-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-sup-t1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-sup-t1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-tlf-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-tlf-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-Italic-tlf-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-tlf-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-tlf-sc-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-tlf-sc-ly1.tfm
@@ -115386,7 +115344,6 @@ runfiles size=2462
RELOC/fonts/tfm/public/etbb/ETbb-Italic-tlf-sc-t1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-tlf-swash-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-tlf-swash-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-Italic-tlf-swash-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-tlf-swash-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-tlf-swash-t1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-tlf-swash-t1.tfm
@@ -115396,7 +115353,6 @@ runfiles size=2462
RELOC/fonts/tfm/public/etbb/ETbb-Italic-tlf-ts1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-tosf-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-tosf-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-Italic-tosf-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-tosf-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-tosf-sc-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-tosf-sc-ly1.tfm
@@ -115406,7 +115362,6 @@ runfiles size=2462
RELOC/fonts/tfm/public/etbb/ETbb-Italic-tosf-sc-t1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-tosf-swash-ly1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-tosf-swash-ly1.tfm
- RELOC/fonts/tfm/public/etbb/ETbb-Italic-tosf-swash-ot1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-tosf-swash-ot1.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-tosf-swash-t1--base.tfm
RELOC/fonts/tfm/public/etbb/ETbb-Italic-tosf-swash-t1.tfm
@@ -115602,149 +115557,116 @@ runfiles size=2462
RELOC/fonts/type1/public/etbb/ETbb-Italic.pfb
RELOC/fonts/type1/public/etbb/ETbb-Regular.pfb
RELOC/fonts/vf/public/etbb/ETbb-Bold-dnom-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-Bold-dnom-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-dnom-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-inf-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-Bold-inf-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-inf-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-lf-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-Bold-lf-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-lf-sc-ly1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-lf-sc-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-lf-sc-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-lf-swash-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-Bold-lf-swash-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-lf-swash-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-lf-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-lf-ts1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-osf-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-Bold-osf-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-osf-sc-ly1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-osf-sc-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-osf-sc-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-osf-swash-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-Bold-osf-swash-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-osf-swash-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-osf-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-osf-ts1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-sup-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-Bold-sup-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-sup-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-tlf-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-Bold-tlf-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-tlf-sc-ly1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-tlf-sc-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-tlf-sc-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-tlf-swash-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-Bold-tlf-swash-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-tlf-swash-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-tlf-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-tlf-ts1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-tosf-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-Bold-tosf-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-tosf-sc-ly1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-tosf-sc-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-tosf-sc-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-tosf-swash-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-Bold-tosf-swash-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-tosf-swash-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-tosf-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-Bold-tosf-ts1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-dnom-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-dnom-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-dnom-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-inf-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-inf-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-inf-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-lf-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-lf-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-lf-sc-ly1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-lf-sc-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-lf-sc-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-lf-swash-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-lf-swash-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-lf-swash-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-lf-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-lf-ts1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-osf-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-osf-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-osf-sc-ly1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-osf-sc-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-osf-sc-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-osf-swash-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-osf-swash-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-osf-swash-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-osf-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-osf-ts1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-sup-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-sup-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-sup-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-sc-ly1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-sc-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-sc-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-swash-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-swash-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-swash-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-ts1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-sc-ly1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-sc-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-sc-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-swash-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-swash-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-swash-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-ts1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-dnom-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-Italic-dnom-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-dnom-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-inf-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-Italic-inf-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-inf-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-lf-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-Italic-lf-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-lf-sc-ly1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-lf-sc-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-lf-sc-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-lf-swash-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-Italic-lf-swash-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-lf-swash-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-lf-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-lf-ts1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-osf-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-Italic-osf-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-osf-sc-ly1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-osf-sc-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-osf-sc-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-osf-swash-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-Italic-osf-swash-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-osf-swash-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-osf-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-osf-ts1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-sup-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-Italic-sup-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-sup-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-tlf-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-Italic-tlf-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-tlf-sc-ly1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-tlf-sc-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-tlf-sc-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-tlf-swash-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-Italic-tlf-swash-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-tlf-swash-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-tlf-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-tlf-ts1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-tosf-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-Italic-tosf-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-tosf-sc-ly1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-tosf-sc-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-tosf-sc-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-tosf-swash-ly1.vf
- RELOC/fonts/vf/public/etbb/ETbb-Italic-tosf-swash-ot1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-tosf-swash-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-tosf-t1.vf
RELOC/fonts/vf/public/etbb/ETbb-Italic-tosf-ts1.vf
@@ -115864,7 +115786,7 @@ runfiles size=2462
catalogue-ctan /fonts/etbb
catalogue-license mit lppl1.3
catalogue-topics font font-body font-proportional font-type1 font-otf font-serif font-supp font-t1enc
-catalogue-version 1.056
+catalogue-version 1.057
name etdipa
category Package
@@ -173611,7 +173533,7 @@ catalogue-topics latex3 expl3 macro-supp pre-release
name l3build
category Package
-revision 68720
+revision 69100
shortdesc A testing and building system for (La)TeX
longdesc The build system supports testing and building LaTeX3 code, on
longdesc Linux, Mac OS X and Windows systems. The package offers: A unit
@@ -173623,18 +173545,18 @@ longdesc material released by the LaTeX3 team, and may be updated on a
longdesc different schedule.
depend l3build.ARCH
depend luatex
-containersize 36608
-containerchecksum 172e88665617075276b4a59e449b75cdcf44649bb985868f1de4b725165844543ad016e627efd086a75df51853e123ea9bc3018d5597f05b836cd3720917e3ec
-doccontainersize 748296
-doccontainerchecksum 6bb4f1bbc370e34ddc765ff467513b623118dd0ab1ac8db2a3e0ad9ecc822a80c379ab11460e5025ee21554a16b136831d6f932c91fd7b98b8b182e85585611d
+containersize 36804
+containerchecksum 066e8efca8e062c6cc2232a7409e55f9e739946dea3b91f1d79c4f5f99daa2dbf8aea4dca8367d2e601dca2514209f378c12fb294f84d13d7777c79684b44f82
+doccontainersize 749604
+doccontainerchecksum 82be4b35bf381a437864602c22977d284a46cf393f5354a09dcb90bb8bf70a5bdf7936230848dce5bd7d2e198f48ca0c4f4c0b0afd030eee05aa700659504f24
docfiles size=195
texmf-dist/doc/latex/l3build/CHANGELOG.md
texmf-dist/doc/latex/l3build/README.md details="Readme"
texmf-dist/doc/latex/l3build/l3build.pdf details="Package documentation"
texmf-dist/doc/man/man1/l3build.1
texmf-dist/doc/man/man1/l3build.man1.pdf
-srccontainersize 31692
-srccontainerchecksum 4f5962b1ffd8bf8af206988998b85bc86c8c2f6ffdce8b01c51ac13735f1ab7be83909a13c16481bb6be86a42ff11a75fc7d4375dffcf0c407c84bc12bae8750
+srccontainersize 31720
+srccontainerchecksum 7d095c9e53cc79edf97cbf1d4fd79bfe75b21f81f2f6da033bfc4d8193889ac89aad50c5a27e348a4fdf1d83a51cd2a947e64e1248b47ca7b47f0b8488c1b63e
srcfiles size=29
texmf-dist/source/latex/l3build/l3build.dtx
texmf-dist/source/latex/l3build/l3build.ins
@@ -174594,7 +174516,7 @@ catalogue-version 0.2
name langnames
category Package
-revision 65502
+revision 69101
shortdesc Name languages and their genetic affiliations consistently
relocated 1
longdesc This package attempts to make the typing of language names,
@@ -174604,15 +174526,15 @@ longdesc important databases, as well as the possibility to create new
longdesc combinations. It may be particularly useful for large,
longdesc collaborative projects as well as typologically minded ones
longdesc with a variety of language examples.
-containersize 137972
-containerchecksum 34942812d0c0a59d9e0515e58dc6517a3e4b9fcbf75a338925f2913287d712b9975aa2c48a5f65d2453d5d2b5798f506e8b5bbcb6351ab92cd7a77a07804e94a
-doccontainersize 107712
-doccontainerchecksum 0f3d6dc9fcff40e3bbf8d9217629b5c587dd5cca03efa840611d907bc2859f88515e9f4a052fe229d9fbdd3aa2c2d5905a5cfe818b09897688f3e528d12c0267
+containersize 125060
+containerchecksum 16d4b14025e142be2c0d21509041d99ee2eb9b4b765abfa3102cf79759c79e79f43191f8ba1fcea3d8c7269bdeb6feb0a9efafb1f1ea195b58ed97a307386bdf
+doccontainersize 107500
+doccontainerchecksum 0cc3548f9a640e3c6756298ff609bc5458f30fe096fb8557881356624dcfc6f81068af21731df3c5635381ef98c9b30c1f297213b8489e2bab8840c78f723ed8
docfiles size=42
RELOC/doc/latex/langnames/README.md details="Readme"
RELOC/doc/latex/langnames/langnames.pdf details="Package documentation"
-srccontainersize 6120
-srccontainerchecksum 0777e5a79ac5dd94ac8a9c7191f877408c5d00de252ee95015e8b8918fc94dd29877f10ee110c082df2309d4c0f057fee6a5c50568259d8f93ef7f55b5b5609e
+srccontainersize 6136
+srccontainerchecksum dba944b6330ed6ec883ae6bc0fddb724b74d5ea31d703cd89e85e9cf91642d9edcfdc4710e812bbf658774611bb29764fa8e2a3e1df678e70aab6fa160cad50b
srcfiles size=6
RELOC/source/latex/langnames/langnames.dtx
RELOC/source/latex/langnames/langnames.ins
@@ -174630,7 +174552,7 @@ catalogue-contact-repository https://github.com/cicervlvs/langnames
catalogue-ctan /macros/latex/contrib/langnames
catalogue-license lppl1.3
catalogue-topics abbrev linguistic
-catalogue-version 2.1
+catalogue-version 3.0.0
name langsci
category Package
@@ -215088,7 +215010,7 @@ catalogue-version 0.11
name modes
category Package
-revision 61719
+revision 69105
shortdesc A collection of Metafont mode_def's
relocated 1
longdesc The modes file collects all known Metafont modes for printing
@@ -215099,10 +215021,10 @@ longdesc pixels whose aspect is non-square. The file also provides
longdesc definitions that make \specials identifying the mode in
longdesc Metafont's GF output, and put coding information and other
longdesc Xerox-world information in the TFM file.
-containersize 27320
-containerchecksum 86931543910145093d3141fd40512ef6c1a99901a757d178d8ba592761c25638383f9511f4937af657c414642341c05ad6278d871e5d397117e03cf86706a9ac
+containersize 27440
+containerchecksum d33aa4ff46b94808659ae0f3e4434bf54ba9fb599eef78631757785f01beb452d784efd5381fe971ced8ec3f0bd4f966c05806eed9ee0e89729052755c465e2c
doccontainersize 275952
-doccontainerchecksum 4ba301dce255d22c23cd732e6c1b1e887a96918d594a06f8386563b0ca46fce015c0cdf17aecb2fb13211360a7db24843ec99664b048a53ed0ac76a1a4188c76
+doccontainerchecksum 92b8b525e13b4e65225323f12c0db33e42ce0650d89c0703cc26f828bd2d5669555bd8d11d76c9193607f3845694685435897d4de4aeeb330ecba0f8cbafa4c9
docfiles size=78
RELOC/doc/fonts/modes/ChangeLog
RELOC/doc/fonts/modes/GNUmakefile
@@ -226408,7 +226330,7 @@ catalogue-version 2.0
name newcomputermodern
category Package
-revision 69039
+revision 69099
shortdesc Computer Modern fonts including matching non-latin alphabets
relocated 1
longdesc This is a new assembly of Computer Modern fonts including
@@ -226417,11 +226339,11 @@ longdesc non-Latin based languages and Mathematics, all compatible in
longdesc style to CM fonts. In addition to the Regular weight of
longdesc Computer Modern, it provides a Book weight for heavier
longdesc printing.
-containersize 6183796
-containerchecksum f64497fc062c534d34c5256002e454c3d1d7a3f1b8d9469bff649cf40de82c93305f140a6892e2e89333541a7aa0b904f41a898d4c4ace3fce53f11b13605ddf
-doccontainersize 15535876
-doccontainerchecksum b73e03a721b092b8ef4af265ec4faaed1dff10ec8980228c5de98cf3990e27b04f0d52de0e4a981d0919385950c5023f193dd3fb4e1577b28e33a50f3645fef4
-docfiles size=3822
+containersize 6197960
+containerchecksum c25ba5b493206d10a775e8f9fba936fb34d0e23579338da2aedabc522b89218df7efab8fdfda01ecf3a58d1e1739ac48effb5fa9263176136796b8dc2351d328
+doccontainersize 15538836
+doccontainerchecksum 01483249da48d09adc8fafde404e943b0d02ae3f58564b87b4ff3075922384780fee4c400bdd85381c6251690664d6e802d2389dae2a14f04366929599aa4457
+docfiles size=3823
RELOC/doc/fonts/newcomputermodern/README details="Readme"
RELOC/doc/fonts/newcomputermodern/colored-diacritics.pdf
RELOC/doc/fonts/newcomputermodern/colored-diacritics.tex
@@ -226437,7 +226359,7 @@ docfiles size=3822
RELOC/doc/fonts/newcomputermodern/opticalmathlm.pdf
RELOC/doc/fonts/newcomputermodern/opticalmathlm.tex
RELOC/doc/fonts/newcomputermodern/source.txz
-runfiles size=3902
+runfiles size=3908
RELOC/fonts/opentype/public/newcomputermodern/NewCM08-Book.otf
RELOC/fonts/opentype/public/newcomputermodern/NewCM08-BookItalic.otf
RELOC/fonts/opentype/public/newcomputermodern/NewCM08-Italic.otf
@@ -226483,12 +226405,13 @@ runfiles size=3902
RELOC/tex/latex/newcomputermodern/NewCMMono10-Regular.fontspec
RELOC/tex/latex/newcomputermodern/NewCMSans10-Book.fontspec
RELOC/tex/latex/newcomputermodern/NewCMSans10-Regular.fontspec
+ RELOC/tex/latex/newcomputermodern/fspdefault.sty
RELOC/tex/latex/newcomputermodern/newcomputermodern.sty
catalogue-alias newcm
catalogue-ctan /fonts/newcomputermodern
catalogue-license gfl
catalogue-topics font cherokee font-archaic font-body font-cm font-coptic font-cyrillic font-greek font-hebrew font-indic font-maths font-medieval font-mono font-multilingual font-otf font-proportional font-sans font-serif font-supp linguistic phonetic
-catalogue-version 5.0
+catalogue-version 5.01
name newenviron
category Package
@@ -259526,7 +259449,7 @@ catalogue-version 0.1.3
name postnotes
category Package
-revision 68840
+revision 69102
shortdesc Endnotes for LaTeX
relocated 1
longdesc This is an endnotes package for LaTeX. Its user interface
@@ -259539,11 +259462,11 @@ longdesc up contextual running headers for printed notes. The default is
longdesc a simple but useful one, in the form "Notes to pages N-M", but
longdesc more elaborate ones can be built. When hyperref is loaded,
longdesc postnotes provides hyperlinked notes, including back links.
-containersize 7396
-containerchecksum 96d25ab37f1f3b5bc34956f48a800cecd622bb102c4043b4534cdfc2513becc79bb247473ecbbeb43c4933257da4772c17d853feba01f5cab0f2ff18c8c5a02b
-doccontainersize 1004116
-doccontainerchecksum 80d8129a50ff54a59a8782b95d03ebbf4d70848f885a4d8a39419999ca55d401790b6b16caaf60f87bca19c4b6865c9d312c66a96ed317f474be8139ea133835
-docfiles size=267
+containersize 7404
+containerchecksum a2b8a54ad8062e550af61a6f51d816d11891976525aeedc5267923665ea63967a388bde67dd2ad537b2c4d8fc3ffc738f05064d2fd26b0fbf7328eb806dfc0c0
+doccontainersize 1004252
+doccontainerchecksum 28537fd0437da707dfaa5dde2fdc92d11d4de5bdf99e8fc7655cc60533d8ed5bd5b9e1d680f0269b2d60e498fee577a3b069957c6a5ba41fc55dfc1631297853
+docfiles size=268
RELOC/doc/latex/postnotes/CHANGELOG.md
RELOC/doc/latex/postnotes/DEPENDS.txt
RELOC/doc/latex/postnotes/README.md details="Readme"
@@ -259551,8 +259474,8 @@ docfiles size=267
RELOC/doc/latex/postnotes/postnotes-code.tex
RELOC/doc/latex/postnotes/postnotes-doc.pdf details="User manual"
RELOC/doc/latex/postnotes/postnotes-doc.tex
-srccontainersize 22524
-srccontainerchecksum 0c6e5f6e0ab3443d5cd2b8072e062076b484a9fe34c5d553699245b99a15b47b70c5cd4428a2d8a64acbe7df5da457938452e43a24beb79d63f7bb1371874a2f
+srccontainersize 22544
+srccontainerchecksum b3050fd301f1a332622912a082dfffbb8ec4d172d4e7a808491f84b2ce7e494d16756a5ac7412cc5d1590d6a0f1ea5ec5a20bb7abb61b051e9f4a5179351d39d
srcfiles size=27
RELOC/source/latex/postnotes/postnotes.dtx
RELOC/source/latex/postnotes/postnotes.ins
@@ -259562,7 +259485,7 @@ catalogue-contact-repository https://github.com/gusbrs/postnotes
catalogue-ctan /macros/latex/contrib/postnotes
catalogue-license lppl1.3c
catalogue-topics endnote expl3
-catalogue-version 0.2.7
+catalogue-version 0.2.8
name powerdot
category Package
@@ -305859,7 +305782,7 @@ binfiles arch=x86_64-solaris size=1
name tex4ht
category Package
-revision 69095
+revision 69104
shortdesc Convert (La)TeX to HTML/XML
longdesc A converter from TeX and LaTeX to SGML-based formats such as
longdesc (X)HTML, MathML, OpenDocument, and Docbook, providing a
@@ -305880,10 +305803,10 @@ longdesc files from them is nontrivial, and generally done with the
longdesc Makefile in development, from which the TeX4ht package in TeX
longdesc Live is updated.
depend tex4ht.ARCH
-containersize 1108536
-containerchecksum 226c6046454bdb602e48a4bd3fd3d283d4648b98f16a688eda76eeec7e0daefb8395756804185cbc68a24a408fffaae7174f208dc67d219da6c353107c08fc1f
+containersize 1108672
+containerchecksum 4903d414ac9038fce92df1a6508769cabd608bc76ff9728cf96e1859049e1c90dd17923b0f3035f7a108f2b6c59e07408e3e77e78e798a1bac5f62b5db53a9b0
doccontainersize 136384
-doccontainerchecksum 0bfab124764c33bc3bb0378c265d784a727b6b78187e2490987118ee30e6f4fb3faaf124306403e38afa5ad94644fd35d05e169395bd1094ccc30c18e6629ad3
+doccontainerchecksum c9972ef198965a00298a350b5ddf841fcd76f23e938c9b6771d3774793050f0069ea7a357e77a11877713639b0c1ca70bfa89b15bfd504c384f6045c47842aef
docfiles size=260
texmf-dist/doc/generic/tex4ht/Makefile
texmf-dist/doc/generic/tex4ht/README details="Readme"
@@ -305955,8 +305878,8 @@ docfiles size=260
texmf-dist/doc/generic/tex4ht/mn56.html
texmf-dist/doc/generic/tex4ht/mn5x.png
texmf-dist/doc/generic/tex4ht/mn6x.png
-srccontainersize 1459284
-srccontainerchecksum 2df8a42dd3c551c104c1838b7366001173abcd1790636ff3fa83984958dcfcaf952d558d461cff2871e1791237e06fa6c16232a57746f638cddda09524b9d350
+srccontainersize 1461268
+srccontainerchecksum c171e0de2d481d80a4a1b4673534a06d436fdc7aabe22da0eef5731bf1829b57c0721e74ba48f59ffc0f30856f1d6adc3e4c98280f8d47966e84f0e9972e6810
srcfiles size=4403
texmf-dist/source/generic/tex4ht/ChangeLog
texmf-dist/source/generic/tex4ht/Makefile
@@ -306036,7 +305959,7 @@ srcfiles size=4403
texmf-dist/source/generic/tex4ht/update-htfonts
texmf-dist/source/generic/tex4ht/wripro.tex
texmf-dist/source/generic/tex4ht/xtpipes.tex
-runfiles size=12251
+runfiles size=12252
texmf-dist/scripts/tex4ht/ht.sh
texmf-dist/scripts/tex4ht/htcopy.pl
texmf-dist/scripts/tex4ht/htlatex.sh
@@ -306337,6 +306260,7 @@ runfiles size=12251
texmf-dist/tex/generic/tex4ht/makeidx.4ht
texmf-dist/tex/generic/tex4ht/manju.4ht
texmf-dist/tex/generic/tex4ht/manmac.4ht
+ texmf-dist/tex/generic/tex4ht/marginnote.4ht
texmf-dist/tex/generic/tex4ht/mathjax-latex-4ht.4ht
texmf-dist/tex/generic/tex4ht/mathltx.4ht
texmf-dist/tex/generic/tex4ht/mathml.4ht
@@ -317633,7 +317557,7 @@ docfiles size=376
name texlive-scripts
category TLCore
-revision 69088
+revision 69097
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.
@@ -317641,10 +317565,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 114260
-containerchecksum a5acb0f9e23c6501a94560d3e3d6d463dbc6f6a1b36aa060f34bf7f6b08c7fc003338088c74f402ca6313d8165ef6d81c731e8c847e59c491106a51ce930c6f6
-doccontainersize 430688
-doccontainerchecksum ac4f775e00866b5b293101940ae752023cb37595bbac0ddaa0dcb093d3fc404718413bb65ef955781d4c71fd5f691192ebeccb0304e7dbc2b94ecdf7ea2d44e0
+containersize 114264
+containerchecksum ac9b2e9facd5a7b75c6241ac16bf0785d74c577938d2351554cb42f0c0495109ff3f9287ba48ff50d5506ed3224397996ef5f7f5a8f01de777b4e984be36ea41
+doccontainersize 430620
+doccontainerchecksum 2e1f8848128f4e4fcbe9d8104a4ca36ed2cc738d07d842d7ac9939d75249af4b08b8f2f4de94ff2efa69f87320ddde9f0519ff0559c7be651554b613a72aef23
docfiles size=560
doc.html
texmf-dist/doc/man/man1/fmtutil-sys.1
@@ -335368,7 +335292,7 @@ catalogue-version 1.0
name tuda-ci
category Package
-revision 67622
+revision 69103
shortdesc LaTeX templates of Technische Universitat Darmstadt
relocated 1
longdesc The TUDa-CI-Bundle provides a possibility to use the Corporate
@@ -335376,15 +335300,17 @@ longdesc Design of TU Darmstadt in LaTeX. It contains documentclasses as
longdesc well as some helper packages and config files together with
longdesc some templates for user documentation, which currently are only
longdesc available in German.
-containersize 44264
-containerchecksum 7c9d581ef3c4124305cec377e6468f858b9f50b98031b966b46386f3075c5a58da331bea4a13f89a4772ba23aa2038691b00e17c156d54d469a57d108d1403f2
-doccontainersize 1132920
-doccontainerchecksum 21bed9e3555191ee2574c9b97607871c6edb9460d2dd978a46ae573e2623857f74f04221aa9dbe58e8b2b711d3f7e0d83987b02311966585a3fe46a76795a6d7
-docfiles size=1616
+containersize 47948
+containerchecksum 6f24f108430375b3ddc201cb222f4000019f4042c1e8714792690329860d9cc09805e53399223ef04c011a05e01bab528040110868c814096f54265982d8b704
+doccontainersize 1165436
+doccontainerchecksum ad32e9f6e9b92b7abe0aedf83e301d85d7544d023594c8000be0686cf428d6810e0ef59c8da80245178dc7456e8cce825de4d264a236edb5f5910653f6578433
+docfiles size=1753
RELOC/doc/latex/tuda-ci/DEMO-TUDaAnnouncement.pdf
RELOC/doc/latex/tuda-ci/DEMO-TUDaAnnouncement.tex
- RELOC/doc/latex/tuda-ci/DEMO-TUDaBeamer.pdf details="Example presentation" language="de"
+ RELOC/doc/latex/tuda-ci/DEMO-TUDaBeamer.pdf
RELOC/doc/latex/tuda-ci/DEMO-TUDaBeamer.tex
+ RELOC/doc/latex/tuda-ci/DEMO-TUDaBeamer2023.pdf details="Example presentation" language="de"
+ RELOC/doc/latex/tuda-ci/DEMO-TUDaBeamer2023.tex
RELOC/doc/latex/tuda-ci/DEMO-TUDaBibliography.bib
RELOC/doc/latex/tuda-ci/DEMO-TUDaExercise.pdf
RELOC/doc/latex/tuda-ci/DEMO-TUDaExercise.tex
@@ -335406,13 +335332,20 @@ docfiles size=1616
RELOC/doc/latex/tuda-ci/DEMO-TUDaThesis.pdf details="Example bachelor's thesis" language="de"
RELOC/doc/latex/tuda-ci/DEMO-TUDaThesis.tex
RELOC/doc/latex/tuda-ci/README.md details="Readme"
-runfiles size=83
+runfiles size=94
RELOC/tex/latex/tuda-ci/beamercolorthemeTUDa.sty
+ RELOC/tex/latex/tuda-ci/beamercolorthemeTUDa2023.sty
RELOC/tex/latex/tuda-ci/beamerfontthemeTUDa.sty
+ RELOC/tex/latex/tuda-ci/beamerfontthemeTUDa2023.sty
RELOC/tex/latex/tuda-ci/beamerinnerthemeTUDa.sty
+ RELOC/tex/latex/tuda-ci/beamerinnerthemeTUDa2008.sty
+ RELOC/tex/latex/tuda-ci/beamerinnerthemeTUDa2023.sty
RELOC/tex/latex/tuda-ci/beamerouterthemeTUDa.sty
+ RELOC/tex/latex/tuda-ci/beamerouterthemeTUDa2023.sty
RELOC/tex/latex/tuda-ci/beamerthemeTUDa-mecheng.sty
RELOC/tex/latex/tuda-ci/beamerthemeTUDa.sty
+ RELOC/tex/latex/tuda-ci/beamerthemeTUDa2008.sty
+ RELOC/tex/latex/tuda-ci/beamerthemeTUDa2023.sty
RELOC/tex/latex/tuda-ci/tuda-a0paper.clo
RELOC/tex/latex/tuda-ci/tuda-a1paper.clo
RELOC/tex/latex/tuda-ci/tuda-a2paper.clo
@@ -335442,7 +335375,7 @@ catalogue-contact-repository https://github.com/tudace/tuda_latex_templates
catalogue-ctan /macros/latex/contrib/tuda-ci
catalogue-license lppl1.3c
catalogue-topics class doc-templ letter dissertation presentation poster std-conform
-catalogue-version 3.34
+catalogue-version 3.35
name tudscr
category Package
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 2bb58a9c7e..6fac394b80 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-5f3be3999f9df9d4111f615234d3703e texlive.tlpdb
+4242a2be0d3e2567524ce29fd696fbc4 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index 93ec4c62c1..72007ebf2d 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-c33cdcde24c8c0a9700455d64dbc25d6944cb692c5eb05b937347c6e5b20d09913b61639780d1bab4a99abf9c5e59327ff20dec5994d4fa7ac281278af3434be texlive.tlpdb
+e1b0b07b0c82fe0d5645e0f3be7ffd08be36007c8a200ed331d345e436e56b362136d7f198aa4a5c07a238c4d60b0eabf10b63b7229769a507d8cc7da1c8df92 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index b7dd9c0e13..bb46558173 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
@@ -1,11 +1,11 @@
-----BEGIN PGP SIGNATURE-----
-iQEzBAEBCgAdFiEE2PL4YFeoV+QqiBBqTOGHfhlDjHAFAmV3rSsACgkQTOGHfhlD
-jHAyiAf9GU8PagH7NDHF31UDKPrMMTZzGXvLB0QSmLdWYFj1awmjuA8cy2udJ+Qb
-QfRNqF8bzx605ICpNjeM+SnVHLTKaLM9ZBy8bbKeqtfCAU68e5hQbRV0a5szrRnM
-xithhfi4CGDNmCjSyRLCHas3kMktDbKTVx4XuMTU8jg2gaoSS3IwLPOC9GnxCMDn
-s/InVhIK7V+VhR5QCE+3pCnSlUKtCOhZ9eIWGdXl8rlIjCGs+Cdfpug4qMbC3o1f
-GyhIDFE1GSuZ0kjbW1EVVNQbzfZ/VgtlmEMYQ6Zh6eEVmJClwPMupMMiDQcT/B1C
-sn0yscflY5CEywyJOTEnQk5LilgcIA==
-=ImXq
+iQEzBAEBCgAdFiEE2PL4YFeoV+QqiBBqTOGHfhlDjHAFAmV4/rUACgkQTOGHfhlD
+jHCE5ggAkV1E3ImejEr8SA16EVCSgOxGUwZwVpTOfgYfsWDP6zP2sP3E2Q9JTxzW
+qJ+EyWI250WSHttnwmqnLdF7KZFl3yXlnrFS9skuBdw3UFMKcPRjUfaYGSM+znWX
+QubLTIdKUDhri5xd0sHThxK0/wJN+kW5GYX1zhnj8LrycP6r94AeTmSZrsD+84T/
+NjaEDI6Gz80cDlCTmzxXgY6EuHjR4aB7Edq3mswtfpenPooyuRCn1mCcy/lv3zvu
+kGqm8IDa7UMunSNVqGY0cHXKi2OZVhftj5MXgYfZAgGkShEezhU0NG4I26gbWn2I
+WS4UpN06y9ewFW+l4WKi3HiesZBlTA==
+=iiU6
-----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index 9aad80e329..5960bcd3ca 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
Binary files differ
diff --git a/timestamp b/timestamp
index df3bb90a55..e761ac4c83 100644
--- a/timestamp
+++ b/timestamp
@@ -2,4 +2,4 @@
# The source CTAN of this site's material:
dante.ctan.org
# The year-month-day-hour-minute of this site's material:
-2023-12-13-02-02
+2023-12-14-02-02