From e7a321bba289c40f39563c19bbeac355f7c0eeeb Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 23 Feb 2024 03:02:16 +0000 Subject: CTAN sync 202402230302 --- macros/latex/contrib/easybook/easybook.dtx | 38 ++-- macros/latex/contrib/easybook/easybook.pdf | Bin 604534 -> 604286 bytes macros/latex/contrib/easybook/easybook.tex | 18 +- macros/latex/contrib/lwarp/README.txt | 2 +- macros/latex/contrib/lwarp/lwarp.dtx | 230 ++++++++++++++------- macros/latex/contrib/lwarp/lwarp.ins | 1 + macros/latex/contrib/lwarp/lwarp.pdf | Bin 3467122 -> 3471136 bytes macros/latex/contrib/lwarp/lwarpmk.lua | 2 +- .../contrib/pdfmanagement-testphase/CHANGELOG.md | 10 +- .../contrib/pdfmanagement-testphase/README.md | 4 +- .../contrib/pdfmanagement-testphase/color-ltx.sty | 2 +- .../colorspace-patches-tmp-ltx.sty | 2 +- .../pdfmanagement-testphase/hyperref-generic.dtx | 6 +- .../pdfmanagement-testphase/hyperref-generic.pdf | Bin 967468 -> 967216 bytes .../l3backend-testphase.dtx | 16 +- .../l3backend-testphase.pdf | Bin 704238 -> 693802 bytes .../contrib/pdfmanagement-testphase/l3pdfannot.dtx | 6 +- .../contrib/pdfmanagement-testphase/l3pdfannot.pdf | Bin 606135 -> 600974 bytes .../contrib/pdfmanagement-testphase/l3pdfdict.dtx | 6 +- .../contrib/pdfmanagement-testphase/l3pdfdict.pdf | Bin 515546 -> 513895 bytes .../pdfmanagement-testphase/l3pdffield-action.dtx | 4 +- .../pdfmanagement-testphase/l3pdffield-action.pdf | Bin 558914 -> 557427 bytes .../l3pdffield-checkbox.dtx | 4 +- .../l3pdffield-checkbox.pdf | Bin 542009 -> 540930 bytes .../pdfmanagement-testphase/l3pdffield-choice.dtx | 4 +- .../pdfmanagement-testphase/l3pdffield-choice.pdf | Bin 544276 -> 542196 bytes .../l3pdffield-pushbutton.dtx | 4 +- .../l3pdffield-pushbutton.pdf | Bin 537399 -> 536366 bytes .../l3pdffield-radiobutton.dtx | 4 +- .../l3pdffield-radiobutton.pdf | Bin 594480 -> 592919 bytes .../l3pdffield-textfield.dtx | 4 +- .../l3pdffield-textfield.pdf | Bin 516613 -> 515587 bytes .../contrib/pdfmanagement-testphase/l3pdffield.dtx | 6 +- .../contrib/pdfmanagement-testphase/l3pdffield.pdf | Bin 751043 -> 750635 bytes .../contrib/pdfmanagement-testphase/l3pdffile.dtx | 6 +- .../contrib/pdfmanagement-testphase/l3pdffile.pdf | Bin 566778 -> 565531 bytes .../pdfmanagement-testphase/l3pdfmanagement.dtx | 6 +- .../pdfmanagement-testphase/l3pdfmanagement.pdf | Bin 682685 -> 682518 bytes .../contrib/pdfmanagement-testphase/l3pdfmeta.dtx | 34 ++- .../contrib/pdfmanagement-testphase/l3pdfmeta.pdf | Bin 831131 -> 831142 bytes .../contrib/pdfmanagement-testphase/l3pdftools.dtx | 6 +- .../contrib/pdfmanagement-testphase/l3pdftools.pdf | Bin 532070 -> 528830 bytes .../contrib/pdfmanagement-testphase/l3pdfxform.dtx | 6 +- .../contrib/pdfmanagement-testphase/l3pdfxform.pdf | Bin 427137 -> 426918 bytes .../contrib/pdfmanagement-testphase/ltdocinit.dtx | 6 +- .../contrib/pdfmanagement-testphase/ltdocinit.pdf | Bin 587463 -> 586583 bytes .../pdfmanagement-firstaid.dtx | 6 +- .../pdfmanagement-firstaid.pdf | Bin 448729 -> 448398 bytes .../pdfmanagement-testphase.dtx | 11 +- .../pdfmanagement-testphase.pdf | Bin 463665 -> 463315 bytes .../xcolor-patches-tmp-ltx.sty | 2 +- macros/latex/contrib/projlib/ProjLib.dtx | 120 ++++++++--- macros/latex/contrib/projlib/README.md | 4 +- macros/latex/contrib/se2thesis/CHANGELOG.md | 23 +++ macros/latex/contrib/se2thesis/se2colors.dtx | 2 +- macros/latex/contrib/se2thesis/se2fonts.dtx | 4 +- macros/latex/contrib/se2thesis/se2packages.dtx | 116 ++++++++++- .../se2thesis/se2thesis-master-thesis-example.pdf | Bin 1101796 -> 231038 bytes .../se2thesis/se2thesis-master-thesis-example.tex | 8 +- macros/latex/contrib/se2thesis/se2thesis.dtx | 54 +++-- macros/latex/contrib/se2thesis/se2thesis.pdf | Bin 328749 -> 350567 bytes macros/latex/contrib/se2thesis/test.pdf | Bin 1102663 -> 0 bytes macros/latex/contrib/se2thesis/test.tex | 107 ---------- 63 files changed, 556 insertions(+), 338 deletions(-) delete mode 100644 macros/latex/contrib/se2thesis/test.pdf delete mode 100644 macros/latex/contrib/se2thesis/test.tex (limited to 'macros/latex') diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index 1128cde18f..53c4131509 100644 --- a/macros/latex/contrib/easybook/easybook.dtx +++ b/macros/latex/contrib/easybook/easybook.dtx @@ -15,11 +15,11 @@ %<*class> \NeedsTeXFormat{LaTeX2e}[2021/11/15] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2024/02/21}{2024ai} +\ProvidesExplClass{easybook}{2024/02/22}{2024ak} {Easily typesetting Chinese theses or books} -\bool_set_false:N \l__eb_compile_draft_bool -\bool_set_false:N \l__eb_title_newline_bool +\bool_new:N \l__eb_compile_draft_bool +\bool_new:N \l__eb_title_newline_bool \bool_set_true:N \l__eb_class_mode_book_bool \clist_new:N \g__eb_doc_options_clist \cs_new_protected:Npn \eb_put_ctexbook:n #1 @@ -297,7 +297,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2021/11/15] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2024/02/21}{2024ai} +\ProvidesExplPackage{easybase}{2024/02/22}{2024ak} {Easily typesetting Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -506,10 +506,10 @@ Please~update~your~macro~package~from~CTAN. } -\NewDocumentCommand{\eb_assign_tag_brackets:n} +\NewDocumentCommand{\eb_assign_tagform:n} {>{\SplitArgument{1}{,}}m} - {\eb_assign_tag_brackets_pos:nn #1} -\cs_new_protected:Npn \eb_assign_tag_brackets_pos:nn #1#2 + {\eb_assign_tagform_pos:nn #1} +\cs_new_protected:Npn \eb_assign_tagform_pos:nn #1#2 { \tl_set:Nn \eb@tag@brackets@left {#1} \tl_set:Nn \eb@tag@brackets@right {#2} @@ -519,11 +519,10 @@ \maketag@@@ { \color{ctex@emph} - \eb@tag@brackets@left - { - \ignorespaces{#1}\unskip\@@italiccorr - \eb@tag@brackets@right - } + \ignorespaces + \eb@tag@brackets@left{#1} + \unskip\@@italiccorr + \eb@tag@brackets@right } } \ctex_define:nn { style } @@ -536,8 +535,9 @@ uppercase .tl_set:N = \l__eb_mark_uppercase_value_tl, uppercase .default:n = all, uppercase .initial:n = all, - brackets .code:n = \eb_assign_tag_brackets:n {#1}, - brackets .initial:n = { (,) }, + tagform .code:n = \eb_assign_tagform:n {#1}, + tagform .initial:n = { (,) }, + brackets .meta:n = { tagform = {#1} }, figurepath .tl_set:N = \l_eb_graphics_path_tl } @@ -1331,7 +1331,7 @@ \cs_new_protected:Npn \SetTocOuter #1 { \keys_set:nn { eb/tocouter } {#1} } \tl_new:N \eb@bitoc@title -\bool_set_false:N \l__eb_toc_notitle_bool +\bool_new:N \l__eb_toc_notitle_bool \newbool{bitoc} \cs_new:Npn \ebifbitoc { \ifbool{bitoc} } \keys_define:nn { eb/tocouter } @@ -2260,15 +2260,17 @@ color-every .code:n = \eb_define_theme_color:n { \exp_not:n {#1} } } -\bool_set_false:N \l__eb_toc_number_color_bool +\bool_new:N \l__eb_toc_number_color_bool \cs_new_protected:Npn \eb_link_border_set:n #1 { - \AtBeginDocument + \bool_set_false:N \l__eb_toc_number_color_bool + \ctex_at_end_package:nn { hyperref } { \def\@pdfborder{#1} \def\Hy@colorlink ##1 {\begingroup} \def\Hy@endcolorlink{\endgroup} } + \eb_put_hyperref:n { colorlinks = false } } \cs_new_protected:Npn \eb_link_colors_set: { @@ -2388,7 +2390,7 @@ } % %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2024/02/21}{2024ai} +\ProvidesExplFile{eb-tcolorbox.cfg}{2024/02/22}{2024ak} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf index 9d8f968127..cd5db495df 100644 Binary files a/macros/latex/contrib/easybook/easybook.pdf and b/macros/latex/contrib/easybook/easybook.pdf differ diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex index 122dffdbf4..f962190767 100644 --- a/macros/latex/contrib/easybook/easybook.tex +++ b/macros/latex/contrib/easybook/easybook.tex @@ -23,8 +23,8 @@ name = easybook, color-scheme = blue, title = EASYBOOK使用手册, - version = v2024ai, - date = 2024/02/21, + version = v2024ak, + date = 2024/02/22, authors = 瞿毅, info = 简便地排版中文学位论文或书籍, email = toquyi@163.com, @@ -388,11 +388,11 @@ 设置脚注跟随编号的计数器,仅在导言区有效。默认跟随章计数器,即开启新的章标题时脚注编号从1开始。 \keychoice{uppercase}{\fbox{all},first,none,none*} 使用 \cs{rightmark} 和 \cs{leftmark} 等标题标记命令获取标题内容用于页眉页脚时其中英文的大小写类型。\code{all} 为标题标记中的英文字母全部大写。\code{first} 为标记以英文起始时仅第一个字母大写。\code{none} 不改变标记中英文字母的大小写形式,变体 \code{none*} 则强制标记的字母均为小写形式。 - \kvsplit{brackets}{左括号,右括号}\Default{\Marg{(,)}} - 设置行间公式编号标签的括号及格式,以英文逗号分隔,分别代表左右括号。\meta{左括号} 可以是带有一个参数的命令,用于接受编号和 \meta{右括号}。将标签括号设置为方括号,并使用无衬线字体: + \kvsplit{tagform}{左括号,右括号}\Default{\Marg{(,)}}\newtag[Chg]% + 设置行间公式标签的括号及格式,以英文逗号分隔,分别代表左右括号。\meta{左括号} 的末尾可以是带有一个参数的命令,用于接受公式编号。将标签括号设置为方括号,并给编号使用无衬线字体: \begin{ctexexam} - \newcommand{\bracketsf}[1]{\textsf{[#1}} - \ebstyle{brackets = {\bracketsf,]}} + \newcommand{\bracketsf}[1]{[\textsf{#1}} + \ebstyle{tagform = {\bracketsf,]}} \end{ctexexam} \kvsplit-{figurepath}{\marg{路径名1}\marg{路径名2}$\cdots$\marg{路径名n}} 设置插入图片的文件夹路径名。可以有多个路径名,每个路径包含在花括号内分隔,只有一个路径时需要包含在两层括号内。 @@ -709,7 +709,7 @@ \end{commands} \subsection[脚注格式]{脚注格式\smodule{hdrset}} -模块 \module*{hdrset} 还可以灵活调整脚注编号和内容的格式。格式主要包括脚注标记的编号类型、字体、附加符号和对齐方式等,以及脚注内容的首行缩进、行距和字体等。基本思想是默认脚注和自定义编号脚注标记的格式分离,两种类型脚注各自正文和内容的标记又共享格式,默认脚注中正文和内容标记的编号类型分离。目前脚注模块基本兼容 \pkg*{footmisc} 宏包。 +模块 \module*{hdrset} 还可以灵活调整脚注编号和内容的格式。格式主要包括脚注标记的编号类型、字体、附加符号和对齐方式等,以及脚注内容的首行缩进、行距和字体等。基本思想是提供常规和自定义标记(\code{fncustom})两种脚注,常规脚注的标记分为正文(\code{fnmark})和内容(\code{fntext})标记两种,且两者编号类型分离,自定义脚注的标记与其共享格式。目前脚注模块基本兼容 \pkg*{footmisc} 宏包。 \begin{options} \keychoice{footnotetype}{plain,\fbox{hang},flush,bottom} 脚注的类型。悬挂缩进 \code{hang} 是默认值,\code{plain} 是原始的类型,\code{flush} 使脚注内容标记位于脚注首行边缘外侧并右对齐。当存在浮动环境排版时,脚注可能位于页面中间,\code{bottom} 使脚注始终位于页面底端。其中 \code{bottom} 是复合选项,可以与前三种类型重复或复合使用: @@ -782,7 +782,7 @@ \command{theupfootnote} 保存正文标记编号类型选项 \option{fnmark-num} 指定的正文标记。 \command{thedownfootnote} - 保存内容标记编号类型选项 \option{fnmtext-num} 指定的内容标记。 + 保存内容标记编号类型选项 \option{fntext-num} 指定的内容标记。 \end{commands} \begin{ctexexam} \defupfntmark{\super[vmove = 2pt]{\theupfootnote}} @@ -1401,7 +1401,7 @@ \shortversion{v = 1.638,date = 2022/03/04,changes = 增加目录条目样式选项注册命令 \cs{RegisterTocName}。} \shortversion{v = 1.644,date = 2022/03/10,changes = 增加浮动环境目录声明命令 \cs{DeclareFloatList} 配合 \pkg*{caption} 宏包。} \shortversion{v = 1.682,date = 2022/05/01,changes = 将迷你页判断命令 \cs{notminipage} 改为被保护命令兼容 \pkg*{circledtext} 宏包。} - \begin{version}[v = 2024ai,date = 2024/02/21] + \begin{version}[v = 2024ak,date = 2024/02/22] \fixed \item 修复图表等浮动环境题注目录中条目标签编号的计数器值显示错误问题。 \item 修复附录命令 \cs{appendix} 的可选参数设置英文目录中条目名字和编号失效的问题。 diff --git a/macros/latex/contrib/lwarp/README.txt b/macros/latex/contrib/lwarp/README.txt index af35531af5..fa58f28c44 100644 --- a/macros/latex/contrib/lwarp/README.txt +++ b/macros/latex/contrib/lwarp/README.txt @@ -1,5 +1,5 @@ -LaTeX lwarp package v0.915 README.txt +LaTeX lwarp package v0.916 README.txt Files included are: diff --git a/macros/latex/contrib/lwarp/lwarp.dtx b/macros/latex/contrib/lwarp/lwarp.dtx index e2d6406106..4ada1553a4 100644 --- a/macros/latex/contrib/lwarp/lwarp.dtx +++ b/macros/latex/contrib/lwarp/lwarp.dtx @@ -16,7 +16,7 @@ % \iffalse %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesPackage{lwarp} -% [2024/02/05 v0.915 Allows LaTeX to directly produce HTML5 output.] +% [2024/02/22 v0.916 Allows LaTeX to directly produce HTML5 output.] % %<*driver> \documentclass{ltxdoc} @@ -1629,16 +1629,18 @@ or ``\texttt{\{0x5C\}}'' for a backslash. \newcommand*{\limitsmathinsectionnames}{ If using named \HTML\ files, -in section names use paren math \texttt{\textbackslash(x+y\textbackslash)} +in section names use parentheses math \texttt{\textbackslash(x+y\textbackslash)} \trouble[math in section names]{filename>math in} \trouble{sectioning>math in name} \trouble{math>section name} \trouble{math>file name} instead of dollar math \texttt{\$x+y\$}. -(Dollar math works, but appears in the filename.) +Parentheses math is removed from the file name. +(Dollar math works, but it generates complicated filenames.) Or, use a short name for the \TOC\ entry without the math, or use \cs{texorpdfstring} from the \pkg{hyperref} package: \begin{sourcedisplay} +\cs{section}[Simplified name]\{Name with \cs{(}1+2=3\cs{)} math\} \\ \cs{section}\{Some math \cs{texorpdfstring}\{\$1+2=3\$\}\{three\}\} \end{sourcedisplay} } @@ -3431,6 +3433,7 @@ This boolean may be tested by the user for later use. % \changes{v0.913}{2024/01/05}{\ 2024/01/05} % \changes{v0.914}{2024/01/11}{\ 2024/01/11} % \changes{v0.915}{2024/02/05}{\ 2024/02/05} +% \changes{v0.916}{2024/02/22}{\ 2024/02/22} @@ -3668,6 +3671,14 @@ This boolean may be tested by the user for later use. % see the end of the Change History on page \pageref{sec:changesend}. % % \begin{description} +% \item[v0.916:] Now allows duplicate section names for file breaks. +% \begin{itemize} +% \item Adjusts file names to allow duplicate section names. +% See \cref{sec:limitssectionnamesduplicates}. +% \item Fixed \LaTeX3 key/value option handling. +% \item Fixed \cs{} at end of a line. +% \end{itemize} +% \needspace{2\baselineskip} % \item[v0.915:] \HTML\ list classes, meta tags. % \begin{itemize} % \item \LaTeX\ lists now given the class \attribute{itemize}, @@ -7928,7 +7939,7 @@ This boolean may be tested by the user for later use. % The \pkg{lwarp} option \optn{pdftotextEnc} may be useful in some situations. % See \cref{sec:loading}. % -% While using \DVI\ \prog{latex} or \PDF\ \prog{pdflatex}, +% While using older versions of \DVI\ \prog{latex} or \PDF\ \prog{pdflatex}, % \margintag{vector fonts} % if no font-related package is specified then the default % \brand{Computer Modern} font is used, @@ -7952,14 +7963,28 @@ This boolean may be tested by the user for later use. % % \DescribePackage{dejavu} % Another useful option is the Deja Vu series of fonts, which have -% an increased coverage of language and glyphs: -% \begin{sourcedisplay} -% |\usepackage{dejavu}| -% \end{sourcedisplay} % \gindex{Deja Vu}% % \gindex{font>Deja Vu}% % \gindex{Unicode>enhanced coverage}% % \gindex{UTF-8>enhanced coverage}% +% an increased coverage of language and glyphs: +% \begin{sourcedisplay} +% |\usepackage{dejavu}| +% \end{sourcedisplay} +% +% +% To avoid ``Missing character'' warnings and empty or missing +% \trouble[Missing characters]{missing characters} +% \trouble{characters>missing} +% \trouble{font>missing characters} +% \trouble{Unicode>missing characters} +% characters in \HTML\ and math output, +% if using a font with an enhanced set of characters +% also specify a monospace font with similar coverage. +% \pkg{lwarp} uses the mono font for \HTML\ and math output. +% Many font packages provide a monospace font automatically. +% \changes{v0.916}{2024/02/18}{Docs: Missing characters} +% % % While using \DVI\ \prog{latex} or \PDF\ \prog{pdflatex}, % \margintag{\prog{latex}, \prog{pdflatex}, T1, UTF8} @@ -9596,20 +9621,7 @@ This boolean may be tested by the user for later use. % Use a trailing backslash: |\item[label] \| % \margintag{lists} % \trouble{list>empty item} -% -% -% \subsubsection{Filenames and \URL{}s in lists or footnotes} -% -% \gindex{underscore>filename}\gindex{filename>underscore in} -% \gindex{list>filename} -% \changes{v0.24}{2017/03/13}{Docs: Filename underscore.} -% Escape underscores in -% \margintag{filename underscore} -% the filenames: -% \begin{sourcedisplay} -% |\item[\href{file\_name.pdf}{text}]| -% \end{sourcedisplay} -% +%% % % \subsubsection{\pkg{relsize} package} % @@ -9781,7 +9793,26 @@ This boolean may be tested by the user for later use. % \label{sec:limitssectionnames} % % If using named \HTML\ files, by selecting |\booltrue{FileSectionNames}|, -% the generated filenames may be simplified by using \cs{FilenameSimplify} +% several steps should be taken to avoid problematic file names. +% +% \subsubsection{Formatting in section names} +% +% When using special formatting in the section name, +% \trouble[macros in section names]{sectioning>macro in name} +% use the optional short form: +% \begin{sourceverb} +% \section[Simplified name]{Fancy name with formatting} +% \end{sourceverb} +% Remember to \cs{protect} \LaTeX\ commands which appear in +% section names and \TOC\ captions. +% +% \subsubsection{Math in section names} +% +% \limitsmathinsectionnames +% +% \subsubsection{Simplifying file names} +% +% The generated filenames may be simplified by using \cs{FilenameSimplify} % and \cs{FilenameNullify}: % % \DescribeMacro{\FilenameSimplify} \marg{text} @@ -9808,7 +9839,6 @@ This boolean may be tested by the user for later use. % \DescribeMacro{\FilenameNullify} \marg{macros} % % Macro names may appear in the automatically-generated file names. -% \trouble[macros in section names]{sectioning>macro in name} % \trouble{filename>corrupted} % \trouble{filename>macro in name} % To remove these, create \emph{non-robust} nullified versions @@ -9828,18 +9858,28 @@ This boolean may be tested by the user for later use. % \} % \end{sourcedisplay} % -% Avoid duplicate file names. +% \subsubsection{Preventing duplicate file names} +% \label{sec:limitssectionnamesduplicates} +% +% Section names at levels which result in \HTML\ file splits may % \trouble[duplicate filename]{filename>duplicate} % \trouble{duplcate filename} % \trouble{sectioning>duplicate name} -% Section names at levels which result in \HTML\ file splits must -% be unique. \pkg{lwarp} will generate an error if a duplicate -% \HTML\ filename is generated. -% Use the optional \TOC\ caption entry parameter for formatting. -% Remember to \cs{protect} \LaTeX\ commands which appear in -% section names and \TOC\ captions. -% -% \limitsmathinsectionnames +% be duplcates, but the resulting file names must be unique. +% \pkg{lwarp} will generate a warning if a duplicate section name occurs, +% then \pkg{lwarp} will append a unique file number to the resulting file name, +% thus avoiding file name clashes. +% These unique file numbers may change as sections are added or removed. +% As a result, old and orphaned HTML files may be left behind. +% To remove these leftover files, use \cmds{lwarpmk cleanall} and recompile. +% Also, as file names are adjusted, external links from outside to these +% files may be broken. +% To use fixed file names, use the optional short-form name, +% or use \cs{texorpdfstring} from \pkg{hyperref}: +% \begin{sourceverb} +% \section[Unique Name]{Duplicate name} +% \section{\texorpdfstring{Duplcate Name}{Unique Name}} +% \end{sourceverb} % % % \subsection{Cross-references} @@ -12233,9 +12273,9 @@ This boolean may be tested by the user for later use. % makeindex -s gglo.ist -o lwarp.gls lwarp.glo \hfill \textgreen{} \\ % splitindex lwarp.idx -- -s gind.ist \hfill \textgreen{} \\ % pdflatex lwarp.dtx \\ -% pdflatex lwarp.dtx \hfill \textgreen{} +% pdflatex lwarp.dtx \hfill \textgreen{} \\ % \end{sourcedisplay} -% (The second round of index processing is required to fully resolve the +% (The multiple rounds of index processing are required to fully resolve the % final Index of Indexes.) % % To make it easier to update the documentation after a minor change, @@ -12544,9 +12584,10 @@ This boolean may be tested by the user for later use. % \item[Filenames:] \pkg{lwarp} may generate file names from section names. % While doing so, the filenames are simplified, and special characters % and math are removed. -% If this process generates a duplicate filename, and error is generated, -% describing the filename and which section name generated it. -% A warning is issued if dollar-delimited math is used. +% If this process generates a duplicate filename, and warning is generated, +% describing the filename and which section name generated it, +% and a unique file number is appended to the file name. +% A warning is also issued if dollar-delimited math is used. % Parenthesis-delimited math is recommended instead. % \item[Multirow:] When \cs{multirow} or \cs{multicolrow} are used, % \trouble[\HTML\ corrupted]{HTML>corrupted} @@ -16724,9 +16765,26 @@ This boolean may be tested by the user for later use. % \begin{macrocode} \IfValueTF{#1}% {% options given +% \end{macrocode} +% +% The \LaTeX3 key/value handler does not appear to expand the option +% argument, so it is pre-expanded here. +% This was a problem for \pkg{mathspec}, which passed options +% to \pkg{fontspec}. +% \changes{v0.916}{2024/02/17}{Fix for \LaTeX3 key/val option handling.} +% \begin{macrocode} + \edef\LWR@packageoptions{#1}% \IfValueTF{#3}% version given? - {\LWR@origRequirePackage[#1]{\LWR@parsedrequirepackagenames}[#3]}% - {\LWR@origRequirePackage[#1]{\LWR@parsedrequirepackagenames}}% + {% + \expandafter\LWR@origRequirePackage% + \expandafter[\LWR@packageoptions]% + {\LWR@parsedrequirepackagenames}[#3]% + }% + {% + \expandafter\LWR@origRequirePackage% + \expandafter[\LWR@packageoptions]% + {\LWR@parsedrequirepackagenames}% + }% }% {% no options given \IfValueTF{#3}% version given? @@ -21299,7 +21357,7 @@ MathJax = { -- Copyright 2016-2024 Brian Dunn -printversion = "v0.915" +printversion = "v0.916" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -26258,9 +26316,20 @@ end -- not --version % \end{macrocode} +% \begin{macro}{\LWR@eolspace} The end of line character +% generated by detokenizing \cs{} when at the end of a line. +% \changes{v0.916}{2024/02/17}{Fixed trailing \cs{\textless{}space\textgreater}.} +% \begin{macrocode} +\expandafter\def\expandafter\LWR@eolspace\expandafter{\detokenize{\ +}}% there is a trailing space in the previous line +% \end{macrocode} +% \end{macro} + + % \begin{macro}{\LWR@HTMLsanitize@tmpb} Sanitizes \HTML\ for \cs{tmpb}. % These characters may be interpreted by the browser. % \changes{v0.913}{2023/10/01}{Added.} +% \changes{v0.916}{2024/02/17}{Fixed trailing \cs{\textless{}space\textgreater}.} % \begin{macrocode} \catcode`\&=12 \newcommand*{\LWR@HTMLsanitize@tmpb}{% @@ -26269,8 +26338,15 @@ end -- not --version % \end{macrocode} % % \HTML\ entities: +% +% At the end of a line, \cs{} is turned in to an end of line character, +% which is now converted to a regular \cs{}. % \begin{macrocode} - \LWR@replacestrings{&}{&}% must be first because & is used for lt, gt, etc. + \expandafter\LWR@replacestrings\expandafter{\LWR@eolspace}{\ }% +% \end{macrocode} +% |&| must be first because |&| is used for |lt|, |gt|, etc. +% \begin{macrocode} + \LWR@replacestrings{&}{&}% Must be before the following: \LWR@replacestrings{<}{<}% \LWR@replacestrings{>}{>}% \LWR@replacestrings{'}{'}% @@ -26856,6 +26932,7 @@ end -- not --version \LWR@traceinfo{LWR@newhtmlfile: about to LWR@orignewpage} \LWR@maybe@orignewpage % \end{macrocode} +% % \changes{v0.84}{2020/04/24}{Added prev/next links.} % \begin{macrocode} \addtocounter{LWR@htmlfilenumber}{1}% @@ -26885,34 +26962,46 @@ end -- not --version \edef\LWR@hashedname{\LWR@mdfive{\LWR@thisfilename}}% % \end{macrocode} % If the macro name is not yet defined, this filename is unique. -% \begin{macrocode} - \ifcsundef{LWR@filename\LWR@hashedname}{% -% \end{macrocode} -% If the filename is unique, create a macro using the hashed name, +% If the filename is unique, create an empty macro using the hashed name, % to be used to test for additional duplicates in the future. +% The first time a duplicate is found, a warning is issued and this +% macro then contains a |1|. +% For further duplicates of the same name, no additional warning is issed. % \begin{macrocode} + \ifcsundef{LWR@filename\LWR@hashedname}{% \csdef{LWR@filename\LWR@hashedname}{}% }{% % \end{macrocode} -% If the filename is not unique, create an error. +% If the filename is not unique, create a warning if the first duplicate, +% and modify the filename by appending a unique file number. +% \changes{v0.916}{2024/02/08}{Warn if duplicate section names.} +% \changes{v0.916}{2024/02/08}{Append unique file number if duplicate sections.} % \begin{macrocode} - \PackageError{lwarp}% - {% - The section name:\MessageBreak - ``#1'',\MessageBreak - at the line number listed below,\MessageBreak - generates the filename\MessageBreak - ``\LWR@thisfilename'',\MessageBreak - which appears to be a duplicate. There is a\MessageBreak - previous section with an identical or similar name.\MessageBreak - While generating file names, Lwarp sanitizes math,\MessageBreak - most symbols, and a few common short words,\MessageBreak - and this may cause a conflict.\MessageBreak - Enter 'H' for possible solutions% - }% - {% - \LWR@avoiddupfilenames% - }% + \ifcsempty{LWR@filename\LWR@hashedname}% + {% first instance + \PackageWarning{lwarp} + {% + The section name:\MessageBreak + ``#1'',\MessageBreak + at the line number listed below,\MessageBreak + generates the filename\MessageBreak + ``\LWR@thisfilename'',\MessageBreak + which appears to be a duplicate. There is a\MessageBreak + previous section with an identical or similar name.\MessageBreak + A unique file number has been appended to the file name\MessageBreak + of this and any further similar files.\MessageBreak + This number may change as sections are added/removed,\MessageBreak + and obsolete HTML files may result.\MessageBreak + To remove these files, use lwarpmk cleanall.\MessageBreak + (While generating file names, Lwarp sanitizes math,\MessageBreak + most symbols, and a few common short words,\MessageBreak + and this may cause a conflict.)\MessageBreak + \LWR@avoiddupfilenames% + }% + \csdef{LWR@filename\LWR@hashedname}{1}% + }% first instance + {}% repeated instances + \edef\LWR@thisfilename{\LWR@thisfilename-\arabic{LWR@htmlseqfilenumber}}% }% }% % \end{macrocode} @@ -37002,6 +37091,7 @@ end -- not --version \begin{warpHTML} % \end{macrocode} + % \begin{macro}{\LWR@sidetoc} % Creates the actual side-TOC. % \begin{macrocode} @@ -37016,7 +37106,6 @@ end -- not --version \LWR@htmlelementclass{nav}{sidetoc} \setcounter{tocdepth}{\value{SideTOCDepth}} - % \end{macrocode} % The title is placed into a \element{div} of class \attribute{sidetoctitle}, and may % contain paragraphs. @@ -37075,15 +37164,17 @@ end -- not --version % The |autopage| label is always created just after the section opens. % % \begin{description} -% \item[\#1] is depth -% \item[\#2] is |section|, |subsection|, etc. -% \item[\#3] the text of the caption -% \item[\#4] page number +% \item[\#1:] Depth. +% \item[\#2:] |section|, |subsection|, etc. +% \item[\#3:] The text of the caption. +% \item[\#4:] Page number, which for \HTML\ is the \ctr{LWR@currentautosecpage} +% when the section was created. % \end{description} % \begin{macrocode} \NewDocumentCommand{\hypertoc}{m m +m m}{% \LWR@traceinfo{hypertoc !#1!#2!#3!#4!}% % \end{macrocode} +% % Respond to |tocdepth|: % \begin{macrocode} \ifnumcomp{#1}{>}{\value{tocdepth}}% @@ -55026,6 +55117,7 @@ name = \chemmacros_translate:n {scheme-name} % % \changes{v0.913}{2023/11/23}{\pkg{doipubmed}: Added.} % \changes{v0.914}{2024/01/11}{\pkg{doipubmed}: Added missing \filenm{sty} file.} +% \changes{v0.916}{2024/02/17}{\pkg{doipubmed}: Added missing \filenm{sty} file.} % % \codehtml % diff --git a/macros/latex/contrib/lwarp/lwarp.ins b/macros/latex/contrib/lwarp/lwarp.ins index d920b43d4c..0993b94bc9 100644 --- a/macros/latex/contrib/lwarp/lwarp.ins +++ b/macros/latex/contrib/lwarp/lwarp.ins @@ -146,6 +146,7 @@ version 2005/12/01 or later. \file{lwarp-diagbox.sty}{\from{lwarp.dtx}{diagbox}} \file{lwarp-dingbat.sty}{\from{lwarp.dtx}{dingbat}} \file{lwarp-DotArrow.sty}{\from{lwarp.dtx}{DotArrow}} +\file{lwarp-doipubmed.sty}{\from{lwarp.dtx}{doipubmed}} \file{lwarp-dotlessi.sty}{\from{lwarp.dtx}{dotlessi}} \file{lwarp-dprogress.sty}{\from{lwarp.dtx}{dprogress}} \file{lwarp-draftcopy.sty}{\from{lwarp.dtx}{draftcopy}} diff --git a/macros/latex/contrib/lwarp/lwarp.pdf b/macros/latex/contrib/lwarp/lwarp.pdf index 6e1bff2fdc..16f3d623e1 100644 Binary files a/macros/latex/contrib/lwarp/lwarp.pdf and b/macros/latex/contrib/lwarp/lwarp.pdf differ diff --git a/macros/latex/contrib/lwarp/lwarpmk.lua b/macros/latex/contrib/lwarp/lwarpmk.lua index f6b1589850..34716147c5 100755 --- a/macros/latex/contrib/lwarp/lwarpmk.lua +++ b/macros/latex/contrib/lwarp/lwarpmk.lua @@ -2,7 +2,7 @@ -- Copyright 2016-2024 Brian Dunn -printversion = "v0.915" +printversion = "v0.916" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () diff --git a/macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md b/macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md index 9076adab08..44ce7a8c55 100644 --- a/macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md +++ b/macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md @@ -5,7 +5,15 @@ first release 0.95a, 2021-02-23 will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), this project uses date-based 'snapshot' version identifiers. -## [2023-11-17] +## [2024-02-22] + +### Changed + - date of UA-2 is now 2024 + - tagpdf-base is now required + - xmp metadata use x-default for the main language for better compability with some viewers + - suppress info dictionary with pdf/ua-2 + +## [2023-12-09] Version: 2023-12-09, 0.96d ### Removed diff --git a/macros/latex/contrib/pdfmanagement-testphase/README.md b/macros/latex/contrib/pdfmanagement-testphase/README.md index e0b527353f..19c948dc5e 100644 --- a/macros/latex/contrib/pdfmanagement-testphase/README.md +++ b/macros/latex/contrib/pdfmanagement-testphase/README.md @@ -1,6 +1,6 @@ # LaTeX PDF management testphase bundle -Version: 0.96d, 2023-12-09 +Version: 0.96e, 2024-02-22 This package is used during a test phase to load the new PDF management code of LaTeX. @@ -31,7 +31,7 @@ For manual installation: unpack by compiling the .ins, then move all ## Copyright (C) -* 2021-2023 The LaTeX Project +* 2021-2024 The LaTeX Project ## License LaTeX Project Public License, version 1.3c or later. diff --git a/macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty b/macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty index fb44b9e726..51437e01b0 100644 --- a/macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty +++ b/macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty @@ -24,7 +24,7 @@ %% This file has the LPPL maintenance status "maintained". %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{color-ltx}[2023-12-09 v0.96d +\ProvidesPackage{color-ltx}[2024-02-22 v0.96e Standard LaTeX Color (patched for l3color, part of pdfmanagement-testphase, original version 2022/01/06 v1.3d) (DPC)] \edef\Gin@codes{% \catcode`\noexpand\^^A\the\catcode`\^^A\relax diff --git a/macros/latex/contrib/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty b/macros/latex/contrib/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty index 21609d988b..a18d10afd0 100644 --- a/macros/latex/contrib/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty +++ b/macros/latex/contrib/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty @@ -19,7 +19,7 @@ % % for those people who are interested. \NeedsTeXFormat{LaTeX2e}[2020/10/01] -\ProvidesExplPackage{colorspace-patches-tmp-ltx}{2023-12-09}{0.96d} +\ProvidesExplPackage{colorspace-patches-tmp-ltx}{2024-02-22}{0.96e} {temporay patches to for the colorspace package to test pdfresource management ... UF} % colorspace can define more models, that l3color can't yet handle. diff --git a/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx b/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx index 03b931f11d..95b10a0f43 100644 --- a/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx +++ b/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx @@ -2,7 +2,7 @@ % %% File: hyperref-generic.dtx % -% Copyright (C) 2021-2023 The LaTeX Project +% Copyright (C) 2021-2024 The LaTeX Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -82,7 +82,7 @@ % }^^A % } % -% \date{Version 0.96d, released 2023-12-09} +% \date{Version 0.96e, released 2024-02-22} % % \maketitle % \begin{documentation} @@ -964,7 +964,7 @@ %<@@=hyp> % \end{macrocode} % \begin{macrocode} -\ProvidesFile{hgeneric-testphase.def}[2023-12-09 v0.96d % +\ProvidesFile{hgeneric-testphase.def}[2024-02-22 v0.96e % generic Hyperref driver for the LaTeX PDF management testphase bundle] \RequirePackage{etoolbox} %why? diff --git a/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdf b/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdf index f5d853b7e4..0450754ced 100644 Binary files a/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdf and b/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdf differ diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx index 03e50367f2..0ec194a94e 100644 --- a/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx +++ b/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx @@ -2,7 +2,7 @@ % %% File: l3backend-testphase.dtx % -% Copyright (C) 2019-2023 The LaTeX Project +% Copyright (C) 2019-2024 The LaTeX Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -45,7 +45,7 @@ % }^^A % } % -% \date{Version 0.96d, released 2023-12-09} +% \date{Version 0.96e, released 2024-02-22} % % \maketitle % @@ -56,27 +56,27 @@ % \begin{macrocode} %\ProvidesExplFile %<*dvipdfmx> - {l3backend-testphase-dvipdfmx.def}{2023-12-09}{} + {l3backend-testphase-dvipdfmx.def}{2024-02-22}{} {LaTeX~PDF~management~testphase~bundle~backend~support: dvipdfmx} % %<*dvips> - {l3backend-testphase-dvips.def}{2023-12-09}{} + {l3backend-testphase-dvips.def}{2024-02-22}{} {LaTeX~PDF~management~testphase~bundle~backend~support: dvips} % %<*dvisvgm> - {l3backend-testphase-dvisvgm.def}{2023-12-09}{} + {l3backend-testphase-dvisvgm.def}{2024-02-22}{} {LaTeX~PDF~management~testphase~bundle~backend~support: dvisvgm} % %<*luatex> - {l3backend-testphase-luatex.def}{2023-12-09}{} + {l3backend-testphase-luatex.def}{2024-02-22}{} {LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (LuaTeX)} % %<*pdftex> - {l3backend-testphase-pdftex.def}{2023-12-09}{} + {l3backend-testphase-pdftex.def}{2024-02-22}{} {LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (pdfTeX)} % %<*xdvipdfmx> - {l3backend-testphase-xetex.def}{2023-12-09}{} + {l3backend-testphase-xetex.def}{2024-02-22}{} {LaTeX~PDF~management~testphase~bundle~backend~support: XeTeX} % % \end{macrocode} diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdf index da62220855..d63b4b9e56 100644 Binary files a/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdf and b/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdf differ diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx index dfb1f12e75..51eb9a656e 100644 --- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx +++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx @@ -2,7 +2,7 @@ % %% File: l3pdfannot.dtx % -% Copyright (C) 2021-2023 The LaTeX Project +% Copyright (C) 2021-2024 The LaTeX Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -48,7 +48,7 @@ % }^^A % } % -% \date{Version 0.96d, released 2023-12-09} +% \date{Version 0.96e, released 2024-02-22} % % \maketitle % \begin{documentation} @@ -432,7 +432,7 @@ % \begin{macrocode} %<@@=pdfannot> %<*header> -\ProvidesExplPackage{l3pdfannot}{2023-12-09}{0.96d} +\ProvidesExplPackage{l3pdfannot}{2024-02-22}{0.96e} {PDF-annotations} \RequirePackage{l3pdfdict} % diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdf index a3b40dbcd2..3a49e6be75 100644 Binary files a/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdf and b/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdf differ diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx index d1007322fa..c7cb24371d 100644 --- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx +++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx @@ -2,7 +2,7 @@ % %% File: l3pdfdict.dtx % -% Copyright (C) 2018-2023 The LaTeX Project +% Copyright (C) 2018-2024 The LaTeX Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -49,7 +49,7 @@ % }^^A % } % -% \date{Version 0.96d, released 2023-12-09} +% \date{Version 0.96e, released 2024-02-22} % % \maketitle % \begin{documentation} @@ -208,7 +208,7 @@ % \begin{macrocode} %<@@=pdfdict> %<*header> -\ProvidesExplPackage{l3pdfdict}{2023-12-09}{0.96d} +\ProvidesExplPackage{l3pdfdict}{2024-02-22}{0.96e} {Tools for PDF dictionaries (LaTeX PDF management testphase bundle)} % % \end{macrocode} diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdf index ae30760b1b..bd7ff5e3ff 100644 Binary files a/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdf and b/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdf differ diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.dtx index ef7f1a5c4c..1bb30b3af5 100644 --- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.dtx +++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.dtx @@ -2,7 +2,7 @@ % %% File: l3pdfpdffield-action.dtx % -% Copyright (C) 2021-2023 The LaTeX Project +% Copyright (C) 2021-2024 The LaTeX Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -49,7 +49,7 @@ % }^^A % } % -% \date{Version 0.96d, released 2023-12-09} +% \date{Version 0.96e, released 2024-02-22} % % \maketitle % \begin{documentation} diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.pdf index 1d2dfa5a9a..a64b7de4e5 100644 Binary files a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.pdf and b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.pdf differ diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.dtx index 6e6f5fe007..42b9e91ba6 100644 --- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.dtx +++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.dtx @@ -2,7 +2,7 @@ % %% File: l3pdfpdffield-checkbox.dtx % -% Copyright (C) 2021-2023 The LaTeX Project +% Copyright (C) 2021-2024 The LaTeX Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -64,7 +64,7 @@ % }^^A % } % -% \date{Version 0.96d, released 2023-12-09} +% \date{Version 0.96e, released 2024-02-22} % % \maketitle % \begin{documentation} diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.pdf index 5daeeaf118..f7333e6d78 100644 Binary files a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.pdf and b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.pdf differ diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.dtx index ae2cdec29d..e7478d06fd 100644 --- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.dtx +++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.dtx @@ -2,7 +2,7 @@ % %% File: l3pdfpdffield-choice.dtx % -% Copyright (C) 2021-2023 The LaTeX Project +% Copyright (C) 2021-2024 The LaTeX Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -49,7 +49,7 @@ % }^^A % } % -% \date{Version 0.96d, released 2023-12-09} +% \date{Version 0.96e, released 2024-02-22} % % \maketitle % \begin{documentation} diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.pdf index 1ab858899c..abbae8d2f8 100644 Binary files a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.pdf and b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.pdf differ diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.dtx index cf0153732e..17e961996b 100644 --- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.dtx +++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.dtx @@ -2,7 +2,7 @@ % %% File: l3pdfpdffield-pushbutton.dtx % -% Copyright (C) 2021-2023 The LaTeX Project +% Copyright (C) 2021-2024 The LaTeX Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -55,7 +55,7 @@ % }^^A % } % -% \date{Version 0.96d, released 2023-12-09} +% \date{Version 0.96e, released 2024-02-22} % % \maketitle % \begin{documentation} diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.pdf index b455ede38e..0c5ad08e2d 100644 Binary files a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.pdf and b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.pdf differ diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.dtx index 2f9ce890c5..bf302f68ca 100644 --- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.dtx +++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.dtx @@ -2,7 +2,7 @@ % %% File: l3pdfpdffield-radiobutton.dtx % -% Copyright (C) 2021-2023 The LaTeX Project +% Copyright (C) 2021-2024 The LaTeX Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -83,7 +83,7 @@ % }^^A % } % -% \date{Version 0.96d, released 2023-12-09} +% \date{Version 0.96e, released 2024-02-22} % % \maketitle % \begin{documentation} diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.pdf index bfe906ca9d..6ab354c51b 100644 Binary files a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.pdf and b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.pdf differ diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.dtx index 15fe26a805..6680441f39 100644 --- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.dtx +++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.dtx @@ -2,7 +2,7 @@ % %% File: l3pdfpdffield-textfield.dtx % -% Copyright (C) 2021-2023 The LaTeX Project +% Copyright (C) 2021-2024 The LaTeX Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -49,7 +49,7 @@ % }^^A % } % -% \date{Version 0.96d, released 2023-12-09} +% \date{Version 0.96e, released 2024-02-22} % % \maketitle % \begin{documentation} diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.pdf index 428b07121c..be651fd1af 100644 Binary files a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.pdf and b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.pdf differ diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx index 28ce09312c..7d1a693535 100644 --- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx +++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx @@ -2,7 +2,7 @@ % %% File: l3pdffield.dtx % -% Copyright (C) 2021-2023 The LaTeX Project +% Copyright (C) 2021-2024 The LaTeX Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -69,7 +69,7 @@ % }^^A % } % -% \date{Version 0.96d, released 2023-12-09} +% \date{Version 0.96e, released 2024-02-22} % % \maketitle % \begin{documentation} @@ -972,7 +972,7 @@ %<*package> %<@@=pdffield> \NeedsTeXFormat{LaTeX2e} -\ProvidesExplPackage{l3pdffield-testphase}{2023-12-09}{0.96d}% +\ProvidesExplPackage{l3pdffield-testphase}{2024-02-22}{0.96e}% {form fields} % \end{macrocode} % \subsection{hyperref specific command} diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdf index 8a91d85118..4a2a565f21 100644 Binary files a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdf and b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdf differ diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx index 01d247b7e7..8ba40c54ed 100644 --- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx +++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx @@ -2,7 +2,7 @@ % %% File: l3pdffile.dtx % -% Copyright (C) 2018-2023 The LaTeX Project +% Copyright (C) 2018-2024 The LaTeX Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -49,7 +49,7 @@ % }^^A % } % -% \date{Version 0.96d, released 2023-12-09} +% \date{Version 0.96e, released 2024-02-22} % % \maketitle % \begin{documentation} @@ -398,7 +398,7 @@ % % \begin{macrocode} %<*header> -\ProvidesExplPackage{l3pdffile}{2023-12-09}{0.96d} +\ProvidesExplPackage{l3pdffile}{2024-02-22}{0.96e} {embedding and referencing files in PDF---LaTeX PDF management testphase bundle} \RequirePackage{l3pdftools} %temporarly!! % diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdf index 35940f20fd..9700e9ab6c 100644 Binary files a/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdf and b/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdf differ diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx index 2a7ce89481..f7c8ec02d7 100644 --- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx +++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx @@ -2,7 +2,7 @@ % %% File: l3pdfmanagement.dtx % -% Copyright (C) 2018-2023 The LaTeX Project +% Copyright (C) 2018-2024 The LaTeX Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -57,7 +57,7 @@ % }^^A % } % -% \date{Version 0.96d, released 2023-12-09} +% \date{Version 0.96e, released 2024-02-22} % % \maketitle % \begin{documentation} @@ -632,7 +632,7 @@ %<@@=pdfmanagement> %<*header> % -\ProvidesExplPackage{l3pdfmanagement}{2023-12-09}{0.96d} +\ProvidesExplPackage{l3pdfmanagement}{2024-02-22}{0.96e} {Management of core PDF dictionaries (LaTeX PDF management testphase bundle)} % % \end{macrocode} diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdf index 4e704567e9..0d8542561b 100644 Binary files a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdf and b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdf differ diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx index 720669e237..63697bf0b3 100644 --- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx +++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx @@ -2,7 +2,7 @@ % %% File: l3pdfmeta.dtx % -% Copyright (C) 2018-2023 The LaTeX Project +% Copyright (C) 2018-2024 The LaTeX Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -49,7 +49,7 @@ % }^^A % } % -% \date{Version 0.96d, released 2023-12-09} +% \date{Version 0.96e, released 2024-02-22} % % \maketitle % \begin{documentation} @@ -618,7 +618,7 @@ % \begin{macrocode} %<@@=pdfmeta> %<*header> -\ProvidesExplPackage{l3pdfmeta}{2023-12-09}{0.96d} +\ProvidesExplPackage{l3pdfmeta}{2024-02-22}{0.96e} {PDF-Standards---LaTeX PDF management testphase bundle} % % \end{macrocode} @@ -1271,8 +1271,17 @@ { \AddToDocumentProperties [document]{pdfstandard-UA}{{1}{}} }, +% \end{macrocode} +% currently it is not possible to merge requirements - these need some thoughts as +% every standard has some common keys like the name or the yes. +% We therefore add some requirements manually. +% \begin{macrocode} _pdfstandard / UA-2 .code:n = - {\AddToDocumentProperties [document]{pdfstandard-UA}{{2}{2023}}}, + { + \AddToDocumentProperties [document]{pdfstandard-UA}{{2}{2024}} + \AddToHook{begindocument/before} + {\prop_gput:Nnn \g__pdfmeta_standard_prop {Trailer_no_Info}{}} + }, xmp .bool_gset:N = \g_@@_xmp_bool } % \end{macrocode} @@ -1716,8 +1725,21 @@ \clist_map_inline:nn {#4} { \@@_xmp_lang_get:nNN {##1}\l_@@_tmpa_tl\l_@@_tmpb_tl - \@@_xmp_add_packet_line_attr:nneV - {rdf}{li}{xml:lang="\l_@@_tmpa_tl" }\l_@@_tmpb_tl +% \end{macrocode} +% change 2024-02-22. There should be if possible a x-default +% entry as some viewers need that. So if the language is equal to the +% main language we use that. This assumes that the user hasn't marked +% every entry as some other language! +% \begin{macrocode} + \tl_if_eq:eeTF{\l_@@_tmpa_tl}{\l_@@_xmp_metalang_tl} + { + \@@_xmp_add_packet_line_attr:nneV + {rdf}{li}{xml:lang="x-default" }\l_@@_tmpb_tl + } + { + \@@_xmp_add_packet_line_attr:nneV + {rdf}{li}{xml:lang="\l_@@_tmpa_tl" }\l_@@_tmpb_tl + } } \@@_xmp_add_packet_close:nn{rdf}{#3} \@@_xmp_add_packet_close:nn {#1}{#2} diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdf index 6f94039cd0..47a827a16b 100644 Binary files a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdf and b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdf differ diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx index 3e5dc1f1ff..acea3f5149 100644 --- a/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx +++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx @@ -2,7 +2,7 @@ % %% File: l3pdftools.dtx % -% Copyright (C) 2018-2023 The LaTeX Project +% Copyright (C) 2018-2024 The LaTeX Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -49,7 +49,7 @@ % }^^A % } % -% \date{Version 0.96d, released 2023-12-09} +% \date{Version 0.96e, released 2024-02-22} % % \maketitle % \begin{documentation} @@ -231,7 +231,7 @@ % % \begin{macrocode} %<*header> -\ProvidesExplPackage{l3pdftools}{2023-12-09}{0.96d} +\ProvidesExplPackage{l3pdftools}{2024-02-22}{0.96e} {candidate commands for l3pdf---LaTeX PDF management testphase bundle} % % \end{macrocode} diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdf index e10591432e..aec25b5a8f 100644 Binary files a/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdf and b/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdf differ diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx index 3928d790d3..40ef83a7c7 100644 --- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx +++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx @@ -2,7 +2,7 @@ % %% File: l3pdfxform.dtx % -% Copyright (C) 2018-2023 The LaTeX Project +% Copyright (C) 2018-2024 The LaTeX Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -48,7 +48,7 @@ % }^^A % } % -% \date{Version 0.96d, released 2023-12-09} +% \date{Version 0.96e, released 2024-02-22} % % \maketitle % \begin{documentation} @@ -132,7 +132,7 @@ % \begin{macrocode} %<@@=pdf> %<*header> -\ProvidesExplPackage{l3pdfxform}{2023-12-09}{0.96d} +\ProvidesExplPackage{l3pdfxform}{2024-02-22}{0.96e} {command to create xforms (beta)---LaTeX PDF management testphase bundle} % % \end{macrocode} diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdf index 7b901ddda0..1b54f22122 100644 Binary files a/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdf and b/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdf differ diff --git a/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx b/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx index 7688446417..0116923ae2 100644 --- a/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx +++ b/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx @@ -2,7 +2,7 @@ % %% File: ltdocinit.dtx % -% Copyright (C) 2018-2023 The LaTeX Project +% Copyright (C) 2018-2024 The LaTeX Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -47,7 +47,7 @@ % }^^A % } % -% \date{Version 0.96d, released 2023-12-09} +% \date{Version 0.96e, released 2024-02-22} % % \maketitle % \begin{documentation} @@ -220,7 +220,7 @@ % \begin{macrocode} %<@@=pdfmanagement> %<*header> -\ProvidesExplPackage{ltdocinit}{2023-12-09}{0.96d} +\ProvidesExplPackage{ltdocinit}{2024-02-22}{0.96e} {Initialize document metadata} % % \end{macrocode} diff --git a/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdf b/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdf index 32df59ad2e..a1cdd6fa05 100644 Binary files a/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdf and b/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdf differ diff --git a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx index cdcc24255e..bd25244517 100644 --- a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx +++ b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx @@ -2,7 +2,7 @@ % %% File: pdfmanagement-firstaid.dtx % -% Copyright (C) 2018-2023 The LaTeX Project +% Copyright (C) 2018-2024 The LaTeX Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -47,7 +47,7 @@ % }^^A % } % -% \date{Version 0.96d, released 2023-12-09} +% \date{Version 0.96e, released 2024-02-22} % % \maketitle % \begin{documentation} @@ -63,7 +63,7 @@ % |debug={firstaidoff={name1,name2,...},...}|. % \begin{macrocode} %<*package> -\ProvidesExplPackage{pdfmanagement-firstaid}{2023-12-09}{0.96d} +\ProvidesExplPackage{pdfmanagement-firstaid}{2024-02-22}{0.96e} {LaTeX PDF management testphase bundle / firstaid-patches} %<@@=pdfmanagement> diff --git a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdf b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdf index fc3bd4ce8a..e5bfb845c9 100644 Binary files a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdf and b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdf differ diff --git a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx index 189f496cf2..7d599fd3bd 100644 --- a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx +++ b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx @@ -2,7 +2,7 @@ % %% File: pdfmanagement-testphase.dtx % -% Copyright (C) 2019-2023 The LaTeX Project +% Copyright (C) 2019-2024 The LaTeX Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -47,7 +47,7 @@ % }^^A % } % -% \date{Version 0.96d, released 2023-12-09} +% \date{Version 0.96e, released 2024-02-22} % % \maketitle % \begin{documentation} @@ -394,7 +394,7 @@ % \begin{macrocode} %<@@=pdf> %<*package> -\ProvidesExplPackage{pdfmanagement-testphase}{2023-12-09}{0.96d} +\ProvidesExplPackage{pdfmanagement-testphase}{2024-02-22}{0.96e} {LaTeX PDF management testphase bundle} \providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion} \IfFormatAtLeastTF{2020-10-01}{}{ @@ -422,7 +422,7 @@ % to allow to set it in the document. % \begin{macrocode} %<*header> -\ProvidesExplFile{pdfmanagement-testphase.ltx}{2023-12-09}{0.96d} +\ProvidesExplFile{pdfmanagement-testphase.ltx}{2024-02-22}{0.96e} {PDF~management~code~(testphase)} % \end{macrocode} % We define a boolean for the new delayed shipout. This is temporary. At some @@ -480,8 +480,7 @@ %\RequirePackage{l3pdfmeta} % %\RequirePackage{l3pdftools} %\RequirePackage{l3pdffile} -\IfFileExists{tagpdf-base.sty} - {\RequirePackage{tagpdf-base}}{} +\RequirePackage{tagpdf-base} \input{pdfmanagement-testphase.ltx} % % \end{macrocode} diff --git a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdf b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdf index 5f9f2f81e5..3b92f77bf0 100644 Binary files a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdf and b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdf differ diff --git a/macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty b/macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty index a444924dfd..7966d479e3 100644 --- a/macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty +++ b/macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty @@ -1,6 +1,6 @@ %% LaTeX2e file `xcolor-patches-tmp-ltx.sty' %% -\ProvidesPackage{xcolor-patches-tmp-ltx}[2023-12-09 v0.96d patch xcolor for l3color] +\ProvidesPackage{xcolor-patches-tmp-ltx}[2024-02-22 v0.96e patch xcolor for l3color] \@ifundefined{color_set:nn}{\RequirePackage{l3color}}{} \ExplSyntaxOn diff --git a/macros/latex/contrib/projlib/ProjLib.dtx b/macros/latex/contrib/projlib/ProjLib.dtx index 1f4cceb73e..fbe6d2acd2 100644 --- a/macros/latex/contrib/projlib/ProjLib.dtx +++ b/macros/latex/contrib/projlib/ProjLib.dtx @@ -19,84 +19,84 @@ %<*ProjLib> \ProvidesExplPackage {ProjLib} - {2024/02/20} {} + {2024/02/22} {} {Collective interface of the ProjLib toolkit} % % %<*projlib-author> \ProvidesExplPackage {projlib-author} - {2024/02/20} {} + {2024/02/22} {} {Enhanced author information block} % % %<*projlib-datetime> \ProvidesExplPackage {projlib-datetime} - {2024/02/20} {} + {2024/02/22} {} {Convert numeric date-time string to natural language} % % %<*projlib-draft> \ProvidesExplPackage {projlib-draft} - {2024/02/20} {} + {2024/02/22} {} {Useful commands during draft stage} % % %<*projlib-font> \ProvidesExplPackage {projlib-font} - {2024/02/20} {} + {2024/02/22} {} {Font selection and configuration} % % %<*projlib-language> \ProvidesExplPackage {projlib-language} - {2024/02/20} {} + {2024/02/22} {} {Multi-language configuration} % % %<*projlib-logo> \ProvidesExplPackage {projlib-logo} - {2024/02/20} {} + {2024/02/22} {} {The ProjLib logo} % % %<*projlib-math> \ProvidesExplPackage {projlib-math} - {2024/02/20} {} + {2024/02/22} {} {Efficient math setup} % % %<*projlib-paper> \ProvidesExplPackage {projlib-paper} - {2024/02/20} {} + {2024/02/22} {} {Configuration of the paper style} % % %<*projlib-text> \ProvidesExplPackage {projlib-text} - {2024/02/20} {} + {2024/02/22} {} {Text-related commands} % % %<*projlib-theorem> \ProvidesExplPackage {projlib-theorem} - {2024/02/20} {} + {2024/02/22} {} {Configuration of theorem-like environments} % % %<*projlib-titlepage> \ProvidesExplPackage {projlib-titlepage} - {2024/02/20} {} + {2024/02/22} {} {Interface for title page rendering} % @@ -355,11 +355,13 @@ \cs_new_nopar:Nn \projlib_author_pre_thanks:n { + \tl_set:Nn \footnotemark {} \projlib_author_backup_thanks:w { \skip_horizontal:n { - \c__projlib_author_width_of_asterisk_dim } #1 } + \RenewCommandCopy \footnotemark \projlib_author_backup_footnotemark: } \NewDocumentCommand \thanks { m } @@ -368,9 +370,7 @@ { \hook_gput_code:nnn { cmd/@title/after } { projlib-author } { - \tl_set:Nn \footnotemark {} \projlib_author_pre_thanks:n { #1 } - \RenewCommandCopy \footnotemark \projlib_author_backup_footnotemark: } } } @@ -483,7 +483,6 @@ { Unknown~edition~(#1)~of~Mathematics~Subject~Classification;~using~'2020' } \NewDocumentCommand \subjclass { O{2020} m } { - \tl_set:Nn \footnotemark {} \tl_set:Nn \l_projlib_author_subjclass_tl { #2 } \tl_if_exist:cTF { subjclassname_#1 } { @@ -499,7 +498,6 @@ \enspace \l_projlib_author_subjclass_tl . } - \RenewCommandCopy \footnotemark \projlib_author_backup_footnotemark: } \tl_const:cn { subjclassname_1991 } { \textup{1991}~Mathematics~Subject~Classification } \tl_const:cn { subjclassname_2000 } { \textup{2000}~Mathematics~Subject~Classification } @@ -2445,11 +2443,20 @@ %<*projlib-font> \keys_define:nn { projlib-font } { - , useosf .bool_set:N = \l__projlib_font_useosf_bool + , use-osf .bool_set:N = \l__projlib_font_useosf_bool , useosf .initial:n = { false } + , use~osf .bool_set:N = \l__projlib_font_useosf_bool + , use osf .bool_set:N = \l__projlib_font_useosf_bool , old-style-figures .bool_set:N = \l__projlib_font_useosf_bool , old~style~figures .bool_set:N = \l__projlib_font_useosf_bool + , old-style~figures .bool_set:N = \l__projlib_font_useosf_bool + , old style~figures .bool_set:N = \l__projlib_font_useosf_bool , old style figures .bool_set:N = \l__projlib_font_useosf_bool + , old-style-figure .bool_set:N = \l__projlib_font_useosf_bool + , old~style~figure .bool_set:N = \l__projlib_font_useosf_bool + , old-style~figure .bool_set:N = \l__projlib_font_useosf_bool + , old style~figure .bool_set:N = \l__projlib_font_useosf_bool + , old style figure .bool_set:N = \l__projlib_font_useosf_bool , new-computer-modern .bool_set:N = \l__projlib_font_newcomputermodern_bool , new-computer-modern .initial:n = { false } , new~computer~modern .bool_set:N = \l__projlib_font_newcomputermodern_bool @@ -2470,10 +2477,15 @@ , times .initial:n = { false } , garamond .bool_set:N = \l__projlib_font_garamond_bool , garamond .initial:n = { false } - , noto .bool_set:N = \l__projlib_font_noto_bool - , noto .initial:n = { false } + , bembo .bool_set:N = \l__projlib_font_bembo_bool + , bembo .initial:n = { false } , biolinum .bool_set:N = \l__projlib_font_biolinum_bool , biolinum .initial:n = { false } + , noto .bool_set:N = \l__projlib_font_noto_bool + , noto .initial:n = { false } + , use-font .meta:n = { #1 } + , use~font .meta:n = { #1 } + , use font .meta:n = { #1 } , unknown .code:n = {} } \ProcessKeyOptions [ projlib-font ] @@ -2497,14 +2509,14 @@ \bool_if:NT \l__projlib_font_newcomputermodern_bool { - \usepackage[default]{fontsetup} + \RequirePackage [default] { fontsetup } \projlib_font_set_linespacing_latin:n { \setstretch { 1.00 } } \bool_gset_true:N \g_projlib_font_already_set_bool } \bool_if:NT \l__projlib_font_computermodern_bool { - \usepackage[olddefault]{fontsetup} + \RequirePackage [olddefault] { fontsetup } \projlib_font_set_linespacing_latin:n { \setstretch { 1.00 } } \bool_gset_true:N \g_projlib_font_already_set_bool } @@ -2553,18 +2565,29 @@ \bool_if:NT \l__projlib_font_times_bool { - \PassOptionsToPackage { defaultsups } { newtxtext } \PassOptionsToPackage { no-math } { fontspec } \hook_gput_code:nnn { begindocument/before } { projlib-font } { - \bool_if:NT \l__projlib_font_useosf_bool + \sys_if_engine_pdftex:TF { - \PassOptionsToPackage { osf } { newtxtext } + \bool_if:NT \l__projlib_font_useosf_bool + { + \PassOptionsToPackage { osf } { newtxtext } + } + \PassOptionsToPackage { defaultsups } { newtxtext } + \RequirePackage { newtxtext } + \RequirePackage { newtxmath } } - \RequirePackage { newtxtext } - \RequirePackage { newtxmath } - \sys_if_engine_pdftex:F { + \RequirePackage { fontspec } + \setmainfont { texgyretermes } + [ + Scale = MatchUppercase , + UprightFont = *-regular , + BoldFont = *-bold , + ItalicFont = *-italic , + BoldItalicFont = *-bolditalic , + ] \setsansfont { texgyreheros } [ Scale = MatchUppercase , @@ -2573,6 +2596,17 @@ ItalicFont = *-italic , BoldItalicFont = *-bolditalic , ] + \setmonofont { texgyrecursor } + [ + Scale = MatchUppercase , + UprightFont = *-regular , + BoldFont = *-bold , + ItalicFont = *-italic , + BoldItalicFont = *-bolditalic , + ] + \setmonofont{inconsolata}[Scale=MatchLowercase] + \RequirePackage { unicode-math } + \setmathfont { texgyretermes-math } } } \projlib_font_set_linespacing_latin:n { \setstretch { 1.00 } } @@ -2623,14 +2657,24 @@ \bool_gset_true:N \g_projlib_font_already_set_bool } -\bool_if:NT \l__projlib_font_noto_bool +\bool_if:NT \l__projlib_font_bembo_bool { \bool_if:NT \l__projlib_font_useosf_bool { - \PassOptionsToPackage { oldstyle } { notomath } + \PassOptionsToPackage { osf } { fbb } } - \RequirePackage { anyfontsize } - \RequirePackage { notomath } + \sys_if_engine_pdftex:F + { + \RequirePackage { fontspec } + } + \RequirePackage [full] { textcomp } % to get the right copyright, etc. + \RequirePackage [p] { fbb } + \RequirePackage [scaled=.95,type1] { cabin } % sans serif in style of Gill Sans + \RequirePackage [varqu,varl] { zi4 }% inconsolata typewriter + \RequirePackage [T1] { fontenc } + \RequirePackage [libertine] { newtxmath } + \RequirePackage [cal=boondoxo,bb=boondox,frak=boondox] { mathalfa } + \cs_undefine:c { openbox } \cs_undefine:c { Bbbk } \projlib_font_set_linespacing_latin:n { \setstretch { 1.00 } } \bool_gset_true:N \g_projlib_font_already_set_bool @@ -2675,6 +2719,20 @@ \bool_gset_true:N \g_projlib_font_already_set_bool } +\bool_if:NT \l__projlib_font_noto_bool + { + \bool_if:NT \l__projlib_font_useosf_bool + { + \PassOptionsToPackage { oldstyle } { notomath } + } + \RequirePackage { anyfontsize } + \RequirePackage { notomath } + \cs_undefine:c { openbox } + \cs_undefine:c { Bbbk } + \projlib_font_set_linespacing_latin:n { \setstretch { 1.00 } } + \bool_gset_true:N \g_projlib_font_already_set_bool + } + % \bool_if:NF \l__projlib_font_lmodern_bool % { % \hook_gput_code:nnn { package/tikz-cd/after } { projlib-font } diff --git a/macros/latex/contrib/projlib/README.md b/macros/latex/contrib/projlib/README.md index 1f231acdbc..e5d6b13900 100644 --- a/macros/latex/contrib/projlib/README.md +++ b/macros/latex/contrib/projlib/README.md @@ -5,7 +5,7 @@ # The `ProjLib` Toolkit -> **This bundle is dated 2024/02/20.** +> **This bundle is dated 2024/02/22.** > **New documentations are still being written. For now, only the core code is included in TeX Live 2024 and MiKTeX (old documentations have been removed from the distribution).** @@ -41,7 +41,7 @@ The modules include: - `\DNF` for marking unfinished part. In addition, a report of all unfinished places shall be printed at the last of your document. - Reimplemented `\blindtext` to support more languages. 1. module `font` - *Font selection and configuration* - - Supporting Palatino, Times, Garamond, Biolinum, Noto, etc. + - Supporting New Computer Modern / Latin Modern, Palatino, Times, Garamond, Bembo, Biolinum, Noto, etc. 1. module `language` - *Multi-language configuration* - `\UseLanguage`, `\UseOtherLanguage` for selecting languages, and `\AddLanguageSetting` for adding language-specific settings. - `\DefineMultilingualText` for defining multilingual text strings. diff --git a/macros/latex/contrib/se2thesis/CHANGELOG.md b/macros/latex/contrib/se2thesis/CHANGELOG.md index 28d32ce95b..ed9739a1ba 100644 --- a/macros/latex/contrib/se2thesis/CHANGELOG.md +++ b/macros/latex/contrib/se2thesis/CHANGELOG.md @@ -7,6 +7,28 @@ and this project adheres to ## [Unreleased] +## [v3.3.0] – 2024–02–22 + +### Added + +- Enhance the options for bibliography styles, one can now choose between + `alphabetic` and `numeric` style. The former loads the default BibLaTeX + `alphabetic` style, the latter uses ACM's numeric style. +- For the new numeric style, we support an enhanced `\autocite` macro, which + typesets the citation in the margin column for the first appearance per + chapter. +- Add thesis-type option `phdeng` for a doctoral degree in engineering. + +### Changed + +- The default citation style, when setting `biblatex=true` while loading the + `se2packages` package is now `numeric` based on the ACM numeric style instead + of `alphabetic`. The latter can now be chosen explicitly. + See [issue #7](https://github.com/se2p/se2thesis/issues/7) for a discussion + on the general decision. + +### Changed + ## [v3.2.0] – 2023–09–12 ### Changed @@ -150,6 +172,7 @@ These changes might be breaking changes! ### Added - First official release +[v3.3.0]: https://github.com/se2p/se2thesis/compare/v3.3.0...v3.2.0 [v3.2.0]: https://github.com/se2p/se2thesis/compare/v3.2.0...v3.1.0 [v3.1.0]: https://github.com/se2p/se2thesis/compare/v3.1.0...v3.0.0 [v3.0.0]: https://github.com/se2p/se2thesis/compare/v3.0.0...v2.1.0 diff --git a/macros/latex/contrib/se2thesis/se2colors.dtx b/macros/latex/contrib/se2thesis/se2colors.dtx index 4460b22889..35bd60d0d3 100644 --- a/macros/latex/contrib/se2thesis/se2colors.dtx +++ b/macros/latex/contrib/se2thesis/se2colors.dtx @@ -231,7 +231,7 @@ % % Identify the package and give the overall version information. % \begin{macrocode} -\ProvidesExplPackage {se2colors} {2023-09-12} {3.2.0} +\ProvidesExplPackage {se2colors} {2024-02-22} {3.3.0} {A colour support package for the se2thesis bundle} % \end{macrocode} % diff --git a/macros/latex/contrib/se2thesis/se2fonts.dtx b/macros/latex/contrib/se2thesis/se2fonts.dtx index e3ad0016da..4f127a4cc3 100644 --- a/macros/latex/contrib/se2thesis/se2fonts.dtx +++ b/macros/latex/contrib/se2thesis/se2fonts.dtx @@ -95,7 +95,7 @@ % \begin{itemize} % \item {\fontspec{LibertinusSerif}An example text in Libertinus Serif} % \item {\fontspec{LibertinusSans}An example text in Libertinus Sans} -% \item {\fontspec{inconsolata}An example text in Inconsolata} +% \item {\fontspec{InconsolataLGCNerdFont}An example text in Inconsolata} % \end{itemize} % % The package provides additional helper functions @@ -151,7 +151,7 @@ % % Identify the package and give the overall version information. % \begin{macrocode} -\ProvidesExplPackage {se2fonts} {2023-09-12} {3.2.0} +\ProvidesExplPackage {se2fonts} {2024-02-22} {3.3.0} {A font-selection support package for the se2thesis bundle} % \end{macrocode} % diff --git a/macros/latex/contrib/se2thesis/se2packages.dtx b/macros/latex/contrib/se2thesis/se2packages.dtx index f1a530ba4d..92c1771a92 100644 --- a/macros/latex/contrib/se2thesis/se2packages.dtx +++ b/macros/latex/contrib/se2thesis/se2packages.dtx @@ -324,11 +324,23 @@ % We provide a load-time option to load and configure \pkg{biblatex}. % \begin{function}{biblatex} % \begin{syntax} -% |biblatex| = \meta{true,false} +% |biblatex| = \meta{true,false,alphabetic,numeric} % \end{syntax} % Decides whether the package loads \pkg{biblatex} % and sets the options for \pkg{biblatex} to the values we recommend. % The default value is |false|, set it to |true| to load \pkg{biblatex}. +% +% By setting the value to |alphabetic|, \pkg{se2packages} sets the citation +% style for \pkg{biblatex} to its alphabetic one; selecting |numeric| loads +% the numeric style as provided by the \pkg{acmart} bundle of the ACM. The +% value |true| also loads the latter style as a default. +% +% Note that for the |numeric| style, we provide an enhanced \cs{autocite} +% command, which does not only print the citation mark in the text but also +% a short entry listing of the bibliography entry in the margin column of the +% page. This entry is only printed for the first occurence of a citation per +% chapter to not clutter the margin column too much. The other citation +% commands from \pkg{biblatex} work as usual. % \end{function} % % Additionally, @@ -431,7 +443,7 @@ % % Identify the package and give the overall version information. % \begin{macrocode} -\ProvidesExplPackage {se2packages} {2023-09-12} {3.2.0} +\ProvidesExplPackage {se2packages} {2024-02-22} {3.3.0} {Supporting packages for the se2thesis bundle} % \end{macrocode} % @@ -475,10 +487,10 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{\l_@@_biblatex_bool} +% \begin{macro}{\l_@@_biblatex_tl} % Whether or not to load and configure \pkg{biblatex}. % \begin{macrocode} -\bool_new:N \l_@@_biblatex_bool +\tl_new:N \l_@@_biblatex_tl % \end{macrocode} % \end{macro} % @@ -538,7 +550,7 @@ listings .bool_gset:N = \l_@@_listings_bool, listings .initial:n = false, - biblatex .bool_gset:N = \l_@@_biblatex_bool, + biblatex .tl_gset:N = \l_@@_biblatex_tl, biblatex .initial:n = false, selnolig .bool_gset:N = \l_@@_selnolig_bool, @@ -609,7 +621,7 @@ \bool_gset_true:N \l_@@_selnolig_bool \bool_gset_true:N \l_@@_luawidowcontrol_bool \bool_gset_true:N \l_@@_microtype_bool - \bool_gset_true:N \l_@@_biblatex_bool + \tl_gset:Nn \l_@@_biblatex_bool {true} \bool_gset_true:N \l_@@_cleveref_bool } % \end{macrocode} @@ -756,13 +768,14 @@ % % Conditionally load and configure the \pkg{biblatex} package. % \begin{macrocode} -\bool_if:NT \l_@@_biblatex_bool +\tl_if_eq:NnT \l_@@_biblatex_tl {alphabetic} { \msg_info:nnn { seiipackages } { load-package } { biblatex } \PassOptionsToPackage { backend=biber, backref=true, + datamodel=software, giveninits=true, hyperref=auto, maxnames=100, @@ -771,6 +784,95 @@ style=alphabetic, } { biblatex } \RequirePackage{biblatex} + \RequirePackage{software-biblatex} + \ExecuteBibliographyOptions{ + halid=false, + swhid=true, + shortswhid=false, + swlabels=true, + vcs=true, + license=true, + } + } + +\bool_new:N \l_@@_biblatex_numeric_variants_bool +\tl_if_eq:NnT \l_@@_biblatex_tl {true} + { + \bool_gset_true:N \l_@@_biblatex_numeric_variants_bool + } +\tl_if_eq:NnT \l_@@_biblatex_tl {numeric} + { + \bool_gset_true:N \l_@@_biblatex_numeric_variants_bool + } + +\bool_if:NT \l_@@_biblatex_numeric_variants_bool + { + \msg_info:nnn { seiipackages } { load-package } { biblatex } + \PassOptionsToPackage + { + backend=biber, + backref=true, + citereset=chapter+, + citetracker=context, + giveninits=true, + hyperref=auto, + sorting=nyt, + datamodel=acmdatamodel, + style=acmnumeric, + } { biblatex } + \RequirePackage{biblatex} + \RequirePackage{ragged2e} + \RequirePackage[mark=arabic,shape=up]{sidenotesplus} + + \newbibmacro{cite:authoryear}{% + \printtext[labelnumberwidth]{% + \usebibmacro{cite}% + }% + \setunit{\addspace}% + \printnames{labelname}% + \setunit{\printdelim{nameyeardelim}}% + \begingroup + \DeclareFieldFormat{date}{\mkbibparens{##1}}% + \printdate + \endgroup + \setunit*{\addcomma\space}%%% NEW + \printfield[title]{labeltitle}%%% NEW + } + + \newrobustcmd*{\makebibmarginnote}[1]{% + \sidenote*{\blxmkbibnote{foot}{#1}}} + + \DeclareCiteCommand{\maycite}[\makebibmarginnote] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite:authoryear}} + {\multicitedelim} + {\usebibmacro{postnote}} + + \newcommand*{\cbx@savedcites}{} + + \newcommand*{\cbx@margcitewrap}[1]{% + \global\let\cbx@savedcites\empty + \mkbibbrackets{#1}% + \cbx@savedcites + } + + \DeclareCiteCommand{\margincite}[\cbx@margcitewrap] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}% + \ifciteseen + {} + {\xappto\cbx@savedcites{\noexpand\maycite{\thefield{entrykey}}}}} + {\multicitedelim} + {\usebibmacro{postnote}} + + \DeclareMultiCiteCommand{\margincites}[\cbx@margcitewrap]{\margincite}{\multicitedelim} + + \DeclareAutoCiteCommand{margin}{\margincite}{\margincites} + \ExecuteBibliographyOptions{autocite=margin} + \newcommand{\bibliofont}{\footnotesize} + \DeclareFieldFormat{titlecase}{#1}% Preserve capitalisation of titles } % \end{macrocode} % diff --git a/macros/latex/contrib/se2thesis/se2thesis-master-thesis-example.pdf b/macros/latex/contrib/se2thesis/se2thesis-master-thesis-example.pdf index a6a215ff14..4750e14e31 100644 Binary files a/macros/latex/contrib/se2thesis/se2thesis-master-thesis-example.pdf and b/macros/latex/contrib/se2thesis/se2thesis-master-thesis-example.pdf differ diff --git a/macros/latex/contrib/se2thesis/se2thesis-master-thesis-example.tex b/macros/latex/contrib/se2thesis/se2thesis-master-thesis-example.tex index 106aa4b541..15000000b2 100644 --- a/macros/latex/contrib/se2thesis/se2thesis-master-thesis-example.tex +++ b/macros/latex/contrib/se2thesis/se2thesis-master-thesis-example.tex @@ -3,7 +3,7 @@ open=right,% twoside=true,% paper=a4,% - logofile={logo.png},% + logofile={logo.pdf},% thesistype=master,% UKenglish,% ]{se2thesis} @@ -18,7 +18,7 @@ selnolig=true,% widowcontrol=false,% microtype=true,% - biblatex=true,% + biblatex=numeric,% cleveref=true,% ]{se2packages} @@ -72,7 +72,7 @@ \section{Further Examples} -We could reference the \TeX{} book~\cite{Knu86}. +We could reference the \TeX{} book~\autocite{Knu86}. \begin{resq} What is \(41 + 1\)? @@ -82,6 +82,8 @@ We could reference the \TeX{} book~\cite{Knu86}. It's 42, obviously! \end{summary} +And using the auto-cite functionality to cite Knuth~\autocite{Knu86}. + \backmatter \printbibliography diff --git a/macros/latex/contrib/se2thesis/se2thesis.dtx b/macros/latex/contrib/se2thesis/se2thesis.dtx index 7f1fbbdde0..832c1bf225 100644 --- a/macros/latex/contrib/se2thesis/se2thesis.dtx +++ b/macros/latex/contrib/se2thesis/se2thesis.dtx @@ -225,7 +225,8 @@ % |bachelor| for a bachelor thesis, |bachelorproposal| for a proposal to % a bachelor thesis, |master| for a master thesis, |masterproposal| for % a proposal to a master thesis, |phdproposal| for a proposal to a PhD thesis, -% and |phd| for a PhD thesis. +% |phd| for a PhD thesis in the natural sciences and |phdeng| for a PhD thesis +% in engineering. % \end{function} % % \begin{function}{colormode} @@ -585,7 +586,7 @@ % % Identify the class and give the overall version number. % \begin{macrocode} -\ProvidesExplClass {se2thesis} {2023-09-12} {3.2.0} +\ProvidesExplClass {se2thesis} {2024-02-22} {3.3.0} {A thesis class for the Chair of Software Engineering II} % \end{macrocode} % @@ -759,6 +760,7 @@ \tl_gset:Nn \l_@@_thesis_type_tl {masterproposal} }, thesistype / phd .code:n = \tl_gset:Nn \l_@@_thesis_type_tl {phd}, + thesistype / phdeng .code:n = \tl_gset:Nn \l_@@_thesis_type_tl {phdeng}, thesistype / phdproposal .code:n = { \tl_gset:Nn \l_@@_thesis_type_tl {phdproposal} }, @@ -1243,23 +1245,37 @@ in~ partial~ fulfillment~ of~ obtaining\\ the~ degree~ of~ a~ Doctor~ of~ Natural~ Sciences } { - \tl_if_eq:NnT \l_@@_thesis_type_tl { bachelor } - { \GetTranslation{Bachelor-thesis} } - \tl_if_eq:NnT \l_@@_thesis_type_tl { bachelorproposal } - { \GetTranslation{Bachelor-thesis-proposal} } - \tl_if_eq:NnT \l_@@_thesis_type_tl { master } - { \GetTranslation{Master-thesis} } - \tl_if_eq:NnT \l_@@_thesis_type_tl { masterproposal } - { \GetTranslation{Master-thesis-proposal} } - \tl_if_eq:NnT \l_@@_thesis_type_tl { phdproposal } - { \GetTranslation{PhD-thesis-proposal} } - \tl_if_empty:NF \l_@@_degreeprogramme_tl + \tl_if_eq:NnTF \l_@@_thesis_type_tl { phdeng } { - \ in~\l_@@_degreeprogramme_tl + Dissertation~ zur~ Erlangung~ des~ Doktorgrades\\ + der~ Ingenieurwissenschaften~ (Dr.-Ing.)\\ + eingereicht~ an~ der~ Fakultät~ für~ Informatik~ und~ Mathematik\\ + der~ Universität~ Passau\\ + \rule{\textwidth}{.1pt}\\ + Dissertation~ submitted~ to\\ + the~ Faculty~ of~ Computer~ Science~ and~ Mathematics\\ + of~ the~ University~ of~ Passau\\ + in~ partial~ fulfillment~ of~ obtaining\\ + the~ degree~ of~ a~ Doctor~ of~ Engineering + } { + \tl_if_eq:NnT \l_@@_thesis_type_tl { bachelor } + { \GetTranslation{Bachelor-thesis} } + \tl_if_eq:NnT \l_@@_thesis_type_tl { bachelorproposal } + { \GetTranslation{Bachelor-thesis-proposal} } + \tl_if_eq:NnT \l_@@_thesis_type_tl { master } + { \GetTranslation{Master-thesis} } + \tl_if_eq:NnT \l_@@_thesis_type_tl { masterproposal } + { \GetTranslation{Master-thesis-proposal} } + \tl_if_eq:NnT \l_@@_thesis_type_tl { phdproposal } + { \GetTranslation{PhD-thesis-proposal} } + \tl_if_empty:NF \l_@@_degreeprogramme_tl + { + \ in~\l_@@_degreeprogramme_tl + } + \par + \tl_if_empty:NF \l_@@_department_tl { \l_@@_department_tl \par } + \tl_if_empty:NF \l_@@_institute_tl { \l_@@_institute_tl \par } } - \par - \tl_if_empty:NF \l_@@_department_tl { \l_@@_department_tl \par } - \tl_if_empty:NF \l_@@_institute_tl { \l_@@_institute_tl \par } } \end{center}\par\bigskip % \end{macrocode} @@ -1603,7 +1619,7 @@ % We provide the following English translations. % % \begin{macrocode} -\ProvideDictionaryFor{English}{se2translations}[2023/09/12] +\ProvideDictionaryFor{English}{se2translations}[2024/02/22] \ProvideDictTranslation{abstract}{abstract} \ProvideDictTranslation{Abstract}{Abstract} \ProvideDictTranslation{acknowledgement}{acknowledgement} @@ -1654,7 +1670,7 @@ % We provide the following German translations. % % \begin{macrocode} -\ProvideDictionaryFor{German}{se2translations}[2023/09/12] +\ProvideDictionaryFor{German}{se2translations}[2024/02/22] \ProvideDictTranslation{abstract}{Zusammenfassung} \ProvideDictTranslation{Abstract}{Zusammenfassung} \ProvideDictTranslation{acknowledgement}{Danksagung} diff --git a/macros/latex/contrib/se2thesis/se2thesis.pdf b/macros/latex/contrib/se2thesis/se2thesis.pdf index 6e771da96d..dcc165ba6a 100644 Binary files a/macros/latex/contrib/se2thesis/se2thesis.pdf and b/macros/latex/contrib/se2thesis/se2thesis.pdf differ diff --git a/macros/latex/contrib/se2thesis/test.pdf b/macros/latex/contrib/se2thesis/test.pdf deleted file mode 100644 index d33ba70794..0000000000 Binary files a/macros/latex/contrib/se2thesis/test.pdf and /dev/null differ diff --git a/macros/latex/contrib/se2thesis/test.tex b/macros/latex/contrib/se2thesis/test.tex deleted file mode 100644 index 79694db902..0000000000 --- a/macros/latex/contrib/se2thesis/test.tex +++ /dev/null @@ -1,107 +0,0 @@ -\documentclass[% - chapterprefix=true,% - open=right,% - twoside=true,% - logofile={logo.png},% - thesistype=master,% - biblatex=true,% - UKenglish,% - class=book,% - paper=b5,% -]{se2thesis} -\listfiles -\usepackage[ngerman,main=UKenglish]{babel} -\usepackage{blindtext} -\usepackage[% - group-minimum-digits=4,% - list-final-separator={, and },% - add-integer-zero=false,% - free-standing-units,% - round-mode=figures,% - round-precision=3,% - detect-weight=true,% - separate-uncertainty=true,% - uncertainty-mode=separate,% -]{siunitx} - -\usepackage[newfloat=true]{minted} -\setminted{% - autogobble,% - breaklines=true,% - fontsize=\footnotesize,% - linenos=false,% - resetmargins=true,% - xleftmargin=1em,% - xrightmargin=1em,% - frame=single,% -} - -\begin{filecontents}{\jobname.bib} - @book{Knu86, - author = {Knuth, Donald E.}, - year = {1986}, - title = {The \TeX book}, - } -\end{filecontents} -\addbibresource{\jobname.bib} - -\usepackage{booktabs} - -\usepackage{csquotes} - -\usepackage{hyperref} -\usepackage{cleveref} - -\author{Stephan Lukasczyk} -\title{A Master Thesis Example Document} -\degreeprogramme{Computer Science} -\matrnumber{0815} -\supervisor{Prof.\,Dr.~Max Mustermann} -\advisor{Marianne Musterfrau} -\department{Faculty of Examples} -\institute{Chair of Example} -\location{Passau} - -\begin{document} - -\frontmatter - -\maketitle - -\authorshipDeclaration - -\begin{abstract} - An English abstract to the thesis. -\end{abstract} - -\begin{abstract}[german] - Eine deutschsprachige Zusammenfassung der Arbeit. -\end{abstract} - -\begin{acknowledgements} - Some acknowledgements. -\end{acknowledgements} - -\tableofcontents - -\mainmatter - -\blinddocument - -\section{Further Examples} - -We could reference the \TeX{} book~\cite{Knu86}. - -\begin{resq} - What is \(41 + 1\)? -\end{resq} - -\begin{summary}{Research Question 1} - It's 42, obviously! -\end{summary} - -\backmatter - -\printbibliography - -\end{document} -- cgit v1.2.3