CTAN sync 202203080300

15 files changed, 133 insertions, 81 deletions

diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md
index ffa7def0f6..a161a34c54 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md
@@ -1,4 +1,4 @@
-<b>Date of last change: 2022-02-22 to version v1.1d</b>
+<b>Date of last change: 2022-03-07 to version v1.1e</b>
 
 
 # biblatex-gb7714-2015: a biblatex style  package
@@ -1560,6 +1560,7 @@ please see the file 'biblatex-gb7714-2015.pdf' for further information!
 * 2021/12/11 v1.1b,ctan
 * 2022/01/24 v1.1c,ctan
 * 2022/02/22 v1.1d,ctan,github
+* 2022/03/07 v1.1e,ctan,github
 
 
 ---------------------------------------------------------
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf
index 0beb49a558..f6e31ca8b3 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.tex b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.tex
index 18152dce43..7d79d7c2d0 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.tex
@@ -684,7 +684,7 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
     \item erjpunctcn=true，使用格式要求的中文标点(即全角标点)。
     \item erjpunctcn=false，则将所有的文献中的标点改为英文标点(即半角标点)。
   \end{itemize}
-  
+
   需要注意的是：若只想修改英文文献的全部标点为半角标点，而中文文献的标点不变，仅需在导言区加上如下命令：
   \lstinline[breaklines=true]!\def\erjpunctcommalanen{\addcomma\addspace}!,
   \lstinline[breaklines=true]!\def\erjpunctcolonlanen{\addcolon\addspace}!。
@@ -2506,7 +2506,7 @@ author.title[usera].journaltitle或journal,year,volume(number):pages[urldate].ur
 \qd{由于biblatex不支持newspaper 条目类型，所以条目类型报纸析出的文献用article表示，但使用entrysubtype或note域等于news|newspaper作为一个区分，当note域数据存在且内容等于news或newspaper时，就将其作为报纸的析出文献进行处理。报纸文献类型标识用N表示，报纸的版次用number域描述。}
 
 \subsubsection{报纸析出的文献/newspaper}\label{sec:standard}
-biblatex没有将报纸的析出文献(newspaper)作为一种文献条目类型，因此可以直接利用article类型加newspaper或note域等于news代替，或者也可以直接使用newspaper类型。为方便使用考虑，本样式增加了对新条目类型newspaper的支持，这种支持通过类似于standard类型的方式实现，没有对数据模型进行改动或增加，而完全利用动态数据修改将newspaper类型转换为article类型。在bib文件中直接使用newspaper类型时需要注意可能存在移植障碍，因为其它biblatex样式可能不支持newspaper类型。
+biblatex没有将报纸的析出文献(newspaper)作为一种文献条目类型，因此可以直接利用article类型加entrysubtype或note域等于news|newspaper代替，或者也可以直接使用newspaper类型。为方便使用考虑，本样式增加了对新条目类型newspaper的支持，这种支持通过类似于standard类型的方式实现，没有对数据模型进行改动或增加，而完全利用动态数据修改将newspaper类型转换为article类型。在bib文件中直接使用newspaper类型时需要注意可能存在移植障碍，因为其它biblatex样式可能不支持newspaper类型。
 
 \begin{refentry}{}{}
 报纸析出的文献对应一个新的entrytype为: newspaper。文献类型标识用N表示。
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx
index 9de266ecdc..46dd2633fb 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx
@@ -11,7 +11,7 @@
 %
 %   版本和时间信息
 %
-\def\versionofgbtstyle{2022/02/22 v1.1d}
+\def\versionofgbtstyle{2022/03/07 v1.1e}
 \def\versionofbiblatex{\abx@version}
 \ProvidesFile{gb7714-2015.bbx}[\versionofgbtstyle biblatex bibliography style]
 %\RequireBiber[3]%显式指定用biber后端，当用bibtex时会报错，但其实不会影响编译，只是采用bibtex后无法达成格式需求
@@ -1477,7 +1477,7 @@
             %\step[notfield=address,final]%当address不存在则继续
             \step[fieldsource=url,final]%地址不存在且存在url那么转变为online
             \step[typesource=report,typetarget=online]
-            \step[fieldset=note,fieldvalue={report}]
+            \step[fieldset=entrysubtype,fieldvalue={report}]
             }
             \map{%
             \pertype{thesis}
@@ -1560,7 +1560,7 @@
             \step[typesource=archive,typetarget=online]
             }
             \map[overwrite]{%这里还必须有overwrite，注意不同版本存在差异，比如texlive2015变16后biber有变化(20161207修改正确)
-            \step[fieldsource=note, final]%将note域信息复制给keywords，用于输出时容易区分标准和报纸
+            \step[fieldsource=entrysubtype, final]%将note域信息复制给keywords，用于输出时容易区分标准和报纸
             \step[fieldset=keywords, fieldvalue={,}, append]
             \step[fieldset=keywords, origfieldval, append]
             }
@@ -1635,7 +1635,7 @@
             %\step[notfield=address,final]%当address不存在则继续
             \step[fieldsource=url,final]%地址不存在且存在url那么转变为online
             \step[typesource=report,typetarget=online]
-            \step[fieldset=note,fieldvalue={report}]
+            \step[fieldset=entrysubtype,fieldvalue={report}]
             }
             \map{%
             \pertype{thesis}
@@ -1718,7 +1718,7 @@
             \step[typesource=archive,typetarget=online]
             }
             \map[overwrite]{%这里还必须有overwrite，注意不同版本存在差异，比如texlive2015变16后biber有变化(20161207修改正确)
-            \step[fieldsource=note, final]%将note域信息复制给keywords，用于输出时容易区分标准和报纸
+            \step[fieldsource=entrysubtype, final]%将note域信息复制给keywords，用于输出时容易区分标准和报纸
             \step[fieldset=keywords, fieldvalue={,}, append]
             \step[fieldset=keywords, origfieldval, append]
             }
@@ -3327,14 +3327,16 @@ incollection,proceedings,inproceedings]{number}{%
 %   对edition版本信息格式做出修改
 %
 \DeclareFieldFormat{edition}{\bibtitlefont%源来自biblatex.DEF
-\testCJKfirst{userd}%
-\iftoggle{ifCJKforgbt}%
-{\ifinteger{#1}%
-{\printtext{#1\str@edition}}%
-{#1\isdot}}%
-{\ifinteger{#1}%
-{\mkbibordedition{#1}~\bibstring{edition}}%
-{#1\isdot}}}
+\ifnumgreater{#1}{1}{%
+    \testCJKfirst{userd}%
+    \iftoggle{ifCJKforgbt}%
+        {\ifinteger{#1}%
+            {\printtext{#1\str@edition}}%
+            {#1\isdot}}%
+        {\ifinteger{#1}%
+            {\mkbibordedition{#1}~\bibstring{edition}}%
+            {#1\isdot}}}{}%
+}
 
 %
 %   对version的版本信息做出修改
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.cbx
index 0f695be5d3..597820363a 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.cbx
@@ -530,7 +530,7 @@
 \DeclareMultiCiteCommand{\authornumcites}[]{\authornumcite}{\multicitedelim}
 
 %如果标注标签不进行压缩可以则重定义如下：
-\iftoggle{bbx:gbcitecomp}%
+\iftoggle{bbx:gbcitecomp}{}%
 {\newbibmacro*{cite}{%
   \printtext[bibhyperref]{%
     \printfield{labelprefix}%
@@ -550,4 +550,4 @@
    \usebibmacro{cite}}
   {\multicitedelim}
   {\mkbibrightborder\mkbibsuperscriptusp{\usebibmacro{postnote}}}
-}{}
+}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx
index 3685335e06..ecc1561155 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx
@@ -10,7 +10,7 @@
 %
 %   版本和时间信息
 %
-\def\versionofgbtstyle{2022/02/22 v1.1d}
+\def\versionofgbtstyle{2022/03/07 v1.1e}
 \def\versionofbiblatex{\abx@version}
 \ProvidesFile{gb7714-2015ay.bbx}[\versionofgbtstyle biblatex bibliography style]
 %\RequireBiber[3]%显式指定用biber后端，当用bibtex时会报错，但其实不会影响编译，只是采用bibtex后无法达成格式需求
@@ -1397,7 +1397,7 @@
             %\step[notfield=address,final]%当address不存在则继续
             \step[fieldsource=url,final]%地址不存在且存在url那么转变为online
             \step[typesource=report,typetarget=online]
-            \step[fieldset=note,fieldvalue={report}]
+            \step[fieldset=entrysubtype,fieldvalue={report}]
             }
             \map{%
             \pertype{thesis}
@@ -1480,7 +1480,7 @@
             \step[typesource=archive,typetarget=online]
             }
             \map[overwrite]{%这里还必须有overwrite，注意不同版本存在差异，比如texlive2015变16后biber有变化(20161207修改正确)
-            \step[fieldsource=note, final]%将note域信息复制给keywords，用于输出时容易区分标准和报纸
+            \step[fieldsource=entrysubtype, final]%将note域信息复制给keywords，用于输出时容易区分标准和报纸
             \step[fieldset=keywords, fieldvalue={,}, append]
             \step[fieldset=keywords, origfieldval, append]
             }
@@ -3149,14 +3149,17 @@ incollection,proceedings,inproceedings]{number}{%
 %   对edition版本信息格式做出修改
 %
 \DeclareFieldFormat{edition}{\bibtitlefont%源来自biblatex.DEF
-\testCJKfirst{userd}%
-\iftoggle{ifCJKforgbt}%
-{\ifinteger{#1}%
-{\printtext{#1\str@edition}}%
-{#1\isdot}}%
-{\ifinteger{#1}%
-{\mkbibordedition{#1}~\bibstring{edition}}%
-{#1\isdot}}}
+\ifnumgreater{#1}{1}{%
+    \testCJKfirst{userd}%
+    \iftoggle{ifCJKforgbt}%
+        {\ifinteger{#1}%
+            {\printtext{#1\str@edition}}%
+            {#1\isdot}}%
+        {\ifinteger{#1}%
+            {\mkbibordedition{#1}~\bibstring{edition}}%
+            {#1\isdot}}}{}%
+}
+
 
 %
 %   对version的版本信息做出修改
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.bbx
index c08a1207d5..adb65495b2 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.bbx
@@ -11,7 +11,7 @@
 %
 %   版本和时间信息
 %
-\def\versionofgbtstyle{2022/02/22 v1.1d}
+\def\versionofgbtstyle{2022/03/07 v1.1e}
 \def\versionofbiblatex{\abx@version}
 \ProvidesFile{gb7714-2015ms.bbx}[\versionofgbtstyle biblatex bibliography style]
 %\RequireBiber[3]%显式指定用biber后端，当用bibtex时会报错，但其实不会影响编译，只是采用bibtex后无法达成格式需求
@@ -1157,7 +1157,7 @@
             \step[notfield=address,final]%当address不存在则继续
             \step[fieldsource=url,final]%地址不存在且存在url那么转变为online
             \step[typesource=report,typetarget=online]
-            \step[fieldset=note,fieldvalue={report}]
+            \step[fieldset=entrysubtype,fieldvalue={report}]
             }
             \map{%
             \pertype{thesis}
@@ -1208,7 +1208,7 @@
             \step[typesource=archive,typetarget=online]
             }
             \map[overwrite]{%这里还必须有overwrite，注意不同版本存在差异，比如texlive2015变16后biber有变化(20161207修改正确)
-            \step[fieldsource=note, final]%将note域信息复制给keywords，用于输出时容易区分标准和报纸
+            \step[fieldsource=entrysubtype, final]%将note域信息复制给keywords，用于输出时容易区分标准和报纸
             \step[fieldset=keywords, fieldvalue={,}, append]
             \step[fieldset=keywords, origfieldval, append]
             }
@@ -2200,15 +2200,17 @@ incollection,proceedings,inproceedings]{number}{%
 %
 %   对edition版本信息格式做出修改
 %
-\DeclareFieldFormat{edition}{%源来自biblatex.DEF
-\testCJKfirst{userd}%
-\iftoggle{ifCJKforgbt}%
-{\ifinteger{##1}%
-{\printtext{##1\str@edition}}%
-{##1\isdot}}%
-{\ifinteger{##1}%
-{\mkbibordedition{##1}~\bibstring{edition}}%
-{##1\isdot}}}%
+\DeclareFieldFormat{edition}{\bibtitlefont%源来自biblatex.DEF
+\ifnumgreater{#1}{1}{%
+    \testCJKfirst{userd}%
+    \iftoggle{ifCJKforgbt}%
+        {\ifinteger{#1}%
+            {\printtext{#1\str@edition}}%
+            {#1\isdot}}%
+        {\ifinteger{#1}%
+            {\mkbibordedition{#1}~\bibstring{edition}}%
+            {#1\isdot}}}{}%
+}%
 %
 %   对version的版本信息做出修改
 %
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.bbx
index 92c9cd22fe..aeb0ccccdc 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.bbx
@@ -11,7 +11,7 @@
 %
 %   版本和时间信息
 %
-\def\versionofgbtstyle{2022/02/22 v1.1d}
+\def\versionofgbtstyle{2022/03/07 v1.1e}
 \def\versionofbiblatex{\abx@version}
 \ProvidesFile{gb7714-2015mx.bbx}[\versionofgbtstyle biblatex bibliography style]
 %\RequireBiber[3]%显式指定用biber后端，当用bibtex时会报错，但其实不会影响编译，只是采用bibtex后无法达成格式需求
@@ -1216,7 +1216,7 @@
             %\step[notfield=address,final]%当address不存在则继续
             \step[fieldsource=url,final]%地址不存在且存在url那么转变为online
             \step[typesource=report,typetarget=online]
-            \step[fieldset=note,fieldvalue={report}]
+            \step[fieldset=entrysubtype,fieldvalue={report}]
             }
             \map{%
             \pertype{thesis}
@@ -1299,7 +1299,7 @@
             \step[typesource=archive,typetarget=online]
             }
             \map[overwrite]{%这里还必须有overwrite，注意不同版本存在差异，比如texlive2015变16后biber有变化(20161207修改正确)
-            \step[fieldsource=note, final]%将note域信息复制给keywords，用于输出时容易区分标准和报纸
+            \step[fieldsource=entrysubtype, final]%将note域信息复制给keywords，用于输出时容易区分标准和报纸
             \step[fieldset=keywords, fieldvalue={,}, append]
             \step[fieldset=keywords, origfieldval, append]
             }
@@ -2482,15 +2482,17 @@ incollection,proceedings,inproceedings]{number}{%
 %
 %   对edition版本信息格式做出修改
 %
-\DeclareFieldFormat{edition}{%源来自biblatex.DEF
-\testCJKfirst{userd}%
-\iftoggle{ifCJKforgbt}%
-{\ifinteger{#1}%
-{\printtext{#1\str@edition}}%
-{#1\isdot}}%
-{\ifinteger{#1}%
-{\mkbibordedition{#1}~\bibstring{edition}}%
-{#1\isdot}}}
+\DeclareFieldFormat{edition}{\bibtitlefont%源来自biblatex.DEF
+\ifnumgreater{#1}{1}{%
+    \testCJKfirst{userd}%
+    \iftoggle{ifCJKforgbt}%
+        {\ifinteger{#1}%
+            {\printtext{#1\str@edition}}%
+            {#1\isdot}}%
+        {\ifinteger{#1}%
+            {\mkbibordedition{#1}~\bibstring{edition}}%
+            {#1\isdot}}}{}%
+}
 
 %
 %   对version的版本信息做出修改
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index c767f8a591..c7a2ae3560 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}{2022/03/06}{1.64}
+\ProvidesExplClass{easybook}{2022/03/06}{1.641}
   {Easily typesetting Chinese theses or books}
 
 \bool_set_false:N \l__eb_compile_draft_bool
@@ -76,22 +76,22 @@
     \cs_new_eq:NN \eb_switch_family:n \ctex_ltj_switch_family:n
   }
 \cs_new_protected:Npn \eb_setmainfont:nn #1#2
-  { \__fontspec_main_setmainfont:nn {#2} {#1} }
+  { \__fontspec_main_setmainfont:nn {#1} {#2} }
 \cs_new_protected:Npn \eb_setsansfont:nn #1#2
-  { \__fontspec_main_setsansfont:nn {#2} {#1} }
+  { \__fontspec_main_setsansfont:nn {#1} {#2} }
 \cs_new_protected:Npn \eb_setmonofont:nn #1#2
-  { \__fontspec_main_setmonofont:nn {#2} {#1} }
+  { \__fontspec_main_setmonofont:nn {#1} {#2} }
 \cs_new_protected:Npn \eb_setCJKmainfont:nn #1#2
-  { \eb_set_family:nnn { \CJKrmdefault } {#2} {#1} }
+  { \eb_set_family:nnn { \CJKrmdefault } {#1} {#2} }
 \cs_new_protected:Npn \eb_setCJKsansfont:nn #1#2
-  { \eb_set_family:nnn { \CJKsfdefault } {#2} {#1} }
+  { \eb_set_family:nnn { \CJKsfdefault } {#1} {#2} }
 \cs_new_protected:Npn \eb_setCJKmonofont:nn #1#2
-  { \eb_set_family:nnn { \CJKttdefault } {#2} {#1} }
+  { \eb_set_family:nnn { \CJKttdefault } {#1} {#2} }
 \eb_seq_map_inline:nn
   { main,sans,mono,CJKmain,CJKsans,CJKmono }
   {
     \exp_args:Nc \RenewDocumentCommand { set#1font }{O{}mO{}}
-      {\use:c { eb_set#1font:nn } {##2} {##1,##3}}
+      {\use:c { eb_set#1font:nn } {##1,##3} {##2}}
   }
 \RenewDocumentCommand{\newCJKfontfamily}{omO{}mO{}}
   {
@@ -303,7 +303,7 @@
 %<*package>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2022/03/06}{1.64}
+\ProvidesExplPackage{easybase}{2022/03/06}{1.641}
   {Easily typesetting Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -1715,7 +1715,12 @@
 \ctex_define:nn { spread }
   {
     line .code:n              = \AfterPreamble{\setspread{#1}},
-    line .initial:n           = 1.354,
+    line .initial:n           =
+      {
+        \fp_if_nan:nTF { \l__ctex_line_spread_fp }
+          { 1.354 }
+          { \fp_use:N \l__ctex_line_spread_fp }
+      },
     table .fp_set:N           = \l__eb_spread_table_fp,
     table .initial:n          = 1.354,
     math .fp_set:N            = \l__eb_spread_math_fp,
@@ -2302,7 +2307,7 @@
   }
 %</package>
 %<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2022/03/06}{1.64}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2022/03/06}{1.641}
   {Customization of tcolorbox for easybook}
 
 \cs_set_protected:Npn \addtotcbstyle #1#2
diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf
index 2de13178dc..db967b2641 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 fc6d6ec086..26b7f8986a 100644
--- a/macros/latex/contrib/easybook/easybook.tex
+++ b/macros/latex/contrib/easybook/easybook.tex
@@ -21,7 +21,7 @@
     name            = easybook,
     color-scheme    = blue,
     title           = EASYBOOK使用手册,
-    version         = v1.64,
+    version         = v1.641,
     date            = 2022/03/06,
     authors         = 瞿毅,
     info            = 简便地排版中文学位论文或书籍,
@@ -551,8 +551,8 @@
 \label{subsec:spacing}
 行距因子用于设置各种行距倍数，\meta{数值} 是不带有长度单位的浮点数。各类行距既可以在导言区全局设置，也可以在正文中设置对后面生效。
 \begin{options}
-  \keyval{line}{数值}\Module{spread}\Default{1.354}
-  正文行距因子，注意 \CTeX 宏集原有的行距选项 \option*{linespread} 失效。
+  \keyval{line}{数值}\Module{spread}
+  正文行距因子。行距因子初始值为 \code{1.354}（相当于 \textsf{Word} 的1.25倍行距），如果设置了文类或 \pkg*{ctex} 宏包的全局行距选项 \option*{linespread} 则初始值设为它的值。
   \keyval{table}{数值}\Default{1.354}
   表格内容行距因子。对传统表格 \env*{tabular} 和 \env*{tabularx} 等环境以及 \pkg*{tabularray} 宏包的 \env{tblr} 环境生效，同时 \env{tblr} 也自带有 \option*{stretch} 选项设置行距系数。
   \keyval{math}{数值}\Default{1.354}
@@ -609,7 +609,7 @@
   \keychoice{bibstyle}{numerical,authoryear,other sty}\Default{numerical}
   参考文献格式使用中国参考文献推荐标准GB/T 7714-2015，对应顺序编码制和著者—出版年制两种风格。若使用其它格式，使用 \hologo{BibTeX} 处理时需确保正确的 \code{bst} 文件，使用 \hologo{biber} 处理可使用 \pkg*{biblatex} 宏包支持的参考文献风格名称。
   \keyval{citestyle}{标注风格}
-  标注参考文献的风格。选项 \keyis{backend}{bibtex} 下可使用 \option{super}（数字上标标注，默认）或 \option{numbers}（数字标注）等 \pkg*{natbib} 宏包带有的标注风格，选项 \keyis{backend}{biblatex} 下可使用 \pkg*{biblatex} 宏包支持的标注风格名称。
+  标注参考文献的风格。后端为 \code{bibtex} 时可使用 \option{super}（数字上标标注，默认）或 \option{numbers}（数字标注）等 \pkg*{natbib} 宏包带有的标注风格，后端为 \code{biblatex} 时可使用 \pkg*{biblatex} 宏包支持的标注风格。
   \keyval{datafile}{数据库列表}
   参考文献数据库的文件名列表，文件列表以花括号包裹并以英文逗号分隔。使用 \hologo{biber} 处理时要带有 \code{bib} 后缀，若参考文献文件不在当前文件夹则文件名需要包含路径。不设置参考文献数据库名时 \module*{bibset} 模块中的选项会失效，即不自动载入 \pkg*{natbib} 或 \pkg*{biblatex} 宏包，此时需要手动载入相关宏包配置参考文献。
 \end{options}
@@ -632,12 +632,14 @@
   使用由 \cs*{defbibfilter} 定义的 \option*{filter} 来过滤条目。
   \end{options}
 
-  可能在一些情况下您希望更加灵活地设置参考文献或有更多需求，下面举一个在导言区手动配置 \pkg*{biblatex} 宏包的例子：
+  可能在一些情况下您希望更加灵活地设置参考文献或有更多需求，下面举一个在导言区手动配置 \pkg*{biblatex} 宏包并使一个条目\textbf{同时输出}双语文献的例子：
   \begin{ctexexam}
   \usepackage[style = numeric]{biblatex}
   \addbibresource{myrefs.bib}
   \defbibheading{bibliography}[参考文献] % 定义参考文献标题
     {\chapter*{#1}\markboth{#1}{#1}}
+  \defbibentryset{Zhang2022}{张三2022,ZhangSan2022}
+  \cite{Zhang2022} % 在正文中引用
   \end{ctexexam}
 \end{commands}
 
@@ -709,7 +711,7 @@
 
 \subsection{页面尺寸}
 \label{subsec:page margins}
-模块 \module*{geoset} 会将除了前两个附加的选项交给页面尺寸宏包 \pkg*{geometry} 处理，并且支持它的键值列表，预置的页面尺寸与 \cls*{Word} 的默认值接近。下面列举几种代表性选项，其它选项可查阅宏包帮助文档。当在此设置纸张规格时，会覆盖文类选项 \option{paper} 的设置。
+模块 \module*{geoset} 会将除了前两个附加的选项交给页面尺寸宏包 \pkg*{geometry} 处理，并且支持它的键值列表，预置的页面尺寸与 \textsf{Word} 的默认值接近。下面列举几种代表性选项，其它选项可查阅宏包帮助文档。当在此设置纸张规格时，会覆盖文类选项 \option{paper} 的设置。
 \begin{options}\noitemsep
   \keyval{headruleskip}{页眉线间距}\Module{geoset}\Default*{0pt}
   \keyval{footruleskip}{页脚线间距}\Default*{3.5pt}
@@ -1085,10 +1087,10 @@
     }
   \newtcolorbox{mytcbox}[1][]{enhanced,mytcb,title = #1}
   \begin{tcolorbox}[mytcb,enhanced]
-    盒子内容1
+    盒子内容
   \end{tcolorbox}
   \begin{mytcbox}[盒子标题]
-    盒子内容2
+    盒子内容
   \end{mytcbox}
   \end{ctexexam}
 \end{commands}
@@ -1125,7 +1127,7 @@
   单位格式化命令 \cs*{unit} 包含文字元素（例如字母或数字）时，使用 \Marg{.} 和 \code{\~{}} 放置在单元乘积中间，并使用 \code{\_} 和 \code{\^{}} 正确放置指定的下标和上标。格式化方法可在数学和文本模式下使用。
   \command*{qty}[\oarg{键值列表}\marg{数字}\oarg{前缀}\marg{单位}]
   命令 \cs*{qty} 可用来输出带有单位的量。
-  \command*{qtyrange}[\oarg{键值列表}\marg{数字1}\marg{数字2}\marg{单位}]
+  \command*{qtyrange}[\oarg{键值列表}\marg{起始数字}\marg{结束数字}\marg{单位}]
   命令 \cs*{qtyrange} 可以输出带有范围和单位的量。
   \begin{ctexexam}
   \numproduct{-21x3e5}
@@ -1179,7 +1181,7 @@
 \begin{commands}\noitemsep
   \command{caption}[\sarg\oarg{目录标题}\marg{标题}]\default{}
   \command{captionof}[\sarg\marg{条目名}\oarg{目录标题}\marg{标题}]\default{}
-  \command{bicaption}[\sarg\oarg{目录标题1}\marg{标题1}\oarg{目录标题2}\marg{标题2}]
+  \command{bicaption}[\sarg\oarg{目录中文标题}\marg{中文标题}\oarg{目录英文标题}\marg{英文标题}]
   题注命令 \cs{caption} 用于在图表上下方插入题注，需要在浮动体环境 \env*{figure} 和 \env*{table} 中使用。在浮动环境外可以使用 \cs{captionof} 命令，第一个参数指定条目名。可以搭配 \pkg*{newfloat} 宏包创建更多类型的浮动环境并设置相应题注。\cs{bicaption} 命令可以实现中英文双语题注，需要在导言区载入 \pkg*{bicaption} 宏包，具体用法见说明文档。
 \end{commands}
 
diff --git a/macros/latex/contrib/footmisc/changes.txt b/macros/latex/contrib/footmisc/changes.txt
index b5389c24db..8471cde6e0 100644
--- a/macros/latex/contrib/footmisc/changes.txt
+++ b/macros/latex/contrib/footmisc/changes.txt
@@ -1,8 +1,15 @@
+2022-03-07  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
+
+	* footmisc.dtx (subsection{The other footnote commands}):
+	Fix an issue in the perpage package (gh/03)
+	Footnotes on chapter pages in report/book class started with 2.
+	This should really be fixed in the perpage package.
+
 2022-02-14  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
 
 	* footmisc.dtx:
 	Corrected the "bottom" option so that it behaves like in v5. Dropped
-	"bottomfloats" because everxything can be expressed with combinations
+	"bottomfootnotes", because everything can be expressed with combinations
 	of the four options "bottom" (footnotes at the bottom), "bottomfloats",
 	"abovefloats", and "belowfloats". (gh/1)
 
diff --git a/macros/latex/contrib/footmisc/footmisc-code.pdf b/macros/latex/contrib/footmisc/footmisc-code.pdf
index 3707200bb3..d1428e73fd 100644
--- a/macros/latex/contrib/footmisc/footmisc-code.pdf
+++ b/macros/latex/contrib/footmisc/footmisc-code.pdf
diff --git a/macros/latex/contrib/footmisc/footmisc-doc.pdf b/macros/latex/contrib/footmisc/footmisc-doc.pdf
index 93f3d0f8ce..71f7811af1 100644
--- a/macros/latex/contrib/footmisc/footmisc-doc.pdf
+++ b/macros/latex/contrib/footmisc/footmisc-doc.pdf
diff --git a/macros/latex/contrib/footmisc/footmisc.dtx b/macros/latex/contrib/footmisc/footmisc.dtx
index 2a9ea7bc13..c3a31d2e6a 100644
--- a/macros/latex/contrib/footmisc/footmisc.dtx
+++ b/macros/latex/contrib/footmisc/footmisc.dtx
@@ -38,7 +38,7 @@
 %<+package>\DeclareCurrentRelease{}{2022-02-14}
 %<package>\ProvidesPackage{footmisc}%
 %<*!debugins>
-        [2022/02/14 v6.0b
+        [2022/03/07 v6.0c
 %</!debugins>
 %<package>     a miscellany of footnote facilities%
 %<*dtx>
@@ -410,8 +410,8 @@
 %
 % This is automatically corrected if \pkg{footmisc} is loaded with any
 % of the options that deal with footnote placement, i.e.,
-% \texttt{abovefloats}, \texttt{belowfloats}, \texttt{bottom},
-% \texttt{bottomfloats}, or \texttt{bottomfootnotes}. In particular,
+% \texttt{abovefloats}, \texttt{belowfloats}, \texttt{bottom}, or
+% \texttt{bottomfloats}. In particular,
 % if you want to have the standard \LaTeX{} placement (but with this
 % strange behavior fixed, apply \texttt{abovefloats} (which is the
 % normal order but with the bug fixed).
@@ -420,7 +420,7 @@
 % \subsection{Option \texttt{marginal}}
 %
 % This option adjusts the position of footnote mark relative to the
-% start of the line in which they appear (the the option is
+% start of the line in which they appear (the option is
 % incompatible with option \texttt{para}, for obvious reasons).
 %
 % When this option is in effect, the footnote is set
@@ -443,7 +443,7 @@
 % This option sets the footnote mark flush with the margin, and makes
 % the body of the footnote hang at an indentation of
 % \cs{footnotemargin} (if that is a positive distance), or the width
-% of the marker (if \cs{footnotemargin}$\leq0$).  The option code
+% of the marker (if \cs{footnotemargin} $\leq0$).  The option code
 % itself leaves \cs{footnotemargin} at its default value of 1.8em.
 %
 % The footnote itself may of course be longer than one paragraph; if
@@ -873,7 +873,7 @@
 %
 % \subsubsection{The \texttt{bottomfloats} option}
 %
-% \begin{macro}{ds@bottomfloats,ds@bottomfootnotes}
+% \begin{macro}{ds@bottomfloats}
 %    This option is for case 2. By default the footnotes are above
 %    (close to the text).
 %    \begin{macrocode}
@@ -1858,6 +1858,34 @@
 \ifFN@perpage
   \RequirePackage{perpage}
   \MakePerPage{footnote}
+%    \end{macrocode}
+%    Unfortunately \pkg{perpage} has a bug and doesn't handle founters
+%    correctly which are part of a reset list of another counter,
+%    e.g., it doesn't work correctly if you use the report class which
+%    resets footnotes at each chapter start. As a result the first
+%    footnote on the first page of a chapter starts with 2. We
+%    therefore alter one \LaTeX{} internal if \pkg{perpage} is in use:
+% \changes{v6.0c}{2022/03/07}{Fix an issue in perpage packag (gh/03)}
+%    \begin{macrocode}
+  \def\@stpelt#1{\global\csname c@#1\endcsname \m@ne
+    \stepcounter{#1}%
+    \setcounter{#1}{0}%
+  }
+%    \end{macrocode}
+%    The above code may look a bit odd: the \cs{stepcounter} sets
+%    the counter to zero and then the \cs{setcounter} does the
+%    same. The reason is that \cs{stepcounter} resets other counters
+%    and when perpage is loaded this results in updating counters on
+%    the reset list to 1, which is precisely the problem here. So
+%    the second \cs{setcounter} undoes this if it happens.
+%
+%    But to make this fully work we also need to update a suport
+%    command in \pkg{perpage}:
+%    \begin{macrocode}
+  \def\pp@cl@end@iii\stepcounter#1\setcounter#2#3{}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
 \fi
 %    \end{macrocode}
 %