diff options
Diffstat (limited to 'macros')
27 files changed, 232 insertions, 116 deletions
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index b5ca727b02..5ee1eadb0f 100644 --- a/macros/latex/contrib/easybook/easybook.dtx +++ b/macros/latex/contrib/easybook/easybook.dtx @@ -15,7 +15,7 @@ %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/11/10}{1.40N} +\ProvidesExplClass{easybook}{2021/11/10}{1.40O} {Typeset Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -325,7 +325,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2021/11/10}{1.40N} +\ProvidesExplPackage{easybase}{2021/11/10}{1.40O} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -453,19 +453,13 @@ class .initial:n = book, book .meta:n = { class = book }, article .meta:n = { class = article }, - unknown .code:n = \clist_gput_right:NV \g__eb_ctex_options_clist \CurrentOption } -\eb_clist_map_inline:nn - { - { protrusion = false } { microtype }, - { list = off } { bicaption }, - { many } { tcolorbox }, - { upint } { newtxmath }, - { svgnames } { xcolor } - } - { \PassOptionsToPackage #1 } +\PassOptionsToPackage{list = off}{bicaption} +\PassOptionsToPackage{many}{tcolorbox} +\PassOptionsToPackage{upint}{newtxmath} +\PassOptionsToPackage{svgnames}{xcolor} \ProcessKeysOptions{easybase} \PassOptionsToPackage{\g__eb_ctex_options_clist}{ctex} \@ifclassloaded{ctexbook}{} @@ -584,8 +578,10 @@ { \color{ctex@emph} \eb@tag@brackets@left - \ignorespaces #1\unskip\@@italiccorr + \bgroup + \ignorespaces{#1}\unskip\@@italiccorr \eb@tag@brackets@right + \egroup } } \ctex_define:nn { style } @@ -1091,7 +1087,7 @@ } } -\ProvideDocumentCommand{\super}{omo}{\textsuperscript{#3}} +\ProvideDocumentCommand{\super}{omo}{\textsuperscript{#2}} \providecommand{\spbset}{\use_none:n} \NewDocumentCommand{\eb@fnmate@super}{sm} { @@ -1140,7 +1136,9 @@ { \eb@fnmate@super* } { \tl_use:N \l__eb_fntext_before_tl - {\l__eb_fnmate_format_tl{\@thefnmark}} + \bgroup + \l__eb_fnmate_format_tl{\@thefnmark} + \egroup } \tl_use:N \l__eb_fntext_after_tl } @@ -1296,24 +1294,24 @@ { \normalsize\normalfont \titlerule*[#2]{\scalebox{#3}{#4}}#5 + \bgroup + \IfBooleanTF{#1} + {\thecontentspage} { - \IfBooleanTF{#1} - {\thecontentspage} - { - \bool_if:NTF \l__eb_toc_line_align_bool - { \contentspage } - { \thecontentspage } - } + \bool_if:NTF \l__eb_toc_line_align_bool + { \contentspage } + { \thecontentspage } } + \egroup } \cs_set_eq:NN \ctexnumberline \CTEXnumberline -\cs_new:Npn \eb@numberline { \protect\numberline } +\cs_new:Npn \p@numberline { \protect\numberline } \cs_set:Npn \CTEXnumberline #1 { \CTEXifname { \bool_if:NTF \eb@titletoc@hang@fix@bool - { \eb@numberline{\use:c { CTEXthe#1 }} } + { \p@numberline{\use:c { CTEXthe#1 }} } { \use:c { CTEXthe#1 } \tl_use:c { l__eb_toc_#1_after_tl } @@ -1368,8 +1366,10 @@ { \addcontentsline{#1}{#2} { - \bool_if:NT \eb@titletoc@hang@fix@bool { \eb@numberline } - {\prop_item:Nn \l__eb_list_label_name_prop {#2}{#3}}#4 + \bool_if:NT \eb@titletoc@hang@fix@bool { \p@numberline } + \bgroup + \prop_item:Nn \l__eb_list_label_name_prop {#2}{#3} + \egroup #4 } } \cs_set_eq:NN \eb@if@boolT \bool_if:NT @@ -1381,8 +1381,11 @@ { \addcontentsline{lol}{lstlisting} { - \eb@if@boolT\eb@titletoc@hang@fix@bool{\eb@numberline} - {\eb@toc@label@lstlisting{}}\lst@@caption + \eb@if@boolT\eb@titletoc@hang@fix@bool{\p@numberline} + \bgroup + \eb@toc@label@lstlisting{} + \egroup + \lst@@caption } } @@ -2069,7 +2072,7 @@ color .tl_set:N = \eb@tc@background@color, color .initial:n = DeepSkyBlue, number .tl_set:N = \eb@tc@list@number, - number .initial:n = { 1. }, + number .initial:n = 1., title .tl_set:N = \eb@tc@exercise@title, title .initial:n = \c__eb_name_exercise_tl, numsep .dim_set:N = \eb@toc@exercise@numsep, @@ -2401,7 +2404,7 @@ } %</package> %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/10}{1.40N} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/10}{1.40O} {Customization of tcolorbox for easybook} \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip } diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf Binary files differindex 2c4528570b..2871a82625 100644 --- a/macros/latex/contrib/easybook/easybook.pdf +++ b/macros/latex/contrib/easybook/easybook.pdf diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex index e3a95b4568..54806dc5a6 100644 --- a/macros/latex/contrib/easybook/easybook.tex +++ b/macros/latex/contrib/easybook/easybook.tex @@ -20,7 +20,7 @@ name = easybook, color-scheme = blue, title = EASYBOOK 使用手册, - version = v1.40N, + version = v1.40O, date = 2021/11/10, authors = 瞿毅, info = 排版简体中文学位论文和书籍, @@ -414,14 +414,18 @@ \keybool{uppercase}\Default{true} 使用 \cs*{rightmark} 及 \cs*{leftmark} 标题标记命令获取标题内容时英文是否大写。 \kvsplit{brackets}{左括号,右括号}\Default{\Carg{(\black{,})}} - 设置行间公式编号标签的括号，以英文逗号分隔，分别代表左右括号。 + 设置行间公式编号标签的括号及格式，以英文逗号分隔，分别代表左右括号。\meta{左括号} 可以是带有一个参数的命令，用于接受编号和 \meta{右括号}。将标签括号设置为方括号，并使用无衬线字体： + \begin{ctexexam} + \newcommand{\bracketsf}[1]{\textsf{[#1}} + \style{brackets = {\bracketsf,]}} + \end{ctexexam} \kvsplit*{figurepath}{\meta{路径名1}\code{\}\{}\meta{路径名2}}\Default 设置插入图片的文件夹路径名，可以有多个路径名，每个路径包含在括号分隔，只有一个路径时需要包含在两层括号内。 \end{options} \subsubsection{连接符} \begin{options} - \keyval-{figure-connect}{图片连接符}\Module{style}\Default{\Carg{.}} + \keyval-{figure-connect}{图片连接符}\Default{\Carg{.}} 设置图片题注编号的连接符。 \keyval-{table-connect}{表格连接符}\Default{\Carg{.}} 设置表格题注编号的连接符。 diff --git a/macros/latex/contrib/huawei/DEPENDS.txt b/macros/latex/contrib/huawei/DEPENDS.txt index 9fd9cd6677..c2a24eeddb 100644 --- a/macros/latex/contrib/huawei/DEPENDS.txt +++ b/macros/latex/contrib/huawei/DEPENDS.txt @@ -3,6 +3,7 @@ hard fontenc hard inputenc hard CJKutf8 hard tabularx +hard anyfontsize hard multicol hard ragged2e hard multicol diff --git a/macros/latex/contrib/huawei/huawei.cls b/macros/latex/contrib/huawei/huawei.cls index 0d63a46f55..ed4894a805 100644 --- a/macros/latex/contrib/huawei/huawei.cls +++ b/macros/latex/contrib/huawei/huawei.cls @@ -21,7 +21,7 @@ % SOFTWARE. \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{huawei}[2021/10/26 0.13.1 Template for Huawei Documents] +\ProvidesClass{huawei}[2021/11/11 0.13.2 Template for Huawei Documents] \LoadClass[12pt]{article} @@ -55,10 +55,16 @@ \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} @@ -176,7 +182,7 @@ \makeatletter\fancyfoot[R]{ \begin{textblock}{8}[0,1](1.2,15.8)% \ifnum\value{page}=1\else% - \huawei@header{% + \huawei@header{\raggedright% \ifhuawei@anonymous\else% \theauthor% \ifhuawei@nosecurity\else% diff --git a/macros/latex/contrib/huawei/huawei.pdf b/macros/latex/contrib/huawei/huawei.pdf Binary files differindex f288913d02..e8655d5565 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 index 6b697a03af..7de97f558b 100644 --- a/macros/latex/contrib/huawei/huawei.tex +++ b/macros/latex/contrib/huawei/huawei.tex @@ -29,9 +29,9 @@ \begin{document} \maketitle -\ff{Version: 0.13.1} +\ff{Version: 0.13.2} \newline -\ff{Date: 2021/10/26} +\ff{Date: 2021/11/11} \section{Overview} diff --git a/macros/latex/contrib/nomencl/README b/macros/latex/contrib/nomencl/README index 3968e40100..ad97c2bf51 100644 --- a/macros/latex/contrib/nomencl/README +++ b/macros/latex/contrib/nomencl/README @@ -46,3 +46,6 @@ VERSION HISTORY v5.5 2020/12/29 Catalan option + v5.6 2021/11/10 Nomentbl no longer uses the s column for units and + thus works with the new versions of siunitx + package.
\ No newline at end of file diff --git a/macros/latex/contrib/nomencl/nomencl.dtx b/macros/latex/contrib/nomencl/nomencl.dtx index 3b9326f74b..c291392a20 100644 --- a/macros/latex/contrib/nomencl/nomencl.dtx +++ b/macros/latex/contrib/nomencl/nomencl.dtx @@ -1,6 +1,6 @@ % \iffalse % File nomencl.dtx -% Copyright 1996-2020 Boris Veytsman, Bernd Shandl, Lee Netherton, CV +% Copyright 1996-2021 Boris Veytsman, Bernd Shandl, Lee Netherton, CV % Radhakrishnan, Brian Elmegaard % % @@ -28,7 +28,7 @@ %<*package|driver> % \fi % \ProvidesFile{nomencl.dtx}% - [2020/12/29 v5.5 Nomenclature package] + [2021/11/10 v5.6 Nomenclature package] % % \iffalse %</package|driver> @@ -579,7 +579,7 @@ or another one % \DescribeMacro{\setnomtableformat} % The list is wrapped in a |longtable| with the default format % \begin{center} -% |lp{0.4\textwidth}sp{0.3\textwidth}@{}l| +% |lp{0.4\textwidth}cp{0.3\textwidth}@{}l| % \end{center} % The command % \cs{setnomtableformat}\marg{format} can be used to change it, for @@ -590,8 +590,7 @@ or another one % % Note that the table has five columns: symbol, description, units, % note, and reference. If you do not use references, you may suppress -% the last column using |@{}l| declaration. The |s| column is used -% for units in the \package{siunitx} format. +% the last column using |@{}l| declaration. % % Figure~\ref{fig:nomentbl} provides an example of this option. % @@ -1429,6 +1428,8 @@ follows easily. % \begin{macro}{\@@@nomenclature} % \changes{v2.7 (1999/05/14)}{1999/05/11}{More robust by using \cs{nom@verb}} % \changes{v5.0}{2018/12/28}{Nomentbl option} +% \changes{v5.6}{2021/11/10}{Nomentbl option now does not use the +% deprecated |s| columnstyle} % If \cs{makenomenclature} was already executed, then \cs{@nomenclature} % calls the macro \cs{@@@nomenclature} which writes to the nomenclature file. % It puts the prefix in front of the entry, adds brackets |[]| around the @@ -1446,7 +1447,7 @@ follows easily. \def\@tempa{#2}\def\@tempb{#3}% \protected@write\@nomenclaturefile{}% {\string\nomenclatureentry{#1\nom@verb\@tempa @&{\nom@verb\@tempa}&% - \begingroup\nom@verb\@tempb\endgroup &\begingroup#4\endgroup&% + \begingroup\nom@verb\@tempb\endgroup &\unit{#4}&% \begingroup#5\endgroup&\begingroup\protect\nomeqref{\theequation}% |nompageref}{\thepage}}% \endgroup @@ -1553,13 +1554,14 @@ follows easily. % \end{macro} % % \begin{macro}{\setnomtableformat} -%\changes{v5.0}{2018/12/28}{Added macro} +% \changes{v5.0}{2018/12/28}{Added macro} +% \changes{v5.6}{2021/11/10}{Switched to |c| column for units} % The format of the nomenclature table. We insert an empty left % column due to the way \TeX\ sees \cs{multicolumn} in \cs{nomgroup} % command. % \begin{macrocode} \def\setnomtableformat#1{\def\@nomtableformat{l@{}#1}} -\setnomtableformat{lp{0.45\textwidth}sp{0.3\textwidth}@{}l} +\setnomtableformat{lp{0.45\textwidth}cp{0.3\textwidth}@{}l} % \end{macrocode} % % \end{macro} diff --git a/macros/latex/contrib/nomencl/nomencl.pdf b/macros/latex/contrib/nomencl/nomencl.pdf Binary files differindex 6159e7288e..ffb368151f 100644 --- a/macros/latex/contrib/nomencl/nomencl.pdf +++ b/macros/latex/contrib/nomencl/nomencl.pdf diff --git a/macros/latex/contrib/nomencl/sample01.pdf b/macros/latex/contrib/nomencl/sample01.pdf Binary files differindex 2c8cc5a429..70dc4cebcb 100644 --- a/macros/latex/contrib/nomencl/sample01.pdf +++ b/macros/latex/contrib/nomencl/sample01.pdf diff --git a/macros/latex/contrib/nomencl/sample02.pdf b/macros/latex/contrib/nomencl/sample02.pdf Binary files differindex dfdfe26eb2..4e9c95fe96 100644 --- a/macros/latex/contrib/nomencl/sample02.pdf +++ b/macros/latex/contrib/nomencl/sample02.pdf diff --git a/macros/latex/contrib/nomencl/sample03.pdf b/macros/latex/contrib/nomencl/sample03.pdf Binary files differindex 57c1219b87..19ad09b3a9 100644 --- a/macros/latex/contrib/nomencl/sample03.pdf +++ b/macros/latex/contrib/nomencl/sample03.pdf diff --git a/macros/latex/contrib/nomencl/sample04.pdf b/macros/latex/contrib/nomencl/sample04.pdf Binary files differindex 8473f6a624..2d6b4f2d98 100644 --- a/macros/latex/contrib/nomencl/sample04.pdf +++ b/macros/latex/contrib/nomencl/sample04.pdf diff --git a/macros/latex/contrib/nomencl/sample05.pdf b/macros/latex/contrib/nomencl/sample05.pdf Binary files differindex 0965d8e7c3..ce7ee64353 100644 --- a/macros/latex/contrib/nomencl/sample05.pdf +++ b/macros/latex/contrib/nomencl/sample05.pdf diff --git a/macros/latex/contrib/uantwerpendocs/beamerthemeuantwerpenuserguide.pdf b/macros/latex/contrib/uantwerpendocs/beamerthemeuantwerpenuserguide.pdf Binary files differindex 4d63ea5dce..05d78863ef 100644 --- a/macros/latex/contrib/uantwerpendocs/beamerthemeuantwerpenuserguide.pdf +++ b/macros/latex/contrib/uantwerpendocs/beamerthemeuantwerpenuserguide.pdf diff --git a/macros/latex/contrib/uantwerpendocs/uantwerpenbamathesis-example.pdf b/macros/latex/contrib/uantwerpendocs/uantwerpenbamathesis-example.pdf Binary files differindex 6231268cc1..b23d264ca3 100644 --- a/macros/latex/contrib/uantwerpendocs/uantwerpenbamathesis-example.pdf +++ b/macros/latex/contrib/uantwerpendocs/uantwerpenbamathesis-example.pdf diff --git a/macros/latex/contrib/uantwerpendocs/uantwerpencoursetext-example.pdf b/macros/latex/contrib/uantwerpendocs/uantwerpencoursetext-example.pdf Binary files differindex ea7a46b578..ed56012bfd 100644 --- a/macros/latex/contrib/uantwerpendocs/uantwerpencoursetext-example.pdf +++ b/macros/latex/contrib/uantwerpendocs/uantwerpencoursetext-example.pdf diff --git a/macros/latex/contrib/uantwerpendocs/uantwerpendocs.dtx b/macros/latex/contrib/uantwerpendocs/uantwerpendocs.dtx index 0b0b87df96..8aa027e390 100644 --- a/macros/latex/contrib/uantwerpendocs/uantwerpendocs.dtx +++ b/macros/latex/contrib/uantwerpendocs/uantwerpendocs.dtx @@ -25,23 +25,21 @@ \ProvidesFile{uantwerpendocs.dtx} %</driver> %<@@=uantwerpendocs> -%<ct|bmt|mt|pt|rp|le|ex|bmr>\NeedsTeXFormat{LaTeX2e}[1999/12/01] +%<ct|bmt|pt|rp|le|ex|bmr>\NeedsTeXFormat{LaTeX2e}[1999/12/01] %<clo>\ProvidesFile{uantwerpencommonoptions.clo} %<cls>\ProvidesPackage{uantwerpencolorlogoscheme} %<ct>\ProvidesClass{uantwerpencoursetext} -%<mt>\ProvidesClass{uantwerpenmasterthesis} %<bmt>\ProvidesClass{uantwerpenbamathesis} %<pt>\ProvidesClass{uantwerpenphdthesis} %<rp>\ProvidesClass{uantwerpenreport} %<le>\ProvidesClass{uantwerpenletter} %<ex>\ProvidesClass{uantwerpenexam} %<bmr>\ProvidesPackage{beamerthemeuantwerpen} -%<cls|ct|bmt|mt|pt|rp|le|ex|bmr> [2021/10/04 v4.2 .dtx skeleton file] -%<mt>\errmessage{This class is obsolete, use the uantwerpenbamathesis class instead !} +%<cls|ct|bmt|pt|rp|le|ex|bmr> [2021/11/11 v4.3 .dtx skeleton file] %<*driver> \documentclass[a4paper]{ltxdoc} -\def\fileversion{4.2}% -\def\filedate{2021/10/04}% +\def\fileversion{4.3}% +\def\filedate{2021/11/11}% \usepackage{makeidx} \usepackage{alltt} \usepackage{longtable} @@ -117,8 +115,11 @@ % to ease maintainability} % \changes{v4.1}{2021/08/03}{\@ Adapted coursetext again to % universitas agreement + added bleed version for phd texts + small bugfixes} +% \changes{v4.2}{2021/10/04}{\@ Added in-style bamathesis class} +% \changes{v4.3}{2021/11/11}{\@ Small bufixes and corrections to +% optional fields of letter class} % -% \DoNotIndex{\newcommand,\newenvironment,\begin,\bfseries,\draw,\clip,\else,\fi,\if,\fill,\filldraw,\ifthenelse,\ifx,\textwidth,\node,\\,\@empty,\@emptymacro,\@tempdima,\@tempdimb,\@tempswatrue,\{,\},\ ,\bf,\BODY,\break,\Alph,\and,\define@key,\color,\dx,\dy,\g,\gdef,\hbox,\tiny,\scriptsize,\footnotesize,\small,\normalsize,\large,\Large,\LARGE,\huge,\Huge,\l,\LaTeX,\let,\p@,\relax,\renewcommand,\Requirepackage,\textbf,\textsf,\texttt,\textbackslash,} +% \DoNotIndex{\newcommand,\newenvironment,\begin,\bfseries,\draw,\clip,\else,\fi,\if,\fill,\filldraw,\ifthenelse,\ifx,\textwidth,\node,\\,\@empty,\@tempdima,\@tempdimb,\@tempswatrue,\{,\},\ ,\bf,\BODY,\break,\Alph,\and,\define@key,\color,\dx,\dy,\g,\gdef,\hbox,\tiny,\scriptsize,\footnotesize,\small,\normalsize,\large,\Large,\LARGE,\huge,\Huge,\l,\LaTeX,\let,\p@,\relax,\renewcommand,\Requirepackage,\textbf,\textsf,\texttt,\textbackslash,\vspace,\hspace,\hfill,\hskip,\vskip,\hline,\vrule,\typeout,\usebox,\end,\paperheight,\paperwidth,\par,\NewDocumentCommand,\seq} % \setlength{\parindent}{0em} % \addtolength{\parskip}{0.5\baselineskip} % @@ -576,6 +577,9 @@ % issued. However, if you care about the typographic readability of % your text, you shouldn't use this option. % +% \DescribeMacro{nofoldline} [letter]\\ +% This option suppresses the fold line on a letter. +% % Common sets of options depend on the purpose: % \begin{itemize} % \item to make a text ready for electronic distribution: @@ -799,6 +803,8 @@ % \item first argument: user name % \item second argument: domain name % \end{itemize} +% You can specify multiple email addresses by using the command +% multiple times. % % \DescribeMacro{\enclosed} [letter] (optional)\\ % List of enclosed documents. Format at will. @@ -806,6 +812,8 @@ % \DescribeMacro{\fax} [letter] (optional)\\ % Probably facsimile is not used anymore, but anyway: fax number of % the sending person. See also |\email|. +% You can specify multiple fax addresses by using the command +% multiple times. % % \DescribeMacro{\logo} [letter] (optional)\\ % file name of an alternative logo to use. The file name must be the @@ -816,12 +824,16 @@ % % \DescribeMacro{\mobile} [letter] (optional)\\ % Mobile phone number of the sending person. See also |\email|. +% You can specify multiple mobile phone numbers by using the command +% multiple times. % % \DescribeMacro{\opening} [letter] (mandatory) \\ % Opening address of the letter. E.g. 'Dear X,'. % % \DescribeMacro{\phone} [letter] (optional)\\ % Phone number of the sending person. See also |\email|. +% You can specify multiple phone numbers by using the command +% multiple times. % % \DescribeMacro{\returnaddress} [letter] (mandatory)\\ % This is a short return address (listed in small font on top of the @@ -852,7 +864,7 @@ % Name of the addressee. Newlines are allowed. % Preferably name and role are split over two lines. % -% \DescribeMacro{\toaddress} [letter] (mandatory)\\ +% \DescribeMacro{\toaddress} [letter] (optional)\\ % Address of the addressee. Newlines are allowed. The address should % fit on max. 3 lines. % @@ -1465,6 +1477,8 @@ %<*le-example> \documentclass[ti,a4paper]{uantwerpenletter} +%% You can suppress the foldline, using the nofoldline option. +%% %% As a good UAntwerpen citizen, you would use the calibri font. %% As this only works for XeLaTeX or LuaLaTeX, we chose to include %% cmbright in any other case. @@ -1497,6 +1511,7 @@ Mumford, DX 94305-2004\\ USA} + \date{January 3, 2016} \subject{Congratulations for online video lectures} @@ -2126,6 +2141,10 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in \newif\if@cameraready \DeclareOption{cameraready}{\@camerareadytrue} %</ct|pt> +%<*le> +\newif\if@nofoldline +\DeclareOption{nofoldline}{\@nofoldlinetrue} +%</le> % \end{macrocode} % % @@ -2202,8 +2221,8 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in % Let's make things a bit easier for me. % \begin{macrocode} %<*ct|bmt|pt|rp|le|ex> -%\RequirePackage{expl3} -\RequirePackage[check-declarations]{expl3} % I use this during debug phase +\RequirePackage{expl3} +%\RequirePackage[check-declarations]{expl3} % I use this during debug phase \RequirePackage{xparse} %</ct|bmt|pt|rp|le|ex> % \end{macrocode} @@ -2243,7 +2262,6 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in \RequirePackage{etoolbox} \RequirePackage{ifthen} \IfFileExists{shellesc.sty}{\RequirePackage{shellesc}}{} -\newcommand{\@emptymacro}{} %</ct|bmt|pt|rp|le|ex> % \end{macrocode} % @@ -2469,6 +2487,7 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in % \end{macrocode} % % The English data can be found below: +% \begin{macrocode} %<*endata> org-be = Faculty of Business and Economics org-fbd = Faculty of Pharmaceutical, Biomedical and Veterinary Sciences @@ -2521,8 +2540,10 @@ pthesisnamei = Thesis submitted in fulfilment of the requirements for the d pthesisnameii = at University of Antwerp weightname = Weight %</endata> +% \end{macrocode} % % The Dutch data can be found below: +% \begin{macrocode} %<*nldata> org-be = Faculteit Bedrijfswetenschappen en Economie org-fbd = Faculteit Farmaceutische, Biomedische en Diergeneeskundige Wetenschappen @@ -2533,7 +2554,7 @@ org-re = Faculteit Rechten org-sw = Faculteit Sociale Wetenschappen org-ti = Faculteit Toegepaste Ingenieurswetenschappen org-we = Faculteit Wetenschappen -org=iob = Instituut voor Ontwikkelingsbeleid- en beheer +org-iob = Instituut voor Ontwikkelingsbeleid- en beheer org-ua = Universiteit Antwerpen arr = Alle rechten voorbehouden of = van @@ -2575,6 +2596,7 @@ pthesisnamei = Proefschrift voorgelegd tot het behalen van de graad van pthesisnameii = aan de Universiteit Antwerpen te verdedigen door weightname = Gewicht %</nldata> +% \end{macrocode} % % % \subsection{Bachelor and Master document types} @@ -2591,14 +2613,14 @@ en-pr = Project report % \end{macrocode} % % \begin{macrocode} -%<*bmt> +%<*bmt|ct|pt|ex> \ExplSyntaxOn \cs_generate_variant:Nn \prop_item:Nn{ Nx } \NewDocumentCommand{\uantwerpendocsdoctype}{m}{ \prop_item:Nx \g_@@_data_prop { #1 } } \ExplSyntaxOff -%</bmt> +%</bmt|ct|pt|ex> % \end{macrocode} % % \subsection{Bachelor and Master disclaimers} @@ -2706,14 +2728,13 @@ we-nl-ma-wiftw = Master of Science in wiskunde: financiële en toegepaste wiskun % \end{macrocode} % % \begin{macrocode} -%<*bmt> +%<*bmt|ct|pt|ex> \ExplSyntaxOn \NewDocumentCommand{\uantwerpendocsdegree}{m}{ - \typeout{#1} \prop_item:Nx \g_@@_data_prop { #1 } } \ExplSyntaxOff -%</bmt> +%</bmt|ct|pt|ex> % \end{macrocode} % % @@ -3365,49 +3386,121 @@ we-nl-ma-wiftw = Master of Science in wiskunde: financiële en toegepaste wiskun % \end{macro} % % \begin{macro}{\email} -% This macro sets the |\@emailuser| and |\@emaildomain| tags that -% will be used in the letter's heading text. This split construction -% was used to overcome problems with the |@| sign. +% This macro allows for the registration of contact email addresses +% for a letter. This can be done by invoking the macro as many times +% as needed (as of v4.2) +% % \begin{macrocode} %<*le> -\newcommand*{\@emailuser}{} -\newcommand*{\@emaildomain}{} -\newcommand*{\email}[2]{\renewcommand*{\@emailuser}{#1}\renewcommand*{\@emaildomain}{#2}} -%</le> +\ExplSyntaxOn +\seq_new:N \g_@@_emailaddresses +\cs_new:Nn \@@_addemailaddress:nn { + \seq_gpush:Nn \g_@@_emailaddresses {#1\tat{}#2} +} +\NewDocumentCommand{\email}{mm}{ + \@@_addemailaddress:nn { #1 } { #2 } +} +\NewDocumentCommand{\jointemails}{m}{ + \seq_use:Nn \g_@@_emailaddresses { #1 } +} +\NewDocumentCommand{\ifemails}{m}{ + \seq_if_empty:NTF \g_@@_emailaddresses {} {#1} +} +\AtBeginDocument{ + \seq_greverse:N \g_@@_emailaddresses +} +\ExplSyntaxOff +%</le> % \end{macrocode} % \end{macro} % +% % \begin{macro}{\phone} -% This macro sets the |\@phone| tag that will be used in the letter's -% heading text. +% This macro allows for the registration of contact phone numbers +% for a letter. This can be done by invoking the macro as many times +% as needed (as of v4.2) +% % \begin{macrocode} %<*le> -\newcommand*{\@phone}{} -\newcommand*{\phone}[1]{\renewcommand*{\@phone}{#1}} -%</le> +\ExplSyntaxOn +\seq_new:N \g_@@_phonenumbers +\cs_new:Nn \@@_addphonenumber:n { + \seq_gpush:Nn \g_@@_phonenumbers {#1} +} +\NewDocumentCommand{\phone}{m}{ + \@@_addphonenumber:n { #1 } +} +\NewDocumentCommand{\jointphones}{m}{ + \seq_use:Nn \g_@@_phonenumbers { #1 } +} +\NewDocumentCommand{\ifphones}{m}{ + \seq_if_empty:NTF \g_@@_phonenumbers {} {#1} +} +\AtBeginDocument{ + \seq_greverse:N \g_@@_phonenumbers +} +\ExplSyntaxOff +%</le> % \end{macrocode} % \end{macro} % +% % \begin{macro}{\fax} -% This macro sets the |\@fax| tag that will be used in the letter's -% heading text. +% This macro allows for the registration of contact fax numbers +% for a letter. This can be done by invoking the macro as many times +% as needed (as of v4.2) +% % \begin{macrocode} %<*le> -\newcommand*{\@fax}{} -\newcommand*{\fax}[1]{\renewcommand*{\@fax}{#1}} -%</le> +\ExplSyntaxOn +\seq_new:N \g_@@_faxnumbers +\cs_new:Nn \@@_addfaxnumber:n { + \seq_gpush:Nn \g_@@_faxnumbers {#1} +} +\NewDocumentCommand{\fax}{m}{ + \@@_addfaxnumber:n { #1 } +} +\NewDocumentCommand{\jointfaxes}{m}{ + \seq_use:Nn \g_@@_faxnumbers { #1 } +} +\NewDocumentCommand{\iffaxes}{m}{ + \seq_if_empty:NTF \g_@@_faxnumbers {} {#1} +} +\AtBeginDocument{ + \seq_greverse:N \g_@@_faxnumbers +} +\ExplSyntaxOff +%</le> % \end{macrocode} % \end{macro} % % % \begin{macro}{\mobile} -% This macro sets the |\@mobile| tag that will be used in the letter's -% heading text. +% This macro allows for the registration of contact mobile numbers +% for a letter. This can be done by invoking the macro as many times +% as needed (as of v4.2) +% % \begin{macrocode} %<*le> -\newcommand*{\@mobile}{} -\newcommand*{\mobile}[1]{\renewcommand*{\@mobile}{#1}} -%</le> +\ExplSyntaxOn +\seq_new:N \g_@@_mobilenumbers +\cs_new:Nn \@@_addmobilenumber:n { + \seq_gpush:Nn \g_@@_mobilenumbers {#1} +} +\NewDocumentCommand{\mobile}{m}{ + \@@_addmobilenumber:n { #1 } +} +\NewDocumentCommand{\jointmobiles}{m}{ + \seq_use:Nn \g_@@_mobilenumbers { #1 } +} +\NewDocumentCommand{\ifmobiles}{m}{ + \seq_if_empty:NTF \g_@@_mobilenumbers {} {#1} +} +\AtBeginDocument{ + \seq_greverse:N \g_@@_mobilenumbers +} +\ExplSyntaxOff +%</le> % \end{macrocode} % \end{macro} % @@ -3441,8 +3534,7 @@ we-nl-ma-wiftw = Master of Science in wiskunde: financiële en toegepaste wiskun % the letter's heading text (in the area of the envelope's window). % \begin{macrocode} %<*le> -\newcommand*{\@toorganization}{<Specify organization using - \textbackslash{}toorganization\{\}>} +\newcommand*{\@toorganization}{} \newcommand*{\toorganization}[1]{\renewcommand*{\@toorganization}{#1}} %</le> % \end{macrocode} @@ -3453,8 +3545,7 @@ we-nl-ma-wiftw = Master of Science in wiskunde: financiële en toegepaste wiskun % the letter's heading text (in the area of the envelope's window). % \begin{macrocode} %<*le> -\newcommand*{\@toaddress}{<Specify (multiline) destination - address\\using \textbackslash{}toaddress\{\}>} +\newcommand*{\@toaddress}{} \newcommand*{\toaddress}[1]{\renewcommand*{\@toaddress}{#1}} %</le> % \end{macrocode} @@ -4617,33 +4708,40 @@ we-nl-ma-wiftw = Master of Science in wiskunde: financiële en toegepaste wiskun \newcommand\maketitle{% \pagestyle{fancy} \thispagestyle{empty} - \begin{tikzpicture}[overlay,remember picture] - \path (current page.north west) +(1.8cm,-1.2cm) - node[anchor=north west] { - \includegraphics[height=1.1cm]{\@logo} - }; - \draw (current page.north west) - +(1cm,-98mm) -- +(1.5cm,-98mm); - % 90 x 45 - % pos: 20mm van kant, 15mm van onderkant - \path (current page.north east) +(-100mm,-65mm) - node[anchor=west,text width=80mm,align=left] { - \scriptsize\textcolor{gray}{\uline{\@returnaddress}}\\* - \normalsize\@to\\* - \@toorganization\\* - \@toaddress - }; - \end{tikzpicture} + \AddToShipoutPicture*{% + \put(0,0){% + \begin{tikzpicture}[inner sep=0pt,outer sep=0pt] + \clip (0,0) rectangle(\paperwidth,\paperheight); + \path (current page.north west) +(1.8cm,-1.2cm) + node[anchor=north west] { + \includegraphics[height=1.1cm]{\@logo} + }; + \if@nofoldline\else + \draw (current page.north west) + +(1cm,-98mm) -- +(1.5cm,-98mm); + \fi + % 90 x 45 + % pos: 20mm van kant, 15mm van onderkant + \path (current page.north east) +(-100mm,-65mm) + node[anchor=west,text width=80mm,align=left] { + \scriptsize\textcolor{gray}{\uline{\@returnaddress}}\\* + \normalsize\@to\\* + \ifx\@toorganization\@empty\else\@toorganization\\*\fi% + \@toaddress + }; + \end{tikzpicture} + } + } ~\\[3ex] \textcolor{uauaside}{\textbf{\@sender}} - \ifx\@senderrole\@emptymacro\\[1.75ex]\else \\*\@senderrole\\[1.75ex]\fi + \ifx\@senderrole\@empty\\[1.75ex]\else \\*\@senderrole\\[1.75ex]\fi \@faculty - \ifx\@unit\@emptymacro\else\\* \@unit\fi~\\[1.75ex] + \ifx\@unit\@empty\else\\* \@unit\fi~\\[1.75ex] \@address\\[1.75ex] - \ifx\@email\@emptymacro\else E \@emailuser\tat{}\@emaildomain\\\fi - \ifx\@phone\@emptymacro\else T \@phone\\\fi - \ifx\@fax\@emptymacro\else F \@fax\\\fi - \ifx\@mobile\@emptymacro\else M \@mobile\\\fi + \ifemails{E~\jointemails{\\\phantom{E~}}\\} + \ifphones{T~\jointphones{\\\phantom{T~}}\\} + \iffaxes{F~\jointfaxes{\\\phantom{F~}}\\} + \ifmobiles{M~\jointmobiles{\\\phantom{M~}}\\} ~\\[4ex] \begin{tikzpicture}[anchor=north west,align=left,outer sep=0,inner sep=0] \path @@ -4666,10 +4764,10 @@ we-nl-ma-wiftw = Master of Science in wiskunde: financiële en toegepaste wiskun \AtEndDocument{ \@closing\\*[3ex]\@signature~\\[3ex] \@sender - \ifx\@senderrole\@emptymacro\\[8ex]\else\\*\@senderrole\\[8ex]\fi + \ifx\@senderrole\@empty\\[8ex]\else\\*\@senderrole\\[8ex]\fi \setlength{\parskip}{0em} - \ifx\@carboncopy\@emptymacro\else CC: \@carboncopy\\[4ex]\fi - \ifx\@enclosed\@emptymacro\else ENCL: \@enclosed\fi + \ifx\@carboncopy\@empty\else CC: \@carboncopy\\[4ex]\fi + \ifx\@enclosed\@empty\else ENCL: \@enclosed\fi \label{lastpage} } %</le> @@ -4703,7 +4801,7 @@ we-nl-ma-wiftw = Master of Science in wiskunde: financiële en toegepaste wiskun \fontfamily{phv}\fontsize{18}{22}\fontseries{b}% \fontshape{n}\selectfont% \@course{} - \ifx\@exampart\@emptymacro + \ifx\@exampart\@empty \else --- \@exampart\fi }; \node diff --git a/macros/latex/contrib/uantwerpendocs/uantwerpendocs.ins b/macros/latex/contrib/uantwerpendocs/uantwerpendocs.ins index 9994e85df2..e60054c17c 100644 --- a/macros/latex/contrib/uantwerpendocs/uantwerpendocs.ins +++ b/macros/latex/contrib/uantwerpendocs/uantwerpendocs.ins @@ -47,7 +47,6 @@ The Current Maintainer of this work is Walter Daems. \generate{\file{uantwerpencoursetext.cls}{\from{uantwerpendocs.dtx}{ct}}} \generate{\file{uantwerpencoursetext-example.tex}{\from{uantwerpendocs.dtx}{ct-example}}} -\generate{\file{uantwerpenmasterthesis.cls}{\from{uantwerpendocs.dtx}{mt}}} \generate{\file{uantwerpenbamathesis.cls}{\from{uantwerpendocs.dtx}{bmt}}} \generate{\file{uantwerpenbamathesis-example.tex}{\from{uantwerpendocs.dtx}{bmt-example}}} diff --git a/macros/latex/contrib/uantwerpendocs/uantwerpendocs.pdf b/macros/latex/contrib/uantwerpendocs/uantwerpendocs.pdf Binary files differindex ad37df0ecc..a94484aa8e 100644 --- a/macros/latex/contrib/uantwerpendocs/uantwerpendocs.pdf +++ b/macros/latex/contrib/uantwerpendocs/uantwerpendocs.pdf diff --git a/macros/latex/contrib/uantwerpendocs/uantwerpenexam-example1.pdf b/macros/latex/contrib/uantwerpendocs/uantwerpenexam-example1.pdf Binary files differindex 0c082ec544..2db05c1171 100644 --- a/macros/latex/contrib/uantwerpendocs/uantwerpenexam-example1.pdf +++ b/macros/latex/contrib/uantwerpendocs/uantwerpenexam-example1.pdf diff --git a/macros/latex/contrib/uantwerpendocs/uantwerpenexam-example2.pdf b/macros/latex/contrib/uantwerpendocs/uantwerpenexam-example2.pdf Binary files differindex ba83514aa1..b06e73f290 100644 --- a/macros/latex/contrib/uantwerpendocs/uantwerpenexam-example2.pdf +++ b/macros/latex/contrib/uantwerpendocs/uantwerpenexam-example2.pdf diff --git a/macros/latex/contrib/uantwerpendocs/uantwerpenletter-example.pdf b/macros/latex/contrib/uantwerpendocs/uantwerpenletter-example.pdf Binary files differindex 0f3b342b4b..38547a42d6 100644 --- a/macros/latex/contrib/uantwerpendocs/uantwerpenletter-example.pdf +++ b/macros/latex/contrib/uantwerpendocs/uantwerpenletter-example.pdf diff --git a/macros/latex/contrib/uantwerpendocs/uantwerpenphdthesis-example1.pdf b/macros/latex/contrib/uantwerpendocs/uantwerpenphdthesis-example1.pdf Binary files differindex 395aca9a58..a1e9b153ad 100644 --- a/macros/latex/contrib/uantwerpendocs/uantwerpenphdthesis-example1.pdf +++ b/macros/latex/contrib/uantwerpendocs/uantwerpenphdthesis-example1.pdf diff --git a/macros/latex/contrib/uantwerpendocs/uantwerpenphdthesis-example2.pdf b/macros/latex/contrib/uantwerpendocs/uantwerpenphdthesis-example2.pdf Binary files differindex dcf054e25c..64a768c4b2 100644 --- a/macros/latex/contrib/uantwerpendocs/uantwerpenphdthesis-example2.pdf +++ b/macros/latex/contrib/uantwerpendocs/uantwerpenphdthesis-example2.pdf diff --git a/macros/latex/contrib/uantwerpendocs/uantwerpenreport-example.pdf b/macros/latex/contrib/uantwerpendocs/uantwerpenreport-example.pdf Binary files differindex e48df6e129..c42d67eff0 100644 --- a/macros/latex/contrib/uantwerpendocs/uantwerpenreport-example.pdf +++ b/macros/latex/contrib/uantwerpendocs/uantwerpenreport-example.pdf |