diff options
Diffstat (limited to 'macros/latex/contrib')
34 files changed, 1304 insertions, 944 deletions
diff --git a/macros/latex/contrib/huawei/DEPENDS.txt b/macros/latex/contrib/huawei/DEPENDS.txt index c2a24eeddb..22b1f7e930 100644 --- a/macros/latex/contrib/huawei/DEPENDS.txt +++ b/macros/latex/contrib/huawei/DEPENDS.txt @@ -1,19 +1,12 @@ hard geometry -hard fontenc -hard inputenc -hard CJKutf8 -hard tabularx hard anyfontsize -hard multicol hard ragged2e -hard multicol hard datetime hard libertine hard paralist hard makecell hard footmisc hard graphicx -hard array hard hyperref hard currfile hard enumitem @@ -23,7 +16,7 @@ hard lastpage hard setspace hard biblatex hard xcolor -hard tikz +hard pgf hard tabularx hard titling hard svg @@ -31,3 +24,12 @@ hard textpos hard fancyhdr hard changepage hard pagecolor +hard fmtcount +hard filehook +hard scrbase +hard trimspaces +hard catchfile +hard transparent +hard fontsize +hard ffcode +hard environ
\ No newline at end of file diff --git a/macros/latex/contrib/huawei/LICENSE.txt b/macros/latex/contrib/huawei/LICENSE.txt new file mode 100644 index 0000000000..bd949ffdab --- /dev/null +++ b/macros/latex/contrib/huawei/LICENSE.txt @@ -0,0 +1,21 @@ +(The MIT License) + +Copyright (c) 2021-2022 Yegor Bugayenko + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the 'Software'), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/macros/latex/contrib/huawei/README.md b/macros/latex/contrib/huawei/README.md index 8e3278065e..b7a0640cf2 100644 --- a/macros/latex/contrib/huawei/README.md +++ b/macros/latex/contrib/huawei/README.md @@ -1,4 +1,5 @@ -[](https://github.com/yegor256/huawei.cls/actions/workflows/latexmk.yml) +[](https://github.com/yegor256/huawei.cls/actions/workflows/l3build.yml) +[](https://ctan.org/pkg/huawei) [](https://github.com/yegor256/huawei.cls/blob/master/LICENSE.txt) Disclaimer: This is **NOT** a product of Huawei Technologies Co., Ltd. @@ -22,8 +23,6 @@ Hello, world! Read the detailed documentation [in PDF](http://mirrors.ctan.org/macros/latex/contrib/huawei/huawei.pdf). -Find more examples in the [`samples/`](/samples) directory. - If you need more formatting options, [submit an issue](https://github.com/yegor256/huawei.cls/issues), I'll implement them. diff --git a/macros/latex/contrib/huawei/huawei-cover-picture.pdf b/macros/latex/contrib/huawei/huawei-cover-picture.pdf Binary files differdeleted file mode 100644 index 6717a9ff35..0000000000 --- a/macros/latex/contrib/huawei/huawei-cover-picture.pdf +++ /dev/null diff --git a/macros/latex/contrib/huawei/huawei.cls b/macros/latex/contrib/huawei/huawei.cls deleted file mode 100644 index ed4894a805..0000000000 --- a/macros/latex/contrib/huawei/huawei.cls +++ /dev/null @@ -1,406 +0,0 @@ -% (The MIT License) -% -% Copyright (c) 2021 Yegor Bugayenko -% -% Permission is hereby granted, free of charge, to any person obtaining a copy -% of this software and associated documentation files (the 'Software'), to deal -% in the Software without restriction, including without limitation the rights -% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -% copies of the Software, and to permit persons to whom the Software is -% furnished to do so, subject to the following conditions: -% -% The above copyright notice and this permission notice shall be included in all -% copies or substantial portions of the Software. -% -% THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -% SOFTWARE. - -\NeedsTeXFormat{LaTeX2e} -\ProvidesClass{huawei}[2021/11/11 0.13.2 Template for Huawei Documents] - -\LoadClass[12pt]{article} - -\makeatletter -\newif\ifhuawei@dark -\DeclareOption{dark}{\huawei@darktrue} -\newif\ifhuawei@slides -\DeclareOption{slides}{\huawei@slidestrue} -\newif\ifhuawei@nosecurity -\DeclareOption{nosecurity}{\huawei@nosecuritytrue} -\newif\ifhuawei@authordraft -\DeclareOption{authordraft}{\huawei@authordrafttrue} -\newif\ifhuawei@nobrand -\DeclareOption{nobrand}{\huawei@nobrandtrue} -\newif\ifhuawei@nodate -\DeclareOption{nodate}{\huawei@nodatetrue} -\newif\ifhuawei@nocover -\DeclareOption{nocover}{\huawei@nocovertrue} -\newif\ifhuawei@nopaging -\DeclareOption{nopaging}{\huawei@nopagingtrue} -\newif\ifhuawei@landscape -\DeclareOption{landscape}{\huawei@landscapetrue} -\newif\ifhuawei@anonymous -\DeclareOption{anonymous}{\huawei@anonymoustrue} -\ProcessOptions\relax -\makeatother - -\RequirePackage{geometry} -\makeatletter\ifhuawei@landscape - \geometry{paperwidth=16in, paperheight=9in, left=4in, right=2in, top=1.5in, bottom=1.5in} -\else - \geometry{a4paper, left=1.5in, right=1in, top=1.2in, bottom=1.2in} -\fi\makeatother - -\makeatletter\ifhuawei@slides - \usepackage[fontsize=24pt]{fontsize} -\fi\makeatother - -\RequirePackage[T1]{fontenc} -\RequirePackage[utf8]{inputenc} -\RequirePackage{CJKutf8} -\RequirePackage{tabularx} -\RequirePackage{anyfontsize} -\RequirePackage{multicol} -\RequirePackage{ragged2e} -\RequirePackage{multicol} -\RequirePackage[mmddyyyy,iso]{datetime} - \newtimeformat{daytime}{\twodigit{\THEHOUR}:\twodigit{\THEMINUTE}} -\RequirePackage[tt=false,type1=true]{libertine} -\RequirePackage{paralist} -\RequirePackage{makecell} -\RequirePackage[para]{footmisc} - \setlength{\footnotemargin}{2pt} - \setlength{\footnotesep}{2pt} -\RequirePackage{graphicx} -\RequirePackage{array} -\RequirePackage[hidelinks]{hyperref} % to enable \pageref* command -\RequirePackage[abspath]{currfile} -\RequirePackage{enumitem} - \setlist{nosep} -\RequirePackage{microtype} -\RequirePackage{wrapfig} -\RequirePackage{lastpage} -\RequirePackage{setspace} - \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{red}{HTML}{CF0A2C} - \definecolor{black}{HTML}{232527} - \definecolor{gray}{HTML}{878C8F} - \definecolor{yellow}{HTML}{F2DC5D} - \definecolor{blue}{HTML}{2274A5} - \definecolor{green}{HTML}{499167} - \definecolor{orange}{HTML}{F06543} -\RequirePackage{tikz} -\RequirePackage{tabularx} -\RequirePackage{titling} -\RequirePackage{svg} -\RequirePackage[absolute]{textpos} - \TPGrid{16}{16} - -\makeatletter\newcommand\huawei@header[1]{{% - \ifhuawei@slides% - \setstretch{0.8}% - \fontsize{19pt}{24pt}\selectfont% - \else% - \setstretch{0.8}% - \fontsize{11pt}{13pt}\selectfont% - \fi% - \sffamily\color{gray}#1\par% -}}\makeatother - -\makeatletter\newcommand\huawei@bar{% - \begin{textblock}{1}[0,0](0,0)% - \tikz \node[fill=red,minimum width=\TPHorizModule,minimum height=16\TPVertModule] {};% - \end{textblock}% -}\makeatother - -\makeatletter\newcommand\huawei@logo{ - \def\BLACK{\ifhuawei@dark white\else black\fi} - \def\BLANK{\ifhuawei@dark black\else white\fi} - \def\SCALE{\ifhuawei@slides 1.8\else 1\fi} - \begin{tikzpicture}[y=0.80pt, x=0.80pt, yscale=-\SCALE, xscale=\SCALE, inner sep=0pt, outer sep=0pt] - \begin{scope}[even odd rule,line width=0.800pt] - \begin{scope}[shift={(0,-0.00024)}] - \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=\BLANK] (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=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}% -}\makeatother - -\RequirePackage{fancyhdr} - \pagestyle{fancy} - \renewcommand{\headrulewidth}{0pt} - \fancyhf{} - \makeatletter\fancyfoot[L]{ - \huawei@bar - \ifhuawei@authordraft% - \begin{textblock}{14}[0.5,0.5](8,8)% - \tikz \node[minimum width=14\TPHorizModule] {% - \fontsize{64}{64}\selectfont\sffamily\scshape\color{gray!20}\rotatebox{30}{it is a draft} - };% - \end{textblock}% - \else\fi% - }\makeatother - \makeatletter\fancyhead[L]{ - \ifnum\value{page}=1\else% - \ifhuawei@nobrand\else% - \begin{textblock}{8}[0,0](1.2,0.2)% - \huawei@logo% - \end{textblock}% - \fi% - \fi% - }\makeatother - \makeatletter\fancyhead[R]{ - \begin{textblock}{8}[1,0](15.8,0.2)% - \raggedleft\huawei@header{% - \ifhuawei@nosecurity\else% - \thesecurity - \fi% - }% - \end{textblock}% - }\makeatother - \makeatletter\fancyfoot[R]{ - \begin{textblock}{8}[0,1](1.2,15.8)% - \ifnum\value{page}=1\else% - \huawei@header{\raggedright% - \ifhuawei@anonymous\else% - \theauthor% - \ifhuawei@nosecurity\else% - \ifx\theid\empty\else, \theid\fi - \fi% - \ifhuawei@nobrand\else% - \newline - \fi% - \fi% - \ifhuawei@nobrand\else% - \thecompany{} - \fi% - }% - \fi% - \end{textblock}% - \begin{textblock}{8}[1,1](15.8,15.8)% - \raggedleft\huawei@header{% - \ifnum\value{page}=1\else% - \ifhuawei@nopaging\else% - Page \#\thepage{} of \pageref*{LastPage}% - \ifhuawei@nodate\else% - \\ - \fi% - \fi% - \fi% - \ifhuawei@nodate\else% - \today{} \settimeformat{daytime}\currenttime{}% - \fi% - }% - \end{textblock}% - }\makeatother - -\RequirePackage{changepage} -\renewenvironment{abstract} - {\begin{adjustwidth}{0pt}{1in}{\scshape Abstract:}\newline\small} - {\end{adjustwidth}} - -\makeatletter\renewcommand\maketitle{% - \vspace*{18pt} - {\bfseries{\Huge\thetitle}} - \ifx\thesubtitle\empty\else% - \\[6pt] - {\color{gray!50!black}\large\thesubtitle} - \fi - \\[18pt] - \ifhuawei@nobrand\else% - \ifhuawei@anonymous\else% - \ifx\thecompany\empty\else% - \thecompany\newline - \fi - \fi - \fi - \ifx\theauthor\empty\else% - {\scshape\ifhuawei@anonymous - Anonymous Authors - \else% - \theauthor - \fi}% - \fi% - \ifhuawei@anonymous\else% - \ifx\theauthor\empty\else - \ifhuawei@nobrand\else% - \ifx\theid\empty\else - $\;$/ {\theid} - \fi - \fi - \fi - \fi - \vspace{2em} -}\makeatother - -\newcommand\PrintCrumb[2]{% - \begin{minipage}{\columnwidth}% - \raggedright\textsc{#1}:\\#2% - \end{minipage}\vspace{4pt}% -} - -\newcommand\PrintThankYouPage{ - \newpage - \vspace*{\fill} - \begin{center} - \normalsize - {\Huge\color{red}\textbf{Thank you!}} - \end{center} - \vspace*{\fill} -} - -\makeatletter\newcommand\PrintDisclaimer{% - \justify\vspace*{\fill}% - \begingroup% - \setstretch{0.55}% - \sffamily\scriptsize\color{gray!50!black}% - \textbf{Disclaimer}: The opinions expressed in this document are in good faith and - while every care has been taken in preparing it, - \ifhuawei@nobrand% - the author% - \else% - \thecompany{}% - \fi - makes no representations and gives no warranties of whatever - nature in respect of these documents, including but not limited to the - accuracy or completeness of any information, facts and/or opinions contained therein. - \ifhuawei@nobrand% - The author% - \else% - \thecompany{}% - \fi, - its subsidiaries, the directors, employees and agents - cannot be held liable for the use of and reliance of the opinions, estimates, forecasts and - findings in these documents. - \par - \endgroup% -}\makeatother - -\makeatletter\newcommand\PrintFirstPage[1]{ - \ifhuawei@landscape\else - \PackageError{huawei}{It's allowed to use PrintFirstPage only in landscape mode}{Read huawei.pdf for more information} - \fi - \huawei@bar - \def\param{#1}% - \ifx\param\empty\else - \includegraphics[height=2in]{#1} - \newline - \fi - \vspace*{0.5in} - \maketitle - \ifhuawei@nocover\else - \begin{textblock}{14}[1,1](14,14) - \raggedleft\includegraphics[height=3.6in]{huawei-cover-picture.pdf} - \end{textblock} - \fi -}\makeatother - -\makeatletter\newcommand\PrintLastPage{ - \ifhuawei@landscape\else - \PackageError{huawei}{It's allowed to use PrintLastPage only in landscape mode}{Read huawei.pdf for more information} - \fi - \newpage - \vspace*{1in} - \begin{center} - \begin{minipage}{0.6\columnwidth}\raggedright - \normalsize - \setlength{\parskip}{6pt} - {\Huge\color{red}\textbf{Thank you!}} - - \vspace{0.5in} - - \begin{CJK}{UTF8}{gbsn} - 把数字世界带入每个人、每个家庭、
每个组织、构建万物互联的智能世界。 - \end{CJK} - - Bring digital to every person, home and organization - \newline - for a fully connected, intelligent world. - - \textbf{% - Copyright \copyright{} \the\year{} \thecompany{} - \newline - All Rights Reserved.% - } - - The information in this document may contain predictive - statements including, without limitation, statements regarding - the future financial and operating results, future product - portfolio, new technology, etc. There are a number of factors that - could cause actual results and developments to differ materially - from those expressed or implied in the predictive statements. - Therefore, such information is provided for reference purpose - only and constitutes neither an offer nor an acceptance. - \ifhuawei@nobrand% - The author% - \else% - \thecompany{}% - \fi - may change the information at any time without notice. - \end{minipage} - \end{center}% -}\makeatother - -\makeatletter\newcommand\PrintBibliography{ - \setlength\bibitemsep{3pt} - \AtNextBibliography{\small} - \newpage - \raggedright - \ifhuawei@landscape - \begin{multicols}{3}\setstretch{0.95}\printbibliography\end{multicols} - \else - \begin{multicols}{2}\setstretch{0.95}\printbibliography\end{multicols} - \fi -}\makeatother - -\makeatletter\ifhuawei@dark - \RequirePackage{pagecolor} - \pagecolor{black} - \color{white} -\fi - -\AtBeginDocument{% - \raggedbottom% - \raggedcolumns% - \setlength\headheight{32pt}% - \setlength\footskip{32pt}% - \setlength\topskip{0mm}% - \setlength\parindent{0pt}% - \setlength\parskip{6pt}% - \setlength\columnsep{32pt}% - \def\arraystretch{1.5}% -} - -\renewcommand\title[1]{\renewcommand\thetitle{#1}} -\newcommand\thetitle{\textbackslash{}thetitle} -\newcommand*\thecompany{Huawei Technologies Co., Ltd.} -\newcommand\thesubtitle{} -\renewcommand\author[1]{\renewcommand\theauthor{#1}} -\newcommand\theauthor{\textbackslash{}theauthor} -\newcommand*\thesecurity{Confidential} -\newcommand*\theid{} - -\ifcsname nospell\endcsname\else\newcommand\nospell[1]{#1}\fi - -\endinput
\ No newline at end of file diff --git a/macros/latex/contrib/huawei/huawei.dtx b/macros/latex/contrib/huawei/huawei.dtx new file mode 100644 index 0000000000..68db55e298 --- /dev/null +++ b/macros/latex/contrib/huawei/huawei.dtx @@ -0,0 +1,952 @@ +% \iffalse meta-comment +% (The MIT License) +% +% Copyright (c) 2021-2022 Yegor Bugayenko +% +% Permission is hereby granted, free of charge, to any person obtaining a copy +% of this software and associated documentation files (the 'Software'), to deal +% in the Software without restriction, including without limitation the rights +% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +% copies of the Software, and to permit persons to whom the Software is +% furnished to do so, subject to the following conditions: +% +% The above copyright notice and this permission notice shall be included in all +% copies or substantial portions of the Software. +% +% THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +% SOFTWARE. +% \fi + +%%% \CheckSum{0} +% +% \CharacterTable +% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +% Digits \0\1\2\3\4\5\6\7\8\9 +% Exclamation \! Double quote \" Hash (number) \# +% Dollar \$ Percent \% Ampersand \& +% Acute accent \' Left paren \( Right paren \) +% Asterisk \* Plus \+ Comma \, +% Minus \- Point \. Solidus \/ +% Colon \: Semicolon \; Less than \< +% Equals \= Greater than \> Question mark \? +% Commercial at \@ Left bracket \[ Backslash \\ +% Right bracket \] Circumflex \^ Underscore \_ +% Grave accent \` Left brace \{ Vertical bar \| +% Right brace \} Tilde \~} + +% \GetFileInfo{huawei.dtx} +% \DoNotIndex{\endgroup,\begingroup,\let,\else,\fi,\newcommand,\newenvironment} + +% \iffalse +%<*driver> +\ProvidesFile{huawei.dtx} +%</driver> +%<class>\NeedsTeXFormat{LaTeX2e} +%<class>\ProvidesClass{huawei} +%<*class> +[05.10.2022 0.14.1 Template for Huawei Documents] +%</class> +%<*driver> +\documentclass{ltxdoc} +\usepackage[tt=false, type1=true]{libertine} +\usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage{href-ul} +\PageIndex +\EnableCrossrefs +\CodelineIndex +\RecordChanges +\begin{document} + \DocInput{huawei.dtx} + \PrintChanges + \PrintIndex +\end{document} +%</driver> +% \fi + +% \title{\LaTeX{} Class |huawei|\thanks{The sources are in GitHub at \href{https://github.com/yegor256/huawei.cls}{yegor256/huawei.cls}}} +% \author{Yegor Bugayenko \\ \texttt{yegor256@gmail.com}} +% \date{\filedate, \fileversion} +% +% \maketitle +% +% \section{Introduction} +% +% The provided class |huawei| helps you design your work +% documents and presentations keeping the code short and the +% style elegant enough both for management and technical +% papers. To use the class you simply mention its name +% in the preamble: +% +%\iffalse +%<*verb> +%\fi +\begin{verbatim} +\documentclass{huawei} +\begin{document} +Hello, world! +\end{document} +\end{verbatim} +%\iffalse +%</verb> +%\fi + +% We recommend you to use +% |latexmk| to compile your |.tex| files to |.pdf|. +% The simplest setup will require a few files staying next to your +% |.tex| file, in the same directory (``story'' is the name +% of your project here): + +%\iffalse +%<*verb> +%\fi +\begin{verbatim} +story\ + .latexmkrc + .gitignore + story.tex +\end{verbatim} +%\iffalse +%</verb> +%\fi + +% The content of your |.latexmkrc| file would be this: + +%\iffalse +%<*verb> +%\fi +\begin{verbatim} +$pdflatex = 'pdflatex %O --shell-escape %S'; +\end{verbatim} +%\iffalse +%</verb> +%\fi + +% Make sure the |.gitignore| file lists all the files generated +% by |pdflatex| during the compilation. You don't need to commit +% them to your repository, since they are temporary and will +% be generated again when you compile your document. + +% In order to compile the document, just say |latexmk| on the command line. + +% \section{Class Options} + +% There are a few class options, provided in square brackets after the +% |\documentclass|, which can help you fine-tune +% the layout of your document: + +% \begin{macro}{landscape} +% makes the document in landscape format, also changing the size +% of the paper to 16x9 inches (the default page size is +% \href{https://en.wikipedia.org/wiki/Paper_size}{A4}), +% making it perfect for presentations. +% \end{macro} + +% \begin{macro}{dark} +% Turns on a dark layout, where the page color is black and the text +% is white. +% \end{macro} + +% \begin{macro}{slides} +% makes all headers a bit larger, assuming that the document +% is in the landscape mode and being presented as a slide deck. +% \end{macro} + +% \begin{macro}{nocover} +% avoid printing the cover images on the first page by the +% |\PrintTitlePage| command. +% \end{macro} + +% \begin{macro}{anonymous} +% removes the name of the author everywhere, including the bottom +% of the page, where the author's name stays next to the name of the +% company. +% \end{macro} + +% \begin{macro}{nobrand} +% avoid mentioning the brand of Huawei anywhere +% in the document and removes the logo too. +% \end{macro} + +% \begin{macro}{nosecurity} +% avoids mentioning the level of security at the right top +% corner of the document and also avoids showing the ID of the author +% where it usually is visible. +% \end{macro} + +% \begin{macro}{nodate} +% don't show the date and time at the bottom of each page, +% where they usually are rendered in ISO~8601 format. +% \end{macro} + +% \begin{macro}{nopaging} +% avoids page numbers at the bottom of each page. +% \end{macro} + +% \begin{macro}{authordraft} +% prints a big ``It's a draft'' message across each page. +% \end{macro} + +% \section{Preamble} + +% In the preamble you can specify meta information about the document, +% such as its title or author's name, here is how: + +%\iffalse +%<*verb> +%\fi +\begin{verbatim} +\documentclass{huawei} +\renewcommand*\thetitle{Making Compression 15\% Faster} +\renewcommand*\thesubtitle{Technical Report} +\renewcommand*\theauthor{Yegor Bugayenko} +\begin{document} +\maketitle +Hello, world! +\end{document} +\end{verbatim} +%\iffalse +%</verb> +%\fi + +% It's recommended to use |\renewcommand*| instead of +% |\renewcommand| in order to let \LaTeX{} catch you +% if by mistake a new line gets into the content. + +% The following meta commands are defined: + +% \begin{macro}{\thetitle} +% |\thetitle| is the main title of the document +% to be used in the text and in the properties of the PDF document. +% \end{macro} + +% \begin{macro}{\thesubtitle} +% |\thesubtitle| is the subtitle to be +% printed under the title. +% \end{macro} + +% \begin{macro}{\theauthor} +% |\theauthor| is the author of the document +% in ``first-name last-name'' format. +% \end{macro} + +% \begin{macro}{\theid} +% |\theid| is the internal ID of the author, if +% it's applicable. +% \end{macro} + +% \begin{macro}{\thesecurity} +% It is the level of security of +% the document, which is usually printed at the top right +% corner of it; usual values are ``Internal,'' +% ''Confidential,'' or ``Secret.'' +% \end{macro} + +% Default values of all these commands are empty. If you don't +% renew them in your document, nothing will be printed. + +% \section{Custom Commands} + +% Inside the document body you can use these commands: + +% \begin{macro}{\PrintFirstPage} +% |\PrintFirstPage| +% prints the first page of a project charter or a similar landscape documents, +% placing the image |front-image.pdf| on the front (the file should be present +% in the current dir. If you don't have the front image file, just leave +% the first argument empty. +% \end{macro} + +% \begin{macro}{\PrintLastPage} +% |\PrintLastPage| +% prints the last page of a project charter or a similar landscape document. +% \end{macro} + +% \begin{macro}{\PrintThankYouPage} +% |\PrintThankYouPage| +% prints the last page with a "Thank You" message in the center. +% \end{macro} + +% \begin{macro}{\PrintDisclaimer} +% |\PrintDisclaimer| +% prints a paragraph at the bottom of the page with a standard disclaimer. +% \end{macro} + +% \section{Best Practices} + +% You are free to design your documents any way you want. However, +% it would be convenient for yourself and for your readers, if you follow +% the convention we have for business and technical documents. + +% The rule of thumb is simple: try \emph{not} to format your documents. +% Instead, let the class designed by us do this work for you. Just type +% the content without changing the layout, adding colors, changing fonts, +% etc. The less you modify the look-and-feel, the better your documents +% will be perceived by your readers. + +% \subsection{Two Columns} + +% In the landscape format it's recommended to use two columns, for better +% readability of the text. Here is how: + +%\iffalse +%<*verb> +%\fi +\begin{verbatim} +\documentclass{huawei} +\begin{document} +\newpage +\begin{multicols}{2} +\section*{First} +Here goes the first column content. +\columnbreak +\section*{Second} +Here goes the second column content. +\end{multicols} +\end{document} +\end{verbatim} +%\iffalse +%</verb> +%\fi + +% \subsection{Crumbs} + +% When you need to put many small information pieces into one page, +% we recommend you to use ``crumbs'': + +%\iffalse +%<*verb> +%\fi +\begin{verbatim} +\documentclass{huawei} +\begin{document} +\newpage +\section*{Project Details} +\begin{multicols}{2} +\raggedright +\PrintCrumb{Budget}{\$100K} + +\PrintCrumb{Duration}{5 months} +\end{multicols} +\end{document} +\end{verbatim} +%\iffalse +%</verb> +%\fi + +% \StopEventually{} + +% \section{Implementation} + +% \changes{v0.1.0}{2021/04/18}{Initial version} + +% First, we load the parent class: +% \begin{macrocode} +\LoadClass[12pt]{article} +% \end{macrocode} + +% Then, we parse package options: +% \begin{macrocode} +\makeatletter +\newif\ifhuawei@dark +\DeclareOption{dark}{\huawei@darktrue} +\newif\ifhuawei@slides +\DeclareOption{slides}{\huawei@slidestrue} +\newif\ifhuawei@nosecurity +\DeclareOption{nosecurity}{\huawei@nosecuritytrue} +\newif\ifhuawei@authordraft +\DeclareOption{authordraft}{\huawei@authordrafttrue} +\newif\ifhuawei@nobrand +\DeclareOption{nobrand}{\huawei@nobrandtrue} +\newif\ifhuawei@nodate +\DeclareOption{nodate}{\huawei@nodatetrue} +\newif\ifhuawei@nocover +\DeclareOption{nocover}{\huawei@nocovertrue} +\newif\ifhuawei@nopaging +\DeclareOption{nopaging}{\huawei@nopagingtrue} +\newif\ifhuawei@landscape +\DeclareOption{landscape}{\huawei@landscapetrue} +\newif\ifhuawei@anonymous +\DeclareOption{anonymous}{\huawei@anonymoustrue} +\ProcessOptions\relax +\makeatother +% \end{macrocode} + +% Then, we set the size of the page: +% \begin{macrocode} +\RequirePackage{geometry} +\makeatletter\ifhuawei@landscape + \geometry{paperwidth=16in, paperheight=9in, + left=4in, right=2in, top=1.5in, bottom=1.5in} +\else + \geometry{a4paper, left=1.5in, right=1in, + top=1.2in, bottom=1.2in} +\fi\makeatother +% \end{macrocode} + +% Then, we set the size of the font: +% \begin{macrocode} +\makeatletter\ifhuawei@slides + \usepackage[fontsize=24pt]{fontsize} +\fi\makeatother +% \end{macrocode} + +% Then, we include a important packages: +% \begin{macrocode} +\RequirePackage[T1]{fontenc} +\RequirePackage[utf8]{inputenc} +\RequirePackage{tabularx} +\RequirePackage{anyfontsize} +\RequirePackage{multicol} +\RequirePackage{ragged2e} +\RequirePackage{multicol} +\RequirePackage[mmddyyyy,iso]{datetime} + \newtimeformat{daytime}{\twodigit{\THEHOUR}:\twodigit{\THEMINUTE}} +\RequirePackage[tt=false,type1=true]{libertine} +\RequirePackage{paralist} + \setdefaultenum{a)}{a)}{a)}{a)} +\RequirePackage{makecell} +\RequirePackage[para]{footmisc} + \setlength{\footnotemargin}{2pt} + \setlength{\footnotesep}{2pt} +\RequirePackage{graphicx} +\RequirePackage{array} +\RequirePackage[hidelinks]{hyperref} % to enable \pageref* command +\RequirePackage[abspath]{currfile} +\RequirePackage{enumitem} + \setlist{nosep} +\RequirePackage{microtype} +\RequirePackage{wrapfig} +\RequirePackage{lastpage} +\RequirePackage{tikz} +\RequirePackage{tabularx} +\RequirePackage{titling} +\RequirePackage{svg} +\RequirePackage[absolute]{textpos} + \TPGrid{16}{16} +% \end{macrocode} + +% Then, we configure |biblatex|: +% \begin{macrocode} +\RequirePackage[maxnames=1,minnames=1,natbib=true, + citestyle=numeric,bibstyle=numeric,doi=false, + url=false,isbn=false,isbn=false]{biblatex} +% \end{macrocode} + +% Then, we set spacing between lines: +% \begin{macrocode} +\RequirePackage{setspace} +\setstretch{1.08} +% \end{macrocode} + +% Then, we define branded colors: +% \begin{macrocode} +\PassOptionsToPackage{table}{xcolor} +\RequirePackage{xcolor} +\definecolor{red}{HTML}{CF0A2C} +\definecolor{black}{HTML}{232527} +\definecolor{gray}{HTML}{878C8F} +\definecolor{yellow}{HTML}{F2DC5D} +\definecolor{blue}{HTML}{2274A5} +\definecolor{green}{HTML}{499167} +\definecolor{orange}{HTML}{F06543} +% \end{macrocode} + +% \begin{macro}{\huawei@header} +% Then, we define |\huawei@header|: +% \begin{macrocode} +\makeatletter\newcommand\huawei@header[1]{{% + \ifhuawei@slides% + \setstretch{0.8}% + \fontsize{19pt}{24pt}\selectfont% + \else% + \setstretch{0.8}% + \fontsize{11pt}{13pt}\selectfont% + \fi% + \sffamily\color{gray}#1\par% +}}\makeatother +% \end{macrocode} +% \end{macro} + +% \begin{macro}{\huawei@bar} +% Then, we define |\huawei@bar|: +% \begin{macrocode} +\makeatletter\newcommand\huawei@bar{% + \begin{textblock}{1}[0,0](0,0)% + \tikz \node[fill=red,minimum width=\TPHorizModule, + minimum height=16\TPVertModule] {};% + \end{textblock}% +}\makeatother +% \end{macrocode} +% \end{macro} + +% \begin{macro}{\huawei@logo} +% Then, we define |\huawei@logo|: +% \begin{macrocode} +\makeatletter\newcommand\huawei@logo{ +\def\BLACK{\ifhuawei@dark white\else black\fi} +\def\BLANK{\ifhuawei@dark black\else white\fi} +\def\SCALE{\ifhuawei@slides 1.8\else 1\fi} +\begin{tikzpicture}[y=0.80pt, x=0.80pt, yscale=-\SCALE, +xscale=\SCALE, inner sep=0pt, outer sep=0pt] +\begin{scope}[even odd rule,line width=0.800pt] +\begin{scope}[shift={(0,-0.00024)}] +\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=\BLANK] (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=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}% +}\makeatother +% \end{macrocode} +% \end{macro} + +% Then, we configure headers using |fancyhdr|: +% \begin{macrocode} +\RequirePackage{fancyhdr} +\pagestyle{fancy} +\renewcommand{\headrulewidth}{0pt} +\fancyhf{} +\makeatletter\fancyfoot[L]{ + \huawei@bar + \ifhuawei@authordraft% + \begin{textblock}{14}[0.5,0.5](8,8)% + \tikz \node[minimum width=14\TPHorizModule] {% + \fontsize{64}{64}\selectfont\sffamily\scshape% + \color{gray!20}\rotatebox{30}{it is a draft} + };% + \end{textblock}% + \else\fi% +}\makeatother +\makeatletter\fancyhead[L]{ + \ifnum\value{page}=1\else% + \ifhuawei@nobrand\else% + \begin{textblock}{8}[0,0](1.2,0.2)% + \huawei@logo% + \end{textblock}% + \fi% + \fi% +}\makeatother +\makeatletter\fancyhead[R]{ + \begin{textblock}{8}[1,0](15.8,0.2)% + \raggedleft\huawei@header{% + \ifhuawei@nosecurity\else% + \thesecurity + \fi% + }% + \end{textblock}% +}\makeatother +\makeatletter\fancyfoot[R]{ + \begin{textblock}{8}[0,1](1.2,15.8)% + \ifnum\value{page}=1\else% + \huawei@header{\raggedright% + \ifhuawei@anonymous\else% + \theauthor% + \ifhuawei@nosecurity\else% + \ifx\theid\empty\else, \theid\fi + \fi% + \ifhuawei@nobrand\else% + \newline + \fi% + \fi% + \ifhuawei@nobrand\else% + \thecompany{} + \fi% + }% + \fi% + \end{textblock}% + \begin{textblock}{8}[1,1](15.8,15.8)% + \raggedleft\huawei@header{% + \ifnum\value{page}=1\else% + \ifhuawei@nopaging\else% + Page \#\thepage{} of \pageref*{LastPage}% + \ifhuawei@nodate\else% + \\ + \fi% + \fi% + \fi% + \ifhuawei@nodate\else% + \today{} \settimeformat{daytime}\currenttime{}% + \fi% + }% + \end{textblock}% +}\makeatother +% \end{macrocode} + +% \begin{macro}{abstract} +% Then, we redefine |abstract| environment: +% \begin{macrocode} +\RequirePackage{changepage} +\renewenvironment{abstract} + {\begin{adjustwidth}{0pt}{1in}{\scshape Abstract:}\newline\small} + {\end{adjustwidth}} +% \end{macrocode} +% \end{macro} + +% \begin{macro}{\maketitle} +% Then, we redefine |\maketitle|: +% \begin{macrocode} +\makeatletter\renewcommand\maketitle{% + \vspace*{18pt} + {\bfseries{\Huge\thetitle}} + \ifx\thesubtitle\empty\else% + \\[6pt] + {\color{gray!50!black}\large\thesubtitle} + \fi + \\[18pt] + \ifhuawei@nobrand\else% + \ifhuawei@anonymous\else% + \ifx\thecompany\empty\else% + \thecompany\newline + \fi + \fi + \fi + \ifx\theauthor\empty\else% + {\scshape\ifhuawei@anonymous + Anonymous Authors + \else% + \theauthor + \fi}% + \fi% + \ifhuawei@anonymous\else% + \ifx\theauthor\empty\else + \ifhuawei@nobrand\else% + \ifx\theid\empty\else + $\;$/ {\theid} + \fi + \fi + \fi + \fi + \vspace{2em} +}\makeatother +% \end{macrocode} +% \end{macro} + +% \begin{macro}{\PrintCrumb} +% Then, we define |\PrintCrumb|: +% \begin{macrocode} +\newcommand\PrintCrumb[2]{% + \begin{minipage}{\columnwidth}% + \raggedright\textsc{#1}:\\#2% + \end{minipage}\vspace{4pt}% +} +% \end{macrocode} +% \end{macro} + +% \begin{macro}{\PrintThankYouPage} +% Then, we define |\PrintThankYouPage|: +% \begin{macrocode} +\newcommand\PrintThankYouPage{ + \newpage + \vspace*{\fill} + \begin{center} + \normalsize + {\Huge\color{red}\textbf{Thank you!}} + \end{center} + \vspace*{\fill} +} +% \end{macrocode} +% \end{macro} + +% \begin{macro}{\PrintDisclaimer} +% Then, we define |\PrintDisclaimer|: +% \begin{macrocode} +\makeatletter\newcommand\PrintDisclaimer{% + \justify\vspace*{\fill}% + \begingroup% + \setstretch{0.55}% + \sffamily\scriptsize\color{gray!50!black}% + \textbf{Disclaimer}: The opinions expressed in + this document are in good faith and + while every care has been taken in preparing it, + \ifhuawei@nobrand% + the author% + \else% + \thecompany{}% + \fi + makes no representations and gives no warranties + of whatever nature in respect of these documents, + including but not limited to the accuracy or completeness + of any information, facts and/or opinions contained therein. + \ifhuawei@nobrand% + The author% + \else% + \thecompany{}% + \fi, + its subsidiaries, the directors, employees and agents + cannot be held liable for the use of and reliance of + the opinions, estimates, forecasts and findings in + these documents. + \par + \endgroup% +}\makeatother +% \end{macrocode} +% \end{macro} + +% \begin{macro}{\PrintFirstPage} +% Then, we define |\PrintFirstPage|: +% \begin{macrocode} +\makeatletter\newcommand\PrintFirstPage[1]{ + \ifhuawei@landscape\else + \PackageError{huawei}{It's allowed to use + PrintFirstPage only in landscape mode}{Read huawei.pdf + for more information} + \fi + \huawei@bar + \def\param{#1}% + \ifx\param\empty\else + \includegraphics[height=2in]{#1} + \newline + \fi + \vspace*{0.5in} + \maketitle + \ifhuawei@nocover\else + \begin{textblock}{14}[1,1](14,14) + \raggedleft\includegraphics[height=3.6in]{huawei-cover-picture.pdf} + \end{textblock} + \fi +}\makeatother +% \end{macrocode} +% \end{macro} + +% \begin{macro}{\PrintLastPage} +% Then, we define |\PrintLastPage|: +% \begin{macrocode} +\makeatletter\newcommand\PrintLastPage{ + \ifhuawei@landscape\else + \PackageError{huawei}{It's allowed to use + PrintLastPage only in landscape mode}{Read huawei.pdf + for more information} + \fi + \newpage + \vspace*{1in} + \begin{center} + \begin{minipage}{0.6\columnwidth}\raggedright + \normalsize + \setlength{\parskip}{6pt} + {\Huge\color{red}\textbf{Thank you!}} + + \vspace{0.5in} + + Bring digital to every person, home and organization + \newline + for a fully connected, intelligent world. + + \textbf{% + Copyright \copyright{} \the\year{} \thecompany{} + \newline + All Rights Reserved.% + } + + The information in this document may contain predictive + statements including, without limitation, statements regarding + the future financial and operating results, future product + portfolio, new technology, etc. There are a number of factors that + could cause actual results and developments to differ materially + from those expressed or implied in the predictive statements. + Therefore, such information is provided for reference purpose + only and constitutes neither an offer nor an acceptance. + \ifhuawei@nobrand% + The author% + \else% + \thecompany{}% + \fi + may change the information at any time without notice. + \end{minipage} + \end{center}% +}\makeatother +% \end{macrocode} +% \end{macro} + +% \begin{macro}{\PrintBibliography} +% Then, we define |\PrintBibliography|: +% \begin{macrocode} +\makeatletter\newcommand\PrintBibliography{ + \setlength\bibitemsep{3pt} + \AtNextBibliography{\small} + \newpage + \raggedright + \ifhuawei@landscape + \begin{multicols}{3}\setstretch{0.95}\printbibliography\end{multicols} + \else + \begin{multicols}{2}\setstretch{0.95}\printbibliography\end{multicols} + \fi +}\makeatother +% \end{macrocode} +% \end{macro} + +% Then, we set the background color of the document: +% \begin{macrocode} +\makeatletter\ifhuawei@dark + \RequirePackage{pagecolor} + \pagecolor{black} + \color{white} +\fi +% \end{macrocode} + +% Then, we configure layout: +% \begin{macrocode} +\AtBeginDocument{% +\raggedbottom% +\raggedcolumns% +\setlength\headheight{32pt}% +\setlength\footskip{32pt}% +\setlength\topskip{0mm}% +\setlength\parindent{0pt}% +\setlength\parskip{6pt}% +\setlength\columnsep{32pt}% +\def\arraystretch{1.5}% +} +% \end{macrocode} + +% Then, we renew a few commands: +% \begin{macrocode} +\renewcommand\title[1]{\renewcommand\thetitle{#1}} +\newcommand\thetitle{\textbackslash{}thetitle} +\newcommand*\thecompany{Huawei Technologies Co., Ltd.} +\newcommand\thesubtitle{} +\renewcommand\author[1]{\renewcommand\theauthor{#1}} +\newcommand\theauthor{\textbackslash{}theauthor} +\newcommand*\thesecurity{Confidential} +\newcommand*\theid{} +\ifcsname nospell\endcsname\else\newcommand\nospell[1]{#1}\fi +% \end{macrocode} + +% \Finale + +%\clearpage +% +%\PrintChanges +%\clearpage +%\PrintIndex diff --git a/macros/latex/contrib/huawei/huawei.ins b/macros/latex/contrib/huawei/huawei.ins new file mode 100644 index 0000000000..676c69d8e5 --- /dev/null +++ b/macros/latex/contrib/huawei/huawei.ins @@ -0,0 +1,55 @@ +%% (The MIT License) +%% +%% Copyright (c) 2021-2022 Yegor Bugayenko +%% +%% Permission is hereby granted, free of charge, to any person obtaining a copy +%% of this software and associated documentation files (the 'Software'), to deal +%% in the Software without restriction, including without limitation the rights +%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +%% copies of the Software, and to permit persons to whom the Software is +%% furnished to do so, subject to the following conditions: +%% +%% The above copyright notice and this permission notice shall be included in all +%% copies or substantial portions of the Software. +%% +%% THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +%% SOFTWARE. + +\input docstrip.tex +\keepsilent +\usedir{macros/latex/contrib/huawei} +\preamble +(The MIT License) + +Copyright (c) 2021-2022 Yegor Bugayenko + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the 'Software'), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +\endpreamble +\generate{\file{huawei.cls}{\from{huawei.dtx}{class}}} +\obeyspaces +\Msg{To finish the installation you have to move the ".cls"} +\Msg{file into a directory searched by TeX. To produce the} +\Msg{documentation run the file ".dtx" through LaTeX. If any} +\Msg{questions, submit a new GitHub issue.} +\endbatchfile diff --git a/macros/latex/contrib/huawei/huawei.pdf b/macros/latex/contrib/huawei/huawei.pdf Binary files differindex e8655d5565..0bf288e449 100644 --- a/macros/latex/contrib/huawei/huawei.pdf +++ b/macros/latex/contrib/huawei/huawei.pdf diff --git a/macros/latex/contrib/huawei/huawei.tex b/macros/latex/contrib/huawei/huawei.tex deleted file mode 100644 index 7de97f558b..0000000000 --- a/macros/latex/contrib/huawei/huawei.tex +++ /dev/null @@ -1,243 +0,0 @@ -% (The MIT License) -% -% Copyright (c) 2021 Yegor Bugayenko -% -% Permission is hereby granted, free of charge, to any person obtaining a copy -% of this software and associated documentation files (the 'Software'), to deal -% in the Software without restriction, including without limitation the rights -% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -% copies of the Software, and to permit persons to whom the Software is -% furnished to do so, subject to the following conditions: -% -% The above copyright notice and this permission notice shall be included in all -% copies or substantial portions of the Software. -% -% THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -% SOFTWARE. - -\documentclass[nobrand,nosecurity]{./huawei} -\usepackage{ffcode} -\usepackage{href-ul} -\renewcommand*\thetitle{\LaTeX{} Class \ff{huawei}} -\renewcommand*\thesubtitle{User's Guide} -\renewcommand*\theauthor{\nospell{Yegor Bugayenko}} -\begin{document} -\maketitle - -\ff{Version: 0.13.2} -\newline -\ff{Date: 2021/11/11} - -\section{Overview} - -The provided class \ff{huawei} helps you design your work -documents and presentations keeping the code short and the -style elegant enough both for management and technical -papers. To use the class you simply mention its name -in the preamble: - -\begin{minted}{text} -\documentclass{huawei} -\begin{document} -Hello, world! -\end{document} -\end{minted} - -The document rendered from this \LaTeX{} code will look similar -to the document you are reading now. We recommend you to use -\ff{latexmk} to compile your \ff{.tex} files to \ff{.pdf}. -The simplest setup will require a few files staying next to your -\ff{.tex} file, in the same directory (``story'' is the name -of your project here): - -\begin{minted}{text} -story\ - .latexmkrc - .gitignore - story.tex -\end{minted} - -The content of your \ff{.latexmkrc} file would be this: - -\begin{minted}{text} -$pdflatex = 'pdflatex %O --shell-escape %S'; -\end{minted} - -Make sure the \ff{.gitignore} file lists all the files generated -by \ff{pdflatex} during the compilation. You don't need to commit -them to your repository, since they are temporary and will -be generated again when you compile your document. - -In order to compile the document, just say \ff{make} on the command line. - -\section{Layout Options} - -There are a few class options, provided in square brackets after the -\ff{\char`\\documentclass}, which can help you fine-tune -the layout of your document: - -\ff{landscape} - makes the document in landscape format, also changing the size - of the paper to 16x9 inches (the default page size is - \href{https://en.wikipedia.org/wiki/Paper_size}{A4}), - making it perfect for presentations. - -\ff{dark} - turns on a dark layout, where the page color is black and the text - is white. - -\ff{slides} - makes all headers a bit larger, assuming that the document - is in the landscape mode and being presented as a slide deck. - -\ff{nocover} - avoid printing the cover images on the first page by the - \ff{\char`\\PrintTitlePage} command. - -\ff{anonymous} - removes the name of the author everywhere, including the bottom - of the page, where the author's name stays next to the name of the - company. - -\ff{nobrand} - avoid mentioning the brand of Huawei anywhere - in the document and removes the logo too. - -\ff{nosecurity} - avoids mentioning the level of security at the right top - corner of the document and also avoids showing the ID of the author - where it usually is visible. - -\ff{nodate} - don't show the date and time at the bottom of each page, - where they usually are rendered in ISO~8601 format. - -\ff{nopaging} - avoids page numbers at the bottom of each page. - -\ff{authordraft} - prints a big ``It's a draft'' message across each page. - -\section{Preamble} - -In the preamble you can specify meta information about the document, -such as its title or author's name, here is how: - -\begin{minted}{text} -\documentclass{huawei} -\renewcommand*\thetitle{Making Compression 15\% Faster} -\renewcommand*\thesubtitle{Technical Report} -\renewcommand*\theauthor{Yegor Bugayenko} -\begin{document} -\maketitle -Hello, world! -\end{document} -\end{minted} - -It's recommended to use \ff{\char`\\renewcommand*} instead of -\ff{\char`\\renewcommand} in order to let \LaTeX{} catch you -if by mistake a new line gets into the content. - -The following meta commands are defined: - -\ff{\char`\\thetitle} is the main title of the document - to be used in the text and in the properties of the PDF document. - -\ff{\char`\\thesubtitle} is the subtitle to be - printed under the title. - -\ff{\char`\\theauthor} is the author of the document - in ``first-name last-name'' format. - -\ff{\char`\\theid} is the internal ID of the author, if - it's applicable. - -\ff{\char`\\thesecurity} is the level of security of - the document, which is usually printed at the top right - corner of it; usual values are ``Internal,'' - ''Confidential,'' or ``Secret.'' - -Default values of all these commands are empty. If you don't -renew them in your document, nothing will be printed. - -\section{Custom Commands} - -Inside the document body you can use these commands: - -\ff{\char`\\PrintFirstPage\{front-image\}} - prints the first page of a project charter or a similar landscape documents, - placing the image \ff{front-image.pdf} on the front (the file should be present - in the current dir. If you don't have the front image file, just leave - the first argument empty. - -\ff{\char`\\PrintLastPage\{\}} - prints the last page of a project charter or a similar landscape document. - -\ff{\char`\\PrintThankYouPage\{\}} - prints the last page with a "Thank You" message in the center. - -\ff{\char`\\PrintDisclaimer\{\}} - prints a paragraph at the bottom of the page with a standard disclaimer. - -\section{Best Practices} - -You are free to design your documents any way you want. However, -it would be convenient for yourself and for your readers, if you follow -the convention we have for business and technical documents. -The \ff{samples} directory contains a number of sample documents, which -we suggest you to use as templates when you start making new documents. - -The rule of thumb is simple: try \emph{not} to format your documents. -Instead, let the class designed by us do this work for you. Just type -the content without changing the layout, adding colors, changing fonts, -etc. The less you modify the look-and-feel, the better your documents -will be perceived by your readers. - -\subsection{Two Columns} - -In the landscape format it's recommended to use two columns, for better -readability of the text. Here is how: - -\begin{minted}{text} -\documentclass{huawei} -\begin{document} -\newpage -\begin{multicols}{2} -\section*{First} -Here goes the first column content. -\columnbreak -\section*{Second} -Here goes the second column content. -\end{multicols} -\end{document} -\end{minted} - -A more complete example is in the \ff{samples/huawei-charter.tex}. - -\subsection{Crumbs} - -When you need to put many small information pieces into one page, -we recommend you to use ``crumbs'': - -\begin{minted}{text} -\documentclass{huawei} -\begin{document} -\newpage -\section*{Project Details} -\begin{multicols}{2} -\raggedright -\PrintCrumb{Budget}{\$100K} - -\PrintCrumb{Duration}{5 months} -\end{multicols} -\end{document} -\end{minted} - -A more complete example is in the \ff{samples/huawei-charter.tex}. - -\end{document}
\ No newline at end of file diff --git a/macros/latex/contrib/huawei/samples/huawei-cfp.tex b/macros/latex/contrib/huawei/samples/huawei-cfp.tex deleted file mode 100644 index cbc9a6dead..0000000000 --- a/macros/latex/contrib/huawei/samples/huawei-cfp.tex +++ /dev/null @@ -1,58 +0,0 @@ -% (The MIT License) -% -% Copyright (c) 2021 Yegor Bugayenko -% -% Permission is hereby granted, free of charge, to any person obtaining a copy -% of this software and associated documentation files (the 'Software'), to deal -% in the Software without restriction, including without limitation the rights -% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -% copies of the Software, and to permit persons to whom the Software is -% furnished to do so, subject to the following conditions: -% -% The above copyright notice and this permission notice shall be included in all -% copies or substantial portions of the Software. -% -% THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -% SOFTWARE. - -\documentclass[nobrand,nosecurity,nopaging,authordraft]{../huawei} -\usepackage{ffcode} -\renewcommand*\thetitle{Test Call for Proposal} -\renewcommand*\theauthor{Yegor Bugayenko} -\addbibresource{huawei-main.bib} -\begin{document} - -\begin{abstract}This is just a demo document, to show how -this package works and formats simple business documents. This -block of text is the abstract.\end{abstract} - -\maketitle - -In this document you don't see the logo, because we use \ff{nobrand} -option of the class: - -\begin{minted}{text} -\documentclass[nobrand]{huawei} -\begin{document} -The rest of the document... -\end{document} -\end{minted} - -By the way, we use \TeX{} created by~\citet{knuth1984texbook} -and \LaTeX{} created by~\citet{lamport1994latex}. The citations -provided at the bottom of the document are printed via -\ff{\char`\\PrintBibliography}. - -The text in small font at the bottom of the page is printed by -the \ff{\char`\\PrintDisclaimer} command. - -\PrintDisclaimer - -\PrintBibliography - -\end{document}
\ No newline at end of file diff --git a/macros/latex/contrib/huawei/samples/huawei-charter.tex b/macros/latex/contrib/huawei/samples/huawei-charter.tex deleted file mode 100644 index e352802f36..0000000000 --- a/macros/latex/contrib/huawei/samples/huawei-charter.tex +++ /dev/null @@ -1,67 +0,0 @@ -% (The MIT License) -% -% Copyright (c) 2021 Yegor Bugayenko -% -% Permission is hereby granted, free of charge, to any person obtaining a copy -% of this software and associated documentation files (the 'Software'), to deal -% in the Software without restriction, including without limitation the rights -% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -% copies of the Software, and to permit persons to whom the Software is -% furnished to do so, subject to the following conditions: -% -% The above copyright notice and this permission notice shall be included in all -% copies or substantial portions of the Software. -% -% THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -% SOFTWARE. - -\documentclass[landscape,nocover,XL,dark,slides]{../huawei} -% \renewcommand*\thetitle{Test Charter} -% \renewcommand*\thesubtitle{Technology Project Charter} -% \renewcommand*\theauthor{Yegor Bugayenko} -\begin{document} - -\PrintFirstPage{} - -\newpage -\section*{Project Details} -\begin{multicols}{2} -\raggedright -\PrintCrumb{Author and Project Manager}{\theauthor / \theid} - -\PrintCrumb{Project Name}{Making Compression 15\% Faster} - -\PrintCrumb{Technical Adviser}{Jeff Lebowski, 00112233} - -\PrintCrumb{Cooperation Manager}{Walter Sobchak, 00889977} - -\PrintCrumb{Budget}{\$99,999} - -\PrintCrumb{Duration}{8 months} - -\PrintCrumb{Export Control}{No} - -\PrintCrumb{AI Technology Involved}{No} - -\PrintCrumb{Hardware Supply}{No} - -\end{multicols} - -\newpage -\begin{multicols}{2} -\section*{Objectives} -The main objective of the project is to win the war -against poverty in the world. -\columnbreak -\section*{Novelty} -The idea of this project is very new and breakthrough. -\end{multicols} - -\PrintLastPage - -\end{document}
\ No newline at end of file diff --git a/macros/latex/contrib/huawei/samples/huawei-main.bib b/macros/latex/contrib/huawei/samples/huawei-main.bib deleted file mode 100644 index d4e68d8ac8..0000000000 --- a/macros/latex/contrib/huawei/samples/huawei-main.bib +++ /dev/null @@ -1,36 +0,0 @@ -% (The MIT License) -% -% Copyright (c) 2021 Yegor Bugayenko -% -% Permission is hereby granted, free of charge, to any person obtaining a copy -% of this software and associated documentation files (the 'Software'), to deal -% in the Software without restriction, including without limitation the rights -% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -% copies of the Software, and to permit persons to whom the Software is -% furnished to do so, subject to the following conditions: -% -% The above copyright notice and this permission notice shall be included in all -% copies or substantial portions of the Software. -% -% THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -% SOFTWARE. - -@book{lamport1994latex, - title={\LaTeX{}: a Document Preparation System: User's Guide and Reference Manual}, - author={Lamport, Leslie}, - year={1994}, - publisher={Addison-Wesley} -} - -@book{knuth1984texbook, - title={The \TeX{}book}, - author={Knuth, Donald Ervin and Bibby, Duane}, - volume={15}, - year={1984}, - publisher={Addison-Wesley} -}
\ No newline at end of file diff --git a/macros/latex/contrib/kvsetkeys/README.md b/macros/latex/contrib/kvsetkeys/README.md index a7e822fa0f..430c1aa264 100644 --- a/macros/latex/contrib/kvsetkeys/README.md +++ b/macros/latex/contrib/kvsetkeys/README.md @@ -1,6 +1,6 @@ -# kvsetkeys +# kvsetkeys -kvsetkeys package for LaTeX +Version: 2022-10-05 v1.19 Package kvsetkeys provides kvsetkeys, a variant @@ -9,3 +9,11 @@ a handler that deals with unknown options. Active commas and equal signs may be used (e.g. see babel's shorthands) and only one level of curly braces is removed from the values. +% Copyright (C) +% 2006, 2007, 2009-2012 Heiko Oberdiek +% 2016-2022 Oberdiek Package Support Group +% https://github.com/ho-tex/kvsetkeys/issues + + +## License +LATEX Project Public License, version 1.3c or later. diff --git a/macros/latex/contrib/kvsetkeys/kvsetkeys.dtx b/macros/latex/contrib/kvsetkeys/kvsetkeys.dtx index c04507c297..e785f45165 100644 --- a/macros/latex/contrib/kvsetkeys/kvsetkeys.dtx +++ b/macros/latex/contrib/kvsetkeys/kvsetkeys.dtx @@ -1,12 +1,12 @@ % \iffalse meta-comment % % File: kvsetkeys.dtx -% Version: 2019/12/15 v1.18 +% Version: 2022-10-05 v1.19 % Info: Key value parser % % Copyright (C) % 2006, 2007, 2009-2012 Heiko Oberdiek -% 2016-2019 Oberdiek Package Support Group +% 2016-2022 Oberdiek Package Support Group % https://github.com/ho-tex/kvsetkeys/issues % % This work may be distributed and/or modified under the @@ -86,7 +86,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: kvsetkeys 2019/12/15 v1.18 Key value parser (HO)} +\Msg{* Package: kvsetkeys 2022-10-05 v1.19 Key value parser (HO)} \Msg{************************************************************************} \keepsilent @@ -98,11 +98,11 @@ This is a generated file. Project: kvsetkeys -Version: 2019/12/15 v1.18 +Version: 2022-10-05 v1.19 Copyright (C) 2006, 2007, 2009-2012 Heiko Oberdiek - 2016-2019 Oberdiek Package Support Group + 2016-2022 Oberdiek Package Support Group This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either @@ -167,7 +167,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{kvsetkeys.drv}% - [2019/12/15 v1.18 Key value parser (HO)]% + [2022-10-05 v1.19 Key value parser (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2011/11/22] \begin{document} @@ -181,7 +181,7 @@ and the derived files % \GetFileInfo{kvsetkeys.drv} % % \title{The \xpackage{kvsetkeys} package} -% \date{2019/12/15 v1.18} +% \date{2022-10-05 v1.19} % \author{Heiko Oberdiek\thanks % {Please report any issues at \url{https://github.com/ho-tex/kvsetkeys/issues}}} % @@ -361,7 +361,7 @@ and the derived files % Since 2011/10/18 v1.15 the family handler can reject the % successful handling of a key by calling \cs{kv@handled@false}. % -% Since 2019/12/15 v1.18 \cs{kv@processor@default} also defines +% Since 2012/04/25 v1.16 \cs{kv@processor@default} also defines % macro \cs{kv@fam} with meaning \meta{family} for convenience. % % \subsubsection{Processing similar to \cs{setkeys*} of package \xpackage{xkeyval}} @@ -397,7 +397,7 @@ and the derived files % fi % \end{quote} % -% Since 2019/12/15 v1.18 \cs{kv@processor@known} also defines +% Since 2012/04/25 v1.16 \cs{kv@processor@known} also defines % macro \cs{kv@fam} with meaning \meta{family} for convenience. % % \subsection{Default family handler} @@ -637,7 +637,7 @@ and the derived files \fi \expandafter\x\csname ver@kvsetkeys.sty\endcsname \ProvidesPackage{kvsetkeys}% - [2019/12/15 v1.18 Key value parser (HO)]% + [2022-10-05 v1.19 Key value parser (HO)]% % \end{macrocode} % % \begin{macrocode} @@ -1222,7 +1222,7 @@ $ \expandafter\ifx\csname KV@#1@#3@default\endcsname\relax & \edef#1{% & \ifx#1\KVS@empty & \else -& \unexpanded{#1},% +& \unexpanded\expandafter{#1},% & \fi & \unexpanded{{#2}={#3}}% & }% @@ -1399,26 +1399,6 @@ $ \x % \end{description} % % -% \paragraph{Bundle.} All the packages of the bundle `kvsetkeys' -% are also available in a TDS compliant ZIP archive. There -% the packages are already unpacked and the documentation files -% are generated. The files and directories obey the TDS standard. -% \begin{description} -% \item[\CTANinstall{install/macros/latex/contrib/kvsetkeys.tds.zip}] -% \end{description} -% \emph{TDS} refers to the standard ``A Directory Structure -% for \TeX\ Files'' (\CTANpkg{tds}). Directories -% with \xfile{texmf} in their name are usually organized this way. -% -% \subsection{Bundle installation} -% -% \paragraph{Unpacking.} Unpack the \xfile{kvsetkeys.tds.zip} in the -% TDS tree (also known as \xfile{texmf} tree) of your choice. -% Example (linux): -% \begin{quote} -% |unzip kvsetkeys.tds.zip -d ~/texmf| -% \end{quote} -% % \subsection{Package installation} % % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting @@ -1668,6 +1648,9 @@ $ \x % \item % Avoid \xpackage{etexcmds} and \xpackage{infwarwerr} in \LaTeX. % \end{Version} +% \begin{Version}{2022-10-05 v1.19} +% \item Corrected storing of unknown keys, issue \#1 +% \end{Version} % \end{History} % % \PrintIndex diff --git a/macros/latex/contrib/kvsetkeys/kvsetkeys.pdf b/macros/latex/contrib/kvsetkeys/kvsetkeys.pdf Binary files differindex 7d4a72c04f..5820d8e0c4 100644 --- a/macros/latex/contrib/kvsetkeys/kvsetkeys.pdf +++ b/macros/latex/contrib/kvsetkeys/kvsetkeys.pdf diff --git a/macros/latex/contrib/membranecomputing/README.md b/macros/latex/contrib/membranecomputing/README.md index 70a87c6b6a..8b0bd9eb32 100644 --- a/macros/latex/contrib/membranecomputing/README.md +++ b/macros/latex/contrib/membranecomputing/README.md @@ -13,7 +13,7 @@ See membranecomputing.pdf for full documentation % Copyright and license % ===================== % -% Copyright (C) 2020 David Orellana Martín +% Copyright (C) 2020-2022 David Orellana Martín % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/membranecomputing/membranecomputing.pdf b/macros/latex/contrib/membranecomputing/membranecomputing.pdf Binary files differindex 33aa4e8c47..127e7b5c4e 100644 --- a/macros/latex/contrib/membranecomputing/membranecomputing.pdf +++ b/macros/latex/contrib/membranecomputing/membranecomputing.pdf diff --git a/macros/latex/contrib/membranecomputing/membranecomputing.sty b/macros/latex/contrib/membranecomputing/membranecomputing.sty index f2eae32028..d2c87cb5ee 100644 --- a/macros/latex/contrib/membranecomputing/membranecomputing.sty +++ b/macros/latex/contrib/membranecomputing/membranecomputing.sty @@ -1,5 +1,5 @@ %% -%% Copyright 2020 David Orellana Martín +%% Copyright 2020-2022 David Orellana Martín % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -16,7 +16,7 @@ % This work consists of the file membranecomputing.sty. \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{membranecomputing}[2021/09/23 Membrane Computing v0.2] +\ProvidesPackage{membranecomputing}[2022/10/05 Membrane Computing v0.2.1] % Require Packages @@ -146,15 +146,15 @@ {% BEGIN CASES {transition} {% BEGIN IF TRANSITION - \ensuremath{\Pi_{#4} = \left(\wa, \ifthenelse{\equal{#1}{recognizer}}{\Sigma, }{} \ifthenelse{\equal{#2}{cell}}{\ms, }{} \im{1}, \dots, \im{\ifthenelse{\equal{#5}{}}{\degree}{#5}}, (\rs{1}, \ps{1}), \dots, (\rs{\ifthenelse{\equal{#5}{}}{\degree}{#5}}, \ps{\ifthenelse{\equal{#5}{}}{\degree}{#5}}), \ifthenelse{\equal{#1}{recognizer}}{\iin, }{} \iout \right)} + \ensuremath{\Pi_{#4} = \left(\wa, \ifthenelse{\equal{#1}{recognizer}}{\Sigma, }{} \ifthenelse{\equal{#2}{cell}}{\labelset, \ms, }{} \im{1}, \dots, \im{\ifthenelse{\equal{#5}{}}{\degree}{#5}}, (\rs{1}, \ps{1}), \dots, (\rs{\ifthenelse{\equal{#5}{}}{\degree}{#5}}, \ps{\ifthenelse{\equal{#5}{}}{\degree}{#5}}), \ifthenelse{\equal{#1}{recognizer}}{\iin, }{} \iout \right)} }% END IF TRANSITION {activemembranes} {% BEGIN IF ACTIVEMEMBRANES - \ensuremath{\Pi_{#4} = \left(\wa, \ifthenelse{\equal{#1}{recognizer}}{\Sigma, }{} \ifthenelse{\equal{#2}{cell}}{\ms, }{} \im{1}, \dots, \im{\ifthenelse{\equal{#5}{}}{\degree}{#5}}, \rs{1}, \dots, \rs{\ifthenelse{\equal{#5}{}}{\degree}{#5}}, \ifthenelse{\equal{#1}{recognizer}}{\iin, }{} \iout \right)} + \ensuremath{\Pi_{#4} = \left(\wa, \ifthenelse{\equal{#1}{recognizer}}{\Sigma, }{} \ifthenelse{\equal{#2}{cell}}{\labelset, \ms, }{} \im{1}, \dots, \im{\ifthenelse{\equal{#5}{}}{\degree}{#5}}, \rs{1}, \dots, \rs{\ifthenelse{\equal{#5}{}}{\degree}{#5}}, \ifthenelse{\equal{#1}{recognizer}}{\iin, }{} \iout \right)} }% END IF ACTIVEMEMBRANES {symportantiport} {% BEGIN IF SYMPORTANTIPORT - \ensuremath{\Pi_{#4} = \left(\wa, \ifthenelse{\equal{#1}{recognizer}}{\Sigma, }{} \mathcal{E}, \ifthenelse{\equal{#2}{cell}}{\ms, }{} \im{1}, \dots, \im{\ifthenelse{\equal{#5}{}}{\degree}{#5}}, \ifthenelse{\equal{#2}{cell}}{\rs{1}, \dots, \rs{\ifthenelse{\equal{#5}{}}{\degree}{#5}}}{\rs}, \ifthenelse{\equal{#1}{recognizer}}{\iin, }{} \iout \right)} + \ensuremath{\Pi_{#4} = \left(\wa, \ifthenelse{\equal{#1}{recognizer}}{\Sigma, }{} \mathcal{E}, \ifthenelse{\equal{#2}{cell}}{\labelset, \ms, }{} \im{1}, \dots, \im{\ifthenelse{\equal{#5}{}}{\degree}{#5}}, \ifthenelse{\equal{#2}{cell}}{\rs{1}, \dots, \rs{\ifthenelse{\equal{#5}{}}{\degree}{#5}}}{\rs}, \ifthenelse{\equal{#1}{recognizer}}{\iin, }{} \iout \right)} }% END IF SYMPORTANTIPORT {spiking} {% BEGIN IF SPIKING @@ -162,7 +162,7 @@ }% END IF SPIKING {kernel} {% BEGIN IF KERNEL - \ensuremath{k\Pi_{#4} = \left(\wa, \ifthenelse{\equal{#2}{cell}}{\ms, }{} \compartment{1}, \dots, \compartment{\ifthenelse{\equal{#5}{}}{\degree}{#5}}, \ifthenelse{\equal{#1}{recognizer}}{\iin, }{} \iout \right)} + \ensuremath{k\Pi_{#4} = \left(\wa, \ifthenelse{\equal{#2}{cell}}{\labelset, \ms, }{} \compartment{1}, \dots, \compartment{\ifthenelse{\equal{#5}{}}{\degree}{#5}}, \ifthenelse{\equal{#1}{recognizer}}{\iin, }{} \iout \right)} }% END IF KERNEL {colony} {% BEGIN IF COLONY @@ -420,6 +420,8 @@ % Templates for P systems +\newcommand{\psystemT}[1][nonrecognizer]{\psystem[#1]{cell}{transition}{}{}} +\newcommand{\rpsystemT}{\psystemT[recognizer]} \newcommand{\psystemAM}[1][nonrecognizer]{\psystem[#1]{cell}{activemembranes}{}{}} \newcommand{\rpsystemAM}{\psystemAM[recognizer]} \newcommand{\psystemSA}[1][nonrecognizer]{\psystem[#1]{tissue}{symportantiport}{}{}} @@ -575,9 +577,17 @@ % Families of P systems \newcommand{\Pfamily}[4]{\ensuremath{\mathcal{#1}^{#2}_{#3} \IfStrEq{#4}{}{}{( #4 )}}} +\ifcsname AM\endcsname% +\newcommand{\mcAM}[2][]{\Pfamily{AM}{#1}{}{#2}} +\else \newcommand{\AM}[2][]{\Pfamily{AM}{#1}{}{#2}} +\fi \newcommand{\AMO}[1]{\Pfamily{AM}{0}{}{#1}} +\ifcsname TC\endcsname% +\newcommand{\mcTC}[2][]{\Pfamily{T#1C}{}{}{#2}} +\else \newcommand{\TC}[2][]{\Pfamily{T#1C}{}{}{#2}} +\fi \newcommand{\TDC}[1]{\TC[D]{#1}} \newcommand{\TSC}[1]{\TC[S]{#1}} \newcommand{\CC}[2][]{\Pfamily{C#1C}{}{}{#2}} @@ -593,11 +603,23 @@ % Terms of computability theory \newcommand{\compSet}[1]{\ensuremath{#1}} +\ifcsname REG\endcsname% +\newcommand{\mcREG}{\compSet{REG}} +\else \newcommand{\REG}{\compSet{REG}} +\fi +\ifcsname LIN\endcsname% +\newcommand{\mcLIN}{\compSet{LIN}} +\else \newcommand{\LIN}{\compSet{LIN}} +\fi \newcommand{\CF}{\compSet{CF}} \newcommand{\CS}{\compSet{CS}} +\ifcsname RE\endcsname% +\newcommand{\mcRE}{\compSet{RE}} +\else \newcommand{\RE}{\compSet{RE}} +\fi % Terms of computational complexity theory @@ -612,6 +634,10 @@ \endinput +v0.2.1 05/10/2022 + - Added label set to cell-like membrane systems + - Conflictive classes with package complexity solved + v0.2 23/09/2021 - Created new rules of membrane systems with evolutional comm rules diff --git a/macros/latex/contrib/membranecomputing/membranecomputing.tex b/macros/latex/contrib/membranecomputing/membranecomputing.tex index 8bbbb2e8bb..6982249ef4 100644 --- a/macros/latex/contrib/membranecomputing/membranecomputing.tex +++ b/macros/latex/contrib/membranecomputing/membranecomputing.tex @@ -8,7 +8,7 @@ \usepackage{amssymb} \usepackage{longtable} -\title{Package \texttt{membranecomputing} (v0.2)} +\title{Package \texttt{membranecomputing} (v0.2.1)} \author{David Orellana-Martín \\ \texttt{\href{mailto:dorellana@us.es}{dorellana@us.es}}} \begin{document} @@ -151,6 +151,15 @@ $ \end{array} $ +There are some command conflicts with the \texttt{complexity} +package~\footnote{\url{https://ctan.org/pkg/complexity}}. If you need +both packages, please load first the \texttt{complexity} package first +and later \texttt{membranecomputing} package. If you do this, some of +the commands defined in this section change, and +$\verb=\AM=, \verb=\TC=, \verb=\REG=, \verb=\LIN=, \verb=\RE=$ become +$\verb=\mcAM=, \verb=\mcTC=, \verb=\mcREG=, \verb=\mcLIN=, +\verb=\mcRE=$, respectively. + To define a new notation for a family of membrane systems, it is enough to make a new command as follows: diff --git a/macros/latex/contrib/thuthesis/CHANGELOG.md b/macros/latex/contrib/thuthesis/CHANGELOG.md index e7883b5e17..36394921bd 100644 --- a/macros/latex/contrib/thuthesis/CHANGELOG.md +++ b/macros/latex/contrib/thuthesis/CHANGELOG.md @@ -6,6 +6,21 @@ ## [Unreleased] +## [v7.3.1] - 2022-10-05 + +### Added + +- 增加选项 `appendix-figure-in-lof` 控制附录中的图/表是否列入插图清单/附表清单。 + +### Changed + +- 修改“指导教师/小组评语”章节的名称，同步《指南》2022 年 9 月版的修改。 + +### Fixed + +- 修正答辩委员会名单页的行距。 +- 修复导言区中设置 `toc-depth` 导致空白插图清单的 bug。 + ## [v7.3.0] - 2022-05-17 ### Added @@ -902,7 +917,8 @@ -[Unreleased]: https://github.com/tuna/thuthesis/compare/v7.3.0...HEAD +[Unreleased]: https://github.com/tuna/thuthesis/compare/v7.3.1...HEAD +[v7.3.1]: https://github.com/tuna/thuthesis/compare/v7.3.0...v7.3.1 [v7.3.0]: https://github.com/tuna/thuthesis/compare/v7.2.4...v7.3.0 [v7.2.4]: https://github.com/tuna/thuthesis/compare/v7.2.3...v7.2.4 [v7.2.3]: https://github.com/tuna/thuthesis/compare/v7.2.2...v7.2.3 diff --git a/macros/latex/contrib/thuthesis/data/comments.tex b/macros/latex/contrib/thuthesis/data/comments.tex index 832d18dd0e..a2431be4d3 100644 --- a/macros/latex/contrib/thuthesis/data/comments.tex +++ b/macros/latex/contrib/thuthesis/data/comments.tex @@ -1,7 +1,7 @@ % !TeX root = ../thuthesis-example.tex \begin{comments} -% \begin{comments}[name = {指导小组学术评语}] +% \begin{comments}[name = {指导小组评语}] % \begin{comments}[name = {Comments from Thesis Supervisor}] % \begin{comments}[name = {Comments from Thesis Supervision Committee}] diff --git a/macros/latex/contrib/thuthesis/spine.pdf b/macros/latex/contrib/thuthesis/spine.pdf Binary files differindex de169dda9b..99892546a7 100644 --- a/macros/latex/contrib/thuthesis/spine.pdf +++ b/macros/latex/contrib/thuthesis/spine.pdf diff --git a/macros/latex/contrib/thuthesis/thusetup.tex b/macros/latex/contrib/thuthesis/thusetup.tex index 718667f969..6a21d8c1a0 100644 --- a/macros/latex/contrib/thuthesis/thusetup.tex +++ b/macros/latex/contrib/thuthesis/thusetup.tex @@ -116,7 +116,7 @@ % % 数学字体 % math-style = GB, % GB | ISO | TeX - math-font = xits, % sitx | xits | libertinus + math-font = xits, % stix | xits | libertinus } % 可以使用 nomencl 生成符号和缩略语说明 diff --git a/macros/latex/contrib/thuthesis/thuthesis-example.pdf b/macros/latex/contrib/thuthesis/thuthesis-example.pdf Binary files differindex 4345c0a1cc..67b5ea52b6 100644 --- a/macros/latex/contrib/thuthesis/thuthesis-example.pdf +++ b/macros/latex/contrib/thuthesis/thuthesis-example.pdf diff --git a/macros/latex/contrib/thuthesis/thuthesis-example.tex b/macros/latex/contrib/thuthesis/thuthesis-example.tex index 39edf3af3e..8c3061a0ed 100644 --- a/macros/latex/contrib/thuthesis/thuthesis-example.tex +++ b/macros/latex/contrib/thuthesis/thuthesis-example.tex @@ -87,7 +87,7 @@ % 本科生可以附个人简历，也可以不附个人简历 \input{data/resume} -% 指导教师/指导小组学术评语 +% 指导教师/指导小组评语 % 本科生不需要 \input{data/comments} diff --git a/macros/latex/contrib/thuthesis/thuthesis.dtx b/macros/latex/contrib/thuthesis/thuthesis.dtx index d273a1add8..17d61b37e8 100644 --- a/macros/latex/contrib/thuthesis/thuthesis.dtx +++ b/macros/latex/contrib/thuthesis/thuthesis.dtx @@ -14,7 +14,7 @@ % % \iffalse %<*driver> -\ProvidesFile{thuthesis.dtx}[2022/05/17 7.3.0 Tsinghua University Thesis Template] +\ProvidesFile{thuthesis.dtx}[2022/10/05 7.3.1 Tsinghua University Thesis Template] \documentclass{ltxdoc} \usepackage{dtx-style} @@ -1248,7 +1248,7 @@ % \begin{macrocode} %<cls>\NeedsTeXFormat{LaTeX2e}[2017/04/15] %<cls>\ProvidesClass{thuthesis} -%<cls>[2022/05/17 7.3.0 Tsinghua University Thesis Template] +%<cls>[2022/10/05 7.3.1 Tsinghua University Thesis Template] % \end{macrocode} % % 报错 @@ -1306,7 +1306,7 @@ %<*cls> \hyphenation{Thu-Thesis} \def\thuthesis{ThuThesis} -\def\version{7.3.0} +\def\version{7.3.1} \RequirePackage{kvdefinekeys} \RequirePackage{kvsetkeys} \RequirePackage{kvoptions} @@ -1939,7 +1939,7 @@ % \begin{macrocode} \newcommand\thu@set@chapter@names{% \ifthu@main@language@chinese - \def\thu@comments@name{指导教师学术评语}% + \def\thu@comments@name{指导教师评语}% \def\bibname{参考文献}% \def\appendixname{附录}% \def\indexname{索引}% @@ -2650,7 +2650,7 @@ UprightFont = * Light, UprightFont = * Bold, ]% - \setCJKfamilyfont{zhhei}{Noto Sans CJK SC}[BoldFont * Medium]% + \setCJKfamilyfont{zhhei}{Noto Sans CJK SC}[BoldFont = * Medium]% \setCJKfamilyfont{zhfs}{FandolFang}[ Extension = .otf, UprightFont = *-Regular, @@ -4967,26 +4967,29 @@ \kvsetkeys{thu@committee}{#1}% \ifx\thu@committee@file\@empty \begingroup - \ifthu@main@language@english - \ctexset{chapter/format=\centering\sffamily\fontsize{16bp}{20bp}\selectfont} - \fi + \ctexset{ + chapter = { + format = \centering\sffamily\fontsize{16bp}{20bp}\selectfont, + afterskip = 49bp, + }, + section = { + beforeskip = 26bp, + afterskip = 9.5bp, + format += \centering, + numbering = false, + afterindent = false, + }, + }% \thu@chapter*[]{\thu@committee@name}% + \thispagestyle{empty}% + \thusetup{language=chinese}% + \BODY\clearpage + \thu@reset@main@language \endgroup \else \thu@pdfbookmark{0}{\thu@committee@name}% \includepdf{\thu@committee@file}% \fi - \thispagestyle{empty}% - \ctexset{ - section = { - format += {\centering}, - numbering = false, - afterindent = false, - }, - }% - \thusetup{language=chinese} - \BODY\clearpage - \thu@reset@main@language \fi } % \end{macrocode} @@ -5965,14 +5968,15 @@ % 造成 \env{survey} 的子目录中 |tocdepth| 为 0。 % \begin{macrocode} \thu@option@hook{toc-depth}{% - \protected@write\@auxout{}{% - \string\ttl@writefile{toc}{% - \protect\setcounter{tocdepth}{\thu@toc@depth}% + \ifx\@begindocumenthook\@undefined + \protected@write\@auxout{}{% + \string\ttl@writefile{toc}{% + \protect\setcounter{tocdepth}{\thu@toc@depth}% + }% }% - }% - \addtocontents{lof}{\string\let\string\contentsline\string\ttl@gobblecontents} - \addtocontents{lot}{\string\let\string\contentsline\string\ttl@gobblecontents} - \addtocontents{loe}{\string\let\string\contentsline\string\ttl@gobblecontents} + \else + \setcounter{tocdepth}{\thu@toc@depth}% + \fi } \g@addto@macro\appendix{% \thusetup{ @@ -5981,6 +5985,36 @@ } % \end{macrocode} % +% 附录中的图、表不列入插图清单/附表清单。 +% \begin{macrocode} +\thu@define@key{ + appendix-figure-in-lof = { + name = appendix@figure@in@lof, + choices = { + true, + false, + }, + default = false, + }, +} +\thu@option@hook{appendix-figure-in-lof}{% + \ifthu@appendix@figure@in@lof@true + \addtocontents{lof}{\string\let\string\contentsline\string\ttl@contentsline}% + \addtocontents{lot}{\string\let\string\contentsline\string\ttl@contentsline}% + \addtocontents{loe}{\string\let\string\contentsline\string\ttl@contentsline}% + \else + \addtocontents{lof}{\string\let\string\contentsline\string\ttl@gobblecontents}% + \addtocontents{lot}{\string\let\string\contentsline\string\ttl@gobblecontents}% + \addtocontents{loe}{\string\let\string\contentsline\string\ttl@gobblecontents}% + \fi +} +\g@addto@macro\appendix{% + \thusetup{ + appendix-figure-in-lof = false, + }% +} +% \end{macrocode} +% % 本科生《写作指南》有独特的要求：附录 A 为外文资料的调研阅读报告或书面翻译， % 并且要分别附上独立的参考文献和外文资料的原文索引。 % 所以这里定义 \env{survey} 和 \env{translation} 专门处理这两种情况， diff --git a/macros/latex/contrib/thuthesis/thuthesis.pdf b/macros/latex/contrib/thuthesis/thuthesis.pdf Binary files differindex 57cc881d94..6ad0c57c0e 100644 --- a/macros/latex/contrib/thuthesis/thuthesis.pdf +++ b/macros/latex/contrib/thuthesis/thuthesis.pdf diff --git a/macros/latex/contrib/unbtex/README.md b/macros/latex/contrib/unbtex/README.md index 57e2e1affc..a68ed5b756 100644 --- a/macros/latex/contrib/unbtex/README.md +++ b/macros/latex/contrib/unbtex/README.md @@ -1,6 +1,6 @@ # UnBTeX: A class for bachelor, master, and doctoral thesis at the University of Brasilia (UnB), Brazil. -Version 1.1.3 2022/09/04 +Version 1.2 2022/10/05 Copyright (C) 2021-2022 by Henrique C. Ferreira <hcferreira@unb.br> @@ -35,6 +35,13 @@ Here is a history of changes: . Documentation and comments improvements 1.1.3 (2022-09-04): . Improved compilation time + 1.2 (2022-10-05): + . The styles of Table of Contents (Sumário), List of Sybols (Lista de + símbolos), and List of Acronyms (Lista de abreviaturas) have been + modified + . A compilation problem with Tex Live 2022 that arises when microtype + package is used has been solved + ## Overleaf diff --git a/macros/latex/contrib/unbtex/unbtex-example.pdf b/macros/latex/contrib/unbtex/unbtex-example.pdf Binary files differindex 0712a28a2e..b88580e43e 100644 --- a/macros/latex/contrib/unbtex/unbtex-example.pdf +++ b/macros/latex/contrib/unbtex/unbtex-example.pdf diff --git a/macros/latex/contrib/unbtex/unbtex-example.tex b/macros/latex/contrib/unbtex/unbtex-example.tex index b1fb91a5db..ea698b2f38 100644 --- a/macros/latex/contrib/unbtex/unbtex-example.tex +++ b/macros/latex/contrib/unbtex/unbtex-example.tex @@ -1,7 +1,7 @@ %% %% UnBTeX: A class for bachelor, master, and doctoral thesis at the %% University of Brasilia (UnB), Brazil -%% Version 1.1.3 2022/09/04 +%% Version 1.2 2022/10/05 %% Copyright (C) 2021-2022 by Henrique C. Ferreira <hcferreira@unb.br> %% %% This class file may be distributed and/or modified under the conditions @@ -26,6 +26,7 @@ oneside, % caso queira imprimir em frente e verso, use %twoside, a4paper, % tamanho do papel. + sumario=tradicional, % -- opções da classe abntex2 -- https://www.ctan.org/pkg/abntex2 %chapter=TITLE, % títulos de capítulos convertidos em letras maiúsculas %section=TITLE, % títulos de seções convertidos em letras maiúsculas @@ -41,10 +42,6 @@ % Pacotes básicos (Adicione abaixo pacotes úteis para o seu trabalho) % --- -% Pacote para desenho -\usepackage{tikz} -\usetikzlibrary{external,shapes,arrows,positioning} - % Bibliografia nas normas da ABNT, formato autor-data (Pacote biblatex) % O formato autor-data facilita a leitura, sobretudo de trabalhos com muitas páginas % https://www.ctan.org/pkg/biblatex @@ -63,6 +60,43 @@ % --- % --- +% Compila lista de siglas de siglas e abreviaturas e lista de símbolos +% --- +\RequirePackage[refpage]{nomencl} % Para gerar lista de siglas e abreviações e lista de símbolos +\newcommand{\makenomencl}{ +\makenomenclature +\renewcommand{\nomname}{\listadesiglasname} +\def\pagedeclaration##1{\dotfill\hyperlink{page.##1}{\nobreakspace##1}\par} +\renewcommand{\nomgroup}[1]{% + % A primeira lista é a de abreviaturas e siglas + \ifstrequal{##1}{A}{\vspace{-36pt} + \item[]% + }{% + \ifstrequal{##1}{B}{ + % Força a criação de uma nova lista, a lista de símbolos + \cleardoublepage\chapter*{\hspace{-\leftmargin}\listadesimbolosname} + % Cria o grupo de símbolos romanos + \item[{\bfseries\color{verdeunb}\sffamily\large Símbolos romanos}]}{} + }{% + \ifstrequal{##1}{C}{\vspace{20pt} + % Cria o grupo de símbolos gregos + \item[{\bfseries\color{verdeunb}\sffamily\large Símbolos gregos}] + }{} + }{% + \ifstrequal{##1}{D}{\vspace{20pt} \item[{\bfseries\color{verdeunb}\sffamily\large Nome do grupo}]}{}}% + \hspace*{-\leftmargin}\vspace{12pt}% +} % Os nomes (e quantidade) dos subgrupos da lista de símbolos pode ser customizados +% https://tex.stackexchange.com/questions/257076/customize-vertical-space-of-entries-and-subgroup-names-in-nomenclature +} + + + +%\renewcommand{\nomgroup}[1]{ +%\ifthenelse{\equal{##1}{A}}{}{% +%\chapter*{\hspace{-\leftmargin}\listadesimbolosname} +%\ifthenelse{\equal{##1}{S}}{}{}}} + +% --- % Compila a nomenclatura % --- \makenomencl @@ -72,6 +106,16 @@ \graphicspath{{unbtex-example/figuras/}} % --- +% Pacote para desenho +\tikzexternalize[prefix=unbtex-example/figuras/, + %only named=true, + %mode=graphics if exists, + %figure list=true, + %optimize=true, optimize command away=\includegraphics, + %optimize command away=\includepdf, + %shell escape=-enable-write18 + ] + % ------------------------------------------------------------------------ % ------------------------------------------------------------------------ % Informações do trabalho @@ -107,8 +151,8 @@ % Local e data \local{Brasília} -\dia{29} -\mes{julho} +\dia{5} +\mes{outubro} \ano{2022} % Palavras-chave (pelo menos três devem ser informadas) @@ -156,12 +200,16 @@ \renewcommand{\lstlistingname}{Código} \renewcommand{\orientadorname}{Orientador} % O gênero pode ser alterado para Orientadora \renewcommand{\coorientadorname}{Coorientador} % O gênero pode ser alterado para Coorientadora +\renewcommand{\anexoname}{Anexo} +\renewcommand{\apendicename}{Apêndice} }{ \thmnameen \renewcommand{\bibname}{References} \renewcommand{\lstlistingname}{Code} \renewcommand{\orientadorname}{Orientador} % O gênero pode ser alterado para Orientadora. Não alterar para Supervisor/Advisor, mesmo que o trabalho seja em inglês. \renewcommand{\coorientadorname}{Coorientador} % O gênero pode ser alterado para Coorientadora. Não alterar para Co-Supervisor/Co-Advisor, mesmo que o trabalho seja em inglês. +\renewcommand{\anexoname}{Annex} +\renewcommand{\apendicename}{Appendix} } % ------------------------------------------------------------------------ @@ -317,11 +365,12 @@ This is the english abstract. % --- % --- -% Insere lista de abreviaturas e siglas +% Insere as listas de abreviaturas e siglas e de símbolos % --- -{\SingleSpacing -%\setlength{\nomitemsep}{-\parsep} -\printnomenclature[2cm]} +%{\SingleSpacing +\setlength{\nomitemsep}{-\parsep} +\printnomenclature[2cm] +% A opção do comando \printnomenclature define a largura da primeira coluna das listas \cleardoublepage % --- @@ -383,7 +432,7 @@ This is the english abstract. \cleardoublepage \phantomsection \tocprintchapternonum -\addcontentsline{toc}{chapter}{\texorpdfstring{\MakeTextUppercase{\bibname}}{\bibname}} +\addcontentsline{toc}{chapter}{\texorpdfstring{\bibname}{\bibname}} \printbibliography \markboth{}{} % --- diff --git a/macros/latex/contrib/unbtex/unbtex-example/capitulo2.tex b/macros/latex/contrib/unbtex/unbtex-example/capitulo2.tex index 6e02fa8eaa..7e28ae3039 100644 --- a/macros/latex/contrib/unbtex/unbtex-example/capitulo2.tex +++ b/macros/latex/contrib/unbtex/unbtex-example/capitulo2.tex @@ -158,12 +158,12 @@ output/.style={coordinate}, pinstyle/.style={ pin edge={to-,thin,black} } -} +} \begin{figure}[htb] \centering % The block diagram code is probably more verbose than necessary -% The block diagram code is probably more verbose than necessary +\tikzsetnextfilename{blockdiagram} \begin{tikzpicture}[auto,>=latex'] % We start by placing the blocks \node [input, name=input] {}; @@ -171,11 +171,11 @@ pinstyle/.style={ \node [block, right = of sum] (controller) {Controlador}; \node [block, right = of controller, pin={[pinstyle]above:Perturbações}, node distance=3cm] (system) {Planta}; - % We draw an edge between the controller and system block to - % calculate the coordinate u. We need it to place the measurement block. - \draw [->] (controller) -- node[name=u] {$u$} (system); - \node [output, right =of system] (output) {}; - %\node [block, below of=u] (measurements) {Measurements}; +% We draw an edge between the controller and system block to +% calculate the coordinate u. We need it to place the measurement block. + \draw [->] (controller) -- node[name=u] {$u$} (system); + \node [output, right =of system] (output) {}; + %\node [block, below of=u] (measurements) {Measurements}; % Once the nodes are placed, connecting them is easy. \draw [draw,->] (input) -- node {$r$} (sum); @@ -324,6 +324,10 @@ u_{li}(t) &= - \textrm{sign}(s_{li}(t))\eta. \label{eq:u_xbi} \end{split} \end{equation} +\nomenclature[C]{$\theta$}{Ângulo de arfagem} +\nomenclature[C]{$\phi$}{Ângulo de rolamento} +\nomenclature[C]{$\psi$}{Ângulo de guinada} + % --- \section{Enumerações: alíneas e subalíneas} % --- @@ -527,9 +531,12 @@ Para definir um elemento da lista de símbolos, próximo da equação onde o sí \nomenclature[B]{$p$}{Pressão} \nomenclature[B]{$v$}{Velocidade} \nomenclature[B]{$h$}{Elevação} +\nomenclature[C]{$\theta$}{Ângulo de arfagem} +\nomenclature[C]{$\phi$}{Ângulo de rolamento} +\nomenclature[C]{$\psi$}{Ângulo de guinada} \end{verbatim} -Note que o \verb|[A]| de \verb|\nomenclature[A]| indica que se trata de uma abreviatura ou sigla. Já o \verb|[B]| em \verb|\nomenclature[B]| indica que se trata de símbolo. Daí cada elemento a ser listado vai para a lista a qual pertencem. +Note que a letra \verb|[A]| de \verb|\nomenclature[A]| indica que o item pertence à lista de abreviaturas e siglas. Já as letras \verb|[B]| em \verb|\nomenclature[B]| e \verb|[C]| em \verb|\nomenclature[C]| referem-se, respectivamente, aos grupos de símbolos romanos e gregos, que compõem a lista de símbolos. As listas e seus grupos estão definidos no arquivo \verb|unbtex-example.tex|. A ordem de apresentação dos grupos em uma lista segue a ordem alfabética das letras que os designam. % --- \section{Ficha catalográfica com código Cutter-Sanborn} diff --git a/macros/latex/contrib/unbtex/unbtex-example/figuras/fig1.eps b/macros/latex/contrib/unbtex/unbtex-example/figuras/fig1.eps Binary files differdeleted file mode 100644 index aa16abe8c3..0000000000 --- a/macros/latex/contrib/unbtex/unbtex-example/figuras/fig1.eps +++ /dev/null diff --git a/macros/latex/contrib/unbtex/unbtex-example/referencias.bib b/macros/latex/contrib/unbtex/unbtex-example/referencias.bib index f8c70cd457..5508213d11 100644 --- a/macros/latex/contrib/unbtex/unbtex-example/referencias.bib +++ b/macros/latex/contrib/unbtex/unbtex-example/referencias.bib @@ -11,7 +11,7 @@ Date-Modified = {2013-08-21 13:56:10 +0000}, Edition = {3}, Organization = {http://biblioteca.ibge.gov.br/visualizacao/livros/liv23907.pdf}, - Publisher = {Centro de Documentação e Disseminação de Informações. Fundação Intituto Brasileiro de Geografia e Estatística}, + Publisher = {Centro de Documentação e Disseminação de Informações. Fundação Instituto Brasileiro de Geografia e Estatística}, Title = {Normas de apresentação tabular}, urldate = {2013-08-21}, Year = {1993}} @@ -142,7 +142,7 @@ Org-Short = {ABNT}, Organization = {Associação Brasileira de Normas T\'ecnicas}, Pages = 7, - Subtitle = {Informação e documentação --- Apresentação de citaçãoes em documentos}, + Subtitle = {Informação e documentação --- Apresentação de citações em documentos}, Title = {{NBR} 10520}, Year = 2002} @@ -154,7 +154,7 @@ Org-Short = {ABNT}, Organization = {Associação Brasileira de Normas T\'ecnicas}, Pages = 4, - Subtitle = {Numeração progressiva das seçãoes de um documento}, + Subtitle = {Numeração progressiva das seções de um documento}, Title = {{NBR} 6024}, Year = 2012} @@ -164,7 +164,7 @@ Date-Modified = {2012-12-15 21:02:50 +0000}, Month = {11}, Org-Short = {ABNT}, - Organization = {Associação Brasileira de Normas T\'ecnicas}, + Organization = {Associação Brasileira de Normas Técnicas}, Pages = 2, Subtitle = {Resumo - Apresentação}, Title = {{NBR} 6028}, @@ -176,9 +176,9 @@ Date-Modified = {2012-12-15 20:34:08 +0000}, Month = {07}, Org-Short = {ABNT}, - Organization = {Associação Brasileira de Normas T\'ecnicas}, + Organization = {Associação Brasileira de Normas Técnicas}, Pages = 6, - Subtitle = {Informação e documentação --- trabalhos acad\^emicos --- apresentação}, + Subtitle = {Informação e documentação --- trabalhos acadêmicos --- apresentação}, Title = {{NBR} 14724}, Year = 2001} @@ -188,9 +188,9 @@ Date-Modified = {2012-12-15 20:34:17 +0000}, Month = {08}, Org-Short = {ABNT}, - Organization = {Associação Brasileira de Normas T\'ecnicas}, + Organization = {Associação Brasileira de Normas Técnicas}, Pages = 6, - Subtitle = {Informação e documentação --- trabalhos acad\^emicos --- apresentação}, + Subtitle = {Informação e documentação --- trabalhos acadêmicos --- apresentação}, Title = {{NBR} 14724}, Year = 2002} @@ -200,9 +200,9 @@ Date-Modified = {2012-12-15 20:35:25 +0000}, Month = {12}, Org-Short = {ABNT}, - Organization = {Associação Brasileira de Normas T\'ecnicas}, + Organization = {Associação Brasileira de Normas Técnicas}, Pages = 9, - Subtitle = {Informação e documentação --- trabalhos acad\^emicos --- apresentação}, + Subtitle = {Informação e documentação --- trabalhos acadêmicos --- apresentação}, Title = {{NBR} 14724}, Year = 2005} @@ -215,7 +215,7 @@ Org-Short = {ABNT}, Organization = {Associação Brasileira de Normas T\'ecnicas}, Pages = 15, - Subtitle = {Informação e documentação --- trabalhos acad\^emicos --- apresentação}, + Subtitle = {Informação e documentação --- trabalhos acadêmicos --- apresentação}, Title = {{NBR} 14724}, Year = 2011} @@ -246,7 +246,7 @@ Date-Modified = {2012-04-23 11:35:13 +0000}, Keywords = {arquitetura da informação}, School = {Universidade de Brasília}, - Title = {Arquitetura da Informação: aspectos espistemológicos, científicos e práticos.}, + Title = {Arquitetura da Informação: aspectos epistemológicos, científicos e práticos.}, Type = {Dissertação de Mestrado}, Year = {2005}} diff --git a/macros/latex/contrib/unbtex/unbtex.cls b/macros/latex/contrib/unbtex/unbtex.cls index a3fde055dd..1e1a6d4c3a 100644 --- a/macros/latex/contrib/unbtex/unbtex.cls +++ b/macros/latex/contrib/unbtex/unbtex.cls @@ -1,7 +1,7 @@ %% %% UnBTeX: A class for bachelor, master, and doctoral thesis at the %% University of Brasilia (UnB), Brazil -%% Version 1.1.3 2022/09/04 +%% Version 1.2 2022/10/05 %% Copyright (C) 2021-2022 by Henrique C. Ferreira <hcferreira@unb.br> %% %% This class file may be distributed and/or modified under the conditions @@ -21,7 +21,7 @@ %% \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{unbtex}[2022/09/04 v1.1.3 Modelo da Universidade de Brasília baseado em abnTeX2] +\ProvidesClass{unbtex}[2022/10/05 v1.2 Modelo da Universidade de Brasília baseado em abnTeX2] % --- % Repassa todos os parâmetros a classe abntex2, @@ -51,21 +51,11 @@ \RequirePackage{subcaption} % Permite fazer subfiguras \RequirePackage{icomma} % Configura casas decimais separadas por vírgula \RequirePackage{indentfirst} % Indenta o primeiro parágrafo de cada seção. -\RequirePackage{microtype} % Para melhorias de justificação +\RequirePackage[nopatch=item]{microtype} % Para melhorias de justificação \RequirePackage{multirow} % Para combinar linhas nas tabelas -% --- - -% --- -% Compila lista de siglas de siglas e abreviaturas e lista de símbolos -% --- -\RequirePackage[refpage]{nomencl} % Para gerar lista de siglas e abreviações e lista de símbolos -\newcommand{\makenomencl}{ -\makenomenclature -\def\pagedeclaration##1{\dotfill\hyperlink{page.##1}{\nobreakspace##1}\par} - \renewcommand{\nomname}{\listadesiglasname} -\renewcommand{\nomgroup}[1]{ -\ifthenelse{\equal{##1}{B}}{\chapter*{\hspace*{-\leftmargin}\listadesimbolosname}}{}} -} +\RequirePackage[dvipsnames,table]{xcolor} % Para cores da UnB +\RequirePackage{tikz} % Cria desenhos +\usetikzlibrary{external,shapes,arrows,positioning} % --- % --- @@ -84,7 +74,6 @@ % Cores verde e azul UnB % http://www.marca.unb.br/arquivosdigitais/files/guia_pratico/guia_pratico.pdf % --- -\RequirePackage[dvipsnames,table]{xcolor} \definecolor{verdeunb}{cmyk}{1,0,1,0.2} \definecolor{azulunb}{cmyk}{1,0.65,0,0.35} @@ -110,6 +99,10 @@ % Controle do espaçamento entre um parágrafo e outro: \setlength{\parskip}{0.2cm} % tente também \onelineskip +% Numeração por capítulo das figuras e tabelas +\renewcommand{\thefigure}{\thechapter.\arabic{figure}} +\renewcommand{\thetable}{\thechapter.\arabic{table}} + % configuração do cabeçalho das páginas \pagestyle{myheadings} % cabeçalho com linha e numeração da página %\setlength{\normalrulethickness}{0pt} % retira a linha do cabeçalho @@ -120,6 +113,12 @@ % Alterando o espaçamento entre linhas do ambiente verbatim \def\verbatim@font{\linespread{1}\small\ttfamily} +% Personalização do Sumário +\settocdepth{subsection} +\renewcommand{\cftchapterfont}{\normalsize\bfseries\sffamily} +\setlength{\cftbeforechapterskip}{1.0em} +\setlength{\cftbeforepartskip}{1.0em} + % Corrige falha do abntex2 nos anexos e apêndices \renewcommand{\PRIVATEapendiceconfig}[2]{% \setboolean{abntex@apendiceousecao}{true}% @@ -127,11 +126,12 @@ \ifthenelse{\boolean{ABNTEXsumario-abnt-6027-2012}}{ \renewcommand{\appendixtocname}{\texorpdfstring{\MakeTextUppercase{#2}}{#2}} }{% -\renewcommand{\appendixtocname}{#2}} -\renewcommand{\appendixpagename}{#2} +\renewcommand{\appendixtocname}{{\normalsize\bfseries\sffamily #2}}} +\renewcommand{\appendixpagename}{{\Huge\bfseries\sffamily #2}} \switchchapname{#1} \renewcommand*{\cftappendixname}{#1 \space} } +\renewcommand{\cftpartpagefont}{\normalsize\bfseries} % --- % --- @@ -370,8 +370,10 @@ \parbox[b][\paperheight]{\paperwidth}{% \vfill \centering + \tikzexternalenable \includegraphics[width=\paperwidth,height=\paperheight,% keepaspectratio]{capa_fundo.pdf}% + \tikzexternaldisable \vfill } } |