summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--FILES.byname624
-rw-r--r--FILES.byname.gzbin2513642 -> 2513618 bytes
-rw-r--r--FILES.last07days492
-rw-r--r--biblio/ctan-bibdata/ctan.bib54
-rw-r--r--biblio/ctan-bibdata/ctan.pdfbin3654175 -> 3654023 bytes
-rw-r--r--macros/latex/contrib/annotate-equations/README.md7
-rw-r--r--macros/latex/contrib/annotate-equations/annotate-equations.pdfbin124665 -> 203389 bytes
-rw-r--r--macros/latex/contrib/annotate-equations/annotate-equations.sty16
-rw-r--r--macros/latex/contrib/annotate-equations/annotate-equations.tex90
-rw-r--r--macros/latex/contrib/overarrows/overarrows.dtx223
-rw-r--r--macros/latex/contrib/overarrows/overarrows.pdfbin545759 -> 554421 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md10
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/README.md4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty6
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/fontspec-luatex-tmp-ltx.sty2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx6
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdfbin961811 -> 961936 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx16
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdfbin686518 -> 686657 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx6
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdfbin586720 -> 586863 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx6
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdfbin514471 -> 514646 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.pdfbin557646 -> 557793 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.pdfbin540685 -> 540820 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.pdfbin542954 -> 543108 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.pdfbin536072 -> 536219 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.pdfbin591503 -> 591646 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.pdfbin515315 -> 515474 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx6
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdfbin749402 -> 749558 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx69
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdfbin561134 -> 565712 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx6
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdfbin681340 -> 681579 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx6
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdfbin810105 -> 810260 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx6
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdfbin526218 -> 526338 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx6
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdfbin426193 -> 426365 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx6
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdfbin588291 -> 588430 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.dtx2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.pdfbin386602 -> 386819 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx80
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdfbin444424 -> 443946 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx8
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdfbin455780 -> 455951 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty2
-rw-r--r--macros/latex/contrib/postnotes/CHANGELOG.md11
-rw-r--r--macros/latex/contrib/postnotes/postnotes-code.pdfbin838960 -> 839836 bytes
-rw-r--r--macros/latex/contrib/postnotes/postnotes.dtx35
-rw-r--r--macros/latex/contrib/postnotes/postnotes.pdfbin177382 -> 177383 bytes
-rw-r--r--macros/latex/contrib/tagpdf/README.md4
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-backend.dtx9
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-checks.dtx4
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-code.pdfbin1495476 -> 1514352 bytes
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-data.dtx18
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-mc-generic.dtx6
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-mc-luacode.dtx4
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-mc-shared.dtx4
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-roles.dtx6
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-space.dtx4
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-struct.dtx144
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-tree.dtx4
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-user.dtx82
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf.dtx6
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf.pdfbin854619 -> 858479 bytes
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf.tex23
-rw-r--r--macros/latex/contrib/tagpdf/tagpdfdocu-patches.sty4
-rw-r--r--macros/luatex/latex/novel/README.md4
-rw-r--r--macros/luatex/latex/novel/doc/extras/novel-example.pdf1127
-rw-r--r--macros/luatex/latex/novel/doc/extras/novel-example.tex5
-rw-r--r--macros/luatex/latex/novel/doc/extras/novel-testsuite.pdfbin0 -> 69115 bytes
-rw-r--r--macros/luatex/latex/novel/doc/extras/novel-testsuite.tex4
-rw-r--r--macros/luatex/latex/novel/doc/novel-documentation.html166
-rw-r--r--macros/luatex/latex/novel/doc/novel.pdf779
-rw-r--r--macros/luatex/latex/novel/doc/novel.tex10
-rw-r--r--macros/luatex/latex/novel/fonts/opentype/novel/NovelDeco.otf (renamed from macros/luatex/latex/novel/fonts/NovelDeco.otf)bin132000 -> 132000 bytes
-rw-r--r--macros/luatex/latex/novel/novel-Obsolete.sty485
-rw-r--r--macros/luatex/latex/novel/novel-xmppacket.sty186
-rw-r--r--macros/luatex/latex/novel/tex/lualatex/novel/novel-CGATSTR001.clo (renamed from macros/luatex/latex/novel/novel-CGATSTR001.clo)2
-rw-r--r--macros/luatex/latex/novel/tex/lualatex/novel/novel-CalculateLayout.sty (renamed from macros/luatex/latex/novel/novel-CalculateLayout.sty)24
-rw-r--r--macros/luatex/latex/novel/tex/lualatex/novel/novel-ChapterScene.sty (renamed from macros/luatex/latex/novel/novel-ChapterScene.sty)18
-rw-r--r--macros/luatex/latex/novel/tex/lualatex/novel/novel-DropCap.sty (renamed from macros/luatex/latex/novel/novel-DropCap.sty)16
-rw-r--r--macros/luatex/latex/novel/tex/lualatex/novel/novel-FOGRA39.clo (renamed from macros/luatex/latex/novel/novel-FOGRA39.clo)2
-rw-r--r--macros/luatex/latex/novel/tex/lualatex/novel/novel-FileData.sty (renamed from macros/luatex/latex/novel/novel-FileData.sty)15
-rw-r--r--macros/luatex/latex/novel/tex/lualatex/novel/novel-Fonts.sty (renamed from macros/luatex/latex/novel/novel-Fonts.sty)36
-rw-r--r--macros/luatex/latex/novel/tex/lualatex/novel/novel-Footnotes.sty (renamed from macros/luatex/latex/novel/novel-Footnotes.sty)6
-rw-r--r--macros/luatex/latex/novel/tex/lualatex/novel/novel-HeadFootStyles.sty (renamed from macros/luatex/latex/novel/novel-HeadFootStyles.sty)12
-rw-r--r--macros/luatex/latex/novel/tex/lualatex/novel/novel-Images.sty (renamed from macros/luatex/latex/novel/novel-Images.sty)12
-rw-r--r--macros/luatex/latex/novel/tex/lualatex/novel/novel-JC200103.clo (renamed from macros/luatex/latex/novel/novel-JC200103.clo)2
-rw-r--r--macros/luatex/latex/novel/tex/lualatex/novel/novel-LayoutSettings.sty (renamed from macros/luatex/latex/novel/novel-LayoutSettings.sty)40
-rw-r--r--macros/luatex/latex/novel/tex/lualatex/novel/novel-PostLayout.sty (renamed from macros/luatex/latex/novel/novel-PostLayout.sty)4
-rw-r--r--macros/luatex/latex/novel/tex/lualatex/novel/novel-Sandbox.sty (renamed from macros/luatex/latex/novel/novel-Sandbox.sty)4
-rw-r--r--macros/luatex/latex/novel/tex/lualatex/novel/novel-TextMacros.sty (renamed from macros/luatex/latex/novel/novel-TextMacros.sty)9
-rw-r--r--macros/luatex/latex/novel/tex/lualatex/novel/novel-microtype.cfg (renamed from macros/luatex/latex/novel/novel-microtype.cfg)4
-rw-r--r--macros/luatex/latex/novel/tex/lualatex/novel/novel-pdfx.sty (renamed from macros/luatex/latex/novel/novel-pdfx.sty)6
-rw-r--r--macros/luatex/latex/novel/tex/lualatex/novel/novel-xmppacket.sty111
-rw-r--r--macros/luatex/latex/novel/tex/lualatex/novel/novel.cls (renamed from macros/luatex/latex/novel/novel.cls)81
-rw-r--r--macros/luatex/latex/pyluatex/pyluatex-interpreter.py2
-rw-r--r--macros/luatex/latex/pyluatex/pyluatex.pdfbin83049 -> 83051 bytes
-rw-r--r--macros/luatex/latex/pyluatex/pyluatex.sty2
-rw-r--r--macros/luatex/latex/pyluatex/pyluatex.tex2
-rw-r--r--systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl5
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb75
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.md52
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha5122
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc14
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.xzbin2449344 -> 2450260 bytes
-rw-r--r--timestamp2
119 files changed, 3115 insertions, 2314 deletions
diff --git a/FILES.byname b/FILES.byname
index bb602ea2f7..cccd533fd3 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -2048,12 +2048,12 @@
2022/12/25 | 1673 | biblio/citation-style-language/README.md
2022/12/25 | 11958 | biblio/citation-style-language/vancouver.csl
2022/12/25 | 604004 | biblio/citation-style-language.zip
-2023/02/14 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2023/02/15 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
2022/10/08 | 127 | biblio/ctan-bibdata/biblatex-ctan/ctan.cbx
-2023/02/14 | 2767755 | biblio/ctan-bibdata/ctan.bib
-2023/02/14 | 3654848 | biblio/ctan-bibdata/ctan.pdf
+2023/02/15 | 2767753 | biblio/ctan-bibdata/ctan.bib
+2023/02/15 | 3654175 | biblio/ctan-bibdata/ctan.pdf
2023/01/16 | 1489 | biblio/ctan-bibdata/README
-2023/02/14 | 4049936 | biblio/ctan-bibdata.zip
+2023/02/15 | 4050905 | biblio/ctan-bibdata.zip
2022/02/06 | 3110 | biblio/pbibtex/pbibtex-base/cpp.awk
2022/02/06 | 1009 | biblio/pbibtex/pbibtex-base/generate.sh
2022/02/06 | 22422 | biblio/pbibtex/pbibtex-base/jabbrv.bst
@@ -5407,7 +5407,7 @@
1990/10/02 | 5440 | dviware/vutex/vaxvms.hlp
1990/10/02 | 812 | dviware/vutex/vaxvms.ins
1990/10/02 | 127576 | dviware/vutex/vutex.web
-2023/02/14 | 245056 | FILES.last07days
+2023/02/15 | 226117 | 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
@@ -193561,7 +193561,6 @@
2010/11/19 | 426632 | install/macros/luatex/latex/luainputenc.tds.zip
2022/01/01 | 214658 | install/macros/luatex/latex/lualatex-math.tds.zip
2010/12/14 | 322044 | install/macros/luatex/latex/luatextra.tds.zip
-2018/04/25 | 5009580 | install/macros/luatex/latex/novel.tds.zip
2023/01/11 | 2535893 | install/macros/musixtex.tds.zip
2013/07/02 | 153964 | install/macros/plain/contrib/plstmary.tds.zip
2008/05/18 | 22279 | install/macros/plain/plnfss.tds.zip
@@ -201001,7 +201000,7 @@
2013/04/01 | 14776 | macros/context/contrib/context-visualcounter/tex/context/third/visualcounter/t-visualcounter.mkvi
2018/03/05 | 11 | macros/context/contrib/context-visualcounter/VERSION
2018/03/22 | 276789 | macros/context/contrib/context-visualcounter.zip
-2023/02/07 | 115770462 | macros/context/latest/cont-tmf.zip
+2023/02/14 | 115855217 | macros/context/latest/cont-tmf.zip
2016/04/21 | 32846 | macros/cstex/base/cmexb.tar.gz
2016/06/26 | 1728262 | macros/cstex/base/csfonts-t1.tar.gz
2007/03/01 | 187106 | macros/cstex/base/csfonts.tar.gz
@@ -210804,12 +210803,12 @@
2020/07/29 | 2377 | macros/latex/contrib/annee-scolaire/MANIFEST.md
2020/07/29 | 986 | macros/latex/contrib/annee-scolaire/README.md
2020/07/29 | 1372816 | macros/latex/contrib/annee-scolaire.zip
-2022/03/29 | 124665 | macros/latex/contrib/annotate-equations/annotate-equations.pdf
-2022/03/29 | 7505 | macros/latex/contrib/annotate-equations/annotate-equations.sty
-2022/03/29 | 9970 | macros/latex/contrib/annotate-equations/annotate-equations.tex
+2023/02/15 | 203389 | macros/latex/contrib/annotate-equations/annotate-equations.pdf
+2023/02/15 | 7556 | macros/latex/contrib/annotate-equations/annotate-equations.sty
+2023/02/15 | 11609 | macros/latex/contrib/annotate-equations/annotate-equations.tex
2022/03/29 | 1090 | macros/latex/contrib/annotate-equations/LICENSE
-2022/03/29 | 3121 | macros/latex/contrib/annotate-equations/README.md
-2022/03/29 | 128663 | macros/latex/contrib/annotate-equations.zip
+2022/11/22 | 3236 | macros/latex/contrib/annotate-equations/README.md
+2023/02/15 | 209671 | macros/latex/contrib/annotate-equations.zip
2018/08/23 | 66355 | macros/latex/contrib/annot_pro/annot_pro.dtx
2018/04/26 | 2148 | macros/latex/contrib/annot_pro/annot_pro.ins
2018/08/25 | 635808 | macros/latex/contrib/annot_pro/doc/annotpro_man.pdf
@@ -230041,12 +230040,12 @@
2017/10/24 | 147577 | macros/latex/contrib/outlining/outlining.pdf
2017/10/25 | 150 | macros/latex/contrib/outlining/README.md
2017/10/25 | 141632 | macros/latex/contrib/outlining.zip
-2023/01/18 | 19106 | macros/latex/contrib/overarrows/LICENSE
-2023/01/19 | 121271 | macros/latex/contrib/overarrows/overarrows.dtx
-2023/01/19 | 1905 | macros/latex/contrib/overarrows/overarrows.ins
-2023/01/19 | 545759 | macros/latex/contrib/overarrows/overarrows.pdf
-2023/01/19 | 877 | macros/latex/contrib/overarrows/README.md
-2023/01/19 | 563546 | macros/latex/contrib/overarrows.zip
+2023/01/17 | 19106 | macros/latex/contrib/overarrows/LICENSE
+2023/02/15 | 124794 | macros/latex/contrib/overarrows/overarrows.dtx
+2023/01/18 | 1905 | macros/latex/contrib/overarrows/overarrows.ins
+2023/02/15 | 554421 | macros/latex/contrib/overarrows/overarrows.pdf
+2023/01/18 | 877 | macros/latex/contrib/overarrows/README.md
+2023/02/15 | 572649 | macros/latex/contrib/overarrows.zip
2021/02/23 | 1917 | macros/latex/contrib/overlays/ChangeLog
2016/09/28 | 19106 | macros/latex/contrib/overlays/COPYING
2021/02/23 | 36910 | macros/latex/contrib/overlays/overlays.pdf
@@ -230936,56 +230935,56 @@
2022/10/29 | 323238 | macros/latex/contrib/pdflscape/pdflscape.pdf
2022/10/29 | 402 | macros/latex/contrib/pdflscape/README.md
2022/10/29 | 319157 | macros/latex/contrib/pdflscape.zip
-2023/02/07 | 8765 | macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md
-2023/02/07 | 7654 | macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty
-2023/02/07 | 2880 | macros/latex/contrib/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty
-2023/02/07 | 150154 | macros/latex/contrib/pdfmanagement-testphase/fontspec-luatex-tmp-ltx.sty
-2023/02/07 | 176583 | macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx
-2023/02/07 | 961811 | macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdf
-2023/02/07 | 72943 | macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx
-2023/02/07 | 686518 | macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdf
-2023/02/07 | 28627 | macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx
-2023/02/07 | 586720 | macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdf
-2023/02/07 | 17304 | macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx
-2023/02/07 | 514471 | macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdf
-2023/02/07 | 26550 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.dtx
-2023/02/07 | 557646 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.pdf
-2023/02/07 | 18170 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.dtx
-2023/02/07 | 540685 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.pdf
-2023/02/07 | 20430 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.dtx
-2023/02/07 | 542954 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.pdf
-2023/02/07 | 67833 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx
-2023/02/07 | 749402 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdf
-2023/02/07 | 26540 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.dtx
-2023/02/07 | 536072 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.pdf
-2023/02/07 | 30678 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.dtx
-2023/02/07 | 591503 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.pdf
-2023/02/07 | 21991 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.dtx
-2023/02/07 | 515315 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.pdf
-2023/02/07 | 27907 | macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx
-2023/02/07 | 561134 | macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdf
-2023/02/07 | 63555 | macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx
-2023/02/07 | 681340 | macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdf
-2023/02/07 | 89488 | macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx
-2023/02/07 | 810105 | macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdf
-2023/02/07 | 15651 | macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx
-2023/02/07 | 526218 | macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdf
-2023/02/07 | 6413 | macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx
-2023/02/07 | 426193 | macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdf
-2023/02/07 | 4041 | macros/latex/contrib/pdfmanagement-testphase/l3ref-tmp.sty
-2023/02/07 | 12372 | macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx
-2023/02/07 | 588291 | macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdf
-2023/02/07 | 2134 | macros/latex/contrib/pdfmanagement-testphase/luaotfload-l3color-tmp.lua
-2023/02/07 | 5310 | macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.dtx
-2023/02/07 | 386602 | macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.pdf
-2023/02/07 | 15159 | macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx
-2023/02/07 | 444424 | macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdf
-2023/02/07 | 18021 | macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx
-2023/02/07 | 4884 | macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.ins
-2023/02/07 | 455780 | macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdf
-2023/02/07 | 1200 | macros/latex/contrib/pdfmanagement-testphase/README.md
-2023/02/07 | 2835 | macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty
-2023/02/07 | 11377750 | macros/latex/contrib/pdfmanagement-testphase.zip
+2023/02/15 | 8978 | macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md
+2023/02/15 | 7654 | macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty
+2023/02/15 | 2882 | macros/latex/contrib/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty
+2023/02/15 | 150154 | macros/latex/contrib/pdfmanagement-testphase/fontspec-luatex-tmp-ltx.sty
+2023/02/15 | 176583 | macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx
+2023/02/15 | 961936 | macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdf
+2023/02/15 | 72943 | macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx
+2023/02/15 | 686657 | macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdf
+2023/02/15 | 28627 | macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx
+2023/02/15 | 586863 | macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdf
+2023/02/15 | 17304 | macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx
+2023/02/15 | 514646 | macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdf
+2023/02/15 | 26550 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.dtx
+2023/02/15 | 557793 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.pdf
+2023/02/15 | 18170 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.dtx
+2023/02/15 | 540820 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.pdf
+2023/02/15 | 20430 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.dtx
+2023/02/15 | 543108 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.pdf
+2023/02/15 | 67833 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx
+2023/02/15 | 749558 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdf
+2023/02/15 | 26540 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.dtx
+2023/02/15 | 536219 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.pdf
+2023/02/15 | 30678 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.dtx
+2023/02/15 | 591646 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.pdf
+2023/02/15 | 21991 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.dtx
+2023/02/15 | 515474 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.pdf
+2023/02/15 | 29765 | macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx
+2023/02/15 | 565712 | macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdf
+2023/02/15 | 63555 | macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx
+2023/02/15 | 681579 | macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdf
+2023/02/15 | 89488 | macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx
+2023/02/15 | 810260 | macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdf
+2023/02/15 | 15651 | macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx
+2023/02/15 | 526338 | macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdf
+2023/02/15 | 6413 | macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx
+2023/02/15 | 426365 | macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdf
+2023/02/15 | 4041 | macros/latex/contrib/pdfmanagement-testphase/l3ref-tmp.sty
+2023/02/15 | 12372 | macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx
+2023/02/15 | 588430 | macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdf
+2023/02/15 | 2134 | macros/latex/contrib/pdfmanagement-testphase/luaotfload-l3color-tmp.lua
+2023/02/15 | 5310 | macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.dtx
+2023/02/15 | 386819 | macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.pdf
+2023/02/15 | 14948 | macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx
+2023/02/15 | 443946 | macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdf
+2023/02/15 | 18021 | macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx
+2023/02/15 | 4884 | macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.ins
+2023/02/15 | 455951 | macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdf
+2023/02/15 | 1200 | macros/latex/contrib/pdfmanagement-testphase/README.md
+2023/02/15 | 2835 | macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty
+2023/02/15 | 11384548 | macros/latex/contrib/pdfmanagement-testphase.zip
2011/05/05 | 156 | macros/latex/contrib/pdfmarginpar/doc/pdfmarginparexample.aux
2011/05/05 | 3368 | macros/latex/contrib/pdfmarginpar/doc/pdfmarginparexample.log
2011/05/05 | 64982 | macros/latex/contrib/pdfmarginpar/doc/pdfmarginparexample.pdf
@@ -231603,16 +231602,16 @@
1999/08/14 | 2754 | macros/latex/contrib/postcards/postcards.cls
1999/08/14 | 559 | macros/latex/contrib/postcards/README
2005/04/30 | 2990 | macros/latex/contrib/postcards.zip
-2023/02/13 | 2465 | macros/latex/contrib/postnotes/CHANGELOG.md
-2023/02/13 | 14 | macros/latex/contrib/postnotes/DEPENDS.txt
-2023/02/13 | 838960 | macros/latex/contrib/postnotes/postnotes-code.pdf
-2023/02/13 | 1439 | macros/latex/contrib/postnotes/postnotes-code.tex
-2023/02/13 | 98087 | macros/latex/contrib/postnotes/postnotes.dtx
-2023/02/13 | 2584 | macros/latex/contrib/postnotes/postnotes.ins
-2023/02/13 | 177382 | macros/latex/contrib/postnotes/postnotes.pdf
-2023/02/13 | 40075 | macros/latex/contrib/postnotes/postnotes.tex
-2023/02/13 | 881 | macros/latex/contrib/postnotes/README.md
-2023/02/13 | 1020550 | macros/latex/contrib/postnotes.zip
+2023/02/15 | 2785 | macros/latex/contrib/postnotes/CHANGELOG.md
+2023/02/15 | 14 | macros/latex/contrib/postnotes/DEPENDS.txt
+2023/02/15 | 839836 | macros/latex/contrib/postnotes/postnotes-code.pdf
+2023/02/15 | 1439 | macros/latex/contrib/postnotes/postnotes-code.tex
+2023/02/15 | 98502 | macros/latex/contrib/postnotes/postnotes.dtx
+2023/02/15 | 2584 | macros/latex/contrib/postnotes/postnotes.ins
+2023/02/15 | 177383 | macros/latex/contrib/postnotes/postnotes.pdf
+2023/02/15 | 40075 | macros/latex/contrib/postnotes/postnotes.tex
+2023/02/15 | 881 | macros/latex/contrib/postnotes/README.md
+2023/02/15 | 1021294 | macros/latex/contrib/postnotes.zip
2005/12/04 | 6045 | macros/latex/contrib/powerdot/doc/lyx/powerdot-example.lyx
2005/12/04 | 3604 | macros/latex/contrib/powerdot/doc/lyx/powerdot-example.tex
2005/09/17 | 8540 | macros/latex/contrib/powerdot/doc/lyx/powerdot.layout
@@ -236467,55 +236466,55 @@
2016/02/03 | 1428 | macros/latex/contrib/tagpair/tagpair.sty
2016/09/23 | 3615 | macros/latex/contrib/tagpair/tagpair.tex
2016/09/23 | 71796 | macros/latex/contrib/tagpair.zip
-2023/01/30 | 23311 | macros/latex/contrib/tagpdf/acrobat.png
-2023/01/30 | 8652 | macros/latex/contrib/tagpdf/ex-AF-file.pdf
-2023/01/30 | 1237 | macros/latex/contrib/tagpdf/ex-AF-file.tex
-2023/01/30 | 17742 | macros/latex/contrib/tagpdf/ex-alt-actualtext-luatex.pdf
-2023/01/30 | 4153 | macros/latex/contrib/tagpdf/ex-alt-actualtext.tex
-2023/01/30 | 6626 | macros/latex/contrib/tagpdf/ex-attribute-luatex.pdf
-2023/01/30 | 1398 | macros/latex/contrib/tagpdf/ex-attribute.tex
-2023/01/30 | 7854 | macros/latex/contrib/tagpdf/ex-formula-problem-luatex.pdf
-2023/01/30 | 1019 | macros/latex/contrib/tagpdf/ex-formula-problem.tex
-2023/01/30 | 22818 | macros/latex/contrib/tagpdf/ex-mc-manual-para-split-obsolete.pdf
-2023/01/30 | 2150 | macros/latex/contrib/tagpdf/ex-mc-manual-para-split-obsolete.tex
-2023/01/30 | 16888 | macros/latex/contrib/tagpdf/ex-patch-list-luatex.pdf
-2023/01/30 | 2528 | macros/latex/contrib/tagpdf/ex-patch-list-obsolete.tex
-2023/01/30 | 2637 | macros/latex/contrib/tagpdf/ex-patch-list.tex
-2023/01/30 | 18461 | macros/latex/contrib/tagpdf/ex-patch-sectioning-koma-luatex.pdf
-2023/01/30 | 4284 | macros/latex/contrib/tagpdf/ex-patch-sectioning-koma.tex
-2023/01/30 | 21067 | macros/latex/contrib/tagpdf/ex-patch-sectioning-memoir.pdf
-2023/01/30 | 5797 | macros/latex/contrib/tagpdf/ex-patch-sectioning-memoir.tex
-2023/01/30 | 6842 | macros/latex/contrib/tagpdf/ex-softhyphen.pdf
-2023/01/30 | 1073 | macros/latex/contrib/tagpdf/ex-softhyphen.tex
-2023/01/30 | 4618 | macros/latex/contrib/tagpdf/ex-spaceglyph-listings.pdf
-2023/01/30 | 777 | macros/latex/contrib/tagpdf/ex-spaceglyph-listings.tex
-2023/01/30 | 1537 | macros/latex/contrib/tagpdf/ex-structure-obsolete.tex
-2023/01/30 | 19363 | macros/latex/contrib/tagpdf/ex-tagpdf-template.pdf
-2023/01/30 | 801 | macros/latex/contrib/tagpdf/ex-tagpdf-template.tex
-2023/01/30 | 8281 | macros/latex/contrib/tagpdf/global-ex.png
-2023/01/30 | 2022 | macros/latex/contrib/tagpdf/link-figure-input.tex
-2023/01/30 | 141163 | macros/latex/contrib/tagpdf/pac3.PNG
-2023/01/30 | 1177 | macros/latex/contrib/tagpdf/README.md
-2023/01/30 | 40916 | macros/latex/contrib/tagpdf/tagpdf-backend.dtx
-2023/01/30 | 1730 | macros/latex/contrib/tagpdf/tagpdf.bib
-2023/01/30 | 30370 | macros/latex/contrib/tagpdf/tagpdf-checks.dtx
-2023/01/30 | 1495476 | macros/latex/contrib/tagpdf/tagpdf-code.pdf
-2023/01/30 | 2262 | macros/latex/contrib/tagpdf/tagpdf-code.tex
-2023/01/30 | 34964 | macros/latex/contrib/tagpdf/tagpdf-data.dtx
-2023/01/30 | 6247 | macros/latex/contrib/tagpdf/tagpdfdocu-patches.sty
-2023/01/30 | 20721 | macros/latex/contrib/tagpdf/tagpdf.dtx
-2023/01/30 | 3962 | macros/latex/contrib/tagpdf/tagpdf.ins
-2023/01/30 | 26787 | macros/latex/contrib/tagpdf/tagpdf-mc-generic.dtx
-2023/01/30 | 14511 | macros/latex/contrib/tagpdf/tagpdf-mc-luacode.dtx
-2023/01/30 | 15241 | macros/latex/contrib/tagpdf/tagpdf-mc-shared.dtx
-2023/01/30 | 854619 | macros/latex/contrib/tagpdf/tagpdf.pdf
-2023/01/30 | 45464 | macros/latex/contrib/tagpdf/tagpdf-roles.dtx
-2023/01/30 | 5109 | macros/latex/contrib/tagpdf/tagpdf-space.dtx
-2023/01/30 | 57602 | macros/latex/contrib/tagpdf/tagpdf-struct.dtx
-2023/01/30 | 109529 | macros/latex/contrib/tagpdf/tagpdf.tex
-2023/01/30 | 17343 | macros/latex/contrib/tagpdf/tagpdf-tree.dtx
-2023/01/30 | 27362 | macros/latex/contrib/tagpdf/tagpdf-user.dtx
-2023/01/30 | 2222096 | macros/latex/contrib/tagpdf.zip
+2023/02/15 | 23311 | macros/latex/contrib/tagpdf/acrobat.png
+2023/02/15 | 8652 | macros/latex/contrib/tagpdf/ex-AF-file.pdf
+2023/02/15 | 1237 | macros/latex/contrib/tagpdf/ex-AF-file.tex
+2023/02/15 | 17742 | macros/latex/contrib/tagpdf/ex-alt-actualtext-luatex.pdf
+2023/02/15 | 4153 | macros/latex/contrib/tagpdf/ex-alt-actualtext.tex
+2023/02/15 | 6626 | macros/latex/contrib/tagpdf/ex-attribute-luatex.pdf
+2023/02/15 | 1398 | macros/latex/contrib/tagpdf/ex-attribute.tex
+2023/02/15 | 7854 | macros/latex/contrib/tagpdf/ex-formula-problem-luatex.pdf
+2023/02/15 | 1019 | macros/latex/contrib/tagpdf/ex-formula-problem.tex
+2023/02/15 | 22818 | macros/latex/contrib/tagpdf/ex-mc-manual-para-split-obsolete.pdf
+2023/02/15 | 2150 | macros/latex/contrib/tagpdf/ex-mc-manual-para-split-obsolete.tex
+2023/02/15 | 16888 | macros/latex/contrib/tagpdf/ex-patch-list-luatex.pdf
+2023/02/15 | 2528 | macros/latex/contrib/tagpdf/ex-patch-list-obsolete.tex
+2023/02/15 | 2637 | macros/latex/contrib/tagpdf/ex-patch-list.tex
+2023/02/15 | 18461 | macros/latex/contrib/tagpdf/ex-patch-sectioning-koma-luatex.pdf
+2023/02/15 | 4284 | macros/latex/contrib/tagpdf/ex-patch-sectioning-koma.tex
+2023/02/15 | 21067 | macros/latex/contrib/tagpdf/ex-patch-sectioning-memoir.pdf
+2023/02/15 | 5797 | macros/latex/contrib/tagpdf/ex-patch-sectioning-memoir.tex
+2023/02/15 | 6842 | macros/latex/contrib/tagpdf/ex-softhyphen.pdf
+2023/02/15 | 1073 | macros/latex/contrib/tagpdf/ex-softhyphen.tex
+2023/02/15 | 4618 | macros/latex/contrib/tagpdf/ex-spaceglyph-listings.pdf
+2023/02/15 | 777 | macros/latex/contrib/tagpdf/ex-spaceglyph-listings.tex
+2023/02/15 | 1537 | macros/latex/contrib/tagpdf/ex-structure-obsolete.tex
+2023/02/15 | 19363 | macros/latex/contrib/tagpdf/ex-tagpdf-template.pdf
+2023/02/15 | 801 | macros/latex/contrib/tagpdf/ex-tagpdf-template.tex
+2023/02/15 | 8281 | macros/latex/contrib/tagpdf/global-ex.png
+2023/02/15 | 2022 | macros/latex/contrib/tagpdf/link-figure-input.tex
+2023/02/15 | 141163 | macros/latex/contrib/tagpdf/pac3.PNG
+2023/02/15 | 1177 | macros/latex/contrib/tagpdf/README.md
+2023/02/15 | 40936 | macros/latex/contrib/tagpdf/tagpdf-backend.dtx
+2023/02/15 | 1730 | macros/latex/contrib/tagpdf/tagpdf.bib
+2023/02/15 | 30370 | macros/latex/contrib/tagpdf/tagpdf-checks.dtx
+2023/02/15 | 1514352 | macros/latex/contrib/tagpdf/tagpdf-code.pdf
+2023/02/15 | 2262 | macros/latex/contrib/tagpdf/tagpdf-code.tex
+2023/02/15 | 34964 | macros/latex/contrib/tagpdf/tagpdf-data.dtx
+2023/02/15 | 6194 | macros/latex/contrib/tagpdf/tagpdfdocu-patches.sty
+2023/02/15 | 20721 | macros/latex/contrib/tagpdf/tagpdf.dtx
+2023/02/15 | 3962 | macros/latex/contrib/tagpdf/tagpdf.ins
+2023/02/15 | 26787 | macros/latex/contrib/tagpdf/tagpdf-mc-generic.dtx
+2023/02/15 | 14511 | macros/latex/contrib/tagpdf/tagpdf-mc-luacode.dtx
+2023/02/15 | 15241 | macros/latex/contrib/tagpdf/tagpdf-mc-shared.dtx
+2023/02/15 | 858479 | macros/latex/contrib/tagpdf/tagpdf.pdf
+2023/02/15 | 45465 | macros/latex/contrib/tagpdf/tagpdf-roles.dtx
+2023/02/15 | 5109 | macros/latex/contrib/tagpdf/tagpdf-space.dtx
+2023/02/15 | 58852 | macros/latex/contrib/tagpdf/tagpdf-struct.dtx
+2023/02/15 | 110565 | macros/latex/contrib/tagpdf/tagpdf.tex
+2023/02/15 | 17343 | macros/latex/contrib/tagpdf/tagpdf-tree.dtx
+2023/02/15 | 28693 | macros/latex/contrib/tagpdf/tagpdf-user.dtx
+2023/02/15 | 2234345 | macros/latex/contrib/tagpdf.zip
2007/08/04 | 1263 | macros/latex/contrib/talk/example.tex
2007/08/04 | 465 | macros/latex/contrib/talk/Makefile
2007/08/04 | 2162 | macros/latex/contrib/talk/README
@@ -243417,145 +243416,146 @@
2018/12/02 | 4020 | macros/luatex/latex/makecookbook/README.old
2018/12/03 | 4028 | macros/luatex/latex/makecookbook/README.txt
2018/12/03 | 511848 | macros/luatex/latex/makecookbook.zip
-2018/04/25 | 51972 | macros/luatex/latex/novel/doc/extras/CPmodified.otf
-2018/04/25 | 42202 | macros/luatex/latex/novel/doc/extras/NovelDeco-glyphs.pdf
-2018/04/25 | 3780 | macros/luatex/latex/novel/doc/extras/novel-example.tex
-2018/04/25 | 2335 | macros/luatex/latex/novel/doc/extras/novel-extras-README.html
-2018/04/25 | 311166 | macros/luatex/latex/novel/doc/extras/novel-Gallery-ChapterStart.pdf
-2018/04/25 | 1499979 | macros/luatex/latex/novel/doc/extras/novel-scripts.zip
-2018/04/25 | 1990 | macros/luatex/latex/novel/doc/extras/novel-testimage.jpg
-2018/04/25 | 1908 | macros/luatex/latex/novel/doc/extras/novel-testimage.png
-2018/04/25 | 2456 | macros/luatex/latex/novel/doc/extras/novel-testscript.jpg
-2018/04/25 | 2064 | macros/luatex/latex/novel/doc/extras/novel-testscript.png
-2018/04/25 | 15394 | macros/luatex/latex/novel/doc/extras/novel-testsuite.tex
-2018/04/25 | 563 | macros/luatex/latex/novel/doc/html-resources/10transold.png
-2018/04/25 | 608 | macros/luatex/latex/novel/doc/html-resources/10trueold.png
-2018/04/25 | 5475 | macros/luatex/latex/novel/doc/html-resources/acronym2.png
-2018/04/25 | 11185 | macros/luatex/latex/novel/doc/html-resources/alphabetagamma.png
-2018/04/25 | 142528 | macros/luatex/latex/novel/doc/html-resources/authorsnote.png
-2018/04/25 | 4711 | macros/luatex/latex/novel/doc/html-resources/badaboom.png
-2018/04/25 | 239173 | macros/luatex/latex/novel/doc/html-resources/bixby-original.png
-2018/04/25 | 246911 | macros/luatex/latex/novel/doc/html-resources/bixby-softproof.png
-2018/04/25 | 22434 | macros/luatex/latex/novel/doc/html-resources/bookmanglerdashboard.png
-2018/04/25 | 22144 | macros/luatex/latex/novel/doc/html-resources/bookofbeirh.png
-2018/04/25 | 21460 | macros/luatex/latex/novel/doc/html-resources/chaptertitlesubtitle.png
-2018/04/25 | 10831 | macros/luatex/latex/novel/doc/html-resources/charscaletext.png
-2018/04/25 | 19382 | macros/luatex/latex/novel/doc/html-resources/closecrop.png
-2018/04/25 | 12701 | macros/luatex/latex/novel/doc/html-resources/colormax-original.png
-2018/04/25 | 14287 | macros/luatex/latex/novel/doc/html-resources/colormax-softproof.png
-2018/04/25 | 54423 | macros/luatex/latex/novel/doc/html-resources/colorsampler.png
-2018/04/25 | 95659 | macros/luatex/latex/novel/doc/html-resources/colorsampler-softproof.png
-2018/04/25 | 5898 | macros/luatex/latex/novel/doc/html-resources/CPmodified-sample.png
-2018/04/25 | 22507 | macros/luatex/latex/novel/doc/html-resources/cropmarks.png
-2018/04/25 | 19907 | macros/luatex/latex/novel/doc/html-resources/cropview.png
-2018/04/25 | 4523 | macros/luatex/latex/novel/doc/html-resources/ctimg35.png
-2018/04/25 | 39286 | macros/luatex/latex/novel/doc/html-resources/doordie.png
-2018/04/25 | 2349 | macros/luatex/latex/novel/doc/html-resources/dorfmcnorf.png
-2018/04/25 | 6548 | macros/luatex/latex/novel/doc/html-resources/dropcap-antestar.png
-2018/04/25 | 6181 | macros/luatex/latex/novel/doc/html-resources/dropcap-gap.png
-2018/04/25 | 18252 | macros/luatex/latex/novel/doc/html-resources/dropcap.png
-2018/04/25 | 6806 | macros/luatex/latex/novel/doc/html-resources/dropcap-scalebloat.png
-2018/04/25 | 5479 | macros/luatex/latex/novel/doc/html-resources/emblembar.png
-2018/04/25 | 6019 | macros/luatex/latex/novel/doc/html-resources/emblemdingbats.png
-2018/04/25 | 7415 | macros/luatex/latex/novel/doc/html-resources/emblemimg.png
-2018/04/25 | 27873 | macros/luatex/latex/novel/doc/html-resources/endnotetext.png
-2018/04/25 | 17688 | macros/luatex/latex/novel/doc/html-resources/firstletterspecial.png
-2018/04/25 | 17690 | macros/luatex/latex/novel/doc/html-resources/firstlinespecial.png
-2018/04/25 | 8518 | macros/luatex/latex/novel/doc/html-resources/fluffy-conspiracy.png
-2018/04/25 | 5151 | macros/luatex/latex/novel/doc/html-resources/fontbyfamily.png
-2018/04/25 | 4331 | macros/luatex/latex/novel/doc/html-resources/fontbyfilenamei.png
-2018/04/25 | 15268 | macros/luatex/latex/novel/doc/html-resources/font-tree.png
-2018/04/25 | 8144 | macros/luatex/latex/novel/doc/html-resources/fpaper.png
-2018/04/25 | 5029 | macros/luatex/latex/novel/doc/html-resources/frankenfont.png
-2018/04/25 | 37436 | macros/luatex/latex/novel/doc/html-resources/gnome-censored.png
-2018/04/25 | 9856 | macros/luatex/latex/novel/doc/html-resources/graytext.png
-2018/04/25 | 8187 | macros/luatex/latex/novel/doc/html-resources/headfont-default.png
-2018/04/25 | 7254 | macros/luatex/latex/novel/doc/html-resources/headfont-montserrat-el.png
-2018/04/25 | 7940 | macros/luatex/latex/novel/doc/html-resources/headfont-roboto.png
-2018/04/25 | 14569 | macros/luatex/latex/novel/doc/html-resources/headfoot1.png
-2018/04/25 | 14028 | macros/luatex/latex/novel/doc/html-resources/headfoot2.png
-2018/04/25 | 14028 | macros/luatex/latex/novel/doc/html-resources/headfoot3.png
-2018/04/25 | 14605 | macros/luatex/latex/novel/doc/html-resources/headfoot4.png
-2018/04/25 | 14973 | macros/luatex/latex/novel/doc/html-resources/headfoot5.png
-2018/04/25 | 14429 | macros/luatex/latex/novel/doc/html-resources/headfoot6.png
-2018/04/25 | 15625 | macros/luatex/latex/novel/doc/html-resources/head-foot-jumps.png
-2018/04/25 | 16097 | macros/luatex/latex/novel/doc/html-resources/human-robot-talk.png
-2018/04/25 | 7616 | macros/luatex/latex/novel/doc/html-resources/Iboxcap.png
-2018/04/25 | 33975 | macros/luatex/latex/novel/doc/html-resources/imgdialogs.png
-2018/04/25 | 1288 | macros/luatex/latex/novel/doc/html-resources/info18.png
-2018/04/25 | 42231 | macros/luatex/latex/novel/doc/html-resources/inlineimagest.png
-2018/04/25 | 5508 | macros/luatex/latex/novel/doc/html-resources/I-shade.png
-2018/04/25 | 12057 | macros/luatex/latex/novel/doc/html-resources/jackbequick.png
-2018/04/25 | 7043 | macros/luatex/latex/novel/doc/html-resources/jollybeers.png
-2018/04/25 | 4533 | macros/luatex/latex/novel/doc/html-resources/jpgcolorspace.png
-2018/04/25 | 69093 | macros/luatex/latex/novel/doc/html-resources/jump-change.png
-2018/04/25 | 6412 | macros/luatex/latex/novel/doc/html-resources/looseheads.png
-2018/04/25 | 17173 | macros/luatex/latex/novel/doc/html-resources/lowdown.png
-2018/04/25 | 7449 | macros/luatex/latex/novel/doc/html-resources/map.png
-2018/04/25 | 30606 | macros/luatex/latex/novel/doc/html-resources/margins-trim-media.png
-2018/04/25 | 20701 | macros/luatex/latex/novel/doc/html-resources/mcdingle.png
-2018/04/25 | 30516 | macros/luatex/latex/novel/doc/html-resources/mediasize.png
-2018/04/25 | 24517 | macros/luatex/latex/novel/doc/html-resources/megadocprops.png
-2018/04/25 | 8567 | macros/luatex/latex/novel/doc/html-resources/megatitlepagesm.png
-2018/04/25 | 18804 | macros/luatex/latex/novel/doc/html-resources/monitorgamut.png
-2018/04/25 | 34282 | macros/luatex/latex/novel/doc/html-resources/no-brainer.png
-2018/04/25 | 80977 | macros/luatex/latex/novel/doc/html-resources/novel-color-sampler.png
-2018/04/25 | 15026 | macros/luatex/latex/novel/doc/html-resources/overflowrule.png
-2018/04/25 | 12898 | macros/luatex/latex/novel/doc/html-resources/page-leaf.png
-2018/04/25 | 36954 | macros/luatex/latex/novel/doc/html-resources/parascale.png
-2018/04/25 | 10407 | macros/luatex/latex/novel/doc/html-resources/perfectbinding.png
-2018/04/25 | 4599 | macros/luatex/latex/novel/doc/html-resources/pngcolortype.png
-2018/04/25 | 19633 | macros/luatex/latex/novel/doc/html-resources/printgamut.png
-2018/04/25 | 33749 | macros/luatex/latex/novel/doc/html-resources/quickchapter.png
-2018/04/25 | 246157 | macros/luatex/latex/novel/doc/html-resources/raffaelino-original.png
-2018/04/25 | 241149 | macros/luatex/latex/novel/doc/html-resources/raffaelino-softproof.png
-2018/04/25 | 9411 | macros/luatex/latex/novel/doc/html-resources/robberies.png
-2018/04/25 | 25213 | macros/luatex/latex/novel/doc/html-resources/scenebreaks.png
-2018/04/25 | 30022 | macros/luatex/latex/novel/doc/html-resources/shademargins.png
-2018/04/25 | 1894 | macros/luatex/latex/novel/doc/html-resources/shakepi.png
-2018/04/25 | 5233 | macros/luatex/latex/novel/doc/html-resources/signature.png
-2018/04/25 | 18412 | macros/luatex/latex/novel/doc/html-resources/simpletoc.png
-2018/04/25 | 9584 | macros/luatex/latex/novel/doc/html-resources/sixpage-frontmatter.png
-2018/04/25 | 56275 | macros/luatex/latex/novel/doc/html-resources/skygrad.jpg
-2018/04/25 | 5448 | macros/luatex/latex/novel/doc/html-resources/smallcapsrealfake.png
-2018/04/25 | 13322 | macros/luatex/latex/novel/doc/html-resources/smfingerprint8.png
-2018/04/25 | 7134 | macros/luatex/latex/novel/doc/html-resources/smythsewn.png
-2018/04/25 | 13553 | macros/luatex/latex/novel/doc/html-resources/toc.png
-2018/04/25 | 12250 | macros/luatex/latex/novel/doc/html-resources/topmargins.png
-2018/04/25 | 27867 | macros/luatex/latex/novel/doc/html-resources/trdol.png
-2018/04/25 | 41850 | macros/luatex/latex/novel/doc/html-resources/trimsize.png
-2018/04/25 | 34135 | macros/luatex/latex/novel/doc/html-resources/ublibser.png
-2018/04/25 | 19235 | macros/luatex/latex/novel/doc/html-resources/unsafe-vs-margin.png
-2018/04/25 | 19012 | macros/luatex/latex/novel/doc/html-resources/whichgutter.png
-2018/04/25 | 10690 | macros/luatex/latex/novel/doc/html-resources/win10libser.png
-2018/04/25 | 62302 | macros/luatex/latex/novel/doc/html-resources/workedforme.png
-2018/04/25 | 4256 | macros/luatex/latex/novel/doc/html-resources/wrapme.png
-2018/04/25 | 340286 | macros/luatex/latex/novel/doc/novel-documentation.html
-2018/04/25 | 72578 | macros/luatex/latex/novel/doc/novel.pdf
-2018/04/25 | 6875 | macros/luatex/latex/novel/doc/novel.tex
-2018/04/25 | 132000 | macros/luatex/latex/novel/fonts/NovelDeco.otf
-2018/04/25 | 13691 | macros/luatex/latex/novel/novel-CalculateLayout.sty
-2018/04/25 | 949 | macros/luatex/latex/novel/novel-CGATSTR001.clo
-2018/04/25 | 14719 | macros/luatex/latex/novel/novel-ChapterScene.sty
-2018/04/25 | 26266 | macros/luatex/latex/novel/novel.cls
-2018/04/25 | 8216 | macros/luatex/latex/novel/novel-DropCap.sty
-2018/04/25 | 7333 | macros/luatex/latex/novel/novel-FileData.sty
-2018/04/25 | 950 | macros/luatex/latex/novel/novel-FOGRA39.clo
-2018/04/25 | 17130 | macros/luatex/latex/novel/novel-Fonts.sty
-2018/04/25 | 16030 | macros/luatex/latex/novel/novel-Footnotes.sty
-2018/04/25 | 18354 | macros/luatex/latex/novel/novel-HeadFootStyles.sty
-2018/04/25 | 20196 | macros/luatex/latex/novel/novel-Images.sty
-2018/04/25 | 959 | macros/luatex/latex/novel/novel-JC200103.clo
-2018/04/25 | 17994 | macros/luatex/latex/novel/novel-LayoutSettings.sty
-2018/04/25 | 6698 | macros/luatex/latex/novel/novel-microtype.cfg
-2018/04/25 | 17569 | macros/luatex/latex/novel/novel-Obsolete.sty
-2018/04/25 | 17114 | macros/luatex/latex/novel/novel-pdfx.sty
-2018/04/25 | 9016 | macros/luatex/latex/novel/novel-PostLayout.sty
-2018/04/25 | 4003 | macros/luatex/latex/novel/novel-Sandbox.sty
-2018/04/25 | 21831 | macros/luatex/latex/novel/novel-TextMacros.sty
-2018/04/25 | 7439 | macros/luatex/latex/novel/novel-xmppacket.sty
-2018/04/25 | 2020 | macros/luatex/latex/novel/README.md
-2018/04/25 | 4999697 | macros/luatex/latex/novel.zip
+2023/02/15 | 51972 | macros/luatex/latex/novel/doc/extras/CPmodified.otf
+2023/02/15 | 42202 | macros/luatex/latex/novel/doc/extras/NovelDeco-glyphs.pdf
+2023/02/15 | 98892 | macros/luatex/latex/novel/doc/extras/novel-example.pdf
+2023/02/15 | 3805 | macros/luatex/latex/novel/doc/extras/novel-example.tex
+2023/02/15 | 2335 | macros/luatex/latex/novel/doc/extras/novel-extras-README.html
+2023/02/15 | 311166 | macros/luatex/latex/novel/doc/extras/novel-Gallery-ChapterStart.pdf
+2023/02/15 | 1499979 | macros/luatex/latex/novel/doc/extras/novel-scripts.zip
+2023/02/15 | 1990 | macros/luatex/latex/novel/doc/extras/novel-testimage.jpg
+2023/02/15 | 1908 | macros/luatex/latex/novel/doc/extras/novel-testimage.png
+2023/02/15 | 2456 | macros/luatex/latex/novel/doc/extras/novel-testscript.jpg
+2023/02/15 | 2064 | macros/luatex/latex/novel/doc/extras/novel-testscript.png
+2023/02/15 | 69115 | macros/luatex/latex/novel/doc/extras/novel-testsuite.pdf
+2023/02/15 | 15394 | macros/luatex/latex/novel/doc/extras/novel-testsuite.tex
+2023/02/15 | 563 | macros/luatex/latex/novel/doc/html-resources/10transold.png
+2023/02/15 | 608 | macros/luatex/latex/novel/doc/html-resources/10trueold.png
+2023/02/15 | 5475 | macros/luatex/latex/novel/doc/html-resources/acronym2.png
+2023/02/15 | 11185 | macros/luatex/latex/novel/doc/html-resources/alphabetagamma.png
+2023/02/15 | 142528 | macros/luatex/latex/novel/doc/html-resources/authorsnote.png
+2023/02/15 | 4711 | macros/luatex/latex/novel/doc/html-resources/badaboom.png
+2023/02/15 | 239173 | macros/luatex/latex/novel/doc/html-resources/bixby-original.png
+2023/02/15 | 246911 | macros/luatex/latex/novel/doc/html-resources/bixby-softproof.png
+2023/02/15 | 22434 | macros/luatex/latex/novel/doc/html-resources/bookmanglerdashboard.png
+2023/02/15 | 22144 | macros/luatex/latex/novel/doc/html-resources/bookofbeirh.png
+2023/02/15 | 21460 | macros/luatex/latex/novel/doc/html-resources/chaptertitlesubtitle.png
+2023/02/15 | 10831 | macros/luatex/latex/novel/doc/html-resources/charscaletext.png
+2023/02/15 | 19382 | macros/luatex/latex/novel/doc/html-resources/closecrop.png
+2023/02/15 | 12701 | macros/luatex/latex/novel/doc/html-resources/colormax-original.png
+2023/02/15 | 14287 | macros/luatex/latex/novel/doc/html-resources/colormax-softproof.png
+2023/02/15 | 54423 | macros/luatex/latex/novel/doc/html-resources/colorsampler.png
+2023/02/15 | 95659 | macros/luatex/latex/novel/doc/html-resources/colorsampler-softproof.png
+2023/02/15 | 5898 | macros/luatex/latex/novel/doc/html-resources/CPmodified-sample.png
+2023/02/15 | 22507 | macros/luatex/latex/novel/doc/html-resources/cropmarks.png
+2023/02/15 | 19907 | macros/luatex/latex/novel/doc/html-resources/cropview.png
+2023/02/15 | 4523 | macros/luatex/latex/novel/doc/html-resources/ctimg35.png
+2023/02/15 | 39286 | macros/luatex/latex/novel/doc/html-resources/doordie.png
+2023/02/15 | 2349 | macros/luatex/latex/novel/doc/html-resources/dorfmcnorf.png
+2023/02/15 | 6548 | macros/luatex/latex/novel/doc/html-resources/dropcap-antestar.png
+2023/02/15 | 6181 | macros/luatex/latex/novel/doc/html-resources/dropcap-gap.png
+2023/02/15 | 18252 | macros/luatex/latex/novel/doc/html-resources/dropcap.png
+2023/02/15 | 6806 | macros/luatex/latex/novel/doc/html-resources/dropcap-scalebloat.png
+2023/02/15 | 5479 | macros/luatex/latex/novel/doc/html-resources/emblembar.png
+2023/02/15 | 6019 | macros/luatex/latex/novel/doc/html-resources/emblemdingbats.png
+2023/02/15 | 7415 | macros/luatex/latex/novel/doc/html-resources/emblemimg.png
+2023/02/15 | 27873 | macros/luatex/latex/novel/doc/html-resources/endnotetext.png
+2023/02/15 | 17688 | macros/luatex/latex/novel/doc/html-resources/firstletterspecial.png
+2023/02/15 | 17690 | macros/luatex/latex/novel/doc/html-resources/firstlinespecial.png
+2023/02/15 | 8518 | macros/luatex/latex/novel/doc/html-resources/fluffy-conspiracy.png
+2023/02/15 | 5151 | macros/luatex/latex/novel/doc/html-resources/fontbyfamily.png
+2023/02/15 | 4331 | macros/luatex/latex/novel/doc/html-resources/fontbyfilenamei.png
+2023/02/15 | 15268 | macros/luatex/latex/novel/doc/html-resources/font-tree.png
+2023/02/15 | 8144 | macros/luatex/latex/novel/doc/html-resources/fpaper.png
+2023/02/15 | 5029 | macros/luatex/latex/novel/doc/html-resources/frankenfont.png
+2023/02/15 | 37436 | macros/luatex/latex/novel/doc/html-resources/gnome-censored.png
+2023/02/15 | 9856 | macros/luatex/latex/novel/doc/html-resources/graytext.png
+2023/02/15 | 8187 | macros/luatex/latex/novel/doc/html-resources/headfont-default.png
+2023/02/15 | 7254 | macros/luatex/latex/novel/doc/html-resources/headfont-montserrat-el.png
+2023/02/15 | 7940 | macros/luatex/latex/novel/doc/html-resources/headfont-roboto.png
+2023/02/15 | 14569 | macros/luatex/latex/novel/doc/html-resources/headfoot1.png
+2023/02/15 | 14028 | macros/luatex/latex/novel/doc/html-resources/headfoot2.png
+2023/02/15 | 14028 | macros/luatex/latex/novel/doc/html-resources/headfoot3.png
+2023/02/15 | 14605 | macros/luatex/latex/novel/doc/html-resources/headfoot4.png
+2023/02/15 | 14973 | macros/luatex/latex/novel/doc/html-resources/headfoot5.png
+2023/02/15 | 14429 | macros/luatex/latex/novel/doc/html-resources/headfoot6.png
+2023/02/15 | 15625 | macros/luatex/latex/novel/doc/html-resources/head-foot-jumps.png
+2023/02/15 | 16097 | macros/luatex/latex/novel/doc/html-resources/human-robot-talk.png
+2023/02/15 | 7616 | macros/luatex/latex/novel/doc/html-resources/Iboxcap.png
+2023/02/15 | 33975 | macros/luatex/latex/novel/doc/html-resources/imgdialogs.png
+2023/02/15 | 1288 | macros/luatex/latex/novel/doc/html-resources/info18.png
+2023/02/15 | 42231 | macros/luatex/latex/novel/doc/html-resources/inlineimagest.png
+2023/02/15 | 5508 | macros/luatex/latex/novel/doc/html-resources/I-shade.png
+2023/02/15 | 12057 | macros/luatex/latex/novel/doc/html-resources/jackbequick.png
+2023/02/15 | 7043 | macros/luatex/latex/novel/doc/html-resources/jollybeers.png
+2023/02/15 | 4533 | macros/luatex/latex/novel/doc/html-resources/jpgcolorspace.png
+2023/02/15 | 69093 | macros/luatex/latex/novel/doc/html-resources/jump-change.png
+2023/02/15 | 6412 | macros/luatex/latex/novel/doc/html-resources/looseheads.png
+2023/02/15 | 17173 | macros/luatex/latex/novel/doc/html-resources/lowdown.png
+2023/02/15 | 7449 | macros/luatex/latex/novel/doc/html-resources/map.png
+2023/02/15 | 30606 | macros/luatex/latex/novel/doc/html-resources/margins-trim-media.png
+2023/02/15 | 20701 | macros/luatex/latex/novel/doc/html-resources/mcdingle.png
+2023/02/15 | 30516 | macros/luatex/latex/novel/doc/html-resources/mediasize.png
+2023/02/15 | 24517 | macros/luatex/latex/novel/doc/html-resources/megadocprops.png
+2023/02/15 | 8567 | macros/luatex/latex/novel/doc/html-resources/megatitlepagesm.png
+2023/02/15 | 18804 | macros/luatex/latex/novel/doc/html-resources/monitorgamut.png
+2023/02/15 | 34282 | macros/luatex/latex/novel/doc/html-resources/no-brainer.png
+2023/02/15 | 80977 | macros/luatex/latex/novel/doc/html-resources/novel-color-sampler.png
+2023/02/15 | 15026 | macros/luatex/latex/novel/doc/html-resources/overflowrule.png
+2023/02/15 | 12898 | macros/luatex/latex/novel/doc/html-resources/page-leaf.png
+2023/02/15 | 36954 | macros/luatex/latex/novel/doc/html-resources/parascale.png
+2023/02/15 | 10407 | macros/luatex/latex/novel/doc/html-resources/perfectbinding.png
+2023/02/15 | 4599 | macros/luatex/latex/novel/doc/html-resources/pngcolortype.png
+2023/02/15 | 19633 | macros/luatex/latex/novel/doc/html-resources/printgamut.png
+2023/02/15 | 33749 | macros/luatex/latex/novel/doc/html-resources/quickchapter.png
+2023/02/15 | 246157 | macros/luatex/latex/novel/doc/html-resources/raffaelino-original.png
+2023/02/15 | 241149 | macros/luatex/latex/novel/doc/html-resources/raffaelino-softproof.png
+2023/02/15 | 9411 | macros/luatex/latex/novel/doc/html-resources/robberies.png
+2023/02/15 | 25213 | macros/luatex/latex/novel/doc/html-resources/scenebreaks.png
+2023/02/15 | 30022 | macros/luatex/latex/novel/doc/html-resources/shademargins.png
+2023/02/15 | 1894 | macros/luatex/latex/novel/doc/html-resources/shakepi.png
+2023/02/15 | 5233 | macros/luatex/latex/novel/doc/html-resources/signature.png
+2023/02/15 | 18412 | macros/luatex/latex/novel/doc/html-resources/simpletoc.png
+2023/02/15 | 9584 | macros/luatex/latex/novel/doc/html-resources/sixpage-frontmatter.png
+2023/02/15 | 56275 | macros/luatex/latex/novel/doc/html-resources/skygrad.jpg
+2023/02/15 | 5448 | macros/luatex/latex/novel/doc/html-resources/smallcapsrealfake.png
+2023/02/15 | 13322 | macros/luatex/latex/novel/doc/html-resources/smfingerprint8.png
+2023/02/15 | 7134 | macros/luatex/latex/novel/doc/html-resources/smythsewn.png
+2023/02/15 | 13553 | macros/luatex/latex/novel/doc/html-resources/toc.png
+2023/02/15 | 12250 | macros/luatex/latex/novel/doc/html-resources/topmargins.png
+2023/02/15 | 27867 | macros/luatex/latex/novel/doc/html-resources/trdol.png
+2023/02/15 | 41850 | macros/luatex/latex/novel/doc/html-resources/trimsize.png
+2023/02/15 | 34135 | macros/luatex/latex/novel/doc/html-resources/ublibser.png
+2023/02/15 | 19235 | macros/luatex/latex/novel/doc/html-resources/unsafe-vs-margin.png
+2023/02/15 | 19012 | macros/luatex/latex/novel/doc/html-resources/whichgutter.png
+2023/02/15 | 10690 | macros/luatex/latex/novel/doc/html-resources/win10libser.png
+2023/02/15 | 62302 | macros/luatex/latex/novel/doc/html-resources/workedforme.png
+2023/02/15 | 4256 | macros/luatex/latex/novel/doc/html-resources/wrapme.png
+2023/02/15 | 332168 | macros/luatex/latex/novel/doc/novel-documentation.html
+2023/02/15 | 60247 | macros/luatex/latex/novel/doc/novel.pdf
+2023/02/15 | 7013 | macros/luatex/latex/novel/doc/novel.tex
+2023/02/15 | 132000 | macros/luatex/latex/novel/fonts/opentype/novel/NovelDeco.otf
+2023/02/15 | 2094 | macros/luatex/latex/novel/README.md
+2023/02/15 | 13279 | macros/luatex/latex/novel/tex/lualatex/novel/novel-CalculateLayout.sty
+2023/02/15 | 949 | macros/luatex/latex/novel/tex/lualatex/novel/novel-CGATSTR001.clo
+2023/02/15 | 14480 | macros/luatex/latex/novel/tex/lualatex/novel/novel-ChapterScene.sty
+2023/02/15 | 24154 | macros/luatex/latex/novel/tex/lualatex/novel/novel.cls
+2023/02/15 | 7798 | macros/luatex/latex/novel/tex/lualatex/novel/novel-DropCap.sty
+2023/02/15 | 7146 | macros/luatex/latex/novel/tex/lualatex/novel/novel-FileData.sty
+2023/02/15 | 950 | macros/luatex/latex/novel/tex/lualatex/novel/novel-FOGRA39.clo
+2023/02/15 | 17354 | macros/luatex/latex/novel/tex/lualatex/novel/novel-Fonts.sty
+2023/02/15 | 15976 | macros/luatex/latex/novel/tex/lualatex/novel/novel-Footnotes.sty
+2023/02/15 | 18281 | macros/luatex/latex/novel/tex/lualatex/novel/novel-HeadFootStyles.sty
+2023/02/15 | 20011 | macros/luatex/latex/novel/tex/lualatex/novel/novel-Images.sty
+2023/02/15 | 959 | macros/luatex/latex/novel/tex/lualatex/novel/novel-JC200103.clo
+2023/02/15 | 17435 | macros/luatex/latex/novel/tex/lualatex/novel/novel-LayoutSettings.sty
+2023/02/15 | 6698 | macros/luatex/latex/novel/tex/lualatex/novel/novel-microtype.cfg
+2023/02/15 | 17094 | macros/luatex/latex/novel/tex/lualatex/novel/novel-pdfx.sty
+2023/02/15 | 9016 | macros/luatex/latex/novel/tex/lualatex/novel/novel-PostLayout.sty
+2023/02/15 | 4003 | macros/luatex/latex/novel/tex/lualatex/novel/novel-Sandbox.sty
+2023/02/15 | 21728 | macros/luatex/latex/novel/tex/lualatex/novel/novel-TextMacros.sty
+2023/02/15 | 3560 | macros/luatex/latex/novel/tex/lualatex/novel/novel-xmppacket.sty
+2023/02/15 | 5072774 | macros/luatex/latex/novel.zip
2022/12/13 | 9501 | macros/luatex/latex/odsfile/odsfile.lua
2022/12/13 | 94940 | macros/luatex/latex/odsfile/odsfile.pdf
2022/12/13 | 8067 | macros/luatex/latex/odsfile/odsfile.sty
@@ -243603,25 +243603,25 @@
2020/05/19 | 3051 | macros/luatex/latex/plantuml/README.md
2020/05/19 | 396 | macros/luatex/latex/plantuml/release.sh
2020/05/19 | 70541 | macros/luatex/latex/plantuml.zip
-2023/01/14 | 3315 | macros/luatex/latex/pyluatex/example/beamer.tex
-2023/01/14 | 4328 | macros/luatex/latex/pyluatex/example/data-visualization.tex
-2023/01/14 | 1527 | macros/luatex/latex/pyluatex/example/matplotlib-external.tex
-2023/01/14 | 1849 | macros/luatex/latex/pyluatex/example/matplotlib-pgf.tex
-2023/01/14 | 39167 | macros/luatex/latex/pyluatex/example/population.csv
-2023/01/14 | 628 | macros/luatex/latex/pyluatex/example/readme-custom-env.tex
-2023/01/14 | 717 | macros/luatex/latex/pyluatex/example/readme-example.tex
-2023/01/14 | 2310 | macros/luatex/latex/pyluatex/example/repl.tex
-2023/01/14 | 1429 | macros/luatex/latex/pyluatex/example/sessions.tex
-2023/01/14 | 1049 | macros/luatex/latex/pyluatex/example/typesetting-example.tex
-2023/01/14 | 2400 | macros/luatex/latex/pyluatex/example/typesetting-listings.tex
-2023/01/14 | 2105 | macros/luatex/latex/pyluatex/example/typesetting-minted.tex
-2023/01/14 | 5086 | macros/luatex/latex/pyluatex/pyluatex-interpreter.py
-2023/01/14 | 7699 | macros/luatex/latex/pyluatex/pyluatex.lua
-2023/01/14 | 83049 | macros/luatex/latex/pyluatex/pyluatex.pdf
-2023/01/14 | 3193 | macros/luatex/latex/pyluatex/pyluatex.sty
-2023/01/14 | 14045 | macros/luatex/latex/pyluatex/pyluatex.tex
-2023/01/14 | 1534 | macros/luatex/latex/pyluatex/README.md
-2023/01/14 | 117485 | macros/luatex/latex/pyluatex.zip
+2023/02/15 | 3315 | macros/luatex/latex/pyluatex/example/beamer.tex
+2023/02/15 | 4328 | macros/luatex/latex/pyluatex/example/data-visualization.tex
+2023/02/15 | 1527 | macros/luatex/latex/pyluatex/example/matplotlib-external.tex
+2023/02/15 | 1849 | macros/luatex/latex/pyluatex/example/matplotlib-pgf.tex
+2023/02/15 | 39167 | macros/luatex/latex/pyluatex/example/population.csv
+2023/02/15 | 628 | macros/luatex/latex/pyluatex/example/readme-custom-env.tex
+2023/02/15 | 717 | macros/luatex/latex/pyluatex/example/readme-example.tex
+2023/02/15 | 2310 | macros/luatex/latex/pyluatex/example/repl.tex
+2023/02/15 | 1429 | macros/luatex/latex/pyluatex/example/sessions.tex
+2023/02/15 | 1049 | macros/luatex/latex/pyluatex/example/typesetting-example.tex
+2023/02/15 | 2400 | macros/luatex/latex/pyluatex/example/typesetting-listings.tex
+2023/02/15 | 2105 | macros/luatex/latex/pyluatex/example/typesetting-minted.tex
+2023/02/15 | 5111 | macros/luatex/latex/pyluatex/pyluatex-interpreter.py
+2023/02/15 | 7699 | macros/luatex/latex/pyluatex/pyluatex.lua
+2023/02/15 | 83051 | macros/luatex/latex/pyluatex/pyluatex.pdf
+2023/02/15 | 3193 | macros/luatex/latex/pyluatex/pyluatex.sty
+2023/02/15 | 14045 | macros/luatex/latex/pyluatex/pyluatex.tex
+2023/02/15 | 1534 | macros/luatex/latex/pyluatex/README.md
+2023/02/15 | 117488 | macros/luatex/latex/pyluatex.zip
2022/12/11 | 1071 | macros/luatex/latex/scikgtex/LICENSE
2022/12/11 | 718 | macros/luatex/latex/scikgtex/README
2022/10/23 | 21905 | macros/luatex/latex/scikgtex/scikgtex.lua
@@ -294571,8 +294571,8 @@
2021/02/22 | 328240 | systems/texlive/tlnet/archive/luacolor.doc.r57829.tar.xz
2021/02/22 | 4152 | systems/texlive/tlnet/archive/luacolor.r57829.tar.xz
2021/02/22 | 9244 | systems/texlive/tlnet/archive/luacolor.source.r57829.tar.xz
-2022/12/29 | 114736 | systems/texlive/tlnet/archive/luacomplex.doc.r65388.tar.xz
-2022/12/29 | 1620 | systems/texlive/tlnet/archive/luacomplex.r65388.tar.xz
+2023/02/15 | 115644 | systems/texlive/tlnet/archive/luacomplex.doc.r65833.tar.xz
+2023/02/15 | 1660 | systems/texlive/tlnet/archive/luacomplex.r65833.tar.xz
2021/12/03 | 340 | systems/texlive/tlnet/archive/luafindfont.aarch64-linux.r61207.tar.xz
2021/12/03 | 344 | systems/texlive/tlnet/archive/luafindfont.amd64-freebsd.r61207.tar.xz
2021/12/03 | 340 | systems/texlive/tlnet/archive/luafindfont.amd64-netbsd.r61207.tar.xz
@@ -294655,8 +294655,8 @@
2022/10/05 | 87452 | systems/texlive/tlnet/archive/lualibs.doc.r64615.tar.xz
2022/10/05 | 131392 | systems/texlive/tlnet/archive/lualibs.r64615.tar.xz
2022/10/05 | 8612 | systems/texlive/tlnet/archive/lualibs.source.r64615.tar.xz
-2023/02/12 | 261108 | systems/texlive/tlnet/archive/lualinalg.doc.r65791.tar.xz
-2023/02/12 | 8148 | systems/texlive/tlnet/archive/lualinalg.r65791.tar.xz
+2023/02/15 | 260860 | systems/texlive/tlnet/archive/lualinalg.doc.r65834.tar.xz
+2023/02/15 | 8152 | systems/texlive/tlnet/archive/lualinalg.r65834.tar.xz
2022/05/05 | 393088 | systems/texlive/tlnet/archive/luamathalign.doc.r63226.tar.xz
2022/05/05 | 4076 | systems/texlive/tlnet/archive/luamathalign.r63226.tar.xz
2022/05/05 | 5704 | systems/texlive/tlnet/archive/luamathalign.source.r63226.tar.xz
@@ -296819,9 +296819,9 @@
2020/07/28 | 2536 | systems/texlive/tlnet/archive/pinoutikz.r55966.tar.xz
2019/02/28 | 110192 | systems/texlive/tlnet/archive/pitex.doc.r24731.tar.xz
2019/02/28 | 22664 | systems/texlive/tlnet/archive/pitex.r24731.tar.xz
-2023/01/30 | 556520 | systems/texlive/tlnet/archive/piton.doc.r65673.tar.xz
-2023/01/30 | 10328 | systems/texlive/tlnet/archive/piton.r65673.tar.xz
-2023/01/30 | 30932 | systems/texlive/tlnet/archive/piton.source.r65673.tar.xz
+2023/02/15 | 603852 | systems/texlive/tlnet/archive/piton.doc.r65835.tar.xz
+2023/02/15 | 11760 | systems/texlive/tlnet/archive/piton.r65835.tar.xz
+2023/02/15 | 34288 | systems/texlive/tlnet/archive/piton.source.r65835.tar.xz
2019/02/28 | 317704 | systems/texlive/tlnet/archive/pittetd.doc.r15878.tar.xz
2019/02/28 | 8884 | systems/texlive/tlnet/archive/pittetd.r15878.tar.xz
2019/02/28 | 38588 | systems/texlive/tlnet/archive/pittetd.source.r15878.tar.xz
@@ -298095,8 +298095,8 @@
2022/07/09 | 10672 | systems/texlive/tlnet/archive/scrlayer-fancyhdr.source.r63844.tar.xz
2020/10/23 | 88404 | systems/texlive/tlnet/archive/scrlttr2copy.doc.r56733.tar.xz
2020/10/23 | 1876 | systems/texlive/tlnet/archive/scrlttr2copy.r56733.tar.xz
-2020/03/04 | 480336 | systems/texlive/tlnet/archive/scsnowman.doc.r54080.tar.xz
-2020/03/04 | 6124 | systems/texlive/tlnet/archive/scsnowman.r54080.tar.xz
+2023/02/15 | 501220 | systems/texlive/tlnet/archive/scsnowman.doc.r65832.tar.xz
+2023/02/15 | 6264 | systems/texlive/tlnet/archive/scsnowman.r65832.tar.xz
2022/12/24 | 277328 | systems/texlive/tlnet/archive/sdaps.doc.r65345.tar.xz
2022/12/24 | 32028 | systems/texlive/tlnet/archive/sdaps.r65345.tar.xz
2022/12/24 | 29416 | systems/texlive/tlnet/archive/sdaps.source.r65345.tar.xz
@@ -299248,7 +299248,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/02/14 | 424660 | systems/texlive/tlnet/archive/texlive-scripts.doc.r65811.tar.xz
+2023/02/15 | 424652 | systems/texlive/tlnet/archive/texlive-scripts.doc.r65827.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
@@ -299272,7 +299272,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/02/14 | 113832 | systems/texlive/tlnet/archive/texlive-scripts.r65811.tar.xz
+2023/02/15 | 113832 | systems/texlive/tlnet/archive/texlive-scripts.r65827.tar.xz
2022/09/13 | 580 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r64356.tar.xz
2022/11/29 | 36264 | systems/texlive/tlnet/archive/texlive-scripts.win32.r65128.tar.xz
2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r64356.tar.xz
@@ -301141,16 +301141,16 @@
2020/07/18 | 47816 | systems/texlive/tlnet/archive/zztex.doc.r55862.tar.xz
2020/07/18 | 101724 | systems/texlive/tlnet/archive/zztex.r55862.tar.xz
2022/07/17 | 124404 | systems/texlive/tlnet/install-tl
-2023/02/14 | 5829239 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2023/02/14 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2023/02/14 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2023/02/15 | 5829215 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2023/02/15 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2023/02/15 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2021/04/11 | 4945 | systems/texlive/tlnet/install-tl-windows.bat
-2023/02/14 | 20436086 | systems/texlive/tlnet/install-tl-windows.exe
-2023/02/14 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2023/02/14 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2023/02/14 | 25513730 | systems/texlive/tlnet/install-tl.zip
-2023/02/14 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2023/02/14 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2023/02/15 | 20432776 | systems/texlive/tlnet/install-tl-windows.exe
+2023/02/15 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2023/02/15 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2023/02/15 | 25513732 | systems/texlive/tlnet/install-tl.zip
+2023/02/15 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2023/02/15 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
2022/04/03 | 1229 | systems/texlive/tlnet/README.md
2022/04/03 | 0 | systems/texlive/tlnet/TEXLIVE_2022
2023/01/17 | 8401 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
@@ -301160,7 +301160,7 @@
2023/01/17 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
2023/01/17 | 49938 | systems/texlive/tlnet/tlpkg/installer/config.guess
2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2023/02/13 | 7357 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2023/02/14 | 7365 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2023/01/11 | 216583 | systems/texlive/tlnet/tlpkg/installer/curl/curl-ca-bundle.crt
2020/04/15 | 2606592 | systems/texlive/tlnet/tlpkg/installer/curl/curl.exe
2017/04/16 | 2629 | systems/texlive/tlnet/tlpkg/installer/installer-options.txt
@@ -301203,12 +301203,12 @@
2021/05/16 | 20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
2021/12/21 | 5429 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
2021/12/21 | 27582 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2023/02/14 | 18059367 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2023/02/14 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2023/02/15 | 18059235 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2023/02/15 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2022/04/18 | 86658 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2023/02/14 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2023/02/14 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2023/02/14 | 2449344 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2023/02/15 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2023/02/15 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2023/02/15 | 2450260 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2022/09/14 | 58922 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
2022/10/04 | 42404 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
2021/12/21 | 16130 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -311487,7 +311487,7 @@
2014/07/05 | 611 | systems/win32/yandy/README
2014/07/05 | 1004628 | systems/win32/yandy/yandy-src.tar.xz
2014/07/05 | 1012416 | systems/win32/yandy.zip
-2023/02/15 | 186 | timestamp
+2023/02/16 | 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 f754ac78d0..7339e94fa0 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index 62ce34de21..6152ddca03 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,3 +1,307 @@
+2023/02/15 | 98892 | macros/luatex/latex/novel/doc/extras/novel-example.pdf
+2023/02/15 | 9856 | macros/luatex/latex/novel/doc/html-resources/graytext.png
+2023/02/15 | 98502 | macros/latex/contrib/postnotes/postnotes.dtx
+2023/02/15 | 961936 | macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdf
+2023/02/15 | 959 | macros/luatex/latex/novel/tex/lualatex/novel/novel-JC200103.clo
+2023/02/15 | 9584 | macros/luatex/latex/novel/doc/html-resources/sixpage-frontmatter.png
+2023/02/15 | 95659 | macros/luatex/latex/novel/doc/html-resources/colorsampler-softproof.png
+2023/02/15 | 950 | macros/luatex/latex/novel/tex/lualatex/novel/novel-FOGRA39.clo
+2023/02/15 | 949 | macros/luatex/latex/novel/tex/lualatex/novel/novel-CGATSTR001.clo
+2023/02/15 | 9411 | macros/luatex/latex/novel/doc/html-resources/robberies.png
+2023/02/15 | 9016 | macros/luatex/latex/novel/tex/lualatex/novel/novel-PostLayout.sty
+2023/02/15 | 8978 | macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md
+2023/02/15 | 89488 | macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx
+2023/02/15 | 881 | macros/latex/contrib/postnotes/README.md
+2023/02/15 | 8652 | macros/latex/contrib/tagpdf/ex-AF-file.pdf
+2023/02/15 | 858479 | macros/latex/contrib/tagpdf/tagpdf.pdf
+2023/02/15 | 8567 | macros/luatex/latex/novel/doc/html-resources/megatitlepagesm.png
+2023/02/15 | 8518 | macros/luatex/latex/novel/doc/html-resources/fluffy-conspiracy.png
+2023/02/15 | 839836 | macros/latex/contrib/postnotes/postnotes-code.pdf
+2023/02/15 | 83051 | macros/luatex/latex/pyluatex/pyluatex.pdf
+2023/02/15 | 8281 | macros/latex/contrib/tagpdf/global-ex.png
+2023/02/15 | 8187 | macros/luatex/latex/novel/doc/html-resources/headfont-default.png
+2023/02/15 | 8152 | systems/texlive/tlnet/archive/lualinalg.r65834.tar.xz
+2023/02/15 | 8144 | macros/luatex/latex/novel/doc/html-resources/fpaper.png
+2023/02/15 | 810260 | macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdf
+2023/02/15 | 80977 | macros/luatex/latex/novel/doc/html-resources/novel-color-sampler.png
+2023/02/15 | 801 | macros/latex/contrib/tagpdf/ex-tagpdf-template.tex
+2023/02/15 | 7940 | macros/luatex/latex/novel/doc/html-resources/headfont-roboto.png
+2023/02/15 | 7854 | macros/latex/contrib/tagpdf/ex-formula-problem-luatex.pdf
+2023/02/15 | 7798 | macros/luatex/latex/novel/tex/lualatex/novel/novel-DropCap.sty
+2023/02/15 | 777 | macros/latex/contrib/tagpdf/ex-spaceglyph-listings.tex
+2023/02/15 | 7699 | macros/luatex/latex/pyluatex/pyluatex.lua
+2023/02/15 | 7654 | macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty
+2023/02/15 | 7616 | macros/luatex/latex/novel/doc/html-resources/Iboxcap.png
+2023/02/15 | 7556 | macros/latex/contrib/annotate-equations/annotate-equations.sty
+2023/02/15 | 749558 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdf
+2023/02/15 | 7449 | macros/luatex/latex/novel/doc/html-resources/map.png
+2023/02/15 | 7415 | macros/luatex/latex/novel/doc/html-resources/emblemimg.png
+2023/02/15 | 72943 | macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx
+2023/02/15 | 7254 | macros/luatex/latex/novel/doc/html-resources/headfont-montserrat-el.png
+2023/02/15 | 717 | macros/luatex/latex/pyluatex/example/readme-example.tex
+2023/02/15 | 7146 | macros/luatex/latex/novel/tex/lualatex/novel/novel-FileData.sty
+2023/02/15 | 7134 | macros/luatex/latex/novel/doc/html-resources/smythsewn.png
+2023/02/15 | 7043 | macros/luatex/latex/novel/doc/html-resources/jollybeers.png
+2023/02/15 | 7013 | macros/luatex/latex/novel/doc/novel.tex
+2023/02/15 | 69115 | macros/luatex/latex/novel/doc/extras/novel-testsuite.pdf
+2023/02/15 | 69093 | macros/luatex/latex/novel/doc/html-resources/jump-change.png
+2023/02/15 | 686657 | macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdf
+2023/02/15 | 6842 | macros/latex/contrib/tagpdf/ex-softhyphen.pdf
+2023/02/15 | 681579 | macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdf
+2023/02/15 | 6806 | macros/luatex/latex/novel/doc/html-resources/dropcap-scalebloat.png
+2023/02/15 | 67833 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx
+2023/02/15 | 6698 | macros/luatex/latex/novel/tex/lualatex/novel/novel-microtype.cfg
+2023/02/15 | 6626 | macros/latex/contrib/tagpdf/ex-attribute-luatex.pdf
+2023/02/15 | 6548 | macros/luatex/latex/novel/doc/html-resources/dropcap-antestar.png
+2023/02/15 | 6413 | macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx
+2023/02/15 | 6412 | macros/luatex/latex/novel/doc/html-resources/looseheads.png
+2023/02/15 | 63555 | macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx
+2023/02/15 | 628 | macros/luatex/latex/pyluatex/example/readme-custom-env.tex
+2023/02/15 | 6264 | systems/texlive/tlnet/archive/scsnowman.r65832.tar.xz
+2023/02/15 | 62302 | macros/luatex/latex/novel/doc/html-resources/workedforme.png
+2023/02/15 | 6194 | macros/latex/contrib/tagpdf/tagpdfdocu-patches.sty
+2023/02/15 | 6181 | macros/luatex/latex/novel/doc/html-resources/dropcap-gap.png
+2023/02/15 | 608 | macros/luatex/latex/novel/doc/html-resources/10trueold.png
+2023/02/15 | 603852 | systems/texlive/tlnet/archive/piton.doc.r65835.tar.xz
+2023/02/15 | 60247 | macros/luatex/latex/novel/doc/novel.pdf
+2023/02/15 | 6019 | macros/luatex/latex/novel/doc/html-resources/emblemdingbats.png
+2023/02/15 | 591646 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.pdf
+2023/02/15 | 5898 | macros/luatex/latex/novel/doc/html-resources/CPmodified-sample.png
+2023/02/15 | 58852 | macros/latex/contrib/tagpdf/tagpdf-struct.dtx
+2023/02/15 | 588430 | macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdf
+2023/02/15 | 586863 | macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdf
+2023/02/15 | 5829215 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2023/02/15 | 5797 | macros/latex/contrib/tagpdf/ex-patch-sectioning-memoir.tex
+2023/02/15 | 572649 | macros/latex/contrib/overarrows.zip
+2023/02/15 | 565712 | macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdf
+2023/02/15 | 563 | macros/luatex/latex/novel/doc/html-resources/10transold.png
+2023/02/15 | 56275 | macros/luatex/latex/novel/doc/html-resources/skygrad.jpg
+2023/02/15 | 557793 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.pdf
+2023/02/15 | 554421 | macros/latex/contrib/overarrows/overarrows.pdf
+2023/02/15 | 5508 | macros/luatex/latex/novel/doc/html-resources/I-shade.png
+2023/02/15 | 5479 | macros/luatex/latex/novel/doc/html-resources/emblembar.png
+2023/02/15 | 5475 | macros/luatex/latex/novel/doc/html-resources/acronym2.png
+2023/02/15 | 5448 | macros/luatex/latex/novel/doc/html-resources/smallcapsrealfake.png
+2023/02/15 | 54423 | macros/luatex/latex/novel/doc/html-resources/colorsampler.png
+2023/02/15 | 543108 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.pdf
+2023/02/15 | 540820 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.pdf
+2023/02/15 | 536219 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.pdf
+2023/02/15 | 5310 | macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.dtx
+2023/02/15 | 526338 | macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdf
+2023/02/15 | 5233 | macros/luatex/latex/novel/doc/html-resources/signature.png
+2023/02/15 | 51972 | macros/luatex/latex/novel/doc/extras/CPmodified.otf
+2023/02/15 | 515474 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.pdf
+2023/02/15 | 5151 | macros/luatex/latex/novel/doc/html-resources/fontbyfamily.png
+2023/02/15 | 514646 | macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdf
+2023/02/15 | 5111 | macros/luatex/latex/pyluatex/pyluatex-interpreter.py
+2023/02/15 | 5109 | macros/latex/contrib/tagpdf/tagpdf-space.dtx
+2023/02/15 | 5072774 | macros/luatex/latex/novel.zip
+2023/02/15 | 5029 | macros/luatex/latex/novel/doc/html-resources/frankenfont.png
+2023/02/15 | 501220 | systems/texlive/tlnet/archive/scsnowman.doc.r65832.tar.xz
+2023/02/15 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2023/02/15 | 4884 | macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.ins
+2023/02/15 | 4711 | macros/luatex/latex/novel/doc/html-resources/badaboom.png
+2023/02/15 | 4618 | macros/latex/contrib/tagpdf/ex-spaceglyph-listings.pdf
+2023/02/15 | 4599 | macros/luatex/latex/novel/doc/html-resources/pngcolortype.png
+2023/02/15 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2023/02/15 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2023/02/15 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2023/02/15 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2023/02/15 | 455951 | macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdf
+2023/02/15 | 45465 | macros/latex/contrib/tagpdf/tagpdf-roles.dtx
+2023/02/15 | 4533 | macros/luatex/latex/novel/doc/html-resources/jpgcolorspace.png
+2023/02/15 | 4523 | macros/luatex/latex/novel/doc/html-resources/ctimg35.png
+2023/02/15 | 443946 | macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdf
+2023/02/15 | 4331 | macros/luatex/latex/novel/doc/html-resources/fontbyfilenamei.png
+2023/02/15 | 4328 | macros/luatex/latex/pyluatex/example/data-visualization.tex
+2023/02/15 | 4284 | macros/latex/contrib/tagpdf/ex-patch-sectioning-koma.tex
+2023/02/15 | 426365 | macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdf
+2023/02/15 | 4256 | macros/luatex/latex/novel/doc/html-resources/wrapme.png
+2023/02/15 | 424652 | systems/texlive/tlnet/archive/texlive-scripts.doc.r65827.tar.xz
+2023/02/15 | 42231 | macros/luatex/latex/novel/doc/html-resources/inlineimagest.png
+2023/02/15 | 42202 | macros/luatex/latex/novel/doc/extras/NovelDeco-glyphs.pdf
+2023/02/15 | 41850 | macros/luatex/latex/novel/doc/html-resources/trimsize.png
+2023/02/15 | 4153 | macros/latex/contrib/tagpdf/ex-alt-actualtext.tex
+2023/02/15 | 40936 | macros/latex/contrib/tagpdf/tagpdf-backend.dtx
+2023/02/15 | 4050905 | biblio/ctan-bibdata.zip
+2023/02/15 | 4041 | macros/latex/contrib/pdfmanagement-testphase/l3ref-tmp.sty
+2023/02/15 | 40075 | macros/latex/contrib/postnotes/postnotes.tex
+2023/02/15 | 4003 | macros/luatex/latex/novel/tex/lualatex/novel/novel-Sandbox.sty
+2023/02/15 | 3962 | macros/latex/contrib/tagpdf/tagpdf.ins
+2023/02/15 | 39286 | macros/luatex/latex/novel/doc/html-resources/doordie.png
+2023/02/15 | 39167 | macros/luatex/latex/pyluatex/example/population.csv
+2023/02/15 | 386819 | macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.pdf
+2023/02/15 | 3805 | macros/luatex/latex/novel/doc/extras/novel-example.tex
+2023/02/15 | 37436 | macros/luatex/latex/novel/doc/html-resources/gnome-censored.png
+2023/02/15 | 36954 | macros/luatex/latex/novel/doc/html-resources/parascale.png
+2023/02/15 | 3654175 | biblio/ctan-bibdata/ctan.pdf
+2023/02/15 | 3560 | macros/luatex/latex/novel/tex/lualatex/novel/novel-xmppacket.sty
+2023/02/15 | 34964 | macros/latex/contrib/tagpdf/tagpdf-data.dtx
+2023/02/15 | 34288 | systems/texlive/tlnet/archive/piton.source.r65835.tar.xz
+2023/02/15 | 34282 | macros/luatex/latex/novel/doc/html-resources/no-brainer.png
+2023/02/15 | 34135 | macros/luatex/latex/novel/doc/html-resources/ublibser.png
+2023/02/15 | 33975 | macros/luatex/latex/novel/doc/html-resources/imgdialogs.png
+2023/02/15 | 33749 | macros/luatex/latex/novel/doc/html-resources/quickchapter.png
+2023/02/15 | 332168 | macros/luatex/latex/novel/doc/novel-documentation.html
+2023/02/15 | 3315 | macros/luatex/latex/pyluatex/example/beamer.tex
+2023/02/15 | 3193 | macros/luatex/latex/pyluatex/pyluatex.sty
+2023/02/15 | 311166 | macros/luatex/latex/novel/doc/extras/novel-Gallery-ChapterStart.pdf
+2023/02/15 | 30678 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.dtx
+2023/02/15 | 30606 | macros/luatex/latex/novel/doc/html-resources/margins-trim-media.png
+2023/02/15 | 30516 | macros/luatex/latex/novel/doc/html-resources/mediasize.png
+2023/02/15 | 30370 | macros/latex/contrib/tagpdf/tagpdf-checks.dtx
+2023/02/15 | 30022 | macros/luatex/latex/novel/doc/html-resources/shademargins.png
+2023/02/15 | 29765 | macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx
+2023/02/15 | 2882 | macros/latex/contrib/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty
+2023/02/15 | 28693 | macros/latex/contrib/tagpdf/tagpdf-user.dtx
+2023/02/15 | 28627 | macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx
+2023/02/15 | 2835 | macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty
+2023/02/15 | 27873 | macros/luatex/latex/novel/doc/html-resources/endnotetext.png
+2023/02/15 | 27867 | macros/luatex/latex/novel/doc/html-resources/trdol.png
+2023/02/15 | 2785 | macros/latex/contrib/postnotes/CHANGELOG.md
+2023/02/15 | 2767753 | biblio/ctan-bibdata/ctan.bib
+2023/02/15 | 26787 | macros/latex/contrib/tagpdf/tagpdf-mc-generic.dtx
+2023/02/15 | 26550 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.dtx
+2023/02/15 | 26540 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.dtx
+2023/02/15 | 2637 | macros/latex/contrib/tagpdf/ex-patch-list.tex
+2023/02/15 | 260860 | systems/texlive/tlnet/archive/lualinalg.doc.r65834.tar.xz
+2023/02/15 | 2584 | macros/latex/contrib/postnotes/postnotes.ins
+2023/02/15 | 25513732 | systems/texlive/tlnet/install-tl.zip
+2023/02/15 | 2528 | macros/latex/contrib/tagpdf/ex-patch-list-obsolete.tex
+2023/02/15 | 25213 | macros/luatex/latex/novel/doc/html-resources/scenebreaks.png
+2023/02/15 | 246911 | macros/luatex/latex/novel/doc/html-resources/bixby-softproof.png
+2023/02/15 | 246157 | macros/luatex/latex/novel/doc/html-resources/raffaelino-original.png
+2023/02/15 | 2456 | macros/luatex/latex/novel/doc/extras/novel-testscript.jpg
+2023/02/15 | 24517 | macros/luatex/latex/novel/doc/html-resources/megadocprops.png
+2023/02/15 | 2450260 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2023/02/15 | 24154 | macros/luatex/latex/novel/tex/lualatex/novel/novel.cls
+2023/02/15 | 241149 | macros/luatex/latex/novel/doc/html-resources/raffaelino-softproof.png
+2023/02/15 | 2400 | macros/luatex/latex/pyluatex/example/typesetting-listings.tex
+2023/02/15 | 239173 | macros/luatex/latex/novel/doc/html-resources/bixby-original.png
+2023/02/15 | 2349 | macros/luatex/latex/novel/doc/html-resources/dorfmcnorf.png
+2023/02/15 | 2335 | macros/luatex/latex/novel/doc/extras/novel-extras-README.html
+2023/02/15 | 23311 | macros/latex/contrib/tagpdf/acrobat.png
+2023/02/15 | 2310 | macros/luatex/latex/pyluatex/example/repl.tex
+2023/02/15 | 22818 | macros/latex/contrib/tagpdf/ex-mc-manual-para-split-obsolete.pdf
+2023/02/15 | 2262 | macros/latex/contrib/tagpdf/tagpdf-code.tex
+2023/02/15 | 22507 | macros/luatex/latex/novel/doc/html-resources/cropmarks.png
+2023/02/15 | 22434 | macros/luatex/latex/novel/doc/html-resources/bookmanglerdashboard.png
+2023/02/15 | 2234345 | macros/latex/contrib/tagpdf.zip
+2023/02/15 | 22144 | macros/luatex/latex/novel/doc/html-resources/bookofbeirh.png
+2023/02/15 | 21991 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.dtx
+2023/02/15 | 21728 | macros/luatex/latex/novel/tex/lualatex/novel/novel-TextMacros.sty
+2023/02/15 | 2150 | macros/latex/contrib/tagpdf/ex-mc-manual-para-split-obsolete.tex
+2023/02/15 | 21460 | macros/luatex/latex/novel/doc/html-resources/chaptertitlesubtitle.png
+2023/02/15 | 2134 | macros/latex/contrib/pdfmanagement-testphase/luaotfload-l3color-tmp.lua
+2023/02/15 | 21067 | macros/latex/contrib/tagpdf/ex-patch-sectioning-memoir.pdf
+2023/02/15 | 2105 | macros/luatex/latex/pyluatex/example/typesetting-minted.tex
+2023/02/15 | 209671 | macros/latex/contrib/annotate-equations.zip
+2023/02/15 | 2094 | macros/luatex/latex/novel/README.md
+2023/02/15 | 20721 | macros/latex/contrib/tagpdf/tagpdf.dtx
+2023/02/15 | 20701 | macros/luatex/latex/novel/doc/html-resources/mcdingle.png
+2023/02/15 | 2064 | macros/luatex/latex/novel/doc/extras/novel-testscript.png
+2023/02/15 | 20432776 | systems/texlive/tlnet/install-tl-windows.exe
+2023/02/15 | 20430 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.dtx
+2023/02/15 | 203389 | macros/latex/contrib/annotate-equations/annotate-equations.pdf
+2023/02/15 | 2022 | macros/latex/contrib/tagpdf/link-figure-input.tex
+2023/02/15 | 20011 | macros/luatex/latex/novel/tex/lualatex/novel/novel-Images.sty
+2023/02/15 | 1990 | macros/luatex/latex/novel/doc/extras/novel-testimage.jpg
+2023/02/15 | 19907 | macros/luatex/latex/novel/doc/html-resources/cropview.png
+2023/02/15 | 19633 | macros/luatex/latex/novel/doc/html-resources/printgamut.png
+2023/02/15 | 19382 | macros/luatex/latex/novel/doc/html-resources/closecrop.png
+2023/02/15 | 19363 | macros/latex/contrib/tagpdf/ex-tagpdf-template.pdf
+2023/02/15 | 19235 | macros/luatex/latex/novel/doc/html-resources/unsafe-vs-margin.png
+2023/02/15 | 1908 | macros/luatex/latex/novel/doc/extras/novel-testimage.png
+2023/02/15 | 19012 | macros/luatex/latex/novel/doc/html-resources/whichgutter.png
+2023/02/15 | 1894 | macros/luatex/latex/novel/doc/html-resources/shakepi.png
+2023/02/15 | 18804 | macros/luatex/latex/novel/doc/html-resources/monitorgamut.png
+2023/02/15 | 1849 | macros/luatex/latex/pyluatex/example/matplotlib-pgf.tex
+2023/02/15 | 18461 | macros/latex/contrib/tagpdf/ex-patch-sectioning-koma-luatex.pdf
+2023/02/15 | 18412 | macros/luatex/latex/novel/doc/html-resources/simpletoc.png
+2023/02/15 | 18281 | macros/luatex/latex/novel/tex/lualatex/novel/novel-HeadFootStyles.sty
+2023/02/15 | 18252 | macros/luatex/latex/novel/doc/html-resources/dropcap.png
+2023/02/15 | 18170 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.dtx
+2023/02/15 | 18059235 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2023/02/15 | 18021 | macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx
+2023/02/15 | 17742 | macros/latex/contrib/tagpdf/ex-alt-actualtext-luatex.pdf
+2023/02/15 | 177383 | macros/latex/contrib/postnotes/postnotes.pdf
+2023/02/15 | 17690 | macros/luatex/latex/novel/doc/html-resources/firstlinespecial.png
+2023/02/15 | 17688 | macros/luatex/latex/novel/doc/html-resources/firstletterspecial.png
+2023/02/15 | 176583 | macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx
+2023/02/15 | 17435 | macros/luatex/latex/novel/tex/lualatex/novel/novel-LayoutSettings.sty
+2023/02/15 | 17354 | macros/luatex/latex/novel/tex/lualatex/novel/novel-Fonts.sty
+2023/02/15 | 17343 | macros/latex/contrib/tagpdf/tagpdf-tree.dtx
+2023/02/15 | 1730 | macros/latex/contrib/tagpdf/tagpdf.bib
+2023/02/15 | 17304 | macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx
+2023/02/15 | 17173 | macros/luatex/latex/novel/doc/html-resources/lowdown.png
+2023/02/15 | 17094 | macros/luatex/latex/novel/tex/lualatex/novel/novel-pdfx.sty
+2023/02/15 | 16888 | macros/latex/contrib/tagpdf/ex-patch-list-luatex.pdf
+2023/02/15 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2023/02/15 | 1660 | systems/texlive/tlnet/archive/luacomplex.r65833.tar.xz
+2023/02/15 | 16097 | macros/luatex/latex/novel/doc/html-resources/human-robot-talk.png
+2023/02/15 | 15976 | macros/luatex/latex/novel/tex/lualatex/novel/novel-Footnotes.sty
+2023/02/15 | 15651 | macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx
+2023/02/15 | 15625 | macros/luatex/latex/novel/doc/html-resources/head-foot-jumps.png
+2023/02/15 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2023/02/15 | 15394 | macros/luatex/latex/novel/doc/extras/novel-testsuite.tex
+2023/02/15 | 1537 | macros/latex/contrib/tagpdf/ex-structure-obsolete.tex
+2023/02/15 | 1534 | macros/luatex/latex/pyluatex/README.md
+2023/02/15 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2023/02/15 | 1527 | macros/luatex/latex/pyluatex/example/matplotlib-external.tex
+2023/02/15 | 15268 | macros/luatex/latex/novel/doc/html-resources/font-tree.png
+2023/02/15 | 15241 | macros/latex/contrib/tagpdf/tagpdf-mc-shared.dtx
+2023/02/15 | 1514352 | macros/latex/contrib/tagpdf/tagpdf-code.pdf
+2023/02/15 | 15026 | macros/luatex/latex/novel/doc/html-resources/overflowrule.png
+2023/02/15 | 150154 | macros/latex/contrib/pdfmanagement-testphase/fontspec-luatex-tmp-ltx.sty
+2023/02/15 | 14 | macros/latex/contrib/postnotes/DEPENDS.txt
+2023/02/15 | 1499979 | macros/luatex/latex/novel/doc/extras/novel-scripts.zip
+2023/02/15 | 14973 | macros/luatex/latex/novel/doc/html-resources/headfoot5.png
+2023/02/15 | 14948 | macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx
+2023/02/15 | 14605 | macros/luatex/latex/novel/doc/html-resources/headfoot4.png
+2023/02/15 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2023/02/15 | 14569 | macros/luatex/latex/novel/doc/html-resources/headfoot1.png
+2023/02/15 | 14511 | macros/latex/contrib/tagpdf/tagpdf-mc-luacode.dtx
+2023/02/15 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2023/02/15 | 14480 | macros/luatex/latex/novel/tex/lualatex/novel/novel-ChapterScene.sty
+2023/02/15 | 14429 | macros/luatex/latex/novel/doc/html-resources/headfoot6.png
+2023/02/15 | 1439 | macros/latex/contrib/postnotes/postnotes-code.tex
+2023/02/15 | 1429 | macros/luatex/latex/pyluatex/example/sessions.tex
+2023/02/15 | 14287 | macros/luatex/latex/novel/doc/html-resources/colormax-softproof.png
+2023/02/15 | 142528 | macros/luatex/latex/novel/doc/html-resources/authorsnote.png
+2023/02/15 | 141163 | macros/latex/contrib/tagpdf/pac3.PNG
+2023/02/15 | 14045 | macros/luatex/latex/pyluatex/pyluatex.tex
+2023/02/15 | 14028 | macros/luatex/latex/novel/doc/html-resources/headfoot3.png
+2023/02/15 | 14028 | macros/luatex/latex/novel/doc/html-resources/headfoot2.png
+2023/02/15 | 1398 | macros/latex/contrib/tagpdf/ex-attribute.tex
+2023/02/15 | 13553 | macros/luatex/latex/novel/doc/html-resources/toc.png
+2023/02/15 | 13322 | macros/luatex/latex/novel/doc/html-resources/smfingerprint8.png
+2023/02/15 | 13279 | macros/luatex/latex/novel/tex/lualatex/novel/novel-CalculateLayout.sty
+2023/02/15 | 132000 | macros/luatex/latex/novel/fonts/opentype/novel/NovelDeco.otf
+2023/02/15 | 12898 | macros/luatex/latex/novel/doc/html-resources/page-leaf.png
+2023/02/15 | 1288 | macros/luatex/latex/novel/doc/html-resources/info18.png
+2023/02/15 | 12701 | macros/luatex/latex/novel/doc/html-resources/colormax-original.png
+2023/02/15 | 124794 | macros/latex/contrib/overarrows/overarrows.dtx
+2023/02/15 | 1237 | macros/latex/contrib/tagpdf/ex-AF-file.tex
+2023/02/15 | 12372 | macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx
+2023/02/15 | 12250 | macros/luatex/latex/novel/doc/html-resources/topmargins.png
+2023/02/15 | 12057 | macros/luatex/latex/novel/doc/html-resources/jackbequick.png
+2023/02/15 | 1200 | macros/latex/contrib/pdfmanagement-testphase/README.md
+2023/02/15 | 1177 | macros/latex/contrib/tagpdf/README.md
+2023/02/15 | 11760 | systems/texlive/tlnet/archive/piton.r65835.tar.xz
+2023/02/15 | 117488 | macros/luatex/latex/pyluatex.zip
+2023/02/15 | 11609 | macros/latex/contrib/annotate-equations/annotate-equations.tex
+2023/02/15 | 115644 | systems/texlive/tlnet/archive/luacomplex.doc.r65833.tar.xz
+2023/02/15 | 11384548 | macros/latex/contrib/pdfmanagement-testphase.zip
+2023/02/15 | 113832 | systems/texlive/tlnet/archive/texlive-scripts.r65827.tar.xz
+2023/02/15 | 11185 | macros/luatex/latex/novel/doc/html-resources/alphabetagamma.png
+2023/02/15 | 110565 | macros/latex/contrib/tagpdf/tagpdf.tex
+2023/02/15 | 10831 | macros/luatex/latex/novel/doc/html-resources/charscaletext.png
+2023/02/15 | 1073 | macros/latex/contrib/tagpdf/ex-softhyphen.tex
+2023/02/15 | 10690 | macros/luatex/latex/novel/doc/html-resources/win10libser.png
+2023/02/15 | 1049 | macros/luatex/latex/pyluatex/example/typesetting-example.tex
+2023/02/15 | 10407 | macros/luatex/latex/novel/doc/html-resources/perfectbinding.png
+2023/02/15 | 1021294 | macros/latex/contrib/postnotes.zip
+2023/02/15 | 1019 | macros/latex/contrib/tagpdf/ex-formula-problem.tex
2023/02/14 | 996436 | systems/texlive/tlnet/archive/postnotes.doc.r65820.tar.xz
2023/02/14 | 94325 | macros/generic/witharrows/witharrows-french.tex
2023/02/14 | 93660 | macros/latex/contrib/pagecolor/pagecolor-example.pdf
@@ -7,6 +311,7 @@
2023/02/14 | 817 | graphics/pgf/contrib/scsnowman/README.md
2023/02/14 | 7828 | systems/texlive/tlnet/archive/resolsysteme.r65821.tar.xz
2023/02/14 | 7814 | macros/luatex/latex/lualinalg/lualinalg_complex.lua
+2023/02/14 | 7365 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2023/02/14 | 728334 | macros/luatex/latex/piton.zip
2023/02/14 | 7278 | macros/luatex/latex/luacomplex/luacomplex.tex
2023/02/14 | 725832 | systems/texlive/tlnet/archive/babel.source.r65823.tar.xz
@@ -21,7 +326,6 @@
2023/02/14 | 59812 | macros/luatex/latex/piton/piton-french.tex
2023/02/14 | 588 | systems/texlive/tlnet/archive/collection-langcjk.r65824.tar.xz
2023/02/14 | 5833 | graphics/pgf/contrib/scsnowman/scsnowman-sample.tex
-2023/02/14 | 5829239 | systems/texlive/tlnet/install-tl-unx.tar.gz
2023/02/14 | 5628 | systems/texlive/tlnet/archive/bibcop.source.r65816.tar.xz
2023/02/14 | 5628 | graphics/pgf/contrib/scsnowman/sctkzsym-base.sty
2023/02/14 | 559782 | macros/generic/witharrows/witharrows.pdf
@@ -31,25 +335,17 @@
2023/02/14 | 5223 | macros/latex/contrib/undolabl/README
2023/02/14 | 5142 | macros/latex/contrib/pagecolor/README
2023/02/14 | 512818 | graphics/pgf/contrib/scsnowman.zip
-2023/02/14 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2023/02/14 | 468716 | systems/texlive/tlnet/archive/resolsysteme.doc.r65821.tar.xz
2023/02/14 | 46182 | macros/latex/contrib/pagecolor/pagecolor.dtx
-2023/02/14 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2023/02/14 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2023/02/14 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2023/02/14 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2023/02/14 | 43928 | macros/luatex/latex/lualinalg/lualinalg.tex
2023/02/14 | 437193 | graphics/pgf/contrib/scsnowman/scsnowman.pdf
-2023/02/14 | 424660 | systems/texlive/tlnet/archive/texlive-scripts.doc.r65811.tar.xz
2023/02/14 | 42158 | macros/latex/contrib/undolabl/undolabl-example.pdf
2023/02/14 | 41227 | macros/luatex/latex/lualinalg/lualinalg.sty
-2023/02/14 | 4049936 | biblio/ctan-bibdata.zip
2023/02/14 | 4045 | macros/luatex/latex/luacomplex/luacomplex.sty
2023/02/14 | 39405 | macros/latex/contrib/undolabl/undolabl.dtx
2023/02/14 | 376314 | install/macros/latex/contrib/undolabl.tds.zip
2023/02/14 | 369998 | macros/latex/contrib/undolabl.zip
2023/02/14 | 3697 | macros/latex/contrib/undolabl/undolabl-example.tex
-2023/02/14 | 3654848 | biblio/ctan-bibdata/ctan.pdf
2023/02/14 | 355000 | systems/texlive/tlnet/archive/bibcop.doc.r65816.tar.xz
2023/02/14 | 345503 | macros/luatex/latex/lualinalg/lualinalg.pdf
2023/02/14 | 341917 | macros/latex/contrib/pagecolor/pagecolor.pdf
@@ -62,43 +358,30 @@
2023/02/14 | 286544 | systems/texlive/tlnet/archive/tipauni.doc.r65817.tar.xz
2023/02/14 | 278782 | macros/generic/witharrows/witharrows-french.pdf
2023/02/14 | 2772 | systems/texlive/tlnet/archive/evangelion-jfm.r65824.tar.xz
-2023/02/14 | 2767755 | biblio/ctan-bibdata/ctan.bib
2023/02/14 | 2620340 | systems/texlive/tlnet/archive/hagenberg-thesis.doc.r65819.tar.xz
-2023/02/14 | 25513730 | systems/texlive/tlnet/install-tl.zip
-2023/02/14 | 2449344 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2023/02/14 | 242140 | systems/texlive/tlnet/archive/epspdf.doc.r65825.tar.xz
2023/02/14 | 23508 | systems/texlive/tlnet/archive/zref-clever.r65822.tar.xz
2023/02/14 | 2308656 | systems/texlive/tlnet/archive/pst-poker.r65818.tar.xz
2023/02/14 | 21664 | systems/texlive/tlnet/archive/postnotes.source.r65820.tar.xz
-2023/02/14 | 20436086 | systems/texlive/tlnet/install-tl-windows.exe
2023/02/14 | 19864 | systems/texlive/tlnet/archive/hagenberg-thesis.r65819.tar.xz
2023/02/14 | 1979 | macros/luatex/latex/lualinalg/README.txt
2023/02/14 | 196284 | systems/texlive/tlnet/archive/babel.r65823.tar.xz
2023/02/14 | 19392 | graphics/pgf/contrib/scsnowman/scsnowman.tex
-2023/02/14 | 18059367 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
2023/02/14 | 17987 | CTAN.sites
-2023/02/14 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
2023/02/14 | 161961 | macros/luatex/latex/piton/piton.dtx
2023/02/14 | 1575424 | systems/texlive/tlnet/archive/zref-clever.doc.r65822.tar.xz
-2023/02/14 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2023/02/14 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
2023/02/14 | 15022 | graphics/pgf/contrib/scsnowman/scsnowman.sty
2023/02/14 | 14984 | systems/texlive/tlnet/archive/tipauni.source.r65817.tar.xz
-2023/02/14 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2023/02/14 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
2023/02/14 | 1338 | graphics/pgf/contrib/scsnowman/LICENSE
2023/02/14 | 133379 | macros/luatex/latex/luacomplex/luacomplex.pdf
2023/02/14 | 119220 | macros/luatex/latex/luacomplex.zip
-2023/02/14 | 113832 | systems/texlive/tlnet/archive/texlive-scripts.r65811.tar.xz
+2023/02/14 | 115855217 | macros/context/latest/cont-tmf.zip
2023/02/14 | 101140 | macros/latex/contrib/pagecolor/pagecolor-crop-example.pdf
-2023/02/13 | 98087 | macros/latex/contrib/postnotes/postnotes.dtx
2023/02/13 | 9804 | systems/texlive/tlnet/archive/uptex-base.r65802.tar.xz
2023/02/13 | 958 | biblio/bibtex/utils/bibcop/bibcop.1
2023/02/13 | 920892 | macros/latex/required/babel/base/babel.pdf
-2023/02/13 | 881 | macros/latex/contrib/postnotes/README.md
2023/02/13 | 870 | macros/latex/contrib/hagenberg-thesis/latex/hgbmath.sty
2023/02/13 | 848447 | macros/latex/required/babel/base/locale.zip
-2023/02/13 | 838960 | macros/latex/contrib/postnotes/postnotes-code.pdf
2023/02/13 | 823 | macros/latex/contrib/zref-clever/README.md
2023/02/13 | 797312 | systems/texlive/tlnet/archive/jsclasses.doc.r65801.tar.xz
2023/02/13 | 7869 | macros/latex/required/babel/base/babel.ins
@@ -106,7 +389,6 @@
2023/02/13 | 762757 | macros/latex/required/babel/base/babel.dtx
2023/02/13 | 7398 | macros/latex/contrib/hagenberg-thesis/latex/hgbbib.sty
2023/02/13 | 735 | support/epspdf/README
-2023/02/13 | 7357 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2023/02/13 | 716427 | graphics/pstricks/contrib/pst-poker/doc/pst-poker-doc.pdf
2023/02/13 | 70 | macros/latex/contrib/zref-clever/DEPENDS.txt
2023/02/13 | 698 | macros/latex/contrib/hagenberg-thesis/README.md
@@ -127,7 +409,6 @@
2023/02/13 | 41959 | macros/latex/contrib/resolsysteme/doc/ResolSysteme-doc.tex
2023/02/13 | 41912 | systems/texlive/tlnet/archive/bithesis.source.r65799.tar.xz
2023/02/13 | 409459 | macros/latex/contrib/hagenberg-thesis/doc/hagenberg-thesis.pdf
-2023/02/13 | 40075 | macros/latex/contrib/postnotes/postnotes.tex
2023/02/13 | 39548 | systems/texlive/tlnet/archive/pdftex.r65808.tar.xz
2023/02/13 | 37744 | graphics/pstricks/contrib/pst-poker/latex/pst-poker.sty
2023/02/13 | 37530 | macros/unicodetex/latex/tipauni/tipauni-example.pdf
@@ -148,11 +429,9 @@
2023/02/13 | 291718 | macros/luatex/generic/evangelion-jfm/Evangelion-doc.pdf
2023/02/13 | 2683 | biblio/bibtex/utils/bibcop/README.md
2023/02/13 | 2628 | biblio/bibtex/utils/bibcop/bibcop.ins
-2023/02/13 | 2584 | macros/latex/contrib/postnotes/postnotes.ins
2023/02/13 | 25660 | macros/latex/contrib/nicefilelist/tex/nicefilelist.sty
2023/02/13 | 24 | biblio/bibtex/utils/bibcop/DEPENDS.txt
2023/02/13 | 24857 | support/epspdf/doc/epspdf.texi
-2023/02/13 | 2465 | macros/latex/contrib/postnotes/CHANGELOG.md
2023/02/13 | 232404 | systems/texlive/tlnet/archive/tcolorbox.r65800.tar.xz
2023/02/13 | 22992 | systems/texlive/tlnet/archive/bithesis.r65799.tar.xz
2023/02/13 | 2219 | macros/latex/contrib/nicefilelist/README
@@ -174,7 +453,6 @@
2023/02/13 | 1893609 | macros/latex/contrib/hagenberg-thesis/doc/hagenberg-thesis-tutorial-en.pdf
2023/02/13 | 18549 | macros/latex/contrib/nicefilelist/source/nicefilelist.tex
2023/02/13 | 1848 | macros/latex/contrib/hagenberg-thesis/latex/hgbabbrev.sty
-2023/02/13 | 177382 | macros/latex/contrib/postnotes/postnotes.pdf
2023/02/13 | 17158 | macros/luatex/generic/evangelion-jfm/jfm-eva.lua
2023/02/13 | 1700 | macros/unicodetex/latex/tipauni/tipauni.ins
2023/02/13 | 1685007 | install/macros/latex/contrib/zref-clever.tds.zip
@@ -185,10 +463,8 @@
2023/02/13 | 1539 | macros/latex/contrib/zref-clever/zref-clever-code.tex
2023/02/13 | 15329 | macros/luatex/generic/evangelion-jfm/Evangelion-doc.tex
2023/02/13 | 15020 | systems/texlive/tlnet/archive/pxpic.source.r65803.tar.xz
-2023/02/13 | 14 | macros/latex/contrib/postnotes/DEPENDS.txt
2023/02/13 | 14488 | macros/latex/contrib/hagenberg-thesis/doc/hagenberg-thesis.tex
2023/02/13 | 1443584 | systems/texlive/tlnet/archive/tex4ht.source.r65804.tar.xz
-2023/02/13 | 1439 | macros/latex/contrib/postnotes/postnotes-code.tex
2023/02/13 | 1437 | macros/latex/contrib/nicefilelist/doc/SrcFILEs.txt
2023/02/13 | 14239 | biblio/bibtex/utils/bibcop/bibcop.dtx
2023/02/13 | 136384 | systems/texlive/tlnet/archive/tex4ht.doc.r65804.tar.xz
@@ -205,7 +481,6 @@
2023/02/13 | 1083 | biblio/bibtex/utils/bibcop/LICENSE.txt
2023/02/13 | 1063 | macros/luatex/generic/evangelion-jfm/LICENSE
2023/02/13 | 1050644 | systems/texlive/tlnet/archive/bithesis.doc.r65799.tar.xz
-2023/02/13 | 1020550 | macros/latex/contrib/postnotes.zip
2023/02/13 | 0 | macros/latex/contrib/nicefilelist/source/empty.f
2023/02/12 | 99833 | macros/latex/contrib/tcolorbox/tcolorbox.sty
2023/02/12 | 981 | macros/latex/contrib/tcolorbox/tcbxparse.code.tex
@@ -223,7 +498,6 @@
2023/02/12 | 83900 | systems/texlive/tlnet/archive/luatexja.source.r65790.tar.xz
2023/02/12 | 83789 | macros/latex/contrib/tcolorbox/tcbskins.code.tex
2023/02/12 | 8355 | macros/latex/contrib/tcolorbox/tcolorbox-example.tex
-2023/02/12 | 8148 | systems/texlive/tlnet/archive/lualinalg.r65791.tar.xz
2023/02/12 | 8006 | macros/latex/contrib/resolsysteme/doc/ResolSysteme-exemples-pyluatex.tex
2023/02/12 | 7928 | macros/latex/contrib/tcolorbox/tcolorbox.doc.graphics.tex
2023/02/12 | 78734 | macros/jptex/latex/jsclasses/jslogo.pdf
@@ -289,7 +563,6 @@
2023/02/12 | 28067 | support/TeX4ht/source/Makefile
2023/02/12 | 273436 | systems/texlive/tlnet/archive/langsci.doc.r65793.tar.xz
2023/02/12 | 2649 | macros/unicodetex/latex/bithesis/contributing-zh.md
-2023/02/12 | 261108 | systems/texlive/tlnet/archive/lualinalg.doc.r65791.tar.xz
2023/02/12 | 2591 | macros/latex/contrib/tcolorbox/tcbprocessing.code.tex
2023/02/12 | 25816 | macros/latex/contrib/tcolorbox/tcolorbox.doc.external.tex
2023/02/12 | 25557 | macros/latex/contrib/tcolorbox/tcolorbox.doc.poster.tex
@@ -2621,156 +2894,3 @@
2023/02/09 | 1000 | graphics/asymptote/doc/FAQ/Makefile
2023/02/09 | 10006 | graphics/asymptote/base/rationalSimplex.asy
2023/02/09 | 100007 | graphics/asymptote/cudareflect/tinyexr/examples/exrview/ThirdPartyLibs/nativefiledialog/screens/open_cocoa.png
-2023/02/08 | 966 | macros/jptex/generic/uptex-base/00readme_uptex.txt
-2023/02/08 | 932 | macros/latex/contrib/hyperref/doc/hyperref-doc2.html
-2023/02/08 | 92038 | macros/jptex/generic/uptex-base/samples/adobe-gb-utf8.tex
-2023/02/08 | 9132 | macros/jptex/generic/uptex-base/samples/bkmk-utf8.tex
-2023/02/08 | 882 | macros/latex/contrib/hyperref/doc/hyperref-doc5.html
-2023/02/08 | 880 | systems/texlive/tlnet/archive/dvisvgm.r65754.tar.xz
-2023/02/08 | 880463 | macros/latex/contrib/hyperref/hyperref.dtx
-2023/02/08 | 8735 | macros/jptex/generic/uptex-base/ukinsoku.tex
-2023/02/08 | 870 | macros/jptex/generic/uptex-base/samples/texxet-jis.tex
-2023/02/08 | 8709180 | systems/texlive/tlnet/archive/pdfmanagement-testphase.doc.r65754.tar.xz
-2023/02/08 | 848 | macros/latex/contrib/cascade/README.md
-2023/02/08 | 813 | macros/jptex/generic/uptex-base/samples/console_io.tex
-2023/02/08 | 795 | macros/latex/contrib/hyperref/doc/hyperref-doc8.html
-2023/02/08 | 795 | macros/latex/contrib/hyperref/doc/hyperref-doc7.html
-2023/02/08 | 795 | macros/latex/contrib/hyperref/doc/hyperref-doc3.html
-2023/02/08 | 793 | macros/latex/contrib/hyperref/doc/hyperref-doc6.html
-2023/02/08 | 7596 | systems/texlive/tlnet/archive/physics2.r65752.tar.xz
-2023/02/08 | 75624 | systems/texlive/tlnet/archive/pdfmanagement-testphase.r65754.tar.xz
-2023/02/08 | 7536 | macros/latex/contrib/hyperref/hyperref-patches.dtx
-2023/02/08 | 74011 | macros/jptex/generic/uptex-base/samples/adobe-cns-utf8.tex
-2023/02/08 | 73 | macros/jptex/generic/uptex-base/euptex.ini
-2023/02/08 | 71128 | macros/latex/contrib/cascade/cascade-french.pdf
-2023/02/08 | 6784 | macros/jptex/generic/uptex-base/samples/aozora-ujreport-utf8.tex
-2023/02/08 | 6782 | macros/jptex/generic/uptex-base/samples/aozora-ujbook-utf8.tex
-2023/02/08 | 6748 | macros/jptex/generic/uptex-base/samples/aozora-ujarticle-utf8.tex
-2023/02/08 | 6704 | macros/jptex/generic/uptex-base/samples/aozora-utreport-utf8.tex
-2023/02/08 | 6702 | macros/jptex/generic/uptex-base/samples/aozora-utbook-utf8.tex
-2023/02/08 | 6677 | macros/jptex/generic/uptex-base/samples/set3-check-h-utf8.tex
-2023/02/08 | 66769 | support/pmx/doc/ref300.pdf
-2023/02/08 | 6668 | macros/jptex/generic/uptex-base/samples/aozora-utf8.tex
-2023/02/08 | 6668 | macros/jptex/generic/uptex-base/samples/aozora-utarticle-utf8.tex
-2023/02/08 | 61 | macros/jptex/generic/uptex-base/uptex.ini
-2023/02/08 | 6115 | macros/jptex/generic/uptex-base/samples/bkmk-jis.tex
-2023/02/08 | 599124 | systems/texlive/tlnet/archive/l3kernel.source.r65749.tar.xz
-2023/02/08 | 5736 | macros/latex/contrib/hyperref/xr-hyper.sty
-2023/02/08 | 563 | macros/jptex/generic/uptex-base/samples/area-uptex.mp
-2023/02/08 | 5420 | macros/jptex/generic/uptex-base/samples/jbib1-jis.tex
-2023/02/08 | 5412 | macros/jptex/generic/uptex-base/samples/jbib2-utf8.tex
-2023/02/08 | 53462 | macros/jptex/generic/uptex-base/samples/adobe-kr-utf8.tex
-2023/02/08 | 5212 | macros/jptex/generic/uptex-base/samples/otfsmpl-uplatex.tex
-2023/02/08 | 519795 | macros/latex/contrib/hyperref/doc/hyperref-doc.html
-2023/02/08 | 5086 | macros/latex/contrib/hyperref/hyperref.ins
-2023/02/08 | 50695 | macros/latex/contrib/hyperref/hluatex.dtx
-2023/02/08 | 48691 | macros/jptex/generic/uptex-base/samples/adobe-jp-utf8.tex
-2023/02/08 | 4791 | macros/jptex/generic/uptex-base/samples/sangoku-uplatex.tex
-2023/02/08 | 475 | macros/jptex/generic/uptex-base/samples/area-jis.mp
-2023/02/08 | 471 | macros/jptex/generic/uptex-base/samples/area-utf8.mp
-2023/02/08 | 458 | macros/jptex/generic/uptex-base/samples/area-sjis.mp
-2023/02/08 | 457 | macros/jptex/generic/uptex-base/samples/area-euc.mp
-2023/02/08 | 4492210 | install/macros/latex/contrib/hyperref.tds.zip
-2023/02/08 | 4479 | macros/latex/contrib/hyperref/README.md
-2023/02/08 | 438106 | macros/latex/contrib/hyperref/doc/hyperref-linktarget.pdf
-2023/02/08 | 4370 | graphics/pgf/contrib/sacsymb/sacsymb.sty
-2023/02/08 | 4311254 | macros/latex/contrib/hyperref.zip
-2023/02/08 | 4147 | macros/latex/contrib/proflycee/tex/proflycee-tools-pythontex.tex
-2023/02/08 | 4089 | macros/jptex/generic/uptex-base/samples/sangoku-uptex.tex
-2023/02/08 | 40689 | graphics/pgf/contrib/sacsymb/sacsymb-doc.pdf
-2023/02/08 | 3886 | macros/jptex/generic/uptex-base/samples/testrun.bat
-2023/02/08 | 384001 | macros/latex/contrib/hyperref/doc/slides.pdf
-2023/02/08 | 372 | macros/jptex/generic/uptex-base/samples/box-utf8.eps
-2023/02/08 | 3632 | macros/jptex/generic/uptex-base/samples/utfsmpl-uplatex.tex
-2023/02/08 | 356 | macros/latex/contrib/uol-physics-report/README
-2023/02/08 | 3563 | macros/jptex/generic/uptex-base/samples/jbtest.bib
-2023/02/08 | 355 | macros/jptex/generic/uptex-base/samples/box-sjis.eps
-2023/02/08 | 35447 | macros/jptex/generic/uptex-base/01uptex_doc_utf8.txt
-2023/02/08 | 350 | macros/jptex/generic/uptex-base/samples/box-euc.eps
-2023/02/08 | 35056 | macros/jptex/generic/uptex-base/02uptex_changelog_utf8.txt
-2023/02/08 | 3417 | macros/jptex/generic/uptex-base/samples/adobe-cid.tex
-2023/02/08 | 339 | macros/jptex/generic/uptex-base/samples/box-jis.eps
-2023/02/08 | 3232 | systems/texlive/tlnet/archive/exam-lite.r65754.tar.xz
-2023/02/08 | 320 | macros/jptex/generic/uptex-base/samples/bkmk-docinfo.txt
-2023/02/08 | 31 | macros/jptex/generic/uptex-base/samples/iotext.txt
-2023/02/08 | 319115 | macros/latex/contrib/hyperref/doc/hyperref-doc.pdf
-2023/02/08 | 3161 | macros/latex/contrib/hyperref/bmhydoc.sty
-2023/02/08 | 3158 | macros/jptex/generic/uptex-base/samples/simple-u-utf8.tex
-2023/02/08 | 3157 | macros/jptex/generic/uptex-base/samples/greek-uplatex.tex
-2023/02/08 | 284 | macros/latex/contrib/hyperref/ntheorem-hyper.sty
-2023/02/08 | 28408 | macros/latex/contrib/hyperref/backref.dtx
-2023/02/08 | 280 | macros/latex/contrib/hyperref/minitoc-hyper.sty
-2023/02/08 | 2764 | macros/jptex/generic/uptex-base/samples/kinsoku-chk-utf8.tex
-2023/02/08 | 2746 | macros/jptex/generic/uptex-base/samples/widow.tex
-2023/02/08 | 2735 | macros/jptex/generic/uptex-base/samples/simple-utf8.tex
-2023/02/08 | 27160 | macros/latex/contrib/hyperref/nameref.dtx
-2023/02/08 | 2689 | macros/jptex/generic/uptex-base/samples/simple-jis.tex
-2023/02/08 | 26548 | macros/jptex/generic/uptex-base/euptex.src
-2023/02/08 | 2613 | macros/jptex/generic/uptex-base/samples/simple-u-jis.tex
-2023/02/08 | 25207 | macros/latex/contrib/cascade/cascade.dtx
-2023/02/08 | 2500 | macros/jptex/generic/uptex-base/samples/simple-sjis.tex
-2023/02/08 | 2493 | macros/jptex/generic/uptex-base/samples/simple-euc.tex
-2023/02/08 | 247116 | macros/latex/contrib/hyperref/paperslides99.zip
-2023/02/08 | 2383 | macros/jptex/generic/uptex-base/samples/00readme_uptex_samples.txt
-2023/02/08 | 237 | macros/jptex/generic/uptex-base/samples/jstr-uptex.mp
-2023/02/08 | 2368871 | macros/latex/contrib/hyperref/doc/hyperref.pdf
-2023/02/08 | 234 | macros/jptex/generic/uptex-base/samples/jstr-utf8.mp
-2023/02/08 | 227 | macros/jptex/generic/uptex-base/samples/jstr-jis.mp
-2023/02/08 | 221 | macros/jptex/generic/uptex-base/samples/jstr-sjis.mp
-2023/02/08 | 221 | macros/jptex/generic/uptex-base/samples/jstr-euc.mp
-2023/02/08 | 2145 | macros/jptex/generic/uptex-base/README_uptex.txt
-2023/02/08 | 205447 | macros/latex/contrib/hyperref/doc/backref.pdf
-2023/02/08 | 2024 | macros/jptex/generic/uptex-base/samples/yaku-jsc-utf8.tex
-2023/02/08 | 1976 | macros/latex/contrib/proflycee/tex/proflycee-tools-piton.tex
-2023/02/08 | 19499 | macros/latex/contrib/ut-thesis/ut-thesis.dtx
-2023/02/08 | 19445 | macros/latex/contrib/hyperref/hyperref-linktarget.dtx
-2023/02/08 | 1929 | macros/latex/contrib/hyperref/manifest.txt
-2023/02/08 | 191752 | systems/texlive/tlnet/archive/physics2.doc.r65752.tar.xz
-2023/02/08 | 1900 | macros/jptex/generic/uptex-base/samples/jbib3-utf8.tex
-2023/02/08 | 182005 | macros/latex/contrib/uol-physics-report/uol-physics-report.pdf
-2023/02/08 | 1810 | macros/jptex/generic/uptex-base/uptex.tex
-2023/02/08 | 180181 | macros/latex/contrib/uol-physics-report.zip
-2023/02/08 | 180085 | macros/latex/contrib/hyperref/doc/nameref.pdf
-2023/02/08 | 1766 | macros/latex/contrib/proflycee/tex/proflycee-tools-minted.tex
-2023/02/08 | 174668 | systems/texlive/tlnet/archive/l3kernel.r65749.tar.xz
-2023/02/08 | 173192 | macros/latex/contrib/cascade.zip
-2023/02/08 | 1676 | macros/latex/contrib/ut-thesis/README
-2023/02/08 | 166898 | macros/latex/contrib/hyperref/doc/hyperref-doc.tex
-2023/02/08 | 1664 | systems/texlive/tlnet/archive/collection-mathscience.r65753.tar.xz
-2023/02/08 | 16254 | macros/jptex/generic/uptex-base/samples/show_kcat.tex
-2023/02/08 | 1611 | macros/jptex/generic/uptex-base/samples/linebreak.bib
-2023/02/08 | 1601 | macros/jptex/generic/uptex-base/samples/yaku-jsc-jis.tex
-2023/02/08 | 1591 | macros/jptex/generic/uptex-base/LICENSE
-2023/02/08 | 15774 | macros/jptex/generic/uptex-base/samples/Makefile
-2023/02/08 | 15605 | macros/latex/contrib/hyperref/doc/hyperref-doc.css
-2023/02/08 | 148632 | systems/texlive/tlnet/archive/exam-lite.doc.r65754.tar.xz
-2023/02/08 | 1444 | graphics/pgf/contrib/sacsymb/sacsymb-doc.tex
-2023/02/08 | 1419 | macros/jptex/generic/uptex-base/samples/check_enc.pl
-2023/02/08 | 1383 | macros/latex/contrib/uol-physics-report/uol-physics-report.ins
-2023/02/08 | 13795 | macros/jptex/generic/uptex-base/samples/punctuation.tex
-2023/02/08 | 137012 | systems/texlive/tlnet/archive/pdfmanagement-testphase.source.r65754.tar.xz
-2023/02/08 | 136 | macros/jptex/generic/uptex-base/samples/jstr-uptex-incl.tex
-2023/02/08 | 136 | macros/jptex/generic/uptex-base/samples/area-uptex-incl.tex
-2023/02/08 | 135197 | macros/latex/contrib/ut-thesis/ut-thesis.pdf
-2023/02/08 | 134 | macros/jptex/generic/uptex-base/samples/jstr-utf8-incl.tex
-2023/02/08 | 134 | macros/jptex/generic/uptex-base/samples/jstr-sjis-incl.tex
-2023/02/08 | 134 | macros/jptex/generic/uptex-base/samples/area-utf8-incl.tex
-2023/02/08 | 134 | macros/jptex/generic/uptex-base/samples/area-sjis-incl.tex
-2023/02/08 | 133 | macros/jptex/generic/uptex-base/samples/jstr-jis-incl.tex
-2023/02/08 | 133 | macros/jptex/generic/uptex-base/samples/jstr-euc-incl.tex
-2023/02/08 | 133 | macros/jptex/generic/uptex-base/samples/area-jis-incl.tex
-2023/02/08 | 133 | macros/jptex/generic/uptex-base/samples/area-euc-incl.tex
-2023/02/08 | 132446 | macros/latex/contrib/hyperref/doc/paper.pdf
-2023/02/08 | 13007 | macros/jptex/generic/uptex-base/samples/cjk_babel.tex
-2023/02/08 | 122721 | macros/latex/contrib/hyperref/ChangeLog.txt
-2023/02/08 | 11920496 | systems/texlive/tlnet/archive/l3kernel.doc.r65749.tar.xz
-2023/02/08 | 1184 | macros/jptex/generic/uptex-base/samples/umin10x.tfm
-2023/02/08 | 1184 | macros/jptex/generic/uptex-base/samples/min10x.tfm
-2023/02/08 | 11616 | macros/jptex/generic/uptex-base/samples/jis_uni_variation.tex
-2023/02/08 | 11271 | macros/jptex/generic/uptex-base/samples/misc-check-h-utf8.tex
-2023/02/08 | 107332 | systems/texlive/tlnet/archive/dvisvgm.doc.r65754.tar.xz
-2023/02/08 | 10491 | macros/jptex/generic/uptex-base/samples/misc-check-v-utf8.tex
-2023/02/08 | 104662 | graphics/metapost/contrib/macros/repere/repere-doc.tex
-2023/02/08 | 1030 | macros/latex/contrib/hyperref/doc/hyperref-doc4.html
-2023/02/08 | 10100 | macros/latex/contrib/uol-physics-report/uol-physics-report.dtx
-2023/02/08 | 100503 | macros/latex/contrib/cascade/cascade.pdf
diff --git a/biblio/ctan-bibdata/ctan.bib b/biblio/ctan-bibdata/ctan.bib
index 12bff712b9..2c5d5ceecf 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 15-02-2023, 02:04:45
+%% created at 16-02-2023, 02:00:58
%%
%% This file is provided under the terms of the LPPL v1.3 or
@@ -1621,7 +1621,7 @@
title = {The \texttt{alpha-persian} package},
subtitle = {Persian version of alpha.bst},
author = {Madadpour Shapour},
- date = {2019-03-10},
+ date = {2023-02-15},
version = {1.3},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/biblio/bibtex/contrib/alpha-persian},
@@ -2234,8 +2234,8 @@
title = {The \texttt{annotate-equations} package},
subtitle = {Easily annotate math equations using TikZ},
author = {ST John},
- date = {2022-04-06},
- version = {0.1.0},
+ date = {2023-02-15},
+ version = {0.2.0},
license = {mit},
mirror = {https://mirror.ctan.org/macros/latex/contrib/annotate-equations},
url = {https://ctan.org/pkg/annotate-equations},
@@ -8566,7 +8566,7 @@
title = {The \texttt{biolett-bst} package},
subtitle = {A BibTeX style for the journal “Biology Letters”},
author = {Og DeSouza},
- date = {2021-11-26},
+ date = {2023-02-15},
version = {},
license = {lppl1},
mirror = {https://mirror.ctan.org/biblio/bibtex/contrib/biolett-bst},
@@ -16255,7 +16255,7 @@
title = {The \texttt{ctex} package},
subtitle = {\LaTeX{} classes and packages for Chinese typesetting},
author = {Qing Lee and Leo Liu and Liam Huang and Xiangdong Zeng and Zeping Lee and Yukai Chou and Ruixi Zhang and LingYun Wu and Jiang Jiang and Yue Wang and Yanrui Li and Zhichu Chen},
- date = {2022-07-14},
+ date = {2023-02-15},
version = {2.5.10},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/language/chinese/ctex},
@@ -46363,7 +46363,7 @@
title = {The \texttt{musicography} package},
subtitle = {Accessing symbols for music writing with pdfLaTeX},
author = {Andrew A. Cashner},
- date = {2020-01-29},
+ date = {2023-02-15},
version = {},
license = {lppl1.3},
mirror = {https://mirror.ctan.org/macros/latex/contrib/musicography},
@@ -48411,8 +48411,8 @@
title = {The \texttt{novel} package},
subtitle = {Class for printing fiction, such as novels},
author = {Robert Allgeyer},
- date = {2023-02-07},
- version = {1.52},
+ date = {2023-02-15},
+ version = {1.80},
license = {lppl1.3c,ofl},
mirror = {https://mirror.ctan.org/macros/luatex/latex/novel},
url = {https://ctan.org/pkg/novel},
@@ -49005,7 +49005,7 @@
title = {The \texttt{octave} package},
subtitle = {Typeset musical pitches with octave designations},
author = {Andrew A. Cashner},
- date = {2017-10-31},
+ date = {2023-02-15},
version = {},
license = {lppl1.3},
mirror = {https://mirror.ctan.org/macros/latex/contrib/octave},
@@ -49849,8 +49849,8 @@
title = {The \texttt{overarrows} package},
subtitle = {Custom extensible arrows over math expressions},
author = {Julien Labbé},
- date = {2023-01-24},
- version = {1.0.1},
+ date = {2023-02-15},
+ version = {1.1},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/overarrows},
url = {https://ctan.org/pkg/overarrows},
@@ -51091,8 +51091,8 @@
title = {The \texttt{pdfmanagement-testphase} package},
subtitle = {\LaTeX{} PDF management testphase bundle},
author = {{The \LaTeX{} Project Team}},
- date = {2023-02-07},
- version = {0.95u},
+ date = {2023-02-15},
+ version = {0.95v},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/pdfmanagement-testphase},
url = {https://ctan.org/pkg/pdfmanagement-testphase},
@@ -53523,8 +53523,8 @@
title = {The \texttt{postnotes} package},
subtitle = {Endnotes for \LaTeX{}},
author = {Gustavo Barros},
- date = {2023-02-13},
- version = {0.2.1},
+ date = {2023-02-15},
+ version = {0.2.2},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/postnotes},
url = {https://ctan.org/pkg/postnotes},
@@ -56654,8 +56654,8 @@
title = {The \texttt{PyLuaTeX} package},
subtitle = {Execute Python code on the fly in your \LaTeX{} documents},
author = {Tobias Enderle},
- date = {2023-01-14},
- version = {0.6.0},
+ date = {2023-02-15},
+ version = {0.6.1},
license = {mit,lppl1.3c},
mirror = {https://mirror.ctan.org/macros/luatex/latex/pyluatex},
url = {https://ctan.org/pkg/pyluatex},
@@ -65362,8 +65362,8 @@
title = {The \texttt{tagpdf} package},
subtitle = {Tools for experimenting with tagging using pdf\LaTeX{} and LuaLaTeX},
author = {Ulrike Fischer},
- date = {2023-01-30},
- version = {0.98c},
+ date = {2023-02-15},
+ version = {0.98d},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/tagpdf},
url = {https://ctan.org/pkg/tagpdf},
@@ -69562,7 +69562,7 @@
title = {The \texttt{tkz-base} package},
subtitle = {Tools for drawing with a cartesian coordinate system},
author = {Alain Matthes},
- date = {2022-07-15},
+ date = {2023-02-15},
version = {4.2c},
license = {lppl1.3},
mirror = {https://mirror.ctan.org/macros/latex/contrib/tkz/tkz-base},
@@ -69587,7 +69587,7 @@
title = {The \texttt{tkz-doc} package},
subtitle = {Documentation macros for the TKZ series of packages},
author = {Alain Matthes},
- date = {2022-07-15},
+ date = {2023-02-15},
version = {1.45c},
license = {lppl1.3},
mirror = {https://mirror.ctan.org/macros/latex/contrib/tkz-doc},
@@ -69639,7 +69639,7 @@
title = {The \texttt{tkz-kiviat} package},
subtitle = {Draw Kiviat graphs},
author = {Alain Matthes},
- date = {2020-04-11},
+ date = {2023-02-15},
version = {0.1b},
license = {lppl},
mirror = {https://mirror.ctan.org/obsolete/macros/latex/contrib/tkz/tkz-kiviat},
@@ -69650,7 +69650,7 @@
title = {The \texttt{tkz-linknodes} package},
subtitle = {Link nodes in mathematical environments},
author = {Alain Matthes},
- date = {2020-04-11},
+ date = {2023-02-15},
version = {1.1d},
license = {lppl},
mirror = {https://mirror.ctan.org/obsolete/macros/latex/contrib/tkz/tkz-linknodes},
@@ -69672,7 +69672,7 @@
title = {The \texttt{tkz-tab} package},
subtitle = {Tables of signs and variations using PGF/TikZ},
author = {Alain Matthes},
- date = {2020-04-29},
+ date = {2023-02-15},
version = {2.12c},
license = {lppl1.3},
mirror = {https://mirror.ctan.org/macros/latex/contrib/tkz/tkz-tab},
@@ -76479,7 +76479,7 @@
title = {The \texttt{xpinyin} package},
subtitle = {Automatically add pinyin to Chinese characters},
author = {Qing Lee},
- date = {2022-07-14},
+ date = {2023-02-15},
version = {3.1},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/xpinyin},
@@ -77418,7 +77418,7 @@
title = {The \texttt{zhnumber} package},
subtitle = {Typeset Chinese representations of numbers},
author = {Qing Lee},
- date = {2022-07-14},
+ date = {2023-02-15},
version = {3.0},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/zhnumber},
diff --git a/biblio/ctan-bibdata/ctan.pdf b/biblio/ctan-bibdata/ctan.pdf
index c85ecc6835..971e490936 100644
--- a/biblio/ctan-bibdata/ctan.pdf
+++ b/biblio/ctan-bibdata/ctan.pdf
Binary files differ
diff --git a/macros/latex/contrib/annotate-equations/README.md b/macros/latex/contrib/annotate-equations/README.md
index ca25cd8b0b..9f88390701 100644
--- a/macros/latex/contrib/annotate-equations/README.md
+++ b/macros/latex/contrib/annotate-equations/README.md
@@ -1,7 +1,9 @@
# Annotate equations in LaTeX using TikZ
+( [Documentation](annotate-equations.pdf) | License: [MIT](LICENSE) | [CTAN](https://ctan.org/pkg/annotate-equations) )
+
This package provides commands that make it easy to highlight terms in equations & add annotation labels (based on TikZ).
-Should work with pdflatex as well as lualatex.
+Tested with pdflatex and lualatex, but should work with most other LaTeX engines such as xelatex as well.
Inspired by Sibin Mohan's https://github.com/synercys/annotated_latex_equations/
@@ -9,9 +11,6 @@ Please report any bugs, issues, contribute changes & improvements on https://git
Package author: ST John, http://www.infinitecuriosity.org/
-License: [MIT](LICENSE)
-
-[Documentation](annotate-equations.pdf)
## A package with reusable commands
diff --git a/macros/latex/contrib/annotate-equations/annotate-equations.pdf b/macros/latex/contrib/annotate-equations/annotate-equations.pdf
index 984daaf8ad..b29c607771 100644
--- a/macros/latex/contrib/annotate-equations/annotate-equations.pdf
+++ b/macros/latex/contrib/annotate-equations/annotate-equations.pdf
Binary files differ
diff --git a/macros/latex/contrib/annotate-equations/annotate-equations.sty b/macros/latex/contrib/annotate-equations/annotate-equations.sty
index a5dbf002f3..dbdd5f59f5 100644
--- a/macros/latex/contrib/annotate-equations/annotate-equations.sty
+++ b/macros/latex/contrib/annotate-equations/annotate-equations.sty
@@ -5,7 +5,7 @@
%
\NeedsTeXFormat{LaTeX2e}[1994/06/01]
\ProvidesPackage{annotate-equations}
- [2022/03/29 v0.1.0 easily annotate equations using TikZ]
+ [2023/02/15 v0.2.0 easily annotate equations using TikZ]
%%% lualatex compatibility, from https://tex.stackexchange.com/a/351520/171664
\RequirePackage{ifluatex}
@@ -36,7 +36,8 @@
\newcommand{\eqnhighlightshade}{17} % light
%\renewcommand{\eqnhighlightshade}{47} % dark
-\newcommand{\eqnannotationtext}[1]{\sffamily\footnotesize#1\strut} %%% TODO remove textsf/footnotesize/strut?
+\newcommand{\eqnannotationstrut}{\strut} % Package default
+\newcommand{\eqnannotationfont}{\sffamily\footnotesize}
\providecommand\EAmarkanchor{north} % default set to "above"
@@ -126,10 +127,12 @@
\def\myEAcolor{\usevalue{\myEAmarkOne}}%
\begin{tikzpicture}[overlay,remember picture,>=stealth,nodes={align=left,inner ysep=1pt},<-]
% default anchor is at center
- \node[anchor=\swapNorthSouth{\EAmarkanchor},color=\myEAcolor!85,#1] % color blended with white to 85%, any (optional) extra args #1
+ \node[anchor=\swapNorthSouth{\EAmarkanchor},color=\myEAcolor!85,
+ font=\eqnannotationfont,#1
+ ] % color blended with white to 85%, any (optional) extra args #1
(\eqnannotateCurrentNode) % use counter-based "local node"
at ($(\myEAmarkOne.\EAmarkanchor)!0.5!(\myEAmarkTwo.\EAmarkanchor)$) % centered between the two nodes
- {\eqnannotationtext{\myEAtext}};
+ {\myEAtext\eqnannotationstrut};
% double arrow to two uses within the equation:
\draw [<->,color=\myEAcolor] (\myEAmarkOne.\EAmarkanchor) |- ([yshift=0.1ex] \eqnannotateCurrentNode.\EAlabelanchor) -| (\myEAmarkTwo.\EAmarkanchor); % from node 1 via annotation to node 2, with anchor #6 each
\end{tikzpicture}%
@@ -167,11 +170,12 @@
%
\def\myEAxshift{\EAxshift{\EAwesteast}}%
\begin{tikzpicture}[overlay,remember picture,>=stealth,nodes={align=left,inner ysep=1pt},<-]
- \node[anchor=\swapNorthSouth{\EAmarkanchor} \swapWestEast{\EAwesteast},color=\myEAcolor!85,#1] % TODO for some reason, passing #1 through command doesn't work...
+ \node[anchor=\swapNorthSouth{\EAmarkanchor} \swapWestEast{\EAwesteast},
+ color=\myEAcolor!85,font=\eqnannotationfont,#1] % TODO for some reason, passing #1 through command doesn't work...
% anchor=west: align left edge of text on top of tikzmark in equation
% should be north west for below and south west for above ...
(\eqnannotateCurrentNode) at (\myEAmark.\EAmarkanchor) % \EAmarkanchor north: above the equation, south: below
- {\eqnannotationtext{\myEAtext}};
+ {\myEAtext\eqnannotationstrut};
\foreach \EAmark in \myEAmarks
\draw [color=\myEAcolor] (\EAmark.\EAmarkanchor) % arrow from the equation
% \EAmarkanchor north: above the equation, south: below
diff --git a/macros/latex/contrib/annotate-equations/annotate-equations.tex b/macros/latex/contrib/annotate-equations/annotate-equations.tex
index 2b492a36e4..26396e679e 100644
--- a/macros/latex/contrib/annotate-equations/annotate-equations.tex
+++ b/macros/latex/contrib/annotate-equations/annotate-equations.tex
@@ -50,6 +50,8 @@ This package is there to make it easier to make annotated equations in \LaTeX, s
\end{LTXexample}
There is still a bit of manual tweaking required (such as adding vertical space before/after the equation), but hopefully this package will already make it a bit more inviting to annotate your equations!
+Note that this package relies on TikZ's \texttt{remember picture} option and therefore you have to compile your \LaTeX{} document at least twice to get everything in the right place (or just use \texttt{latexmk}!).
+
\section{Marking annotation targets within your equation}
\newcommand{\cmdoption}[1]{$\langle$\textit{#1}$\rangle$}
@@ -61,7 +63,7 @@ or
to define the target of an annotation within your equation. \verb|\eqnmarkbox| adds background shading, whereas \verb|\eqnmark| changes the text color.
(You can also use
\verb|\tikzmarknode{|\cmdoption{node name}\verb|}{|\cmdoption{equation term(s)}\verb|}|,
-but this is likely to end up with the arrow tip too close to the target.)
+but this is likely to end up with the arrow tip too close to the target, so you may want to also pass the \texttt{outer ysep} option, see \cref{sec:outerysep}.)
%
\begin{LTXexample}[text outside listing,lefthand width=1in]
\begin{equation*}
@@ -94,7 +96,7 @@ For \cmdoption{annotate keys}, see \cref{sec:annotate-keys}.
\noindent
%
\label{sec:tikz-options}
-You generally need to manually adjust the \texttt{yshift} to move the annotations to an appropriate distance above (or negative values for below) the equation.
+You generally need to manually adjust the \texttt{yshift} to move the annotations to an appropriate distance above (or negative values for below) the equation. If you want an annotation below the equation, with negative \texttt{yshift}, remember to also pass the \texttt{below} option (see \cref{sec:annotate-keys}).
(You can also adjust \texttt{xshift} if needed, also positive or negative.)
The annotation picks the same text color as given to \verb|\eqnmarkbox| or \verb|\eqnmark|, but you can also override it using \texttt{color} option.
@@ -152,6 +154,7 @@ Color is picked from the first of the two nodes.
%
\begin{LTXexample}[text outside listing,lefthand width=0.5in]
\renewcommand{\eqnhighlightheight}{} % package default
+
\begin{equation*}
\eqnmarkbox[red]{hbar}{\hbar} \eqnmarkbox[blue]{q}{q}
\end{equation*}
@@ -160,6 +163,7 @@ Color is picked from the first of the two nodes.
%
\begin{LTXexample}[text outside listing,lefthand width=0.5in]
\renewcommand{\eqnhighlightheight}{\mathstrut} % 0-width "constant" height
+
\begin{equation*}
\eqnmarkbox[red]{hbar}{\hbar} \eqnmarkbox[blue]{q}{q}
\end{equation*}
@@ -173,6 +177,7 @@ Note that in some cases \verb|\mathstrut| might not be enough, as in the introdu
%
\begin{LTXexample}[text outside listing,lefthand width=0.5in]
\renewcommand{\eqnhighlightheight}{\mathstrut} % 0-width "constant" height
+
\begin{equation*}
\eqnmarkbox[red]{Hhat}{\hat{H}} \eqnmarkbox[blue]{Psi}{\Psi}
\end{equation*}
@@ -183,6 +188,7 @@ You can create custom 0-width characters using \verb|\vphantom|:
%
\begin{LTXexample}[text outside listing,lefthand width=0.5in]
\renewcommand{\eqnhighlightheight}{\vphantom{\hat{H}}\mathstrut} % custom 0-width height
+
\begin{equation*}
\eqnmarkbox[red]{Hhat}{\hat{H}} \eqnmarkbox[blue]{Psi}{\Psi}
\end{equation*}
@@ -197,6 +203,7 @@ You can create custom 0-width characters using \verb|\vphantom|:
%
\begin{LTXexample}[text outside listing,lefthand width=0.5in]
\renewcommand{\eqnhighlightshade}{17} % package default
+
\begin{equation*}
\eqnmarkbox[red]{hbar}{\hbar} \eqnmarkbox[blue]{q}{q}
\end{equation*}
@@ -207,6 +214,7 @@ By redefining this command, you can change the ``alpha'' value of the highlight:
%
\begin{LTXexample}[text outside listing,lefthand width=0.5in]
\renewcommand{\eqnhighlightshade}{47} % 0 is white, 100 is solid color
+
\begin{equation*}
\eqnmarkbox[red]{hbar}{\hbar} \eqnmarkbox[blue]{q}{q}
\end{equation*}
@@ -215,10 +223,9 @@ By redefining this command, you can change the ``alpha'' value of the highlight:
\subsection{Default formatting of annotation labels}
-\verb|\eqnannotationtext| is a one-argument command that gets the annotation text as an argument and can be used to have consistent formatting:
+\verb|\eqnannotationfont| sets the \texttt{font} field of the TikZ annotation label and can be re-set to change its formatting:
\begin{LTXexample}[text outside listing,lefthand width=0.5in]
-% package default:
-\renewcommand{\eqnannotationtext}[1]{\sffamily\footnotesize#1\strut}
+\renewcommand{\eqnannotationfont}{\sffamily\footnotesize} % package default
\begin{equation*}
\eqnmarkbox[blue]{v}{v}
@@ -228,10 +235,8 @@ By redefining this command, you can change the ``alpha'' value of the highlight:
\end{LTXexample}
\noindent
%
-(The \verb|\strut| has a similar effect to \verb|\mathstrut| in \verb|\eqnhighlightheight|.)
-%
\begin{LTXexample}[text outside listing,lefthand width=0.5in]
-\renewcommand{\eqnannotationtext}[1]{\bfseries\small#1}
+\renewcommand{\eqnannotationfont}{\bfseries\small}
\begin{equation*}
\eqnmarkbox[blue]{v}{v}
@@ -240,43 +245,78 @@ By redefining this command, you can change the ``alpha'' value of the highlight:
\vspace{1em}
\end{LTXexample}
\noindent
-%
-\section{Recommendations, tips \& tricks}
-
-\subsection{Use \texttt{\textbackslash{}colorlet} for consistent, easily changeable colors}
+\verb|\eqnannotationstrut| is defined to be a strut (zero-width height) to
+provide minimum distance between the text and the corresponding arrow line. By
+default it is \verb|\strut|, which has a similar effect to
+\verb|\mathstrut| in \verb|\eqnhighlightheight|.
-\subsection{Line breaks within annotations}
-\label{sec:multiline}
-
-Possible, but a bit annoying. By default, the formatting only covers the first line:
-%
\begin{LTXexample}[text outside listing,lefthand width=0.5in]
+\renewcommand{\eqnannotationstrut}{\strut} % package default
+
\begin{equation*}
- \eqnmarkbox[blue]{h}{h}
+ \eqnmarkbox[blue]{size}{s}
\end{equation*}
-\annotate[yshift=-0.5em]{below}{h}{Planck\\constant}
+\annotate[yshift=-0.5em]{below}{size}{The size}
\vspace{1em}
\end{LTXexample}
\noindent
%
-Here is a manual work-around:
-%
\begin{LTXexample}[text outside listing,lefthand width=0.5in]
+\renewcommand{\eqnannotationstrut}{}
+
\begin{equation*}
- \eqnmarkbox[blue]{h}{h}
+ \eqnmarkbox[blue]{size}{s}
\end{equation*}
-\annotate[yshift=-0.5em]{below}{h}{Planck\\\sffamily\footnotesize constant}
+\annotate[yshift=-0.5em]{below}{size}{The size}
\vspace{1em}
\end{LTXexample}
+
+
+\section{Recommendations, tips \& tricks}
+
+\subsection{Use \texttt{\textbackslash{}colorlet} for consistent, easily changeable colors}
+
+
+\subsection{Relations such as ``$=$''}
+\label{sec:mathrel}
+
+Wrapping a mathematical relation symbol such as {\color{blue}$=$} in, for example, \texttt{\textbackslash{}tikzmarknode}, breaks how \TeX{} determines spacing in equations:
+\begin{LTXexample}[text outside listing,lefthand width=0.5in]
+\[
+a \tikzmarknode{node1}{=} b
+\]
+\annotate[yshift=-1em]{below}{node1}{equality}
+\end{LTXexample}
\noindent
+This can be fixed by wrapping the \texttt{\textbackslash{}tikzmarknode} in \texttt{\textbackslash{}mathrel}:
+\begin{LTXexample}[text outside listing,lefthand width=0.5in]
+\[
+a \mathrel{\tikzmarknode{node1}{=}} b
+\]
+\annotate[yshift=-1em]{below}{node1}{equality}
+\end{LTXexample}
+
+\subsection{Extra spacing between \texttt{\textbackslash{}tikzmarknode} and arrow}
+\label{sec:outerysep}
+
+If you want more space between arrow tip and annotated term, you can pass the \texttt{outer ysep} option to \texttt{\textbackslash{}tikzmarknode}:
+\begin{LTXexample}[text outside listing,lefthand width=0.5in]
+\[
+a \mathrel{\tikzmarknode[outer ysep=5pt]{node1}{=}} b
+\]
+\annotate[yshift=-1em]{below}{node1}{equality}
+\end{LTXexample}
+
+
\section{Known issues}
\begin{itemize}
- \item \texttt{label above}/\texttt{label below} not implemented for \verb|\annotate|.
+ \item \texttt{label above}/\texttt{label below} is not implemented for \verb|\annotate|.
+
+ \item Annotations of mathematical relations require some manual patching to get the correct surrounding spacing (see \cref{sec:mathrel}).
- \item Formatting only covers first line in multi-line annotation texts (see \cref{sec:multiline}).
\end{itemize}
\end{document}
diff --git a/macros/latex/contrib/overarrows/overarrows.dtx b/macros/latex/contrib/overarrows/overarrows.dtx
index 1b3700b3f0..419593f577 100644
--- a/macros/latex/contrib/overarrows/overarrows.dtx
+++ b/macros/latex/contrib/overarrows/overarrows.dtx
@@ -16,7 +16,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\ProvidesPackage{overarrows}
%<*package>
-[2023/01/19 v1.0.1 Custom extensible arrows over math expressions]
+[2023/02/15 v1.1 Custom extensible arrows over math expressions]
%</package>
%
%<*driver>
@@ -243,7 +243,7 @@
%
% \subsection{Stack and arrow macros}
%
-% It worth looking at the definition of \pkg{amsmath} \cs{overrightarrow}
+% It's worth looking at the definition of \pkg{amsmath} \cs{overrightarrow}
% command:
% \iffalse
%<*example>
@@ -1116,6 +1116,20 @@ $ \overbandedarrow{v} \qquad \overbandedarrow{AB} $
% a subscript follows.
% \end{docOption}
%
+% \begin{docOption}{subother}
+% Sets to 12 (\emph{other} catcode category) the catcode of the ``|_|" symbol
+% used for subscript detection, when this is enabled by the key \refKey{detect
+% subscripts} (see the section~\ref{sec:non-standard-subscripts},
+% page~\pageref{sec:non-standard-subscripts}).
+% \end{docOption}
+%
+% \begin{docOption}{subactive}
+% Sets to 13 (\emph{active} catcode category) the catcode of the ``|_|" symbol
+% used for subscript detection, when this is enabled by the key \refKey{detect
+% subscripts} (see the section~\ref{sec:non-standard-subscripts},
+% page~\pageref{sec:non-standard-subscripts}).
+% \end{docOption}
+%
% \begin{docOption}{debug}
% Writes the meaning of defined commands in \LaTeX{} log.
% \end{docOption}
@@ -1671,6 +1685,10 @@ $ \dot{\overharpoonsdown{v}} \qquad \ddot{\overharpoonsdown{AB}}$
% When the option \refOpt{subscripts} is set, the initial value of
% \refKey*{detect subscripts} is |true|.
%
+% Note that the detection may fail when the standard subscript command is
+% changed or altered (see the section~\ref{sec:non-standard-subscripts},
+% page~\pageref{sec:non-standard-subscripts}).
+%
% \iffalse
%<*example>
% \fi
@@ -2010,6 +2028,13 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
%
% \subsubsection{Advanced commands}
%
+% \begin{docCommand}{SetOverArrowsSubscriptCommand}{\marg{command}}
+% Sets to \meta{command} the command used for subscript detection, when this
+% is enabled by the key \refKey{detect subscripts} (see the
+% section~\ref{sec:non-standard-subscripts},
+% page~\pageref{sec:non-standard-subscripts}).
+% \end{docCommand}
+%
% \begin{docCommands}{%
% {
% doc name=SetOverArrowsMethod,
@@ -2095,7 +2120,9 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
%
% \section{Complements}
%
-% \subsection{Math font issue}
+% \subsection{Know issues}
+%
+% \subsubsection{Math font change}
%
% If the math font differs from the default \emph{Computer Modern}, arrow drawn
% with the |symb| method may have a central part of the arrow with inappropriate
@@ -2104,6 +2131,60 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
% \symb{\relbareda} from the \pkg{esvect} package. This can be fixed with the
% \refOpt{noesvect} option.
%
+% \subsubsection{Detection of non standard subscripts}
+% \label{sec:non-standard-subscripts}
+%
+% The subscript detection enabled by the key \refKey{detect subscripts} is based
+% on the \LaTeX{} macro \cs{@ifnextchar}. The detection may fail if the standard
+% subscript command is modified of altered. This is the case, as example:
+% \begin{itemize}
+% \item with the \pkg{spbmark} package
+% (\url{https://www.ctan.org/pkg/spbmark}), by Qu Yi, which allows a complete
+% customisation of subscripts, through the \cs{sub} command;
+% \item with the \pkg{altsubsup} package
+% (\url{https://www.ctan.org/pkg/altsubsup}), by Julien Labb\'e, which
+% provides an alternative subscript format, and changes, for this purpose, the
+% catcode of the underscore symbol ``|_|" from 8 (\emph{subscript} catcode
+% category) to 12 (\emph{other} catcode category).
+% \end{itemize}
+%
+% To handle theses cases, the command used for subscript detection can be
+% redefined with \refCom{SetOverArrowsSubscriptCommand}. Compatibility with the
+% \pkg{spbmark} package is then obtained by:
+% \iffalse
+%<*example>
+% \fi
+\begin{dispListing}
+\SetOverArrowsSubscriptCommand{\sub}
+\end{dispListing}
+% \iffalse
+%</example>
+% \fi
+% \noindent In the same way, with the \pkg{altsubsup} package, add:
+% \iffalse
+%<*example>
+% \fi
+\begin{dispListing}
+\SetOverArrowsSubscriptCommand{_}
+\end{dispListing}
+% \iffalse
+%</example>
+% \fi
+% \noindent after the \cs{begin}|{document}| (namely, after the catcode
+% redefinition done by \pkg{altsubsup}).
+%
+% \medskip
+%
+% Alternatively, two package options handle the cases where the catcode of the
+% underscore ``|_|" symbol is changed: \refOpt{subother} (for catcode 12, or
+% \emph{other}) and \refOpt{subactive} (for catcode 13, or \emph{active}).
+% Hence, setting the \refOpt{subother} option is sufficient for compatibility
+% with the \pkg{altsubsup} package (no need of
+% \refCom{SetOverArrowsSubscriptCommand}). Note, that with options
+% \refOpt{subother} and \refOpt{subactive}, the command \refCom{TestOverArrow*}
+% may give bad results for kerning test, as defined before the
+% catcode redefinition.
+%
% \subsection{Package dependencies}
%
% The following packages are used by \pkg{overarrows}:
@@ -2145,6 +2226,7 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
% \subsection{Changelog}
%
% \begin{description}
+% \item[v1.1] Support for non-standard subscripts
% \item[v1.0.1] Bug fix for under* options.
% \item[v1.0] Initial version.
% \end{description}
@@ -2160,7 +2242,7 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
% \setlength{\parindent}{0em}
% \setlength{\parskip}{\smallskipamount}
%
-%\subsection*{Management of options}
+% \subsection*{Management of options}
%
% \subsubsection*{Declaration of conditionals}
%
@@ -2170,6 +2252,8 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
\newif\ifovar@option@tikz@
\newif\ifovar@option@pstarrows@
\newif\ifovar@detectsubscripts@
+\newif\ifovar@option@subother@
+\newif\ifovar@option@subactive@
\newif\ifovar@option@debug@
% \end{macrocode}
%
@@ -2211,6 +2295,8 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
\DeclareOption{tikz}{\ovar@option@tikz@true}
\DeclareOption{pstarrows}{\ovar@option@pstarrows@true}
\DeclareOption{subscripts}{\ovar@detectsubscripts@true}
+\DeclareOption{subother}{\ovar@option@subother@true}
+\DeclareOption{subactive}{\ovar@option@subactive@true}
\DeclareOption{debug}{\ovar@option@debug@true}
% \end{macrocode}
%
@@ -2218,7 +2304,6 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
%
% \changes{v1.0.1}{2023/01/19}{Bug fix for under* options}
%
-%
% \begin{macrocode}
\DeclareOption{overrightarrow}{\ovar@option@overrightarrow@true}
\DeclareOption{underrightarrow}{\ovar@option@underrightarrow@true}
@@ -2327,6 +2412,39 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
\fi
% \end{macrocode}
%
+% \subsection*{Configuration of subscripts detection}
+%
+% \changes{v1.1}{2023/02/15}{Support for non-standard subscripts}
+%
+% \begin{macro}{\SetOverArrowsSubscriptCommand}
+% Sets the subscript command.
+% \begin{macrocode}
+\newcommand{\SetOverArrowsSubscriptCommand}[1]{\global\let\ovar@subcmd=#1}
+% \end{macrocode}
+% \end{macro}
+%
+% Initial configuration.
+% \begin{macrocode}
+\SetOverArrowsSubscriptCommand{_}
+% \end{macrocode}
+% Option \refOpt{subother} for \emph{other} (catcode 12) subscript commands.
+% \begin{macrocode}
+\ifovar@option@subother@
+ \begingroup
+ \catcode `_=12
+ \AddToHook{begindocument/end}{\SetOverArrowsSubscriptCommand{_}}
+ \endgroup
+\fi
+% \end{macrocode}
+% Option \refOpt{subactive} for \emph{active} (catcode 13) subscript commands.
+% \begin{macrocode}
+\ifovar@option@subactive@
+ \begingroup
+ \catcode `_=13
+ \AddToHook{begindocument/end}{\SetOverArrowsSubscriptCommand{_}}
+ \endgroup
+\fi
+% \end{macrocode}
% \subsection*{Management of keys}
%
% \subsubsection*{Family declaration and setters}
@@ -2365,6 +2483,11 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
%
% \begin{macrocode}
\SetOverArrowsMethod*{common}[\undef{\ovar@macro@stack}\undef{\ovar@macro@arrow}]{%
+% \end{macrocode}
+%
+% \refKey{detect subscripts}.
+%
+% \begin{macrocode}
detect subscripts/.is if=ovar@detectsubscripts@,
% \end{macrocode}
%
@@ -2926,7 +3049,11 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
}
\ifovar@detectsubscripts@%
\csgdef{ovar@#2@auto}##1{%
- \@ifnextchar _{%
+% \end{macrocode}
+% \vspace{-2\smallskipamount}%^^A remove space between code blocs
+% \changes{v1.1}{2023/02/15}{Support for non-standard subscripts}
+% \begin{macrocode}
+ \@ifnextchar \ovar@subcmd {%
\csuse{ovar@#2@starred}{##1}%
}{%
\csuse{ovar@#2@normal}{##1}%
@@ -3271,6 +3398,28 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
% \end{macrocode}
% \end{macro}
%
+% \changes{v1.1}{2023/02/15}{Support for non-standard subscripts}
+%
+% \begin{macro}{\ovar@testkerning}
+% \begin{macrocode}
+\begingroup
+\ifovar@option@subother@ \catcode `_=12 \fi
+\ifovar@option@subactive@ \catcode `_=13 \fi
+\gdef\ovar@testkerning#1{%
+ \begin{displaymath}
+ #1{t}_{#1{u}_{#1{v}}}
+ \qquad
+ #1{\imath}_0
+ \qquad
+ #1{v}
+ = #1{v}_x + #1{v}_y + #1{v}_z
+ = v_x #1{\imath} + v_y #1{\jmath} + v_z #1{k}
+ \end{displaymath}
+}
+\endgroup
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\TestOverArrow}
% \begin{macrocode}
\NewDocumentCommand{\TestOverArrow}{ s o m }{
@@ -3290,25 +3439,9 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
\ovar@testmathstyles[#2]{#3}%
\bigskip\par
\textbf{\texttt{\textbackslash#3} kerning}
- \begin{displaymath}
- \csuse{#3}{t}_{\csuse{#3}{u}_{\csuse{#3}{v}}}
- \qquad
- \csuse{#3}{\imath}_0
- \qquad
- \csuse{#3}{v}
- = \csuse{#3}{v}_x + \csuse{#3}{v}_y + \csuse{#3}{v}_z
- = v_x \csuse{#3}{\imath} + v_y \csuse{#3}{\jmath} + v_z \csuse{#3}{k}
- \end{displaymath}
+ \ovar@testkerning{\csuse{#3}}
\textbf{\texttt{\textbackslash#3*} kerning}
- \begin{displaymath}
- \csuse{#3}*{t}_{\csuse{#3}*{u}_{\csuse{#3}*{v}}}
- \qquad
- \csuse{#3}*{\imath}_0
- \qquad
- \csuse{#3}*{v}
- = \csuse{#3}*{v}_x + \csuse{#3}*{v}_y + \csuse{#3}*{v}_z
- = v_x \csuse{#3}*{\imath} + v_y \csuse{#3}*{\jmath} + v_z \csuse{#3}*{k}
- \end{displaymath}
+ \ovar@testkerning{\csuse{#3}*}
\end{minipage}%
}\bigskip\par
}{%
@@ -3501,7 +3634,7 @@ actual '='
overrightharpoondown, overleftharpoonup, overleftharpoondown, overbar,%
underrightarrow, underleftarrow, underleftrightarrow, underrightharpoonup,%
underrightharpoondown, underleftharpoonup, underleftharpoondown, underbar,%
- SetOverArrowsMethod,%
+ SetOverArrowsMethod, SetOverArrowsSubscriptCommand,%
},
index = [2][texcs2],%
indexstyle = [2]\indexmacro,%
@@ -3537,6 +3670,7 @@ actual '='
ovar@stackover@, ovar@stackunder@, ovar@stackover@fill,
ovar@stackover@lens, ovar@set@common, ovar@starversion,
ovar@testmathstyles, ovar@row@teststyle,%
+ ifovar@option@subother@,ifovar@option@subactive@,ovar@subcmd,ovar@testkerning,%
},
index = [4][texcs4],%
indexstyle = [4]\indexmacrointernal,%
@@ -3657,45 +3791,6 @@ actual '='
%
%</docstyle>
%
-%<*comment>
-%
-% \section*{Notes}
-%
-% \subsection*{Bash commands reminder}
-%^^A the command |awk '!line[$0]++'| remove duplicate lines
-%
-% \subsubsection*{List of package options}
-%
-\begin{lstlisting}[language={bash}]
-rg -o -N 'DeclareOption\{\w+' overarrows.dtx | rg -o '\w+$'
-\end{lstlisting} %^^A dummy '|' for emacs
-%
-% \subsubsection*{List of commands}
-%
-\begin{lstlisting}[language={bash}]
-rg -o -N '^[[:blank:]]*\\(let|def|newcommand\*?|(New|Renew|Declare|Provides)\w*Command)[{\\]+[\w@]+' overarrows.sty | rg -o '[\w@]+$' | grep -v ovar@ | awk '!line[$0]++'
-\end{lstlisting} %^^A dummy '|' for emacs
-%
-% \subsubsection*{List of internal macros and lengths}
-%
-\begin{lstlisting}[language={bash}]
- rg '\\(if)?ovar@[\w@]+' -o -N overarrows.dtx | rg -v '(@true|@false)' | awk '!line[$0]++'
-\end{lstlisting} %^^A dummy '|' for emacs
-%
-% \subsubsection*{List of lengths}
-%
-\begin{lstlisting}[language={bash}]
-rg -o -N '^[[:blank:]]*\\(def|new)length[{\\]+[\w@]+' overarrows.sty | rg -o '[\w@]+$' | grep -v ovar@| awk '!line[$0]++'
-\end{lstlisting}
-%
-% \subsubsection*{List of keys}
-%
-\begin{lstlisting}[language={bash}]
-rg -o -N ".*/\." overarrows.sty | sed 's/\/\.$//' | sed -r 's/^([[:blank:]]|\\[[:alpha:]@]+\{)*//' | awk '!line[$0]++'
-\end{lstlisting}
-%
-%</comment>
-%
% \fi ^^A end of \iffalse
%
% \Finale
diff --git a/macros/latex/contrib/overarrows/overarrows.pdf b/macros/latex/contrib/overarrows/overarrows.pdf
index 2b29e7cb45..7203b11bb3 100644
--- a/macros/latex/contrib/overarrows/overarrows.pdf
+++ b/macros/latex/contrib/overarrows/overarrows.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md b/macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md
index 6340136c0b..5184ea0aed 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md
+++ b/macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md
@@ -5,8 +5,16 @@ first release 0.95a, 2021-02-23 will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
this project uses date-based 'snapshot' version identifiers.
-## [2023-02-07]
+## [2023-02-14]
+
+### Added
+ - l3pdffile: \pdffile_embed_stream:nnN to embed a stream without creating a named
+ object.
+### Changed
+ - l3pdffile: default mime type of tex-files changed to application/x-tex.
+
+## [2023-02-07]
### Fixed
- pdf A4 uses pdfaid:rev not pdfaid:year.
- pdfcreationdate and pdfmoddate key
diff --git a/macros/latex/contrib/pdfmanagement-testphase/README.md b/macros/latex/contrib/pdfmanagement-testphase/README.md
index 51efd816a5..0374c9f268 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/README.md
+++ b/macros/latex/contrib/pdfmanagement-testphase/README.md
@@ -1,6 +1,6 @@
# LaTeX PDF management testphase bundle
-Version: 0.95u, 2023-02-07
+Version: 0.95v, 2023-02-14
This package is used during a test phase to load the new PDF management code
of LaTeX.
@@ -31,7 +31,7 @@ For manual installation: unpack by compiling the .ins, then move all
## Copyright (C)
-* 2021-2022 The LaTeX Project
+* 2021-2023 The LaTeX Project
## License
LaTeX Project Public License, version 1.3c or later.
diff --git a/macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty b/macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty
index e6464c3527..43f338e6da 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty
+++ b/macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty
@@ -24,7 +24,7 @@
%% This file has the LPPL maintenance status "maintained".
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{color-ltx}[2023-02-07 v0.95u
+\ProvidesPackage{color-ltx}[2023-02-14 v0.95v
Standard LaTeX Color (patched for l3color, part of pdfmanagement-testphase, original version 2022/01/06 v1.3d) (DPC)]
\edef\Gin@codes{%
\catcode`\noexpand\^^A\the\catcode`\^^A\relax
diff --git a/macros/latex/contrib/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty b/macros/latex/contrib/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty
index b9c37a0869..ee704315ce 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty
+++ b/macros/latex/contrib/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty
@@ -1,5 +1,5 @@
-%% This is file `hyperxmp-patches-tmp-ltx.sty"
-% Copyright (C) 2019-2021 The LaTeX Project
+%% This is file `colorspace-patches-tmp-ltx.sty"
+% Copyright (C) 2019-2022 The LaTeX Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -19,7 +19,7 @@
%
% for those people who are interested.
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
-\ProvidesExplPackage{colorspace-patches-tmp-ltx}{2023-02-07}{0.95u}
+\ProvidesExplPackage{colorspace-patches-tmp-ltx}{2023-02-14}{0.95v}
{temporay patches to for the colorspace package to test pdfresource management ... UF}
% colorspace can define more models, that l3color can't yet handle.
diff --git a/macros/latex/contrib/pdfmanagement-testphase/fontspec-luatex-tmp-ltx.sty b/macros/latex/contrib/pdfmanagement-testphase/fontspec-luatex-tmp-ltx.sty
index d58ac829fd..40c56ef9c9 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/fontspec-luatex-tmp-ltx.sty
+++ b/macros/latex/contrib/pdfmanagement-testphase/fontspec-luatex-tmp-ltx.sty
@@ -40,7 +40,7 @@
\RequirePackage{xparse}
\ProvidesExplPackage{fontspec-luatex-tmp-ltx}%
- {2022/01/15}{2023-02-07}{0.95u}
+ {2022/01/15}{2023-02-14}{0.95v}
%%^^A%% fontspec-code-load.dtx -- part of FONTSPEC <wspr.io/fontspec>
%%^^A%% fontspec-code-vars.dtx -- part of FONTSPEC <wspr.io/fontspec>
diff --git a/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx b/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx
index 0a80dc1bda..a145b046ed 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx
@@ -2,7 +2,7 @@
%
%% File: hyperref-generic.dtx
%
-% Copyright (C) 2021-2022 The LaTeX Project
+% Copyright (C) 2021-2023 The LaTeX Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -82,7 +82,7 @@
% }^^A
% }
%
-% \date{Version 0.95u, released 2023-02-07}
+% \date{Version 0.95v, released 2023-02-14}
%
% \maketitle
% \begin{documentation}
@@ -969,7 +969,7 @@
%<@@=hyp>
% \end{macrocode}
% \begin{macrocode}
-\ProvidesFile{hgeneric-testphase.def}[2023-02-07 v0.95u %
+\ProvidesFile{hgeneric-testphase.def}[2023-02-14 v0.95v %
generic Hyperref driver for the LaTeX PDF management testphase bundle]
\RequirePackage{etoolbox} %why?
diff --git a/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdf b/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdf
index 050ce269eb..d225a49f2d 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx
index d6c6c742c8..58a14075e8 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx
@@ -2,7 +2,7 @@
%
%% File: l3backend-testphase.dtx
%
-% Copyright (C) 2019-2021 The LaTeX Project
+% Copyright (C) 2019-2023 The LaTeX Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -45,7 +45,7 @@
% }^^A
% }
%
-% \date{Version 0.95u, released 2023-02-07}
+% \date{Version 0.95v, released 2023-02-14}
%
% \maketitle
%
@@ -56,27 +56,27 @@
% \begin{macrocode}
%<drivers>\ProvidesExplFile
%<*dvipdfmx>
- {l3backend-testphase-dvipdfmx.def}{2023-02-07}{}
+ {l3backend-testphase-dvipdfmx.def}{2023-02-14}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: dvipdfmx}
%</dvipdfmx>
%<*dvips>
- {l3backend-testphase-dvips.def}{2023-02-07}{}
+ {l3backend-testphase-dvips.def}{2023-02-14}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: dvips}
%</dvips>
%<*dvisvgm>
- {l3backend-testphase-dvisvgm.def}{2023-02-07}{}
+ {l3backend-testphase-dvisvgm.def}{2023-02-14}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: dvisvgm}
%</dvisvgm>
%<*luatex>
- {l3backend-testphase-luatex.def}{2023-02-07}{}
+ {l3backend-testphase-luatex.def}{2023-02-14}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (LuaTeX)}
%</luatex>
%<*pdftex>
- {l3backend-testphase-pdftex.def}{2023-02-07}{}
+ {l3backend-testphase-pdftex.def}{2023-02-14}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (pdfTeX)}
%</pdftex>
%<*xdvipdfmx>
- {l3backend-testphase-xetex.def}{2023-02-07}{}
+ {l3backend-testphase-xetex.def}{2023-02-14}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: XeTeX}
%</xdvipdfmx>
% \end{macrocode}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdf
index 9bace5d9c8..d1d9e1bedd 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx
index b34c9610fd..3073eeca7e 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx
@@ -2,7 +2,7 @@
%
%% File: l3pdfannot.dtx
%
-% Copyright (C) 2021-2022 The LaTeX Project
+% Copyright (C) 2021-2023 The LaTeX Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -48,7 +48,7 @@
% }^^A
% }
%
-% \date{Version 0.95u, released 2023-02-07}
+% \date{Version 0.95v, released 2023-02-14}
%
% \maketitle
% \begin{documentation}
@@ -432,7 +432,7 @@
% \begin{macrocode}
%<@@=pdfannot>
%<*header>
-\ProvidesExplPackage{l3pdfannot}{2023-02-07}{0.95u}
+\ProvidesExplPackage{l3pdfannot}{2023-02-14}{0.95v}
{PDF-annotations}
\RequirePackage{l3pdfdict}
%</header>
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdf
index 8b8e35a3b4..7f5b77efd9 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx
index e8bc32484a..8098f62774 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx
@@ -2,7 +2,7 @@
%
%% File: l3pdfdict.dtx
%
-% Copyright (C) 2018-2022 The LaTeX Project
+% Copyright (C) 2018-2023 The LaTeX Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -49,7 +49,7 @@
% }^^A
% }
%
-% \date{Version 0.95u, released 2023-02-07}
+% \date{Version 0.95v, released 2023-02-14}
%
% \maketitle
% \begin{documentation}
@@ -208,7 +208,7 @@
% \begin{macrocode}
%<@@=pdfdict>
%<*header>
-\ProvidesExplPackage{l3pdfdict}{2023-02-07}{0.95u}
+\ProvidesExplPackage{l3pdfdict}{2023-02-14}{0.95v}
{Tools for PDF dictionaries (LaTeX PDF management testphase bundle)}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdf
index e83d445c94..6ffccc6d0e 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.dtx
index 96855a08c2..c0b448ca2e 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.dtx
@@ -2,7 +2,7 @@
%
%% File: l3pdfpdffield-action.dtx
%
-% Copyright (C) 2021-2022 The LaTeX Project
+% Copyright (C) 2021-2023 The LaTeX Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -49,7 +49,7 @@
% }^^A
% }
%
-% \date{Version 0.95u, released 2023-02-07}
+% \date{Version 0.95v, released 2023-02-14}
%
% \maketitle
% \begin{documentation}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.pdf
index bebc9d08d4..30e213b3bd 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.dtx
index 5fba604620..e734ac71db 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.dtx
@@ -2,7 +2,7 @@
%
%% File: l3pdfpdffield-checkbox.dtx
%
-% Copyright (C) 2021-2022 The LaTeX Project
+% Copyright (C) 2021-2023 The LaTeX Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -64,7 +64,7 @@
% }^^A
% }
%
-% \date{Version 0.95u, released 2023-02-07}
+% \date{Version 0.95v, released 2023-02-14}
%
% \maketitle
% \begin{documentation}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.pdf
index 466fd5a705..f139a2d04a 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.dtx
index 3c0541b947..9b664ade97 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.dtx
@@ -2,7 +2,7 @@
%
%% File: l3pdfpdffield-choice.dtx
%
-% Copyright (C) 2021-2022 The LaTeX Project
+% Copyright (C) 2021-2023 The LaTeX Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -49,7 +49,7 @@
% }^^A
% }
%
-% \date{Version 0.95u, released 2023-02-07}
+% \date{Version 0.95v, released 2023-02-14}
%
% \maketitle
% \begin{documentation}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.pdf
index d506fa15f4..17eb232e70 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.dtx
index a078ea2fb8..c0a05b8a3c 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.dtx
@@ -2,7 +2,7 @@
%
%% File: l3pdfpdffield-pushbutton.dtx
%
-% Copyright (C) 2021-2022 The LaTeX Project
+% Copyright (C) 2021-2023 The LaTeX Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -55,7 +55,7 @@
% }^^A
% }
%
-% \date{Version 0.95u, released 2023-02-07}
+% \date{Version 0.95v, released 2023-02-14}
%
% \maketitle
% \begin{documentation}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.pdf
index 853f8adaa9..e30221c289 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.dtx
index 36ab234bbf..6207ffb2db 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.dtx
@@ -2,7 +2,7 @@
%
%% File: l3pdfpdffield-radiobutton.dtx
%
-% Copyright (C) 2021-2022 The LaTeX Project
+% Copyright (C) 2021-2023 The LaTeX Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -83,7 +83,7 @@
% }^^A
% }
%
-% \date{Version 0.95u, released 2023-02-07}
+% \date{Version 0.95v, released 2023-02-14}
%
% \maketitle
% \begin{documentation}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.pdf
index 838b411c46..7a253321fd 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.dtx
index ecf4211755..c6807a162a 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.dtx
@@ -2,7 +2,7 @@
%
%% File: l3pdfpdffield-textfield.dtx
%
-% Copyright (C) 2021-2022 The LaTeX Project
+% Copyright (C) 2021-2023 The LaTeX Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -49,7 +49,7 @@
% }^^A
% }
%
-% \date{Version 0.95u, released 2023-02-07}
+% \date{Version 0.95v, released 2023-02-14}
%
% \maketitle
% \begin{documentation}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.pdf
index 5c4e030d3e..87eb534dd2 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx
index 3bc48a0cb4..efb1171861 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx
@@ -2,7 +2,7 @@
%
%% File: l3pdffield.dtx
%
-% Copyright (C) 2021-2022 The LaTeX Project
+% Copyright (C) 2021-2023 The LaTeX Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -69,7 +69,7 @@
% }^^A
% }
%
-% \date{Version 0.95u, released 2023-02-07}
+% \date{Version 0.95v, released 2023-02-14}
%
% \maketitle
% \begin{documentation}
@@ -973,7 +973,7 @@
%<*package>
%<@@=pdffield>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesExplPackage{l3pdffield-testphase}{2023-02-07}{0.95u}%
+\ProvidesExplPackage{l3pdffield-testphase}{2023-02-14}{0.95v}%
{form fields}
% \end{macrocode}
% \subsection{hyperref specific command}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdf
index 60b5c4d669..9cbe0420f3 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx
index e682ad4e10..e8f6b1c2f8 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx
@@ -2,7 +2,7 @@
%
%% File: l3pdffile.dtx
%
-% Copyright (C) 2018-2022 The LaTeX Project
+% Copyright (C) 2018-2023 The LaTeX Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -49,7 +49,7 @@
% }^^A
% }
%
-% \date{Version 0.95u, released 2023-02-07}
+% \date{Version 0.95v, released 2023-02-14}
%
% \maketitle
% \begin{documentation}
@@ -296,12 +296,14 @@
% https://chat.stackexchange.com/transcript/message/54181193#54181193
% \end{NOTE}
%
-% \begin{function}{\pdffile_embed_stream:nnn}
+% \begin{function}{\pdffile_embed_stream:nnn,\pdffile_embed_stream:nnN}
% \begin{syntax}
-% \cs{pdffile_embed_stream:nnn} \Arg{content} \Arg{target filename} \Arg{object name }
+% \cs{pdffile_embed_stream:nnn} \Arg{content} \Arg{target filename} \Arg{object name}\\
+% \cs{pdffile_embed_stream:nnN} \Arg{content} \Arg{target filename} \Arg{tl var}
% \end{syntax}
% This commands embeds the \meta{content} in the PDF in a stream objects and
-% creates a |/Filespec| dictionary object named \meta{object name}.
+% creates either a |/Filespec| dictionary object named \meta{object name}, or stores
+% the object reference (what you would get with \cs{pdf_object_ref:n}) in \meta{tl var}.
% \meta{content} is wrapped in a \cs{exp_not:n}.
% The object name must be unique. The command uses the content of the local
% dictionaries |l_pdffile|, |l_pdffile/streamParams| and |l_pdffile/Filespec|
@@ -396,7 +398,7 @@
%
% \begin{macrocode}
%<*header>
-\ProvidesExplPackage{l3pdffile}{2023-02-07}{0.95u}
+\ProvidesExplPackage{l3pdffile}{2023-02-14}{0.95v}
{embedding and referencing files in PDF---LaTeX PDF management testphase bundle}
\RequirePackage{l3pdftools} %temporarly!!
%</header>
@@ -440,6 +442,7 @@
% {
% \l_@@_tmpa_tl,
% \l_@@_tmpb_tl,
+% \g_@@_tmpa_tl,
% \l_@@_tmpa_str,
% \l_@@_tmpb_str,
% \l_@@_ext_str,
@@ -451,6 +454,7 @@
% \begin{macrocode}
\tl_new:N \l_@@_tmpa_tl
\tl_new:N \l_@@_tmpb_tl
+\tl_new:N \g_@@_tmpa_tl
\str_new:N \l_@@_tmpa_str
\str_new:N \l_@@_tmpb_str
\str_new:N \l_@@_ext_str
@@ -474,7 +478,7 @@
,.mp4 = video/mp4
,.pdf = application/pdf
,.png = image/png
- ,.tex = text/plain %or application/x-tex, not in iana.org list
+ ,.tex = application/x-tex %not in iana.org list but probably better
,.txt = text/plain
,.sty = text/plain
,.xml = text/xml
@@ -543,7 +547,7 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\pdffile_embed_file:nnn, \pdffile_embed_stream:nnn}
+% \begin{macro}{\pdffile_embed_file:nnn, \pdffile_embed_stream:nnn, \pdffile_embed_stream:nnN}
% At first a command to set the mimetype. It either uses the current value
% in the file dictionary, or tries to guess it from the extension.
% \begin{macro}{\@@_mimetype_set:nN,\@@_mimetype_set:VN}
@@ -635,7 +639,7 @@
%#3 object ref of the file stream.
\cs_new_protected:Npn \@@_filespec_write:nnn #1 #2 #3
{
- \tl_if_blank:nT { #2 }
+ \tl_if_blank:nTF { #2 }
{
\msg_error:nn {pdffile}{target-name-missing}
}
@@ -656,6 +660,32 @@
}
}
+%#1 target file name #2 object ref of file stream #3 reference of object
+\cs_new_protected:Npn \@@_filespec_write:nnN #1 #2 #3
+ {
+ \tl_if_blank:nTF { #1 }
+ {
+ \msg_error:nn {pdffile}{target-name-missing}
+ }
+ {
+ \group_begin:
+ \@@_filename_convert_to_print:nN { #1 } \l_@@_tmpa_str
+ \pdfdict_put:nnx {l_pdffile/Filespec}{F} { \l_@@_tmpa_str }
+ \pdfdict_put:nnx {l_pdffile/Filespec}{UF}{ \l_@@_tmpa_str }
+ \pdf_object_unnamed_write:nx {dict}
+ {
+ \pdfdict_use:n { l_pdffile/Filespec}
+ \tl_if_empty:nF { #2 }
+ {
+ /EF <</F~#2 /UF~#2>>
+ }
+ }
+ \tl_gset:Nx\g_@@_tmpa_tl{\pdf_object_ref_last:}
+ \group_end:
+ \tl_set_eq:NN#3\g_@@_tmpa_tl
+ }
+ }
+
\cs_set_eq:NN \pdffile_filespec:nnn \@@_filespec_write:nnn
\cs_generate_variant:Nn \pdffile_filespec:nnn {nnx}
%#1 {source filename}
@@ -756,6 +786,27 @@
}
}
+\cs_new_protected:Npn \pdffile_embed_stream:nnN #1 #2 #3
+ {
+ \tl_if_blank:nTF {#2}
+ { \@@_mimetype_set:nN {stream.txt}\l_@@_automimetype_tl}
+ { \@@_mimetype_set:nN { #2 } \l_@@_automimetype_tl }
+ \@@_stream_write:nN
+ { #1 }
+ \l_@@_automimetype_tl
+ \tl_set:Nx \l_@@_embed_ref_tl { \pdf_object_ref_last: }
+ \exp_args:Nxx
+ \@@_filespec_write:nnN
+ %#1 target file name, #2 object ref of stream, #3 object ref of filespec
+ { \tl_if_blank:nTF {#2}{stream.txt}{\exp_not:n{#2}} }
+ {\l_@@_embed_ref_tl}
+ #3
+ \prop_gput:Nxx
+ \g_pdffile_embed_prop
+ { #3 }
+ {{stream}{}{\tl_if_blank:nTF {#2}{stream.txt}{\exp_not:n{#2}}}}
+ }
+
% \end{macrocode}
% \end{macro}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdf
index 074a7ada21..26756d7287 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx
index a9c96844d9..9b9d86eb43 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx
@@ -2,7 +2,7 @@
%
%% File: l3pdfmanagement.dtx
%
-% Copyright (C) 2018-2022 The LaTeX Project
+% Copyright (C) 2018-2023 The LaTeX Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -57,7 +57,7 @@
% }^^A
% }
%
-% \date{Version 0.95u, released 2023-02-07}
+% \date{Version 0.95v, released 2023-02-14}
%
% \maketitle
% \begin{documentation}
@@ -632,7 +632,7 @@
%<@@=pdfmanagement>
%<*header>
%
-\ProvidesExplPackage{l3pdfmanagement}{2023-02-07}{0.95u}
+\ProvidesExplPackage{l3pdfmanagement}{2023-02-14}{0.95v}
{Management of core PDF dictionaries (LaTeX PDF management testphase bundle)}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdf
index 1466bb0a6f..7c01923bdf 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx
index be0db1b9f3..8fe1bf2859 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx
@@ -2,7 +2,7 @@
%
%% File: l3pdfmeta.dtx
%
-% Copyright (C) 2018-2022 The LaTeX Project
+% Copyright (C) 2018-2023 The LaTeX Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -49,7 +49,7 @@
% }^^A
% }
%
-% \date{Version 0.95u, released 2023-02-07}
+% \date{Version 0.95v, released 2023-02-14}
%
% \maketitle
% \begin{documentation}
@@ -562,7 +562,7 @@
% \begin{macrocode}
%<@@=pdfmeta>
%<*header>
-\ProvidesExplPackage{l3pdfmeta}{2023-02-07}{0.95u}
+\ProvidesExplPackage{l3pdfmeta}{2023-02-14}{0.95v}
{PDF-Standards---LaTeX PDF management testphase bundle}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdf
index f13004eea6..04f852c94e 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx
index 9609617ddc..5d313f1570 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx
@@ -2,7 +2,7 @@
%
%% File: l3pdftools.dtx
%
-% Copyright (C) 2018-2022 The LaTeX Project
+% Copyright (C) 2018-2023 The LaTeX Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -49,7 +49,7 @@
% }^^A
% }
%
-% \date{Version 0.95u, released 2023-02-07}
+% \date{Version 0.95v, released 2023-02-14}
%
% \maketitle
% \begin{documentation}
@@ -211,7 +211,7 @@
%
% \begin{macrocode}
%<*header>
-\ProvidesExplPackage{l3pdftools}{2023-02-07}{0.95u}
+\ProvidesExplPackage{l3pdftools}{2023-02-14}{0.95v}
{candidate commands for l3pdf---LaTeX PDF management testphase bundle}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdf
index 01556046ec..59ee93b0d1 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx
index 3f6350f95f..63395542e1 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx
@@ -2,7 +2,7 @@
%
%% File: l3pdfxform.dtx
%
-% Copyright (C) 2018-2022 The LaTeX Project
+% Copyright (C) 2018-2023 The LaTeX Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -48,7 +48,7 @@
% }^^A
% }
%
-% \date{Version 0.95u, released 2023-02-07}
+% \date{Version 0.95v, released 2023-02-14}
%
% \maketitle
% \begin{documentation}
@@ -132,7 +132,7 @@
% \begin{macrocode}
%<@@=pdf>
%<*header>
-\ProvidesExplPackage{l3pdfxform}{2023-02-07}{0.95u}
+\ProvidesExplPackage{l3pdfxform}{2023-02-14}{0.95v}
{command to create xforms (beta)---LaTeX PDF management testphase bundle}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdf
index 87ced6bc38..e7e426a73b 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx b/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx
index ada32d8d2f..e7128d2c26 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx
@@ -2,7 +2,7 @@
%
%% File: ltdocinit.dtx
%
-% Copyright (C) 2018-2022 The LaTeX Project
+% Copyright (C) 2018-2023 The LaTeX Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -47,7 +47,7 @@
% }^^A
% }
%
-% \date{Version 0.95u, released 2023-02-07}
+% \date{Version 0.95v, released 2023-02-14}
%
% \maketitle
% \begin{documentation}
@@ -215,7 +215,7 @@
% \begin{macrocode}
%<@@=pdfmanagement>
%<*header>
-\ProvidesExplPackage{ltdocinit}{2023-02-07}{0.95u}
+\ProvidesExplPackage{ltdocinit}{2023-02-14}{0.95v}
{Initialize document metadata}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdf b/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdf
index 882188cde8..2607f576de 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.dtx b/macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.dtx
index 38f0f38641..11eae11300 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% File: output-patches.dtx (C) Copyright 2020-2021 Frank Mittelbach
+%% File: output-patches.dtx (C) Copyright 2020-2023 Frank Mittelbach
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
diff --git a/macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.pdf b/macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.pdf
index 7d24fbf133..542dab7788 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx
index 2025a4fa18..3e9810a925 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx
@@ -2,7 +2,7 @@
%
%% File: pdfmanagement-firstaid.dtx
%
-% Copyright (C) 2018-2022 The LaTeX Project
+% Copyright (C) 2018-2023 The LaTeX Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -47,7 +47,7 @@
% }^^A
% }
%
-% \date{Version 0.95u, released 2023-02-07}
+% \date{Version 0.95v, released 2023-02-14}
%
% \maketitle
% \begin{documentation}
@@ -63,7 +63,7 @@
% |debug={firstaidoff={name1,name2,...},...}|.
% \begin{macrocode}
%<*package>
-\ProvidesExplPackage{pdfmanagement-firstaid}{2023-02-07}{0.95u}
+\ProvidesExplPackage{pdfmanagement-firstaid}{2023-02-14}{0.95v}
{LaTeX PDF management testphase bundle / firstaid-patches}
%<@@=pdfmanagement>
@@ -201,8 +201,9 @@
% \subsection{luacolor}
%
% The luacolor package doesn't take colors from l3color into account.
-% We add a fix, but only for pdf mode. It is disable if luacolor is updated,
-% assuming that the update will then handle it (or expl3 directly)
+% We add a fix, but only for pdf mode. luacolor can disable the
+% code by clearing the hook if needed.
+%
% \begin{macrocode}
\bool_lazy_all:nT
{
@@ -213,47 +214,44 @@
{
\AddToHook{package/luacolor/after}
{
- \@ifpackagelater{luacolor}{2021-02-18}{}
+ \cs_set_protected:Npn \__color_backend_select:nn #1#2
{
- \cs_set_protected:Npn \__color_backend_select:nn #1#2
- {
- \tl_set:Nn \l__color_backend_fill_tl {#1}
- \tl_set:Nn \l__color_backend_stroke_tl {#2}
- \LuaCol@setattribute\LuaCol@Attribute
- {
- \directlua
- {
- oberdiek.luacolor.get("\luaescapestring{#1~#2}")
- }
- }
- }
- \cs_set_protected:Npn \__color_backend_fill:n #1
+ \tl_set:Nn \l__color_backend_fill_tl {#1}
+ \tl_set:Nn \l__color_backend_stroke_tl {#2}
+ \LuaCol@setattribute\LuaCol@Attribute
{
- \tl_set:Nn \l__color_backend_fill_tl {#1}
- \LuaCol@setattribute\LuaCol@Attribute
- {
- \directlua
- {
- oberdiek.luacolor.get("\luaescapestring{#1}")
- }
- }
+ \directlua
+ {
+ oberdiek.luacolor.get("\luaescapestring{#1~#2}")
+ }
}
- \cs_set_protected:Npn \__color_backend_stroke:n #1
+ }
+ \cs_set_protected:Npn \__color_backend_fill:n #1
+ {
+ \tl_set:Nn \l__color_backend_fill_tl {#1}
+ \LuaCol@setattribute\LuaCol@Attribute
{
- \tl_set:Nn \l__color_backend_stroke_tl {#1}
- \LuaCol@setattribute\LuaCol@Attribute
+ \directlua
{
- \directlua
- {
- oberdiek.luacolor.get("\luaescapestring{#1}")
- }
- }
- }
- \cs_set_protected:Npn \__color_backend_reset: {}
- \cs_set_eq:NN \__color_backend_fill_reset: \__color_backend_reset:
- \cs_set_eq:NN \__color_backend_stroke_reset: \__color_backend_reset:
- }
- }
+ oberdiek.luacolor.get("\luaescapestring{#1}")
+ }
+ }
+ }
+ \cs_set_protected:Npn \__color_backend_stroke:n #1
+ {
+ \tl_set:Nn \l__color_backend_stroke_tl {#1}
+ \LuaCol@setattribute\LuaCol@Attribute
+ {
+ \directlua
+ {
+ oberdiek.luacolor.get("\luaescapestring{#1}")
+ }
+ }
+ }
+ \cs_set_protected:Npn \__color_backend_reset: {}
+ \cs_set_eq:NN \__color_backend_fill_reset: \__color_backend_reset:
+ \cs_set_eq:NN \__color_backend_stroke_reset: \__color_backend_reset:
+ }
}
% \end{macrocode}
% \subsection{\pkg{pgf}}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdf b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdf
index b1cd065bde..f9f33a201e 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx
index 8110f77cba..17f7bc45cd 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx
@@ -2,7 +2,7 @@
%
%% File: pdfmanagement-testphase.dtx
%
-% Copyright (C) 2019-2022 The LaTeX Project
+% Copyright (C) 2019-2023 The LaTeX Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -47,7 +47,7 @@
% }^^A
% }
%
-% \date{Version 0.95u, released 2023-02-07}
+% \date{Version 0.95v, released 2023-02-14}
%
% \maketitle
% \begin{documentation}
@@ -386,7 +386,7 @@
% \begin{macrocode}
%<@@=pdf>
%<*package>
-\ProvidesExplPackage{pdfmanagement-testphase}{2023-02-07}{0.95u}
+\ProvidesExplPackage{pdfmanagement-testphase}{2023-02-14}{0.95v}
{LaTeX PDF management testphase bundle}
\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}
\IfFormatAtLeastTF{2020-10-01}{}{
@@ -414,7 +414,7 @@
% to allow to set it in the document.
% \begin{macrocode}
%<*header>
-\ProvidesExplFile{pdfmanagement-testphase.ltx}{2023-02-07}{0.95u}
+\ProvidesExplFile{pdfmanagement-testphase.ltx}{2023-02-14}{0.95v}
{PDF~management~code~(testphase)}
%</header>
%<*package>
diff --git a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdf b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdf
index 39df81d3ba..681c789fe7 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty b/macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty
index 9ef9dcce2d..9e27131014 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty
+++ b/macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty
@@ -1,6 +1,6 @@
%% LaTeX2e file `xcolor-patches.sty'
%%
-\ProvidesPackage{xcolor-patches-tmp-ltx}[2023-02-07 v0.95u patch xcolor for l3color]
+\ProvidesPackage{xcolor-patches-tmp-ltx}[2023-02-14 v0.95v patch xcolor for l3color]
\@ifundefined{color_set:nn}{\RequirePackage{l3color}}{}
\ExplSyntaxOn
diff --git a/macros/latex/contrib/postnotes/CHANGELOG.md b/macros/latex/contrib/postnotes/CHANGELOG.md
index d9b24379f5..b626145fd0 100644
--- a/macros/latex/contrib/postnotes/CHANGELOG.md
+++ b/macros/latex/contrib/postnotes/CHANGELOG.md
@@ -1,6 +1,15 @@
# Changelog
-## [Unreleased](https://github.com/gusbrs/postnotes/compare/v0.2.1...HEAD)
+## [Unreleased](https://github.com/gusbrs/postnotes/compare/v0.2.2...HEAD)
+
+## [v0.2.2](https://github.com/gusbrs/postnotes/compare/v0.2.1...v0.2.2) (2023-02-15)
+
+### Fixed
+- Don't try to hyperlink `\postnotezref` when `zref-hyperref` is not loaded.
+- "perhaps a missing \item" error for empty `\postnote`.
+
+### Changed
+- Renamed `postnotes/print/eachnote` hook to `postnotes/print/note/begin`.
## [v0.2.1](https://github.com/gusbrs/postnotes/compare/v0.2.0...v0.2.1) (2023-02-13)
diff --git a/macros/latex/contrib/postnotes/postnotes-code.pdf b/macros/latex/contrib/postnotes/postnotes-code.pdf
index 644edf8e88..76ed8d090b 100644
--- a/macros/latex/contrib/postnotes/postnotes-code.pdf
+++ b/macros/latex/contrib/postnotes/postnotes-code.pdf
Binary files differ
diff --git a/macros/latex/contrib/postnotes/postnotes.dtx b/macros/latex/contrib/postnotes/postnotes.dtx
index fab2cb9914..47271ac97a 100644
--- a/macros/latex/contrib/postnotes/postnotes.dtx
+++ b/macros/latex/contrib/postnotes/postnotes.dtx
@@ -153,7 +153,7 @@
%
%
% \begin{macrocode}
-\ProvidesExplPackage {postnotes} {2023-02-13} {0.2.1}
+\ProvidesExplPackage {postnotes} {2023-02-15} {0.2.2}
{Endnotes for LaTeX}
% \end{macrocode}
%
@@ -1210,14 +1210,14 @@
% additional setup, specially to add support to packages and features which
% require it. The \texttt{postnotes/print/begin} hook is run early in
% \cs{@@_print_notes:} and only once per call, after the user options have
-% been processed. The \texttt{postnotes/print/eachnote} hook is run once for
-% each note, at the point where environment variables are being set or
+% been processed. The \texttt{postnotes/print/note/begin} hook is run once
+% for each note, at the point where environment variables are being set or
% restored, before the typesetting of either the mark or the text, but within
% a group of its own of each note.
%
% \begin{macrocode}
\NewHook { postnotes/print/begin }
-\NewHook { postnotes/print/eachnote }
+\NewHook { postnotes/print/note/begin }
% \end{macrocode}
%
%
@@ -1350,7 +1350,7 @@
\l_@@_print_format_tl
}
\group_begin:
- \UseHook { postnotes/print/eachnote }
+ \UseHook { postnotes/print/note/begin }
\@@_get_pageref:Nx \pnthepage
{ mark@ \l_postnotes_print_note_id_tl }
\@@_prop_get:nnN
@@ -1377,6 +1377,10 @@
{ \l_postnotes_print_note_id_tl }
\l_@@_print_mark_tl
}
+% \end{macrocode}
+% Leave vertical mode to avoid ``perhaps a missing \cs{item}'' error.
+% \begin{macrocode}
+ \mode_leave_vertical:
\l_@@_print_content_tl
\l_@@_post_printnote_tl
\group_end:
@@ -2072,7 +2076,7 @@
% \end{macrocode}
% Restore \pkg{biblatex} variables for each note.
% \begin{macrocode}
- \AddToHook { postnotes/print/eachnote } [ postnotes ]
+ \AddToHook { postnotes/print/note/begin } [ postnotes ]
{
\@@_prop_get:nnN { \l_postnotes_print_note_id_tl }
{ biblatex@refsection } \l_@@_restore_tmp_tl
@@ -2201,7 +2205,7 @@
\tl_gset:Nx \g_@@_biblatex_prev_refsection_tl
\l_@@_biblatex_orig_refsection_tl
}
- \AddToHook { postnotes/print/eachnote } [ postnotes ]
+ \AddToHook { postnotes/print/note/begin } [ postnotes ]
{
\@@_prop_get:nnN { \l_postnotes_print_note_id_tl }
{ biblatex@refsection } \l_@@_restore_tmp_tl
@@ -2275,9 +2279,12 @@
\group_begin:
\@@_typeset_mark_wrapper:n
{
- \bool_lazy_and:nnTF
- { ! #1 }
- { \l_@@_hyperlink_bool }
+ \bool_lazy_all:nTF
+ {
+ { ! #1 }
+ { \l_@@_hyperlink_bool }
+ { \l_@@_zrefhyperref_bool }
+ }
{
\hyperlink
{ \zref@extractdefault {#2} { anchor } { } }
@@ -2294,6 +2301,12 @@
}
% \end{macrocode}
%
+% \begin{macrocode}
+\bool_new:N \l_@@_zrefhyperref_bool
+\AddToHook { package/zref-hyperref/after }
+ { \bool_set_true:N \l_@@_zrefhyperref_bool }
+% \end{macrocode}
+%
%
% \subsection*{\pkg{zref-clever}}
%
@@ -2325,7 +2338,7 @@
\prop_gput:cnx { \@@_data_name:e { \l_postnotes_note_id_tl } }
{ zref-check@abssec } { \int_use:N \c@zc@abssec }
}
- \AddToHook { postnotes/print/eachnote } [ postnotes ]
+ \AddToHook { postnotes/print/note/begin } [ postnotes ]
{
\@@_prop_get:nnN { \l_postnotes_print_note_id_tl }
{ zref-check@abschap } \l_@@_restore_tmp_tl
diff --git a/macros/latex/contrib/postnotes/postnotes.pdf b/macros/latex/contrib/postnotes/postnotes.pdf
index 52735b1562..6a20c7ba76 100644
--- a/macros/latex/contrib/postnotes/postnotes.pdf
+++ b/macros/latex/contrib/postnotes/postnotes.pdf
Binary files differ
diff --git a/macros/latex/contrib/tagpdf/README.md b/macros/latex/contrib/tagpdf/README.md
index e6db86a9e4..fd324960da 100644
--- a/macros/latex/contrib/tagpdf/README.md
+++ b/macros/latex/contrib/tagpdf/README.md
@@ -1,6 +1,6 @@
#tagpdf — A package to create tagged pdf
-Packageversion: 0.98c
-Packagedate: 2023/01/30
+Packageversion: 0.98d
+Packagedate: 2023/02/15
Author: Ulrike Fischer
## License
diff --git a/macros/latex/contrib/tagpdf/tagpdf-backend.dtx b/macros/latex/contrib/tagpdf/tagpdf-backend.dtx
index 0a2c4f693f..012321bba5 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-backend.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-backend.dtx
@@ -47,13 +47,13 @@
% }^^A
% }
%
-% \date{Version 0.98c, released 2023-01-30}
+% \date{Version 0.98d, released 2023-02-15}
% \maketitle
% \begin{implementation}
% \begin{macrocode}
%<@@=tag>
%<*luatex>
-\ProvidesExplFile {tagpdf-luatex.def} {2023-01-30} {0.98c}
+\ProvidesExplFile {tagpdf-luatex.def} {2023-02-15} {0.98d}
{tagpdf~driver~for~luatex}
% \end{macrocode}
% \section{Loading the lua}
@@ -158,8 +158,8 @@
local ProvidesLuaModule = {
name = "tagpdf",
- version = "0.98c", --TAGVERSION
- date = "2023-01-30", --TAGDATE
+ version = "0.98d", --TAGVERSION
+ date = "2023-02-15", --TAGDATE
description = "tagpdf lua code",
license = "The LATEX Project Public License 1.3c"
}
@@ -802,6 +802,7 @@ local function @@_space_chars_shipout (box)
end
end
end
+ box.head = head
end
end
diff --git a/macros/latex/contrib/tagpdf/tagpdf-checks.dtx b/macros/latex/contrib/tagpdf/tagpdf-checks.dtx
index a20017a77c..6219d00192 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-checks.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-checks.dtx
@@ -48,7 +48,7 @@
% }^^A
% }
%
-% \date{Version 0.98c, released 2023-01-30}
+% \date{Version 0.98d, released 2023-02-15}
% \maketitle
% \begin{documentation}
% \section{Commands}
@@ -295,7 +295,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-checks-code} {2023-01-30} {0.98c}
+\ProvidesExplPackage {tagpdf-checks-code} {2023-02-15} {0.98d}
{part of tagpdf - code related to checks, conditionals, debugging and messages}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/tagpdf/tagpdf-code.pdf b/macros/latex/contrib/tagpdf/tagpdf-code.pdf
index c8c3c146cb..d3c692b9d0 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-code.pdf
+++ b/macros/latex/contrib/tagpdf/tagpdf-code.pdf
Binary files differ
diff --git a/macros/latex/contrib/tagpdf/tagpdf-data.dtx b/macros/latex/contrib/tagpdf/tagpdf-data.dtx
index a62f6d3cdb..89b6d09d26 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-data.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-data.dtx
@@ -47,7 +47,7 @@
% }^^A
% }
%
-% \date{Version 0.98c, released 2023-01-30}
+% \date{Version 0.98d, released 2023-02-15}
% \maketitle
% \begin{documentation}
% This files contains a various data files which are read in
@@ -60,7 +60,7 @@
% It lists the new tag, the rolemap and the namespace of the rolemap.
% \begin{macrocode}
%<*ns-latex>
-%% \ProvidesExplFile {tagpdf-ns-latex.def} {2023-01-30} {0.98c}
+%% \ProvidesExplFile {tagpdf-ns-latex.def} {2023-02-15} {0.98d}
%% {latex} {https://www.latex-project.org/ns/dflt/2022}{}
title, Title, pdf2,
part, Title, pdf2,
@@ -86,7 +86,7 @@ footnotelabel,Lbl, pdf2,
% It is bound to change
% \begin{macrocode}
%<*ns-latex-book>
-%% \ProvidesExplFile {tagpdf-ns-latex-book.def} {2023-01-30} {0.98c}
+%% \ProvidesExplFile {tagpdf-ns-latex-book.def} {2023-02-15} {0.98d}
%% {latex-book} {https://www.latex-project.org/ns/book/2022}{}
chapter, H1,pdf2,
section, H2,pdf2,
@@ -102,7 +102,7 @@ subparagraph, H6,pdf2,
% It is bound to change a lot!
% \begin{macrocode}
%<*ns-latex-inline>
-%% \ProvidesExplFile {tagpdf-ns-latex-inline.def} {2023-01-30} {0.98c}
+%% \ProvidesExplFile {tagpdf-ns-latex-inline.def} {2023-02-15} {0.98d}
%% {latex-inline} {https://www.latex-project.org/ns/inline/2022}{}
chapter, Span, pdf2,
section, Span, pdf2,
@@ -116,7 +116,7 @@ P, Span, pdf2,
% \section{The pdf namespace data}
% \begin{macrocode}
%<*ns-pdf>
-%% \ProvidesExplFile {tagpdf-ns-pdf.def} {2023-01-30} {0.98c}
+%% \ProvidesExplFile {tagpdf-ns-pdf.def} {2023-02-15} {0.98d}
%% {pdf} {http://iso.org/pdf/ssn}{}
StructTreeRoot,StructTreeRoot,pdf,D,
Document,Document,pdf,D,
@@ -184,7 +184,7 @@ Strong,Span,pdf,I,
% \section{The pdf 2.0 namespace data}
% \begin{macrocode}
%<*ns-pdf2>
-%% \ProvidesExplFile {tagpdf-ns-pdf2.def} {2023-01-30} {0.98c}
+%% \ProvidesExplFile {tagpdf-ns-pdf2.def} {2023-02-15} {0.98d}
%% {pdf2} {http://iso.org/pdf2/ssn}{}
Document,Document,pdf2,D,
Part,Part,pdf2,G,
@@ -240,7 +240,7 @@ Strong,Strong,pdf2,I,
% \section{The mathml namespace data}
% \begin{macrocode}
%<*ns-mathml>
-%% \ProvidesExplFile {tagpdf-ns-mathml.def} {2023-01-30} {0.98c}
+%% \ProvidesExplFile {tagpdf-ns-mathml.def} {2023-02-15} {0.98d}
% {mathml}{http://www.w3.org/1998/Math/MathML}{}
abs,,,
and,,,
@@ -475,7 +475,7 @@ xor,,,
% This will perhaps change in future.
% \begin{macrocode}
%<*parent-child>
-%% \ProvidesExplFile {tagpdf-parent-child.csv} {2023-01-30} {0.98c}
+%% \ProvidesExplFile {tagpdf-parent-child.csv} {2023-02-15} {0.98d}
,,,StructTreeRoot,Document,Art,Part,Div,Sect,BlockQuote,NonStruct,TOC,TOCI,Index,Private,Quote,Note,Reference,BibEntry,P,Hn,H,Lbl,Code,Span,Link,Annot,Form,Ruby,RB,RT,RP,Warichu,WT,WP,L,LI,LBody,Table,TR,TH,TD,THead,TBody,TFoot,Caption,Figure,Formula,MC
Document,both,document level,1,0..n,∅,‡,‡,∅,0..n,‡,∅,∅,∅,0..n,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅
Art,1.7,grouping,∅,0..n,∅,‡,‡,0..n,0..n,‡,∅,∅,∅,0..n,∅,0..n,∅,∅,∅,0..1,0..1,∅,∅,∅,0..n,0..n,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,0..n,∅,∅,0..n,0..n,∅,∅,∅,0..n,0..n,∅,∅
@@ -530,7 +530,7 @@ MC,both,---,∅,∅,∅,∅,∅,∅,0..n,‡,∅,∅,∅,0..n,0..n,0..n,0..n,0..
% This will perhaps change in future.
% \begin{macrocode}
%<*parent-child-2>
-%% \ProvidesExplFile {tagpdf-parent-child-2.csv} {2023-01-30} {0.98c}
+%% \ProvidesExplFile {tagpdf-parent-child-2.csv} {2023-02-15} {0.98d}
,,,StructTreeRoot,Document,DocumentFragment,Art,Part,Div,Sect,Aside,BlockQuote,NonStruct,TOC,TOCI,Index,Private,Title,Sub,Quote,Note,Reference,BibEntry,P,Hn,H,Lbl,Code,Em,Strong,Span,Link,Annot,Form,Ruby,RB,RT,RP,Warichu,WT,WP,FENote,L,LI,LBody,Table,TR,TH,TD,THead,TBody,TFoot,Caption,Figure,Formula,math,mathml,Artifact,MC
Document,both,document level,1,0..n,0..n,∅,‡,‡,∅,0..n,0..n,‡,∅,∅,∅,0..n,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,0..n,∅
DocumentFragment,2.0,document level,∅,0..n,0..n,0..n,‡,‡,0..n,0..n,0..n,‡,∅,∅,∅,0..n,∅,∅,∅,∅*,∅,∅,∅,∅,∅,∅,∅*,∅,∅,∅,∅*,∅*,∅,∅,∅,∅,∅,∅,∅,∅,∅*,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅*,∅,∅,∅,∅,0..n,∅
diff --git a/macros/latex/contrib/tagpdf/tagpdf-mc-generic.dtx b/macros/latex/contrib/tagpdf/tagpdf-mc-generic.dtx
index 1d04a19368..8061a5d18d 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-mc-generic.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-mc-generic.dtx
@@ -46,7 +46,7 @@
% }^^A
% }
%
-% \date{Version 0.98c, released 2023-01-30}
+% \date{Version 0.98d, released 2023-02-15}
% \maketitle
% \begin{documentation}
% \end{documentation}
@@ -55,11 +55,11 @@
% \begin{macrocode}
%<@@=tag>
%<*generic>
-\ProvidesExplPackage {tagpdf-mc-code-generic} {2023-01-30} {0.98c}
+\ProvidesExplPackage {tagpdf-mc-code-generic} {2023-02-15} {0.98d}
{part of tagpdf - code related to marking chunks - generic mode}
%</generic>
%<*debug>
-\ProvidesExplPackage {tagpdf-debug-generic} {2023-01-30} {0.98c}
+\ProvidesExplPackage {tagpdf-debug-generic} {2023-02-15} {0.98d}
{part of tagpdf - debugging code related to marking chunks - generic mode}
%</debug>
% \end{macrocode}
diff --git a/macros/latex/contrib/tagpdf/tagpdf-mc-luacode.dtx b/macros/latex/contrib/tagpdf/tagpdf-mc-luacode.dtx
index 066d2e2243..1b03011ddf 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-mc-luacode.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-mc-luacode.dtx
@@ -46,7 +46,7 @@
% }^^A
% }
%
-% \date{Version 0.98c, released 2023-01-30}
+% \date{Version 0.98d, released 2023-02-15}
% \maketitle
% \begin{implementation}
% The code is splitted into three parts: code shared by all engines,
@@ -86,7 +86,7 @@
% \begin{macrocode}
%<@@=tag>
%<*luamode>
-\ProvidesExplPackage {tagpdf-mc-code-lua} {2023-01-30} {0.98c}
+\ProvidesExplPackage {tagpdf-mc-code-lua} {2023-02-15} {0.98d}
{tagpdf - mc code only for the luamode }
%</luamode>
% \end{macrocode}
diff --git a/macros/latex/contrib/tagpdf/tagpdf-mc-shared.dtx b/macros/latex/contrib/tagpdf/tagpdf-mc-shared.dtx
index 88c5937f57..ba5516dc4c 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-mc-shared.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-mc-shared.dtx
@@ -46,7 +46,7 @@
% }^^A
% }
%
-% \date{Version 0.98c, released 2023-01-30}
+% \date{Version 0.98d, released 2023-02-15}
% \maketitle
% \begin{documentation}
% \section{Public Commands}
@@ -174,7 +174,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-mc-code-shared} {2023-01-30} {0.98c}
+\ProvidesExplPackage {tagpdf-mc-code-shared} {2023-02-15} {0.98d}
{part of tagpdf - code related to marking chunks -
code shared by generic and luamode }
%</header>
diff --git a/macros/latex/contrib/tagpdf/tagpdf-roles.dtx b/macros/latex/contrib/tagpdf/tagpdf-roles.dtx
index 8948b89055..8557552f9a 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-roles.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-roles.dtx
@@ -46,7 +46,7 @@
% }^^A
% }
%
-% \date{Version 0.98c, released 2023-01-30}
+% \date{Version 0.98d, released 2023-02-15}
% \maketitle
% \begin{documentation}
% \begin{function}
@@ -98,7 +98,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-roles-code} {2023-01-30} {0.98c}
+\ProvidesExplPackage {tagpdf-roles-code} {2023-02-15} {0.98d}
{part of tagpdf - code related to roles and structure names}
%</header>
% \end{macrocode}
@@ -913,7 +913,7 @@
{
\tl_set:Nx\l_@@_tmpa_tl { \use_ii:nn ##1 }
\exp_args:Nne
- \tl_if_in:nnF {-Part-Div-NonStruct-}{-\l_@@_tmpa_tl-}
+ \str_if_in:nnF {-Part-Div-NonStruct-}{-\l_@@_tmpa_tl-}
{
\tl_set:Nn\l_@@_role_real_parent_tl {##1}
\int_zero:N\l_@@_tmpa_int
diff --git a/macros/latex/contrib/tagpdf/tagpdf-space.dtx b/macros/latex/contrib/tagpdf/tagpdf-space.dtx
index 5e21bb0f6a..ffb891fdc5 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-space.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-space.dtx
@@ -46,7 +46,7 @@
% }^^A
% }
%
-% \date{Version 0.98c, released 2023-01-30}
+% \date{Version 0.98d, released 2023-02-15}
% \maketitle
% \begin{documentation}
% \begin{function}{interwordspace (setup-key)}
@@ -64,7 +64,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-space-code} {2023-01-30} {0.98c}
+\ProvidesExplPackage {tagpdf-space-code} {2023-02-15} {0.98d}
{part of tagpdf - code related to real space chars}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/tagpdf/tagpdf-struct.dtx b/macros/latex/contrib/tagpdf/tagpdf-struct.dtx
index 229989dad1..c488ad823d 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-struct.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-struct.dtx
@@ -46,7 +46,7 @@
% }^^A
% }
%
-% \date{Version 0.98c, released 2023-01-30}
+% \date{Version 0.98d, released 2023-02-15}
% \maketitle
% \begin{documentation}
% \section{Public Commands}
@@ -242,7 +242,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-struct-code} {2023-01-30} {0.98c}
+\ProvidesExplPackage {tagpdf-struct-code} {2023-02-15} {0.98d}
{part of tagpdf - code related to storing structure}
%</header>
% \end{macrocode}
@@ -1080,9 +1080,78 @@
% extension.
% AF is an array and can be used more than once, so we store it in a tl.
% which is expanded.
-% AFinline can be use only once (more quite probably doesn't make sense).
+% AFinline currently uses the fix extention txt.
+% texsource is a special variant which creates a tex-file, it expects a
+% tl-var as value (e.g. from math grabbing)
+%
+% \begin{variable}{\g_@@_struct_AFobj_int}
+% This variable is used to number the AF-object names
+% \begin{macrocode}
+\int_new:N\g_@@_struct_AFobj_int
+% \end{macrocode}
+% \end{variable}
+%
+% \begin{macrocode}
+\cs_if_free:NTF \pdffile_embed_stream:nnN
+ {
+ \cs_new_protected:Npn \@@_struct_add_inline_AF:nn #1 #2
+ % #1 content, #2 extension
+ {
+ \group_begin:
+ \int_gincr:N \g_@@_struct_AFobj_int
+ \pdf_object_if_exist:eF {@@/fileobj\int_use:N\g_@@_struct_AFobj_int}
+ {
+ \pdffile_embed_stream:nxx
+ {#1}
+ {tag-AFfile\int_use:N\g_@@_struct_AFobj_int.#2}
+ {@@/fileobj\int_use:N\g_@@_struct_AFobj_int}
+ \@@_struct_add_AF:ee
+ { \int_eval:n {\c@g_@@_struct_abs_int} }
+ { \pdf_object_ref:e {@@/fileobj\int_use:N\g_@@_struct_AFobj_int} }
+ \@@_prop_gput:cnx
+ { g_@@_struct_\int_use:N\c@g_@@_struct_abs_int _prop }
+ { AF }
+ {
+ [
+ \tl_use:c
+ { g_@@_struct_\int_eval:n {\c@g_@@_struct_abs_int}_AF_tl }
+ ]
+ }
+ }
+ \group_end:
+ }
+ }
+ {
+ \cs_generate_variant:Nn \pdffile_embed_stream:nnN {nxN}
+ \cs_new_protected:Npn \@@_struct_add_inline_AF:nn #1 #2
+ % #1 content, #2 extension
+ {
+ \group_begin:
+ \int_gincr:N \g_@@_struct_AFobj_int
+ \pdffile_embed_stream:nxN
+ {#1}
+ {tag-AFfile\int_use:N\g_@@_struct_AFobj_int.#2}
+ \l_@@_tmpa_tl
+ \@@_struct_add_AF:ee
+ { \int_eval:n {\c@g_@@_struct_abs_int} }
+ { \l_@@_tmpa_tl }
+ \@@_prop_gput:cnx
+ { g_@@_struct_\int_use:N\c@g_@@_struct_abs_int _prop }
+ { AF }
+ {
+ [
+ \tl_use:c
+ { g_@@_struct_\int_eval:n {\c@g_@@_struct_abs_int}_AF_tl }
+ ]
+ }
+ \group_end:
+ }
+ }
+\cs_generate_variant:Nn \@@_struct_add_inline_AF:nn {on}
+% \end{macrocode}
+%
% \begin{macrocode}
-\cs_new_protected:Npn \@@_struct_add_AF:nn #1 #2 % #1 struct num #2 object name
+\cs_new_protected:Npn \@@_struct_add_AF:nn #1 #2 % #1 struct num #2 object reference
{
\tl_if_exist:cTF
{
@@ -1091,14 +1160,14 @@
{
\tl_gput_right:cx
{ g_@@_struct_#1_AF_tl }
- { ~ \pdf_object_ref:n {#2} }
+ { \c_space_tl #2 }
}
{
\tl_new:c
{ g_@@_struct_#1_AF_tl }
\tl_gset:cx
{ g_@@_struct_#1_AF_tl }
- { \pdf_object_ref:n {#2} }
+ { #2 }
}
}
\cs_generate_variant:Nn \@@_struct_add_AF:nn {en,ee}
@@ -1108,7 +1177,7 @@
{
\pdf_object_if_exist:nTF {#1}
{
- \@@_struct_add_AF:en { \int_eval:n {\c@g_@@_struct_abs_int} }{#1}
+ \@@_struct_add_AF:ee { \int_eval:n {\c@g_@@_struct_abs_int} }{\pdf_object_ref:n {#1}}
\@@_prop_gput:cnx
{ g_@@_struct_\int_eval:n {\c@g_@@_struct_abs_int}_prop }
{ AF }
@@ -1125,52 +1194,25 @@
},
,AFinline .code:n =
{
- \group_begin:
- \pdf_object_if_exist:eF {@@/fileobj\int_use:N\c@g_@@_struct_abs_int}
- {
- \pdffile_embed_stream:nxx
- {#1}
- {tag-AFfile\int_use:N\c@g_@@_struct_abs_int.txt}
- {@@/fileobj\int_use:N\c@g_@@_struct_abs_int}
- \@@_struct_add_AF:ee
- { \int_eval:n {\c@g_@@_struct_abs_int} }
- { @@/fileobj\int_use:N\c@g_@@_struct_abs_int }
- \@@_prop_gput:cnx
- { g_@@_struct_\int_use:N\c@g_@@_struct_abs_int _prop }
- { AF }
- {
- [
- \tl_use:c
- { g_@@_struct_\int_eval:n {\c@g_@@_struct_abs_int}_AF_tl }
- ]
- }
- }
- \group_end:
+ \@@_struct_add_inline_AF:nn {#1}{txt}
}
,AFinline-o .code:n =
{
- \group_begin:
- \pdf_object_if_exist:eF {@@/fileobj\int_use:N\c@g_@@_struct_abs_int}
- {
- \pdffile_embed_stream:oxx
- {#1}
- {tag-AFfile\int_use:N\c@g_@@_struct_abs_int.txt}
- {@@/fileobj\int_use:N\c@g_@@_struct_abs_int}
- \@@_struct_add_AF:ee
- { \int_eval:n {\c@g_@@_struct_abs_int} }
- { @@/fileobj\int_use:N\c@g_@@_struct_abs_int }
- \@@_prop_gput:cnx
- { g_@@_struct_\int_use:N\c@g_@@_struct_abs_int _prop }
- { AF }
- {
- [
- \tl_use:c
- { g_@@_struct_\int_eval:n {\c@g_@@_struct_abs_int}_AF_tl }
- ]
- }
- }
- \group_end:
+ \@@_struct_add_inline_AF:on {#1}{txt}
}
+ ,texsource .code:n =
+ {
+ \group_begin:
+ \pdfdict_put:nnn { l_pdffile/Filespec }{AFRelationship} { /Source }
+% \end{macrocode}
+% we set the mime type as pdfresources uses currently text/plain
+% \begin{macrocode}
+ \pdfdict_put:nnx
+ { l_pdffile }{Subtype}
+ { \pdf_name_from_unicode_e:n{application/x-tex} }
+ \@@_struct_add_inline_AF:on {#1}{tex}
+ \group_end:
+ }
}
% \end{macrocode}
% \end{macro}
@@ -1184,7 +1226,7 @@
{
\pdf_object_if_exist:nTF {#1}
{
- \@@_struct_add_AF:en { 0 }{#1}
+ \@@_struct_add_AF:ee { 0 }{\pdf_object_ref:n {#1}}
\@@_prop_gput:cnx
{ g_@@_struct_0_prop }
{ AF }
@@ -1510,7 +1552,7 @@
% \section{Attributes and attribute classes}
% \begin{macrocode}
%<*header>
-\ProvidesExplPackage {tagpdf-attr-code} {2023-01-30} {0.98c}
+\ProvidesExplPackage {tagpdf-attr-code} {2023-02-15} {0.98d}
{part of tagpdf - code related to attributes and attribute classes}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/tagpdf/tagpdf-tree.dtx b/macros/latex/contrib/tagpdf/tagpdf-tree.dtx
index 507681afa6..c757e9e54d 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-tree.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-tree.dtx
@@ -47,13 +47,13 @@
% }^^A
% }
%
-% \date{Version 0.98c, released 2023-01-30}
+% \date{Version 0.98d, released 2023-02-15}
% \maketitle
% \begin{implementation}
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-tree-code} {2023-01-30} {0.98c}
+\ProvidesExplPackage {tagpdf-tree-code} {2023-02-15} {0.98d}
{part of tagpdf - code related to writing trees and dictionaries to the pdf}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/tagpdf/tagpdf-user.dtx b/macros/latex/contrib/tagpdf/tagpdf-user.dtx
index 980641b6b7..01de768a15 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-user.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-user.dtx
@@ -46,7 +46,7 @@
% }^^A
% }
%
-% \date{Version 0.98c, released 2023-01-30}
+% \date{Version 0.98d, released 2023-02-15}
% \maketitle
% \begin{documentation}
% \section{Setup commands}
@@ -64,10 +64,14 @@
% add a document structure.
% \end{function}
%
-%
-% \begin{function}{\tagpdfifluatexTF,\tagpdfifluatexT,\tagpdfifpdftexT}
-% small wrappers around engine tests. This functions should not be used and will be removed
-% in one of the next versions.
+% \begin{function}{\tag_tool:n,\tagtool}
+% \begin{syntax}
+% \cs{tag_tool:n}\Arg{key val}
+% \end{syntax}
+% The tagging of basic document elements will require a variaty of small commands
+% to configure and adapt the tagging. This command will collect them under a command
+% interface. The argument is \emph{one} key-value like string. This is work in progress
+% and both syntax, known arguments and implementation can change!
% \end{function}
%
% \section{Commands related to mc-chunks}
@@ -246,7 +250,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-user} {2023-01-30} {0.98c}
+\ProvidesExplPackage {tagpdf-user} {2023-02-15} {0.98d}
{tagpdf - user commands}
%</header>
% \end{macrocode}
@@ -263,6 +267,22 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\tag_tool:n,\tagtool}
+% This is a first definition of the tool command.
+% Currently it uses key-val, but this should be probably
+% be flattened to speed it up.
+% \begin{macrocode}
+%<base>\cs_new_protected:Npn\tag_tool:n #1 {}
+%<base>\cs_set_eq:NN\tagtool\tag_tool:n
+%<*package>
+\cs_set_protected:Npn\tag_tool:n #1
+ {
+ \tag_if_active:T { \keys_set:nn {tag / tool}{#1} }
+ }
+\cs_set_eq:NN\tagtool\tag_tool:n
+%</package>
+% \end{macrocode}
+% \end{macro}
% \section{Commands for the mc-chunks}
% \begin{macro}{\tagmcbegin,\tagmcend,\tagmcuse }
@@ -579,10 +599,13 @@
% {
% paratagging (setup-key),
% paratagging-show (setup-key),
+% paratag (setup-key),
+% paratag (tool-key),
% }
% These keys enable/disable locally paratagging, and the debug modus.
% It can affect the typesetting if |paratagging-show| is used. The small numbers
-% are boxes and they have a (small) height.
+% are boxes and they have a (small) height. The |paratag| key sets the tag used by
+% the next automatic paratagging, it can also be changed with |\tag_tool:n|
% \begin{macrocode}
\keys_define:nn { @@ / setup }
{
@@ -590,22 +613,43 @@
paratagging-show .bool_set:N = \l_@@_para_show_bool,
paratag .tl_set:N = \l_@@_para_tag_tl
}
-
+\keys_define:nn { tag / tool}
+ {
+ paratag .tl_set:N = \l_@@_para_tag_tl
+ }
% \end{macrocode}
% \end{macro}
% This fills the para hooks with the needed code.
% \begin{macrocode}
+\cs_new_protected:Npn \@@_check_para_begin_show:nn #1 #2
+ %#1 color, #2 prefix
+ {
+ \bool_if:NT \l_@@_para_show_bool
+ {
+ \tag_mc_begin:n{artifact}
+ \llap{\color_select:n{#1}\tiny#2\int_use:N\g_@@_para_begin_int\ }
+ \tag_mc_end:
+ }
+ }
+
+\cs_new_protected:Npn \@@_check_para_end_show:nn #1 #2
+ %#1 color, #2 prefix
+ {
+ \bool_if:NT \l_@@_para_show_bool
+ {
+ \tag_mc_begin:n{artifact}
+ \rlap{\color_select:n{#1}\tiny\ #2\int_use:N\g_@@_para_end_int}
+ \tag_mc_end:
+ }
+ }
+
\AddToHook{para/begin}
{
\bool_if:NT \l_@@_para_bool
{
\int_gincr:N \g_@@_para_begin_int
\tag_struct_begin:n {tag=\l_@@_para_tag_tl}
- \bool_if:NT \l_@@_para_show_bool
- { \tag_mc_begin:n{artifact}
- \llap{\color_select:n{red}\tiny\int_use:N\g_@@_para_begin_int\ }
- \tag_mc_end:
- }
+ \@@_check_para_begin_show:nn {green}{}
\tag_mc_begin:n {}
}
}
@@ -615,11 +659,7 @@
{
\int_gincr:N \g_@@_para_end_int
\tag_mc_end:
- \bool_if:NT \l_@@_para_show_bool
- { \tag_mc_begin:n{artifact}
- \rlap{\color_select:n{red}\tiny\ \int_use:N\g_@@_para_end_int}
- \tag_mc_end:
- }
+ \@@_check_para_end_show:nn {red}{}
\tag_struct_end:
}
}
@@ -671,13 +711,17 @@
% \tagpdfparaOff
% }
% This two command switch para mode on and off. |\tagpdfsetup| could be used
-% too but is longer.
+% too but is longer. An alternative is |\tag_tool:n{para=false}|
% \begin{macrocode}
%<base>\newcommand\tagpdfparaOn {}
%<base>\newcommand\tagpdfparaOff{}
%<*package>
\renewcommand\tagpdfparaOn {\bool_set_true:N \l_@@_para_bool}
\renewcommand\tagpdfparaOff{\bool_set_false:N \l_@@_para_bool}
+\keys_define:nn { tag / tool}
+ {
+ para .bool_set:N = \l_@@_para_bool
+ }
% \end{macrocode}
% \end{macro}
%
diff --git a/macros/latex/contrib/tagpdf/tagpdf.dtx b/macros/latex/contrib/tagpdf/tagpdf.dtx
index 61222d151a..67a3e411d4 100644
--- a/macros/latex/contrib/tagpdf/tagpdf.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf.dtx
@@ -92,7 +92,7 @@
% \begin{macrocode}
%<@@=tag>
%<*package>
-\ProvidesExplPackage {tagpdf} {2023-01-30} {0.98c}
+\ProvidesExplPackage {tagpdf} {2023-02-15} {0.98d}
{ A package to experiment with pdf tagging }
\bool_if:nF
@@ -118,7 +118,7 @@
% \end{macrocode}
%<*debug>
% \begin{macrocode}
-\ProvidesExplPackage {tagpdf-debug} {2023-01-30} {0.98c}
+\ProvidesExplPackage {tagpdf-debug} {2023-02-15} {0.98d}
{ debug code for tagpdf }
\@ifpackageloaded{tagpdf}{}{\PackageWarning{tagpdf-debug}{tagpdf~not~loaded,~quitting}\endinput}
% \end{macrocode}
@@ -159,7 +159,7 @@
% \end{macrocode}
% \begin{macrocode}
%<*base>
-\ProvidesExplPackage {tagpdf-base} {2023-01-30} {0.98c}
+\ProvidesExplPackage {tagpdf-base} {2023-02-15} {0.98d}
{part of tagpdf - provide base, no-op versions of the user commands }
%</base>
% \end{macrocode}
diff --git a/macros/latex/contrib/tagpdf/tagpdf.pdf b/macros/latex/contrib/tagpdf/tagpdf.pdf
index 3edd2185eb..8266cfc1b3 100644
--- a/macros/latex/contrib/tagpdf/tagpdf.pdf
+++ b/macros/latex/contrib/tagpdf/tagpdf.pdf
Binary files differ
diff --git a/macros/latex/contrib/tagpdf/tagpdf.tex b/macros/latex/contrib/tagpdf/tagpdf.tex
index 299763001c..364fcce88f 100644
--- a/macros/latex/contrib/tagpdf/tagpdf.tex
+++ b/macros/latex/contrib/tagpdf/tagpdf.tex
@@ -15,8 +15,8 @@
}
\makeatletter
-\def\UlrikeFischer@package@version{0.98c}
-\def\UlrikeFischer@package@date{2023-01-30}
+\def\UlrikeFischer@package@version{0.98d}
+\def\UlrikeFischer@package@date{2023-02-15}
\makeatother
\documentclass[DIV=12,parskip=half-,bibliography=totoc,a4paper]{article}
@@ -655,6 +655,21 @@ That's a debug option, it helps in lua mode to see where space glyph will be ins
\end{description}
+\begin{docCommand}[nosep]{tagtool}{\marg{key-val}}\end{docCommand}
+\begin{docCommand}{tag_tool:n}{\marg{key-val}}\end{docCommand}
+
+The tagging of document elements require a variety of small commands. This command
+will unify them under a common interface. This is work-in-progress and syntax and implementation
+can change! While the argument looks like a key-val \emph{list} (and currently is actually one),
+this should not be relied on. Instead only
+one argument should be used as the implementation will change to improve the speed. Currently the following
+arguments are supported
+
+\begin{description}
+\item[\PrintKeyName{para}] Boolean. It will replace the \cs{tagpdfparaOn} and \cs{tagpdfparaOff} command.
+\item[\PrintKeyName{paratag}] String. It allows to change the tag used in the following automatically tagged paragraphs.
+\end{description}
+
\section{Tagging}
@@ -1643,6 +1658,10 @@ The key-val list understands the following keys:
\item[\PrintKeyName{AFinline-o}]
This is like verb+AFinline+, but it expands the value once.
+\item[\PrintKeyName{texsource}] This is like verb+AFinline-o+, but it
+ creates a tex-file, with mime type \texttt{application/x-tex} and the
+ AFRelationship \texttt{Source}.
+
\item[\PrintKeyName{lang}]
This key allows to set the language for a structure element. The value should be a bcp-identifier,
e.g. |de-De|.
diff --git a/macros/latex/contrib/tagpdf/tagpdfdocu-patches.sty b/macros/latex/contrib/tagpdf/tagpdfdocu-patches.sty
index dc1c94b911..df9d084a39 100644
--- a/macros/latex/contrib/tagpdf/tagpdfdocu-patches.sty
+++ b/macros/latex/contrib/tagpdf/tagpdfdocu-patches.sty
@@ -1,10 +1,8 @@
%\RequirePackage[enable-debug]{expl3}[2018/06/14]
-\ProvidesExplPackage {tagpdfdocu-patches} {2023-01-30} {0.98c}
+\ProvidesExplPackage {tagpdfdocu-patches} {2023-02-15} {0.98d}
{patches/commands for the tagpdf documentation}
\RequirePackage{etoolbox,xpatch}
-% latex-lab experiments
-\providecommand\tagtool[1]{}
%vLogos
\ExplSyntaxOn
diff --git a/macros/luatex/latex/novel/README.md b/macros/luatex/latex/novel/README.md
index db96138c6b..219947aa63 100644
--- a/macros/luatex/latex/novel/README.md
+++ b/macros/luatex/latex/novel/README.md
@@ -4,12 +4,14 @@ The *novel* LuaLaTeX document class is specifically written to meet the needs of
If your book is a detective novel, science fiction, romance, or collection of short stories, then you are in the right place. This document class has been used for creating several actual printed novels, both text interior and color cover. Internal code can create PDF/X files for the interior and cover. Furthermore, a color cover image can be separated to CMYK at 240% ink limit, as required by some print-on-demand services.
-This class requires TeXLive 2016 or later, or recent MiKTeX. Distributions based on TeXLive 2015 or earlier will fail.
+This class requires TeXLive 2016 or later, or recent MiKTeX. Recommended 2020 or later. Distributions based on TeXLive 2015 or earlier will fail.
Extensive documentation is in HTML format. The "novel.pdf" file is merely a place-holder.
## News:
+Version 1.80, February 8, 2023: Small tweaks.
+
Version 1.52, April 26, 2018: Enhanced detection and Warnings, using Lua code.
Version 1.50.5, April 11, 2018: Minor bug fix (incorrect warning message).
diff --git a/macros/luatex/latex/novel/doc/extras/novel-example.pdf b/macros/luatex/latex/novel/doc/extras/novel-example.pdf
new file mode 100644
index 0000000000..a8409e8bf6
--- /dev/null
+++ b/macros/luatex/latex/novel/doc/extras/novel-example.pdf
@@ -0,0 +1,1127 @@
+%PDF-1.3
+%
+4 0 obj
+<< /Type /Metadata /Subtype /XML /Length 2653 >>
+stream
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+ <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 4.2.1-c043 52.372728, 2009/01/18-15:08:04 ">
+ <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <rdf:Description rdf:about=""
+ xmlns:xmp="http://ns.adobe.com/xap/1.0/">
+ <xmp:ModifyDate>2023-02-07T18:47:29-08:00</xmp:ModifyDate>
+ <xmp:CreateDate>2023-02-07T18:47:29-08:00</xmp:CreateDate>
+ <xmp:CreatorTool>LuaLaTeX with novel and microtype</xmp:CreatorTool>
+ <xmp:MetadataDate>2023-02-07T18:47:29-08:00</xmp:MetadataDate>
+ </rdf:Description>
+ <rdf:Description rdf:about=""
+ xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <dc:format>application/pdf</dc:format>
+ <dc:title>
+ <rdf:Alt>
+ <rdf:li xml:lang="x-default">Dark and Stormy</rdf:li>
+ </rdf:Alt>
+ </dc:title>
+ <dc:creator>
+ <rdf:Bag>
+ <rdf:li>Dirk Hardcase</rdf:li>
+ </rdf:Bag>
+ </dc:creator>
+ </rdf:Description>
+ <rdf:Description rdf:about=""
+ xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/">
+ <xmpMM:DocumentID>uuid:A12D98E081B6A0EC2CBA2D468474F922</xmpMM:DocumentID>
+ <xmpMM:InstanceID>uuid:BE8C167D686F6EB156D87D29749E4ABF</xmpMM:InstanceID>
+ <xmpMM:RenditionClass>default</xmpMM:RenditionClass>
+ <xmpMM:VersionID>1</xmpMM:VersionID>
+ </rdf:Description>
+ <rdf:Description rdf:about=""
+ xmlns:pdf="http://ns.adobe.com/pdf/1.3/">
+ <pdf:Producer>LuaLaTeX with novel-pdfx and hyperref</pdf:Producer>
+ <pdf:Trapped>False</pdf:Trapped>
+ </rdf:Description>
+ <rdf:Description rdf:about=""
+ xmlns:pdfx="http://ns.adobe.com/pdfx/1.3/">
+ <pdfx:GTS_PDFXVersion>PDF/X-1a:2001</pdfx:GTS_PDFXVersion>
+ <pdfx:GTS_PDFXConformance>PDF/X-1a:2001</pdfx:GTS_PDFXConformance>
+ </rdf:Description>
+ <rdf:Description rdf:about=""
+ xmlns:pdfxid="http://www.npes.org/pdfx/ns/id/">
+ <pdfxid:GTS_PDFXVersion>PDF/X-1a:2001</pdfxid:GTS_PDFXVersion>
+ </rdf:Description>
+ </rdf:RDF>
+ </x:xmpmeta>
+ <?xpacket end="w"?>
+endstream
+endobj
+7 0 obj
+<< /Length 435 >>
+stream
+0 g 0 G
+0 g 0 G
+0 g 0 G
+1 0 0 1 273.852 438.889 cm
+q
+1.8 0 0 1.8 0 0 cm
+1 0 0 1 -273.852 -438.889 cm
+BT
+/F95 11.3574 Tf
+1 0 0 1 273.852 438.889 Tm [<002500420053004C>-250<0042004F0045>]TJ
+ET
+1 0 0 1 273.852 438.889 cm
+Q
+1 0 0 1 -3.911 -29.589 cm
+q
+2.4 0 0 2.4 0 0 cm
+0.5 g 0.5 G
+1 0 0 1 -269.941 -409.3 cm
+BT
+/F95 11.3574 Tf
+1 0 0 1 269.941 409.3 Tm [<0034005500500053004E005A>]TJ
+0 g 0 G
+ET
+1 0 0 1 269.941 409.3 cm
+Q
+0 g 0 G
+0 g 0 G
+
+endstream
+endobj
+6 0 obj
+<< /Type /Page /Contents 7 0 R /Resources 5 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612]
+
+/TrimBox[0 0 396 612] /Parent 9 0 R >>
+endobj
+5 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F95 8 0 R >> /ProcSet [ /PDF /Text ] >>
+endobj
+12 0 obj
+<< /Length 32 >>
+stream
+0 g 0 G
+0 g 0 G
+0 g 0 G
+0 g 0 G
+
+endstream
+endobj
+11 0 obj
+<< /Type /Page /Contents 12 0 R /Resources 10 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612]
+
+/TrimBox[0 0 396 612] /Parent 9 0 R >>
+endobj
+10 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /ProcSet [ /PDF ] >>
+endobj
+15 0 obj
+<< /Length 1288 >>
+stream
+0 g 0 G
+0 g 0 G
+0 g 0 G
+0 g 0 G
+1 0 0 1 120.852 453.684 cm
+q
+3.6 0 0 3.6 0 0 cm
+1 0 0 1 -120.852 -453.684 cm
+BT
+/F95 11.3574 Tf
+1 0 0 1 120.852 453.684 Tm [<002500420053004C>-250<0042004F0045>]TJ
+ET
+1 0 0 1 120.852 453.684 cm
+Q
+1 0 0 1 -3.912 -44.384 cm
+q
+4.8 0 0 4.8 0 0 cm
+0.5 g 0.5 G
+1 0 0 1 -116.94 -409.3 cm
+BT
+/F95 11.3574 Tf
+1 0 0 1 116.94 409.3 Tm [<0034005500500053004E005A>]TJ
+0 g 0 G
+ET
+1 0 0 1 116.94 409.3 cm
+Q
+1 0 0 1 29.284 -36.986 cm
+q
+1.6 0 0 1.6 0 0 cm
+1 0 0 1 -146.224 -372.314 cm
+BT
+/F83 11.3574 Tf
+1 0 0 1 146.224 372.314 Tm [<0022>-250<0035>49<0042004D0046>-250<00500047>-250<002F004A0048004900550054>]TJ
+ET
+1 0 0 1 146.224 372.314 cm
+Q
+1 0 0 1 -7.368 -71.014 cm
+q
+6 0 0 6 0 0 cm
+1 0 0 1 -138.856 -301.3 cm
+BT
+/F96 11.3574 Tf
+1 0 0 1 138.856 301.3 Tm [<0176>]TJ
+ET
+1 0 0 1 138.856 301.3 cm
+Q
+1 0 0 1 -138.856 -301.3 cm
+BT
+/F83 34.07221 Tf
+1 0 0 1 106.742 215.381 Tm [<0025004A0053004C>-250<002900420053>8<00450044004200540046>]TJ
+/F83 14.19675 Tf
+1 0 0 1 134.49 54.231 Tm [<002F0050004F0046>7<0059004A005400550046004F0055>-250<003100560043004D004A004400420055004A0050004F0054>]TJ
+1 0 0 1 109.27 39.437 Tm [<0022004F005A00550050>7<0058004F>-250<06E8>-250<0022004F005A0051004D004200440046>-250<06E8>-250<0022004F005A>-15<0058004900460053>8<0046>]TJ
+0 g 0 G
+0 g 0 G
+ET
+
+endstream
+endobj
+14 0 obj
+<< /Type /Page /Contents 15 0 R /Resources 13 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612]
+
+/TrimBox[0 0 396 612] /Parent 9 0 R >>
+endobj
+13 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F95 8 0 R /F83 16 0 R /F96 17 0 R >> /ProcSet [ /PDF /Text ] >>
+endobj
+20 0 obj
+<< /Length 2698 >>
+stream
+0 g 0 G
+0 g 0 G
+0 g 0 G
+0 g 0 G
+BT
+/F101 11.3574 Tf
+1 0 0 1 146.785 335.327 Tm [<0025086D087E0877>-250<086D087A0870>-250<00340880>25<087B087E08790885>]TJ
+/F101 11.3574 Tf
+1 0 0 1 117.136 320.533 Tm [<002400500051>7<005A0053004A004800490055>-250<006908D308D108D208D8>-250<0025004A0053004C>-250<002900420053>8<00450044004200540046>10<000F>]TJ
+1 0 0 1 145.053 305.738 Tm [<0022004D004D>-250<0033004A0048004900550054>-250<00330046005400460053>-15<0057>8<0046>-7<0045000F>]TJ
+1 0 0 1 135.626 276.149 Tm [<00350049004A0054>-250<004A0054>-250<0042>-250<0058>8<00500053004C>-250<00500047>-250<084A00440055004A0050004F000F>]TJ
+1 0 0 1 130.566 261.355 Tm [<0022004D004D>-250<0051>-7<0046005300540050004F0054>-250<0042004F0045>-250<0046>7<0057>8<0046004F00550054>-250<00420053>8<0046>]TJ
+1 0 0 1 120.356 246.56 Tm [<00470053>8<0050004E>-250<005500490046>-250<00420056005500490050005306BC0054>-250<004A004E00420048004A004F00420055004A0050004F000F>]TJ
+1 0 0 1 118.152 231.766 Tm [<0033004600540046004E0043004D0042004F00440046>-250<00550050>-250<0042004F005A>-250<0053>8<00460042004D>-250<0051>-7<0046005300540050004F000D>]TJ
+1 0 0 1 122.707 216.971 Tm [<004D004A0057004A004F0048>-250<00500053>-250<0045004600420045000D>-250<004A0054>-250<00440050004A004F0044004A00450046004F00550042004D000F>]TJ
+1 0 0 1 130.543 187.382 Tm [<00310053004A004F00550046>-7<0045>-250<0050004F>-250<00420044004A0045000E00470053>8<0046>-7<0046>-250<005100420051>-7<00460053>59<000F>]TJ
+1 0 0 1 101.008 172.588 Tm [<00310053004A004F00550046>-7<0045>-250<004A004F>-250<005500490046>-250<0036004F004A00550046>-7<0045>-250<003400550042005500460054>-250<00500047>-250<0022>49<004E00460053004A>1<00440042000F>]TJ
+1 0 0 1 147.466 142.999 Tm [<002A00340023002F>-250<08D1000E08D208D308D408D508D608D708D808D9000E08DA>]TJ
+1 0 0 1 93.092 113.41 Tm [<002A004F004500460051>-7<0046004F00450046004F0055004D005A>-250<003100560043004D004A005400490046>-7<0045>-250<0043005A>-250<0025004A0053004C>-250<002900420053>8<00450044004200540046>10<000D>]TJ
+1 0 0 1 134.729 98.615 Tm [<0022>50<004F005A00550050>7<0058004F000D>-250<0022>50<004F005A00540055004200550046>-250<003600340022>]TJ
+1 0 0 1 92.701 83.82 Tm [<0058>-15<0058>-15<0058>59<000F0046>7<00590042004E0051004D0046>10<000F00440050004E00100045004900420053>8<004500440042005400460010005100560043004D004A004400420055004A0050004F00540010>]TJ
+1 0 0 1 92.349 54.231 Tm [<003100560043004D004A005400490046005306BC0054>-250<0024004200550042004D00500048004A004F0048000E002A004F000E003100560043004D004A004400420055004A0050004F>-250<0025004200550042>]TJ
+1 0 0 1 137.67 39.437 Tm [<004200570042004A004D00420043004D0046>-250<00560051>-7<0050004F>-250<0053>8<0046>-7<00520056004600540055000F>]TJ
+0 g 0 G
+0 g 0 G
+ET
+
+endstream
+endobj
+19 0 obj
+<< /Type /Page /Contents 20 0 R /Resources 18 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612]
+
+/TrimBox[0 0 396 612] /Parent 9 0 R >>
+endobj
+18 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F101 21 0 R >> /ProcSet [ /PDF /Text ] >>
+endobj
+24 0 obj
+<< /Length 862 >>
+stream
+0 g 0 G
+0 g 0 G
+0 g 0 G
+0 g 0 G
+BT
+/F83 11.3574 Tf
+1 0 0 1 110.787 424.095 Tm [<003800490046004F>-250<005500490046>-250<004D0050004F0046>-250<00530042004400440050>-7<0050004F>-250<00490050>7<0058004D0054>-250<00420055>-250<004500560054004C000D>]TJ
+1 0 0 1 110.389 409.3 Tm [<0022004F0045>-250<00580049004A00550046>-250<0043004A0053>8<00450054>-250<00440046004200540046>-250<005500490046004A0053>-250<00550058004A0055005500460053>58<000D>]TJ
+0.997 0 0 1 110.446 394.506 Tm [<003500490046004F>-250<005400490042004D004D>-251<005500490046>-251<0053004A0057>7<004600530054>-249<0050>6<0057>8<00460053093A0050>7<0058>-250<0058004A00550049>-250<004E004600420045000F>]TJ
+1 0 0 1 198.975 379.711 Tm [<06DA>]TJ
+/F101 11.3574 Tf
+1 0 0 1 207.402 379.711 Tm [<00310053>8<0050005100490046>-7<0044005A>-250<00500047>-250<0024004D004200560045004A00560054>]TJ
+0 g 0 G
+0 g 0 G
+ET
+
+endstream
+endobj
+23 0 obj
+<< /Type /Page /Contents 24 0 R /Resources 22 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612]
+
+/TrimBox[0 0 396 612] /Parent 9 0 R >>
+endobj
+22 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F83 16 0 R /F101 21 0 R >> /ProcSet [ /PDF /Text ] >>
+endobj
+27 0 obj
+<< /Length 32 >>
+stream
+0 g 0 G
+0 g 0 G
+0 g 0 G
+0 g 0 G
+
+endstream
+endobj
+26 0 obj
+<< /Type /Page /Contents 27 0 R /Resources 25 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612]
+
+/TrimBox[0 0 396 612] /Parent 9 0 R >>
+endobj
+25 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /ProcSet [ /PDF ] >>
+endobj
+30 0 obj
+<< /Length 7553 >>
+stream
+0 g 0 G
+0 g 0 G
+BT
+/F83 18.17191 Tf
+1 0 0 1 159.426 489.674 Tm [<0024004900420051005500460053>-250<0030004F0046>]TJ
+/F83 11.3574 Tf
+0.98 0 0 1 54 394.506 Tm [<002A0055>-178<005800420054>-178<0042>-179<004500420053004C>-178<0042004F0045>-179<0054005500500053004E005A>-178<004F004A004800490055000F>-315<002D00500053>8<0045>-178<0038004A005500490046004F0054>-178<0053>7<0050>-6<00450046>-179<0049004A0054>-178<00490050005300540046>-179<005500490053>8<0050005600480049>]TJ
+0.993 0 0 1 54 379.711 Tm [<005500490046>-250<0048004D0050>-7<0050004E000D>-251<00580049004A00440049>-251<005800420054000D>-251<00420054>-251<004900460053>8<004600550050004700500053>8<0046>-250<004E0046004F0055004A0050004F0046>-7<0045000D>-251<004500420053004C000F>-335<002E005000540055>-251<0048004D0050>-7<0050004E>]TJ
+1 0 0 1 54 364.917 Tm [<004A0054>-250<004500420053004C000D>-250<00460049>-250<0058>8<005000550020>]TJ
+1.002 0 0 1 71.036 350.122 Tm [<002E0050>7<0057004A004F0048>-249<0053004A004800490055>-249<0042004D0050004F0048000D>-249<0049004A0054>-249<00490050005300540046>-249<004200530053004A0057>7<0046>-6<0045>-249<00420055>-249<005500490046>-249<004300420044004C>-249<00450050>-7<00500053>-249<00500047>-250<002D00420045005A>]TJ
+1.02 0 0 1 53.455 335.327 Tm [<0038004A00540049004A004F00550042004D0046>24<06DF0054>-256<00520056004200530055004600530054000F>-359<003400420045004D005A>58<000D>-258<002D00500053>7<0045>-255<0038004A005500490046004F0054>-256<005800420054>-256<004F00500055>-256<0050004F>-256<004A0055000D>-259<004900420057004A004F0048>]TJ
+0.982 0 0 1 54 320.533 Tm [<0054004D004A00510051>-7<0046>-7<0045>-255<00500938>-256<0049004A0054>-255<0054004200450045004D0046>-256<0042004D0050004F0048>-255<005500490046>-255<00580042005A>60<000F>-341<0035004900420055>-255<005800420054>-256<0043>-10<0046>-7<00440042005600540046>-255<005500490046>-256<0058>8<004600420055004900460053>]TJ
+1 0 0 1 53.58 305.738 Tm [<005800420054>-250<0054005500500053004E005A>59<000F>]TJ
+0.98 0 0 1 71.036 290.944 Tm [<002D00500053>8<0046004E>-248<004A005100540056004E>-248<00450050004D00500053>-249<0054004A0055>-248<0042004E00460055000D>-250<00440050004F00540046>-7<0044005500460055005600460053>-249<00420045004A0051004A00540044004A004F0048>-249<0046004D004A0055000F>-337<00360055>-249<00510056000E>]TJ
+0.985 0 0 1 54 276.149 Tm [<005300560054>-253<0046004D004A0055000D>-253<0057>7<004600540055004A00430056004D0056004E>-252<00560055000D>-253<0051004D004200440046005300420055>-253<00420044000D>-254<00420045004A0051004A00540044004A004F0048>-253<0057004A005500420046>10<000D>-253<00470046004D004A0054000F>-338<00240056005300420043004A005500560053>]TJ
+1.02 0 0 1 54 261.355 Tm [<0045004A004400550056004E>-243<0048005300420057004A00450042>-243<004E004200560053004A0054000F>-327<002F0042004E>-243<00420053>7<00440056>-243<004D004A0043>-10<00460053>7<0050>10<000D>-242<004F0050004F0056004E004E005A>-244<0046004800460055000D>-244<00440050004F00540046>-7<0044000E>]TJ
+1.02 0 0 1 54 246.56 Tm [<005500460055005600460053>-335<004A0045000D>-358<00570056004D005100560055004200550046>-335<0042000D>-358<004E00420048004F0042000F>-598<00250050004F0046>-7<0044>-335<0057>7<00460049004A00440056004D0042>-335<00420056004800560046>-335<00460056>-335<004F0046>-7<005200560046>9<000F>]TJ
+1.02 0 0 1 54 231.766 Tm [<00310046004D004D0046004F005500460054005200560046>-319<004900420043004A00550042004F0055>-320<004E005000530043004A>-320<00550053004A00540055004A005200560046>-320<00540046004F0046>-7<0044005500560054>-320<00460055>-320<004F0046005500560054>-320<00460055>-320<004E0042004D0046000E>]TJ
+1.02 0 0 1 54 216.971 Tm [<00540056004200450042>-261<00470042004E00460054>-262<00420044>-261<0055005600530051004A0054>-262<0046004800460054005500420054000F>-376<002E004200560053004A0054>-262<00560055>-262<004D0046>-7<0050>10<000F>-376<0024005300420054>-261<0057004A0057>7<0046005300530042>-261<004E0046005500560054>]TJ
+0.98 0 0 1 54 202.177 Tm [<005300490050004F004400560054>-226<00540046004E000F>-331<002F0056004D004D0042>-227<00460055>-226<004D0046>-8<0044005500560054>-226<0057>7<004600540055004A00430056004D0056004E>-226<00560053004F0042>-227<00470053004A004F0048004A004D004D0042>-226<0056004D00550053004A004400460054000F>-331<0031>-13<00490042000E>]TJ
+1.004 0 0 1 54 187.382 Tm [<00540046004D004D00560054>-248<00460056>-249<00550046004D004D00560054>-249<0054004A0055>-249<0042004E00460055>-249<005500500053005500500053>-249<0048005300420057004A00450042>-249<0051004D004200440046005300420055000F>-332<002A004F00550046004800460053>-249<005400420051004A0046004F>-249<004600540055000D>]TJ
+0.99 0 0 1 54 172.588 Tm [<004A004200440056004D004A0054>-253<004A004F000D>-253<00510053>7<00460055004A0056004E>-253<00520056004A0054000D>-253<0057004A0057>7<0046005300530042>-252<00420044000D>-254<004F0056004F0044000F>-339<003100530042004600540046004F0055>-253<0046004800460055>-254<00540046004E>-253<0057>7<0046004D>-252<004D0046>-7<0050>]TJ
+0.99 0 0 1 54 157.793 Tm [<0056004D00550053004A004400460054>-252<0043004A0043>-11<0046004F00450056004E000F>-337<0022>12<0046004F00460042004F>-252<0047004200560044004A004300560054000F>-337<002E005000530043004A>-253<00450050004D00500053>-253<004F0056004D004D0042000D>-252<004E0042004D004600540056004200450042>]TJ
+1.02 0 0 1 54 142.999 Tm [<00460056000D>-331<00510056004D0057004A004F00420053>-314<00420055000D>-332<004E0050004D004D004A0054>-314<00420044000D>-332<004F0056004D004D0042000F>-534<00240056005300420043004A005500560053>-315<004200560044005500500053>-314<00540046004E0051>-7<00460053>-314<004F0056004D004D0042000F>]TJ
+1.02 0 0 1 54 128.204 Tm [<00250050004F0046>-7<0044>-252<005700420053004A00560054>-253<00500053>8<0044004A>-252<0046004800460055>-253<0053004A005400560054000F>-349<00250056004A0054>-252<004F004A00430049>-253<004E004A000D>-254<00440050004F004800560046>-253<00460056000D>-254<0042004400440056004E00540042004F>]TJ
+1.007 0 0 1 54 113.41 Tm [<0046004D0046004A00470046004F0045000D>-249<005400420048004A00550055004A0054>-249<00520056004A0054000D>-250<0045004A0042004E000F>-333<00250056004A0054>-249<0046004800460055>-250<00500053>8<0044004A>-249<0054004A0055>-249<0042004E00460055>-249<00500053>7<0044004A>-248<0045004A0048004F004A00540054004A004E>]TJ
+1 0 0 1 54 98.615 Tm [<00530056005500530056004E000F>]TJ
+1.02 0 0 1 71.036 83.82 Tm [<002F0042004E>-328<00450056004A>-328<004D004A00480056004D0042000D>-349<00470053004A004F0048004A004D004D0042>-329<0042000D>-349<00460056004A0054004E0050>-7<0045>-328<00540050>-7<00450042004D00460054000D>-349<00540050004D004D004A0044004A005500560045004A004F>-329<0057>7<0046004D000D>]TJ
+1.016 0 0 1 53.58 69.026 Tm [<0058004A0054004A000F>-328<002E005000530043004A>-245<004200560044005500500053>-246<004D00500053>7<0046004E>-245<004F0050004F>-246<004B0056005400550050>9<000F>-327<002F0042004E>-245<004D0042004400560054>-246<004D004A0043>-10<00460053>7<0050>10<000D>-245<00510053>7<00460055004A0056004E>-245<00420055000D>]TJ
+0.98 0 0 1 54 54.231 Tm [<004D00500043>-10<005000530055004A0054>-215<0057004A005500420046>10<000D>-222<0056004D00550053004A0044004A00460054>-215<00460055000D>-223<00550046004D004D00560054000F>-327<00250050004F0046>-7<0044>-215<0042004D004A0052005600460055000D>-223<005500500053005500500053>-215<00540046>-7<0045>-215<0042004400440056004E00540042004F>]TJ
+0.995 0 0 1 54 39.437 Tm [<0043004A0043>-10<0046004F00450056004E000D>-251<0046005300420055>-250<004D004A00480056004D0042>-251<0042004D004A0052005600460055>-251<004E00420048004F0042000D>-250<0057004A005500420046>-251<00500053004F00420053>7<0046>-250<0050>-7<0045004A0050>-251<004E0046005500560054>-250<0042>-251<004E004A000F>]TJ
+0 g 0 G
+0 g 0 G
+ET
+
+endstream
+endobj
+29 0 obj
+<< /Type /Page /Contents 30 0 R /Resources 28 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612]
+
+/TrimBox[0 0 396 612] /Parent 9 0 R >>
+endobj
+28 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F83 16 0 R >> /ProcSet [ /PDF /Text ] >>
+endobj
+33 0 obj
+<< /Length 10995 >>
+stream
+0 g 0 G
+BT
+/F83 10.44878 Tf
+1 0 0 1 36 565.121 Tm [<0013>]TJ
+/F83 10.44878 Tf
+1 0 0 1 151.292 565.121 Tm [<0025>-50<0964>-50<096C>-50<095B>-341<0029>-50<095C>-50<096C>-50<095F>-50<095E>-50<095C>-50<096D>-50<0960>]TJ
+0 g 0 G
+/F83 11.3574 Tf
+1.011 0 0 1 36 542.451 Tm [<002E005000530043004A>-247<00420044>-248<00500053>7<0044004A>-246<00460055>-248<004F004A0054004D>-247<00490046004F00450053>7<00460053004A0055>-247<004E0050004D004D004A0054000F>-330<0034005600540051>-7<0046004F0045004A005400540046>-248<00560055>-248<004E0042005400540042000F>-330<0024005300420054>]TJ
+1.02 0 0 1 36 527.656 Tm [<004F0046>-7<0044>-283<0042004F00550046>9<000F>-443<00310046004D004D0046004F005500460054005200560046>-284<0042>-283<004F0056004D004D0042000F>-444<00240056004E>-284<00540050>-6<0044004A004A0054>-284<004F004200550050>-7<005200560046>-284<0051>-7<0046004F00420055004A004300560054>-284<00460055>]TJ
+1.02 0 0 1 36 512.862 Tm [<004E00420048004F004A0054>-316<0045004A0054>-316<005100420053005500560053004A0046004F0055>-317<004E0050004F005500460054000D>-334<004F0042005400440046005500560053>-316<0053004A0045004A00440056004D00560054>-316<004E00560054000F>-541<0022004D004A005200560042004E>]TJ
+0.999 0 0 1 36 498.067 Tm [<0055004A004F0044004A00450056004F0055>-250<00560053004F0042000F>-336<002F0056004D004D0042>-251<0056004D004D0042004E0044005000530051>-7<00460053>-251<0057>7<004600540055004A00430056004D0056004E>-250<0055005600530051004A0054000F>-335<00310046004D004D0046004F005500460054005200560046>]TJ
+1 0 0 1 36 483.273 Tm [<004400560053005400560054>-250<004D00560044005500560054>-250<004E004200560053004A0054000F>]TJ
+1.011 0 0 1 53.036 468.478 Tm [<002F0056004D004D0042>-248<004E0042004D004600540056004200450042>-248<0051>-7<0050005300550055004A005500500053>-249<0045004A0042004E000F>-332<00250050004F0046>-7<0044>-249<00470046004D004A0054>-248<0046005300420055000D>-249<00440050004F004800560046>-248<004F0050004F000D>]TJ
+0.992 0 0 1 35.716 453.684 Tm [<0057>8<0050004D00560055005100420055>-251<00420055000D>-252<0055004A004F0044004A00450056004F0055>-251<00550053004A00540055004A005200560046>9<000D>-251<004D004A0043>-10<00460053>7<0050>10<000F>-335<0037004A00570042004E00560054>-251<0057004A0057>7<0046005300530042>-251<004700460053004E0046004F00550056004E>]TJ
+0.98 0 0 1 36 438.889 Tm [<00470046004D004A0054000F>-329<00250050004F0046>-7<0044>-222<004F0050004F0056004E004E005A>-221<0051>-7<0046004D004D0046004F005500460054005200560046>-222<0042004F00550046>9<000F>-328<0031>-12<0049004200540046004D004D00560054>-222<00420045004A0051004A00540044004A004F0048>-222<00540046004E000E>]TJ
+0.98 0 0 1 36 424.095 Tm [<0051>-7<00460053>-226<0046004D004A0055000F>-330<00310053>7<0050004A004F>-225<004700460053004E0046004F00550056004E>-226<004E0042005400540042>-226<00420044>-226<005200560042004E000F>-331<00340046>-7<0045>-226<0045004A0042004E>-226<0055005600530051004A0054000D>-232<004E0050004D004600540055004A0046>]TJ
+1.02 0 0 1 35.716 409.3 Tm [<0057004A005500420046>10<000D>-250<0051004D004200440046005300420055>-249<0042000D>-251<004E0050004D004600540055004A0046>-249<004F0046>-7<0044000D>-251<004D0046>-7<0050>9<000F>-338<002E00420046>-7<00440046004F00420054>-250<004D00420044004A004F004A0042000F>-339<002F0042004E>-250<004A005100540056004E>]TJ
+1.015 0 0 1 36 394.506 Tm [<004D004A00480056004D0042000D>-246<0046004D0046004A00470046004F0045>-247<00420055000D>-246<0042004400440056004E00540042004F>-247<004F0046>-7<0044000D>-246<0054005600540044004A0051004A0055>-247<0042000D>-247<004A005100540056004E000F>-329<002E005000530043004A>-246<0043004D0042004F0045004A0055>]TJ
+1.017 0 0 1 36 379.711 Tm [<004D004A00480056004D0042>-244<0047004600560048004A00420055>-245<004E00420048004F0042000F>-328<002F0056004F0044>-245<0046004D0046004A00470046004F0045>-245<00440050004F00540046>-7<0052005600420055>-245<004D00500053>8<0046004E000F>-327<00340046>-7<0045>-245<004D00420044004A004F004A0042>]TJ
+1.02 0 0 1 36 364.917 Tm [<004F0056004D004D0042>-305<0057004A005500420046>-306<0046004F004A004E000F>-510<00310046004D004D0046004F005500460054005200560046>-306<0055004A004F0044004A00450056004F0055>-306<00510056005300560054>-305<0057>7<0046004D>-305<004E00420048004F0042000F>-510<002A004F00550046000E>]TJ
+1.004 0 0 1 36 350.122 Tm [<004800460053>-248<004F0050004F>-249<0046004F004A004E000F>-332<003100530042004600540046004F0055>-248<00460056004A0054004E0050>-7<0045>-249<004F0056004F0044>-249<00460056>-248<00510056005300560054000F>-332<00250050004F0046>-7<0044>-249<0043004A0043>-10<0046004F00450056004E>]TJ
+1.014 0 0 1 36 335.327 Tm [<005200560042004E>-247<004A004F>-247<00550046004D004D00560054000F>-331<002F0056004D004D0042004E>-247<004400560053005400560054>-247<00510056004D0057004A004F00420053>-247<004D0046>-7<0044005500560054000F>-331<00250050004F0046>-7<0044>-247<00460055>-248<004E004A000F>-330<002F0042004E>]TJ
+1 0 0 1 35.716 320.533 Tm [<00570056004D005100560055004200550046>-250<004E0046005500560054>-250<00460056>-250<0046004F004A004E000F>-333<0037>79<004600540055004A00430056004D0056004E>-249<0051>-7<0046004D004D0046004F005500460054005200560046>-250<00470046004D004A0054>-250<00460056>-250<004E0042005400540042000F>]TJ
+0.98 0 0 1 53.036 305.738 Tm [<09550056004A0054005200560046>-228<0056004D004D0042004E0044005000530051>-7<00460053>-228<0051004D004200440046005300420055>-228<004A005100540056004E000F>-331<0024005300420054>-228<004F004A00430049000F>-331<002E005000530043004A>-228<0057>7<0046004D>-227<004B0056005400550050>]TJ
+0.98 0 0 1 35.716 290.944 Tm [<0057004A005500420046>-236<004D0042004400560054>-237<0055004A004F0044004A00450056004F0055>-236<0056004D00550053004A004400460054000F>-334<002D00500053>7<0046004E>-235<004A005100540056004E>-237<00450050004D00500053>-236<0054004A0055>-237<0042004E00460055000D>-240<00440050004F00540046>-7<004400550046000E>]TJ
+0.98 0 0 1 36 276.149 Tm [<0055005600460053>-193<00420045004A0051004A00540044004A004F0048>-193<0046004D004A0055000F>-319<002A004F>-193<004900420044>-193<004900420043004A00550042005400540046>-194<0051004D0042005500460042>-193<0045004A004400550056004E00540055000F>-319<002A004F00550046004800460053>-193<00550046004E005100560054>]TJ
+0.996 0 0 1 36 261.355 Tm [<00440050004F00570042004D004D004A0054>-250<00420056004800560046>9<000F>-333<00260055004A0042004E>-251<004700420044004A004D004A0054004A0054000F>-334<002F0056004F0044>-251<0046004D0046004E0046004F00550056004E>-250<004700460053004E0046004F00550056004E>-251<0058004A0054004A000F>]TJ
+1.01 0 0 1 35.602 246.56 Tm [<0022>12<0046004F00460042004F>-246<0051004D004200440046005300420055000F>-330<00360055>-247<004A004E0051>-7<00460053>7<0045004A00460055000D>-246<0046004F004A004E>-247<00540046>-7<0045>-247<0048005300420057004A00450042>-246<00540050004D004D004A0044004A005500560045004A004F000D>-247<00470046004D004A0054>]TJ
+1.02 0 0 1 36 231.766 Tm [<0050>-7<0045004A0050>-259<0051004D004200440046005300420055>-260<005200560042004E000D>-264<00420044>-260<00510056004D0057004A004F00420053>-260<0046004D004A0055>-260<00510056005300560054>-260<0046004800460055>-260<0046004F004A004E000F>-371<002F0056004F0044>-260<0057004A005500420046>]TJ
+1.014 0 0 1 36 216.971 Tm [<005500500053005500500053>59<000F>-330<00310053>7<0050004A004F>-246<00550046004E005100560054>-247<004F004A00430049>-247<0054004A0055>-247<0042004E00460055>-247<004F004A0054004D000F>-331<0037004A00570042004E00560054>-247<00520056004A0054>-247<005500500053005500500053>-247<0057004A005500420046>]TJ
+1 0 0 1 36 202.177 Tm [<0053004A005400560054>-250<0051>-7<0050005300550042>-250<0057>8<00460049004A00440056004D0042000F>]TJ
+0.999 0 0 1 53.036 187.382 Tm [<00270056005400440046>-250<004E004200560053004A0054000F>-333<0037>80<004600540055004A00430056004D0056004E>-249<004D00560044005500560054>-250<004F004A00430049>-250<00420055>-251<004D0046>-7<0044005500560054000F>-333<00340046>-7<0045>-251<0043004A0043>-10<0046004F00450056004E000D>]TJ
+1.004 0 0 1 36 172.588 Tm [<004F0056004D004D0042>-248<0042>-248<0047004200560044004A004300560054>-248<00540046004E0051>-7<00460053>59<000D>-247<004D0046>-7<0050>-248<0057>7<0046004D004A0055>-247<0056004D00550053004A0044004A00460054>-248<00550046004D004D00560054000D>-248<00420044>-248<0057>7<0046004F0046004F00420055004A0054>-247<00420053>7<00440056>]TJ
+1.016 0 0 1 35.58 157.793 Tm [<0058004A0054004A>-246<0057>7<0046004D>-245<004F004A0054004D000F>-328<0037>79<004600540055004A00430056004D0056004E>-245<0045004A0042004E000F>-329<0022004D004A005200560042004E>-246<0051>-7<0046004D004D0046004F005500460054005200560046>9<000D>-245<00420056004800560046>-246<00520056004A0054>]TJ
+1.007 0 0 1 36 142.999 Tm [<005400420048004A00550055004A0054>-247<0051>-7<00500054005600460053>7<0046>10<000D>-247<0055005600530051004A0054>-247<004D0042004400560054>-248<00440050004F004800560046>-248<005200560042004E000D>-247<004A004F>-248<00490046004F00450053>7<00460053004A0055>-247<0053004A005400560054>-247<00460053>7<00500054>]TJ
+0.98 0 0 1 36 128.204 Tm [<0046004800460055>-237<00470046004D004A0054000F>-334<002E00420046>-7<00440046004F00420054>-237<0046004800460055>-237<0046005300420055>-237<004A004F>-237<005400420051004A0046004F>-237<004E004200550055004A0054>-237<0051>-8<0050005300550055004A005500500053>61<000F>-333<0037>82<004600540055004A00430056004D0056004E>]TJ
+1.02 0 0 1 36 113.41 Tm [<0051>-7<0050005300550055004A005500500053>59<000F>-483<002F0056004D004D0042>-297<004700420044004A004D004A0054004A000F>-484<00340046>-7<0045>-297<0042>-298<0055005600530051004A0054>-297<00460056>-297<004D0042004400560054>-298<00440050004E004E0050>-7<00450050>-297<004700420044004A004D004A0054004A0054000F>]TJ
+0.982 0 0 1 36 98.615 Tm [<002E005000530043004A>-254<00470053004A004F0048004A004D004D0042000D>-254<0058004A0054004A>-254<004A004F>-254<0045004A0048004F004A00540054004A004E>-254<004A004F005500460053>8<00450056004E000D>-254<004B0056005400550050>-254<004D0046>-7<0044005500560054>-254<005400420048004A00550055004A0054>-254<00450056004A000D>]TJ
+1.02 0 0 1 36 83.82 Tm [<00460055>-258<0057>7<00460049004A00440056004D0042>-258<004D004A0043>-10<00460053>7<0050>-258<00450056004A>-259<004400560053005400560054>-258<00450056004A000F>-368<002E004200560053004A0054>-259<00550046004E0051>-7<00500053>-259<004D004A00480056004D0042>-258<00540046>-7<0045>-259<004D0042004400560054000F>]TJ
+1.02 0 0 1 36 69.026 Tm [<00250056004A0054>-341<004400560053005400560054>-341<0046004F004A004E>-341<00560055>-341<00420056004800560046>9<000F>-614<0024005300420054>-341<00420044>-341<004E00420048004F0042000F>-615<0024005300420054>-341<004F0056004D004D0042000F>-615<002F0056004D004D0042>]TJ
+1.02 0 0 1 36 54.231 Tm [<0046004800460054005500420054000F>-526<00240056005300420043004A005500560053>-312<0042>-311<004D0046>-7<0050>9<000F>-526<09550056004A0054005200560046>-312<0046004800460054005500420054>-311<0058004A0054004A>-312<0046004800460055>-312<004F0056004F0044000F>-526<002F0042004E>]TJ
+1 0 0 1 36 39.437 Tm [<0047004600560048004A00420055>-250<004D0042004400560054>-250<0057>8<0046004D>-250<004600540055000F>-333<00240056005300420043004A005500560053>-250<00440050004F00540046>-7<0044005500460055005600460053>58<000F>]TJ
+0 g 0 G
+0 g 0 G
+ET
+
+endstream
+endobj
+32 0 obj
+<< /Type /Page /Contents 33 0 R /Resources 31 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612]
+
+/TrimBox[0 0 396 612] /Parent 9 0 R >>
+endobj
+31 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F83 16 0 R >> /ProcSet [ /PDF /Text ] >>
+endobj
+36 0 obj
+<< /Length 6171 >>
+stream
+0 g 0 G
+BT
+/F83 10.44878 Tf
+1 0 0 1 162.868 565.121 Tm [<0025>-50<095C>-50<096C>-50<095B>-341<095C>-50<0968>-50<095F>-342<0034>-50<096E>-25<0969>-50<096C>-50<0967>-50<0973>]TJ
+/F83 10.44878 Tf
+1 0 0 1 355.141 565.121 Tm [<0014>]TJ
+0 g 0 G
+/F83 11.3574 Tf
+0.98 0 0 1 71.036 542.451 Tm [<0034005600540051>-7<0046004F0045004A005400540046>-249<0057>7<0046004D>-248<00470046004D004A0054000F>-339<00360055>-249<004D00500053>7<0046004E>-248<004D00500053>7<0046004E000D>-249<004A004F005500460053>7<00450056004E>-249<00460056000D>-250<0055004A004F0044004A00450056004F0055>-250<0054004A0055>]TJ
+1.015 0 0 1 54 527.656 Tm [<0042004E00460055000D>-246<004D004200500053>7<0046>-6<00460055>-247<0057004A005500420046>9<000D>-246<00420053>7<00440056000F>-329<0022>12<0046004F00460042004F>-246<0047004200560044004A004300560054>-247<0051>-7<0046>-7<00450046>-247<00460056>-247<0042004F00550046>10<000F>-329<003100530042004600540046004F0055>]TJ
+1.02 0 0 1 54 512.862 Tm [<0046004F004A004E>-282<0046004D004A0055000D>-293<00530056005500530056004E>-283<00420055000D>-292<004E0050004D004600540055004A0046>-283<004F0050004F000D>-292<004F0050004F0056004E004E005A>-283<0057>7<0046004D000D>-291<004F004A0054004D000F>-440<00360055>-283<004D0046>-7<0044005500560054>]TJ
+1.02 0 0 1 54 498.067 Tm [<00460053>8<00500054000D>-318<004E0042004D004600540056004200450042>-304<0054004A0055>-304<0042004E00460055000D>-319<004700460053004E0046004F00550056004E>-304<00460056000D>-319<00540050>-6<00450042004D00460054>-304<004400560053005400560054000D>-319<004E00420048004F0042000F>]TJ
+1.007 0 0 1 54 483.273 Tm [<00250050004F0046>-7<0044>-248<00460056>-249<00510056005300560054000F>-332<09550056004A0054005200560046>-249<0057>7<00460049004A00440056004D0042000D>-248<00560053004F0042>-248<00540046>-7<0045>-249<0056004D00550053004A0044004A00460054>-249<004200560044005500500053>59<000D>-248<0051>-7<0046>-7<00450046>]TJ
+1.02 0 0 1 54 468.478 Tm [<004D00500053>8<0046004E>-316<0046004800460054005500420054>-316<00450056004A000D>-335<00460055>-316<00440050004F00570042004D004D004A0054>-317<0046004D004A0055>-316<0046005300420055>-316<00540046>-7<0045>-317<004F0056004D004D0042000F>-541<00250050004F0046>-7<0044>-316<004D00560044005500560054000F>]TJ
+0.98 0 0 1 54 453.684 Tm [<00240056005300420043004A005500560053>-241<00460055>-242<004F0056004F0044000F>-336<0022004D004A005200560042004E>-242<00450050004D00500053>-242<0050>-7<0045004A0050>10<000D>-244<00440050004E004E0050>-7<00450050>-242<00510053>7<00460055004A0056004E000D>-243<0056004D00550053004A0044004A00460054>]TJ
+1.018 0 0 1 54 438.889 Tm [<004F0050004F000D>-244<0051004900420053>7<0046005500530042>-243<004A004F000D>-245<0057>7<0046004D004A0055000F>-326<002A004F00550046004800460053>-244<00420053>7<00440056>-244<004600540055000D>-244<004F0050004F0056004E004E005A>-244<004A004F000D>-245<004700460053004E0046004F00550056004E>]TJ
+1 0 0 1 54 424.095 Tm [<0047004200560044004A004300560054000D>-250<0046004800460054005500420054>-250<0057>8<0046004D000D>-250<0050>-7<0045004A0050>10<000F>]TJ
+1.005 0 0 1 71.036 409.3 Tm [<00340046>-7<0045>-247<00440050004E004E0050>-7<00450050>-248<0051>-7<00500054005600460053>7<0046>-246<0051>-7<0046>-7<00450046>9<000F>-330<002E004200560053004A0054>-248<00560055>-247<004600540055000F>-332<00360055>-247<00520056004A0054>-247<00510056005300560054000F>-332<00340046>-7<0045>]TJ
+1.01 0 0 1 54 394.506 Tm [<00420044>-247<0050>-7<0045004A0050>9<000F>-330<00340046>-7<0045>-248<0057>7<00460049004A00440056004D0042>-247<00490046004F00450053>7<00460053004A0055>-247<00540046004E000F>-331<00250056004A0054>-248<004F0050004F>-247<0050>-8<0045004A0050>10<000F>-330<002E005000530043004A>-248<00560055>-248<00450056004A000F>]TJ
+1.02 0 0 1 54 379.711 Tm [<00340046>-7<0045>-316<0042004400440056004E00540042004F>-317<0053004A005400560054>-316<0046004800460055>-317<0050>-7<0045004A0050>9<000F>-541<002A004F>-316<004900420044>-317<004900420043004A00550042005400540046>-317<0051004D0042005500460042>-316<0045004A004400550056004E00540055000F>]TJ
+1.02 0 0 1 54 364.917 Tm [<00310046004D004D0046004F005500460054005200560046>-361<004F0050004F>-362<0046004D004A0055000F>-677<00270056005400440046>-361<00540046>-7<0045>-362<004B0056005400550050>-362<00460056>-362<00560053004F0042>-361<0051>-7<0050005300550042>-362<0055004A004F0044004A00450056004F0055000F>]TJ
+0.981 0 0 1 54 350.122 Tm [<002E004200560053004A0054>-255<00470046004D004A0054>-255<0050>-7<0045004A0050>9<000D>-254<00540050004D004D004A0044004A005500560045004A004F>-255<00540046>-8<0045000D>-255<0057>7<0050004D0056>1<0055005100420055>-255<0042000D>-255<00500053004F00420053>7<0046>-254<00420044000D>-255<0046005300420055000F>-341<002E005000530043004A>]TJ
+1.02 0 0 1 54 335.327 Tm [<00520056004A0054>-270<00450050004D00500053>59<000F>-401<00250050004F0046>-7<0044>-270<0051>-7<0046004D004D0046004F005500460054005200560046>9<000D>-275<0046005300420055>-270<00420044>-270<005400420048004A00550055004A0054>-270<00540046004E0051>-7<00460053>58<000D>-275<004F0056004F0044>-270<00450056004A>]TJ
+1.02 0 0 1 54 320.533 Tm [<004D00500043>-10<005000530055004A0054>-269<00510056005300560054000D>-275<00520056004A0054>-269<00440050004F004800560046>-269<00510056005300560054>-269<004E0046005500560054>-269<0056004D00550053004A0044004A00460054>-269<00550046004D004D00560054000F>-398<00310053>7<0050004A004F>-268<00460055>]TJ
+1.02 0 0 1 54 305.738 Tm [<005200560042004E000F>-341<0024004D004200540054>-250<0042005100550046004F0055>-250<005500420044004A0055004A>-250<00540050>-7<0044004A0050005400520056>-250<00420045>-250<004D004A0055005000530042>-250<005500500053>7<005200560046004F0055>-249<0051>-7<00460053>-250<00440050004F00560043004A0042>]TJ
+0.98 0 0 1 54 290.944 Tm [<004F00500054005500530042000D>-241<0051>-7<00460053>-238<004A004F004400460051005500500054>-239<0049005A004E0046004F00420046>-7<00500054000F>-334<003100530042004600540046004F0055>-239<005400420051004A0046004F>-238<0055005600530051004A0054000D>-241<004700460053004E0046004F00550056004E>]TJ
+1 0 0 1 53.716 276.149 Tm [<0057>8<0046004D000D>-250<0046004D0046004A00470046004F0045>-250<0047004200560044004A004300560054000D>-250<0057>8<00460049004A00440056004D0042>-250<00460056000D>-250<004D0042004400560054000F>]TJ
+0 g 0 G
+0 g 0 G
+ET
+
+endstream
+endobj
+35 0 obj
+<< /Type /Page /Contents 36 0 R /Resources 34 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612]
+
+/TrimBox[0 0 396 612] /Parent 9 0 R >>
+endobj
+34 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F83 16 0 R >> /ProcSet [ /PDF /Text ] >>
+endobj
+39 0 obj
+<< /Length 7861 >>
+stream
+0 g 0 G
+0 g 0 G
+BT
+/F83 18.17191 Tf
+1 0 0 1 140.517 489.674 Tm [<0024004900420051005500460053>-250<0035>49<0058>8<0050>]TJ
+/F83 11.3574 Tf
+0.988 0 0 1 35.659 394.506 Tm [<003500490046>-254<004F004A004800490055>-253<005800420054>-254<00540055004A004D004D>-254<004500420053004C>-254<0042004F0045>-254<0054005500500053004E005A>60<000F>-339<00350049004A0054>-254<0054004900500056004D0045>-254<004F00500055>-254<0043>-11<0046>-253<00540056005300510053004A0054004A004F0048000D>]TJ
+0.989 0 0 1 36 379.711 Tm [<00540046>-7<0046004A004F0048>-253<00420054>-254<00490050>7<0058>-253<0050004F004D005A>-253<00490042004D0047>-253<0042004F>-254<0049005000560053>-253<004900420054>-254<0046004D0042005100540046>-7<0045>-253<0054004A004F00440046>-254<005500490046>-253<0939005300540055>-253<0044004900420051005500460053>60<000F>]TJ
+1.02 0 0 1 35.659 364.917 Tm [<0035004900420055>-281<004A004F004700500053004E00420055004A0050004F>-282<005800420054>-282<004F0046>-7<004400460054005400420053>-15<005A>58<000D>-289<004A004F>-282<0044004200540046>-282<005A>7<00500056>-280<005100560055>-282<005500490046>-282<0043>-10<0050>-7<0050004C>-281<00450050>6<0058004F>]TJ
+1 0 0 1 36 350.122 Tm [<0042004F0045>-250<004900420057>8<0046004F06DF0055>-250<0053>8<004600420045>-250<0042004F005A>-250<00500047>-250<004A0055>-250<004700500053>-250<005500490046>-250<004D004200540055>-250<00550058>8<0050>-250<0058>8<0046>-7<0046004C0054000F>]TJ
+0.98 0 0 1 53.036 335.327 Tm [<002D00500053>8<0045>-209<0038004A005500490046004F0054000D>-220<0058>8<00460055>-209<0042004F0045>-210<004300530056004A00540046>-8<0045000D>-219<0939004F0042004D004D005A>-210<004200530053004A0057>7<0046>-6<0045>-210<00420055>-210<0049004A0054>-210<0045004600540055004A004F00420055004A0050004F000F>]TJ
+0.98 0 0 1 35.659 320.533 Tm [<003500490046>-234<0053>7<0046004200540050004F>-234<00490046>-234<005800420054>-235<0058>7<00460055>-233<005800420054>-235<0043>-10<0046>-8<00440042005600540046>10<000D>-238<00420054>-235<004900420054>-234<0043>-11<0046>-7<0046004F>-235<004F005000550046>-7<0045000D>-239<005500490046>-235<0058>8<004600420055004900460053>]TJ
+1 0 0 1 35.58 305.738 Tm [<005800420054>-250<0054005500500053004E005A>59<000F>-333<002A0055>-250<005800420054>-250<004500420053004C000D>-250<00550050>-7<0050>9<000F>]TJ
+0.98 0 0 1 53.036 290.944 Tm [<002D00500053>8<0046004E>-248<004A005100540056004E>-248<00450050004D00500053>-249<0054004A0055>-248<0042004E00460055000D>-250<00440050004F00540046>-7<0044005500460055005600460053>-249<00420045004A0051004A00540044004A004F0048>-249<0046004D004A0055000F>-337<00360055>-249<00510056000E>]TJ
+0.985 0 0 1 36 276.149 Tm [<005300560054>-253<0046004D004A0055000D>-253<0057>7<004600540055004A00430056004D0056004E>-252<00560055000D>-253<0051004D004200440046005300420055>-253<00420044000D>-254<00420045004A0051004A00540044004A004F0048>-253<0057004A005500420046>10<000D>-253<00470046004D004A0054000F>-338<00240056005300420043004A005500560053>]TJ
+1.02 0 0 1 36 261.355 Tm [<0045004A004400550056004E>-243<0048005300420057004A00450042>-243<004E004200560053004A0054000F>-327<002F0042004E>-243<00420053>7<00440056>-243<004D004A0043>-10<00460053>7<0050>10<000D>-242<004F0050004F0056004E004E005A>-244<0046004800460055000D>-244<00440050004F00540046>-7<0044000E>]TJ
+1.02 0 0 1 36 246.56 Tm [<005500460055005600460053>-335<004A0045000D>-358<00570056004D005100560055004200550046>-335<0042000D>-358<004E00420048004F0042000F>-598<00250050004F0046>-7<0044>-335<0057>7<00460049004A00440056004D0042>-335<00420056004800560046>-335<00460056>-335<004F0046>-7<005200560046>9<000F>]TJ
+1.02 0 0 1 36 231.766 Tm [<00310046004D004D0046004F005500460054005200560046>-319<004900420043004A00550042004F0055>-320<004E005000530043004A>-320<00550053004A00540055004A005200560046>-320<00540046004F0046>-7<0044005500560054>-320<00460055>-320<004F0046005500560054>-320<00460055>-320<004E0042004D0046000E>]TJ
+1.02 0 0 1 36 216.971 Tm [<00540056004200450042>-261<00470042004E00460054>-262<00420044>-261<0055005600530051004A0054>-262<0046004800460054005500420054000F>-376<002E004200560053004A0054>-262<00560055>-262<004D0046>-7<0050>10<000F>-376<0024005300420054>-261<0057004A0057>7<0046005300530042>-261<004E0046005500560054>]TJ
+0.98 0 0 1 36 202.177 Tm [<005300490050004F004400560054>-226<00540046004E000F>-331<002F0056004D004D0042>-227<00460055>-226<004D0046>-8<0044005500560054>-226<0057>7<004600540055004A00430056004D0056004E>-226<00560053004F0042>-227<00470053004A004F0048004A004D004D0042>-226<0056004D00550053004A004400460054000F>-331<0031>-13<00490042000E>]TJ
+1.004 0 0 1 36 187.382 Tm [<00540046004D004D00560054>-248<00460056>-249<00550046004D004D00560054>-249<0054004A0055>-249<0042004E00460055>-249<005500500053005500500053>-249<0048005300420057004A00450042>-249<0051004D004200440046005300420055000F>-332<002A004F00550046004800460053>-249<005400420051004A0046004F>-249<004600540055000D>]TJ
+0.99 0 0 1 36 172.588 Tm [<004A004200440056004D004A0054>-253<004A004F000D>-253<00510053>7<00460055004A0056004E>-253<00520056004A0054000D>-253<0057004A0057>7<0046005300530042>-252<00420044000D>-254<004F0056004F0044000F>-339<003100530042004600540046004F0055>-253<0046004800460055>-254<00540046004E>-253<0057>7<0046004D>-252<004D0046>-7<0050>]TJ
+0.99 0 0 1 36 157.793 Tm [<0056004D00550053004A004400460054>-252<0043004A0043>-11<0046004F00450056004E000F>-337<0022>12<0046004F00460042004F>-252<0047004200560044004A004300560054000F>-337<002E005000530043004A>-253<00450050004D00500053>-253<004F0056004D004D0042000D>-252<004E0042004D004600540056004200450042>]TJ
+1.02 0 0 1 36 142.999 Tm [<00460056000D>-331<00510056004D0057004A004F00420053>-314<00420055000D>-332<004E0050004D004D004A0054>-314<00420044000D>-332<004F0056004D004D0042000F>-534<00240056005300420043004A005500560053>-315<004200560044005500500053>-314<00540046004E0051>-7<00460053>-314<004F0056004D004D0042000F>]TJ
+1.02 0 0 1 36 128.204 Tm [<00250050004F0046>-7<0044>-252<005700420053004A00560054>-253<00500053>8<0044004A>-252<0046004800460055>-253<0053004A005400560054000F>-349<00250056004A0054>-252<004F004A00430049>-253<004E004A000D>-254<00440050004F004800560046>-253<00460056000D>-254<0042004400440056004E00540042004F>]TJ
+1.007 0 0 1 36 113.41 Tm [<0046004D0046004A00470046004F0045000D>-249<005400420048004A00550055004A0054>-249<00520056004A0054000D>-250<0045004A0042004E000F>-333<00250056004A0054>-249<0046004800460055>-250<00500053>8<0044004A>-249<0054004A0055>-249<0042004E00460055>-249<00500053>7<0044004A>-248<0045004A0048004F004A00540054004A004E>]TJ
+1 0 0 1 36 98.615 Tm [<00530056005500530056004E000F>]TJ
+1.02 0 0 1 53.036 83.82 Tm [<002F0042004E>-328<00450056004A>-328<004D004A00480056004D0042000D>-349<00470053004A004F0048004A004D004D0042>-329<0042000D>-349<00460056004A0054004E0050>-7<0045>-328<00540050>-7<00450042004D00460054000D>-349<00540050004D004D004A0044004A005500560045004A004F>-329<0057>7<0046004D000D>]TJ
+1.016 0 0 1 35.58 69.026 Tm [<0058004A0054004A000F>-328<002E005000530043004A>-245<004200560044005500500053>-246<004D00500053>7<0046004E>-245<004F0050004F>-246<004B0056005400550050>9<000F>-327<002F0042004E>-245<004D0042004400560054>-246<004D004A0043>-10<00460053>7<0050>10<000D>-245<00510053>7<00460055004A0056004E>-245<00420055000D>]TJ
+0.98 0 0 1 36 54.231 Tm [<004D00500043>-10<005000530055004A0054>-215<0057004A005500420046>10<000D>-222<0056004D00550053004A0044004A00460054>-215<00460055000D>-223<00550046004D004D00560054000F>-327<00250050004F0046>-7<0044>-215<0042004D004A0052005600460055000D>-223<005500500053005500500053>-215<00540046>-7<0045>-215<0042004400440056004E00540042004F>]TJ
+0.995 0 0 1 36 39.437 Tm [<0043004A0043>-10<0046004F00450056004E000D>-251<0046005300420055>-250<004D004A00480056004D0042>-251<0042004D004A0052005600460055>-251<004E00420048004F0042000D>-250<0057004A005500420046>-251<00500053004F00420053>7<0046>-250<0050>-7<0045004A0050>-251<004E0046005500560054>-250<0042>-251<004E004A000F>]TJ
+0 g 0 G
+0 g 0 G
+ET
+
+endstream
+endobj
+38 0 obj
+<< /Type /Page /Contents 39 0 R /Resources 37 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612]
+
+/TrimBox[0 0 396 612] /Parent 9 0 R >>
+endobj
+37 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F83 16 0 R >> /ProcSet [ /PDF /Text ] >>
+endobj
+42 0 obj
+<< /Length 11010 >>
+stream
+0 g 0 G
+BT
+/F83 10.44878 Tf
+1 0 0 1 162.868 565.121 Tm [<0025>-50<095C>-50<096C>-50<095B>-341<095C>-50<0968>-50<095F>-342<0034>-50<096E>-25<0969>-50<096C>-50<0967>-50<0973>]TJ
+/F83 10.44878 Tf
+1 0 0 1 355.141 565.121 Tm [<0016>]TJ
+0 g 0 G
+/F83 11.3574 Tf
+1.011 0 0 1 54 542.451 Tm [<002E005000530043004A>-247<00420044>-248<00500053>7<0044004A>-246<00460055>-248<004F004A0054004D>-247<00490046004F00450053>7<00460053004A0055>-247<004E0050004D004D004A0054000F>-330<0034005600540051>-7<0046004F0045004A005400540046>-248<00560055>-248<004E0042005400540042000F>-330<0024005300420054>]TJ
+1.02 0 0 1 54 527.656 Tm [<004F0046>-7<0044>-283<0042004F00550046>9<000F>-443<00310046004D004D0046004F005500460054005200560046>-284<0042>-283<004F0056004D004D0042000F>-444<00240056004E>-284<00540050>-6<0044004A004A0054>-284<004F004200550050>-7<005200560046>-284<0051>-7<0046004F00420055004A004300560054>-284<00460055>]TJ
+1.02 0 0 1 54 512.862 Tm [<004E00420048004F004A0054>-316<0045004A0054>-316<005100420053005500560053004A0046004F0055>-317<004E0050004F005500460054000D>-334<004F0042005400440046005500560053>-316<0053004A0045004A00440056004D00560054>-316<004E00560054000F>-541<0022004D004A005200560042004E>]TJ
+0.999 0 0 1 54 498.067 Tm [<0055004A004F0044004A00450056004F0055>-250<00560053004F0042000F>-336<002F0056004D004D0042>-251<0056004D004D0042004E0044005000530051>-7<00460053>-251<0057>7<004600540055004A00430056004D0056004E>-250<0055005600530051004A0054000F>-335<00310046004D004D0046004F005500460054005200560046>]TJ
+1 0 0 1 54 483.273 Tm [<004400560053005400560054>-250<004D00560044005500560054>-250<004E004200560053004A0054000F>]TJ
+1.011 0 0 1 71.036 468.478 Tm [<002F0056004D004D0042>-248<004E0042004D004600540056004200450042>-248<0051>-7<0050005300550055004A005500500053>-249<0045004A0042004E000F>-332<00250050004F0046>-7<0044>-249<00470046004D004A0054>-248<0046005300420055000D>-249<00440050004F004800560046>-248<004F0050004F000D>]TJ
+0.992 0 0 1 53.716 453.684 Tm [<0057>8<0050004D00560055005100420055>-251<00420055000D>-252<0055004A004F0044004A00450056004F0055>-251<00550053004A00540055004A005200560046>9<000D>-251<004D004A0043>-10<00460053>7<0050>10<000F>-335<0037004A00570042004E00560054>-251<0057004A0057>7<0046005300530042>-251<004700460053004E0046004F00550056004E>]TJ
+0.98 0 0 1 54 438.889 Tm [<00470046004D004A0054000F>-329<00250050004F0046>-7<0044>-222<004F0050004F0056004E004E005A>-221<0051>-7<0046004D004D0046004F005500460054005200560046>-222<0042004F00550046>9<000F>-328<0031>-12<0049004200540046004D004D00560054>-222<00420045004A0051004A00540044004A004F0048>-222<00540046004E000E>]TJ
+0.98 0 0 1 54 424.095 Tm [<0051>-7<00460053>-226<0046004D004A0055000F>-330<00310053>7<0050004A004F>-225<004700460053004E0046004F00550056004E>-226<004E0042005400540042>-226<00420044>-226<005200560042004E000F>-331<00340046>-7<0045>-226<0045004A0042004E>-226<0055005600530051004A0054000D>-232<004E0050004D004600540055004A0046>]TJ
+1.02 0 0 1 53.716 409.3 Tm [<0057004A005500420046>10<000D>-250<0051004D004200440046005300420055>-249<0042000D>-251<004E0050004D004600540055004A0046>-249<004F0046>-7<0044000D>-251<004D0046>-7<0050>9<000F>-338<002E00420046>-7<00440046004F00420054>-250<004D00420044004A004F004A0042000F>-339<002F0042004E>-250<004A005100540056004E>]TJ
+1.015 0 0 1 54 394.506 Tm [<004D004A00480056004D0042000D>-246<0046004D0046004A00470046004F0045>-247<00420055000D>-246<0042004400440056004E00540042004F>-247<004F0046>-7<0044000D>-246<0054005600540044004A0051004A0055>-247<0042000D>-247<004A005100540056004E000F>-329<002E005000530043004A>-246<0043004D0042004F0045004A0055>]TJ
+1.017 0 0 1 54 379.711 Tm [<004D004A00480056004D0042>-244<0047004600560048004A00420055>-245<004E00420048004F0042000F>-328<002F0056004F0044>-245<0046004D0046004A00470046004F0045>-245<00440050004F00540046>-7<0052005600420055>-245<004D00500053>8<0046004E000F>-327<00340046>-7<0045>-245<004D00420044004A004F004A0042>]TJ
+1.02 0 0 1 54 364.917 Tm [<004F0056004D004D0042>-305<0057004A005500420046>-306<0046004F004A004E000F>-510<00310046004D004D0046004F005500460054005200560046>-306<0055004A004F0044004A00450056004F0055>-306<00510056005300560054>-305<0057>7<0046004D>-305<004E00420048004F0042000F>-510<002A004F00550046000E>]TJ
+1.004 0 0 1 54 350.122 Tm [<004800460053>-248<004F0050004F>-249<0046004F004A004E000F>-332<003100530042004600540046004F0055>-248<00460056004A0054004E0050>-7<0045>-249<004F0056004F0044>-249<00460056>-248<00510056005300560054000F>-332<00250050004F0046>-7<0044>-249<0043004A0043>-10<0046004F00450056004E>]TJ
+1.014 0 0 1 54 335.327 Tm [<005200560042004E>-247<004A004F>-247<00550046004D004D00560054000F>-331<002F0056004D004D0042004E>-247<004400560053005400560054>-247<00510056004D0057004A004F00420053>-247<004D0046>-7<0044005500560054000F>-331<00250050004F0046>-7<0044>-247<00460055>-248<004E004A000F>-330<002F0042004E>]TJ
+1 0 0 1 53.716 320.533 Tm [<00570056004D005100560055004200550046>-250<004E0046005500560054>-250<00460056>-250<0046004F004A004E000F>-333<0037>79<004600540055004A00430056004D0056004E>-249<0051>-7<0046004D004D0046004F005500460054005200560046>-250<00470046004D004A0054>-250<00460056>-250<004E0042005400540042000F>]TJ
+0.98 0 0 1 71.036 305.738 Tm [<09550056004A0054005200560046>-228<0056004D004D0042004E0044005000530051>-7<00460053>-228<0051004D004200440046005300420055>-228<004A005100540056004E000F>-331<0024005300420054>-228<004F004A00430049000F>-331<002E005000530043004A>-228<0057>7<0046004D>-227<004B0056005400550050>]TJ
+0.98 0 0 1 53.716 290.944 Tm [<0057004A005500420046>-236<004D0042004400560054>-237<0055004A004F0044004A00450056004F0055>-236<0056004D00550053004A004400460054000F>-334<002D00500053>7<0046004E>-235<004A005100540056004E>-237<00450050004D00500053>-236<0054004A0055>-237<0042004E00460055000D>-240<00440050004F00540046>-7<004400550046000E>]TJ
+0.98 0 0 1 54 276.149 Tm [<0055005600460053>-193<00420045004A0051004A00540044004A004F0048>-193<0046004D004A0055000F>-319<002A004F>-193<004900420044>-193<004900420043004A00550042005400540046>-194<0051004D0042005500460042>-193<0045004A004400550056004E00540055000F>-319<002A004F00550046004800460053>-193<00550046004E005100560054>]TJ
+0.996 0 0 1 54 261.355 Tm [<00440050004F00570042004D004D004A0054>-250<00420056004800560046>9<000F>-333<00260055004A0042004E>-251<004700420044004A004D004A0054004A0054000F>-334<002F0056004F0044>-251<0046004D0046004E0046004F00550056004E>-250<004700460053004E0046004F00550056004E>-251<0058004A0054004A000F>]TJ
+1.01 0 0 1 53.602 246.56 Tm [<0022>12<0046004F00460042004F>-246<0051004D004200440046005300420055000F>-330<00360055>-247<004A004E0051>-7<00460053>7<0045004A00460055000D>-246<0046004F004A004E>-247<00540046>-7<0045>-247<0048005300420057004A00450042>-246<00540050004D004D004A0044004A005500560045004A004F000D>-247<00470046004D004A0054>]TJ
+1.02 0 0 1 54 231.766 Tm [<0050>-7<0045004A0050>-259<0051004D004200440046005300420055>-260<005200560042004E000D>-264<00420044>-260<00510056004D0057004A004F00420053>-260<0046004D004A0055>-260<00510056005300560054>-260<0046004800460055>-260<0046004F004A004E000F>-371<002F0056004F0044>-260<0057004A005500420046>]TJ
+1.014 0 0 1 54 216.971 Tm [<005500500053005500500053>59<000F>-330<00310053>7<0050004A004F>-246<00550046004E005100560054>-247<004F004A00430049>-247<0054004A0055>-247<0042004E00460055>-247<004F004A0054004D000F>-331<0037004A00570042004E00560054>-247<00520056004A0054>-247<005500500053005500500053>-247<0057004A005500420046>]TJ
+1 0 0 1 54 202.177 Tm [<0053004A005400560054>-250<0051>-7<0050005300550042>-250<0057>8<00460049004A00440056004D0042000F>]TJ
+0.999 0 0 1 71.036 187.382 Tm [<00270056005400440046>-250<004E004200560053004A0054000F>-333<0037>80<004600540055004A00430056004D0056004E>-249<004D00560044005500560054>-250<004F004A00430049>-250<00420055>-251<004D0046>-7<0044005500560054000F>-333<00340046>-7<0045>-251<0043004A0043>-10<0046004F00450056004E000D>]TJ
+1.004 0 0 1 54 172.588 Tm [<004F0056004D004D0042>-248<0042>-248<0047004200560044004A004300560054>-248<00540046004E0051>-7<00460053>59<000D>-247<004D0046>-7<0050>-248<0057>7<0046004D004A0055>-247<0056004D00550053004A0044004A00460054>-248<00550046004D004D00560054000D>-248<00420044>-248<0057>7<0046004F0046004F00420055004A0054>-247<00420053>7<00440056>]TJ
+1.016 0 0 1 53.58 157.793 Tm [<0058004A0054004A>-246<0057>7<0046004D>-245<004F004A0054004D000F>-328<0037>79<004600540055004A00430056004D0056004E>-245<0045004A0042004E000F>-329<0022004D004A005200560042004E>-246<0051>-7<0046004D004D0046004F005500460054005200560046>9<000D>-245<00420056004800560046>-246<00520056004A0054>]TJ
+1.007 0 0 1 54 142.999 Tm [<005400420048004A00550055004A0054>-247<0051>-7<00500054005600460053>7<0046>10<000D>-247<0055005600530051004A0054>-247<004D0042004400560054>-248<00440050004F004800560046>-248<005200560042004E000D>-247<004A004F>-248<00490046004F00450053>7<00460053004A0055>-247<0053004A005400560054>-247<00460053>7<00500054>]TJ
+0.98 0 0 1 54 128.204 Tm [<0046004800460055>-237<00470046004D004A0054000F>-334<002E00420046>-7<00440046004F00420054>-237<0046004800460055>-237<0046005300420055>-237<004A004F>-237<005400420051004A0046004F>-237<004E004200550055004A0054>-237<0051>-8<0050005300550055004A005500500053>61<000F>-333<0037>82<004600540055004A00430056004D0056004E>]TJ
+1.02 0 0 1 54 113.41 Tm [<0051>-7<0050005300550055004A005500500053>59<000F>-483<002F0056004D004D0042>-297<004700420044004A004D004A0054004A000F>-484<00340046>-7<0045>-297<0042>-298<0055005600530051004A0054>-297<00460056>-297<004D0042004400560054>-298<00440050004E004E0050>-7<00450050>-297<004700420044004A004D004A0054004A0054000F>]TJ
+0.982 0 0 1 54 98.615 Tm [<002E005000530043004A>-254<00470053004A004F0048004A004D004D0042000D>-254<0058004A0054004A>-254<004A004F>-254<0045004A0048004F004A00540054004A004E>-254<004A004F005500460053>8<00450056004E000D>-254<004B0056005400550050>-254<004D0046>-7<0044005500560054>-254<005400420048004A00550055004A0054>-254<00450056004A000D>]TJ
+1.02 0 0 1 54 83.82 Tm [<00460055>-258<0057>7<00460049004A00440056004D0042>-258<004D004A0043>-10<00460053>7<0050>-258<00450056004A>-259<004400560053005400560054>-258<00450056004A000F>-368<002E004200560053004A0054>-259<00550046004E0051>-7<00500053>-259<004D004A00480056004D0042>-258<00540046>-7<0045>-259<004D0042004400560054000F>]TJ
+1.02 0 0 1 54 69.026 Tm [<00250056004A0054>-341<004400560053005400560054>-341<0046004F004A004E>-341<00560055>-341<00420056004800560046>9<000F>-614<0024005300420054>-341<00420044>-341<004E00420048004F0042000F>-615<0024005300420054>-341<004F0056004D004D0042000F>-615<002F0056004D004D0042>]TJ
+1.02 0 0 1 54 54.231 Tm [<0046004800460054005500420054000F>-526<00240056005300420043004A005500560053>-312<0042>-311<004D0046>-7<0050>9<000F>-526<09550056004A0054005200560046>-312<0046004800460054005500420054>-311<0058004A0054004A>-312<0046004800460055>-312<004F0056004F0044000F>-526<002F0042004E>]TJ
+1 0 0 1 54 39.437 Tm [<0047004600560048004A00420055>-250<004D0042004400560054>-250<0057>8<0046004D>-250<004600540055000F>-333<00240056005300420043004A005500560053>-250<00440050004F00540046>-7<0044005500460055005600460053>58<000F>]TJ
+0 g 0 G
+0 g 0 G
+ET
+
+endstream
+endobj
+41 0 obj
+<< /Type /Page /Contents 42 0 R /Resources 40 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612]
+
+/TrimBox[0 0 396 612] /Parent 43 0 R >>
+endobj
+40 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F83 16 0 R >> /ProcSet [ /PDF /Text ] >>
+endobj
+46 0 obj
+<< /Length 6156 >>
+stream
+0 g 0 G
+BT
+/F83 10.44878 Tf
+1 0 0 1 36 565.121 Tm [<0017>]TJ
+/F83 10.44878 Tf
+1 0 0 1 151.292 565.121 Tm [<0025>-50<0964>-50<096C>-50<095B>-341<0029>-50<095C>-50<096C>-50<095F>-50<095E>-50<095C>-50<096D>-50<0960>]TJ
+0 g 0 G
+/F83 11.3574 Tf
+0.98 0 0 1 53.036 542.451 Tm [<0034005600540051>-7<0046004F0045004A005400540046>-249<0057>7<0046004D>-248<00470046004D004A0054000F>-339<00360055>-249<004D00500053>7<0046004E>-248<004D00500053>7<0046004E000D>-249<004A004F005500460053>7<00450056004E>-249<00460056000D>-250<0055004A004F0044004A00450056004F0055>-250<0054004A0055>]TJ
+1.015 0 0 1 36 527.656 Tm [<0042004E00460055000D>-246<004D004200500053>7<0046>-6<00460055>-247<0057004A005500420046>9<000D>-246<00420053>7<00440056000F>-329<0022>12<0046004F00460042004F>-246<0047004200560044004A004300560054>-247<0051>-7<0046>-7<00450046>-247<00460056>-247<0042004F00550046>10<000F>-329<003100530042004600540046004F0055>]TJ
+1.02 0 0 1 36 512.862 Tm [<0046004F004A004E>-282<0046004D004A0055000D>-293<00530056005500530056004E>-283<00420055000D>-292<004E0050004D004600540055004A0046>-283<004F0050004F000D>-292<004F0050004F0056004E004E005A>-283<0057>7<0046004D000D>-291<004F004A0054004D000F>-440<00360055>-283<004D0046>-7<0044005500560054>]TJ
+1.02 0 0 1 36 498.067 Tm [<00460053>8<00500054000D>-318<004E0042004D004600540056004200450042>-304<0054004A0055>-304<0042004E00460055000D>-319<004700460053004E0046004F00550056004E>-304<00460056000D>-319<00540050>-6<00450042004D00460054>-304<004400560053005400560054000D>-319<004E00420048004F0042000F>]TJ
+1.007 0 0 1 36 483.273 Tm [<00250050004F0046>-7<0044>-248<00460056>-249<00510056005300560054000F>-332<09550056004A0054005200560046>-249<0057>7<00460049004A00440056004D0042000D>-248<00560053004F0042>-248<00540046>-7<0045>-249<0056004D00550053004A0044004A00460054>-249<004200560044005500500053>59<000D>-248<0051>-7<0046>-7<00450046>]TJ
+1.02 0 0 1 36 468.478 Tm [<004D00500053>8<0046004E>-316<0046004800460054005500420054>-316<00450056004A000D>-335<00460055>-316<00440050004F00570042004D004D004A0054>-317<0046004D004A0055>-316<0046005300420055>-316<00540046>-7<0045>-317<004F0056004D004D0042000F>-541<00250050004F0046>-7<0044>-316<004D00560044005500560054000F>]TJ
+0.98 0 0 1 36 453.684 Tm [<00240056005300420043004A005500560053>-241<00460055>-242<004F0056004F0044000F>-336<0022004D004A005200560042004E>-242<00450050004D00500053>-242<0050>-7<0045004A0050>10<000D>-244<00440050004E004E0050>-7<00450050>-242<00510053>7<00460055004A0056004E000D>-243<0056004D00550053004A0044004A00460054>]TJ
+1.018 0 0 1 36 438.889 Tm [<004F0050004F000D>-244<0051004900420053>7<0046005500530042>-243<004A004F000D>-245<0057>7<0046004D004A0055000F>-326<002A004F00550046004800460053>-244<00420053>7<00440056>-244<004600540055000D>-244<004F0050004F0056004E004E005A>-244<004A004F000D>-245<004700460053004E0046004F00550056004E>]TJ
+1 0 0 1 36 424.095 Tm [<0047004200560044004A004300560054000D>-250<0046004800460054005500420054>-250<0057>8<0046004D000D>-250<0050>-7<0045004A0050>10<000F>]TJ
+1.005 0 0 1 53.036 409.3 Tm [<00340046>-7<0045>-247<00440050004E004E0050>-7<00450050>-248<0051>-7<00500054005600460053>7<0046>-246<0051>-7<0046>-7<00450046>9<000F>-330<002E004200560053004A0054>-248<00560055>-247<004600540055000F>-332<00360055>-247<00520056004A0054>-247<00510056005300560054000F>-332<00340046>-7<0045>]TJ
+1.01 0 0 1 36 394.506 Tm [<00420044>-247<0050>-7<0045004A0050>9<000F>-330<00340046>-7<0045>-248<0057>7<00460049004A00440056004D0042>-247<00490046004F00450053>7<00460053004A0055>-247<00540046004E000F>-331<00250056004A0054>-248<004F0050004F>-247<0050>-8<0045004A0050>10<000F>-330<002E005000530043004A>-248<00560055>-248<00450056004A000F>]TJ
+1.02 0 0 1 36 379.711 Tm [<00340046>-7<0045>-316<0042004400440056004E00540042004F>-317<0053004A005400560054>-316<0046004800460055>-317<0050>-7<0045004A0050>9<000F>-541<002A004F>-316<004900420044>-317<004900420043004A00550042005400540046>-317<0051004D0042005500460042>-316<0045004A004400550056004E00540055000F>]TJ
+1.02 0 0 1 36 364.917 Tm [<00310046004D004D0046004F005500460054005200560046>-361<004F0050004F>-362<0046004D004A0055000F>-677<00270056005400440046>-361<00540046>-7<0045>-362<004B0056005400550050>-362<00460056>-362<00560053004F0042>-361<0051>-7<0050005300550042>-362<0055004A004F0044004A00450056004F0055000F>]TJ
+0.981 0 0 1 36 350.122 Tm [<002E004200560053004A0054>-255<00470046004D004A0054>-255<0050>-7<0045004A0050>9<000D>-254<00540050004D004D004A0044004A005500560045004A004F>-255<00540046>-8<0045000D>-255<0057>7<0050004D0056>1<0055005100420055>-255<0042000D>-255<00500053004F00420053>7<0046>-254<00420044000D>-255<0046005300420055000F>-341<002E005000530043004A>]TJ
+1.02 0 0 1 36 335.327 Tm [<00520056004A0054>-270<00450050004D00500053>59<000F>-401<00250050004F0046>-7<0044>-270<0051>-7<0046004D004D0046004F005500460054005200560046>9<000D>-275<0046005300420055>-270<00420044>-270<005400420048004A00550055004A0054>-270<00540046004E0051>-7<00460053>58<000D>-275<004F0056004F0044>-270<00450056004A>]TJ
+1.02 0 0 1 36 320.533 Tm [<004D00500043>-10<005000530055004A0054>-269<00510056005300560054000D>-275<00520056004A0054>-269<00440050004F004800560046>-269<00510056005300560054>-269<004E0046005500560054>-269<0056004D00550053004A0044004A00460054>-269<00550046004D004D00560054000F>-398<00310053>7<0050004A004F>-268<00460055>]TJ
+1.02 0 0 1 36 305.738 Tm [<005200560042004E000F>-341<0024004D004200540054>-250<0042005100550046004F0055>-250<005500420044004A0055004A>-250<00540050>-7<0044004A0050005400520056>-250<00420045>-250<004D004A0055005000530042>-250<005500500053>7<005200560046004F0055>-249<0051>-7<00460053>-250<00440050004F00560043004A0042>]TJ
+0.98 0 0 1 36 290.944 Tm [<004F00500054005500530042000D>-241<0051>-7<00460053>-238<004A004F004400460051005500500054>-239<0049005A004E0046004F00420046>-7<00500054000F>-334<003100530042004600540046004F0055>-239<005400420051004A0046004F>-238<0055005600530051004A0054000D>-241<004700460053004E0046004F00550056004E>]TJ
+1 0 0 1 35.716 276.149 Tm [<0057>8<0046004D000D>-250<0046004D0046004A00470046004F0045>-250<0047004200560044004A004300560054000D>-250<0057>8<00460049004A00440056004D0042>-250<00460056000D>-250<004D0042004400560054000F>]TJ
+0 g 0 G
+0 g 0 G
+ET
+
+endstream
+endobj
+45 0 obj
+<< /Type /Page /Contents 46 0 R /Resources 44 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612]
+
+/TrimBox[0 0 396 612] /Parent 43 0 R >>
+endobj
+44 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F83 16 0 R >> /ProcSet [ /PDF /Text ] >>
+endobj
+49 0 obj
+<< /Length 32 >>
+stream
+0 g 0 G
+0 g 0 G
+0 g 0 G
+0 g 0 G
+
+endstream
+endobj
+48 0 obj
+<< /Type /Page /Contents 49 0 R /Resources 47 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612]
+
+/TrimBox[0 0 396 612] /Parent 43 0 R >>
+endobj
+47 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /ProcSet [ /PDF ] >>
+endobj
+52 0 obj
+<< /Length 32 >>
+stream
+0 g 0 G
+0 g 0 G
+0 g 0 G
+0 g 0 G
+
+endstream
+endobj
+51 0 obj
+<< /Type /Page /Contents 52 0 R /Resources 50 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612]
+
+/TrimBox[0 0 396 612] /Parent 43 0 R >>
+endobj
+50 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /ProcSet [ /PDF ] >>
+endobj
+1 0 obj
+<<>>
+endobj
+2 0 obj
+<<>>
+endobj
+3 0 obj
+<< /pgfprgb [/Pattern /DeviceRGB] >>
+endobj
+53 0 obj
+[ 13 [ 219 333 219 291 ] 34 [ 667 557 616 667 ] 41 [ 673 280 ] 47 [ 666 ] 49 [ 499 ] 51 [ 555 454 544 634 ] 66 [ 486 478 389 489 401 314 477 519 276 ] 76 [ 486 266 783 518 447 489 491 357 353 307 521 472 688 475 503 ] 105 [ 633 ] 1724 [ 268 ] 2122 [ 564 ] 2157 [ 519 ] 2160 [ 551 ] 2167 [ 568 ] 2169 [ 648 591 552 ] 2174 [ 462 ] 2176 [ 492 ] 2181 [ 474 ] 2257 [ 444 444 444 444 445 444 444 444 444 444 ] ]
+endobj
+55 0 obj
+<< /Length 284 >>
+stream
+
+endstream
+endobj
+56 0 obj
+<< /Subtype /CIDFontType0C /Length 10174 >>
+stream
+
+k
+ p"{ "/j;;]#X !!w!"z###$Z$%ZN$P>>>>z>\>wɸsyoX\Vtlmnxlxssyuqz
+3D&Yersr
+Bn٭nkly $S/ 5NRdfd^ $xw*kxinlB;mmm^dY;y
+y;<1 ޓ&{orfmc5fS`ocyen`C}
+Cq*Nw$C9pOV)v}xEl~}mt.B8rrr$m4kL|oPN~.Lol< "u|Cx}ykvvߍċ "r+wx~&v|}J_roC "u|~5qw|w⊨vJ"ѻgыsvwvύċ "l{gCv}(c~dv "m~vxvRmTmoF "v{zXzPxxyFx{skvv͍ȋ "vr{pU{:6  mwyyF)#ec[)uroqBA18X蠎*(rTJo֘jw~kwvԍы "q4МghIjQؘVqj[ƒϼM5s]ijcm $gsvsZ8zYv@dkFegF(mvÒ+^DqCs܅{{r܂_]z\ӯ|Cw}lvvӍۋ "vr4*_kw~kwvЋԍۋ "vq&2Z{]O $u4E46M $vv^ }K"%2r'n9
+ %
+|`bObNϷtjgd5YI8Zfnl*?tR Ktĩt/1BA* !K:uH`M^_RS6fCgZkr9vнӲi"aUs
+ 
+endstream
+endobj
+54 0 obj
+<< /Type /FontDescriptor /FontName /OKLFSU+LibertinusSerif-Italic /Flags 4 /FontBBox [ -1325 -312 1389 928 ] /Ascent 894 /CapHeight 647 /Descent -246 /ItalicAngle -12 /StemV 73 /XHeight 429 /FontFile3 56 0 R /CIDSet 55 0 R >>
+endobj
+57 0 obj
+<< /Length 1576 >>
+stream
+%!PS-Adobe-3.0 Resource-CMap
+%%DocumentNeededResources: ProcSet (CIDInit)
+%%IncludeResource: ProcSet (CIDInit)
+%%BeginResource: CMap (TeX-OKLFSU-LibertinusSerif-Italic-0)
+%%Title: (TeX-OKLFSU-LibertinusSerif-Italic-0 TeX OKLFSU-LibertinusSerif-Italic 0)
+%%Version: 1.000
+%%EndComments
+/CIDInit /ProcSet findresource begin
+12 dict begin
+begincmap
+/CIDSystemInfo
+<< /Registry (TeX)
+/Ordering (OKLFSU-LibertinusSerif-Italic)
+/Supplement 0
+>> def
+/CMapName /TeX-Identity-OKLFSU-LibertinusSerif-Italic def
+/CMapType 2 def
+1 begincodespacerange
+<0000> <FFFF>
+endcodespacerange
+0 beginbfrange
+endbfrange
+62 beginbfchar
+<000D> <002C>
+<000E> <002D>
+<000F> <002E>
+<0010> <002F>
+<0022> <0041>
+<0023> <0042>
+<0024> <0043>
+<0025> <0044>
+<0029> <0048>
+<002A> <0049>
+<002F> <004E>
+<0031> <0050>
+<0033> <0052>
+<0034> <0053>
+<0035> <0054>
+<0036> <0055>
+<0042> <0061>
+<0043> <0062>
+<0044> <0063>
+<0045> <0064>
+<0046> <0065>
+<0047> <0066>
+<0048> <0067>
+<0049> <0068>
+<004A> <0069>
+<004C> <006B>
+<004D> <006C>
+<004E> <006D>
+<004F> <006E>
+<0050> <006F>
+<0051> <0070>
+<0052> <0071>
+<0053> <0072>
+<0054> <0073>
+<0055> <0074>
+<0056> <0075>
+<0057> <0076>
+<0058> <0077>
+<0059> <0078>
+<005A> <0079>
+<0069> <00A9>
+<06BC> <2019>
+<084A> <00660069>
+<086D> <0061>
+<0870> <0064>
+<0877> <006B>
+<0879> <006D>
+<087A> <006E>
+<087B> <006F>
+<087E> <0072>
+<0880> <0074>
+<0885> <0079>
+<08D1> <0030>
+<08D2> <0031>
+<08D3> <0032>
+<08D4> <0033>
+<08D5> <0034>
+<08D6> <0035>
+<08D7> <0036>
+<08D8> <0037>
+<08D9> <0038>
+<08DA> <0039>
+endbfchar
+endcmap
+CMapName currentdict /CMap defineresource pop
+end
+end
+%%EndResource
+%%EOF
+
+endstream
+endobj
+21 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /OKLFSU+LibertinusSerif-Italic /DescendantFonts [ 58 0 R ] /ToUnicode 57 0 R >>
+endobj
+58 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /OKLFSU+LibertinusSerif-Italic /FontDescriptor 54 0 R /W 53 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+endobj
+59 0 obj
+[ 374 [ 2000 ] ]
+endobj
+61 0 obj
+<< /Length 47 >>
+stream
+
+endstream
+endobj
+62 0 obj
+<< /Subtype /CIDFontType0C /Length 471 >>
+stream
+
+
+ ڒ
+endstream
+endobj
+60 0 obj
+<< /Type /FontDescriptor /FontName /ETXLAD+NovelDeco /Flags 4 /FontBBox [ -392 -234 1985 838 ] /Ascent 894 /CapHeight 537 /Descent -246 /ItalicAngle 0 /StemV 61 /XHeight 429 /FontFile3 62 0 R /CIDSet 61 0 R >>
+endobj
+63 0 obj
+<< /Length 652 >>
+stream
+%!PS-Adobe-3.0 Resource-CMap
+%%DocumentNeededResources: ProcSet (CIDInit)
+%%IncludeResource: ProcSet (CIDInit)
+%%BeginResource: CMap (TeX-ETXLAD-NovelDeco-0)
+%%Title: (TeX-ETXLAD-NovelDeco-0 TeX ETXLAD-NovelDeco 0)
+%%Version: 1.000
+%%EndComments
+/CIDInit /ProcSet findresource begin
+12 dict begin
+begincmap
+/CIDSystemInfo
+<< /Registry (TeX)
+/Ordering (ETXLAD-NovelDeco)
+/Supplement 0
+>> def
+/CMapName /TeX-Identity-ETXLAD-NovelDeco def
+/CMapType 2 def
+1 begincodespacerange
+<0000> <FFFF>
+endcodespacerange
+0 beginbfrange
+endbfrange
+1 beginbfchar
+<0176> <254C>
+endbfchar
+endcmap
+CMapName currentdict /CMap defineresource pop
+end
+end
+%%EndResource
+%%EOF
+
+endstream
+endobj
+17 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /ETXLAD+NovelDeco /DescendantFonts [ 64 0 R ] /ToUnicode 63 0 R >>
+endobj
+64 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /ETXLAD+NovelDeco /FontDescriptor 60 0 R /W 59 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+endobj
+65 0 obj
+[ 13 [ 220 338 220 ] 19 [ 465 465 ] 22 [ 465 465 ] 32 [ 435 ] 34 [ 695 ] 36 [ 646 701 557 485 ] 41 [ 730 297 ] 45 [ 528 839 699 702 541 ] 52 [ 485 597 661 652 951 ] 66 [ 457 493 428 506 447 310 500 538 271 272 512 264 790 542 504 519 503 372 390 316 531 497 747 490 515 ] 1754 [ 742 ] 1759 [ 268 ] 1768 [ 351 ] 2360 [ 582 560 540 ] 2389 [ 702 ] 2395 [ 554 556 ] 2398 [ 492 565 477 ] 2404 [ 311 ] 2407 [ 667 602 563 ] 2412 [ 511 412 529 ] 2419 [ 489 ] ]
+endobj
+67 0 obj
+<< /Length 303 >>
+stream
+
+endstream
+endobj
+68 0 obj
+<< /Subtype /CIDFontType0C /Length 10921 >>
+stream
+
+s   9E4/~AH]]fa`5lM  !"="##$!$%%&''(3U$N>>>>z>\>xluvoltvg]W~ǖŻqclsso~tyĶnssnnssn2A@Bhvyԉԯr+KtWPOAB)'{[PC֌~DzzrgFϐ¶
+1M+:Jv $Gm9ϏhKa%vЇ@Mc0OrRv $I%cUu%vv)xx|nGvhq52zEv $EzuM|䜑ђb\sv]_ $vxф0(I.c#GV.VY#>ġ^G5"Tf~­wu%8zEvƊ $=s>J dMePcfWcvш8t
+e^W[۟eN8z;v $;z۬@ޚ؎\Zddbd $vLj8`daFxۜǒebtvZ] $vք:|=[bmZv:TՆpvU2%4+tǑϒc^gghj $v†zFY{cʒmhtt^b $v!v4BAT0F:zb_cjhk $vlqIz&Nj_dhnn $vUP{)zz]Žnkqq_c $v|`*bK5lplz~n'"=B98URsz5v+sFVG9qѮM~vqitoYu՞Nv^wi;L̏sr@}c{<|dy}x 314`ezollȽA*]5,lvw"_i`u`BN ƓhhpR+(!2"2ݽ[^wpshkȒKY̏r@}c{<bjI_uec``qPA1
+wXmrixȒKTԋ||kgi $vIUx}kfe{rmYJԋ||kgi $vJTFHRv./i "vX:X{d{CUyjhjjmm $v{X|͞Ðwsqjir $vUv..%i
+_"mhgepq $vW}}ћwummam $vևn}h7dr5oxmcmrjm $vn^{EE~j~;bxK 96)Ң:+4@Jtp_mmmq $vzb@7
+)wyz{\iccncwx[
+l|zfI;uY?X1|^G5"TfLHA.$l8Nv $[w{~} $ps~(Bmjqnjn $vq>4[`n{jޔkjln_d $vȆ8 w.w_rVv $UOUUUv $Vs. |xw+w=M-ٻʺU]hwH(Q<ٮۺ_Ee^;%'&LF^fw"(`p^dvȇ8l8Nv $C9;Ggn< # Mf?>V>wu͌xfy^JR"ݘjR؇ى}zcn]gvȇ8l8Nv.͉’P{nY8`a*vdwWޖȐe`lmad $vȇ8l8Nv $NvvCy
+ ڒ 
+endstream
+endobj
+66 0 obj
+<< /Type /FontDescriptor /FontName /FIJEIL+LibertinusSerif-Regular /Flags 4 /FontBBox [ -1325 -256 1269 928 ] /Ascent 894 /CapHeight 647 /Descent -246 /ItalicAngle 0 /StemV 73 /XHeight 429 /FontFile3 68 0 R /CIDSet 67 0 R >>
+endobj
+69 0 obj
+<< /Length 1701 >>
+stream
+%!PS-Adobe-3.0 Resource-CMap
+%%DocumentNeededResources: ProcSet (CIDInit)
+%%IncludeResource: ProcSet (CIDInit)
+%%BeginResource: CMap (TeX-FIJEIL-LibertinusSerif-Regular-0)
+%%Title: (TeX-FIJEIL-LibertinusSerif-Regular-0 TeX FIJEIL-LibertinusSerif-Regular 0)
+%%Version: 1.000
+%%EndComments
+/CIDInit /ProcSet findresource begin
+12 dict begin
+begincmap
+/CIDSystemInfo
+<< /Registry (TeX)
+/Ordering (FIJEIL-LibertinusSerif-Regular)
+/Supplement 0
+>> def
+/CMapName /TeX-Identity-FIJEIL-LibertinusSerif-Regular def
+/CMapType 2 def
+1 begincodespacerange
+<0000> <FFFF>
+endcodespacerange
+0 beginbfrange
+endbfrange
+70 beginbfchar
+<000D> <002C>
+<000E> <002D>
+<000F> <002E>
+<0013> <0032>
+<0014> <0033>
+<0016> <0035>
+<0017> <0036>
+<0020> <003F>
+<0022> <0041>
+<0024> <0043>
+<0025> <0044>
+<0026> <0045>
+<0027> <0046>
+<0029> <0048>
+<002A> <0049>
+<002D> <004C>
+<002E> <004D>
+<002F> <004E>
+<0030> <004F>
+<0031> <0050>
+<0034> <0053>
+<0035> <0054>
+<0036> <0055>
+<0037> <0056>
+<0038> <0057>
+<0042> <0061>
+<0043> <0062>
+<0044> <0063>
+<0045> <0064>
+<0046> <0065>
+<0047> <0066>
+<0048> <0067>
+<0049> <0068>
+<004A> <0069>
+<004B> <006A>
+<004C> <006B>
+<004D> <006C>
+<004E> <006D>
+<004F> <006E>
+<0050> <006F>
+<0051> <0070>
+<0052> <0071>
+<0053> <0072>
+<0054> <0073>
+<0055> <0074>
+<0056> <0075>
+<0057> <0076>
+<0058> <0077>
+<0059> <0078>
+<005A> <0079>
+<06DA> <2014>
+<06DF> <2019>
+<06E8> <2022>
+<0938> <00660066>
+<0939> <00660069>
+<093A> <0066006C>
+<0955> <0051>
+<095B> <006B>
+<095C> <0061>
+<095E> <0063>
+<095F> <0064>
+<0960> <0065>
+<0964> <0069>
+<0967> <006D>
+<0968> <006E>
+<0969> <006F>
+<096C> <0072>
+<096D> <0073>
+<096E> <0074>
+<0973> <0079>
+endbfchar
+endcmap
+CMapName currentdict /CMap defineresource pop
+end
+end
+%%EndResource
+%%EOF
+
+endstream
+endobj
+16 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /FIJEIL+LibertinusSerif-Regular /DescendantFonts [ 70 0 R ] /ToUnicode 69 0 R >>
+endobj
+70 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /FIJEIL+LibertinusSerif-Regular /FontDescriptor 66 0 R /W 65 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+endobj
+71 0 obj
+[ 37 [ 734 ] 52 [ 504 ] 66 [ 506 ] 69 [ 561 ] 76 [ 613 ] 78 [ 905 616 551 ] 83 [ 428 ] 85 [ 358 ] 90 [ 558 ] ]
+endobj
+73 0 obj
+<< /Length 12 >>
+stream
+
+endstream
+endobj
+74 0 obj
+<< /Subtype /CIDFontType0C /Length 2256 >>
+stream
+
+by²l~xu$$29BaIouyHv"jAn<Fgū>wrr{y`|Ңww BszǙДUV̎f;D~ʆFΑxsnPFeo}շzvVuYd jljE-w-qcJ8{Nu· $mz{ibfo|qÊ $dum?דuLqf\f $uncumuswy~]zm̎f;DʆFvz55x[yR;7{bu $cz0yR;7{bu· $N{0c5f7ckQ|cPgCekRܗ}fO}Fw†RO8Nu $aʞv<x]yR;7{bu· $N{0\5cD_eT}fO}Fw†RO8Nu $a Y c5Ɵ2)8Mn^de_zOPsWϹ: \kg9kvxmghemI]}\V}Ix†RO8Nu $NWؽ'F}|~n&Yhiyxȧ~rxuu Ύf{znp;|'8v]4N:<U
+  
+endstream
+endobj
+72 0 obj
+<< /Type /FontDescriptor /FontName /COAJSK+LibertinusSerif-Bold /Flags 4 /FontBBox [ -1625 -328 1562 1014 ] /Ascent 894 /CapHeight 647 /Descent -246 /ItalicAngle 0 /StemV 81 /XHeight 433 /FontFile3 74 0 R /CIDSet 73 0 R >>
+endobj
+75 0 obj
+<< /Length 848 >>
+stream
+%!PS-Adobe-3.0 Resource-CMap
+%%DocumentNeededResources: ProcSet (CIDInit)
+%%IncludeResource: ProcSet (CIDInit)
+%%BeginResource: CMap (TeX-COAJSK-LibertinusSerif-Bold-0)
+%%Title: (TeX-COAJSK-LibertinusSerif-Bold-0 TeX COAJSK-LibertinusSerif-Bold 0)
+%%Version: 1.000
+%%EndComments
+/CIDInit /ProcSet findresource begin
+12 dict begin
+begincmap
+/CIDSystemInfo
+<< /Registry (TeX)
+/Ordering (COAJSK-LibertinusSerif-Bold)
+/Supplement 0
+>> def
+/CMapName /TeX-Identity-COAJSK-LibertinusSerif-Bold def
+/CMapType 2 def
+1 begincodespacerange
+<0000> <FFFF>
+endcodespacerange
+0 beginbfrange
+endbfrange
+11 beginbfchar
+<0025> <0044>
+<0034> <0053>
+<0042> <0061>
+<0045> <0064>
+<004C> <006B>
+<004E> <006D>
+<004F> <006E>
+<0050> <006F>
+<0053> <0072>
+<0055> <0074>
+<005A> <0079>
+endbfchar
+endcmap
+CMapName currentdict /CMap defineresource pop
+end
+end
+%%EndResource
+%%EOF
+
+endstream
+endobj
+8 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /COAJSK+LibertinusSerif-Bold /DescendantFonts [ 76 0 R ] /ToUnicode 75 0 R >>
+endobj
+76 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /COAJSK+LibertinusSerif-Bold /FontDescriptor 72 0 R /W 71 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+endobj
+9 0 obj
+<< /Type /Pages /Parent 77 0 R /Count 10 /Kids [ 6 0 R 11 0 R 14 0 R 19 0 R 23 0 R 26 0 R 29 0 R 32 0 R 35 0 R 38 0 R ] >>
+endobj
+43 0 obj
+<< /Type /Pages /Parent 77 0 R /Count 4 /Kids [ 41 0 R 45 0 R 48 0 R 51 0 R ] >>
+endobj
+77 0 obj
+<< /Type /Pages /Count 14 /Kids [ 9 0 R 43 0 R ] >>
+endobj
+78 0 obj
+<< /Type /Catalog /Pages 77 0 R /Metadata 4 0 R/OutputIntents [ <</Type/OutputIntent/S/GTS_PDFX/OutputCondition (SWOP (Publication) printing in USA (Printing process definition: ANSI CGATS.6).)/OutputConditionIdentifier (CGATS TR 001)/Info (U.S. Web Coated (SWOP) v2)/RegistryName (http://www.color.org)>> ]/PageLabels<</Nums[0<</S/r>>6<</S/D>>]>> >>
+endobj
+79 0 obj
+<< /Title(Dark\040and\040Stormy)/Author(Dirk\040Hardcase)/Creator(LuaLaTeX\040with\040novel\040and\040microtype)/CreationDate(D:20230207184729-08'00')/ModDate(D:20230207184729-08'00')/Producer(LuaLaTeX\040with\040novel-pdfx\040and\040hyperref)/Trapped/False/GTS_PDFXVersion(PDF/X-1a:2001)/GTS_PDFXConformance(PDF/X-1a:2001) >>
+endobj
+xref
+0 80
+0000000000 65535 f
+0000062538 00000 n
+0000062558 00000 n
+0000062578 00000 n
+0000000020 00000 n
+0000003407 00000 n
+0000003256 00000 n
+0000002762 00000 n
+0000095759 00000 n
+0000096118 00000 n
+0000003773 00000 n
+0000003619 00000 n
+0000003527 00000 n
+0000005367 00000 n
+0000005213 00000 n
+0000003865 00000 n
+0000091707 00000 n
+0000077530 00000 n
+0000008424 00000 n
+0000008270 00000 n
+0000005512 00000 n
+0000075533 00000 n
+0000009623 00000 n
+0000009469 00000 n
+0000008547 00000 n
+0000010004 00000 n
+0000009850 00000 n
+0000009758 00000 n
+0000017863 00000 n
+0000017709 00000 n
+0000010096 00000 n
+0000029194 00000 n
+0000029040 00000 n
+0000017985 00000 n
+0000035701 00000 n
+0000035547 00000 n
+0000029316 00000 n
+0000043898 00000 n
+0000043744 00000 n
+0000035823 00000 n
+0000055245 00000 n
+0000055090 00000 n
+0000044020 00000 n
+0000096256 00000 n
+0000061738 00000 n
+0000061583 00000 n
+0000055367 00000 n
+0000062107 00000 n
+0000061952 00000 n
+0000061860 00000 n
+0000062446 00000 n
+0000062291 00000 n
+0000062199 00000 n
+0000062631 00000 n
+0000073655 00000 n
+0000063053 00000 n
+0000063397 00000 n
+0000073897 00000 n
+0000075692 00000 n
+0000075897 00000 n
+0000076592 00000 n
+0000075930 00000 n
+0000076037 00000 n
+0000076818 00000 n
+0000077676 00000 n
+0000077868 00000 n
+0000089705 00000 n
+0000078337 00000 n
+0000078700 00000 n
+0000089946 00000 n
+0000091867 00000 n
+0000092073 00000 n
+0000094612 00000 n
+0000092200 00000 n
+0000092272 00000 n
+0000094851 00000 n
+0000095915 00000 n
+0000096353 00000 n
+0000096422 00000 n
+0000096789 00000 n
+trailer
+<< /Size 80 /Root 78 0 R /Info 79 0 R /ID [ <7969E9E99751F0FCDE254F150311FF3F> <7969E9E99751F0FCDE254F150311FF3F> ] >>
+startxref
+97133
+%%EOF
diff --git a/macros/luatex/latex/novel/doc/extras/novel-example.tex b/macros/luatex/latex/novel/doc/extras/novel-example.tex
index c6f025585c..940c7b2d7a 100644
--- a/macros/luatex/latex/novel/doc/extras/novel-example.tex
+++ b/macros/luatex/latex/novel/doc/extras/novel-example.tex
@@ -1,4 +1,4 @@
-% !TeX TS-program = LuaLaTeX
+% !TeX TS-program = lualatex
% !TeX encoding = UTF-8
%
% EXAMPLE OF NOVEL DOCUMENT CLASS
@@ -6,11 +6,12 @@
% IF YOU COMPILE THIS DOCUMENT: Be sure that this file, and its generated PDF,
% have read/write permissions for any user. If they don't, then
% compile will fail at the point where files are written.
-\documentclass{novel} % v. 1.52.
+\documentclass{novel} % v. 1.80.
\SetTitle{Dark and Stormy}
\SetSubtitle{A Tale of Nights}
\SetAuthor{Dirk Hardcase}
\SetPDFX[CGATSTR001]{X-1a:2001}
+\setotherlanguage{latin}
\begin{document}
\frontmatter
diff --git a/macros/luatex/latex/novel/doc/extras/novel-testsuite.pdf b/macros/luatex/latex/novel/doc/extras/novel-testsuite.pdf
new file mode 100644
index 0000000000..7baf36ba0f
--- /dev/null
+++ b/macros/luatex/latex/novel/doc/extras/novel-testsuite.pdf
Binary files differ
diff --git a/macros/luatex/latex/novel/doc/extras/novel-testsuite.tex b/macros/luatex/latex/novel/doc/extras/novel-testsuite.tex
index ae341921db..2ebb5b64f8 100644
--- a/macros/luatex/latex/novel/doc/extras/novel-testsuite.tex
+++ b/macros/luatex/latex/novel/doc/extras/novel-testsuite.tex
@@ -1,4 +1,4 @@
-% !TeX TS-program = LuaLaTeX
+% !TeX TS-program = lualatex
% !TeX encoding = UTF-8
%
% TEST SUITE FOR NOVEL DOCUMENT CLASS
@@ -21,7 +21,7 @@
% It is grayscale png, 150x150 pixels, with resolution 300pdi.
%
% The `test' class option is required. You may add others.
-\documentclass[test,shademargins,draft]{novel} % v. 1.52.
+\documentclass[test,shademargins,draft]{novel} % v. 1.80.
\SetTitle{Test Suite}
\SetSubtitle{Novel Document Class}
\SetAuthor{Author Name}
diff --git a/macros/luatex/latex/novel/doc/novel-documentation.html b/macros/luatex/latex/novel/doc/novel-documentation.html
index c2f454e47a..8493194b5c 100644
--- a/macros/luatex/latex/novel/doc/novel-documentation.html
+++ b/macros/luatex/latex/novel/doc/novel-documentation.html
@@ -170,7 +170,7 @@ function closeall() {
<ul id="u1.1">
<li><a href="#h1.1.1">1.1.1 LuaLateX Compiler</a></li>
<li><a href="#h1.1.2">1.1.2 UTF-8 Encoding</a></li>
- <li><a href="#h1.1.3">1.1.3 Polyglossia</a></li>
+ <li><a href="#h1.1.3">1.1.3 Language Support</a></li>
<li><a href="#h1.1.4">1.1.4 Open Type Fonts</a></li>
<li><a href="#h1.1.5">1.1.5 Book Design</a></li>
</ul>
@@ -203,6 +203,7 @@ function closeall() {
<li><a href="#h2.7">2.7 xml</a></li>
<li><a href="#h2.8">2.8 coverart</a></li>
<li><a href="#h2.9">2.9 developer options</a></li>
+ <li><a href="#h2.10">2.10 revert</a></li>
</ul>
</li><!-- end 2 -->
@@ -565,18 +566,20 @@ function closeall() {
<div id="main">
<!-- **************************************************************************************** -->
-<h1 id="h0" style="padding-top:16px">Document class <i>novel</i> - documentation. &nbsp; <span style="font-size:75%">V. 1.52, 2018/04/26</span></h1>
+<h1 id="h0" style="padding-top:16px">Document class <i>novel</i> - documentation. &nbsp; <span style="font-size:75%">V. 1.80, 2023/02/08</span></h1>
<p class="noindent"><span id="screennoscript" class="screennoscript"><b>For enhanced navigation of this file, turn on JavaScript.</b></span></p>
<div><script>if(document.getElementById("screennoscript")){document.getElementById("screennoscript").style.display="none";}</script></div>
-<p class="item">ALERT: If you have been using this document class prior to version 1.50, see <a href="#hZ">Appendix Z</a> for important changes.</p>
+<p class="item">ALERT: If you have been using this document class prior to version 1.80 (February 2023), see <a href="#hZ">Appendix Z</a>.</p>
+
+<p class="item">ALERT: New user? Little knowledge of LaTeX? Try the simpler "novelette" document class. Expected in March, 2023.</p>
<!-- ********************************************************************** -->
<div id="page01" class="page">
<p class="noindent">The <i>novel</i> document class is for authors of text-intensive original fiction, such as detective novels, murder mysteries, romance, sci-fi, and collections of short stories. Academic works and graphic novels are excluded.</p>
<p>The resulting PDF uses built-in technology to produce PDF/X compliant files for print-on-demand (P.O.D.) services. There is no capability for E-books, and never will be.</p>
-<p>To use <i>novel</i>, you need TeXLive 2016 or later, or recent MikTeX. Open your TeX package manager, and install both <i>novel</i> and <i>libertinus</i>.</p>
+<p>To use <i>novel</i>, you need TeXLive 2016 or later, or recent MikTeX. Open your TeX package manager, and install both <i>novel</i> and <i>libertinus-fonts</i>.</p>
<h2 id="h1">1. Before You Begin</h2>
@@ -592,12 +595,12 @@ function closeall() {
<h4 id="h1.1.1">1.1.1. Use the LuaLaTeX Compiler</h4>
<div class="d4" id="d1.1.1">
<p class="item"><b>A.</b> At the top of your *.tex main document, before the document class, place these lines:</p>
-<p class="code"><code>% !TeX TS-program = LuaLaTeX</code><br/>
+<p class="code"><code>% !TeX TS-program = lualatex</code><br/>
<code>% !TeX encoding = UTF-8</code></p>
<p>Those instructions are read and understood by many TeX editors, and also serve as a reminder to yourself.</p>
<p class="item"><b>B.</b> If you compile by command line, try this:</p>
-<p class="code"><code>lualatex yourdocument.tex</code><p>
-<p class="item"><b>C.</b> If using a service such as ShareLaTeX online, open the Menu, and scroll down to where you can choose the compiler. Set it to LuaLaTeX.</p>
+<p class="code"><code>lualatex your-document.tex</code></p>
+<p class="item"><b>C.</b> If using a service such as ShareLaTeX online, open the Menu, and scroll down to where you can choose the compiler. Set it to lualatex.</p>
</div><!-- end 1.1.1 -->
<h4 id="h1.1.2">1.1.2. Use UTF-8 Encoding</h4>
@@ -608,16 +611,23 @@ function closeall() {
<p class="item"><b>D.</b> If you are on Windows, <i>do not</i> use Notepad! The free <a class="external" rel="external" target="new" href="https://notepad-plus-plus.org">Notepad++</a> (also <a class="external" rel="external" target="new" href="https://portableapps.com/apps/development/notepadpp_portable">Portable</a> version) is a suitable plain text editor. Configure it as specified, with utf-8 but without BOM. Does not matter whether UNIX or DOS line endings, as long as you are consistent.</p>
</div><!-- end 1.1.2 -->
-<h4 id="h1.1.3">1.1.3. Use Polyglossia Language Support</h4>
+<h4 id="h1.1.3">1.1.3. Language Support</h4>
<div class="d4" id="d1.1.3">
-<p class="item"><b>A.</b> The pre-loaded <i>polyglossia</i> package provides language support. By default, <i>novel</i> is configured for American English.</p>
-<p class="item"><b>B.</b> If your document's language is something else, or if you will be writing in multiple languages, see the <i>polyglossia</i> package documentation regarding <code>\setdefaultlanguage</code> and related commands.</p>
+<p class="item"><b>A.</b> The <i>polyglossia</i> package is loaded automatically. Do not load it yourself.</p>
+<p class="item"><b>B.</b> Language is loaded like this default:</p>
+<p class="code"><code>\setdefaultlanguage[variant=american]{english}</code></p>
+<p class="item"><b>C.</b> For other possibilities, see polyglossia documentation.</p>
+<p class="item"><b>D.</b> Polyglossia does not always load language hyphenation patterns.
+If it does not, be sure that your system has the hyphenation patterns for your language or languages.
+For example, <code>hyphen-latin</code> is used when you insert <code>lipsum</code> text.
+And, you may need to use the polyglossia <code>\setotherlanguage</code> if extended text
+is not your default.</p>
</div><!-- end 1.1.3 -->
<h4 id="h1.1.4">1.1.4. Use Open Type Fonts</h4>
<div class="d4" id="d1.1.4">
<p class="item"><b>A.</b> The built-in <i>fontspec</i> package requires utf-8 encoding. It is able to load Open Type fonts, and access their internal feature sets. Forget Type 1 fonts and special encodings! If you wish to use Greek or Cyrillic, all you need are compatible fonts.</p>
-<p class="item"><b>B.</b> If you accept the pre-configured fonts (from <i>libertinus</i>), then you do not need to know anything about <i>fontspec</i>. But if you wish to configure your own fonts, <a href="#hE">Appendix E</a> reviews the most important parts of <i>fontspec</i> syntax.</p>
+<p class="item"><b>B.</b> If you accept the pre-configured fonts (from package <i>libertinus-fonts</i>), then you do not need to know anything about <i>fontspec</i>. But if you wish to configure your own fonts, <a href="#hE">Appendix E</a> reviews the most important parts of <i>fontspec</i> syntax.</p>
<div style="clear:both"></div>
</div><!-- end 1.1.4 -->
@@ -715,7 +725,7 @@ function closeall() {
<h3 id="h2.2">2.2. sandbox</h3>
<div class="d3" id="d2.2">
-<p class="noindent">New in version 1.50. You work in <code>sandbox</code> mode as a class option:</p>
+<p class="noindent">You may work in <code>sandbox</code> mode as a class option:</p>
<p class="code"><code>\documentclass[sandbox]{novel}</code></p>
<p class="item"><b>A.</b> In <code>sandbox</code> mode, you can use many packages that would otherwise be prohibited. This will allow you to create tables and diagrams using nearly any methods ordinarily available in most other document classes. Of course, you may have to load some additional packages.</p>
<p>Also, when in <code>sandbox</code> mode, many glues and lengths are set to values that are typical of other document classes, rather than the special values ordinarily used by <i>novel</i>.
@@ -787,11 +797,17 @@ function closeall() {
<div class="d3" id="d2.9">
<p class="noindent">These options are primarily used for developer testing, not user production. Using them may cause compilation to fail, or produce an undesirable result. That is not considered a bug.</p>
<p class="item"><b>A.</b> <code>mtoff</code> The <i>microtype</i> package will not be loaded.</p>
-<p class="item"><b>B.</b> <code>polyoff</code> The <i>polyglossia</i> package will not be loaded.</p>
-<p class="item"><b>C.</b> <code>test</code> Only used with file <i>novel-testsuite.tex</i>.</p>
-<p class="item"><b>D.</b> <code>unblock</code> Allows use of some packages that would otherwise be blocked.</p>
+<p class="item"><b>B.</b> <code>test</code> Only used with file <i>novel-testsuite.tex</i>.</p>
+<p class="item"><b>C.</b> <code>unblock</code> Allows use of some packages that would otherwise be blocked.</p>
</div><!-- end 2.9 -->
+<h3 id="h2.10">2.10. revert</h3>
+<div class="d3" id="d2.10">
+<p class="noindent">Version 1.80 has some minor tweaks, so that documents compile faster.
+In most cases, a document compiled with earlier version 1.52 will look the same.
+If it does not, the class option <code>revert</code> will undo the tweaks.</p>
+</div><!-- end 2.10 -->
+
</div><!-- end 2 -->
</div><!-- end page02 -->
@@ -1074,7 +1090,7 @@ OSX: <code>/Library/Colorsync/Profiles/</code> or hidden <code>(username)/Librar
<h5 id="h4.2.1.1">4.2.1.1. <code>\SetParentFont[<em>features</em>]{<em>fontname</em>}</code></h5>
<div class="d5" id="d4.2.1.1">
<p class="item"><b>A.</b> In <i>novel</i> you set a parent font, which is the ancestor of several pre-defined font styles, including the main font. In Preamble:</p>
-<p class="code"><code>\SetParentFont[<em>features</em>]{<em>fontname</em>}</code><p>
+<p class="code"><code>\SetParentFont[<em>features</em>]{<em>fontname</em>}</code></p>
<p class="item"><b>B.</b> The command uses <i>fontspec</i> syntax, which is reviewed in <a href="#hE">Appendix E</a>, and described in full detail by the <i>fontspec</i> package documentation.</p>
<p class="item"><b>C.</b> Whether you use <code>\SetParentFont</code> or accept the default, the features and fontname are stored as strings in macros <code>\parentfontfeatures</code> and <code>\parentfontname</code>. You may use <code>\parentfontfeatures</code> and <code>\parentfontname</code> as arguments to other font commands.</p>
<p class="item"><b>D.</b> If you have the proper license, you can use a commercial font. For example:</p>
@@ -1085,7 +1101,7 @@ OSX: <code>/Library/Colorsync/Profiles/</code> or hidden <code>(username)/Librar
<h5 id="h4.2.1.2">4.2.1.2. <code>\SetFontSize{<em>length</em>}</code></h5>
<div class="d5" id="d4.2.1.2">
<p class="item"><b>A.</b> In the <i>novel</i> document class, you do not set point size as a class option. Instead you use <code>\SetFontSize</code> in the Preamble. It applies to the parent (main) font, and is used as the basis for scaling font sizes.</p>
-<p class="item"><b>B.</b> The size may be any units TeX understands, including decimal values. So, <i>12.8bp</i> and <i>13.1pt</i> are acceptable. This is because you will be using scalable, Open&nbsp;Type and TrueType fonts throughout your document. They do not need TeX metrics.<p>
+<p class="item"><b>B.</b> The size may be any units TeX understands, including decimal values. So, <i>12.8bp</i> and <i>13.1pt</i> are acceptable. This is because you will be using scalable, Open&nbsp;Type and TrueType fonts throughout your document. They do not need TeX metrics.</p>
<p class="item"><b>C.</b> If you insist on using ancient TeX fonts, then you may need to specify a convenient integer font size such as 11pt or 12pt. But why? Forget those fonts! Welcome to the Twenty-First Century.</p>
<p class="item"><b>D.</b> The minimum global font size is <i>8pt</i>, and the maximum is <i>18bp</i>. On a local basis, text may be larger or smaller than this.</p>
<p class="item"><b>E.</b> If you do not use <code>\SetFontSize</code>, the default will be <i>11.4pt</i> more or less. That is, the size is calculated from other layout settings. When there is less available text area, the default size is <i>11pt</i>. For larger books, the default is <i>12pt</i>.</p>
@@ -1100,7 +1116,7 @@ OSX: <code>/Library/Colorsync/Profiles/</code> or hidden <code>(username)/Librar
<p>For example, the <i>main font</i> uses the <i>parent font</i> family. It has TeX Ligatures and Kerning (inherited from the <i>parent font</i>), and also Common Ligatures and OldStyle numbers.</p>
<p class="item"><b>B.</b> The <i>main font</i> is not configured directly. Instead, configure the <i>parent font</i>, then the <i>main font</i> (and other descendants) will obey. For example, if you don't want OldStyle numbers:</p>
<p class="code"><code>\SetParentFont[<em>Numbers=Lining</em>]{<em>fontname</em>}</code></p>
-<p>Then, Lining numbers will be used for the <i>main font</i> (and other descendants).<p>
+<p>Then, Lining numbers will be used for the <i>main font</i> (and other descendants).</p>
<p class="item"><b>C.</b> If you don't like the defaults, you can set the other descendant fonts directly, in Preamble:</p>
<p class="code">
<code>\SetChapterFont[<em>features</em>]{<em>fontname</em>}</code> &nbsp; % <em>see section <a href="#h5.1.3.1">5.1.3.1</a></em><br/>
@@ -1655,7 +1671,7 @@ Who could blame them? It's not like they lived in Italy.\par<br/>
Ah, such ill fortune haunted the Withens!\par<br/>
Unfortunately, novelists of that era had so little to write about, or they would have chosen another family to pursue.\par
</small></code></p>
-<p class="item"><b>C.</b> From version 1.52, a badly-placed scene break will be detected, and a Warning message will be issued.</p>
+<p class="item"><b>C.</b> A badly-placed scene break will be detected, and a Warning message will be issued.</p>
<p>If <code>\scenebreak</code> is positioned at the very top or bottom of a page, then the Warning will advise you to substitute it with either <code>\scenestars</code> or <code>\sceneline</code>. The substitution is not automatic.</p>
<p>If any of <code>scenebreak</code>, <code>\sceneline</code>, or <code>\scenestars</code> appears just one line away from the top or bottom of a page, you will get a Warning.</p>
@@ -1829,7 +1845,7 @@ Even after his jodphurs had finally uncurled, Lord Withens could not master his
<div class="d4" id="d6.2.2">
<p class="item"><b>A.</b> <code>\bfshape{<em>text, may cross paragraphs</em>}</code> is a general-purpose command for bold.</p>
<p class="item"><b>B.</b> <code>\textbf{<em>text</em>}</code> will not cross paragraphs.</p>
-<p class="item"><b>C.</b> The default main font in <i>novel</i> is <i>Libertinus Serif</i>, which has both bold and semibold weights. The semibold weight is pre-configured to substitute for bold.</p>
+<p class="item"><b>C.</b> The default main font in <i>novel</i> is <i>Libertinus Serif</i>, which has both bold and semibold weights. In versions prior to 1.80 (2023), The semibold weight is pre-configured to substitute for bold. Version 1.80 does not make this substitution.</p>
<p class="item"><b>D.</b> If you use a different font, and it has an alternative to bold weight, see <a href="#hE.1.1">Appendix E.1.1</a> <i>file name combinations</i> for how to configure the choice. Bold is not faked by thickening.</p>
<p class="item" style="position:relative"><b>E.</b> <img src="html-resources/info18.png" width="18" height="18" style="position:relative; bottom:-3px" title="tech info" alt="tech info"/> Bold is rare in fiction. It <em>might</em> be the case that this weight is useful for titles, but you ought to consider a fancy-looking font for that purpose, rather than mere Bold. Or, make the letters big and bold, but balance the effect by using gray.</p>
</div><!-- end 6.2.2 -->
@@ -1934,7 +1950,7 @@ This text is in lightgray, until the group ends.<br/>
<p>Images have built-in positioning arguments.</p>
<p class="item"><b>F.</b> Do not use floats (except in <a href="#h2.2">sandbox</a>). Use <i>novel's</i> own <code>\FloatImage</code>.</p>
<p class="item"><b>G.</b> Do not use tables (except in <a href="#h2.2">sandbox</a>). But <i>novel</i> has its <a href="#hD.3.2.7">own provision</a> for a Table of Contents, and the code may be used for other purposes as well.</p>
-<p class="item"><b>H.</b> Do not use picture environment (except in <a href="#h2.2">sandbox</a>). Use only the image commands provided by novel: <code><a href="#h7.2.2">\InlineImage</a></code>, <code><a href="#h7.2.4">\FloatImage</a></code>, and <code><a href="#h7.2.5">\WrapImage</a></code>. There is also a special provision for <a href="#h7.1.2">color cover artwork</a>.<p>
+<p class="item"><b>H.</b> Do not use picture environment (except in <a href="#h2.2">sandbox</a>). Use only the image commands provided by novel: <code><a href="#h7.2.2">\InlineImage</a></code>, <code><a href="#h7.2.4">\FloatImage</a></code>, and <code><a href="#h7.2.5">\WrapImage</a></code>. There is also a special provision for <a href="#h7.1.2">color cover artwork</a>.</p>
</div><!-- end 6.3.1 -->
<h4 id="h6.3.2">6.3.2. Some Useful Commands</h4>
@@ -1943,6 +1959,7 @@ This text is in lightgray, until the group ends.<br/>
<p style="margin-top:10pt"><code>\begin{adjustwidth}{<em>left</em>}{<em>right</em>} ... \end{adjustwidth}</code></p>
<p>This environment, from the included <i>changepage</i> package, is the most useful way to create block indents. The included text may have multiple paragraphs and span pages. The left and right arguments are lengths, being the amount to <em>increase</em> the respective margins from their normal values.</p>
<p style="margin-top:10pt"><code>\rotatebox{<em>text</em>}</code></p>
+<p>NOTE: Do not use rotation unless you really need it. Some P.O.D. printers robot-screen files, and a rotated box may be rejected (even though it is good).</p>
<p>This command is from the included <i>graphicx</i> package. It rotates the text, about an axis at the lower left of the text. If you wish to rotate the text about its center, use <code>\rotatebox[origin=c]{text}</code>.</p>
<p>This command plays nicely with <code>\charscale</code>, so you can size, rotate, and displace a string of text (single line). It makes a difference which command goes inside the other. More likely than not, the effect you want is obtained by using <code>\charscale</code> on the outside, with <code>\rotatebox</code> inside.</p>
<p>To avoid disturbing the line grid, <code>\rotatebox</code> is best used with <a href="#h6.1.2">\charscale</a> and a few blank lines.</p>
@@ -2037,7 +2054,7 @@ This text is in lightgray, until the group ends.<br/>
<p class="item"><b>F.</b> Most print services require that images must be stripped of private metadata (such as EXIF), and that the color space be DeviceGray, rather than specified by a transfer profile.</p>
<p class="item"><b>G.</b> Black/White images must be in <i>png</i> file format. Grayscale images may be in either <i>png</i> or <i>jpg</i> file format.</p>
<p class="item" style="position:relative"><b>H.</b> <img src="html-resources/info18.png" width="18" height="18" style="position:relative; bottom:-3px" title="tech info" alt="tech info"/> In the documentation <i>extras</i> folder, <i style="white-space:nowrap">novel-scripts.zip</i> will help you comply with these requirements. Complete usage information is provided there.</p>
- <p class="item"><b>I.</b> From version 1.52, <i>novel</i> detects whether or not an interior image was pre-processed using <i>novel-scripts</i>. If yes, it is "known good". If no, it is "unknown" and may be good or bad.</p>
+ <p class="item"><b>I.</b> Now <i>novel</i> detects whether or not an interior image was pre-processed using <i>novel-scripts</i>. If yes, it is "known good". If no, it is "unknown" and may be good or bad.</p>
<p>If your document has any "unknown" images, you will get a Warning. The list of "unknown" images is written near the bottom of the log file.</p>
<p>If you know that an image meets specs (because you are a graphic artists who knows these things), but it wasn't processed by <i>novel-scripts</i>, you can manually add it to the list of "known good" images. In Preamble:</p>
<p class="code"><code>\SetKnownGoodImages{somefile.png anotherfile.jpg}</code></p>
@@ -2066,7 +2083,7 @@ This text is in lightgray, until the group ends.<br/>
<h4 id="h7.2.2">7.2.2. <code>\InlineImage[<em>hoffset,voffset</em>]{<em>imageFile.png or .jpg</em>}</code> and starred version</h4>
<div class="d4" id="d7.2.2">
-<p class="item"><b>A.</b> This command places the image as an inline element, at 100% scale. The use of <i>png</i> or <i>jpg</i> images, with file extension, is required.<p>
+<p class="item"><b>A.</b> This command places the image as an inline element, at 100% scale. The use of <i>png</i> or <i>jpg</i> images, with file extension, is required.</p>
<p class="item"><b>B.</b> You may offset the image horizontally or vertically. Positive direction is to the right and up. If you use one offset, then you must use both (if necessary, <i>0em</i>). Any units of length may be used, but the preferred units are <i>em</i> or <code>\textwidth</code> for horizontal, and <i>em</i> or <code><span style="cursor:help" title="normal baseline skip">\nbs</span></code> for vertical.</p>
<p class="item"><b>C.</b> By default, the <em>top</em> of the image is at the text baseline. If you prefer that the <em>bottom</em> of the image be at the text baseline, use voffset <i>b</i>. Example:</p>
<p class="code"><code>\InlineImage[0em,b]{imageFile.png}</code></p>
@@ -2287,7 +2304,7 @@ There are many other commands available, but they are not specific to novel clas
<p>Non-empty default values are <em>shown like this</em>.<br/>
&nbsp;</p>
<p style="text-indent:0">
-<a href="#h1.1.1">% !TeX TS-program = LuaLaTeX</a><br/>
+<a href="#h1.1.1">% !TeX TS-program = lualatex</a><br/>
<a href="#h1.1.2">% !TeX encoding = UTF-8</a><br/>
<a href="#h2">\documentclass{novel}</a> % See list of class options; usually none needed.<br/>
%%% METADATA (FILE DATA):<br/>
@@ -2345,7 +2362,7 @@ There are many other commands available, but they are not specific to novel clas
% <a href="#h4.2.5">\NewFontFace[]{}</a> % Optional command.<br/>
% <a href="#hE.2.3">\CreateFontFeature{}{}</a> % Optional command.<br/>
%%% OTHER:<br/>
-<a href="#h1.1.3">\setdefaultlanguage[<em>variant=american</em>]{<em>english</em>}</a> % polyglossia<br/>
+<a href="#h1.1.3">Language Support</a>
<a href="#h6">\microtypesetup{<em>config=novel-microtype,stretch=20,shrink=20,final</em>}</a> % microtype<br/>
%%% BEGIN DOCUMENT:<br/>
\begin{document}<br/>
@@ -2451,7 +2468,7 @@ It was a dark and stormy night, etc.<br/>
<p>You have numerous fonts already installed in your operating system, and perhaps others that came bundled with a particular application. If you intend to use those fonts, carefully read their licenses. It is often the case that fonts bundled with an application may <em>only</em> be used for documents created within, or processed by, that application. Or, the fonts may be OK to use for printing directly by your own home printer, but not for embedding in a PDF that will go to a commercial printer.</p>
<p>Although it does not pertain to TeX, another issue can arise if you later publish an ebook version. Fonts licensed for printing are often not licensed for an ebook. Indeed, the ebook distributor may ban them.</p>
<p>Always look for a Copyright notice, which can be identified with a particular person or organization. Copyright is good! It means that someone is claiming authorship of the font software. Only the Copyright owner has the right to give the font away for free, or license it to you after payment (often through an intermediary).</p>
-<p>If you prefer free fonts, the most widely accepted license is the <a class="external" rel="external" target="new" href="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL">SIL Open Font License</a>. This allows you to use the font for commercial purposes, embed it in PDF, modify it to suit your needs (if you change the font name), and even re-distribute the modifications. The recommended default <i>Libertinus Serif</i> bears this font license. So does the included font <i>NovelDeco</i>.</p>
+<p>If you prefer free fonts, the most widely accepted license is the <a class="external" rel="external" target="new" href="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&amp;id=OFL">SIL Open Font License</a>. This allows you to use the font for commercial purposes, embed it in PDF, modify it to suit your needs (if you change the font name), and even re-distribute the modifications. The recommended default <i>Libertinus Serif</i> bears this font license. So does the included font <i>NovelDeco</i>.</p>
</div><!-- end C.1 -->
<h3 id="hC.2">C.2. &nbsp; Technical Issues</h3>
@@ -2635,7 +2652,7 @@ It was a dark and stormy night, etc.<br/>
<p>Alternatively, you can quote from your own book, or make up something entirely new. One famous Epigraph is used in J.R.R. Tolkien's <i>Lord of the Rings</i> trilogy, in which each book uses the long form of the Ring's incantation as its Epigraph.</p>
<p>One possible use of an Epigraph is on recto page v, in books that lack a Dedication, a Table of Contents, or other important front matter beyond the Copyright Page. Alternatively, if a book has both Dedication and Table of Contents, an Epigraph may be placed on the otherwise-blank verso page vi between them. Or, an Epigraph may appear in some later convenient place in front matter.</p>
<p>In general, an Epigraph is set as a centered block, not occupying the full page width. The <i>adjustwidth</i> environment serves this purpose. You will have to manually adjust the widths at left and right, for best visual effect.</p>
-<p>The source of the quotation should be right-justified within the block, and may be preceded by an emdash. Typically, names of people are not italicized, but titles of books are. It is not necessary to give elaborate details; this is not a bibliography.<p>
+<p>The source of the quotation should be right-justified within the block, and may be preceded by an emdash. Typically, names of people are not italicized, but titles of books are. It is not necessary to give elaborate details; this is not a bibliography.</p>
<p>It is not necessary to load the <i>epigraph</i> package. Simply construct your own style of epigraph using other methods. But if you do load <i>epigraph</i>: Only use <code>\epigraph</code>, or the <code>epigraphs</code> environment, within the ChapterStart environment, or on a display page. Commands <code>\epigraphhead</code>, <code>\dropchapter</code>, <code>\undocrop</code> do not work in <i>novel</i>. The <code>\cleartoevenpage[<i>option</i>]</code> command does work. Ignore the material regarding epigraphs on part pages or in bibliographies.</p>
<h6 id="hD.3.2.6.1"><span class="n"></span>D.3.2.6.1. Example Epigraph: Real Quotation</h6>
@@ -2920,7 +2937,7 @@ Dirk Hardcase is a former... etc.\par<br/>
<p>Document Body:</p>
<p class="code"><code>{\rwayi I came, \textbf{I saw}, \emph{I conquered}, \textsc{I left}.}</code></p>
<p style="margin-top:10px"><b>File Name Combinations:</b></p>
-<p><img class="floatright" style="padding-top:12px" src="html-resources/frankenfont.png" width="312" height="41" alt="frankenfont"/> What you write is what you get. You can customize a font family by individually selecting its members. Here is the syntax.</p>
+<p><img class="floatright" style="padding-top:12px" src="html-resources/frankenfont.png" width="312" height="41" alt="frankenfont"/> What you write is what you get. You can customize a font family by individually selecting its members. Here is the syntax. Case-sensitive, so what you see here may differ from what you have.</p>
<p>Preamble:</p>
<p class="code" style="clear:both"><code>\NewFontFamily\frankenfont[% note the % at linebreaks<br/>
&nbsp; ItalicFont=BaskervilleF-Italic.otf,%<br/>
@@ -3080,7 +3097,6 @@ Some text {\baskf\addfontfeature{Numbers=Monospaced} hello 123} is here.
<h3 id="hF.2">F.2. &nbsp; \dropcap[<em>options</em>]{<em>letter or image</em>}</h3>
<div class="d3" id="dF.2">
-<p class="noindent">To ensure that this command works as described here, verify that font <i>NovelDeco.otf</i> is at least version 1.48. If you use your own <i>deco font</i>, be sure that it is based on at least that version. Also, clear <i>luatex-cache</i> so that the version is updated. If you do not do that, the <code>\dropcap</code> command still works, but the appearance of the result will differ.</p>
<p class="item"><b>A.</b> The <code>\dropcap</code> command is based on <i>lettrine</i> technology, but has different options and behavior.</p>
<p class="item"><b>B.</b> The <code>\dropcap</code> command accepts the following options as <span style="white-space:nowrap">comma-separated</span> key values:</p>
<p class="code"><code>lines=<em>integer</em></code> &nbsp; Number of lines indented by the drop cap. Default 3.</p>
@@ -3124,7 +3140,7 @@ Some text {\baskf\addfontfeature{Numbers=Monospaced} hello 123} is here.
<p class="code"><code>\NewFontFace\mynicedc[<em>features</em>]{font file name}</code></p>
<p>Then, you set the font. This may be changed anywhere:</p>
<p class="code"><code>\SetDropCapFont{\mynicedc}</code></p>
-<p class="item"><b>D.</b> Do not use Type1 or Metafont fonts. If the desired font is only available in one of those formats, you can use a font editor such as <a href="https://fontforge.github.io/en-US/" class="external" rel="external" target="new">FontForge</a> to convert it to Open Type or TrueType format. Then, as described above, load the converted file by its exact file name. If the font has mssing extrema, that is almost never a problem. Overlapped hints are rarely a problem. But self-intersecting glyphs and open paths may be a problem, if you use those glyphs.</p>
+<p class="item"><b>D.</b> Do not use Type1 or Metafont fonts. If the desired font is only available in one of those formats, you can use a font editor such as <a href="https://fontforge.org" class="external" rel="external" target="new">FontForge</a> to convert it to Open Type or TrueType format. Then, as described above, load the converted file by its exact file name. If the font has mssing extrema, that is almost never a problem. Overlapped hints are rarely a problem. But self-intersecting glyphs and open paths may be a problem, if you use those glyphs.</p>
<p class="item"><b>E.</b> Default drop cap color is black. To change it, use <i>xcolor</i> syntax. Either of these:</p>
<p class="code"><code>\SetDropCapColor[<em>color model</em>]{<em>color value</em>}</code></p>
<p class="code"><code>\SetDropCapColor{<em>color name</em>}</code></p>
@@ -3162,7 +3178,7 @@ Some text {\baskf\addfontfeature{Numbers=Monospaced} hello 123} is here.
<p class="item"><b>B. Credits:</b> Within the TeX code files, you will find places where small or large pieces of code are the work of someone else. Names or organizations are credited in-place within the TeX code, according to license.</p>
<p>Various clipart graphics were obtained from <a class="external" rel="external" target="new" href="https://openclipart.org">openclipart.org</a>.</p>
-<p>Font <i>NovelDeco.otf</i> was created using <a class="external" rel="external" target="new" href="https://fontforge.github.io/en-US/">FontForge</a>. The font is partly derived from <a class="external" rel="external" target="new" href="https://github.com/khaledhosny/libertinus"><span style="white-space:nowrap"><i>Libertinus Serif</i></span></a>, which in turn is derived from <a class="external" rel="external" target="new" href="http://www.linuxlibertine.org/"><span style="white-space:nowrap"><i>Linux Libertine O</i></span></a>.</p>
+<p>Font <i>NovelDeco.otf</i> was created using <a class="external" rel="external" target="new" href="https://fontforge.org">FontForge</a>. The font is partly derived from <i>Libertinus Serif</i>, which in turn is derived from <a class="external" rel="external" target="new" href="http://www.linuxlibertine.org/"><span style="white-space:nowrap"><i>Linux Libertine O</i></span></a>.</p>
<p>In places, I offer opinions or make suggestions regarding design. These are largely based on my own inspection of popular fiction books, at my local public library. In some cases, I follow the <a class="external" rel="external" target="new" href="http://www.chicagomanualofstyle.org/home.html"><i>Chicago Manual of Style</i></a> (CMoS), hardcover 16th edition. However, please do not regard my opinions and suggestions as authoritative.</p>
<p>&nbsp;</p>
@@ -3173,88 +3189,18 @@ Some text {\baskf\addfontfeature{Numbers=Monospaced} hello 123} is here.
<div id="pageZ" class="page">
-<h2 id="hZ">Appendix Z. &nbsp; Changes in v.1.50 and Later</h2>
+<h2 id="hZ">Appendix Z. &nbsp; Changes in v.1.80.</h2>
<div class="d2" id="dZ">
-<h4>Changes in version 1.52</h4>
-<div class="d4">
-<p>The <code>linegap</code> environment is deprecated. It will still be honored in code, but has been removed from the documentation. It was never very useful.</p>
-<p>The <code>parascale</code> environment now measures how much it disturbs the line grid. Although it cannot automatically correct the disturbance, it does provide a useful warning so that you can make the change yourself.</p>
-<p>Best practice avoids scene breaks too close to the top or bottom of a page, unless you place something visible there. Now, a badly-placed <code>\scenebreak</code> can be detected, and a warning will be issued.</p>
-<p>Version 1.50 already included an advanced method for PDF/X-1a color covers. In version 1.52, this is extended to non-color interior book blocks. Now, any image placed in your document will be inspected, and classified either as <i>known-compliant</i> or <i>unknown</i>. Images with <i>unknown</i> compliance will be reported in the log file, and if any were detected, there will be a warning.</p>
-<p>There have been some miscellaneous small tweaks, unlikely to be noticeable by most users.</p>
-<p>Documents that successfully compiled with version 1.50 should look the same in version 1.52, but you may see more warnings.</p>
-</div>
-
-<h4>Changes in Version 1.50</h4>
+<h4>Important Changes</h4>
<div class="d3">
-<p>Version 1.50 introduced many new features, and some changes, from version 1.46.2.</p>
-
-<p class="noindent"><b>Post-Release Reversion to Old</b></p>
-<p>If you have an existing document created with version prior to 1.50, in rare circumstances the layout will change. </p>
-<p>If the only change is the number of lines per page, then you can simply fix it manually, using the <code>\SetLinesPerPage</code> command. But if version 1.50 creates problems, you can run the old and new versions side-by-side. Be sure to keep the new version installed.</p>
-<p>In the short term, an older version of <i>novel</i> can be found <a href="https://github.com/RobtAll/novel">here</a>, in the archives folder. Be sure that the zip file is named "novel-old".</p>
-<p>1) Unpack novel-old.zip into your texmf-local directory.</p>
-<p>2) Refresh your file name database.</p>
-<p>3) Change your document class from <i>novel</i> to <i>novel-old</i>.</p>
-<p>If performed correctly, you will be using version 1.46.2 of <i>novel</i>, when you change the document class to <i>novel-old</i>. To avoid version conflict, be sure that you do not duplicate font <i>NovelDeco.otf</i> in texmf-local; <i>novel-old</i> will rely on the current version installed with <i>novel</i>.</p>
-<p>Any document using <i>novel</i> will get the installed version, rather than <i>novel-old</i>.</p>
-<p>In the long term, the older version will be removed. No particular time frame. I do not believe that many users (if any) will be affected.</p>
-<p>If your existing documents have no problem with version 1.50, then use the newer version.</p>
-
-<p class="noindent"><b>Cover Art Methods Changed</b></p>
-<p>From version 1.50, the method used for cover art has changed. If you have existing cover artwork using the older syntax, it will still be honored, but it is no longer documented.</p>
-<p>The new cover art syntax requires you to pre-process your image using a script, included in the documentation <i>extras</i> folder. The scripts works on Windows, Linux, and Mac OSX. The processed image will be PDF, separated to CMYK, at 240% ink limit.</p>
-<p>To obtain PDF/X, you post-process the above PDF in lualatex, using a template. Complete instructions are in the zip file containing the scripts.</p>
-<p>Of course, you don't need to use TeX at all, if your print service accepts an ordinary RGB image.</p>
-
-<p class="noindent"><b>New Class Option: sandbox</b></p>
-<p><i>Novel</i> does not permit things such as TikZ diagams, tables (other than its own method), imported PDf pages, and some other TeX effects. The purpose of the prohibition is to maintain grid layout, and ensure PDF/X compliance.</p>
-<p>From version 1.50, the <code>sandbox</code> class option allows you to do nearly anything, provided that the result is no more than four pages. Then, you can create drawings or whatever, convert to raster images, and place the images in your main document.</p>
-
-<p class="noindent"><b>\BlockImage Obsolete</b></p>
-<p>From version 1.50 the \BlockImage command is obsolete. It was never a very good macro. If you have an existing document that uses \BlockImage, it will be honored, but it is no longer documented.</p>
-<p>You may prefer the new <code>\FloatImage</code> and <code>\WrapImage</code> commands.</p>
-
-<p class="noindent"><b>\FloatImage Added</b></p>
-<p>Better than <code>\BlockImage</code>: Version 1.50 now has <code>\FloatImage</code>, which can place an image "here" or float it to the next page, if it doesn't immdiately fit. Full-page floats are supported. See the full documentation, above.</p>
-<p>The <code>\InlineImage</code> command remains unchanged, and will probably remain forever. It's a good macro.</p>
-
-<p class="noindent"><b>\WrapImage Added</b></p>
-<p>The new <code>\WrapImage</code> command provides limited support for wrapping text around an image. It is all you need in the context of fiction writing.</p>
-<p>The <i>wrapfig</i> package is automatically loaded, and provides the layout engine. However, do not directly use the commands and environments from that package (they won't work). Instead, <i>novel</i> provides macro <code>\WrapImage</code>, which will format your input so that it can be processed correctly.</p>
-
-<p class="noindent"><b>Drop Caps Added</b></p>
-<p>As before, you may use the <i>lettrine</i> package, if you wish. From version 1.50, <i>novel</i> now has built-in support for a certain style of drop caps, as a special interface to the <i>lettrine</i> layout engine.</p>
-<p>Since the new <code>\dropcap</code> command requires an updated version of the <i>NovelDeco.otf</i> font, be sure to update your <span style="white-space:nowrap">luatex-cache</span>.</p>
-
-<p class="noindent"><b>\Rework Obsolete</b></p>
-<p>From its early days, <i>novel</i> had an exotic built-in method for preserving layout if your book's Trim Size changed. It was a complicated piece of code, and even though it worked, it was inherently incapable of addressing some layout situations.</p>
-<p>In version 1.46.1 it was quietly removed from the documentation. In the short term, existing documents that rely on <code>\Rework</code> commands will still compile. In the long term, forget it. To my knowledge, nobody is using it.</p>
-
-<p class="noindent"><b>Class Option <i>graytext</i> Obsolete</b></p>
-<p>Formerly, you could use a class option to specify whether or not the use of grayscale text (anything other than solid black) was permitted. There was never any good reason for having that choice, so it has been removed. Now, you can always use grayscale text, if you wish.</p>
-
-<p class="noindent"><b>\SetCropmarkGap Obsolete</b></p>
-<p>Formerly, there was a minimal ability to configure crop marks. It was not very useful, and made the code more complex. Now, the size of cropmarks is fixed.</p>
-
-<p class="noindent"><b>New Error Messages for Endnotes</b></p>
-<p>Prior to version 1.50, incorrect use of <a href="#h9.2"><code>\endnote</code></a> commands would simply produce bad typesetting, without warning.</p>
-<p>New error messages have been added. If you use <a href="#h9.2"><code>\endnote</code></a>, and get error messages that did not appear before, then be sure to read the command documentation again. The most likely reason for error is that you are using the commands according to the syntax of some other package, rather than using <i>novel's</i> own syntax.</p>
-
-<p class="noindent"><b>New Algorithm for Layout Calculations</b></p>
-<p>Under the hood, version 1.50 uses a more accurate method for page layout. In most cases, the change is microscopic, and will not affect existing documents.</p>
-<p>Books that use widely-spaced lines are most likely to show a noticeable change for the better. In a few cases, the default number of lines per page will change. If you have an existing document using default lines per page, and it has changed, then simply specify the exact number manually.</p>
-
-<p class="noindent"><b>Revised Documentation Format</b></p>
-<p>This documentation has been slightly revised. Now, long sections are broken down into items, marked A, B, etc. This is for the convenience of translators.</p>
-<p>Under the hood, in the TeX code, there has been some cleanup, for the benefit of future package maintainers.</p>
-
-<p class="noindent"><b>What's Unchanged</b></p>
-<p>Most of <i>novel</i> is just as before, and will be...</p>
-<p>In particular, there is no support for tables (other than novel's own Table of Contents), no support for automatic divisions into sections and other kinds of partitions, no support for automatic index or bibliography, and generally no support for the "academic" structure used by other document classes.</p>
-</div>
-
+<p>Version 1.80 (2023) tweaks some internal code, for faster compiling.
+No new features or bugs. If you have a document built with the earlier
+version 1.52, use class option <code>revert</code> to avoid using the tweaks.
+In any case, if you are re-building an earlier document, pay careful attention
+to line breaks and pagination. Due to various adjustments in component
+packages and fonts, a document built in the past may look slightly different
+if re-built now.</p>
</div><!-- end Z -->
</div><!-- end Appendix Z -->
diff --git a/macros/luatex/latex/novel/doc/novel.pdf b/macros/luatex/latex/novel/doc/novel.pdf
index 05afb49738..d0c1cfbd66 100644
--- a/macros/luatex/latex/novel/doc/novel.pdf
+++ b/macros/luatex/latex/novel/doc/novel.pdf
@@ -1,18 +1,17 @@
%PDF-1.3
-%
+%
4 0 obj
-<</Type /Metadata /Subtype /XML
-/Length 6630 >>
+<< /Type /Metadata /Subtype /XML /Length 2535 >>
stream
<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 4.2.1-c043 52.372728, 2009/01/18-15:08:04 ">
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<rdf:Description rdf:about=""
xmlns:xmp="http://ns.adobe.com/xap/1.0/">
- <xmp:ModifyDate>2018-04-25T14:02:52-07:00</xmp:ModifyDate>
- <xmp:CreateDate>2018-04-25T14:02:52-07:00</xmp:CreateDate>
+ <xmp:ModifyDate>2023-02-15T11:45:06-08:00</xmp:ModifyDate>
+ <xmp:CreateDate>2023-02-15T11:45:06-08:00</xmp:CreateDate>
<xmp:CreatorTool>LuaLaTeX with novel and microtype</xmp:CreatorTool>
- <xmp:MetadataDate>2018-04-25T14:02:52-07:00</xmp:MetadataDate>
+ <xmp:MetadataDate>2023-02-15T11:45:06-08:00</xmp:MetadataDate>
</rdf:Description>
<rdf:Description rdf:about=""
xmlns:dc="http://purl.org/dc/elements/1.1/">
@@ -26,7 +25,7 @@ stream
<rdf:Description rdf:about=""
xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/">
<xmpMM:DocumentID>uuid:A12D98E081B6A0EC2CBA2D468474F922</xmpMM:DocumentID>
- <xmpMM:InstanceID>uuid:A99D5F97282F8D328BFD492B6475A679</xmpMM:InstanceID>
+ <xmpMM:InstanceID>uuid:DE40971EE9369E324A7B5A3A6BF63829</xmpMM:InstanceID>
<xmpMM:RenditionClass>default</xmpMM:RenditionClass>
<xmpMM:VersionID>1</xmpMM:VersionID>
</rdf:Description>
@@ -44,246 +43,212 @@ stream
xmlns:pdfxid="http://www.npes.org/pdfx/ns/id/">
<pdfxid:GTS_PDFXVersion>PDF/X-1a:2001</pdfxid:GTS_PDFXVersion>
</rdf:Description>
- <rdf:Description rdf:about=""
- xmlns:pdfaExtension="http://www.aiim.org/pdfa/ns/extension/"
- xmlns:pdfaSchema="http://www.aiim.org/pdfa/ns/schema#"
- xmlns:pdfaProperty="http://www.aiim.org/pdfa/ns/property#">
- <pdfaExtension:schemas>
- <rdf:Bag>
- <rdf:li rdf:parseType="Resource">
- <pdfaSchema:namespaceURI>http://ns.adobe.com/pdf/1.3/</pdfaSchema:namespaceURI>
- <pdfaSchema:prefix>pdf</pdfaSchema:prefix>
- <pdfaSchema:schema>Adobe PDF Schema</pdfaSchema:schema>
- <pdfaSchema:property>
- <rdf:Seq>
- <rdf:li rdf:parseType="Resource">
- <pdfaProperty:category>internal</pdfaProperty:category>
- <pdfaProperty:description>A name object indicating whether the document has been modified to include trapping information</pdfaProperty:description>
- <pdfaProperty:name>Trapped</pdfaProperty:name>
- <pdfaProperty:valueType>Text</pdfaProperty:valueType>
- </rdf:li>
- </rdf:Seq>
- </pdfaSchema:property>
- </rdf:li>
- <rdf:li rdf:parseType="Resource">
- <pdfaSchema:namespaceURI>http://ns.adobe.com/pdfx/1.3/</pdfaSchema:namespaceURI>
- <pdfaSchema:prefix>pdfx</pdfaSchema:prefix>
- <pdfaSchema:schema>PDF/X ID Schema</pdfaSchema:schema>
- <pdfaSchema:property>
- <rdf:Seq>
- <rdf:li rdf:parseType="Resource">
- <pdfaProperty:category>internal</pdfaProperty:category>
- <pdfaProperty:description>ID of PDF/X standard</pdfaProperty:description>
- <pdfaProperty:name>GTS_PDFXVersion</pdfaProperty:name>
- <pdfaProperty:valueType>Text</pdfaProperty:valueType>
- </rdf:li>
- <rdf:li rdf:parseType="Resource">
- <pdfaProperty:category>internal</pdfaProperty:category>
- <pdfaProperty:description>Conformance level of PDF/X standard</pdfaProperty:description>
- <pdfaProperty:name>GTS_PDFXConformance</pdfaProperty:name>
- <pdfaProperty:valueType>Text</pdfaProperty:valueType>
- </rdf:li>
- </rdf:Seq>
- </pdfaSchema:property>
- </rdf:li>
- <rdf:li rdf:parseType="Resource">
- <pdfaSchema:namespaceURI>http://ns.adobe.com/xap/1.0/mm/</pdfaSchema:namespaceURI>
- <pdfaSchema:prefix>xmpMM</pdfaSchema:prefix>
- <pdfaSchema:schema>XMP Media Management Schema</pdfaSchema:schema>
- <pdfaSchema:property>
- <rdf:Seq>
- <rdf:li rdf:parseType="Resource">
- <pdfaProperty:category>internal</pdfaProperty:category>
- <pdfaProperty:description>UUID based identifier for specific incarnation of a document</pdfaProperty:description>
- <pdfaProperty:name>InstanceID</pdfaProperty:name>
- <pdfaProperty:valueType>URI</pdfaProperty:valueType>
- </rdf:li>
- </rdf:Seq>
- </pdfaSchema:property>
- </rdf:li>
- <rdf:li rdf:parseType="Resource">
- <pdfaSchema:namespaceURI>http://www.npes.org/pdfx/ns/id/</pdfaSchema:namespaceURI>
- <pdfaSchema:prefix>pdfxid</pdfaSchema:prefix>
- <pdfaSchema:schema>PDF/X ID Schema</pdfaSchema:schema>
- <pdfaSchema:property>
- <rdf:Seq>
- <rdf:li rdf:parseType="Resource">
- <pdfaProperty:category>internal</pdfaProperty:category>
- <pdfaProperty:description>ID of PDF/X standard</pdfaProperty:description>
- <pdfaProperty:name>GTS_PDFXVersion</pdfaProperty:name>
- <pdfaProperty:valueType>Text</pdfaProperty:valueType>
- </rdf:li>
- </rdf:Seq>
- </pdfaSchema:property>
- </rdf:li>
- </rdf:Bag>
- </pdfaExtension:schemas>
- </rdf:Description>
</rdf:RDF>
</x:xmpmeta>
<?xpacket end="w"?>
endstream
endobj
7 0 obj
-<</Length 8268 >>
+<< /Length 8649 >>
stream
0 g 0 G
0 g 0 G
0 g 0 G
BT
-/F57 18.17191 Tf 1 0 0 1 178.388 541.455 Tm [<002F0030>-37<00370026002D>]TJ
-/F57 13.62884 Tf 1 0 0 1 105.124 508.167 Tm [<0022>-250<00250050>-7<00440056004E0046004F0055>-250<0024004D004200540054>-250<004700500053>-250<005500490046>-250<0033004600540055>-250<00500047>-250<00360054>]TJ
+/F95 18.17191 Tf
+1 0 0 1 178.388 541.455 Tm [<002F0030>-37<00370026002D>]TJ
+/F95 13.62884 Tf
+1 0 0 1 105.124 508.167 Tm [<0022>-250<00250050>-7<00440056004E0046004F0055>-250<0024004D004200540054>-250<004700500053>-250<005500490046>-250<0033004600540055>-250<00500047>-250<00360054>]TJ
+/F95 11.3574 Tf
+1 0 0 1 88.167 493.372 Tm [<0022004D00540050>-250<00440050004F0054004A004500460053>-250<005500490046>-250<0054004A004E0051004D00460053>]TJ
+/F97 11.3574 Tf
+1 0 0 1 209.317 493.372 Tm [<004F0050>7<0057>8<0046004D0046005500550046>]TJ
+/F95 11.3574 Tf
+1 0 0 1 252.452 493.372 Tm [<00450050>-7<00440056004E0046004F0055>-250<0044004D004200540054000F>]TJ
ET
1 0 0 1 161.57 481.537 cm
q
4 0 0 4 0 0 cm
1 0 0 1 -161.57 -481.537 cm
BT
-/F59 11.3574 Tf 1 0 0 1 161.57 481.537 Tm [<0176>]TJ
+/F98 11.3574 Tf
+1 0 0 1 161.57 481.537 Tm [<0176>]TJ
ET
1 0 0 1 161.57 481.537 cm
Q
1 0 0 1 -161.57 -481.537 cm
BT
-/F60 11.3574 Tf 1 0 0 1 53.432 446.286 Tm [<0038004900460053>5<0046>-250<004A0054>-249<005500490046>-250<00450050>-7<00440056004E0046004F005500420055004A0050004F00200020>]TJ
-/F57 11.3574 Tf 1.017 0 0 1 203.432 446.286 Tm [<002A0055>-245<004A0054>-246<004A004F>-246<0029>-36<0035002E002D>-246<004700500053004E00420055000D>-246<0042004F0045>-246<00440042004F004F00500055>]TJ
-1 0 0 1 54 431.492 Tm [<0043>-10<0046>-249<0053>7<004600550053004A0046>7<0057>8<0046>-6<0045>-249<0057004A0042>]TJ
-/F61 11.3574 Tf 1 0 0 1 128.745 431.492 Tm [<00550046>7<005900450050>-7<0044>]TJ
-/F57 11.3574 Tf 1 0 0 1 157.229 431.492 Tm [<000F>-333<002A0047>-249<005A>7<00500056>-248<004900420057>7<0046>-248<00550049004A0054>-249<005100420044004C004200480046>-249<004A004F005400550042004D004D0046>-7<0045000D>-249<004D0050>-7<0050004C>-249<004700500053>]TJ
-0.996 0 0 1 53.659 416.697 Tm [<000900550046>7<00590053>8<0050>-7<00500055000A001000450050>-7<00440010004D00560042004D004200550046>7<00590010004F0050>7<0057>8<0046004D0010004F0050>7<0057>8<0046004D000E00450050>-6<00440056004E0046004F005500420055004A0050004F000F00490055004E004D000F>-341<002A0047>-253<005A>7<00500056>-252<00420053>7<0046>]TJ
-0.98 0 0 1 54 401.903 Tm [<0050004F004D004A004F0046>10<000D>-248<00480050>-247<00550050>-247<005500490046>-247<00240035>49<0022002F>-247<0051004200480046>-247<00420055>-247<00490A1D00510054001B00100010004400550042004F000F00500053004800100051004C00480010004F0050>6<0057>9<0046004D>-247<0042004F0045>-247<0044004D004A0044004C>]TJ
-1 0 0 1 53.148 387.108 Tm [<06E0003100420044004C004200480046>-250<00250050>-7<00440056004E0046004F005500420055004A0050004F>-250<00090029>-37<0035002E002D000A000F>122<06E1>]TJ
-/F60 11.3574 Tf 1 0 0 1 54 357.519 Tm [<0025>-5<0046005400440053004A00510055004A0050004F001B>]TJ
-/F57 11.3574 Tf 1.02 0 0 1 117.818 357.519 Tm [<09AB0046>]TJ
-/F61 11.3574 Tf 1.02 0 0 1 138.758 357.519 Tm [<004F0050>6<0057>8<0046004D>]TJ
-/F57 11.3574 Tf 1.02 0 0 1 167.321 357.519 Tm [<00450050>-6<00440056004E0046004F0055>-313<0044004D004200540054>-313<004A0054>-312<004700500053>-313<00580053004A0055004600530054>-312<00500047>-313<00500053004A0048004A004F0042004D>]TJ
-0.98 0 0 1 54 342.725 Tm [<098B00440055004A0050004F000D>-245<00550050>-244<0043>-10<0046>-243<00510053004A004F00550046>-7<0045>-244<00550050>-243<005100420051>-7<00460053>59<000D>-245<0058004A00550049>-243<00420A1D0046004F0055004A0050004F>-243<00550050>-244<005500490046>-243<0053>7<0046>-6<00520056004A0053>7<0046004E0046004F00550054>-242<00500047>]TJ
-0.995 0 0 1 54 327.93 Tm [<005500490046>-249<00510053004A004F0055000E0050004F000E00450046004E0042004F0045>-250<004E00420053004C00460055000F>-335<002F0050004F000E00440050004D00500053>-249<004A004F005500460053004A005000530054>-250<0042004F0045>-250<00440050004D00500053>-250<00440050>6<0057>8<004600530054>]TJ
-1.02 0 0 1 54 313.136 Tm [<00420053>7<0046>-293<0054005600510051>-7<0050005300550046>-7<0045000F>-474<002A004E0042004800460054>-295<00420053>7<0046>-293<0054005600510051>-7<0050005300550046>-7<0045000D>-306<004300560055>-295<0050004F004D005A>-294<00420054>-294<005500490046>6<005A>-294<004E004A004800490055>-294<0043>-10<0046>]TJ
-1 0 0 1 54 298.341 Tm [<005600540046>-7<0045>-250<004A004F>-250<098B00440055004A0050004F000D>-250<004F00500055>-250<0051004A0044005500560053>8<0046>-250<0043>-10<0050>-7<0050004C0054000F>]TJ
-0.98 0 0 1 71.036 283.547 Tm [<002A0047>-226<005A>8<005000560053>-226<0058>8<00500053004C>-226<004A0054>-226<0042004F>-226<0026000E0043>-10<0050>-7<0050004C000D>-232<00500053>-226<0056005400460054>-226<004A004F005500460053004A00500053>-226<00440050004D00500053>-226<00500055004900460053>-227<005500490042004F>-226<004800530042005A>60<000D>]TJ
+/F99 11.3574 Tf
+1 0 0 1 53.421 446.286 Tm [<0038004900460053>8<0046>-201<004A0054>-201<005500490046>-202<00450050>-7<00440056004E0046004F005500420055004A0050004F00200020>]TJ
+/F95 11.3574 Tf
+0.98 0 0 1 211.688 446.286 Tm [<002A0055>-205<004A0054>-205<004A004F>-206<0029>-38<0035002E002D>-206<004700500053004E00420055000D>-215<0042004F0045>-206<00440042004F004F00500055>]TJ
+1 0 0 1 54 431.492 Tm [<0043>-10<0046>-249<0053>7<004600550053004A0046>8<0057>8<0046>-7<0045>-249<0057004A0042>]TJ
+/F97 11.3574 Tf
+1 0 0 1 128.744 431.492 Tm [<00550046>7<005900450050>-7<0044>]TJ
+/F95 11.3574 Tf
+1 0 0 1 157.229 431.492 Tm [<000F>-333<002A0047>-249<005A>8<00500056>-249<004900420057>8<0046>-248<00550049004A0054>-250<005100420044004C004200480046>-249<004A004F005400550042004D004D0046>-7<0045000D>-249<004D0050>-7<0050004C>-249<004700500053>]TJ
+0.996 0 0 1 53.659 416.697 Tm [<000900550046>7<00590053>8<0050>-6<00500055000A001000450050>-8<00440010004D00560042004D004200550046>7<00590010004F0050>7<0057>8<0046004D0010004F0050>7<0057>8<0046004D000E00450050>-6<00440056004E0046004F005500420055004A0050004F000F00490055004E004D000F>-341<002A0047>-253<005A>7<00500056>-252<00420053>7<0046>]TJ
+0.98 0 0 1 54 401.903 Tm [<0050004F004D004A004F0046>10<000D>-246<00480050>-246<00550050>-245<005500490046>-245<00240035>50<0022002F>-244<0051004200480046>-246<00420055>-245<00490055005500510054001B00100010004400550042004F000F00500053004800100051004C00480010004F0050>7<0057>8<0046004D>-244<0042004F0045>-246<0044004D004A0044004C>]TJ
+1 0 0 1 53.148 387.108 Tm [<06E2003100420044004C004200480046>-250<00250050>-7<00440056004E0046004F005500420055004A0050004F>-250<00090029>-37<0035002E002D000A000F>122<06E3>]TJ
+/F99 11.3574 Tf
+1 0 0 1 54 357.519 Tm [<00250046005400440053004A00510055004A0050004F001B>]TJ
+/F95 11.3574 Tf
+1.02 0 0 1 121.178 357.519 Tm [<003500490046>]TJ
+/F97 11.3574 Tf
+1.02 0 0 1 142.58 357.519 Tm [<004F0050>7<0057>8<0046004D>]TJ
+/F95 11.3574 Tf
+1.02 0 0 1 170.594 357.519 Tm [<00450050>-7<00440056004E0046004F0055>-265<0044004D004200540054>-266<004A0054>-265<004700500053>-265<00580053004A0055004600530054>-266<00500047>-265<00500053004A0048004A004F0042004D>]TJ
+0.98 0 0 1 54 342.725 Tm [<093900440055004A0050004F000D>-244<00550050>-242<0043>-10<0046>-242<00510053004A004F00550046>-7<0045>-242<00550050>-242<005100420051>-7<00460053>61<000D>-244<0058004A00550049>-242<0042005500550046004F0055004A0050004F>-241<00550050>-242<005500490046>-242<0053>7<0046>-6<00520056004A0053>8<0046004E0046004F00550054>-241<00500047>]TJ
+0.995 0 0 1 54 327.93 Tm [<005500490046>-249<00510053004A004F0055000E0050004F000E00450046004E0042004F0045>-250<004E00420053004C00460055000F>-335<002F0050004F000E00440050004D00500053>-250<004A004F005500460053004A005000530054>-249<0042004F0045>-250<00440050004D00500053>-250<00440050>6<0057>8<004600530054>]TJ
+1.02 0 0 1 54 313.136 Tm [<00420053>8<0046>-294<0054005600510051>-7<0050005300550046>-7<0045000F>-474<002A004E0042004800460054>-295<00420053>8<0046>-294<0054005600510051>-7<0050005300550046>-7<0045000D>-307<004300560055>-294<0050004F004D005A>-294<00420054>-294<005500490046>6<005A>-294<004E004A004800490055>-294<0043>-10<0046>]TJ
+1 0 0 1 54 298.341 Tm [<005600540046>-7<0045>-250<004A004F>-250<093900440055004A0050004F000D>-250<004F00500055>-250<0051004A0044005500560053>8<0046>-250<0043>-10<0050>-7<0050004C0054000F>]TJ
+0.98 0 0 1 71.036 283.547 Tm [<002A0047>-226<005A>8<005000560053>-226<0058>8<00500053004C>-226<004A0054>-226<0042004F>-226<0026000E0043>-10<0050>-8<0050004C000D>-232<00500053>-226<0056005400460054>-226<004A004F005500460053004A00500053>-226<00440050004D00500053>-226<00500055004900460053>-227<005500490042004F>-226<004800530042005A>61<000D>]TJ
1 0 0 1 54 268.752 Tm [<00500053>-250<004A0054>-250<00420044004200450046004E004A0044000D>-250<005500490046004F>-250<00550049004A0054>-250<00450050>-7<00440056004E0046004F0055>-250<0044004D004200540054>-250<004A0054>-250<004F00500055>-250<004700500053>-250<005A>8<00500056000F>]TJ
-1 0 0 1 71.036 253.958 Tm [<002300560055>-250<004A0047>-250<005A>7<00500056>-250<00420053>7<0046>-249<00580053004A0055004A004F0048>-250<0042>-251<0045004600550046>-7<00440055004A0057>7<0046>-249<004F0050>6<0057>8<0046004D000D>-250<00500053>-250<00540044004A0046004F00440046>-250<098B00440055004A0050004F000D>-251<00500053>-250<0042>]TJ
+1 0 0 1 71.036 253.958 Tm [<002300560055>-250<004A0047>-250<005A>7<00500056>-250<00420053>8<0046>-250<00580053004A0055004A004F0048>-250<0042>-251<0045004600550046>-7<00440055004A0057>7<0046>-249<004F0050>6<0057>8<0046004D000D>-249<00500053>-251<00540044004A0046004F00440046>-250<093900440055004A0050004F000D>-251<00500053>-250<0042>]TJ
1 0 0 1 54 239.163 Tm [<00440050004D004D0046>-7<00440055004A0050004F>-250<00500047>-250<00540049005000530055>-250<0054005500500053004A00460054000D>-250<005500490046004F>-250<0053>8<004600420045>-250<0050004F0002>]TJ
-/F57 13.62884 Tf 1 0 0 1 54 213.663 Tm [<0012000F>-333<002700460042005500560053>7<00460054>]TJ
-/F57 11.3574 Tf 1.02 0 0 1 54 194.779 Tm [<09AB0053>7<0050005600480049005000560055000D>-334<004A0055>-318<004A0054>-317<0042005400540056004E0046>-7<0045>-318<0055004900420055>-317<005500490046>-318<0051005600530051>-6<005000540046>-318<00500047>-317<005A>7<005000560053>-317<00580053004A0055004A004F0048>-318<004A0054>-317<0042>]TJ
-1 0 0 1 54 179.985 Tm [<00440050004E004E00460053>8<0044004A0042004D004D005A>-250<00510053004A004F00550046>-7<0045>-250<0043>-10<0050>-7<0050004C>-250<00500047>-250<098B00440055004A0050004F000F>]TJ
-0.98 0 0 1 71.036 165.19 Tm [<0022>-244<004F0046>6<0058>]TJ
-/F61 11.3574 Tf 0.98 0 0 1 103.452 165.19 Tm [<004F0050>7<0057>8<0046004D>]TJ
-/F57 11.3574 Tf 0.98 0 0 1 130.156 165.19 Tm [<004A0054>-244<00510053>7<0046000E00440050004F098B004800560053>9<0046>-7<0045>-244<00550050>-244<00510053>7<0050>-6<0045005600440046>-244<0042>-245<005400550042004F004500420053>8<0045>-244<00550053004200450046>-244<0043>-10<0050>-7<0050004C>]TJ
-1.003 0 0 1 54 150.396 Tm [<0054004A005B0046>-249<00500047>-249<0A25000F0A25004A004F>-249<0038>-249<0059>-249<0A28000F0A25004A004F>-249<0029000D>-250<0058004A00550049>-249<004D0042005A>7<005000560055>-248<004E004200530048004A004F0054>-249<0055004900420055>-249<00420053>7<0046>-248<004D004A004C0046004D005A>-250<00550050>-249<0043>-10<0046>]TJ
-0.998 0 0 1 54 135.601 Tm [<00420044004400460051005500420043004D0046>-249<00550050>-249<005500490046>-250<004E005000540055>-249<0058004A00450046004D005A000E005600540046>-7<0045>-249<00510053004A004F0055>-250<005400460053>-15<0057004A004400460054000F>-333<09AB0046>-250<098B004D0046>-249<005A>7<00500056>-248<00420053>7<0046>]TJ
-0.98 0 0 1 54 120.807 Tm [<004F0050>7<0058>-203<0053>8<004600420045004A004F0048>-202<004A0054>-204<004A004F>-203<00550049004A0054>-203<004700500053004E00420055000F>-323<002300560055>-203<004A0047>-203<0055004900420055>-203<004A0054>-203<004F00500055>-203<005500490046>-203<0054004A005B0046>-203<00500053>-203<004D0042005A>7<005000560055>-202<005A>7<00500056>]TJ
-0.986 0 0 1 53.58 106.012 Tm [<00580042004F0055000D>-252<005500490046004F>-253<0055004900460053>8<0046>-252<00420053>7<0046>-251<00440050004E004E0042004F00450054>-252<0055004900420055>-253<00440050004F098B004800560053>7<0046>-251<004B005600540055>-252<00420043>-11<005000560055>-252<0042004F005A00550049004A004F0048000D>]TJ
+/F95 13.62884 Tf
+1 0 0 1 54 213.663 Tm [<0012000F>-333<002700460042005500560053>7<00460054>]TJ
+/F95 11.3574 Tf
+1.02 0 0 1 53.659 194.779 Tm [<003500490053>8<0050005600480049005000560055000D>-329<004A0055>-312<004A0054>-313<0042005400540056004E0046>-7<0045>-312<0055004900420055>-312<005500490046>-313<0051005600530051>-7<005000540046>-312<00500047>-312<005A>7<005000560053>-312<00580053004A0055004A004F0048>-312<004A0054>-312<0042>]TJ
+1 0 0 1 54 179.985 Tm [<00440050004E004E00460053>8<0044004A0042004D004D005A>-250<00510053004A004F00550046>-7<0045>-250<0043>-10<0050>-7<0050004C>-250<00500047>-250<093900440055004A0050004F000F>]TJ
+0.98 0 0 1 71.036 165.19 Tm [<0022>-244<004F0046>7<0058>]TJ
+/F97 11.3574 Tf
+0.98 0 0 1 103.451 165.19 Tm [<004F0050>7<0057>8<0046004D>]TJ
+/F95 11.3574 Tf
+0.98 0 0 1 130.153 165.19 Tm [<004A0054>-244<00510053>8<0046000E00440050004F0939004800560053>8<0046>-7<0045>-244<00550050>-244<00510053>7<0050>-6<0045005600440046>-244<0042>-245<005400550042004F004500420053>8<0045>-244<00550053004200450046>-244<0043>-10<0050>-8<0050004C>]TJ
+1.003 0 0 1 54 150.396 Tm [<0054004A005B0046>-249<00500047>-249<09CD000F09CD004A004F>-249<0038>-249<0059>-249<09D0000F09CD004A004F>-249<0029000D>-250<0058004A00550049>-249<004D0042005A>7<005000560055>-248<004E004200530048004A004F0054>-249<0055004900420055>-249<00420053>7<0046>-248<004D004A004C0046004D005A>-249<00550050>-250<0043>-10<0046>]TJ
+0.994 0 0 1 54 135.601 Tm [<00420044004400460051005500420043004D0046>-251<00550050>-252<005500490046>-251<004E005000540055>-252<0058004A00450046004D005A000E005600540046>-7<0045>-252<00510053004A004F0055>-251<005400460053>-15<0057004A004400460054000F>-336<003500490046>-251<0939004D0046>-252<005A>7<00500056>-250<00420053>7<0046>]TJ
+0.98 0 0 1 54 120.807 Tm [<004F0050>7<0058>-202<0053>7<004600420045004A004F0048>-202<004A0054>-203<004A004F>-203<00550049004A0054>-204<004700500053004E00420055000F>-322<002300560055>-204<004A0047>-203<0055004900420055>-203<004A0054>-203<004F00500055>-203<005500490046>-203<0054004A005B0046>-203<00500053>-204<004D0042005A>8<005000560055>-203<005A>8<00500056>]TJ
+0.986 0 0 1 53.58 106.012 Tm [<00580042004F0055000D>-252<005500490046004F>-253<0055004900460053>8<0046>-252<00420053>8<0046>-252<00440050004E004E0042004F00450054>-252<0055004900420055>-253<00440050004F0939004800560053>8<0046>-252<004B005600540055>-252<00420043>-11<005000560055>-252<0042004F005A00550049004A004F0048000D>]TJ
1.02 0 0 1 54 91.218 Tm [<00560054004A004F0048>-243<005400550042004F004500420053>7<0045>-243<005500460053004E004A004F0050004D00500048005A>-244<0042004F0045>-243<0056004F004500460053005400550042004F004500420043004D0046>-244<0051005600530051>-7<005000540046>9<000F>-325<0023004600540055>-244<00500047>]TJ
-0.984 0 0 1 54 76.423 Tm [<0042004D004D000D>-253<005500490046>-253<0029>-38<0035002E002D>-253<00450050>-7<00440056004E0046004F005500420055004A0050004F>-254<00440050004E00460054>-253<0058004A00550049>-253<004A004E0042004800460054>-254<0042004F0045>-253<0046>6<00590042004E0051004D00460054000D>-252<00540050>]TJ
+0.984 0 0 1 54 76.423 Tm [<0042004D004D000D>-253<005500490046>-253<0029>-39<0035002E002D>-253<00450050>-7<00440056004E0046004F005500420055004A0050004F>-253<00440050004E00460054>-254<0058004A00550049>-253<004A004E0042004800460054>-253<0042004F0045>-253<0046>6<00590042004E0051004D00460054000D>-252<00540050>]TJ
1 0 0 1 54 61.629 Tm [<005A>8<00500056>-250<004C004F0050>7<0058>-250<0058004900420055>-250<005A>8<00500056>-250<00420053>8<0046>-250<00450050004A004F0048000F>]TJ
0 g 0 G
-/F57 10.44878 Tf 1 0 0 1 204.571 39.437 Tm [<0012>]TJ
+/F95 10.44878 Tf
+1 0 0 1 204.571 39.437 Tm [<0012>]TJ
0 g 0 G
ET
endstream
endobj
6 0 obj
-<</Type/Page/Contents 7 0 R/Resources 5 0 R/MediaBox[0 0 396 612]/CropBox[0 0 396 612]
+<< /Type /Page /Contents 7 0 R /Resources 5 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612]
-/TrimBox[0 0 396 612]/Parent 12 0 R>>
+/TrimBox[0 0 396 612] /Parent 12 0 R >>
endobj
5 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font<</F57 8 0 R/F59 9 0 R/F60 10 0 R/F61 11 0 R>>/ProcSet[/PDF/Text]>>
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F95 8 0 R /F97 9 0 R /F98 10 0 R /F99 11 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
15 0 obj
-<</Length 8727 >>
+<< /Length 9039 >>
stream
0 g 0 G
0 g 0 G
BT
-/F57 11.3574 Tf 1.02 0 0 1 53.036 564.643 Tm [<0022004D004E005000540055>-285<0046>6<0057>8<00460053>-14<005A00550049004A004F0048>-286<004A0054>-286<00510053>7<0046000E00440050004F098B004800560053>8<0046>-6<0045>-286<00550050>-285<06E0004B005600540055>-286<0058>7<00500053004C000D>120<06E1>-295<0046>6<0057>7<0046004F>-284<005500490046>]TJ
-0.997 0 0 1 36 549.848 Tm [<004400490050004A00440046>-250<00500047>-251<00470050004F00550054000F>-335<09AB0046>-251<00440049005000540046004F>-250<00440050004E0051004A004D00460053>-251<004A0054>-251<002D00560042002D00420035>62<00460039000D>-250<0042004F0045>-251<00300051>-7<0046004F>-251<0035>49<005A0051>-6<0046>]TJ
+/F95 11.3574 Tf
+1.02 0 0 1 53.036 564.643 Tm [<0022004D004E005000540055>-286<0046>6<0057>8<00460053>-14<005A00550049004A004F0048>-286<004A0054>-286<00510053>7<0046000E00440050004F0939004800560053>8<0046>-6<0045>-286<00550050>-286<06E2004B005600540055>-286<0058>7<00500053004C000D>122<06E3>-295<0046>6<0057>8<0046004F>-285<005500490046>]TJ
+0.993 0 0 1 36 549.848 Tm [<004400490050004A00440046>-253<00500047>-253<00470050004F00550054000F>-339<003500490046>-253<00440049005000540046004F>-253<00440050004E0051004A004D00460053>-253<004A0054>-253<002D00560042002D00420035>64<00460039000D>-252<0042004F0045>-253<00300051>-7<0046004F>-253<0035>49<005A0051>-6<0046>]TJ
1.02 0 0 1 36 535.054 Tm [<00470050004F00550054>-254<00420053>7<0046>-253<004D0050004200450046>-7<0045>-254<00560054004A004F0048>]TJ
-/F61 11.3574 Tf 1.02 0 0 1 143.404 535.054 Tm [<00470050004F005500540051>-6<0046>-7<0044>]TJ
-/F57 11.3574 Tf 1.02 0 0 1 184.399 535.054 Tm [<00550046>-6<00440049004F0050004D00500048005A>57<000F>-353<002A0047>-254<005A>7<00500056>-254<00510053>7<0046004700460053>-253<00550050>-254<005600540046>-254<0042>]TJ
-1 0 0 1 36 520.259 Tm [<00510053>8<00500047004600540054004A0050004F0042004D>-250<00470050004F0055000D>-250<004A0055>-250<0058004A004D004D>-250<0043>-10<0046>-250<004600420054005A>-250<00550050>-250<004D005000420045>-250<0042004F0045>-250<005600540046>-250<004A004F>-250<005600550047000E0A28000F>]TJ
-1.02 0 0 1 53.036 505.465 Tm [<002E0042004F005A>-339<005400550042004F004500420053>7<0045>-338<002D00420035>60<00460039>-338<00440050004E004E0042004F00450054>-339<00420053>7<0046>-339<0045004A005400420043004D0046>-7<0045000F>-609<09AB004A0054>-339<0058004A004D004D>-340<0043>-9<0046>]TJ
-0.98 0 0 1 36 490.67 Tm [<00540056005300510053004A0054004A004F0048>-227<00420055>-228<098B005300540055000F>-331<002300560055>]TJ
-/F61 11.3574 Tf 0.98 0 0 1 138.827 490.67 Tm [<004F0050>7<0057>8<0046004D>]TJ
-/F57 11.3574 Tf 0.98 0 0 1 165.349 490.67 Tm [<004A0054>-227<00470050>-8<0044005600540046>-7<0045>-227<0050004F>-228<0050004F0046>-228<00550049004A004F0048>-228<0050004F004D005A>59<000F>-330<0022004F005A00550049004A004F0048>]TJ
-0.986 0 0 1 36 475.875 Tm [<0055004900420055>-254<004E004A004800490055>-254<004A004F005500460053004700460053>7<0046>-254<0058004A00550049>-254<0055004900420055>-254<0051005600530051>-7<005000540046>-255<004E0042005A>-254<004900420057>7<0046>-254<0043>-10<0046>-7<0046004F>-254<00550050005400540046>-7<0045>-255<00420054004A00450046>10<000F>]TJ
+/F97 11.3574 Tf
+1.02 0 0 1 143.408 535.054 Tm [<00470050004F005500540051>-7<0046>-7<0044>]TJ
+/F95 11.3574 Tf
+1.02 0 0 1 184.407 535.054 Tm [<00550046>-7<00440049004F0050004D00500048005A>59<000F>-353<002A0047>-255<005A>7<00500056>-253<00510053>7<0046004700460053>-253<00550050>-254<005600540046>-254<0042>]TJ
+1 0 0 1 36 520.259 Tm [<00510053>8<00500047004600540054004A0050004F0042004D>-250<00470050004F0055000D>-250<004A0055>-250<0058004A004D004D>-250<0043>-10<0046>-250<004600420054005A>-250<00550050>-250<004D005000420045>-250<0042004F0045>-250<005600540046>-250<004A004F>-250<005600550047000E09D0000F>]TJ
+1.02 0 0 1 53.036 505.465 Tm [<002E0042004F005A>-330<005400550042004F004500420053>7<0045>-330<002D00420035>62<00460039>-330<00440050004E004E0042004F00450054>-330<00420053>7<0046>-330<0045004A005400420043004D0046>-7<0045000F>-584<00350049004A0054>-331<0058004A004D004D>-330<0043>-10<0046>]TJ
+0.98 0 0 1 36 490.67 Tm [<00540056005300510053004A0054004A004F0048>-228<00420055>-227<0939005300540055000F>-332<002300560055>]TJ
+/F97 11.3574 Tf
+0.98 0 0 1 138.832 490.67 Tm [<004F0050>7<0057>8<0046004D>]TJ
+/F95 11.3574 Tf
+0.98 0 0 1 165.352 490.67 Tm [<004A0054>-228<00470050>-7<0044005600540046>-7<0045>-228<0050004F>-228<0050004F0046>-228<00550049004A004F0048>-228<0050004F004D005A>61<000F>-331<0022004F005A00550049004A004F0048>]TJ
+0.986 0 0 1 36 475.875 Tm [<0055004900420055>-254<004E004A004800490055>-254<004A004F005500460053004700460053>7<0046>-253<0058004A00550049>-255<0055004900420055>-254<0051005600530051>-7<005000540046>-255<004E0042005A>-254<004900420057>7<0046>-253<0043>-11<0046>-7<0046004F>-254<00550050005400540046>-7<0045>-255<00420054004A00450046>10<000F>]TJ
0.98 0 0 1 36 461.081 Tm [<00340050>10<000D>-231<0043>-10<0046>-226<005400560053>7<0046>-224<0055004900420055>-226<005A>7<00500056>-225<0053>8<004600420045>-225<005500490046>-226<00450050>-7<00440056004E0046004F005500420055004A0050004F0002>-331<002A0047>-225<005A>7<00500056>-225<00550042004C0046>-226<0042004F>-225<0046>6<0059004A00540055004A004F0048>]TJ
-0.98 0 0 1 36 446.286 Tm [<002D00420035>64<00460039>-173<00450050>-8<00440056004E0046004F0055>-174<0042004F0045>-174<004B005600540055>-174<004400490042004F00480046>-175<005500490046>-174<0044004D004200540054>-174<00550050>]TJ
-/F61 11.3574 Tf 0.98 0 0 1 237.08 446.286 Tm [<004F0050>7<0057>8<0046004D000D>]TJ
-/F57 11.3574 Tf 0.98 0 0 1 264.884 446.286 Tm [<004A0055>-174<004A0054>-174<0057>7<00460053>-14<005A>-175<0056004F004D004A004C0046004D005A>]TJ
+0.98 0 0 1 36 446.286 Tm [<002D00420035>65<00460039>-173<00450050>-8<00440056004E0046004F0055>-174<0042004F0045>-174<004B005600540055>-175<004400490042004F00480046>-174<005500490046>-175<0044004D004200540054>-174<00550050>]TJ
+/F97 11.3574 Tf
+0.98 0 0 1 237.077 446.286 Tm [<004F0050>7<0057>8<0046004D000D>]TJ
+/F95 11.3574 Tf
+0.98 0 0 1 264.879 446.286 Tm [<004A0055>-174<004A0054>-174<0057>7<00460053>-15<005A>-174<0056004F004D004A004C0046004D005A>]TJ
1 0 0 1 36 431.492 Tm [<00550050>-250<0058>8<00500053004C>-250<00420054>-250<0046>7<00590051>-7<0046>-7<004400550046>-7<0045000F>]TJ
-1.02 0 0 1 53.036 416.697 Tm [<002E0042004F005A>-273<004F0046>6<0058>-274<00440050004E004E0042004F00450054>-273<00420053>7<0046>-273<00510053>6<0050>7<0057004A00450046>-6<0045000F>-413<09AB0046>6<005A>-273<00420053>7<0046>-273<00470050>-7<0044005600540046>-7<0045>-274<0050004F>-273<005500490046>]TJ
-0.98 0 0 1 36 401.903 Tm [<004F0046>-7<0046>-7<00450054>-239<00500047>-240<00510053004A004F0055>-240<098B00440055004A0050004F>-239<00580053004A0055004600530054000D>-243<0051>-7<00460053004A0050>-7<0045000F>-335<0022004F0045000D>]TJ
-/F61 11.3574 Tf 0.98 0 0 1 231.129 401.903 Tm [<004F0050>7<0057>8<0046004D>]TJ
-/F57 11.3574 Tf 0.98 0 0 1 257.782 401.903 Tm [<004900420054>-239<00430056004A004D0055000E004A004F>-240<00310025002700100039>]TJ
-0.98 0 0 1 36 387.108 Tm [<00550046>-7<00440049004F0050004D00500048005A>-185<0055004900420055>-186<0046>6<005900440046>-6<0046>-7<00450054>-186<005500490046>-185<00440042005100420043004A004D004A0055004A00460054>-186<0044005600530053>7<0046004F0055004D005A>-184<004200570042004A004D00420043004D0046>-186<0057004A0042>-186<00500055004900460053>]TJ
+1.02 0 0 1 53.036 416.697 Tm [<002E0042004F005A>-266<004F0046>7<0058>-266<00440050004E004E0042004F00450054>-266<00420053>7<0046>-265<00510053>7<0050>7<0057004A00450046>-6<0045000F>-389<003500490046>6<005A>-265<00420053>7<0046>-266<00470050>-6<0044005600540046>-7<0045>-266<0050004F>-266<005500490046>]TJ
+0.98 0 0 1 36 401.903 Tm [<004F0046>-7<0046>-7<00450054>-240<00500047>-239<00510053004A004F0055>-240<093900440055004A0050004F>-239<00580053004A0055004600530054000D>-243<0051>-7<00460053004A0050>-8<0045000F>-335<0022004F0045000D>]TJ
+/F97 11.3574 Tf
+0.98 0 0 1 231.134 401.903 Tm [<004F0050>7<0057>8<0046004D>]TJ
+/F95 11.3574 Tf
+0.98 0 0 1 257.783 401.903 Tm [<004900420054>-239<00430056004A004D0055000E004A004F>-240<00310025002700100039>]TJ
+0.98 0 0 1 36 387.108 Tm [<00550046>-7<00440049004F0050004D00500048005A>-185<0055004900420055>-186<0046>6<005900440046>-6<0046>-7<00450054>-186<005500490046>-186<00440042005100420043004A004D004A0055004A00460054>-185<0044005600530053>7<0046004F0055004D005A>-184<004200570042004A004D00420043004D0046>-186<0057004A0042>-186<00500055004900460053>]TJ
1 0 0 1 36 372.314 Tm [<002D00420035>63<00460039>-250<005100420044004C0042004800460054000F>]TJ
-/F57 13.62884 Tf 1 0 0 1 36 346.813 Tm [<0013000F>-333<00240050004E0051004D004600550046>-250<00250050>-7<00440056004E0046004F005500420055004A0050004F>]TJ
-/F57 11.3574 Tf 1.012 0 0 1 35.455 327.93 Tm [<0038004900420055>-246<005A>7<00500056>-245<00420053>7<0046>-246<0053>7<004600420045004A004F0048>-245<004F0050>6<0058>58<000D>-246<004A0054>-246<0050004F004D005A>-246<0042004F>-247<004A004F00550053>7<0050>-6<0045005600440055004A0050004F000F>-329<09AB0046>-246<00440050004E0051004D004600550046>]TJ
-0.98 0 0 1 36 313.136 Tm [<00450050>-7<00440056004E0046004F005500420055004A0050004F>-223<004A0054>-224<004A004F>-223<0029>-38<0035002E002D>-224<004700500053004E00420055000D>-230<0045004A0053>8<0046>-7<00440055004D005A>-223<00580053004A0A1D0046004F>-224<004A004F>-223<0029>-38<0035002E002D>-224<005300420055004900460053>]TJ
-0.98 0 0 1 36 298.341 Tm [<005500490042004F>-183<0046>6<0059005500530042004400550046>-6<0045>-184<00470053>7<0050004E>-183<00440050>-7<00450046>10<000F>-316<09AB00460053>7<0046>-183<00420053>8<0046>-183<004F0056004E00460053>7<005000560054>-183<0046>7<00590042004E0051004D00460054>-183<0042004F0045>-184<004A004E0042004800460054000D>]TJ
+/F95 13.62884 Tf
+1 0 0 1 36 346.813 Tm [<0013000F>-333<00240050004E0051004D004600550046>-250<00250050>-7<00440056004E0046004F005500420055004A0050004F>]TJ
+/F95 11.3574 Tf
+1.008 0 0 1 35.455 327.93 Tm [<0038004900420055>-248<005A>7<00500056>-247<00420053>7<0046>-248<0053>8<004600420045004A004F0048>-248<004F0050>6<0058>60<000D>-248<004A0054>-248<0050004F004D005A>-249<0042004F>-248<004A004F00550053>7<0050>-6<0045005600440055004A0050004F000F>-332<003500490046>-248<00440050004E0051004D004600550046>]TJ
+0.98 0 0 1 36 313.136 Tm [<00450050>-7<00440056004E0046004F005500420055004A0050004F>-221<004A0054>-222<004A004F>-221<0029>-38<0035002E002D>-222<004700500053004E00420055000D>-228<0045004A0053>8<0046>-7<00440055004D005A>-221<00580053004A005500550046004F>-221<004A004F>-222<0029>-38<0035002E002D>-222<005300420055004900460053>]TJ
+0.98 0 0 1 36 298.341 Tm [<005500490042004F>-173<0046>6<0059005500530042004400550046>-6<0045>-173<00470053>7<0050004E>-172<00440050>-8<00450046>10<000F>-312<0035004900460053>7<0046>-172<00420053>7<0046>-172<004F0056004E00460053>7<005000560054>-173<0046>7<00590042004E0051004D00460054>-173<0042004F0045>-173<004A004E0042004800460054000D>]TJ
1 0 0 1 36 283.547 Tm [<00550050>-7<0050>-250<0045004600550042004A004D0046>-7<0045>-250<00550050>-250<0043>-10<0046>-250<00510053>8<004600540046004F00550046>-7<0045>-250<00420054>-250<003100250027>24<000F>]TJ
-/F57 13.62884 Tf 1 0 0 1 36 258.046 Tm [<0014000F>-333<002D004A00440046004F00540046>]TJ
-/F57 11.3574 Tf 1.02 0 0 1 36 239.163 Tm [<09AB0046>-331<002D00420035>61<00460039>-330<00440050>-7<00450046>9<000D>-352<0042004F0045>-331<0042004400440050004E00510042004F005A004A004F0048>-331<00450050>-7<00440056004E0046004F005500420055004A0050004F000D>-353<004A0054>-331<0053>7<0046004D0046004200540046>-6<0045>]TJ
-1 0 0 1 36 224.369 Tm [<0056004F004500460053>-250<005500490046>-250<002D0042005500460039>-250<00310053>8<0050004B0046>-7<00440055>-250<003100560043004D004A0044>-250<002D004A00440046004F00540046>10<000D>-250<0057>8<004600530054004A0050004F>-250<0A21000F0A230044>-250<00500053>-250<004D0042005500460053>59<000F>]TJ
-0.983 0 0 1 53.036 209.574 Tm [<09AB0046>-255<00440050004E00510042004F004A0050004F>-255<00470050004F00550009>11<0054000A>-254<004A00540009>11<00420053>8<0046000A>-254<004D004A00440046004F00540046>-7<0045>-255<0056004F004500460053>-256<005500490046>-255<0034002A002D>-255<00300051>-7<0046004F>-255<00270050004F0055>]TJ
-1 0 0 1 36 194.779 Tm [<002D004A00440046004F00540046>10<000D>-250<0057>8<004600530054004A0050004F>-250<0A21000F0A21000F>]TJ
-/F57 13.62884 Tf 1 0 0 1 36 169.279 Tm [<0015000F>-333<0037>79<004600530054004A0050004F>]TJ
-/F57 11.3574 Tf 0.994 0 0 1 36 150.396 Tm [<0A21000F0A250A22000D>-250<0A220A200A210A28000E0A200A24000E0A220A26001B>-335<0026004F00490042004F00440046>-7<0045>-250<0045004600550046>-7<00440055004A0050004F>-250<0042004F0045>-251<005800420053004F004A004F0048>-250<00560054004A004F0048>-250<002D00560042>-250<00440050>-7<00450046>9<000F>]TJ
-1 0 0 1 36 135.601 Tm [<0A21000F0A250A20000F0A25000D>-250<0A220A200A210A28000E0A200A24000E0A210A21001B>-333<002E004A004F00500053>-250<004300560048>-250<098B005900460054>-250<0009>16<00450050>-6<00440054>-250<0042004F0045>-250<00440050>-7<00450046>-250<0045004A0054004200480053>7<0046>-6<0046>-7<0045000A000F>]TJ
-1 0 0 1 36 120.807 Tm [<0A21000F0A250A20000D>-250<0A220A200A210A28000E0A200A23000E0A220A28001B>-333<002A004E00510053>7<0050>7<0057>8<0046>-6<0045>-250<004A004E004200480046>-250<00490042004F0045004D004A004F0048>-250<00440050004E004E0042004F00450054000D>-250<00540042004F00450043>-10<0050>6<0059000F>]TJ
-1 0 0 1 36 106.012 Tm [<0A21000F0A240A26000F0A22000D>-250<0A220A200A210A28000E0A200A21000E0A210A24001B>-333<0034005500420043004D0046>-250<06E1>23<0050004D004506E1>-249<0057>7<004600530054004A0050004F000F>-332<003600540046>-250<004F0046>6<0058>8<00460053>-249<0A21000F0A250A20000F>]TJ
-1 0 0 1 36 91.218 Tm [<0A21000F0A21000D>-250<0A220A200A210A27000E0A200A23000E0A200A21001B>-333<004A004F004A0055004A0042004D>-250<005100560043004D004A0044>-250<0053>7<0046004D0046004200540046>10<000F>]TJ
-0 g 0 G
-/F57 10.44878 Tf 1 0 0 1 186.571 39.437 Tm [<0013>]TJ
+/F95 13.62884 Tf
+1 0 0 1 36 258.046 Tm [<0014000F>-333<002D004A00440046004F00540046>]TJ
+/F95 11.3574 Tf
+1.02 0 0 1 35.659 239.163 Tm [<003500490046>-323<002D00420035>62<00460039>-323<00440050>-7<00450046>9<000D>-342<0042004F0045>-324<0042004400440050004E00510042004F005A004A004F0048>-323<00450050>-7<00440056004E0046004F005500420055004A0050004F000D>-344<004A0054>-323<0053>7<0046004D0046004200540046>-6<0045>]TJ
+1 0 0 1 36 224.369 Tm [<0056004F004500460053>-250<005500490046>-250<002D0042005500460039>-250<00310053>8<0050004B0046>-7<00440055>-250<003100560043004D004A0044>-250<002D004A00440046004F00540046>10<000D>-250<0057>8<004600530054004A0050004F>-250<09C9000F09CB0044>-250<00500053>-250<004D0042005500460053>59<000F>]TJ
+0.98 0 0 1 53.036 209.574 Tm [<003500490046>-254<00440050004E00510042004F004A0050004F>-254<00470050004F00550009>11<0054000A>-253<004A00540009>11<00420053>9<0046000A>-254<004D004A00440046004F00540046>-7<0045>-255<0056004F004500460053>-254<005500490046>-254<0034002A002D>-255<00300051>-7<0046004F>-255<00270050004F0055>]TJ
+1 0 0 1 36 194.779 Tm [<002D004A00440046004F00540046>10<000D>-250<0057>8<004600530054004A0050004F>-250<09C9000F09C9000F>]TJ
+/F95 13.62884 Tf
+1 0 0 1 36 169.279 Tm [<0015000F>-333<0037>79<004600530054004A0050004F>]TJ
+/F95 11.3574 Tf
+1 0 0 1 36 150.396 Tm [<09C9000F09D009C8000D>-250<09CA09C809CA09CB000E09C809CA000E09C809D0001B>-333<0024004D004200540054>-250<005000510055004A0050004F>-250<06E20053>7<0046>7<005706E3>-249<004700500053>-250<004F0046>6<0058>-249<00450050>-7<00440056004E0046004F00550054000F>]TJ
+0.994 0 0 1 36 135.601 Tm [<09C9000F09CD09CA000D>-250<09CA09C809C909D0000E09C809CC000E09CA09CE001B>-335<0026004F00490042004F00440046>-7<0045>-250<0045004600550046>-7<00440055004A0050004F>-250<0042004F0045>-251<005800420053004F004A004F0048>-250<00560054004A004F0048>-250<002D00560042>-250<00440050>-7<00450046>9<000F>]TJ
+1 0 0 1 36 120.807 Tm [<09C9000F09CD09C8000F09CD000D>-250<09CA09C809C909D0000E09C809CC000E09C909C9001B>-333<002E004A004F00500053>-250<004300560048>-250<0939005900460054>-250<0009>16<00450050>-6<00440054>-250<0042004F0045>-250<00440050>-7<00450046>-250<0045004A0054004200480053>7<0046>-6<0046>-7<0045000A000F>]TJ
+1 0 0 1 36 106.012 Tm [<09C9000F09CD09C8000D>-250<09CA09C809C909D0000E09C809CB000E09CA09D0001B>-333<002A004E00510053>7<0050>7<0057>8<0046>-6<0045>-250<004A004E004200480046>-250<00490042004F0045004D004A004F0048>-250<00440050004E004E0042004F00450054000D>-250<00540042004F00450043>-10<0050>6<0059000F>]TJ
+1 0 0 1 36 91.218 Tm [<09C9000F09CC09CE000F09CA000D>-250<09CA09C809C909D0000E09C809C9000E09C909CC001B>-333<0034005500420043004D0046>-250<06E3>23<0050004D004506E3>-249<0057>7<004600530054004A0050004F000F>-332<003600540046>-250<004F0046>6<0058>8<00460053>-249<09C9000F09CD09C8000F>]TJ
+1 0 0 1 36 76.423 Tm [<09C9000F09C9000D>-250<09CA09C809C909CF000E09C809CB000E09C809C9001B>-333<004A004F004A0055004A0042004D>-250<005100560043004D004A0044>-250<0053>7<0046004D0046004200540046>10<000F>]TJ
+0 g 0 G
+/F95 10.44878 Tf
+1 0 0 1 186.571 39.437 Tm [<0013>]TJ
0 g 0 G
ET
endstream
endobj
14 0 obj
-<</Type/Page/Contents 15 0 R/Resources 13 0 R/MediaBox[0 0 396 612]/CropBox[0 0 396 612]
+<< /Type /Page /Contents 15 0 R /Resources 13 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612]
-/TrimBox[0 0 396 612]/Parent 12 0 R>>
+/TrimBox[0 0 396 612] /Parent 12 0 R >>
endobj
13 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font<</F57 8 0 R/F61 11 0 R>>/ProcSet[/PDF/Text]>>
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F95 8 0 R /F97 9 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
18 0 obj
-<</Length 8573 >>
+<< /Length 8644 >>
stream
0 g 0 G
0 g 0 G
BT
-/F57 13.62884 Tf 1 0 0 1 54 553.937 Tm [<0016000F>-333<0027>58<0022>34<00320054>]TJ
+/F95 13.62884 Tf
+1 0 0 1 54 553.937 Tm [<0016000F>-333<0027>58<0022>34<00320054>]TJ
0 g 0 G
0 g 0 G
-/F57 11.3574 Tf 1 0 0 1 54 535.054 Tm [<0032>29<000F>-607<00240042004F>-250<00550049004A0054>-250<00450050>-7<00440056004E0046004F0055>-250<0044004D004200540054>-250<0043>-10<0046>-250<005600540046>-7<0045>-250<004700500053>-250<0026000E0043>-10<0050>-7<0050004C00540020>]TJ
+/F95 11.3574 Tf
+1 0 0 1 54 535.054 Tm [<0032>29<000F>-607<00240042004F>-250<00550049004A0054>-250<00450050>-7<00440056004E0046004F0055>-250<0044004D004200540054>-250<0043>-10<0046>-250<005600540046>-7<0045>-250<004700500053>-250<0026000E0043>-10<0050>-7<0050004C00540020>]TJ
0 g 0 G
0 g 0 G
1 0 0 1 54 520.259 Tm [<0022000F>]TJ
-0.997 0 0 1 71.036 520.259 Tm [<002F0050>10<000F>-334<0022004F0045000D>-250<0055004900420055>-250<004700460042005500560053>7<0046>-249<0058004A004D004D>-250<004F0046>6<0057>8<00460053>-249<0043>-10<0046>-250<0042004500450046>-7<0045000D>-251<00420054>-250<005500490046>-250<00550046>-7<00440049004F0050004D00500048005A>-250<004A0054>]TJ
+0.997 0 0 1 71.036 520.259 Tm [<002F0050>10<000F>-333<0022004F0045000D>-251<0055004900420055>-250<004700460042005500560053>7<0046>-249<0058004A004D004D>-250<004F0046>6<0057>9<00460053>-250<0043>-10<0046>-250<0042004500450046>-7<0045000D>-250<00420054>-251<005500490046>-250<00550046>-7<00440049004F0050004D00500048005A>-250<004A0054>]TJ
1 0 0 1 71.036 505.465 Tm [<004A004F004900460053>8<0046004F0055004D005A>-250<004A004F00440050004E005100420055004A0043004D0046>10<000F>-333<0022>-250<0058>7<00500053>8<0045>-249<00510053>7<0050>-6<004400460054005400500053>-250<004A0054>-250<005A>7<005000560053>-249<00470053004A0046004F0045000F>]TJ
0 g 0 G
0 g 0 G
-1 0 0 1 54 490.67 Tm [<0032>29<000F>-607<0038004900420055>-250<0049004200510051>-7<0046004F0046>-7<0045>-250<00550050>-250<098C0050004200550054>-250<0042004F0045>-250<004D004A0054005500540020>]TJ
+1 0 0 1 54 490.67 Tm [<0032>29<000F>-607<0038004900420055>-250<0049004200510051>-7<0046004F0046>-7<0045>-250<00550050>-250<093A0050004200550054>-250<0042004F0045>-250<004D004A0054005500540020>]TJ
0 g 0 G
0 g 0 G
1 0 0 1 54 475.875 Tm [<0022000F>-585<003600540046>-250<005500490046>-250<004F0046>7<0058>-250<004A004E004200480046>-250<00440050004E004E0042004F00450054000D>-250<00500053>-250<00540042004F00450043>-10<0050>7<0059>-250<004E0050>-7<00450046>10<000F>]TJ
0 g 0 G
0 g 0 G
-1 0 0 1 54 461.081 Tm [<0032>29<000F>-607<002E005A>-250<0055004900460054004A0054>-250<004200450057004A005400500053>-250<00550050004D0045>-250<004E004606D8>]TJ
+1 0 0 1 54 461.081 Tm [<0032>29<000F>-607<002E005A>-250<0055004900460054004A0054>-250<004200450057004A005400500053>-250<00550050004D0045>-250<004E004606DA>]TJ
0 g 0 G
0 g 0 G
1 0 0 1 54 446.286 Tm [<0022000F>]TJ
-1.02 0 0 1 71.036 446.286 Tm [<0034005500500051>-323<0053004A004800490055>-323<0055004900460053>6<0046>10<000F>-561<09AB004A0054>-323<00450050>-7<00440056004E0046004F0055>-323<0044004D004200540054>-324<004A0054>-323<0057>7<00460053>-14<005A>-324<0045004A098A00460053>7<0046004F0055>-322<00470053>7<0050004E>]TJ
+1.02 0 0 1 71.036 446.286 Tm [<0034005500500051>-315<0053004A004800490055>-316<0055004900460053>7<0046>10<000F>-537<00350049004A0054>-315<00450050>-7<00440056004E0046004F0055>-316<0044004D004200540054>-316<004A0054>-315<0057>7<00460053>-14<005A>-316<0045004A093800460053>7<0046004F0055>-314<00470053>7<0050004E>]TJ
1 0 0 1 71.036 431.492 Tm [<0042004F005A00550049004A004F0048>-250<005600540046>-7<0045>-250<004700500053>-250<005500490046005400460054>-250<0042004F0045>-250<00500055004900460053>-250<00420044004200450046004E004A0044>-250<005100560043004D004A004400420055004A0050004F0054000F>]TJ
0 g 0 G
0 g 0 G
-1 0 0 1 54 416.697 Tm [<0032>29<000F>-607<002A0047>-250<002A>-250<005600540046>-250<0035004A004C003B>-250<004700500053>-250<00270046>7<005A004F004E0042004F>-250<0045004A0042004800530042004E0054000D>-250<005500490046004F06D8>]TJ
+1 0 0 1 54 416.697 Tm [<0032>29<000F>-607<002A0047>-250<002A>-250<005600540046>-250<0035004A004C003B>-250<004700500053>-250<00270046>7<005A004F004E0042004F>-250<0045004A0042004800530042004E0054000D>-250<005500490046004F06DA>]TJ
0 g 0 G
0 g 0 G
1 0 0 1 54 401.903 Tm [<0022000F>-585<00280050>-250<004200580042005A>59<000F>]TJ
@@ -293,48 +258,53 @@ BT
0 g 0 G
0 g 0 G
1 0 0 1 54 372.314 Tm [<0022000F>]TJ
-1.02 0 0 1 71.036 372.314 Tm [<003A>69<00460054>-290<004A004F00450046>-7<0046>-7<00450002>-465<002A004F>-291<0022>32<00560048005600540055>-290<0A220A200A210A27>-292<005500490046>-291<004200560055004900500053>-291<005100560043004D004A005400490046>-7<0045>-291<0042>-291<00440050004E0051004D004600550046>]TJ
-0.98 0 0 1 71.036 357.519 Tm [<004F0050>7<0057>8<0046004D000D>-253<004A004F0044004D00560045004A004F0048>-253<004A00550054>-253<00440050>6<0057>8<00460053>60<000D>-252<00560054004A004F0048>-253<00550049004A0054>-254<00450050>-7<00440056004E0046004F0055>-253<0044004D004200540054000F>-339<0022004D004E005000540055>-254<0042004D004D>]TJ
-0.999 0 0 1 71.036 342.725 Tm [<00500047>-250<005500490046>-250<00540046005500560051>-251<005600540046>-7<0045>-250<00450046004700420056004D00550054000F>-335<09AB0046>-250<098B004D00460054>-251<000900550046>7<005900550043004D0050>-7<0044004C>-250<0042004F0045>-250<00440050>6<0057>8<00460053>17<000A>-250<0058>7<00460053>8<0046>]TJ
-0.98 0 0 1 71.036 327.93 Tm [<005400560043004E004A0A1D0046>-7<0045>-254<00550050>-253<0042>-254<004E0042004B00500053>-254<0022004E00460053004A00440042004F>-254<0031>24<000F>10<0030>30<000F0025>29<000F>-253<005400460053>-15<0057004A00440046>-254<004A004F>]TJ
-/F57 11.3574 Tf 0.98 0 0 1 293.018 327.93 Tm [<00310025002700100039>24<000E00120042001B0013001100110012>]TJ
-/F57 11.3574 Tf 1.02 0 0 1 71.036 313.136 Tm [<004700500053004E00420055000D>-261<005500490046004F>-258<0046004D0046>-7<004400550053>7<0050004F004A00440042004D004D005A>-258<0053>7<0046>7<0057004A0046>7<0058>8<0046>-6<0045>-258<0042004F0045>-259<0042004400440046005100550046>-7<0045>]TJ
-/F61 11.3574 Tf 1.02 0 0 1 310.307 313.136 Tm [<0050004F>-258<005500490046>-258<0848005300540055>]TJ
-1.02 0 0 1 71.036 298.341 Tm [<004208680046004E00510055000F>]TJ
-/F57 11.3574 Tf 1.02 0 0 1 115.343 298.341 Tm [<0022>-313<00510053004A004F00550046>-7<0045>-314<004400500051>6<005A>-314<005800420054>-314<004A004F>-314<005500490046>-314<00420056005500490050005306DD0054>-314<00490042004F00450054>-314<0058004A00550049004A004F>-314<0042>]TJ
+1.02 0 0 1 71.036 372.314 Tm [<003A>71<00460054>-291<004A004F00450046>-7<0046>-7<00450002>-466<002A004F>-291<0022>33<00560048005600540055>-290<09CA09C809C909CF>-292<005500490046>-291<004200560055004900500053>-292<005100560043004D004A005400490046>-7<0045>-291<0042>-291<00440050004E0051004D004600550046>]TJ
+0.98 0 0 1 71.036 357.519 Tm [<004F0050>7<0057>8<0046004D000D>-253<004A004F0044004D00560045004A004F0048>-253<004A00550054>-253<00440050>6<0057>8<00460053>62<000D>-253<00560054004A004F0048>-254<00550049004A0054>-253<00450050>-7<00440056004E0046004F0055>-254<0044004D004200540054000F>-339<0022004D004E005000540055>-254<0042004D004D>]TJ
+0.995 0 0 1 71.036 342.725 Tm [<00500047>-252<005500490046>-251<00540046005500560051>-252<005600540046>-8<0045>-252<00450046004700420056004D00550054000F>-337<003500490046>-252<0939004D00460054>-252<000900550046>7<005900550043004D0050>-7<0044004C>-252<0042004F0045>-251<00440050>6<0057>8<00460053>17<000A>-251<0058>8<00460053>8<0046>]TJ
+0.98 0 0 1 71.036 327.93 Tm [<005400560043004E004A005500550046>-7<0045>-252<00550050>-251<0042>-252<004E0042004B00500053>-252<0022004E00460053004A00440042004F>-252<0031>24<000F>11<0030>30<000F0025>30<000F>-251<005400460053>-15<0057004A00440046>-252<004A004F>]TJ
+/F95 11.3574 Tf
+0.98 0 0 1 293.018 327.93 Tm [<00310025002700100039>24<000E00120042001B0013001100110012>]TJ
+/F95 11.3574 Tf
+1.02 0 0 1 71.036 313.136 Tm [<004700500053004E00420055000D>-261<005500490046004F>-258<0046004D0046>-7<004400550053>7<0050004F004A00440042004D004D005A>-258<0053>7<0046>7<0057004A0046>7<0058>8<0046>-6<0045>-258<0042004F0045>-259<0042004400440046005100550046>-7<0045>]TJ
+/F97 11.3574 Tf
+1.02 0 0 1 310.307 313.136 Tm [<0050004F>-258<005500490046>-258<084A005300540055>]TJ
+1.02 0 0 1 71.036 298.341 Tm [<0042005500550046004E00510055000F>]TJ
+/F95 11.3574 Tf
+1.02 0 0 1 115.412 298.341 Tm [<0022>-313<00510053004A004F00550046>-7<0045>-313<004400500051>6<005A>-313<005800420054>-313<004A004F>-313<005500490046>-314<00420056005500490050005306DF0054>-313<00490042004F00450054>-313<0058004A00550049004A004F>-314<0042>]TJ
1 0 0 1 70.616 283.547 Tm [<0058>8<0046>-7<0046004C000F>-333<002B005600540055>-250<004D004A004C0046>-250<0055004900420055000F>-333<0035>62<0050>-6<0050004C>-250<004E0050004F005500490054>-250<00550050>-250<00580053004A00550046>9<000D>-249<00500047>-250<004400500056005300540046>9<000F>]TJ
-1 0 0 1 88.072 268.752 Tm [<00360051>-7<0045004200550046001B>-333<0022004F00500055004900460053>-250<004200560055004900500053>-250<0053>7<00460051>-6<0050005300550054>-250<0054005600440044004600540054000F>]TJ
+1 0 0 1 88.072 268.752 Tm [<00360051>-7<0045004200550046001B>-333<00340046>6<0057>8<004600530042004D>-249<00500055004900460053>-250<0042005600550049005000530054>-250<0053>7<00460051>-6<005000530055>-250<0054005600440044004600540054000F>]TJ
0 g 0 G
0 g 0 G
1 0 0 1 54 253.958 Tm [<0032>29<000F>]TJ
-1.009 0 0 1 71.036 253.958 Tm [<003800490046004F>-247<002A>-247<0058>7<0050004C0046>-247<00560051>-247<00550049004A0054>-248<004E00500053004F004A004F0048000D>-247<004E005A>-247<0049004600420045>-248<00470046004D0055>-247<004D004A004C0046>-248<0042>-247<00550050>-7<00450045004D00460053>-247<004900420045>]TJ
-1.011 0 0 1 71.036 239.163 Tm [<0043>-9<0046>-7<0046004F>-248<0051>-6<00500056004F0045004A004F0048>-248<004A0055>-247<004A004F>-247<0042>-247<00540042004F00450043>-10<0050>6<0059000F>-329<002A>-247<0053>7<0050004D004D0046>-6<0045>-247<0050>6<0057>8<00460053>-246<0042004F0045>-247<004D0050>-7<0050004C0046>-7<0045>-247<00420055>-248<005500490046>]TJ
-0.98 0 0 1 71.036 224.369 Tm [<004E00560048>-234<0054004900500055>-234<0050004F>-235<005500490046>-234<00580042004D004D000F>-333<002A0055>-235<005800420054>-234<0042>-234<0058>7<0050004E0042004F>-234<004A004F>-234<004900460053>-234<0047005000530055004A00460054>-235<0058004A00550049>-234<0042>-235<0045005300560048>]TJ
-1.02 0 0 1 71.036 209.574 Tm [<004900420043004A0055>-266<0055004900420055>-265<005800420054>-266<004300420045000D>-272<0042004F0045>-266<0042004F>-266<00420A1D004A0055005600450046>-266<0055004900420055>-265<005800420054>-266<0046>6<0057>7<0046004F>-265<0058>7<0050005300540046>10<000F>-388<003400490046>]TJ
-0.98 0 0 1 71.036 194.779 Tm [<004900420045>-232<00540046>-7<0046004F>-233<0043>-10<00460A1D00460053>-233<00450042005A0054000D>-237<004D004A004C0046>-232<005500490046>-233<0055004A004E0046>-232<002A>-233<00550050>-7<0050004C>-232<004900460053>-233<00550050>-232<005500490046>-233<0046004A0048004900550049>-233<00480053004200450046>]TJ
-1.02 0 0 1 71.036 179.985 Tm [<00540050>-6<0044004C>-249<004900500051>9<000F>-337<09AB0046004F>-249<002A>-249<004800500055>-248<00560051>9<000D>-249<00580042005400490046>-7<0045000D>-250<0042004F0045>-248<004500530042004800480046>-7<0045>-249<004E005A>-249<004D0050004F0046004D005A>-248<004300560A1D>]TJ
-0.98 0 0 1 71.036 165.19 Tm [<00450050>7<0058004F>-240<00550050>-242<005500490046>-241<0050004F0046000E004E0042004F>-241<0045004600550046>-7<00440055004A0057>7<0046>-240<004200480046004F0044005A>-241<0055004900420055>-241<002A>-241<004B0050004C004A004F0048004D005A>-241<00440042004D004D0046>-7<0045>-241<004E005A>]TJ
+1.009 0 0 1 71.036 253.958 Tm [<003800490046004F>-247<002A>-247<0058>7<0050004C0046>-247<00560051>-247<00550049004A0054>-247<004E00500053004F004A004F0048000D>-248<004E005A>-247<0049004600420045>-248<00470046004D0055>-247<004D004A004C0046>-248<0042>-247<00550050>-7<00450045004D00460053>-247<004900420045>]TJ
+1.011 0 0 1 71.036 239.163 Tm [<0043>-10<0046>-7<0046004F>-247<0051>-7<00500056004F0045004A004F0048>-247<004A0055>-247<004A004F>-247<0042>-247<00540042004F00450043>-10<0050>6<0059000F>-329<002A>-247<0053>7<0050004D004D0046>-6<0045>-247<0050>6<0057>8<00460053>-246<0042004F0045>-247<004D0050>-7<0050004C0046>-7<0045>-247<00420055>-248<005500490046>]TJ
+0.98 0 0 1 71.036 224.369 Tm [<004E00560048>-234<0054004900500055>-234<0050004F>-235<005500490046>-234<00580042004D004D000F>-333<002A0055>-235<005800420054>-234<0042>-235<0058>8<0050004E0042004F>-234<004A004F>-234<004900460053>-234<0047005000530055004A00460054>-235<0058004A00550049>-234<0042>-235<0045005300560048>]TJ
+1.02 0 0 1 71.036 209.574 Tm [<004900420043004A0055>-264<0055004900420055>-265<005800420054>-265<004300420045000D>-269<0042004F0045>-265<0042004F>-264<004200550055004A0055005600450046>-265<0055004900420055>-265<005800420054>-264<0046>6<0057>8<0046004F>-264<0058>7<0050005300540046>10<000F>-384<003400490046>]TJ
+0.98 0 0 1 71.036 194.779 Tm [<004900420045>-231<00540046>-7<0046004F>-231<0043>-10<00460055005500460053>-232<00450042005A0054000D>-235<004D004A004C0046>-232<005500490046>-231<0055004A004E0046>-231<002A>-231<00550050>-7<0050004C>-231<004900460053>-231<00550050>-231<005500490046>-231<0046004A0048004900550049>-232<00480053004200450046>]TJ
+1.017 0 0 1 71.036 179.985 Tm [<00540050>-7<0044004C>-246<004900500051>9<000F>-329<003500490046004F>-246<002A>-247<004800500055>-247<00560051>10<000D>-246<00580042005400490046>-7<0045000D>-247<0042004F0045>-246<004500530042004800480046>-7<0045>-247<004E005A>-247<004D0050004F0046004D005A>-246<0043005600550055>]TJ
+0.98 0 0 1 71.036 165.19 Tm [<00450050>7<0058004F>-240<00550050>-241<005500490046>-241<0050004F0046000E004E0042004F>-242<0045004600550046>-7<00440055004A0057>8<0046>-241<004200480046004F0044005A>-241<0055004900420055>-241<002A>-241<004B0050004C004A004F0048004D005A>-241<00440042004D004D0046>-7<0045>-241<004E005A>]TJ
1 0 0 1 71.036 150.396 Tm [<004E00460042004F0054>-250<00500047>-250<004D004A0057004A004F0048000F>-333<003A>70<00500056>-249<004C004F0050>6<0058>-249<0058004900420055>-250<002A>-250<004E00460042004F0020>]TJ
0 g 0 G
0 g 0 G
-1 0 0 1 54 135.601 Tm [<0022000F>-585<003A>71<004600420049000F>-333<00340055004A0044004C>-250<0058004A00550049>-250<004E0046>9<000D>-249<004C004A0045000F>-333<09AB004A0054>-250<00450050>-7<00440056004E0046004F0055>-250<0044004D004200540054>-250<004A0054>-250<004700500053>-250<005A>7<00500056000F>]TJ
+1 0 0 1 54 135.601 Tm [<0022000F>-585<003A>71<004600420049000F>-333<00340055004A0044004C>-250<0058004A00550049>-250<004E0046>9<000D>-249<004C004A0045000F>-333<00350049004A0054>-250<00450050>-7<00440056004E0046004F0055>-250<0044004D004200540054>-250<004A0054>-250<004700500053>-250<005A>7<00500056000F>]TJ
0 g 0 G
-/F57 10.44878 Tf 1 0 0 1 204.571 39.437 Tm [<0014>]TJ
+/F95 10.44878 Tf
+1 0 0 1 204.571 39.437 Tm [<0014>]TJ
0 g 0 G
ET
endstream
endobj
17 0 obj
-<</Type/Page/Contents 18 0 R/Resources 16 0 R/MediaBox[0 0 396 612]/CropBox[0 0 396 612]
+<< /Type /Page /Contents 18 0 R /Resources 16 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612]
-/TrimBox[0 0 396 612]/Parent 12 0 R>>
+/TrimBox[0 0 396 612] /Parent 12 0 R >>
endobj
16 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font<</F57 8 0 R/F61 11 0 R>>/ProcSet[/PDF/Text]>>
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F95 8 0 R /F97 9 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
21 0 obj
-<</Length 32 >>
+<< /Length 32 >>
stream
0 g 0 G
0 g 0 G
@@ -344,12 +314,12 @@ stream
endstream
endobj
20 0 obj
-<</Type/Page/Contents 21 0 R/Resources 19 0 R/MediaBox[0 0 396 612]/CropBox[0 0 396 612]
+<< /Type /Page /Contents 21 0 R /Resources 19 0 R /MediaBox [ 0 0 396 612 ] /CropBox[0 0 396 612]
-/TrimBox[0 0 396 612]/Parent 12 0 R>>
+/TrimBox[0 0 396 612] /Parent 12 0 R >>
endobj
19 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /ProcSet[/PDF]>>
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /ProcSet [ /PDF ] >>
endobj
1 0 obj
<<>>
@@ -361,43 +331,36 @@ endobj
<< /pgfprgb [/Pattern /DeviceRGB] >>
endobj
22 0 obj
-[13[219]15[219]66[486]68[389 489 401 314]73[519]77[266 783 518 447 489]83[357 353 307]87[472]89[475]2120[564]2152[606]]
+[ 27 [ 256 ] 32 [ 430 ] 37 [ 734 ] 56 [ 1028 ] 66 [ 506 ] 68 [ 456 561 489 ] 73 [ 619 322 ] 78 [ 905 616 551 581 ] 83 [ 428 427 358 598 ] ]
endobj
-23 0 obj
-<</Length 270 >>
+24 0 obj
+<< /Length 11 >>
stream
-
+
endstream
endobj
-24 0 obj
-<</Subtype/CIDFontType0C/Length 5776 >>
+25 0 obj
+<< /Subtype /CIDFontType0C /Length 3010 >>
stream
-
-
-c # B / hN$>>^>> >\>8Pɸsyò
-
-
-
-
-
-L{33
-͋L͋f3Lo\bkbxx}ƈ}qmn|f
-fg`ffgAkg_e~Yo
-
-
+
+3<ZUFl
+#V$P>>>>z>\>3&emkccikdemkccikd|& ãWQYwfhlDJRb|uӮʹDN]}rmioxthew䦂ЅemkccikdIȵ +M݉M ,Vaccuˆ8%8oTu .¥Y=+JM?Eqovw99xo~#'qf'dbSf $u`Pv*#-#xPƳjihb\f $uĂvfg|\O %
+by²l~xu$$29BaIouyHv"jAn<Fgū>wrr{y`|Ң*:fcixn@P dkpwU
+#,(JRff|е±ww BszǙДUV̎f;D~ʆFΑxsnPFeo}շzvVuYd jK3 CabUe=[j'" .-QNdi{ϮԽ&q;~͞vw<0\5fDfhRg̎f;DʆFJ8{Nu» $a|ayR;7{bu· $N{{vRw|[Ë}o:Fw†RT8Nu $Nnjjta\tkmvz55x[yR;7{bu $cz0yR;7{bu· $N{0c5f7ckQ|cPgCekRܗ}fO}Fw†RO8Nu $aʞv<x]yR;7{bu· $N{0\5cD_eT}fO}Fw†RO8Nu $a Y c5Ɵ2)8Mn^de_zOPsWϹ: \kg9kivtF 78Nu $N ,'vdhYWnUhkh}fO}Fw†RY 7m-4rrvxmghemI]}\V}Ix†RO8Nu $N &Z\e{⭃toa]c}kNkrTVYwkkttopmsvih}ygskkzp^[v{{Wؽ'F}|~n&Yhiyxȧ~rxuu Ύf{znp;w5AߍywxoJd $u7Mrbjycm;ߍyvyXe` $u70!UԨrxǙДU
+  
endstream
endobj
-25 0 obj
-<</Type/FontDescriptor/FontName/EKAOGO+LibertinusSerif-Italic/Flags 4/FontBBox[-634 -312 6171 893]/Ascent 894/CapHeight 647/Descent -246/ItalicAngle -12/StemV 73/XHeight 429/FontFile3 24 0 R/CIDSet 23 0 R>>
+23 0 obj
+<< /Type /FontDescriptor /FontName /VDIGQQ+LibertinusSerif-Bold /Flags 4 /FontBBox [ -1625 -328 1562 1014 ] /Ascent 894 /CapHeight 647 /Descent -246 /ItalicAngle 0 /StemV 81 /XHeight 433 /FontFile3 25 0 R /CIDSet 24 0 R >>
endobj
26 0 obj
-<</Length 992 >>
+<< /Length 946 >>
stream
%!PS-Adobe-3.0 Resource-CMap
%%DocumentNeededResources: ProcSet (CIDInit)
%%IncludeResource: ProcSet (CIDInit)
-%%BeginResource: CMap (TeX-EKAOGO-LibertinusSerif-Italic-0)
-%%Title: (TeX-EKAOGO-LibertinusSerif-Italic-0 TeX EKAOGO-LibertinusSerif-Italic 0)
+%%BeginResource: CMap (TeX-VDIGQQ-LibertinusSerif-Bold-0)
+%%Title: (TeX-VDIGQQ-LibertinusSerif-Bold-0 TeX VDIGQQ-LibertinusSerif-Bold 0)
%%Version: 1.000
%%EndComments
/CIDInit /ProcSet findresource begin
@@ -405,26 +368,27 @@ stream
begincmap
/CIDSystemInfo
<< /Registry (TeX)
-/Ordering (EKAOGO-LibertinusSerif-Italic)
+/Ordering (VDIGQQ-LibertinusSerif-Bold)
/Supplement 0
>> def
-/CMapName /TeX-Identity-EKAOGO-LibertinusSerif-Italic def
+/CMapName /TeX-Identity-VDIGQQ-LibertinusSerif-Bold def
/CMapType 2 def
1 begincodespacerange
<0000> <FFFF>
endcodespacerange
0 beginbfrange
endbfrange
-20 beginbfchar
-<000D> <002C>
-<000F> <002E>
+18 beginbfchar
+<001B> <003A>
+<0020> <003F>
+<0025> <0044>
+<0038> <0057>
<0042> <0061>
<0044> <0063>
<0045> <0064>
<0046> <0065>
-<0047> <0066>
<0049> <0068>
-<004D> <006C>
+<004A> <0069>
<004E> <006D>
<004F> <006E>
<0050> <006F>
@@ -432,10 +396,7 @@ endbfrange
<0053> <0072>
<0054> <0073>
<0055> <0074>
-<0057> <0076>
-<0059> <0078>
-<0848> <00660069>
-<0868> <00740074>
+<0056> <0075>
endbfchar
endcmap
CMapName currentdict /CMap defineresource pop
@@ -447,44 +408,39 @@ end
endstream
endobj
11 0 obj
-<</Type/Font/Subtype/Type0/Encoding/Identity-H/BaseFont/EKAOGO+LibertinusSerif-Italic/DescendantFonts[27 0 R]/ToUnicode 26 0 R>>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /VDIGQQ+LibertinusSerif-Bold /DescendantFonts [ 27 0 R ] /ToUnicode 26 0 R >>
endobj
27 0 obj
-<</Type/Font/Subtype/CIDFontType0/BaseFont/EKAOGO+LibertinusSerif-Italic/FontDescriptor 25 0 R/W 22 0 R/CIDSystemInfo<</Registry (Adobe)/Ordering (Identity)/Supplement 0>>>>
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /VDIGQQ+LibertinusSerif-Bold /FontDescriptor 23 0 R /W 22 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
28 0 obj
-[27[219]32[430]37[718]56[998]66[476]68[435 527 461]73[550 286]78[801 563 519 523]83[401 401 331 550]]
+[ 374 [ 2000 ] ]
endobj
-29 0 obj
-<</Length 11 >>
+30 0 obj
+<< /Length 47 >>
stream
-
+
endstream
endobj
-30 0 obj
-<</Subtype/CIDFontType0C/Length 3826 >>
+31 0 obj
+<< /Subtype /CIDFontType0C /Length 471 >>
stream
-
- [
- - Ad$>>^>> >\>8PԲ,mrrllrrlmrrllrrl1
-q?vxĭ ZcSt}pK~~AvtEt ~1XeBtqrBmzL.!
-)'#:"ҋïVwJgiuwR\%ɮqj̎f~׀
-
-
-  
+
+
+ ڒ
endstream
endobj
-31 0 obj
-<</Type/FontDescriptor/FontName/IZNYRK+LibertinusSerif-Semibold/Flags 4/FontBBox[-446 -328 6171 900]/Ascent 894/CapHeight 647/Descent -246/ItalicAngle 0/StemV 81/XHeight 463/FontFile3 30 0 R/CIDSet 29 0 R>>
+29 0 obj
+<< /Type /FontDescriptor /FontName /ETXLAD+NovelDeco /Flags 4 /FontBBox [ -392 -234 1985 838 ] /Ascent 894 /CapHeight 537 /Descent -246 /ItalicAngle 0 /StemV 61 /XHeight 429 /FontFile3 31 0 R /CIDSet 30 0 R >>
endobj
32 0 obj
-<</Length 966 >>
+<< /Length 652 >>
stream
%!PS-Adobe-3.0 Resource-CMap
%%DocumentNeededResources: ProcSet (CIDInit)
%%IncludeResource: ProcSet (CIDInit)
-%%BeginResource: CMap (TeX-IZNYRK-LibertinusSerif-Semibold-0)
-%%Title: (TeX-IZNYRK-LibertinusSerif-Semibold-0 TeX IZNYRK-LibertinusSerif-Semibold 0)
+%%BeginResource: CMap (TeX-ETXLAD-NovelDeco-0)
+%%Title: (TeX-ETXLAD-NovelDeco-0 TeX ETXLAD-NovelDeco 0)
%%Version: 1.000
%%EndComments
/CIDInit /ProcSet findresource begin
@@ -492,35 +448,18 @@ stream
begincmap
/CIDSystemInfo
<< /Registry (TeX)
-/Ordering (IZNYRK-LibertinusSerif-Semibold)
+/Ordering (ETXLAD-NovelDeco)
/Supplement 0
>> def
-/CMapName /TeX-Identity-IZNYRK-LibertinusSerif-Semibold def
+/CMapName /TeX-Identity-ETXLAD-NovelDeco def
/CMapType 2 def
1 begincodespacerange
<0000> <FFFF>
endcodespacerange
0 beginbfrange
endbfrange
-18 beginbfchar
-<001B> <003A>
-<0020> <003F>
-<0025> <0044>
-<0038> <0057>
-<0042> <0061>
-<0044> <0063>
-<0045> <0064>
-<0046> <0065>
-<0049> <0068>
-<004A> <0069>
-<004E> <006D>
-<004F> <006E>
-<0050> <006F>
-<0051> <0070>
-<0053> <0072>
-<0054> <0073>
-<0055> <0074>
-<0056> <0075>
+1 beginbfchar
+<0176> <254C>
endbfchar
endcmap
CMapName currentdict /CMap defineresource pop
@@ -532,39 +471,40 @@ end
endstream
endobj
10 0 obj
-<</Type/Font/Subtype/Type0/Encoding/Identity-H/BaseFont/IZNYRK+LibertinusSerif-Semibold/DescendantFonts[33 0 R]/ToUnicode 32 0 R>>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /ETXLAD+NovelDeco /DescendantFonts [ 33 0 R ] /ToUnicode 32 0 R >>
endobj
33 0 obj
-<</Type/Font/Subtype/CIDFontType0/BaseFont/IZNYRK+LibertinusSerif-Semibold/FontDescriptor 31 0 R/W 28 0 R/CIDSystemInfo<</Registry (Adobe)/Ordering (Identity)/Supplement 0>>>>
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /ETXLAD+NovelDeco /FontDescriptor 29 0 R /W 28 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
34 0 obj
-[374[2000]]
+[ 13 [ 219 ] 15 [ 219 ] 66 [ 486 ] 68 [ 389 489 401 314 ] 73 [ 519 ] 77 [ 266 783 518 447 489 ] 83 [ 357 353 307 ] 87 [ 472 ] 89 [ 475 ] 2122 [ 564 ] ]
endobj
-35 0 obj
-<</Length 47 >>
+36 0 obj
+<< /Length 266 >>
stream
-
+
endstream
endobj
-36 0 obj
-<</Subtype/CIDFontType0C/Length 471 >>
+37 0 obj
+<< /Subtype /CIDFontType0C /Length 3317 >>
stream
-
-
- ڒ
+
+= =N$P>>>>z>\>wɸsyoX\Vtlmnxl
+y;<1 ޓ&{orfmc5fS`ocyen`C}
+ 
endstream
endobj
-37 0 obj
-<</Type/FontDescriptor/FontName/ETXLAD+NovelDeco/Flags 4/FontBBox[-392 -234 1985 838]/Ascent 894/CapHeight 537/Descent -246/ItalicAngle 0/StemV 61/XHeight 429/FontFile3 36 0 R/CIDSet 35 0 R>>
+35 0 obj
+<< /Type /FontDescriptor /FontName /LMQEIT+LibertinusSerif-Italic /Flags 4 /FontBBox [ -1325 -312 1389 928 ] /Ascent 894 /CapHeight 647 /Descent -246 /ItalicAngle -12 /StemV 73 /XHeight 429 /FontFile3 37 0 R /CIDSet 36 0 R >>
endobj
38 0 obj
-<</Length 652 >>
+<< /Length 974 >>
stream
%!PS-Adobe-3.0 Resource-CMap
%%DocumentNeededResources: ProcSet (CIDInit)
%%IncludeResource: ProcSet (CIDInit)
-%%BeginResource: CMap (TeX-ETXLAD-NovelDeco-0)
-%%Title: (TeX-ETXLAD-NovelDeco-0 TeX ETXLAD-NovelDeco 0)
+%%BeginResource: CMap (TeX-LMQEIT-LibertinusSerif-Italic-0)
+%%Title: (TeX-LMQEIT-LibertinusSerif-Italic-0 TeX LMQEIT-LibertinusSerif-Italic 0)
%%Version: 1.000
%%EndComments
/CIDInit /ProcSet findresource begin
@@ -572,18 +512,36 @@ stream
begincmap
/CIDSystemInfo
<< /Registry (TeX)
-/Ordering (ETXLAD-NovelDeco)
+/Ordering (LMQEIT-LibertinusSerif-Italic)
/Supplement 0
>> def
-/CMapName /TeX-Identity-ETXLAD-NovelDeco def
+/CMapName /TeX-Identity-LMQEIT-LibertinusSerif-Italic def
/CMapType 2 def
1 begincodespacerange
<0000> <FFFF>
endcodespacerange
0 beginbfrange
endbfrange
-1 beginbfchar
-<0176> <254C>
+19 beginbfchar
+<000D> <002C>
+<000F> <002E>
+<0042> <0061>
+<0044> <0063>
+<0045> <0064>
+<0046> <0065>
+<0047> <0066>
+<0049> <0068>
+<004D> <006C>
+<004E> <006D>
+<004F> <006E>
+<0050> <006F>
+<0051> <0070>
+<0053> <0072>
+<0054> <0073>
+<0055> <0074>
+<0057> <0076>
+<0059> <0078>
+<084A> <00660069>
endbfchar
endcmap
CMapName currentdict /CMap defineresource pop
@@ -595,85 +553,54 @@ end
endstream
endobj
9 0 obj
-<</Type/Font/Subtype/Type0/Encoding/Identity-H/BaseFont/ETXLAD+NovelDeco/DescendantFonts[39 0 R]/ToUnicode 38 0 R>>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /LMQEIT+LibertinusSerif-Italic /DescendantFonts [ 39 0 R ] /ToUnicode 38 0 R >>
endobj
39 0 obj
-<</Type/Font/Subtype/CIDFontType0/BaseFont/ETXLAD+NovelDeco/FontDescriptor 37 0 R/W 34 0 R/CIDSystemInfo<</Registry (Adobe)/Ordering (Identity)/Supplement 0>>>>
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /LMQEIT+LibertinusSerif-Italic /FontDescriptor 35 0 R /W 34 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
40 0 obj
-[2[288]9[298 298]13[220 338 220 323 465 465 465 465 465 465]27[236]32[435]34[695 588 646 701 557 485 685 730 297 322]45[528 839 699 702 541 702 587 485 597 661 652 951 660 575 604]66[457 493 428 506 447 310 500 538 271 272 512 264 790 542 504 519 503 372 390 316 531 497 747 490 515 424]1752[742]1757[268]1760[375 375]2442[582 560 540]2475[1048]2589[614]2592[465 465 465 465 465 465 465 465 465]]
+[ 2 [ 288 ] 9 [ 298 298 ] 13 [ 220 338 220 323 465 465 465 465 465 465 ] 27 [ 236 ] 32 [ 435 ] 34 [ 695 588 646 701 557 485 685 730 297 322 ] 45 [ 528 839 699 702 541 702 587 485 597 661 652 951 660 575 604 ] 66 [ 457 493 428 506 447 310 500 538 271 272 512 264 790 542 504 519 503 372 390 316 531 497 747 490 515 424 ] 1754 [ 742 ] 1759 [ 268 ] 1762 [ 375 375 ] 2360 [ 582 560 540 ] 2504 [ 465 465 465 465 465 465 465 465 465 ] ]
endobj
-41 0 obj
-<</Length 326 >>
+42 0 obj
+<< /Length 315 >>
stream
- g?
+ g?
endstream
endobj
-42 0 obj
-<</Subtype/CIDFontType0C/Length 18212 >>
+43 0 obj
+<< /Subtype /CIDFontType0C /Length 12055 >>
stream
-
-) "
-
-
-
-!
-"
-#
-$
-%
-&
-'
-(
- ^M(%F !"a"#%7%&Y'(")*+J,-./Y0%013746"727U7889:;=??F?@AhBBCQCD,$>>^>> >\>8Nǁw$&snxUEh3=1vǘ
-
-L
-kg
-Zff
-L
-
-ŀ
-ff
-Do*[y8=ߋ
-
-e^W[۹͋eN8z;v
-ff
-,
-p
-L͗
-
-Lf
-Lf
-Lf
-33
-Lf
-3uxA}~Do
-Lͅ
-f
-f
-
-Nluvo
-3ww
-e^W[۹͋eN8z;v
-Lͅ
-22'9&B檵wjj8pEv
-
-
-
- ڒ
+
+
+T
+ # },[wE}xFK0Wf  ; ![!"#$W$% %@%&' '(()>)*(*+!++,qU$N>>>>z>\>w$&snxUEh3=1vǘ
+ %.;NGw?{dHe 
+kg ;Nxluvoltvg]W~ǖŻqclsso~tyĶnssnnssn{wbU2ex s_qaU(-
+Z 'To}q?/L}X9uZy.?ȹ2wgnjȍTiVr3bsi8pEv $Ez2A@Bhvyԉԯr+KtWPOAB)'{[PC֌~DzzrgFϐ¶
+srcj\_ $s‡c-kiHU27=C %85{OfDv׵w%ޜюbXef[_ $vш844ޜюebXYbe $vш8%8zEv $Ez[[8zEv $EzvwS%ޜю_\djZ\ $vш8%8zEv $Ez|@y!vޜǎe`dgVY $vۈ8NHWojx}r}mvugyſ#qw)i牋̑CwfP!Ldy2ޜю^\eg\] $vш8%8zEvČvvw
+1M+:Jv $Gm9ϏhKa%vЇ@Mc0OrRv $I%cUu%vv)xx|nGvhq52zEv $EzuM|䜑ђb\sv]_ $vxф0(I.c#GV.VY#>ġ^G5"Tf~­wu%8zEvƊ $=s>J dMePcfWcvш8t
++xNlT[g`wxuppʵòzpugnaca\YQߙζġ^G5"TfvwlQ=ߞ|tB\a^rqfzg[ML\agnh\\vш8%8zEv $Ezu
+Do*[yF~/\ Q)&2H!"[ito):^a;.Oux~>qZʧtů;9O'þMIӲw˕ֺq>Јi<5>
+e^W[۟eN8z;v $;z۬@ޚ؎\Zddbd $vLj8`daFxۜǒebtvZ] $vք:|=[bmZv:TՆpvU2%4+tǑϒc^gghj $v†zFY{cʒmhtt^b $v!v4BAT0F:zb_cjhk $vlqIz&Nj_dhnn $vUP{)zz]Žnkqq_c $v|`۬** ED7+-fEʮmfttac $vsjC8nÎffcdjm $vP"_(Zi]k^v $_xMDcSv $aza۬>K lokttgk $vvce|asÎgecdjm $vQqnf8z;v $;z̲ÕƗ~lDrTUzL
+,lmq\*fURbб֌g*R%,
+wXmrixȒKTԋ||kgi $vIUx}kfe{rmYJԋ||kgi $vJTFHRv./i "vX:X{d{CUyjhjjmm $v{X|͞Ðwsqjir $vUv..%i
+_"mhgepq $vW}}ћwummam $vևn}h7dr5oxmcmrjm $vn^{EE~j~;bxK 96)Ң:+4@Jtp_mmmq $vzb@7
+Nluvoltvg]W~ǖŻqc1luvoltvg]W~ǖŻqcvry[S
+2%jj8pEv $Ez[ǎZ{a7yW2Ĥb&,NXWzoVQxp
+ ڒ 
endstream
endobj
-43 0 obj
-<</Type/FontDescriptor/FontName/VEKDRV+LibertinusSerif/Flags 4/FontBBox[-1082 -256 6171 1125]/Ascent 894/CapHeight 647/Descent -246/ItalicAngle 0/StemV 73/XHeight 429/FontFile3 42 0 R/CIDSet 41 0 R>>
+41 0 obj
+<< /Type /FontDescriptor /FontName /UUWHOM+LibertinusSerif-Regular /Flags 4 /FontBBox [ -1325 -256 1269 928 ] /Ascent 894 /CapHeight 647 /Descent -246 /ItalicAngle 0 /StemV 73 /XHeight 429 /FontFile3 43 0 R /CIDSet 42 0 R >>
endobj
44 0 obj
-<</Length 1865 >>
+<< /Length 1869 >>
stream
%!PS-Adobe-3.0 Resource-CMap
%%DocumentNeededResources: ProcSet (CIDInit)
%%IncludeResource: ProcSet (CIDInit)
-%%BeginResource: CMap (TeX-VEKDRV-LibertinusSerif-0)
-%%Title: (TeX-VEKDRV-LibertinusSerif-0 TeX VEKDRV-LibertinusSerif 0)
+%%BeginResource: CMap (TeX-UUWHOM-LibertinusSerif-Regular-0)
+%%Title: (TeX-UUWHOM-LibertinusSerif-Regular-0 TeX UUWHOM-LibertinusSerif-Regular 0)
%%Version: 1.000
%%EndComments
/CIDInit /ProcSet findresource begin
@@ -681,17 +608,17 @@ stream
begincmap
/CIDSystemInfo
<< /Registry (TeX)
-/Ordering (VEKDRV-LibertinusSerif)
+/Ordering (UUWHOM-LibertinusSerif-Regular)
/Supplement 0
>> def
-/CMapName /TeX-Identity-VEKDRV-LibertinusSerif def
+/CMapName /TeX-Identity-UUWHOM-LibertinusSerif-Regular def
/CMapType 2 def
1 begincodespacerange
<0000> <FFFF>
endcodespacerange
0 beginbfrange
endbfrange
-84 beginbfchar
+82 beginbfchar
<0002> <0021>
<0009> <0028>
<000A> <0029>
@@ -758,24 +685,22 @@ endbfrange
<0059> <0078>
<005A> <0079>
<005B> <007A>
-<06D8> <2014>
-<06DD> <2019>
-<06E0> <201C>
-<06E1> <201D>
-<098A> <00660066>
-<098B> <00660069>
-<098C> <0066006C>
-<09AB> <00540068>
-<0A1D> <00740074>
-<0A20> <0030>
-<0A21> <0031>
-<0A22> <0032>
-<0A23> <0033>
-<0A24> <0034>
-<0A25> <0035>
-<0A26> <0036>
-<0A27> <0037>
-<0A28> <0038>
+<06DA> <2014>
+<06DF> <2019>
+<06E2> <201C>
+<06E3> <201D>
+<0938> <00660066>
+<0939> <00660069>
+<093A> <0066006C>
+<09C8> <0030>
+<09C9> <0031>
+<09CA> <0032>
+<09CB> <0033>
+<09CC> <0034>
+<09CD> <0035>
+<09CE> <0036>
+<09CF> <0037>
+<09D0> <0038>
endbfchar
endcmap
CMapName currentdict /CMap defineresource pop
@@ -787,74 +712,72 @@ end
endstream
endobj
8 0 obj
-<</Type/Font/Subtype/Type0/Encoding/Identity-H/BaseFont/VEKDRV+LibertinusSerif/DescendantFonts[45 0 R]/ToUnicode 44 0 R>>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /UUWHOM+LibertinusSerif-Regular /DescendantFonts [ 45 0 R ] /ToUnicode 44 0 R >>
endobj
45 0 obj
-<</Type/Font/Subtype/CIDFontType0/BaseFont/VEKDRV+LibertinusSerif/FontDescriptor 43 0 R/W 40 0 R/CIDSystemInfo<</Registry (Adobe)/Ordering (Identity)/Supplement 0>>>>
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /UUWHOM+LibertinusSerif-Regular /FontDescriptor 41 0 R /W 40 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
12 0 obj
-<</Type/Pages /Count 4/Kids[6 0 R 14 0 R 17 0 R 20 0 R]>>
+<< /Type /Pages /Count 4 /Kids [ 6 0 R 14 0 R 17 0 R 20 0 R ] >>
endobj
46 0 obj
-<</Type/Catalog/Pages 12 0 R /Metadata 4 0 R/OutputIntents [ <</Type/OutputIntent/S/GTS_PDFX/OutputCondition (SWOP (Publication) printing in USA (Printing process definition: ANSI CGATS.6).)/OutputConditionIdentifier (CGATS TR 001)/Info (U.S. Web Coated (SWOP) v2)/RegistryName (http://www.color.org)>> ]>>
+<< /Type /Catalog /Pages 12 0 R /Metadata 4 0 R/OutputIntents [ <</Type/OutputIntent/S/GTS_PDFX/OutputCondition (SWOP (Publication) printing in USA (Printing process definition: ANSI CGATS.6).)/OutputConditionIdentifier (CGATS TR 001)/Info (U.S. Web Coated (SWOP) v2)/RegistryName (http://www.color.org)>> ] >>
endobj
47 0 obj
-<<
- /Title(Novel\040Document\040Class)/Creator(LuaLaTeX\040with\040novel\040and\040microtype)/CreationDate(D:20180425140252-07'00')/ModDate(D:20180425140252-07'00')/Producer(LuaLaTeX\040with\040novel-pdfx\040and\040hyperref)/Trapped/False/GTS_PDFXVersion(PDF/X-1a:2001)/GTS_PDFXConformance(PDF/X-1a:2001)
->>
+<< /Title(Novel\040Document\040Class)/Creator(LuaLaTeX\040with\040novel\040and\040microtype)/CreationDate(D:20230215114506-08'00')/ModDate(D:20230215114506-08'00')/Producer(LuaLaTeX\040with\040novel-pdfx\040and\040hyperref)/Trapped/False/GTS_PDFXVersion(PDF/X-1a:2001)/GTS_PDFXConformance(PDF/X-1a:2001) >>
endobj
xref
0 48
0000000000 65535 f
-0000033600 00000 n
-0000033620 00000 n
-0000033640 00000 n
-0000000015 00000 n
-0000015196 00000 n
-0000015055 00000 n
-0000006731 00000 n
-0000070426 00000 n
-0000048893 00000 n
-0000046955 00000 n
-0000041283 00000 n
-0000070746 00000 n
-0000024265 00000 n
-0000024121 00000 n
-0000015337 00000 n
-0000033160 00000 n
-0000033016 00000 n
-0000024386 00000 n
-0000033514 00000 n
-0000033370 00000 n
-0000033281 00000 n
-0000033693 00000 n
-0000033829 00000 n
-0000034156 00000 n
-0000040011 00000 n
-0000040234 00000 n
-0000041428 00000 n
-0000041618 00000 n
-0000041736 00000 n
-0000041804 00000 n
-0000045709 00000 n
-0000045932 00000 n
-0000047102 00000 n
-0000047294 00000 n
-0000047322 00000 n
-0000047426 00000 n
-0000047976 00000 n
-0000048184 00000 n
-0000049024 00000 n
-0000049201 00000 n
-0000049614 00000 n
-0000049997 00000 n
-0000068288 00000 n
-0000068504 00000 n
-0000070563 00000 n
-0000070820 00000 n
-0000071143 00000 n
+0000030375 00000 n
+0000030395 00000 n
+0000030415 00000 n
+0000000020 00000 n
+0000011504 00000 n
+0000011352 00000 n
+0000002644 00000 n
+0000058030 00000 n
+0000042536 00000 n
+0000037027 00000 n
+0000035034 00000 n
+0000058395 00000 n
+0000020913 00000 n
+0000020758 00000 n
+0000011659 00000 n
+0000029904 00000 n
+0000029749 00000 n
+0000021045 00000 n
+0000030283 00000 n
+0000030128 00000 n
+0000030036 00000 n
+0000030468 00000 n
+0000033789 00000 n
+0000030624 00000 n
+0000030695 00000 n
+0000034028 00000 n
+0000035191 00000 n
+0000035394 00000 n
+0000036089 00000 n
+0000035427 00000 n
+0000035534 00000 n
+0000036315 00000 n
+0000037173 00000 n
+0000037365 00000 n
+0000041260 00000 n
+0000037533 00000 n
+0000037859 00000 n
+0000041502 00000 n
+0000042694 00000 n
+0000042899 00000 n
+0000055860 00000 n
+0000043346 00000 n
+0000043721 00000 n
+0000056101 00000 n
+0000058189 00000 n
+0000058477 00000 n
+0000058804 00000 n
trailer
-<</Size 48/Root 46 0 R/Info 47 0 R/ID[<66C207AB9E1E764B97BB23DE55BCCEC2> <66C207AB9E1E764B97BB23DE55BCCEC2>]>>
+<< /Size 48 /Root 46 0 R /Info 47 0 R /ID [ <A065821F124D1A8686D8C4E70D9F63F8> <A065821F124D1A8686D8C4E70D9F63F8> ] >>
startxref
-71467
+59128
%%EOF
diff --git a/macros/luatex/latex/novel/doc/novel.tex b/macros/luatex/latex/novel/doc/novel.tex
index 98189b5d42..b389ab741a 100644
--- a/macros/luatex/latex/novel/doc/novel.tex
+++ b/macros/luatex/latex/novel/doc/novel.tex
@@ -1,11 +1,11 @@
-% !TeX TS-program = LuaLaTeX
+% !TeX TS-program = lualatex
% !TeX encoding = UTF-8
%
% SOURCE CODE FOR FILE novel.pdf, the cover info for novel document class.
% IF YOU COMPILE THIS DOCUMENT: Be sure that both this file and
% novel.pdf (if present) have read/write permissions for any user.
% Otherwise, compile may fail at the point where files are written.
-\documentclass{novel} % v. 1.52.
+\documentclass{novel} % v. 1.80.
% Almost all settings are defaults.
\SetHeadFootStyle{3}
\SetTitle{Novel Document Class} % only footer, with page number
@@ -18,7 +18,7 @@
\ChapterTitle{NOVEL}
\vspace{\nbs}
\ChapterSubtitle{A Document Class for the Rest of Us}
-\vspace{\nbs}
+\centering{Also consider the simpler \textit{novelette} document class.\par}
\ChapterDeco[4]{\decoglyph{n9548}}
\end{ChapterStart}
@@ -58,6 +58,8 @@ The companion font(s) is(are) licensed under the SIL Open Font License, version
\QuickChapter{4. Version}
+\noindent 1.80, 2023-02-08: Class option ``rev'' for new documents.
+
\noindent 1.52, 2018-04-26: Enhanced detection and warning using Lua code.
\noindent 1.50.5, 2018-04-11: Minor bug fixes (docs and code disagreed).
@@ -105,7 +107,7 @@ The companion font(s) is(are) licensed under the SIL Open Font License, version
\end{adjustwidth}
\begin{adjustwidth}{\parindent}{0pt}
\backindent\makebox[\parindent][l]{A. }Yes indeed! In August 2017 the author published a complete novel, including its cover, using this document class. Almost all of the setup used defaults. The files (textblock and cover) were submitted to a major American P.O.D. service in \lnum{PDF/X-1a:2001} format, then electronically reviewed and accepted \textit{on the first attempt.} A printed copy was in the author's hands within a week. Just like that. Took months to write, of course.\par
-Update: Another author reports success.
+Update: Several other authors report success.
\end{adjustwidth}
\begin{adjustwidth}{\parindent}{0pt}
diff --git a/macros/luatex/latex/novel/fonts/NovelDeco.otf b/macros/luatex/latex/novel/fonts/opentype/novel/NovelDeco.otf
index b0c81ecb61..b0c81ecb61 100644
--- a/macros/luatex/latex/novel/fonts/NovelDeco.otf
+++ b/macros/luatex/latex/novel/fonts/opentype/novel/NovelDeco.otf
Binary files differ
diff --git a/macros/luatex/latex/novel/novel-Obsolete.sty b/macros/luatex/latex/novel/novel-Obsolete.sty
deleted file mode 100644
index 305fc7b7c7..0000000000
--- a/macros/luatex/latex/novel/novel-Obsolete.sty
+++ /dev/null
@@ -1,485 +0,0 @@
-%%
-%% This is file `novel-Obsolete.sty', part of `novel' document class.
-%% Copyright 2017-2018 Robert Allgeyer.
-%%
-%%
-%% This file may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3c
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
-%%
-%%
-\ProvidesFile{novel-Obsolete.sty}%
-[2018/04/26 v1.52 LaTeX file (obsolete macros)]
-%%
-
-
-%% OBSOLETE MACROS !!!
-%%
-%% Prior to version 1.50, `novel' contained some macros or features that
-%% worked but were hard to maintain, or worked in a fashion that was
-%% user-unfriendly, or was not as good as some better code.
-%% These macros have been gathered here. DO NOT USE THEM IN NEW DOCUMENTS.
-%% They have only been retained for backwards-compatibility.
-%% If you find a bug -- too bad! Anything here is "won't fix."
-%%
-
-
-%% OBSOLETE
-\gdef\SetCropmarkGap#1{} % simply ignored
-%%
-
-
-%% OBSOLETE
-\newcommand\pushtextdown[1]{% OBSOLETE
- \ifthenelse{\equal{#1}{} \OR \equal{#1}{ } \OR \equal{#1}{0}}{%
- \def\@howmuchdown{0em}%
- }{%
- \def\@howmuchdown{#1}%
- }%
- ~\par\vspace*{-\nbs}\vspace*{\@howmuchdown}\par%
-}
-%%
-
-
-%% OBSOLETE
-%% \squeeze{} and \crush{} slightly shrink the horizonal dimension of the
-% enclosed text. May span paragraphs. Emergency only! No compounding.
-\long\gdef\squeeze#1{{\addfontfeature{FakeStretch=0.99}#1}}
-\long\gdef\crush#1{{\addfontfeature{FakeStretch=0.98}#1}}
-%%
-
-
-%% OBSOLETE
-\gdef\specialblankline{\null} % deprecated
-%%
-
-
-%% OBSOLETE.
-%%Replaced by better method. Will be honored, but not documented.
-\newcommand\TestCoverImage[1]{%
- \@tempTFfalse%
- \IfSubStr{#1}{jpg}{\@tempTFtrue}{}%
- \IfSubStr{#1}{jpeg}{\@tempTFtrue}{}%
- \IfSubStr{#1}{JPG}{\@tempTFtrue}{}%
- \IfSubStr{#1}{JPEG}{\@tempTFtrue}{}%
- \IfSubStr{#1}{png}{%
- \@tempTFtrue
- \if@pdfxISoff\else
- \ifthenelse{\equal{\@PDFversion}{PDF/X-1}}{
- \ClassError{novel}{Cannot use png cover image with PDF/X-1a}%
- {PDF/X-1a requires CMYK image. But png format is always RGB.}%
- }{}
- \fi
- \ClassWarning{novel}{^^JCover image is png file type. ^^J%
- Format png only supports RGB, not CMYK. ^^J%
- This might be OK if you are not using PDF/X-1a, ^^J%
- and if your print service accepts RGB artwork. ^^J%
- But in many cases, not OK. Did you need CMYK? ^^J}%
- }{}%
- \IfSubStr{#1}{PNG}{%
- \@tempTFtrue
- \if@pdfxISoff\else
- \ifthenelse{\equal{\@PDFversion}{PDF/X-1}}{
- \ClassError{novel}{Cannot use png cover image with PDF/X-1a}%
- {PDF/X-1a requires CMYK image. But png format is always RGB.}%
- }{}
- \fi
- \ClassWarning{novel}{^^JCover image is png file type. ^^J%
- Format png only supports RGB, not CMYK. ^^J%
- This might be OK if you are not using PDF/X-1a, ^^J%
- and if your print service accepts RGB artwork. ^^J%
- But in many cases, not OK. Did you need CMYK? ^^J}%
- }{}%
- \if@tempTF\else%
- \ClassError{novel}{Cover image has wrong file extension}%
- {Cover image must be jpg, JPG, jpeg, JPEG. ^^J%
- Can also use png or PNG if CMYK not required.}%
- \fi%
-} % end \TestCoverImage
-%%
-\newcommand\SetCoverImage[1]{%
- \if@coverart%
- \ClassWarning{novel}{^^J\string\SetCoverImage\space is obsolete. ^^J%
- It will be honored, but not documented. From `novel' version 1.50 use ^^J%
- novel-scripts, then \ScriptCoverImage\space instead. ^^J}%
- \TestCoverImage{#1}%
- \AddToShipoutPictureBG{%
- \AtPageUpperLeft{%
- \InlineImage{#1}%
- }%
- }%
- \null% without this, page has no "content"
- \else%
- \ClassError{novel}{\string\SetCoverImage\space requires `coverart' option}%
- {You must use the `coverart' document class option, for cover image.}%
- \fi%
-} % end \SetCoverImage
-%%
-
-
-%% OBSOLETE
-\newif \if@FlexResolutionSet
-\gdef\@novereserror{%
- \ClassError{novel}{\string\SetFlexResolution\space bad value}%
- {Resolution dpi must be integer from 200 to 9600. Default 300.}%
-}
-\newcommand\SetFlexResolution[1]{
- \IfInteger{#1}{ %
- \FPiflt{#1}{200}\@novereserror\else\fi % not enough
- \FPifgt{#1}{9600}\@novereserror\else\fi % too much
- \gdef\@novimgres{#1} %
- }{ %
- \@novreserror %
- } %
- \@FlexResolutionSettrue %
-}%
-%
-\AtEndPreamble{% called by `novel.cls' \AtEndPreamble
- \if@FlexResolutionSet %
- \pdfimageresolution=\@novimgres % from \SetFlexResolution. Default 300.
- \fi %
-}%
-%%
-
-
-%% BLOCK IMAGE (OBSOLETE)
-%% ----------------------------------------------------------------------------
-%% \BlockImage[alignment]{image}[text]
-%% OBSOLETE FROM VERSION 1.50. Use \FloatImage instead.
-\DeclareDocumentCommand \BlockImage { O{c} m +O{} }{%
- \ClassWarning{novel}{^^J\string\BlockImage\space command is obsolete. ^^J%
- It will remain in effect for existing documents that have it. ^^J%
- New documents: Use \string\FloatImage, or \string\WrapImage, instead. ^^J%
- Purpose and syntax is slightly different. See docs. ^^J}%
- \iftoggle{@inheadfoot}{%
- \ClassError{novel}{Cannot use \string\BlockImage\space in header/footer}%
- {Header footer allow \string\InlineImage, but not \string\BlockImage.}%
- }{}%
- \@TestImageExtension{#2}%
- % Allows empty or blank to be used, and still provide default values:
- \ifthenelse{\equal{#1}{} \OR \equal{#1}{\space}}{%
- \def\@myargs{c}}{\def\@myargs{#1}%
- }%
- \StrDel{\@myargs}{\space}[\@myargsns]% needs {\space} not { }
- \StrCut{\@myargsns}{,}{\@myalign}{\@mycoord}%
- \StrCut{\@mycoord}{,}{\@myxt}{\@myyt}%
- \ifthenelse{\equal{\@myxt}{}\OR\equal{\@myxt}{0}}{%
- \def\@myx{0pt}}{\def\@myx{\@myxt}%
- }%
- \ifthenelse{\equal{\@myyt}{}\OR\equal{\@myyt}{0}}{%
- \def\@myy{0pt}}{\def\@myy{\@myyt}%
- }%
- %
- \global\@UsingNovelCommandtrue%
- \gdef\@mygraphic{\novel@sub@inclgr{#2}}%
- \gdef\@mygraphicname{#2}%
- \setlength\@imagewidth{\widthof{\@mygraphic}}%
- \global\@imagewidth=\@imagewidth%
- \setlength\@imageheight{\heightof{\@mygraphic}}%
- \global\@imageheight=\@imageheight%
- \setlength\@imagehoffset{\@myx}%
- \IfBeginWith{\@myy}{b}{%
- \ClassError{novel}{Cannot use voffset `b' on %
- \string\BlockImage, page \thepage}%
- {The `b' voffset only works with \string\InlineImage, %
- not \string\BlockImage.}%
- }{%
- \setlength\@imagevoffset{-\@imageheight}%
- \addtolength\@imagevoffset{\@myy}%
- }%
- %
- \setlength\@mytotalht{0pt}%
- \addtolength\@mytotalht{\@imageheight}%
- \addtolength\@mytotalht{-\@myy}%
- \addtolength\@mytotalht{1em}%
- \def\@mytotalhtN{\strip@pt\@mytotalht}%
- \FPdiv{\@mytotalhtN}{\@mytotalhtN}{\strip@pt\nbs}%
- \FPadd{\@mytotalhtN}{\@mytotalhtN}{0.5}%
- \FPround{\@mytotalhtN}{\@mytotalhtN}{0}%
- %
- \begin{linegap}{\@mytotalhtN}%
- %
- \ifthenelse{\equal{\@myalign}{c}\OR\equal{\@myalign}{}}{%
- {\centering%
- \makebox[0pt][l]{%
- \hspace{\dimexpr\@myx-0.5\@imagewidth}%
- \stake\smash{\raisebox{\dimexpr\@myy-\@imageheight}{\@mygraphic}}%
- }%
- \par%
- }
- \vspace*{-\nbs}%
- {\centering #3\par}%
- }{}%
- \ifthenelse{\equal{\@myalign}{r}}{%
- \noindent\makebox[0pt][l]{%
- \hspace{\dimexpr\textwidth+\@myx-\@imagewidth}%
- \stake\smash{\raisebox{\dimexpr\@myy-\@imageheight}{\@mygraphic}}%
- }\par%
- \vspace{-2\nbs}%
- \begin{adjustwidth}{0pt}{\@imagewidth+\parindent}%
- \strut\par%
- #3\par%
- \end{adjustwidth}%
- }{}%
- \ifthenelse{\equal{\@myalign}{l}}{%
- \noindent\makebox[0pt][l]{%
- \hspace{\@myx}%
- \stake\smash{\raisebox{\dimexpr\@myy-\@imageheight}{\@mygraphic}}%
- }%
- \par%
- \vspace{-2\nbs}%
- \begin{adjustwidth}{\@imagewidth+\parindent}{0pt}%
- \strut\par%
- #3\par%
- \end{adjustwidth}%
- }{}%
- \end{linegap}%
- \global\@UsingNovelCommandfalse%
-} % end \BlockImage (OBSOLETE)
-%%
-
-
-%% LINEGAP IS OBSOLETE CODE. NOT DOCUMENTED.
-%% ----------------------------------------------------------------------------
-% Allows text to be placed (potentially) off-grid, with grid resuming after.
-\newif \if@WithinLinegap % true within linegap environment
-\newcounter{currentlinegap} % 0 when not within linegap, >0 otherwise.
-\DeclareDocumentEnvironment {linegap} { m } {%
- \FPifint{#1}\else%
- \ClassError{novel}{Non-integer linegap on page \thepage}%
- {Only integer >= 1 allowed for linegap.}%
- \fi%
- \FPiflt{#1}{1}%
- \ClassError{novel}{Insufficient linegap on page \thepage}%
- {Only integer >= 1 allowed for linegap.}%
- \fi%
- \par%
- \null%
- \vspace*{-\nbs}%
- \global\@WithinLinegaptrue%
- \begin{textblock*}{\textwidth}[0,0](0pt,0pt)%
- \setcounter{currentlinegap}{#1}
- \strut\par%
- \vspace*{-\nbs}%
-}{% close the environment:
- \end{textblock*}%
- \global\@WithinLinegapfalse%
- \par%
- \vspace*{#1\nbs}%
- \setcounter{currentlinegap}{0}%
-} % end linegap (obsolete)
-%%
-
-
-%% REWORK IS OBSOLETE CODE. NOT DOCUMENTED.
-%% ----------------------------------------------------------------------------
-%% \ReworkTrimSize retroactively changes Trim Size after layout.
-% If you use \ReworkTrimSize, you must first use \SetTrimSize (not defaults):
-\newlength\@NewTrimWidth
-\newlength\@NewTrimHeight
-\newif \if@ReworkTrimSize
-\newcommand\ReworkTrimSize[2]{% width, height
- \ClassWarning{novel}{\string\Rework\space commands are obsolete. ^^J%
- The \string\Rework\space commands are still effective for old documents, ^^J%
- but should not be used for new documents, due to potential layout issues.}%
- \if@SetTrimSize\else
- \ClassError{novel}{Must use \string\SetTrimSize\space %
- before \string\ReworkTrimSize}%
- {\string\ReworkTrimSize\space cannot be applied to default Trim Size. ^^J%
- You must manually \string\SetTrimSize\space prior to %
- \string\ReworkTrimSize.}%
- \fi
- \if@coverart % New in version 1.2
- \ClassError{novel}{\string\Rework\space commands cannot be used %
- with `coverart' option}%
- {Instead of \string\Rework, you must re-do the graphics artwork.}
- \else
- \global\@ReworkTrimSizetrue
- \gsetlength\@NewTrimWidth{#1}
- \gsetlength\@NewTrimHeight{#2}
- \typeout{^^J Class `novel' Alert: %
- Used \string\ReworkTrimSize\space command. ^^J%
- Carefully review your PDF to ensure that line breaks, paragraphs, ^^J%
- and page breaks are where you expect them to be. ^^J}%
- \fi
-}% end \ReworkTrimSize
-%%
-
-
-%% REWORK IS OBSOLETE CODE. NOT DOCUMENTED.
-%% Retroactively change margins after layout. See documentation.
-% If you use \ReworkMargins, you must first use \SetMargins (not defaults):
-\newlength\@NewTopMargin
-\newlength\@NewOuterMargin
-\newlength\@NewBottomMargin
-\newlength\@NewInnerMargin
-\newif \if@ReworkMargins
-\newcommand\ReworkMargins[4]{ % top, outer, bottom, inner
- \ClassWarning{novel}{\string\Rework\space commands are obsolete. ^^J%
- The \string\Rework\space commands are still effective for old documents, ^^J%
- but should not be used for new documents, due to potential layout issues.}%
- \if@coverart % New in version 1.2
- \ClassError{novel}{\string\Rework\space commands cannot be used %
- with coverart option}%
- {Instead of \string\Rework, you must re-do the graphics artwork.}
- \else
- \global\@ReworkMarginstrue
- \gsetlength\@NewTopMargin{#1}
- \gsetlength\@NewOuterMargin{#2}
- \gsetlength\@NewBottomMargin{#3}
- \gsetlength\@NewInnerMargin{#4}
- \typeout{^^JClass novel Alert: Used \string\ReworkMargins. ^^J%
- Carefully review your PDF to ensure that line breaks, paragraphs, ^^J%
- and page breaks are where you expect them to be. ^^J}%
- \fi
-}% end \ReworkMargins
-\LetLtxMacro\ReworkMargin{\ReworkMargins}\relax % for those who mis-type
-%% When \Rework, should result honor new margins (if possible), or should
-% result maintain original aspect ratio?
-\newif \if@AspectPriority
-\newcommand\ReworkPriority[1]{%
- \@tempTFfalse
- \ifthenelse{\equal{#1}{aspect}}{\@AspectPrioritytrue\@tempTFtrue}{}
- \ifthenelse{\equal{#1}{margins}}{\@AspectPriorityfalse\@tempTFtrue}{}
- \ifthenelse{\equal{#1}{margin}}{\@AspectPriorityfalse\@tempTFtrue}{}
- \if@tempTF\else
- \ClassError{novel}{Bad choice for \string\ReworkPriority}%
- {Rework priority choices: aspect, margins (default margins).}%
- \fi
-}
-\ReworkPriority{margins} % default
-%%
-
-
-%% REWORK IS OBSOLETE CODE. NOT DOCUMENTED.
-\gdef\ObsoleteRework{ %
-% A few values from the original calculation must be stored:
-\newlength\@OriginalEmSize
- \gsetlength\@OriginalEmSize{\@SetFontSize}
-\newlength\@OriginalTextWidth % same as original available width
- \gsetlength\@OriginalTextWidth{\textwidth}
-\newlength\@OriginalHeight % includes header/footer
- \gsetlength\@OriginalHeight{\@AvailableHeight}
-\newlength\@OriginalBaselineSkip
- \gsetlength\@OriginalBaselineSkip{\baselineskip}
-% Change the values of trim size and margins, as requested.
-% If not changed, same as before:
-\if@ReworkTrimSize
- \gsetlength\@TrimWidth{\@NewTrimWidth}
- \gsetlength\@TrimHeight{\@NewTrimHeight}
-\fi
-\if@ReworkMargins
- \gsetlength\@TopMargin{\@NewTopMargin}
- \gsetlength\@OuterMargin{\@NewOuterMargin}
- \gsetlength\@BottomMargin{\@NewBottomMargin}
- \gsetlength\@InnerMargin{\@NewInnerMargin}
-\fi
-% Re-calculate:
-\gsetlength\@AvailableWidth{\@TrimWidth-\@OuterMargin-\@InnerMargin}
-\gsetlength\@AvailableHeight{\@TrimHeight-\@TopMargin-\@BottomMargin}
-%%
-\xdef\@TWratio{\fpeval{\@AvailableWidth/\@OriginalTextWidth}}
-\xdef\@THratio{\fpeval{\@AvailableHeight/\@OriginalHeight}}
-\FPmin{\@TMratio}{\@TWratio}{\@THratio}
-%%
-\if@AspectPriority
- \gsetlength\textwidth{\@TMratio\@OriginalTextWidth}
- \gsetlength\@SetFontSize{\@TMratio\@OriginalEmSize}
- \gsetlength\baselineskip{\@TMratio\@OriginalBaselineSkip}
- % Find whether limiting factor is width or height:
- \ifnumcomp{\@TWratio}{<}{\@THratio}{%
- \setlength\@tempLength{\@AvailableHeight-\@AdjLPP\baselineskip}
- \setlength\@tempLength{\@tempLength-\baselineskip+\@SetFontSize}
- \setlength\@tempLength{0.5\@tempLength}
- \gsetlength{\@TopMargin}{\@TopMargin+\@tempLength}
- \gsetlength{\@BottomMargin}{\@BottomMargin+\@tempLength}
- \FPround{\@tempN}{\strip@pt\@tempLength}{2}
- \setlength\@tempLength{\@tempN pt}
- \FPround{\@tempN}{\@TMratio}{4}
- \typeout{^^JClass `novel' Info: Rework preserving aspect ratio. ^^J Each%
- vertical margin \the\@tempLength\space over requested rework value. ^^J%
- Scale \@tempN\space applied to text size and baselineskip. ^^J%
- } %
- }{%
- \gsetlength\@OuterMargin{\@OuterMargin+0.5\@AvailableWidth-0.5\textwidth}
- \gsetlength\@InnerMargin{\@InnerMargin+0.5\@AvailableWidth-0.5\textwidth}
- \setlength\@tempLength{0.5\@AvailableWidth-0.5\textwidth}
- \FPround{\@tempN}{\strip@pt\@tempLength}{2}
- \setlength\@tempLength{\@tempN pt}
- \FPround{\@tempN}{\@TMratio}{4}
- \typeout{^^JClass `novel' Info: Rework preserving aspect ratio. ^^J%
- Each side margin \the\@tempLength\space over requested rework value. ^^J%
- Scale \@tempN\space applied to text size and baselineskip. ^^J%
- } %
- } % end \ifnumcomp
-\else % margins priority:
- % Discover what happens if scaled according to text width:
- \gsetlength\textwidth{\@AvailableWidth}
- \gsetlength\@SetFontSize{\@TWratio\@OriginalEmSize}
- \gsetlength\baselineskip{1.2\@SetFontSize} % test for least allowable
- \setlength\@tempLength{\@AdjLPP\baselineskip}
- \ifdimcomp{\@AvailableHeight-\@tempLength}{<}{0pt}{%
- % Will not fit vertically, so will need to re-scale \@SetFontSize.
- \gsetlength\@SetFontSize{\@OriginalEmSize}
- \gsetlength\baselineskip{\fpeval{\@AvailableHeight/(\@AdjLPP+1.3)}pt}
- \FPdiv\@THratio{\strip@pt\baselineskip}{\strip@pt\@OriginalBaselineSkip}
- \gsetlength\@SetFontSize{0.8333\baselineskip} % 0.8333 = 1/1.2, tight skip
- \FPdiv{\@tempN}{\strip@pt\@SetFontSize}{\strip@pt\@OriginalEmSize}
- \gsetlength\textwidth{\@tempN\@OriginalTextWidth}
- \gsetlength\@OuterMargin{%
- 0.5\@OuterMargin+0.5\@TrimWidth-0.5\@InnerMargin-0.5\textwidth%
- }
- \gsetlength\@InnerMargin{%
- 0.5\@InnerMargin+0.5\@TrimWidth-0.5\@OuterMargin-0.5\textwidth%
- }
- \FPround{\@ActualOuterN}{\strip@pt\@OuterMargin}{2}
- \FPround{\@ActualInnerN}{\strip@pt\@InnerMargin}{2}
- \FPmul{\@TWratio}{\@TWratio}{\@THratio}
- \FPmul{\@THratio}{\@TWratio}{1.2}
- \FPround{\@TWratio}{\@TWratio}{4}
- \FPround{\@THratio}{\@THratio}{4}
- \typeout{^^JClass `novel' Info: Reworked side margins enlarged. ^^J%
- Actual Outer Margin is now \@ActualOuterN pt. ^^J%
- Actual Inner Margin is now \@ActualInnerN pt. ^^J%
- Scale \@TWratio\space applied to text, ^^J%
- \@THratio\space applied to baselineskip. ^^J%
- } %
- }{% Fits vertically. Keep \@SetFontSize. Calculate \baselineskip to fit:
- \gsetlength\baselineskip{%
- \fpeval{(\@AvailableHeight-1.3*\@SetFontSize)/\@AdjLPP}pt%
- } %
- \FPdiv{\@BLratio}{\strip@pt\baselineskip}{\strip@pt\@OriginalBaselineSkip}
- \FPround{\@BLratio}{\@BLratio}{4}
- \FPround{\@TWratio}{\@TWratio}{4}
- \typeout{^^JClass `novel' Info: Rework was able to fit new margins. ^^J%
- Scale applied to font size: \@TWratio. ^^J%
- Scale applied to baselineskip: \@BLratio. ^^J%
- } %
- }% end \ifdimcomp.
-\fi
-} % end ObsoleteRework.
-%%
-
-
-%%
-\AtBeginDocument{%
- \LetLtxMacro\ReworkTrimSize\relax
- \LetLtxMacro\ReworkMargins\relax
- \LetLtxMacro\ReworkPriority\relax
- \LetLtxMacro\SetFlexResolution\relax % cannot use past Preamble
- \providecommand\acronym[1]{\midcase{#1}}% acronym deprecated
-} %
-%%
-
-
-
-%%
-\endinput
-%%
-%% End of file `novel-Obsolete.sty'.
-
-
diff --git a/macros/luatex/latex/novel/novel-xmppacket.sty b/macros/luatex/latex/novel/novel-xmppacket.sty
deleted file mode 100644
index a70419c6fe..0000000000
--- a/macros/luatex/latex/novel/novel-xmppacket.sty
+++ /dev/null
@@ -1,186 +0,0 @@
-%%
-%% This is file `novel-xmppacket.sty', part of `novel' document class.
-%% Copyright 2017-2018 Robert Allgeyer.
-%%
-%%
-%% This file may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3c
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
-%%
-%%
-%% ----------------------------------------------------------------------------
-%%
-%% The descriptive properties of the namespaces, and the general format of XMP,
-%% are public standards released by Adobe Systems Incorporated.
-%% See http://www.adobe.com/products/xmp.html
-%%
-%% ----------------------------------------------------------------------------
-%%
-%%
-\ProvidesFile{novel-xmppacket.sty}%
-[2018/01/14 any version. (novel XMP packet template)]
-%%
-
-
-
-% This packet uses utf-8 BOM.
-% The catcodes allow # _ ~ $ % & to be used as ordinary characters.
-% \edef and \let get rid of escape backslashes in front of those characters.
-% NO COMMENTS AFTER THIS! Until \endgroup.
-
-
-
-
-
-\begingroup
-\catcode`\¤=12\relax
-\lccode`\¤="FEFF
-\lowercase{\gdef\@novelBOM{¤}}
-\catcode`\#=12
-\catcode`\_=12
-\catcode`\~=12
-\catcode`\$=12
-\catcode`\%=12
-\catcode`\&=12
-
-\edef\@pctchar{\expandafter\@gobble\string\%}
-\let\%\@pctchar
-\edef\@hashchar{\expandafter\@gobble\string\#}
-\let\#\@hashchar
-\edef\@ampchar{\expandafter\@gobble\string\&amp;}
-\let\&\@ampchar
-\edef\@dollarchar{\expandafter\@gobble\string\$}
-\let\$\@dollarchar
-\edef\@underchar{\expandafter\@gobble\string\_}
-\let\_\@underchar
-\edef\@tildechar{\expandafter\@gobble\string\~}
-\let\~\@tildechar
-
-\xdef\@xmpPacket{<?xpacket begin="\@novelBOM" id="W5M0MpCehiHzreSzNTczkc9d"?>^^J
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 4.2.1-c043 52.372728, 2009/01/18-15:08:04\pad@iv\pad@iv">^^J
-\pad@ii<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">^^J
-\pad@iv<rdf:Description rdf:about=""^^J
-\pad@viii xmlns:xmp="http://ns.adobe.com/xap/1.0/">^^J
-\pad@vi<xmp:ModifyDate>\@modifyDate</xmp:ModifyDate>^^J
-\pad@vi<xmp:CreateDate>\@createDate</xmp:CreateDate>^^J
-\@applicationString
-\pad@vi<xmp:MetadataDate>\@metadataDate</xmp:MetadataDate>^^J
-\pad@iv</rdf:Description>^^J
-\pad@iv<rdf:Description rdf:about=""^^J
-\pad@viii xmlns:dc="http://purl.org/dc/elements/1.1/">^^J
-\pad@vi<dc:format>application/pdf</dc:format>^^J
-\@titleString
-\@authorString
-\pad@iv</rdf:Description>^^J
-\pad@iv<rdf:Description rdf:about=""^^J
-\pad@viii xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/">^^J
-\pad@vi<xmpMM:DocumentID>\@documentID</xmpMM:DocumentID>^^J
-\pad@vi<xmpMM:InstanceID>\@instanceID</xmpMM:InstanceID>^^J
-\pad@vi<xmpMM:RenditionClass>default</xmpMM:RenditionClass>^^J
-\pad@vi<xmpMM:VersionID>1</xmpMM:VersionID>^^J
-\pad@iv</rdf:Description>^^J
-\pad@iv<rdf:Description rdf:about=""^^J
-\pad@viii xmlns:pdf="http://ns.adobe.com/pdf/\@pdfVersion/">^^J
-\@producerString
-\pad@vi<pdf:Trapped>False</pdf:Trapped>^^J
-\pad@iv</rdf:Description>^^J
-\pad@iv<rdf:Description rdf:about=""^^J
-\pad@viii xmlns:pdfx="http://ns.adobe.com/pdfx/\@pdfVersion/">^^J
-\@verconfString
-\pad@iv</rdf:Description>^^J
-\pad@iv<rdf:Description rdf:about=""^^J
-\pad@viii xmlns:pdfxid="http://www.npes.org/pdfx/ns/id/">^^J
-\@pdfidString
-\pad@iv</rdf:Description>^^J
-\pad@iv<rdf:Description rdf:about=""^^J
-\pad@viii xmlns:pdfaExtension="http://www.aiim.org/pdfa/ns/extension/"^^J
-\pad@viii xmlns:pdfaSchema="http://www.aiim.org/pdfa/ns/schema#"^^J
-\pad@viii xmlns:pdfaProperty="http://www.aiim.org/pdfa/ns/property#">^^J
-\pad@vi<pdfaExtension:schemas>^^J
-\pad@viii<rdf:Bag>^^J
-\pad@x<rdf:li rdf:parseType="Resource">^^J
-\pad@xii<pdfaSchema:namespaceURI>http://ns.adobe.com/pdf/\@pdfVersion/</pdfaSchema:namespaceURI>^^J
-\pad@xii<pdfaSchema:prefix>pdf</pdfaSchema:prefix>^^J
-\pad@xii<pdfaSchema:schema>Adobe PDF Schema</pdfaSchema:schema>^^J
-\pad@xii<pdfaSchema:property>^^J
-\pad@xiv<rdf:Seq>^^J
-\pad@xvi<rdf:li rdf:parseType="Resource">^^J
-\pad@xviii<pdfaProperty:category>internal</pdfaProperty:category>^^J
-\pad@xviii<pdfaProperty:description>A name object indicating whether the document has been modified to include trapping information</pdfaProperty:description>^^J
-\pad@xviii<pdfaProperty:name>Trapped</pdfaProperty:name>^^J
-\pad@xviii<pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J
-\pad@xvi</rdf:li>^^J
-\pad@xiv</rdf:Seq>^^J
-\pad@xii</pdfaSchema:property>^^J
-\pad@x</rdf:li>^^J
-\pad@x<rdf:li rdf:parseType="Resource">^^J
-\pad@xii<pdfaSchema:namespaceURI>http://ns.adobe.com/pdfx/\@pdfVersion/</pdfaSchema:namespaceURI>^^J
-\pad@xii<pdfaSchema:prefix>pdfx</pdfaSchema:prefix>^^J
-\pad@xii<pdfaSchema:schema>PDF/X ID Schema</pdfaSchema:schema>^^J
-\pad@xii<pdfaSchema:property>^^J
-\pad@xiv<rdf:Seq>^^J
-\pad@xvi<rdf:li rdf:parseType="Resource">^^J
-\pad@xviii<pdfaProperty:category>internal</pdfaProperty:category>^^J
-\pad@xviii<pdfaProperty:description>ID of PDF/X standard</pdfaProperty:description>^^J
-\pad@xviii<pdfaProperty:name>GTS_PDFXVersion</pdfaProperty:name>^^J
-\pad@xviii<pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J
-\pad@xvi</rdf:li>^^J
-\pad@xvi<rdf:li rdf:parseType="Resource">^^J
-\pad@xviii<pdfaProperty:category>internal</pdfaProperty:category>^^J
-\pad@xviii<pdfaProperty:description>Conformance level of PDF/X standard</pdfaProperty:description>^^J
-\pad@xviii<pdfaProperty:name>GTS_PDFXConformance</pdfaProperty:name>^^J
-\pad@xviii<pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J
-\pad@xvi</rdf:li>^^J
-\pad@xiv</rdf:Seq>^^J
-\pad@xii</pdfaSchema:property>^^J
-\pad@x</rdf:li>^^J
-\pad@x<rdf:li rdf:parseType="Resource">^^J
-\pad@xii<pdfaSchema:namespaceURI>http://ns.adobe.com/xap/1.0/mm/</pdfaSchema:namespaceURI>^^J
-\pad@xii<pdfaSchema:prefix>xmpMM</pdfaSchema:prefix>^^J
-\pad@xii<pdfaSchema:schema>XMP Media Management Schema</pdfaSchema:schema>^^J
-\pad@xii<pdfaSchema:property>^^J
-\pad@xiv<rdf:Seq>^^J
-\pad@xvi<rdf:li rdf:parseType="Resource">^^J
-\pad@xviii<pdfaProperty:category>internal</pdfaProperty:category>^^J
-\pad@xviii<pdfaProperty:description>UUID based identifier for specific incarnation of a document</pdfaProperty:description>^^J
-\pad@xviii<pdfaProperty:name>InstanceID</pdfaProperty:name>^^J
-\pad@xviii<pdfaProperty:valueType>URI</pdfaProperty:valueType>^^J
-\pad@xvi</rdf:li>^^J
-\pad@xiv</rdf:Seq>^^J
-\pad@xii</pdfaSchema:property>^^J
-\pad@x</rdf:li>^^J
-\pad@x<rdf:li rdf:parseType="Resource">^^J
-\pad@xii<pdfaSchema:namespaceURI>http://www.npes.org/pdfx/ns/id/</pdfaSchema:namespaceURI>^^J
-\pad@xii<pdfaSchema:prefix>pdfxid</pdfaSchema:prefix>^^J
-\pad@xii<pdfaSchema:schema>PDF/X ID Schema</pdfaSchema:schema>^^J
-\pad@xii<pdfaSchema:property>^^J
-\pad@xiv<rdf:Seq>^^J
-\pad@xvi<rdf:li rdf:parseType="Resource">^^J
-\pad@xviii<pdfaProperty:category>internal</pdfaProperty:category>^^J
-\pad@xviii<pdfaProperty:description>ID of PDF/X standard</pdfaProperty:description>^^J
-\pad@xviii<pdfaProperty:name>GTS_PDFXVersion</pdfaProperty:name>^^J
-\pad@xviii<pdfaProperty:valueType>Text</pdfaProperty:valueType>^^J
-\pad@xvi</rdf:li>^^J
-\pad@xiv</rdf:Seq>^^J
-\pad@xii</pdfaSchema:property>^^J
-\pad@x</rdf:li>^^J
-\pad@viii</rdf:Bag>^^J
-\pad@vi</pdfaExtension:schemas>^^J
-\pad@iv</rdf:Description>^^J
-\pad@ii</rdf:RDF>^^J
-</x:xmpmeta>^^J
-\pad@dxii
-<?xpacket end="w"?>}
-\endgroup
-
-
-% OK to use comments now.
-%%
-\endinput
-%%
-%% End of file `novel-xmppacket.sty'.
-
diff --git a/macros/luatex/latex/novel/novel-CGATSTR001.clo b/macros/luatex/latex/novel/tex/lualatex/novel/novel-CGATSTR001.clo
index a550245b83..a304ed3e63 100644
--- a/macros/luatex/latex/novel/novel-CGATSTR001.clo
+++ b/macros/luatex/latex/novel/tex/lualatex/novel/novel-CGATSTR001.clo
@@ -3,7 +3,7 @@
%% The values of the arguments are public industry standards.
%%
\ProvidesFile{novel-CGATSTR001.clo}%
-[2018/01/14 any version. (novel Output Intent CGATS TR 001)]
+[2023/02/08 any version. (novel Output Intent CGATS TR 001)]
%%
% Typically used in the USA.
diff --git a/macros/luatex/latex/novel/novel-CalculateLayout.sty b/macros/luatex/latex/novel/tex/lualatex/novel/novel-CalculateLayout.sty
index fbb8671302..40308f6590 100644
--- a/macros/luatex/latex/novel/novel-CalculateLayout.sty
+++ b/macros/luatex/latex/novel/tex/lualatex/novel/novel-CalculateLayout.sty
@@ -1,6 +1,6 @@
%%
%% This is file `novel-CalculateLayout.sty', part of `novel' document class.
-%% Copyright 2017-2018 Robert Allgeyer.
+%% Copyright 2017-2023 Robert Allgeyer.
%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -12,7 +12,7 @@
%%
%%
\ProvidesFile{novel-CalculateLayout.sty}%
-[2018/04/26 v1.52 LaTeX file (layout calculations)]
+[2023/02/08 v1.80 LaTeX file (layout calculations)]
%%
%%
@@ -71,8 +71,7 @@
\newlength\@AvailableWidth
\gsetlength\@AvailableWidth{\@TrimWidth-\@OuterMargin-\@InnerMargin}
% The "occupied width" of the text block is the TeX dimension \textwidth.
-% Your originally set layout can always fill the available width,
-% although that is not always true when using \Rework:
+% Your originally set layout can always fill the available width.
\gsetlength\textwidth{\@AvailableWidth}
% The "available height" is the trim height minus the top and bottom margins:
\newlength\@AvailableHeight
@@ -163,24 +162,9 @@
%% end calculate baselineskip.
-%% LOAD REWORK, IF USED
-%% REWORK IS EXPERIMENTAL CODE. NOT DOCUMENTED.
-%% ----------------------------------------------------------------------------
-% Note that \Rework does not change lines per page.
-\gdef\@TMratio{1}
-\if@ReworkTrimSize
- \ObsoleteRework
-\else
- \if@ReworkMargins
- \ObsoleteRework
- \fi
-\fi
-%% end load rework.
-
-
%% FINISH LAYOUT (but post-layout deals with special class options)
%% ----------------------------------------------------------------------------
-% Caution if font size (set or reworked) is small:
+% Caution if font size is small:
\ifdimcomp{\@SetFontSize}{<}{10pt}{ %
\typeout{^^JClass `novel' Alert: Normal font at less than 10pt. ^^J%
Whether or not this is too small, depends on circumstances. ^^J%
diff --git a/macros/luatex/latex/novel/novel-ChapterScene.sty b/macros/luatex/latex/novel/tex/lualatex/novel/novel-ChapterScene.sty
index e297eeacd3..89d77c718f 100644
--- a/macros/luatex/latex/novel/novel-ChapterScene.sty
+++ b/macros/luatex/latex/novel/tex/lualatex/novel/novel-ChapterScene.sty
@@ -1,6 +1,6 @@
%%
%% This is file `novel-ChapterScene.sty', part of `novel' document class.
-%% Copyright 2017-2018 Robert Allgeyer.
+%% Copyright 2017-2023 Robert Allgeyer.
%%
%%
%% This file may be distributed and/or modified under the
@@ -13,13 +13,13 @@
%%
%%
\ProvidesFile{novel-ChapterScene.sty}%
-[2018/04/26 v1.52 LaTeX file (chapter and scene macros)]
+[2023/02/08 v1.80 LaTeX file (chapter and scene macros)]
%%
% Each new chapter generally has its own header/footer style. This allows a
% default setting when chapters begin with ChapterStart environment:
-\gdef\SetChapterStartStyle#1{% from v. 1.40.3
+\gdef\SetChapterStartStyle#1{%
\@tempTFfalse%
\ifthenelse{\equal{#1}{fancy}}{\@tempTFtrue}{}%
\ifthenelse{\equal{#1}{empty}}{\@tempTFtrue}{}%
@@ -43,7 +43,6 @@
}
\let\SetChapterStart\SetChapterStartStyle\relax % deprecated from v1.40.3.
\SetChapterStartStyle{footer} % default
-% New in version 1.40.2:
\gdef\SetChapterStartHeight#1{%
\FPifint{#1}\else%
\ClassError{novel}{\string\SetChapterStartHeight\space integer >= 4}%
@@ -78,7 +77,7 @@
\fi%
}
\SetScenebreakIndent{false} % default
-% Deprected from v. 1.40.3:
+% Deprecated:
\newcommand\IndentAfterScenebreak{\global\@IndentAfterScenebreaktrue}
@@ -96,7 +95,7 @@
% Either way, local behavior changed using \forceindent or \backindent.
% \newcommand\scenebreak{\null}
%
-\newcommand\scenebreak{% revised in version 1.52.
+\newcommand\scenebreak{%
\leavevmode\getBreakpos{scenebreak}~\par
}
%
@@ -167,7 +166,7 @@
%%
-%% Chapter number count. New in version 1.44. See documentation.
+%% Chapter number count.
%% Do NOT use for "chapter-like" sections, only numbered chapters.
\newcounter{novelcn}
\setcounter{novelcn}{1}
@@ -309,9 +308,6 @@
%%
-%% \Epigraph[align,scale,width]{text} OBSOLETE IN CODE VERSION 1.2
-
-
%% \QuickChapter[line style]{text} intended for a story consisting of numerous
% short chapters without page breaks. Two blank lines are inserted. In the gap
% is the text, using subchfont. Optional line follows using \bigemdash style.
@@ -341,7 +337,7 @@
%%
-%% New in version 1.40: \cleartorecto and \cleartoend
+%%
% \cleartorecto works same as \clearpage when next page is recto.
% If next page would be verso, a blank verso is inserted,
% so that the following material is recto.
diff --git a/macros/luatex/latex/novel/novel-DropCap.sty b/macros/luatex/latex/novel/tex/lualatex/novel/novel-DropCap.sty
index 3a6233e3f5..7d418b45f5 100644
--- a/macros/luatex/latex/novel/novel-DropCap.sty
+++ b/macros/luatex/latex/novel/tex/lualatex/novel/novel-DropCap.sty
@@ -1,6 +1,6 @@
%%
%% This is file `novel-DropCap.sty', part of `novel' document class.
-%% Copyright (C) 2017-2018 Robert Allgeyer.
+%% Copyright (C) 2017-2023 Robert Allgeyer.
%%
%% It is based on `lettrine.sty', part of `lettrine' package,
%% Copyright (C) 1999-2015 Daniel Flipo.
@@ -16,10 +16,8 @@
% version 2005/12/01 or later.
%
%%
-% This file is new in `novel' version 1.50.
-%
\ProvidesFile{novel-DropCap.sty}%
- [2018/04/26 v1.52 (Drop Caps)]
+ [2023/02/08 v1.80 (Drop Caps)]
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%
%
@@ -157,16 +155,6 @@
\NDC@ante%
\@dropthisthing%
\else%
- % Compensate for effect of using \Rework:
- \if@ReworkTrimSize%
- \FPdiv{\@tempN}{\strip@pt\textwidth}{\strip@pt\@OriginalTextWidth}%
- \FPmul{\NDC@bloat}{\NDC@bloat}{\@tempN}%
- \else%
- \if@ReworkMargins%
- \FPdiv{\@tempN}{\strip@pt\textwidth}{\strip@pt\@OriginalTextWidth}%
- \FPmul{\NDC@bloat}{\NDC@bloat}{\@tempN}%
- \fi%
- \fi%
\sbox{\NDC@normalXbox}{X}% Normal capital X.
\sbox{\NDC@dropcapbox}{\scalebox{\NDC@bloat}[1]{\NDC@char\@dropthisthing}}%
\@tempdima=\baselineskip%
diff --git a/macros/luatex/latex/novel/novel-FOGRA39.clo b/macros/luatex/latex/novel/tex/lualatex/novel/novel-FOGRA39.clo
index dab3501fb9..fb20757902 100644
--- a/macros/luatex/latex/novel/novel-FOGRA39.clo
+++ b/macros/luatex/latex/novel/tex/lualatex/novel/novel-FOGRA39.clo
@@ -2,7 +2,7 @@
%% This is file `novel-FOGRA39.clo', part of `novel' document class.
%% The values of the arguments are public industry standards.
\ProvidesFile{novel-FOGRA39.clo}%
-[2018/01/14 any version. (novel Output Intent FOGRA39)]
+[2023/02/08 any version. (novel Output Intent FOGRA39)]
%%
diff --git a/macros/luatex/latex/novel/novel-FileData.sty b/macros/luatex/latex/novel/tex/lualatex/novel/novel-FileData.sty
index 803ef635c0..4d4535ead0 100644
--- a/macros/luatex/latex/novel/novel-FileData.sty
+++ b/macros/luatex/latex/novel/tex/lualatex/novel/novel-FileData.sty
@@ -1,6 +1,6 @@
%%
%% This is file `novel-FileData.sty', part of `novel' document class.
-%% Copyright 2017-2018 Robert Allgeyer.
+%% Copyright 2017-2023 Robert Allgeyer.
%%
%%
%% This file may be distributed and/or modified under the
@@ -13,7 +13,7 @@
%%
%%
\ProvidesFile{novel-FileData.sty}%
-[2018/04/26 v1.52 LaTeX file (File Data settings)]
+[2023/02/08 v1.80 LaTeX file (File Data settings)]
%%
@@ -48,7 +48,7 @@
\gdef\title#1{\gdef\@title{#1}}
\gdef\thetitle{\@title} % for convenience
\gdef\theTitle{\@title}
-\SetTitle{IMPORTANT: Provide Book Title} % Default v. 1.46.1. Formerly empty.
+\SetTitle{IMPORTANT: Provide Book Title} % Default.
%
% \author{} or \SetAuthor{}
% Copied to File Data at end of preamble, unless not set.
@@ -90,13 +90,12 @@
%% ----------------------------------------------------------------------------
%% \SetPDFX[Output Intent]{compliance standard} % No embed *.icc. Default.
%% \SetPDFX*[Output Intent]{compliance standard} % Embed *.icc.
-%% Default up to and including v. 1.46: \SetPDFX{off}
-%% Default as of v. 1.46.1: \SetPDFX[CGATSTR001]{X-1a:2001}
+%% Default: \SetPDFX[CGATSTR001]{X-1a:2001}
%
% \@pdfxSEToff refers to the setting, rather than whether it really is off.
% \@pdfxISoff refers to whether it really is off.
-\newif \if@pdfxSEToff % Prior to v. 1.46.1, was \ifpdfx@isOFF.
-\newif \if@pdfxISoff % New in v. 1.46.1.
+\newif \if@pdfxSEToff
+\newif \if@pdfxISoff
% These will get meaningful info when an output intent file is loaded:
\gdef\@OIidentifier{}
\gdef\@OIcondition{}
@@ -179,7 +178,7 @@
}{}%
} % end \@setpdfx
%
-\SetPDFX[CGATSTR001]{X-1a:2001} % Default, from v. 1.46.1. Formerly off.
+\SetPDFX[CGATSTR001]{X-1a:2001} % Default.
%%
diff --git a/macros/luatex/latex/novel/novel-Fonts.sty b/macros/luatex/latex/novel/tex/lualatex/novel/novel-Fonts.sty
index 11341046f0..f35708f606 100644
--- a/macros/luatex/latex/novel/novel-Fonts.sty
+++ b/macros/luatex/latex/novel/tex/lualatex/novel/novel-Fonts.sty
@@ -1,6 +1,6 @@
%%
%% This is file `novel-Fonts.sty', part of `novel' document class.
-%% Copyright 2017-2018 Robert Allgeyer.
+%% Copyright 2017-2023 Robert Allgeyer.
%%
%%
%% This file may be distributed and/or modified under the
@@ -13,7 +13,7 @@
%%
%%
\ProvidesFile{novel-Fonts.sty}%
-[2018/04/26 v1.52 LaTeX file (font settings and defaults)]
+[2023/02/08 v1.80 LaTeX file (font settings and defaults)]
%%
@@ -52,9 +52,13 @@
% Default font features (will be changed later):
\defaultfontfeatures{} % reset
\defaultfontfeatures{SmallCapsFeatures={Renderer=Basic},Ligatures=TeX,} % all
-% Main and sans fonts: kerning, ligatures, and OldStyle numbers if available:
-\defaultfontfeatures[\rmfamily,\sffamily]%
- {Kerning=On,Numbers=OldStyle,Ligatures=Common}
+\if@novrevert
+ \defaultfontfeatures[\rmfamily,\sffamily]%
+ {Kerning=On,Numbers=OldStyle,Ligatures=Common}
+\else
+ \defaultfontfeatures[\rmfamily,\sffamily]%
+ {Kerning=On,Numbers=OldStyle}
+\fi
% Fake \microtypesetup until package loaded by \@ActivateFonts, \AtEndPreamble:
\newif \if@MicrotypeSet
\gdef\microtypesetup#1{
@@ -82,9 +86,13 @@
\newif \if@ParentFontSet
\gdef\parentfontfeatures{}
\gdef\parentfontname{}
-\DeclareDocumentCommand \SetParentFont { O{} m O{} } {% from version 1.1.
+\DeclareDocumentCommand \SetParentFont { O{} m O{} } {%
\@CheckFontspecFeatures{#1,#3}
- \gdef\parentfontfeatures{#1,#3}
+ \if@novrevert
+ \gdef\parentfontfeatures{#1,#3}
+ \else
+ \gdef\parentfontfeatures{Ligatures=Common,#1,#3}
+ \fi
\gdef\parentfontname{#2}
\global\@ParentFontSettrue
}%
@@ -159,7 +167,6 @@
\cs_new_eq:NN \AddFontFeatures \addfontfeatures
\cs_new_eq:NN \AddFontFeature \addfontfeatures
\ExplSyntaxOff
-% New in v. 1.50: built-in drop caps.
\gdef\@DropCapFont{} % until actually set, will be default main font
\gdef\@DropCapColorModel{} % until actually set, using `xcolor' syntax
\gdef\@DropCapColorValue{black} % until actually set, using `xcolor' syntax
@@ -283,10 +290,14 @@
% a different font. Then, Libertinus Serif or Latin Modern Roman
% will be automatically set as \rmdefault, if available:
\IfFontExistsTF{Libertinus Serif}{ % preferred default
- \SetParentFont[%
- BoldFont=libertinusserif-semibold.otf,%
- BoldItalicFont=libertinusserif-semibolditalic.otf,%
- ]{Libertinus Serif}
+ \if@novrevert % Version 1.52 behavior.
+ \SetParentFont[% Pre-1.80 default.
+ BoldFont=libertinusserif-semibold.otf,%
+ BoldItalicFont=libertinusserif-semibolditalic.otf,%
+ ]{Libertinus Serif}
+ \else % Version 1.80. Compiles faster wihout semibold.
+ \SetParentFont{Libertinus Serif}
+ \fi
}{ % backup default, if Libertinus Serif not available:
\SetParentFont[%
SmallCapsFont={Latin Modern Roman Caps}%
@@ -372,7 +383,6 @@
\@decofontfeatures,RawFeature=+ss03,%
]{\@decofontname}
\fi% end \if@HasDecoFont
- % New in version 1.50:
\if@HasDecoFont
\NewFontFace\decodropcapfont[RawFeature=+dcap]{\@decofontname}
\else
diff --git a/macros/luatex/latex/novel/novel-Footnotes.sty b/macros/luatex/latex/novel/tex/lualatex/novel/novel-Footnotes.sty
index fb21fb1f7c..5465b0b70b 100644
--- a/macros/luatex/latex/novel/novel-Footnotes.sty
+++ b/macros/luatex/latex/novel/tex/lualatex/novel/novel-Footnotes.sty
@@ -1,6 +1,6 @@
%%
%% This is file `novel-Footnotes.sty', part of `novel' document class.
-%% Copyright 2017-2018 Robert Allgeyer.
+%% Copyright 2017-2023 Robert Allgeyer.
%%
%%
%% This file may be distributed and/or modified under the
@@ -13,7 +13,7 @@
%%
%%
\ProvidesFile{novel-Footnotes.sty}%
-[2018/04/26 v1.52 LaTeX file (commands for footnotes and endnotes)]
+[2023/02/08 v1.80 LaTeX file (commands for footnotes and endnotes)]
%%
@@ -304,7 +304,7 @@
-%% ENDNOTES. Behavior modified in v. 1.50 (added error messages).
+%% ENDNOTES
%% ----------------------------------------------------------------------------
% \endnote only places a marker. It does not store a note for later use.
% Any argument is non-printing. So \endnote{ancestry of yada} does not print
diff --git a/macros/luatex/latex/novel/novel-HeadFootStyles.sty b/macros/luatex/latex/novel/tex/lualatex/novel/novel-HeadFootStyles.sty
index e19000bb26..4e003edd15 100644
--- a/macros/luatex/latex/novel/novel-HeadFootStyles.sty
+++ b/macros/luatex/latex/novel/tex/lualatex/novel/novel-HeadFootStyles.sty
@@ -1,6 +1,6 @@
%%
%% This is file `novel-HeadFootStyles.sty', part of `novel' document class.
-%% Copyright 2017-2018 Robert Allgeyer.
+%% Copyright 2017-2023 Robert Allgeyer.
%%
%%
%% This file may be distributed and/or modified under the
@@ -13,7 +13,7 @@
%%
%%
\ProvidesFile{novel-HeadFootStyles.sty}%
-[2018/04/26 v1.52 LaTeX file (header and footer layouts and styles)]
+[2023/02/08 v1.80 LaTeX file (header and footer layouts and styles)]
%%
@@ -138,8 +138,8 @@
\gdef\SetLooseHead#1{
\FPdiv{\@loosehead}{#1}{10} % change method fontspec w/ microtype
\FPmin{\@looseheadN}{\@loosehead}{50} % don't want numbers too loose
- \FPdiv{\@looseheadword}{\@loosehead}{30} % inter-word, new in v. 1.40.3
- \FPadd{\@looseheadword}{\@looseheadword}{1}
+ \FPdiv{\@looseheadword}{\@loosehead}{30} %
+ \FPadd{\@looseheadword}{\@looseheadword}{1} %
}
\SetLooseHead{50}
%%
@@ -368,10 +368,10 @@
% \versoheadtext is initialized to \theauthor
% \rectoheadtext is initialized to \thetitle
\@ifundefined{versoheadtext}{
- \NewVersoHeadText{\theauthor} % revised in v. 1.40.3
+ \NewVersoHeadText{\theauthor}
}{}
\@ifundefined{rectoheadtext}{
- \NewRectoHeadText{\thetitle} % revised in v. 1.40.3
+ \NewRectoHeadText{\thetitle}
}{}
%
% ---------------------------------------------------------------------------
diff --git a/macros/luatex/latex/novel/novel-Images.sty b/macros/luatex/latex/novel/tex/lualatex/novel/novel-Images.sty
index fc6261e072..206f130565 100644
--- a/macros/luatex/latex/novel/novel-Images.sty
+++ b/macros/luatex/latex/novel/tex/lualatex/novel/novel-Images.sty
@@ -1,6 +1,6 @@
%%
%% This is file `novel-Images.sty', part of `novel' document class.
-%% Copyright 2017-2018 Robert Allgeyer.
+%% Copyright 2017-2023 Robert Allgeyer.
%%
%%
%% This file may be distributed and/or modified under the
@@ -13,7 +13,7 @@
%%
%%
\ProvidesFile{novel-Images.sty}%
-[2018/04/26 v1.52 LaTeX file (image placement)]
+[2023/02/08 v1.80 LaTeX file (image placement)]
%%
@@ -128,7 +128,7 @@ end
%%
-%% New in version 1.50, makecmyk script, with special syntax:
+%%
\LetLtxMacro\@scriptincludepdf\includepdf\relax
\providecommand\includepdf[2][]{}
\renewcommand\includepdf[2][]{% from package `pdfpages'
@@ -281,9 +281,8 @@ end
%%
-%% FLOAT IMAGE
+%% FLOAT IMAGE (centered unless offset)
%% ----------------------------------------------------------------------------
-%% New in v.1.50. \FloatImage. Centered unless offset.
% \FloatImage[floatmethod,xoffset,yoffset]{yourimagename.png} % or jpg
% This is a substitute for other floats. Does not require `float' package.
% Default: [ht,0pt,\nfs].
@@ -411,7 +410,6 @@ end
%% WRAP IMAGE
-%% New in v. 1.50. Wraps text around an image, with limited float support.
% This is a shim to `wrapfig' package. Since `novel' uses its own method for
% placing images, environments defined in `wrapfig' cannot be used directly.
% \WrapImage[position]{image} % default position r
@@ -435,7 +433,7 @@ end
%%
-%% New in version 1.52: read file bytes as plain text, for later parsing.
+%% Read file bytes as plain text, for later parsing.
% Output is comma-separated list of byte codes, decimal 0-255.
% Returns -1 if requested start is more than file size.
% Returns all bytes if requested number exceeds file size.
diff --git a/macros/luatex/latex/novel/novel-JC200103.clo b/macros/luatex/latex/novel/tex/lualatex/novel/novel-JC200103.clo
index 578f883adb..7286dac7dc 100644
--- a/macros/luatex/latex/novel/novel-JC200103.clo
+++ b/macros/luatex/latex/novel/tex/lualatex/novel/novel-JC200103.clo
@@ -2,7 +2,7 @@
%% This is file `novel-JC200103.clo', part of `novel' document class.
%% The values of the arguments are public industry standards.
\ProvidesFile{novel-JC200103.clo}%
-[2018/01/14 any version. (novel Output Intent JC200103)]
+[2023/02/08 any version. (novel Output Intent JC200103)]
%%
diff --git a/macros/luatex/latex/novel/novel-LayoutSettings.sty b/macros/luatex/latex/novel/tex/lualatex/novel/novel-LayoutSettings.sty
index 690a4b03e6..a9b2bb09e1 100644
--- a/macros/luatex/latex/novel/novel-LayoutSettings.sty
+++ b/macros/luatex/latex/novel/tex/lualatex/novel/novel-LayoutSettings.sty
@@ -1,6 +1,6 @@
%%
%% This is file `novel-LayoutSettings.sty', part of `novel' document class.
-%% Copyright 2017-2018 Robert Allgeyer.
+%% Copyright 2017-2023 Robert Allgeyer.
%%
%%
%% This file may be distributed and/or modified under the
@@ -13,7 +13,7 @@
%%
%%
\ProvidesFile{novel-LayoutSettings.sty}%
-[2018/04/26 v1.52 LaTeX file (layout settings)]
+[2023/02/08 v1.80 LaTeX file (layout settings)]
%%
@@ -82,7 +82,7 @@
%%
-%% New in version 1.50: Unsafe Zone (opposite of "safe area").
+%% Unsafe Zone (opposite of "safe area").
% This feature only applies with class options `draft,shademargins'
% and does NOT apply in `coverart'.
% The purpose of margins is to confine the main text (and header/footer).
@@ -151,13 +151,12 @@
% Class options `cropview' and `closecrop' (only in draft mode)
% affect Media Size. See their descriptions below.
%
-% \SetMediaSize[<obsolete option>]{width}{height} usage:
-% The optional argument is obsolete. Anything there will be ignored.
+% \SetMediaSize{width}{height} usage:
\newif \if@MediaSize % true if \SetMediaSize rather than default = Trim Size.
-\DeclareDocumentCommand\SetMediaSize { O{} m m } {% width, height
+\DeclareDocumentCommand\SetMediaSize { m m } {% width, height
\@MediaSizetrue
- \gsetlength\paperwidth{#2}
- \gsetlength\paperheight{#3}
+ \gsetlength\paperwidth{#1}
+ \gsetlength\paperheight{#2}
}% end \SetMediaSize
%%
@@ -303,34 +302,19 @@
\ClassError{novel}{\string\mainmatter\ used more than once}%
{You issued \string\mainmatter\ more than once.}%
\fi
- \cleartorecto % added v. 1.40.1
+ \cleartorecto
\global\WithinFrontmatterfalse\global\WithinMainmattertrue
\pagenumbering{arabic}
\setcounter{page}{1}
}
%
-\def\backmatter{\@ifstar\@backmatterst\@backmatterns} % asterisk obsolete
-\def\@backmatterst{%
- \ClassWarning{novel}{^^J\string\backmatter*\ ignored. Do not use. ^^J}%
-}
-%
+\def\backmatter{\@ifstar\@backmatterst\@backmatterns}
\def\@backmatterns{%
- \cleartorecto% v. 1.40.2
+ \cleartorecto%
\typeout{^^JClass `novel' Alert: \string\backmatter\space merely %
- clears to recto. See docs. ^^J}% v. 1.42
-%
+ clears to recto. See docs. ^^J}%
}
-%
-\def\Backmatter{\@ifstar\@Backmatterst\@Backmatterns} % obsolete
-%
-\def\@Backmatterst{% continues frontmatter count w/ uppercase Roman numerals
- \ClassWarning{novel}{^^J\string\Backmatter*\ ignored. Do not use. ^^J}%
-}
-%
-\def\@Backmatterns{%
- \ClassWarning{novel}{^^J\string\Backmatter\ ignored. Do not use. ^^J}%
-}
-%
+\let\@backmatterst\@backmatterns
%% end frontmatter, mainmatter. No backmatter!
diff --git a/macros/luatex/latex/novel/novel-PostLayout.sty b/macros/luatex/latex/novel/tex/lualatex/novel/novel-PostLayout.sty
index a2796db1d1..5096645cac 100644
--- a/macros/luatex/latex/novel/novel-PostLayout.sty
+++ b/macros/luatex/latex/novel/tex/lualatex/novel/novel-PostLayout.sty
@@ -1,6 +1,6 @@
%%
%% This is file `novel-PostLayout.sty', part of `novel' document class.
-%% Copyright 2017-2018 Robert Allgeyer.
+%% Copyright 2017-2023 Robert Allgeyer.
%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -12,7 +12,7 @@
%%
%%
\ProvidesFile{novel-PostLayout.sty}%
-[2018/04/26 v1.52 LaTeX file (post-layout modifications)]
+[2023/02/08 v1.80 LaTeX file (post-layout modifications)]
%%
%%
diff --git a/macros/luatex/latex/novel/novel-Sandbox.sty b/macros/luatex/latex/novel/tex/lualatex/novel/novel-Sandbox.sty
index 9939c66110..71b890738e 100644
--- a/macros/luatex/latex/novel/novel-Sandbox.sty
+++ b/macros/luatex/latex/novel/tex/lualatex/novel/novel-Sandbox.sty
@@ -1,6 +1,6 @@
%%
%% This is file `novel-Sandbox.sty', part of `novel' document class.
-%% Copyright 2017-2018 Robert Allgeyer.
+%% Copyright 2017-2023 Robert Allgeyer.
%%
%% Material extracted from `article.cls', a LaTeX document class.
%% Copyright 1993-2016
@@ -17,7 +17,7 @@
%%
%%
\ProvidesFile{novel-Sandbox.sty}%
-[2018/04/26 v1.52 LaTeX file (used only with sandbox class option)]
+[2023/02/08 v1.80 LaTeX file (used only with sandbox class option)]
%%
%%
diff --git a/macros/luatex/latex/novel/novel-TextMacros.sty b/macros/luatex/latex/novel/tex/lualatex/novel/novel-TextMacros.sty
index 5b994c2538..23a6a8af9d 100644
--- a/macros/luatex/latex/novel/novel-TextMacros.sty
+++ b/macros/luatex/latex/novel/tex/lualatex/novel/novel-TextMacros.sty
@@ -1,6 +1,6 @@
%%
%% This is file `novel-TextMacros.sty', part of `novel' document class.
-%% Copyright 2017-2018 Robert Allgeyer.
+%% Copyright 2017-2023 Robert Allgeyer.
%%
%%
%% This file may be distributed and/or modified under the
@@ -13,7 +13,7 @@
%%
%%
\ProvidesFile{novel-TextMacros.sty}%
-[2018/04/26 v1.52 LaTeX file (text macros usable within document body)]
+[2023/02/08 v1.80 LaTeX file (text macros usable within document body)]
%%
@@ -60,7 +60,6 @@
%% ----------------------------------------------------------------------------
%%
-% New in version 1.38, \straightquote and \straightdblquote:
\gdef\straightquote{{\addfontfeature{Ligatures=ResetAll}'}}
\gdef\straightdblquote{{\addfontfeature{Ligatures=ResetAll}"}}
%%
@@ -298,7 +297,7 @@
%%
-%% Environment parascale. Scales one or more paragraphs. Modified in v. 1.52.
+%% Environment parascale. Scales one or more paragraphs.
% Warns when (as is often the case) the line after \end{parascale}
% will be off grid. Then, add some \vspace just before \end{parascale}.
\newenvironment{parascale}[1][1]{% optional argument is scale, default 1.
@@ -496,7 +495,7 @@
%%
-%% New in version 1.50: two columns, cannot cross page break.
+%% Two columns, cannot cross page break.
%% \sidebyside[a,b,c,d]{column 1 content}{column 2 content} % a,b,c,d lengths
% a = left margin to left edge of left column (left indent)
% b = left margin to right edge of left column ( = a + column width)
diff --git a/macros/luatex/latex/novel/novel-microtype.cfg b/macros/luatex/latex/novel/tex/lualatex/novel/novel-microtype.cfg
index d5bb8e639f..e9076d5593 100644
--- a/macros/luatex/latex/novel/novel-microtype.cfg
+++ b/macros/luatex/latex/novel/tex/lualatex/novel/novel-microtype.cfg
@@ -1,6 +1,6 @@
%%
%% This is file `novel-microtype.cfg', part of `novel' document class.
-%% Modified from file `microtype.cfg' by Robert Allgeyer, 2017-2018.
+%% Modified from file `microtype.cfg' by Robert Allgeyer, 2017-2023.
%%
%% Original notice from `microtype.cfg' follows.
%% Same license for `novel-microtype.cfg'.
@@ -19,7 +19,7 @@
%% ------------------------------------------------------------------------
%%
\ProvidesFile{novel-microtype.cfg}%
-[2018/01/14 any version. (default microtype configuration for novel class)]
+[2023/02/08 any version. (default microtype configuration for novel class)]
%%% ---------------------------------------------------------------------------
%%% FONT SETS
diff --git a/macros/luatex/latex/novel/novel-pdfx.sty b/macros/luatex/latex/novel/tex/lualatex/novel/novel-pdfx.sty
index 4af4ea09f0..537ccf65c7 100644
--- a/macros/luatex/latex/novel/novel-pdfx.sty
+++ b/macros/luatex/latex/novel/tex/lualatex/novel/novel-pdfx.sty
@@ -1,6 +1,6 @@
%%
%% This is file `novel-pdfx.sty', part of `novel' document class.
-%% Copyright (c) 2017-2018 Robert Allgeyer.
+%% Copyright (c) 2017-2023 Robert Allgeyer.
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -21,7 +21,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{novel-pdfx.sty}%
-[2018/04/26 v1.52 LaTeX file (PDF/X support for novel class)]
+[2023/02/08 v1.80 LaTeX file (PDF/X support for novel class)]
% This package supports, and is part of, class `novel'.
% No support for anything but LuaLaTeX.
@@ -157,7 +157,7 @@
/TrimBox[\@myTWorigin\space\@myTHorigin\space\@myTWcorner\space\@myTHcorner]%
}
%
-% New in version 1.2: BleedBox, only for cover art. Same size as MediaBox.
+% BleedBox, only for cover art. Same size as MediaBox.
\newcommand\novel@BleedBox{%
\if@coverart%
/BleedBox[0\space0\space\@myMWN\space\@myMHN]%
diff --git a/macros/luatex/latex/novel/tex/lualatex/novel/novel-xmppacket.sty b/macros/luatex/latex/novel/tex/lualatex/novel/novel-xmppacket.sty
new file mode 100644
index 0000000000..006c5f777e
--- /dev/null
+++ b/macros/luatex/latex/novel/tex/lualatex/novel/novel-xmppacket.sty
@@ -0,0 +1,111 @@
+%%
+%% This is file `novel-xmppacket.sty', part of `novel' document class.
+%% Copyright 2017-2023 Robert Allgeyer.
+%%
+%%
+%% This file may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%%
+%% ----------------------------------------------------------------------------
+%%
+%% The descriptive properties of the namespaces, and the general format of XMP,
+%% are public standards released by Adobe Systems Incorporated.
+%% See http://www.adobe.com/products/xmp.html
+%%
+%% ----------------------------------------------------------------------------
+%%
+%%
+\ProvidesFile{novel-xmppacket.sty}%
+[2023/02/08 any version. (novel XMP packet template)]
+%%
+
+
+
+% This packet uses utf-8 BOM.
+% The catcodes allow # _ ~ $ % & to be used as ordinary characters.
+% \edef and \let get rid of escape backslashes in front of those characters.
+% NO COMMENTS AFTER THIS! Until \endgroup.
+
+
+
+
+
+\begingroup
+\catcode`\¤=12\relax
+\lccode`\¤="FEFF
+\lowercase{\gdef\@novelBOM{¤}}
+\catcode`\#=12
+\catcode`\_=12
+\catcode`\~=12
+\catcode`\$=12
+\catcode`\%=12
+\catcode`\&=12
+
+\edef\@pctchar{\expandafter\@gobble\string\%}
+\let\%\@pctchar
+\edef\@hashchar{\expandafter\@gobble\string\#}
+\let\#\@hashchar
+\edef\@ampchar{\expandafter\@gobble\string\&amp;}
+\let\&\@ampchar
+\edef\@dollarchar{\expandafter\@gobble\string\$}
+\let\$\@dollarchar
+\edef\@underchar{\expandafter\@gobble\string\_}
+\let\_\@underchar
+\edef\@tildechar{\expandafter\@gobble\string\~}
+\let\~\@tildechar
+
+\xdef\@xmpPacket{<?xpacket begin="\@novelBOM" id="W5M0MpCehiHzreSzNTczkc9d"?>^^J
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 4.2.1-c043 52.372728, 2009/01/18-15:08:04\pad@iv\pad@iv">^^J
+\pad@ii<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">^^J
+\pad@iv<rdf:Description rdf:about=""^^J
+\pad@viii xmlns:xmp="http://ns.adobe.com/xap/1.0/">^^J
+\pad@vi<xmp:ModifyDate>\@modifyDate</xmp:ModifyDate>^^J
+\pad@vi<xmp:CreateDate>\@createDate</xmp:CreateDate>^^J
+\@applicationString
+\pad@vi<xmp:MetadataDate>\@metadataDate</xmp:MetadataDate>^^J
+\pad@iv</rdf:Description>^^J
+\pad@iv<rdf:Description rdf:about=""^^J
+\pad@viii xmlns:dc="http://purl.org/dc/elements/1.1/">^^J
+\pad@vi<dc:format>application/pdf</dc:format>^^J
+\@titleString
+\@authorString
+\pad@iv</rdf:Description>^^J
+\pad@iv<rdf:Description rdf:about=""^^J
+\pad@viii xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/">^^J
+\pad@vi<xmpMM:DocumentID>\@documentID</xmpMM:DocumentID>^^J
+\pad@vi<xmpMM:InstanceID>\@instanceID</xmpMM:InstanceID>^^J
+\pad@vi<xmpMM:RenditionClass>default</xmpMM:RenditionClass>^^J
+\pad@vi<xmpMM:VersionID>1</xmpMM:VersionID>^^J
+\pad@iv</rdf:Description>^^J
+\pad@iv<rdf:Description rdf:about=""^^J
+\pad@viii xmlns:pdf="http://ns.adobe.com/pdf/\@pdfVersion/">^^J
+\@producerString
+\pad@vi<pdf:Trapped>False</pdf:Trapped>^^J
+\pad@iv</rdf:Description>^^J
+\pad@iv<rdf:Description rdf:about=""^^J
+\pad@viii xmlns:pdfx="http://ns.adobe.com/pdfx/\@pdfVersion/">^^J
+\@verconfString
+\pad@iv</rdf:Description>^^J
+\pad@iv<rdf:Description rdf:about=""^^J
+\pad@viii xmlns:pdfxid="http://www.npes.org/pdfx/ns/id/">^^J
+\@pdfidString
+\pad@iv</rdf:Description>^^J
+\pad@ii</rdf:RDF>^^J
+</x:xmpmeta>^^J
+\pad@dxii
+<?xpacket end="w"?>}
+\endgroup
+
+
+% OK to use comments now.
+%%
+\endinput
+%%
+%% End of file `novel-xmppacket.sty'.
+
diff --git a/macros/luatex/latex/novel/novel.cls b/macros/luatex/latex/novel/tex/lualatex/novel/novel.cls
index e029b43c79..0d894e1fdf 100644
--- a/macros/luatex/latex/novel/novel.cls
+++ b/macros/luatex/latex/novel/tex/lualatex/novel/novel.cls
@@ -1,6 +1,7 @@
%%
%% This is file `novel.cls', LuaLaTeX `novel' document class.
-%% Copyright 2017-2018 Robert Allgeyer. Contact: anytthree [at] gmail.com
+%% Copyright 2017-2023 Robert Allgeyer.
+%% Contact: Username `rallg' on GitHub and stackexchange. `RobtAll' on CTAN.
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -13,26 +14,9 @@
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
% Actually needs LuaLaTeX, at least version 0.95 from TeXLive 2016.
-\ProvidesClass{novel}[2018/04/26 v1.52 LaTeX document class]
+\ProvidesClass{novel}[2023/02/08 v1.80 LaTeX document class]
%%
-%% Version 1.50.n (any n) incremental minor changes from 1.50.
-%% Version 1.50: Improved image handled, sandbox, scripts.
-%% Version 1.46.2: Now called "novel-old" version.
-%% Version 1.43: General cleanup of docs and code, for improved readbaility.
-%% Version 1.42: Greatly improved HTML documentation.
-%% Version 1.41: Improved HTML documentation.
-%% Versions 1.40.x: Incremental minor changes, leading to 1.42.
-%% Version 1.40: removed `debug' option (was not useful). Major docs rewrite.
-%% This version was successfully used for a P.O.D. novel, with cover.
-%% Version 1.38: corrected offset in cover artwork; some docs modified.
-%% Version 1.36: minor documentation correction.
-%% Version 1.34: Added debug class option and related code. [Later removed.]
-%% Version 1.32 includes a minor documentation fix, and a major bug fix
-%% concerning looose text tracking. The bug occasionally appeared when
-%% page headings were compiled, but gave a cryptic error message
-%% about MT@res@a. The fix is expected to be permanent.
-%% Version 1.2: Added capability for cover artwork.
-%% Versions 1.1.x: First general release, occasional documentation changes.
+%% Version 1.80: Minor changes. Class option `revert' for 1.5.2 behavior.
%% DESCRIPTION:
@@ -54,9 +38,8 @@
%% Fonts are loaded by luaotfload and fontspec, and massaged by microtype.
%% For best results, use modern Open Type fonts, or TrueType fonts.
%%
-%% The Libertinus font family, a fork of [Linux] Libertine/Biolinum,
-%% is the default. Actually, I recommend it! In addition, an included
-%% custom font, NovelDeco.otf, is used for special purposes.
+%% The Libertinus font family, fork of [Linux] Libertine/Biolinum, is default.
+%% An included custom font, NovelDeco.otf, is used for special purposes.
%%
@@ -73,7 +56,8 @@
\pdfvariable suppressoptionalinfo 511 % writes only ID to PDF Catalog
\else
\ClassError{novel}{Must compile with LuaLaTeX 0.95+}%
- {Sorry, LuaLaTeX only. No pdfTeX, dvips, or XeTeX.}
+ {Sorry, LuaLaTeX only. No pdfTeX, dvips, or XeTeX.^^J%
+ Command line: lualatex your-document.tex}
\fi
\pdfimageresolution=300 % default dpi if image does not say
%
@@ -106,7 +90,6 @@
% with suitable arguments, when the time comes:
% fontspec -- in novel-LayoutSettings.sty
% unicode-math -- in novel-LayoutSettings.sty
-% polyglossia -- in novel-LayoutSettings.sty
% microtype -- in novel-Fonts.sty
% hyperref -- in novel-pdfx.sty
% fancyhdr -- in novel.HeadFootStyles.sty
@@ -138,12 +121,13 @@
%% ----------------------------------------------------------------------------
% Allowed option list:
% draft xml shademargins cropmarks cropview closecrop
-% coverart sandbox unblock mtoff polyoff test
+% coverart sandbox unblock mtoff test revert
% Yes, I realize that this could have been done another way, but I want
% to issue error messages from `novel' rather than (say) `keyval':
\gdef\@mycol{\@classoptionslist}
\StrDel{\@mycol}{ }[\@mycol]
\StrDel{\@mycol}{,}[\@mycol]
+\StrDel{\@mycol}{revert}[\@mycol]
\StrDel{\@mycol}{draft}[\@mycol]
\StrDel{\@mycol}{xml}[\@mycol]
\StrDel{\@mycol}{shademargins}[\@mycol]
@@ -155,20 +139,19 @@
\StrDel{\@mycol}{coverart}[\@mycol]
\StrDel{\@mycol}{unblock}[\@mycol]
\StrDel{\@mycol}{mtoff}[\@mycol]
-\StrDel{\@mycol}{polyoff}[\@mycol]
\StrDel{\@mycol}{test}[\@mycol]
\StrDel{\@mycol}{sandbox}[\@mycol]
%
\ifthenelse{\equal{\@mycol}{}}{}{
\ClassWarning{novel}{^^JUnrecognized class option: \@mycol. ^^J%
The unrecognized option was ignored! ^^J%
- If `debug' it is obsolete from v.1.40. ^^J%
Note that font size, document size, and language ^^J%
are not `novel' class options. See documentation. ^^J}%
}
+% Version 1.80 has minor tweaks. Option `revert' for version 1.52 behavior.
+\newif \if@novrevert
+\DeclareOption{revert}{\@novreverttrue}
% If used, option `draft' shows overflow rule.
-% Prior to v. 1.46.1, the following was \if@useDraftMode.
-% Changed for possible compatibility with packages that detect draft mode.
\newif \ifdraftdoc
\setlength\overfullrule{0pt}
\DeclareOption{draft}{
@@ -192,7 +175,7 @@
\DeclareOption{shademargins}{\@shademarginstrue}
%
\newif \if@graytext % remains here for backwards compatibility
-\@graytexttrue % from v.1.50 always true, no longer an option.
+\@graytexttrue % Always true.
%
% Usually you do NOT want crop (trim) marks!
\newif \if@cropmarks
@@ -211,12 +194,11 @@
% it has no hyperlinks and is missing some features that an e-book should have.
\newif \if@closecrop
\DeclareOption{closecrop}{\@cropviewtrue\@closecroptrue}
-% New in version 1.2: `coverart' option. See documentation.
% This is used to create a 1-page file with no text, just an image.
-% Intended purpose is PDF/X for novel cover.
+% Option coverart. Intended purpose is PDF/X for novel cover.
\newif \if@coverart
\DeclareOption{coverart}{\@coverarttrue}
-% New in version 1.34: unblock option, for developer use only.
+% Option unblock, for developer use only.
% Normally, a number of packages known to be incompatible with `novel'
% are blocked from loading. If the user tries to get them via \usepackage
% or \RequirePackage, or if they are called within some other loaded package,
@@ -224,20 +206,15 @@
% and allows incompatible packages to load. Use only at own risk!
\newif \if@novelunblock % For developer use.
\DeclareOption{unblock}{\@novelunblocktrue}
-% New in version 1.44: mtoff option, primarily for developer use.
+% Option mtoff. Primarily for developer use.
% With mtoff, the microtype package is not loaded.
\newif \if@mtoff
\DeclareOption{mtoff}{\@mtofftrue}
-% New in version 1.44: polyoff option, primarily for developer use.
-% With polyoff, the polyglossia package is not loaded.
-% You may need to load babel, or not, via \RequirePackage[options]{babel}.
-\newif \if@polyoff
-\DeclareOption{polyoff}{\@polyofftrue}
-% New in version 1.46: test option, primarily for developer use.
+% Option test. Primarily for developer use.
\newif \if@testsuite
\DeclareOption{test}{\@testsuitetrue}
%
-% New in version 1.50: sandbox option, for artwork and tables. Max 4 pages.
+% Option sandbox. for artwork and tables. Max 4 pages.
\newif \if@sandbox
\DeclareOption{sandbox}{\@sandboxtrue}
%
@@ -356,27 +333,17 @@
\RequirePackage{novel-LayoutSettings}
-%% Polyglossia.
+%% Language support.
%% ----------------------------------------------------------------------------
-% Language-specific settings:
-\if@polyoff % polyoff is new in v 1.44.
- \ClassWarning{novel}{^^JYou chose the `polyoff' class option. ^^J%
- So, the polyglossia package was not loaded. But like it or not, ^^J%
- the babel package was loaded, with generic hyphenation. ^^J%
- This behavior, or choice of language, cannot be changed. ^^J%
- If you want a specific language, you will have to use polyglossia. ^^J}%
-\else
- \RequirePackage{polyglossia} % loading order changed in v. 1.40.3.
- \setdefaultlanguage[variant=american]{english} % may be changed by user
-\fi
-%% end polyglossia
+\RequirePackage{polyglossia}
+\setdefaultlanguage[variant=american]{english} % may be changed by user
+%% end language support.
%% Additional Macros, Loaded in Preamble.
%% ----------------------------------------------------------------------------
\RequirePackage{novel-Fonts} % font settings and defaults
\if@coverart\else\RequirePackage{lipsum}\fi % generates dummy text for examples
-%% New in version 1.50:
\RequirePackage{novel-DropCap}
% Macros for use in document body:
\RequirePackage{novel-TextMacros}
@@ -390,8 +357,6 @@
\RequirePackage{novel-Images}
% Footnotes and endnotes:
\RequirePackage{novel-Footnotes}
-% Obsolete code. Do not use in new documents:
-\RequirePackage{novel-Obsolete}
%%
diff --git a/macros/luatex/latex/pyluatex/pyluatex-interpreter.py b/macros/luatex/latex/pyluatex/pyluatex-interpreter.py
index 341c2ace04..13256ba386 100644
--- a/macros/luatex/latex/pyluatex/pyluatex-interpreter.py
+++ b/macros/luatex/latex/pyluatex/pyluatex-interpreter.py
@@ -82,7 +82,7 @@ class Interpreter(InteractiveInterpreter):
self.success = False
output += out.getvalue()
if not ignore_errors and not self.success:
- return False, output
+ return False, output, self.tex._log_message()
return self.success, output, self.tex._log_message()
def execute(self, code):
diff --git a/macros/luatex/latex/pyluatex/pyluatex.pdf b/macros/luatex/latex/pyluatex/pyluatex.pdf
index bc41fa99e4..d357f15385 100644
--- a/macros/luatex/latex/pyluatex/pyluatex.pdf
+++ b/macros/luatex/latex/pyluatex/pyluatex.pdf
Binary files differ
diff --git a/macros/luatex/latex/pyluatex/pyluatex.sty b/macros/luatex/latex/pyluatex/pyluatex.sty
index db5654e6b8..11b9261709 100644
--- a/macros/luatex/latex/pyluatex/pyluatex.sty
+++ b/macros/luatex/latex/pyluatex/pyluatex.sty
@@ -9,7 +9,7 @@
%% version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{pyluatex}[2023/01/14 v0.6.0 Execute Python code on the fly]
+\ProvidesPackage{pyluatex}[2023/02/15 v0.6.1 Execute Python code on the fly]
\RequirePackage{expl3}
\ExplSyntaxOn
diff --git a/macros/luatex/latex/pyluatex/pyluatex.tex b/macros/luatex/latex/pyluatex/pyluatex.tex
index 4dc0c09e35..908fb04c77 100644
--- a/macros/luatex/latex/pyluatex/pyluatex.tex
+++ b/macros/luatex/latex/pyluatex/pyluatex.tex
@@ -15,7 +15,7 @@
\usepackage{url}
\title{The \emph{pyluatex} package}
\author{Tobias Enderle\\\url{https://github.com/tndrle/PyLuaTeX}}
-\date{v0.6.0 (2023/01/14)}
+\date{v0.6.1 (2023/02/15)}
\begin{document}
\maketitle
\raggedright
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index adc16160c5..be4c59fd01 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -45,6 +45,7 @@ $mirrors = {
},
'Korea' => {
'http://ftp.ktug.org/tex-archive/' => 1,
+ 'https://cran.asia/tex/' => 1,
'https://ftp.kaist.ac.kr/pub/tex-archive/' => 1,
'https://lab.uklee.pe.kr/tex-archive/' => 1,
'https://mirror.kakao.com/CTAN/' => 1,
@@ -69,6 +70,7 @@ $mirrors = {
'https://mirror.datacenter.by/pub/mirrors/CTAN/' => 1,
},
'Czech Republic' => {
+ 'http://ftp.cvut.cz/tex-archive/' => 1,
'https://mirrors.nic.cz/tex-archive/' => 1,
},
'Denmark' => {
@@ -180,9 +182,6 @@ $mirrors = {
'https://mirror.its.dal.ca/ctan/' => 1,
'https://muug.ca/mirror/ctan/' => 1,
},
- 'Costa Rica' => {
- 'https://mirrors.ucr.ac.cr/CTAN/' => 1,
- },
'USA' => {
'http://bay.uchicago.edu/CTAN/' => 1,
'http://mirrors.ibiblio.org/pub/mirrors/CTAN/' => 1,
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index f2df2210a8..cebedca7b8 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
@@ -26,7 +26,7 @@ depend container_split_src_files/1
depend frozen/0
depend minrelease/2016
depend release/2022
-depend revision/65825
+depend revision/65837
name 00texlive.image
category TLCore
@@ -4707,7 +4707,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
name 00texlive.installer
category TLCore
-revision 65811
+revision 65827
shortdesc TeX Live standalone installer package
longdesc This package defines the files to go into the installer
longdesc archives (install-tl-unx.tar.gz, install-tl.zip) built by the
@@ -194129,7 +194129,7 @@ catalogue-version 1.17
name luacomplex
category Package
-revision 65388
+revision 65833
shortdesc Operations on complex numbers inside LaTeX documents using Lua
relocated 1
longdesc The luacomplex package is developed to define complex numbers
@@ -194141,10 +194141,10 @@ longdesc operations on complex numbers. The package commands can be used
longdesc in any environment (including the mathematics environment). It
longdesc is written in Lua, and the .tex file is to be compiled with the
longdesc LuaLaTeX engine.
-containersize 1620
-containerchecksum bafc391663fe141d9ea851de5f31eb1ce8b6449bb48ffd55552eaa5d81d42d89a6b9da20879e948ca15add4bc2256bbd8c46d873b8ff3dd19488e1a12fb75634
-doccontainersize 114736
-doccontainerchecksum 7390f4233447765778634b6b912b9e39ee712333f3cbfc90180ee03d4350e56151aff28972819151ea922e03119f6fceefeda96f83f106845729d36cfa66e70e
+containersize 1660
+containerchecksum 621f7f8955c309b31f19a94cfff7632591f5b67b60cdeb1ddccb1076855a49c0e9030fd7abcb21cb7c3c474d3d418e8f08e6d1d4a74fa18f96307bdf8ab96094
+doccontainersize 115644
+doccontainerchecksum abcc97af487f24e2fa0636a3bfb069419eb29071e2060c7712c22c5a4dafc97b082e72b27f3e390a74564d1950b1f7158bee90151399ec6c5175513a9c9eb706
docfiles size=36
RELOC/doc/lualatex/luacomplex/README.txt details="Readme"
RELOC/doc/lualatex/luacomplex/luacomplex.pdf details="Package documentation"
@@ -194154,7 +194154,7 @@ runfiles size=1
catalogue-ctan /macros/luatex/latex/luacomplex
catalogue-license lppl1.3c
catalogue-topics luatex maths
-catalogue-version 1.0
+catalogue-version 1.2
name luafindfont
category Package
@@ -195294,7 +195294,7 @@ catalogue-version 2.75
name lualinalg
category Package
-revision 65791
+revision 65834
shortdesc A linear algebra package for LaTeX
relocated 1
longdesc The lualinalg package is developed to perform operations on
@@ -195312,10 +195312,10 @@ longdesc from other software (which may not be in LaTeX-compatible
longdesc format) and to use them in a tex file. The vectors and matrices
longdesc of reasonable size can be handled with ease. The package can be
longdesc modified or extended by writing custom Lua programs.
-containersize 8148
-containerchecksum c75d5c85a7499c98b8885d08390d1da1b93bf04de0cfd618cd65073eb5cb6b1c782ef169135946042d916302142ced9fd04311ec75c34bf7d790f6ce6acbb383
-doccontainersize 261108
-doccontainerchecksum bc773257368f0e3413e93b87201e0d6a8c258d2d3b2d901a7f30f3e59954b5ca5c51a5105f8511a115eb5355f8fb2cc23afb6480cc89bf784430cdabe017f669
+containersize 8152
+containerchecksum 18ff75c7153af357e5913b01cd4d9ba8fd5e4225fb503f63dea5d9d8af6b0f13189371d04dc8ced3bfa91d9e25af479391e13ea3f1f4cf30485f51536867cc17
+doccontainersize 260860
+doccontainerchecksum eb07f1a76292facef0a93d4d407da76e18c4638ef5a51f44fa71dc7a7e3ee3e368f82bb780b67820547457ec3eaae1b6327c166705966a65f71395cfad4958ef
docfiles size=107
RELOC/doc/lualatex/lualinalg/2dvec.jpg
RELOC/doc/lualatex/lualinalg/3dvec.jpg
@@ -195328,7 +195328,7 @@ runfiles size=13
catalogue-ctan /macros/luatex/latex/lualinalg
catalogue-license lppl1.3c
catalogue-topics luatex maths
-catalogue-version 1.1
+catalogue-version 1.2
name luamathalign
category Package
@@ -249484,32 +249484,32 @@ catalogue-topics doc-supp
name piton
category Package
-revision 65673
+revision 65835
shortdesc Typeset Python listings with LPEG
relocated 1
longdesc This package uses the Lua library LPEG to typeset and highlight
longdesc Python listings.
-containersize 10328
-containerchecksum 80f097ed6a2c1e54ca994e6ffa2f03d8544c8cf28d44cc02f40cfa848b439b5e5ffb98a999ea0a9e7ccb0e4b38a52c70823ee970091e7c55d000751a075803a4
-doccontainersize 556520
-doccontainerchecksum 4adc82a222238f51df3dc208594a1235a33b1b12038e9f729bf7a343cbd279236edd056049f5e4e3cf607132e0f3101a6823f602be990d0b1dc4f7ba64f40a9b
-docfiles size=231
+containersize 11760
+containerchecksum 431d6967b4825b4e36b2251d59571f57ef3f20d231c4f215d67ba34ac5a105de25c8f2044b4f7a5bd774a906bca4d98bc77b76e3b678b80c57aee4d1c6d705b3
+doccontainersize 603852
+doccontainerchecksum ef3dfcdcfb807135535f52859c6fff5bc46e78e979c07290b96c50fa1f1ffd3fea1a17a619c23f4aeb1fc4d0b21313d841b323799ea050b38b9bb1575d974c62
+docfiles size=259
RELOC/doc/lualatex/piton/README.md details="Readme"
RELOC/doc/lualatex/piton/piton-french.pdf details="Package documentation (French)" language="fr"
RELOC/doc/lualatex/piton/piton-french.tex
RELOC/doc/lualatex/piton/piton.pdf details="Package documentation (English)"
-srccontainersize 30932
-srccontainerchecksum 2bb2bf774e775c9e5fdbad29b38243ad7ae1b3daa9ed26a153c2e35d7fe18531db71b75711b8a789475d6b14194857b538023ebd226749a0b1765bc638b5ae2d
-srcfiles size=36
+srccontainersize 34288
+srccontainerchecksum 137f87044f7625fd7db4c4fd43957f929ada766248d262c883c111592e00e63f613201c0641a50917bb663adb6c976af7e91f10193cb9cd985eedf5f27d9f52a
+srcfiles size=41
RELOC/source/lualatex/piton/piton.dtx
RELOC/source/lualatex/piton/piton.ins
-runfiles size=13
+runfiles size=15
RELOC/tex/lualatex/piton/piton.sty
catalogue-also codehigh
catalogue-ctan /macros/luatex/latex/piton
catalogue-license lppl1.3
catalogue-topics listing synt-hlt luatex
-catalogue-version 1.3
+catalogue-version 1.4
name pittetd
category Package
@@ -280607,24 +280607,21 @@ catalogue-version 0.3a
name scsnowman
category Package
-revision 54080
+revision 65832
shortdesc Snowman variants using TikZ
relocated 1
longdesc This LaTeX package provides a command \scsnowman which can
longdesc display many variants of "snowman" ("yukidaruma" in Japanese).
longdesc TikZ is required for drawing these snowmen.
-containersize 6124
-containerchecksum 61d9ae5c1632d4fcf5058fd1bb004cadb1a1becfe75d00335509c68624a62cae6780528e2633c89e9a742ea885b207efe5e36d85c402bfd98825dbc8630f200a
-doccontainersize 480336
-doccontainerchecksum 542deda691600da9cbea070436c5eb8eda2670cdfee2ac5d46d241a50de87ee6d89062c9f5c0e55341a5ea0224e44472fad867503470c3b52b6729f470b09972
-docfiles size=130
+containersize 6264
+containerchecksum feae4433995574223599a374902fa0ab45dc3d6bd408a52c3842671133ec1ada3a57c6d1f7600cb686f5f669744332a83476298af79b2b5cd2565de35357f858
+doccontainersize 501220
+doccontainerchecksum 2eb1272c41155c72ad156310765cc651cbb64356c99cb3576d785f77a5dae3eb10a6116803d3f8d4278f0c9af2e749688f7d1489bc363d334125f7e808a4750f
+docfiles size=133
RELOC/doc/latex/scsnowman/LICENSE
- RELOC/doc/latex/scsnowman/Makefile
RELOC/doc/latex/scsnowman/README.md details="Readme"
RELOC/doc/latex/scsnowman/scsnowman-sample.pdf details="Sample of use" language="ja"
RELOC/doc/latex/scsnowman/scsnowman-sample.tex
- RELOC/doc/latex/scsnowman/scsnowman-zrtest.pdf
- RELOC/doc/latex/scsnowman/scsnowman-zrtest.tex
RELOC/doc/latex/scsnowman/scsnowman.pdf details="Package documentation"
RELOC/doc/latex/scsnowman/scsnowman.tex
runfiles size=9
@@ -280635,7 +280632,7 @@ catalogue-contact-repository https://github.com/aminophen/scsnowman
catalogue-ctan /graphics/pgf/contrib/scsnowman
catalogue-license bsd2
catalogue-topics amusements graphics pgf-tikz
-catalogue-version 1.2d
+catalogue-version 1.3b
name sdaps
category Package
@@ -312612,7 +312609,7 @@ docfiles size=376
name texlive-scripts
category TLCore
-revision 65811
+revision 65827
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.
@@ -312621,9 +312618,9 @@ depend texlive.infra
execute addMap mathpple.map
postaction shortcut type=menu name="TeX Live command-line" cmd=TEXDIR/tlpkg/installer/tl-cmd.bat
containersize 113832
-containerchecksum f04b60f6ffe11a7ac87ab68f419121e604c63edbd272c740f89dc814101c37541e7ccf562a8b6b339d850356c0ea013b7ba12a8fdf4970c53553227251bad30d
-doccontainersize 424660
-doccontainerchecksum 753d1a680c4c0c5d4c871a147b48200ddf738130c9da22e9407aebfc4a3ac3a75c557237bf54068d2450f349e01e59666eeb10e2fb0b8db251b1a8e20ee27598
+containerchecksum 9975325deb3722d4cc22494dac08a15669f8a0c0856cd7a9d8e9a9ee6a603ada4648345ba6b1c550d8c29c1d709de8c38a524fac53290c35c0a981690b6030ce
+doccontainersize 424652
+doccontainerchecksum d82523d589767fe07caf2ff22ed4169c15049766cffd4f7a3c72b6d18157a24962a26f9c058934da91a10b37a989c33e91b03295677ef5d71f4c2946baece97f
docfiles size=534
doc.html
texmf-dist/doc/man/man1/fmtutil-sys.1
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 6a62cbd86d..2730291f27 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-005a2113b9b19d1ff6c55ab41f47dcd8 texlive.tlpdb
+b46159b0985ca85099d2e41024c80aa5 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index 726e6df706..5364e5a11c 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-d1c8d3e5f429a5ecdd6712a6c3bb1996a05c0e8529abd80eaaea58ccfba5ad35f9687950c0ef71d4a89cbea7841572bc93b51664ba85f0f59e1c42c531cc7638 texlive.tlpdb
+04fcfb393a1d817d8bc869be08e9177443ffd5320c2866f0b31b8a4ea01c4c0f883420deb93c8bd62d89e08aafbbfd22ab640691f9065e097df4892cdcc4ad1e texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index 33d1d8d282..10b3181f83 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
@@ -1,10 +1,10 @@
-----BEGIN PGP SIGNATURE-----
-iQEcBAEBCgAGBQJj6tuDAAoJEEzhh34ZQ4xwF7QIAIetsBwUr+BqYYGwF3bCqF8z
-ksoEZCtPXWdl2RM0qP8oqYTzNQW1RwgCYwGmjyMi92JkQdZvQIQtw8+bEDcpDVMR
-AcFXe0JBQD430kCNSuhJ3UyKpf17HGAlH4uNMfbXqDpLrq04Aiw33gGKDIEg9OTs
-IpdQNijlErGJJYObNrEkEi87cpiNxGtzearYd9RGzZrRZxSQJox4knjgMkDrxwPj
-7QETQEJagR1YF6jnTKbNUNAJV045t+36PzgQuzWf2Vfdgk6CUHCOlRiGX7pN77pN
-j8fTBcjLLmvZf6M4wC2Mdm7j7CDBcrNYUyNt9tGtXYEiGk02uo+/3/eYIBFJyQ0=
-=N/70
+iQEcBAEBCgAGBQJj7C0NAAoJEEzhh34ZQ4xwuBYH/0IY7k2IHhtJyNoVCf3E1dI3
+j/g4R+00uBUc6kO+2R0oL5NGKvSbDc4T/LmuKP/cSN3ve0OxdmtCyY9WGFgi68dC
+eYBlt/baOlZoaoACOMX2b2fZO/wSoWKIhiR/NL5TCPG46TPkJC37TtQMiArXLUor
+Y8eSg/uyGWHxZ2295B1DOpgHI5fpxDbQ+GEkF7QNmJbv7JVu1rq1YfYjENkiluby
+/z+a6dBWUdfIBqGijY7c/e4TguqifRnuPtZOy6VT7vkwFnSIr9KhtY/t4lBRD8S7
+6yZRFT9PPHviz84usgq4HQgclgwuoQNCucfYprndu9Pjto4fyPvzpVOd+fwUy3k=
+=Vc2K
-----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index 44fd9ebe71..3d13f6ce27 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 80cfaca3bf..45faa83a7f 100644
--- a/timestamp
+++ b/timestamp
@@ -2,4 +2,4 @@
# The source CTAN of this site's material:
dante.ctan.org
# The year-month-day-hour-minute of this site's material:
-2023-02-15-02-02
+2023-02-16-02-02