summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/fancyvrb/Changes1
-rw-r--r--macros/latex/contrib/fancyvrb/README2
-rw-r--r--macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdfbin141124 -> 141127 bytes
-rw-r--r--macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex1
-rw-r--r--macros/latex/contrib/fancyvrb/latex/fancyvrb.sty10
-rw-r--r--macros/latex/contrib/graphics-def/README.md2
-rw-r--r--macros/latex/contrib/graphics-def/dvipdfmx.def34
-rw-r--r--macros/latex/contrib/graphics-def/xetex.def34
-rw-r--r--macros/latex/contrib/l3build/CHANGELOG.md11
-rw-r--r--macros/latex/contrib/l3build/README.md2
-rw-r--r--macros/latex/contrib/l3build/l3build-check.lua11
-rw-r--r--macros/latex/contrib/l3build/l3build-variables.lua4
-rw-r--r--macros/latex/contrib/l3build/l3build.12
-rw-r--r--macros/latex/contrib/l3build/l3build.dtx2
-rwxr-xr-xmacros/latex/contrib/l3build/l3build.lua2
-rw-r--r--macros/latex/contrib/l3build/l3build.pdfbin741870 -> 741424 bytes
-rw-r--r--macros/xetex/latex/xduts/README.md46
-rw-r--r--macros/xetex/latex/xduts/xduts.dtx154
-rw-r--r--macros/xetex/latex/xduts/xduts.pdfbin316944 -> 324220 bytes
19 files changed, 196 insertions, 122 deletions
diff --git a/macros/latex/contrib/fancyvrb/Changes b/macros/latex/contrib/fancyvrb/Changes
index c903c62ef2..8053f8e8d7 100644
--- a/macros/latex/contrib/fancyvrb/Changes
+++ b/macros/latex/contrib/fancyvrb/Changes
@@ -1,4 +1,5 @@
--- fancyvrb.sty
+4.2 2022/04/12 - change option file_ext to fileext (hv)
4.1b 2021/12/21 - fix for ~ in message (hv)
4.1a 2021/11/24 - updated filedate (hv)
4.1 2021/11/24 - make lastline without argument possible (hv)
diff --git a/macros/latex/contrib/fancyvrb/README b/macros/latex/contrib/fancyvrb/README
index 97c41fe60a..68a9168d10 100644
--- a/macros/latex/contrib/fancyvrb/README
+++ b/macros/latex/contrib/fancyvrb/README
@@ -21,7 +21,7 @@ and conditionally processing text.
`fancyvrb' was heavily used in the typesetting of the "LaTeX Graphics
Companion", by Michel Goossens, Frank Mittelbach, Sebastian Rahtz,
-Denis Roegel, and Herbert Voß, Addison Wesley, 2007.
+Denis Roegel, and Herbert Voß, Addison Wesley, 2007 and Lehmanns Media, 2022
It was presented March 31, 1998 for EuroTeX'98. The original paper is
available on "Cahiers GUTenberg"
diff --git a/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdf b/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdf
index 55ccaceaab..a797fa6253 100644
--- a/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdf
+++ b/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex b/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex
index 40cb65ff83..66b211391f 100644
--- a/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex
+++ b/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex
@@ -1,3 +1,4 @@
+\listfiles
\documentclass[twoside]{article}
\usepackage{libertinus-otf}
\setmonofont[Scale=MatchLowercase,FakeStretch=0.9]{AnonymousPro-Regular.ttf}
diff --git a/macros/latex/contrib/fancyvrb/latex/fancyvrb.sty b/macros/latex/contrib/fancyvrb/latex/fancyvrb.sty
index 86fdbef54e..cd7a2478a1 100644
--- a/macros/latex/contrib/fancyvrb/latex/fancyvrb.sty
+++ b/macros/latex/contrib/fancyvrb/latex/fancyvrb.sty
@@ -2,7 +2,7 @@
%% This is file `fancyvrb.sty',
%%
%% COPYRIGHT 1992-1999, by Timothy Van Zandt <tvz@zandtwerk.kellogg.nwu.edu>
-%% 2000-2021 ... , by Herbert Voss <hvoss@tug.org>
+%% 2000-2022 ... , by Herbert Voss <hvoss@tug.org>
%%
%% This package may be distributed under the terms of the LaTeX Project Public
%% License, as described in lppl.txt in the base LaTeX distribution.
@@ -13,8 +13,8 @@
%% verbatim environments and commands and extensive documentation.
%%
\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{4.1b}
-\def\filedate{2021/12/21}
+\def\fileversion{4.2}
+\def\filedate{2022/04/12}
\ProvidesPackage{fancyvrb}[\filedate\space \fileversion\space verbatim text (tvz,hv)]
%\message{Style option: `fancyvrb' v\fileversion \space <\filedate> (tvz)}
\csname fancyvrb@loaded\endcsname
@@ -532,12 +532,12 @@
\catcode`\^^I=\active
\gdef\FV@DefineWhiteSpace{\def {\FV@Space}\def^^I{\FV@Tab}}%
\endgroup
-\define@key{FV}{file_ext}[.tex]{\def\FancyVerbFileExtension{#1}}
+\define@key{FV}{fileext}[.tex]{\def\FancyVerbFileExtension{#1}}
\define@key{FV}{defineactive}[]{\def\FancyVerbDefineActive{#1\relax}}
\define@key{FV}{defineactive*}{%
\expandafter\def\expandafter\FancyVerbDefineActive\expandafter{%
\FancyVerbDefineActive#1\relax}}
-\fvset{defineactive,file_ext=.tex}
+\fvset{defineactive,fileext=.tex}
\define@booleankey{FV}{showspaces}%
{\def\FV@Space{{\FancyVerbSpace}}}%
{\def\FV@Space{\ }}
diff --git a/macros/latex/contrib/graphics-def/README.md b/macros/latex/contrib/graphics-def/README.md
index 060344b425..03c905bc88 100644
--- a/macros/latex/contrib/graphics-def/README.md
+++ b/macros/latex/contrib/graphics-def/README.md
@@ -1,7 +1,7 @@
LaTeX support for color and graphics
====================================
-Release 2022-02-19
+Release 2022-04-12
This bundle contains the 'engine-dependent' part of support for
color and graphics in LaTeX2e (the code here will also function
diff --git a/macros/latex/contrib/graphics-def/dvipdfmx.def b/macros/latex/contrib/graphics-def/dvipdfmx.def
index 0d73189fe2..f8a984cb5a 100644
--- a/macros/latex/contrib/graphics-def/dvipdfmx.def
+++ b/macros/latex/contrib/graphics-def/dvipdfmx.def
@@ -1,5 +1,5 @@
%% dvipdfmx.def
-%% Copyright (C) 2005-2021 LaTeX3 Project, Jin-Hwan Cho, Shunsaku Hirata
+%% Copyright (C) 2005-2022 LaTeX3 Project, Jin-Hwan Cho, Shunsaku Hirata
%% (with contributions from many others)
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%% https://github.com/latex3/graphics-def/issues
%%
\ProvidesFile{dvipdfmx.def}
- [2021/03/18 v5.0j Graphics/color driver for dvipdfmx]
+ [2022/04/12 v5.0k Graphics/color driver for dvipdfmx]
\def\GPT@space{ }
\def\c@lor@arg#1{%
\dimen@#1\p@
@@ -329,36 +329,6 @@
}
\fi
\fi
-% Disable use of new multiple stacks pending further testing
-\endinput
-% Updates for newer dvipdfmx versions
-% Loaded last as we can then bail-out if not required
-\begingroup
- \ifcsname\detokenize{c__kernel_sys_dvipdfmx_version_int}\endcsname
- \edef\extractbbversion{%
- \number\csname\detokenize{c__kernel_sys_dvipdfmx_version_int}\endcsname}%
- \else
- \immediate\openin 0 = |"extractbb --version"
- \ifeof0 %
- \def\extractbbversion{0}%
- \else
- \read0 to \extractbbversion % \par
- \ifeof0 %
- \def\extractbbversion{0}%
- \else
- \read0 to \extractbbversion
- \long\def\getextractbbversion#1Version #2 #3\stop{%
- \def\extractbbversion{#2}}%
- \expandafter\getextractbbversion\extractbbversion Version 0 \stop
- \fi
- \fi
- \fi
-\ifnum\extractbbversion<20201111 %
- \endgroup
- \expandafter\endinput
-\else
- \endgroup
-\fi
% Conversion functions so the internal representation stays unchanged
\let\init@current@color\current@color
\def\convert@color#1{%
diff --git a/macros/latex/contrib/graphics-def/xetex.def b/macros/latex/contrib/graphics-def/xetex.def
index ba109f78aa..0ddde80f15 100644
--- a/macros/latex/contrib/graphics-def/xetex.def
+++ b/macros/latex/contrib/graphics-def/xetex.def
@@ -1,5 +1,5 @@
%% xetex.def
-%% Copyright (C) 2005-2021 LaTeX3 Project, Jin-Hwan Cho, Shunsaku Hirata
+%% Copyright (C) 2005-2022 LaTeX3 Project, Jin-Hwan Cho, Shunsaku Hirata
%% (with contributions from many others)
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%% https://github.com/latex3/graphics-def/issues
%%
\ProvidesFile{xetex.def}
- [2021/03/18 v5.0k Graphics/color driver for xetex]
+ [2022/04/12 v5.0l Graphics/color driver for xetex]
\def\GPT@space{ }
\def\c@lor@arg#1{%
\dimen@#1\p@
@@ -428,36 +428,6 @@
}
\fi
\fi
-% Disable use of new multiple stacks pending further testing
-\endinput
-% Updates for newer dvipdfmx versions
-% Loaded last as we can then bail-out if not required
-\begingroup
- \ifcsname\detokenize{c__kernel_sys_dvipdfmx_version_int}\endcsname
- \edef\extractbbversion{%
- \number\csname\detokenize{c__kernel_sys_dvipdfmx_version_int}\endcsname}%
- \else
- \immediate\openin 0 = |"extractbb --version"
- \ifeof0 %
- \def\extractbbversion{0}%
- \else
- \read0 to \extractbbversion % \par
- \ifeof0 %
- \def\extractbbversion{0}%
- \else
- \read0 to \extractbbversion
- \long\def\getextractbbversion#1Version #2 #3\stop{%
- \def\extractbbversion{#2}}%
- \expandafter\getextractbbversion\extractbbversion Version 0 \stop
- \fi
- \fi
- \fi
-\ifnum\extractbbversion<20201111 %
- \endgroup
- \expandafter\endinput
-\else
- \endgroup
-\fi
% Conversion functions so the internal representation stays unchanged
\let\init@current@color\current@color
\def\convert@color#1{%
diff --git a/macros/latex/contrib/l3build/CHANGELOG.md b/macros/latex/contrib/l3build/CHANGELOG.md
index 129cdab7b9..ee19e133b6 100644
--- a/macros/latex/contrib/l3build/CHANGELOG.md
+++ b/macros/latex/contrib/l3build/CHANGELOG.md
@@ -7,6 +7,14 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
+## [2022-04-12]
+
+### Added
+- Basic support for `make4ht`
+
+### Changed
+- Support `bidi` version string in `\special` lines (closes \#226)
+
## [2022-03-15]
### Changed
@@ -584,7 +592,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/2022-03-15...HEAD
+[Unreleased]: https://github.com/latex3/l3build/compare/2022-04-12...HEAD
+[2022-04-12]: https://github.com/latex3/l3build/compare/2022-03-15...2022-04-12
[2022-03-15]: https://github.com/latex3/l3build/compare/2022-02-24...2022-03-15
[2022-02-24]: https://github.com/latex3/l3build/compare/2021-12-14...2022-02-24
[2021-12-14]: https://github.com/latex3/l3build/compare/2021-12-09...2021-12-14
diff --git a/macros/latex/contrib/l3build/README.md b/macros/latex/contrib/l3build/README.md
index 67f37bd53d..0df0bbe27e 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 2022-03-15
+Release 2022-04-12
Overview
--------
diff --git a/macros/latex/contrib/l3build/l3build-check.lua b/macros/latex/contrib/l3build/l3build-check.lua
index f016c25a62..94ffc671ef 100644
--- a/macros/latex/contrib/l3build/l3build-check.lua
+++ b/macros/latex/contrib/l3build/l3build-check.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-check.lua Copyright (C) 2018-2021 The LaTeX Project
+File l3build-check.lua Copyright (C) 2018-2022 The LaTeX Project
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -246,6 +246,10 @@ local function normalize_log(content,engine,errlevels)
if match(line, "^%.*\\special%{papersize") then
return ""
end
+ -- Remove bidi version in \special lines line
+ if match(line, "BIDI.Fullbanner") then
+ line = gsub(line,"Version %d*%.%d*", "Version ...")
+ end
-- Remove ConTeXt stuff
if match(line, "^backend >") or
match(line, "^close source >") or
@@ -750,6 +754,11 @@ function runtest(name, engine, hide, ext, test_type, breakout)
if match(checkformat,"^context$") then
function setup(file) return tokens .. ' "' .. file .. '" ' end
end
+ if match(binary,"make4ht") then
+ function setup(file) return tokens .. ' "' .. file .. '" ' end
+ format = ""
+ checkopts = ""
+ end
local basename = testdir .. "/" .. name
local gen_file = basename .. test_type.generated
local new_file = basename .. "." .. engine .. test_type.generated
diff --git a/macros/latex/contrib/l3build/l3build-variables.lua b/macros/latex/contrib/l3build/l3build-variables.lua
index 736df6ae82..131b6b7d55 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-2021 The LaTeX Project
+File l3build-variables.lua Copyright (C) 2018-2022 The LaTeX Project
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -134,6 +134,8 @@ if not string.find(status.banner,"2019") then
specialformats["latex-dev"] = specialformats["latex-dev"] or
{luatex = {binary="luahbtex",format = "lualatex-dev"}}
end
+specialformats.latex["make4ht"] = specialformats.latex["make4ht"] or
+ {binary = "make4ht"}
stdengine = stdengine or checkengines[1] or "pdftex"
diff --git a/macros/latex/contrib/l3build/l3build.1 b/macros/latex/contrib/l3build/l3build.1
index 2329238b1a..fd55c79944 100644
--- a/macros/latex/contrib/l3build/l3build.1
+++ b/macros/latex/contrib/l3build/l3build.1
@@ -1,4 +1,4 @@
-.TH l3build 1 "2022-03-15"
+.TH l3build 1 "2022-04-12"
.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 fbd84ff215..6e6dde9f36 100644
--- a/macros/latex/contrib/l3build/l3build.dtx
+++ b/macros/latex/contrib/l3build/l3build.dtx
@@ -237,7 +237,7 @@
% }^^A
% }
%
-% \date{Released 2022-03-15}
+% \date{Released 2022-04-12}
%
% \maketitle
% \tableofcontents
diff --git a/macros/latex/contrib/l3build/l3build.lua b/macros/latex/contrib/l3build/l3build.lua
index 80a7b6e3d0..7556fb39d8 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 = "2022-03-15"
+release_date = "2022-04-12"
-- 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 def5d5ec3d..98a74b5df2 100644
--- a/macros/latex/contrib/l3build/l3build.pdf
+++ b/macros/latex/contrib/l3build/l3build.pdf
Binary files differ
diff --git a/macros/xetex/latex/xduts/README.md b/macros/xetex/latex/xduts/README.md
index 2915333371..f4e54ed187 100644
--- a/macros/xetex/latex/xduts/README.md
+++ b/macros/xetex/latex/xduts/README.md
@@ -2,18 +2,40 @@
[![](https://img.shields.io/ctan/v/xduts)](https://www.ctan.org/pkg/xduts) [![](https://img.shields.io/github/license/note286/xduts)](https://github.com/note286/xduts/blob/main/LICENSE) [![](https://img.shields.io/github/stars/note286/xduts)](https://github.com/note286/xduts) [![](https://img.shields.io/github/issues/note286/xduts)](https://github.com/note286/xduts/issues?q=is%3Aopen+is%3Aissue) [![](https://img.shields.io/github/issues-closed/note286/xduts)](https://github.com/note286/xduts/issues?q=is%3Aissue+is%3Aclosed) [![](https://img.shields.io/github/commit-activity/m/note286/xduts)](https://github.com/note286/xduts/commits/main) [![](https://img.shields.io/github/v/tag/note286/xduts)](https://github.com/note286/xduts/tags)
-XDUTS(Xidian University TeX Suite)是面向西安电子科技大学本科生/研究生的LaTeX3文档类和宏包套装,支持XeLaTeX,支持TeX Live、MacTeX、MiKTeX,支持Windows、macOS、GNU/Linux、Overleaf和TeXPage。旨在帮助西安电子科技大学本科生/研究生撰写开题报告/学位论文及其他文档,目前有:
+XDUTS (Xidian University TeX Suite) is a LaTeX3 document class and package suite for undergraduate/postgraduate students in Xidian University, which can be compiled with XeLaTeX on Windows, macOS, GNU/Linux, Overleaf, and TeXPage. It is designed to typesetting proposal/thesis and other documents.
-- xduugthesis,本科毕业设计论文文档类
-- xdufont,中/英/数学字体配置宏包
+XDUTS currently includes:
-即将支持:
+- `xduugthesis.cls`, Xidian University Undergraduate Thesis document class
+- `xdufont.sty`, Xidian University Font package
-- xduugtp,本科生开题报告文档类
-- xdupgthesis,研究生学位论文文档类
-- xdupgtp,研究生开题报告文档类
+In the future, we plan to add the following document classes, including
-## 获取
+- `xduugtp.cls`, Xidian University Undergraduate Thesis Proposal document class
+- `xdupgtp.cls`, Xidian University Postgraduate Thesis Proposal document class
+- `xdupgthesis.cls`, Xidian University Postgraduate Thesis document class
+
+## Installation
+
+You can install XDUTS by either CTAN or GitHub by following the instructions below.
+
+### CTAN
+
+Make sure the latest version of TeX Live/MacTeX is installed. Then, you can install XDUTS by running command below. If on Windows, it may be necessary to start a Command Prompt as an Administrator. If on macOS or GNU/Linux, please run the command with `sudo`.
+
+```shell
+tlmgr update xduts
+```
+
+Run command below to open the documentation in TeX Live/MacTeX.
+
+```shell
+texdoc xduts
+```
+
+### GitHub
+
+Generally speaking, CTAN updates XDUTS slowly. If you want to use the latest version of XDUTS, download this repository and run the following commands to get the corresponding documentation and document class/package files.
```shell
xetex xduts.ins
@@ -24,6 +46,10 @@ xelatex xduts.dtx
xelatex xduts.dtx
```
-## 许可
+## Note
+
+`xidian-text.pdf` and `xidian-logo.pdf` should be placed in the same directory as `xduugthesis.cls`.
+
+## License
-This material is subject to [the LaTeX Project Public License 1.3c](https://ctan.org/license/lppl1.3).
+XDUTS is subject to [the LaTeX Project Public License 1.3c](https://ctan.org/license/lppl1.3).
diff --git a/macros/xetex/latex/xduts/xduts.dtx b/macros/xetex/latex/xduts/xduts.dtx
index 691a2a6e20..4c7e798e76 100644
--- a/macros/xetex/latex/xduts/xduts.dtx
+++ b/macros/xetex/latex/xduts/xduts.dtx
@@ -1,15 +1,15 @@
% \iffalse
%<*driver>
\ProvidesFile{xduts.dtx}
-[2022/04/10 v0.6.0.0 Xidian University TeX Suite]
+[2022/04/11 v0.7.0.0 Xidian University TeX Suite]
%</driver>
%<class|sty>\NeedsTeXFormat{LaTeX2e}
%<class|sty>\RequirePackage{expl3}
%<xduugthesis>\ProvidesExplClass{xduugthesis}
%<xdufont>\ProvidesExplPackage{xdufont}
-%<class|sty> {2022/04/10}{0.6.0.0}
+%<class|sty> {2022/04/11}{0.7.0.0}
%<xdufont> {Xidian University Font package}
-%<xduugthesis> {Xidian University Undergraduate Thesis class}
+%<xduugthesis> {Xidian University Undergraduate Thesis document class}
%<*driver>
\documentclass{ctxdoc}
\changes{v0.6.0.0}{2022/04/10}{新增xdufont宏包}
@@ -143,7 +143,7 @@
\end{document}
%</driver>
% \fi
-% \CheckSum{823}
+% \CheckSum{872}
% \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
@@ -539,6 +539,45 @@
% \end{syntax}
% 设置章节标题后的垂直间距,默认值为\valuex{\{18pt, 12pt, 6pt, 6pt, 6pt, 6pt\}},分别对应\tnx{chapter}、\tnx{section}、\tnx{subsection}、\tnx{subsubsection}、\tnx{paragraph}和\tnx{subparagraph}。
% \end{function}
+% \begin{function}[added=2022-04-11]
+% {
+% style/chap-zihao,
+% style/sec-zihao,
+% style/subsec-zihao,
+% style/subsubsec-zihao,
+% style/para-zihao,
+% style/subpara-zihao
+% }
+% \begin{syntax}
+% \optx{style/chap-zihao}=\metax{0|-0|1|-1|2|-2|3|-3|4|-4|5|-5|6|-6|7|8}
+% \optx{style/sec-zihao}=\metax{0|-0|1|-1|2|-2|3|-3|4|-4|5|-5|6|-6|7|8}
+% \optx{style/subsec-zihao}=\metax{0|-0|1|-1|2|-2|3|-3|4|-4|5|-5|6|-6|7|8}
+% \optx{style/subsubsec-zihao}=\metax{0|-0|1|-1|2|-2|3|-3|4|-4|5|-5|6|-6|7|8}
+% \optx{style/para-zihao}=\metax{0|-0|1|-1|2|-2|3|-3|4|-4|5|-5|6|-6|7|8}
+% \optx{style/subpara-zihao}=\metax{0|-0|1|-1|2|-2|3|-3|4|-4|5|-5|6|-6|7|8}
+% \end{syntax}
+% 设置章节标题字号。
+% 当论文语言为中文时,默认值分别为\valuex{3}、\valuex{4}、\valuex{4}、\valuex{4}、\valuex{4}、\valuex{4}。
+% 当论文语言为英文时,默认值分别为\valuex{4}、\valuex{-4}、\valuex{-4}、\valuex{-4}、\valuex{-4}、\valuex{-4}。
+% \end{function}
+% \begin{optdesc}
+% \item[0] 初号
+% \item[−0] 小初号
+% \item[1] 一号
+% \item[-1] 小一号
+% \item[2] 二号
+% \item[-2] 小二号
+% \item[3] 三号
+% \item[-3] 小三号
+% \item[4] 四号
+% \item[-4] 小四号
+% \item[5] 五号
+% \item[-5] 小五号
+% \item[6] 六号
+% \item[-6] 小六号
+% \item[7] 七号
+% \item[8] 八号
+% \end{optdesc}
% \subsection{附录环境}
% \label{附录环境}
% \begin{function}[added=2022-04-04]{appendixes}
@@ -1571,7 +1610,13 @@
% \l_@@_bib_file_clist,
% \l_@@_fig_label_sep_tl,
% \l_@@_before_skip_clist,
-% \l_@@_after_skip_clist
+% \l_@@_after_skip_clist,
+% \l_@@_chap_tl,
+% \l_@@_sec_tl,
+% \l_@@_subsec_tl,
+% \l_@@_subsubsec_tl,
+% \l_@@_para_tl,
+% \l_@@_subpara_tl
% }
% 英文是否使用中文字体。
% \begin{macrocode}
@@ -1598,6 +1643,15 @@
\clist_new:N \l_@@_before_skip_clist
\clist_new:N \l_@@_after_skip_clist
% \end{macrocode}
+% 设置章节标题字号。
+% \begin{macrocode}
+\tl_new:N \l_@@_chap_tl
+\tl_new:N \l_@@_sec_tl
+\tl_new:N \l_@@_subsec_tl
+\tl_new:N \l_@@_subsubsec_tl
+\tl_new:N \l_@@_para_tl
+\tl_new:N \l_@@_subpara_tl
+% \end{macrocode}
% \end{variable}
% \begin{macro}{\keys_define:nn}
% 定义样式键值。
@@ -1633,7 +1687,16 @@
% \end{macrocode}
% 设置章节标题后的垂直间距。
% \begin{macrocode}
- after-skip .clist_set:N = \l_@@_after_skip_clist
+ after-skip .clist_set:N = \l_@@_after_skip_clist,
+% \end{macrocode}
+% 设置章节标题字号。
+% \begin{macrocode}
+ chap-zihao .tl_set:N = \l_@@_chap_tl,
+ sec-zihao .tl_set:N = \l_@@_sec_tl,
+ subsec-zihao .tl_set:N = \l_@@_subsec_tl,
+ subsubsec-zihao .tl_set:N = \l_@@_subsubsec_tl,
+ para-zihao .tl_set:N = \l_@@_para_tl,
+ subpara-zihao .tl_set:N = \l_@@_subpara_tl
}
% \end{macrocode}
% \end{macro}
@@ -1642,13 +1705,13 @@
% \begin{macrocode}
\keys_set:nn { xdu }
{
- style / en-cjk-font = false,
- style / language = zh,
- style / bib-backend = biblatex,
- style / bib-resource = { },
- style / fig-label-sep = { 0.75em },
- style / before-skip = { 24pt, 18pt, 12pt, 12pt, 12pt, 12pt },
- style / after-skip = { 18pt, 12pt, 6pt, 6pt, 6pt, 6pt }
+ style / en-cjk-font = false,
+ style / language = zh,
+ style / bib-backend = biblatex,
+ style / bib-resource = { },
+ style / fig-label-sep = { 0.75em },
+ style / before-skip = { 24pt, 18pt, 12pt, 12pt, 12pt, 12pt },
+ style / after-skip = { 18pt, 12pt, 6pt, 6pt, 6pt, 6pt }
}
% \end{macrocode}
% \end{macro}
@@ -1731,6 +1794,14 @@
{ \CJKunderline [ thickness = 0.5pt ] { #1 } }
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\@@_tl_set_if_empty:Nn}
+% \changes{v0.7.0.0}{2022/04/11}{对空凭据表赋值}
+% 对空凭据表赋值。
+% \begin{macrocode}
+\cs_new:Npn \@@_tl_set_if_empty:Nn #1#2
+ { \tl_if_empty:NT #1 { \tl_set:Nn #1 { #2 } } }
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\@@_get_text_width:Nn,\@@_get_text_width:NV}
% 获取文本宽度。
% \begin{arguments}
@@ -1936,7 +2007,7 @@
% \end{macrocode}
% \end{macro}
% \subsubsection{章节和标题}
-% \begin{macro}{\@@_zh_title:nnn}
+% \begin{macro}{\@@_zh_t:nnn}
% 设置中文章节名字和随后的标题内容格式。
% \begin{arguments}
% \item 字体族。
@@ -1944,10 +2015,10 @@
% \item 位置。
% \end{arguments}
% \begin{macrocode}
-\cs_new:Npn \@@_zh_title:nnn #1#2#3
+\cs_new:Npn \@@_zh_t:nnn #1#2#3
{
\use:c { @@_ #1 _family : }
- \zihao { #2 }
+ \zihao { \use:c { l_@@_ #2 _tl } }
\str_if_eq:ccTF { #3 } { c }
{ \centering }
{ \raggedright }
@@ -1955,42 +2026,55 @@
% \end{macrocode}
% \end{macro}
% 设置英文章节名字和随后的标题内容格式。
-% \begin{macro}{\@@_en_title:nn}
+% \begin{macro}{\@@_en_t:nn}
% \begin{arguments}
% \item 字号。
% \item 偏移量。
% \end{arguments}
% \begin{macrocode}
-\cs_new:Npn \@@_en_title:nn #1#2
- { \zihao { #1 } \raggedright \skip_horizontal:n { #2 ex } }
+\cs_new:Npn \@@_en_t:nn #1#2
+ { \zihao { \use:c { l_@@_ #1 _tl } } \raggedright \skip_horizontal:n { #2 ex } }
% \end{macrocode}
% \end{macro}
% \begin{macro}{\ctexset}
+% \changes{v0.7.0.0}{2022/04/11}{自定义章节标题字号}
% 设置章节名字和随后的标题内容格式。
% \begin{macrocode}
\ctex_at_end_preamble:n
{
\@@_lang_switch:nn
{
+ \@@_tl_set_if_empty:Nn \l_@@_chap_tl { 3 }
+ \@@_tl_set_if_empty:Nn \l_@@_sec_tl { 4 }
+ \@@_tl_set_if_empty:Nn \l_@@_subsec_tl { 4 }
+ \@@_tl_set_if_empty:Nn \l_@@_subsubsec_tl { 4 }
+ \@@_tl_set_if_empty:Nn \l_@@_para_tl { 4 }
+ \@@_tl_set_if_empty:Nn \l_@@_subpara_tl { 4 }
\ctexset
{
- chapter / format = { \@@_zh_title:nnn { sf } { 3 } { c } },
- section / format = { \@@_zh_title:nnn { rm } { 4 } { c } },
- subsection / format = { \@@_zh_title:nnn { rm } { 4 } { l } },
- subsubsection / format = { \@@_zh_title:nnn { rm } { 4 } { l } },
- paragraph / format = { \@@_zh_title:nnn { rm } { 4 } { l } },
- subparagraph / format = { \@@_zh_title:nnn { rm } { 4 } { l } }
+ chapter / format = { \@@_zh_t:nnn { sf } { chap } { c } },
+ section / format = { \@@_zh_t:nnn { rm } { sec } { c } },
+ subsection / format = { \@@_zh_t:nnn { rm } { subsec } { l } },
+ subsubsection / format = { \@@_zh_t:nnn { rm } { subsubsec } { l } },
+ paragraph / format = { \@@_zh_t:nnn { rm } { para } { l } },
+ subparagraph / format = { \@@_zh_t:nnn { rm } { subpara } { l } }
}
}
{
+ \@@_tl_set_if_empty:Nn \l_@@_chap_tl { 4 }
+ \@@_tl_set_if_empty:Nn \l_@@_sec_tl { -4 }
+ \@@_tl_set_if_empty:Nn \l_@@_subsec_tl { -4 }
+ \@@_tl_set_if_empty:Nn \l_@@_subsubsec_tl { -4 }
+ \@@_tl_set_if_empty:Nn \l_@@_para_tl { -4 }
+ \@@_tl_set_if_empty:Nn \l_@@_subpara_tl { -4 }
\ctexset
{
- chapter / format = { \@@_en_title:nn { 4 } { 0 } },
- section / format = { \@@_en_title:nn { -4 } { 4 } },
- subsection / format = { \@@_en_title:nn { -4 } { 8 } },
- subsubsection / format = { \@@_en_title:nn { -4 } { 12 } },
- paragraph / format = { \@@_en_title:nn { -4 } { 16 } },
- subparagraph / format = { \@@_en_title:nn { -4 } { 20 } }
+ chapter / format = { \@@_en_t:nn { chap } { 0 } },
+ section / format = { \@@_en_t:nn { sec } { 4 } },
+ subsection / format = { \@@_en_t:nn { subsec } { 8 } },
+ subsubsection / format = { \@@_en_t:nn { subsubsec } { 12 } },
+ paragraph / format = { \@@_en_t:nn { para } { 16 } },
+ subparagraph / format = { \@@_en_t:nn { subpara } { 20 } }
}
}
}
@@ -2205,6 +2289,7 @@
% \end{macrocode}
% \end{macro}
% \begin{macro}{\@@_cover_ii:nnn}
+% \changes{v0.6.1.0}{2022/04/11}{修复logo不存在导致的无法编译}
% 绘制西电logo。
% \begin{arguments}
% \item 盒子高度。
@@ -2218,7 +2303,8 @@
{
\mode_leave_vertical:
\hfil
- \includegraphics [ height = #2, keepaspectratio ] { #3 }
+ \file_if_exist:nT { #3 }
+ { \includegraphics [ height = #2, keepaspectratio ] { #3 } }
\hfil
}
}
@@ -2321,7 +2407,7 @@
% \end{macrocode}
% 排版西电文字logo。
% \begin{macrocode}
- \@@_cover_ii:nnn { 65pt } { 35pt } { xidian-text }
+ \@@_cover_ii:nnn { 65pt } { 35pt } { xidian-text.pdf }
% \end{macrocode}
% 排版封面标题。
% \begin{macrocode}
@@ -2330,7 +2416,7 @@
% \end{macrocode}
% 排版西电logo。
% \begin{macrocode}
- \@@_cover_ii:nnn { 130pt } { 120pt } { xidian-logo }
+ \@@_cover_ii:nnn { 130pt } { 120pt } { xidian-logo.pdf }
% \end{macrocode}
% 拆分论文标题并排版。
% \begin{macrocode}
diff --git a/macros/xetex/latex/xduts/xduts.pdf b/macros/xetex/latex/xduts/xduts.pdf
index 6145412d94..e802bb7ff2 100644
--- a/macros/xetex/latex/xduts/xduts.pdf
+++ b/macros/xetex/latex/xduts/xduts.pdf
Binary files differ