From 0efaa39c6d0b17b58df9a68ae1319ea20aaabc28 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 15 Dec 2021 03:01:18 +0000 Subject: CTAN sync 202112150301 --- macros/context/contrib/context-vim/VERSION | 2 +- .../context-vim/doc/context/third/vim/vim.txt | 18 ++++- .../tex/context/third/vim/t-syntax-highlight.mkiv | 8 +-- .../tex/context/third/vim/t-syntax-highlight.mkxl | 8 +-- .../biblatex-contrib/biblatex-publist/README | 4 ++ .../biblatex-publist/biblatex-publist.pdf | Bin 371508 -> 371571 bytes .../biblatex-publist/biblatex-publist.tex | 8 ++- .../biblatex-contrib/biblatex-publist/publist.bbx | 76 ++++++++++++-------- .../biblatex-contrib/biblatex-publist/publist.cbx | 4 +- macros/latex/contrib/easybook/easybook.dtx | 38 +++++----- macros/latex/contrib/easybook/easybook.pdf | Bin 594412 -> 594610 bytes macros/latex/contrib/easybook/easybook.tex | 46 ++++++------ macros/latex/contrib/l3backend/CHANGELOG.md | 10 ++- macros/latex/contrib/l3backend/README.md | 2 +- .../latex/contrib/l3backend/l3backend-basics.dtx | 14 ++-- macros/latex/contrib/l3backend/l3backend-box.dtx | 12 ++-- macros/latex/contrib/l3backend/l3backend-code.pdf | Bin 896357 -> 897083 bytes macros/latex/contrib/l3backend/l3backend-color.dtx | 2 +- macros/latex/contrib/l3backend/l3backend-draw.dtx | 80 +++++++++++---------- .../latex/contrib/l3backend/l3backend-graphics.dtx | 2 +- .../latex/contrib/l3backend/l3backend-header.dtx | 2 +- .../latex/contrib/l3backend/l3backend-opacity.dtx | 2 +- macros/latex/contrib/l3backend/l3backend-pdf.dtx | 2 +- macros/latex/contrib/l3build/CHANGELOG.md | 8 ++- macros/latex/contrib/l3build/README.md | 2 +- macros/latex/contrib/l3build/l3build-variables.lua | 12 ++-- macros/latex/contrib/l3build/l3build.1 | 2 +- macros/latex/contrib/l3build/l3build.dtx | 2 +- macros/latex/contrib/l3build/l3build.lua | 11 ++- macros/latex/contrib/l3build/l3build.pdf | Bin 741184 -> 741143 bytes macros/latex/required/graphics/README.md | 2 +- macros/latex/required/graphics/changes.txt | 8 +++ macros/latex/required/graphics/color.dtx | 14 ++-- macros/latex/required/graphics/color.pdf | Bin 215047 -> 208054 bytes macros/latex/required/graphics/drivers.pdf | Bin 286309 -> 286458 bytes macros/latex/required/graphics/epsfig.pdf | Bin 167686 -> 160073 bytes macros/latex/required/graphics/graphics.pdf | Bin 310675 -> 303029 bytes macros/latex/required/graphics/graphicx.pdf | Bin 248231 -> 240629 bytes macros/latex/required/graphics/grfguide.pdf | Bin 330071 -> 330070 bytes macros/latex/required/graphics/keyval.pdf | Bin 239654 -> 239821 bytes macros/latex/required/graphics/lscape.pdf | Bin 163584 -> 155981 bytes macros/latex/required/graphics/rotating.pdf | Bin 269530 -> 269553 bytes macros/latex/required/graphics/rotex.pdf | Bin 172232 -> 172230 bytes macros/latex/required/graphics/trig.pdf | Bin 206897 -> 199269 bytes macros/luatex/latex/datestamp/README.txt | 12 ++-- .../luatex/latex/datestamp/datestamp-example.pdf | Bin 6041 -> 6041 bytes macros/luatex/latex/datestamp/datestamp.dtx | 26 +++---- macros/luatex/latex/datestamp/datestamp.ins | 14 ++-- macros/luatex/latex/datestamp/datestamp.pdf | Bin 112888 -> 113179 bytes 49 files changed, 260 insertions(+), 193 deletions(-) (limited to 'macros') diff --git a/macros/context/contrib/context-vim/VERSION b/macros/context/contrib/context-vim/VERSION index 1664ef53fc..207ae307b6 100644 --- a/macros/context/contrib/context-vim/VERSION +++ b/macros/context/contrib/context-vim/VERSION @@ -1 +1 @@ -2021.09.05 +2021.12.13 diff --git a/macros/context/contrib/context-vim/doc/context/third/vim/vim.txt b/macros/context/contrib/context-vim/doc/context/third/vim/vim.txt index e42a2bdab8..af6bfdb74a 100644 --- a/macros/context/contrib/context-vim/doc/context/third/vim/vim.txt +++ b/macros/context/contrib/context-vim/doc/context/third/vim/vim.txt @@ -315,8 +315,9 @@ will effect all the listings on that page, _even those defined earlier!_ - To change the width of the box in which the numbers are typeset, use `numberwidth=...` option. Default value is `2em`. -- To change the distance between the numbers and the rest of the code, use - `numberdistance=...` option. Default value is `0.5em`. +- By default, the numbers are placed on the left of the text area. To change + the distance between the numbers and the text area, use `numberdistance=...` + option. Default value is `0.5em`. - To change the conversion of numbers, use `numberconversion=...` option. Default value is `numbers`. @@ -411,8 +412,19 @@ of each line: margin=, ...] -where `` is a valid TeX dimension. +where `` is a valid TeX dimension. Note that this does not change the +location of the line numbers. So, if you are using line numbers along with +margin, also change the `numberdistance`. For example, + + \definevimtyping + [...] + [... + margin=4em, + numberdistance=-3.5em, + ...] + +will place the numbers `4em - 3.5em = 0.5em` to the left of the code. diff --git a/macros/context/contrib/context-vim/tex/context/third/vim/t-syntax-highlight.mkiv b/macros/context/contrib/context-vim/tex/context/third/vim/t-syntax-highlight.mkiv index 23466fb17d..9b759bab78 100644 --- a/macros/context/contrib/context-vim/tex/context/third/vim/t-syntax-highlight.mkiv +++ b/macros/context/contrib/context-vim/tex/context/third/vim/t-syntax-highlight.mkiv @@ -1,6 +1,6 @@ %D \module %D [ file=t-syntax-highlight, -%D version=2020.06.29, +%D version=2021.12.13, %D title=\CONTEXT\ User Module, %D subtitle=Code syntax highlighting, %D author=Aditya Mahajan, @@ -9,13 +9,13 @@ %D email=adityam ieee org, %D license=Simplified BSD License] -\writestatus{loading}{Code syntax highlighting (ver: 2020.06.29)} +\writestatus{loading}{Code syntax highlighting (ver: 2021.12.13)} \startmodule [syntax-highlight] \usemodule [syntax-groups] \usemodule [filter] % loads module-catcodes -\unprotect +\unprotectmodulecatcodes \startinterface all \setinterfaceconstant {syntax} {syntax} @@ -256,7 +256,7 @@ \def\syntaxhighlighting@namespace {\????syntaxhighlighting} \def\syntaxhighlighting@name {\currentsyntaxhighlighting} -\protect +\protectmodulecatcodes \stopmodule diff --git a/macros/context/contrib/context-vim/tex/context/third/vim/t-syntax-highlight.mkxl b/macros/context/contrib/context-vim/tex/context/third/vim/t-syntax-highlight.mkxl index 8fadebb780..450ffb51ff 100644 --- a/macros/context/contrib/context-vim/tex/context/third/vim/t-syntax-highlight.mkxl +++ b/macros/context/contrib/context-vim/tex/context/third/vim/t-syntax-highlight.mkxl @@ -1,6 +1,6 @@ %D \module %D [ file=t-syntax-highlight, -%D version=2021.05.31, +%D version=2021.12.13, %D title=\CONTEXT\ User Module, %D subtitle=Code syntax highlighting, %D author=Aditya Mahajan, @@ -9,13 +9,13 @@ %D email=adityam ieee org, %D license=Simplified BSD License] -\writestatus{loading}{Code syntax highlighting (ver: 2021.05.31)} +\writestatus{loading}{Code syntax highlighting (ver: 2021.12.13)} \startmodule [syntax-highlight] \usemodule [syntax-groups] \usemodule [filter] % loads module-catcodes -\unprotect +\unprotectmodulecatcodes \startinterface all \setinterfaceconstant {syntax} {syntax} @@ -257,7 +257,7 @@ \def\syntaxhighlighting@namespace {\????syntaxhighlighting} \def\syntaxhighlighting@name {\currentsyntaxhighlighting} -\protect +\protectmodulecatcodes \stopmodule diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-publist/README b/macros/latex/contrib/biblatex-contrib/biblatex-publist/README index ae2d769a96..690c242cd6 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-publist/README +++ b/macros/latex/contrib/biblatex-contrib/biblatex-publist/README @@ -45,6 +45,10 @@ instructions. == CHANGES == +* V. 1.25 (2021-12-14): + - More robustification with names consisting of non-ASCII chars. + - With "pubstateextra", differentiate between pubstates. + * V. 1.24 (2021-12-11): - Robustify handling of names with non-ASCII chars (#35). diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-publist/biblatex-publist.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-publist/biblatex-publist.pdf index cb0ba5891a..2ea2539720 100644 Binary files a/macros/latex/contrib/biblatex-contrib/biblatex-publist/biblatex-publist.pdf and b/macros/latex/contrib/biblatex-contrib/biblatex-publist/biblatex-publist.pdf differ diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-publist/biblatex-publist.tex b/macros/latex/contrib/biblatex-contrib/biblatex-publist/biblatex-publist.tex index 282f87d9e0..a925e0c0ae 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-publist/biblatex-publist.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-publist/biblatex-publist.tex @@ -102,7 +102,7 @@ \thanks{Please report issues via \protect\url{https://github.com/jspitz/biblatex-publist}.}% } -\date{Version 1.24, 2021/12/11} +\date{Version 1.25, 2021/12/14} \maketitle \begin{abstract} @@ -667,6 +667,12 @@ or \begin{description} + \item [{V. 1.25 (2021-12-14):}]~ + \begin{itemize} + \item More robustification with names consisting of non-ASCII chars. + \item With \joption{pubstateextra}, differentiate between pubstates. + \end{itemize} + \item [{V. 1.24 (2021-12-11):}]~ \begin{itemize} \item Robustify handling of names with non-ASCII chars. diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.bbx index 5edbe259b9..100722aa9b 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.bbx @@ -25,8 +25,8 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\bpl@version{1.24} -\def\bpl@rdate{2021/12/11} +\def\bpl@version{1.25} +\def\bpl@rdate{2021/12/14} \ProvidesFile{publist.bbx}[\bpl@rdate\space v.\bpl@version\space biblatex bibliography style (JSP)] @@ -253,18 +253,36 @@ \fi } % -% Check first token of macro -% (based on a suggestion by Qrrbrbirlbel at -% https://tex.stackexchange.com/a/132254) -\newcommand*{\iffirstinitialsequal}{% - \@expandtwoargs\if@startswith} -\newcommand*{\if@startswith}[2]{% - \if\@car#1.\@nil\@car#2.\@nil - \expandafter\@firstoftwo - \else - \expandafter\@secondoftwo - \fi -} +% String comparison methods. We use l3 here since this is more robust. +\ExplSyntaxOn + +% 1. Check first token of macro. +% Based on code by egreg on https://tex.stackexchange.com/a/405005 +\prg_new_conditional:Nnn \bpl_firstletterequal:nn { T,F,TF,p } + { + % compare the two strings after full expansion: + % f expansion is used so using explicit + % strings or macros is the same + \str_if_eq:eeTF + { \str_head:f { #1 } } + { \str_head:f { #2 } } + { \prg_return_true: } + { \prg_return_false: } + } +\cs_generate_variant:Nn \str_head:n { f } + +\NewExpandableDocumentCommand{\bpl@iffirstcharequal}{ m m m m } +{ + \bpl_firstletterequal:nnTF { #1 } { #2 } { #3 } { #4 } +} + +% 2. Fully expanded macro content comparison +\NewExpandableDocumentCommand{\bpl@ifstreq}{ m m m m } +{ + \str_if_eq:eeTF { #1 } { #2 } { #3 } { #4 } +} + +\ExplSyntaxOff % % Split plauthors list item \def\bpl@lsurname{} @@ -282,17 +300,6 @@ \global\def\bpl@lsurname{#3}% } % -% Fully expanded comparison -% (adapted from scrbase.sty) -\newcommand\bpl@ifstreq[2]{% - \begingroup\protected@edef\@tempa{#1}\protected@edef\@tempb{#2}% - \ifx\@tempa\@tempb - \endgroup\expandafter\@firstoftwo - \else - \endgroup\expandafter\@secondoftwo - \fi -} -% % Check if we have an entry in plauthors % \bpl@ifplauthor{firstname}{prefix}{surname}{true}{false} \newcommand*\bpl@ifplauthor[3]{% @@ -309,7 +316,7 @@ test { \bpl@ifstreq{\bpl@esurname}{\bpl@tsurname} } and ( test { \bpl@ifstreq{\bpl@efirstname}{\bpl@tfirstname} } or test { \ifdefstring{\bpl@ofirstname}{} } - or ( test { \iftoggle{firstinit} } and test{ \iffirstinitialsequal{\bpl@efirstname}{\bpl@tfirstname} } ) + or ( test { \iftoggle{firstinit} } and test{ \bpl@iffirstcharequal{\bpl@efirstname}{\bpl@tfirstname} } ) ) and ( test { \bpl@ifstreq{\bpl@evonpart}{\bpl@tvonpart} } or test { \ifdefstring{\bpl@ovonpart}{} }) } @@ -327,7 +334,7 @@ test { \bpl@ifstreq{\bpl@elsurname}{\bpl@tsurname} } and ( test { \bpl@ifstreq{\bpl@elfirstname}{\bpl@tfirstname} } or test { \ifdefstring{\bpl@lfirstname}{} } - or ( test { \iftoggle{firstinit} } and test{ \iffirstinitialsequal{\bpl@lfirstname}{\bpl@tfirstname} } ) + or ( test { \iftoggle{firstinit} } and test{ \bpl@iffirstcharequal{\bpl@lfirstname}{\bpl@tfirstname} } ) ) and ( test { \bpl@ifstreq{\bpl@elvonpart}{\bpl@tvonpart} } or test { \ifdefstring{\bpl@lvonpart}{} }) } @@ -938,6 +945,19 @@ } \fi +\AtEndOfPackage{% + \if@pubstateextra + % Include pubstate in extradate + \DeclareExtradate{% + \scope{ + \field{pubstate} + \field{labelyear} + \field{year} + } + } + \fi +} + \newbibmacro*{bpl:date:makedate}{% \printtext{% \iffieldundef{year}{% @@ -1342,7 +1362,7 @@ \step[fieldset=shortauthor, fieldvalue={1111}] } } -} + } \fi % Correctly sort pubstates. diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.cbx index 0ceed4cbb3..13c7945ed0 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.cbx @@ -26,8 +26,8 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\bpl@version{1.24} -\def\bpl@rdate{2021/12/11} +\def\bpl@version{1.25} +\def\bpl@rdate{2021/12/14} \ProvidesFile{publist.cbx}[\bpl@rdate\space v.\bpl@version\space biblatex citation style (JSP)] diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index 169e50a8a7..701abb0ff0 100644 --- a/macros/latex/contrib/easybook/easybook.dtx +++ b/macros/latex/contrib/easybook/easybook.dtx @@ -15,14 +15,14 @@ %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/12/12}{1.41S} +\ProvidesExplClass{easybook}{2021/12/14}{1.41T} {Typeset Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool \bool_set_false:N \l__eb_title_newline_bool \bool_set_true:N \l__eb_class_mode_book_bool -\tl_new:N \g__eb_config_tl \tl_new:N \l__eb_font_value_tl +\clist_new:N \g__eb_config_file_clist \clist_new:N \g__eb_options_clist \cs_new_protected:Npn \eb_put_ctexbook:n #1 { \PassOptionsToClass{#1}{ctexbook} } @@ -52,7 +52,7 @@ }, book .meta:n = { class = book }, article .meta:n = { class = article }, - config .tl_set:N = \g__eb_config_tl, + config .clist_gset:N = \g__eb_config_file_clist, floatpage .bool_set:N = \l__eb_float_page_bool, floatpage .default:n = true, unknown .code:n = \clist_gput_right:NV \g__eb_options_clist \CurrentOption @@ -67,8 +67,8 @@ \ctex_at_end:n { \use:c { eb@font@load@\l__eb_font_value_tl } - \tl_if_empty:NF \g__eb_config_tl - { \file_input:n { \g__eb_config_tl } } + \clist_if_empty:NF \g__eb_config_file_clist + { \clist_map_function:NN \g__eb_config_file_clist \file_input:n } } \sys_if_engine_xetex:TF @@ -100,10 +100,8 @@ } \RenewDocumentCommand{\newCJKfontfamily}{omO{}mO{}} { - \tl_set:Nx \l_tmpa_tl - { \tl_if_novalue:nTF {#1} { \cs_to_str:N #2 } {#1} } - \cs_new_protected:Npx #2 - { \eb_switch_family:V \l_tmpa_tl } + \tl_set:Nx \l_tmpa_tl { \tl_if_novalue:nTF {#1} { \cs_to_str:N #2 } {#1} } + \cs_new_protected:Npx #2 { \eb_switch_family:V \l_tmpa_tl } \eb_set_family:nnn { \l_tmpa_tl } {#3,#5} {#4} } @@ -310,7 +308,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2021/12/12}{1.41S} +\ProvidesExplPackage{easybase}{2021/12/14}{1.41T} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -408,10 +406,8 @@ { \BeforeBeginEnvironment{document} } \cs_gset_eq:NN \PackageWarning \PackageInfo -\bool_if_exist:NF \l__eb_class_mode_book_bool - { \bool_set_true:N \l__eb_class_mode_book_bool } -\bool_if_exist:NF \l__eb_compile_draft_bool - { \bool_set_false:N \l__eb_compile_draft_bool } +\bool_set_true:N \l__eb_class_mode_book_bool +\bool_set_false:N \l__eb_compile_draft_bool \clist_new:N \g__eb_ctex_options_clist \keys_define:nn { easybase } @@ -454,7 +450,7 @@ \bool_new:N \l__eb_mark_uppercase_bool \bool_new:N \l__eb_chap_counter_withpart_bool -\tl_new:N \l__eb_foot_counter_parent_value_tl +\tl_new:N \l__eb_fnt_counter_parent_value_tl \eb_seq_map_inline:nn { @@ -735,11 +731,11 @@ \ctex_define:nn { style } { - footwith .choices:nn = + fntnumwith .choices:nn = { part,page,chapter } - { \tl_set:Nn \l__eb_foot_counter_parent_value_tl {#1} }, - footwith .value_required:n = true, - footwith .initial:n = chapter + { \tl_set:Nn \l__eb_fnt_counter_parent_value_tl {#1} }, + fntnumwith .value_required:n = true, + fntnumwith .initial:n = chapter } \NewDocumentCommand{\eb_assign_fntext_code:n} {>{\SplitArgument{1}{,}}m} @@ -917,7 +913,7 @@ \dim_set:Nn \footnotesep { \dim_use:N \box_ht:N \strutbox } \bool_if:NT \l__eb_chap_counter_withpart_bool { \counterwithin*{chapter}{part} } - \str_case:VnT \l__eb_foot_counter_parent_value_tl + \str_case:VnT \l__eb_fnt_counter_parent_value_tl { { part } { \counterwithin*{footnote}{part} } { page } { \counterwithin*{footnote}{page} } @@ -2433,7 +2429,7 @@ } % %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/12}{1.41S} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/14}{1.41T} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \setexercise #1 diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf index 1b28eb05a9..9eb1112942 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 6231c55c10..38d6cdfba5 100644 --- a/macros/latex/contrib/easybook/easybook.tex +++ b/macros/latex/contrib/easybook/easybook.tex @@ -20,8 +20,8 @@ name = easybook, color-scheme = blue, title = EASYBOOK 使用手册, - version = v1.41S, - date = 2021/12/12, + version = v1.41T, + date = 2021/12/14, authors = 瞿毅, info = 排版简体中文学位论文和书籍, email = q1jx@foxmail.com, @@ -224,8 +224,8 @@ 同时开启 \option{newline} 和 \keyis-{scheme}{plain} 选项以符合英文原生风格。 \keychoice{paper}{a4paper,b5paper,c5paper,letterpaper,other paper}\Default{a4paper} 文档页面尺寸选项将参数交给 \pkg*{geometry} 宏包处理，可使用它支持的所有纸张规格。建议选项值 \code{b5paper} 和 \keyis*-{zihao}{5}，选项值 \code{a4paper} 和 \keyis*-{zihao}{-4} 配合。 - \keyval-{config}{配置文件名}\Default - 选项 \option{config} 载入用户配置文件，最好放在当前路径且需带有文件扩展名如 \code{tex}、\code{def} 和 \code{cfg}。 + \keyval-{config}{配置文件列表}\Default + 载入用户配置的文件名列表，文件列表以花括号包裹并以英文逗号分隔。文件名应包含如 \code{tex}、\code{def} 或 \code{cfg} 等扩展名。若配置文件不在当前文件夹则文件名需要包含路径。 \keybool{floatpage}\Default{false} 开启这个选项后浮动环境 \env*{table} 和 \env*{figure} 的比例参数会使用默认值，关闭它则尽可能避免出现浮动页，使图表环境与正文段落更加紧凑，减少多余的空白版面。 \end{options} @@ -388,11 +388,11 @@ \begin{ctexexam} \ctexset { - style/color = seaside, - style = + style/color = seaside, + style = { - color = seaside, - uppercase = false + fntnumwith = page, + uppercase = false } } \ebstyle{connect-figure = {-}} @@ -408,16 +408,16 @@ 预置了四种颜色主题，默认主题 \code{none} 为黑白页面，颜色主题不包括超链接。 \begin{commands} \command{DeclareThemeColor}[\splitmarg{风格名称,ctex@frame,ctex@emph,ctex@verb}] - 可以使用 \cs{DeclareThemeColor} 命令声明新的颜色主题，它的参数以英文逗号分隔，第一部分为颜色风格名称，后面三部分为 \code{HTML} 颜色代码，构成颜色主题。类似地更改超链接颜色见\ref{subsec:hyperlinks}。 + 声明新的颜色主题命令。它的参数以英文逗号分隔，第一部分为颜色风格名称，后面三部分为 \code{HTML} 颜色代码，构成颜色主题。类似地更改超链接颜色见\ref{subsec:hyperlinks}。 \end{commands} \keyval-{color-every}{HTML颜色代码}\Default 统一设置主题的各部分颜色，参数是 6 个十六进制数字组成的 \code{HTML} 颜色代码，任意颜色的代码可以在常见的图片处理工具拾色器中查看。 \keyval-{multoc}{整数}\Default{2} 使目录多栏排版，与\ref{sec:document command} 中目录命令的同名选项有相同效果。 \keybool{withpart}\Default{false} - 使章标题跟随每一部分编号，开启新的一部分时章编号从 1 开始，默认不跟随。 - \keychoice{footwith}{part,chapter,page}\Default{chapter} - 使脚注跟随编号的计数器，默认跟随章，当开启新的一章时脚注编号从 1 开始。 + 使章标题跟随部分计数器编号，当开启新的一部分时章编号从 1 开始。 + \keychoice{fntnumwith}{part,chapter,page}\Default{chapter} + 使脚注跟随编号的计数器名。默认跟随章计数器，当开启新的一章时脚注编号从 1 开始。 \keybool{uppercase}\Default{true} 使用 \cs*{rightmark} 及 \cs*{leftmark} 等标题标记命令获取标题内容时英文是否大写。 \kvsplit{brackets}{左括号,右括号}\Default{\Carg{(\black{,})}} @@ -483,7 +483,7 @@ 超链接颜色样式，预置了四种超链接颜色风格。为使相关颜色能够正确显示，\option{linkcolor} 选项应当在 \option{linktype} 前使用。 \begin{commands} \command{DeclareLinkColor}[\splitmarg{风格名称,ctex@link,ctex@url,ctex@cite}] - 可以使用 \cs{DeclareLinkColor} 命令声明新的超链接颜色样式，它的参数以英文逗号分隔，第一部分为颜色风格名称，后面三部分为 \code{HTML} 颜色代码，构成超链接颜色。 + 声明新的超链接颜色样式命令。它的参数以英文逗号分隔，第一部分为颜色风格名称，后面三部分为 \code{HTML} 颜色代码，构成超链接颜色。 \end{commands} \keyval-{linkcolor-every}{HTML颜色代码}\Default 统一设置超链接的各部分颜色，参数是 6 个十六进制数字组成的 \code{HTML} 颜色代码，任意颜色的代码可以在常见的图片处理工具拾色器中查看。 @@ -549,13 +549,13 @@ \label{subsec:reference} \begin{options} \keychoice{backend}{bibtex,biblatex}\Module{bibset}\Default{bibtex} - 参考文献处理后端，默认用传统的 \hologo{BibTeX} 处理参考文献\footnote{使用 \hologo{BibTeX} 引擎时加载 \pkg*{natbib} 宏包，使用 \hologo{biber} 时将加载 \pkg*{biblatex} 宏包。}。 + 参考文献处理后端。默认用传统的 \hologo{BibTeX} 处理参考文献\footnote{使用 \hologo{BibTeX} 引擎时加载 \pkg*{natbib} 宏包，使用 \hologo{biber} 时将加载 \pkg*{biblatex} 宏包。}。 \keychoice{bibstyle}{numerical,authoryear,other sty}\Default{numerical} - 参考文献格式为中国的参考文献推荐标准 GB/T 7714-2015，有顺序编码制和著者-出版年制两种风格，理工科类一般使用顺序编码制，文科类一般使用著者-出版年制。若使用其它格式，使用 \hologo{BibTeX} 处理时需确保正确的 \code{bst} 文件，使用 \hologo{biber} 处理可使用 \pkg*{biblatex} 宏包支持的参考文献风格名称。 + 参考文献格式为中国的参考文献推荐标准 GB/T 7714-2015，有顺序编码制和著者-出版年制两种风格。理工科类一般使用顺序编码制，文科类一般使用著者-出版年制。若使用其它格式，使用 \hologo{BibTeX} 处理时需确保正确的 \code{bst} 文件，使用 \hologo{biber} 处理可使用 \pkg*{biblatex} 宏包支持的参考文献风格名称。 \keyval-{citestyle}{标注风格}\Default - 标注参考文献的风格，选项 \keyis-{backend}{bibtex} 下可使用 \option{super}（数字上标标注，默认）或 \option{numbers}（数字标注）等 \pkg*{natbib} 宏包带有的标注风格，选项 \keyis-{backend}{biblatex} 下可使用 \pkg*{biblatex} 宏包支持的标注风格名称。 - \keyval-{datafile}{参考文献数据库名}\Default - 参考文献数据库的文件名，可以是单个文件也可以是以括号包裹并以英文逗号分隔的文件列表，使用 \hologo{biber} 处理时要带有 \code{bib} 后缀，若不在当前文件夹名称需要包含路径。不设置参考文献数据库名时 \module*{bibset} 中的选项会失效，即不自动载入 \pkg*{natbib} 或 \pkg*{biblatex} 宏包，此时需要手动载入相关宏包配置参考文献。 + 标注参考文献的风格。选项 \keyis-{backend}{bibtex} 下可使用 \option{super}（数字上标标注，默认）或 \option{numbers}（数字标注）等 \pkg*{natbib} 宏包带有的标注风格，选项 \keyis-{backend}{biblatex} 下可使用 \pkg*{biblatex} 宏包支持的标注风格名称。 + \keyval-{datafile}{参考文献数据库列表}\Default + 参考文献数据库的文件名列表，文件列表以花括号包裹并以英文逗号分隔。使用 \hologo{biber} 处理时要带有 \code{bib} 后缀，若参考文献文件不在当前文件夹则文件名需要包含路径。不设置参考文献数据库名时 \module*{bibset} 模块中的选项会失效，即不自动载入 \pkg*{natbib} 或 \pkg*{biblatex} 宏包，此时需要手动载入相关宏包配置参考文献。 \end{options} \subsubsection{配置参考文献} @@ -637,7 +637,7 @@ \tcolorboxenvironment{caixiang}{tc-theorem} \end{ctexexam} \command{deftheorem}[\marg{环境名}\oarg{英文标题}\marg{中文标题}\darg{盒子风格}\oarg{键值列表}] - 定理环境定义命令 \cs{deftheorem} 更便捷，\meta{键值列表} 中支持的选项与命令 \cs{declaretheorem} 完全相同。但它与后者命令有以下几个区别： + 定理环境定义命令 \cs{deftheorem} 更加便捷，\meta{键值列表} 中支持的选项与命令 \cs{declaretheorem} 完全相同。但它与后者命令有以下几个区别： \begin{itemize} \item 可以重复定义已存在的定理环境而不会报错。 \item 中英文模式下定理标题自动切换。针对中文定理标题的特点将 \meta{中文标题} 设计为必选参数，\meta{英文标题} 则默认为首字母大写的 \meta{环境名}。 @@ -1209,7 +1209,7 @@ \keyval-{width}{符号宽度}\Default{10pt} 设置适当的符号宽度可以防止文字重叠和边界溢出等问题。 \keyval-{delim}{引导符}\Default{\Carg{——}} - 全局的符号对照引导符，\cs{symb} 局部的 \meta{引导符} 和对齐方式是基于这个符号的宽度。 + 全局的符号对照引导符。\cs{symb} 局部的 \meta{引导符} 和对齐方式是基于这个符号的宽度。 \keyval-{space}{符号间隙}\Default{0.25em} 符号间隙为引导符两侧与符号和说明文字间的距离。 \keychoice{item-align}{l,c,r}\Default{r} @@ -1219,9 +1219,9 @@ \keyval-{enumitem}{键值列表2} 可以使用选项 \option{enumitem} 或命令 \cs{seteqcomplist} 调整对照列表的水平和垂直间距。 \keyval-{intro}{首行文字}\Default - 符号对照的说明文字，应当为简短的几个字，只显示在第一行，其后为悬挂缩进的对照列表。 + 符号对照的说明文字。应当为简短的几个字，只显示在第一行，其后为悬挂缩进的对照列表。 \keyval-{font}{符号字体}\Default - 符号的字体，数学和文本符号模式应采用不同的字体命令，最后一个命令可以接受一个参数，这个参数为符号。 + 符号的字体。数学和文本符号模式应采用不同的字体命令，最后一个命令可以接受一个参数，这个参数为符号。 \keychoice{mode}{math,text}\Default{math} 符号字体模式，可以为数学字体或者文本字体。 \end{options} @@ -1230,7 +1230,7 @@ \subsection{交叉引用} \begin{commands} \command*{ref}[\marg{标签名}] - 使用 \cs*{ref} 命令引用 \cs*{label} 设置的 \meta{标签名}，将会检测临近计数器并添加相应的前缀，比如图表、章节标题和定理等。 + 使用 \cs*{ref} 命令引用 \cs*{label} 设置的 \meta{标签名}，将会检测临近计数器并添加相应的前缀，比如图表题注、章节标题和定理等。 \command{footref}[\marg{脚注标签名}] 对自动编号的脚注进行引用可使用 \cs{footref} 命令，与引用的标记共享一个编号与格式。 \command{labelformat}[\marg{计数器}\marg{标签引用格式}] diff --git a/macros/latex/contrib/l3backend/CHANGELOG.md b/macros/latex/contrib/l3backend/CHANGELOG.md index b6b15a00ec..15826624b8 100644 --- a/macros/latex/contrib/l3backend/CHANGELOG.md +++ b/macros/latex/contrib/l3backend/CHANGELOG.md @@ -6,7 +6,11 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] -## [2021-10-18] +## [2021-12-14] + +### Fixed +- Scoping issues for `dvisvgm` +- Some incorrect functions in `l3draw` backend for `dvisvgm` ## [2021-10-17] @@ -203,8 +207,8 @@ this project uses date-based 'snapshot' version identifiers. - Include `l3backend` in file names - Moved backend code to internal for each 'parent' module -[Unreleased]: https://github.com/latex3/latex3/compare/2021-10-18...HEAD -[2021-10-18]: https://github.com/latex3/latex3/compare/2021-10-17...2021-10-18 +[Unreleased]: https://github.com/latex3/latex3/compare/2021-12-14...HEAD +[2021-12-14]: https://github.com/latex3/latex3/compare/2021-10-17...2021-12-14 [2021-10-17]: https://github.com/latex3/latex3/compare/2021-10-12...2021-10-17 [2021-10-12]: https://github.com/latex3/latex3/compare/2021-08-04...2021-10-12 [2021-08-04]: https://github.com/latex3/latex3/compare/2021-07-12...2021-08-04 diff --git a/macros/latex/contrib/l3backend/README.md b/macros/latex/contrib/l3backend/README.md index 5ca467a1f0..4e713baec6 100644 --- a/macros/latex/contrib/l3backend/README.md +++ b/macros/latex/contrib/l3backend/README.md @@ -1,7 +1,7 @@ LaTeX3 Backend Drivers ====================== -Release 2021-10-18 +Release 2021-12-14 This package forms parts of `expl3`, and contains the code used to interface with backends (drivers) across the `expl3` codebase. The functions here are diff --git a/macros/latex/contrib/l3backend/l3backend-basics.dtx b/macros/latex/contrib/l3backend/l3backend-basics.dtx index a8f2c67155..48a8673e39 100644 --- a/macros/latex/contrib/l3backend/l3backend-basics.dtx +++ b/macros/latex/contrib/l3backend/l3backend-basics.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-10-18} +% \date{Released 2021-12-14} % % \maketitle % @@ -70,27 +70,27 @@ % \begin{macrocode} \ProvidesExplFile %<*dvipdfmx> - {l3backend-dvipdfmx.def}{2021-10-18}{} + {l3backend-dvipdfmx.def}{2021-12-14}{} {L3 backend support: dvipdfmx} % %<*dvips> - {l3backend-dvips.def}{2021-10-18}{} + {l3backend-dvips.def}{2021-12-14}{} {L3 backend support: dvips} % %<*dvisvgm> - {l3backend-dvisvgm.def}{2021-10-18}{} + {l3backend-dvisvgm.def}{2021-12-14}{} {L3 backend support: dvisvgm} % %<*luatex> - {l3backend-luatex.def}{2021-10-18}{} + {l3backend-luatex.def}{2021-12-14}{} {L3 backend support: PDF output (LuaTeX)} % %<*pdftex> - {l3backend-pdftex.def}{2021-10-18}{} + {l3backend-pdftex.def}{2021-12-14}{} {L3 backend support: PDF output (pdfTeX)} % %<*xetex> - {l3backend-xetex.def}{2021-10-18}{} + {l3backend-xetex.def}{2021-12-14}{} {L3 backend support: XeTeX} % % \end{macrocode} diff --git a/macros/latex/contrib/l3backend/l3backend-box.dtx b/macros/latex/contrib/l3backend/l3backend-box.dtx index dc592e2fce..29a20a8ceb 100644 --- a/macros/latex/contrib/l3backend/l3backend-box.dtx +++ b/macros/latex/contrib/l3backend/l3backend-box.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-10-18} +% \date{Released 2021-12-14} % % \maketitle % @@ -337,7 +337,7 @@ % \end{macrocode} % % \begin{macro}{\@@_backend_clip:N} -% \begin{variable}{\g_@@_clip_path_int} +% \begin{variable}{\g__kernel_clip_path_int} % Clipping in SVG is more involved than with other backends. The first issue % is that the clipping path must be defined separately from where it is used, % so we need to track how many paths have applied. The naming here uses @@ -349,9 +349,9 @@ % \begin{macrocode} \cs_new_protected:Npn \@@_backend_clip:N #1 { - \int_gincr:N \g_@@_clip_path_int + \int_gincr:N \g__kernel_clip_path_int \__kernel_backend_literal_svg:x - { < clipPath~id = " l3cp \int_use:N \g_@@_clip_path_int " > } + { < clipPath~id = " l3cp \int_use:N \g__kernel_clip_path_int " > } \__kernel_backend_literal_svg:x { < @@ -390,7 +390,7 @@ \__kernel_backend_scope:x { clip-path = - "url ( \c_hash_str l3cp \int_use:N \g_@@_clip_path_int ) " + "url ( \c_hash_str l3cp \int_use:N \g__kernel_clip_path_int ) " } \__kernel_backend_scope:n { @@ -404,7 +404,7 @@ \box_use:N #1 \__kernel_backend_scope_end: } -\int_new:N \g_@@_clip_path_int +\int_new:N \g__kernel_clip_path_int % \end{macrocode} % \end{variable} % \end{macro} diff --git a/macros/latex/contrib/l3backend/l3backend-code.pdf b/macros/latex/contrib/l3backend/l3backend-code.pdf index b190a428d9..ac30cca198 100644 Binary files a/macros/latex/contrib/l3backend/l3backend-code.pdf and b/macros/latex/contrib/l3backend/l3backend-code.pdf differ diff --git a/macros/latex/contrib/l3backend/l3backend-color.dtx b/macros/latex/contrib/l3backend/l3backend-color.dtx index d47b2a7179..b9185ea80b 100644 --- a/macros/latex/contrib/l3backend/l3backend-color.dtx +++ b/macros/latex/contrib/l3backend/l3backend-color.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-10-18} +% \date{Released 2021-12-14} % % \maketitle % diff --git a/macros/latex/contrib/l3backend/l3backend-draw.dtx b/macros/latex/contrib/l3backend/l3backend-draw.dtx index d8e8a19226..6a9ac910c3 100644 --- a/macros/latex/contrib/l3backend/l3backend-draw.dtx +++ b/macros/latex/contrib/l3backend/l3backend-draw.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-10-18} +% \date{Released 2021-12-14} % % \maketitle % @@ -768,6 +768,14 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\@@_backend_scope_begin:, \@@_backend_scope_end:} +% Use the backend-level scope mechanisms. +% \begin{macrocode} +\cs_new_eq:NN \@@_backend_scope_begin: \__kernel_backend_scope_begin: +\cs_new_eq:NN \@@_backend_scope_end: \__kernel_backend_scope_end: +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\@@_backend_begin:, \@@_backend_end:} % A drawing needs to be set up such that the co-ordinate system is % translated. That is done inside a scope, which as described below @@ -785,7 +793,7 @@ % \begin{macro}{\@@_backend_rectangle:nnnn} % \begin{macro}{\@@_backend_curveto:nnnnnn} % \begin{macro}{\@@_backend_add_to_path:n} -% \begin{variable}{\g_@@_draw_path_tl} +% \begin{variable}{\g_@@_backend_path_tl} % Once again, some work is needed to get path constructs correct. Rather % then write the values as they are given, the entire path needs to be % collected up before being output in one go. For that we use a dedicated @@ -826,14 +834,14 @@ } \cs_new_protected:Npn \@@_backend_add_to_path:n #1 { - \tl_gset:Nx \g_@@_draw_path_tl + \tl_gset:Nx \g_@@_backend_path_tl { - \g_@@_draw_path_tl - \tl_if_empty:NF \g_@@_draw_path_tl { \c_space_tl } + \g_@@_backend_path_tl + \tl_if_empty:NF \g_@@_backend_path_tl { \c_space_tl } #1 } } -\tl_new:N \g_@@_draw_path_tl +\tl_new:N \g_@@_backend_path_tl % \end{macrocode} % \end{variable} % \end{macro} @@ -845,9 +853,9 @@ % The fill rules here have to be handled as scopes. % \begin{macrocode} \cs_new_protected:Npn \@@_backend_evenodd_rule: - { \@@_backend_scope:n { fill-rule="evenodd" } } + { \__kernel_backend_scope:n { fill-rule="evenodd" } } \cs_new_protected:Npn \@@_backend_nonzero_rule: - { \@@_backend_scope:n { fill-rule="nonzero" } } + { \__kernel_backend_scope:n { fill-rule="nonzero" } } % \end{macrocode} % \end{macro} % @@ -876,33 +884,33 @@ { \bool_if:NTF \g_@@_draw_clip_bool { - \int_gincr:N \g_@@_clip_path_int + \int_gincr:N \g__kernel_clip_path_int \@@_backend_literal:x { - < clipPath~id = " l3cp \int_use:N \g_@@_clip_path_int " > + < clipPath~id = " l3cp \int_use:N \g__kernel_clip_path_int " > { ?nl } - { ?nl } + { ?nl } < /clipPath > { ? nl } < use~xlink:href = - "\c_hash_str l3path \int_use:N \g_@@_path_int " ~ + "\c_hash_str l3path \int_use:N \g_@@_backend_path_int " ~ #1 /> } - \@@_backend_scope:x + \__kernel_backend_scope:x { clip-path = - "url( \c_hash_str l3cp \int_use:N \g_@@_clip_path_int)" + "url( \c_hash_str l3cp \int_use:N \g__kernel_clip_path_int)" } } { \@@_backend_literal:x - { } + { } } - \tl_gclear:N \g_@@_draw_path_tl + \tl_gclear:N \g_@@_backend_path_tl \bool_gset_false:N \g_@@_draw_clip_bool } -\int_new:N \g_@@_path_int +\int_new:N \g_@@_backend_path_int \cs_new_protected:Npn \@@_backend_stroke: { \@@_backend_path:n { style="fill:none" } } \cs_new_protected:Npn \@@_backend_closestroke: @@ -921,21 +929,21 @@ { \bool_if:NT \g_@@_draw_clip_bool { - \int_gincr:N \g_@@_clip_path_int + \int_gincr:N \g__kernel_clip_path_int \@@_backend_literal:x { - < clipPath~id = " l3cp \int_use:N \g_@@_clip_path_int " > + < clipPath~id = " l3cp \int_use:N \g__kernel_clip_path_int " > { ?nl } - { ?nl } + { ?nl } < /clipPath > } - \@@_backend_scope:x + \__kernel_backend_scope:x { clip-path = - "url( \c_hash_str l3cp \int_use:N \g_@@_clip_path_int)" + "url( \c_hash_str l3cp \int_use:N \g__kernel_clip_path_int)" } } - \tl_gclear:N \g_@@_draw_path_tl + \tl_gclear:N \g_@@_path_tl \bool_gset_false:N \g_@@_draw_clip_bool } % \end{macrocode} @@ -963,7 +971,7 @@ \use:x { \@@_backend_dash_aux:nn - { \clist_map_function:nn {#1} \@@_backend_dash:n } + { \clist_map_function:nN {#1} \@@_backend_dash:n } { \dim_to_decimal:n {#2} } } } @@ -971,11 +979,11 @@ { , \dim_to_decimal_in_bp:n {#1} } \cs_new_protected:Npn \@@_backend_dash_aux:nn #1#2 { - \@@_backend_scope:x + \__kernel_backend_scope:x { stroke-dasharray = " - \tl_if_empty:oTF { \use_none:n #1 } + \tl_if_empty:nTF {#1} { none } { \use_none:n #1 } " ~ @@ -983,21 +991,21 @@ } } \cs_new_protected:Npn \@@_backend_linewidth:n #1 - { \@@_backend_scope:x { stroke-width=" \dim_to_decimal:n {#1} " } } + { \__kernel_backend_scope:x { stroke-width=" \dim_to_decimal:n {#1} " } } \cs_new_protected:Npn \@@_backend_miterlimit:n #1 - { \@@_backend_scope:x { stroke-miterlimit=" #1 " } } + { \__kernel_backend_scope:x { stroke-miterlimit=" #1 " } } \cs_new_protected:Npn \@@_backend_cap_butt: - { \@@_backend_scope:n { stroke-linecap="butt" } } + { \__kernel_backend_scope:n { stroke-linecap="butt" } } \cs_new_protected:Npn \@@_backend_cap_round: - { \@@_backend_scope:n { stroke-linecap="round" } } + { \__kernel_backend_scope:n { stroke-linecap="round" } } \cs_new_protected:Npn \@@_backend_cap_rectangle: - { \@@_backend_scope:n { stroke-linecap="square" } } + { \__kernel_backend_scope:n { stroke-linecap="square" } } \cs_new_protected:Npn \@@_backend_join_miter: - { \@@_backend_scope:n { stroke-linejoin="miter" } } + { \__kernel_backend_scope:n { stroke-linejoin="miter" } } \cs_new_protected:Npn \@@_backend_join_round: - { \@@_backend_scope:n { stroke-linejoin="round" } } + { \__kernel_backend_scope:n { stroke-linejoin="round" } } \cs_new_protected:Npn \@@_backend_join_bevel: - { \@@_backend_scope:n { stroke-linejoin="bevel" } } + { \__kernel_backend_scope:n { stroke-linejoin="bevel" } } % \end{macrocode} % \end{macro} % \end{macro} @@ -1012,7 +1020,7 @@ % \begin{macrocode} \cs_new_protected:Npn \@@_backend_cm:nnnn #1#2#3#4 { - \@@_backend_scope:n + \__kernel_backend_scope:n { transform = " matrix ( #1 , #2 , #3 , #4 , 0pt , 0pt ) " @@ -1026,7 +1034,7 @@ % a scope. As there is nothing to re-box, just make the box passed of % zero size. % \begin{macrocode} -\cs_new_protected:Npn \@@_backend_box_use:Nnnnn #1#2#3#4#5#6#7 +\cs_new_protected:Npn \@@_backend_box_use:Nnnnn #1#2#3#4#5 { \__kernel_backend_scope_begin: \@@_backend_cm:nnnn {#2} {#3} {#4} {#5} diff --git a/macros/latex/contrib/l3backend/l3backend-graphics.dtx b/macros/latex/contrib/l3backend/l3backend-graphics.dtx index 144b21cf5a..57cac24006 100644 --- a/macros/latex/contrib/l3backend/l3backend-graphics.dtx +++ b/macros/latex/contrib/l3backend/l3backend-graphics.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-10-18} +% \date{Released 2021-12-14} % % \maketitle % diff --git a/macros/latex/contrib/l3backend/l3backend-header.dtx b/macros/latex/contrib/l3backend/l3backend-header.dtx index 7eab8cdf2f..6692fec9bf 100644 --- a/macros/latex/contrib/l3backend/l3backend-header.dtx +++ b/macros/latex/contrib/l3backend/l3backend-header.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-10-18} +% \date{Released 2021-12-14} % % \maketitle % diff --git a/macros/latex/contrib/l3backend/l3backend-opacity.dtx b/macros/latex/contrib/l3backend/l3backend-opacity.dtx index ff9eec5226..ed811bd7b7 100644 --- a/macros/latex/contrib/l3backend/l3backend-opacity.dtx +++ b/macros/latex/contrib/l3backend/l3backend-opacity.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-10-18} +% \date{Released 2021-12-14} % % \maketitle % diff --git a/macros/latex/contrib/l3backend/l3backend-pdf.dtx b/macros/latex/contrib/l3backend/l3backend-pdf.dtx index d9098ccd1f..2d09226bf1 100644 --- a/macros/latex/contrib/l3backend/l3backend-pdf.dtx +++ b/macros/latex/contrib/l3backend/l3backend-pdf.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-10-18} +% \date{Released 2021-12-14} % % \maketitle % diff --git a/macros/latex/contrib/l3build/CHANGELOG.md b/macros/latex/contrib/l3build/CHANGELOG.md index 07631b0dd9..9c0dbdebb0 100644 --- a/macros/latex/contrib/l3build/CHANGELOG.md +++ b/macros/latex/contrib/l3build/CHANGELOG.md @@ -7,6 +7,11 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2021-12-14] + +### Fixed +- Use correct name for `options` table in multi configuration management code + ## [2021-12-09] ### Added @@ -553,7 +558,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/2021-12-09...HEAD +[Unreleased]: https://github.com/latex3/l3build/compare/2021-12-14...HEAD +[2021-12-14]: https://github.com/latex3/l3build/compare/2021-12-09...2021-12-14 [2021-12-09]: https://github.com/latex3/l3build/compare/2021-12-06...2021-12-09 [2021-12-06]: https://github.com/latex3/l3build/compare/2021-11-29...2021-12-06 [2021-11-29]: https://github.com/latex3/l3build/compare/2021-11-24...2021-11-29 diff --git a/macros/latex/contrib/l3build/README.md b/macros/latex/contrib/l3build/README.md index 2c5e33a032..0b09e63bab 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 2021-12-09 +Release 2021-12-14 Overview -------- diff --git a/macros/latex/contrib/l3build/l3build-variables.lua b/macros/latex/contrib/l3build/l3build-variables.lua index ffabf3490a..736df6ae82 100644 --- a/macros/latex/contrib/l3build/l3build-variables.lua +++ b/macros/latex/contrib/l3build/l3build-variables.lua @@ -121,11 +121,13 @@ specialformats.context = specialformats.context or { pdftex = {binary = "texexec", format = ""}, xetex = {binary = "texexec", format = "", options = "--xetex"} } -specialformats.latex = specialformats.latex or { - etex = {format = "latex"}, - ptex = {binary = "eptex"}, - uptex = {binary = "euptex"} - } +specialformats.latex = specialformats.latex or { } +specialformats.latex.etex = specialformats.latex.etex or + {format = "latex"} +specialformats.latex.ptex = specialformats.latex.ptex or + {binary = "eptex"} +specialformats.latex.uptex = specialformats.latex.uptex or + {binary = "euptex"} if not string.find(status.banner,"2019") then specialformats.latex.luatex = specialformats.latex.luatex or {binary = "luahbtex",format = "lualatex"} diff --git a/macros/latex/contrib/l3build/l3build.1 b/macros/latex/contrib/l3build/l3build.1 index 0a0fbf2344..592424ba4f 100644 --- a/macros/latex/contrib/l3build/l3build.1 +++ b/macros/latex/contrib/l3build/l3build.1 @@ -1,4 +1,4 @@ -.TH l3build 1 "2021-12-09" +.TH l3build 1 "2021-12-14" .SH NAME l3build \- Checking and building packages .SH SYNOPSIS diff --git a/macros/latex/contrib/l3build/l3build.dtx b/macros/latex/contrib/l3build/l3build.dtx index b11dc1adcb..e385c5249d 100644 --- a/macros/latex/contrib/l3build/l3build.dtx +++ b/macros/latex/contrib/l3build/l3build.dtx @@ -237,7 +237,7 @@ % }^^A % } % -% \date{Released 2021-12-09} +% \date{Released 2021-12-14} % % \maketitle % \tableofcontents diff --git a/macros/latex/contrib/l3build/l3build.lua b/macros/latex/contrib/l3build/l3build.lua index 1d8d58c694..9c811c3fc8 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 = "2021-12-09" +release_date = "2021-12-14" -- File operations are aided by the LuaFileSystem module local lfs = require("lfs") @@ -136,11 +136,10 @@ end if #checkconfigs > 1 then if options["target"] == "check" then local errorlevel = 0 - local opts = options local failed = { } for i = 1, #checkconfigs do - opts["config"] = {checkconfigs[i]} - errorlevel = call({"."}, "check", opts) + options["config"] = {checkconfigs[i]} + errorlevel = call({"."}, "check", options) if errorlevel ~= 0 then if options["halt-on-error"] then exit(1) @@ -199,8 +198,8 @@ if #checkconfigs > 1 then elseif options["target"] == "clean" then local failure for i = 1, #checkconfigs do - opts["config"] = {checkconfigs[i]} - failure = 0 ~= call({"."}, "clean", opts) or failure + options["config"] = {checkconfigs[i]} + failure = 0 ~= call({"."}, "clean", options) or failure end exit(failure and 1 or 0) end diff --git a/macros/latex/contrib/l3build/l3build.pdf b/macros/latex/contrib/l3build/l3build.pdf index 43000ca133..6f9d13aff9 100644 Binary files a/macros/latex/contrib/l3build/l3build.pdf and b/macros/latex/contrib/l3build/l3build.pdf differ diff --git a/macros/latex/required/graphics/README.md b/macros/latex/required/graphics/README.md index 896ce7366a..e58a421c93 100644 --- a/macros/latex/required/graphics/README.md +++ b/macros/latex/required/graphics/README.md @@ -1,7 +1,7 @@ The LaTeX `graphics` bundle =========================== -Release 2021-11-15 +Release 2021-12-14 Overview -------- diff --git a/macros/latex/required/graphics/changes.txt b/macros/latex/required/graphics/changes.txt index 374cbd1c6b..eb95865d2f 100644 --- a/macros/latex/required/graphics/changes.txt +++ b/macros/latex/required/graphics/changes.txt @@ -8,6 +8,14 @@ are not part of the distribution. All changes above are only part of the development branch for the next release. ================================================================================ +######################### +# 2021-12-14 Release +######################### + +2021-12-07 Ulrike Fischer + + * color.dtx: Remove stray spaces after change for xcolor/gh/10} + ######################### # 2021-11-15 Release ######################### diff --git a/macros/latex/required/graphics/color.dtx b/macros/latex/required/graphics/color.dtx index 9418a12477..b4b0ad1091 100644 --- a/macros/latex/required/graphics/color.dtx +++ b/macros/latex/required/graphics/color.dtx @@ -21,7 +21,7 @@ % \ProvidesFile{color.drv} % \fi % \ProvidesFile{color.dtx} - [2021/10/11 v1.3b Standard LaTeX Color (DPC)] + [2021/12/07 v1.3c Standard LaTeX Color (DPC)] % % \iffalse %<*driver> @@ -80,6 +80,8 @@ % {Save and restore catcodes} % \changes{v1.3a}{2021/09/27} % {Use \cs{@backslashchar} in preference to \cs{string} gh/659} +% \changes{v1.3c}{2021/12/07} +% {Remove stray spaces after change to \cs{@backslashchar} xcolor/gh/10} % % \begin{macrocode} \edef\Gin@codes{% @@ -380,7 +382,7 @@ % \begin{macrocode} \DeclareOption{usenames}{% \def\c@lor@usename#1{% - \expandafter\color@named\csname\@backslashchar color @#1\endcsname{#1}}} + \expandafter\color@named\csname\@backslashchar color@#1\endcsname{#1}}} % \end{macrocode} % \end{option} % @@ -437,10 +439,10 @@ % Finally call |\set@color| to effect the colour change. % \begin{macrocode} \def\@declaredcolor#1{% - \@ifundefined{\@backslashchar color @#1}% + \@ifundefined{\@backslashchar color@#1}% {\c@lor@error{`#1'}}% {\expandafter\let\expandafter\current@color - \csname\@backslashchar color @#1\endcsname + \csname\@backslashchar color@#1\endcsname \set@color}% \ignorespaces} % \end{macrocode} @@ -550,10 +552,10 @@ \protected\def\definecolor#1#2#3{% \@ifundefined{color@#2}% {\c@lor@error{model `#2'}}% - {\@ifundefined{\@backslashchar color @#1}{}% + {\@ifundefined{\@backslashchar color@#1}{}% {\PackageInfo{color}{Redefining color #1}}% \csname color@#2\expandafter\endcsname - \csname\@backslashchar color @#1\endcsname{#3}}} + \csname\@backslashchar color@#1\endcsname{#3}}} % \end{macrocode} % \end{macro} % diff --git a/macros/latex/required/graphics/color.pdf b/macros/latex/required/graphics/color.pdf index f8c3c65aa4..540a4f2808 100644 Binary files a/macros/latex/required/graphics/color.pdf and b/macros/latex/required/graphics/color.pdf differ diff --git a/macros/latex/required/graphics/drivers.pdf b/macros/latex/required/graphics/drivers.pdf index 6e4154e751..0f83884b10 100644 Binary files a/macros/latex/required/graphics/drivers.pdf and b/macros/latex/required/graphics/drivers.pdf differ diff --git a/macros/latex/required/graphics/epsfig.pdf b/macros/latex/required/graphics/epsfig.pdf index 7fca183869..f8af4c38ae 100644 Binary files a/macros/latex/required/graphics/epsfig.pdf and b/macros/latex/required/graphics/epsfig.pdf differ diff --git a/macros/latex/required/graphics/graphics.pdf b/macros/latex/required/graphics/graphics.pdf index 17c7d7e936..a50ff186fd 100644 Binary files a/macros/latex/required/graphics/graphics.pdf and b/macros/latex/required/graphics/graphics.pdf differ diff --git a/macros/latex/required/graphics/graphicx.pdf b/macros/latex/required/graphics/graphicx.pdf index a7ffe13078..88ef6488c2 100644 Binary files a/macros/latex/required/graphics/graphicx.pdf and b/macros/latex/required/graphics/graphicx.pdf differ diff --git a/macros/latex/required/graphics/grfguide.pdf b/macros/latex/required/graphics/grfguide.pdf index fddd2595da..95e7c76295 100644 Binary files a/macros/latex/required/graphics/grfguide.pdf and b/macros/latex/required/graphics/grfguide.pdf differ diff --git a/macros/latex/required/graphics/keyval.pdf b/macros/latex/required/graphics/keyval.pdf index f57d32807f..8746550d0e 100644 Binary files a/macros/latex/required/graphics/keyval.pdf and b/macros/latex/required/graphics/keyval.pdf differ diff --git a/macros/latex/required/graphics/lscape.pdf b/macros/latex/required/graphics/lscape.pdf index 1e0dabceed..178ffb231d 100644 Binary files a/macros/latex/required/graphics/lscape.pdf and b/macros/latex/required/graphics/lscape.pdf differ diff --git a/macros/latex/required/graphics/rotating.pdf b/macros/latex/required/graphics/rotating.pdf index de222fd290..94fab64ec2 100644 Binary files a/macros/latex/required/graphics/rotating.pdf and b/macros/latex/required/graphics/rotating.pdf differ diff --git a/macros/latex/required/graphics/rotex.pdf b/macros/latex/required/graphics/rotex.pdf index b8edcb0a6e..3ca96254af 100644 Binary files a/macros/latex/required/graphics/rotex.pdf and b/macros/latex/required/graphics/rotex.pdf differ diff --git a/macros/latex/required/graphics/trig.pdf b/macros/latex/required/graphics/trig.pdf index 14627b628d..cc9bbe3bcf 100644 Binary files a/macros/latex/required/graphics/trig.pdf and b/macros/latex/required/graphics/trig.pdf differ diff --git a/macros/luatex/latex/datestamp/README.txt b/macros/luatex/latex/datestamp/README.txt index fe22e37dae..560bff619e 100644 --- a/macros/luatex/latex/datestamp/README.txt +++ b/macros/luatex/latex/datestamp/README.txt @@ -1,8 +1,8 @@ ----------------------------------------------------------- -Package: datestamp -Version: v0.2(08 December, 2021) -Author: निरंजन -Description: Fixed date-stamps with LuaLaTeX -Repository: http://savannah.nongnu.org/projects/datestamp -License: GPLv3+, GFDLv1.3+ +Package: datestamp +Version: v0.3 (14 December, 2021) +Author: निरंजन +Description: Fixed date-stamps with LuaLaTeX +Repository: http://puszcza.gnu.org.ua/projects/datestamp +License: GPLv3+, GFDLv1.3+ ----------------------------------------------------------- diff --git a/macros/luatex/latex/datestamp/datestamp-example.pdf b/macros/luatex/latex/datestamp/datestamp-example.pdf index 73854cc330..5ca4121432 100644 Binary files a/macros/luatex/latex/datestamp/datestamp-example.pdf and b/macros/luatex/latex/datestamp/datestamp-example.pdf differ diff --git a/macros/luatex/latex/datestamp/datestamp.dtx b/macros/luatex/latex/datestamp/datestamp.dtx index 7e9861f42e..daf7c386e6 100644 --- a/macros/luatex/latex/datestamp/datestamp.dtx +++ b/macros/luatex/latex/datestamp/datestamp.dtx @@ -3,14 +3,14 @@ % File: datestamp.dtx % ---------------------------------------------------------- % Package: datestamp -% Version: v0.2 (08 December, 2021) +% Version: v0.3 (14 December, 2021) % Author: निरंजन % Description: Fixed date-stamps with LuaLaTeX. -% Repository: http://savannah.nongnu.org/projects/datestamp +% Repository: http://puszcza.gnu.org.ua/projects/datestamp % License: GPLv3+, GFDLv1.3+ % ---------------------------------------------------------- % -% LaTeX Package datestamp v0.2 +% LaTeX Package datestamp v0.3 % Copyright © 2021 निरंजन % % This program is free software: you can redistribute it @@ -41,12 +41,12 @@ % %<*readme> ----------------------------------------------------------- -Package: datestamp -Version: v0.2(08 December, 2021) -Author: निरंजन -Description: Fixed date-stamps with LuaLaTeX -Repository: http://savannah.nongnu.org/projects/datestamp -License: GPLv3+, GFDLv1.3+ +Package: datestamp +Version: v0.3 (14 December, 2021) +Author: निरंजन +Description: Fixed date-stamps with LuaLaTeX +Repository: http://puszcza.gnu.org.ua/projects/datestamp +License: GPLv3+, GFDLv1.3+ ----------------------------------------------------------- % %<*internal> @@ -54,8 +54,8 @@ License: GPLv3+, GFDLv1.3+ % %<*driver|package> \def\datestampname{datestamp} -\def\datestampversion{0.2} -\def\datestampdate{2021-12-08} +\def\datestampversion{0.3} +\def\datestampdate{2021-12-14} \def\datestampdescription{% Fixed date-stamps with LuaLaTeX.% } @@ -100,7 +100,7 @@ License: GPLv3+, GFDLv1.3+ % }\\^^A % {^^A % \small\faIcon{bug}\quad -% \url{http://savannah.nongnu.org/bugs/?group=datestamp}^^A +% \url{http://puszcza.gnu.org/bugs/?group=datestamp}^^A % }^^A % } % @@ -175,7 +175,7 @@ License: GPLv3+, GFDLv1.3+ % \begin{macrocode} %<@@=datestamp> %<*package> -\ProvidesPackage{datestamp}[2021/12/08 v0.2 +\ProvidesPackage{datestamp}[2021/12/14 v0.3 Fixed date-stamps with LuaLaTeX.] % \end{macrocode} % Load package \pkg{xparse} for declaring the robust command diff --git a/macros/luatex/latex/datestamp/datestamp.ins b/macros/luatex/latex/datestamp/datestamp.ins index abfd0bbfe7..521125d43c 100644 --- a/macros/luatex/latex/datestamp/datestamp.ins +++ b/macros/luatex/latex/datestamp/datestamp.ins @@ -6,15 +6,15 @@ \preamble ----------------------------------------------------------- -Package: datestamp -Version: v0.2(08 December, 2021) -Author: निरंजन -Description: Fixed date-stamps with LuaLaTeX. -Repository: http://savannah.nongnu.org/projects/datestamp -License: GPLv3+, GFDLv1.3+ +Package: datestamp +Version: v0.3 (14 December, 2021) +Author: निरंजन +Description: Fixed date-stamps with LuaLaTeX. +Repository: http://puszcza.gnu.org.ua/projects/datestamp +License: GPLv3+, GFDLv1.3+ ----------------------------------------------------------- -LaTeX Package datestamp v0.2 +LaTeX Package datestamp v0.3 Copyright © 2021 निरंजन This program is free software: you can redistribute it diff --git a/macros/luatex/latex/datestamp/datestamp.pdf b/macros/luatex/latex/datestamp/datestamp.pdf index 79cd3ea8ca..13861a5e86 100644 Binary files a/macros/luatex/latex/datestamp/datestamp.pdf and b/macros/luatex/latex/datestamp/datestamp.pdf differ -- cgit v1.2.3