95 files changed, 4212 insertions, 1308 deletions

diff --git a/FILES.byname b/FILES.byname
index 5e44a334cc..bfd41563b8 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -5105,7 +5105,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
-2021/09/27 |     117481 | FILES.last07days
+2021/09/28 |      81789 | 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
@@ -187778,14 +187778,14 @@
 2020/01/30 |       1086 | language/japanese/BX/bxghost/LICENSE
 2020/01/30 |       1819 | language/japanese/BX/bxghost/README.md
 2020/01/30 |       3130 | language/japanese/BX/bxghost.zip
-2020/11/28 |     120411 | language/japanese/BX/bxjaholiday/bxjaholiday-ja.pdf
-2020/11/28 |       8750 | language/japanese/BX/bxjaholiday/bxjaholiday-ja.tex
-2020/11/28 |      87961 | language/japanese/BX/bxjaholiday/bxjaholiday.pdf
-2020/11/28 |      35840 | language/japanese/BX/bxjaholiday/bxjaholiday.sty
-2020/11/28 |       8672 | language/japanese/BX/bxjaholiday/bxjaholiday.tex
-2020/11/28 |       1091 | language/japanese/BX/bxjaholiday/LICENSE
-2020/11/28 |       1378 | language/japanese/BX/bxjaholiday/README.md
-2020/11/28 |     218055 | language/japanese/BX/bxjaholiday.zip
+2021/09/28 |     121871 | language/japanese/BX/bxjaholiday/bxjaholiday-ja.pdf
+2021/09/28 |       8750 | language/japanese/BX/bxjaholiday/bxjaholiday-ja.tex
+2021/09/28 |      89512 | language/japanese/BX/bxjaholiday/bxjaholiday.pdf
+2021/09/28 |      35932 | language/japanese/BX/bxjaholiday/bxjaholiday.sty
+2021/09/28 |       8672 | language/japanese/BX/bxjaholiday/bxjaholiday.tex
+2021/09/28 |       1091 | language/japanese/BX/bxjaholiday/LICENSE
+2021/09/28 |       1414 | language/japanese/BX/bxjaholiday/README.md
+2021/09/28 |     221072 | language/japanese/BX/bxjaholiday.zip
 2017/03/01 |      86732 | language/japanese/BX/bxjalipsum/bxjalipsum.sty
 2017/03/01 |       1086 | language/japanese/BX/bxjalipsum/LICENSE
 2017/03/01 |       3066 | language/japanese/BX/bxjalipsum/README.md
@@ -207642,12 +207642,12 @@
 2008/02/10 |      19110 | macros/latex/contrib/ean13isbn/License.txt
 2021/01/24 |        422 | macros/latex/contrib/ean13isbn/README
 2021/01/24 |     322624 | macros/latex/contrib/ean13isbn.zip
-2021/09/12 |      79213 | macros/latex/contrib/easybook/easybook.dtx
+2021/09/28 |      79237 | macros/latex/contrib/easybook/easybook.dtx
 2021/08/16 |       2081 | macros/latex/contrib/easybook/easybook.ins
-2021/09/12 |     577947 | macros/latex/contrib/easybook/easybook.pdf
-2021/09/12 |      78193 | macros/latex/contrib/easybook/easybook.tex
+2021/09/28 |     577949 | macros/latex/contrib/easybook/easybook.pdf
+2021/09/28 |      78193 | macros/latex/contrib/easybook/easybook.tex
 2021/09/06 |        799 | macros/latex/contrib/easybook/README.md
-2021/09/12 |     617981 | macros/latex/contrib/easybook.zip
+2021/09/28 |     617988 | macros/latex/contrib/easybook.zip
 2009/06/17 |      82589 | macros/latex/contrib/easy/doc/docbib.pdf
 2009/06/17 |      78378 | macros/latex/contrib/easy/doc/docbmat.pdf
 2009/06/17 |      99132 | macros/latex/contrib/easy/doc/doceqn.pdf
@@ -220469,116 +220469,116 @@
 2012/01/07 |     327688 | macros/latex/contrib/regstats/regstats.pdf
 2012/01/08 |     409653 | macros/latex/contrib/regstats.zip
 2021/05/13 |      24795 | macros/latex/contrib/reledmac/doc-include/migrate-mac.dtx
-2021/05/13 |       5602 | macros/latex/contrib/reledmac/doc-include/migrate-par.dtx
+2021/09/27 |       5602 | macros/latex/contrib/reledmac/doc-include/migrate-par.dtx
 2021/02/28 |         16 | macros/latex/contrib/reledmac/doc-more/latexmkrc
 2021/02/28 |        243 | macros/latex/contrib/reledmac/doc-more/makefile
-2021/05/30 |      40812 | macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf
+2021/09/28 |      40813 | macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf
 2021/02/28 |       4645 | macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.tex
-2021/05/30 |     197491 | macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
+2021/09/28 |     201045 | macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
 2021/05/13 |       1979 | macros/latex/contrib/reledmac/examples/1-criticalendnotes.tex
-2021/05/30 |     195653 | macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
+2021/09/28 |     199196 | macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
 2021/05/13 |       2161 | macros/latex/contrib/reledmac/examples/1-criticalnotes.tex
-2021/05/30 |     291188 | macros/latex/contrib/reledmac/examples/1-sidenotes.pdf
+2021/09/28 |     295847 | macros/latex/contrib/reledmac/examples/1-sidenotes.pdf
 2021/05/13 |       9804 | macros/latex/contrib/reledmac/examples/1-sidenotes.tex
-2021/05/30 |     281031 | macros/latex/contrib/reledmac/examples/1-tabular.pdf
+2021/09/28 |     284803 | macros/latex/contrib/reledmac/examples/1-tabular.pdf
 2021/05/13 |       2004 | macros/latex/contrib/reledmac/examples/1-tabular.tex
-2021/05/30 |     197564 | macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
+2021/09/28 |     200373 | macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
 2021/05/13 |       2592 | macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.tex
-2021/05/30 |     197396 | macros/latex/contrib/reledmac/examples/1-verses.pdf
+2021/09/28 |     200204 | macros/latex/contrib/reledmac/examples/1-verses.pdf
 2021/05/13 |       1902 | macros/latex/contrib/reledmac/examples/1-verses.tex
-2021/05/30 |     205373 | macros/latex/contrib/reledmac/examples/2-antilabe.pdf
+2021/09/28 |     209856 | macros/latex/contrib/reledmac/examples/2-antilabe.pdf
 2021/05/13 |       1998 | macros/latex/contrib/reledmac/examples/2-antilabe.tex
-2021/05/30 |     196391 | macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
+2021/09/28 |     199197 | macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
 2021/05/13 |       1857 | macros/latex/contrib/reledmac/examples/2-cross_referencing.tex
-2021/05/30 |     199862 | macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf
+2021/09/28 |     202702 | macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf
 2021/05/13 |       6806 | macros/latex/contrib/reledmac/examples/2-footnote_spacing.tex
-2021/05/30 |     280691 | macros/latex/contrib/reledmac/examples/2-glossaries.pdf
-2021/05/13 |       1794 | macros/latex/contrib/reledmac/examples/2-glossaries.tex
-2021/05/30 |     279825 | macros/latex/contrib/reledmac/examples/2-indexing.pdf
+2021/09/28 |     284462 | macros/latex/contrib/reledmac/examples/2-glossaries.pdf
+2021/09/27 |       1794 | macros/latex/contrib/reledmac/examples/2-glossaries.tex
+2021/09/28 |     283598 | macros/latex/contrib/reledmac/examples/2-indexing.pdf
 2021/05/13 |       2761 | macros/latex/contrib/reledmac/examples/2-indexing.tex
-2021/05/30 |     273987 | macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf
-2021/05/13 |       1140 | macros/latex/contrib/reledmac/examples/2-lemma_disambigution.tex
-2021/05/30 |     289480 | macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf
+2021/09/28 |     277764 | macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf
+2021/09/27 |       1140 | macros/latex/contrib/reledmac/examples/2-lemma_disambigution.tex
+2021/09/28 |     293260 | macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf
 2021/05/13 |      11391 | macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.tex
-2021/05/30 |     284653 | macros/latex/contrib/reledmac/examples/2-linespacing.pdf
+2021/09/28 |     288423 | macros/latex/contrib/reledmac/examples/2-linespacing.pdf
 2021/05/13 |       1488 | macros/latex/contrib/reledmac/examples/2-linespacing.tex
-2021/05/30 |     285314 | macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf
+2021/09/28 |     290106 | macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf
 2021/05/13 |      21449 | macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.tex
-2021/05/30 |     203109 | macros/latex/contrib/reledmac/examples/2-notes-width.pdf
+2021/09/28 |     205925 | macros/latex/contrib/reledmac/examples/2-notes-width.pdf
 2021/05/13 |       1528 | macros/latex/contrib/reledmac/examples/2-notes-width.tex
-2021/05/30 |     208756 | macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf
+2021/09/28 |     211562 | macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf
 2021/05/13 |       5161 | macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.tex
-2021/05/30 |     281669 | macros/latex/contrib/reledmac/examples/2-performances.pdf
+2021/09/28 |     286175 | macros/latex/contrib/reledmac/examples/2-performances.pdf
 2021/05/13 |       2710 | macros/latex/contrib/reledmac/examples/2-performances.tex
-2021/05/30 |      31448 | macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf
+2021/09/28 |      31498 | macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf
 2021/02/28 |       3159 | macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.tex
-2021/05/30 |     304788 | macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf
+2021/09/28 |     309311 | macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf
 2021/05/13 |      15949 | macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.tex
-2021/05/30 |     283765 | macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
+2021/09/28 |     287548 | macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
 2021/05/13 |       3065 | macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.tex
-2021/05/30 |     196243 | macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf
+2021/09/28 |     199051 | macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf
 2021/05/13 |       2006 | macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.tex
-2021/05/30 |      23426 | macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf
+2021/09/28 |      23428 | macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf
 2021/02/28 |       2388 | macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.tex
-2021/05/30 |     172606 | macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf
+2021/09/28 |     174535 | macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf
 2021/05/13 |       2912 | macros/latex/contrib/reledmac/examples/3-reledpar_mwe.tex
-2021/05/30 |      32047 | macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
+2021/09/28 |      32047 | macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
 2021/02/28 |       2027 | macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.tex
-2021/05/30 |     284905 | macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
+2021/09/28 |     288679 | macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
 2021/05/13 |      20137 | macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.tex
-2021/05/30 |     190129 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
+2021/09/28 |     199948 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
 2021/05/13 |       1665 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.tex
-2021/05/30 |     189364 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
+2021/09/28 |     199183 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
 2021/05/13 |       1627 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.tex
-2021/05/30 |     168145 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf
+2021/09/28 |     177026 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf
 2021/05/13 |       1553 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.tex
-2021/05/30 |     188698 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
-2021/05/30 |     189772 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
+2021/09/28 |     198522 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
+2021/09/28 |     199590 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
 2021/05/13 |       1644 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.tex
 2021/05/13 |       1603 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.tex
-2021/05/30 |     188752 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
+2021/09/28 |     198573 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
 2021/05/13 |       1609 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.tex
-2021/05/30 |     188888 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
+2021/09/28 |     198707 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
 2021/05/13 |       1611 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.tex
-2021/05/30 |     210267 | macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
-2021/05/13 |      13642 | macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex
-2021/05/30 |     209050 | macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
-2021/05/13 |      12681 | macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.tex
-2021/05/30 |     201331 | macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf
+2021/09/28 |     213256 | macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
+2021/09/27 |      13653 | macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex
+2021/09/28 |     211867 | macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
+2021/09/27 |      12681 | macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.tex
+2021/09/28 |     204143 | macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf
 2021/05/13 |       3005 | macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.tex
-2021/05/30 |     293347 | macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
+2021/09/28 |     297127 | macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
 2021/05/13 |       5587 | macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.tex
-2021/05/30 |     200437 | macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf
+2021/09/28 |     203251 | macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf
 2021/05/13 |      11558 | macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.tex
-2021/05/30 |     221703 | macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
+2021/09/28 |     224508 | macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
 2021/05/13 |      10033 | macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.tex
-2021/05/30 |     246378 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf
+2021/09/28 |     249192 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf
 2021/05/13 |      43045 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.tex
-2021/05/30 |     201164 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
+2021/09/28 |     203970 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
 2021/05/13 |       6540 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.tex
-2021/05/30 |     197012 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
+2021/09/28 |     199821 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
 2021/05/13 |       4504 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.tex
-2021/05/30 |     297750 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
+2021/09/28 |     301523 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
 2021/05/13 |       9314 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.tex
-2021/05/30 |     203497 | macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
+2021/09/28 |     206311 | macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
 2021/05/13 |       8510 | macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.tex
-2021/05/30 |     192572 | macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf
+2021/09/28 |     195383 | macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf
 2021/05/13 |       2157 | macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.tex
 2021/02/28 |         49 | macros/latex/contrib/reledmac/examples/latexmkrc
 2021/05/13 |        816 | macros/latex/contrib/reledmac/examples/makefile
 2020/11/24 |       2269 | macros/latex/contrib/reledmac/examples/reledmac.xdy
 2021/02/28 |         16 | macros/latex/contrib/reledmac/latexmkrc
-2021/05/30 |       1718 | macros/latex/contrib/reledmac/makefile
+2021/09/27 |       1718 | macros/latex/contrib/reledmac/makefile
 2021/02/28 |       3495 | macros/latex/contrib/reledmac/migration.dtx
-2021/05/30 |     358155 | macros/latex/contrib/reledmac/migration.pdf
-2021/05/13 |       3962 | macros/latex/contrib/reledmac/README.md
-2021/05/30 |     895964 | macros/latex/contrib/reledmac/reledmac.dtx
+2021/09/28 |     368877 | macros/latex/contrib/reledmac/migration.pdf
+2021/09/27 |       3962 | macros/latex/contrib/reledmac/README.md
+2021/09/27 |     896174 | macros/latex/contrib/reledmac/reledmac.dtx
 2021/02/28 |       2691 | macros/latex/contrib/reledmac/reledmac.ins
-2021/05/30 |    2041560 | macros/latex/contrib/reledmac/reledmac.pdf
-2021/05/28 |     305928 | macros/latex/contrib/reledmac/reledpar.dtx
+2021/09/28 |    2063704 | macros/latex/contrib/reledmac/reledmac.pdf
+2021/09/27 |     306199 | macros/latex/contrib/reledmac/reledpar.dtx
 2021/02/28 |       2638 | macros/latex/contrib/reledmac/reledpar.ins
-2021/05/30 |     987754 | macros/latex/contrib/reledmac/reledpar.pdf
-2021/05/30 |   13309241 | macros/latex/contrib/reledmac.zip
+2021/09/28 |    1006705 | macros/latex/contrib/reledmac/reledpar.pdf
+2021/09/28 |   13508657 | macros/latex/contrib/reledmac.zip
 1999/02/05 |      10370 | macros/latex/contrib/relenc/2sidedoc.sty
 2011/04/06 |       6770 | macros/latex/contrib/relenc/README
 1999/02/05 |      13969 | macros/latex/contrib/relenc/reldemo.tex
@@ -231433,13 +231433,13 @@
 2009/01/30 |       1741 | macros/latex/contrib/williams/toklist.sty
 2009/01/30 |       3286 | macros/latex/contrib/williams.zip
 2015/04/19 |        335 | macros/latex/contrib/willowtreebook/notation.gst
-2021/09/22 |        480 | macros/latex/contrib/willowtreebook/README
+2021/09/28 |        426 | macros/latex/contrib/willowtreebook/README
 2020/04/22 |   10482937 | macros/latex/contrib/willowtreebook/willow.jpg
 2020/04/22 |        304 | macros/latex/contrib/willowtreebook/willowtreebook.bib
 2021/09/22 |      17716 | macros/latex/contrib/willowtreebook/willowtreebook.cls
-2021/09/22 |   13991774 | macros/latex/contrib/willowtreebook/willowtreebook.pdf
-2021/09/22 |       5489 | macros/latex/contrib/willowtreebook/willowtreebook.tex
-2021/09/22 |   24272757 | macros/latex/contrib/willowtreebook.zip
+2021/09/28 |   13992183 | macros/latex/contrib/willowtreebook/willowtreebook.pdf
+2021/09/28 |       5501 | macros/latex/contrib/willowtreebook/willowtreebook.tex
+2021/09/28 |   24273164 | macros/latex/contrib/willowtreebook.zip
 2019/11/04 |       1074 | macros/latex/contrib/withargs/README
 2019/11/04 |       2115 | macros/latex/contrib/withargs/withargs-dry.sty
 2019/11/04 |      11094 | macros/latex/contrib/withargs/withargs-packagedoc.cls
@@ -242440,12 +242440,24 @@
 2020/01/31 |      15373 | macros/unicodetex/latex/unicode-math/unimath-symbols.ltx
 2020/01/31 |    1194223 | macros/unicodetex/latex/unicode-math/unimath-symbols.pdf
 2020/01/30 |    1825724 | macros/unicodetex/latex/unicode-math.zip
-2021/09/10 |       1115 | macros/unicodetex/latex/uwa-letterhead/example.tex
-2021/09/10 |       1041 | macros/unicodetex/latex/uwa-letterhead/README
-2021/09/10 |      26440 | macros/unicodetex/latex/uwa-letterhead/uwa-letterhead.dtx
-2021/09/10 |       2183 | macros/unicodetex/latex/uwa-letterhead/uwa-letterhead.ins
-2021/09/10 |      58265 | macros/unicodetex/latex/uwa-letterhead/uwa-letterhead.pdf
-2021/09/10 |      64473 | macros/unicodetex/latex/uwa-letterhead.zip
+2021/09/28 |       1056 | macros/unicodetex/latex/uwa-letterhead/README
+2021/09/28 |      27362 | macros/unicodetex/latex/uwa-letterhead/uwa-letterhead.dtx
+2021/09/28 |       1107 | macros/unicodetex/latex/uwa-letterhead/uwa-letterhead-example.tex
+2021/09/28 |       2216 | macros/unicodetex/latex/uwa-letterhead/uwa-letterhead.ins
+2021/09/28 |      58508 | macros/unicodetex/latex/uwa-letterhead/uwa-letterhead.pdf
+2021/09/28 |      64926 | macros/unicodetex/latex/uwa-letterhead.zip
+2021/09/28 |       1069 | macros/unicodetex/latex/uwa-pcf/README
+2021/09/28 |      22039 | macros/unicodetex/latex/uwa-pcf/uwa-pcf.dtx
+2021/09/28 |       1694 | macros/unicodetex/latex/uwa-pcf/uwa-pcf-example.tex
+2021/09/28 |       2120 | macros/unicodetex/latex/uwa-pcf/uwa-pcf.ins
+2021/09/28 |      53157 | macros/unicodetex/latex/uwa-pcf/uwa-pcf.pdf
+2021/09/28 |      59376 | macros/unicodetex/latex/uwa-pcf.zip
+2021/09/28 |       1032 | macros/unicodetex/latex/uwa-pif/README
+2021/09/28 |      19189 | macros/unicodetex/latex/uwa-pif/uwa-pif.dtx
+2021/09/28 |       3317 | macros/unicodetex/latex/uwa-pif/uwa-pif-example.tex
+2021/09/28 |       2120 | macros/unicodetex/latex/uwa-pif/uwa-pif.ins
+2021/09/28 |      50323 | macros/unicodetex/latex/uwa-pif/uwa-pif.pdf
+2021/09/28 |      56777 | macros/unicodetex/latex/uwa-pif.zip
 2018/12/31 |       1817 | macros/unicodetex/latex/xltxtra/README.md
 2018/12/31 |      16823 | macros/unicodetex/latex/xltxtra/xltxtra.dtx
 2018/12/31 |        935 | macros/unicodetex/latex/xltxtra/xltxtra.ins
@@ -242813,11 +242825,11 @@
 2008/06/07 |      15435 | macros/xetex/latex/fontwrap/fontwrap.tex
 2008/06/07 |       3891 | macros/xetex/latex/fontwrap/README
 2008/06/08 |     287452 | macros/xetex/latex/fontwrap.zip
-2021/09/23 |        242 | macros/xetex/latex/hanzibox/build.sh
-2021/09/23 |      37236 | macros/xetex/latex/hanzibox/hanzibox.dtx
-2021/09/23 |     292228 | macros/xetex/latex/hanzibox/hanzibox.pdf
-2021/09/23 |       1974 | macros/xetex/latex/hanzibox/README.md
-2021/09/23 |     298587 | macros/xetex/latex/hanzibox.zip
+2021/09/28 |        242 | macros/xetex/latex/hanzibox/build.sh
+2021/09/28 |      71334 | macros/xetex/latex/hanzibox/hanzibox.dtx
+2021/09/28 |     459483 | macros/xetex/latex/hanzibox/hanzibox.pdf
+2021/09/28 |       5122 | macros/xetex/latex/hanzibox/README.md
+2021/09/28 |     470872 | macros/xetex/latex/hanzibox.zip
 2013/04/03 |      54055 | macros/xetex/latex/imsproc/imsproc.cls
 2013/04/03 |      65609 | macros/xetex/latex/imsproc/logo.JPG
 2013/04/03 |       1332 | macros/xetex/latex/imsproc/README
@@ -275268,9 +275280,9 @@
 1994/02/22 |      94984 | systems/mac/macmakeindex2.12.sea.hqx
 1993/07/19 |      61321 | systems/mac/macmakeindex.sit.hqx
 2021/04/01 |         47 | systems/mac/mactex/BasicTeX.pkg.md5
-2021/09/20 |      38197 | systems/mac/mactex/ExtrasFolder.pdf
+2021/09/27 |      38194 | systems/mac/mactex/ExtrasFolder.pdf
 2021/04/01 |         50 | systems/mac/mactex/Ghostscript.pkg.md5
-2021/09/20 |       1711 | systems/mac/mactex/Licenses.txt
+2021/09/27 |       1711 | systems/mac/mactex/Licenses.txt
 2021/03/29 | 4701496188 | systems/mac/mactex/mactex-20210328.pkg
 2021/03/29 |         54 | systems/mac/mactex/mactex-20210328.pkg.md5
 2021/03/25 |   97330890 | systems/mac/mactex/mactex-basictex-20210325.pkg
@@ -275280,8 +275292,8 @@
 2021/04/01 |         45 | systems/mac/mactex/MacTeX.pkg.md5
 2021/02/26 |      77461 | systems/mac/mactex/mactex-texdist-20210226.pkg
 2021/02/26 |         58 | systems/mac/mactex/mactex-texdist-20210226.pkg.md5
-2021/09/20 |  450718189 | systems/mac/mactex/MacTeXtras-20210920.zip
-2021/09/20 |         58 | systems/mac/mactex/MacTeXtras-20210920.zip.md5
+2021/09/27 |  450713352 | systems/mac/mactex/MacTeXtras-20210927.zip
+2021/09/27 |         58 | systems/mac/mactex/MacTeXtras-20210927.zip.md5
 2021/04/01 |        179 | systems/mac/mactex/README
 1995/08/15 |     308344 | systems/mac/MakeIndex-Fat-1.0-sit.hqx
 1994/04/20 |    2925109 | systems/mac/metafont/bluesky/MAC_MF_0.66.sit.hqx
@@ -278741,8 +278753,8 @@
 2019/02/28 |      61056 | systems/texlive/tlnet/archive/cmbright.doc.r21107.tar.xz
 2019/02/28 |     111916 | systems/texlive/tlnet/archive/cmbright.r21107.tar.xz
 2019/02/28 |       6944 | systems/texlive/tlnet/archive/cmbright.source.r21107.tar.xz
-2019/02/28 |       5864 | systems/texlive/tlnet/archive/cmcyr.doc.r39273.tar.xz
-2019/02/28 |     901484 | systems/texlive/tlnet/archive/cmcyr.r39273.tar.xz
+2021/09/28 |       5864 | systems/texlive/tlnet/archive/cmcyr.doc.r60630.tar.xz
+2021/09/28 |     901484 | systems/texlive/tlnet/archive/cmcyr.r60630.tar.xz
 2021/02/27 |       2500 | systems/texlive/tlnet/archive/cm.doc.r57963.tar.xz
 2019/02/28 |     346136 | systems/texlive/tlnet/archive/cmdstring.doc.r15878.tar.xz
 2019/02/28 |        872 | systems/texlive/tlnet/archive/cmdstring.r15878.tar.xz
@@ -287887,7 +287899,7 @@
 2020/05/17 |        592 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.r55172.tar.xz
 2020/05/17 |        588 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.r55172.tar.xz
 2020/05/17 |        592 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.r55172.tar.xz
-2021/09/27 |     400304 | systems/texlive/tlnet/archive/texlive-scripts.doc.r60611.tar.xz
+2021/09/28 |     400276 | systems/texlive/tlnet/archive/texlive-scripts.doc.r60626.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
@@ -287911,7 +287923,7 @@
 2020/05/17 |        588 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r55172.tar.xz
 2020/05/17 |        592 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r55172.tar.xz
 2020/05/17 |        588 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r55172.tar.xz
-2021/09/27 |     108300 | systems/texlive/tlnet/archive/texlive-scripts.r60611.tar.xz
+2021/09/28 |     108300 | systems/texlive/tlnet/archive/texlive-scripts.r60626.tar.xz
 2021/02/25 |        572 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r57908.tar.xz
 2021/04/12 |      36308 | systems/texlive/tlnet/archive/texlive-scripts.win32.r58829.tar.xz
 2020/05/17 |        588 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r55172.tar.xz
@@ -289645,16 +289657,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
 2021/05/02 |     105152 | systems/texlive/tlnet/install-tl
-2021/09/27 |    6811697 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2021/09/27 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2021/09/27 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2021/09/28 |    6811733 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2021/09/28 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2021/09/28 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
 2021/04/11 |       4945 | systems/texlive/tlnet/install-tl-windows.bat
-2021/09/27 |   20873947 | systems/texlive/tlnet/install-tl-windows.exe
-2021/09/27 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2021/09/27 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2021/09/27 |   25629631 | systems/texlive/tlnet/install-tl.zip
-2021/09/27 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
-2021/09/27 |        455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2021/09/28 |   20873755 | systems/texlive/tlnet/install-tl-windows.exe
+2021/09/28 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2021/09/28 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2021/09/28 |   25629627 | systems/texlive/tlnet/install-tl.zip
+2021/09/28 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
+2021/09/28 |        455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
 2021/04/01 |       1229 | systems/texlive/tlnet/README.md
 2021/04/01 |          0 | systems/texlive/tlnet/TEXLIVE_2021
 2021/07/03 |       7181 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
@@ -289664,7 +289676,7 @@
 2021/07/03 |       1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
 2021/07/02 |      49348 | systems/texlive/tlnet/tlpkg/installer/config.guess
 2010/11/11 |      11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2021/09/26 |       6939 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2021/09/27 |       6875 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
 2020/04/15 |     223687 | systems/texlive/tlnet/tlpkg/installer/curl/curl-ca-bundle.crt
 2020/04/15 |    2606592 | systems/texlive/tlnet/tlpkg/installer/curl/curl.exe
 2017/04/16 |       2629 | systems/texlive/tlnet/tlpkg/installer/installer-options.txt
@@ -289706,12 +289718,12 @@
 2021/05/16 |      20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
 2021/05/16 |       5402 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
 2021/05/16 |      27555 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2021/09/27 |   16885625 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2021/09/27 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2021/09/28 |   16885630 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2021/09/28 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
 2021/05/16 |      86511 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2021/09/27 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2021/09/27 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2021/09/27 |    2311616 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2021/09/28 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2021/09/28 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2021/09/28 |    2312656 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
 2021/05/16 |      58801 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
 2021/05/16 |      42084 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
 2021/05/16 |      16103 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -294632,7 +294644,7 @@
 2020/10/03 |     318630 | systems/win32/miktex/tm/packages/filehook.tar.lzma
 2012/12/04 |     924573 | systems/win32/miktex/tm/packages/fileinfo.tar.lzma
 2011/09/21 |     281409 | systems/win32/miktex/tm/packages/filemod.tar.lzma
-2021/09/27 |     615154 | systems/win32/miktex/tm/packages/files.csv.lzma
+2021/09/28 |     615154 | systems/win32/miktex/tm/packages/files.csv.lzma
 2001/05/14 |       5617 | systems/win32/miktex/tm/packages/finbib.tar.lzma
 2015/10/20 |      44379 | systems/win32/miktex/tm/packages/findhyph.tar.lzma
 2011/10/21 |      89323 | systems/win32/miktex/tm/packages/fink.tar.lzma
@@ -296022,9 +296034,9 @@
 2018/01/12 |     157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma
 2021/08/07 |      39000 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma
 2021/08/07 |      43393 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/09/27 |     241599 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2021/09/27 |    1358536 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2021/09/27 |    1262237 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2021/09/28 |     241635 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2021/09/28 |    1359029 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2021/09/28 |    1262590 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
 2021/08/07 |      13446 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma
 2021/08/07 |      14327 | systems/win32/miktex/tm/packages/miktex-zzip-bin-x64-2.9.tar.lzma
 2016/07/15 |      35914 | systems/win32/miktex/tm/packages/mil3.tar.lzma
@@ -296234,189 +296246,189 @@
 2018/04/09 |     400132 | systems/win32/miktex/tm/packages/newunicodechar.tar.lzma
 2011/09/19 |     101312 | systems/win32/miktex/tm/packages/newvbtm.tar.lzma
 2021/03/17 |     232249 | systems/win32/miktex/tm/packages/newverbs.tar.lzma
-2021/09/27 |     615217 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2021/09/27 |      51113 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2021/09/27 |      56476 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2021/09/27 |     975020 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2021/09/27 |    1077991 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2021/09/27 |      29036 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2021/09/27 |      31351 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2021/09/27 |      29841 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2021/09/27 |      34665 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2021/09/27 |      50153 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2021/09/27 |      57547 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2021/09/27 |      83541 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2021/09/27 |      95402 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2021/09/27 |      67820 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2021/09/27 |      75792 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2021/09/27 |      27198 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2021/09/27 |      30822 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2021/09/27 |     330788 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2021/09/27 |     392791 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2021/09/27 |      32675 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2021/09/27 |      36628 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2021/09/27 |      51310 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2021/09/27 |      56686 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2021/09/27 |     241810 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2021/09/27 |     263957 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2021/09/27 |     180012 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2021/09/27 |     195636 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2021/09/27 |      54631 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2021/09/27 |      61813 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2021/09/27 |      21225 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2021/09/27 |      23365 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2021/09/27 |     461813 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2021/09/27 |      45905 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2021/09/27 |      51202 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2021/09/27 |     284580 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2021/09/27 |     325043 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2021/09/27 |      41194 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2021/09/27 |      45311 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2021/09/27 |     119819 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2021/09/27 |     133865 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2021/09/27 |    1291298 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2021/09/27 |    1421867 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2021/09/27 |     100626 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2021/09/27 |     112983 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2021/09/27 |      43029 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2021/09/27 |      48252 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2021/09/27 |      25020 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2021/09/27 |      28179 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2021/09/27 |      56317 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2021/09/27 |      62786 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2021/09/27 |     136817 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2021/09/27 |     154426 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2021/09/27 |      73196 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2021/09/27 |      77951 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2021/09/27 |      71669 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2021/09/27 |      80449 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2021/09/27 |     258881 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2021/09/27 |     295203 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2021/09/27 |      22049 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
-2021/09/27 |      24994 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2021/09/27 |      97339 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2021/09/27 |     112087 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2021/09/27 |      64427 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2021/09/27 |      73146 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2021/09/27 |      96634 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2021/09/27 |     115351 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2021/09/27 |      38140 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2021/09/27 |      43003 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2021/09/27 |     483655 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2021/09/27 |     566528 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2021/09/27 |     147373 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2021/09/27 |     159578 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2021/09/27 |      94799 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2021/09/27 |     109032 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2021/09/27 |      16357 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
-2021/09/27 |      17980 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2021/09/27 |      28391 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2021/09/27 |      30059 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2021/09/27 |     629398 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2021/09/27 |     681251 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2021/09/27 |     531849 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2021/09/27 |     596930 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2021/09/27 |     476918 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2021/09/27 |     510587 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2021/09/27 |      94310 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2021/09/27 |     103399 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2021/09/27 |    1713896 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2021/09/27 |    2009903 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2021/09/27 |      67618 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2021/09/27 |      74210 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2021/09/27 |      27357 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2021/09/27 |      31620 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2021/09/27 |       7722 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2021/09/27 |       8768 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2021/09/27 |     196871 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2021/09/27 |     215248 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2021/09/27 |     250262 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2021/09/27 |     284023 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2021/09/27 |      98380 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2021/09/27 |     103204 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2021/09/27 |      60638 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
-2021/09/27 |      68024 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
-2021/09/27 |     124281 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
-2021/09/27 |     136821 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2021/09/27 |     178352 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2021/09/27 |     196741 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2021/09/27 |     199732 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2021/09/27 |     180119 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2021/09/27 |      67484 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2021/09/27 |      76826 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2021/09/27 |      31232 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2021/09/27 |      35086 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2021/09/27 |      37805 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2021/09/27 |      42711 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2021/09/27 |      42891 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2021/09/27 |      46906 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2021/09/27 |      45970 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2021/09/27 |      52523 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2021/09/27 |     194381 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
-2021/09/27 |     206605 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2021/09/27 |      35691 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2021/09/27 |      40229 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2021/09/27 |     744118 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2021/09/27 |     815240 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2021/09/27 |     198170 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2021/09/27 |     202796 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2021/09/27 |     208048 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2021/09/27 |     243426 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2021/09/27 |      78773 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2021/09/27 |      87777 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2021/09/27 |    1169718 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2021/09/27 |    1301194 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2021/09/27 |      20138 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2021/09/27 |      23903 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2021/09/27 |      31537 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2021/09/27 |      37242 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2021/09/27 |      64185 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2021/09/27 |      72207 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2021/09/27 |      50395 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2021/09/27 |      57730 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2021/09/27 |    1340931 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2021/09/27 |    1464200 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2021/09/27 |      42386 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2021/09/27 |      51749 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2021/09/27 |      56515 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2021/09/27 |      60039 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2021/09/27 |      25290 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2021/09/27 |      27390 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2021/09/27 |      16412 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2021/09/27 |      18175 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2021/09/27 |      63777 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2021/09/27 |      69915 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2021/09/27 |     154806 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2021/09/27 |     169243 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2021/09/27 |      57013 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2021/09/27 |      65786 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2021/09/27 |      98262 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2021/09/27 |     105221 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2021/09/27 |    2672611 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2021/09/27 |    2796726 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2021/09/27 |      56355 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2021/09/27 |      62227 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2021/09/27 |      33544 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2021/09/27 |      37359 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2021/09/27 |      27728 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2021/09/27 |      33632 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2021/09/27 |      65619 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2021/09/27 |      70648 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2021/09/27 |     312108 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2021/09/27 |     345739 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2021/09/27 |      55499 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2021/09/27 |      57138 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2021/09/27 |     589842 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2021/09/27 |     624652 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2021/09/27 |      39130 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2021/09/27 |      43425 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/09/27 |     241651 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2021/09/27 |    1359720 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2021/09/27 |    1263051 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2021/09/27 |      13465 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2021/09/27 |      14348 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2021/09/28 |     615217 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2021/09/28 |      51114 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2021/09/28 |      56476 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2021/09/28 |     975019 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2021/09/28 |    1077989 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2021/09/28 |      29037 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2021/09/28 |      31350 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2021/09/28 |      29841 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2021/09/28 |      34666 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2021/09/28 |      50153 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2021/09/28 |      57548 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2021/09/28 |      83540 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2021/09/28 |      95402 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2021/09/28 |      67819 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2021/09/28 |      75792 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2021/09/28 |      27199 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2021/09/28 |      30824 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2021/09/28 |     330787 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2021/09/28 |     392793 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2021/09/28 |      32674 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2021/09/28 |      36629 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2021/09/28 |      51309 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2021/09/28 |      56686 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2021/09/28 |     241812 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2021/09/28 |     263958 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2021/09/28 |     180009 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2021/09/28 |     195635 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2021/09/28 |      54631 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2021/09/28 |      61814 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2021/09/28 |      21224 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2021/09/28 |      23365 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2021/09/28 |     461812 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2021/09/28 |      45906 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2021/09/28 |      51202 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2021/09/28 |     284580 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2021/09/28 |     325042 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2021/09/28 |      41194 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2021/09/28 |      45310 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2021/09/28 |     119820 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2021/09/28 |     133864 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2021/09/28 |    1291300 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2021/09/28 |    1421867 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2021/09/28 |     100626 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2021/09/28 |     112984 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/09/28 |      43028 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2021/09/28 |      48252 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2021/09/28 |      25020 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2021/09/28 |      28180 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2021/09/28 |      56317 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2021/09/28 |      62786 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2021/09/28 |     136818 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2021/09/28 |     154426 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2021/09/28 |      73196 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2021/09/28 |      77952 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2021/09/28 |      71669 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2021/09/28 |      80448 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2021/09/28 |     258881 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2021/09/28 |     295204 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2021/09/28 |      22049 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2021/09/28 |      24996 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2021/09/28 |      97339 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2021/09/28 |     112087 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2021/09/28 |      64428 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2021/09/28 |      73146 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2021/09/28 |      96634 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2021/09/28 |     115351 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2021/09/28 |      38140 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2021/09/28 |      43003 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2021/09/28 |     483653 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2021/09/28 |     566529 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2021/09/28 |     147372 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2021/09/28 |     159579 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2021/09/28 |      94799 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2021/09/28 |     109032 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2021/09/28 |      16357 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2021/09/28 |      17981 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2021/09/28 |      28391 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2021/09/28 |      30059 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2021/09/28 |     629400 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2021/09/28 |     681251 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2021/09/28 |     531849 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2021/09/28 |     596931 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2021/09/28 |     476919 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2021/09/28 |     510587 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2021/09/28 |      94311 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2021/09/28 |     103399 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2021/09/28 |    1713894 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2021/09/28 |    2009905 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2021/09/28 |      67618 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2021/09/28 |      74210 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2021/09/28 |      27358 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2021/09/28 |      31620 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2021/09/28 |       7722 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2021/09/28 |       8768 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2021/09/28 |     196871 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2021/09/28 |     215248 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2021/09/28 |     250265 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2021/09/28 |     284024 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2021/09/28 |      98380 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2021/09/28 |     103204 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2021/09/28 |      60638 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2021/09/28 |      68024 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2021/09/28 |     124281 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2021/09/28 |     136823 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2021/09/28 |     178352 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2021/09/28 |     196740 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2021/09/28 |     199732 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2021/09/28 |     180121 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2021/09/28 |      67483 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2021/09/28 |      76827 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2021/09/28 |      31231 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2021/09/28 |      35086 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2021/09/28 |      37806 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2021/09/28 |      42710 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2021/09/28 |      42893 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2021/09/28 |      46905 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2021/09/28 |      45970 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2021/09/28 |      52523 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2021/09/28 |     194383 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2021/09/28 |     206605 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2021/09/28 |      35692 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2021/09/28 |      40229 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2021/09/28 |     744119 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2021/09/28 |     815243 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2021/09/28 |     198170 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2021/09/28 |     202796 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2021/09/28 |     208047 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2021/09/28 |     243426 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2021/09/28 |      78774 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2021/09/28 |      87775 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2021/09/28 |    1169717 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2021/09/28 |    1301195 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2021/09/28 |      20137 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2021/09/28 |      23903 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2021/09/28 |      31539 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2021/09/28 |      37242 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2021/09/28 |      64185 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2021/09/28 |      72207 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2021/09/28 |      50394 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2021/09/28 |      57728 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2021/09/28 |    1340930 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2021/09/28 |    1464202 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2021/09/28 |      42386 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2021/09/28 |      51750 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2021/09/28 |      56515 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2021/09/28 |      60039 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2021/09/28 |      25291 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2021/09/28 |      27390 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2021/09/28 |      16413 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2021/09/28 |      18177 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2021/09/28 |      63776 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2021/09/28 |      69915 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2021/09/28 |     154805 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2021/09/28 |     169242 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2021/09/28 |      57013 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2021/09/28 |      65787 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2021/09/28 |      98262 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2021/09/28 |     105222 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2021/09/28 |    2672611 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2021/09/28 |    2796726 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2021/09/28 |      56356 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2021/09/28 |      62228 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2021/09/28 |      33546 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2021/09/28 |      37360 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2021/09/28 |      27729 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2021/09/28 |      33634 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2021/09/28 |      65620 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2021/09/28 |      70648 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2021/09/28 |     312109 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2021/09/28 |     345739 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2021/09/28 |      55499 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2021/09/28 |      57140 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2021/09/28 |     589845 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2021/09/28 |     624656 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2021/09/28 |      39128 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2021/09/28 |      43427 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2021/09/28 |     241657 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2021/09/28 |    1359041 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2021/09/28 |    1262307 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2021/09/28 |      13464 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2021/09/28 |      14349 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
 2019/03/12 |       1412 | systems/win32/miktex/tm/packages/nextpage.tar.lzma
-2021/09/27 |       1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2021/09/28 |       1153 | systems/win32/miktex/tm/packages/next/pr.ini
 2018/07/06 |     145915 | systems/win32/miktex/tm/packages/nexus-otf.tar.lzma
 2017/03/30 |     191149 | systems/win32/miktex/tm/packages/nfssext-cfr.tar.lzma
 2012/12/20 |     612251 | systems/win32/miktex/tm/packages/nicefilelist.tar.lzma
@@ -296813,7 +296825,7 @@
 2020/10/20 |     342254 | systems/win32/miktex/tm/packages/preview.tar.lzma
 2019/06/20 |     375963 | systems/win32/miktex/tm/packages/prftree.tar.lzma
 2021/04/23 |     274028 | systems/win32/miktex/tm/packages/principia.tar.lzma
-2021/09/27 |        961 | systems/win32/miktex/tm/packages/pr.ini
+2021/09/28 |        961 | systems/win32/miktex/tm/packages/pr.ini
 2010/09/27 |     248469 | systems/win32/miktex/tm/packages/printlen.tar.lzma
 2008/06/17 |      77313 | systems/win32/miktex/tm/packages/proba.tar.lzma
 2017/07/12 |     988486 | systems/win32/miktex/tm/packages/probsoln.tar.lzma
@@ -298419,7 +298431,7 @@
 2004/06/04 |        404 | tds/tds.sed
 2004/06/23 |      65418 | tds/tds.tex
 2019/05/29 |     304264 | tds.zip
-2021/09/28 |        186 | timestamp
+2021/09/29 |        186 | timestamp
 2002/08/26 |      61898 | usergrps/dante/antrag.pdf
 2002/08/26 |     118217 | usergrps/dante/antrag.ps
 2021/08/04 |        917 | usergrps/dante/dtk/doc/beispiel.bib
diff --git a/FILES.byname.gz b/FILES.byname.gz
index c8a6271d69..c2225fc6ed 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
diff --git a/FILES.last07days b/FILES.last07days
index 5a8c1660a4..70b53b04c0 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,231 +1,336 @@
-2021/09/27 |      98380 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2021/09/27 |      98262 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2021/09/27 |     975020 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2021/09/27 |      97339 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2021/09/27 |      96634 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2021/09/28 |      98380 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2021/09/28 |      98262 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2021/09/28 |     975019 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2021/09/28 |      97339 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2021/09/28 |      96634 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2021/09/28 |        961 | systems/win32/miktex/tm/packages/pr.ini
+2021/09/28 |      95402 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2021/09/28 |      94799 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2021/09/28 |      94311 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2021/09/28 |     901484 | systems/texlive/tlnet/archive/cmcyr.r60630.tar.xz
+2021/09/28 |      89512 | language/japanese/BX/bxjaholiday/bxjaholiday.pdf
+2021/09/28 |      87775 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2021/09/28 |       8768 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2021/09/28 |       8750 | language/japanese/BX/bxjaholiday/bxjaholiday-ja.tex
+2021/09/28 |       8672 | language/japanese/BX/bxjaholiday/bxjaholiday.tex
+2021/09/28 |      83540 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2021/09/28 |     815243 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2021/09/28 |      80448 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2021/09/28 |      79237 | macros/latex/contrib/easybook/easybook.dtx
+2021/09/28 |      78774 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2021/09/28 |      78193 | macros/latex/contrib/easybook/easybook.tex
+2021/09/28 |      77952 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2021/09/28 |       7722 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2021/09/28 |      76827 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2021/09/28 |      75792 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2021/09/28 |     744119 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2021/09/28 |      74210 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2021/09/28 |      73196 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2021/09/28 |      73146 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2021/09/28 |      72207 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2021/09/28 |      71669 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2021/09/28 |      71334 | macros/xetex/latex/hanzibox/hanzibox.dtx
+2021/09/28 |      70648 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2021/09/28 |      69915 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2021/09/28 |     681251 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2021/09/28 |    6811733 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2021/09/28 |      68024 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2021/09/28 |      67819 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2021/09/28 |      67618 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2021/09/28 |      67483 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2021/09/28 |      65787 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2021/09/28 |      65620 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2021/09/28 |      64926 | macros/unicodetex/latex/uwa-letterhead.zip
+2021/09/28 |      64428 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2021/09/28 |      64185 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2021/09/28 |      63776 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2021/09/28 |     629400 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2021/09/28 |      62786 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2021/09/28 |     624656 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2021/09/28 |      62228 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2021/09/28 |      61814 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2021/09/28 |     617988 | macros/latex/contrib/easybook.zip
+2021/09/28 |     615217 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2021/09/28 |     615154 | systems/win32/miktex/tm/packages/files.csv.lzma
+2021/09/28 |      60638 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2021/09/28 |      60039 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2021/09/28 |     596931 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2021/09/28 |      59376 | macros/unicodetex/latex/uwa-pcf.zip
+2021/09/28 |     589845 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2021/09/28 |       5864 | systems/texlive/tlnet/archive/cmcyr.doc.r60630.tar.xz
+2021/09/28 |      58508 | macros/unicodetex/latex/uwa-letterhead/uwa-letterhead.pdf
+2021/09/28 |     577949 | macros/latex/contrib/easybook/easybook.pdf
+2021/09/28 |      57728 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2021/09/28 |      57548 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2021/09/28 |      57140 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2021/09/28 |      57013 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2021/09/28 |      56777 | macros/unicodetex/latex/uwa-pif.zip
+2021/09/28 |      56686 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2021/09/28 |     566529 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2021/09/28 |      56515 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2021/09/28 |      56476 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2021/09/28 |      56356 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2021/09/28 |      56317 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2021/09/28 |      55499 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2021/09/28 |       5501 | macros/latex/contrib/willowtreebook/willowtreebook.tex
+2021/09/28 |      54631 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2021/09/28 |     531849 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2021/09/28 |      53157 | macros/unicodetex/latex/uwa-pcf/uwa-pcf.pdf
+2021/09/28 |      52523 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2021/09/28 |      51750 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2021/09/28 |      51309 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2021/09/28 |       5122 | macros/xetex/latex/hanzibox/README.md
+2021/09/28 |      51202 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2021/09/28 |      51114 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2021/09/28 |     510587 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2021/09/28 |      50394 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2021/09/28 |      50323 | macros/unicodetex/latex/uwa-pif/uwa-pif.pdf
+2021/09/28 |      50153 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2021/09/28 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2021/09/28 |     483653 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2021/09/28 |      48252 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2021/09/28 |     476919 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2021/09/28 |     470872 | macros/xetex/latex/hanzibox.zip
+2021/09/28 |      46905 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2021/09/28 |     461812 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2021/09/28 |      45970 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2021/09/28 |     459483 | macros/xetex/latex/hanzibox/hanzibox.pdf
+2021/09/28 |      45906 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2021/09/28 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2021/09/28 |        455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2021/09/28 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2021/09/28 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2021/09/28 |      45310 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2021/09/28 |      43427 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2021/09/28 |      43028 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2021/09/28 |      43003 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2021/09/28 |      42893 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2021/09/28 |      42710 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2021/09/28 |        426 | macros/latex/contrib/willowtreebook/README
+2021/09/28 |      42386 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2021/09/28 |      41194 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2021/09/28 |      40813 | macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf
+2021/09/28 |      40229 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2021/09/28 |     400276 | systems/texlive/tlnet/archive/texlive-scripts.doc.r60626.tar.xz
+2021/09/28 |     392793 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2021/09/28 |      39128 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2021/09/28 |      38140 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2021/09/28 |      37806 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2021/09/28 |      37360 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2021/09/28 |      37242 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2021/09/28 |     368877 | macros/latex/contrib/reledmac/migration.pdf
+2021/09/28 |      36629 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2021/09/28 |      35932 | language/japanese/BX/bxjaholiday/bxjaholiday.sty
+2021/09/28 |      35692 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2021/09/28 |      35086 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2021/09/28 |      34666 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2021/09/28 |     345739 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2021/09/28 |      33634 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2021/09/28 |      33546 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2021/09/28 |       3317 | macros/unicodetex/latex/uwa-pif/uwa-pif-example.tex
+2021/09/28 |     330787 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2021/09/28 |      32674 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2021/09/28 |     325042 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2021/09/28 |      32047 | macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
+2021/09/28 |      31620 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2021/09/28 |      31539 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2021/09/28 |      31498 | macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf
+2021/09/28 |      31350 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2021/09/28 |      31231 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2021/09/28 |     312109 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2021/09/28 |     309311 | macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf
+2021/09/28 |      30824 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2021/09/28 |     301523 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
+2021/09/28 |      30059 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2021/09/28 |      29841 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2021/09/28 |     297127 | macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
+2021/09/28 |     295847 | macros/latex/contrib/reledmac/examples/1-sidenotes.pdf
+2021/09/28 |     295204 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2021/09/28 |     293260 | macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf
+2021/09/28 |      29037 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2021/09/28 |     290106 | macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf
+2021/09/28 |     288679 | macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
+2021/09/28 |     288423 | macros/latex/contrib/reledmac/examples/2-linespacing.pdf
+2021/09/28 |     287548 | macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
+2021/09/28 |     286175 | macros/latex/contrib/reledmac/examples/2-performances.pdf
+2021/09/28 |     284803 | macros/latex/contrib/reledmac/examples/1-tabular.pdf
+2021/09/28 |     284580 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2021/09/28 |     284462 | macros/latex/contrib/reledmac/examples/2-glossaries.pdf
+2021/09/28 |     284024 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2021/09/28 |      28391 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2021/09/28 |     283598 | macros/latex/contrib/reledmac/examples/2-indexing.pdf
+2021/09/28 |      28180 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2021/09/28 |    2796726 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2021/09/28 |     277764 | macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf
+2021/09/28 |      27729 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2021/09/28 |      27390 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2021/09/28 |      27362 | macros/unicodetex/latex/uwa-letterhead/uwa-letterhead.dtx
+2021/09/28 |      27358 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2021/09/28 |      27199 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2021/09/28 |    2672611 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2021/09/28 |     263958 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2021/09/28 |     258881 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2021/09/28 |   25629627 | systems/texlive/tlnet/install-tl.zip
+2021/09/28 |      25291 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2021/09/28 |     250265 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2021/09/28 |      25020 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2021/09/28 |      24996 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2021/09/28 |     249192 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf
+2021/09/28 |     243426 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2021/09/28 |        242 | macros/xetex/latex/hanzibox/build.sh
+2021/09/28 |   24273164 | macros/latex/contrib/willowtreebook.zip
+2021/09/28 |     241812 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2021/09/28 |     241657 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2021/09/28 |     241635 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2021/09/28 |      23903 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2021/09/28 |      23428 | macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf
+2021/09/28 |      23365 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2021/09/28 |    2312656 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2021/09/28 |     224508 | macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
+2021/09/28 |       2216 | macros/unicodetex/latex/uwa-letterhead/uwa-letterhead.ins
+2021/09/28 |     221072 | language/japanese/BX/bxjaholiday.zip
+2021/09/28 |      22049 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2021/09/28 |      22039 | macros/unicodetex/latex/uwa-pcf/uwa-pcf.dtx
+2021/09/28 |     215248 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2021/09/28 |     213256 | macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
+2021/09/28 |      21224 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2021/09/28 |       2120 | macros/unicodetex/latex/uwa-pif/uwa-pif.ins
+2021/09/28 |       2120 | macros/unicodetex/latex/uwa-pcf/uwa-pcf.ins
+2021/09/28 |     211867 | macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
+2021/09/28 |     211562 | macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf
+2021/09/28 |     209856 | macros/latex/contrib/reledmac/examples/2-antilabe.pdf
+2021/09/28 |   20873755 | systems/texlive/tlnet/install-tl-windows.exe
+2021/09/28 |     208047 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2021/09/28 |     206605 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2021/09/28 |    2063704 | macros/latex/contrib/reledmac/reledmac.pdf
+2021/09/28 |     206311 | macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
+2021/09/28 |     205925 | macros/latex/contrib/reledmac/examples/2-notes-width.pdf
+2021/09/28 |     204143 | macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf
+2021/09/28 |     203970 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
+2021/09/28 |     203251 | macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf
+2021/09/28 |     202796 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2021/09/28 |     202702 | macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf
+2021/09/28 |      20137 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2021/09/28 |     201045 | macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
+2021/09/28 |    2009905 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2021/09/28 |     200373 | macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
+2021/09/28 |     200204 | macros/latex/contrib/reledmac/examples/1-verses.pdf
+2021/09/28 |     199948 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
+2021/09/28 |     199821 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
+2021/09/28 |     199732 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2021/09/28 |     199590 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
+2021/09/28 |     199197 | macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
+2021/09/28 |     199196 | macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
+2021/09/28 |     199183 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
+2021/09/28 |     199051 | macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf
+2021/09/28 |     198707 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
+2021/09/28 |     198573 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
+2021/09/28 |     198522 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
+2021/09/28 |     198170 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2021/09/28 |     196871 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2021/09/28 |     196740 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2021/09/28 |     195635 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2021/09/28 |     195383 | macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf
+2021/09/28 |     194383 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2021/09/28 |      19189 | macros/unicodetex/latex/uwa-pif/uwa-pif.dtx
+2021/09/28 |      18177 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2021/09/28 |     180121 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2021/09/28 |     180009 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2021/09/28 |      17981 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2021/09/28 |     178352 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2021/09/28 |     177026 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf
+2021/09/28 |     174535 | macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf
+2021/09/28 |    1713894 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2021/09/28 |       1694 | macros/unicodetex/latex/uwa-pcf/uwa-pcf-example.tex
+2021/09/28 |     169242 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2021/09/28 |   16885630 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2021/09/28 |      16413 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2021/09/28 |      16357 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2021/09/28 |     159579 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2021/09/28 |     154805 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2021/09/28 |     154426 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2021/09/28 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2021/09/28 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2021/09/28 |     147372 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2021/09/28 |    1464202 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2021/09/28 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
+2021/09/28 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2021/09/28 |      14349 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2021/09/28 |    1421867 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2021/09/28 |       1414 | language/japanese/BX/bxjaholiday/README.md
+2021/09/28 |   13992183 | macros/latex/contrib/willowtreebook/willowtreebook.pdf
+2021/09/28 |     136823 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2021/09/28 |     136818 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2021/09/28 |    1359041 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2021/09/28 |    1359029 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2021/09/28 |   13508657 | macros/latex/contrib/reledmac.zip
+2021/09/28 |      13464 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2021/09/28 |    1340930 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2021/09/28 |     133864 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2021/09/28 |    1301195 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2021/09/28 |    1291300 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2021/09/28 |    1262590 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2021/09/28 |    1262307 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2021/09/28 |     124281 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2021/09/28 |     121871 | language/japanese/BX/bxjaholiday/bxjaholiday-ja.pdf
+2021/09/28 |     119820 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2021/09/28 |    1169717 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2021/09/28 |       1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2021/09/28 |     115351 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2021/09/28 |     112984 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/09/28 |     112087 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2021/09/28 |       1107 | macros/unicodetex/latex/uwa-letterhead/uwa-letterhead-example.tex
+2021/09/28 |       1091 | language/japanese/BX/bxjaholiday/LICENSE
+2021/09/28 |     109032 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2021/09/28 |     108300 | systems/texlive/tlnet/archive/texlive-scripts.r60626.tar.xz
+2021/09/28 |    1077989 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2021/09/28 |       1069 | macros/unicodetex/latex/uwa-pcf/README
+2021/09/28 |       1056 | macros/unicodetex/latex/uwa-letterhead/README
+2021/09/28 |     105222 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2021/09/28 |     103399 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2021/09/28 |       1032 | macros/unicodetex/latex/uwa-pif/README
+2021/09/28 |     103204 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2021/09/28 |    1006705 | macros/latex/contrib/reledmac/reledpar.pdf
+2021/09/28 |     100626 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
 2021/09/27 |     962220 | systems/texlive/tlnet/archive/pst-3dplot.doc.r60619.tar.xz
-2021/09/27 |        961 | systems/win32/miktex/tm/packages/pr.ini
-2021/09/27 |      95402 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2021/09/27 |      94799 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2021/09/27 |      94310 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
 2021/09/27 |      94232 | systems/texlive/tlnet/archive/latexmk.r60617.tar.xz
 2021/09/27 |     908520 | systems/texlive/tlnet/archive/tex4ht.r60623.tar.xz
-2021/09/27 |      87777 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2021/09/27 |       8768 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2021/09/27 |      83541 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2021/09/27 |     815240 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2021/09/27 |      80449 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2021/09/27 |      78773 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2021/09/27 |      77951 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2021/09/27 |       7722 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2021/09/27 |      76826 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2021/09/27 |      75792 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2021/09/27 |     744118 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2021/09/27 |      74210 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2021/09/27 |      73196 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2021/09/27 |      73146 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2021/09/27 |      72207 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2021/09/27 |      71669 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2021/09/27 |      70648 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2021/09/27 |      69915 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2021/09/27 |     681251 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2021/09/27 |    6811697 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2021/09/27 |      68024 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
-2021/09/27 |      67820 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2021/09/27 |      67618 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2021/09/27 |      67484 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2021/09/27 |      65786 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2021/09/27 |     896174 | macros/latex/contrib/reledmac/reledmac.dtx
+2021/09/27 |       6875 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
 2021/09/27 |       6564 | systems/texlive/tlnet/archive/pst-tools.r60621.tar.xz
-2021/09/27 |      65619 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
 2021/09/27 |       6456 | systems/texlive/tlnet/archive/collection-latexextra.r60619.tar.xz
-2021/09/27 |      64427 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2021/09/27 |      64185 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2021/09/27 |      63777 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2021/09/27 |     629398 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2021/09/27 |      62786 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2021/09/27 |     624652 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2021/09/27 |      62227 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2021/09/27 |      61813 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2021/09/27 |     615217 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2021/09/27 |     615154 | systems/win32/miktex/tm/packages/files.csv.lzma
 2021/09/27 |     608920 | support/TeX4ht/source/tex4ht-html4.tex
-2021/09/27 |      60638 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
-2021/09/27 |      60039 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2021/09/27 |     596930 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2021/09/27 |     589842 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2021/09/27 |      57730 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2021/09/27 |      57547 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2021/09/27 |         58 | systems/mac/mactex/MacTeXtras-20210927.zip.md5
 2021/09/27 |       5752 | systems/texlive/tlnet/archive/scrambledenvs.source.r60615.tar.xz
-2021/09/27 |      57138 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2021/09/27 |      57013 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2021/09/27 |      56686 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2021/09/27 |     566528 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2021/09/27 |      56515 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2021/09/27 |      56476 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2021/09/27 |      56355 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2021/09/27 |      56317 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2021/09/27 |      55499 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2021/09/27 |      54631 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2021/09/27 |     531849 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2021/09/27 |      52523 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2021/09/27 |      51749 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2021/09/27 |      51310 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2021/09/27 |      51202 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2021/09/27 |      51113 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2021/09/27 |     510587 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2021/09/27 |      50395 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2021/09/27 |       5602 | macros/latex/contrib/reledmac/doc-include/migrate-par.dtx
 2021/09/27 |       5024 | systems/texlive/tlnet/archive/thalie.r60616.tar.xz
-2021/09/27 |      50153 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2021/09/27 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
 2021/09/27 |     486620 | systems/texlive/tlnet/archive/latexmk.doc.r60617.tar.xz
-2021/09/27 |     483655 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2021/09/27 |      48252 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2021/09/27 |     476918 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2021/09/27 |      46906 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2021/09/27 |     461813 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2021/09/27 |      45970 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2021/09/27 |      45905 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2021/09/27 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2021/09/27 |        455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2021/09/27 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2021/09/27 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
 2021/09/27 |     455772 | systems/texlive/tlnet/archive/thalie.doc.r60616.tar.xz
-2021/09/27 |      45311 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2021/09/27 |      43425 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/09/27 |      43029 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2021/09/27 |      43003 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2021/09/27 |      42891 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2021/09/27 |      42711 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2021/09/27 |      42386 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2021/09/27 |      41194 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2021/09/27 |      40229 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2021/09/27 |     400304 | systems/texlive/tlnet/archive/texlive-scripts.doc.r60611.tar.xz
-2021/09/27 |     392791 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2021/09/27 |      39130 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2021/09/27 |      38140 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2021/09/27 |      37805 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2021/09/27 |      37359 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2021/09/27 |      37242 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2021/09/27 |      36628 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2021/09/27 |      35691 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2021/09/27 |      35086 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2021/09/27 |      34665 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2021/09/27 |     345739 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2021/09/27 |      33632 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2021/09/27 |      33544 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2021/09/27 |     330788 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2021/09/27 |      32675 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2021/09/27 |     325043 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2021/09/27 |      31620 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2021/09/27 |      31537 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2021/09/27 |      31351 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2021/09/27 |      31232 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2021/09/27 |     312108 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2021/09/27 |      30822 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2021/09/27 |      30059 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2021/09/27 |      29841 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2021/09/27 |     295203 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2021/09/27 |      29036 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2021/09/27 |     284580 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2021/09/27 |     284023 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2021/09/27 |      28391 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2021/09/27 |      28179 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2021/09/27 |    2796726 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2021/09/27 |      27728 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2021/09/27 |      27390 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2021/09/27 |      27357 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2021/09/27 |      27198 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2021/09/27 |    2672611 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2021/09/27 |     263957 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2021/09/27 |     258881 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2021/09/27 |   25629631 | systems/texlive/tlnet/install-tl.zip
-2021/09/27 |      25290 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2021/09/27 |     250262 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2021/09/27 |      25020 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2021/09/27 |      24994 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2021/09/27 |     243426 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2021/09/27 |     241810 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2021/09/27 |     241651 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2021/09/27 |     241599 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2021/09/27 |  450713352 | systems/mac/mactex/MacTeXtras-20210927.zip
+2021/09/27 |       3962 | macros/latex/contrib/reledmac/README.md
+2021/09/27 |      38194 | systems/mac/mactex/ExtrasFolder.pdf
+2021/09/27 |     306199 | macros/latex/contrib/reledmac/reledpar.dtx
 2021/09/27 |       2408 | systems/texlive/tlnet/archive/scrambledenvs.r60615.tar.xz
-2021/09/27 |      23903 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2021/09/27 |      23365 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2021/09/27 |    2311616 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
 2021/09/27 |      22632 | systems/texlive/tlnet/archive/pst-plot.r60620.tar.xz
 2021/09/27 |     225260 | systems/texlive/tlnet/archive/erewhon-math.r60614.tar.xz
-2021/09/27 |      22049 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
 2021/09/27 |      21852 | systems/texlive/tlnet/archive/pst-3dplot.r60619.tar.xz
-2021/09/27 |     215248 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
 2021/09/27 |      21292 | systems/texlive/tlnet/archive/pstricks-add.r60622.tar.xz
-2021/09/27 |      21225 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2021/09/27 |   20873947 | systems/texlive/tlnet/install-tl-windows.exe
-2021/09/27 |     208048 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2021/09/27 |     206605 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2021/09/27 |     202796 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2021/09/27 |      20138 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2021/09/27 |    2009903 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
 2021/09/27 |      20012 | systems/texlive/tlnet/archive/thalie.source.r60616.tar.xz
-2021/09/27 |     199732 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2021/09/27 |     198170 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2021/09/27 |     196871 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2021/09/27 |     196741 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
 2021/09/27 |    1959184 | systems/texlive/tlnet/archive/erewhon-math.doc.r60614.tar.xz
-2021/09/27 |     195636 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2021/09/27 |     194381 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
 2021/09/27 |     193772 | systems/texlive/tlnet/archive/scrambledenvs.doc.r60615.tar.xz
-2021/09/27 |      18175 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2021/09/27 |     180119 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2021/09/27 |     180012 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2021/09/27 |      17980 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2021/09/27 |     178352 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2021/09/27 |    1713896 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2021/09/27 |     169243 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2021/09/27 |   16885625 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2021/09/27 |      16412 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2021/09/27 |      16357 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2021/09/27 |       1794 | macros/latex/contrib/reledmac/examples/2-glossaries.tex
+2021/09/27 |       1718 | macros/latex/contrib/reledmac/makefile
+2021/09/27 |       1711 | systems/mac/mactex/Licenses.txt
 2021/09/27 |     162978 | support/TeX4ht/source/ChangeLog
-2021/09/27 |     159578 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2021/09/27 |     154806 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2021/09/27 |     154426 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2021/09/27 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2021/09/27 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2021/09/27 |     147373 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2021/09/27 |    1464200 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2021/09/27 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
-2021/09/27 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2021/09/27 |      14348 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
-2021/09/27 |    1421867 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
 2021/09/27 |    1375272 | systems/texlive/tlnet/archive/pst-plot.doc.r60620.tar.xz
-2021/09/27 |     136821 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2021/09/27 |     136817 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2021/09/27 |      13653 | macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex
 2021/09/27 |     136384 | systems/texlive/tlnet/archive/tex4ht.doc.r60623.tar.xz
-2021/09/27 |    1359720 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2021/09/27 |    1358536 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2021/09/27 |      13465 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2021/09/27 |    1340931 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2021/09/27 |     133865 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2021/09/27 |    1301194 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2021/09/27 |    1291298 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2021/09/27 |    1263051 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2021/09/27 |    1262237 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
-2021/09/27 |     124281 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2021/09/27 |      12681 | macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.tex
 2021/09/27 |    1212648 | systems/texlive/tlnet/archive/tex4ht.source.r60623.tar.xz
-2021/09/27 |     119819 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2021/09/27 |    1169718 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2021/09/27 |       1153 | systems/win32/miktex/tm/packages/next/pr.ini
-2021/09/27 |     115351 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2021/09/27 |     112983 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2021/09/27 |     112087 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2021/09/27 |       1140 | macros/latex/contrib/reledmac/examples/2-lemma_disambigution.tex
 2021/09/27 |    1095203 | support/TeX4ht/source/tex4ht-4ht.tex
-2021/09/27 |     109032 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2021/09/27 |     108300 | systems/texlive/tlnet/archive/texlive-scripts.r60611.tar.xz
-2021/09/27 |    1077991 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
 2021/09/27 |     106384 | systems/texlive/tlnet/archive/pst-tools.doc.r60621.tar.xz
 2021/09/27 |   10634380 | systems/texlive/tlnet/archive/pstricks-add.doc.r60622.tar.xz
-2021/09/27 |     105221 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2021/09/27 |     103399 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2021/09/27 |     103204 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2021/09/27 |     100626 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
 2021/09/26 |       9996 | systems/texlive/tlnet/archive/latexbug.source.r60609.tar.xz
 2021/09/26 |     970944 | systems/texlive/tlnet/archive/chemplants.doc.r60606.tar.xz
 2021/09/26 |      86744 | systems/texlive/tlnet/archive/pstricks.r60607.tar.xz
@@ -234,7 +339,6 @@
 2021/09/26 |      78103 | macros/latex/contrib/thalie/thalie.dtx
 2021/09/26 |       7704 | systems/texlive/tlnet/archive/chemplants.r60606.tar.xz
 2021/09/26 |    7526604 | systems/texlive/tlnet/archive/pstricks.doc.r60607.tar.xz
-2021/09/26 |       6939 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
 2021/09/26 |      54720 | systems/texlive/tlnet/archive/acmart.source.r60608.tar.xz
 2021/09/26 |      54451 | help/ctan/CTAN-upload-addendum.html
 2021/09/26 |       5396 | systems/texlive/tlnet/archive/latexbug.r60609.tar.xz
@@ -591,7 +695,6 @@
 2021/09/23 |      37492 | macros/latex/contrib/glossaries-extra/samples/sample-suppl-hyp.pdf
 2021/09/23 |      37408 | macros/latex/contrib/glossaries/samples/sample-entryfmt.pdf
 2021/09/23 |       3724 | macros/latex/contrib/glossaries/samples/sampleCustomAcr.tex
-2021/09/23 |      37236 | macros/xetex/latex/hanzibox/hanzibox.dtx
 2021/09/23 |      37059 | support/latexmk/CHANGES
 2021/09/23 |       3675 | obsolete/macros/latex/contrib/beamer-contrib/themes/fibeamer/README.md
 2021/09/23 |      36694 | macros/latex/contrib/glossaries-extra/samples/sample-external.pdf
@@ -616,10 +719,8 @@
 2021/09/23 |        320 | obsolete/macros/latex/contrib/beamer-contrib/themes/fibeamer/logo/bs/Makefile
 2021/09/23 |        307 | macros/latex/contrib/glossaries-extra/samples/sample-suppl-main.tex
 2021/09/23 |     299904 | macros/xetex/latex/zitie.zip
-2021/09/23 |     298587 | macros/xetex/latex/hanzibox.zip
 2021/09/23 |     294975 | obsolete/macros/latex/contrib/beamer-contrib/themes/fibeamer/guide/mu/sci.pdf
 2021/09/23 |     293275 | obsolete/macros/latex/contrib/beamer-contrib/themes/fibeamer/guide/mu/fi.pdf
-2021/09/23 |     292228 | macros/xetex/latex/hanzibox/hanzibox.pdf
 2021/09/23 |       2902 | macros/latex/contrib/glossaries/makeglossaries-lite.pod
 2021/09/23 |     288061 | macros/xetex/latex/zitie/doc/zitie-cn.pdf
 2021/09/23 |     287446 | obsolete/macros/latex/contrib/beamer-contrib/themes/fibeamer/guide/mu/fss.pdf
@@ -643,7 +744,6 @@
 2021/09/23 |      25262 | macros/xetex/latex/zitie/doc/zitie-cn.tex
 2021/09/23 |        250 | macros/latex/contrib/glossaries-extra/samples/sample-suppl.tex
 2021/09/23 |       2442 | macros/latex/contrib/glossaries/samples/sampleAcrDesc.tex
-2021/09/23 |        242 | macros/xetex/latex/hanzibox/build.sh
 2021/09/23 |      24235 | macros/latex/contrib/glossaries/glossary2glossaries.tex
 2021/09/23 |   24230228 | systems/texlive/tlnet/archive/willowtreebook.doc.r60583.tar.xz
 2021/09/23 |    2421825 | macros/latex/contrib/glossaries/glossaries-user.html
@@ -666,7 +766,6 @@
 2021/09/23 |    2033204 | systems/texlive/tlnet/archive/siunitx.doc.r60581.tar.xz
 2021/09/23 |       2020 | macros/latex/contrib/ccool/ccool.ins
 2021/09/23 |     199351 | macros/latex/contrib/glossaries/glossariesbegin.pdf
-2021/09/23 |       1974 | macros/xetex/latex/hanzibox/README.md
 2021/09/23 |       1969 | macros/latex/contrib/glossaries/samples/sampleSec.tex
 2021/09/23 |      19673 | macros/latex/contrib/glossaries-extra/samples/sample-onthefly-xetex.pdf
 2021/09/23 |       1965 | macros/latex/contrib/glossaries-extra/samples/sample-header.tex
@@ -810,12 +909,10 @@
 2021/09/22 |     577660 | systems/texlive/tlnet/archive/texlive-common.doc.r60568.tar.xz
 2021/09/22 |       5744 | systems/texlive/tlnet/archive/expkv-cs.r60571.tar.xz
 2021/09/22 |        548 | systems/texlive/tlnet/archive/collection-langchinese.r60575.tar.xz
-2021/09/22 |       5489 | macros/latex/contrib/willowtreebook/willowtreebook.tex
 2021/09/22 |     548215 | language/korean/kotex-oblivoir.zip
 2021/09/22 |       5180 | systems/texlive/tlnet/archive/expkv-def.r60572.tar.xz
 2021/09/22 |       5124 | systems/texlive/tlnet/archive/expkv.r60573.tar.xz
 2021/09/22 |      50335 | macros/latex/contrib/siunitx/siunitx-table.dtx
-2021/09/22 |        480 | macros/latex/contrib/willowtreebook/README
 2021/09/22 |     479908 | systems/texlive/tlnet/archive/expkv.doc.r60573.tar.xz
 2021/09/22 |       4748 | macros/latex/contrib/siunitx/siunitx-abbreviations.cfg
 2021/09/22 |       4746 | macros/latex/contrib/siunitx/siunitx-locale.dtx
@@ -837,7 +934,6 @@
 2021/09/22 |     273398 | macros/latex/contrib/siunitx/siunitx-v2.sty
 2021/09/22 |      25939 | macros/latex/contrib/siunitx/siunitx-complex.dtx
 2021/09/22 |      25772 | systems/texlive/tlnet/archive/expkv-cs.source.r60571.tar.xz
-2021/09/22 |   24272757 | macros/latex/contrib/willowtreebook.zip
 2021/09/22 |       2426 | macros/latex/contrib/siunitx/siunitx-code.tex
 2021/09/22 |       2325 | macros/latex/contrib/to-be-determined/to-be-determined.tex
 2021/09/22 |     231352 | systems/texlive/tlnet/archive/texlive.infra.r60568.tar.xz
@@ -867,7 +963,6 @@
 2021/09/22 |      15317 | macros/latex/contrib/siunitx/siunitx-quantity.dtx
 2021/09/22 |    1513710 | macros/latex/contrib/siunitx/siunitx-code.pdf
 2021/09/22 |     146955 | macros/latex/contrib/siunitx/siunitx.tex
-2021/09/22 |   13991774 | macros/latex/contrib/willowtreebook/willowtreebook.pdf
 2021/09/22 |       1360 | language/korean/kotex-oblivoir/README
 2021/09/22 |      13140 | language/korean/kotex-oblivoir/tex/memhangul-x/memhangul-x.sty
 2021/09/22 |       1298 | macros/latex/contrib/to-be-determined/README.md
@@ -878,56 +973,3 @@
 2021/09/22 |      10106 | macros/latex/contrib/siunitx/siunitx-abbreviation.dtx
 2021/09/22 |   10067787 | systems/texlive/tlnet/update-tlmgr-r60568.sh
 2021/09/22 |     100272 | systems/texlive/tlnet/archive/arara.source.r60568.tar.xz
-2021/09/21 |      98732 | systems/texlive/tlnet/archive/spacingtricks.doc.r60559.tar.xz
-2021/09/21 |     967084 | systems/texlive/tlnet/archive/elteikthesis.doc.r60563.tar.xz
-2021/09/21 |     905936 | systems/texlive/tlnet/archive/schooldocs.doc.r60560.tar.xz
-2021/09/21 |     879392 | systems/texlive/tlnet/archive/mcf2graph.doc.r60565.tar.xz
-2021/09/21 |       8468 | systems/texlive/tlnet/archive/spacingtricks.source.r60559.tar.xz
-2021/09/21 |       8180 | systems/texlive/tlnet/archive/latex-firstaid-dev.source.r60566.tar.xz
-2021/09/21 |      79731 | macros/generic/expkv-def/expkv-def.dtx
-2021/09/21 |     757020 | systems/texlive/tlnet/archive/lipsum.doc.r60561.tar.xz
-2021/09/21 |     677616 | systems/texlive/tlnet/archive/latex-base-dev.source.r60566.tar.xz
-2021/09/21 |      65756 | systems/texlive/tlnet/archive/latex-amsmath-dev.source.r60566.tar.xz
-2021/09/21 |       6196 | systems/texlive/tlnet/archive/elteikthesis.r60563.tar.xz
-2021/09/21 |    5282740 | systems/texlive/tlnet/archive/latex-tools-dev.doc.r60566.tar.xz
-2021/09/21 |      52344 | systems/texlive/tlnet/archive/latex-graphics-dev.source.r60566.tar.xz
-2021/09/21 |        516 | systems/texlive/tlnet/archive/dtk-bibliography.r60564.tar.xz
-2021/09/21 |     514924 | install/macros/generic/expkv.tds.zip
-2021/09/21 |     508252 | macros/generic/expkv.zip
-2021/09/21 |     490757 | macros/generic/expkv/expkv.pdf
-2021/09/21 |     481498 | install/macros/generic/expkv-cs.tds.zip
-2021/09/21 |     474231 | macros/generic/expkv-cs.zip
-2021/09/21 |     460837 | macros/generic/expkv-cs/expkv-cs.pdf
-2021/09/21 |    4494164 | systems/texlive/tlnet/archive/genealogytree.doc.r60562.tar.xz
-2021/09/21 |      42536 | systems/texlive/tlnet/archive/latex-tools-dev.r60566.tar.xz
-2021/09/21 |     425052 | systems/texlive/tlnet/archive/dtk-bibliography.doc.r60564.tar.xz
-2021/09/21 |     424285 | install/macros/generic/expkv-def.tds.zip
-2021/09/21 |     417550 | macros/generic/expkv-def.zip
-2021/09/21 |       4138 | macros/luatex/generic/penlight/penlight.tex
-2021/09/21 |     410977 | macros/generic/expkv-def/expkv-def.pdf
-2021/09/21 |       3536 | systems/texlive/tlnet/archive/latex-firstaid-dev.r60566.tar.xz
-2021/09/21 |      34380 | systems/texlive/tlnet/archive/genealogytree.r60562.tar.xz
-2021/09/21 |      30640 | systems/texlive/tlnet/archive/latex-amsmath-dev.r60566.tar.xz
-2021/09/21 |       3048 | systems/texlive/tlnet/archive/schooldocs.r60560.tar.xz
-2021/09/21 |   28219892 | systems/texlive/tlnet/archive/latex-base-dev.doc.r60566.tar.xz
-2021/09/21 |      25376 | systems/texlive/tlnet/archive/mcf2graph.r60565.tar.xz
-2021/09/21 |     239964 | systems/texlive/tlnet/archive/latex-firstaid-dev.doc.r60566.tar.xz
-2021/09/21 |    2394524 | systems/texlive/tlnet/archive/latex-amsmath-dev.doc.r60566.tar.xz
-2021/09/21 |      22977 | macros/luatex/generic/penlight/penlight.pdf
-2021/09/21 |     228044 | systems/texlive/tlnet/archive/latex-tools-dev.source.r60566.tar.xz
-2021/09/21 |     219404 | systems/texlive/tlnet/archive/latex-base-dev.r60566.tar.xz
-2021/09/21 |    2027612 | systems/texlive/tlnet/archive/latex-graphics-dev.doc.r60566.tar.xz
-2021/09/21 |     185760 | systems/texlive/tlnet/archive/light-latex-make.doc.r60558.tar.xz
-2021/09/21 |      17004 | systems/texlive/tlnet/archive/lipsum.source.r60561.tar.xz
-2021/09/21 |       1636 | systems/texlive/tlnet/archive/spacingtricks.r60559.tar.xz
-2021/09/21 |      15160 | systems/texlive/tlnet/archive/latex-graphics-dev.r60566.tar.xz
-2021/09/21 |       1431 | macros/generic/expkv/README.md
-2021/09/21 |     139874 | macros/luatex/generic/penlight.zip
-2021/09/21 |       1297 | macros/generic/expkv-cs/README.md
-2021/09/21 |       1269 | macros/generic/expkv-def/README.md
-2021/09/21 |     125324 | systems/texlive/tlnet/archive/lipsum.r60561.tar.xz
-2021/09/21 |     118063 | macros/generic/expkv-cs/expkv-cs.dtx
-2021/09/21 |     115615 | macros/generic/expkv/expkv.dtx
-2021/09/21 |      10568 | systems/texlive/tlnet/archive/light-latex-make.r60558.tar.xz
-2021/09/21 |      10412 | systems/texlive/tlnet/archive/schooldocs.source.r60560.tar.xz
-2021/09/21 |      10060 | macros/luatex/generic/penlight/penlightextras.lua
diff --git a/language/japanese/BX/bxjaholiday/LICENSE b/language/japanese/BX/bxjaholiday/LICENSE
index d8cb193881..bcd5768aa0 100644
--- a/language/japanese/BX/bxjaholiday/LICENSE
+++ b/language/japanese/BX/bxjaholiday/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright 2018-2020 Takuto ASAKURA (wtsnjp)
+Copyright 2018-2021 Takuto ASAKURA (wtsnjp)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/language/japanese/BX/bxjaholiday/README.md b/language/japanese/BX/bxjaholiday/README.md
index fb5a96e70a..52c23bf39d 100644
--- a/language/japanese/BX/bxjaholiday/README.md
+++ b/language/japanese/BX/bxjaholiday/README.md
@@ -26,19 +26,19 @@ You can easily build this package with [l3build](https://github.com/latex3/l3bui
 * Installing the package to TEXMFHOME
 
 ```
-$ ./build.lua install --full
+$ l3build install --full
 ```
 
 * Typesetting documentation
 
 ```
-$ ./build.lua doc
+$ l3build doc
 ```
 
 * Running tests
 
 ```
-$ ./build.lua check
+$ l3build check
 ```
 
 ## License
@@ -47,17 +47,19 @@ This package is distributed under [the MIT license](./LICENSE).
 
 ## Revision History
 
-* Version 1.1.0  ‹2020/11/28›
+* Version 1.1.1  ‹2021-09-28›
+  * A bug fix
+* Version 1.1.0  ‹2020-11-28›
   * Add Japanese documentation
   * Support special cases in 2021
-* Version 1.0.0  ‹2019/02/03›
+* Version 1.0.0  ‹2019-02-03›
   * Add documentation
   * Rename `\g_bxjh_sport_tl` -> `\g_bxjh_sports_tl`
-* Version 0.2.0  ‹2019/01/27›
+* Version 0.2.0  ‹2019-01-27›
   * Support special holidays in 2019
   * Add new expl3 interface `\bxjh_apply_(next|prev)_day:Nnnn`
   * Fix a potential bug
-* Version 0.1.0  ‹2018/12/03›
+* Version 0.1.0  ‹2018-12-03›
   * The first public version
 
 ---
diff --git a/language/japanese/BX/bxjaholiday/bxjaholiday-ja.pdf b/language/japanese/BX/bxjaholiday/bxjaholiday-ja.pdf
index d09830390f..f050527809 100644
--- a/language/japanese/BX/bxjaholiday/bxjaholiday-ja.pdf
+++ b/language/japanese/BX/bxjaholiday/bxjaholiday-ja.pdf
diff --git a/language/japanese/BX/bxjaholiday/bxjaholiday.pdf b/language/japanese/BX/bxjaholiday/bxjaholiday.pdf
index 1b95865d5b..8ac92925f8 100644
--- a/language/japanese/BX/bxjaholiday/bxjaholiday.pdf
+++ b/language/japanese/BX/bxjaholiday/bxjaholiday.pdf
diff --git a/language/japanese/BX/bxjaholiday/bxjaholiday.sty b/language/japanese/BX/bxjaholiday/bxjaholiday.sty
index cb80232ee1..b816240b41 100644
--- a/language/japanese/BX/bxjaholiday/bxjaholiday.sty
+++ b/language/japanese/BX/bxjaholiday/bxjaholiday.sty
@@ -1,7 +1,7 @@
 %%
 %% This is file 'bxjaholiday.sty'.
 %%
-%% Copyright 2018-2020 Takuto ASAKURA (wtsnjp)
+%% Copyright 2018-2021 Takuto ASAKURA (wtsnjp)
 %%   GitHub:   https://github.com/wtsnjp
 %%   Twitter:  @wtsnjp
 %%
@@ -13,7 +13,7 @@
 % -------------------------------------------------- declarations
 
 \RequirePackage{expl3}
-\ProvidesExplPackage {bxjaholiday} {2020/11/28} {1.1.0}
+\ProvidesExplPackage {bxjaholiday} {2021-09-28} {1.1.1}
   {Support for Japanese holidays}
 
 % -------------------------------------------------- utilities
@@ -850,7 +850,7 @@
 
             { 10 } % October
             {
-              \int_compare:nNnTF { #1 } > { 2020 }
+              \int_compare:nNnTF { #1 } > { 2021 }
                 {
                   \__bxjh_int_compare_and:nnT % second Monday
                     { \int_div_truncate:nn { #3 - 1 } { 7 } = 1 }
@@ -861,7 +861,9 @@
                     { \g_bxjh_sports_tl }
                 }
                 {
-                  \int_compare:nNnTF { #1 } = { 2020 }
+                  \bool_lazy_or:nnTF
+                    { \int_compare_p:n { #1 = 2020 } }
+                    { \int_compare_p:n { #1 = 2021 } }
                     {
                       % pass because of 2020 Tokyo Olympic
                     }
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index 2081f55551..2a841ac896 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -15,7 +15,7 @@
 %<*class>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/09/12}{1.3d}
+\ProvidesExplClass{easybook}{2021/09/28}{1.3e}
   {Typeset Chinese theses or books}
 
 \bool_set_false:N \l__eb_compile_draft_bool
@@ -297,7 +297,7 @@
 %<*package>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/09/12}{1.3d}
+\ProvidesExplPackage{easybase}{2021/09/28}{1.3e}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -1771,6 +1771,7 @@
     \tl_gset:Nn \dbltopfraction { 0.9 }
     \tl_gset:Nn \dblfloatpagefraction { 0.9 }
   }
+\dim_zero:N \mathindent
 \skip_set:Nn \parskip { 0pt plus 2pt minus 1pt }
 \skip_set:Nn \intextsep { 14pt plus 2pt minus 2pt }
 \skip_set:Nn \textfloatsep { 16pt plus 2pt minus 4pt }
@@ -2389,7 +2390,7 @@
   }
 %</package>
 %<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/09/12}{1.3d}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/09/28}{1.3e}
   {Customization of tcolorbox for easybook}
 
 \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip }
diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf
index 2549d682b3..9a4997299c 100644
--- a/macros/latex/contrib/easybook/easybook.pdf
+++ b/macros/latex/contrib/easybook/easybook.pdf
diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex
index a979be5a54..0c202a3674 100644
--- a/macros/latex/contrib/easybook/easybook.tex
+++ b/macros/latex/contrib/easybook/easybook.tex
@@ -12,8 +12,8 @@
     name            = easybook,
     color-scheme    = blue,
     title           = EASYBOOK 使用手册,
-    version         = v1.3d,
-    date            = 2021/09/12,
+    version         = v1.3e,
+    date            = 2021/09/28,
     authors         = 瞿毅,
     info            = 排版简体中文学位论文和书籍,
     email           = quee123@foxmail.com,
diff --git a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf
index 4e6cef7423..b92b60e47b 100644
--- a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf
+++ b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf
diff --git a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
index 4a4492ba6d..4766e38d38 100644
--- a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
diff --git a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
index edcc2bf125..f669ce30c9 100644
--- a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
diff --git a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf
index 87fcfccdb0..fe9826bcf5 100644
--- a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf
diff --git a/macros/latex/contrib/reledmac/examples/1-tabular.pdf b/macros/latex/contrib/reledmac/examples/1-tabular.pdf
index 3b5e5715b7..abb3976b59 100644
--- a/macros/latex/contrib/reledmac/examples/1-tabular.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-tabular.pdf
diff --git a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
index c833b9f6ae..ac76fd9f8b 100644
--- a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
diff --git a/macros/latex/contrib/reledmac/examples/1-verses.pdf b/macros/latex/contrib/reledmac/examples/1-verses.pdf
index 382ba54302..8a975fac9f 100644
--- a/macros/latex/contrib/reledmac/examples/1-verses.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-verses.pdf
diff --git a/macros/latex/contrib/reledmac/examples/2-antilabe.pdf b/macros/latex/contrib/reledmac/examples/2-antilabe.pdf
index 319e83f2ea..e295f0204d 100644
--- a/macros/latex/contrib/reledmac/examples/2-antilabe.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-antilabe.pdf
diff --git a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
index a407c54f18..55fb7476ee 100644
--- a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
diff --git a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf
index d66bb8eda8..81a3764006 100644
--- a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf
diff --git a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf
index c75e366e1a..4f21057ba8 100644
--- a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf
diff --git a/macros/latex/contrib/reledmac/examples/2-indexing.pdf b/macros/latex/contrib/reledmac/examples/2-indexing.pdf
index 471a7a233d..99ce6fe10b 100644
--- a/macros/latex/contrib/reledmac/examples/2-indexing.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-indexing.pdf
diff --git a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf
index 0561b50d0d..2a1b3ebdf4 100644
--- a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf
diff --git a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf
index 4cdceb5b2e..56789481bf 100644
--- a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf
diff --git a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf
index 5fd637fe57..bf49a6826b 100644
--- a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf
diff --git a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf
index 494cc2fa3c..274f719ce6 100644
--- a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf
diff --git a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf
index 3237be4be1..028329e06b 100644
--- a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf
diff --git a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf
index e7c505a201..d4ac5f3c64 100644
--- a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf
diff --git a/macros/latex/contrib/reledmac/examples/2-performances.pdf b/macros/latex/contrib/reledmac/examples/2-performances.pdf
index 65d17ca2e9..482b1ed01b 100644
--- a/macros/latex/contrib/reledmac/examples/2-performances.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-performances.pdf
diff --git a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf
index 62a3ac3b45..5ae176bc27 100644
--- a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf
diff --git a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf
index 60abd860ab..3d7988bcde 100644
--- a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf
diff --git a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
index 113a237956..0fa1eda97d 100644
--- a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
diff --git a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf
index ff5d2b97c7..784b4f5e91 100644
--- a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf
index a7fd40a1ea..5a2396d8fa 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf
index a963695d7c..a5ac937d4b 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
index c47c522bb4..297ddc4672 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
index 33b19d76f6..222c139845 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
index 4b48dcc44c..04a751bd9e 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
index 4883912f88..957720ca6f 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf
index 6dab47543e..3338e9124c 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
index 08c01a94bf..67756d6ad9 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
index 7d1d97c5c1..d292d76db0 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
index 4f5cf3ccf6..b378e9dec8 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
index 40df495e5a..497ecc61f5 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
index 3bd111bac9..bb47c504a1 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex
index 8ca3aa3aed..9c542dda87 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex
@@ -22,6 +22,7 @@
 \begin{english}
 \date{}
 \title{Mixing multiple columns with a single column, using continuous numbering}
+\maketitle
 \begin{abstract}
 In this example, we use the \verb+widthliketwocolumns+ and \\ \verb+continuousnumberingwithcolumns+ and \verb+\pausenumbering+ to alternate parallel typesetting in columns and typesetting in a single column, getting continuous line numbering between them.
 \end{abstract}
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
index 7c5e7413e5..70aa4ce555 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf
index 5b42775a42..612f63e28b 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
index c8b8d81cf9..a901f4b4d6 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf
index 5f21322ee8..4e610657b4 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
index 4ac56fd5c9..9195e3c8a4 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf
index f328cc61d3..3232142908 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
index 842a706a28..8d323b82b5 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
index 2b2f02ecbb..7b169a2f9c 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
index 353ab235fa..95ee47081d 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
index 23415e60b4..b8eb7dabec 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf
index 32008aee75..205c3bc2f9 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf
diff --git a/macros/latex/contrib/reledmac/migration.pdf b/macros/latex/contrib/reledmac/migration.pdf
index 6800d46fac..6363914c61 100644
--- a/macros/latex/contrib/reledmac/migration.pdf
+++ b/macros/latex/contrib/reledmac/migration.pdf
diff --git a/macros/latex/contrib/reledmac/reledmac.dtx b/macros/latex/contrib/reledmac/reledmac.dtx
index dd6a6f39c0..996dc98008 100644
--- a/macros/latex/contrib/reledmac/reledmac.dtx
+++ b/macros/latex/contrib/reledmac/reledmac.dtx
@@ -586,6 +586,7 @@
 % \changes{v2.38.0}{2021/05/30}{Add hyperlinks between footnote and lemma when using abbreviated line range.}
 % \changes{v2.38.0}{2021/05/30}{Add \protect\cs{Xnopagenumberifcurrent} hook.}
 % \changes{v2.38.0}{2021/05/30}{Add \protect\cs{Xbeforepagenumber} hook.}
+% \changes{v2.38.1}{2021/09/27}{Fix incompatibility between \protect\parpackage's option \protect\option{continuousnumberingwithcolumns} and lineation by page.}
 %      Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
 % has version number \fileversion, last revised \filedate.}}
 %
@@ -4475,7 +4476,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2021/05/30 v2.38.0 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2021/09/27 v2.38.1 typesetting critical editions]%
 %    \end{macrocode}
 %
 % \subsection{Package options}
@@ -6808,7 +6809,7 @@
       \ifbypage@R
         \ifx\l@dchset@num\relax%Not resetting if preceded by a \setlinenum
           \ifboolexpr{%
-            bool{resumenumberingR@start}%
+            (bool{continuousnumberingwithcolumns} or bool{resumenumberingR@start})%
             and test {\ifnumequal{\last@page@numR}{-10000}}%
           }%
           {}%
@@ -6821,7 +6822,7 @@
       \fi
       \page@numR=#1%
       \global\this@section@page@numR=#1%
-      \last@page@numR=#1%
+      \global\last@page@numR=#1%
       \global\this@section@last@page@numR=#1%
       \def\next@page@numR{#1}%
       \gdef\this@section@next@page@numR{#1}%
diff --git a/macros/latex/contrib/reledmac/reledmac.pdf b/macros/latex/contrib/reledmac/reledmac.pdf
index 0e3ba600ed..a0bae5136c 100644
--- a/macros/latex/contrib/reledmac/reledmac.pdf
+++ b/macros/latex/contrib/reledmac/reledmac.pdf
diff --git a/macros/latex/contrib/reledmac/reledpar.dtx b/macros/latex/contrib/reledmac/reledpar.dtx
index 4fe935f799..55d7ea094b 100644
--- a/macros/latex/contrib/reledmac/reledpar.dtx
+++ b/macros/latex/contrib/reledmac/reledpar.dtx
@@ -349,6 +349,7 @@
 % \changes{v2.24.3}{2020/11/08}{Fix bug with hanging verse in parallel typesetting.}
 % \changes{v2.25.0}{2020/11/29}{Add compatibility with \protect\cs{linenumannotationothersidetrue} of \protect\macpackage.}.
 % \changes{v2.25.1}{2021/01/21}{\protect\cs{ifsublines@R} migrated to \protect\macpackage}
+% \changes{v2.25.2}{2021/09/27}{Fix incompatibility with \protect\package{babel} v.3.61}
 % ^^A PW added following as the definitions are at some unknown elsewhere
 %
 % \newcommand{\egstart}{%
@@ -1405,7 +1406,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2021/03/08 v2.25.1a reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2021/09/27 v2.25.2 reledmac extension for parallel texts]%
 
 %    \end{macrocode}
 % \subsection{Package's requirement}
@@ -5617,7 +5618,10 @@
 % that \protect\cs{theledlanguageL} and \protect\cs{theledlanguageR} are unaltered.
 %    \begin{macrocode}
     \renewcommand*{\l@duselanguage}[1]{%
-      \expandafter\l@doldselectlanguage\expandafter{#1}}
+      \let\bbl@savelastskip\relax% Babel 3.61, which provokes spurious vertical space
+      \let\bbl@restorelastskip\relax%% Babel 3.61, which provokes spurious vertical space
+      \expandafter\l@doldselectlanguage\expandafter{#1}%
+    }%
 %    \end{macrocode}
 % Lastly, initialise the left and right languages to the current \protect\package{babel}
 % one.
diff --git a/macros/latex/contrib/reledmac/reledpar.pdf b/macros/latex/contrib/reledmac/reledpar.pdf
index ed94a2657e..01117f6c19 100644
--- a/macros/latex/contrib/reledmac/reledpar.pdf
+++ b/macros/latex/contrib/reledmac/reledpar.pdf
diff --git a/macros/latex/contrib/willowtreebook/README b/macros/latex/contrib/willowtreebook/README
index df5fb11cab..fb1eb87949 100644
--- a/macros/latex/contrib/willowtreebook/README
+++ b/macros/latex/contrib/willowtreebook/README
@@ -1,6 +1,6 @@
 Willow Tree Book Class
-v1.02
-22 September 2021
+v1.03
+28 September 2021
 
 Authors: 
 Ben McKay
@@ -18,4 +18,4 @@ See http://www.latex-project.org/lppl.txt
 The willowtreebook class is a simple book class, which I use for lecture notes.
 It actually just selects options for the more sophisticated memoir class.
 
-Changes: added hint and bibliography preambles, to load before the hints or bibliography.
+Changes: fixed typo in user manual.
diff --git a/macros/latex/contrib/willowtreebook/willowtreebook.pdf b/macros/latex/contrib/willowtreebook/willowtreebook.pdf
index 0c3d8b6578..6df38e5391 100644
--- a/macros/latex/contrib/willowtreebook/willowtreebook.pdf
+++ b/macros/latex/contrib/willowtreebook/willowtreebook.pdf
diff --git a/macros/latex/contrib/willowtreebook/willowtreebook.tex b/macros/latex/contrib/willowtreebook/willowtreebook.tex
index 2418ae455e..331432e52e 100644
--- a/macros/latex/contrib/willowtreebook/willowtreebook.tex
+++ b/macros/latex/contrib/willowtreebook/willowtreebook.tex
@@ -1,5 +1,5 @@
 \documentclass{willowtreebook}
-\Title{The Willow Tree Book Class 1.02}
+\Title{The Willow Tree Book Class 1.03}
 \Author{Benjamin \scotsMc{}Kay}
 \Colophon{Released under the \LaTeX{} Public Project License 1.3c}
 \BibliographyFile{willowtreebook}
@@ -129,12 +129,26 @@ is evaluated by substituting \(u=x^2\), so
 \section{Preambles}
 We can put some \LaTeX{} code before the hints:
 \begin{Verbatim}[frame=leftline]
-\RenewDocumentCommand\hintsPreamble{}{\par\noindent{}\textit{When you are describing, \\ A shape, or sound, or tint; \\ Don't state the matter plainly, \\ But put it in a hint; \\\ And learn to look at all things, \\ With a sort of mental squint.}\par\noindent{}---\ {Lewis Carroll}}
+\RenewDocumentCommand\hintsPreamble{}{
+\par\noindent{}
+\textit{When you are describing, \\ 
+A shape, or sound, or tint; \\ 
+Don't state the matter plainly, \\ 
+But put it in a hint; \\
+And learn to look at all things, \\ 
+With a sort of mental squint.}
+\par\noindent{}---\ {Lewis Carroll}}
 \end{Verbatim}
 \RenewDocumentCommand\hintsPreamble{}{\par\noindent{}\textit{When you are describing, \\ A shape, or sound, or tint; \\ Don't state the matter plainly, \\ But put it in a hint; \\\ And learn to look at all things, \\ With a sort of mental squint.}\par\noindent{}---\ {Lewis Carroll}}
 or before the bibliography:
 \begin{Verbatim}[frame=leftline]
-\RenewDocumentCommand\bibliographyPreamble{}{\par\noindent\textit{If those books are in agreement with the Quran, we have no need of them; and if these are opposed to the Quran, destroy them.}\par\noindent{}---\ {Omar}}
+\RenewDocumentCommand\bibliographyPreamble{}{
+\par\noindent
+\textit{If those books are in agreement with the Quran, 
+we have no need of them; 
+and if these are opposed to the Quran, 
+destroy them.}
+\par\noindent{}---\ {Omar}}
 \end{Verbatim}
 \RenewDocumentCommand\bibliographyPreamble{}{\par\noindent\textit{If those books are in agreement with the Quran, we have no need of them; and if these are opposed to the Quran, destroy them.}\par\noindent{}---\ {Omar}}
 \end{document}
diff --git a/macros/unicodetex/latex/uwa-letterhead/README b/macros/unicodetex/latex/uwa-letterhead/README
index 5aa003f531..15b9f212d2 100644
--- a/macros/unicodetex/latex/uwa-letterhead/README
+++ b/macros/unicodetex/latex/uwa-letterhead/README
@@ -20,4 +20,5 @@ This work has the LPPL maintenance status `maintained'.
 The Current Maintainer of this work is Anthony Di Pietro.
 
 This work consists of the files uwa-letterhead.dtx, uwa-letterhead.ins, and
-example.tex and the derived files uwa-letterhead.sty and uwa-letterhead.pdf.
+uwa-letterhead-example.tex and the derived files uwa-letterhead.sty and
+uwa-letterhead.pdf.
diff --git a/macros/unicodetex/latex/uwa-letterhead/example.tex b/macros/unicodetex/latex/uwa-letterhead/uwa-letterhead-example.tex
index 9168e2d7d1..3a467e0eeb 100644
--- a/macros/unicodetex/latex/uwa-letterhead/example.tex
+++ b/macros/unicodetex/latex/uwa-letterhead/uwa-letterhead-example.tex
@@ -13,7 +13,8 @@
 % The Current Maintainer of this work is Anthony Di Pietro.
 %
 % This work consists of the files uwa-letterhead.dtx, uwa-letterhead.ins, and
-% example.tex and the derived files uwa-letterhead.sty and uwa-letterhead.pdf.
+% uwa-letterhead-example.tex and the derived files uwa-letterhead.sty and
+% uwa-letterhead.pdf.
 
 \documentclass[a4paper,11pt]{article}
 \usepackage{uwa-letterhead}
@@ -22,7 +23,6 @@
 \school{School of Psychological Science}
 \mbdp{000}
 \phone{+61 8 6488 0000}
-\mobile{+61 000 000 000}
 \email{john.smith@uwa.edu.au}
 
 \begin{document}
diff --git a/macros/unicodetex/latex/uwa-letterhead/uwa-letterhead.dtx b/macros/unicodetex/latex/uwa-letterhead/uwa-letterhead.dtx
index 87f044cc85..7f3a1e4073 100644
--- a/macros/unicodetex/latex/uwa-letterhead/uwa-letterhead.dtx
+++ b/macros/unicodetex/latex/uwa-letterhead/uwa-letterhead.dtx
@@ -14,7 +14,8 @@
 % The Current Maintainer of this work is Anthony Di Pietro.
 %
 % This work consists of the files uwa-letterhead.dtx, uwa-letterhead.ins, and
-% example.tex and the derived files uwa-letterhead.sty and uwa-letterhead.pdf.
+% uwa-letterhead-example.tex and the derived files uwa-letterhead.sty and
+% uwa-letterhead.pdf.
 % \fi
 %
 % \iffalse
@@ -24,7 +25,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
 %<package>\ProvidesPackage{uwa-letterhead}
 %<*package>
-    [2019/08/31 1.0.0 UWA Letterhead]
+    [2021/09/13 1.0.1 UWA Letterhead]
 %</package>
 %
 %<*driver>
@@ -38,7 +39,7 @@
         regular,
         nouwafont,
         noarial
-]{uwa-letterhead}[2019/08/31]
+]{uwa-letterhead}[2021/09/13]
 \GetFileInfo{uwa-letterhead.dtx}
 \setcounter{secnumdepth}{3}
 \geometry{
@@ -59,7 +60,7 @@
 \DisableCrossrefs
 \CodelineIndex
 \RecordChanges
-\CheckSum{545}
+\CheckSum{561}
 \begin{document}
         \DocInput{uwa-letterhead.dtx}
 \end{document}
@@ -83,6 +84,7 @@
 %   Right brace   \}     Tilde         \~}
 %
 % \changes{1.0.0}{2019/08/31}{Initial version}
+% \changes{1.0.1}{2021/09/13}{Make first-page footer optional}
 %
 % \maketitle
 %
@@ -104,7 +106,7 @@
 % typeface for the first-page footer and the
 % \href{https://www.brand.uwa.edu.au/}{UWA Slab} typeface for headings.
 % The fonts must be installed on the system for this to work. Arial is
-% available as part of Microsoft's TypeType core fonts for the web
+% available as part of Microsoft's TrueType core fonts for the web
 % (\url{https://sourceforge.net/projects/mscorefonts2/}), and UWA Slab is
 % available from the UWA website
 % (\url{https://static-listing.weboffice.uwa.edu.au/visualid/core-rebrand/fonts/uwa/}).
@@ -132,6 +134,13 @@
 %         \item |nouwafont|: Use the body text typeface for headings.
 % \end{itemize}
 %
+% You can pass the following options to specify whether to include the
+% first-page footer:
+% \begin{itemize}
+%         \item |footer|: Include the first-page footer.
+%         \item |nofooter|: Do not include the first-page footer (default).
+% \end{itemize}
+%
 % You can pass the following options to specify whether to use Arial
 % for the first-page footer:
 % \begin{itemize}
@@ -241,14 +250,17 @@
 %
 % \begin{minipage}{\textwidth}
 % \begin{macro}{\uwalh@uwafont}
+% \begin{macro}{\uwalh@footer}
 % \begin{macro}{\uwalh@arialfont}
 % Define conditionals for the package options.
 %    \begin{macrocode}
 \newif\ifuwalh@uwafont
+\newif\ifuwalh@footer
 \newif\ifuwalh@arialfont
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
+% \end{macro}
 % \end{minipage}
 %
 % The |uwafont| and |nouwafont| options respectively enable and disable
@@ -262,6 +274,17 @@
 }
 %    \end{macrocode}
 %
+% The |footer| and |nofooter| options respectively enable and disable
+% the first-page footer.
+%    \begin{macrocode}
+\DeclareOption{footer}{
+        \uwalh@footertrue
+}
+\DeclareOption{nofooter}{
+        \uwalh@footerfalse
+}
+%    \end{macrocode}
+%
 % The |arial| and |noarial| options respectively enable and disable
 % using Arial for the first-page footer.
 %    \begin{macrocode}
@@ -301,14 +324,17 @@
         }{sourcecodepro}
 }
 %    \end{macrocode}
-% Use the |uwafont|, |arial|, and |light| options by default.
+%
+% Use the |uwafont|, |nofooter|, |arial|, and |light| options by default.
 %    \begin{macrocode}
 \ExecuteOptions{
         uwafont,
+        nofooter,
         arial,
         light
 }
 %    \end{macrocode}
+%
 % Complete option processing.
 %    \begin{macrocode}
 \ProcessOptions\relax
@@ -355,8 +381,12 @@
 %
 % Set font for first-page footer.
 %    \begin{macrocode}
-\ifuwalh@arialfont
-        \newfontfamily{\uwalh@arial}{Arial}
+\ifuwalh@footer
+        \ifuwalh@arialfont
+                \newfontfamily{\uwalh@arial}{Arial}
+        \else
+                \newcommand*{\uwalh@arial}{\sffamily}
+        \fi
 \else
         \newcommand*{\uwalh@arial}{\sffamily}
 \fi
@@ -385,6 +415,7 @@
 \titlespacing*{\section}{0em}{2\baselineskip}{0em}
 \titlespacing*{\subsection}{0em}{\baselineskip}{0em}
 %    \end{macrocode}
+%
 % Disable section numbering.
 %    \begin{macrocode}
 \setcounter{secnumdepth}{0}
@@ -424,11 +455,13 @@
 %    \begin{macrocode}
 \RequirePackage{stringstrings}
 %    \end{macrocode}
+%
 % Use |textpos| in |absolute| mode to place letterhead elements
 % at arbitrary positions on the page.
 %    \begin{macrocode}
 \RequirePackage[absolute]{textpos}
 %    \end{macrocode}
+%
 % Use |graphicx| to add the university logo.
 %    \begin{macrocode}
 \RequirePackage{graphicx}
@@ -590,6 +623,7 @@
 % \begin{macro}{\address}
 % \begin{macro}{\phone}
 % \begin{macro}{\mobile}
+% \changes{1.0.1}{2021/09/13}{Make mobile optional without first-page footer}
 % \begin{macro}{\email}
 % \begin{macro}{\website}
 % \begin{macro}{\footeraddress}
@@ -858,7 +892,7 @@
         \uwalh@checkfield{\uwalh@school}{\noexpand\school}
         \uwalh@checkfield{\uwalh@mbdp}{\noexpand\mbdp}
         \uwalh@checkfield{\uwalh@phone}{\noexpand\phone}
-        \uwalh@checkfield{\uwalh@mobile}{\noexpand\mobile}
+        \ifuwalh@footer\uwalh@checkfield{\uwalh@mobile}{\noexpand\mobile}\fi
         \uwalh@checkfield{\uwalh@email}{\noexpand\email}
 }
 %    \end{macrocode}
@@ -874,7 +908,7 @@
         \uwalh@bar{}%
         \uwalh@logo{}%
         \uwalh@addressblock{}%
-        \uwalh@firstpagefooter{}%
+        \ifuwalh@footer\uwalh@firstpagefooter{}\fi%
         \vspace*{\uwalh@vspaceatstart}%
 }
 %    \end{macrocode}
diff --git a/macros/unicodetex/latex/uwa-letterhead/uwa-letterhead.ins b/macros/unicodetex/latex/uwa-letterhead/uwa-letterhead.ins
index fbf81d2c00..914719e130 100644
--- a/macros/unicodetex/latex/uwa-letterhead/uwa-letterhead.ins
+++ b/macros/unicodetex/latex/uwa-letterhead/uwa-letterhead.ins
@@ -13,7 +13,8 @@
 %% The Current Maintainer of this work is Anthony Di Pietro.
 %%
 %% This work consists of the files uwa-letterhead.dtx, uwa-letterhead.ins, and
-%% example.tex and the derived files uwa-letterhead.sty and uwa-letterhead.pdf.
+%% uwa-letterhead-example.tex and the derived files uwa-letterhead.sty and
+%% uwa-letterhead.pdf.
 
 \input docstrip.tex
 \keepsilent
@@ -37,7 +38,8 @@ This work has the LPPL maintenance status `maintained'.
 The Current Maintainer of this work is Anthony Di Pietro.
 
 This work consists of the files uwa-letterhead.dtx, uwa-letterhead.ins, and
-example.tex and the derived files uwa-letterhead.sty and uwa-letterhead.pdf.
+uwa-letterhead-example.tex and the derived files uwa-letterhead.sty and
+uwa-letterhead.pdf.
 
 \endpreamble
 
diff --git a/macros/unicodetex/latex/uwa-letterhead/uwa-letterhead.pdf b/macros/unicodetex/latex/uwa-letterhead/uwa-letterhead.pdf
index 1325f7aa0d..cdc994b8cd 100644
--- a/macros/unicodetex/latex/uwa-letterhead/uwa-letterhead.pdf
+++ b/macros/unicodetex/latex/uwa-letterhead/uwa-letterhead.pdf
diff --git a/macros/unicodetex/latex/uwa-pcf/README b/macros/unicodetex/latex/uwa-pcf/README
new file mode 100644
index 0000000000..4af4f788fe
--- /dev/null
+++ b/macros/unicodetex/latex/uwa-pcf/README
@@ -0,0 +1,24 @@
+This package generates a Participant Consent Form (PCF) for a
+human research protocol at the University of Western Australia.
+
+It requires the UWA logo in PDF format, which is available in SVG format at
+https://static-listing.weboffice.uwa.edu.au/visualid/core-rebrand/img/uwacrest/,
+and uses the Arial (https://docs.microsoft.com/en-us/typography/font-list/arial)
+and UWA Slab (https://www.brand.uwa.edu.au/) fonts by default.
+
+Copyright 2019, 2021 Anthony Di Pietro
+
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3
+of this license or (at your option) any later version.
+The latest version of this license is in
+  http://www.latex-project.org/lppl.txt
+and version 1.3 or later is part of all distributions of LaTeX
+version 2005/12/01 or later.
+
+This work has the LPPL maintenance status `maintained'.
+
+The Current Maintainer of this work is Anthony Di Pietro.
+
+This work consists of the files uwa-pcf.dtx, uwa-pcf.ins, and
+uwa-pcf-example.tex and the derived files uwa-pcf.cls and uwa-pcf.pdf.
diff --git a/macros/unicodetex/latex/uwa-pcf/uwa-pcf-example.tex b/macros/unicodetex/latex/uwa-pcf/uwa-pcf-example.tex
new file mode 100644
index 0000000000..a39fa7100c
--- /dev/null
+++ b/macros/unicodetex/latex/uwa-pcf/uwa-pcf-example.tex
@@ -0,0 +1,47 @@
+% Copyright 2019, 2021 Anthony Di Pietro
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Anthony Di Pietro.
+%
+% This work consists of the files uwa-pcf.dtx, uwa-pcf.ins, and
+% uwa-pcf-example.tex and the derived files uwa-pcf.cls and uwa-pcf.pdf.
+
+\documentclass{uwa-pcf}
+
+\author{John Smith}
+\school{School of Psychological Science}
+\mbdp{000}
+\phone{+61 8 6488 0000}
+\email{john.smith@uwa.edu.au}
+\project{My Research Project}
+
+\begin{document}
+
+I, \theparticipant, have read the information provided and any
+questions I have asked have been answered to my satisfaction. I agree
+to participate in this research project but withdrawal is not possible
+once data are submitted.
+
+I understand that all identifiable (attributable) information that I
+provide is treated as strictly confidential and will not be released
+by the investigator in any form that may identify me. The only
+exception to this principle of confidentiality is if documents are
+required by law.
+
+I have been advised as to what data is being collected, the purpose
+for collecting the data, and what will be done with the data upon
+completion of the research.
+
+I agree that research data gathered for the study may be published
+provided my name or other identifying information is not used.
+
+\end{document}
diff --git a/macros/unicodetex/latex/uwa-pcf/uwa-pcf.dtx b/macros/unicodetex/latex/uwa-pcf/uwa-pcf.dtx
new file mode 100644
index 0000000000..d8c52a147b
--- /dev/null
+++ b/macros/unicodetex/latex/uwa-pcf/uwa-pcf.dtx
@@ -0,0 +1,735 @@
+% \iffalse meta-comment
+% Copyright 2019, 2021 Anthony Di Pietro
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Anthony Di Pietro.
+%
+% This work consists of the files uwa-pcf.dtx, uwa-pcf.ins, and
+% uwa-pcf-example.tex and the derived files uwa-pcf.cls and uwa-pcf.pdf.
+% \fi
+%
+% \iffalse
+%<*driver>
+\ProvidesFile{uwa-pcf.dtx}
+%</driver>
+%<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
+%<class>\ProvidesClass{uwa-pcf}
+%<*class>
+    [2021/09/28 1.0.1 UWA Participant Consent Form]
+%</class>
+%
+%<*driver>
+\documentclass[
+        a4paper,
+        10pt
+]{ltxdoc}
+\usepackage{hypdoc}
+\PassOptionsToPackage{scale=0.9}{sourcecodepro}
+\usepackage[regular]{uwa-letterhead}[2021/09/13]
+\GetFileInfo{uwa-pcf.dtx}
+\setcounter{secnumdepth}{3}
+\geometry{
+        left=5cm,
+        right=2cm
+}
+\hypersetup{colorlinks=true}
+\date{}
+\makeatletter
+\title{%
+        {The UWA Participant Consent Form Class} \\
+        {\Large uwa-pcf \fileversion{} (\filedate{})}%
+}
+\c@IndexColumns = 2
+\renewcommand*{\uwalh@uwa}{\sffamily}
+\renewcommand{\uwalh@makeletterhead}{}
+\makeatother
+\DoNotIndex{\newcommand, \newenvironment}
+\DisableCrossrefs
+\CodelineIndex
+\RecordChanges
+\CheckSum{328}
+\begin{document}
+        \DocInput{uwa-pcf.dtx}
+\end{document}
+%</driver>
+% \fi
+%
+% \CharacterTable
+%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%   Digits        \0\1\2\3\4\5\6\7\8\9
+%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%   Dollar        \$     Percent       \%     Ampersand     \&
+%   Acute accent  \'     Left paren    \(     Right paren   \)
+%   Asterisk      \*     Plus          \+     Comma         \,
+%   Minus         \-     Point         \.     Solidus       \/
+%   Colon         \:     Semicolon     \;     Less than     \<
+%   Equals        \=     Greater than  \>     Question mark \?
+%   Commercial at \@     Left bracket  \[     Backslash     \\
+%   Right bracket \]     Circumflex    \^     Underscore    \_
+%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%   Right brace   \}     Tilde         \~}
+%
+% \changes{1.0.0}{2019/08/31}{Initial version}
+% \changes{1.0.1}{2021/09/28}{Make HREO statement and signature lines optional}
+%
+% \maketitle
+%
+% \section{Introduction}
+%
+% This class generates a Participant Consent Form (PCF) for a
+% human research protocol at the University of Western Australia.
+%
+% \section{Usage}
+%
+% \subsection{External Dependencies}
+%
+% You must supply the university logo (as |uwacrest-blue.pdf| by default).
+% It is available in SVG format at
+% \href{https://static-listing.weboffice.uwa.edu.au/visualid/core-rebrand/img/uwacrest/}
+% {https://static-listing.weboffice.uwa.edu.au/visualid/core-rebrand/img/uwacrest/}.
+%
+% In accordance with the official PCF template, this class uses the
+% \href{https://docs.microsoft.com/en-us/typography/font-list/arial}{Arial}
+% typeface by default. The fonts must be installed on the system for this to
+% work. Arial is available as part of Microsoft's TrueType core fonts for the
+% web (\url{https://sourceforge.net/projects/mscorefonts2/}). Alternatively,
+% you can use the |noarial| package option to substitute it with
+% \href{https://adobe-fonts.github.io/source-sans/}{Source Sans Pro}, the usual
+% typeface used for university correspondence.
+%
+% \subsection{Class Options}
+%
+% \DescribeMacro{\documentclass}
+% To select the class, add this to your preamble:
+% \begin{quote}
+% |\documentclass{uwa-pcf}|
+% \end{quote}
+%
+% This class supports the |draft|, |final|, |leqno|, and |fleqn| options
+% from the |article| base class and the |footer|, |nofooter|, |arial|, and
+% |noarial| options from the |uwa-letterhead| package.
+%
+% You can pass the following options to specify whether to include the
+% mandatory Human Ethics Research Office (HREO) statement:
+% \begin{itemize}
+%         \item |hreo|: Include HREO statement (default).
+%         \item |nohreo|: Do not include HREO statement.
+% \end{itemize}
+%
+% You can pass the following options to specify whether to include the
+% signature and date lines:
+% \begin{itemize}
+%         \item |signature|: Include signature and date lines (default).
+%         \item |nosignature|: Do not include signature and date lines.
+% \end{itemize}
+%
+% \subsection{Letterhead Fields}
+%
+% Use the following commands in the preamble to set the letterhead fields:
+%
+% \DescribeMacro{\author}
+% \begin{minipage}[t]{\textwidth}
+% |\author|\marg{author} \\
+% The author of the document. \\
+% Required
+% \end{minipage}
+%
+% \DescribeMacro{\school}
+% \begin{minipage}[t]{\textwidth}
+% |\school|\marg{school} \\
+% The author's school within the university. \\
+% Required
+% \end{minipage}
+%
+% \DescribeMacro{\mbdp}
+% \begin{minipage}[t]{\textwidth}
+% |\mbdp|\marg{mbdp} \\
+% The author's \href{http://www.staff.uwa.edu.au/facilities/mail/mbdp}
+% {mailbag delivery point (MBDP)}. \\
+% Required
+% \end{minipage}
+%
+% \DescribeMacro{\university}
+% \begin{minipage}[t]{\textwidth}
+% |\university|\marg{university} \\
+% The name of the university. \\
+% Default: \textit{The University of Western Australia}
+% \end{minipage}
+%
+% \DescribeMacro{\address}
+% \begin{minipage}[t]{\textwidth}
+% |\address|\marg{address} \\
+% The university's address. \\
+% Default: \textit{35 Stirling Highway, Crawley WA 6009}
+% \end{minipage}
+%
+% \DescribeMacro{\phone}
+% \begin{minipage}[t]{\textwidth}
+% |\phone|\marg{phone} \\
+% The author's phone number. \\
+% Required
+% \end{minipage}
+%
+% \DescribeMacro{\mobile}
+% \begin{minipage}[t]{\textwidth}
+% |\mobile|\marg{mobile} \\
+% The author's mobile number. \\
+% Required
+% \end{minipage}
+%
+% \DescribeMacro{\email}
+% \begin{minipage}[t]{\textwidth}
+% |\email|\marg{email} \\
+% The author's email address. \\
+% Required
+% \end{minipage}
+%
+% \DescribeMacro{\website}
+% \begin{minipage}[t]{\textwidth}
+% |\website|\marg{website} \\
+% The author's website, or their school's website. \\
+% Omit the scheme (|https://|) and path (|/|). \\
+% Default: \textit{www.uwa.edu.au}
+% \end{minipage}
+%
+% \DescribeMacro{\footeraddress}
+% \begin{minipage}[t]{\textwidth}
+% |\footeraddress|\marg{footeraddress} \\
+% The university's address, shortened for the first-page footer. \\
+% Default: \textit{Perth WA 6009 Australia}
+% \end{minipage}
+%
+% \DescribeMacro{\cricos}
+% \begin{minipage}[t]{\textwidth}
+% |\cricos|\marg{cricos} \\
+% The university's \href{http://cricos.education.gov.au/}{CRICOS} provider code. \\
+% Default: \textit{00126G}
+% \end{minipage}
+%
+% \DescribeMacro{\uwacrest}
+% \begin{minipage}[t]{\textwidth}
+% |\uwacrest|\marg{uwacrest} \\
+% The filename of the UWA crest in PDF format (available in SVG format at
+% \href{https://static-listing.weboffice.uwa.edu.au/visualid/core-rebrand/img/uwacrest/}
+% {https://static-listing.weboffice.uwa.edu.au/visualid/core-rebrand/img/uwacrest/}). \\
+% Default: \textit{uwacrest-blue.pdf}
+% \end{minipage}
+%
+% \subsection{Project Fields}
+%
+% Use the following commands in the preamble to set the project fields:
+%
+% \DescribeMacro{\project}
+% \begin{minipage}[t]{\textwidth}
+% |\project|\marg{project} \\
+% The project's title. \\
+% Required
+% \end{minipage}
+%
+% \subsection{Participant Name}
+%
+% \DescribeMacro{\theparticipant}
+% Use |\theparticipant| to generate the line for the participant's name.
+% For example:
+%
+% \begin{quote}
+% \begin{verbatim}
+% I, \theparticipant, have read the information provided and
+% any questions I have asked have been answered to my satisfaction.
+% I agree to participate in this research project but withdrawal
+% is not possible once data are submitted.
+% \end{verbatim}
+% \end{quote}
+%
+% \StopEventually{\PrintChanges\PrintIndex}
+%
+% \section{Implementation}
+%
+% \subsection{Class Options}
+%
+% \begin{minipage}{\textwidth}
+% \begin{macro}{\uwapcf@hreo}
+% \begin{macro}{\uwapcf@signature}
+% Define conditionals for the class options.
+%    \begin{macrocode}
+\newif\ifuwapcf@hreo
+\newif\ifuwapcf@signature
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{minipage}
+%
+% The |hreo| and |nohreo| options respectively enable and disable
+% the HREO statement.
+%    \begin{macrocode}
+\DeclareOption{hreo}{
+        \uwapcf@hreotrue
+}
+\DeclareOption{nohreo}{
+        \uwapcf@hreofalse
+}
+%    \end{macrocode}
+%
+% The |signature| and |nosignature| options respectively enable and disable
+% the signature and date lines.
+%    \begin{macrocode}
+\DeclareOption{signature}{
+        \uwapcf@signaturetrue
+}
+\DeclareOption{nosignature}{
+        \uwapcf@signaturefalse
+}
+%    \end{macrocode}
+%
+% Pass the |draft|, |final|, |leqno|, and |fleqn| options through to the
+% |article| base class, and pass the |footer|, |nofooter|, |arial|, and
+% |noarial| options through to the |uwa-letterhead| package.
+%    \begin{macrocode}
+\DeclareOption{draft}{
+        \PassOptionsToClass{\CurrentOption}{article}
+}
+\DeclareOption{final}{
+        \PassOptionsToClass{\CurrentOption}{article}
+}
+\DeclareOption{leqno}{
+        \PassOptionsToClass{\CurrentOption}{article}
+}
+\DeclareOption{fleqn}{
+        \PassOptionsToClass{\CurrentOption}{article}
+}
+\DeclareOption{footer}{
+        \PassOptionsToPackage{\CurrentOption}{uwa-letterhead}
+}
+\DeclareOption{nofooter}{
+        \PassOptionsToPackage{\CurrentOption}{uwa-letterhead}
+}
+\DeclareOption{arial}{
+        \PassOptionsToPackage{\CurrentOption}{uwa-letterhead}
+}
+\DeclareOption{noarial}{
+        \PassOptionsToPackage{\CurrentOption}{uwa-letterhead}
+}
+%    \end{macrocode}
+%
+% Show a warning for unknown options.
+%    \begin{macrocode}
+\DeclareOption*{
+        \ClassWarning{uwa-pcf}{Unknown option '\CurrentOption'}
+}
+%    \end{macrocode}
+%
+% Use the |hreo| and |signature| options by default.
+%    \begin{macrocode}
+\ExecuteOptions{
+        hreo,
+        signature
+}
+%    \end{macrocode}
+%
+% Complete option processing.
+%    \begin{macrocode}
+\ProcessOptions\relax
+%    \end{macrocode}
+%
+% Load the |article| base class with the |a4paper| and |11pt| options.
+%    \begin{macrocode}
+\PassOptionsToClass{
+        a4paper,
+        11pt
+}{article}
+\LoadClass{article}
+%    \end{macrocode}
+%
+% \subsection{Page Configuration}
+%
+% Use |uwa-letterhead| to configure the page.
+%    \begin{macrocode}
+\RequirePackage[regular]{uwa-letterhead}
+%    \end{macrocode}
+%
+% Adjust paragraph spacing.
+%    \begin{macrocode}
+\setlength{\parskip}{0.83\baselineskip}
+%    \end{macrocode}
+%
+% \subsection{Font Configuration}
+%
+% Use |fontspec| for access to OpenType and TrueType fonts.
+%    \begin{macrocode}
+\RequirePackage[no-math]{fontspec}
+%    \end{macrocode}
+%
+% Set default fonts.
+%    \begin{macrocode}
+\uwalh@arial
+\ifuwalh@arialfont
+        \setmainfont{Arial}
+        \setsansfont{Arial}
+\fi
+\renewcommand{\familydefault}{\sfdefault}
+%    \end{macrocode}
+%
+% Use |anyfontsize| to support the irregular font sizes required.
+%    \begin{macrocode}
+\RequirePackage{anyfontsize}
+%    \end{macrocode}
+%
+% \subsection{Letterhead}
+%
+% Adjust the address block of the letterhead to match the PCF template.
+% \begin{macro}{\uwalh@addresstop}
+% \begin{macro}{\uwalh@addressblock}
+%    \begin{macrocode}
+\setlength{\uwalh@addresstop}{2.07cm}
+\renewcommand{\uwalh@addressblock}{%
+        \begin{textblock*}%
+                {\uwalh@addresswidth}(\uwalh@addressleft, \uwalh@addresstop)
+                \begin{minipage}[t]{\uwalh@addresswidth}
+                        \color{UWAPCFBody}%
+                        \sffamily\fontsize{9}{10.4}\selectfont%
+                        \@author{} \\
+                        \uwalh@school{}, M\uwalh@mbdp{} \\
+                        \uwalh@university{} \\
+                        \uwalh@address{} \\
+                        \noblanks[q]{\uwalh@phone}%
+                        Tel: \href{tel:\thestring}{\uwalh@phone} \\
+                        Email: \href{mailto:\uwalh@email}{\uwalh@email} \\
+                        \href{https://\uwalh@website/}{\uwalh@website}
+                \end{minipage}
+        \end{textblock*}%
+}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \subsection{Heading Configuration}
+%
+% Use |titlesec| to configure headings.
+%    \begin{macrocode}
+\RequirePackage[sf]{titlesec}
+\titleformat{\section}{\color{black}\bfseries}{\thesection}{1em}{}
+\titleformat{\subsection}{\color{black}\bfseries\small}{\thesubsection}{1em}{}
+\titlespacing*{\section}{0pt}{-0.07em}{-0.07em}
+\titlespacing*{\subsection}{0pt}{-0.07em}{-0.07em}
+%    \end{macrocode}
+% Disable section numbering.
+%    \begin{macrocode}
+\setcounter{secnumdepth}{0}
+%    \end{macrocode}
+%
+% \subsection{Colour Configuration}
+%
+% Use |xcolor| for colour support, and enable |hyperref| compatibility.
+%    \begin{macrocode}
+\RequirePackage[hyperref]{xcolor}
+%    \end{macrocode}
+% Define body text colour.
+%    \begin{macrocode}
+\definecolor{UWAPCFBody}{RGB}{77, 77, 79}
+%    \end{macrocode}
+%
+% \subsection{Template Fields}
+%
+% Set default values for the letterhead template fields.
+%    \begin{macrocode}
+\renewcommand*{\uwalh@footermbdp}{459}
+\renewcommand*{\uwalh@footerphone}{+61 8 6488 3703}
+\renewcommand*{\uwalh@mobile}{+61 000 000 000}
+\renewcommand*{\uwalh@footeremail}{humanethics@uwa.edu.au}
+%    \end{macrocode}
+%
+% Redefine macros to set the letterhead template fields
+% without affecting the first-page footer.
+%    \begin{macrocode}
+\renewcommand*{\mbdp}[1]{\renewcommand*{\uwalh@mbdp}{#1}}
+\renewcommand*{\university}[1]{\renewcommand*{\uwalh@university}{#1}}
+\renewcommand*{\phone}[1]{\renewcommand*{\uwalh@phone}{#1}}
+\renewcommand*{\mobile}[1]{}
+\renewcommand*{\email}[1]{\renewcommand*{\uwalh@email}{#1}}
+%    \end{macrocode}
+%
+% \begin{minipage}{\textwidth}
+% \begin{macro}{\uwapcf@project}
+% Set default values for the template fields.
+%    \begin{macrocode}
+\newcommand*{\uwapcf@project}{}
+%    \end{macrocode}
+% \end{macro}
+% \end{minipage}
+%
+% \begin{minipage}{\textwidth}
+% \begin{macro}{\project}
+% Define macros to set the template fields.
+%    \begin{macrocode}
+\newcommand*{\project}[1]{\renewcommand*{\uwapcf@project}{#1}}
+%    \end{macrocode}
+% \end{macro}
+% \end{minipage}
+%
+% \subsection{Field Validation}
+%
+% \begin{macro}{\uwapcf@checkfields}
+% Check that the required template fields are set.
+%    \begin{macrocode}
+\newcommand{\uwapcf@checkfields}{%
+        \uwalh@checkfield{\uwapcf@project}{\noexpand\project}
+}
+%    \end{macrocode}
+% \end{macro}
+%
+% \subsection{Document Title}
+%
+% \begin{macro}{\uwapcf@maketitle}
+% Generate the title of the Participant Consent Form, including the
+% fields for the project title and researchers.
+%    \begin{macrocode}
+\newcommand{\uwapcf@maketitle}{%
+        \uwapcf@checkfields{}%
+        \vspace{-1\parskip}\vspace{-0.310cm}%
+        \begin{center}%
+                \uwalh@arial%
+                \fontsize{16}{16.96}\selectfont%
+                \textbf{Participant Consent Form}%
+                \normalsize%
+        \end{center}%
+        \vspace{-1\parskip}\vspace{-0.120cm}%
+        \begin{center}%
+                \uwalh@arial%
+                \fontsize{12}{12.72}\selectfont%
+                \uwapcf@project{}%
+                \normalsize%
+        \end{center}%
+        \uwalh@arial%
+        \fontsize{10}{11.6}\selectfont%
+        \vspace{-1\parskip}\vspace{0.860cm}%
+}
+%    \end{macrocode}
+% \end{macro}
+%
+% \subsection{Signature Lines}
+%
+% \begin{macro}{\uwapcf@sig@vspace}
+% The vertical space before the signature lines.
+%    \begin{macrocode}
+\newlength{\uwapcf@sig@vspace}
+\setlength{\uwapcf@sig@vspace}{1.3cm}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\uwapcf@sig@rulewidth}
+% The width of the signature lines.
+%    \begin{macrocode}
+\newlength{\uwapcf@sig@rulewidth}
+\setlength{\uwapcf@sig@rulewidth}{0.0227cm}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\uwapcf@sig@offset}
+% The horizontal offset of the leftmost signature line.
+%    \begin{macrocode}
+\newlength{\uwapcf@sig@offset}
+\setlength{\uwapcf@sig@offset}{0.095cm}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\uwapcf@sig@labeloffset}
+% The horizontal offset of the signature line labels.
+%    \begin{macrocode}
+\newlength{\uwapcf@sig@labeloffset}
+\setlength{\uwapcf@sig@labeloffset}{0.008cm}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\uwapcf@siglabelvspace}
+% The vertical space added before the signature line labels.
+%    \begin{macrocode}
+\newlength{\uwapcf@sig@labelvspace}
+\setlength{\uwapcf@sig@labelvspace}{-0.0675cm}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\uwapcf@sig@gutter}
+% The horizontal space between the signature lines.
+%    \begin{macrocode}
+\newlength{\uwapcf@sig@gutter}
+\setlength{\uwapcf@sig@gutter}{3cm}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\uwapcf@sig@siglinelength}
+% The length of the line for the signature.
+%    \begin{macrocode}
+\newlength{\uwapcf@sig@siglinelength}
+\setlength{\uwapcf@sig@siglinelength}{4.905cm}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\uwapcf@sig@datelinelength}
+% The length of the line for the date.
+%    \begin{macrocode}
+\newlength{\uwapcf@sig@datelinelength}
+\setlength{\uwapcf@sig@datelinelength}{2.946cm}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\uwapcf@makesignature}
+% Generate the signature lines.
+%    \begin{macrocode}
+\newcommand{\uwapcf@makesignature}{%
+        \vspace{\uwapcf@sig@vspace}%
+        \hspace{\uwapcf@sig@offset}%
+        \begin{minipage}[t]{\uwapcf@sig@siglinelength}
+                \rule{\textwidth}{\uwapcf@sig@rulewidth} \\
+                \vspace{-1\baselineskip}\vspace{\uwapcf@sig@labelvspace} \\
+                \hspace*{\uwapcf@sig@labeloffset}%
+                Participant signature
+        \end{minipage}%
+        \hspace{\uwapcf@sig@gutter}%
+        \begin{minipage}[t]{\uwapcf@sig@datelinelength}
+                \rule{\textwidth}{\uwapcf@sig@rulewidth} \\
+                \vspace{-1\baselineskip}\vspace{\uwapcf@sig@labelvspace} \\
+                \hspace*{\uwapcf@sig@labeloffset}%
+                Date
+        \end{minipage}%
+}
+%    \end{macrocode}
+% \end{macro}
+%
+% \subsection{HREO Statement}
+%
+% \begin{macro}{\uwapcf@hreo@vspace}
+% The vertical space before the HREO statement.
+%    \begin{macrocode}
+\newlength{\uwapcf@hreo@vspace}
+\setlength{\uwapcf@hreo@vspace}{1.843cm}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\uwapcf@hreo@font}
+% The font for the HREO statement.
+%    \begin{macrocode}
+\newcommand*{\uwapcf@hreo@font}{%
+        \uwalh@arial%
+        \fontsize{9}{10.4}\selectfont%
+        \color{black}%
+        \bfseries\itshape%
+}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\uwapcf@hreo@parvspace}
+% The vertical space between paragraphs for the HREO statement.
+%    \begin{macrocode}
+\newlength{\uwapcf@hreo@parvspace}
+\setlength{\uwapcf@hreo@parvspace}{0.5\baselineskip}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\uwapcf@hreo@statement}
+% The statement required by the Human Research Ethics Office (HREO).
+%    \begin{macrocode}
+\newcommand{\uwapcf@hreo@statement}{%
+        \begin{minipage}{\textwidth}
+        Approval to conduct this research has been provided by the
+        University of Western Australia, in accordance with its ethics
+        review and approval procedures. Any person considering
+        participation in this research project, or agreeing to
+        participate, may raise any questions or issues with the
+        researchers at any time.
+        \end{minipage}
+
+        \vspace*{\uwapcf@hreo@parvspace}
+
+        \begin{minipage}{\textwidth}
+        In addition, any person not satisfied with the response of
+        researchers may raise ethics issues or concerns, and may make
+        any complaints about this research project by contacting the
+        Human Ethics office at UWA on
+        \href{tel:+61-8-6488-4703}{(08)~6488~4703} or by emailing to
+        \href{mailto:humanethics@uwa.edu.au}{humanethics@uwa.edu.au}.
+        \end{minipage}
+
+        \vspace*{\uwapcf@hreo@parvspace}
+        
+        \begin{minipage}{\textwidth}
+        All research participants are entitled to retain a copy of any
+        Participant Information Form and/or Participant Consent Form
+        relating to this research project.
+        \end{minipage}
+}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\uwapcf@makehreostatement}
+% Generate the HREO statement.
+%    \begin{macrocode}
+\newcommand{\uwapcf@makehreostatement}{%
+        \vspace{\uwapcf@hreo@vspace} \\
+        \begin{minipage}{\textwidth}
+                {%
+                        \uwapcf@hreo@font{}%
+                        \uwapcf@hreo@statement{}%
+                }%
+        \end{minipage}
+}
+%    \end{macrocode}
+% \end{macro}
+%
+% \subsection{Body Text Font}
+%
+% \begin{macro}{\uwapcf@bodyfont}
+% Set the body text font and colour.
+%    \begin{macrocode}
+\newcommand*{\uwapcf@bodyfont}{%
+        \sffamily%
+        \fontsize{11}{15.5}\selectfont%
+        \color{UWAPCFBody}%
+}
+%    \end{macrocode}
+% \end{macro}
+%
+% \subsection{Form Generation}
+%
+% Automatically generate the title and set the body text font at
+% the beginning of the document.
+%    \begin{macrocode}
+\AtBeginDocument{%
+        \uwapcf@bodyfont{}%
+        \uwapcf@maketitle{}%
+}
+%    \end{macrocode}
+%
+% Automatically add the signature lines and HREO statement at the end
+% of the document.
+%    \begin{macrocode}
+\AtEndDocument{%
+        \ifuwapcf@signature\uwapcf@makesignature{}\fi%
+        \ifuwapcf@hreo\uwapcf@makehreostatement{}\fi%
+}
+%    \end{macrocode}
+%
+% \subsection{Participant Name}
+%
+% \begin{macro}{\theparticipant}
+% Generate the line for the participant's name.
+%    \begin{macrocode}
+\newcommand{\theparticipant}{%
+        \begin{minipage}[t]{9.415cm}
+                \vspace*{0.048cm}%
+                \rule{\textwidth}{0.0227cm}%
+        \end{minipage}%
+}
+%    \end{macrocode}
+% \end{macro}
+% \Finale
+\endinput
diff --git a/macros/unicodetex/latex/uwa-pcf/uwa-pcf.ins b/macros/unicodetex/latex/uwa-pcf/uwa-pcf.ins
new file mode 100644
index 0000000000..501f6ce4a1
--- /dev/null
+++ b/macros/unicodetex/latex/uwa-pcf/uwa-pcf.ins
@@ -0,0 +1,58 @@
+%% Copyright 2019 Anthony Di Pietro
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%% 
+%% The Current Maintainer of this work is Anthony Di Pietro.
+%%
+%% This work consists of the files uwa-pcf.dtx, uwa-pcf.ins, and
+%% uwa-pcf-example.tex and the derived files uwa-pcf.cls and uwa-pcf.pdf.
+
+\input docstrip.tex
+\keepsilent
+
+\usedir{tex/latex/uwa-pcf}
+
+\preamble
+
+Copyright 2019 Anthony Di Pietro
+
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3
+of this license or (at your option) any later version.
+The latest version of this license is in
+  http://www.latex-project.org/lppl.txt
+and version 1.3 or later is part of all distributions of LaTeX
+version 2005/12/01 or later.
+
+This work has the LPPL maintenance status `maintained'.
+
+The Current Maintainer of this work is Anthony Di Pietro.
+
+This work consists of the files uwa-pcf.dtx, uwa-pcf.ins, and
+uwa-pcf-example.tex and the derived files uwa-pcf.cls and uwa-pcf.pdf.
+
+\endpreamble
+
+\askforoverwritefalse
+\generate{\file{uwa-pcf.cls}{\from{uwa-pcf.dtx}{class}}}
+
+\obeyspaces
+\Msg{*************************************************************}
+\Msg{*                                                           *}
+\Msg{* To complete the installation, move uwa-pcf.cls            *}
+\Msg{* into a directory searched by LaTeX.                       *}
+\Msg{*                                                           *}
+\Msg{* To produce the documentation, run uwa-pcf.dtx             *}
+\Msg{* through pdfLaTeX.                                         *}
+\Msg{*                                                           *}
+\Msg{*************************************************************}
+
+\endbatchfile
diff --git a/macros/unicodetex/latex/uwa-pcf/uwa-pcf.pdf b/macros/unicodetex/latex/uwa-pcf/uwa-pcf.pdf
new file mode 100644
index 0000000000..978fa44120
--- /dev/null
+++ b/macros/unicodetex/latex/uwa-pcf/uwa-pcf.pdf
diff --git a/macros/unicodetex/latex/uwa-pif/README b/macros/unicodetex/latex/uwa-pif/README
new file mode 100644
index 0000000000..6b84099d33
--- /dev/null
+++ b/macros/unicodetex/latex/uwa-pif/README
@@ -0,0 +1,24 @@
+This package generates a Participant Information Form (PIF) for a
+human research protocol at the University of Western Australia.
+
+It requires the UWA logo in PDF format, which is available in SVG format at
+https://static-listing.weboffice.uwa.edu.au/visualid/core-rebrand/img/uwacrest/,
+and uses the Calibri (https://docs.microsoft.com/en-us/typography/font-list/calibri)
+fonts by default.
+
+Copyright 2019, 2021 Anthony Di Pietro
+
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3
+of this license or (at your option) any later version.
+The latest version of this license is in
+  http://www.latex-project.org/lppl.txt
+and version 1.3 or later is part of all distributions of LaTeX
+version 2005/12/01 or later.
+
+This work has the LPPL maintenance status `maintained'.
+
+The Current Maintainer of this work is Anthony Di Pietro.
+
+This work consists of the files uwa-pif.dtx, uwa-pif.ins, and
+uwa-pif-example.tex and the derived files uwa-pif.cls and uwa-pif.pdf.
diff --git a/macros/unicodetex/latex/uwa-pif/uwa-pif-example.tex b/macros/unicodetex/latex/uwa-pif/uwa-pif-example.tex
new file mode 100644
index 0000000000..137c3eb108
--- /dev/null
+++ b/macros/unicodetex/latex/uwa-pif/uwa-pif-example.tex
@@ -0,0 +1,92 @@
+% Copyright 2019, 2021 Anthony Di Pietro
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Anthony Di Pietro.
+%
+% This work consists of the files uwa-pif.dtx, uwa-pif.ins, and
+% uwa-pif-example.tex and the derived files uwa-pif.cls and uwa-pif.pdf.
+
+\documentclass{uwa-pif}
+
+\author{John Smith}
+\school{School of Psychological Science}
+\mbdp{000}
+\phone{+61 8 6488 0000}
+\email{john.smith@uwa.edu.au}
+\project{My Research Project}
+\researchers{Joe Bloggs (PhD Student) \\ John Smith (Supervisor)}
+
+\begin{document}
+
+\section{Invitation:}
+
+You are invited to participate in a research project. You are asked
+to take part in this project because you are registered as a research
+participant in our database.
+
+\section{Aim of the Study (What is the project about?)}
+
+This project examines how people think and behave.
+
+\section{What does participation involve?}
+
+You will be asked to complete a task. You may also be asked to complete
+surveys that provide demographic information about yourself. This information
+will be anonymised, and so will not be linked to your identity.
+
+We estimate that participating in this study will take 15~minutes.
+
+\section{Voluntary Participation and Withdrawal from the Study}
+
+Participation in this study is entirely voluntary, and does not
+prejudice any right to compensation, which you may be entitled to
+under statute or common law. Should you wish to withdraw from the study
+before completing it, your responses will be discarded. Your data will
+be stored in a deidentified fashion, meaning that no identifying information
+will be associated with the data we collect from you in the experiment.
+Accordingly, you will not be able to withdraw your consent for us to
+use your data once the study has been completed.
+
+\section{Your privacy}
+
+On publication of this work, your responses (without any personally
+identifying information) will be made publicly available by banking
+the data from the entire study on data sharing websites.
+
+\section{Possible Benefits}
+
+The data from this project may allow researchers (including us) to better
+understand how people think and behave.
+
+\section{Possible Risks and Risk Management Plan}
+
+There are no foreseeable risks associated with this study.
+
+\section{Reimbursement}
+
+You will receive a payment of £2 as reimbursement for your participation.
+
+\section{Contacts}
+
+If you would like to participate or discuss any aspect of this study,
+please feel free to contact Mr Joe Bloggs (PhD Student,
+\href{mailto:joe.bloggs@research.uwa.edu.au}{joe.bloggs@research.uwa.edu.au},
+\href{tel:+61-000-000-000}{+61 000 000 000}) or Dr John Smith (Supervisor,
+\href{mailto:john.smith@uwa.edu.au}{john.smith@uwa.edu.au},
+\href{tel:+61-8-6488-000}{+61 8 6488 000}).
+
+\section{About This Document}
+
+You are entitled to retain a copy of this document. If you would prefer
+a PDF copy, email the above contacts to obtain one.
+
+\end{document}
diff --git a/macros/unicodetex/latex/uwa-pif/uwa-pif.dtx b/macros/unicodetex/latex/uwa-pif/uwa-pif.dtx
new file mode 100644
index 0000000000..7bd0944453
--- /dev/null
+++ b/macros/unicodetex/latex/uwa-pif/uwa-pif.dtx
@@ -0,0 +1,646 @@
+% \iffalse meta-comment
+% Copyright 2019, 2021 Anthony Di Pietro
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Anthony Di Pietro.
+%
+% This work consists of the files uwa-pif.dtx, uwa-pif.ins, and
+% uwa-pif-example.tex and the derived files uwa-pif.cls and uwa-pif.pdf.
+% \fi
+%
+% \iffalse
+%<*driver>
+\ProvidesFile{uwa-pif.dtx}
+%</driver>
+%<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
+%<class>\ProvidesClass{uwa-pif}
+%<*class>
+    [2021/09/28 1.0.1 UWA Participant Information Form]
+%</class>
+%
+%<*driver>
+\documentclass[
+        a4paper,
+        10pt
+]{ltxdoc}
+\usepackage{hypdoc}
+\PassOptionsToPackage{scale=0.9}{sourcecodepro}
+\usepackage[regular]{uwa-letterhead}[2021/09/13]
+\GetFileInfo{uwa-pif.dtx}
+\setcounter{secnumdepth}{3}
+\geometry{
+        left=5cm,
+        right=2cm
+}
+\hypersetup{colorlinks=true}
+\date{}
+\makeatletter
+\title{%
+        {The UWA Participant Information Form Class} \\
+        {\Large uwa-pif \fileversion{} (\filedate{})}%
+}
+\c@IndexColumns = 2
+\renewcommand*{\uwalh@uwa}{\sffamily}
+\renewcommand{\uwalh@makeletterhead}{}
+\makeatother
+\DoNotIndex{\newcommand, \newenvironment}
+\DisableCrossrefs
+\CodelineIndex
+\RecordChanges
+\CheckSum{220}
+\begin{document}
+        \DocInput{uwa-pif.dtx}
+\end{document}
+%</driver>
+% \fi
+%
+% \CharacterTable
+%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%   Digits        \0\1\2\3\4\5\6\7\8\9
+%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%   Dollar        \$     Percent       \%     Ampersand     \&
+%   Acute accent  \'     Left paren    \(     Right paren   \)
+%   Asterisk      \*     Plus          \+     Comma         \,
+%   Minus         \-     Point         \.     Solidus       \/
+%   Colon         \:     Semicolon     \;     Less than     \<
+%   Equals        \=     Greater than  \>     Question mark \?
+%   Commercial at \@     Left bracket  \[     Backslash     \\
+%   Right bracket \]     Circumflex    \^     Underscore    \_
+%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%   Right brace   \}     Tilde         \~}
+%
+% \changes{1.0.0}{2019/08/31}{Initial version}
+% \changes{1.0.1}{2021/09/28}{
+%         Make HREO statement, closing, and Calibri optional
+% }
+%
+% \maketitle
+%
+% \section{Introduction}
+%
+% This class generates a Participant Information Form (PIF) for a
+% human research protocol at the University of Western Australia.
+%
+% \section{Usage}
+%
+% \subsection{External Dependencies}
+%
+% You must supply the university logo (as |uwacrest-blue.pdf| by default).
+% It is available in SVG format at
+% \href{https://static-listing.weboffice.uwa.edu.au/visualid/core-rebrand/img/uwacrest/}
+% {https://static-listing.weboffice.uwa.edu.au/visualid/core-rebrand/img/uwacrest/}.
+%
+% In accordance with the official PIF template, this class uses the
+% \href{https://docs.microsoft.com/en-us/typography/font-list/calibri}{Calibri}
+% typeface by default. The fonts must be installed on the system for this to
+% work. Calibri is available as part of Microsoft's TrueType core fonts for the
+% web (\url{https://sourceforge.net/projects/mscorefonts2/}). Alternatively,
+% you can use the |nocalibri| class option to substitute it with
+% \href{https://adobe-fonts.github.io/source-sans/}{Source Sans Pro}, the usual
+% typeface used for university correspondence.
+%
+% With the |footer| option, this class uses the
+% \href{https://docs.microsoft.com/en-us/typography/font-list/arial}{Arial}
+% typeface by default. The fonts must be installed on the system for this to
+% work. Arial is also available as part of Microsoft's TrueType core fonts
+% for the web, and you can use the |noarial| class option to substitute it
+% with Source Sans Pro.
+%
+% \subsection{Class Options}
+%
+% \DescribeMacro{\documentclass}
+% To select the class, add this to your preamble:
+% \begin{quote}
+% |\documentclass{uwa-pif}|
+% \end{quote}
+%
+% This class supports the |draft|, |final|, |leqno|, and |fleqn| options
+% from the |article| base class and the |footer|, |nofooter|, |arial|, and
+% |noarial| options from the |uwa-letterhead| package.
+%
+% You can pass the following options to specify whether to include the
+% mandatory Human Ethics Research Office (HREO) statement:
+% \begin{itemize}
+%         \item |hreo|: Include HREO statement (default).
+%         \item |nohreo|: Do not include HREO statement.
+% \end{itemize}
+%
+% You can pass the following options to specify whether to include the
+% closing:
+% \begin{itemize}
+%         \item |closing|: Include closing (default).
+%         \item |noclosing|: Do not include closing.
+% \end{itemize}
+%
+% You can pass the following options to specify whether to use the
+% Calibri typeface:
+% \begin{itemize}
+%         \item |calibri|: Use Calibri (default).
+%         \item |nocalibri|: Do not use Calibri.
+% \end{itemize}
+%
+% \subsection{Letterhead Fields}
+%
+% Use the following commands in the preamble to set the letterhead fields:
+%
+% \DescribeMacro{\author}
+% \begin{minipage}[t]{\textwidth}
+% |\author|\marg{author} \\
+% The author of the document. \\
+% Required
+% \end{minipage}
+%
+% \DescribeMacro{\school}
+% \begin{minipage}[t]{\textwidth}
+% |\school|\marg{school} \\
+% The author's school within the university. \\
+% Required
+% \end{minipage}
+%
+% \DescribeMacro{\mbdp}
+% \begin{minipage}[t]{\textwidth}
+% |\mbdp|\marg{mbdp} \\
+% The author's \href{http://www.staff.uwa.edu.au/facilities/mail/mbdp}
+% {mailbag delivery point (MBDP)}. \\
+% Required
+% \end{minipage}
+%
+% \DescribeMacro{\university}
+% \begin{minipage}[t]{\textwidth}
+% |\university|\marg{university} \\
+% The name of the university. \\
+% Default: \textit{The University of Western Australia}
+% \end{minipage}
+%
+% \DescribeMacro{\address}
+% \begin{minipage}[t]{\textwidth}
+% |\address|\marg{address} \\
+% The university's address. \\
+% Default: \textit{35 Stirling Highway, Crawley WA 6009}
+% \end{minipage}
+%
+% \DescribeMacro{\phone}
+% \begin{minipage}[t]{\textwidth}
+% |\phone|\marg{phone} \\
+% The author's phone number. \\
+% Required
+% \end{minipage}
+%
+% \DescribeMacro{\mobile}
+% \begin{minipage}[t]{\textwidth}
+% |\mobile|\marg{mobile} \\
+% The author's mobile number. \\
+% Required
+% \end{minipage}
+%
+% \DescribeMacro{\email}
+% \begin{minipage}[t]{\textwidth}
+% |\email|\marg{email} \\
+% The author's email address. \\
+% Required
+% \end{minipage}
+%
+% \DescribeMacro{\website}
+% \begin{minipage}[t]{\textwidth}
+% |\website|\marg{website} \\
+% The author's website, or their school's website. \\
+% Omit the scheme (|https://|) and path (|/|). \\
+% Default: \textit{www.uwa.edu.au}
+% \end{minipage}
+%
+% \DescribeMacro{\footeraddress}
+% \begin{minipage}[t]{\textwidth}
+% |\footeraddress|\marg{footeraddress} \\
+% The university's address, shortened for the first-page footer. \\
+% Default: \textit{Perth WA 6009 Australia}
+% \end{minipage}
+%
+% \DescribeMacro{\cricos}
+% \begin{minipage}[t]{\textwidth}
+% |\cricos|\marg{cricos} \\
+% The university's \href{http://cricos.education.gov.au/}{CRICOS} provider code. \\
+% Default: \textit{00126G}
+% \end{minipage}
+%
+% \DescribeMacro{\uwacrest}
+% \begin{minipage}[t]{\textwidth}
+% |\uwacrest|\marg{uwacrest} \\
+% The filename of the UWA crest in PDF format (available in SVG format at
+% \href{https://static-listing.weboffice.uwa.edu.au/visualid/core-rebrand/img/uwacrest/}
+% {https://static-listing.weboffice.uwa.edu.au/visualid/core-rebrand/img/uwacrest/}). \\
+% Default: \textit{uwacrest-blue.pdf}
+% \end{minipage}
+%
+% \subsection{Project Fields}
+%
+% Use the following commands in the preamble to set the project fields:
+%
+% \DescribeMacro{\project}
+% \begin{minipage}[t]{\textwidth}
+% |\project|\marg{project} \\
+% The project's title. \\
+% Required
+% \end{minipage}
+%
+% \DescribeMacro{\researchers}
+% \begin{minipage}[t]{\textwidth}
+% |\researchers|\marg{researchers} \\
+% The project's researchers. Use |\researcher| for each researcher. \\
+% Required
+% \end{minipage}
+%
+% \DescribeMacro{\researcher}
+% \begin{minipage}[t]{\textwidth}
+% |\researcher|\marg{name}\marg{role} \\
+% Define a researcher by name and role.
+% \end{minipage}
+%
+% For example, a student project might define its researchers as follows:
+% \begin{quote}
+% \begin{verbatim}
+% \researchers{
+%         \researcher{John Doe}{PhD Student}
+%         \researcher{Jane Doe}{Supervisor}
+% }
+% \end{verbatim}
+% \end{quote}
+%
+% \StopEventually{\PrintChanges\PrintIndex}
+%
+% \section{Implementation}
+%
+% \subsection{Class Options}
+%
+% \begin{minipage}{\textwidth}
+% \begin{macro}{\uwapif@hreo}
+% \begin{macro}{\uwapif@closing}
+% \begin{macro}{\uwapif@calibrifont}
+% Define conditionals for the class options.
+%    \begin{macrocode}
+\newif\ifuwapif@hreo
+\newif\ifuwapif@closing
+\newif\ifuwapif@calibrifont
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{minipage}
+%
+% The |hreo| and |nohreo| options respectively enable and disable
+% the HREO statement.
+%    \begin{macrocode}
+\DeclareOption{hreo}{
+        \uwapif@hreotrue
+}
+\DeclareOption{nohreo}{
+        \uwapif@hreofalse
+}
+%    \end{macrocode}
+%
+% The |closing| and |noclosing| options respectively enable and disable
+% the closing.
+%    \begin{macrocode}
+\DeclareOption{closing}{
+        \uwapif@closingtrue
+}
+\DeclareOption{noclosing}{
+        \uwapif@closingfalse
+}
+%    \end{macrocode}
+%
+% The |calibri| and |nocalibri| options respectively enable and disable
+% the Calibri typeface.
+%    \begin{macrocode}
+\DeclareOption{calibri}{
+        \uwapif@calibrifonttrue
+}
+\DeclareOption{nocalibri}{
+        \uwapif@calibrifontfalse
+}
+%    \end{macrocode}
+%
+% Pass the |draft|, |final|, |leqno|, and |fleqn| options through to the
+% |article| base class, and pass the |footer|, |nofooter|, |arial|, and
+% |noarial| options through to the |uwa-letterhead| package.
+%    \begin{macrocode}
+\DeclareOption{draft}{
+        \PassOptionsToClass{\CurrentOption}{article}
+}
+\DeclareOption{final}{
+        \PassOptionsToClass{\CurrentOption}{article}
+}
+\DeclareOption{leqno}{
+        \PassOptionsToClass{\CurrentOption}{article}
+}
+\DeclareOption{fleqn}{
+        \PassOptionsToClass{\CurrentOption}{article}
+}
+\DeclareOption{footer}{
+        \PassOptionsToPackage{\CurrentOption}{uwa-letterhead}
+}
+\DeclareOption{nofooter}{
+        \PassOptionsToPackage{\CurrentOption}{uwa-letterhead}
+}
+\DeclareOption{arial}{
+        \PassOptionsToPackage{\CurrentOption}{uwa-letterhead}
+}
+\DeclareOption{noarial}{
+        \PassOptionsToPackage{\CurrentOption}{uwa-letterhead}
+}
+%    \end{macrocode}
+%
+% Show a warning for unknown options.
+%    \begin{macrocode}
+\DeclareOption*{
+        \ClassWarning{uwa-pif}{Unknown option '\CurrentOption'}
+}
+%    \end{macrocode}
+%
+% Use the |hreo|, |closing|, and |calibri| options by default.
+%    \begin{macrocode}
+\ExecuteOptions{
+       hreo,
+       closing,
+       calibri
+}
+%    \end{macrocode}
+%
+% Complete option processing.
+%    \begin{macrocode}
+\ProcessOptions\relax
+%    \end{macrocode}
+%
+% Load the |article| base class with the |a4paper| and |11pt| options.
+%    \begin{macrocode}
+\PassOptionsToClass{
+        a4paper,
+        11pt
+}{article}
+\LoadClass{article}
+%    \end{macrocode}
+%
+% \subsection{Page Configuration}
+%
+% Use |uwa-letterhead| to configure the page.
+%    \begin{macrocode}
+\RequirePackage{uwa-letterhead}
+%    \end{macrocode}
+%
+% \subsection{Font Configuration}
+%
+% Use |fontspec| for access to OpenType and TrueType fonts.
+%    \begin{macrocode}
+\RequirePackage[no-math]{fontspec}
+%    \end{macrocode}
+%
+% Set default fonts.
+%    \begin{macrocode}
+\sffamily
+\ifuwapif@calibrifont
+        \setmainfont{Calibri}
+        \setsansfont{Calibri}
+\fi
+\renewcommand{\familydefault}{\sfdefault}
+%    \end{macrocode}
+%
+% Use |anyfontsize| to support the irregular font sizes required.
+%    \begin{macrocode}
+\RequirePackage{anyfontsize}
+%    \end{macrocode}
+%
+% Use |setspace| to adjust line spacing of HREO statement.
+%    \begin{macrocode}
+\RequirePackage{setspace}
+%    \end{macrocode}
+%
+% \subsection{Heading Configuration}
+%
+% Use |titlesec| to configure headings.
+%    \begin{macrocode}
+\RequirePackage[sf]{titlesec}
+\titleformat{\section}{\color{black}\bfseries}{\thesection}{1em}{}
+\titleformat{\subsection}{\color{black}\bfseries\small}{\thesubsection}{1em}{}
+\titlespacing*{\section}{0pt}{-0.07em}{-0.07em}
+\titlespacing*{\subsection}{0pt}{-0.07em}{-0.07em}
+%    \end{macrocode}
+% Disable section numbering.
+%    \begin{macrocode}
+\setcounter{secnumdepth}{0}
+%    \end{macrocode}
+%
+% \subsection{Colour Configuration}
+%
+% Use |xcolor| for colour support, and enable |hyperref| compatibility.
+%    \begin{macrocode}
+\RequirePackage[hyperref]{xcolor}
+%    \end{macrocode}
+% Define body text colour.
+%    \begin{macrocode}
+\definecolor{UWAPIFBody}{RGB}{31, 73, 125}
+%    \end{macrocode}
+%
+% \subsection{Template Fields}
+%
+% Set default values for the letterhead template fields.
+%    \begin{macrocode}
+\renewcommand*{\uwalh@footermbdp}{459}
+\renewcommand*{\uwalh@footerphone}{+61 8 6488 3703}
+\renewcommand*{\uwalh@mobile}{+61 000 000 000}
+\renewcommand*{\uwalh@footeremail}{humanethics@uwa.edu.au}
+%    \end{macrocode}
+%
+% Redefine macros to set the letterhead template fields
+% without affecting the first-page footer.
+%    \begin{macrocode}
+\renewcommand*{\mbdp}[1]{\renewcommand*{\uwalh@mbdp}{#1}}
+\renewcommand*{\university}[1]{\renewcommand*{\uwalh@university}{#1}}
+\renewcommand*{\phone}[1]{\renewcommand*{\uwalh@phone}{#1}}
+\renewcommand*{\mobile}[1]{}
+\renewcommand*{\email}[1]{\renewcommand*{\uwalh@email}{#1}}
+%    \end{macrocode}
+%
+% \begin{minipage}{\textwidth}
+% \begin{macro}{\uwapif@project}
+% \begin{macro}{\uwapif@researchers}
+% Set default values for the template fields.
+%    \begin{macrocode}
+\newcommand*{\uwapif@project}{}
+\newcommand*{\uwapif@researchers}{}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{minipage}
+%
+% \begin{minipage}{\textwidth}
+% \begin{macro}{\project}
+% \begin{macro}{\researcher}
+% \begin{macro}{\researchers}
+% Define macros to set the template fields.
+%    \begin{macrocode}
+\newcommand*{\project}[1]{\renewcommand*{\uwapif@project}{#1}}
+\newcommand{\researcher}[2]{#1 & (#2) \\}
+\newcommand{\researchers}[1]{\renewcommand{\uwapif@researchers}{%
+        \begin{tabular}{@{}ll@{}}
+                #1
+        \end{tabular}%
+}}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{minipage}
+%
+% \subsection{Field Validation}
+%
+% \begin{macro}{\uwapif@checkfields}
+% Check that the required template fields are set.
+%    \begin{macrocode}
+\newcommand{\uwapif@checkfields}{%
+        \uwalh@checkfield{\uwapif@project}{\noexpand\project}
+        \uwalh@checkfield{\uwapif@researchers}{\noexpand\researchers}
+}
+%    \end{macrocode}
+% \end{macro}
+%
+% \subsection{Document Title}
+%
+% \begin{macro}{\uwapif@maketitle}
+% Generate the title of the Participant Information Form, including the
+% fields for the project title and researchers.
+%    \begin{macrocode}
+\newcommand{\uwapif@maketitle}{%
+        \uwapif@checkfields{}%
+        \vspace{-1\baselineskip}\vspace{0.450cm}%
+        \begin{center}%
+                \fontsize{16}{16.96}\selectfont%
+                \textcolor{black}{\textbf{Participant Information Form}}%
+                \normalsize%
+        \end{center}%
+        \vspace{-1\baselineskip}\vspace{0.935cm}
+        \textcolor{black}{\textbf{Project title:}} \uwapif@project{} \\
+        \vspace{-2\baselineskip}\vspace{0.477cm} \\
+        \textcolor{black}{\textbf{Name of Researchers:}} \\
+        \vspace{-2\baselineskip}\vspace{1.025cm} \\
+        \uwapif@researchers{}
+        \vspace{-0.045cm}
+}
+%    \end{macrocode}
+% \end{macro}
+%
+% \subsection{Closing}
+%
+% \begin{macro}{\uwapif@closingvspace}
+% The vertical space before the closing.
+%    \begin{macrocode}
+\newlength{\uwapif@closingvspace}
+\setlength{\uwapif@closingvspace}{2.6cm}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\uwapif@makeclosing}
+% Generate the closing.
+%    \begin{macrocode}
+\newcommand{\uwapif@makeclosing}{%
+        \vspace{\uwapif@closingvspace}%
+        {%
+                \color{black}%
+                Sincerely,
+
+                \@author
+        }
+}
+%    \end{macrocode}
+% \end{macro}
+%
+% \subsection{HREO Statement}
+%
+% \begin{macro}{\uwapif@hreovspace}
+% The vertical space before the HREO statement.
+%    \begin{macrocode}
+\newlength{\uwapif@hreovspace}
+\setlength{\uwapif@hreovspace}{2.55cm}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\uwapif@hreostatement}
+% The statement required by the Human Research Ethics Office (HREO).
+%    \begin{macrocode}
+\newcommand{\uwapif@hreostatement}{%
+        Approval to conduct this research has been provided by the University
+        of Western Australia, in accordance with its ethics review and
+        approval procedures. Any person considering participation in this
+        research project, or agreeing to participate, may raise any questions
+        or issues with the researchers at any time. In addition, any person
+        not satisfied with the response of researchers may raise ethics issues
+        or concerns, and may make any complaints about this research project
+        by contacting the Human Ethics office at UWA on
+        \href{tel:+61-8-6488-4703}{(08)~6488~4703} or by emailing to
+        \href{mailto:humanethics@uwa.edu.au}{humanethics@uwa.edu.au}. All
+        research participants are entitled to retain a copy of any Participant
+        Information Form and/or Participant Consent Form relating to this
+        research project.
+}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\uwapif@makehreostatement}
+% Generate the HREO statement.
+%    \begin{macrocode}
+\newcommand{\uwapif@makehreostatement}{%
+        \vspace{\uwapif@hreovspace}%
+        \hrule%
+        \begin{minipage}{\textwidth}
+                {%
+                        \begin{spacing}{1.17}
+                        \fontsize{9}{10.8}\selectfont\color{black}%
+                        \uwapif@hreostatement{}%
+                        \end{spacing}
+                }%
+        \end{minipage}
+}
+%    \end{macrocode}
+% \end{macro}
+%
+% \subsection{Body Text Font}
+%
+% \begin{macro}{\uwapif@bodyfont}
+% Set the body text font and colour.
+%    \begin{macrocode}
+\newcommand*{\uwapif@bodyfont}{%
+        \sffamily\fontsize{11}{15.5}\selectfont\color{UWAPIFBody}%
+}
+%    \end{macrocode}
+% \end{macro}
+%
+% \subsection{Form Generation}
+%
+% Automatically generate the title and set the body text font at
+% the beginning of the document.
+%    \begin{macrocode}
+\AtBeginDocument{%
+        \uwapif@bodyfont{}%
+        \uwapif@maketitle{}%
+}
+%    \end{macrocode}
+%
+% Automatically add the closing and HREO statement at the end
+% of the document.
+%    \begin{macrocode}
+\AtEndDocument{%
+        \ifuwapif@closing\uwapif@makeclosing{}\fi%
+        \ifuwapif@hreo\uwapif@makehreostatement{}\fi%
+}
+%    \end{macrocode}
+%
+% \Finale
+\endinput
diff --git a/macros/unicodetex/latex/uwa-pif/uwa-pif.ins b/macros/unicodetex/latex/uwa-pif/uwa-pif.ins
new file mode 100644
index 0000000000..b0ff82713e
--- /dev/null
+++ b/macros/unicodetex/latex/uwa-pif/uwa-pif.ins
@@ -0,0 +1,58 @@
+%% Copyright 2019 Anthony Di Pietro
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%% 
+%% The Current Maintainer of this work is Anthony Di Pietro.
+%%
+%% This work consists of the files uwa-pif.dtx, uwa-pif.ins, and
+%% uwa-pif-example.tex and the derived files uwa-pif.cls and uwa-pif.pdf.
+
+\input docstrip.tex
+\keepsilent
+
+\usedir{tex/latex/uwa-pif}
+
+\preamble
+
+Copyright 2019 Anthony Di Pietro
+
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3
+of this license or (at your option) any later version.
+The latest version of this license is in
+  http://www.latex-project.org/lppl.txt
+and version 1.3 or later is part of all distributions of LaTeX
+version 2005/12/01 or later.
+
+This work has the LPPL maintenance status `maintained'.
+
+The Current Maintainer of this work is Anthony Di Pietro.
+
+This work consists of the files uwa-pif.dtx, uwa-pif.ins, and
+uwa-pif-example.tex and the derived files uwa-pif.cls and uwa-pif.pdf.
+
+\endpreamble
+
+\askforoverwritefalse
+\generate{\file{uwa-pif.cls}{\from{uwa-pif.dtx}{class}}}
+
+\obeyspaces
+\Msg{*************************************************************}
+\Msg{*                                                           *}
+\Msg{* To complete the installation, move uwa-pif.cls            *}
+\Msg{* into a directory searched by LaTeX.                       *}
+\Msg{*                                                           *}
+\Msg{* To produce the documentation, run uwa-pif.dtx             *}
+\Msg{* through pdfLaTeX.                                         *}
+\Msg{*                                                           *}
+\Msg{*************************************************************}
+
+\endbatchfile
diff --git a/macros/unicodetex/latex/uwa-pif/uwa-pif.pdf b/macros/unicodetex/latex/uwa-pif/uwa-pif.pdf
new file mode 100644
index 0000000000..82e051f648
--- /dev/null
+++ b/macros/unicodetex/latex/uwa-pif/uwa-pif.pdf
diff --git a/macros/xetex/latex/hanzibox/README.md b/macros/xetex/latex/hanzibox/README.md
index 68fd73ec82..07e27823da 100644
--- a/macros/xetex/latex/hanzibox/README.md
+++ b/macros/xetex/latex/hanzibox/README.md
@@ -1,28 +1,49 @@
 hanzibox
-LaTeX3 Chinese Character package, v1.1.0
+LaTeX3-based Chinese Character package, v2.0.0
 =======
 
-`hanzibox` is a LaTeX package written to simplify the input of Chinese
-with Hanyu Pinyin and translation. Hanyu Pinyin was placed above Chinese with
-xpinyin package and the translation was placed below the Chinese.
+`hanzibox` is a LaTeX package developed in LaTeX3, which provides `\hanzibox` and `\hanzidialog` macros. These two macros are used for typesetting Chinese character with or without a background grid such as a cross grid or star grid for Chinese character writting learning.
 
-`hanzibox` is a utility for creating practise sheets, dialogs, character explanations and more.
-There are PDFs included which may be useful to regular users.
+And you can display the Hanyu Pinyin above the Chinese character and the translation below them as needed.
 
-It was inspired by hanzibox.sty from https://github.com/janvorisek/chinese-latex-utilities.
+The `\hanzibox` macro can automatically invoke the `\xpinyin*` command of the `xpinyin` package to achieve Hanyu Pinyin according to the Chinese characters.  And the `\hanzibox` command provides an asterisk version of `\hanzibox*`, whose function is achieved by automatically invoking the `xpinyin` package's `\pinyin` macro to achieve this. The `\hanzidialog` macro is implemented by manually inserting the `\pinyin` macro of the `xpinyin` package in it's pinyin option.
 
-In this new package, the commands were kept, but redesign its options and mandatories.
+`hanzibox` is a utility for learning to write and pronounce Chinese characters, and can be used for Chinese character learning plans, presentations, exercise booklets and other documentation work.
 
-At present, hanzibox.sty only supports XeTeX engines and only allows UTF-8 encoding tex source file.
+The development of this package was inspired by [Jan Vorisek's hanzibox package](https://github.com/janvorisek/chinese-latex-utilities).
 
-You can read the package manual (in Chinese) for more detailed explanations.
+However, the new package redesigned the `\hanzibox` and `\hanzidialog` macros and the background grid is redesigned with the `l3draw` package with reference to [zitie package](https://www.ctan.org/pkg/zitie).  Also, the new macro package provides more options and arguments in order to get better typesetting results.
+
+Due to the limitations of the `xpinyin` package, the `hanzibox.sty` package currently only supports the XeTeX engine and only supports UTF-8 encoded LaTeX source files.
+
+You can read the manual (in Chinese) for more details and examples.
 
 Contributing
 ------------
 
-Gitee repository: https://gitee.com/nwafu_nan/hanzibox-l3.
+1. Gitee repository: [hanzibox-l3](https://gitee.com/nwafu_nan/hanzibox-l3)
+2. Issues and pull requests are welcome. [issue](https://gitee.com/nwafu_nan/hanzibox-l3/issues) or [pull request](https://gitee.com/nwafu_nan/hanzibox- l3/pulls).
+
+hanzibox
+基于LaTeX3的汉字练习宏包, v2.0.0
+=======
+
+`hanzibox`是一个用LaTeX3开发的LaTeX宏包，它提供了`\hanzibox`和`\hanzidialog` 两个命令。这两个命令用于排版汉字学习中带有或不带田字格、米字格等背景格子的汉字，并可以根据需要在汉字正上方显示拼音，在正下方显示译文。其中，`\hanzibox`命令能够根据汉字自动调用`xpinyin`宏包的`\xpinyin*`命令实现汉字注音。并且`\hanzibox`命令提供了`\hanzibox*`星号版本，其注音功能是通过自动调用`xpinyin`宏包的`\pinyin`命令实现的。`\hanzidialog`命令的注音功能通过在拼音选项中手动插入`xpinyin`宏包的`\pinyin`命令实现。
 
-Issues and pull requests are welcome.
+`hanzibox` 是一个用于学习汉字书写与发音的工具，可以用于汉字学习教案、演示文稿、习题册等文档工作。
+
+开发该宏的灵感来自于[Jan Vorisek的hanzibox宏包](https://github.com/janvorisek/chinese-latex-utilities)。但该宏包对`\hanzibox`和`\hanzidialog`命令进行了重新设计，并参考[zitie字贴宏包](https://www.ctan.org/pkg/zitie)重新用`l3draw`宏包设计了背景格子。同时，新的宏包也提供了更多命令选项和参数，以期更好地控制排版结果。
+
+受`xpinyin`基础宏包所限，目前`hanzibox.sty`宏包仅支持XeTeX编译引擎，并且只支持UTF-8编码的LaTeX源文件。
+
+可以通过阅读宏包手册(中文)以也解该宏包更多的使用细节和使用样例。
+
+###  参与贡献
+---------------------
+1. 本项目由西北农林科技大学信息工程学院耿楠创建和维护
+2. 如果您愿意一同参与工作(不计报酬，免费自由)，请及时与作者联系
+3. 项目的gitee仓库地址：[hanzibox-l3](https://gitee.com/nwafu_nan/hanzibox-l3)
+4. 如果您有任何改进意见或者功能需求，欢迎提交 [issue](https://gitee.com/nwafu_nan/hanzibox-l3/issues) 或 [pull request](https://gitee.com/nwafu_nan/hanzibox-l3/pulls)。
 
 Copyright and Licence
 ---------------------
diff --git a/macros/xetex/latex/hanzibox/hanzibox.dtx b/macros/xetex/latex/hanzibox/hanzibox.dtx
index ae34ed29bb..b84c920ac4 100644
--- a/macros/xetex/latex/hanzibox/hanzibox.dtx
+++ b/macros/xetex/latex/hanzibox/hanzibox.dtx
@@ -5,30 +5,51 @@
 %</internal>
 %<*readme>
 hanzibox
-LaTeX3 Chinese Character package, v1.1.0
+LaTeX3-based Chinese Character package, v2.0.0
 =======
 
-`hanzibox` is a LaTeX package written to simplify the input of Chinese
-with Hanyu Pinyin and translation. Hanyu Pinyin was placed above Chinese with
-xpinyin package and the translation was placed below the Chinese.
+`hanzibox` is a LaTeX package developed in LaTeX3, which provides `\hanzibox` and `\hanzidialog` macros. These two macros are used for typesetting Chinese character with or without a background grid such as a cross grid or star grid for Chinese character writting learning.
 
-`hanzibox` is a utility for creating practise sheets, dialogs, character explanations and more.
-There are PDFs included which may be useful to regular users.
+And you can display the Hanyu Pinyin above the Chinese character and the translation below them as needed.
 
-It was inspired by hanzibox.sty from https://github.com/janvorisek/chinese-latex-utilities.
+The `\hanzibox` macro can automatically invoke the `\xpinyin*` command of the `xpinyin` package to achieve Hanyu Pinyin according to the Chinese characters.  And the `\hanzibox` command provides an asterisk version of `\hanzibox*`, whose function is achieved by automatically invoking the `xpinyin` package's `\pinyin` macro to achieve this. The `\hanzidialog` macro is implemented by manually inserting the `\pinyin` macro of the `xpinyin` package in it's pinyin option.
 
-In this new package, the commands were kept, but redesign its options and mandatories.
+`hanzibox` is a utility for learning to write and pronounce Chinese characters, and can be used for Chinese character learning plans, presentations, exercise booklets and other documentation work.
 
-At present, hanzibox.sty only supports XeTeX engines and only allows UTF-8 encoding tex source file.
+The development of this package was inspired by [Jan Vorisek's hanzibox package](https://github.com/janvorisek/chinese-latex-utilities).
 
-You can read the package manual (in Chinese) for more detailed explanations.
+However, the new package redesigned the `\hanzibox` and `\hanzidialog` macros and the background grid is redesigned with the `l3draw` package with reference to [zitie package](https://www.ctan.org/pkg/zitie).  Also, the new macro package provides more options and arguments in order to get better typesetting results.
+
+Due to the limitations of the `xpinyin` package, the `hanzibox.sty` package currently only supports the XeTeX engine and only supports UTF-8 encoded LaTeX source files.
+
+You can read the manual (in Chinese) for more details and examples.
 
 Contributing
 ------------
 
-Gitee repository: https://gitee.com/nwafu_nan/hanzibox-l3.
+1. Gitee repository: [hanzibox-l3](https://gitee.com/nwafu_nan/hanzibox-l3)
+2. Issues and pull requests are welcome. [issue](https://gitee.com/nwafu_nan/hanzibox-l3/issues) or [pull request](https://gitee.com/nwafu_nan/hanzibox- l3/pulls).
+
+hanzibox
+基于LaTeX3的汉字练习宏包, v2.0.0
+=======
+
+`hanzibox`是一个用LaTeX3开发的LaTeX宏包，它提供了`\hanzibox`和`\hanzidialog` 两个命令。这两个命令用于排版汉字学习中带有或不带田字格、米字格等背景格子的汉字，并可以根据需要在汉字正上方显示拼音，在正下方显示译文。其中，`\hanzibox`命令能够根据汉字自动调用`xpinyin`宏包的`\xpinyin*`命令实现汉字注音。并且`\hanzibox`命令提供了`\hanzibox*`星号版本，其注音功能是通过自动调用`xpinyin`宏包的`\pinyin`命令实现的。`\hanzidialog`命令的注音功能通过在拼音选项中手动插入`xpinyin`宏包的`\pinyin`命令实现。
+
+`hanzibox` 是一个用于学习汉字书写与发音的工具，可以用于汉字学习教案、演示文稿、习题册等文档工作。
+
+开发该宏的灵感来自于[Jan Vorisek的hanzibox宏包](https://github.com/janvorisek/chinese-latex-utilities)。但该宏包对`\hanzibox`和`\hanzidialog`命令进行了重新设计，并参考[zitie字贴宏包](https://www.ctan.org/pkg/zitie)重新用`l3draw`宏包设计了背景格子。同时，新的宏包也提供了更多命令选项和参数，以期更好地控制排版结果。
+
+受`xpinyin`基础宏包所限，目前`hanzibox.sty`宏包仅支持XeTeX编译引擎，并且只支持UTF-8编码的LaTeX源文件。
 
-Issues and pull requests are welcome.
+可以通过阅读宏包手册(中文)以也解该宏包更多的使用细节和使用样例。
+
+###  参与贡献
+---------------------
+1. 本项目由西北农林科技大学信息工程学院耿楠创建和维护
+2. 如果您愿意一同参与工作(不计报酬，免费自由)，请及时与作者联系
+3. 项目的gitee仓库地址：[hanzibox-l3](https://gitee.com/nwafu_nan/hanzibox-l3)
+4. 如果您有任何改进意见或者功能需求，欢迎提交 [issue](https://gitee.com/nwafu_nan/hanzibox-l3/issues) 或 [pull request](https://gitee.com/nwafu_nan/hanzibox-l3/pulls)。
 
 Copyright and Licence
 ---------------------
@@ -132,7 +153,7 @@ Copyright and Licence
 %</internal>
 %<package>\NeedsTeXFormat{LaTeX2e}[2020/10/01]
 %<package>\RequirePackage{expl3}
-%<+package>\GetIdInfo$Id: hanzibox.dtx 1.1.0 2021-09-23 08:00:00 +0800 Nan Geng <nangeng@nwafu.edu.cn> $
+%<+package>\GetIdInfo$Id: hanzibox.dtx 2.0.0 2021-09-28 08:00:00 +0800 Nan Geng <nangeng@nwafu.edu.cn> $
 %<package>  {Boxed Chinese characters with Pinyin above and translation below.}
 %<package>\ProvidesExplPackage{\ExplFileName}
 %<package>  {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -145,11 +166,14 @@ Copyright and Licence
 \renewcommand*\marg[1]{\{\meta{#1}\}}
 \renewcommand*\oarg[1]{[\meta{#1}]}
 \renewcommand*\parg[1]{(\meta{#1})}
+\NewDocumentCommand{\init}{+v}{\hspace{\fill}初始值~=~\textcolor{blue}{\bfseries#1}}
 \DeclareDocumentCommand\opt{m}{\texttt{#1}}
 \DeclareDocumentCommand\kvopt{mm}
   {\texttt{#1\breakablethinspace=\breakablethinspace#2}}
 \def\breakablethinspace{\hskip 0.16667em\relax}
 \begin{document}
+  \DisableImplementation
+  \EnableImplementation
   \DocInput{\jobname.dtx}
   \IndexLayout
   \PrintChanges
@@ -158,9 +182,11 @@ Copyright and Licence
 %</driver>
 % \fi
 %
-% \changes{v1.0.0}{2021/09/18}{开始编写模板。}
+% \changes{v1.0.0}{2021/09/18}{开始编写模板}
+% \changes{v2.0.0}{2021/09/25}{基于l3draw重新设计}
+% \changes{v2.0.0}{2021/09/28}{重新编写README.md内容}
 %
-% \CheckSum{420}
+% \CheckSum{829}
 % \GetFileId{hanzibox.sty}
 %
 % \CharacterTable
@@ -185,234 +211,436 @@ Copyright and Licence
 % \date{\filedate\qquad\fileversion\thanks{\url{https://gitee.com/nwafu_nan/hanzibox-l3}.}}
 % \maketitle
 %
+% \changes{v2.0.0}{2021/09/28}{修订说明文档}
+%
 % \begin{documentation}
 %
 % \begin{abstract}
 %
-% \pkg{hanzibox} 是一个用\LaTeX3开发的 \LaTeX 宏包，它提供了\tn{hanzidialog}和\tn{hanzibox}
-% 两个命令。这两个命令用于输出汉字学习中的田字格或米字格，并可以根据需要在汉字正上方显示拼音，
-% 在正下方显示需要的译文。其中，\tn{hanzidialog}命令的注音功能通过手动插入\pkg{xpinyin}宏包的
-% \tn{pinyin}命令实现。\tn{hanzibox}命令的注音功能自动调用\pkg{xpinyin}宏包的\tn{pinyin}命令实现，
-% 并且\tn{hanzibox}命令提供了\tn{hanzibox*}星号版本，该星号版本能够根据汉字自动调用
-% \pkg{xpinyin}宏包的\tn{xpinyin*}命令实现汉字注音。
+% \pkg{hanzibox} 是一个用\LaTeX3开发的 \LaTeX 宏包，它提供了\tn{hanzibox}和\tn{hanzidialog}
+% 两个命令。这两个命令用于输出汉字学习中带有或不带田字格、米字格等背景格子的汉字，
+% 并可以根据需要在汉字正上方显示拼音，在正下方显示译文。
+% 其中，\tn{hanzibox}命令能够根据汉字自动调用\pkg{xpinyin}宏包的\tn{xpinyin*}命令实现汉字注音。
+% 同时，\tn{hanzibox}命令还提供了\tn{hanzibox*}星号版本，其注音功能是通过自动调用\pkg{xpinyin}宏包
+% 的\tn{pinyin}命令实现的。\tn{hanzidialog}命令的注音功能则是通过在其拼音选项中手动插入
+% \pkg{xpinyin}宏包的\tn{pinyin}命令实现。
 %
 % \end{abstract}
 %
 % \section{简要说明}
 %
-% \pkg{hanzibox} 是一个用于输出汉字学习中的田字格或米字格，并在汉字正上方显示拼音，
-% 在正下方显示需要的译文。同时，也可以根据需要隐藏拼音、汉字或译文。
+% \pkg{hanzibox} 是一个用于输出汉字学习中的田字格、米字格等背景，并在汉字正上方显示拼音，
+% 在正下方显示译文。当然，也可以根据需要隐藏拼音、汉字或译文。
 %
 % 使用\pkg{hanzibox}宏包的\LaTeX 源文件需采用 \texttt{UTF-8}编码，并且需使用\XeLaTeX 进行编译。
 %
-% \pkg{hanzibox} 依赖 \package{l3kernel} 和 \package{l3packages}。
+% \pkg{hanzibox} 依赖 \package{l3kernel} 、\package{l3packages}、\package{l3draw}和\package{xpinyin}宏包。
 %
 % \section{用户接口}
 %
-% \begin{function}[added=2021-09-18,updated=2021-09-19]{\hanzidialog}
-%   \begin{syntax}
-%     \tn{hanzidialog} \Arg{汉字} \oarg{拼音选项} \oarg{译文选项}
-%   \end{syntax}
-%   排版汉字，并根据选项内容在顶部排版拼音，在底部排版译文。\\
-%   其中，\oarg{拼音选项}可以是任意文本，如果是汉语拼音则需要使用\pkg{xpinyin}宏包的
-%   \tn{pinyin}命令进行处理；\oarg{译文选项}可以是任意文本。
-%   \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.3\linewidth,gobble=5]
-%     \hanzidialog{王老师}[Wang \pinyin{lao3shi1}][teacher wang]
-%     \hanzidialog{王老师}[Wang \pinyin{lao3shi1}][王先生]
-%   \end{SideBySideExample}
-% \end{function}
-%
-% \begin{function}[added=2021-09-18,updated=2021-09-20]{\hanzibox,\hanzibox*}
+% \begin{function}[added=2021-09-18,updated=2021-09-28]{\hanzibox,\hanzibox*}
 %   \begin{syntax}
-%     \tn{hanzibox} \oarg{外观选项} \Arg{汉字} \oarg{拼音选项} \oarg{译文选项}
+%     \tn{hanzibox}  \oarg{外观选项} \Arg{汉字} \oarg{拼音选项} \oarg{译文选项}
 %     \tn{hanzibox*} \oarg{外观选项} \Arg{汉字} \oarg{拼音选项} \oarg{译文选项}
 %   \end{syntax}
 %   排版汉字，并根据选项内容在顶部排版拼音，在底部排版译文。\\
-%   其中，\oarg{外观选项}用于设置盒子外观；\oarg{拼音选项}用于设置拼音，
-%   要求其拼音格式符合\pkg{xpinyin}宏包的规定；\oarg{译文选项}可以是任意文本。
+%   其中，\Arg{汉字}可以留空，\oarg{外观选项}用于设置盒子外观；
+%   \tn{hanzibox}命令中的\oarg{拼音选项}无效，可以省略，也可以留空；\\
+%   \oarg{译文选项}可以是任意文本，需要注意的是，当需要\oarg{译文选项}时，
+%   \oarg{拼音选项}可以留空，但不能省略。
+%   注音由\pkg{xpinyin}宏包自动根据汉字获得，此时，可能会存在多音字等问题，
+%   其调整详情请参阅其\pkg{xpinyin}宏包说明。
+%
+%   排版样式可能通过\tn{hanziboxset}命令或\tn{hanzidialog}\oarg{外观选项}的key-value进行设置。
 %   \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.43\linewidth,gobble=5]
-%     \hanzibox[inner=none,border=false]{我}[wo3][me]
-%     \hanzibox[inner=cross,border=true]{我}[wo3][吾]
-%     \hanzibox[inner=star]{我}[wo3][俺]
-%     \hanzibox[borderwidth=1.5pt]{我}[wo3][爷]
-%     \hanzibox[bordercolor=red]{我}[wo3][山人]
+%     \hanziboxset{fillcolor=yellow!30, charcolor=red,
+%                  framecolor=red}
+%     \hanzibox[frametype=none]{我}
+%     \hanzibox[frametype=none]{我}[][me]
+%     \hanzibox[frametype=口  ]{我}[][吾]
+%     \hanzibox[frametype=十  ]{我}[wo3][俺]
+%     \hanzibox[frametype=×   ]{我}[wo2][爷]
+%     \hanzibox[frametype=田  ]{我}[wo1][愚]
+%     \hanzibox[frametype=米  ]{我}[ni3][奴]
+%     \hanzibox[frametype=咪  ]{我}[ta1][山人]
 %   \end{SideBySideExample}
-%   星号命令用于根据汉字自动在顶部排版拼音，在底部排版译文。\\
-%   此时，\oarg{拼音选项}中的拼音无效，可以留空，但若有译文则该选项不可省略；
-%   \oarg{译文选项}可以是任意文本。\\
-%   注意：此时的注音由\pkg{xpinyin}宏包实现，如需要设置多音字的拼音，请参阅其宏包说明。
+%   星号命令\tn{hanzibox*}用于手动排版拼音。\\
 %   \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.43\linewidth,gobble=5]
-%     \hanzibox*[inner=none,border=false]{我}[][me]
-%     \hanzibox*[inner=cross,border=true]{我}[][吾]
-%     \hanzibox*[inner=star]{我}[wo3][不才]
-%     \hanzibox*[borderwidth=1.5pt]{我}[wo2][本人]
-%     \hanzibox*[bordercolor=red]{我}[ni3][孤家]
+%     \hanziboxset{xscale=1.5,yscale=1.5,resize=real}
+%     \hanzibox*[frametype=none]{我}[wo3][me]
+%     \hanzibox*[frametype=口  ]{我}[wo3][吾]
+%     \hanzibox*[frametype=十  ]{我}[wo3][俺]
+%     \hanzibox*[frametype=×   ]{我}[wo3][爷]
+%     \hanzibox*[frametype=田  ]{我}[wo2][愚]
+%     \hanzibox*[frametype=米  ]{我}[ni3][奴]
+%     \hanzibox*[frametype=咪  ]{我}[ta5][山人]
 %   \end{SideBySideExample}
 % \end{function}
 %
-% \section{选项说明}
-%
-% \begin{function}[added=2021-09-20]{\hanziboxset}
+% \begin{function}[added=2021-09-18,updated=2021-09-28]{\hanzidialog}
 %   \begin{syntax}
-%     \tn{hanziboxset} \marg{键值列表}
+%     \tn{hanzidialog} \oarg{外观选项} \Arg{汉字} \oarg{拼音选项} \oarg{译文选项}
 %   \end{syntax}
-%   本宏包提供了一系列选项，以实现汉字盒子外观样式设置。
-%   载入\pkg{hanzibox}宏包后，以下选项均可通过统一的\tn{hanziboxset}命令进行设置。
-%   同时，这些选项也可以通过\tn{hanzibox}命令的外观选项进行设置。
-% \end{function}
+%   排版汉字，并根据选项内容在顶部排版拼音，在底部排版译文。\\
+%   其中，\Arg{汉字}可以留空，\oarg{拼音选项}可以是任意文本；\oarg{译文选项}可以是任意文本。
+%   \oarg{拼音选项}和\oarg{译文选项}都可以留空，也可以省略，
+%   但当需要\oarg{译文选项}时，\oarg{拼音选项}可以留空，不能省略。
+%   如果是汉语拼音则需要手动使用\pkg{xpinyin}宏包的\tn{pinyin}命令，
+%   排版样式可能通过\tn{hanziboxset}命令或\tn{hanzidialog}\oarg{外观选项}的key-value进行设置。
+%   \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.25\linewidth,gobble=5]
+%     \hanzidialog{王老师}[teacher wang][Wang \pinyin{lao3shi1}]
+%
+%     \hanzidialog[frametype=田]{王老师}[Wang \pinyin{lao3shi1}]
+%                 [王先生]
 %
-% \tn{hanziboxset} 的参数是一组由(英文)逗号隔开的选项列表，
-% 列表中的选项通常是 \kvopt{\meta{key}}{\meta{value}} 形式。
-% 部分选项的\meta{value} 可以省略。对于同一项，后续设置会覆盖以前的设置。
-% 在下文的说明中，将用\textbf{粗体}表示默认值。
+%     \hanzidialog[height=1cm,frametype=咪,framecolor=red,resize=real]
+%                 {王老师}[Wang \pinyin{lao3shi1}][王先生]
 %
-% \tn{hanziboxset} 采用 \LaTeX3 风格的键值设置，支持不同类型以及多种
-% 层次的选项设定。键值列表中，“|=|”左右的空格不影响设置；但需注意，
-% 参数列表中\textbf{不可以出现空行}。
+%   \end{SideBySideExample}
+% \end{function}
 %
-% 布尔型的参数 \kvopt{\meta{选项}}{true} 中的“|= true|”可以省略。
+% \begin{function}[added=2021-09-20,updated=2021-09-24]{\hanziboxset}
+%   \begin{syntax}
+%     \tn{hanziboxset} \marg{键值列表}
+%   \end{syntax}
 %
-% \changes{v1.1.0}{2021/09/22}{添加外观选项设置命令示例代码。}
+%   \tn{hanziboxset} 的参数是一组由(英文)逗号隔开的选项列表，
+%   列表中的选项通常是 \kvopt{\meta{key}}{\meta{value}} 形式。
+%   部分选项的\meta{value} 可以省略。对于同一项，后续设置会覆盖以前的设置。
+%   在下文的说明中，将用\textbf{粗体}表示默认值。
 %
-% \begin{frameverb}
-%   \hanziboxset{
-%     scale       = 0.8,       % 整体缩放比例
-%     inner       = star,      % 盒子内部图案
-%     border      = true,      % 是否有边框
-%     borderwidth = 1.5 pt,    % 边框宽度
-%     bordercolor = red,       % 边框颜色
-%     fgcolor     = red,       % 盒子前景色(文字颜色)
-%     bgcolor     = yellow!50, % 盒子背景色
-%     withpinyin  = false,     % 是否显示拼音
-%     withhanzi   = true,      % 是否显示汉字
-%     withtran    = true       % 是否显示译文
-%    }
-% \end{frameverb}
+%   \tn{hanziboxset} 采用 \LaTeX3 风格的键值设置，支持不同类型以及多种
+%   层次的选项设定。键值列表中，“|=|”左右的空格不影响设置；但需注意，
+%   参数列表中\textbf{不可以出现空行}。
 %
-% 注：各选项也可以以相同的键值列表在汉字盒子命令的外观选项中进行设置。
+%   布尔型的参数 \kvopt{\meta{选项}}{true} 中的“|= true|”可以省略。
+% \end{function}
 %
-% \subsection{缩放比例}
+% \section{选项说明}
 %
-% \changes{v1.1.0}{2021/09/22}{将缩放比例键ratio改为scale。}
+%   本宏包提供了一系列选项，以实现汉字盒子外观样式设置。
+%   载入\pkg{hanzibox}宏包后，以下选项均可通过统一的\tn{hanziboxset}命令进行设置。
+%   同时，这些选项也可以通过\tn{hanzibox}命令的外观选项进行设置。
 %
-% \begin{function}[added=2021-09-20,updated=2021-09-22]{scale}
+% \begin{function}[added=2021-09-24,updated=2021-09-24]{basechar,zihao}
 %   \begin{syntax}
-%     scale = \Arg{number}
+%     basechar = \meta{CJK char} \init{好}
+%     zihao = \meta{字号} \init{4}
 %   \end{syntax}
-%   设置\tn{hanzibox}命令绘制汉字盒子及其拼音和译文的整体缩放比例，默认值为\textbf{1.0}。
+%   \opt{basechar} 设置基字符，用于计算缩放比例，
+%   基字符不同时，即使给定相同的缩放比例，其实际缩放比例也可能不同。
+% 
+%   \opt{zihao} 设置计算缩放比例时的字号大小。
 % \end{function}
 %
-% \subsection{汉字边框}
-%
-% \begin{function}[added=2021-09-20]{border}
+% \begin{function}[added=2021-09-27,updated=2021-09-28]{pinyinf,charf,tranf}
 %   \begin{syntax}
-%     border = <\TTF>
+%     pinyinf = \meta{格式命令} \init{\normalsize}
+%     charf = \meta{格式命令}   \init{\tiny}
+%     tranf = \meta{格式命令}   \init{\tiny}
 %   \end{syntax}
-%   为\tn{hanzibox}命令选择是否绘制汉字的边框，默认值为\textbf{true}。该选项对\tn{hanzidialog}命令无效。
+%   分别用于设置拼音、汉字、译文的排版格式。
 % \end{function}
 %
-% \begin{function}[added=2021-09-20]{borderwidth}
+% \begin{function}[added=2021-09-24,updated=2021-09-24]{frametype,resize}
+%  \begin{syntax}
+%    frametype = <none|口|十|田|米|咪> \init{none}
+%    resize    = <none|real|base> \init{none}
+%  \end{syntax}
+%  \opt{frametype} 设置汉字盒子样式。可用值的效果与选项值文字形状类似：\verb|口|--仅方框，
+%  \verb|十|--仅中间的横线和竖线，\verb|田|--常见的田字格，\verb|米|--十字格再加上斜的两条线，
+%  \verb|咪|--常见的米字格。
+%
+%   \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.50\linewidth,gobble=5]
+%     \hanzibox[frametype=none]{无}
+%     \hanzibox[frametype=口  ]{口}
+%     \hanzibox[frametype=十  ]{十}
+%     \hanzibox[frametype=田  ]{田}
+%     \hanzibox[frametype=米  ]{米}
+%     \hanzibox[frametype=咪  ]{咪}
+%   \end{SideBySideExample}
+%
+%  \opt{resize} 设置缩放方式，\opt{real}--使用字符实际宽高缩放，
+%  \opt{base}--使用 \opt{basechar} 设置的字符的宽高缩放，
+%
+%  以下为宽度设置为 1cm 时的缩放情况。
+%   \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.45\linewidth,gobble=5]
+%     \hanziboxset{width=1cm,frametype=咪,
+%                  framecolor=black}
+%     \hanzibox[resize=none  ]{无}
+%     \hanzibox[resize=real  ]{实}
+%     \hanzibox[resize=base  ]{基}
+%   \end{SideBySideExample}
+% \end{function}
+%
+% \begin{function}[added=2021-09-24,updated=2021-09-24]{
+%   xscale,yscale,scale,
+%   width,height}
 %   \begin{syntax}
-%     borderwidth = \Arg{dimen}
+%     xscale = \meta{scale ratio} \init{1}
+%     yscale = \meta{scale ratio} \init{1}
+%     scale  = \meta{scale ratio}
+%     width  = \meta{dim}
+%     height = \meta{dim}
 %   \end{syntax}
-%   为\tn{hanzibox}命令设置汉字的边框宽度，默认值为\textbf{0.4pt}。该选项对\tn{hanzidialog}命令无效。
+%   设置缩放比例和盒子宽高。
+%
+%   宽高具有更高的优先级，即若比例和宽高都设置了，则使用宽高来计算。
+%   宽高为二者都为0cm视为未设置，二者有一大于0cm，视为设置了宽高。
+%
+%   此处的宽高和最终的宽高可能略有差异，最终的宽高保存在
+%   \tn{hanziboxwidth} 和 \tn{hanziboxheight} dim寄存器中。
 % \end{function}
 %
-% \begin{function}[added=2021-09-20]{bordercolor}
+% \begin{function}[added=2021-09-24,updated=2021-09-24]{
+%   linewidth,
+%   dashpattern,
+%   framearc,
+%   framearc*
+%   }
 %   \begin{syntax}
-%     bordercolor = \Arg{color}
+%     linewidth   = \meta{dim} \init{0.4pt}
+%     dashpattern = \meta{ dim1, dim2, ... }
+%     framearc    = \meta{dim}
+%     framearc*   = \{ \marg{dim1} \marg{dim2} \}
 %   \end{syntax}
-%   为\tn{hanzibox}命令设置汉字的边框颜色，默认值为\textbf{black}。该选项对\tn{hanzidialog}命令无效。
+%   设置边框线宽、线型、转角样式。
+%
+%   \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.30\linewidth,gobble=5]
+%     \hanziboxset{width=1.0cm,resize=real,framecolor=red}
+%     \hanzibox[linewidth=1pt,frametype=口]{好}
+%     \hanzibox[dashpattern={1.5mm,1mm,2mm,1.5mm},frametype=田]{好}
+%     \hanzibox[framearc=1mm,frametype=口]{好} \\
+%     \hanzibox[framearc=1mm,frametype=咪]{好}
+%     \hanzibox[framearc*={1mm}{2mm},frametype=口]{好}
+%     \hanzibox[framearc*={2mm}{1mm},frametype=咪]{好}
+%   \end{SideBySideExample}
 % \end{function}
 %
-% \changes{v1.1.0}{2021/09/21}{添加前景颜色设置选项。}
-%
-% \begin{function}[added=2021-09-21]{fgcolor}
+% \begin{function}[added=2021-09-24,updated=2021-09-24]{
+%   framecolor,
+%   framecolor*,
+%   charcolor,
+%   charcolor*,
+%   fillcolor,
+%   fillcolor*
+%   }
 %   \begin{syntax}
-%     fgcolor = \Arg{color}
+%     framecolor  = \meta{color expr} \init{black}
+%     framecolor* = \meta{model(s)} \meta{value(s)}
+%     charcolor   = \meta{color expr} \init{black}
+%     charcolor*  = \meta{model(s)} \meta{value(s)}
+%     fillcolor   = \meta{color expr}
+%     fillcolor*  = \meta{model(s)} \meta{value(s)}
 %   \end{syntax}
-%   为\tn{hanzibox}命令设置汉字盒子前景颜色(文字颜色)，
-%   默认值为\textbf{black}。该选项对\tn{hanzidialog}命令无效。
-% \end{function}
+%   命名的颜色仅支持 \LaTeX3 定义的 black, white, red, green, blue, cyan, magenta 和 yellow。
+%   颜色模型和表达式也应使用 \LaTeX3 支持的模型和表达式，详见 \pkg{interface3.pdf} 文档。
 %
-% \changes{v1.1.0}{2021/09/21}{添加背景颜色设置选项。}
+%   若要去掉 \opt{fillcolor}，应将其设置为空，即 \verb|fillcolor={}|，而不是将其设置为白色。
+% \end{function}
 %
-% \begin{function}[added=2021-09-21]{bgcolor}
+% \begin{function}[added=2021-09-24,updated=2021-09-24]{initial,vowel,tone}
 %   \begin{syntax}
-%     bgcolor = \Arg{color}
+%     initial = <\TTF> \init{true}
+%     vowel   = <\TTF> \init{true}
+%     tone    = <\TTF> \init{true}
 %   \end{syntax}
-%   为\tn{hanzibox}命令设置汉字盒子背景颜色(填充颜色)，
-%   默认值为\textbf{white}。该选项对\tn{hanzidialog}命令无效。
+%   分别用于设置是否输出拼音的声母、韵母和声调，默认值为\textbf{true}。
+%   该选项仅对\tn{hanzibox}命令有效。
+%   \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.33\linewidth,gobble=5]
+%     \hanziboxset{frametype=咪,framecolor=red,
+%                  fillcolor=yellow!40,resize=real}
+%     \hanzibox{明月几时有}[]
+%       [How long will the full moon appear?]\\[0.5ex]
+%     \hanzibox[initial=false]{明月几时有}[]
+%       [How long will the full moon appear?]\\[0.5ex]
+%     \hanzibox[vowel=false]{明月几时有}[]
+%       [How long will the full moon appear?]\\[0.5ex]
+%     \hanzibox[tone=false]{明月几时有}[]
+%       [How long will the full moon appear?]\\[0.5ex]
+%     \hanzibox[initial=false,vowel=false]{明有几时有}
+%       [][How long will the full moon appear?]
+%   \end{SideBySideExample}
+%   \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.28\linewidth,gobble=5]
+%     \hanziboxset{frametype=咪,framecolor=red,fillcolor=yellow!40,
+%                  charf=\Huge,resize=real}
+%     \hanzibox*[initial=false]{我}[wo3][吾]
+%     \hanzibox*[initial=true,vowel=false]{我}[wo3][吾]
+%     \hanzibox*[initial=true,vowel=true,tone=false]{我}[wo3][不才]
+%   \end{SideBySideExample}
 % \end{function}
 %
-% \subsection{格子样式}
-%
-% \begin{function}[added=2021-09-20]{inner}
+% \begin{function}[added=2021-09-21,updated=2021-09-26]{pinyin,hanzi,tran}
 %   \begin{syntax}
-%     inner = <(none)|star|cross>
+%     pinyin = <\TTF> \init{true}
+%     hanzi = <\TTF>  \init{true}
+%     tran = <\TTF>   \init{true}
 %   \end{syntax}
-%   为\tn{hanzibox}命令设置汉字盒子内部装饰为无(none)、米字格(star)或田字格(cross)，
-%   默认值为\textbf{none}。该选项对\tn{hanzidialog}命令无效。
+%   分别用于设置是否输出拼音、汉字和译文，默认值为\textbf{true}。
+%   该选项对\tn{hanzidialog}命令无效。
+%   \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.33\linewidth,gobble=5]
+%     \centering
+%     \hanziboxset{frametype=咪,framecolor=red,charf=\large,
+%                  fillcolor=yellow!40}
+%     \hanzibox[hanzi=false]{明月几时有}[]
+%       [How long will the full moon appear?]\\[0.5ex]
+%     \hanzibox[pinyin=false]{明月几时有}[]
+%       [How long will the full moon appear?]\\[0.5ex]
+%     \hanzibox[tran=false]{明月几时有}[]
+%       [How long will the full moon appear?]\\[0.5ex]
+%   \end{SideBySideExample}
 % \end{function}
 %
-% \changes{v1.1.0}{2021/09/21}{添加隐藏拼音选项。}
+% \changes{v2.0.0}{2021/09/28}{在说明文档中添加应用实例}
 %
-% \subsection{内容隐藏}
+% \section{应用实例}
 %
-% \begin{function}[added=2021-09-21]{withpinyin}
-%   \begin{syntax}
-%     withpinyin = <\TTF>
-%   \end{syntax}
-%   为\tn{hanzibox}命令选择是否输出拼音，默认值为\textbf{true}。该选项对\tn{hanzidialog}命令无效。
-%   \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.35\linewidth,gobble=5]
-%     \hanzibox[inner=cross]{我}[wo3][吾]
-%     \hanzibox[withpinyin=false,inner=star]{我}[wo3][不才]
-%     \hanzibox[bordercolor=red]{我们}[wo3men5][吾辈]
+% \pkg{hanzibox}宏包可以广泛用于汉字学习的练习中。
+%
+% \subsection{拼一拼---写一写练习}
+%
+%   \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.45\linewidth,gobble=5]
+%     \hanziboxset{frametype=田,framecolor=blue}
+%     \hanzibox{门}\hanzibox[hanzi=false]{口}\hfill
+%     \hanzibox{生}\hanzibox[hanzi=false]{日}\hfill
+%     \hanzibox{题}\hanzibox[hanzi=false]{目}\hfill
+%     \hanzibox[hanzi=false]{田}\hanzibox{野}
 %   \end{SideBySideExample}
+%
+% \subsection{标注声母练习}
+%
 %   \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.35\linewidth,gobble=5]
-%     \hanzibox*[inner=cross]{我}[][吾]
-%     \hanzibox*[withpinyin=false,inner=star]{我}[wo3][不才]
-%     \hanzibox*[bordercolor=red]{我们}[wo3][吾辈]
+%     \hanziboxset{frametype=咪,framecolor=red,charcolor=red,
+%                  charf=\Huge,pinyinf=\small,initial=false}
+%     \hanzibox{门口}\hfill
+%     \hanzibox{生日}\\
+%     \hanzibox{题目}\hfill
+%     \hanzibox{田野}
 %   \end{SideBySideExample}
-% \end{function}
 %
-% \changes{v1.1.0}{2021/09/21}{添加隐藏汉字选项。}
+% \subsection{标注韵母练习}
 %
-% \begin{function}[added=2021-09-21]{withhanzi}
-%   \begin{syntax}
-%     withhanzi = <\TTF>
-%   \end{syntax}
-%   为\tn{hanzibox}命令选择是否输出汉字，默认值为\textbf{true}。该选项对\tn{hanzidialog}命令无效。
 %   \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.35\linewidth,gobble=5]
-%     \hanzibox[inner=cross]{我}[wo3][吾]
-%     \hanzibox[withhanzi=false,inner=star]{我}[wo3][不才]
-%     \hanzibox[bordercolor=red]{我们}[wo3men5][吾辈]
+%     \hanziboxset{frametype=咪,framecolor=red,charcolor=red,
+%                  charf=\Huge,pinyinf=\small,vowel=false}
+%     \hanzibox{门口}\hfill
+%     \hanzibox{生日}\\
+%     \hanzibox{题目}\hfill
+%     \hanzibox{田野}
 %   \end{SideBySideExample}
+%
+% \subsection{标注声调练习}
+%
 %   \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.35\linewidth,gobble=5]
-%     \hanzibox*[inner=cross]{我}[][吾]
-%     \hanzibox*[withhanzi=false,inner=star]{我}[wo3][不才]
-%     \hanzibox*[bordercolor=red]{我们}[wo3][吾辈]
+%     \hanziboxset{frametype=咪,framecolor=red,charcolor=red,
+%                  charf=\Huge,pinyinf=\small,tone=false}
+%     \hanzibox{门口}\hfill
+%     \hanzibox{生日}\\
+%     \hanzibox{题目}\hfill
+%     \hanzibox{田野}
 %   \end{SideBySideExample}
-% \end{function}
 %
-% \changes{v1.1.0}{2021/09/21}{添加隐藏译文选项。}
+% \subsection{随机生成生词练习}
+%
+% 假设提前准备了生词表的\verb!\clist_set:Nn \l__words_clist!，则可以使用
+% \LaTeX3的随机处理随机生成生词练习题(每次编译可以成不同的结果)。
+%
+%   \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.30\linewidth,gobble=5]
+%     \ExplSyntaxOn
+%     \clist_set:Nn \l__words_clist
+%       {
+%         {铅笔} , {橡皮} , {报纸} ,
+%         {头发} , {耳朵} , {眼睛} ,
+%         {大象} , {蚂蚁} , {松鼠} ,
+%         {男孩} , {同学} , {兄弟} ,
+%         {学生} , {医生} , {护士} ,
+%         {老师} , {警察} , {羊肉} ,
+%         {窗户} , {镜子} , {沙发}
+%       }
+%     \hanziboxset{frametype=咪,framecolor=red,charcolor=red,
+%                  charf=\huge,pinyinf=\footnotesize,hanzi=false}
+%     \centering
+%     \int_step_inline:nn {6}
+%       {
+%         \hanzibox{\clist_rand_item:N \l__words_clist}\\
+%       }
+%     \ExplSyntaxOff
+%   \end{SideBySideExample}
 %
-% \begin{function}[added=2021-09-21]{withtran}
-%   \begin{syntax}
-%     withtran = <\TTF>
-%   \end{syntax}
-%   为\tn{hanzibox}命令选择是否输出译文，默认值为\textbf{true}。该选项对\tn{hanzidialog}命令无效。
-%   \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.35\linewidth,gobble=5]
-%     \hanzibox[inner=cross]{我}[wo3][吾]
-%     \hanzibox[withtran=false,inner=star]{我}[wo3][不才]
-%     \hanzibox[bordercolor=red]{我们}[wo3men5][吾辈]
+% \subsection{随机生成拼音练习}
+%
+% 假设提前准备了生词表的声母和韵母表，则可以使用
+% \LaTeX3的随机处理随机生成拼音练习题(每次编译可以成不同的结果)。
+% 此时，可能生成的拼音不正确，可让学生填写“无”。
+%
+%   \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.25\linewidth,gobble=5]
+%     \ExplSyntaxOn
+%     \int_new:N \l__tone_int
+%     \clist_set:Nn \l__initials_clist
+%       {
+%         {zh} , {ch} , {sh} , {b} , {p} , {m} , {f} ,
+%         {d}  , {t}  , {n}  , {l} , {g} , {k} , {h} ,
+%         {j}  , {q}  , {x}  , {r} , {z} , {c} , {s} ,
+%         {y}  , {w}
+%       }
+%     \clist_set:Nn \l__vowel_clist
+%       {
+%         {iang} , {iong} , {uang} , {ueng} , {ang} , {eng} , {ing} ,
+%         {ong}  , {uai}  , {uan}  , {uai}  , {uei} , {iao} , {iou} ,
+%         {ian}  , {van}  , {uen}  , {ai}   , {ei}  , {ua}  , {uo}  ,
+%         {ui}   , {ao}   , {ou}   , {iu}   , {ie}  , {ve}  , {er}  ,
+%         {an}   , {en}   , {in}   , {un}   , {vn}  , {a}   , {e}   ,
+%         {i}    , {o}    , {u}    , {v}
+%       }
+%     \hanziboxset{frametype=咪,framecolor=red,charcolor=red,
+%                  charf=\huge,pinyinf=\footnotesize,hanzi=false}
+%     \centering
+%     \int_step_inline:nn {10}
+%       {
+%         \int_zero:N \l__tone_int
+%         \int_set:Nn \l__tone_int {\int_rand:n {5}}
+%         \hanzibox*{好}[
+%           \clist_rand_item:N \l__initials_clist
+%           \clist_rand_item:N \l__vowel_clist
+%           \int_use:N \l__tone_int
+%          ]\\
+%       }
+%     \ExplSyntaxOff
 %   \end{SideBySideExample}
-%   \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.35\linewidth,gobble=5]
-%     \hanzibox*[inner=cross]{我}[][吾]
-%     \hanzibox*[withtran=false,inner=star]{我}[wo3][不才]
-%     \hanzibox*[bordercolor=red]{我们}[wo3][吾辈]
+%
+% \subsection{生成格式纸}
+%
+%   \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.50\linewidth,gobble=5]
+%     \hanziboxset{frametype=咪,framecolor=red,
+%        charcolor=red,charf=\huge}
+%     \centering
+%     \ExplSyntaxOn
+%     \int_step_inline:nn {8}
+%       {
+%         \int_step_inline:nn {6}
+%           {
+%             \hanzibox{}
+%             \hspace*{-0.4pt}
+%           }
+%         \par\nointerlineskip\vspace*{-6.0pt}
+%      }
+%     \ExplSyntaxOff
+%   \end{SideBySideExample}
+%
+% \subsection{生成诗词注音}
+%
+%   \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.50\linewidth,gobble=5]
+%     \setpinyin{长}{chang2}
+%     \setpinyin{尽}{jin4}
+%     \hanziboxset{frametype=咪,framecolor=red,
+%       charf=\huge,pinyinf=\footnotesize,
+%       charcolor=green!40!black}
+%     \centering
+%     \hanzibox{故人西辞黄鹤楼}
+%     \hanzibox{烟花三月下扬州}
+%     \hanzibox{孤帆远影碧空尽}
+%     \hanzibox{唯见长江天际流}
 %   \end{SideBySideExample}
-% \end{function}
 %
 % \end{documentation}
 %
@@ -423,9 +651,9 @@ Copyright and Licence
 % \section{代码实现}
 %
 % 本宏包使用 \LaTeX3 语法编写，依赖 \pkg{expl3} 环境，
-% 并需调用 \pkg{l3packages} 中的相关宏包。
+% 并需调用 \pkg{l3packages} 中的\pkg{l3draw}等相关宏包。
 %
-% 按照 \LaTeX3 语法，代码中的空格、换行、回车与制表符完全被忽略，
+% 按照 \LaTeX3 语法，代码中的空格、换行、回车与制表符会完全被忽略，
 % 而下划线“|_|”和冒号“|:|”则可作为一般字母使用。
 % 正常的空格可以使用“|~|”代替；至于 |~| 原来所表示的“带子”，
 % 则要用 \LaTeXe{} 的原始命令 \tn{nobreakspace} 代替。
@@ -450,7 +678,7 @@ Copyright and Licence
 %
 %    \begin{macrocode}
 
-\RequirePackage { xtemplate, l3keys2e, xparse }
+\RequirePackage { xtemplate, l3keys2e, l3draw, xparse }
 
 %    \end{macrocode}
 %
@@ -482,78 +710,26 @@ Copyright and Licence
   }
 \msg_new:nnn { hanzibox } { unsupported-engine }
   {
-    The~ hanzibox~ packages~ requires~ either~ XeTeX. \\\\
+    The~ hanzibox~ packages~ requires~ XeTeX. \\\\
     "#1"~ is~ not~ supported~ at~ present.~ You~ must~ change \\
     your~ typesetting~ engine~ to~ "xelatex"~ or~ "lualatex".
   }
 
 %    \end{macrocode}
 %
-% 载入TikZ, xpinyin宏包
-%
-%    \begin{macrocode}
-\RequirePackage { tikz, xpinyin }
-
-%    \end{macrocode}
-%
-% 在Expl3中使用TikZ库的补丁
-%
-%    \begin{macrocode}
-\RequirePackage{etoolbox}
-\ExplSyntaxOff
-\patchcmd
-  {\pgfutil@InputIfFileExists}
-  {\input #1}
-  {%
-    \@pushfilename
-    \xdef\@currname{#1}%
-    \input #1 %
-    \@popfilename
-  }
-  {}{}
-\ExplSyntaxOn
-\usetikzlibrary{decorations}
-\usetikzlibrary{shapes.geometric}
-\usetikzlibrary{positioning}
-
-%    \end{macrocode}
-%
-% TikZ样式设置
+% 载入xpinyin宏包
 %
 %    \begin{macrocode}
-\tikzset{%
-  stretch~dash/.code~args={on~#1~off~#2}{%
-    \tikz@addoption{%
-      \pgfgetpath\currentpath%
-      \pgfprocessround{\currentpath}{\currentpath}%
-      \pgf@decorate@parsesoftpath{\currentpath}{\currentpath}%
-      \pgfmathparse{max(round((\pgf@decorate@totalpathlength-#1)/(#1+#2)),0)}%
-      \let\npattern=\pgfmathresult%
-      \pgfmathparse{\pgf@decorate@totalpathlength/(\npattern*(#1+#2)+#1)}%
-      \let\spattern=\pgfmathresult%
-      \pgfsetdash{{\spattern*#1}{\spattern*#2}}{0pt}%
-    }%
-  }%
-}
+\RequirePackage { xpinyin }
 
 %    \end{macrocode}
 %
 % \subsection{用户接口}
 %
-% \changes{v1.1.0}{2021/09/22}{为用户命令添加组限制。}
-%
-% \begin{macro}{\hanzidialog}
-% 手动汉字盒子命令。
-%    \begin{macrocode}
-\NewDocumentCommand{\hanzidialog}{ m O{} O{} }
-  {
-    \group_begin:
-      \@@_dialog:nnnn { #1 } { #2 } { #3 }
-    \group_end:
-  }
-
-%    \end{macrocode}
-% \end{macro}
+% \changes{v1.1.0}{2021/09/22}{为用户命令添加组限制}
+% \changes{v2.0.0}{2021/09/26}{调整星号命令为手动拼音注音}
+% 汉字背景盒子改为l3draw实现，
+% 其设计思路和部分源码来自\LaTeX 字帖宏包(\url{https://www.ctan.org/pkg/zitie})。
 %
 % \begin{macro}{\hanzibox}
 % 自动拼音汉字盒子命令。
@@ -562,14 +738,27 @@ Copyright and Licence
   {
     \IfBooleanTF{#1}
       {
-        \group_begin:
-          \@@_asterisk_draw:nnnn { #2 } { #3 } { #4 } { #5 }
-        \group_end:
+        \bool_set_false:N \l_@@_autopinyin_bool
       }{
-        \group_begin:
-          \@@_draw:nnnn { #2 } { #3 } { #4 } { #5 }
-        \group_end:
+        \bool_set_true:N \l_@@_autopinyin_bool
       }
+      \group_begin:
+        \@@_handle:nnnn { #2 } { #3 } { #4 } { #5 }
+      \group_end:
+  }
+
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\hanzidialog}
+% 手动汉字盒子命令。
+%    \begin{macrocode}
+\NewDocumentCommand{\hanzidialog}{O{} m O{} O{} }
+  {
+    \group_begin:
+      \bool_set_false:N \l_@@_autopinyin_bool
+      \@@_dialog:nnnn { #1 } { #2 } { #3 } { #4 }
+    \group_end:
   }
 
 %    \end{macrocode}
@@ -578,566 +767,1371 @@ Copyright and Licence
 % \subsection{内部变量声明}
 %
 % \changes{v1.1.0}{2021/09/21}{添加缩放比例，前景/背景色，隐藏控制变量。}
-%
-% \begin{variable}{\fp_new:N \l_@@_scale_fp,
-%   \l_@@_inner_int,
-%   \l_@@_border_bool,
-%   \l_@@_borderwidth_dim,
-%   \l_@@_bordercolor_tl,
-%   \l_@@_fgcolor_tl,
-%   \l_@@_bgcolor_tl,
-%   \l_@@_pinyin_bool,
-%   \l_@@_hanzi_bool,
-%   \l_@@_tran_bool,
+% \changes{v2.0.0}{2021/09/24}{根据l3draw的需要重新设计各个变量。}
+%
+% \begin{variable}{\l_@@_autopinyin_bool,
+%   \l_@@_withinitials_bool,
+%   \l_@@_withvowel_bool,
+%   \l_@@_withtone_bool,
+%   \l_@@_withpinyin_bool,
+%   \l_@@_withhanzi_bool,
+%   \l_@@_withtran_bool,
+%   \l_@@_basebox_box,
+%   \l_@@_frame_type_tl,
+%   \g_@@_frame_list_clist,
+%   \l_@@_resize_method_tl,
+%   \g_@@_resize_method_clist,
+%   \l_@@_frame_size_dim,
+%   \l_@@_char_width_dim,
+%   \l_@@_char_height_dim,
+%   \l_@@_box_width_dim,
+%   \l_@@_box_height_dim,
+%   \l_@@_linewidth_dim,
+%   \l_@@_box_coffin,
+%   \l_@@_tmpa_coffin,
+%   \l_@@_tmpb_coffin,
+%   \hanziboxwidth,
+%   \hanziboxheight,
+%   \hanziboxboxwd,
+%   \hanziboxboxht,
+%   \hanziboxboxdp,
+%   \hanziboxxscaleratio,
+%   \hanziboxyscaleratio,
 %   \l_@@_pinyin_tl,
 %   \l_@@_character_tl,
 %   \l_@@_translation_tl,
+%   \l_@@_pinyin_format_tl,
+%   \l_@@_character_format_tl,
+%   \l_@@_translation_format_tl,
 %   \l_@@_pinyin_int,
 %   \l_@@_character_int,
-%   \l_@@_translation_int
+%   \l_@@_translation_int,
+%   \l_@@_tone_int,
+%   \l_@@_pinyin_str,
+%   \l_@@_initial_tl,
+%   \l_@@_vowel_tl
 %  }
-% 临时变量。
-%
-%    \begin{macrocode}
-\fp_new:N \l_@@_scale_fp
-\int_new:N \l_@@_inner_int
-\bool_new:N \l_@@_border_bool
-\dim_new:N \l_@@_borderwidth_dim
-\tl_new:N \l_@@_bordercolor_tl
-\tl_new:N \l_@@_fgcolor_tl
-\tl_new:N \l_@@_bgcolor_tl
-\bool_new:N \l_@@_pinyin_bool
-\bool_new:N \l_@@_hanzi_bool
-\bool_new:N \l_@@_tran_bool
-\tl_new:N \l_@@_pinyin_tl
-\tl_new:N \l_@@_character_tl
-\tl_new:N \l_@@_translation_tl
-\int_new:N \l_@@_pinyin_int
-\int_new:N \l_@@_character_int
-\int_new:N \l_@@_translation_int
+% 定义变量。
+%
+%    \begin{macrocode}
+\bool_new:N   \l_@@_autopinyin_bool
+\bool_new:N   \l_@@_withinitials_bool
+\bool_new:N   \l_@@_withvowel_bool
+\bool_new:N   \l_@@_withtone_bool
+\bool_new:N   \l_@@_withpinyin_bool
+\bool_new:N   \l_@@_withhanzi_bool
+\bool_new:N   \l_@@_withtran_bool
+
+\box_new:N    \l_@@_basebox_box
+\tl_new:N     \l_@@_frame_type_tl
+\clist_new:N  \g_@@_frame_list_clist
+\tl_new:N     \l_@@_resize_method_tl
+\clist_new:N  \g_@@_resize_method_clist
+\dim_new:N    \l_@@_frame_size_dim
+\dim_new:N    \l_@@_char_width_dim
+\dim_new:N    \l_@@_char_height_dim
+\dim_new:N    \l_@@_box_width_dim
+\dim_new:N    \l_@@_box_height_dim
+\dim_new:N    \l_@@_linewidth_dim
+
+\coffin_new:N \l_@@_str_box_coffin
+\coffin_new:N \l_@@_box_coffin
+\coffin_new:N \l_@@_pinyin_box_coffin
+\coffin_new:N \l_@@_tran_box_coffin
+\coffin_new:N \l_@@_tmpa_coffin
+\coffin_new:N \l_@@_tmpb_coffin
+
+\dim_new:N    \hanziboxwidth
+\dim_new:N    \hanziboxheight
+\dim_new:N    \hanziboxboxwd
+\dim_new:N    \hanziboxboxht
+\dim_new:N    \hanziboxboxdp
+\tl_new:N     \hanziboxxscaleratio
+\tl_new:N     \hanziboxyscaleratio
+
+\tl_new:N     \l_@@_pinyin_tl
+\tl_new:N     \l_@@_character_tl
+\tl_new:N     \l_@@_translation_tl
+\tl_new:N     \l_@@_pinyin_format_tl
+\tl_new:N     \l_@@_character_format_tl
+\tl_new:N     \l_@@_translation_format_tl
+\int_new:N    \l_@@_pinyin_int
+\int_new:N    \l_@@_character_int
+\int_new:N    \l_@@_translation_int
+
+\int_new:N    \l_@@_tone_int
+\str_new:N    \l_@@_pinyin_str
+\tl_new:N     \l_@@_initial_tl
+\tl_new:N     \l_@@_vowel_tl
 
 %    \end{macrocode}
 % \end{variable}
 %
+% \subsection{辅助函数}
 %
-% \subsection{选项处理}
+% \subsubsection{设置填充色}
 %
-% 定义 |hanzibox| 键值类。
+% \begin{macro}{\@@_aux_color_fill:}
+% 设置填充色
 %    \begin{macrocode}
-\keys_define:nn { hanzibox }
+\cs_new_nopar:Nn \@@_aux_color_fill:
+  { }
+%    \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{计算盒子尺寸}
+%
+% \begin{macro}{\@@_calc_basechar_w_h:}
+% 计算基字符盒子宽和高
+%    \begin{macrocode}
+\cs_new:Npn \@@_calc_basechar_w_h:
+  {
+    \dim_set:Nn \l_@@_char_width_dim
+      {
+        \box_wd:N \l_@@_basebox_box
+      }
+    \dim_set:Nn \l_@@_char_height_dim
+      {
+        \box_ht_plus_dp:N \l_@@_basebox_box
+      }
+  }
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_coffin_ht_plus_dp:N}
+% 获取coffin盒子总高度
+%    \begin{macrocode}
+\cs_new_nopar:Npn \@@_coffin_ht_plus_dp:N #1
   {
+    \coffin_ht:N #1 + \coffin_dp:N #1
+  }
 %    \end{macrocode}
+% \end{macro}
 %
-% \changes{v1.1.0}{2021/09/21}{添加缩放比例键。}
+% \changes{v2.0.0}{2021/09/28}{添加根据基字符格式计算外观盒子尺寸的函数}
 %
-% \begin{macro}{scale}
-% 设置汉字及其拼音和译文的整体缩放比例。
+% \begin{macro}{\@@_calc_frame_size:}
+% 计算外框长度(正方形，由基字符按charf选项设定的格式盒子确定)
 %    \begin{macrocode}
-    scale .fp_set:N  = \l_@@_scale_fp,
-    scale .initial:n = 1.0,
+\cs_new:Npn \@@_calc_frame_size:
+  {
+    \hbox_set:Nn \l_tmpa_box
+      {
+        \tl_use:N \l_@@_character_format_tl
+        \tl_use:N \c_@@_basechar_tl
+      }
 
+    \dim_set:Nn \l_tmpa_dim
+      {
+        \box_wd:N \l_tmpa_box
+      }
+    \dim_set:Nn \l_tmpb_dim
+      {
+        \box_ht_plus_dp:N \l_tmpa_box
+      }
+
+    \dim_compare:nNnTF \l_tmpa_dim > \l_tmpb_dim
+      {
+        \dim_gset_eq:NN \l_@@_frame_size_dim \l_tmpa_dim
+      }
+      {
+        \dim_gset_eq:NN \l_@@_frame_size_dim \l_tmpb_dim
+      }
+
+    \dim_gadd:Nn \l_@@_frame_size_dim { 2pt }
+
+    \dim_gset_eq:NN \hanziboxwidth \l_@@_frame_size_dim
+    \dim_gset_eq:NN \hanziboxheight \l_@@_frame_size_dim
+
+  }
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{inner}
-% 设置汉字格子内部样式，有空白、米字和十字3种样式，默认为空白样式。
+% \subsubsection{定义边框样式}
+%
+% \begin{macro}{\@@_frame_type:n,\@@_frame_type_c:n}
+% 生成边框样式函数名称
 %    \begin{macrocode}
-    inner .choice:,
-    inner .value_required:n = true,
-    inner .choices:nn =
-      { none,star,cross }
-      { \int_set_eq:NN \l_@@_inner_int \l_keys_choice_int },
-    inner .initial:n = none,
-
+\cs_new_nopar:Npn \@@_frame_type:n #1
+  {
+    @@_frame_construct_type_ #1 :nnnnnn
+  }
+\cs_new_nopar:Npn \@@_frame_type_c:n #1
+  {
+    \use:c
+      {
+        @@_frame_construct_type_ #1 :nnnnnn
+      }
+  }
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{border}
-% 是否绘制汉字盒子边框，默认为空true。
+% \begin{macro}{\@@_new_frame_construct:nn}
+% 边框样式函数的定义函数。
 %    \begin{macrocode}
-    border .bool_set:N = \l_@@_border_bool,
-    border .default:n = true,
-    border .initial:n = true,
-
+\cs_new:Npn \@@_new_frame_construct:nn #1
+  {
+    \clist_put_right:Nn \g_@@_frame_list_clist {#1}
+    \cs_new:cn { \@@_frame_type:n {#1} }
+  }
+\@@_new_frame_construct:nn { none } { }
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{borderwidth}
-% 汉字盒子边框宽度，默认为空3 pt。
 %    \begin{macrocode}
-    borderwidth .dim_set:N  = \l_@@_borderwidth_dim,
-    borderwidth .initial:n = 0.4 pt,
+\@@_new_frame_construct:nn { 口 }
+  {
+    \color_stroke:n { hanziboxframecolor }
+    \draw_path_rectangle_corners:nn { #1, #2} { #3, #4}
+
+    \cs_if_eq:NNTF \@@_aux_color_fill: \c_empty_tl
+      {
+        \draw_path_use_clear:n { stroke }
+      }
+      {
+        \draw_path_use_clear:n { stroke , fill }
+      }
+  }
+
+\@@_new_frame_construct:nn { 十 }
+  {
+    \tl_if_empty:NF \l_@@_dash_pattern_tl
+      {
+        \exp_args:No \draw_dash_pattern:nn { \l_@@_dash_pattern_tl } { 0pt }
+      }
+    \color_stroke:n { hanziboxframecolor!30 }
+    \draw_path_moveto:n { (#3)/2, #2 }
+    \draw_path_lineto:n { #3/2, #4 }
+    \draw_path_moveto:n { #1, (#4)/2 }
+    \draw_path_lineto:n { #3, (#4)/2 }
+    \draw_path_use_clear:n { stroke }
+  }
+
+\@@_new_frame_construct:nn { × }
+  {
+    \tl_if_empty:NF \l_@@_dash_pattern_tl
+      {
+        \exp_args:No \draw_dash_pattern:nn { \l_@@_dash_pattern_tl } { 0pt }
+      }
+    \color_stroke:n { hanziboxframecolor!30 }
+    \draw_path_moveto:n { #1, #2 }
+    \draw_path_lineto:n { #3, #4 }
+    \draw_path_moveto:n { #1, #4 }
+    \draw_path_lineto:n { #3, #2 }
+    \draw_path_use_clear:n { stroke }
+  }
+
+\@@_new_frame_construct:nn { 田 }
+  {
+    \@@_frame_type_c:n { 口 } {#1} {#2} {#3} {#4} {#5} {#6}
+    \@@_frame_type_c:n { 十 } {#1} {#2} {#3} {#4} {#5} {#6}
+  }
+
+\@@_new_frame_construct:nn { 米 }
+  {
+    \@@_frame_type_c:n { × } {#1} {#2} {#3} {#4} {#5} {#6}
+    \@@_frame_type_c:n { 十 } {#1} {#2} {#3} {#4} {#5} {#6}
+  }
 
+\@@_new_frame_construct:nn { 咪 }
+  {
+    \@@_frame_type_c:n { 口 } {#1} {#2} {#3} {#4} {#5} {#6}
+    \@@_frame_type_c:n { × } {#1} {#2} {#3} {#4} {#5} {#6}
+    \@@_frame_type_c:n { 十 } {#1} {#2} {#3} {#4} {#5} {#6}
+  }
+%    \end{macrocode}
+%
+% \subsubsection{定义缩放方式}
+%
+% \begin{macro}{\@@_resize:n,\@@_resize_c:n}
+% 缩放方式命名函数
+%    \begin{macrocode}
+\cs_new_nopar:Npn \@@_resize:n #1
+  {
+    @@_processor_resize_ #1 :w
+  }
+\cs_new_nopar:Npn \@@_resize_c:n #1
+  {
+    \use:c
+      {
+        @@_processor_resize_ #1 :w
+      }
+  }
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{bordercolor}
-% 汉字盒子边框颜色，默认为black。
+% \begin{macro}{\@@_dim_gezero_dispatch:NNnnn,\@@_dim_gezero_dispatch:NNnnn,
+%               \@@_force_size_dispatch:nnn,\@@_force_size_dispatch:nnnn}
+% 定义缩放方式函数需要的辅助函数。
 %    \begin{macrocode}
-    bordercolor .tl_set:N  = \l_@@_bordercolor_tl,
-    bordercolor .initial:n = black,
-
+\cs_new:Npn \@@_dim_gezero_dispatch:NNnnn #1#2 #3#4#5
+  {
+    \dim_compare:nNnTF #1 > \c_zero_dim
+      { #3 }
+      {
+        \dim_compare:nNnTF #2 > \c_zero_dim
+          { #4 } { #5 }
+      }
+  }
+\cs_new:Npn \@@_dim_gezero_dispatch:NNnnnn #1#2 #3#4#5#6
+  {
+    \dim_compare:nNnTF #1 > \c_zero_dim
+      {
+        \dim_compare:nNnTF #2 > \c_zero_dim
+          { #3 } { #4 }
+      }
+      {
+        \dim_compare:nNnTF #2 > \c_zero_dim
+          { #5 } { #6 }
+      }
+  }
+\cs_new:Npn \@@_force_size_dispatch:nnn % height, width, none
+  {
+    \@@_dim_gezero_dispatch:NNnnn \l_@@_height_dim \l_@@_width_dim
+  }
+\cs_new:Npn \@@_force_size_dispatch:nnnn % both, height, width, none
+  {
+    \@@_dim_gezero_dispatch:NNnnnn \l_@@_box_height_dim \l_@@_box_width_dim
+  }
 %    \end{macrocode}
 % \end{macro}
 %
-% \changes{v1.1.0}{2021/09/21}{添加前景颜色键。}
+% \begin{macro}{\@@_new_resize_method:nn}
+% 缩放方式函数的定义函数。
+%    \begin{macrocode}
+\cs_new:Npn \@@_new_resize_method:nn #1
+  {
+    \clist_put_right:Nn \g_@@_resize_method_clist {#1}
+    \cs_new:cpn { \@@_resize:n {#1} }
+  }
+%    \end{macrocode}
+% \end{macro}
 %
-% \begin{macro}{fgcolor}
-% 汉字盒子前景颜色(文字颜色)，默认为black。
+% 定义缩放方式函数。
 %    \begin{macrocode}
-    fgcolor .tl_set:N  = \l_@@_fgcolor_tl,
-    fgcolor .initial:n = black,
+\@@_new_resize_method:nn { none } { }
+
+\@@_new_resize_method:nn { real }
+  {
+    \@@_force_size_dispatch:nnnn
+      {
+        \coffin_resize:Nnn \l_@@_box_coffin
+                           \l_@@_box_width_dim
+                           \l_@@_box_height_dim
+      }
+      {
+        \coffin_scale:Nnn \l_@@_box_coffin
+          {
+            \dim_ratio:nn { \l_@@_box_height_dim }
+                          { \@@_coffin_ht_plus_dp:N \l_@@_box_coffin }
+          }
+          {
+            \dim_ratio:nn { \l_@@_box_height_dim }
+                          { \@@_coffin_ht_plus_dp:N \l_@@_box_coffin }
+          }
+      }
+      {
+        \coffin_scale:Nnn \l_@@_box_coffin
+          {
+            \dim_ratio:nn { \l_@@_box_width_dim }
+                          { \coffin_wd:N \l_@@_box_coffin }
+          }
+          {
+            \dim_ratio:nn { \l_@@_box_width_dim }
+                          { \coffin_wd:N \l_@@_box_coffin }
+          }
+      }
+      {
+        \coffin_scale:Nnn \l_@@_box_coffin
+                          { \l_@@_x_scale_tl }
+                          { \l_@@_y_scale_tl }
+      }
+  }
+
+\@@_new_resize_method:nn { base }
+  {
+    \@@_force_size_dispatch:nnnn
+      {
+        \coffin_resize:Nnn \l_@@_box_coffin
+                           \l_@@_box_width_dim
+                           \l_@@_box_height_dim
+      }
+      {
+        \coffin_resize:Nnn \l_@@_box_coffin
+           {
+             \l_@@_char_width_dim * \dim_ratio:nn { \l_@@_box_height_dim }
+               { \@@_coffin_ht_plus_dp:N \l_@@_box_coffin }
+           }
+           {
+             \l_@@_box_height_dim
+           }
+      }
+      {
+        \coffin_resize:Nnn \l_@@_box_coffin
+           {
+             \l_@@_box_width_dim
+           }
+           {
+             \l_@@_char_height_dim * \dim_ratio:nn { \l_@@_box_width_dim }
+               { \coffin_wd:N \l_@@_box_coffin }
+           }
+      }
+      {
+        \coffin_resize:Nnn \l_@@_box_coffin
+           {
+             \l_@@_x_scale_tl \l_@@_char_width_dim
+           }
+           {
+             \l_@@_y_scale_tl \l_@@_char_height_dim
+           }
+      }
+  }
 
+\msg_new:nnn { hanzibox } { frame-type } { using~ `#1'~ frame. }
 %    \end{macrocode}
-% \end{macro}
 %
-% \changes{v1.1.0}{2021/09/21}{添加背景颜色键。}
+% \changes{v2.0.0}{2021/09/28}{删除square缩放样式}
+%
+% \subsubsection{设置字号}
 %
-% \begin{macro}{bgcolor}
-% 汉字盒子背景颜色，默认为black。
+% \begin{macro}{\@@_zihao:n}
+% 设置字号
 %    \begin{macrocode}
-    bgcolor .tl_set:N  = \l_@@_bgcolor_tl,
-    bgcolor .initial:n = white,
-
+\cs_new_nopar:Npn \@@_zihao:n #1 { \zihao {#1} }
 %    \end{macrocode}
 % \end{macro}
 %
-% \changes{v1.1.0}{2021/09/21}{添加隐藏拼音键。}
+% \subsubsection{定义边框类型错误提示信息}
 %
-% \begin{macro}{withpinyin}
-% 是否显示汉语拼音，默认为true。
 %    \begin{macrocode}
-    withpinyin .bool_set:N = \l_@@_pinyin_bool,
-    withpinyin .default:n = true,
-    withpinyin .initial:n = true,
-
+\msg_new:nnn { hanzibox } { frame-exists } { The~ frame~ type~ `#1~ not~ exists. }
+%    \end{macrocode}
+%
+% \subsubsection{命名颜色}
+%
+% \begin{macro}{\@@_color_select:nn,\@@_color_select:nnn}
+% 颜色命名函数，注意使用的是l3语法
+%    \begin{macrocode}
+\cs_set_nopar:Npn \@@_color_select:nn #1#2
+  {
+    \color_set:nn {#1} {#2}
+  }
+\cs_set_nopar:Npn \@@_color_select:nnn #1#2#3
+  {
+    \color_set:nnn {#1} {#2} {#3}
+  }
 %    \end{macrocode}
 % \end{macro}
 %
-% \changes{v1.1.0}{2021/09/21}{添加隐藏汉字键。}
+% \subsubsection{设置Debug状态}
 %
-% \begin{macro}{withhanzi}
-% 是否显示汉语拼音，默认为true。
+% \begin{macro}{\@@_debug:n}
+% 设置debug状态
 %    \begin{macrocode}
-    withhanzi .bool_set:N = \l_@@_hanzi_bool,
-    withhanzi .default:n = true,
-    withhanzi .initial:n = true,
-
+\cs_new:Npn \@@_debug:n
+  {
+    \bool_if:NTF \l_@@_debug_bool
+      { \use:n } { \use_none:n }
+  }
 %    \end{macrocode}
 % \end{macro}
 %
-% \changes{v1.1.0}{2021/09/21}{添加隐藏译文键。}
+% \subsection{选项处理}
 %
-% \begin{macro}{withtran}
-% 是否显示汉语拼音，默认为true。
+% \changes{v2.0.0}{2021/09/25}{参考zitie宏包，重新设计选项，
+%                              仅保留1.1.0版本中的拼音、汉字、译文显示控制选项。}
+%
+% 定义 |hanzibox| 键值类。
 %    \begin{macrocode}
-    withtran .bool_set:N = \l_@@_tran_bool,
-    withtran .default:n = true,
-    withtran .initial:n = true,
-
+\keys_define:nn { hanzibox }
+  {
+%    \end{macrocode}
+%
+% \begin{macro}{basechar}
+% 设置基字符。
+%    \begin{macrocode}
+    basechar  .code:n = { \tl_gset:Nx \c_@@_basechar_tl {#1}
+                          \@@_calc_basechar_w_h:
+                        },
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}{zihao}
+% 设置字号。
+%    \begin{macrocode}
+    zihao     .code:n = { \hbox_gset:Nn \l_@@_basebox_box
+                            {
+                              \@@_zihao:n {#1} \c_@@_basechar_tl
+                            }
+                          \@@_calc_basechar_w_h:
+                        },
+%    \end{macrocode}
+% \end{macro}
 %
-% 处理未知选项。
+% \begin{macro}{pinyinf}
+% 拼音的格式
 %    \begin{macrocode}
-    unknown .code:n = { \@@_error:n { unknown-option } }
-  }
-\msg_new:nnn { hanzibox } { unknown-option }
-  { package~ option~ "\l_keys_key_tl"~ is~ unknown. }
-
+    pinyinf .tl_set:N = \l_@@_pinyin_format_tl ,
+    pinyinf .initial:n = \tiny ,
 %    \end{macrocode}
+% \end{macro}
 %
-% \subsection{选项用户接口}
+% \begin{macro}{charf}
+% 汉字的格式
+%    \begin{macrocode}
+    charf .code:n = { \tl_gset:Nn \l_@@_character_format_tl {#1}
+                      \@@_calc_frame_size:
+                    },
+%    \end{macrocode}
+% \end{macro}
 %
-% \begin{macro}{\hanziboxset}
-% 选项设置用户接口。
+% \begin{macro}{tranf}
+% 译文的格式
 %    \begin{macrocode}
-\NewDocumentCommand \hanziboxset { m }
-  { \keys_set:nn { hanzibox } {#1} }
+    tranf .tl_set:N = \l_@@_translation_format_tl ,
+    tranf .initial:n = \tiny ,
 %    \end{macrocode}
 % \end{macro}
 %
-% \subsection{内部函数}
+% \begin{macro}{frametype}
+% 设置边框类型，其取值可以是：none-无方框，口–仅方框， 十–仅中间的横线和竖线，
+% 田–常见的田字格， 米–十字格再加上斜的两条线， 咪–常见的米字格。
+%    \begin{macrocode}
+    frametype .code:n = { \exp_args:NNx \clist_if_in:NnTF \g_@@_frame_list_clist {#1}
+                            { \tl_set:Nx \l_@@_frame_type_tl {#1} }
+                            { \msg_error:nnx { hanzibox } { frame-exists } {#1} }
+                        },
+%    \end{macrocode}
+% \end{macro}
 %
-% \begin{macro}{\@@_dialog:nnnn}
-% 手动汉字盒子排版内部命令，根据选项用TikZ实现绘制。
+% \begin{macro}{resize}
+% resize 设置缩放方式，其取值可以是：
+% none，不使用缩放
+% real，使用字符实际宽高缩放，
+% base，使用 basechar 设置的字符的宽高缩放，
+% square，使得字符的宽高相等再进行缩放。
 %    \begin{macrocode}
-\cs_new_protected:Npn \@@_dialog:nnnn #1#2#3
-  {
-    \tl_set:Nx \l_@@_character_tl {#1}
-    \tl_set:Nx \l_@@_pinyin_tl {#2}
-    \tl_set:Nx \l_@@_translation_tl {#3}
-    \scalebox{\fp_use:N \l_@@_scale_fp}{
-      \tikz[scale=0.5, every~node/.style={inner~sep=0,outer~sep=0}]{%
-        {\node[] at (1,1){\huge{\l_@@_character_tl}}};
-        {\node[label={\strut\small\textbf{\l_@@_pinyin_tl}},
-          text~height=1cm] (charr) at (1,1){};}%
-        {\node[align=center] at (1,-0.5)
-          {\strut\small\textit{\l_@@_translation_tl}};}%
-      }%
-    }%
-  }
-
+    resize    .code:n = { \exp_args:NNx \clist_if_in:NnTF \g_@@_resize_method_clist {#1}
+                            { \tl_set:Nx \l_@@_resize_method_tl {#1} }
+                            { \msg_error:nnx { hanzibox } { resize-method } {#1} }
+                        },
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}{xscale}
+% x方向缩放比例
+%    \begin{macrocode}
+    xscale .tl_set:N = \l_@@_x_scale_tl ,
+    xscale .initial:n = 1 ,
+%    \end{macrocode}
+% \end{macro}
 %
-% \begin{macro}{\@@_pinyinaux:n}
-% \begin{macro}{\@@_pinyinaux:x}
-% \pkg{xpyinyin}宏包\tn{pinyin} 命令的\LaTeX3{}版本函数及其函数变体。
+% \begin{macro}{yscale}
+% y方向缩放比例
 %    \begin{macrocode}
-\cs_set_eq:NN \@@_pinyinaux:n \pinyin
-\cs_generate_variant:Nn \@@_pinyinaux:n { x }
+    yscale .tl_set:N = \l_@@_y_scale_tl ,
+    yscale .initial:n = 1 ,
 %    \end{macrocode}
 % \end{macro}
+%
+% \begin{macro}{scale}
+% x,y方向缩放比例
+%    \begin{macrocode}
+    scale  .meta:n = { xscale = #1 , yscale = #1 } ,
+%    \end{macrocode}
 % \end{macro}
 %
-% \changes{v1.1.0}{2021/09/21}{添加整体缩放代码。}
-% \changes{v1.1.0}{2021/09/21}{添加按需要隐藏拼音、汉字或译文代码。}
-% \changes{v1.1.0}{2021/09/21}{将隐藏功能修正为用前景/背景色实现。}
-% \changes{v1.1.0}{2021/09/22}{将各部分绘制分解为函数实现。}
+% \begin{macro}{width}
+% 盒子宽度
+%    \begin{macrocode}
+    width  .dim_set:N = \l_@@_box_width_dim ,
+%    \end{macrocode}
+% \end{macro}
 %
-% \begin{macro}{\@@_draw:nnnn}
-% 自动汉字盒子排版内部命令，根据选项用TikZ实现绘制。
+% \begin{macro}{height}
+% 盒子高度
 %    \begin{macrocode}
-\cs_new_protected:Npn \@@_draw:nnnn #1#2#3#4
-  {
+    height .dim_set:N = \l_@@_box_height_dim ,
 %    \end{macrocode}
+% \end{macro}
 %
-% 设置盒子外观选项
+% \begin{macro}{linewidth}
+% 线条宽度
+%    \begin{macrocode}
+    linewidth .dim_set:N = \l_@@_linewidth_dim ,
+    linewidth .initial:n = 0.4pt ,
+%    \end{macrocode}
+% \end{macro}
 %
+% \begin{macro}{framecolor}
+% 边框颜色
 %    \begin{macrocode}
-    \keys_set:nn { hanzibox } { #1 }
+    framecolor  .code:n = { \@@_color_select:nn { hanziboxframecolor } {#1} } ,
+    framecolor  .initial:n = black ,
+    framecolor* .code:n = { \@@_color_select:nnn { hanziboxframecolor } #1 } ,
 %    \end{macrocode}
+% \end{macro}
 %
-% 将各参数存入token list变量，注意使用x递归展开
+% \begin{macro}{charcolor}
+% 字符颜色
+%    \begin{macrocode}
+    charcolor  .code:n = { \@@_color_select:nn { hanziboxcharcolor } {#1} } ,
+    charcolor  .initial:n = black ,
+    charcolor* .code:n = { \@@_color_select:nnn { hanziboxframecolor } {#1} } ,
+%    \end{macrocode}
+% \end{macro}
 %
+% \begin{macro}{color}
+% 同时设置边框和字符颜色
 %    \begin{macrocode}
-    \tl_set:Nx \l_@@_character_tl {#2}
-    \tl_set:Nx \l_@@_pinyin_tl {#3}
-    \tl_set:Nx \l_@@_translation_tl {#4}
+    color  .meta:n = { framecolor = #1, charcolor = #1 } ,
+    color* .meta:n = { framecolor* = #1, charcolor* = #1 } ,
 %    \end{macrocode}
+% \end{macro}
 %
-% 计算token list中的内容长度(个数)
+% \begin{macro}{fillcolor}
+% 填充色
+%    \begin{macrocode}
+    fillcolor  .code:n = { \exp_args:Nx \tl_if_empty:nTF {#1}
+                            {  \@@_color_select:nn { hanziboxfillcolor } { white }
+                               \cs_set_nopar:Npn \@@_aux_color_fill: { }
+                            }{ \@@_color_select:nn { hanziboxfillcolor } {#1}
+                               \cs_set_nopar:Npn \@@_aux_color_fill: { \color_fill:n {#1} }
+                            }
+                        } ,
+    fillcolor* .code:n = { \@@_color_select:nnn { hanziboxfillcolor } #1
+                           \cs_set_nopar:Npn \@@_aux_color_fill: { \color_fill:nn #1 }
+                         } ,
+%    \end{macrocode}
+% \end{macro}
 %
+% \begin{macro}{dashpattern}
+% 虚线样式
 %    \begin{macrocode}
-    \int_set:Nn \l_@@_character_int
-      {
-        \tl_count:V \l_@@_character_tl
-      }
-    \int_set:Nn \l_@@_pinyin_int
-      {
-        \tl_count:V \l_@@_pinyin_tl
-      }
-    \int_set:Nn \l_@@_translation_int
-      {
-        \tl_count:V \l_@@_translation_tl
-      }
-
-    \scalebox{\fp_use:N \l_@@_scale_fp}{
-    \tikz[scale=0.5, every~node/.style={inner~sep=0,outer~sep=0}]{%
+    dashpattern .tl_set:N = \l_@@_dash_pattern_tl ,
+    dashpattern .initial:n = { } ,
 %    \end{macrocode}
+% \end{macro}
 %
-% 根据汉字长度绘制汉字盒子背景，必须提前绘制
+% \begin{macro}{framearc}
+% 转角半径
+%    \begin{macrocode}
+    framearc  .code:n = { \tl_set:Nn \l_@@_frame_arc_tl { {#1}{#1} } } ,
+    framearc* .tl_set:N = \l_@@_frame_arc_tl ,
+    framearc* .initial:n = { { 0cm }{ 0cm } } ,
+%    \end{macrocode}
+% \end{macro}
 %
+% \begin{macro}{debug}
+% Debug状态
 %    \begin{macrocode}
-      \@@_border_draw:n {0.0cm}
+    debug .bool_set:N = \l_@@_debug_bool ,
+    debug .initial:n = false ,
+    debug .default:n = true ,
 %    \end{macrocode}
+% \end{macro}
 %
-% 如果显示汉字，则内部格线应该提前绘制
+% \begin{macro}{autopinyin}
+% 是否使用\tn{xpyinyin*}命令通过汉字自动获取汉语拼音，默认为true。
+%    \begin{macrocode}
+    autopinyin .bool_set:N = \l_@@_autopinyin_bool,
+    autopinyin .default:n = true,
+    autopinyin .initial:n = true,
+
+%    \end{macrocode}
+% \end{macro}
 %
+% \begin{macro}{initial}
+% 是否输出声母，默认为true。
 %    \begin{macrocode}
-      \bool_if:NT \l_@@_hanzi_bool
-        {
-          \@@_frame_background:n {0.0cm}
-        }
-      \int_compare:nNnTF { \l_@@_character_int } = {0}
-        {
-          \bool_if:NTF \l_@@_hanzi_bool
-            {
-              \node[\l_@@_fgcolor_tl] at (1,1){\huge{\l_@@_character_tl}};
-            }{
-              \node[\l_@@_bgcolor_tl] at (1,1){\huge{\l_@@_character_tl}};
-            }
-          \bool_if:NTF \l_@@_pinyin_bool
-            {
-              \node[label={[font=\small,text=\l_@@_fgcolor_tl]
-                           \strut\@@_pinyinaux:x {\l_@@_pinyin_tl}},
-                text~height=1cm] (charr) at (1,1){};
-            }{
-              \node[label={[font=\small,text=\l_@@_bgcolor_tl]
-                           \strut\@@_pinyinaux:x {\l_@@_pinyin_tl}},
-                text~height=1cm] (charr) at (1,1){};
-            }
-          \@@_tran_draw:nn {1}{-0.5}
-        }
-        {
-          \bool_if:NTF \l_@@_hanzi_bool
-            {
-              \node[\l_@@_fgcolor_tl] at (1*\l_@@_character_int,1)
-                {\huge\tl_use:N \l_@@_character_tl};
-            }{
-              \node[\l_@@_bgcolor_tl] at (1*\l_@@_character_int,1)
-                {\huge\tl_use:N \l_@@_character_tl};
-            }
+    initial .bool_set:N = \l_@@_withinitials_bool,
+    initial .default:n = true,
+    initial .initial:n = true,
 
-          \bool_if:NTF \l_@@_pinyin_bool
-            {
-              \node[label={[font=\small,text=\l_@@_fgcolor_tl]
-                           \strut\@@_pinyinaux:x {\l_@@_pinyin_tl}},
-                text~height=1cm] (charr) at (1*\l_@@_character_int,1){};
-            }{
-              \node[label={[font=\small,text=\l_@@_bgcolor_tl]
-                           \strut\@@_pinyinaux:x {\l_@@_pinyin_tl}},
-                text~height=1cm] (charr) at (1*\l_@@_character_int,1){};
-            }
-          \@@_tran_draw:nn {\l_@@_character_int}{-0.5}
-        }
 %    \end{macrocode}
+% \end{macro}
 %
-% 如果不显示汉字，则内部格线应该最后绘制
+% \begin{macro}{vowel}
+% 是否输出韵母，默认为true。
+%    \begin{macrocode}
+    vowel .bool_set:N = \l_@@_withvowel_bool,
+    vowel .default:n = true,
+    vowel .initial:n = true,
+
+%    \end{macrocode}
+% \end{macro}
 %
+% \begin{macro}{tone}
+% 是否输出声调，默认为true。
 %    \begin{macrocode}
-      \bool_if:NF \l_@@_hanzi_bool
-        {
-          \@@_frame_background:n {0.0cm}
-        }
-    }%
-    }%
-  }
+    tone .bool_set:N = \l_@@_withtone_bool,
+    tone .default:n = true,
+    tone .initial:n = true,
+
 %    \end{macrocode}
 % \end{macro}
 %
-% \changes{v1.1.0}{2021/09/21}{添加\tn{hanzibox*}星号命令的内部实现代码。}
-% \changes{v1.1.0}{2021/09/21}{添加按需要隐藏拼音、汉字或译文代码。}
-% \changes{v1.1.0}{2021/09/21}{将隐藏功能修正为用前景/背景色实现。}
-% \changes{v1.1.0}{2021/09/22}{将各部分绘制分解为函数实现。}
+% \changes{v1.1.0}{2021/09/21}{添加隐藏拼音键。}
 %
-% \begin{macro}{\@@_asterisk_draw:nnnn}
-% 自动汉字拼音盒子排版内部命令，根据选项用TikZ实现绘制。
+% \begin{macro}{pinyin}
+% 是否显示汉语拼音，默认为true。
 %    \begin{macrocode}
-\cs_new_protected:Npn \@@_asterisk_draw:nnnn #1#2#3#4
-  {
+    pinyin .bool_set:N = \l_@@_withpinyin_bool,
+    pinyin .default:n = true,
+    pinyin .initial:n = true,
+
 %    \end{macrocode}
+% \end{macro}
 %
-% 设置盒子外观选项
+% \changes{v1.1.0}{2021/09/21}{添加隐藏汉字键。}
 %
+% \begin{macro}{hanzi}
+% 是否显示汉语拼音，默认为true。
 %    \begin{macrocode}
-    \keys_set:nn { hanzibox } { #1 }
+    hanzi .bool_set:N = \l_@@_withhanzi_bool,
+    hanzi .default:n = true,
+    hanzi .initial:n = true,
+
 %    \end{macrocode}
+% \end{macro}
 %
-% 将各参数存入token list变量，注意使用x递归展开
+% \changes{v1.1.0}{2021/09/21}{添加隐藏译文键。}
 %
+% \begin{macro}{tran}
+% 是否显示汉语拼音，默认为true。
 %    \begin{macrocode}
-    \tl_set:Nx \l_@@_character_tl {#2}
-    \tl_set:Nx \l_@@_pinyin_tl {#3}
-    \tl_set:Nx \l_@@_translation_tl {#4}
+    tran .bool_set:N = \l_@@_withtran_bool,
+    tran .default:n = true,
+    tran .initial:n = true,
+
 %    \end{macrocode}
+% \end{macro}
 %
-% 计算token list中的内容长度(个数)
 %
+% 处理未知选项。
 %    \begin{macrocode}
-    \int_set:Nn \l_@@_character_int
-      {
-        \tl_count:V \l_@@_character_tl
-      }
-    \int_set:Nn \l_@@_pinyin_int
-      {
-        \tl_count:V \l_@@_pinyin_tl
-      }
-    \int_set:Nn \l_@@_translation_int
-      {
-        \tl_count:V \l_@@_translation_tl
-      }
+    unknown .code:n = { \@@_error:n { unknown-option } }
+  }
+\msg_new:nnn { hanzibox } { unknown-option }
+  { package~ option~ "\l_keys_key_tl"~ is~ unknown. }
+
+%    \end{macrocode}
+%
+% 参数默认值
+%    \begin{macrocode}
+\keys_set:nn { hanzibox }
+  {
+    basechar = 好 ,
+    zihao = 4 ,
+    pinyinf = \tiny ,
+    charf = \normalsize ,
+    tranf = \tiny ,
+    frametype = none ,
+    resize = none ,
+  }
 
-    \scalebox{\fp_use:N \l_@@_scale_fp}{
-    \tikz[scale=0.5, every~node/.style={inner~sep=0,outer~sep=0}]{%
 %    \end{macrocode}
 %
-% 根据汉字长度绘制汉字盒子背景，必须提前绘制
+% \subsection{选项用户接口}
 %
+% \begin{macro}{\hanziboxset}
+% 选项设置用户接口。
 %    \begin{macrocode}
-      \@@_border_draw:n {-0.5cm}
+\NewDocumentCommand \hanziboxset { m }
+  { \keys_set:nn { hanzibox } {#1} }
+%    \end{macrocode}
+% \end{macro}
+%
+% \subsection{内部函数}
+%
+% \begin{macro}{\@@_pinyinaux:n}
+% \begin{macro}{\@@_pinyinaux:x}
+% \pkg{xpyinyin}宏包\tn{pinyin} 命令的\LaTeX3{}版本函数及其函数变体。
+%    \begin{macrocode}
+  % \xpinyinsetup{pysep={\hspace*{1em}}}
+\cs_set_eq:NN \@@_pinyinaux:n \pinyin
+\cs_generate_variant:Nn \@@_pinyinaux:n { x }
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\@@_dialog:nnnn}
+% 手动汉字盒子排版内部命令。
+%    \begin{macrocode}
+\cs_new:Npn \@@_dialog:nnnn #1#2#3#4
+  {
+    \group_begin:
+      \keys_set:nn { hanzibox } { #1 }
+
+      \tl_set:Nx \l_@@_character_tl {#2}
+      \tl_set:Nx \l_@@_pinyin_tl {#3}
+      \tl_set:Nx \l_@@_translation_tl {#4}
+
+      \hcoffin_set:Nn \l_@@_pinyin_box_coffin
+        {
+          \tl_use:N \l_@@_pinyin_format_tl
+          \tl_use:N \l_@@_pinyin_tl
+        }
+      \hcoffin_set:Nn \l_@@_str_box_coffin
+        {
+          \tl_map_inline:Nn \l_@@_character_tl
+            {
+              \@@_single_handle:N ##1 \allowbreak
+            }
+        }
+      \hcoffin_set:Nn \l_@@_tran_box_coffin
+        {
+          \tl_use:N \l_@@_translation_format_tl
+          \tl_use:N \l_@@_translation_tl
+        }
+      \coffin_join:NnnNnnnn \l_@@_str_box_coffin
+        { hc } { t } \l_@@_pinyin_box_coffin { hc } { H } { 0pt } { 3pt }
+      \coffin_join:NnnNnnnn \l_@@_str_box_coffin
+        { hc } { b } \l_@@_tran_box_coffin { hc } { t } { 0pt } { -2pt }
+
+      \coffin_set_eq:NN \l_@@_box_coffin \l_@@_str_box_coffin
+
+      \@@_resize_c:n { \l_@@_resize_method_tl }
+
+      \coffin_typeset:Nnnnn \l_@@_box_coffin
+        { l } { b } { 0pt } { 0pt }
+    \group_end:
+  }
 %    \end{macrocode}
+% \end{macro}
 %
-% 如果显示汉字，则内部格线应该提前绘制
+% \changes{v2.0.0}{2021/09/28}{将拼音处理调整为在handle函数中直接实现}
+% \changes{v2.0.0}{2021/09/28}{区分了单个汉字和0个汉字的处理}
 %
+% \begin{macro}{\@@_handle:nnnn}
+% 构造汉字盒子入口
 %    \begin{macrocode}
-      \bool_if:NT \l_@@_hanzi_bool
+\cs_new:Npn \@@_handle:nnnn #1#2#3#4
+  {
+    \group_begin:
+      \keys_set:nn { hanzibox } { #1 }
+
+      \tl_set:Nx \l_@@_character_tl {#2}
+      \tl_set:Nx \l_@@_pinyin_tl {#3}
+      \tl_set:Nx \l_@@_translation_tl {#4}
+
+      \int_set:Nn \l_@@_character_int
+        {
+          \tl_count:V \l_@@_character_tl
+        }
+      \int_set:Nn \l_@@_translation_int
         {
-          \@@_frame_background:n {-0.5cm}
+          \tl_count:V \l_@@_translation_tl
         }
-      \int_compare:nNnTF { \l_@@_character_int } = {0}
+      \int_set:Nn \l_@@_pinyin_int
         {
-          \bool_if:NTF \l_@@_pinyin_bool
+          \tl_count:V \l_@@_pinyin_tl
+        }
+
+      \bool_if:NTF \l_@@_autopinyin_bool
+        {
+          \int_compare:nNnTF { \l_@@_character_int } > { 0 }
             {
-              \bool_if:NTF \l_@@_hanzi_bool
+              \hcoffin_set:Nn \l_@@_str_box_coffin
                 {
-                  \node[\l_@@_fgcolor_tl] at (1,1)
-                    {\huge{\xpinyin*[format={\small\color{\l_@@_fgcolor_tl}},
-                     vsep=0.90 cm]{\l_@@_character_tl}}};
-                }{
-                  \node[\l_@@_bgcolor_tl] at (1,1)
-                    {\huge{\xpinyin*[format={\small\color{\l_@@_fgcolor_tl}},
-                     vsep=0.90 cm]{\l_@@_character_tl}}};
+                  \tl_map_inline:Nn \l_@@_character_tl
+                    {
+                      \hcoffin_set:Nn \l_tmpa_coffin
+                        {
+                          \@@_single_handle:N ##1
+                        }
+
+                      \bool_if:NT \l_@@_withpinyin_bool
+                        {
+                          \tl_gset_eq:Nc \l_@@_pinyin_tl
+                            {
+                              c__xpinyin_ \int_to_arabic:n { `##1 } _tl
+                            }
+                          \@@_single_pinyin:V \l_@@_pinyin_tl
+
+                          \coffin_join:NnnNnnnn \l_tmpa_coffin
+                            { hc } { t } \l_@@_pinyin_box_coffin { hc } { H } { 0pt } { 3pt }
+                        }
+                      \coffin_typeset:Nnnnn \l_tmpa_coffin
+                        { l } { b } { 0pt } { 0pt }
+                      \allowbreak
+                    }
                 }
-            }{
-              \bool_if:NTF \l_@@_hanzi_bool
+            }
+            {
+              \hcoffin_set:Nn \l_@@_str_box_coffin
                 {
-                  \node[\l_@@_fgcolor_tl] at (1,1)
-                    {\huge{\xpinyin*[format={\small\color{\l_@@_bgcolor_tl}},
-                     vsep=0.90 cm]{\l_@@_character_tl}}};
-                }{
-                  \node[\l_@@_fgcolor_tl] at (1,1)
-                    {\huge{\xpinyin*[format={\small\color{\l_@@_bgcolor_tl}},
-                     vsep=0.90 cm]{\l_@@_character_tl}}};
+                  \bool_set_false:N \l_@@_withhanzi_bool
+                  \tl_set:Nn \l_@@_character_tl {好}
+
+                  \hcoffin_set:Nn \l_tmpa_coffin
+                    {
+                      \@@_single_handle:N \l_@@_character_tl
+                    }
+
+                  \bool_if:NT \l_@@_withpinyin_bool
+                    {
+                      \hcoffin_set:Nn \l_@@_pinyin_box_coffin
+                        {
+                          \color_select:n { hanziboxcharcolor }
+                          \tl_use:N \l_@@_pinyin_format_tl
+                          \@@_pinyinaux:x {\l@@_pinyin_tl}
+                        }
+                      \coffin_join:NnnNnnnn \l_tmpa_coffin
+                        { hc } { t } \l_@@_pinyin_box_coffin { hc } { H } { 0pt } { 3pt }
+                    }
+                  \coffin_typeset:Nnnnn \l_tmpa_coffin
+                    { l } { b } { 0pt } { 0pt }
+                  \allowbreak
                 }
             }
-          \@@_tran_draw:nn {1}{-1.0}
         }
         {
-          \bool_if:NTF \l_@@_pinyin_bool
+          \int_compare:nNnTF { \l_@@_character_int } > { 1 }
+            {
+              \hcoffin_set:Nn \l_@@_str_box_coffin
+                {
+                  \tl_map_inline:Nn \l_@@_character_tl
+                    {
+                      \@@_single_handle:N ##1 \allowbreak
+                    }
+                }
+              \bool_if:NT \l_@@_withpinyin_bool
+                {
+                  \hcoffin_set:Nn \l_@@_pinyin_box_coffin
+                    {
+                      \color_select:n { hanziboxcharcolor }
+                      \@@_pinyinaux:x {\l_@@_pinyin_tl}
+                    }
+                }
+              \coffin_join:NnnNnnnn \l_@@_str_box_coffin
+                { hc } { t } \l_@@_pinyin_box_coffin { hc } { H } { 0pt } { 7pt }
+            }
             {
-              \bool_if:NTF \l_@@_hanzi_bool
+              \int_compare:nNnTF { \l_@@_character_int } = { 1 }
                 {
-                  \node[\l_@@_fgcolor_tl] at (1*\l_@@_character_int,1)
-                    {\huge{\xpinyin*[format={\small\color{\l_@@_fgcolor_tl}},
-                     vsep=0.90 cm]{\l_@@_character_tl}}};
-                }{
-                  \node[\l_@@_bgcolor_tl] at (1*\l_@@_character_int,1)
-                    {\huge{\xpinyin*[format={\small\color{\l_@@_fgcolor_tl}},
-                     vsep=0.90 cm]{\l_@@_character_tl}}};
+                  \hcoffin_set:Nn \l_@@_str_box_coffin
+                    {
+                      \hcoffin_set:Nn \l_tmpa_coffin
+                        {
+                          \@@_single_handle:N \l_@@_character_tl
+                        }
+
+                      \bool_if:NT \l_@@_withpinyin_bool
+                        {
+                          \hcoffin_set:Nn \l_@@_pinyin_box_coffin
+                            {
+                              \color_select:n { hanziboxcharcolor }
+                              \tl_use:N \l_@@_pinyin_format_tl
+                              \@@_pinyinaux:x {\l@@_pinyin_tl}
+                            }
+                          \coffin_join:NnnNnnnn \l_tmpa_coffin
+                            { hc } { t } \l_@@_pinyin_box_coffin { hc } { H } { 0pt } { 3pt }
+                        }
+                      \coffin_typeset:Nnnnn \l_tmpa_coffin
+                        { l } { b } { 0pt } { 0pt }
+                      \allowbreak
+                    }
                 }
-            }{
-              \bool_if:NTF \l_@@_hanzi_bool
                 {
-                  \node[\l_@@_fgcolor_tl] at (1*\l_@@_character_int,1)
-                    {\huge{\xpinyin*[format={\small\color{\l_@@_bgcolor_tl}},
-                     vsep=0.90 cm]{\l_@@_character_tl}}};
-                }{
-                  \node[\l_@@_fgcolor_tl] at (1*\l_@@_character_int,1)
-                    {\huge{\xpinyin*[format={\small\color{\l_@@_bgcolor_tl}},
-                     vsep=0.90 cm]{\l_@@_character_tl}}};
+                  \hcoffin_set:Nn \l_@@_str_box_coffin
+                    {
+                      \bool_set_false:N \l_@@_withhanzi_bool
+                      \tl_set:Nn \l_@@_character_tl {好}
+
+                      \hcoffin_set:Nn \l_tmpa_coffin
+                        {
+                          \@@_single_handle:N \l_@@_character_tl
+                        }
+
+                      \bool_if:NT \l_@@_withpinyin_bool
+                        {
+                          \hcoffin_set:Nn \l_@@_pinyin_box_coffin
+                            {
+                              \color_select:n { hanziboxcharcolor }
+                              \tl_use:N \l_@@_pinyin_format_tl
+                              \@@_pinyinaux:x {\l@@_pinyin_tl}
+                            }
+                          \coffin_join:NnnNnnnn \l_tmpa_coffin
+                            { hc } { t } \l_@@_pinyin_box_coffin { hc } { H } { 0pt } { 3pt }
+                        }
+                      \coffin_typeset:Nnnnn \l_tmpa_coffin
+                        { l } { b } { 0pt } { 0pt }
+                      \allowbreak
+                    }
                 }
             }
-            \@@_tran_draw:nn {\l_@@_character_int}{-1.0}
         }
+      \bool_if:NT \l_@@_withtran_bool
+        {
+          \hcoffin_set:Nn \l_@@_tran_box_coffin
+            {
+              \color_select:n { hanziboxcharcolor }
+              \tl_use:N \l_@@_translation_format_tl
+              \tl_use:N \l_@@_translation_tl
+            }
+        }
+      \coffin_join:NnnNnnnn \l_@@_str_box_coffin
+        { hc } { b } \l_@@_tran_box_coffin { hc } { t } { 0pt } { -3pt }
+
+      \coffin_set_eq:NN \l_@@_box_coffin \l_@@_str_box_coffin
+
+      \@@_resize_c:n { \l_@@_resize_method_tl }
+
+      \coffin_typeset:Nnnnn \l_@@_box_coffin
+        { l } { b } { 0pt } { 0pt }
+    \group_end:
+  }
 %    \end{macrocode}
+% \end{macro}
 %
-% 如果不显示汉字，则内部格线应该最后绘制
+% \changes{v2.0.0}{2021/09/27}{对于无需分解声韵母的情况，
+%     直接使用xpinyin宏包的结果排版拼音。}
 %
+% \begin{macro}{\@@_single_pinyin:n}
+% 构造单个汉字的拼音盒子
 %    \begin{macrocode}
-      \bool_if:NF \l_@@_hanzi_bool
+\cs_new:Npn \@@_single_pinyin:n #1
+  {
+    \bool_if:NTF \l_@@_withtone_bool
+      {
+        \bool_if:nTF { !(\l_@@_withinitials_bool) || !(\l_@@_withvowel_bool) }
+          {
+            \@@_split_pinyin_withtone:n { #1 }
+            \hcoffin_set:Nn \l_@@_pinyin_box_coffin
+              {
+                \color_select:n { hanziboxcharcolor }
+                \tl_use:N \l_@@_pinyin_format_tl
+
+                \bool_if:NTF \l_@@_withinitials_bool
+                  {
+                    \bool_if:NTF \l_@@_withvowel_bool
+                    {
+                      \tl_use:N \l_@@_initial_tl
+                      \tl_use:N \l_@@_vowel_tl
+                    }
+                    {
+                      \tl_use:N \l_@@_initial_tl
+                      \phantom{ \tl_use:N \l_@@_vowel_tl }
+                    }
+                  }
+                  {
+                    \bool_if:NTF \l_@@_withvowel_bool
+                    {
+                      \phantom{ \tl_use:N \l_@@_initial_tl }
+                      \tl_use:N \l_@@_vowel_tl
+                    }
+                    {
+                      \phantom{ \tl_use:N \l_@@_initial_tl }
+                      \phantom{ \tl_use:N \l_@@_vowel_tl }
+                    }
+                  }
+              }
+          }
+          {
+            \hcoffin_set:Nn \l_@@_pinyin_box_coffin
+              {
+                \color_select:n { hanziboxcharcolor }
+                \tl_use:N \l_@@_pinyin_format_tl
+                #1
+              }
+          }
+      }
+      {
+        \@@_split_pinyin_withouttone:n { #1 }
+        \hcoffin_set:Nn \l_@@_pinyin_box_coffin
         {
-          \@@_frame_background:n {-0.5cm}
+          \color_select:n { hanziboxcharcolor }
+          \tl_use:N \l_@@_pinyin_format_tl
+
+          \tl_use:N \l_@@_pinyin_tl
         }
-    }%
-    }%
+      }
   }
+\cs_generate_variant:Nn  \@@_single_pinyin:n { V }
+\cs_generate_variant:Nn  \@@_single_pinyin:n { x }
+\cs_set:Npn \@@_single_pinyin_o:n
+  { \exp_after:wN \@@_single_pinyin:n }
+\cs_set:Npn \@@_single_pinyin_f:n
+  { \exp_args:Nf \@@_single_pinyin:n }
 %    \end{macrocode}
 % \end{macro}
 %
-% \changes{v1.1.0}{2021/09/22}{添加方格背景绘制内部函数。}
+% \begin{macro}{\@@_single_handle:nN,\@@_single_handle:N}
+% 构造单个汉字盒子入口
+%    \begin{macrocode}
+\cs_new:Npn \@@_single_handle:nN #1#2
+  {
+    \group_begin:
+      \tl_if_empty:nF {#1} { \keys_set:nn { hanzibox } {#1} }
+
+      \tl_set:Nf \l_@@_curr_char_tl {#2}
+
+      \@@_single_construct_o:N \l_@@_curr_char_tl
+    \group_end:
+  }
+\cs_new:Npn \@@_single_handle:N #1
+  {
+    \group_begin:
+      \tl_set:Nf \l_@@_curr_char_tl {#1}
+      \@@_single_construct_o:N \l_@@_curr_char_tl
+    \group_end:
+  }
+%    \end{macrocode}
+% \end{macro}
+%
+% \changes{v2.0.0}{2021/09/27}{删除单个汉字构造中添加拼音的功能}
 %
-% \begin{macro}{\@@_frame_background:n}
-% TikZ米字格绘制代码。
+% \begin{macro}{\@@_single_construct:N}
+% 构造单个汉字盒子
 %    \begin{macrocode}
-\cs_new_protected:Npn \@@_frame_background:n #1
+\cs_new:Npn \@@_single_construct:N #1
   {
-    \int_compare:nNnT { \l_@@_character_int } < {2}
+    \bool_if:NTF \l_@@_withhanzi_bool
       {
-        \int_case:nn {\l_@@_inner_int}
+        \hcoffin_set:Nn \l_@@_box_coffin
           {
-            {1}{
-            }
-            {2}{
-              \@@_star_background:n {#1}
-            }
-            {3}{
-              \@@_cross_background:n {#1}
-            }
+            \color_select:n { hanziboxcharcolor }
+            \tl_use:N \l_@@_character_format_tl
+            #1
+          }
+      }
+      {
+        \hcoffin_set:Nn \l_@@_box_coffin
+          {
+            \color_select:n { hanziboxcharcolor }
+            \tl_use:N \l_@@_character_format_tl
+            \phantom{#1}
           }
       }
+
+    \@@_single_frame_construct:
   }
+\cs_set:Npn \@@_single_construct_o:N
+  { \exp_after:wN \@@_single_construct:N }
+\cs_set:Npn \@@_single_construct_f:N
+  { \exp_args:Nf \@@_single_construct:N }
 %    \end{macrocode}
 % \end{macro}
 %
-% \changes{v1.1.0}{2021/09/22}{添加米字格内部函数。}
+% \changes{v2.0.0}{2021/09/28}{为边框添加偏移，以使汉字尽量居中}
 %
-% \begin{macro}{\@@_star_background:n}
-% TikZ米字格绘制代码。
+% \begin{macro}{\@@_single_frame_construct:}
+% 构造单个汉字盒子边框
 %    \begin{macrocode}
-\cs_new_protected:Npn \@@_star_background:n #1
+\cs_new:Npn \@@_single_frame_construct:
   {
-    \draw[stretch~dash=on~2pt~off~2pt,thin, yshift=#1,
-          \l_@@_bordercolor_tl!50](0,0)--(2,2);%
-    \draw[stretch~dash=on~2pt~off~2pt,thin, yshift=#1,
-          \l_@@_bordercolor_tl!50](0,2)--(2,0);%
-
-    \draw[stretch~dash=on~2pt~off~2pt,thin, yshift=#1,
-          \l_@@_bordercolor_tl!50](0,1)--(2,1);%
-    \draw[stretch~dash=on~2pt~off~2pt,thin, yshift=#1,
-          \l_@@_bordercolor_tl!50](1,0)--(1,2);%
+    \draw_begin:
+      \draw_linewidth:n { \l_@@_linewidth_dim }
+      \@@_aux_color_fill:
+      \color_stroke:n { hanziboxframecolor }
+
+      \exp_after:wN \draw_path_corner_arc:nn \l_@@_frame_arc_tl
+
+      \draw_path_scope_begin:
+        \draw_transform_shift:n { -1.00pt, -1.50pt }
+        \@@_frame_type_c:n { \l_@@_frame_type_tl }
+          { 0 } { 0 } { \hanziboxwidth } { \hanziboxheight } { 1.0 } { 1.0 }
+      \draw_path_scope_end:
+      \draw_coffin_use:Nnn \l_@@_box_coffin { l } { b }
+    \draw_end:
   }
 %    \end{macrocode}
 % \end{macro}
 %
-% \changes{v1.1.0}{2021/09/22}{添加田字格背景内部函数。}
+% \subsection{\pkg{xpinyin}宏包拼音后处理函数}
+%
+% \changes{v2.0.0}{2021/09/24}{添加从xpinyin宏包中提取拼音函数。}
+% 代码摘录自LaTeX工作室：基于xpinyin宏包获取汉字的声母，韵母，声调
+% (\url{https://www.latexstudio.net/index/details/index/mid/1994.html})
+%
+% 从需要的声母、韵母、读音表。
 %
-% \begin{macro}{\@@_cross_background:n}
-% TikZ田字格绘制代码。
+% 声母表
 %    \begin{macrocode}
-\cs_new_protected:Npn \@@_cross_background:n #1
+\clist_set:Nn \l_@@_initials_clist
   {
-    \draw[stretch~dash=on~2pt~off~2pt,thin, yshift=#1,
-          \l_@@_bordercolor_tl!50](0,1)--(2,1);%
-    \draw[stretch~dash=on~2pt~off~2pt,thin, yshift=#1,
-          \l_@@_bordercolor_tl!50](1,0)--(1,2);%
+    {zh} , {ch} , {sh} , {b} , {p} , {m} , {f} ,
+    {d}  , {t}  , {l}  , {k} , {h} , {j} , {q} ,
+    {x}  , {r}  , {z}  , {c} , {s} , {y} , {w} ,
+    {g}  , {n}
   }
 %    \end{macrocode}
-% \end{macro}
 %
-% \changes{v1.1.0}{2021/09/22}{添加背景方格内部函数。}
+% \changes{v2.0.0}{2021/09/27}{修订部分错误带音调韵母表}
 %
-% \begin{macro}{\@@_border_draw:n}
-% 绘制边框代码。
+% 带声音调韵母表
 %    \begin{macrocode}
-\cs_new_protected:Npn \@@_border_draw:n #1
+\clist_set:Nn \l_@@_vowel_tone_clist
   {
-      \int_compare:nNnTF { \l_@@_character_int } = {0}
-        {
-          \draw[fill=\l_@@_bgcolor_tl,line~width=\l_@@_borderwidth_dim,
-            yshift=#1, draw=\l_@@_bordercolor_tl] (0,0) rectangle(2,2);
-        }
-        {
-          \bool_if:NTF \l_@@_border_bool
-            {
-              \draw[fill=\l_@@_bgcolor_tl,line~width=\l_@@_borderwidth_dim,
-                    yshift=#1, draw=\l_@@_bordercolor_tl] (0,0)
-                rectangle(2*\l_@@_character_int,2);
-            }{}
-        }
+    {iāng} , {iáng} , {iǎng} , {iàng} , {iang} ,
+    {iōng} , {ióng} , {iǒng} , {iòng} , {iong} ,
+    {uāng} , {uáng} , {uǎng} , {uàng} , {uang} ,
+    {uēng} , {uéng} , {uěng} , {uèng} , {ueng} ,
+    {āng}  , {áng}  , {ǎng}  , {àng}  , {ang}  ,
+    {ēng}  , {éng}  , {ěng}  , {èng}  , {eng}  ,
+    {īng}  , {íng}  , {ǐng}  , {ìng}  , {ing}  ,
+    {ōng}  , {óng}  , {ǒng}  , {òng}  , {ong}  ,
+    {uāi}  , {uái}  , {uǎi}  , {uài}  , {uai}  ,
+    {uān}  , {uán}  , {uǎn}  , {uàn}  , {uan}  ,
+    {uēi}  , {uéi}  , {uěi}  , {uèi}  , {uei}  ,
+    {uāo}  , {uáo}  , {uǎo}  , {uào}  , {uao}  ,
+    {iōu}  , {ióu}  , {iǒu}  , {iòu}  , {iou}  ,
+    {iān}  , {ián}  , {iǎn}  , {iàn}  , {ian}  ,
+    {üān}  , {üán}  , {üǎn}  , {üàn}  , {üan}  ,
+    {uēn}  , {uén}  , {uěn}  , {uèn}  , {uen}  ,
+    {āi}   , {ái}   , {ǎi}   , {ài}   , {ai}   ,
+    {ēi}   , {éi}   , {ěi}   , {èi}   , {ei}   ,
+    {uā}   , {uá}   , {uǎ}   , {uà}   , {ua}   ,
+    {uō}   , {uó}   , {uǒ}   , {uò}   , {uo}   ,
+    {uī}   , {uí}   , {uǐ}   , {uì}   , {ui}   ,
+    {āo}   , {áo}   , {ǎo}   , {ào}   , {ao}   ,
+    {ōu}   , {óu}   , {ǒu}   , {òu}   , {ou}   ,
+    {iū}   , {iú}   , {iǔ}   , {iù}   , {iu}   ,
+    {iā}   , {iá}   , {iǎ}   , {ià}   , {ia}   ,
+    {iē}   , {ié}   , {iě}   , {iè}   , {ie}   ,
+    {uē}   , {ué}   , {uě}   , {uè}   , {ue}   ,
+    {üē}   , {üé}   , {üě}   , {üè}   , {üe}   ,
+    {ēr}   , {ér}   , {ěr}   , {èr}   , {er}   ,
+    {ān}   , {án}   , {ǎn}   , {àn}   , {an}   ,
+    {ēn}   , {én}   , {ěn}   , {èn}   , {en}   ,
+    {īn}   , {ín}   , {ǐn}   , {ìn}   , {in}   ,
+    {ūn}   , {ún}   , {ǔn}   , {ùn}   , {un}   ,
+    {ǖn}   , {ǘn}   , {ǚn}   , {ǜn}   , {ün}   ,
+    {ā}    , {á}    , {ǎ}    , {à}    , {a}    ,
+    {ē}    , {é}    , {ě}    , {è}    , {e}    ,
+    {ī}    , {í}    , {ǐ}    , {ì}    , {i}    ,
+    {ō}    , {ó}    , {ǒ}    , {ò}    , {o}    ,
+    {ū}    , {ú}    , {ǔ}    , {ù}    , {u}    ,
+    {ǖ}    , {ǘ}    , {ǚ}    , {ǜ}    , {ü}
+  }
+%    \end{macrocode}
+%
+% 韵母表
+%    \begin{macrocode}
+\clist_set:Nn \l_@@_vowel_clist
+  {
+    {iang} , {iong} , {uang} , {ueng} , {ang} , {eng} , {ing} ,
+    {ong}  , {uai}  , {uan}  , {uai}  , {uei} , {iao} , {iou} ,
+    {ian}  , {üan}  , {uen}  , {ai}   , {ei}  , {ua}  , {uo}  ,
+    {ui}   , {ao}   , {ou}   , {iu}   , {ie}  , {üe}  , {er}  ,
+    {an}   , {en}   , {in}   , {un}   , {ün}  , {a}   , {e}   ,
+    {i}    , {o}    , {ü}    , {u}
+  }
+%    \end{macrocode}
+%
+% 声调表
+%    \begin{macrocode}
+\clist_set:Nn \l_@@_tone_num_clist
+  {
+    {ā} {a1} , {á} {a2} , {ǎ} {a3} , {à} {a4} ,
+    {ō} {o1} , {ó} {o2} , {ǒ} {o3} , {ò} {o4} ,
+    {ē} {e1} , {é} {e2} , {ě} {e3} , {è} {e4} ,
+    {ū} {u1} , {ú} {u2} , {ǔ} {u3} , {ù} {u4} ,
+    {ḿ} {m2} ,
+    {ń} {n2} , {ň} {n3} , {ǹ} {n4} ,
+    {ī} {i1} , {í} {i2} , {ǐ} {i3} , {ì} {i4} ,
+    {ǖ} {v1} , {ǘ} {v2} , {ǚ} {v3} , {ǜ} {v4}
   }
 %    \end{macrocode}
-% \end{macro}
 %
-% \changes{v1.1.0}{2021/09/22}{添加译文文本绘制内部函数。}
+% 去声调表
+%    \begin{macrocode}
+\clist_set:Nn \l_@@_nonetone_clist
+  {
+    {ā} {a} , {á} {a} , {ǎ} {a} , {à} {a} ,
+    {ō} {o} , {ó} {o} , {ǒ} {o} , {ò} {o} ,
+    {ē} {e} , {é} {e} , {ě} {e} , {è} {e} ,
+    {ū} {u} , {ú} {u} , {ǔ} {u} , {ù} {u} ,
+    {ḿ} {m} ,
+    {ń} {n} , {ň} {n} , {ǹ} {n} ,
+    {ī} {i} , {í} {i} , {ǐ} {i} , {ì} {i} ,
+    {ǖ} {ü} , {ǘ} {ü} , {ǚ} {ü} , {ǜ} {ü}
+  }
+%    \end{macrocode}
 %
-% \begin{macro}{\@@_tran_draw:nn}
-% 绘制译文文本。
+% \begin{macro}{\@@_split_pinyin_withtone:n}
+% 分离拼音中的声母和带声调的韵母。
 %    \begin{macrocode}
-\cs_new_protected:Npn \@@_tran_draw:nn #1#2
+\cs_new_protected:Npn \@@_split_pinyin_withtone:n #1
   {
-    \bool_if:NTF \l_@@_tran_bool
+    \int_zero:N  \l_@@_tone_int
+    \str_clear:N \l_@@_pinyin_str
+    \tl_clear:N  \l_@@_pinyin_tl
+    \tl_clear:N  \l_@@_initial_tl
+    \tl_clear:N  \l_@@_vowel_tl
+
+    \tl_set:Nn \l_@@_pinyin_tl {#1}
+
+    \tl_map_inline:Nn \l_@@_pinyin_tl
       {
-        \node[align=center,\l_@@_fgcolor_tl] at (1*#1,#2)
-          {\strut\small\textit{\l_@@_translation_tl}};
-      }{
-        \node[align=center,\l_@@_bgcolor_tl] at (1*#1,#2)
-          {\strut\small\textit{\l_@@_translation_tl}};
+        \str_put_right:Nn \l_@@_pinyin_str {##1}
+      }
+
+    \clist_map_inline:Nn \l_@@_initials_clist
+      {
+        \str_if_in:NnT { \l_@@_pinyin_str } {##1}
+          {
+            \tl_set:Nn \l_@@_initial_tl {##1}
+            \clist_map_break:
+          }
+      }
+
+    \clist_map_inline:Nn \l_@@_vowel_tone_clist
+      {
+        \str_if_in:NnT { \l_@@_pinyin_str } { ##1 }
+          {
+            \tl_set:Nn \l_@@_vowel_tl {##1}
+            \clist_map_break:
+          }
+      }
+  }
+\cs_generate_variant:Nn  \@@_split_pinyin:n { V }
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_split_pinyin_withouttone:n}
+% 分离拼音中的声母和不带声调的韵母。
+%    \begin{macrocode}
+\cs_new_protected:Npn \@@_split_pinyin_withouttone:n #1
+  {
+    \int_zero:N  \l_@@_tone_int
+    \str_clear:N \l_@@_pinyin_str
+    \tl_clear:N  \l_@@_pinyin_tl
+    \tl_clear:N  \l_@@_initial_tl
+    \tl_clear:N  \l_@@_vowel_tl
+
+    \tl_set:Nn \l_@@_pinyin_tl {#1}
+
+    \clist_map_inline:Nn \l_@@_nonetone_clist
+      {
+        \tl_replace_all:Nnn \l_@@_pinyin_tl ##1
+      }
+
+    \tl_map_inline:Nn \l_@@_pinyin_tl
+      {
+        \str_put_right:Nn \l_@@_pinyin_str {##1}
+      }
+
+    \clist_map_inline:Nn \l_@@_initials_clist
+      {
+        \str_if_in:NnT {\l_@@_pinyin_str} {##1}
+          {
+            \tl_set:Nn \l_@@_initial_tl {##1}
+            \clist_map_break:
+          }
+      }
+
+    \clist_map_inline:Nn \l_@@_vowel_clist
+      {
+        \str_if_in:NnT { \l_@@_pinyin_str } { ##1 }
+          {
+            \tl_set:Nn \l_@@_vowel_tl {##1}
+            \clist_map_break:
+          }
       }
   }
+\cs_generate_variant:Nn  \@@_split_pinyin:n { V }
 %    \end{macrocode}
 % \end{macro}
 %
diff --git a/macros/xetex/latex/hanzibox/hanzibox.pdf b/macros/xetex/latex/hanzibox/hanzibox.pdf
index 57f81b9296..0d4335cc6e 100644
--- a/macros/xetex/latex/hanzibox/hanzibox.pdf
+++ b/macros/xetex/latex/hanzibox/hanzibox.pdf
diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog
index 45b3c47aef..fb6049c959 100644
--- a/support/TeX4ht/source/ChangeLog
+++ b/support/TeX4ht/source/ChangeLog
@@ -1,3 +1,8 @@
+2021-09-28  Michal Hoftich  <michal.h21@gmail.com>
+
+	* tex4ht-html4.tex (html4.4ht): support for change of booktabs rule colors.
+	https://tex.stackexchange.com/q/615729/2891
+
 2021-09-26  Michal Hoftich  <michal.h21@gmail.com>
 
 	* tex4ht-html4.tex (html4.4ht): draw table lines in \hline using CSS.
diff --git a/support/TeX4ht/source/tex4ht-html4.tex b/support/TeX4ht/source/tex4ht-html4.tex
index 859ee361c5..e8e952e56b 100644
--- a/support/TeX4ht/source/tex4ht-html4.tex
+++ b/support/TeX4ht/source/tex4ht-html4.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-html4.tex 986 2021-09-26 18:06:30Z michal_h21 $
+% $Id: tex4ht-html4.tex 988 2021-09-28 21:06:02Z michal_h21 $
 % Compile 4 times: latex tex4ht-html4
 % Copy html4.4ht into the work directory before all but the last compilation.
 %
@@ -22256,28 +22256,38 @@ font commands
 
 
 \<configure html4 booktabs\><<<
+
+|<booktabs default hline color|>
+
 \Configure{toprule}
    {|<booktabs rule mag|>%
     \Css{tr\#TBL-\TableNo-\ifnum \HRow=0 
-          1- td{border-top:|<booktabs rule height|> solid}
+          1- {border-top:|<booktabs rule height|> solid \#\hline:color;}
      \else
-          \HRow- td{border-bottom:|<booktabs rule height|> solid}
+          \HRow- {border-bottom:|<booktabs rule height|> solid \#\hline:color;}
      \fi
    }}
 \Configure{bottomrule}
    {|<booktabs rule mag|>%
     \Css{tr\#TBL-\TableNo-\HRow-
-            td{border-bottom:|<booktabs rule height|> solid}}}
+            {border-bottom:|<booktabs rule height|> solid  \#\hline:color}}}
 \Configure{midrule}
    {|<booktabs rule mag|>%
     \Css{tr\#TBL-\TableNo-\HRow- 
-            td{border-bottom:|<booktabs rule height|> solid}}}
+            {border-bottom:|<booktabs rule height|> solid \#\hline:color}}}
 \Configure{cmidrule}
    {|<booktabs rule mag|>%
-    \Css{td\#TBL-\TableNo-\HRow-\HCol{border-bottom:|<booktabs rule height|> solid}}%
+    \Css{td\#TBL-\TableNo-\HRow-\HCol{border-bottom:|<booktabs rule height|> solid \#\hline:color}}%
     \HCode{<span class="cmidrule"><!-- enable post-processing of cmidrule--></span>}}
 >>>
 
+The \verb|\hline:color| macro is defined by TeX4ht configuration for colortbl.sty. 
+We reuse it to support change of rule colors. It is initialized as black.
+
+\<booktabs default hline color\><<<
+\def\hline:color{000}
+>>>
+
 
 
 The cmidrule introduces ruler segments at different rows, instead of all of
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index f6eff9a816..cffd5bdee7 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -100,6 +100,7 @@ $mirrors = {
       'https://ctan.mc1.root.project-creative.net/' => 1,
       'https://ctan.mirror.norbert-ruehl.de/' => 1,
       'https://ctan.net/' => 1,
+      'https://ctan.space-pro.be/tex-archive/' => 1,
       'https://ftp.agdsn.de/pub/mirrors/latex/dante/' => 1,
       'https://ftp.fau.de/ctan/' => 1,
       'https://ftp.gwdg.de/pub/ctan/' => 1,
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 78407420b5..9434a3bce9 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
@@ -26,11 +26,11 @@ depend container_split_src_files/1
 depend frozen/0
 depend minrelease/2016
 depend release/2021
-depend revision/60630
+depend revision/60645
 
 name 00texlive.image
 category TLCore
-revision 60630
+revision 60642
 shortdesc TeX Live files only in the source repository
 longdesc The files here are not copied by the installer and containers
 longdesc are not built for them; they exist only in the source
@@ -40,7 +40,7 @@ longdesc IgnorePatterns in the check_files routine in tlmgr.pl augment
 longdesc this list. Those are not included in the source/ tarball. For
 longdesc information on the 00texlive prefix see
 longdesc 00texlive.installation(.tlpsrc)
-runfiles size=13900
+runfiles size=12493
  .mkisofsrc
  autorun.inf
  texmf-dist/README
@@ -4214,6 +4214,8 @@ runfiles size=13900
  tlpkg/tlpsrc/utopia.tlpsrc
  tlpkg/tlpsrc/uwa-colours.tlpsrc
  tlpkg/tlpsrc/uwa-letterhead.tlpsrc
+ tlpkg/tlpsrc/uwa-pcf.tlpsrc
+ tlpkg/tlpsrc/uwa-pif.tlpsrc
  tlpkg/tlpsrc/uwmslide.tlpsrc
  tlpkg/tlpsrc/uwthesis.tlpsrc
  tlpkg/tlpsrc/vak.tlpsrc
@@ -4462,7 +4464,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
 
 name 00texlive.installer
 category TLCore
-revision 60626
+revision 60632
 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
@@ -44080,7 +44082,7 @@ catalogue-version 0.3.0
 
 name bxjaholiday
 category Package
-revision 57025
+revision 60636
 shortdesc Support for Japanese holidays
 relocated 1
 longdesc This LaTeX package provides a command to convert dates to names
@@ -44088,10 +44090,10 @@ longdesc of Japanese holidays. Another command, converting dates to the
 longdesc day of the week in Japanese, is available as a free gift.
 longdesc Further (lower-level) APIs are provided for expl3. The package
 longdesc supports pdfTeX, XeTeX, LuaTeX, pTeX, and upTeX.
-containersize 5576
-containerchecksum e062446514cdcf8e817f06a33cd02a29cd1985dff450a89baaf2e230fd9dbe20e92d3a34b661ec12c764c5a6230b1fede49034847fcac2d2db2377eb7d4450cb
-doccontainersize 208336
-doccontainerchecksum 3b44cf93b4afbbf97263b091509a5486bcbc6fc7091bc8a583be73f35487962af93f071547a78895231fb576054e440271abea20a7b07d111c197382b52ee746
+containersize 5600
+containerchecksum 4f5dc4081f989b73e5334d62af403922e2918424cff24480644f1e9016e3e20fb044cb22da91a035b198aa92edd0a51e985fe791a4c99ffbde2d339ca46a3918
+doccontainersize 210340
+doccontainerchecksum 6d3ccd7c279e9dd8063296d843dbb6b42af90359b16f421eaddc7b2ddf23e2dc6077d4748abbef3c67c9672536d58a20746848237525a4cf8ec87ed19117a618
 docfiles size=60
  RELOC/doc/latex/bxjaholiday/LICENSE
  RELOC/doc/latex/bxjaholiday/README.md details="Readme"
@@ -44106,7 +44108,7 @@ catalogue-contact-repository https://github.com/wtsnjp/BXjaholiday
 catalogue-ctan /language/japanese/BX/bxjaholiday
 catalogue-license mit
 catalogue-topics japanese date-time expl3
-catalogue-version 1.1.0
+catalogue-version 1.1.1
 
 name bxjalipsum
 category Package
@@ -69832,7 +69834,7 @@ containerchecksum 2b900dbe1cd032509169ee2b63f283cac0c9e42276f853e6f8556a0432e413
 
 name collection-publishers
 category Collection
-revision 60486
+revision 60641
 shortdesc Publisher styles, theses, etc.
 relocated 1
 depend aastex
@@ -70077,6 +70079,8 @@ depend ut-thesis
 depend utexasthesis
 depend uwa-colours
 depend uwa-letterhead
+depend uwa-pcf
+depend uwa-pif
 depend uwthesis
 depend vancouver
 depend wsemclassic
@@ -70085,8 +70089,8 @@ depend xmuthesis
 depend yathesis
 depend yazd-thesis
 depend york-thesis
-containersize 1580
-containerchecksum 55ed23c23a9c8f68cc2f29a930d8a45c51c6d04905a92de30f45e6ced3de22063dcad651c516c8f1221d6c31b7484f803335656498295dbf926d657ced67cd51
+containersize 1584
+containerchecksum fbceaeab17e696ba2962ebc9264dddcc78e98b8e4bc06b108bf01704e51829d66e0581afa958e83178837db0c72f26c9f67489ad968eb528a35b8f3cc3b7c9d8
 
 name collection-texworks
 category Collection
@@ -134945,33 +134949,36 @@ catalogue-version 20120101
 
 name hanzibox
 category Package
-revision 60594
-shortdesc Simplify the input of Chinese characters
+revision 60639
+shortdesc Boxed Chinese characters with Pinyin above and translation below
 relocated 1
 longdesc This is a LaTeX package written to simplify the input of
-longdesc Chinese with Hanyu Pinyin and translation. Hanyu Pinyin was
-longdesc placed above Chinese with the xpinyin package and the
-longdesc translation was placed below the Chinese.
-containersize 3208
-containerchecksum 00174c4786c54e3bc312cf3599ba7660fc9343afe621a4a0598179bd760f8747d1a2eecde2af3f317f1895276bb726f7e2efd263342db23664f20a339cbf743f
-doccontainersize 291624
-doccontainerchecksum c92ba8202c00abd507bc0123ff36303e9b848b7409e2843d7e562e62901553dda0240a629acb8a60157b9868fb8ea1a7147022d9301dae866c761e6c205cde1c
-docfiles size=74
+longdesc Chinese with Hanyu Pinyin and translation. Hanyu Pinyin is
+longdesc placed above Chinese with the xpinyin package, and the
+longdesc translation is placed below. The package can be used as a
+longdesc utility for learning to write and pronounce Chinese characters,
+longdesc for Chinese character learning plans, presentations, exercise
+longdesc booklets and other documentation work.
+containersize 5652
+containerchecksum 945a28848584b89b980b6aaf5e99b0071985e919f9d765d823db8c12d69918c1cf5bb647f91dbff8a65d051e92fe5c39b33442676c6504c16fb373c745ec2d8d
+doccontainersize 455704
+doccontainerchecksum a5e16473e81314ebe6071340a5f79006b9027badda48f9057c2889b51d04ed24145c1ff87071a3af938f440ac6f8ae316ca0e78d803961e82ef9a6d746a21a92
+docfiles size=116
  RELOC/doc/xelatex/hanzibox/README.md details="Readme"
  RELOC/doc/xelatex/hanzibox/build.sh
- RELOC/doc/xelatex/hanzibox/hanzibox.pdf details="Package documentation"
-srccontainersize 8400
-srccontainerchecksum 6e2164c2d4e1b28a71e2e455922cc7813a247138076e5c921c7cac849a4e35fc7f8336467ce4b4be81cec822eb260ddfe57116f34a17df317de13a07e665399c
-srcfiles size=10
+ RELOC/doc/xelatex/hanzibox/hanzibox.pdf details="Package documentation" language="zh"
+srccontainersize 14724
+srccontainerchecksum ef2d9933cb9af2a215c2d3154085513896d29156fec724a650962645ab971df7f19fd99f38fab44cff6420fc61ceb4c6166b9c92c04dede275db41538ddc7f62
+srcfiles size=18
  RELOC/source/xelatex/hanzibox/hanzibox.dtx
-runfiles size=4
+runfiles size=9
  RELOC/tex/xelatex/hanzibox/hanzibox.sty
 catalogue-contact-bugs https://gitee.com/nwafu_nan/hanzibox-l3/issues
 catalogue-contact-repository https://gitee.com/nwafu_nan/hanzibox-l3
 catalogue-ctan /macros/xetex/latex/hanzibox
-catalogue-license lppl1.3
+catalogue-license lppl1.3c
 catalogue-topics xetex expl3 chinese
-catalogue-version 1.1.0
+catalogue-version 2.0.0
 
 name happy4th
 category Package
@@ -186645,7 +186652,7 @@ catalogue-version 1.0
 
 name luapstricks
 category Package
-revision 60526
+revision 60642
 shortdesc A PSTricks backend for LuaLaTeX
 relocated 1
 longdesc This package enables the use of PSTricks directly in LuaLaTeX
@@ -186654,14 +186661,14 @@ longdesc implementing a PostScript interpreter in Lua. Therefore it does
 longdesc not require shell escape to be enabled or special environments,
 longdesc and instead allows PSTricks to be used exactly like in dvips
 longdesc based documents.
-containersize 21316
-containerchecksum 05090f0d2f89d3fd1ff4102f902885f415a330bbb1e0f01fe5b4392f48ad8d2a1c2d7da9c1e561fb5db174244a1a5a8580bba29085a5d1ede8dc4179ee53cd98
+containersize 21328
+containerchecksum 1267432ca104e944f15a37ece7ae0206aba72ebc1256da4f5496dd75c42efaa2bda98251f5aa9fae06b9021f3badae1e498b1a5769df2cfe3d6aebfe47148e42
 doccontainersize 1492
-doccontainerchecksum e6e65f725832e9c62188455d2114a7141c1936ee927d2b98b1e571c76a544afc5a83e30952baa7d8eaeff7194230c0a42c57255fdda35aa0cd9dae1467dbd30e
+doccontainerchecksum 703fbbeb8fdb997c3549fcc6c8d7c710679d97d0398f9d924117ab98bd28507c6df3e824cf4736913bd174b67abde28b351f21e5e4b73bef0580c0eeb489c7ad
 docfiles size=1
- RELOC/doc/latex/luapstricks/README.md details="Readme"
+ RELOC/doc/lualatex/luapstricks/README.md details="Readme"
 runfiles size=30
- RELOC/tex/latex/luapstricks/luapstricks.lua
+ RELOC/tex/lualatex/luapstricks/luapstricks.lua
 catalogue-contact-bugs https://github.com/zauguin/luapstricks/issues
 catalogue-contact-repository https://github.com/zauguin/luapstricks
 catalogue-ctan /graphics/pstricks/contrib/luapstricks
@@ -257864,7 +257871,7 @@ catalogue-version 1.0h
 
 name reledmac
 category Package
-revision 59398
+revision 60637
 shortdesc Typeset scholarly editions
 relocated 1
 longdesc A package for typesetting scholarly critical editions,
@@ -257873,11 +257880,11 @@ longdesc itself was a LaTeX port of the plain TeX EDMAC macros. The
 longdesc package supports indexing by page and by line numbers, and
 longdesc simple tabular- and array-style environments. The package is
 longdesc distributed with the related reledpar package.
-containersize 55160
-containerchecksum 2f5cdc83e91c0b90b0b72a98d0dfe493671621bc13542eb02a2ef3ac47d862e7697ed11a4d54f9d9c175aa9e48052f3d435fd0e001be7cf032a634ade83e4f5a
-doccontainersize 10230540
-doccontainerchecksum 2f9a0f091514de7a138529cb5b258cb5a17ab887a71a4735fe47a34eecd69d7c536d6a37f7c506ce164e852ccfe8b369876b1e9b7da88d7091af69e8a80e64f4
-docfiles size=3331
+containersize 55200
+containerchecksum 31fc7501933ad4c3615d52770a5c844b7ad57e75a9403f4bd9db1e702a0e2bd79af5bc6da75da8e7233f0d5548060e29a19635d7d7c6284b161d265760ab7d4d
+doccontainersize 10276876
+doccontainerchecksum 76e0db2e19b7dc284ca59e433483b2d740bee7a2cfb80d2256b3548f9c2763790a942adfbd58a08466cd80db097566290e68ca4ac0cf28fbae643caa53c0e60b
+docfiles size=3382
  RELOC/doc/latex/reledmac/README.md details="Readme"
  RELOC/doc/latex/reledmac/doc-include/migrate-mac.dtx
  RELOC/doc/latex/reledmac/doc-include/migrate-par.dtx
@@ -257983,8 +257990,8 @@ docfiles size=3331
  RELOC/doc/latex/reledmac/migration.pdf
  RELOC/doc/latex/reledmac/reledmac.pdf details="Package documentation"
  RELOC/doc/latex/reledmac/reledpar.pdf
-srccontainersize 208576
-srccontainerchecksum 311d1f4bfe93faf04d008d5ad6a25ffb82b674e862c09b1a79d0036fae86d8aa12faa8251132442e1efc3c15f6641cd08823b186a4dd5677463e6abc5d8ff8e9
+srccontainersize 208620
+srccontainerchecksum 3cf76224fd699058c11c4621931f0dc914eb73bbb07b4fc0dd5894b224a1151c418e90b8ca5834473330636c0fdf616bd4373b0ec1fcbf03f500b970f43e21e1
 srcfiles size=297
  RELOC/source/latex/reledmac/migration.dtx
  RELOC/source/latex/reledmac/reledmac.dtx
@@ -258001,7 +258008,7 @@ catalogue-contact-support http://geekographie.maieul.net/146
 catalogue-ctan /macros/latex/contrib/reledmac
 catalogue-license lppl1.3
 catalogue-topics crit-ed
-catalogue-version 2.38.0
+catalogue-version 2.38.1
 
 name relenc
 category Package
@@ -286041,7 +286048,7 @@ binfiles arch=x86_64-solaris size=1
 
 name tex4ht
 category Package
-revision 60623
+revision 60643
 shortdesc Convert (La)TeX to HTML/XML
 longdesc A converter from TeX and LaTeX to SGML-based formats such as
 longdesc (X)HTML, MathML, OpenDocument, and Docbook, providing a
@@ -286054,10 +286061,10 @@ longdesc helper DVI file that it can then process. This technique allows
 longdesc TeX4ht to approach the robustness characteristic of
 longdesc restricted-syntax systems such as gellmu.
 depend tex4ht.ARCH
-containersize 908520
-containerchecksum b9a8951c89c5a2e54d6f772fda6fa06b17d60e1e9f5affb1ae644205389a927b6f2e52bfd040088904a37f635280a46d0603ea98c937926bfaef09f8dff14ef3
+containersize 908452
+containerchecksum f75f4454b17c94a29e69d5c78c0c03ffc8e967db08400c26abdd6da683d22b6445473e52aad3e8833600dfc4b14f5996daf574da342b1f1646fd7c6aea7aa29c
 doccontainersize 136384
-doccontainerchecksum 3d677433db62ace0ad8dd30f61573aede3143e74cc43db55007f80beaa12440daa235fa02e30a3e645e712a1995c04a4315f3f9f19aa1266652077f0dbe75d00
+doccontainerchecksum b827ef5bfd8dd8f0b0730986b0e254725aa9a3e16747b477599740ede8e62a20409761739d4f98c484fcda5f54b67acac9eaf56393e378565502ecdf1f8b2f55
 docfiles size=260
  texmf-dist/doc/generic/tex4ht/Makefile
  texmf-dist/doc/generic/tex4ht/README details="Readme"
@@ -286129,8 +286136,8 @@ docfiles size=260
  texmf-dist/doc/generic/tex4ht/mn56.html
  texmf-dist/doc/generic/tex4ht/mn5x.png
  texmf-dist/doc/generic/tex4ht/mn6x.png
-srccontainersize 1212648
-srccontainerchecksum d37633b81b90750dae9375719b66ab89b5309026b7393a4cbb17a11216926a9e42b4cba52dd2d0d3c22e4530255fd89cc7d24e6a85542e0c048462ce3509080c
+srccontainersize 1214128
+srccontainerchecksum e61e45deac67be7fbe900aaeb96daf3b09ed835dce267a1df63121cf34dadcc9d5baefb39a6e13a1df41ec8c755a58b0e19dc9ca2b38faae2c0784f28862e43f
 srcfiles size=3627
  texmf-dist/source/generic/tex4ht/ChangeLog
  texmf-dist/source/generic/tex4ht/Makefile
@@ -295266,7 +295273,7 @@ docfiles size=376
 
 name texlive-scripts
 category TLCore
-revision 60626
+revision 60633
 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.
@@ -295274,10 +295281,10 @@ depend texlive-scripts.ARCH
 depend texlive.infra
 execute addMap mathpple.map
 postaction shortcut type=menu name="TeX Live command-line"   cmd=TEXDIR/tlpkg/installer/tl-cmd.bat
-containersize 108300
-containerchecksum ae1986e4fd610440d2a7f6b42aa22b1c6a3221d91c4553512f1c12edb8b294dcb08a266f8a4461f44e81eb860e4141d68b963bc2e5ff44e1da039f91b7aac2e9
+containersize 108296
+containerchecksum d47e3449147d82deaa161ecd658e1cd90fb5f54af2fbfe0ba8d75436e344fb10f56d843638fd69c31b6b0366247eadb075403dbdc0fa60fe4726621db27b8a68
 doccontainersize 400276
-doccontainerchecksum 4ad844f3e8b03fcddf5517171494d0dede40e0b54a22224bde273a7b24b3dc9cb796699736bfb2feaafe5ec509c3631efb067e6d4269698d1f72871bc2312e95
+doccontainerchecksum c87088354b2063bcafc607fbc32d42d3e87d23431773cdfc19dc962cd3a2703c9b3a0fbce6d0b1d4bb8517ceb93172295f7acb55603030ac667f35d322303fd6
 docfiles size=496
  doc.html
  texmf-dist/doc/man/man1/fmtutil-sys.1
@@ -305195,7 +305202,7 @@ binfiles arch=x86_64-solaris size=1
 
 name tlgs.win32
 category TLCore
-revision 59157
+revision 60634
 catalogue ghostscript
 shortdesc Freely available PostScript interpreter
 longdesc Ghostscript is a freely available PostScript interpreter which
@@ -305204,9 +305211,9 @@ longdesc complement to a TeX installation, used in many utilities,
 longdesc including PostScript/PDF viewers such as gv and GSview.
 longdesc Ghostscript is no longer held on CTAN: please see the home page
 longdesc for downloads.
-containersize 7999236
-containerchecksum 8183b21935f05c17048efc716ca6b950d5f1adc02b7c031264530fd9ec7efc9ca33f3e908655b769fdbc8be71c30ab7f0d8cffdd5fd9f221c273f801c4941451
-binfiles arch=win32 size=7047
+containersize 8367880
+containerchecksum 73e1a5dd1631a1d5f7667e3ae569297a8ff879600e07905f851f70326348261489735449ce161f825fafb51f5f24898b3befb3949709aa69db26dabd7175e4bf
+binfiles arch=win32 size=7833
  bin/win32/eps2eps.exe
  bin/win32/pdf2dsc.exe
  bin/win32/pdfopt.exe
@@ -322228,7 +322235,7 @@ catalogue-version 1.0.0
 
 name uwa-letterhead
 category Package
-revision 60468
+revision 60635
 shortdesc The letterhead of the University of Western Australia
 relocated 1
 longdesc This package generates the letterhead of the University of
@@ -322237,16 +322244,16 @@ longdesc which is available in SVG format at
 longdesc https://static-listing.weboffice.uwa.edu.au/visualid/core-rebra
 longdesc nd/img/uwacrest/, and uses the Arial and UWA Slab fonts by
 longdesc default. The package works with XeLaTeX and LuaLaTeX.
-containersize 3300
-containerchecksum 5f61b55098e9d34abe59e1462ae5a28daa463f43b132514f326b48929a451fcac592cf63bf276332ff496cdcc54050e5a6655e73aac5f77033343dfd0ca05fd2
-doccontainersize 57412
-doccontainerchecksum 389390d9422127772588b29dc7e61eb1d9e3d071b7d16668cfc59f8a1916c60dbb2d3162b78d8c554868e150eca368f147c9a8e5509abe409ace6acf7f64dc64
+containersize 3348
+containerchecksum 9277f935e5769bb49cfcb1e90a8e6040da4bff341f82bc673076d0ecf0778d795a3ef480d94373d28b7e14e5c2083ab8e01737dcbdefa87cd042448d7cff3a32
+doccontainersize 57652
+doccontainerchecksum 1d778538ed1c9f8b1f2fda030a1c37dad0f3d8b6ebea71a3b5b784f695ce636414e5144402f50f10279df599e5698de157a9549edb77c2a788c68dc0cf869072
 docfiles size=17
  RELOC/doc/latex/uwa-letterhead/README details="Readme"
- RELOC/doc/latex/uwa-letterhead/example.tex
+ RELOC/doc/latex/uwa-letterhead/uwa-letterhead-example.tex
  RELOC/doc/latex/uwa-letterhead/uwa-letterhead.pdf details="Package documentation"
-srccontainersize 6416
-srccontainerchecksum bddf3c4659ac1e010c100d0015b099c420d54a48cb12c25a60c5c8be65f7e07b9be0589766d6afd42d6220a0e34437dfe7f0148cc7b552d2051eb8be159397e2
+srccontainersize 6564
+srccontainerchecksum 1b0a5d473a5deea6355cf021ef62e564216792ef14b8eeeaad18da441d2e42cdfe7356972b165126cec9e8d239aa5fb14222e1b6c93fdcc7a563b00a1a2024cf
 srcfiles size=8
  RELOC/source/latex/uwa-letterhead/uwa-letterhead.dtx
  RELOC/source/latex/uwa-letterhead/uwa-letterhead.ins
@@ -322255,7 +322262,73 @@ runfiles size=3
 catalogue-ctan /macros/unicodetex/latex/uwa-letterhead
 catalogue-license lppl1.3
 catalogue-topics letter page-hf std-conform
-catalogue-version 1.0.0
+catalogue-version 1.0.1
+
+name uwa-pcf
+category Package
+revision 60641
+shortdesc A Participant Consent Form (PCF) for a human research protocol at the University of Western Australia
+relocated 1
+longdesc This LaTeX class generates a Participant Consent Form (PCF) for
+longdesc a human research protocol at the University of Western
+longdesc Australia. It requires the UWA logo in PDF format, which is
+longdesc available in SVG format at
+longdesc https://static-listing.weboffice.uwa.edu.au/visualid/core-rebra
+longdesc nd/img/uwacrest/, and uses the Arial and UWA Slab fonts by
+longdesc default. The class works with XeLaTeX and LuaLaTeX. It depends
+longdesc on the uwa-letterhead package.
+containersize 2924
+containerchecksum 96a5ef7a7b016e48ecbd80210a8737ff624e30ae7814218c4bfac89f527caef238d5651f700d5cd1428aa4ae3e30fcb8225420d46043f0f1280e3ea35645adf2
+doccontainersize 52740
+doccontainerchecksum 58bb43df7b6e36da128848c0ae8c1526eba889b628e6de987ecac40f25a0e359a257a7b9e0713d8422fc4f2f045615e52374691107c5b02af3a02a737e91ade5
+docfiles size=15
+ RELOC/doc/latex/uwa-pcf/README details="Readme"
+ RELOC/doc/latex/uwa-pcf/uwa-pcf-example.tex
+ RELOC/doc/latex/uwa-pcf/uwa-pcf.pdf details="Package documentation"
+srccontainersize 6060
+srccontainerchecksum 8f0a0615e36b2f745e44cac73b853e906e9956651f8614313ef95ecfef977b7a456432c6710b2aadca47c695a030b2339ee1a10c0d728a798d269aa6578e58bf
+srcfiles size=7
+ RELOC/source/latex/uwa-pcf/uwa-pcf.dtx
+ RELOC/source/latex/uwa-pcf/uwa-pcf.ins
+runfiles size=3
+ RELOC/tex/latex/uwa-pcf/uwa-pcf.cls
+catalogue-ctan /macros/unicodetex/latex/uwa-pcf
+catalogue-license lppl1.3
+catalogue-topics class std-conform
+catalogue-version 1.0.1
+
+name uwa-pif
+category Package
+revision 60640
+shortdesc A Participant Information Form (PIF) for a human research protocol at the University of Western Australia
+relocated 1
+longdesc This package generates a Participant Information Form (PIF) for
+longdesc a human research protocol at the University of Western
+longdesc Australia. It requires the UWA logo in PDF format, which is
+longdesc available in SVG format at
+longdesc https://static-listing.weboffice.uwa.edu.au/visualid/core-rebra
+longdesc nd/img/uwacrest/, and uses the Calibri fonts by default. The
+longdesc class works with XeLaTeX and LuaLaTeX. It depends on the
+longdesc uwa-letterhead package.
+containersize 2588
+containerchecksum 728907dcd2ebfc289afdd798a83081d3ee357635efd36f757b7a29e3ec49911c60462fa2cb5e9988b86c9cd22be74f71a92e1962b2c1d1a20c860f8c6c66eeb7
+doccontainersize 50500
+doccontainerchecksum 8891ef73abccc06efe541cbd5b68e5c40fff48df12dd008b3a864993af0ab3ab46e9514ac261a51daee93cd53a74c884e33c0bce1d21c9625acf0ef0b0c046a2
+docfiles size=15
+ RELOC/doc/latex/uwa-pif/README details="Readme"
+ RELOC/doc/latex/uwa-pif/uwa-pif-example.tex
+ RELOC/doc/latex/uwa-pif/uwa-pif.pdf details="Package documentation"
+srccontainersize 5692
+srccontainerchecksum b10a63d7b7e7fc39440a53dfee84385c2e6e4d574fe98814eb3340ef9ab97a142aadff54efdf55510f16a38f70745f456cc2fb4990434a2ec41607b08d3bdf60
+srcfiles size=6
+ RELOC/source/latex/uwa-pif/uwa-pif.dtx
+ RELOC/source/latex/uwa-pif/uwa-pif.ins
+runfiles size=2
+ RELOC/tex/latex/uwa-pif/uwa-pif.cls
+catalogue-ctan /macros/unicodetex/latex/uwa-pif
+catalogue-license lppl1.3
+catalogue-topics class std-conform
+catalogue-version 1.0.1
 
 name uwmslide
 category Package
@@ -328120,7 +328193,7 @@ catalogue-topics tree macro-supp
 
 name willowtreebook
 category Package
-revision 60583
+revision 60638
 shortdesc Easy basic book class, built on memoir
 relocated 1
 longdesc The willowtreebook class is a simple book class, which the
@@ -328128,10 +328201,10 @@ longdesc author uses for his lecture notes to be found on his web page
 longdesc Benjamin McKay. It actually just selects options for the more
 longdesc sophisticated memoir class.
 containersize 6300
-containerchecksum a54aa54019985a87e1ff3b95894c02b2a4bb29290b51286f4db290ad7459393716cf0577ce15b5b68b5a3ca0b82a09ba08be420c45c52fb05251ac61e0966b80
-doccontainersize 24230228
-doccontainerchecksum c9256041147c028893ec629aa331035bf6c712fd98f4ea8a9721dda37fea84c167564588c79b9c94679468e9f193695ee5d9ce3413d8983bd1f3557c671df0cd
-docfiles size=5981
+containerchecksum 835b19d0927b01e4acf9da483148d3fa45b1c12eecebe39802ee4bab7426843710dd67306b2a8946c9c2b51d4c1864eb054f440c3ea021ae124bbeb6e4908b33
+doccontainersize 24230688
+doccontainerchecksum 9e5fddf4765325a550e6dbea529d110bbbfbcdf89e1dafcfe62099a4e8fa6ce2bf3384ef9e1b2453f1155b6e6d3f48d1d1675100c8295362653aaabec35aaf86
+docfiles size=5982
  RELOC/doc/latex/willowtreebook/README details="Readme"
  RELOC/doc/latex/willowtreebook/notation.gst
  RELOC/doc/latex/willowtreebook/willow.jpg
@@ -328144,7 +328217,7 @@ catalogue-also memoir
 catalogue-ctan /macros/latex/contrib/willowtreebook
 catalogue-license lppl1.3c
 catalogue-topics class book-pub
-catalogue-version 1.02
+catalogue-version 1.03
 
 name windycity
 category Package
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 61c43396b3..1dcdc63602 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-ec7ed8d6655abd8260ba40d88aeda6b6  texlive.tlpdb
+b175646e8b263cebcc31ee80ca0c254d  texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index e14af766d1..95f23e657e 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-6bbb3c6f584f59d213a391e3abcd6bf65a283fb1faaf03fec4b6e26f5de6bbaef6be8cd5359022cc42af4f6c72e1f497e924ef44447e534625732d0875b6ee6b  texlive.tlpdb
+a6b1145da3f2315b4a95eb2433c6c01db9cd03a76667d15cefc86a87fc34127fe541ce68cdcbe390056a66fe7348c892805a9bccef4195dca17364283be42bb3  texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index bcc93de2a1..9024a8f6c4 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-----
 
-iQEcBAEBCgAGBQJhUll2AAoJEEzhh34ZQ4xwdqQH/jYkC72wM+yiQuaXGcP8cMRc
-UJ/u2zq75mP+gsAceCRtD1ROEqy/1Vm2fap+A+LgOQvUJPfstj0I/lM+8YVnSKrC
-yvLL7IwoeoSnYaOjTimLvkBEc4xuA1zl9kRWAk2/xy77wH5utBALdPnEOHC/WZig
-Rh++Un3e8UNGXUJjQ0uPwLW0yLT3JZ7F6ArnMwC4QUvbgp0rF0WgMrGHlx9a8ohB
-VFgga1rYm0wPsXyBXNSCUSRUURbHGSn1ZUzeLHgv+Z9460pfAtPPcepTT4bDlYZ4
-od3kMuuG/TqEPiolHDZXIgUIFduxUSjK6iB1qQ6ZusNxKRbFZ/y3BFHd/R2qS1Y=
-=/7/O
+iQEcBAEBCgAGBQJhU6reAAoJEEzhh34ZQ4xwy94H/jOkkvD9RVkuvq7n9K++4GUP
+tPit0DnPUedP2NKQYerIukcwhJYihh0GCmaMozEfTgtXmjvtZ0mOn1E5YJV2Zy4N
+pLERoqeg/vvAdJpNrvXoexlg0CicsZWPu33jc+wq1Vzh3mI0+cU36G8M3SgQE7c7
+Phz6O8lLCbk/Aov2AZHootdVWGSSIpe7dnvBTgjyaUdlFCiJQCFNpkcv5Y9fZame
+8EB956D33EFAAZAkmOEzmJs863ETzbSre+xqSDK0ijjHUfuZ8AHMj91D6706m0NE
+l9bjJo6RFBmVN6v1bqf0wbocYaFCVcrsqT38zfIRqc6Zfvy1VFn8e2tBzQrUOes=
+=GLE/
 -----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index 0520741ef1..e1769fdd86 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
diff --git a/systems/win32/miktex/tm/packages/next/pr.ini b/systems/win32/miktex/tm/packages/next/pr.ini
index 1e67fe9b1a..8933f30777 100644
--- a/systems/win32/miktex/tm/packages/next/pr.ini
+++ b/systems/win32/miktex/tm/packages/next/pr.ini
@@ -1,13 +1,13 @@
 

 [repository]

-date=1632773824

+date=1632860179

 lastupd=miktex-arctrl-bin-2.9 miktex-arctrl-bin-x64-2.9 miktex-asymptote-bin-2.9 miktex-asymptote-bin-x64-2.9 miktex-autosp-bin-2.9 miktex-autosp-bin-x64-2.9 miktex-axohelp-bin-2.9 miktex-axohelp-bin-x64-2.9 miktex-bibarts-bin-2.9 miktex-bibarts-bin-x64-2.9 miktex-bibtex-bin-2.9 miktex-bibtex-bin-x64-2.9 miktex-bibtex8bit-bin-2.9 miktex-bibtex8bit-bin-x64-2.9 miktex-bzip2-bin-2.9 miktex-bzip2-bin-x64-2.9 miktex-cairo-bin-2.9 miktex-cairo-bin-x64-2.9 miktex-chktex-bin-2.9 miktex-chktex-bin-x64-2.9

-lstdigest=7fcf09f1fb5cd30ce074cea58141071d

+lstdigest=92d9cc3af3aa7427de56c2b99a37a999

 numpkg=4816

 relstate=next

-version=7940

+version=7941

 

 ;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.

 ;;;;-----BEGIN MIKTEX SIGNATURE-----

-;;;; signature/miktex: dYKKnShC2kljF2E/GBiBXNpcByQIy2qE8xRd0fDVzyVlyvf3BuDalysuUGDJcevR5qDLj9qYHkOU8uXGp4LvJ8H1VdUIlQAVblCF4jjFIKOtnJ0foEhEO9Hfu9M5pW28o4/UcfKySLfGWrQIByoSTW12rvX4YySPVzvHoePMgYK1TgUWjp3izhBUwYgCFX66HBmT63RMAYOvoldA7wIX7rlMyeLkAAh6gngVd2zLhj4ZPV5mgKF+pwBwg0z/lI9BkraRkBlR5vef6zlPdaF4GpHWCSJvTi8W88kn8bSIQv1D/51vYIWjW+rRUGPvQ+d/Bxf1MhMzOulw2q8i+AH93A==

+;;;; signature/miktex: oBtBGe+AjtKvXhFfenPgsRplhQZx0/q3SgxQUfAKbucFmDjL43EpnAf2h+leCYbzFSCRNmbZ7lQICV1t4yoIdkSn4XH5b34TrQD1MFPhtsV6yU36LukXmVE4NoQ5TTdPnjW1Gxb4B0T49Mz2b61zye0tltKTQoDJhwdtPueWJ8g+6JxXNMJoAneoEcS5yYWZWhlZxRc6GEICr410ErpW631UuhFnLUXUCLWnZi0WLgOhFwMmg6lOcMAo+7f7yXjyq2Ht/d5Q9ZVO0GJWKjfm/Tlj6F/Aa6wN8D82lFsNTKpE3Z20VVlsKYE8qgHtHByY4I7AsMwlU6rAw1CEj/O6MQ==

 ;;;;-----END MIKTEX SIGNATURE-----

diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini
index 2f68242f18..b5a9102622 100644
--- a/systems/win32/miktex/tm/packages/pr.ini
+++ b/systems/win32/miktex/tm/packages/pr.ini
@@ -1,13 +1,13 @@
 

 [repository]

-date=1632773524

+date=1632859915

 lastupd=clicks clicks__doc clicks__source dtk-bibliography dtk-bibliography__source exesheet exesheet__doc exesheet__source expkv-def expkv-def__doc expkv-def__source light-latex-make light-latex-make__doc light-latex-make__source luakeys luakeys__doc luakeys__source luatexja luatexja__doc luatexja__source

-lstdigest=33028a4eabf66525b800ef0ef9f67166

+lstdigest=bf354109037628ee2c63bb96316098c6

 numpkg=4816

 relstate=stable

-version=7940

+version=7941

 

 ;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.

 ;;;;-----BEGIN MIKTEX SIGNATURE-----

-;;;; signature/miktex: GzahcSVmPzc6kG9xP2t06gLR1oIN4lDPcxt7DMtxxOsUGvxdNyJJnif4/2AYONHwjT+12PEa01KCV6LTtEPXm/TlWss2kwwUuG7PitD5FA8/E0pxnlN10SvcLyJEcBUjUjk7JJqKIIHRzX3kfdZiMC/zto5mKAYC25aYREo2ILFhyRade2mL2Ba/Jfrw+VVDeK7AY1hVvspln4ZQkiIEVqeOAkgUp0DeMmndKgOk2Vb3MShb3b9lbWExjiGK2DAe6YZzwzUrrtvbgM+0CcBJZp5RmrjvphcMGF/fEI39XDTvDRtt3pjkcHBU3f48OC/UjrEZs2EsC0+Io34L89V1Ng==

+;;;; signature/miktex: E/h3ZQlWI8ZBo+OcmK8RmBDEZM6PMlf8jCFweJG7k722Cm7irVJatmpTy30tUN2DGOey9UDG7Na+hfdis8SWdkx+MRPb83tVq2EGYxdJNbX9AKALcwWNwb0Bp7ZNB1DnQv4RwVxMgyHyLm0qGinpmdJhtVxC9X8HQpCgOAtxRo5FhnuSm5tSv4pUSJm8/slpXn/A9bPiMsexTxEbHU6u3/Eurb9LBLnHk3FJyiJoeyUoJgPIdQmlt8mKh8fVQtH1JqOi631nApWIhCd593XXINCTjBt4l0Q4h4ZzdMCJkifr/XKgM4faEEeJv6ZzAqKrRl6hmUpi/x+e2yD3O1fZuA==

 ;;;;-----END MIKTEX SIGNATURE-----

diff --git a/timestamp b/timestamp
index dd6cfc09ef..e395d89d00 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:
-2021-09-28-02-02
+2021-09-29-02-02