summaryrefslogtreecommitdiff
path: root/macros/latex/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib')
-rw-r--r--macros/latex/contrib/changebar/CATALOG2
-rw-r--r--macros/latex/contrib/changebar/README2
-rw-r--r--macros/latex/contrib/changebar/changebar.bug3
-rw-r--r--macros/latex/contrib/changebar/changebar.dtx11
-rw-r--r--macros/latex/contrib/changebar/changebar.ins4
-rw-r--r--macros/latex/contrib/changebar/changebar.pdfbin484332 -> 486497 bytes
-rw-r--r--macros/latex/contrib/docshots/DEPENDS.txt23
-rw-r--r--macros/latex/contrib/docshots/LICENSE.txt2
-rw-r--r--macros/latex/contrib/docshots/README.md2
-rw-r--r--macros/latex/contrib/docshots/docshots.dtx24
-rw-r--r--macros/latex/contrib/docshots/docshots.ins4
-rw-r--r--macros/latex/contrib/docshots/docshots.pdfbin340901 -> 341476 bytes
-rw-r--r--macros/latex/contrib/easybook/easybook.dtx6
-rw-r--r--macros/latex/contrib/easybook/easybook.pdfbin592288 -> 592282 bytes
-rw-r--r--macros/latex/contrib/easybook/easybook.tex15
-rw-r--r--macros/latex/contrib/href-ul/DEPENDS.txt18
-rw-r--r--macros/latex/contrib/href-ul/LICENSE.txt2
-rw-r--r--macros/latex/contrib/href-ul/README.md2
-rw-r--r--macros/latex/contrib/href-ul/href-ul.dtx46
-rw-r--r--macros/latex/contrib/href-ul/href-ul.ins4
-rw-r--r--macros/latex/contrib/href-ul/href-ul.pdfbin283808 -> 300457 bytes
-rw-r--r--macros/latex/contrib/l3build/CHANGELOG.md10
-rw-r--r--macros/latex/contrib/l3build/README.md2
-rw-r--r--macros/latex/contrib/l3build/l3build-check.lua2
-rw-r--r--macros/latex/contrib/l3build/l3build.138
-rw-r--r--macros/latex/contrib/l3build/l3build.dtx19
-rwxr-xr-xmacros/latex/contrib/l3build/l3build.lua2
-rw-r--r--macros/latex/contrib/l3build/l3build.pdfbin747742 -> 749004 bytes
-rw-r--r--macros/latex/contrib/ukbill/README4
-rw-r--r--macros/latex/contrib/ukbill/immigration-bill.pdfbin85092 -> 85123 bytes
-rw-r--r--macros/latex/contrib/ukbill/ukbill-documentation.pdfbin101813 -> 102709 bytes
-rw-r--r--macros/latex/contrib/ukbill/ukbill-documentation.tex16
-rw-r--r--macros/latex/contrib/ukbill/ukbill.cls12
-rw-r--r--macros/latex/contrib/ukbill/ukbill.pdfbin0 -> 5829 bytes
34 files changed, 204 insertions, 71 deletions
diff --git a/macros/latex/contrib/changebar/CATALOG b/macros/latex/contrib/changebar/CATALOG
index 74e408ac34..50cd35da78 100644
--- a/macros/latex/contrib/changebar/CATALOG
+++ b/macros/latex/contrib/changebar/CATALOG
@@ -1,7 +1,7 @@
Name: ChangeBar
Problems-To: johannes.braams(at)texniek.nl
Author: J.L. Braams
-Version: 3.7c
+Version: 3.7d
Description:
diff --git a/macros/latex/contrib/changebar/README b/macros/latex/contrib/changebar/README
index 847be179da..2a9c69bad7 100644
--- a/macros/latex/contrib/changebar/README
+++ b/macros/latex/contrib/changebar/README
@@ -1,6 +1,6 @@
changebar bundle
- January 1, 2024
+ January 9, 2024
This bundle contains a package that I maintain to add changebars to a
LaTeX document.
diff --git a/macros/latex/contrib/changebar/changebar.bug b/macros/latex/contrib/changebar/changebar.bug
index 4d2b9fa0a7..d661332150 100644
--- a/macros/latex/contrib/changebar/changebar.bug
+++ b/macros/latex/contrib/changebar/changebar.bug
@@ -216,6 +216,9 @@
% v3.7c JLB: Arash Esbati reported inconsistent spacing whit or without the
% optional argumenty to \cbstart or \begin{changebar}.
%
+% v3.7d JLB: Arash Esbati reported a simlar phenomenon when \nochangebars
+% is used. Similar solution was needed.
+%
% Known problems
% - changebars for marginal paragraphs collide with changebars
% for the main body of text
diff --git a/macros/latex/contrib/changebar/changebar.dtx b/macros/latex/contrib/changebar/changebar.dtx
index 2c67180adb..406ccf5290 100644
--- a/macros/latex/contrib/changebar/changebar.dtx
+++ b/macros/latex/contrib/changebar/changebar.dtx
@@ -24,7 +24,7 @@
% and covered by LPPL is defined by the unpacking scripts (with
% extension .ins) which are part of the distribution.
% \fi
-% \CheckSum{2953}
+% \CheckSum{2954}
%
%\iffalse
% This file is built for \LaTeXe, so we make sure an error is
@@ -39,7 +39,7 @@
\ProvidesFile{changebar.dtx}
%</dtx>
%<+package>\ProvidesPackage{changebar}
- [2024/01/01 v3.7c Indicate changes with marginal bars]
+ [2024/01/09 v3.7d Indicate changes with marginal bars]
% \end{macrocode}
%
% \section{A driver for this document}
@@ -2290,11 +2290,14 @@
% To disable changebars altogether without having to remove them
% from the document the macro |\nochangebars| is provided. It makes
% no-ops of three internal macros.
+% \changes{v3.7d}{2024/01/09}{Make sure spaces are ignored (cf. change
+% 3.7c)}
% \begin{macrocode}
\newcommand*{\nochangebars}{%
- \def\cb@start[##1]{}%
+ \def\cb@start[##1]{\ignorespaces}%
\def\cb@delete[##1]{}%
- \let\cb@end\relax}
+ \def\cb@end{\ignorespacesafterend}
+ }
% \end{macrocode}
% \end{macro}
%
diff --git a/macros/latex/contrib/changebar/changebar.ins b/macros/latex/contrib/changebar/changebar.ins
index f9c86c4943..8de997825c 100644
--- a/macros/latex/contrib/changebar/changebar.ins
+++ b/macros/latex/contrib/changebar/changebar.ins
@@ -10,7 +10,7 @@
%%
%% IMPORTANT NOTICE:
%%
-%% Copyright (C) 1994-2023 Johannes Braams, All rights reserved.
+%% Copyright (C) 1994-2024 Johannes Braams, All rights reserved.
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN
@@ -24,7 +24,7 @@
\preamble
This is a generated file.
-Copyright (C) 1994-2023 Johannes Braams, All rights reserved.
+Copyright (C) 1994-2024 Johannes Braams, All rights reserved.
This file was generated from file(s) of the changebar package.
--------------------------------------------------------------
diff --git a/macros/latex/contrib/changebar/changebar.pdf b/macros/latex/contrib/changebar/changebar.pdf
index ef79e6b5dc..b313fe1c53 100644
--- a/macros/latex/contrib/changebar/changebar.pdf
+++ b/macros/latex/contrib/changebar/changebar.pdf
Binary files differ
diff --git a/macros/latex/contrib/docshots/DEPENDS.txt b/macros/latex/contrib/docshots/DEPENDS.txt
index 42b2d30ead..e3b60fe89b 100644
--- a/macros/latex/contrib/docshots/DEPENDS.txt
+++ b/macros/latex/contrib/docshots/DEPENDS.txt
@@ -1,10 +1,21 @@
-hard iexec
hard fancyvrb
-hard pdfcrop
-hard pgf
-hard pgfopts
+hard iexec
hard listings
hard minted
+hard pdfcrop
hard pdftexcmds
-hard ifluatex
-hard ifxetex
+hard pgf
+hard pgfopts
+soft biber
+soft biblatex
+soft ffcode
+soft href-ul
+soft hypdoc
+soft l3build
+soft libertine
+soft microtype
+soft newtx
+soft scheme-basic
+soft tools
+soft xetex
+soft upquote \ No newline at end of file
diff --git a/macros/latex/contrib/docshots/LICENSE.txt b/macros/latex/contrib/docshots/LICENSE.txt
index bd949ffdab..1f211e0287 100644
--- a/macros/latex/contrib/docshots/LICENSE.txt
+++ b/macros/latex/contrib/docshots/LICENSE.txt
@@ -1,6 +1,6 @@
(The MIT License)
-Copyright (c) 2021-2022 Yegor Bugayenko
+Copyright (c) 2021-2024 Yegor Bugayenko
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the 'Software'), to deal
diff --git a/macros/latex/contrib/docshots/README.md b/macros/latex/contrib/docshots/README.md
index 839ad7a513..675a17cb3b 100644
--- a/macros/latex/contrib/docshots/README.md
+++ b/macros/latex/contrib/docshots/README.md
@@ -28,7 +28,7 @@ For more informaiton, read \TeX{} Book by Donald Knuth.
\end{document}
```
-Otherwise, you can download [`docshots.sty`](https://raw.githubusercontent.com/yegor256/docshots/gh-pages/docshots/docshots.sty) and add to your project.
+Otherwise, you can download [`docshots.sty`](https://yegor256.github.io/docshots/docshots.sty) and add to your project.
If you want to contribute yourself, make a fork, then create a branch,
then run `l3build ctan` in the root directory.
diff --git a/macros/latex/contrib/docshots/docshots.dtx b/macros/latex/contrib/docshots/docshots.dtx
index 438938f870..393f867408 100644
--- a/macros/latex/contrib/docshots/docshots.dtx
+++ b/macros/latex/contrib/docshots/docshots.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% (The MIT License)
%
-% Copyright (c) 2021-2022 Yegor Bugayenko
+% Copyright (c) 2021-2024 Yegor Bugayenko
%
% Permission is hereby granted, free of charge, to any person obtaining a copy
% of this software and associated documentation files (the 'Software'), to deal
@@ -50,7 +50,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\ProvidesPackage{docshots}
%<*package>
-[2022-11-29 0.4.0 TeX Samples Next to Their PDF Snapshots in DTX]
+[2024-01-09 0.4.1 TeX Samples Next to Their PDF Snapshots in DTX]
%</package>
%<*driver>
\documentclass{ltxdoc}
@@ -623,16 +623,22 @@ Hello, world!
% \end{macrocode}
% We configure |fancyvrb|:
% \begin{macrocode}
- \fvset{numbers=left,numbersep=3pt}%
- \fvset{frame=leftline,framerule=.2pt,rulecolor=\color{gray}}%
- \fvset{samepage=true}%
- \fvset{baselinestretch=1}%
+ \def\docshots@xopts{
+ numbers=left,numbersep=3pt,
+ frame=leftline,framerule=.2pt,rulecolor=\color{gray},
+ samepage=true,
+ commandchars=none,
+ baselinestretch=1
+ }%
\ifdefined\docshots@small%
- \fvset{fontsize=\small}%
+ \edef\docshots@xopts{\unexpanded\expandafter{\docshots@xopts},fontsize=\small}%
\fi%
\ifdefined\docshots@tiny%
- \fvset{fontsize=\scriptsize}%
+ \edef\docshots@xopts{\unexpanded\expandafter{\docshots@xopts},fontsize=\scriptsize}%
\fi%
+ \ifdefined\docshots@opts
+ \edef\docshots@xopts{\unexpanded\expandafter{\docshots@xopts},\docshots@opts}
+ \fi
% \end{macrocode}
% Finally, we render the two-column content:
% \begin{macrocode}
@@ -654,7 +660,7 @@ Hello, world!
{\docshots@inputminted}
{\docshots@tmpdir/\jobname/\hash.tex}%
\else%
- \expandafter\VerbatimInput\expandafter[\docshots@opts]
+ \expandafter\VerbatimInput\expandafter[\docshots@xopts]
{\docshots@tmpdir/\jobname/\hash.tex}%
\fi\fi%
\vspace{0pt}%
diff --git a/macros/latex/contrib/docshots/docshots.ins b/macros/latex/contrib/docshots/docshots.ins
index d7ba42bfee..aac261d2d4 100644
--- a/macros/latex/contrib/docshots/docshots.ins
+++ b/macros/latex/contrib/docshots/docshots.ins
@@ -1,6 +1,6 @@
%% (The MIT License)
%%
-%% Copyright (c) 2021-2022 Yegor Bugayenko
+%% Copyright (c) 2021-2024 Yegor Bugayenko
%%
%% Permission is hereby granted, free of charge, to any person obtaining a copy
%% of this software and associated documentation files (the 'Software'), to deal
@@ -26,7 +26,7 @@
\preamble
(The MIT License)
-Copyright (c) 2021-2022 Yegor Bugayenko
+Copyright (c) 2021-2024 Yegor Bugayenko
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the 'Software'), to deal
diff --git a/macros/latex/contrib/docshots/docshots.pdf b/macros/latex/contrib/docshots/docshots.pdf
index a9b34346b3..903ad5d3ce 100644
--- a/macros/latex/contrib/docshots/docshots.pdf
+++ b/macros/latex/contrib/docshots/docshots.pdf
Binary files differ
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index 9d435384a2..5bc284e694 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}{2024/01/08}{2024E}
+\ProvidesExplClass{easybook}{2024/01/10}{2024F}
{Easily typesetting Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -302,7 +302,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2024/01/08}{2024E}
+\ProvidesExplPackage{easybase}{2024/01/10}{2024F}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -2326,7 +2326,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/01/08}{2024E}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/01/10}{2024F}
{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 d700f1cfd7..e45cbbca7e 100644
--- a/macros/latex/contrib/easybook/easybook.pdf
+++ b/macros/latex/contrib/easybook/easybook.pdf
Binary files differ
diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex
index 07b4ad1665..feb54cec19 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 = v2024E,
- date = 2024/01/08,
+ version = v2024F,
+ date = 2024/01/10,
authors = 瞿毅,
info = 简便地排版中文学位论文或书籍,
email = toquyi@163.com,
@@ -89,6 +89,7 @@
\newsplitarg{\splitmarg}{\{}{\}}
\newsplitarg[\code{|}]{\baroarg}{[}{]}
\newcommand{\harg}{\textcolor{argument}{\code{-}}}
+\newcommand{\HoLogo@TeXLive}[1]{\hologo{TeX}\HOLOGO@space\HOLOGO@mbox{Live}}
% Remove default braces of values
\RenewDocumentCommand{\key}{s}
{
@@ -285,7 +286,7 @@
\begin{options}
\keychoice{font}{noto,times,times*,ebgaramond,libertine,palatino,\fbox{auto}}\dtag
- 预置的英文字体相关配置方案如下表所示。这些字体已经包含在了 \TeX Live 发行版中,所以通常不需要再专门安装。如果您想使用其它英文字体,可以使用 \pkg*{fontspec} 宏包的相关命令进行设置。
+ 预置的英文字体相关配置方案如下表所示。这些字体已经包含在了 \hologo{TeXLive} 发行版中,所以通常不需要再专门安装。如果您想使用其它英文字体,可以使用 \pkg*{fontspec} 宏包的相关命令进行设置。
\insertalltblr[
remark{\ding{72}} = \code{times*} 方案为 \textsf{windows} 系统的预置字体。
]{
@@ -543,7 +544,7 @@
\subsection[定理样式]{定理样式\smodule{thmset}}
\label{subsec:theorem of style}
-模块 \module*{thmset} 由 \pkg*{thmtools} 宏包提供支持,主要提供了定理声明和样式声明两个命令。定理声明命令使用的定理样式由样式声明命令提供,文档类预置了一个定理样式 \code{fancy}。
+模块 \module*{thmset} 由 \pkg*{thmtools} 宏包提供支持,主要提供了定理声明和样式声明两个命令。定理声明命令使用的定理样式由样式声明命令提供,文档类预置了一个定理样式 \code{default}。
\begin{commands}
\command{declaretheorem}[\oarg{键值列表1}\marg{环境名}\oarg{键值列表2}]
定理环境声明命令。可选参数的 \meta{键值列表1} 与 \meta{键值列表2} 等效,其中常用的选项如下:
@@ -609,7 +610,7 @@
\subsection[页面尺寸]{页面尺寸\smodule{geoset}}
\label{subsec:page margins}
-模块 \module*{geoset} 会将除了前两个附加的选项交给页面尺寸宏包 \pkg*{geometry} 处理,并且支持它的键值列表,预置的页面尺寸与 \textsf{Word} 的默认值接近。下面列举几种代表性选项,其它选项可查阅宏包帮助文档。当在此设置纸张规格时,会覆盖文类选项 \option{paper} 的设置。
+模块 \module*{geoset} 会将选项(除了前两个为附加)交给页面尺寸宏包 \pkg*{geometry} 处理,并且支持它的键值列表,预置的页面尺寸与 \textsf{Word} 的默认值接近。下面列举几种代表性选项,其它选项可查阅宏包帮助文档。当在此设置纸张规格时,会覆盖文类选项 \option{paper} 的设置。
\begin{options}\noitemsep
\keyval{headruleskip}{页眉线间距}\Default*{0pt}
\keyval{footruleskip}{页脚线间距}\Default*{3.5pt}
@@ -707,7 +708,7 @@
\keychoice{fnmark-num}{\fbox{plain},pifont,pifont*,pisans,pisans*,short num}
脚注正文标记编号的类型。默认为原生样式 \code{plain},还可以改为 \code{pifont} 的各个版本,从左往右依次为普通版、阴文衬线版、阳文无衬线版和阴文无衬线版,缺点是它们的编号仅包括1-10。
- 短编号的参数与列表环境类似,有1、A、a、I和i,除此之外还增加了中文数字 \code{c} 和符号 \code{s} 格式。原生样式 \code{plain} 等同于单独使用数字 \code{1} 参数。这个选项可以用在正文中改变其后脚注编号类型。
+ 短编号的参数与列表环境类似,有 \code{1}、\code{A}、\code{a}、\code{I} 和 \code{i},除此之外还增加了中文数字 \code{c} 和符号 \code{s} 格式。原生样式 \code{plain} 等同于单独使用数字 \code{1} 参数。这个选项可以用在正文中改变其后脚注编号类型。
\begin{commands}
\command{footref}[\marg{脚注标签名}]
在当前位置对自动编号的脚注进行引用,与被引用的正文标记共享一个编号与格式。
@@ -1335,7 +1336,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} 宏包。}
- \shortversion{v = 2024E,date = 2024/01/08,changes = 核对依赖宏包的更新改动,优化使用手册的内容细节。}
+ \shortversion{v = 2024F,date = 2024/01/10,changes = 核对依赖宏包的更新改动,优化使用手册的内容细节。}
\end{changelog}
\nocite{*}
diff --git a/macros/latex/contrib/href-ul/DEPENDS.txt b/macros/latex/contrib/href-ul/DEPENDS.txt
index ba572a3763..3712b603b2 100644
--- a/macros/latex/contrib/href-ul/DEPENDS.txt
+++ b/macros/latex/contrib/href-ul/DEPENDS.txt
@@ -1,2 +1,18 @@
-hard ulem
hard hyperref
+hard ulem
+hard pgfopts
+soft docshots
+soft environ
+soft etoolbox
+soft href-ul
+soft hypdoc
+soft l3build
+soft libertine
+soft mathtools
+soft microtype
+soft pdfcrop
+soft pgf
+soft pgfopts
+soft scheme-basic
+soft tools
+soft xetex
diff --git a/macros/latex/contrib/href-ul/LICENSE.txt b/macros/latex/contrib/href-ul/LICENSE.txt
index bd949ffdab..1f211e0287 100644
--- a/macros/latex/contrib/href-ul/LICENSE.txt
+++ b/macros/latex/contrib/href-ul/LICENSE.txt
@@ -1,6 +1,6 @@
(The MIT License)
-Copyright (c) 2021-2022 Yegor Bugayenko
+Copyright (c) 2021-2024 Yegor Bugayenko
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the 'Software'), to deal
diff --git a/macros/latex/contrib/href-ul/README.md b/macros/latex/contrib/href-ul/README.md
index 8ad680d582..d5a941ed61 100644
--- a/macros/latex/contrib/href-ul/README.md
+++ b/macros/latex/contrib/href-ul/README.md
@@ -18,7 +18,7 @@ Go to \href{https://www.google.com}{Google}!
\end{document}
```
-Otherwise, you can download [`to-be-determined.sty`](https://raw.githubusercontent.com/yegor256/href-ul/gh-pages/href-ul/href-ul.sty) and add to your project.
+Otherwise, you can download [`href-ul.sty`](https://yegor256.github.io/href-ul/href-ul.sty) and add to your project.
If you want to contribute yourself, make a fork, then create a branch,
then run `l3build ctan` in the root directory.
diff --git a/macros/latex/contrib/href-ul/href-ul.dtx b/macros/latex/contrib/href-ul/href-ul.dtx
index 82aa5e6f70..e0c410d9cc 100644
--- a/macros/latex/contrib/href-ul/href-ul.dtx
+++ b/macros/latex/contrib/href-ul/href-ul.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% (The MIT License)
%
-% Copyright (c) 2021-2022 Yegor Bugayenko
+% Copyright (c) 2021-2024 Yegor Bugayenko
%
% Permission is hereby granted, free of charge, to any person obtaining a copy
% of this software and associated documentation files (the 'Software'), to deal
@@ -50,7 +50,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\ProvidesPackage{href-ul}
%<*package>
-[31.10.20220 0.3.0 Underlined Hyperlinks]
+[09.01.20240 0.4.0 Underlined Hyperlinks]
%</package>
%<*driver>
\documentclass{ltxdoc}
@@ -117,16 +117,47 @@
% \end{document}
% \end{docshot}
+% With the help of the |plain| package option, it's possible to avoid underscores:
+% \docshotOptions{firstline=3,lastline=7}
+% \begin{docshot}
+% \documentclass{article}
+% \pagestyle{empty}
+% \usepackage[plain]{href-ul}
+% \begin{document}
+% This link has no underscore: \\
+% \href{https://google.com}{Google}.
+% \end{document}
+% \end{docshot}
+
% \StopEventually{}
% \section{Implementation}
% \changes{v0.2.0}{2021/06/11}{Initial version}
% \changes{v0.3.0}{2022/10/31}{We started using "docshots" package for better rendering of examples.}
-% First, we include two packages:
+% First, we process package options:
+% \changes{0.4.0}{2024/01/09}{Package options processing introduced with a single \texttt{plain} option.}
% \begin{macrocode}
+\RequirePackage{pgfopts}
+\pgfkeys{
+ /href/.cd,
+ plain/.store in=\href@plain
+}
+\ProcessPgfPackageOptions{/href}
+% \end{macrocode}
+
+% Then, we include the |ulem| package in order to enable underscores:
+% \begin{macrocode}
+\makeatletter
+\ifdefined\href@plain\else
\PassOptionsToPackage{normalem}{ulem}
\RequirePackage{ulem}
+\fi
+\makeatother
+% \end{macrocode}
+
+% Then, we include the |hyperref| package for PDF hyperlinks:
+% \begin{macrocode}
\PassOptionsToPackage{hidelinks}{hyperref}
\RequirePackage{hyperref}
% \end{macrocode}
@@ -134,14 +165,17 @@
% \begin{macro}{\href}
% Then, we define the |\href| command:
% \begin{macrocode}
-\makeatletter\begingroup%
+\makeatletter%
+\begingroup%
\catcode`\$=6 %
\catcode`\#=12 %
\gdef\href@split$1#$2#$3\\$4{%
- \hyper@@link{$1}{$2}{\uline{$4}}%
+ \hyper@@link{$1}{$2}{%
+ \ifdefined\href@plain$4\else\uline{$4}\fi}%
\endgroup%
}%
-\endgroup\makeatother
+\endgroup%
+\makeatother%
% \end{macrocode}
% \end{macro}
diff --git a/macros/latex/contrib/href-ul/href-ul.ins b/macros/latex/contrib/href-ul/href-ul.ins
index abfcb368ff..332400c0dc 100644
--- a/macros/latex/contrib/href-ul/href-ul.ins
+++ b/macros/latex/contrib/href-ul/href-ul.ins
@@ -1,6 +1,6 @@
%% (The MIT License)
%%
-%% Copyright (c) 2021-2022 Yegor Bugayenko
+%% Copyright (c) 2021-2024 Yegor Bugayenko
%%
%% Permission is hereby granted, free of charge, to any person obtaining a copy
%% of this software and associated documentation files (the 'Software'), to deal
@@ -26,7 +26,7 @@
\preamble
(The MIT License)
-Copyright (c) 2021-2022 Yegor Bugayenko
+Copyright (c) 2021-2024 Yegor Bugayenko
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the 'Software'), to deal
diff --git a/macros/latex/contrib/href-ul/href-ul.pdf b/macros/latex/contrib/href-ul/href-ul.pdf
index 46b31bf10a..53dc60a20b 100644
--- a/macros/latex/contrib/href-ul/href-ul.pdf
+++ b/macros/latex/contrib/href-ul/href-ul.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3build/CHANGELOG.md b/macros/latex/contrib/l3build/CHANGELOG.md
index c06b9a380f..02ad0179e1 100644
--- a/macros/latex/contrib/l3build/CHANGELOG.md
+++ b/macros/latex/contrib/l3build/CHANGELOG.md
@@ -7,6 +7,13 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
+## [2024-01-09]
+
+### Fixed
+- Type of return value of `runtest_tasks()` in doc
+- Print failures correctly when these occur in multiple configurations
+ including the core (`build`) one
+
## [2024-01-04]
### Changed
@@ -753,7 +760,8 @@ this project uses date-based 'snapshot' version identifiers.
- Rationalise short option names: removed `-d`, `-E`, `-r`
- Target `cmdcheck`: specific to LaTeX kernel work
-[Unreleased]: https://github.com/latex3/l3build/compare/2024-01-04...HEAD
+[Unreleased]: https://github.com/latex3/l3build/compare/2024-01-09...HEAD
+[2024-01-09]: https://github.com/latex3/l3build/compare/2024-01-04...2024-01-09
[2024-01-04]: https://github.com/latex3/l3build/compare/2023-12-15...2024-01-04
[2023-12-15]: https://github.com/latex3/l3build/compare/2023-12-13-2...2023-12-15
[2023-12-13-2]: https://github.com/latex3/l3build/compare/2023-12-13...2023-12-13-2
diff --git a/macros/latex/contrib/l3build/README.md b/macros/latex/contrib/l3build/README.md
index c2bba6cc5b..1196dc6d42 100644
--- a/macros/latex/contrib/l3build/README.md
+++ b/macros/latex/contrib/l3build/README.md
@@ -1,7 +1,7 @@
l3build: a testing and building system for LaTeX
=================================================
-Release 2024-01-04
+Release 2024-01-09
Overview
--------
diff --git a/macros/latex/contrib/l3build/l3build-check.lua b/macros/latex/contrib/l3build/l3build-check.lua
index 1f2b04ce5a..2a50c590db 100644
--- a/macros/latex/contrib/l3build/l3build-check.lua
+++ b/macros/latex/contrib/l3build/l3build-check.lua
@@ -1058,7 +1058,7 @@ end
-- A short auxiliary to print the list of differences for check
function checkdiff(config)
local testdir = testdir
- if config then
+ if config and config ~= "build" then
testdir = testdir .. "-" .. config
end
local diff_files = ordered_filelist(testdir, "*" .. os_diffext)
diff --git a/macros/latex/contrib/l3build/l3build.1 b/macros/latex/contrib/l3build/l3build.1
index e6d604b560..47462ae7a4 100644
--- a/macros/latex/contrib/l3build/l3build.1
+++ b/macros/latex/contrib/l3build/l3build.1
@@ -1,4 +1,4 @@
-.TH l3build 1 "2024-01-04"
+.TH l3build 1 "2024-01-09"
.SH NAME
l3build \- Checking and building packages
.SH SYNOPSIS
@@ -10,53 +10,77 @@ can be used by any modern TeX distribution with the texlua interpreter. A
package for building with l3build can be written in any TeX dialect; its
defaults are set up for LaTeX packages written in the DocStrip style.
.PP
-The most commonly used l3build targets are:
+The standard l3build targets are:
.IP check
Run all automated tests
.IP clean
Clean out directory tree
+.IP ctan
+Create CTAN-ready archive
.IP doc
Typesets all documentation files
.IP install
Installs files into the local texmf tree
+.IP manifest
+Creates a manifest file
.IP save
Saves test validation log
.IP tag
-Update release tags in files
+Updates release tags in files
.IP uninstall
Uninstalls files from the local texmf tree
.IP unpack
Unpacks the source files into the build tree
+.IP upload
+Send archive to CTAN for public release
.SH OPTIONS
-Various options apply
+Various options apply
.IP --config|-c
Sets the config(s) used for running tests
.IP --date
Sets the date to insert into sources
+.IP --debug
+Runs target in debug mode
+.IP --dirty
+Skip cleaning up the test area
.IP --dry-run
-Dry run for install
+Dry run for install or upload
+.IP --email
+Email address of CTAN uploader
.IP --engine|-e
Sets the engine(s) to use for running test
.IP --epoch
Sets the epoch for tests and typesetting
+.IP --file|-F
+Take the upload announcement from the given file
.IP --first
Name of first test to run
.IP --force|-f
Force tests to run if engine is not set up
+.IP --full
+Install all files
.IP --halt-on-error|-H
Stops running tests after the first failure
+.IP --help|-h
+Print help message and exit
.IP --last
Name of last test to run
-.IP --pdf|-p
-Check/save PDF files
+.IP --message|-m
+Text for upload announcement message
.IP --quiet|-q
Suppresses TeX output when unpacking
.IP --rerun
Skip setup: simply rerun tests
+.IP --show-log-on-error
+Show the full log of the failure with 'halt-on-error'
+.IP --show-saves|-S
+Show the invocation to update failing .tlg files
.IP --shuffle
Shuffle order of tests
.IP --texmfhome
Location of user texmf tree
+.IP --version
+Print version information and exit
.SH BUGS
.SH AUTHOR
The LaTeX Project (latex-team@latex-project.org)
diff --git a/macros/latex/contrib/l3build/l3build.dtx b/macros/latex/contrib/l3build/l3build.dtx
index 047f43f4df..e02dfd6f53 100644
--- a/macros/latex/contrib/l3build/l3build.dtx
+++ b/macros/latex/contrib/l3build/l3build.dtx
@@ -251,7 +251,7 @@
% }^^A
% }
%
-% \date{Released 2024-01-04}
+% \date{Released 2024-01-09}
%
% \maketitle
% \tableofcontents
@@ -713,24 +713,28 @@
%
% For example, for the core \LaTeXe{} tests the main test files are contained
% in a directory |testfiles|. To test font loading for \XeTeX{} and \LuaTeX{}
-% there are a second set of tests in |testfiles-TU| which use the short
-% |config-TU.lua| file shown in Listing~\vref{lst:configs}. To run both sets of
-% tests, the main |build.lua| file contains the setting
+% there are a second set of tests in |testfiles-TU| which use a short
+% |config-TU.lua| file similar to the one shown in Listing~\vref{lst:configs}.
+% To run both sets of tests, the main |build.lua| file contains the setting
% |checkconfigs = {"build", "config-TU"}|. This will cause \pkg{l3build} to run
% first using no additional settings (\emph{i.e.}~reading the normal
% |build.lua| file alone), then running \emph{also} loading the settings from
% |config-TU.lua|.
% \begin{floating-listing}[caption={Example of using additional (or overriding) settings for configuring tests in a different subdirectory.},label={lst:configs}]
% -- Special config for these tests
-% checksearch = true
+% stdengine = "xetex"
% checkengines = {"xetex","luatex"}
+% checksearch = true
% testfiledir = "testfiles-TU"
% \end{floating-listing}
%
% To allow selection of one or more configurations, and to allow saving of
% |.tlg| files in non-standard configurations, the |--config| (|-c|) option may
% be used. This works in the same way as |--engine|: it takes a comma list of
-% configurations to apply, overriding \var{checkconfigs}.
+% configurations to apply, overriding \var{checkconfigs}. For example, in the
+% directory containing |config-TU.lua|, you can use
+% |l3build check -cconfig-TU <name(s)>| and |l3build save -cconfig-TU <name(s)>|
+% to check and save tests in |testfiles-TU| directory.
%
% \subsection{Dependencies}
%
@@ -1157,7 +1161,8 @@
% of the current test (this is equivalent to \TeX{}'s \cs{jobname},
% \emph{i.e.}~it lacks an extension) and the current run number.
% The function |runtest_tasks| is run after the main call to the
-% engine for a test cycle. It should return an errorlevel value.
+% engine for a test cycle. It should return a string consists of task(s),
+% i.e., the CLI command(s) to execute.
% If more than one task is required, these should be separated
% by use of |os_concat|, a string variable defined by \pkg{l3build} as the
% correct concatenation marker for the system. An example of |runtest_tasks|
diff --git a/macros/latex/contrib/l3build/l3build.lua b/macros/latex/contrib/l3build/l3build.lua
index 995eefe533..8b0dcbda6f 100755
--- a/macros/latex/contrib/l3build/l3build.lua
+++ b/macros/latex/contrib/l3build/l3build.lua
@@ -25,7 +25,7 @@ for those people who are interested.
--]]
-- Version information
-release_date = "2024-01-04"
+release_date = "2024-01-09"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")
diff --git a/macros/latex/contrib/l3build/l3build.pdf b/macros/latex/contrib/l3build/l3build.pdf
index 763d37dc2d..8883e78d95 100644
--- a/macros/latex/contrib/l3build/l3build.pdf
+++ b/macros/latex/contrib/l3build/l3build.pdf
Binary files differ
diff --git a/macros/latex/contrib/ukbill/README b/macros/latex/contrib/ukbill/README
index eee87a03d6..74a97b2246 100644
--- a/macros/latex/contrib/ukbill/README
+++ b/macros/latex/contrib/ukbill/README
@@ -12,6 +12,10 @@ For suggestions, feature requests, and bug reports, please use the project's
GitHub site: https://github.com/ezgranet/ukbill
Version history:
+08/01/2024: v 1.2.1 vertical indent for nostat environment fixed
+
+
+
06/01/2024: v 1.2 fixed issues with macros not being properly used in template environment
13/12/2022: v 1.0.2 fixed indent with nostat environment
diff --git a/macros/latex/contrib/ukbill/immigration-bill.pdf b/macros/latex/contrib/ukbill/immigration-bill.pdf
index 8ebc864b30..3ca215c7d9 100644
--- a/macros/latex/contrib/ukbill/immigration-bill.pdf
+++ b/macros/latex/contrib/ukbill/immigration-bill.pdf
Binary files differ
diff --git a/macros/latex/contrib/ukbill/ukbill-documentation.pdf b/macros/latex/contrib/ukbill/ukbill-documentation.pdf
index 87b172449d..7985e53081 100644
--- a/macros/latex/contrib/ukbill/ukbill-documentation.pdf
+++ b/macros/latex/contrib/ukbill/ukbill-documentation.pdf
Binary files differ
diff --git a/macros/latex/contrib/ukbill/ukbill-documentation.tex b/macros/latex/contrib/ukbill/ukbill-documentation.tex
index f8f1de1635..07060aa38f 100644
--- a/macros/latex/contrib/ukbill/ukbill-documentation.tex
+++ b/macros/latex/contrib/ukbill/ukbill-documentation.tex
@@ -25,7 +25,7 @@ ItalicFont={Palatine Parliamentary Italic}]{Palatine Parliamentary Regular}
\newcommand{\thebox}{{\boxy ▯}}
%\usepackage[firstnumber=last]{fancyvrb}
\usepackage{minted}
-\date{\today\\\smallskip\ttfamily Version 1.2.0}
+\date{\today\\\smallskip\ttfamily Version 1.2.1}
\author{Elijah Z Granet\thanks{e-mail: \href{mailto:ezg21@cantab.ac.uk}{\ttfamily ezg21@cantab.ac.uk}}}
\title{\texttt{ukbill}:\\A package for typesetting UK legislation}
@@ -143,6 +143,11 @@ Private bills have a different enacting formula and also make use of recitals. D
\section{Licence}
This project is licensed under the Latex Public Project Licence version 1.3\textit{c}. This documentation is copyright of the author but licensed under CC-BY-SA 4.0.
\section{Version History}
+
+\subsection{\normalfont\texttt{1.2.1}} v 1.2.1 \ttfamily 8 January 2024: vertical indent for nostat environment fixed
+
+\subsection{\normalfont\texttt{1.2.0}} \ttfamily 6 January 2024: fixed issues with macros not being properly used in template environment
+
\subsection{\normalfont\texttt{1.0.2}}
\ttfamily 13 December 2022: fixed an error with changes made in 1.0.2
\subsection{\normalfont\texttt{1.0.2}}
@@ -568,7 +573,14 @@ BoldFont={PalatineP-Bold},
}%
\item[]}%
{\end{list}}
-\newenvironment{nostat}{\begin{enumerate}[nosep,leftmargin=1.7cm,labelindent=0pt,itemindent=0pt,label=]}{\end{enumerate}}
+\newenvironment{nostat}{\begin{enumerate}[nosep,partopsep=0pt,
+%parsep=0.5ex,
+%itemsep=1ex,
+labelsep=3ex,
+leftmargin=4em,rightmargin=1.5em,label=]%
+\item[]}%
+
+{\end{enumerate}}
\newenvironment{numstat}%
{%
%\vspace{-9ex}%
diff --git a/macros/latex/contrib/ukbill/ukbill.cls b/macros/latex/contrib/ukbill/ukbill.cls
index 36f393a5a9..92b39e8e76 100644
--- a/macros/latex/contrib/ukbill/ukbill.cls
+++ b/macros/latex/contrib/ukbill/ukbill.cls
@@ -1,6 +1,6 @@
\NeedsTeXFormat{LaTeX2e}
-\def\ukbillversionnumber{1.2.0}
-\ProvidesClass{ukbill}[2024-01-06 A Class for UK legislation]
+\def\ukbillversionnumber{1.2.1}
+\ProvidesClass{ukbill}[2024-01-08 A Class for UK legislation]
% !TeX program = lualatex
% !TeX encoding = utf8
% This work may be distributed and/or modified under the
@@ -399,7 +399,13 @@ BoldFont={PalatineP-Bold},
}%
\item[]}%
{\end{list}}
-\newenvironment{nostat}{\begin{enumerate}[nosep,leftmargin=1.7cm,labelindent=0pt,itemindent=0pt,label=]}{\end{enumerate}}
+\newenvironment{nostat}{\begin{enumerate}[nosep,partopsep=0pt,
+%parsep=0.5ex,
+%itemsep=1ex,
+labelsep=3ex,
+leftmargin=4em,rightmargin=1.5em,label=]%
+\item[]}%
+{\end{enumerate}}
\newenvironment{numstat}%
{%
%\vspace{-9ex}%
diff --git a/macros/latex/contrib/ukbill/ukbill.pdf b/macros/latex/contrib/ukbill/ukbill.pdf
new file mode 100644
index 0000000000..924a28fc29
--- /dev/null
+++ b/macros/latex/contrib/ukbill/ukbill.pdf
Binary files differ