From 46b6c321a2ff14698b756600bffb54d5d5fc3772 Mon Sep 17 00:00:00 2001
From: Norbert Preining <norbert@preining.info>
Date: Thu, 23 Mar 2023 03:01:33 +0000
Subject: CTAN sync 202303230301

---
 .../themes/beamertheme-arguelles/README.md         |   4 +-
 .../beamercolorthemeArguelles.sty                  |   4 +-
 .../beamerfontthemeArguelles.sty                   |   4 +-
 .../beamerinnerthemeArguelles.sty                  |   4 +-
 .../beamerouterthemeArguelles.sty                  |   4 +-
 .../beamertheme-arguelles/beamerthemeArguelles.sty |  43 ++++++---
 .../beamertheme-arguelles/demo/demo-arguelles.tex  |   2 +-
 macros/latex/contrib/hfutexam/CHANGELOG.md         |   5 +
 macros/latex/contrib/hfutexam/hfutexam.cls         |  32 ++++---
 macros/latex/contrib/hfutexam/hfutexam.pdf         | Bin 205967 -> 217180 bytes
 macros/latex/contrib/hfutexam/hfutexam.tex         |  82 ++++++++--------
 .../latex/contrib/hfutexam/hfutexam_cankaodaan.pdf | Bin 94308 -> 94295 bytes
 .../latex/contrib/hfutexam/hfutexam_cankaodaan.tex |   4 +-
 macros/latex/contrib/hfutexam/hfutexam_datizhi.pdf | Bin 71061 -> 72652 bytes
 macros/latex/contrib/hfutexam/hfutexam_datizhi.tex |   7 +-
 macros/latex/contrib/hfutexam/hfutexam_shijuan.pdf | Bin 95264 -> 95069 bytes
 macros/latex/contrib/hfutexam/hfutexam_shijuan.tex |  18 +---
 macros/latex/contrib/hfutexam/hfutexam_simple.pdf  | Bin 112375 -> 112298 bytes
 macros/latex/contrib/hfutexam/hfutexam_simple.tex  |   9 +-
 macros/latex/contrib/l3build/CHANGELOG.md          |  13 ++-
 macros/latex/contrib/l3build/README.md             |   2 +-
 macros/latex/contrib/l3build/l3build-check.lua     |   5 +-
 macros/latex/contrib/l3build/l3build-variables.lua |   4 +-
 macros/latex/contrib/l3build/l3build.1             |   2 +-
 macros/latex/contrib/l3build/l3build.dtx           |  23 ++++-
 macros/latex/contrib/l3build/l3build.lua           |   2 +-
 macros/latex/contrib/l3build/l3build.pdf           | Bin 742027 -> 743297 bytes
 macros/texinfo/latest/texinfo.tex                  | 103 ++++++++-------------
 28 files changed, 209 insertions(+), 167 deletions(-)

(limited to 'macros')

diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/README.md b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/README.md
index f8408448f7..5382e8cdb4 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/README.md
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/README.md
@@ -1,5 +1,5 @@
 <!--
-arguelles v2.1.0
+arguelles v2.2.0
 author: Michele Piazzai
 contact: michele.piazzai@uc3m.es
 license: MIT
@@ -33,6 +33,8 @@ By default, the theme uses serif fonts for body text. Loading it with the `sans`
 
 The `frameno` option adds frame numbering in the bottom right corner of each frame. By default, frame numbers are hidden on title and plain frames. They can also be suppressed on individual frames by `\begin{frame}[noframenumbering]`.
 
+The `splitnav` option makes the navigation bar in the headline display only the current section and its frames. This could be preferable if your presentation has only a few sections, which do not adequately fill the headline, or if it has a lot of sections and the headline looks too crowded.
+
 The `mp` option loads additional dependencies that could be useful for designing scientific presentations. These currently include [ulem](https://ctan.org/pkg/ulem), [booktabs](https://ctan.org/pkg/booktabs), [dcolumn](https://ctan.org/pkg/dcolumn), [makecell](https://ctan.org/pkg/makecell), [colortbl](https://www.ctan.org/pkg/colortbl), [cancel](https://www.ctan.org/pkg/cancel), [pgfplots](https://www.ctan.org/pkg/pgfplots), and [csvsimple](https://www.ctan.org/pkg/csvsimple). In addition, the option loads the [calc](https://tikz.dev/library-calc) library for TikZ, and the [statistics](https://tikz.dev/pgfplots/libs-statistics) and [fillbetween](https://tikz.dev/pgfplots/libs-fillbetween) libraries for PGFplots.
 
 ## Customization
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamercolorthemeArguelles.sty b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamercolorthemeArguelles.sty
index 36ffbdad99..3f9b398074 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamercolorthemeArguelles.sty
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamercolorthemeArguelles.sty
@@ -1,10 +1,10 @@
-% arguelles v2.1.0
+% arguelles v2.2.0
 % author: Michele Piazzai
 % contact: michele.piazzai@uc3m.es
 % license: MIT
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamercolorthemeArguelles}[2023/02/02 Argüelles]
+\ProvidesPackage{beamercolorthemeArguelles}[2023/03/22 Argüelles]
 
 \mode<presentation>
 
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerfontthemeArguelles.sty b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerfontthemeArguelles.sty
index 5e637f9ce4..c1b7e74267 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerfontthemeArguelles.sty
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerfontthemeArguelles.sty
@@ -1,10 +1,10 @@
-% arguelles v2.1.0
+% arguelles v2.2.0
 % author: Michele Piazzai
 % contact: michele.piazzai@uc3m.es
 % license: MIT
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerfontthemeArguelles}[2023/02/02 Argüelles]
+\ProvidesPackage{beamerfontthemeArguelles}[2023/03/22 Argüelles]
 
 \mode<presentation>
 
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerinnerthemeArguelles.sty b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerinnerthemeArguelles.sty
index 88ee7563f7..fb5ffd180c 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerinnerthemeArguelles.sty
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerinnerthemeArguelles.sty
@@ -1,10 +1,10 @@
-% arguelles v2.1.0
+% arguelles v2.2.0
 % author: Michele Piazzai
 % contact: michele.piazzai@uc3m.es
 % license: MIT
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerinnerthemeArguelles}[2023/02/02 Argüelles]
+\ProvidesPackage{beamerinnerthemeArguelles}[2023/03/22 Argüelles]
 
 \mode<presentation>
 
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerouterthemeArguelles.sty b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerouterthemeArguelles.sty
index 7eee0e9c2f..c1c7350506 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerouterthemeArguelles.sty
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerouterthemeArguelles.sty
@@ -1,10 +1,10 @@
-% arguelles v2.1.0
+% arguelles v2.2.0
 % author: Michele Piazzai
 % contact: michele.piazzai@uc3m.es
 % license: MIT
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerouterthemeArguelles}[2023/02/02 Argüelles]
+\ProvidesPackage{beamerouterthemeArguelles}[2023/03/22 Argüelles]
 
 \mode<presentation>
 
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerthemeArguelles.sty b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerthemeArguelles.sty
index af6b9f7854..817e780bea 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerthemeArguelles.sty
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerthemeArguelles.sty
@@ -1,13 +1,41 @@
-% arguelles v2.1.0
+% arguelles v2.2.0
 % author: Michele Piazzai
 % contact: michele.piazzai@uc3m.es
 % license: MIT
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerthemeArguelles}[2023/02/02 Argüelles]
+\ProvidesPackage{beamerthemeArguelles}[2023/03/22 Argüelles]
 
 \mode<presentation>
 
+\newif\if@optSans
+\@optSansfalse
+\DeclareOption{sans}{\@optSanstrue}
+\newif\if@optFrameno
+\@optFramenofalse
+\DeclareOption{frameno}{\@optFramenotrue}
+\newif\if@optSplitnav
+\@optSplitnavfalse
+\DeclareOption{splitnav}{\@optSplitnavtrue}
+\newif\if@optMp
+\@optMpfalse
+\DeclareOption{mp}{\@optMptrue}
+\ProcessOptions
+
+% split navigation
+\if@optSplitnav
+\useoutertheme[subsection=false]{miniframes}
+\setbeamertemplate{mini frame in other section}{}
+\RequirePackage{etoolbox}
+\let\beamer@section@set@min@width=\relax
+\patchcmd{\insertnavigation}{\hskip-1.875ex plus-1fill}{}{}{}
+\patchcmd{\sectionentry}{\hskip1.875ex plus 1fill}{}{}{}
+\patchcmd{\sectionentry}{\hyperlink{Navigation#3}{{\usebeamertemplate{section in head/foot shaded}}}}{}{}{}
+\patchcmd{\slideentry}{\usebeamertemplate{mini frame in other subsection}}{\usebeamertemplate{mini frame in other subsection of current section}}{}{}
+\patchcmd{\slideentry}{\usebeamertemplate{mini frame in other subsection}}{\usebeamertemplate{mini frame in other section}}{}{}
+\patchcmd{\slideentry}{\usebeamertemplate{mini frame in other subsection of current section}}{\usebeamertemplate{mini frame in other subsection}}{}{}
+\fi
+
 % dependencies
 \RequirePackage[utf8]{inputenc}
 \RequirePackage[T1]{fontenc}
@@ -28,17 +56,6 @@
 \usecolortheme{Arguelles}
 \usefonttheme{Arguelles}
 
-\newif\if@optSans
-\@optSansfalse
-\DeclareOption{sans}{\@optSanstrue}
-\newif\if@optFrameno
-\@optFramenofalse
-\DeclareOption{frameno}{\@optFramenotrue}
-\newif\if@optMp
-\@optMpfalse
-\DeclareOption{mp}{\@optMptrue}
-\ProcessOptions
-
 % sans font
 \if@optSans
 \usefonttheme[onlymath]{serif}
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/demo/demo-arguelles.tex b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/demo/demo-arguelles.tex
index caa0604b40..7ed3abb8ae 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/demo/demo-arguelles.tex
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/demo/demo-arguelles.tex
@@ -1,4 +1,4 @@
-% arguelles v2.1.0
+% arguelles v2.2.0
 % author: Michele Piazzai
 % contact: michele.piazzai@uc3m.es
 % license: MIT
diff --git a/macros/latex/contrib/hfutexam/CHANGELOG.md b/macros/latex/contrib/hfutexam/CHANGELOG.md
index 1e2dd6ee64..08fa6e7daf 100644
--- a/macros/latex/contrib/hfutexam/CHANGELOG.md
+++ b/macros/latex/contrib/hfutexam/CHANGELOG.md
@@ -1,5 +1,10 @@
 # 更新日志
 
+## [1.8] - 2023/03/22
++ 修复了正文设置字体大小会导致中英文字体大小不一致的问题。
++ 将简易模式的各个部分标题添加至目录中。
++ 调整了 `\fillblank` 命令在不同模式下的默认高度.
+
 ## [1.7] - 2023/03/10
 + 精简了文档类的代码。
 + 将伪粗体权重统一设置为3以更接近Word的加粗效果。
diff --git a/macros/latex/contrib/hfutexam/hfutexam.cls b/macros/latex/contrib/hfutexam/hfutexam.cls
index a8eb76dae0..1d47cffcb7 100644
--- a/macros/latex/contrib/hfutexam/hfutexam.cls
+++ b/macros/latex/contrib/hfutexam/hfutexam.cls
@@ -7,7 +7,7 @@
 % 编译模式： XeLaTeX
 % 你可以任意修改或再次分发该文件
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{hfutexam}[2023/03/10 v1.7 HFUTExam document class by Zhang Shenxing]
+\ProvidesClass{hfutexam}[2023/03/22 v1.8 HFUTExam document class by Zhang Shenxing]
 % 文档选项
 \newif\ifhfut@ShiJuan\hfut@ShiJuantrue
 \newif\ifhfut@DaTiZhi\hfut@DaTiZhifalse
@@ -46,8 +46,8 @@
 \newcommand{\hfutstretch}{1.5} % 下划线内两侧空格长度除以条目之间空格长度
 \newcommand{\hfutul}[1]{\uline{\hspace{\stretch{\hfutstretch}}#1\hspace{\stretch{\hfutstretch}}}}
 \newcommand{\hfutrule}[1]{\rule{#1}{0mm}}
-\newcommand{\hfutboxyes}{{\raisebox{-0.5mm}{\LARGE$\checkmark\hspace{-18pt}\square$}}}
-\newcommand{\hfutboxno}{{\raisebox{-0.5mm}{\LARGE$\square$}}}
+\newcommand{\hfutboxyes}{{\raisebox{-2pt}{\LARGE$\checkmark\hspace{-18pt}\square$}}}
+\newcommand{\hfutboxno}{{\raisebox{-2pt}{\LARGE$\square$}}}
 \newcommand{\XueNian}[2]{\gdef\hfut@XueNian{{\hfutFontTimes #1}～{\hfutFontTimes #2}}}
 \newcommand{\BiaoTi}[1]{\gdef\hfut@BiaoTi{#1}}
 \newcommand{\XueQi}[1]{\gdef\hfut@XueQi{#1}}
@@ -90,12 +90,13 @@
 \newcommand{\hfutFontTitle}{\CJKfamily{hfutFontTitle}\hfutFontTitleEn}
 \newcommand{\hfutFontHead}{\hfutFontHeadEn\CJKfamily{hfutFontHead}}
 % 重新设定字体大小
-\renewcommand{\LARGE}{\fontsize{21pt}{25.2pt}}
-\renewcommand{\large}{\fontsize{14pt}{21pt}}
-\renewcommand{\small}{\fontsize{10.5pt}{12.6pt}}
+\renewcommand{\LARGE}{\fontsize{21pt}{25.2pt}\selectfont}
+\renewcommand{\large}{\fontsize{14pt}{21pt}\selectfont}
+\renewcommand{\small}{\fontsize{10.5pt}{12.6pt}\selectfont}
 % 缩进
 \setlength{\parindent}{0em}
 \renewcommand{\indent}{\hspace*{2em}}
+\newlength{\ltemp}
 % 页眉页脚
 \pagestyle{fancy}
 \fancyhf{}
@@ -132,6 +133,10 @@
 		1. 主考教师必须于考试一周前将“试卷A”、“试卷B”经教研室主任审批签字后送教务科印刷。\hspace{1em}%
 		2. 请命题教师用黑色水笔工整地书写题目或用A4纸横式打印贴在试卷版芯中。
 	}
+	\NewDocumentCommand\fillblank{O{35mm} O{5mm} m}{%
+		\settodepth{\ltemp}{#3}%
+		\uline{\makebox[#1]{\rule{0pt}{#2}\raisebox{\ltemp}{#3}}}%
+	}
 \fi
 \ifhfut@DaTiZhi % 答题纸页眉页脚
 	\renewcommand\headrulewidth{0.5pt}
@@ -154,13 +159,17 @@
 		\hfill 成绩\hfutul{\hfutrule{6em}}%
 	}
 	\fancyfoot[C]{\small\vspace{0.5\baselineskip}第~\hfutpage~页~~共~\hfutlastpage~页}
+	\NewDocumentCommand\fillblank{O{35mm} O{9mm} m}{%
+		\settodepth{\ltemp}{#3}%
+		\uline{\makebox[#1]{\rule{0pt}{#2}\raisebox{\ltemp}{#3}}}%
+	}
 \fi
 \ifhfut@Simple % 简单模式页眉页脚
 	\RequirePackage{hyperref}
 	\renewcommand\headrulewidth{0pt}
 	\renewcommand\footrulewidth{0pt}
 	\renewcommand{\maketitle}{%
-		\pdfbookmark{\hfut@BiaoTi}{hfutBiaoTi\thepage}
+		\addcontentsline{toc}{section}{\hfut@BiaoTi}
 		\begin{center}\bfseries
 			\makebox[\linewidth][s]{\LARGE\hfutFontTitle~\hfut@BiaoTi~}
 			
@@ -173,6 +182,10 @@
 		\end{center}
 	}
 	\fancyfoot[C]{\small{}第~\hfutpage~页~~共~\hfutlastpage~页}
+	\NewDocumentCommand\fillblank{O{35mm} O{5mm} m}{%
+		\settodepth{\ltemp}{#3}%
+		\uline{\makebox[#1]{\rule{0pt}{#2}\raisebox{\ltemp}{#3}}}%
+	}
 \fi
 % 题号加粗
 \renewcommand{\labelenumi}{{\bfseries \theenumi.}}
@@ -199,15 +212,10 @@
 	{\leavevmode\xleaders\hbox{\rule[4pt]{8pt}{0.5pt}\,}\hfill\null}%
 }
 % 填空题
-\newlength{\ltemp}
 \newlength{\lxxmax}
 \newlength{\lquar}
 \newlength{\lhalf}
 \newlength{\lfull}
-\NewDocumentCommand\fillblank{O{35mm} O{5mm} m}{%
-	\settodepth{\ltemp}{#3}%
-	\uline{\makebox[#1]{\rule{0pt}{#2}\raisebox{\ltemp}{#3}}}%
-}
 % 选择题, 根据选项内容长度自动排版
 \newcounter{lxxtype}
 \NewDocumentCommand\xx{O{0} m m m m}{%
diff --git a/macros/latex/contrib/hfutexam/hfutexam.pdf b/macros/latex/contrib/hfutexam/hfutexam.pdf
index 69731d6fbc..4424f31160 100644
Binary files a/macros/latex/contrib/hfutexam/hfutexam.pdf and b/macros/latex/contrib/hfutexam/hfutexam.pdf differ
diff --git a/macros/latex/contrib/hfutexam/hfutexam.tex b/macros/latex/contrib/hfutexam/hfutexam.tex
index 0579704f5a..a65dc0a794 100644
--- a/macros/latex/contrib/hfutexam/hfutexam.tex
+++ b/macros/latex/contrib/hfutexam/hfutexam.tex
@@ -15,7 +15,6 @@
 	basicstyle=\couriernew\color{blue},
 	rulecolor=\color{black},
 	texcsstyle=*\color{red},
-	mathescape,
 	breaklines=true,
 	commentstyle=\color{green!70!black},
 	stringstyle=\color{green!50!blue},
@@ -52,33 +51,34 @@
 \MingTiJiaoShi{集体}
 \XiZhuRenQianMing{}
 
+\indent
+本模板 (2023/03/22 v1.8) 旨在为将合肥工业大学试卷的 word 格式转为\LaTeX{}格式.
+\textbf{\color{red}使用前请注意, 如果你使用的是CTeX套装, 请彻底删除并安装MikTeX发行版, 否则编译会出错.}
+如果需要的话, 你可以单独安装WinEdt编辑器.
 
 \tigan{一、模板选项}
 
 \indent
-本模板 (2023/03/10 v1.7) 旨在为将合肥工业大学试卷的 word 格式转为\LaTeX{}格式.
-使用时, 只需在文档开头写上
+只需在文档开头写上
 \begin{lstlisting}
 \documentclass[shijuan]{hfutexam}
 \end{lstlisting}
 即可使用.
 需要使用~{\color{blue}{\lstinline|UTF-8|}} 编码, 并使用 \lstinline|XeLaTeX| 至少编译两次, 以正确生成页码.
-
-\indent
-可使用的选项为: \lstinline|shijuan| (试卷), \lstinline|datizhi| (答题纸), \lstinline|cankaodaan| (参考答案) 和 \lstinline|simple| (简易模式). 如果留空则为默认值 \lstinline|shijuan| (试卷).
+可使用的选项为: \lstinline|shijuan| (试卷, 为缺省值), \lstinline|datizhi| (答题纸和参考答案) 和 \lstinline|simple| (简易模式).
 \begin{enumerate}
-\item 试卷/答题纸/参考答案三个选项下页面会设置为 A3 大小的双栏模式, 相应的标题、页眉和页脚内容有所不同.
-\item 简易模式选项下页面会设置为 A4 大小, 页眉页脚也较为简单. 此时需要使用命令 \lstinline|\maketitle| 来生成标题.
-一般用于保存(多张)试卷的内容，或者便于打印使用.
-\item 标题默认使用方正字体, 因此请在使用前先安装字体: {\bfseries\hfutFontTitle 方正小标宋}和{\bfseries\hfutFontHead 方正仿宋}(右键选择为所有用户安装), 否则请使用选项 \lstinline|nofangzheng| (采用新宋体和仿宋代替).
+\item 试卷、答题纸和参考答案页面为 A3 大小双栏模式, 并自动生成相应的标题和页眉页脚.
+\item 简易模式页面为 A4 大小. 此时需要使用命令 \lstinline|\maketitle| 来生成标题.
+该模式一般用于保存(多张)试卷的内容，且便于打印以分发试卷和参考答案.
+\item 标题为方正字体, 请在使用前自行搜索并安装字体: {\bfseries\hfutFontTitle 方正小标宋}和{\bfseries\hfutFontHead 方正仿宋}(右键选择为所有用户安装).
+若不愿使用方正字体可使用选项 \lstinline|nofangzheng| 以采用新宋体和仿宋代替.
+\item 本模板\textbf{不支持使用字体大小选项}, 可在正文中使用诸如 \lstinline|\large| 等命令来调整.
 \end{enumerate}
 
 \tigan{二、试卷信息}
 
 \indent
-通过下述命令来设置试卷信息.
-
-\textit{\color{blue}{试卷信息示例:}}
+下述命令用于设置试卷信息:
 \begin{lstlisting}
 \BiaoTi{合肥工业大学试卷（A）} % 试卷标题, 一般为: 合肥工业大学试卷（A）或（B)
 \XueNian{2021}{2022}                 % 学年起始和结束, 一般为相差 1 的 4 位数字
@@ -99,8 +99,9 @@
 
 \tigan{三、解答题}
 \begin{enumerate}
-\item \lstinline|\hfutstretch{1.5}| 用于设置标题中\uline{带下划线文字两侧空格}与\uline{各分项之间空格}的宽度比, 默认为\lstinline|1.5|.
-\item \lstinline|\tigan{三、解答题}| 用于生成题干, 为14pt黑体. 小题用~{\color{blue}\lstinline|enumerate|} 环境来生成.
+\item \lstinline|\renewcommand{\hfutstretch}{1.5}| 用于重新设置标题中\underline{带下划线文字两侧空格}与\underline{各分项之间空格}的宽度比, 默认为\lstinline|1.5|. \textbf{一般无需修改该值}.
+\item \lstinline|\tigan{三、解答题}| 用于生成题干, 为14pt黑体. 小题可用~{\color{blue}\lstinline|enumerate|} 环境来生成.
+如觉格式不妥也可不用该命令而使用\lstinline|\textbf{}|, 或任意自行设置.
 \item \hspace{-8mm}\scorebox\hspace{8mm}\lstinline|\scorebox| 用于生成打分框, 请放置在答题纸一行的开头使用.
 \vspace{-2mm}
 \item \lstinline|\notice| 用于生成答题纸提示信息, 请放置在答题纸的正文开始处.
@@ -110,58 +111,59 @@
 
 \tigan{填空题相关}
 \begin{enumerate}[resume]
-\item \lstinline|\fillblank[长度][最低高度]{内容}| 用于生成填空题的空白, 内容可以为空. 其中长度默认值是~{\color{blue}{\lstinline|35mm|}}, 最低高度默认值是~{\color{blue}{\lstinline|5mm|}}.
+\item \lstinline|\fillblank[长度][最低高度]{内容}| 用于生成填空题的空白, 内容可以为空. 其中长度默认值是~{\color{blue}{\lstinline|35mm|}}, 最低高度默认值是~{\color{blue}{\lstinline|5mm|}} (答题纸和参考答案则为~{\color{blue}{\lstinline|9mm|}}).
 \end{enumerate}
 
 \textit{\color{blue}{填空题示例:}}
 \begin{lstlisting}
-\textbf{请将你的答案对应填在横线上：}\\[5mm]
+\textbf{请将你的答案对应填在横线上：}\\
 \textbf{1.} \fillblank{}, 
 \textbf{2.} \fillblank[5cm]{}, 
-\textbf{3.} \fillblank{}.
+\textbf{3.} \fillblank{$\dfrac\pi2$}.
 \end{lstlisting}
 
 \begin{tcolorbox}
-\textbf{请将你的答案对应填在横线上：}\\[5mm]
+\textbf{请将你的答案对应填在横线上：}\\
 \textbf{1.} \fillblank{}, 
-\textbf{2.} \fillblank[5cm]{}, 
-\textbf{3.} \fillblank{}.
+\textbf{2.} \fillblank[5cm][9mm]{}, 
+\textbf{3.} \fillblank{$\dfrac\pi2$}.
 \end{tcolorbox}
 
 \tigan{选择题相关}
 \begin{enumerate}[resume]
-\item \lstinline|\xx{选项}{选项}{选项}{选项}| 用于生成选择题的选项, 直接在选择题题干后使用即可. 该命令会自动根据选项长度设置行数. 只支持四个选项, 选项会自动带上 ABCD.
-\item 该命令具有可选参数: \lstinline|\xx[每行显示的选项数]{选项}{选项}{选项}{选项}|, 每行只能显示 1, 2 或 4 个选项.
+\item \lstinline|\xx[可选参数]{选项}{选项}{选项}{选项}| 用于生成选择题的选项, 直接在选择题题干后使用即可. 只支持四个选项, 选项会自动带上 ABCD.
+该命令会自动根据选项长度设置行数.
+可选参数用于手动设置每行显示的选项个数, 只能是 1, 2 或 4.
 \item \lstinline|\xuanzeti{题号}{答案}| 用于生成答题纸或参考答案中选择题的答题区域.
 \end{enumerate}
 
 \textit{\color{blue}{选择题示例:}}
 \begin{lstlisting}
 \begin{enumerate}
-\item 柳宗元的《江雪》包含下面哪一句? (~~~~)
-\xx[2]{一山鸟飞绝}{百山鸟飞绝}{千山鸟飞绝}{亿山鸟飞绝}
-\item 张志和的《渔歌子》是(~~~~).
-\xx{东塞山前白鹭飞，桃花流水鳜鱼肥。青箬笠，绿蓑衣，斜风细雨不须归。}
-{南塞山前白鹭飞，桃花流水鳜鱼肥。青箬笠，绿蓑衣，斜风细雨不须归。}
-{西塞山前白鹭飞，桃花流水鳜鱼肥。青箬笠，绿蓑衣，斜风细雨不须归。}
-{北塞山前白鹭飞，桃花流水鳜鱼肥。青箬笠，绿蓑衣，斜风细雨不须归。}
+	\item 柳宗元的《江雪》包含下面哪一句? (~~~~)
+		\xx[2]{一山鸟飞绝}{百山鸟飞绝}{千山鸟飞绝}{亿山鸟飞绝}
+	\item 张志和的《渔歌子》是(~~~~).
+		\xx{东塞山前白鹭飞，桃花流水鳜鱼肥。青箬笠，绿蓑衣，斜风细雨不须归。}
+		{南塞山前白鹭飞，桃花流水鳜鱼肥。青箬笠，绿蓑衣，斜风细雨不须归。}
+		{西塞山前白鹭飞，桃花流水鳜鱼肥。青箬笠，绿蓑衣，斜风细雨不须归。}
+		{北塞山前白鹭飞，桃花流水鳜鱼肥。青箬笠，绿蓑衣，斜风细雨不须归。}
 \end{enumerate}
 \end{lstlisting}
 
 \begin{tcolorbox}
 \begin{enumerate}
-\item 柳宗元的《江雪》包含下面哪一句? (~~~~).
-\xx[2]{一山鸟飞绝}{百山鸟飞绝}{千山鸟飞绝}{亿山鸟飞绝}
-\item 张志和的《渔歌子》是(~~~~).
-\xx{东塞山前白鹭飞，桃花流水鳜鱼肥。青箬笠，绿蓑衣，斜风细雨不须归。}
-{南塞山前白鹭飞，桃花流水鳜鱼肥。青箬笠，绿蓑衣，斜风细雨不须归。}
-{西塞山前白鹭飞，桃花流水鳜鱼肥。青箬笠，绿蓑衣，斜风细雨不须归。}
-{北塞山前白鹭飞，桃花流水鳜鱼肥。青箬笠，绿蓑衣，斜风细雨不须归。}
+	\item 柳宗元的《江雪》包含下面哪一句? (~~~~)
+		\xx[2]{一山鸟飞绝}{百山鸟飞绝}{千山鸟飞绝}{亿山鸟飞绝}
+	\item 张志和的《渔歌子》是(~~~~).
+		\xx{东塞山前白鹭飞，桃花流水鳜鱼肥。青箬笠，绿蓑衣，斜风细雨不须归。}
+		{南塞山前白鹭飞，桃花流水鳜鱼肥。青箬笠，绿蓑衣，斜风细雨不须归。}
+		{西塞山前白鹭飞，桃花流水鳜鱼肥。青箬笠，绿蓑衣，斜风细雨不须归。}
+		{北塞山前白鹭飞，桃花流水鳜鱼肥。青箬笠，绿蓑衣，斜风细雨不须归。}
 \end{enumerate}
 \end{tcolorbox}
 
 %\newpage
-\textit{\color{blue}{选择题示例:}}
+% \textit{\color{blue}{选择题示例:}}
 \begin{lstlisting}
 \textbf{请将你所选择的字母 A, B, C, D 之一对应填在下列表格里：}
 
@@ -184,6 +186,8 @@
 \end{enumerate}
 \textit{\color{blue}{得分点示例:}}
 \begin{lstlisting}
+所以有 $f(a)=f(b)$.\score2\\
+根据罗尔定理, 命题得证.\score1
 \[\int e^x\diff x=e^x+C. \Score{(4分, 缺少常数得2分)}\]
 \begin{align*}
 	\int\sin x\diff x&=-\cos x+C, \Score{(4分, 缺少常数得2分)}\\
@@ -192,6 +196,8 @@
 \end{lstlisting}
 
 \begin{tcolorbox}
+所以有 $f(a)=f(b)$.\score2\\
+根据罗尔定理, 命题得证.\score1
 \[\int e^x\diff x=e^x+C. \Score{(4分, 缺少常数得2分)}\]
 \begin{align*}
 \int\sin x\diff x&=-\cos x+C, \Score{(4分, 缺少常数得2分)}\\
diff --git a/macros/latex/contrib/hfutexam/hfutexam_cankaodaan.pdf b/macros/latex/contrib/hfutexam/hfutexam_cankaodaan.pdf
index 5be4a7f7c1..e4810e0a03 100644
Binary files a/macros/latex/contrib/hfutexam/hfutexam_cankaodaan.pdf and b/macros/latex/contrib/hfutexam/hfutexam_cankaodaan.pdf differ
diff --git a/macros/latex/contrib/hfutexam/hfutexam_cankaodaan.tex b/macros/latex/contrib/hfutexam/hfutexam_cankaodaan.tex
index c4e8f069b9..269a4d437a 100644
--- a/macros/latex/contrib/hfutexam/hfutexam_cankaodaan.tex
+++ b/macros/latex/contrib/hfutexam/hfutexam_cankaodaan.tex
@@ -1,6 +1,6 @@
 \documentclass[cankaodaan]{hfutexam}
-\usepackage{extarrows}
-\newcommand{\diff}{\,\mathrm{d}}
+\RequirePackage{extarrows} % 用于等号上面加文字
+\newcommand{\diff}{\,\mathrm{d}} % 定义微分符号
 
 \begin{document}
 \BiaoTi{合肥工业大学试卷参考答案（A）}
diff --git a/macros/latex/contrib/hfutexam/hfutexam_datizhi.pdf b/macros/latex/contrib/hfutexam/hfutexam_datizhi.pdf
index 28f58baf36..80ebc5a105 100644
Binary files a/macros/latex/contrib/hfutexam/hfutexam_datizhi.pdf and b/macros/latex/contrib/hfutexam/hfutexam_datizhi.pdf differ
diff --git a/macros/latex/contrib/hfutexam/hfutexam_datizhi.tex b/macros/latex/contrib/hfutexam/hfutexam_datizhi.tex
index 31e1b3576f..838dc4dad8 100644
--- a/macros/latex/contrib/hfutexam/hfutexam_datizhi.tex
+++ b/macros/latex/contrib/hfutexam/hfutexam_datizhi.tex
@@ -1,5 +1,4 @@
 \documentclass[datizhi]{hfutexam}
-\newcommand{\diff}{\,\mathrm{d}}
 
 \begin{document}
 \BiaoTi{合肥工业大学考试专用答题纸（A）}
@@ -21,10 +20,10 @@
 \scorebox
 \tigan{一、填空题（每小题3分，共18分）}
 
-\textbf{请将你的答案对应填在横线上：}\\[0.5cm]
+\textbf{请将你的答案对应填在横线上：}\\
 \textbf{1.} \fillblank{}, 
 \textbf{2.} \fillblank{}, 
-\textbf{3.} \fillblank{}, \\[0.5cm]
+\textbf{3.} \fillblank{}, \\
 \textbf{4.} \fillblank{}, 
 \textbf{5.} \fillblank{}, 
 \textbf{6.} \fillblank{}.
@@ -53,6 +52,8 @@
 \textbf{2. （8分）【解】}
 \newpage
 
+% 换栏后需要空白时, 需要先输入一个空格再加\vspace
+\ \vspace{3cm}
 \scorebox
 \textbf{3. （8分）【解】}
 \vspace{7cm}
diff --git a/macros/latex/contrib/hfutexam/hfutexam_shijuan.pdf b/macros/latex/contrib/hfutexam/hfutexam_shijuan.pdf
index 35222d2cab..0eb92c7718 100644
Binary files a/macros/latex/contrib/hfutexam/hfutexam_shijuan.pdf and b/macros/latex/contrib/hfutexam/hfutexam_shijuan.pdf differ
diff --git a/macros/latex/contrib/hfutexam/hfutexam_shijuan.tex b/macros/latex/contrib/hfutexam/hfutexam_shijuan.tex
index 9be69f2a92..b362404fd3 100644
--- a/macros/latex/contrib/hfutexam/hfutexam_shijuan.tex
+++ b/macros/latex/contrib/hfutexam/hfutexam_shijuan.tex
@@ -1,6 +1,5 @@
 \documentclass{hfutexam}
-\newcommand{\diff}{\,\mathrm{d}}
-\usetikzlibrary{arrows.meta}
+\newcommand{\diff}{\,\mathrm{d}} % 定义微分符号
 
 \begin{document}
 \BiaoTi{合肥工业大学试卷（A）}
@@ -26,7 +25,7 @@
 \item 如果函数 $f(x)$ 的定义域是 $(0,+\infty)$, 且 $x=0$ 是曲线 $y=f(x)$ 的垂直渐近线, 那么 $\displaystyle\lim_{x\to0^+}\frac1{f(x)}=$\fillblank{}.
 \end{enumerate}
 
-\tigan{二、选择题（每题3分，共18分）}
+\tigan{\normalsize 二、选择题（每题3分，共18分）}
 \begin{enumerate}
 \item 当 $x\to+\infty$ 时, $\dfrac1x$ 和(~~~~)是等价无穷小.
 % 自动根据选项长度设置行数
@@ -35,18 +34,7 @@
 \xx{$0$}{$1$}{$2$}{$3$}
 \item 设 $f(x)=\arctan\dfrac1{x(x-1)^2}$, 则 $x=0$ 是 $f(x)$ 的(~~~~).
 \xx{可去间断点}{跳跃间断点}{第二类间断点}{连续点}
-\item
-\begin{tikzpicture}[overlay,xshift=130mm,yshift=-35mm]
-	\draw[-Stealth,thick](-3,0)--(3,0);
-	\draw[-Stealth,thick](0,-1)--(0,3);
-	\draw[very thick,smooth,domain=-55:55] plot ({\x/50-1.3}, {tan(\x)*tan(\x)});
-	\draw[very thick,smooth,domain=0.15:2] plot ({\x}, {-ln(\x)});
-	\draw
-		(-0.3,-0.3) node {$O$}
-		(2.8,-0.3) node {$x$}
-		(-0.3,2.8) node {$y$};
-\end{tikzpicture}
-设 $f(x)$ 是定义在 $(-\infty,+\infty)$ 上的连续函数, 且 $f'(x)$ 的图像如下图所示, 则 $f(x)$ 有(~~~~).
+\item 设 $f(x)$ 是定义在 $(-\infty,+\infty)$ 上的连续函数, 且 $f'(x)$ 的图像如下图所示, 则 $f(x)$ 有(~~~~).
 % 手动设置为每行1个
 \xx[1]{一个极大值点，没有极小值点}{没有极大值点，一个极小值点}{一个极大值点和一个极小值点}{一个极大值点和两个极小值点}
 \newpage
diff --git a/macros/latex/contrib/hfutexam/hfutexam_simple.pdf b/macros/latex/contrib/hfutexam/hfutexam_simple.pdf
index 157e0a4c4f..cf84fa6515 100644
Binary files a/macros/latex/contrib/hfutexam/hfutexam_simple.pdf and b/macros/latex/contrib/hfutexam/hfutexam_simple.pdf differ
diff --git a/macros/latex/contrib/hfutexam/hfutexam_simple.tex b/macros/latex/contrib/hfutexam/hfutexam_simple.tex
index 54175ece65..2dc597ffe6 100644
--- a/macros/latex/contrib/hfutexam/hfutexam_simple.tex
+++ b/macros/latex/contrib/hfutexam/hfutexam_simple.tex
@@ -1,9 +1,11 @@
 \documentclass[simple]{hfutexam}
-\newcommand{\diff}{\,\mathrm{d}}
-\usetikzlibrary{arrows.meta, overlay-beamer-styles}
-\RequirePackage{extarrows}
+\usetikzlibrary{arrows.meta}
+\RequirePackage{extarrows} % 用于等号上面加文字
+\newcommand{\diff}{\,\mathrm{d}} % 定义微分符号
 
 \begin{document}
+
+% \tableofcontents
 \BiaoTi{合肥工业大学期中试卷}
 \XueNian{2021}{2022}
 \XueQi{二}
@@ -17,6 +19,7 @@
 \MingTiJiaoShi{集体}
 \maketitle
 
+
 \begin{enumerate}
 \item \textbf{(10分)} 求函数 $\displaystyle f(x)=\ln\frac1{\sqrt{x^2-1}}+\arctan\frac1x$ 的定义域.
 \item \textbf{(5分)} 求函数 $\displaystyle y=\begin{cases}
diff --git a/macros/latex/contrib/l3build/CHANGELOG.md b/macros/latex/contrib/l3build/CHANGELOG.md
index 39389f6fb8..b08104f693 100644
--- a/macros/latex/contrib/l3build/CHANGELOG.md
+++ b/macros/latex/contrib/l3build/CHANGELOG.md
@@ -7,6 +7,16 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+## [2023-03-22]
+
+### Changed
+- Default value of `maxprintline` is now `9999`
+  (may require `.tlg` updates: see docs)
+
+### Fixed
+- Apply needed luatex-specific log normalization, even when `--rerun` is used
+  (issue #291)
+
 ## [2023-03-08]
 
 ### Changed
@@ -647,7 +657,8 @@ this project uses date-based 'snapshot' version identifiers.
 - Rationalise short option names: removed `-d`, `-E`, `-r`
 - Target `cmdcheck`: specific to LaTeX kernel work
 
-[Unreleased]: https://github.com/latex3/l3build/compare/2023-03-08...HEAD
+[Unreleased]: https://github.com/latex3/l3build/compare/2023-03-22...HEAD
+[2023-03-22]: https://github.com/latex3/l3build/compare/2023-03-08...2023-03-22
 [2023-03-08]: https://github.com/latex3/l3build/compare/2023-02-26...2023-03-08
 [2023-02-26]: https://github.com/latex3/l3build/compare/2023-02-20...2023-02-26
 [2023-02-20]: https://github.com/latex3/l3build/compare/2023-02-16...2023-02-20
diff --git a/macros/latex/contrib/l3build/README.md b/macros/latex/contrib/l3build/README.md
index e1e5a05212..d07f186a6f 100644
--- a/macros/latex/contrib/l3build/README.md
+++ b/macros/latex/contrib/l3build/README.md
@@ -1,7 +1,7 @@
 l3build: a testing and building system for LaTeX
 =================================================
 
-Release 2023-03-08
+Release 2023-03-22
 
 Overview
 --------
diff --git a/macros/latex/contrib/l3build/l3build-check.lua b/macros/latex/contrib/l3build/l3build-check.lua
index e7569b69d2..e7bc388bd1 100644
--- a/macros/latex/contrib/l3build/l3build-check.lua
+++ b/macros/latex/contrib/l3build/l3build-check.lua
@@ -697,8 +697,11 @@ function compare_tlg(difffile, tlgfile, logfile, cleanup, name, engine)
   local testname = name .. "." .. engine
   -- Do additional log formatting if the engine is LuaTeX, there is no
   -- engine-specific .tlg file and the default engine is not LuaTeX
+  local has_engine_specific_tlg =
+      match(tlgfile, "%." .. engine .. "%" .. tlgext)
+      and locate({ testfiledir, unpackdir }, { tlgfile })
   if (match(engine,"^lua") or match(engine,"^harf"))
-    and not match(tlgfile, "%." .. engine .. "%" .. tlgext)
+    and not has_engine_specific_tlg
     and not match(stdengine,"^lua")
     then
     local lualogfile = logfile
diff --git a/macros/latex/contrib/l3build/l3build-variables.lua b/macros/latex/contrib/l3build/l3build-variables.lua
index ce07d1f815..576fb15e82 100644
--- a/macros/latex/contrib/l3build/l3build-variables.lua
+++ b/macros/latex/contrib/l3build/l3build-variables.lua
@@ -1,6 +1,6 @@
 --[[
 
-File l3build-variables.lua Copyright (C) 2018-2022 The LaTeX Project
+File l3build-variables.lua Copyright (C) 2018-2023 The LaTeX Project
 
 It may be distributed and/or modified under the conditions of the
 LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -191,7 +191,7 @@ end
 if flattentds == nil then
   flattentds = true
 end
-maxprintline = maxprintline or 79
+maxprintline = maxprintline or 9999
 packtdszip   = packtdszip   or false
 -- support "ps2pdfopt" for backward compatibility, gh issue #275
 ps2pdfopts   = ps2pdfopts   or ps2pdfopt or ""
diff --git a/macros/latex/contrib/l3build/l3build.1 b/macros/latex/contrib/l3build/l3build.1
index 746b894acc..07f2caa08a 100644
--- a/macros/latex/contrib/l3build/l3build.1
+++ b/macros/latex/contrib/l3build/l3build.1
@@ -1,4 +1,4 @@
-.TH l3build 1 "2023-03-08"
+.TH l3build 1 "2023-03-22"
 .SH NAME
 l3build \- Checking and building packages
 .SH SYNOPSIS
diff --git a/macros/latex/contrib/l3build/l3build.dtx b/macros/latex/contrib/l3build/l3build.dtx
index 8ab6295ccb..761ee55c67 100644
--- a/macros/latex/contrib/l3build/l3build.dtx
+++ b/macros/latex/contrib/l3build/l3build.dtx
@@ -152,7 +152,7 @@
 \luavarset{epoch}       {1463734800}  {Epoch (Unix date) to set for test runs}
 \luavarset{flatten}     {true}        {Switch to flatten any source structure when sending to CTAN}
 \luavarset{flattentds}  {true}        {Switch to flatten any source structure when creating a TDS structure}
-\luavarset{maxprintline}{79}          {Length of line to use in log files}
+\luavarset{maxprintline}{9999}        {Length of line to use in log files}
 \luavarset{packtdszip}  {false}       {Switch to build a TDS-style zip file for CTAN}
 \luavarset{ps2pdfopts}  {""}          {Options for \texttt{ps2pdf}}
 \luavarset{typesetcmds} {""}          {Instructions to be passed to \TeX{} when doing typesetting}
@@ -236,7 +236,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2023-03-08}
+% \date{Released 2023-03-22}
 %
 % \maketitle
 % \tableofcontents
@@ -896,6 +896,25 @@
 % an empty table the latter process is skipped: suitable for cases where only
 % Unicode engines are in use.
 %
+% \subsection{Breaking changes}
+%
+% Very occasionally, it is necessary to make changes to \pkg{l3build} that
+% change the \texttt{.tlg} file results. This is typically when additional
+% normalisation is required. When this is the case, you should first verify
+% that \texttt{.tlg} files pass with the older \pkg{l3build}, then update only
+% \pkg{l3build}, re-check the files and save the results. Where possible,
+% we provide a mechanism to run with older setting to allow this process to
+% take place smoothly.
+%
+% \subsubsection{Release 2023-03-22}
+%
+% This release changes the standard value of \var{maxprintline} for $79$ to
+% $9999$, to suppress line wrapping in the log. This makes normalisation of
+% for example file paths more reliable. To check that \texttt{.tlg} files
+% are correct, you can set \var{maxprintline} in your \texttt{build.lua} file
+% explicitly to the old default, check that tests pass, then remove this
+% line and re-check.
+%
 % \section{Writing test files}
 % \label{sec:writing-tests}
 %
diff --git a/macros/latex/contrib/l3build/l3build.lua b/macros/latex/contrib/l3build/l3build.lua
index 55d6999808..a9a4a316c5 100755
--- a/macros/latex/contrib/l3build/l3build.lua
+++ b/macros/latex/contrib/l3build/l3build.lua
@@ -25,7 +25,7 @@ for those people who are interested.
 --]]
 
 -- Version information
-release_date = "2023-03-08"
+release_date = "2023-03-22"
 
 -- File operations are aided by the LuaFileSystem module
 local lfs = require("lfs")
diff --git a/macros/latex/contrib/l3build/l3build.pdf b/macros/latex/contrib/l3build/l3build.pdf
index da58149a23..a7119ae790 100644
Binary files a/macros/latex/contrib/l3build/l3build.pdf and b/macros/latex/contrib/l3build/l3build.pdf differ
diff --git a/macros/texinfo/latest/texinfo.tex b/macros/texinfo/latest/texinfo.tex
index 2f11da59fb..0b8b87c959 100644
--- a/macros/texinfo/latest/texinfo.tex
+++ b/macros/texinfo/latest/texinfo.tex
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2023-03-04.12}
+\def\texinfoversion{2023-03-21.06}
 %
 % Copyright 1985, 1986, 1988, 1990-2023 Free Software Foundation, Inc.
 %
@@ -4102,7 +4102,6 @@ $$%
     \nobreak\kern\dimen0
     \endgroup
     \itemxneedsnegativevskiptrue
-    \penalty 10021 % for \indexpar
   \fi
 }
 
@@ -4219,7 +4218,6 @@ $$%
    % We can be in inner vertical mode in a footnote, although an
    % @itemize looks awful there.
   }%
-  \penalty 10021 % for \indexpar
   \flushcr
 }
 
@@ -4784,17 +4782,11 @@ $$%
 % and it is the two-letter name of the index.
 
 \def\doindex#1{\edef\indexname{#1}\parsearg\doindexxxx}
-\def\doindexxxx #1{\indexpar\doind{\indexname}{#1}}
+\def\doindexxxx #1{\doind{\indexname}{#1}}
 
 % like the previous two, but they put @code around the argument.
 \def\docodeindex#1{\edef\indexname{#1}\parsearg\docodeindexxxx}
-\def\docodeindexxxx #1{\indexpar\docind{\indexname}{#1}}
-
-% End any open paragraph, unless we are immediately after @item in
-% @itemize or @enumerate.
-\def\indexpar{%
-\ifnum\lastpenalty=10021 \else\endgraf\fi
-}
+\def\docodeindexxxx #1{\docind{\indexname}{#1}}
 
 
 % \definedummyword defines \#1 as \string\#1\space, thus effectively
@@ -5351,9 +5343,7 @@ $$%
 % ..., ready, GO:
 %
 \def\safewhatsit#1{\ifhmode
-  \whatsitpenalty = \lastpenalty
   #1%
-  \ifnum\whatsitpenalty>9999 \penalty\whatsitpenalty \fi
  \else
   % \lastskip and \lastpenalty cannot both be nonzero simultaneously.
   \whatsitskip = \lastskip
@@ -7597,7 +7587,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
   \parseargusing\activeparens{\printdefunline\deflineheader}%
 }
 \def\deflineheader#1 #2 #3\endheader{%
-  \defname{#1}{}{#2}\magicamp\defunargs{#3\unskip}%
+  \printdefname{#1}{}{#2}\magicamp\defunargs{#3\unskip}%
 }
 \def\deftypeline{%
   \doingtypefntrue
@@ -7660,14 +7650,14 @@ might help (with 'rm \jobname.?? \jobname.??s')%
 % @deffn category name args
 \makedefun{deffn}#1 #2 #3\endheader{%
   \doind{fn}{\code{#2}}%
-  \defname{#1}{}{#2}\magicamp\defunargs{#3\unskip}%
+  \printdefname{#1}{}{#2}\magicamp\defunargs{#3\unskip}%
 }
 
 % @defop category class name args
 \makedefun{defop}#1 {\defopheaderx{#1\ \putwordon}}
 \def\defopheaderx#1#2 #3 #4\endheader{%
   \doind{fn}{\code{#3}\space\putwordon\ \code{#2}}%
-  \defname{#1\ \code{#2}}{}{#3}\magicamp\defunargs{#4\unskip}%
+  \printdefname{#1\ \code{#2}}{}{#3}\magicamp\defunargs{#4\unskip}%
 }
 
 % Typed functions:
@@ -7676,7 +7666,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
 \makedefun{deftypefn}#1 #2 #3 #4\endheader{%
   \doind{fn}{\code{#3}}%
   \doingtypefntrue
-  \defname{#1}{#2}{#3}\defunargs{#4\unskip}%
+  \printdefname{#1}{#2}{#3}\defunargs{#4\unskip}%
 }
 
 % @deftypeop category class type name args
@@ -7684,7 +7674,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
 \def\deftypeopheaderx#1#2 #3 #4 #5\endheader{%
   \doind{fn}{\code{#4}\space\putwordon\ \code{#1\ \code{#2}}}%
   \doingtypefntrue
-  \defname{#1\ \code{#2}}{#3}{#4}\defunargs{#5\unskip}%
+  \printdefname{#1\ \code{#2}}{#3}{#4}\defunargs{#5\unskip}%
 }
 
 % Typed variables:
@@ -7692,14 +7682,14 @@ might help (with 'rm \jobname.?? \jobname.??s')%
 % @deftypevr category type var args
 \makedefun{deftypevr}#1 #2 #3 #4\endheader{%
   \doind{vr}{\code{#3}}%
-  \defname{#1}{#2}{#3}\defunargs{#4\unskip}%
+  \printdefname{#1}{#2}{#3}\defunargs{#4\unskip}%
 }
 
 % @deftypecv category class type var args
 \makedefun{deftypecv}#1 {\deftypecvheaderx{#1\ \putwordof}}
 \def\deftypecvheaderx#1#2 #3 #4 #5\endheader{%
   \doind{vr}{\code{#4}\space\putwordof\ \code{#2}}%
-  \defname{#1\ \code{#2}}{#3}{#4}\defunargs{#5\unskip}%
+  \printdefname{#1\ \code{#2}}{#3}{#4}\defunargs{#5\unskip}%
 }
 
 % Untyped variables:
@@ -7716,7 +7706,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
 % @deftp category name args
 \makedefun{deftp}#1 #2 #3\endheader{%
   \doind{tp}{\code{#2}}%
-  \defname{#1}{}{#2}\defunargs{#3\unskip}%
+  \printdefname{#1}{}{#2}\defunargs{#3\unskip}%
 }
 
 % Remaining @defun-like shortcuts:
@@ -7732,14 +7722,14 @@ might help (with 'rm \jobname.?? \jobname.??s')%
 \makedefun{defivar}{\defcvheaderx\putwordInstanceVariableof}
 \makedefun{deftypeivar}{\deftypecvheaderx\putwordInstanceVariableof}
 
-% \defname, which formats the name of the @def (not the args).
+% \printdefname, which formats the name of the @def (not the args).
 % #1 is the category, such as "Function".
 % #2 is the return type, if any.
 % #3 is the function name.
 %
 % We are followed by (but not passed) the arguments, if any.
 %
-\def\defname#1#2#3{%
+\def\printdefname#1#2#3{%
   \par
   % Get the values of \leftskip and \rightskip as they were outside the @def...
   \advance\leftskip by -\defbodyindent
@@ -7864,7 +7854,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
 
 % If we encounter &foo, then turn on ()-hacking afterwards
 \newif\ifampseen
-\def\amprm#1 {\ampseentrue{\bf\&#1 }}
+\def\amprm#1 {\ampseentrue{\rm\&#1 }}
 
 \def\parenfont{%
   \ifampseen
@@ -8188,12 +8178,12 @@ might help (with 'rm \jobname.?? \jobname.??s')%
 % 
 % We are in \macrobodyctxt, and the \xdef causes backslashshes in the macro 
 % body to be transformed.
-% Set \macrobody to the body of the macro, and call \defmacro.
+% Set \macrobody to the body of the macro, and call \macrodef.
 %
 {\catcode`\ =\other\long\gdef\parsemacbody#1@end macro{%
-\xdef\macrobody{\eatcr{#1}}\endgroup\defmacro}}%
+\xdef\macrobody{\eatcr{#1}}\endgroup\macrodef}}%
 {\catcode`\ =\other\long\gdef\parsermacbody#1@end rmacro{%
-\xdef\macrobody{\eatcr{#1}}\endgroup\defmacro}}%
+\xdef\macrobody{\eatcr{#1}}\endgroup\macrodef}}%
 
 % Make @ a letter, so that we can make private-to-Texinfo macro names.
 \edef\texiatcatcode{\the\catcode`\@}
@@ -8412,16 +8402,17 @@ might help (with 'rm \jobname.?? \jobname.??s')%
 % \xdef is used so that macro definitions will survive the file
 % they're defined in: @include reads the file inside a group.
 %
-\def\defmacro{%
+\def\macrodef{%
   \let\hash=##% convert placeholders to macro parameter chars
   \ifnum\paramno=1
-    \def\xeatspaces##1{##1}%
-    % This removes the pair of braces around the argument.  We don't
-    % use \eatspaces, because this can cause ends of lines to be lost
-    % when the argument to \eatspaces is read, leading to line-based
-    % commands like "@itemize" not being read correctly.
+    \long\def\xeatspaces##1{##1}%
+    % We don't use \xeatspaces for single-argument macros, because we
+    % want to keep ends of lines.  This definition removes \xeatspaces
+    % when \macrobody is expanded below.
   \else
-    \let\xeatspaces\relax % suppress expansion
+    \def\xeatspaces{\string\xeatspaces}%
+    % This expands \xeatspaces as a sequence of character tokens, which
+    % stops \scantokens inserting an extra space after the control sequence.
   \fi
   \ifcase\paramno
   % 0
@@ -8590,40 +8581,35 @@ might help (with 'rm \jobname.?? \jobname.??s')%
 % @linemacro
 
 \parseargdef\linemacro{%
-  \linegetargs#1 \linegetargs
-  \expandafter\linegetparamlist\argl;%
+  \getargs{#1}% now \macname is the macname and \argl the arglist
+  \ifx\argl\empty
+    \paramno=0
+    \let\hash\relax
+    \def\paramlist{\hash 1\endlinemacro}%
+  \else
+    \expandafter\linegetparamlist\argl;%
+  \fi
   \begingroup \macrobodyctxt \usembodybackslash
   \parselinemacrobody
 }
 
-% Parse the arguments to a @linemacro line.  Set \macname to the name
-% of the macro and \argl to the list of arguments.
-\def\linegetargs#1 #2\linegetargs{%
-  \macname={#1}%
-  \def\argl{#2}%
-}
-
 % Build up \paramlist which will be used as the parameter text for the macro.
 % At the end it will be like "#1 #2 #3\endlinemacro".
 \def\linegetparamlist#1;{%
   \paramno=0\def\paramlist{}%
-  \let\hash\relax \let\xeatspaces\relax
-  \linegetparamlistxxx#1; %
+  \let\hash\relax
+  \linegetparamlistxxx#1,;,%
 }
-\def\linegetparamlistxxx#1 {%
+\def\linegetparamlistxxx#1,{%
   \if#1;\let\next=\linegetparamlistxxxx
   \else \let\next=\linegetparamlistxxx
     \advance\paramno by 1
     \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname
-        {\noexpand\xeatspaces{\hash\the\paramno}}%
+        {\hash\the\paramno}%
     \edef\paramlist{\paramlist\hash\the\paramno\space}%
   \fi\next}
 \def\linegetparamlistxxxx{%
-  \ifx\paramlist\empty
-     \def\paramlist{\hash 1\endlinemacro}%
-  \else
-    \expandafter\fixparamlist\paramlist\fixparamlist
-  \fi
+  \expandafter\fixparamlist\paramlist\fixparamlist
 }
 % Replace final space token
 \def\fixparamlist#1 \fixparamlist{%
@@ -8633,7 +8619,6 @@ might help (with 'rm \jobname.?? \jobname.??s')%
 % Read the body of the macro, replacing backslash-surrounded variables
 %
 {\catcode`\ =\other\long\gdef\parselinemacrobody#1@end linemacro{%
-\let\xeatspaces\relax
 \xdef\macrobody{#1}%
 \endgroup
 \linemacrodef
@@ -8642,26 +8627,20 @@ might help (with 'rm \jobname.?? \jobname.??s')%
 % Make the definition
 \def\linemacrodef{%
   \let\hash=##%
-  \let\xeatspaces\relax
   \expandafter\xdef\csname\the\macname\endcsname{%
     \bgroup
-    \noexpand\scanctxt
     \noexpand\parsearg
     \expandafter\noexpand\csname\the\macname @@\endcsname
   }
   \expandafter\xdef\csname\the\macname @@\endcsname##1{%
     \egroup
     \expandafter\noexpand
-    \csname\the\macname @@@\endcsname##1 \noexpand\endlinemacro
-    % Note that we append a space to the macro line to terminate the last
-    % argument in case the final argument is empty.  @xeatspaces may be needed
-    % to remove this space.
+    \csname\the\macname @@@\endcsname##1\noexpand\endlinemacro
   }
   \expandafter\expandafter
   \expandafter\xdef
   \expandafter\expandafter\csname\the\macname @@@\endcsname\paramlist{%
     \newlinechar=13 % split \macrobody into lines
-    \let\noexpand\xeatspaces\noexpand\eatspaces
     \noexpand\scantokens{\macrobody}%
   }
 }
@@ -9659,8 +9638,8 @@ might help (with 'rm \jobname.?? \jobname.??s')%
 %
 \def\caption{\docaption\thiscaption}
 \def\shortcaption{\docaption\thisshortcaption}
-\def\docaption{\checkenv\float \bgroup\scanctxt\defcaption}
-\def\defcaption#1#2{\egroup \def#1{#2}}
+\def\docaption{\checkenv\float \bgroup\scanctxt\docaptionz}
+\def\docaptionz#1#2{\egroup \def#1{#2}}
 
 % The parameter is the control sequence identifying the counter we are
 % going to use.  Create it if it doesn't exist and assign it to \floatno.
-- 
cgit v1.2.3