summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-09-09 03:00:35 +0000
committerNorbert Preining <norbert@preining.info>2021-09-09 03:00:35 +0000
commit30ebcb04bb501c56bfac1652a749eda69ba28c34 (patch)
treec1492b714f76dd6c85a5665308561bdc86e019ed /macros
parentf8d688cceb9bee2119c4cf3422a85bd60c0e846c (diff)
CTAN sync 202109090300
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/bithesis/bithesis.dtx88
-rw-r--r--macros/latex/contrib/bithesis/bithesis.pdfbin216524 -> 252958 bytes
-rw-r--r--macros/latex/contrib/easybook/easybook.dtx173
-rw-r--r--macros/latex/contrib/easybook/easybook.pdfbin578268 -> 577996 bytes
-rw-r--r--macros/latex/contrib/easybook/easybook.tex32
-rw-r--r--macros/latex/contrib/ejpecp/README.md36
-rw-r--r--macros/latex/contrib/ejpecp/ejpecp.dtx18
-rw-r--r--macros/latex/contrib/ejpecp/ejpecp.pdfbin183645 -> 105240 bytes
-rw-r--r--macros/latex/contrib/huawei/huawei.cls44
-rw-r--r--macros/latex/contrib/huawei/huawei.pdfbin333239 -> 333759 bytes
-rw-r--r--macros/latex/contrib/huawei/huawei.tex4
11 files changed, 257 insertions, 138 deletions
diff --git a/macros/latex/contrib/bithesis/bithesis.dtx b/macros/latex/contrib/bithesis/bithesis.dtx
index db84b03eed..d5e02c47f5 100644
--- a/macros/latex/contrib/bithesis/bithesis.dtx
+++ b/macros/latex/contrib/bithesis/bithesis.dtx
@@ -20,10 +20,10 @@
%<cls>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<book>\ProvidesClass{bitbook}
%<article>\ProvidesClass{bitart}
-%<cls> [2021/01/06 v1.0.1 BIT Thesis Templates]
+%<cls> [2021/09/07 v1.1.0 BIT Thesis Templates]
%
%<*driver>
-\ProvidesFile{bithesis.dtx}[2021/01/06 1.0.1 BIT Thesis Templates]
+\ProvidesFile{bithesis.dtx}[2021/09/07 1.1.0 BIT Thesis Templates]
\documentclass{ltxdoc}
\usepackage{dtx-style}
@@ -126,6 +126,7 @@
% \item 在此期间,冯开宇将原来的 .tex 文件制作成了宏包,并发布到 CTAN 上。
% \item 项目代码也随之被拆分成了 \BIThesisMacroPackage,\BIThesisWiki 和 \BIThesisScaffold。
% \end{itemize}
+% \item 2021 - 2022 年,2021 级(硕士研究生)的冯开宇针对 2021 年毕业季收到的反馈对该项目进行维护升级(前向兼容)。
% \end{itemize}
% \subsection{\BIThesis 是什么?}
% \BIThesis 之名是英文单词 Beijing Institution of Technology(北京理工大学)的首字母缩写“BIT” 与“Thesis”结合而成。在纯文本环境下,该名字应写作“BIThesis”。
@@ -203,16 +204,33 @@
% \end{macrocode}
% \begin{macrocode}
+% 目前只有本科的模板,但仍旧要为可能预留空间。
\newif\if@bit@bachelor
+\newif\if@bit@docTranslation
\newif\if@bit@master
\newif\if@bit@docter
+\RequirePackage{kvoptions}
+
+\SetupKeyvalOptions{
+ family=BIThesis,
+ prefix=BIThesis@
+}
+
+\DeclareStringOption[14pt]{footskip}
+\DeclareBoolOption{titleNumberHeiti}
+\ProcessKeyvalOptions*
+
+
\DeclareOption{bachelor}{\@bit@bachelortrue}
+\DeclareOption{translation}{\@bit@docTranslationtrue}
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{ctexbook}}
+
\ExecuteOptions{bachelor}
\ProcessOptions\relax
+
\LoadClass[UTF8,AutoFakeBold,AutoFakeSlant,zihao=-4,oneside,openany]{ctexbook}
\RequirePackage[a4paper,left=3cm,right=2.6cm,top=3.5cm,bottom=2.9cm]{geometry}
@@ -236,6 +254,9 @@
\RequirePackage{amsmath}
\RequirePackage{amssymb}
\RequirePackage{pdfpages}
+\RequirePackage{listings}
+
+%\PackageError{zzzz}{Main \BIThesis@footskip hellp}{test}
% 设置参考文献编译后端为 biber,引用格式为 GB/T7714-2015 格式
% 参考文献使用宏包见 https://github.com/hushidong/biblatex-gb7714-2015
@@ -260,6 +281,12 @@
\setCJKfamilyfont{xihei}[AutoFakeBold,AutoFakeSlant]{[STXIHEI.TTF]} % 若希望使用本机字体,也可以用 {STXihei} 来调用
\newcommand{\xihei}{\CJKfamily{xihei}}
+\ifBIThesis@titleNumberHeiti
+ \newcommand{\arabicHeiti}[1]{\xeCJKsetup{CJKspace=true}\xeCJKDeclareCharClass{CJK}{`0 -> `9}{\heiti\raisebox{-0.1ex}{#1}}\normalspacedchars{0,1,2,3,4,5,6,7,8,9}\xeCJKsetup{CJKspace=false}}
+\else
+ \newcommand{\arabicHeiti}[1]{#1}
+\fi
+
% 主题页面格式:BIThesis
@@ -267,7 +294,7 @@
% 页眉高度
\setlength{\headheight}{20pt}
% 页码高度(不完美,比规定稍微靠下 2mm)
- \setlength{\footskip}{14pt}
+ \setlength{\footskip}{\BIThesis@footskip}
\fancyhf{}
% 定义页眉、页码
@@ -277,11 +304,29 @@
\renewcommand{\headrulewidth}{0.6pt}
}
+\if@bit@docTranslation
+% 主题页面格式:BIThesis
+\fancypagestyle{BIThesis}{
+ % 页眉高度
+ \setlength{\headheight}{20pt}
+ % 页码高度(不完美,比规定稍微靠下 2mm)
+ \setlength{\footskip}{\BIThesis@footskip}
+
+ \fancyhf{}
+ % 定义页码
+ \fancyfoot[C]{\songti\zihao{5} \thepage}
+ % 页眉分割线稍微粗一些
+ \renewcommand{\headrulewidth}{0.6pt}
+
+ % 定义页眉
+ \fancyhead[C]{\zihao{4}\ziju{0.08}\songti{北京理工大学本科生毕业设计(论文)外文翻译}}
+}
+\fi
% 设置章节格式
% 一级标题:黑体,三号,加粗;间距:段前 0.5 行,段后 1 行;
\ctexset{chapter={
name = {第,章},
- number = {\arabic{chapter}},
+ number = {\arabicHeiti{ \arabic{chapter} }},
format = {\heiti \bfseries \centering \zihao{3}},
aftername = \hspace{9bp},
pagestyle = BIThesis,
@@ -293,7 +338,7 @@
% 二级标题:黑体,四号,加粗;间距:段前 0.5 行,段后 0 行;
\ctexset{section={
- number = {\thechapter.\hspace{4bp}\arabic{section}},
+ number = {\arabicHeiti{\thechapter.\hspace{1bp}\arabic{section}}},
format = {\heiti \raggedright \bfseries \zihao{4}},
aftername = \hspace{8bp},
beforeskip = 20bp plus 1ex minus .2ex,
@@ -304,7 +349,7 @@
% 三级标题:黑体、小四、加粗;间距:段前 0.5 行,段后 0 行;
\ctexset{subsection={
- number = {\thechapter.\hspace{3bp}\arabic{section}.\hspace{3bp}\arabic{subsection}},
+ number = {\arabicHeiti{\thechapter.\hspace{1bp}\arabic{section}.\hspace{1bp}\arabic{subsection}}},
format = {\heiti \bfseries \raggedright \zihao{-4}},
aftername = \hspace{7bp},
beforeskip = 17bp plus 1ex minus .2ex,
@@ -354,6 +399,37 @@
\renewcommand{\thefigure}{\thechapter-\arabic{figure}}
\captionsetup[figure]{font=small,labelsep=space}
+% 设置 listings 源代码高亮的格式
+\AtBeginDocument{
+ \renewcommand{\lstlistingname}{代码}
+ \renewcommand{\thelstlisting}{\arabic{chapter}-\arabic{lstlisting}}
+}
+
+\definecolor{codegreen}{rgb}{0,0.6,0}
+\definecolor{codegray}{rgb}{0.5,0.5,0.5}
+\definecolor{codepurple}{rgb}{0.58,0,0.82}
+\definecolor{backcolour}{rgb}{0.95,0.95,0.92}
+\lstdefinestyle{examplestyle}{
+ backgroundcolor=\color{backcolour},
+ commentstyle=\color{codegreen},
+ keywordstyle=\color{magenta},
+ numberstyle=\tiny\color{codegray},
+ stringstyle=\color{codepurple},
+ basicstyle=\ttfamily\footnotesize,
+ breakatwhitespace=false,
+ breaklines=true,
+ captionpos=b,
+ keepspaces=true,
+ numbers=left,
+ numbersep=5pt,
+ showspaces=false,
+ showstringspaces=false,
+ showtabs=false,
+ tabsize=2
+}
+\lstset{style=examplestyle}
+
+
% 设置表格的 caption 格式和 caption 与 table 之间的垂直距离
\renewcommand{\thetable}{\thechapter-\arabic{table}}
\captionsetup[table]{font=small,labelsep=space,skip=2pt}
diff --git a/macros/latex/contrib/bithesis/bithesis.pdf b/macros/latex/contrib/bithesis/bithesis.pdf
index de2c9e0a91..ac61b8a83b 100644
--- a/macros/latex/contrib/bithesis/bithesis.pdf
+++ b/macros/latex/contrib/bithesis/bithesis.pdf
Binary files differ
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index 2150fef75c..ee291bcbb1 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -15,7 +15,7 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/09/06}{1.30}
+\ProvidesExplClass{easybook}{2021/09/08}{1.3a}
{Typeset Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -297,14 +297,13 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/09/06}{1.30}
+\ProvidesExplPackage{easybase}{2021/09/08}{1.3a}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
\cs_generate_variant:Nn \dim_sign:n { V }
\cs_generate_variant:Nn \int_to_arabic:n { v }
\cs_generate_variant:Nn \prop_set_from_keyval:Nn { NV }
-\cs_generate_variant:Nn \skip_add:Nn { NV,Nv }
\cs_generate_variant:Nn \skip_set:Nn { NV }
\cs_generate_variant:Nn \seq_set_from_clist:Nn { No }
\cs_generate_variant:Nn \ctex_define:nn { nx }
@@ -1128,12 +1127,6 @@
#1/numsep .dim_set:c = eb@toc@#1@numsep,
#1/unknown .code:n = \eb_msg_unknown_option:n { tocset }
}
- \seq_if_in:NnF \c__ctex_headings_seq { subparagraph }
- {
- \ctex_define:nn { tocset }
- { #1/belowskip .skip_set:c = l__eb_toc_#1_below_skip }
- }
- \seq_pop:NN \c__ctex_headings_seq \l_tmpa_tl
\titlecontents{#1}
[\dim_use:c { l__eb_toc_#1_indent_dim }]
{\tl_use:c { l__eb_toc_#1_format_tl }}
@@ -1155,7 +1148,16 @@
\c__ctex_headings_seq \eb_toc_assign_keys:n
\ctex_define:n { tocset/list .meta:nn = { ctex/tocset/list } {#1} }
\eb_clist_map_inline:nn
- { format,format+,format~+,indent,rule,numsep,belowskip }
+ { figure,table,lstlisting }
+ {
+ \ctex_define:nn { tocset }
+ {
+ #1/voffset .skip_set:c = l__eb_toc_#1_voffset_skip,
+ #1/tocline .cs_set:cp = { eb@labelname@#1 } ##1,
+ }
+ }
+\eb_clist_map_inline:nn
+ { format,format+,format~+,indent,rule,numsep,voffset,tocline }
{
\ctex_define:nn { tocset }
{
@@ -1187,66 +1189,44 @@
\ctex_define:nn { tocset }
{
lolskip .skip_set:N = \eb@toc@lolskip,
- lolskip .initial:n = 0.8pc,
- belowoffset .skip_set:N = \l__eb_toc_offset_skip,
- belowoffset .initial:n =
- { \bool_if:NTF \l__eb_class_book_bool { -1pc } { -0.35pc } },
+ lolskip .initial:n = 10pt,
+ toc-voffset .skip_set:N = \l__eb_toc_voffset_skip,
+ toc-voffset .initial:n =
+ { \bool_if:NTF \l__eb_class_book_bool { 1pc } { 0.35pc } },
line-align .bool_set:N = \l__eb_toc_line_align_bool,
line-align .default:n = true,
line-align .initial:n = true,
- tocline-fig .cs_set:Np = \eb@labelname@lof #1,
- tocline-fig .initial:n =
- {
- \figurename\space #1
- \notbool{eb@titletoc@hang@fix}
- {\hspace{\eb@toc@figure@numsep}}{}
- },
- tocline-tab .cs_set:Np = \eb@labelname@lot #1,
- tocline-tab .initial:n =
- {
- \tablename\space #1
- \notbool{eb@titletoc@hang@fix}
- {\hspace{\eb@toc@table@numsep}}{}
- },
- tocline-lst .tl_set:N = \eb@labelname@lol,
- tocline-lst .initial:n =
- {
- \lstlistingname\space\thelstlisting
- \notbool{eb@titletoc@hang@fix}
- {\hspace{\eb@toc@lstlisting@numsep}}{}
- },
-
hang .choice:,
- hang/true .code:n = \booltrue{eb@titletoc@hang@fix},
- hang/false .code:n = { },
- hang .default:n = true,
- hang .initial:n = false,
-
- numsep-all .meta:n =
- {
- part/numsep = #1,
- chapter/numsep = #1,
- section/numsep = #1,
- subsection/numsep = #1,
- list/numsep = #1
+ hang/true .code:n = \booltrue{eb@titletoc@hang@fix},
+ hang/false .code:n = { },
+ hang .default:n = true,
+ hang .initial:n = false,
+
+ numsep-all .meta:n =
+ {
+ part/numsep = #1,
+ chapter/numsep = #1,
+ section/numsep = #1,
+ subsection/numsep = #1,
+ list/numsep = #1
},
- numsep-all .initial:n = 1em,
- indent-all .meta:n =
- {
- part/indent = #1,
- chapter/indent = #1,
- section/indent = #1,
- subsection/indent = #1,
- list/indent = #1
+ numsep-all .initial:n = 1em,
+ indent-all .meta:n =
+ {
+ part/indent = #1,
+ chapter/indent = #1,
+ section/indent = #1,
+ subsection/indent = #1,
+ list/indent = #1
},
- rule-all .meta:n =
+ rule-all .meta:n =
{
- part/rule = #1,
- chapter/rule = #1,
- section/rule = #1,
- subsection/rule = #1,
- list/rule = #1
+ part/rule = #1,
+ chapter/rule = #1,
+ section/rule = #1,
+ subsection/rule = #1,
+ list/rule = #1
}
}
\ctex_set:n
@@ -1273,45 +1253,64 @@
}
\ctex_set:nn { tocset }
{
- part/format = \addvspace{1pc}\sffamily\large,
- part/indent = 0em,
- part/rule = \tocrule{}[\bfseries],
+ part/format = \addvspace{1pc}\sffamily\large,
+ part/indent = 0em,
+ part/rule = \tocrule{}[\bfseries],
- chapter/format = \addvspace{1pc}\sffamily\large,
- chapter/indent = 0em,
- chapter/rule = \tocrule{$\cdot$}[\bfseries],
+ chapter/format = \addvspace{1pc}\sffamily\large,
+ chapter/indent = 0em,
+ chapter/rule = \tocrule{$\cdot$}[\bfseries],
- section/format =
+ section/format =
{
\addvspace{0.35pc}
\bool_if:NF \l__eb_class_book_bool { \sffamily }
},
- section/indent =
+ section/indent =
{ \bool_if:NTF \l__eb_class_book_bool { 1.5em } { 0em } },
- section/rule =
+ section/rule =
{
\bool_if:NTF \l__eb_class_book_bool
{ \tocrule{$\cdot$} }
{ \tocrule{$\cdot$}[\bfseries] }
},
- subsection/format = \addvspace{0.35pc},
- subsection/indent =
+ subsection/format = \addvspace{0.35pc},
+ subsection/indent =
{ \bool_if:NTF \l__eb_class_book_bool { 3.8em } { 1.4em } },
- subsection/rule = \tocrule{$\cdot$},
+ subsection/rule = \tocrule{$\cdot$},
+
+ list/format = \addvspace{0.2pc},
+ list/indent = 0em,
+ list/rule = \tocrule{$\cdot$},
+ list/voffset =
+ { 0.2pc\bool_if:NT \l__eb_class_book_bool { + 10pt } },
- list/format = \addvspace{0.2pc},
- list/indent = 0em,
- list/rule = \tocrule{$\cdot$},
- list/belowskip =
- { \bool_if:NTF \l__eb_class_book_bool { 0pc } { 0.15pc } }
+ figure/tocline =
+ {
+ \figurename\space #1
+ \notbool{eb@titletoc@hang@fix}
+ {\hspace{\eb@toc@figure@numsep}}{}
+ },
+ table/tocline =
+ {
+ \tablename\space #1
+ \notbool{eb@titletoc@hang@fix}
+ {\hspace{\eb@toc@table@numsep}}{}
+ },
+ lstlisting/tocline =
+ {
+ \lstlistingname\space\thelstlisting
+ \notbool{eb@titletoc@hang@fix}
+ {\hspace{\eb@toc@lstlisting@numsep}}{}
+ }
}
\prop_new:N \l__eb_list_label_name_prop
\prop_set_from_keyval:Nn \l__eb_list_label_name_prop
{
- figure = \eb@labelname@lof,
- table = \eb@labelname@lot
+ figure = \eb@labelname@figure,
+ table = \eb@labelname@table
}
\cs_gset:Npn \caption@@@addcontentsline #1#2#3#4
{
@@ -1330,7 +1329,7 @@
\addcontentsline{lol}{lstlisting}
{
\ifbool{eb@titletoc@hang@fix}{\eb@numberline}{}
- {\eb@labelname@lol}\lst@@caption
+ {\eb@labelname@lstlisting}\lst@@caption
}
}
@@ -1542,9 +1541,7 @@
\tl_set_eq:Nc \eb@toc@title { list#4name }
\IfValueT{#3}{\keys_set:nn { eb/listoc } {#3}}
\eb_title_number_intoc_spec:nn {#2} {#1}
- \skip_add:Nv
- \l__eb_toc_offset_skip { l__eb_toc_#4_below_skip }
- \vspace*{\dim_use:N \l__eb_toc_offset_skip}
+ \vspace*{-\dim_use:c { l__eb_toc_#4_voffset_skip }}
\eb_toc_start_multi_column_ext:n {#5}
\group_end:
}
@@ -1568,12 +1565,12 @@
\tl_set:Nn \eb@bitoc@title { Contents }
\IfValueT{#2}{\keys_set:nn { eb/listoc } {#2}}
\eb_title_mark_notoc:n { \eb@toc@title }
- \vspace*{\dim_use:N \l__eb_toc_offset_skip}
+ \vspace*{-\dim_use:N \l__eb_toc_voffset_skip}
\eb_toc_start_multi_column_ext:n { toc }#3
\IfBooleanT{#1}
{
\eb_title_mark_notoc:n { \eb@bitoc@title }
- \vspace*{\dim_use:N \l__eb_toc_offset_skip}
+ \vspace*{-\dim_use:N \l__eb_toc_voffset_skip}
\eb_toc_start_multi_column_ext:n { tec }
}
\group_end:
@@ -2400,7 +2397,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/09/06}{1.30}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/09/08}{1.3a}
{Customization of tcolorbox for easybook}
\tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip }
diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf
index 62b5067a0f..a27447bba5 100644
--- a/macros/latex/contrib/easybook/easybook.pdf
+++ b/macros/latex/contrib/easybook/easybook.pdf
Binary files differ
diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex
index e8425fef2d..011565190a 100644
--- a/macros/latex/contrib/easybook/easybook.tex
+++ b/macros/latex/contrib/easybook/easybook.tex
@@ -12,8 +12,8 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK 使用手册,
- version = v1.30,
- date = 2021/09/06,
+ version = v1.3a,
+ date = 2021/09/08,
authors = 瞿毅,
info = 排版简体中文学位论文和书籍,
email = quee123@foxmail.com,
@@ -727,9 +727,9 @@
\subsection{目录样式}
\label{subsec:catalog style}
-模块 \module*{tocset} 将使用 \pkg*{titletoc} 处理目录样式,\module*{level} 代表 \code{part}、\code{chapter}、\code{section}、\code{subsection}、\code{figure}、\code{table} 或 \code{lstlisting} 目录级别,而使用 \code{list} 级别可以统一设置图片、表格和代码目录的样式。目前目录支持适用于论文的常规样式,如果您需要例如段落或更复杂的样式可以使用本模块基于的 \cs*{titlecontents} 命令。
+模块 \module*{tocset} 将使用 \pkg*{titletoc} 处理目录样式。模块包括 \module*{part}、\module*{chapter}、\module*{section}、\module*{subsection}、\module*{figure}、\module*{table} 和 \module*{lstlisting} 二级路径,而使用 \module*{list} 路径可以统一设置图片、表格和代码目录的样式。模块中 \option{format}、\option{format+}、\option{indent}、\option{rule} 和 \option{numsep} 这 5 个选项支持所有路径级别,没有特别说明的其它选项则没有二级路径。目前支持常规的论文目录样式,更复杂的样式可以查看 \pkg*{titletoc} 宏包的相关用法。
\begin{options}
- \keyval-{format}{目录标题格式}\Module{/level}
+ \keyval-{format}{目录标题格式}\Module{tocset}
各级别目录中标题的格式,可以设置字体和加入垂直间距等,垂直间距最好使用防止垂直间距重合的 \cs*{addvspace} 命令。
\keyval-{format+}{目录标题格式}
与 \option{format} 用法一样,只是在已有的格式命令后附加代码。
@@ -760,24 +760,20 @@
\end{commands}
\begin{options}
- \keyval-{belowskip}{弹性长度}\Module{/level}\Default{0pc}
- 图片、表格和代码三种目录命令标题下方的额外间距,\module*{level} 代表 \code{figure}、\code{table} 或 \code{lstlisting}。这个距离也可以使用 \code{list} 级别统一设置,或直接用 C\TeX 标题选项 \option*{afterskip} 修改。
- \keyval-{belowoffset}{弹性长度}\Module{tocset}\Default{-1pc}
- 主文档目录标题下方的间距补偿,一般为负值,用于抵消 \option{format} 中额外的垂直间距。
- \keyval-{lolskip}{弹性长度}\Default{0.8pc}
+ \keyval-{lolskip}{弹性长度}\Default{10pt}
代码目录中每章代码标题的额外距离,与 C\TeX 的表格和图片目录中每章间的标题距离选项 \option*{lotskip} 和 \option*{lofskip} 类似,在 \cls*{article} 模式中此选项失效。
- \keyval-{tocline-fig}{图片目录标签}
- 图片目录标签,选项参数中 \code{\#1} 代表编号,还可包含标签名称,默认标签名称与图片题注名称一致。
- \keyval-{tocline-tab}{表格目录标签}
- 表格目录标签,选项参数中 \code{\#1} 代表编号,还可包含标签名称,默认标签名称与表格题注名称一致。
- \keyval-{tocline-lst}{代码目录标签}
- 代码目录标签,选项参数中 \cs*{thelstlisting} 代表编号,还可包含标签名称,默认标签名称与代码题注名称一致。
+ \keyval-{toc-voffset}{弹性长度}
+ 主文档目录标题下方的间距补偿,一般为正值,用于抵消目录中首行的额外垂直间距。
+ \keyval-{voffset}{弹性长度}
+ 图片、表格或代码目录标题下方的间距补偿,一般为正值,用于抵消目录中首行的额外垂直间距。路径为 \module*{figure}、\module*{table} 和 \module*{lstlisting},或者用 \module*{list} 路径统一设置。
+ \keyval-{tocline}{目录标签}
+ 图片、表格或代码的目录标签,图片或表格的选项参数中 \code{\#1} 代表编号,代码中 \cs*{thelstlisting} 代表编号。参数还可包含标签名称,默认标签名称与对应题注名称一致。路径为 \module*{figure}、\module*{table} 和 \module*{lstlisting},或者用 \module*{list} 路径统一设置。
\begin{ctexexam}
\tocset
{
- hang = false,
- tocline-fig = 图 #1\hspace{1em},
- tocline-lst = 代码\thelstlisting\hspace{1em}
+ hang = false,
+ figure/tocline = 图 #1\hspace{1em},
+ lstlisting/tocline = 代码\thelstlisting\hspace{1em}
}
\end{ctexexam}
\keybool{line-align}\Default{true}
diff --git a/macros/latex/contrib/ejpecp/README.md b/macros/latex/contrib/ejpecp/README.md
index f893ab593c..7f350b041e 100644
--- a/macros/latex/contrib/ejpecp/README.md
+++ b/macros/latex/contrib/ejpecp/README.md
@@ -57,6 +57,40 @@ electronic journals are https://imstat.org/journals-and-publications/electronic-
`microtype`, `afterpackage`. It was also successfully tested with the next
generation engine `lualatex`.
+## TROUBLESHOOTING
+
+- If You get an error after compilation (e.g. in MiKTeX v2.9):
+
+ ! pdfTeX error (font expansion): auto expansion is only possible with scalable fonts.
+
+ Try one of the following:
+
+ 1. Add _Latin Modern_ font loading lines before the document class line:
+
+ \RequirePackage{lmodern}
+ \RequirePackage[T1]{fontenc}
+ \documentclass[EJP]{ejpecp}
+
+ It will change bitmap _Computer Modern_ fonts with scalable _Latin Modern_ fonts.
+
+ 2. If 1st step does not solve the problem, then use `nofontexpansion` option:
+
+ \documentclass[nofontexpansion,EJP]{ejpecp}
+
+ It will turn off font expansion feature of `microtype` package.
+
+ **No worries**: font expansion will still be used at production stage.
+
+- If _Bitstream Vera_ font (i.e. `bera` package) is not available in Your TeX distribution, use `nobera` class option and add alternative main document font:
+
+ \documentclass[nobera,EJP]{ejpecp}
+ \usepackage{mathptmx}% URW Nimbus Roman
+ \usepackage[T1]{fontenc}
+
+ Some suggestions can be found here: https://www.tug.org/FontCatalogue/seriffonts.html
+
+ **No worries**: `bera` package will still be used at production stage.
+
## LATEST VERSION
The latest version is on the CTAN at:
@@ -67,6 +101,8 @@ https://github.com/vtex-soft/texsupport.ims-ejpecp
## CHANGELOG
+- 2021/09/07 v1.11.2
+ - Added `nobera` and `nofontexpansion` options
- 2021/08/17 v1.11.1
- Removed dependency on `lastpage` package
- 2021/04/20 v1.11.0
diff --git a/macros/latex/contrib/ejpecp/ejpecp.dtx b/macros/latex/contrib/ejpecp/ejpecp.dtx
index 663786f537..ebdf588ba8 100644
--- a/macros/latex/contrib/ejpecp/ejpecp.dtx
+++ b/macros/latex/contrib/ejpecp/ejpecp.dtx
@@ -26,7 +26,7 @@
%<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<class>\ProvidesClass{ejpecp}
%<*class>
- [2021/08/17 v1.11.1 class for EJP and ECP journals]
+ [2021/09/07 v1.11.2 class for EJP and ECP journals]
%</class>
%<class>\ClassInfo{ejpecp}{Copyright (c) 2019-2021 Edgaras SAKURAS, VTeX, Lithuania.}
%<class>\ClassInfo{ejpecp}{Copyright (c) 2018 Deimantas GALCIUS, VTeX, Lithuania.}
@@ -47,7 +47,7 @@
%</driver>
% \fi
%
-% \CheckSum{968}
+% \CheckSum{983}
%
% \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
@@ -85,6 +85,7 @@
% \changes{v1.10.0}{2021/02/11}{acks and support}
% \changes{v1.11.0}{2021/04/20}{preprint option}
% \changes{v1.11.1}{2021/08/17}{removed dependency on lastpage package}
+% \changes{v1.11.2}{2021/09/07}{nobera and nofontexpansion options added}
% \GetFileInfo{ejpecp.dtx}
%
% \DoNotIndex{\newcommand,\newenvironment}
@@ -167,6 +168,10 @@
}
\newif\if@ejpecp@preprint \@ejpecp@preprintfalse
\DeclareOption{preprint}{\@ejpecp@preprinttrue}
+\newif\if@ejpecp@nofontexpansion \@ejpecp@nofontexpansionfalse
+\DeclareOption{nofontexpansion}{\@ejpecp@nofontexpansiontrue}
+\newif\if@ejpecp@nobera \@ejpecp@noberafalse
+\DeclareOption{nobera}{\@ejpecp@noberatrue}
\DeclareOption*{%
\PackageWarning{ejpecp}{Unknown option ‘\CurrentOption’}%
}
@@ -184,6 +189,9 @@
\fi
\RequirePackage{mathtools}
\RequirePackage{microtype}
+\if@ejpecp@nofontexpansion
+ \microtypesetup{expansion=false}
+\fi
\RequirePackage{latexsym}
\ifx\@NODS\undefined
\RequirePackage{dsfont}
@@ -193,8 +201,10 @@
\fi
\RequirePackage{geometry}
\geometry{a4paper,portrait,left=3.5cm,right=3.5cm,top=3.5cm,bottom=3.5cm}
-%\RequirePackage{charter} % Ph. Carmona
-\RequirePackage{bera} % beware that the logo is sensitive to default font change
+\if@ejpecp@nobera
+\else
+ \RequirePackage{bera} % beware that the logo is sensitive to default font change
+\fi
\RequirePackage{hyperref}
\hypersetup{
pagebackref=false,
diff --git a/macros/latex/contrib/ejpecp/ejpecp.pdf b/macros/latex/contrib/ejpecp/ejpecp.pdf
index f55a7f9df9..47f1bb8d65 100644
--- a/macros/latex/contrib/ejpecp/ejpecp.pdf
+++ b/macros/latex/contrib/ejpecp/ejpecp.pdf
Binary files differ
diff --git a/macros/latex/contrib/huawei/huawei.cls b/macros/latex/contrib/huawei/huawei.cls
index 5a8442e6f0..52df7f9632 100644
--- a/macros/latex/contrib/huawei/huawei.cls
+++ b/macros/latex/contrib/huawei/huawei.cls
@@ -21,7 +21,7 @@
% SOFTWARE.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{huawei}[2021/08/25 0.9.1 Template for Huawei Documents]
+\ProvidesClass{huawei}[2021/09/08 0.10.0 Template for Huawei Documents]
\newif\ifXL
\DeclareOption{XL}{\XLtrue}
@@ -81,8 +81,12 @@
\setstretch{1.08}
\RequirePackage[maxnames=1,minnames=1,natbib=true,citestyle=numeric,bibstyle=numeric,doi=false,url=false,isbn=false,isbn=false]{biblatex}
\RequirePackage[table]{xcolor}
- \definecolor{huawei-red}{HTML}{CF0A2C}
- \definecolor{huawei-black}{HTML}{232527}
+ \definecolor{red}{HTML}{CF0A2C}
+ \definecolor{black}{HTML}{232527}
+ \definecolor{gray}{HTML}{878C8F}
+ \definecolor{yellow}{HTML}{F2DC5D}
+ \definecolor{blue}{HTML}{2274A5}
+ \definecolor{green}{HTML}{499167}
\RequirePackage{tikz}
\RequirePackage{tabularx}
\RequirePackage{titling}
@@ -134,7 +138,7 @@
\newcommand\LeftHuaweiBar{%
\begin{textblock}{1}[0,0](0,0)%
- \tikz \node[fill=huawei-red,minimum width=\TPHorizModule,minimum height=16\TPVertModule] {};%
+ \tikz \node[fill=red,minimum width=\TPHorizModule,minimum height=16\TPVertModule] {};%
\end{textblock}%
}
@@ -142,21 +146,21 @@
\begin{tikzpicture}[y=0.80pt, x=0.80pt, yscale=-1, inner sep=0pt, outer sep=0pt]
\begin{scope}[even odd rule,line width=0.800pt]
\begin{scope}[shift={(0,-0.00024)}]
- \path[fill=huawei-black] (10.9375,30.2240) -- (10.9375,33.6097) .. controls (10.9375,34.5713) and (10.4603,35.0845) .. (9.5932,35.0845) .. controls (8.7212,35.0845) and (8.2411,34.5565) .. (8.2411,33.5686) -- (8.2411,30.2278) -- (7.0415,30.2278) -- (7.0415,33.6097) .. controls (7.0415,35.2737) and (7.9658,36.2272) .. (9.5774,36.2272) .. controls (11.2041,36.2272) and (12.1371,35.2554) .. (12.1371,33.5609) -- (12.1371,30.2240) -- (10.9375,30.2240) -- cycle;
- \path[fill=huawei-black] (15.3511,30.2240) -- (12.7456,36.1351) -- (13.9702,36.1351) -- (14.4731,34.9903) -- (14.5091,34.9045) -- (17.2158,34.9045) -- (17.7467,36.1351) -- (19.0045,36.1351) -- (16.4233,30.2590) -- (16.4001,30.2240) -- cycle;
- \path[fill=huawei-black] (22.4840,30.2240) -- (21.1414,34.2912) -- (19.8344,30.2271) -- (18.5578,30.2271) -- (20.6186,36.1388) -- (21.6120,36.1388) -- (22.9573,32.2553) -- (24.3016,36.1388) -- (25.3034,36.1388) -- (27.3592,30.2271) -- (26.1152,30.2271) -- (24.8055,34.2912) -- (23.4626,30.2240) -- cycle;
- \path[fill=huawei-black] (34.2236,30.2240) -- (34.2236,36.1300) -- (35.4074,36.1300) -- (35.4074,30.2240) -- cycle;
- \path[fill=huawei-black] (0.2686,30.2244) -- (0.2686,36.1384) -- (1.4686,36.1384) -- (1.4686,33.7365) -- (4.1780,33.7365) -- (4.1780,36.1384) -- (5.3783,36.1384) -- (5.3783,30.2244) -- (4.1780,30.2244) -- (4.1780,32.6102) -- (1.4686,32.6102) -- (1.4686,30.2244) -- cycle;
- \path[fill=huawei-black] (28.3267,30.2284) -- (28.3267,36.1344) -- (32.7928,36.1344) -- (32.7928,35.0575) -- (29.5105,35.0575) -- (29.5105,33.5931) -- (31.6931,33.5931) -- (31.6931,32.5160) -- (29.5105,32.5160) -- (29.5105,31.3052) -- (32.6785,31.3052) -- (32.6785,30.2284) -- cycle;
+ \path[fill=black] (10.9375,30.2240) -- (10.9375,33.6097) .. controls (10.9375,34.5713) and (10.4603,35.0845) .. (9.5932,35.0845) .. controls (8.7212,35.0845) and (8.2411,34.5565) .. (8.2411,33.5686) -- (8.2411,30.2278) -- (7.0415,30.2278) -- (7.0415,33.6097) .. controls (7.0415,35.2737) and (7.9658,36.2272) .. (9.5774,36.2272) .. controls (11.2041,36.2272) and (12.1371,35.2554) .. (12.1371,33.5609) -- (12.1371,30.2240) -- (10.9375,30.2240) -- cycle;
+ \path[fill=black] (15.3511,30.2240) -- (12.7456,36.1351) -- (13.9702,36.1351) -- (14.4731,34.9903) -- (14.5091,34.9045) -- (17.2158,34.9045) -- (17.7467,36.1351) -- (19.0045,36.1351) -- (16.4233,30.2590) -- (16.4001,30.2240) -- cycle;
+ \path[fill=black] (22.4840,30.2240) -- (21.1414,34.2912) -- (19.8344,30.2271) -- (18.5578,30.2271) -- (20.6186,36.1388) -- (21.6120,36.1388) -- (22.9573,32.2553) -- (24.3016,36.1388) -- (25.3034,36.1388) -- (27.3592,30.2271) -- (26.1152,30.2271) -- (24.8055,34.2912) -- (23.4626,30.2240) -- cycle;
+ \path[fill=black] (34.2236,30.2240) -- (34.2236,36.1300) -- (35.4074,36.1300) -- (35.4074,30.2240) -- cycle;
+ \path[fill=black] (0.2686,30.2244) -- (0.2686,36.1384) -- (1.4686,36.1384) -- (1.4686,33.7365) -- (4.1780,33.7365) -- (4.1780,36.1384) -- (5.3783,36.1384) -- (5.3783,30.2244) -- (4.1780,30.2244) -- (4.1780,32.6102) -- (1.4686,32.6102) -- (1.4686,30.2244) -- cycle;
+ \path[fill=black] (28.3267,30.2284) -- (28.3267,36.1344) -- (32.7928,36.1344) -- (32.7928,35.0575) -- (29.5105,35.0575) -- (29.5105,33.5931) -- (31.6931,33.5931) -- (31.6931,32.5160) -- (29.5105,32.5160) -- (29.5105,31.3052) -- (32.6785,31.3052) -- (32.6785,30.2284) -- cycle;
\path[fill=white] (15.8594,31.7207) -- (16.7149,33.7008) -- (16.7119,33.7008) -- (16.7701,33.8374) -- (14.9552,33.8374) -- (15.0127,33.7008) -- (15.0117,33.7008) -- cycle;
- \path[fill=huawei-red] (15.2113,0.0001) .. controls (14.7353,0.0422) and (13.4491,0.3349) .. (13.4491,0.3349) -- (13.4486,0.3349) .. controls (10.5495,1.0843) and (9.8643,3.7151) .. (9.8643,3.7151) .. controls (9.7227,4.1575) and (9.6584,4.6109) .. (9.6395,5.0380) -- (9.6395,5.6194) .. controls (9.6780,6.5176) and (9.8777,7.1883) .. (9.8777,7.1883) .. controls (10.8461,11.4823) and (15.6075,18.5379) .. (16.6308,20.0200) .. controls (16.7034,20.0920) and (16.7615,20.0660) .. (16.7615,20.0660) .. controls (16.8720,20.0355) and (16.8633,19.9296) .. (16.8633,19.9296) -- (16.8654,19.9301) .. controls (18.4416,4.1760) and (15.2113,0.0001) .. (15.2113,0.0001) -- (15.2113,0.0001) -- cycle;
- \path[fill=huawei-red] (20.4192,0.0000) .. controls (20.4192,0.0000) and (17.1748,4.1782) .. (18.7521,19.9415) -- (18.7542,19.9415) .. controls (18.7664,20.0416) and (18.8374,20.0624) .. (18.8374,20.0624) .. controls (18.9430,20.1033) and (18.9971,20.0019) .. (18.9971,20.0019) -- (18.9976,20.0029) .. controls (20.0472,18.4829) and (24.7814,11.4657) .. (25.7455,7.1882) .. controls (25.7455,7.1882) and (26.2683,5.1179) .. (25.7636,3.7150) .. controls (25.7636,3.7150) and (25.0470,1.0434) .. (22.1442,0.3375) .. controls (22.1442,0.3375) and (21.3077,0.1251) .. (20.4193,0.0000) -- (20.4192,0.0000) -- cycle;
- \path[fill=huawei-red] (5.4542,4.7294) .. controls (5.4542,4.7294) and (2.6920,7.3513) .. (2.5547,10.1307) -- (2.5558,10.1307) -- (2.5558,10.5519) .. controls (2.5579,10.5836) and (2.5595,10.6157) .. (2.5615,10.6480) .. controls (2.6804,12.8893) and (4.3665,14.2157) .. (4.3665,14.2157) .. controls (7.0831,16.8634) and (13.6611,20.2062) .. (15.1896,20.9647) .. controls (15.2110,20.9727) and (15.2900,20.9985) .. (15.3364,20.9399) .. controls (15.3364,20.9399) and (15.3605,20.9216) .. (15.3715,20.8887) -- (15.3715,20.8189) .. controls (15.3704,20.8149) and (15.3683,20.8109) .. (15.3663,20.8065) -- (15.3669,20.8065) .. controls (11.1809,11.6620) and (5.4543,4.7294) .. (5.4543,4.7294) -- (5.4542,4.7294) -- cycle;
- \path[fill=huawei-red] (30.1695,4.7294) .. controls (30.1695,4.7294) and (24.4602,11.6403) .. (20.2761,20.7662) -- (20.2777,20.7657) .. controls (20.2777,20.7657) and (20.2283,20.8715) .. (20.3082,20.9399) .. controls (20.3082,20.9399) and (20.3320,20.9579) .. (20.3650,20.9652) -- (20.4229,20.9652) .. controls (20.4333,20.9622) and (20.4444,20.9582) .. (20.4554,20.9507) -- (20.4554,20.9517) .. controls (22.0255,20.1724) and (28.5525,16.8516) .. (31.2563,14.2162) .. controls (31.2563,14.2162) and (32.9686,12.8412) .. (33.0583,10.6334) .. controls (33.2560,7.5672) and (30.1696,4.7294) .. (30.1696,4.7294) -- (30.1695,4.7294) -- cycle;
- \path[fill=huawei-red] (35.3082,13.8080) .. controls (35.3082,13.8080) and (26.0003,18.8031) .. (21.1876,22.0494) -- (21.1882,22.0499) -- (21.1893,22.0509) .. controls (21.1893,22.0509) and (21.1019,22.1081) .. (21.1324,22.2106) .. controls (21.1324,22.2106) and (21.1781,22.2933) .. (21.2446,22.2933) -- (21.2446,22.2938) .. controls (22.9684,22.2968) and (29.4914,22.3041) .. (29.6549,22.2736) .. controls (29.6549,22.2736) and (30.4983,22.2399) .. (31.5406,21.8395) .. controls (31.5406,21.8395) and (33.8608,21.1019) .. (35.0659,18.4677) .. controls (35.0659,18.4677) and (35.6166,17.3662) .. (35.6246,15.8187) -- (35.6246,15.7531) .. controls (35.6206,15.1563) and (35.5365,14.4957) .. (35.3083,13.8080) -- (35.3082,13.8080) -- cycle;
- \path[fill=huawei-red] (0.3129,13.8313) .. controls (-0.5339,16.4531) and (0.6062,18.5656) .. (0.6080,18.5690) .. controls (1.7962,21.0795) and (4.0641,21.8401) .. (4.0641,21.8401) .. controls (5.1112,22.2703) and (6.1586,22.3000) .. (6.1586,22.3000) .. controls (6.3221,22.3300) and (12.6713,22.3030) .. (14.3725,22.2950) .. controls (14.4445,22.2945) and (14.4842,22.2221) .. (14.4842,22.2221) .. controls (14.4892,22.2142) and (14.4936,22.2062) .. (14.4955,22.1989) -- (14.4955,22.1333) .. controls (14.4814,22.0893) and (14.4439,22.0584) .. (14.4439,22.0584) -- (14.4450,22.0578) .. controls (9.6347,18.8126) and (0.3130,13.8315) .. (0.3130,13.8315) -- (0.3129,13.8313) -- cycle;
- \path[fill=huawei-red] (14.1782,23.1010) -- (3.2285,23.4850) .. controls (4.4160,25.6018) and (6.4158,27.2469) .. (8.4990,26.7416) .. controls (9.9366,26.3822) and (13.1935,24.1105) .. (14.2687,23.3429) -- (14.2651,23.3399) .. controls (14.3487,23.2648) and (14.3188,23.2045) .. (14.3188,23.2045) .. controls (14.2913,23.1062) and (14.1783,23.1063) .. (14.1783,23.1063) -- (14.1782,23.1010) -- cycle;
- \path[fill=huawei-red] (21.4305,23.1090) -- (21.4294,23.1130) .. controls (21.4294,23.1130) and (21.3333,23.1252) .. (21.3064,23.1972) .. controls (21.3064,23.1972) and (21.2831,23.2956) .. (21.3478,23.3445) -- (21.3467,23.3455) .. controls (22.3950,24.0973) and (25.5729,26.3191) .. (27.1039,26.7505) .. controls (27.1039,26.7505) and (27.3359,26.8294) .. (27.7246,26.8435) -- (27.9581,26.8435) .. controls (28.9839,26.8075) and (30.7708,26.2805) .. (32.3946,23.4907) -- (21.4305,23.1090) -- cycle;
+ \path[fill=red] (15.2113,0.0001) .. controls (14.7353,0.0422) and (13.4491,0.3349) .. (13.4491,0.3349) -- (13.4486,0.3349) .. controls (10.5495,1.0843) and (9.8643,3.7151) .. (9.8643,3.7151) .. controls (9.7227,4.1575) and (9.6584,4.6109) .. (9.6395,5.0380) -- (9.6395,5.6194) .. controls (9.6780,6.5176) and (9.8777,7.1883) .. (9.8777,7.1883) .. controls (10.8461,11.4823) and (15.6075,18.5379) .. (16.6308,20.0200) .. controls (16.7034,20.0920) and (16.7615,20.0660) .. (16.7615,20.0660) .. controls (16.8720,20.0355) and (16.8633,19.9296) .. (16.8633,19.9296) -- (16.8654,19.9301) .. controls (18.4416,4.1760) and (15.2113,0.0001) .. (15.2113,0.0001) -- (15.2113,0.0001) -- cycle;
+ \path[fill=red] (20.4192,0.0000) .. controls (20.4192,0.0000) and (17.1748,4.1782) .. (18.7521,19.9415) -- (18.7542,19.9415) .. controls (18.7664,20.0416) and (18.8374,20.0624) .. (18.8374,20.0624) .. controls (18.9430,20.1033) and (18.9971,20.0019) .. (18.9971,20.0019) -- (18.9976,20.0029) .. controls (20.0472,18.4829) and (24.7814,11.4657) .. (25.7455,7.1882) .. controls (25.7455,7.1882) and (26.2683,5.1179) .. (25.7636,3.7150) .. controls (25.7636,3.7150) and (25.0470,1.0434) .. (22.1442,0.3375) .. controls (22.1442,0.3375) and (21.3077,0.1251) .. (20.4193,0.0000) -- (20.4192,0.0000) -- cycle;
+ \path[fill=red] (5.4542,4.7294) .. controls (5.4542,4.7294) and (2.6920,7.3513) .. (2.5547,10.1307) -- (2.5558,10.1307) -- (2.5558,10.5519) .. controls (2.5579,10.5836) and (2.5595,10.6157) .. (2.5615,10.6480) .. controls (2.6804,12.8893) and (4.3665,14.2157) .. (4.3665,14.2157) .. controls (7.0831,16.8634) and (13.6611,20.2062) .. (15.1896,20.9647) .. controls (15.2110,20.9727) and (15.2900,20.9985) .. (15.3364,20.9399) .. controls (15.3364,20.9399) and (15.3605,20.9216) .. (15.3715,20.8887) -- (15.3715,20.8189) .. controls (15.3704,20.8149) and (15.3683,20.8109) .. (15.3663,20.8065) -- (15.3669,20.8065) .. controls (11.1809,11.6620) and (5.4543,4.7294) .. (5.4543,4.7294) -- (5.4542,4.7294) -- cycle;
+ \path[fill=red] (30.1695,4.7294) .. controls (30.1695,4.7294) and (24.4602,11.6403) .. (20.2761,20.7662) -- (20.2777,20.7657) .. controls (20.2777,20.7657) and (20.2283,20.8715) .. (20.3082,20.9399) .. controls (20.3082,20.9399) and (20.3320,20.9579) .. (20.3650,20.9652) -- (20.4229,20.9652) .. controls (20.4333,20.9622) and (20.4444,20.9582) .. (20.4554,20.9507) -- (20.4554,20.9517) .. controls (22.0255,20.1724) and (28.5525,16.8516) .. (31.2563,14.2162) .. controls (31.2563,14.2162) and (32.9686,12.8412) .. (33.0583,10.6334) .. controls (33.2560,7.5672) and (30.1696,4.7294) .. (30.1696,4.7294) -- (30.1695,4.7294) -- cycle;
+ \path[fill=red] (35.3082,13.8080) .. controls (35.3082,13.8080) and (26.0003,18.8031) .. (21.1876,22.0494) -- (21.1882,22.0499) -- (21.1893,22.0509) .. controls (21.1893,22.0509) and (21.1019,22.1081) .. (21.1324,22.2106) .. controls (21.1324,22.2106) and (21.1781,22.2933) .. (21.2446,22.2933) -- (21.2446,22.2938) .. controls (22.9684,22.2968) and (29.4914,22.3041) .. (29.6549,22.2736) .. controls (29.6549,22.2736) and (30.4983,22.2399) .. (31.5406,21.8395) .. controls (31.5406,21.8395) and (33.8608,21.1019) .. (35.0659,18.4677) .. controls (35.0659,18.4677) and (35.6166,17.3662) .. (35.6246,15.8187) -- (35.6246,15.7531) .. controls (35.6206,15.1563) and (35.5365,14.4957) .. (35.3083,13.8080) -- (35.3082,13.8080) -- cycle;
+ \path[fill=red] (0.3129,13.8313) .. controls (-0.5339,16.4531) and (0.6062,18.5656) .. (0.6080,18.5690) .. controls (1.7962,21.0795) and (4.0641,21.8401) .. (4.0641,21.8401) .. controls (5.1112,22.2703) and (6.1586,22.3000) .. (6.1586,22.3000) .. controls (6.3221,22.3300) and (12.6713,22.3030) .. (14.3725,22.2950) .. controls (14.4445,22.2945) and (14.4842,22.2221) .. (14.4842,22.2221) .. controls (14.4892,22.2142) and (14.4936,22.2062) .. (14.4955,22.1989) -- (14.4955,22.1333) .. controls (14.4814,22.0893) and (14.4439,22.0584) .. (14.4439,22.0584) -- (14.4450,22.0578) .. controls (9.6347,18.8126) and (0.3130,13.8315) .. (0.3130,13.8315) -- (0.3129,13.8313) -- cycle;
+ \path[fill=red] (14.1782,23.1010) -- (3.2285,23.4850) .. controls (4.4160,25.6018) and (6.4158,27.2469) .. (8.4990,26.7416) .. controls (9.9366,26.3822) and (13.1935,24.1105) .. (14.2687,23.3429) -- (14.2651,23.3399) .. controls (14.3487,23.2648) and (14.3188,23.2045) .. (14.3188,23.2045) .. controls (14.2913,23.1062) and (14.1783,23.1063) .. (14.1783,23.1063) -- (14.1782,23.1010) -- cycle;
+ \path[fill=red] (21.4305,23.1090) -- (21.4294,23.1130) .. controls (21.4294,23.1130) and (21.3333,23.1252) .. (21.3064,23.1972) .. controls (21.3064,23.1972) and (21.2831,23.2956) .. (21.3478,23.3445) -- (21.3467,23.3455) .. controls (22.3950,24.0973) and (25.5729,26.3191) .. (27.1039,26.7505) .. controls (27.1039,26.7505) and (27.3359,26.8294) .. (27.7246,26.8435) -- (27.9581,26.8435) .. controls (28.9839,26.8075) and (30.7708,26.2805) .. (32.3946,23.4907) -- (21.4305,23.1090) -- cycle;
\end{scope}%
\end{scope}%
\end{tikzpicture}%
@@ -263,7 +267,7 @@
\vspace*{\fill}
\begin{center}
\normalsize
- {\Huge\color{huawei-red}\textbf{Thank you!}}
+ {\Huge\color{red}\textbf{Thank you!}}
\end{center}
\vspace*{\fill}
}
@@ -324,7 +328,7 @@
\begin{minipage}{0.6\columnwidth}\raggedright
\normalsize
\setlength{\parskip}{6pt}
- {\Huge\color{huawei-red}\textbf{Thank you!}}
+ {\Huge\color{red}\textbf{Thank you!}}
\vspace{0.5in}
diff --git a/macros/latex/contrib/huawei/huawei.pdf b/macros/latex/contrib/huawei/huawei.pdf
index 8fa0f47c80..66c69804bb 100644
--- a/macros/latex/contrib/huawei/huawei.pdf
+++ b/macros/latex/contrib/huawei/huawei.pdf
Binary files differ
diff --git a/macros/latex/contrib/huawei/huawei.tex b/macros/latex/contrib/huawei/huawei.tex
index 15a3b9bddc..91bca320d5 100644
--- a/macros/latex/contrib/huawei/huawei.tex
+++ b/macros/latex/contrib/huawei/huawei.tex
@@ -29,9 +29,9 @@
\begin{document}
\maketitle
-\ff{Version: 0.9.1}
+\ff{Version: 0.10.0}
\newline
-\ff{Date: 2021/08/25}
+\ff{Date: 2021/09/08}
\section{Overview}