summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2024-01-24 03:01:03 +0000
committerNorbert Preining <norbert@preining.info>2024-01-24 03:01:03 +0000
commit30e494c68ef358eeb09d53920dd0658dc9238f51 (patch)
tree6126efb698a9eece711552040e1057a38a1d9554 /macros
parent208ecf90e1d5a239ff2a8cd506c077d194d348c0 (diff)
CTAN sync 202401240301
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/easybook/easybook.dtx6
-rw-r--r--macros/latex/contrib/easybook/easybook.pdfbin599111 -> 599132 bytes
-rw-r--r--macros/latex/contrib/easybook/easybook.tex12
-rw-r--r--macros/latex/contrib/hvlogos/Changes1
-rw-r--r--macros/latex/contrib/hvlogos/doc/hvlogos-doc.pdfbin87052 -> 86730 bytes
-rw-r--r--macros/latex/contrib/hvlogos/doc/hvlogos-doc.tex2
-rw-r--r--macros/latex/contrib/hvlogos/latex/hvlogos.sty20
-rw-r--r--macros/latex/contrib/ppt-slides/ppt-slides.dtx5
-rw-r--r--macros/latex/contrib/ppt-slides/ppt-slides.pdfbin935899 -> 935972 bytes
-rw-r--r--macros/luatex/latex/lua-placeholders/doc/lua-placeholders-deps.bib6
-rw-r--r--macros/luatex/latex/lua-placeholders/doc/lua-placeholders-example/example.pdfbin67505 -> 67759 bytes
-rw-r--r--macros/luatex/latex/lua-placeholders/doc/lua-placeholders-manual.pdfbin256425 -> 257529 bytes
-rw-r--r--macros/luatex/latex/lua-placeholders/doc/lua-placeholders-manual.tex12
-rw-r--r--macros/luatex/latex/lua-placeholders/scripts/lua-placeholders-parser.lua21
-rw-r--r--macros/luatex/latex/lua-placeholders/scripts/lua-placeholders.lua4
-rw-r--r--macros/luatex/latex/lua-placeholders/tex/lua-placeholders.sty2
16 files changed, 55 insertions, 36 deletions
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index 0889094f34..bf2b48909d 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/19}{2024L}
+\ProvidesExplClass{easybook}{2024/01/23}{2024N}
{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/19}{2024L}
+\ProvidesExplPackage{easybase}{2024/01/23}{2024N}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -2323,7 +2323,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/01/19}{2024L}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/01/23}{2024N}
{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 55a91f1b6b..b55ed461ae 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 0387b7301c..cfc0c22370 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 = v2024L,
- date = 2024/01/19,
+ version = v2024N,
+ date = 2024/01/23,
authors = 瞿毅,
info = 简便地排版中文学位论文或书籍,
email = toquyi@163.com,
@@ -959,9 +959,9 @@
它们的星号变体命令使文中标题不编号,但是仍然加入双语目录,若英文标题参数空置那么仅加入中文目录而不加入英文目录,这一特点与 \cs*{chapter}\sarg{} 等命令的行为不太一样,在一些情况下会用到。可选参数是目录中的中文条目,默认与中文标题一致,正文标题过长时可用它设置在目录中显示的标题。默认情况下双语目录条目的格式是一致的,共享使用 \module*{tocset} 模块的设置。提供了两个选项 \option{biname} 和 \option{binumber} 修改英文目录章标题条目的名字及编号:
\begin{options}
\kvsplit{biname}{英文目录前名字,英文目录后名字}\Default{Chapter\cs*{space}}
- 更改英文目录 \code{chapter} 级别的标题编号前后名字,类似于 \CTeX 的 \option*{name} 选项。
+ 更改英文目录 \code{chapter} 级别的标题条目编号前后名字,类似于 \CTeX 的 \option*{name} 选项。
\keyval{binumber}{英文目录编号输出命令}\Default{\cs*{arabic}\Marg{chapter}}
- 更改英文目录 \code{chapter} 级别的标题编号输出格式,类似于 \CTeX 的 \option*{number} 选项。下面两种设置英文目录中章标题编号的方式等效:
+ 更改英文目录 \code{chapter} 级别的标题条目编号输出格式,类似于 \CTeX 的 \option*{number} 选项。下面两种设置英文目录中章标题编号的方式等效:
\end{options}
\begin{ctexexam}
\ctexset{chapter/binumber = \arabic{chapter}}
@@ -973,7 +973,7 @@
\command{appendix}[\splitoarg{前名字,后名字}\darg{编号输出命令}]
附录起始命令,其后的章节标题变为附录形式。\meta{前名字} 为英文目录中附录标题的前名字,同理 \meta{后名字} 为英文目录中附录标题的后名字。前后名字之间用一个半角逗号分开,也可以只有一部分,表示英文目录中附录标题前名字。\meta{编号输出命令} 为附录标题计数器在英文目录中的编号命令。注意这两个参数仅对 \code{bichapter} 级别的标题生效。
\command{BeforeAddBitoc}[\sarg\marg{英文标题加入目录前的代码}]
- 作用于局部范围的英文目录章节标题钩子,代码在标题加入目录前执行,可以插入条目标题定义命令临时改变英文目录中条目的格式,带有星号参数的命令会重置之前的代码。这个命令设置英文目录条目的标题格式具有最高优先级,放置在导言区或 \cs{bichapter} 等双语标题命令前生效。举一个在英文目录节标题编号前添加 \code{Section} 字符串的例子:
+ 作用于局部范围的英文目录标题条目钩子,代码在标题加入目录前执行,可以插入条目标题定义命令临时改变英文目录中条目的格式,带有星号参数的命令会重置之前的代码。这个命令设置英文目录条目的标题格式具有最高优先级,放置在导言区或 \cs{bichapter} 等双语标题命令前生效。举一个在英文目录节标题条目编号前添加 \code{Section} 字符串的例子:
\begin{ctexexam}
\BeforeAddBitoc{\ctexset{section/name = Section\space}}
\bisection{zhtitle}{entitle}
@@ -1350,7 +1350,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 = 2024L,date = 2024/01/19,simple]
+ \begin{version}[v = 2024N,date = 2024/01/23,simple]
\item 核对依赖宏包的更新改动,优化使用手册的内容细节。
\item 修复图表等浮动环境题注目录中条目标签编号的计数器值显示错误问题。
\item 修复附录命令 \cs{appendix} 的可选参数设置英文目录中条目名字和编号失效的问题。
diff --git a/macros/latex/contrib/hvlogos/Changes b/macros/latex/contrib/hvlogos/Changes
index 2d194ea0f6..b1284adf8a 100644
--- a/macros/latex/contrib/hvlogos/Changes
+++ b/macros/latex/contrib/hvlogos/Changes
@@ -1,4 +1,5 @@
hvlogos.sty:
+0.11 2024-01-23 - do not load a mathfont
0.10 2023-10-16 - changed \MetaPost to \MP
0.09 2022-05-06 - changed almost all \def to \providecommand
0.08 2022-04-25 - added \mkII, \mkIV
diff --git a/macros/latex/contrib/hvlogos/doc/hvlogos-doc.pdf b/macros/latex/contrib/hvlogos/doc/hvlogos-doc.pdf
index 82a77a0d48..487250e33f 100644
--- a/macros/latex/contrib/hvlogos/doc/hvlogos-doc.pdf
+++ b/macros/latex/contrib/hvlogos/doc/hvlogos-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvlogos/doc/hvlogos-doc.tex b/macros/latex/contrib/hvlogos/doc/hvlogos-doc.tex
index 7243ea6db9..75c7cfbea2 100644
--- a/macros/latex/contrib/hvlogos/doc/hvlogos-doc.tex
+++ b/macros/latex/contrib/hvlogos/doc/hvlogos-doc.tex
@@ -13,7 +13,7 @@
\title{\texttt{hvlogos} -- Print \TeX-related Logos}
\author{Herbert Voß\thanks{Thanks to
-Karl Berry, Denis Bitouzé, Heiko Oberdiek, Mark Senn}}
+Karl Berry, Denis Bitouzé, Hans Nieuwenhuis, Heiko Oberdiek, Mark Senn}}
\begin{document}
\maketitle
diff --git a/macros/latex/contrib/hvlogos/latex/hvlogos.sty b/macros/latex/contrib/hvlogos/latex/hvlogos.sty
index 192d438f30..ef9dfdc5b8 100644
--- a/macros/latex/contrib/hvlogos/latex/hvlogos.sty
+++ b/macros/latex/contrib/hvlogos/latex/hvlogos.sty
@@ -2,7 +2,7 @@
%%
%% This is file `hvlogos.sty',
%%
-%% Copyright (C) 2021,22,23 Herbert Voss
+%% Copyright (C) 2021,22,23,24 Herbert Voss
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN archives
@@ -10,19 +10,19 @@
%
%
% -------------------------------------
-\ProvidesPackage{hvlogos}[2023/10/16 v. 0.10 Logos (hv)]
+\ProvidesPackage{hvlogos}[2024/01/23 v. 0.11 Logos (hv)]
%
\newif\if@dtk@newengine \@dtk@newenginetrue
%
\RequirePackage{fetamont,hologo,dantelogo,xspace,expl3}
-\ifluatex\else\ifxetex\else\@dtk@newenginefalse\fi\fi
-\if@dtk@newengine
- \RequirePackage{unicode-math}
- \setmathfont{LatinModernMath-Regular}
- \setmathfont[version=XITS]{XITSMath-Regular.otf}
-\fi
+%\ifluatex\else\ifxetex\else\@dtk@newenginefalse\fi\fi
+%\if@dtk@newengine
+% \RequirePackage{unicode-math}
+% \setmathfont{LatinModernMath-Regular}
+% \setmathfont[version=XITS]{XITSMath-Regular.otf}
+%\fi
%
\iffalse
\DeclareRobustCommand\ffmfamily{\not@math@alphabet\ffmfamily\relax
@@ -75,7 +75,7 @@
\providecommand\amsmath{\AMS\textsf{math}}
\providecommand\AmSLaTeX{\mbox{\textsf{AMS}-\LaTeX}}
\providecommand\AmSTeX{\mbox{\textsf{AMS}-\hologo{TeX}}}
-\DeclareRobustCommand\Biber{\textsf{Biber}}
+\DeclareRobustCommand\Biber{\textsf{Biber}\xspace}
\let\biber\Biber
\DeclareRobustCommand{\BibLaTeXML}{B\kern-.05em%
\hbox{$\m@th$% %% force math size calculations
@@ -88,7 +88,7 @@
\def\@BibTeX{{\hologoLogoSetup{BibTeX}{variant=sc}\hologo{BibTeX}}}
\providecommand\BibTeXacht{{\hologoLogoSetup{BibTeX8}{variant=sc}\hologo{BibTeX8}}}
\def\@@BibTeX8{\hologo{BibTeX8}}
-\DeclareRobustCommand\BibLaTeX{Bib\LaTeX}
+\DeclareRobustCommand\BibLaTeX{\textsf{Bib\LaTeX}\xspace}
\let\biblatex\BibLaTeX
\providecommand\ConTeXt{\hologo{ConTeXt}}
\let\context\ConTeXt
diff --git a/macros/latex/contrib/ppt-slides/ppt-slides.dtx b/macros/latex/contrib/ppt-slides/ppt-slides.dtx
index 9e14a1170d..e0618f0a8d 100644
--- a/macros/latex/contrib/ppt-slides/ppt-slides.dtx
+++ b/macros/latex/contrib/ppt-slides/ppt-slides.dtx
@@ -50,7 +50,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\ProvidesPackage{ppt-slides}
%<*package>
-[2024-01-16 0.3.1 Slide Decks a la Power Point]
+[2024-01-23 0.3.2 Slide Decks a la Power Point]
%</package>
%<*driver>
\documentclass{ltxdoc}
@@ -613,9 +613,10 @@
``#3''%
\def\param{#4}%
\ifx\param\empty\else%
- \newline\newline%
+ \par\vspace*{1em}%
\small%
--- \param%
+ \par%
\fi%
\\%
\end{tabularx}%
diff --git a/macros/latex/contrib/ppt-slides/ppt-slides.pdf b/macros/latex/contrib/ppt-slides/ppt-slides.pdf
index 774992d89f..95c1024bff 100644
--- a/macros/latex/contrib/ppt-slides/ppt-slides.pdf
+++ b/macros/latex/contrib/ppt-slides/ppt-slides.pdf
Binary files differ
diff --git a/macros/luatex/latex/lua-placeholders/doc/lua-placeholders-deps.bib b/macros/luatex/latex/lua-placeholders/doc/lua-placeholders-deps.bib
index 2e80c1b269..c5ecf4484c 100644
--- a/macros/luatex/latex/lua-placeholders/doc/lua-placeholders-deps.bib
+++ b/macros/luatex/latex/lua-placeholders/doc/lua-placeholders-deps.bib
@@ -1,4 +1,10 @@
+@misc{tiny,
+ title = {lua-tinyyaml},
+ note = {Accessed: 23 January, 2024},
+ howpublished = {\url{https://ctan.org/pkg/lua-tinyyaml} and \url{https://github.com/api7/lua-tinyyaml}},
+}
+
@misc{lyaml,
title = {lyaml},
author = {Andrew Danforth},
diff --git a/macros/luatex/latex/lua-placeholders/doc/lua-placeholders-example/example.pdf b/macros/luatex/latex/lua-placeholders/doc/lua-placeholders-example/example.pdf
index fcdf27afab..1b9ff4a52f 100644
--- a/macros/luatex/latex/lua-placeholders/doc/lua-placeholders-example/example.pdf
+++ b/macros/luatex/latex/lua-placeholders/doc/lua-placeholders-example/example.pdf
Binary files differ
diff --git a/macros/luatex/latex/lua-placeholders/doc/lua-placeholders-manual.pdf b/macros/luatex/latex/lua-placeholders/doc/lua-placeholders-manual.pdf
index 499978dbf0..b9bb4a0238 100644
--- a/macros/luatex/latex/lua-placeholders/doc/lua-placeholders-manual.pdf
+++ b/macros/luatex/latex/lua-placeholders/doc/lua-placeholders-manual.pdf
Binary files differ
diff --git a/macros/luatex/latex/lua-placeholders/doc/lua-placeholders-manual.tex b/macros/luatex/latex/lua-placeholders/doc/lua-placeholders-manual.tex
index 776ad3af5d..c618146637 100644
--- a/macros/luatex/latex/lua-placeholders/doc/lua-placeholders-manual.tex
+++ b/macros/luatex/latex/lua-placeholders/doc/lua-placeholders-manual.tex
@@ -13,9 +13,10 @@
%
% The Current Maintainer of this work is E. Nijenhuis.
%
-% This work consists of the files lua-placeholders.sty lua-placeholders-manual.pdf
-% lua-placeholders.lua lua-placeholders-common.lua lua-placeholders-namespace.lua lua-placeholders-parser.lua
-% and lua-placeholders-types.lua
+% This work consists of the files lua-placeholders.sty
+% lua-placeholders-manual.pdf lua-placeholders.lua
+% lua-placeholders-common.lua lua-placeholders-namespace.lua
+% lua-placeholders-parser.lua and lua-placeholders-types.lua
\documentclass{ltxdoc}
\usepackage[english]{babel}
@@ -84,7 +85,6 @@
\begin{enumerate}[align=left]
\item The package only works with Lua\LaTeX{}.
\item In order for the files to be loaded, commandline option `\texttt{--shell-escape}' is required.
- \item For YAML support, there needs to be a Lua setup with certain dependencies, which can be quite hard to setup on some systems.
\end{enumerate}
\subsection{Prerequisites}
@@ -94,7 +94,7 @@
This also includes the \texttt{libYAML}\cite{libYAML} platform dependent library and optionally LuaRocks for installing \texttt{lyaml}.
Another requirement is Lua, which version meets the Lua version used by Lua\TeX{}.
If no \texttt{LUA\_PATH} is set, and you use LuaRocks, this package tries to call the LuaRocks executable to find the \texttt{LUA\_PATH}.
- If \texttt{lyaml} can't be loaded, this package will fall back on accepting JSON files only.
+ If \texttt{lyaml} can't be loaded, this package will first try to fall back with \texttt{lua-tinyyaml}\cite{tiny} for lesser YAML support and secondly fall back on accepting JSON files only.
\clearpage
\section{Usage}
@@ -210,7 +210,7 @@
The source file \texttt{example.tex} is a perfect demonstration of all macros in action.
It shows perfectly what happens when there's a \meta{payload} file loaded and when not.
- The result of this example \attachfile[icon=Paperclip,description={ELPI Example v\gitversion}]{lua-placeholders-example/example.pdf} is attached in the digital version of this document.
+ The result of this example \attachfile[icon=Paperclip,description={Lua Parameters Example v\gitversion}]{lua-placeholders-example/example.pdf} is attached in the digital version of this document.
\lstinputlisting[language={[LaTeX]TeX},frame=single,caption={\ttfamily example.tex},captionpos=t,numbers=left,keywordsprefix={\\},firstnumber=20,firstline=20,columns=fullflexible]{lua-placeholders-example/example.tex}
\end{document}
diff --git a/macros/luatex/latex/lua-placeholders/scripts/lua-placeholders-parser.lua b/macros/luatex/latex/lua-placeholders/scripts/lua-placeholders-parser.lua
index 1fa43227a4..3583c09a28 100644
--- a/macros/luatex/latex/lua-placeholders/scripts/lua-placeholders-parser.lua
+++ b/macros/luatex/latex/lua-placeholders/scripts/lua-placeholders-parser.lua
@@ -22,6 +22,12 @@ local LUA_VERSION = string.sub(_VERSION, 5, -1)
yaml_supported = false
+-- Check for tiny yaml as YAML fallback option
+local tiny_found, tiny = pcall(require,'tinyyaml')
+if tiny_found then
+ texio.write_nl('Found fallback support for YAML (tiny yaml)')
+end
+
-- Check if LUA_PATH is set
local current_path = os.getenv('LUA_PATH')
if current_path then
@@ -44,6 +50,9 @@ else
texio.write_nl('Info: Setting LUA_CPATH from LuaRocks', lua_cpath)
package.cpath = lua_cpath
end
+ elseif tiny_found then
+ texio.write_nl('Warning: could\'t find LuaRocks installation')
+ texio.write_nl('Info: falling back to tiny yaml implementation')
else
texio.write_nl('Error: couldn\'t find LuaRocks installation')
texio.write_nl("Info: LUA PATH:\n\t" .. string.gsub(package.path, ';', '\n\t') .. '\n\n')
@@ -59,12 +68,12 @@ require('lualibs')
-- Require YAML configuration files
-- Make sure to have the apt package lua-yaml installed
-local status, yaml = pcall(require, 'lyaml')
-if status then
+local lyaml_found, lyaml = pcall(require, 'lyaml')
+if lyaml_found or tiny_found then
yaml_supported = true
else
texio.write_nl('Warning: No YAML support.')
- texio.write_nl(yaml)
+ texio.write_nl(lyaml)
texio.write_nl('Info: Falling back to JSON.')
end
@@ -79,8 +88,10 @@ return function(filename)
if ext == 'json' then
return utilities.json.tolua(raw)
else
- if yaml_supported then
- return yaml.load(raw)
+ if lyaml_found then
+ return lyaml.load(raw)
+ elseif tiny_found then
+ return tiny.parse(raw)
else
tex.error('Error: no YAML support!')
end
diff --git a/macros/luatex/latex/lua-placeholders/scripts/lua-placeholders.lua b/macros/luatex/latex/lua-placeholders/scripts/lua-placeholders.lua
index 255b4d1f26..181676679c 100644
--- a/macros/luatex/latex/lua-placeholders/scripts/lua-placeholders.lua
+++ b/macros/luatex/latex/lua-placeholders/scripts/lua-placeholders.lua
@@ -23,8 +23,8 @@ if not modules then
end
modules.lua_placeholders = {
- version = "0.1.0",
- date = "2024/01/12",
+ version = "1.0.0",
+ date = "2024/01/23",
comment = 'Extended LaTeX Parameter Interface — for specifying and inserting document parameters',
author = 'Erik Nijenhuis',
license = 'free'
diff --git a/macros/luatex/latex/lua-placeholders/tex/lua-placeholders.sty b/macros/luatex/latex/lua-placeholders/tex/lua-placeholders.sty
index 9a2c247962..e11b950f5a 100644
--- a/macros/luatex/latex/lua-placeholders/tex/lua-placeholders.sty
+++ b/macros/luatex/latex/lua-placeholders/tex/lua-placeholders.sty
@@ -19,7 +19,7 @@
% lua-placeholders-parser.lua and lua-placeholders-types.lua
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lua-placeholders}[2024/01/12 Extended LaTeX Paramter Interface Package]
+\ProvidesPackage{lua-placeholders}[2024/01/23 1.0.0 Extended LaTeX Paramter Interface Package]
\RequirePackage{ifthen}
\RequirePackage{luapackageloader}